From db2e96062339d64842a98b88501035897f18eb3d Mon Sep 17 00:00:00 2001
From: BabeL <tongtianta4444@gmail.com>
Date: Tue, 1 Oct 2024 12:41:45 +0800
Subject: [PATCH 1/4] add new liveries of 25k

---
 src/coaches/25k/ca25k.pnml | 6 +++---
 src/coaches/25k/kd25k.pnml | 4 ++--
 src/coaches/25k/rw25k.pnml | 6 +++---
 src/coaches/25k/xl25k.pnml | 6 +++---
 src/coaches/25k/yw25k.pnml | 6 +++---
 src/coaches/25k/yz25k.pnml | 6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/coaches/25k/ca25k.pnml b/src/coaches/25k/ca25k.pnml
index 7989b490..7b6b9596 100644
--- a/src/coaches/25k/ca25k.pnml
+++ b/src/coaches/25k/ca25k.pnml
@@ -33,7 +33,7 @@ switch (FEAT_TRAINS, SELF, switch_ca25k_cargo_subtype, cargo_subtype) {
     1: return string(STR_ORIGINAL);
     /* 2: string(STR_GAOZU_GREEN); */
     2: return string(STR_GMSR);
-/*     3: return string(STR_GUANGSHEN); */
+    3: return string(STR_GUANGSHEN);
     return CB_RESULT_NO_TEXT;
 }
 
@@ -51,7 +51,7 @@ switch (FEAT_TRAINS, SELF, switch_ca25k_graphics_subtype, cargo_subtype) {
     1: spriteset_ca25k_original;
 /*     2: ; */
     2: spriteset_ca25k_gmsr;
-/*     3: spriteset_ca25k_guangshen; */
+    3: spriteset_ca25k_guangshen;
 }
 
 switch (FEAT_TRAINS, SELF, switch_ca25k_graphics, position_in_articulated_veh % 3) {
@@ -105,7 +105,7 @@ item (FEAT_TRAINS, ca25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_4, string(STR_FULL_NAME_CA25K), string(STR_CAFE_EFFECT),  string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_MEDIUM, 200));
+        additional_text:                string(STR_DESC_4, string(STR_FULL_NAME_CA25K), string(STR_CAFE_EFFECT),  string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_MEDIUM, 200));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_ca25k_cargo_subtype;
 
diff --git a/src/coaches/25k/kd25k.pnml b/src/coaches/25k/kd25k.pnml
index 043d4c44..ec985b48 100644
--- a/src/coaches/25k/kd25k.pnml
+++ b/src/coaches/25k/kd25k.pnml
@@ -55,7 +55,7 @@ switch (FEAT_TRAINS, SELF, switch_kd25k_graphics_subtype, cargo_subtype) {
     1: spriteset_kd25k_original;
 /*     2: ; */
     2: spriteset_kd25k_gmsr;
-/*     3: spriteset_kd25k_guangshen; */
+    3: spriteset_kd25k_guangshen;
     3: spriteset_kd25k_luchaogang;
     4: spriteset_kd25k_xian;
 }
@@ -104,7 +104,7 @@ item (FEAT_TRAINS, kd25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_KD25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN)*/, string(STR_GMSR)/* , string(STR_GUANGSHEN) */, string(STR_LUCHAOGANG), string(STR_XIAN)), string(STR_AIR_CONDITIONER_EFFECT));
+        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_KD25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN)*/, string(STR_GMSR), string(STR_GUANGSHEN), string(STR_LUCHAOGANG), string(STR_XIAN)), string(STR_AIR_CONDITIONER_EFFECT));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_kd25k_cargo_subtype;
 
