Merge pull request #5 from Babel-TTT/main

250217 fix yellowhead's capacity
OpenTTD-China-Set · Feb 17, 2025 · edab247 · edab247
2 parents 3350ca4 + 70594ad
commit edab247
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 20 deletions.
diff --git a/chinaset-mtraddon.nml b/chinaset-mtraddon.nml
@@ -3,8 +3,8 @@ grf {
     name:    string(STR_GRF_NAME);
     desc:    string(STR_DESC_4, string(STR_GRF_DESC), string(STR_GRF_DESC_README),string(STR_GRF_DESC_MTR));
     url:     string(STR_GRF_URL);
-    version: 20;
-    min_compatible_version: 7;
+    version: 21;
+    min_compatible_version: 20;
 
     param 0 {
         param_loading_speed {
@@ -454,9 +454,9 @@ item (FEAT_TRAINS, caf_train_airport_express, 2240) {}
 item (FEAT_TRAINS, caf_train_tungchung, 2751) {}
 
 
-//Misc, available ID range: 2240-2751 (hex 0x0AC0..0x0CBF)
+//Misc, available ID range: 2752-3263 (hex 0x0AC0..0x0CBF)
 //define id_range_misc 0x0AC0..0x0CBF
-item (FEAT_TRAINS, yellowhead_mailroom, 2240) {}
+item (FEAT_TRAINS, yellowhead_mailroom, 2752) {}
 
 
 /* Begin Functions */
@@ -1334,7 +1334,7 @@ item (FEAT_TRAINS, lok2000) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_5, string(STR_USEDLINE_KTT), string(STR_ELECTRICITY_SUPPLY), string(STR_RELDEC_MEDIUM, 16));
+        additional_text:                string(STR_DESC_5, string(STR_ELECTRIC_25KVAC),  string(STR_USEDLINE_KTT), string(STR_ELECTRICITY_SUPPLY), string(STR_RELDEC_MEDIUM, 16));
         cargo_subtype_text:             switch_lok2000_cargo_subtype;
         can_attach_wagon:               locowagon;
         // Graphics
@@ -3042,7 +3042,7 @@ item (FEAT_TRAINS, mtr380a) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_8, string(STR_FULLNAME_MTR380A), string(STR_NICKNAME_MTR380A), string(STR_USEDLINE_XRL), string(STR_MTR_FIRST_CAN_ATTACH_WAGON), string(STR_MTR380A_CONSIST), string(STR_RELDEC_LOW, 12), string(STR_FIRST_HEAD_SEAT), string(STR_350_AVAILABLE));
+        additional_text:                string(STR_DESC_8, string(STR_ELECTRIC_25KVAC),  string(STR_FULLNAME_MTR380A), string(STR_NICKNAME_MTR380A), string(STR_USEDLINE_XRL), string(STR_MTR_FIRST_CAN_ATTACH_WAGON), string(STR_MTR380A_CONSIST), string(STR_RELDEC_LOW, 12), string(STR_FIRST_HEAD_SEAT), string(STR_350_AVAILABLE));
         can_attach_wagon:               muhead_with_first_class;
         start_stop:                     mu4to24car;
         cargo_subtype_text:             switch_crh380_cargo_subtype;

diff --git a/custom_tags.txt b/custom_tags.txt
@@ -1,6 +1,6 @@
-VERSION        :0.2.0
-VERSION_STRING :0.2.0
-TITLE          :China Set: MTR Addon 0.2.0
+VERSION        :0.2.1
+VERSION_STRING :0.2.1
+TITLE          :China Set: MTR Addon 0.2.1
 FILENAME       :chinaset-mtraddon.grf
 REPO_HASH      :
-NEWGRF_VERSION :20
+NEWGRF_VERSION :21
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,4 +1,9 @@
-25/02/12 v0.2.2 by Babel
+25/02/17 v0.2.1 by Babel
+---------
+Fix #4: Mail capacity of Yellowhead train (Exurban ) is 0
+Fix #5: lok2000 and MTR380A don't show electric supply mode on purchase mune
+
+25/02/12 v0.2.0 by Babel
 ---------
 Fix #3: param_cargo_decay can't effect on luggageroom of Yellowhead
 Add: CAF Train(Airport Express and Tung Chung Line), MTR Luggage MU Wagon

diff --git a/docs/str.CSV b/docs/str.CSV
@@ -35,6 +35,7 @@ STR_USED_WITH_DYNAMIC_ENGINES,"This GRF needs dynamic_engines to be turned on. O
 STR_US_IMPORT,Imported from United States,美国进口车型,
 STR_FR_IMPORT,Imported from France,法国进口车型,
 # DESC,,,
+STR_DESC_10,{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING},,
 STR_DESC_8,{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING},,
 STR_DESC_7,{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING},,
 STR_DESC_6,{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING}{}{STRING},,
@@ -147,8 +148,8 @@ STR_FULLNAME_MTR380A,{BLACK}Full Name: MTR {ORANGE}Vibrant Express,{BLACK}全名
 STR_NICKNAME_MTR380A,{BLACK}Nickname: HongKong Mouse,{BLACK}昵称：港鼠,
 STR_MTR380A_CONSIST,"{BLACK}Consist: {GOLD}4 to 24 cars; with head and cab trailers, all middle cars motorised. Will run as coupled when cars more than 12",{BLACK}构成：{GOLD}4-24节；头尾拖车，中间全为动力车。大于12节时以重联方式运行,
 # CAF Train,,,
-STR_SERIES_CAF_TRAIN,CAF Train (EMU),CAF Train(电力动车组),
-STR_NAME_CAF_TRAIN_AIRPORT_EXPRESS,CAF Train(Airport Express Type) (EMU),CAF Train(机场快线型) (电力动车),
-STR_NAME_CAF_TRAIN_TUNGCHUNG,CAF Train(Tung Chung Line Type) (EMU),CAF Train(东涌线型) (电力动车),
+STR_SERIES_CAF_TRAIN,CAF-Train (EMU),CAF-Train(电力动车组),
+STR_NAME_CAF_TRAIN_AIRPORT_EXPRESS,CAF-Train(Airport Express Type) (EMU),CAF-Train(机场快线型) (电力动车),
+STR_NAME_CAF_TRAIN_TUNGCHUNG,CAF-Train(Tung Chung Line Type) (EMU),CAF-Train(东涌线型) (电力动车),
 STR_FULLNAME_CAF_TRAIN,{BLACK}Full Name: Lantau Airport Railway Adtranz-CAF Train,{BLACK}全名：港铁机场铁路ADTranz-CAF列车,
 STR_NICKNAME_CAF_TRAIN,{BLACK}Nickname: A-Train,{BLACK}昵称：A-Train，马世军快乐车,
diff --git a/src/25kvloco/lok2000.pnml b/src/25kvloco/lok2000.pnml
@@ -89,7 +89,7 @@ item (FEAT_TRAINS, lok2000) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_5, string(STR_USEDLINE_KTT), string(STR_ELECTRICITY_SUPPLY), string(STR_RELDEC_MEDIUM, 16));
+        additional_text:                string(STR_DESC_5, string(STR_ELECTRIC_25KVAC),  string(STR_USEDLINE_KTT), string(STR_ELECTRICITY_SUPPLY), string(STR_RELDEC_MEDIUM, 16));
         cargo_subtype_text:             switch_lok2000_cargo_subtype;
         can_attach_wagon:               locowagon;
         // Graphics

