Merge pull request #86 from JohnFranklin523/176-changelog-and-wagon-fix

Changelog, wagon fix, readme and language file optimisation

Makefile.dist

@@ -1,2 +1,2 @@
-REPO_REVISION       := 174
-REPO_VERSION_STRING := 0.3.3.174
+REPO_REVISION       := 176
+REPO_VERSION_STRING := 0.3.3.176

README-zh.md

@@ -19,17 +19,19 @@ READ IN [ENGLISH](./README.md) | CHINESE
 
 机车和动车组可以改装以更改参数或涂装。
 
-载具的默认涂装会按年份变化，也就是当到达一定时间后车厢将自动更新到下一个涂装。除此之外，也可以选择保留购买载具时的涂装，或手动指定涂装。
-
-如果提供了选项，机车参数可以与不同涂装同时选择。
+载具的默认涂装以购买年份为准，不会自动更新，但可以通过改装选项手动指定涂装。
 
 货车改装机制与原版 OpenTTD 中的车厢相同。大部分车厢的外观会根据所运载的货物而改变。
 
 可用参数名单：
 
 | 名称     | 功能       | 默认值 |
-|--------|------------|--------|
+|---------|------------|--------|
 | 装载速度 | 改变装载速度 | 普通   |
 | 购买费用 | 改变购买费用 | 25%    |
 | 运行费用 | 改变运行费用 | 25%    |
-| 保鲜度   | 改变保鲜度   | 标准   |
+| 货物贬值周期 | 改变货物贬值周期（保鲜度/舒适度） | 100%   |
+| 单独设置货车的货物贬值周期 | 单独设置邮件与货物车厢的货物贬值周期，在变量“货物贬值周期”上叠加计算 | 100%   |
+| 2014年后建造的25型客车车厢默认刷绿 | 决定2014年以后建造（购买）的25型客车车厢默认涂装是否为橄榄绿 |  是    |
+
+

README.md

@@ -27,18 +27,18 @@ graphics on major part of wagons.
 
 List of available parameters:
 
-| Name                                                               | Function                                                                                                                                                    | Default value |
-| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| Loading speed                                                      | Change wagon loading speed                                                                                                                                  | Normal        |
-| Purchase cost                                                      | Change purchase cost                                                                                                                                        | 25%           |
-| Running cost                                                       | Change running cost                                                                                                                                         | 25%           |
-| Cargo age period                                                   | Change the rate cargo gets aged                                                                                                                             | Standard      |
-| Cargo age period<br />for freight wagons                           | Change the rate cargo in mail and freight wagons<br />gets aged; independent from the parameter above                                                      | Standard      |
-| 25-Series coaches<br />built after 2014 <br />default to be green | Change whether the Type 25 Series Coaches<br />purchased after 2014 default to be olive green. <br />In reality, before 2014, they had different colours. | Yes           |
+| Name     | Function    | Default value |
+| ------------ | ------------ | ------------- |
+| Loading speed         | Change wagon loading speed                       | Normal        |
+| Purchase cost         | Change purchase cost                             | 25%           |
+| Running cost          | Change running cost                              | 25%           |
+| Cargo age period      | Change the rate cargo gets aged                  | Standard      |
+| Cargo age period for freight wagons | Change the rate cargo in mail and freight wagons gets aged; independent from the parameter above | Standard      |
+| 25-Series coaches built after 2014 default to be green | Change whether the Type 25 Series Coaches purchased after 2014 default to be olive green. In reality, before 2014, they had different colours. | Yes           |
 
 ## 2. Building
 
