Bug fixing previous commit

BRTrains · Nov 22, 2024 · 2837f22 · 2837f22
1 parent 93b2173
commit 2837f22
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/lang/english.lng b/lang/english.lng
@@ -20,6 +20,7 @@ STR_CONCAT_3s	: {STRING} {STRING} {STRING}
 STR_CONCAT_4s	: {STRING} {STRING} {STRING} {STRING}
 STR_CONCAT_5s	: {STRING} {STRING} {STRING} {STRING} {STRING}
 
+STR_LIVERY_SHORT    : ({STRING})
 STR_LIVERY          : ({STRING} - {STRING})
 STR_LIVERY_EXTENDED : ({STRING} - {STRING} - {STRING})
 STR_LIVERY_SPECIAL  : ({STRING} - {STRING} - {SILVER}{STRING})
@@ -1752,7 +1753,7 @@ str_BRProvincial                : (BR - Provincial)
 str_BRRailfreightGrey           : (BR - Railfreight Grey)
 str_BRResearch                  : (BR - Research Department)
 str_BRRefurb                    : (BR - Refurbished)
-str_BRTransitionalRed           : (BR - TransitionalRed)
+str_BRTransitionalRed           : (BR - Transitional Red)
 str_BRTest						: (BR - Track Test Train)
 str_BristolElectricProto        : (Bristol Electric - Prototype)
 str_Brown                       : (Brown)