diff --git a/src/coaches/25k/rw25k.pnml b/src/coaches/25k/rw25k.pnml
index 7f6bc9c3..ecf8ea3c 100644
--- a/src/coaches/25k/rw25k.pnml
+++ b/src/coaches/25k/rw25k.pnml
@@ -34,7 +34,7 @@ switch (FEAT_TRAINS, SELF, switch_rw25k_cargo_subtype, cargo_subtype) {
     1: return string(STR_ORIGINAL);
     /* 2: string(STR_GAOZU_GREEN); */
     2: return string(STR_GMSR);
-/*     3: return string(STR_GUANGSHEN); */
+    3: return string(STR_GUANGSHEN);
     return CB_RESULT_NO_TEXT;
 }
 
@@ -52,7 +52,7 @@ switch (FEAT_TRAINS, SELF, switch_rw25k_graphics_subtype, cargo_subtype) {
     1: spriteset_rw25k_original;
 /*     2: ; */
     2: spriteset_rw25k_gmsr;
-/*     3: spriteset_rw25k_guangshen; */
+    3: spriteset_rw25k_guangshen;
 }
 
 switch (FEAT_TRAINS, SELF, switch_rw25k_graphics, position_in_articulated_veh % 3) {
@@ -105,7 +105,7 @@ item (FEAT_TRAINS, rw25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_RW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_HIGH, 384));
+        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_RW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_HIGH, 384));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_rw25k_cargo_subtype;
 
diff --git a/src/coaches/25k/xl25k.pnml b/src/coaches/25k/xl25k.pnml
index 26c184b2..6182e79f 100644
--- a/src/coaches/25k/xl25k.pnml
+++ b/src/coaches/25k/xl25k.pnml
@@ -33,7 +33,7 @@ switch (FEAT_TRAINS, SELF, switch_xl25k_cargo_subtype, cargo_subtype) {
     1: return string(STR_ORIGINAL);
 /*     2: string(STR_GAOZU_GREEN); */
     2: return string(STR_GMSR);
-/*     3: return string(STR_GUANGSHEN); */
+    3: return string(STR_GUANGSHEN);
     return CB_RESULT_NO_TEXT;
 }
 
@@ -51,7 +51,7 @@ switch (FEAT_TRAINS, SELF, switch_xl25k_graphics_subtype, cargo_subtype) {
     1: spriteset_xl25k_original;
 /*     2: ; */
     2: spriteset_xl25k_gmsr;
-/*     3: spriteset_xl25k_guangshen; */
+    3: spriteset_xl25k_guangshen;
 }
 
 switch (FEAT_TRAINS, SELF, switch_xl25k_graphics, position_in_articulated_veh % 3) {
@@ -104,7 +104,7 @@ item (FEAT_TRAINS, xl25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_XL25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_FRESHNESS_MEDIUM, 200));
+        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_XL25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_FRESHNESS_MEDIUM, 200));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_xl25k_cargo_subtype;
 
diff --git a/src/coaches/25k/yw25k.pnml b/src/coaches/25k/yw25k.pnml
index 93f713d4..d45fbdc9 100644
--- a/src/coaches/25k/yw25k.pnml
+++ b/src/coaches/25k/yw25k.pnml
@@ -36,7 +36,7 @@ switch (FEAT_TRAINS, SELF, switch_yw25k_cargo_subtype, cargo_subtype) {
     1: return string(STR_ORIGINAL);
     /* 2: string(STR_GAOZU_GREEN); */
     2: return string(STR_GMSR);
-/*     3: return string(STR_GUANGSHEN); */
+    3: return string(STR_GUANGSHEN);
     return CB_RESULT_NO_TEXT;
 }
 
@@ -54,7 +54,7 @@ switch (FEAT_TRAINS, SELF, switch_yw25k_graphics_subtype, cargo_subtype) {
     1: spriteset_yw25k_original;
 /*     2: ; */
     2: spriteset_yw25k_gmsr;
-/*     3: spriteset_yw25k_guangshen; */
+    3: spriteset_yw25k_guangshen;
 }
 
 switch (FEAT_TRAINS, SELF, switch_yw25k_graphics, position_in_articulated_veh % 3) {
@@ -109,7 +109,7 @@ item (FEAT_TRAINS, yw25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_YW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_HIGH, 288));
+        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_YW25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_HIGH, 288));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_yw25k_cargo_subtype;
 