-The source is available on [GitHub](https://github.com/OpenTTD-China-Set/China-Set-Trains).These tools are required to build the GRF:
+The source is available on [GitHub](https://github.com/OpenTTD-China-Set/China-Set-Trains). These tools are required to build the GRF:
 
 - nml
 - make

changelog.md

@@ -5,6 +5,24 @@ China Set: Trains Changelog
 
 ## Initial-0-3 Updates
 
+0.3.3.176 (21/10/2024)
+--------------------
+Fix #55: wagon sprite errors
+
+0.3.3.175 (20/10/2024)
+--------------------
+Fix #54: RW25G sprites
+
+0.3.3.174 (19/10/2024)
+--------------------
+Fix #53: offset of sprites template
+Renew sprites of 22 Series, 25B Series
+Add Liveries: 25G Series, 25T Series, 25K Series (Gaozu Grenn, GMS, GYR, Xiaoyong)
+Allow wagons change colors
+Completed the CRH5 Sries:
+    - Refurbish and renewal the sprites of CRH5A
+    - Add: CRH5E
+
 0.3.2.173 (4/10/2024)
 ---------------------
 Fix #53: CR400AF-Z Sprite Errors

docs/changelog.txt

@@ -5,12 +5,20 @@ China Set: Trains Changelog
 
 ## Initial-0-3 Updates
 
-0.3.3.174(14/10/2024)
+0.3.3.176 (21/10/2024)
+--------------------
+Fix #55: wagon sprite errors
+
+0.3.3.175 (20/10/2024)
+--------------------
+Fix #54: RW25G sprites
+
+0.3.3.174 (19/10/2024)
 --------------------
 Fix #53: offset of sprites template
-Renewal the sprites of 22 Series, 25B Series
+Renew sprites of 22 Series, 25B Series
 Add Liveries: 25G Series, 25T Series, 25K Series (Gaozu Grenn, GMS, GYR, Xiaoyong)
-Allow Wagons change colors
+Allow wagons change colors
 Completed the CRH5 Sries:
     - Refurbish and renewal the sprites of CRH5A
     - Add: CRH5E

docs/readme.txt

@@ -26,9 +26,9 @@ graphics on major part of wagons.
 List of available parameters:
   Loading speed: change wagon loading speed; default to be Normal.
   Purchase cost: change purchase cost; default to be 25%.
-  Running cost: change running cost; default to be 25% 
-  Cargo age period: change the rate cargo gets aged; default to be Standard.
-  Cargo age period for freight wagons: change the rate cargo in mail and freight wagons gets aged; independent from the parameter above; default to be Standard.
+  Running cost: change running cost; default to be 25%.
+  Cargo age period: change the rate cargo gets aged; default to be 100%.
+  Cargo age period for freight wagons: change the rate cargo in mail and freight wagons gets aged; independent from the parameter above; default to be 100%.
   25-Series coaches built after 2014 default to be green: change whether the Type 25 Series Coaches purchased after 2014 default to be olive green. In reality, before 2014, they had different colours. Default to be Yes.
 
 ## 2. Building

docs/str.CSV

@@ -2,10 +2,10 @@
 STR_GRF_NAME,China Set: Trains {VERSION_STRING},中国包：火车 {VERSION_STRING}
 STR_GRF_DESC,The Train sector of the China Set of OpenTTD.,OpenTTD中国包的火车部分。
 STR_GRF_URL,https://www.tt-forums.net/viewtopic.php?t=91092,
-STR_GRF_DESC_EXTRA," Locomotives, MUs, Coaches and Wagons in China Mainland. More contents in the future.",中国大陆的火车，包括机车、动车组、车厢。未来会有更多内容。{RED}在游戏中更新NewGRF时请注意最低兼容版本！请不要强行更新！
+STR_GRF_DESC_EXTRA,"Locomotives, MUs, Coaches and Wagons in China Mainland. More contents in the future.",中国大陆的火车，包括机车、动车组、车厢。未来会有更多内容。{RED}在游戏中更新NewGRF时请注意最低兼容版本！请不要强行更新！
 STR_GRF_DESC_README,See readme for details.,更多信息请查看Readme。
 STR_LEAPING_LIU_NEVER_DIES,{BLUE}Leaping Liu Never Dies.,{BLUE}跨越不死，曙光永生
-STR_PARAM_LOADING_SPEED,Loading Speed,装载速度
+STR_PARAM_LOADING_SPEED,Loading speed,装载速度
 STR_PARAM_LOADING_SPEED_DESC,Adjust vehicle loading speed. Default is 100%.,调整车辆装载速度。默认为100%。
 STR_PARAM_PURCHASE_COST,Purchase costs,购买费用
 STR_PARAM_PURCHASE_COST_DESC,Adjust vehicle purchase costs. Default is 25%.,调整车辆购买费用。默认为25%。
@@ -20,17 +20,13 @@ STR_PARAM_TIMES_2,200%,
 STR_PARAM_TIMES_4,400%,
 STR_PARAM_TIMES_8,800%,
 STR_PARAM_TIMES_16,1600%,
-STR_PARAM_DEFAULT,Default,默认
-STR_PARAM_CARGO_DECAY,Cargo Age Period,货物贬值周期
-STR_PARAM_CARGO_DECAY_DESC,"Adjust cargo age period of coaches and wagons. ""Long"" is ""Standard"" doubled, while ""Very Long"" is ""Long"" doubled. Even in ""Standard"" mode, cargo age period varies.",调整车厢的货物贬值周期。“较长”为“标准”的两倍，“很长”是“较长”的两倍。即使在“标准”设置下，货物贬值周期也随车厢种类而变化。
-STR_PARAM_STANDARD,Standard,标准
-STR_PARAM_LONG,Long,较长
-STR_PARAM_VERY_LONG,Very Long,很长
-STR_PARAM_GAOZULV,"Type 25 Passenger Coaches built after 2014 are {DKGREEN}""Gaozu Geeen""{BLACK} in default",2014年后建造的25型客车默认刷{DKGREEN}绿
-STR_PARAM_GAOZULV_DESC,"Choose whether to print{DKGREEN} Canarium Green (also called ""Gaozu Geeen""){BLACK} to Type 25 Passenger Coaches built after 2014 in default",决定2014年后建造的25型客车是否默认刷{DKGREEN}绿
-STR_PARAM_WAGON_CARGO_DECAY,Set Cargo Age Period of Wagons Individually,单独设置货车的货物贬值周期
-STR_PARAM_WAGON_CARGO_DECAY_DESC,"Set cargo age period of mail and freight wagons individually, and multiplied by ""Cargo Age Period"" again. It makes very-long-distance transport of frieght possible.","单独设置邮件车和货车的货物贬值周期，在选项""货物贬值周期""上叠加计算。这个选项使超长途货物运输成为可能"
-STR_USED_WITH_DYNAMIC_ENGINES,"This GRF needs dynamic_engines to be turned on. Open console, and type ""setting dynamic_engines 1"".","请切换至控制台模式, 键入 ""setting dynamic_engines 1"", 否则您无法游玩中国包."
+STR_PARAM_CARGO_DECAY,Cargo age period,货物贬值周期
+STR_PARAM_CARGO_DECAY_DESC,"Adjust cargo age period (the ability of keeping freshness of cargo and comfort for passengers) of coaches and wagons. Default is 100%. Cargo age period varies, so that a passenger would usually pay more for their long journey in a soft sleeper coach than in a hard seat coach.",调整车厢的货物贬值周期（旅客舒适度/货物保鲜度）。默认为100%。货物贬值周期随车厢种类而有不同；长途乘客使用软卧时一般会较使用硬座时付更多的钱。
+STR_PARAM_GAOZULV,"Type 25 Passenger Coaches built after 2014 are {DKGREEN}""Gaozu Green""{BLACK} by default",2014年后建造的25型客车默认刷{DKGREEN}绿
+STR_PARAM_GAOZULV_DESC,"Choose whether to print{DKGREEN} Canarium Green (also called ""Gaozu Green""){BLACK} to Type 25 Passenger Coaches built after 2014 by default",决定2014年后建造的25型客车是否默认刷{DKGREEN}绿
+STR_PARAM_WAGON_CARGO_DECAY,Cargo age period of mail and freight wagons,单独设置货车的货物贬值周期
+STR_PARAM_WAGON_CARGO_DECAY_DESC,"Set cargo age period of mail and freight wagons individually, multiplied by ""Cargo Age Period"" again. It makes very-long-distance transport of freight possible.","单独设置邮件车和货车的货物贬值周期，在选项""货物贬值周期""上叠加计算。这个选项使超长途货物运输成为可能"
+STR_USED_WITH_DYNAMIC_ENGINES,"This GRF needs dynamic_engines to be turned on. Open console, and type ""set dynamic_engines 1"".","请切换至控制台模式，键入 ""set dynamic_engines 1""， 否则您无法游玩中国包。"
 # Name,,
 STR_NAME_YZ1,YZ1 (Passenger Coach),YZ1 (客车)
 STR_NAME_YZ21,YZ21 (Passenger Coach),YZ21 (客车)

src/header.pnml

@@ -73,9 +73,9 @@ grf {
             max_value: 2;
             def_value: 0;
             names: {
-                0: string(STR_PARAM_STANDARD);
-                1: string(STR_PARAM_LONG);
-                2: string(STR_PARAM_VERY_LONG);
+                0: string(STR_PARAM_NORMAL);
+                1: string(STR_PARAM_TIMES_2);
+                2: string(STR_PARAM_TIMES_4);
             };
         }
     }
@@ -88,9 +88,9 @@ grf {
             max_value: 2;
             def_value: 0;
             names: {
-                0: string(STR_PARAM_DEFAULT);
-                1: string(STR_PARAM_LONG);
-                2: string(STR_PARAM_VERY_LONG);
+                0: string(STR_PARAM_NORMAL);
+                1: string(STR_PARAM_TIMES_2);
+                2: string(STR_PARAM_TIMES_4);
             };
 		}
 	}