diff --git a/src/trains/freight_wagons/BR/BRT_CovHop.pnml b/src/trains/freight_wagons/BR/BRT_CovHop.pnml
@@ -7,23 +7,23 @@ spriteset(spriteset_BRT_CovHop_Grainflow, "gfx/Freight/BRT_CovHop.png") {
 }
 
 spriteset(spriteset_BRT_CovHop_Grey, "gfx/Freight/BRT_CovHop.png") {
-    template_train32px(0, 39)
+    template_train20px(0, 39)
 }
 
 spriteset(spriteset_BRT_CovHop_Brown, "gfx/Freight/BRT_CovHop.png") {
-    template_train32px(0, 65)
+    template_train20px(0, 65)
 }
 
 spriteset(spriteset_BRT_CovHop_Priv_Blue, "gfx/Freight/BRT_CovHop.png") {
-    template_train32px(0, 91)
+    template_train20px(0, 91)
 }
 
 spriteset(spriteset_BRT_CovHop_Priv_Blue_Ad, "gfx/Freight/BRT_CovHop.png") {
-    template_train32px(0, 117)
+    template_train20px(0, 117)
 }
 
 spriteset(spriteset_BRT_CovHop_Priv_Yellow, "gfx/Freight/BRT_CovHop.png") {
-    template_train32px(0, 144)
+    template_train20px(0, 143)
 }
 
 switch(FEAT_TRAINS, SELF, sw_BRT_CovHop, cargo_subtype) {
@@ -36,12 +36,12 @@ switch(FEAT_TRAINS, SELF, sw_BRT_CovHop, cargo_subtype) {
 }
 
 switch(FEAT_TRAINS, SELF, sw_BRT_CovHop_cargo_subtype_text, cargo_subtype) {
-    0: return string(STR_LIVERY, string(str_var_Polybulk));
-    1: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Grey));
-    2: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Brown));
-    3: return string(STR_LIVERY_EXTENDED, string(str_comp_gen_priv_owner), string(str_col_Blue));
-    4: return string(STR_LIVERY_SPECIAL, string(str_comp_gen_priv_owner), string(str_col_Blue), string(str_var_Advertisement));
-    5: return string(STR_LIVERY_EXTENDED, string(str_comp_gen_priv_owner), string(str_col_Yellow));
+    0: return string(STR_LIVERY_SHORT, string(str_var_Polybulk));
+    1: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_Grey));
+    2: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_Brown));
+    3: return string(STR_LIVERY, string(str_comp_gen_priv_owner), string(str_col_Blue));
+    4: return string(STR_LIVERY_EXTENDED, string(str_comp_gen_priv_owner), string(str_col_Blue), string(str_var_Advertisement));
+    5: return string(STR_LIVERY, string(str_comp_gen_priv_owner), string(str_col_Yellow));
 }
 
 item(FEAT_TRAINS, item_BRTCovHop, 708) {
@@ -62,16 +62,16 @@ item(FEAT_TRAINS, item_BRTCovHop, 708) {
 		cargo_capacity:					35;
 		weight:							13 ton;		
 		air_drag_coefficient:			0.07;
-		length:							8;
+		length:							5;
 		bitmask_vehicle_info:			0;
     }
     graphics {
         additional_text:                return(string(str_purchase_coach, string(str_BRJIA_Polybulk_liveries)));
         can_attach_wagon:               CB_RESULT_ATTACH_ALLOW;
-        default:                        sw_BR_JIA_cargo;
+        default:                        sw_BRT_CovHop;
         purchase:                       spriteset_BRT_CovHop_purchase;
         colour_mapping:                 return PALETTE_CC_FIRST;
-        cargo_subtype_text:             sw_BRJIA_cargo_subtype_text;
+        cargo_subtype_text:             sw_BRT_CovHop_cargo_subtype_text;
         cost_factor:                    return(GetAdjustedCost(29));
         running_cost_factor:            return(GetAdjustedCost(17));
     }

diff --git a/src/trains/freight_wagons/BR/BR_JIA.pnml b/src/trains/freight_wagons/BR/BR_JIA.pnml
@@ -27,10 +27,9 @@ switch(FEAT_TRAINS, SELF, sw_BR_JIA_cargo, cargo_subtype) {
 
 switch(FEAT_TRAINS, SELF, sw_BR_JIA_cargo_subtype_text, cargo_subtype) {
     0:  return string(STR_LIVERY, string(str_comp_TSL), string(str_var_Polybulk));
-    1:  return string(STR_LIVERY, string(str_var_Polybulk));
-    2:  return string(STR_LIVERY, string(str_var_Grainflow));
-    3:  return string(STR_LIVERY_EXTENDED, string(str_comp_TigerNacco), string(str_col_Grey));
-    #    return CB_RESULT_NO_TEXT;
+    1:  return string(STR_LIVERY_SHORT, string(str_var_Polybulk));
+    2:  return string(STR_LIVERY_SHORT, string(str_var_Grainflow));
+    3:  return string(STR_LIVERY, string(str_comp_TigerNacco), string(str_col_Grey));
 }
 
 item(FEAT_TRAINS, item_BRJIA, 709) {
@@ -60,7 +59,7 @@ item(FEAT_TRAINS, item_BRJIA, 709) {
         default:                        sw_BR_JIA_cargo;
         purchase:                       spriteset_BR_JIA_Polybulk_purchase;
         colour_mapping:                 return PALETTE_CC_FIRST;
-        cargo_subtype_text:             sw_BRJIA_cargo_subtype_text;
+        cargo_subtype_text:             sw_BR_JIA_cargo_subtype_text;
         cost_factor:                    return(GetAdjustedCost(29));
         running_cost_factor:            return(GetAdjustedCost(17));
     }

diff --git a/src/trains/freight_wagons/GWR/GWR_Mink_G.pnml b/src/trains/freight_wagons/GWR/GWR_Mink_G.pnml
@@ -16,9 +16,8 @@ switch(FEAT_TRAINS, SELF, sw_GWR_Mink_G_cargo, cargo_subtype) {
 }
 
 switch(FEAT_TRAINS, SELF, sw_GWR_Mink_G_cargo_subtype_text, cargo_subtype) {
-    0: return string(STR_LIVERY_EXTENDED, string(str_comp_GWR), string(str_col_Grey));
-    1: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Bauxite));
-    # return CB_RESULT_NO_TEXT;
+    0: return string(STR_LIVERY, string(str_abbr_GWR), string(str_col_Grey));
+    1: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_Bauxite));
 }
 
 item(FEAT_TRAINS, item_GWRMinkG, 710) {