diff --git a/src/coaches/25k/yz25k.pnml b/src/coaches/25k/yz25k.pnml
index ecbb0a3d..f9552df9 100644
--- a/src/coaches/25k/yz25k.pnml
+++ b/src/coaches/25k/yz25k.pnml
@@ -32,7 +32,7 @@ switch (FEAT_TRAINS, SELF, switch_yz25k_cargo_subtype, cargo_subtype) {
     1: return string(STR_ORIGINAL);
 /*     2: string(STR_GAOZU_GREEN); */
     2: return string(STR_GMSR);
-/*     3: return string(STR_GUANGSHEN); */
+    3: return string(STR_GUANGSHEN);
     return CB_RESULT_NO_TEXT;
 }
 
@@ -50,7 +50,7 @@ switch (FEAT_TRAINS, SELF, switch_yz25k_graphics_subtype, cargo_subtype) {
     1: spriteset_yz25k_original;
 /*     2: ; */
     2: spriteset_yz25k_gmsr;
-/*     3: spriteset_yz25k_guangshen; */
+    3: spriteset_yz25k_guangshen;
 }
 
 switch (FEAT_TRAINS, SELF, switch_yz25k_graphics, position_in_articulated_veh % 3) {
@@ -102,7 +102,7 @@ item (FEAT_TRAINS, yz25k) {
     }
     graphics {
         // Menu
-        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_YZ25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR)/* , string(STR_GUANGSHEN) */), string(STR_COMFORT_LOW, 160));
+        additional_text:                string(STR_DESC_3, string(STR_FULL_NAME_YZ25K), string(STR_LV_AVAILABLE_L ,string(STR_LIVERY_AVALIABLE), string(STR_ORIGINAL)/* , string(STR_GAOZU_GREEN) */, string(STR_GMSR), string(STR_GUANGSHEN)), string(STR_COMFORT_LOW, 160));
         can_attach_wagon:               locowagon;
         cargo_subtype_text:             switch_yz25k_cargo_subtype;
 

From 284e2a282018a4606229be50efad0dac1cd28a5e Mon Sep 17 00:00:00 2001
From: BabeL <tongtianta4444@gmail.com>
Date: Tue, 1 Oct 2024 14:14:44 +0800
Subject: [PATCH 2/4] fix sprites of kd25k

---
 src/coaches/25k/kd25k.pnml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coaches/25k/kd25k.pnml b/src/coaches/25k/kd25k.pnml