diff --git a/src/25kvmu/mtr380a.pnml b/src/25kvmu/mtr380a.pnml
@@ -237,7 +237,7 @@ item (FEAT_TRAINS, mtr380a) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_8, string(STR_FULLNAME_MTR380A), string(STR_NICKNAME_MTR380A), string(STR_USEDLINE_XRL), string(STR_MTR_FIRST_CAN_ATTACH_WAGON), string(STR_MTR380A_CONSIST), string(STR_RELDEC_LOW, 12), string(STR_FIRST_HEAD_SEAT), string(STR_350_AVAILABLE));
+        additional_text:                string(STR_DESC_8, string(STR_ELECTRIC_25KVAC),  string(STR_FULLNAME_MTR380A), string(STR_NICKNAME_MTR380A), string(STR_USEDLINE_XRL), string(STR_MTR_FIRST_CAN_ATTACH_WAGON), string(STR_MTR380A_CONSIST), string(STR_RELDEC_LOW, 12), string(STR_FIRST_HEAD_SEAT), string(STR_350_AVAILABLE));
         can_attach_wagon:               muhead_with_first_class;
         start_stop:                     mu4to24car;
         cargo_subtype_text:             switch_crh380_cargo_subtype;

diff --git a/src/header.pnml b/src/header.pnml
@@ -3,8 +3,8 @@ grf {
     name:    string(STR_GRF_NAME);
     desc:    string(STR_DESC_4, string(STR_GRF_DESC), string(STR_GRF_DESC_README),string(STR_GRF_DESC_MTR));
     url:     string(STR_GRF_URL);
-    version: 20;
-    min_compatible_version: 7;
+    version: 21;
+    min_compatible_version: 20;
 
     param 0 {
         param_loading_speed {

diff --git a/src/vehicleid.pnml b/src/vehicleid.pnml
@@ -49,6 +49,6 @@ item (FEAT_TRAINS, caf_train_airport_express, 2240) {}
 item (FEAT_TRAINS, caf_train_tungchung, 2751) {}
 
 
-//Misc, available ID range: 2240-2751 (hex 0x0AC0..0x0CBF)
+//Misc, available ID range: 2752-3263 (hex 0x0AC0..0x0CBF)
 //define id_range_misc 0x0AC0..0x0CBF
-item (FEAT_TRAINS, yellowhead_mailroom, 2240) {}
+item (FEAT_TRAINS, yellowhead_mailroom, 2752) {}