src/wagons/g17.pnml

@@ -29,7 +29,7 @@ spriteset (spriteset_g17_yellow, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {
 random_switch (FEAT_TRAINS, SELF, random_g17_colour) {
     1: spriteset_g17_grey;
     1: spriteset_g17_red;
-    1: spriteset_g17_red;
+    1: spriteset_g17_yellow;
 }
 switch (FEAT_TRAINS, SELF, switch_g17_cargo_subtype, cargo_subtype) {
     0: return string(STR_RANDOM_COLOR);
@@ -41,8 +41,8 @@ switch (FEAT_TRAINS, SELF, switch_g17_cargo_subtype, cargo_subtype) {
 switch (FEAT_TRAINS, SELF, switch_gl7_graphics_subtype, cargo_subtype) {
     0: random_g17_colour;
     1: spriteset_g17_grey;
-    2: spriteset_yz25g_green;
-    3: spriteset_yz25g_jinwen;
+    2: spriteset_g17_red;
+    3: spriteset_g17_yellow;
 
 }
 

src/wagons/g60.pnml

@@ -61,7 +61,7 @@ switch (FEAT_TRAINS, SELF, switch_g60_articulated_part, extra_callback_info1) {
 }
 
 switch (FEAT_TRAINS, SELF, switch_g60_graphics, position_in_articulated_veh % 3) {
-    1: switch_g60_cargo_subtype;
+    1: switch_g60_graphics_subtype;
     empty_sprites;
 }
 

src/wagons/g70.pnml

@@ -49,7 +49,7 @@ switch (FEAT_TRAINS, SELF, switch_g70_articulated_part, extra_callback_info1) {
 }
 
 switch (FEAT_TRAINS, SELF, switch_g70_graphics, position_in_articulated_veh % 3) {
-    1: switch_g70_cargo_subtype;
+    1: switch_g70_graphics_subtype;
     empty_sprites;
 }
 

src/wagons/gn70.pnml

@@ -42,7 +42,7 @@ switch (FEAT_TRAINS, SELF, switch_gn70_articulated_part, extra_callback_info1) {
 }
 
 switch (FEAT_TRAINS, SELF, switch_gn70_graphics, position_in_articulated_veh % 3) {
-    1: switch_gn70_cargo_subtype;
+    1: switch_gn70_graphics_subtype;
     empty_sprites;
 }
 

src/wagons/gn80.pnml

@@ -36,7 +36,7 @@ switch (FEAT_TRAINS, SELF, switch_gn80_articulated_part, extra_callback_info1) {
 }
 
 switch (FEAT_TRAINS, SELF, switch_gn80_graphics, position_in_articulated_veh % 3) {
-    1: random_gn80_colour;
+    1: switch_gn80_graphics_subtype;
     empty_sprites;
 }
 

src/wagons/jsq1.pnml

@@ -180,10 +180,10 @@ switch (FEAT_TRAINS, SELF, switch_jsq1_full_color, cargo_subtype) {
 }
 
 
-switch (FEAT_TRAINS, SELF, switch_jsq1_original, cargo_count < 2) {
-    0..2: random_jsq1_empty;
-    3..10: random_jsq1_half;
-    random_jsq1_full;
+switch (FEAT_TRAINS, SELF, switch_jsq1_colour, cargo_count) {
+    0..2: switch_jsq1_empty_color;
+    3..10: switch_jsq1_half_color;
+    switch_jsq1_full_color;
 }
 
 switch (FEAT_TRAINS, SELF, switch_jsq1_cargo_subtype, cargo_subtype) {
@@ -194,10 +194,8 @@ switch (FEAT_TRAINS, SELF, switch_jsq1_cargo_subtype, cargo_subtype) {
 }
 
 
-
-
 switch (FEAT_TRAINS, SELF, switch_jsq1_graphics, position_in_articulated_veh % 3) {
-    1: switch_jsq1_original;
+    1: switch_jsq1_colour;
     empty_sprites;
 }
 

src/wagons/p50.pnml

@@ -66,7 +66,7 @@ switch (FEAT_TRAINS, SELF, switch_p50_graphics_subtype, cargo_subtype) {
     1: spriteset_p50_black;
     2: spriteset_p50_brown;
     3: spriteset_p50_rustyred;
-    1: spriteset_p50_rescue;
+    4: spriteset_p50_rescue;
 }
 
 switch (FEAT_TRAINS, SELF, switch_p50_graphics, position_in_articulated_veh % 3) {