index ec985b48..1c7cfc09 100644
--- a/src/coaches/25k/kd25k.pnml
+++ b/src/coaches/25k/kd25k.pnml
@@ -56,8 +56,8 @@ switch (FEAT_TRAINS, SELF, switch_kd25k_graphics_subtype, cargo_subtype) {
 /*     2: ; */
     2: spriteset_kd25k_gmsr;
     3: spriteset_kd25k_guangshen;
-    3: spriteset_kd25k_luchaogang;
-    4: spriteset_kd25k_xian;
+    4: spriteset_kd25k_luchaogang;
+    5: spriteset_kd25k_xian;
 }
 
 switch (FEAT_TRAINS, SELF, switch_kd25k_graphics, position_in_articulated_veh % 3) {

From aaeed7ca8f83b2d6400a594368a7e28585eb6092 Mon Sep 17 00:00:00 2001
From: BabeL <tongtianta4444@gmail.com>
Date: Tue, 1 Oct 2024 14:39:38 +0800
Subject: [PATCH 3/4] fix sprite of extra locomotive

---
 gfx/25-electric/extra/hxd1d-1898.vox | Bin 855809 -> 857073 bytes
 gfx/25-electric/extra/hxd3d-1886.vox | Bin 800702 -> 802546 bytes
 gfx/25-electric/extra/hxd3d-1893.vox | Bin 800665 -> 802497 bytes
 gfx/25-electric/extra/hxd3d-1921.vox | Bin 800954 -> 803066 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gfx/25-electric/extra/hxd1d-1898.vox b/gfx/25-electric/extra/hxd1d-1898.vox
index 1e83852a167848ba9d12dfaa8b91e800ff5f7bf2..6c56d180759d387398d8594c86314a32cd1a39a3 100644
GIT binary patch
delta 2868
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

delta 1581
zcmXBT4@_HC6vy%Yd3~>9hn+IhESRB^1(9f%)!B8OR_sDqy3u6~DI02aEaGfj7f~^3
zbi}HSVG#{RX6me39dl$>N4ZSVpo4%*V=zP0DT~#hG6mC37SS||_lqR=(_hay@8p%&
zUOejPI^u9OH-)MubvoU)dm6XP7u`bn3f<1eU0W=?k$<D|)XL+NC)Bd5vGw@>o$qS9
zTv?a?_q?b%r*Acg?jQ7FgD9RS2MXljpUJjg$g$tZg$rcwJh}f*G+)HXU;2<iOkT#C
zB`S%3^>Meb-f3u)*KRbl8^ru34Bds39_o&JF}Vd5pFwVpY{e-*6=xHscTlke$(_wu
z2pO!K#o}w^a3AL0K*yU*Cf||{y+ffry}aywvhx@@bsUuwR3aJj^v7g(7SqCz@rqE1
z8yvfWcD+%WG@@C>4l@?Y(7(bcuNu4tE3Y+%8^pmD>hrrXbU%)T(Y}Y7zP-|+c4GTJ
zoQj}xKc)_#xx?5~FOoxCWIjbD`YGl=L(eGoe~H#{?3}>DSLn-O=4-TlgYmP*SiMlL
zSLC*+4QE!P?*<%PqsW=cn=oFD^J_793y$83b+=)k9hLPMxkE|bEi6wc@)<{;Qslod
z|1^4H*#8V#yRh>)EIg0C1ZG}B+aWyoGS0rj9&fKQ<(BtM?mUb6Z_$~@<o8S}=P~jl
zPXC1NSxo<mmJ1mDgZZfiv=_1G5*8Pgm`g-&H_=^(b_e!sz@ifan@n=U@Mf&?V4@z2
z-sNrsW*X7z$LMyP3ZQ+bsmCS84w0*SF#ame_M-Q7Odn>OC5atJa3+P`cbB{Gq0*0S
zAK=&kR)2``k4*A+RXAy~xkPEf6qL`Xhy#~Uxs0uUGc)oJR+cb!MVg&aWz%8AZWGRG
z=q|%viyAP9xpH)`R0lVT#jVu++c4dPr5zXys&eIEGgh=<$8Mayk8WKU;}79X8#*4w
z?nl^McoZFvVIr!|Z4eztRlod*$FO1m+fLwMh8fFAY|G+^z=}_nXGWH1K1byX44%gH
zxayM+Y69J7Fp*Ouj_i^qn?57<nQ%@+XPG8fc3U)ggLCERU5Tmdu(XP9z=rA7xKxS$
zHJG{)7jI^dcP;kT;B2i{SSKc1HLv`BJb<AGHF+cHJy_g}?siP<!|4cC?Z?Og9DW>?
zCo#~e<yBGlESqCpT0#-#7qt2HV(Ao{JtJC971q;q!{eBlkPe-Zyco!7@|fkhN}e)#
Mt`>ou<?V+50JTsf-v9sr

diff --git a/gfx/25-electric/extra/hxd3d-1886.vox b/gfx/25-electric/extra/hxd3d-1886.vox
index 140b380ab2beaa7d19b97ebdb925427bee35bdfe..4498880a38a4c15ad3aee47173e8200d2420a08d 100644
GIT binary patch
delta 3978
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
bz3Qo#t4h-m8HjO+OvHFZ7FCsIFZ$~LsKi=n

delta 2051
zcmW;N0Z@}=9LI6Cy$HtaI1f+Gb_!{>%XuxEfwl??3knf))-){6=83h6YMt0E!+Nt-
zR68C#$=l^RS8;~tkm0*atmRSdiWCxUXLxenuJA&gh>D5S^Bs4;4?q6=_rA}#_r~Z=
z>vtEeOP^ZdEQn`hWGpYOsFL3@_7)j4R#mKBX5<I?6_c^bl*>5RtgXl&$dN50BlAkf
z(htKT9#%zlhbj^>wFd&todFS)DTxHcP(&4VU8+cRshtf6Z8JsqH&qlLRYgpu{Fo~G
zWSo7f7?P>$my7)Y;r~4#tj7bQPo{oA72`6ECsdJrQWbug{6AC?lrbmN&Tyh+M(5c1
zI=!e(HHnl=<0VxXM|~n7W4Y`T-7=M9J~1fczTy)TGEG;5!gehv24&Rops-w*doq>(
z$~_tP4Y?=NG~pAbn?BJlQ#|Pxy^~FyHUE{EwBT*JTD_*s*2NXA?{;0CUMsmnSFhKi
zchb#w(SsJc@ot?<uQl9*$$PQ-KIXAvwBC=w2Qaq;y$|DX89E+gKUP7vR${OUb628w
z6%MaPhg0V>X+s`*<z}5*uXS%hix&f1(YOu0@8ZaNSmVRK53%fHjDE_=t<Bihf(1LV
z^)t*3pzm{>2x9#nOn%909c|dN7j646v>)>hpc=ukgSvt_TK-ASsV35sQ|LO417~y|
zdH%B)PcpIpO^=?_HR!eC5$+YfK(}7P@MR|EtMs;Udch5P@TRoOq?ff-ua{$Ere0n~
z&C+v(spvA|z^!`!e64OVza1(<=ThvmWBEfED@A)5Mju661%{vC`qnB8SEu``bYG1Y
zC$_D{dFwFv9Iwh>kA4?sZ^Xt;IR2tOI$w)4b6WEbCc&MUzYF~V%-)TSU*Py2^n8V>
zHm+a)4W{;`dpO+>pt}o)H8yL%#Y8t&e~<AWu%rj0Kk0`RE%d9tuTX0^&m?t`^SDOo
zgJbBphP~IZYy!I{(WWy<!v?fWF~~c%XQL%2-KV8{F1Ag_c{A7y%*4D|*knRw4tfi5
zY_36`XUJ?ADAb~lGqEl=$n%6&&`nQbivx{Mqq+tso<YyEn5sqh^W1S{1G?+d{e^UY
z35Q=n*K2GJdeE^Md$(Yj7rVEjZ5!t)*lvgxYJ*=J<Re_Z7bEQk`7F)bk1ZXjM9^~(
zlTmaW!uVmd$9NZ!BWU?C{f>S{(=X`nMdcWqo_<UoN5@I*Nucdd44pQVWoaWxL(HUw
zb&8x6D2hB!(-a)fW>S}fiD_7#i_z(5o`J11(Kt(ycT`O{F&jOFI5HPq^KsCO)eG2<
zEkvsogNrbCF*X)qYKbCGRa~mHnzVs+iu?ex*J5Zr8aJS4BMxrDGB>urjCrr3_jMe8
zgLmO<!1$Y3{1&#ojrs4OPsOqA?ALsNJs+Xv6KwJ0L^HZ}VDC<}?ZQ9+mEB5Wx;E57
zFOMkmvb6d`iu`CFILyQz!_X1MKUFL4r3a6qv7h^TkK@P*tVv++DYT!)_A{7&mi@*g
z4*$iKE6-v0AI!VJ+?&GWs3QNFgs*Xi#H7-0(V7-y*2ur-!c4j8v|?-#nir$L2*;M7
r)1K*+Pt=2$TZ-;SFup7^k@J3NWv0v&nJk%XnW-|jXrYxkRp<W)Bv&2x

diff --git a/gfx/25-electric/extra/hxd3d-1893.vox b/gfx/25-electric/extra/hxd3d-1893.vox
index cb30fe9a980e040312ab855255e00e3776cb7cf8..ea543766f5645b966ad9c2885dc18e2bd18f3df9 100644
GIT binary patch
delta 4256
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
P-w6DCvT(3$(yjjou13Y~

delta 2344
zcmW;N4{)1v9LMn{d7iDSvU0&zwdKgR+LdJ|rrWyH?J{eLEpD-^DT*K?D1y2bF~3<x
z&G_YZ9dUY7bmS_#rhSSY-3f~Qsma!IMMqGs>_)bATR6Y>)4T60pM0P1lixSjq}~0m
zYx@z`qBX1P90LUf1=lUDU8x=lHeOj=u)22b@?xH-pMF&?RW+*WZd_ZN`{oRl3JUVM
zU5ko3Wld*9?&%a={`U$kvLP9f*`$!6U7{<utJflvU9Hlaip%ko=n8kMiAYaGYKG`)
zF?!FHHG9>)dxiAx6LM5laDP-z>=!aJC}i>1LdL$1O6P&NOsfif(<X~Eahb?OW#vI3
z`wvE??~stghoUktB)Z0jT+^lFXjCSS3hDk^$Uaq`e}o)VRhNs(Y)<WUOdW7cNO8PP
zmY;~rJtx{^<3wEAPYM}VRenmy<f*8vIxS>cl{YWCGWn##h+b%Euo~ktEdi_HzX<!B
zmXOtO%^|m5VrjG*B^BhR%Pc{wG3FxsE+_Y2K`yVvt&3ErX9+QQ6&Ht>lB+%B<kjS9
zwPbNEdHg!``z$51jo_p7Gff=pS&ykF&>6wl2GllUcoSwfqrU~yThRRywo9~cL(z)4
zS1|AzW?o0n4otP9^KFdnL@j~gPK#rv(Ylv?v_Z3T0J9nN4`KRSbdO;B50<diC_9X?
zpXq47lAFgc_XnN8pX8Av=>MBeI!CTLK~9_`JM$R-5A7DK>I<7y<-AS~72-${de6kZ
zsn%erQ9jqIemU_9ChhaEWj<<dY+iu5N(?Q=>=LZ6#>_JGF2{it)+Vb_a}5r7&AiIY
z*Q3YJOy3%G--wBu(0L2S8_<3Sw%mzY5S#D8T*w+NH6okXGq;&es0FiIu>K{?Nc3*Q
zbSqZ9imBJo)y59V9q4+~%x|0d9Wy7){GOS2nK^}t9`1F%kMR%D{t>qHqxK0le~P)!
zG4v&SPGs3L^c$V*?^r*MnZM9`6x07;)p1NsV8v-{|5w@Vu&Kk_tmx3qJlV`eW-d1K
zRE(c(Q#aY|*m53f)3Nyi%w32f2WBtA`dOHnV^eE3EVHRKGafqL6_~EYDlev1V#W2?
zz8cHcV5|;{Z$fc1=5J+_=G!qJF!SAJUdPpN2*>Zoz=JsQF!~?GJx%CYk9|*|JA#P~
z=-g<Flo}nc+tk;{zQd+Iu%aDvZ((33X5K|lC#I6<?7~<#YP}f#0LS`xzYQPb@NV>_
zao{to`huCnS6H?WTLv+I07D0HWC*?AVc!T={D|?xwuaK4JZpyjQ;qHsjX4|k=~z*S
z@ggif6Pu^v_}N%*$35p^^>j^b(|ZBBW?+W{9T#J47BgBohUa3o0{!zaJs;g}Y+r!(
zg(wzdZi!Z1YE;%~>JMhyS}m;^!CT3Lw_#<#?B9ij>#*@&9KH{$8?oadv_GQ0nud4`
zbB|-788c5}_0#6$Gg$I0HbrstIjngBlP}`5moXA!lbY>j|5Yt}j?vnw)mx2;q~@G#
zIC|+vKVZi9F}Zg)I?{B;2FSjz%>G_<4zfe+0BQ#@JcQYA(KljF{(z3d<}3U{_KlhS
zKj=h`kjIX4ddW$0(`hYrj^R2>S6gi@(aR<q$@6v9pH`}erWnzS>5t9AnsV%ztE>Nn
zC6{8;JRF^mHE#3j0xVpJ!Nq!DiZSRRyH@Dx#JZKda=%ZnQ=h`sO6{ZB(>^uAH|UY`
zjfoJ0br0yG#29^wT)hF?gtBK7v0*dzKaY+r7}<)WFLP7y4f4R7desc0Fs-Mi8~xww
ve)Ud9vGFGy$fDynb+vnVl8P?dB%gJY&?l*ytg2Ae6jep4&M<^tykz13B_DID

diff --git a/gfx/25-electric/extra/hxd3d-1921.vox b/gfx/25-electric/extra/hxd3d-1921.vox
index 63711891450dbbc5183cdd2a669fe235d5d86838..16cafc6a478967828912fe1dacfb5962a1dc2337 100644
GIT binary patch
delta 4637
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
W6Uw<pa#e7R;;Q8GO7jHYc<cYeTSr#_

delta 2375
zcmW;M0dSjR9LMn{dEYgg92wziiWi;LuE?w=wvHesB_^y~Or0PIil9ePmJz%xBRoZp
zAgHNRldW0b+|((89A-7y)}10K3wm^0H?ehizIyln^w;0}ywCfjmt^nqIqP>g=U;YF
zKr2*LRb6;i^J4j{YL&}YwWN9Jxi<cgKZA0da=dZ^moII0Y(7Aysw&U!HS?#f7QWR{
zQIymAjxNUJbY^s6TceBQ8ojS>t!C=;_BEPBG@BH)>tdouPGi3=@^V@Xy>HYg94fLK
zqN3@`sK|dQ%Z<7imD4_?3*{?abji^+=_0c!C0f2ti%B`@Vp@1N$3$_nE<#&$F(D_m
zRTqw7y{~)NeYhy^kQ?lbipiZZq3?<b$Am7r<uvY=PnP4~ql?m>m}vVeEgY4!7?2bC
zJ1wkx<+=C9MBP4JWaW4!by1WP+^_eI?aygO&rznJ*{~ghk>gAuvoSo=)Mhq(_2k@a
zQ^agIPc((iM*3v5pMudw9G{25({X44y3fFj8?|#VajvxAON^Y4BR=$A#P*qsO^)M@
z!re5D_hPz}hufE7Y&ljQ;s}vPu&iTn1rD!7Ujhf8W~K8POh1SA=P{PT%1f+?yn^M|
zFt`ebd(ih54!+GwXU0@_v=P|IN%CKzvq+!bg7$3~{RYRs#ZbxAZZ=9knmXj3KeJD9
zJK6smePN8I=}&TY2R2M_S85Nr=5MmTkF5M7T^BWXnENeec~844qcL7>mMenOaL9)4
zgD^AQ+&06|8d%wN5?be&<u1{=SUD9VE*zVW;f3s0J`+P{W66W9=W(^zj6NUc7h}`K
zm|cPmmtl7RwJR`nCDsJlA$bituEWF)^wyg&+J==|&G8wA{un2mT!E1%=*JQm5;*b<
zwj^=rdGx)=ZiSc8`zq$U(ftNj2i`<iFHLSWHm<=;AALhV_T*^l-z9gyN7e>0^&ySp
zV~l@_%4hV^FF2=tJ130&ik08F8u<gu;~3n9!@IGif<t?`*S8-F|I&EO7U`g3kxf%I
z=BCm(ZP<Gt)=#JJJ_NPHXi_y;a|BJ-k!aUw^kb#{Gl?CuaQp;|JZ98mkq4YugyClT
z(ghe;j6;6(F2Vez=nk;uz*2NwNt3+_o!8LxhRAg{VCqJ6v|-{_uG(%#{Z1O?E{t~2
zOx}wf_tT6o!|;PxiecbUOKgTwdc`6?KE7_ut+L3sZT*{=d<(6su_J@!wHR231p}Mb
zWA6agzK@9yr2Tnf<P$6v_y@FnPR?(@#vz)XP2`%*sBgu}HVlv8@OS9_0dqfDLh@7e
zk38VIxFSzkF)J)oakv`2(=cbl`hzez9jy-RJPgNbu=NQ1;z&gv!K0D0$C4Xnl2fzL
zHXAz|=*LeY2j}3>Ty)RFj0?2|m{=(7cPpM5hIgqVzn*(rm4ae)TumOiR*~PIp6jtU
zjE<YJ^A;Sv4gGgut{t_zd5Q6R{(qtOVfX?1ViesEVb8;8*SXsHIC(UVz9%vJ6xMcO
z>{(9Ye}R)^UsTEm8|jP^kZ+8&N`19azn(rmz?#4Z<bjX4tL_tw7jWV;Y~6r`jp*Ej
z$s$j;ZpDsmSpJ6I{~hK^G<83b<3HoXc5M9(^J6?Qv4ba0?BXQaK5}foVn5VK9;|BB
z#=zmKY_wW+P%%a|HLDn@nW{W_WtQ41--NSqpaE-7#^@X@&E+o7JaV^-Y+XPOFI01i
zQFk``j4WawSF<Xg8}hTJaEa=wHI&=vgSV^B1C6d_<niU)>yKgP5p+C;?JKaj5*rij
zkbIh4>B7Ks>=1vQ9m;R0uA}7tQw`XS=oU3J)hK_j`sD}bN3}(Mi;UvfFX;JI4NNuC
nJJpcguv(_bHLdED@M(`0nx@F9mSdGORn9ay2N;DW+bPO_3AKj_


From 31fb881da16d1a4061cd2a5ad4f2716532dcf6d2 Mon Sep 17 00:00:00 2001
From: BabeL <tongtianta4444@gmail.com>
Date: Tue, 1 Oct 2024 14:44:44 +0800
Subject: [PATCH 4/4] renewal changelog

---
 docs/changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2cc758bb..2712f280 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -14,7 +14,7 @@ Renewal the sprites of 25K Series, and add liveries of 25K Series
 
 0.3.2.170 (26/9/2024)
 --------------------
-Add: X2000, HXD2B, HXD3, FXD1B-1000, FXD2B-1000, DFH3, P64, BH1, JSQ1, X2K, W5, W5S, W5SK, W6, W6S, P62N, P64A, P66H, C1, C50, JF1, SL6, G70, RZXL25T
+Add: X2000, HXD2B, HXD3, FXD1B-1000, FXD2B-1000, DFH3, P64, BH1, JSQ1, X2K, W5, W5S, W5SK, W6, W6S, P62N, P64A, P66H, C1, C80, JF1, SL6, G70, RZXL25T
 Add Livery: 25Z series, 25T series, 25G series, CR200JA-Prototype, G60
 Add the GRF-ID check for wagon attachment
 Renewal the sprites of DF11Z, HXD2, HXD2-1000, CRH3A, CRH3C
@@ -37,7 +37,7 @@ Feature: improved language strings of reliability decay and comfort
 
 0.3.1.167 (8/8/2024)
 --------------------
-Add: NC3, P80, UZ25T, P50, P65
+Add: NC3, P80, UZ25T, P50, P65, G50
 Renewal the sprites of HXD1D, 25T
 Wagons with aging liveries now have new feature: The probabilities of aging liveries will change by years
 Fix #47: The Cargo Type of PB