2022.08.26 버그 수정 외

CoconutKR · Aug 26, 2022 · 63987d8 · 63987d8
1 parent d28fe97
commit 63987d8
Show file tree

Hide file tree

Showing 27 changed files with 220 additions and 84 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,12 @@
+2022.8.26
+-----
+* EMU150 2층 객차 32bpp 적용
+* S-Train 신도식 추가
+* 레이디 버드 도색 수정
+* 비츠로 레드, 녹색 스프라이트 수정
+* 와인인삼, 와인시네마 스프라이트 수정
+* 해무 2층객차 도색 추가 (도색으로 변경)
+
 2022.8.6
 -----
 * 한국형 표준전동차 추가 (롱시트, 크로스시트)

diff --git a/lang/english.lng b/lang/english.lng
@@ -83,6 +83,9 @@ STR_REFIT_LIVERY_GT26CW_Korail                      :(Korail)
 STR_REFIT_LIVERY_GT26CW_CL                          :(CL)
 STR_REFIT_LIVERY_GT26CW_CY_GW                       :(Chungbuk Yeongdong Gugak & Wine Train)
 STR_REFIT_LIVERY_GT26CW_LB                          :(Lady Bird)
+STR_REFIT_LIVERY_GT26CW_ST                          :(S-Train)
+STR_REFIT_LIVERY_HEMU_430X_1F                       :(HEMU-430X 1F)
+STR_REFIT_LIVERY_HEMU_430X_2F                       :(HEMU-430X 2F)
 STR_REFIT_LIVERY_ITX_SM2_R                          :(ITX-Saemaeul DD Red Color)
 STR_REFIT_LIVERY_ITX_SM2_G                          :(ITX-Saemaeul DD Green Color)
 STR_REFIT_LIVERY_ITX_SM2_W                          :(ITX-Saemaeul DD White Color)
@@ -106,11 +109,13 @@ STR_REFIT_LIVERY_E_Train_Passenger_Car              :(E-Trian)
 STR_REFIT_LIVERY_Wine_Panax_Passenger_Car           :(wine Panax Train)
 STR_REFIT_LIVERY_wine_Cinema_Passenger_Car          :(wine Cinema Train)
 STR_REFIT_LIVERY_Lady_Bird_Passenger_Car            :(Lady Bird)
+STR_REFIT_LIVERY_S_Train_New_Passenger_Car          :(S-Train)
 STR_REFIT_LIVERY_Eco_Rail_Generatar_Car             :(Generatar Car)
 STR_REFIT_LIVERY_CY_GW_Generatar_Car                :(Chungbuk Yeongdong Gugak & Wine Generatar Car)
 STR_REFIT_LIVERY_JA_a_Old_Generatar_Car             :(Jeongseon Arirang Old Color)
 STR_REFIT_LIVERY_JA_a_New_Generatar_Car             :(Jeongseon Arirang New Color)
 STR_REFIT_LIVERY_Lady_Bird_Generatar_Car            :(Lady Bird)
+STR_REFIT_LIVERY_S_Train_New_Generatar_Car          :(S-Train)
 STR_REFIT_LIVERY_Eco_Rail_Luggage_Car               :(Eco Rail Luggage Car)
 STR_REFIT_LIVERY_CY_GW_Luggage_Car                  :(Chungbuk Yeongdong Gugak & Wine Luggage Car)
 STR_REFIT_LIVERY_Travel_8500_A_train                :(A-Train)

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -83,6 +83,10 @@ STR_REFIT_LIVERY_GT26CW_Korail                      :(코레일)
 STR_REFIT_LIVERY_GT26CW_CL                          :(철도청)
 STR_REFIT_LIVERY_GT26CW_CY_GW                       :(충북영동국악와인)
 STR_REFIT_LIVERY_GT26CW_LB                          :(레이디버드)
+STR_REFIT_LIVERY_GT26CW_ST                          :(S-Train)
+STR_REFIT_LIVERY_HEMU_430X_1F                       :(HEMU-430X 1층)
+STR_REFIT_LIVERY_HEMU_430X_2F                       :(HEMU-430X 2층)
+STR_REFIT_LIVERY_ITX_SM2_R                          :(ITX-새마을 DD 빨강도색)
 STR_REFIT_LIVERY_ITX_SM2_R                          :(ITX-새마을 DD 빨강도색)
 STR_REFIT_LIVERY_ITX_SM2_G                          :(ITX-새마을 DD 녹색도색)
 STR_REFIT_LIVERY_ITX_SM2_W                          :(ITX-새마을 DD 흰색도색)
@@ -106,11 +110,13 @@ STR_REFIT_LIVERY_E_Train_Passenger_Car              :(E-Trian)
 STR_REFIT_LIVERY_Wine_Panax_Passenger_Car           :(와인인삼트레인)
 STR_REFIT_LIVERY_wine_Cinema_Passenger_Car          :(와인시네마트레인)
 STR_REFIT_LIVERY_Lady_Bird_Passenger_Car            :(레이디 버드)
+STR_REFIT_LIVERY_S_Train_New_Passenger_Car          :(S-Train)
 STR_REFIT_LIVERY_Eco_Rail_Generatar_Car             :(발전차)
 STR_REFIT_LIVERY_CY_GW_Generatar_Car                :(충북영동국악와인)
 STR_REFIT_LIVERY_JA_a_Old_Generatar_Car             :(정선아리랑 유람열차 구도색)
 STR_REFIT_LIVERY_JA_a_New_Generatar_Car             :(정선아리랑 유람열차 신도색)
 STR_REFIT_LIVERY_Lady_Bird_Generatar_Car            :(레이디 버드)
+STR_REFIT_LIVERY_S_Train_New_Generatar_Car          :(S-Train)
 STR_REFIT_LIVERY_Eco_Rail_Luggage_Car               :(에코레일)
 STR_REFIT_LIVERY_CY_GW_Luggage_Car                  :(충북영동국악와인)
 STR_REFIT_LIVERY_Travel_8500_A_train                :(A-Train)

diff --git a/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_G.png b/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_G.png
diff --git a/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png b/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png
diff --git a/src/locomotive/EMU/EMU150/EMU150G_32bpp.png b/src/locomotive/EMU/EMU150/EMU150G_32bpp.png
diff --git a/src/locomotive/EMU/EMU150/EMU150R_32bpp.png b/src/locomotive/EMU/EMU150/EMU150R_32bpp.png
diff --git a/src/locomotive/EMU/EMU150/EMU150W_32bpp.png b/src/locomotive/EMU/EMU150/EMU150W_32bpp.png
diff --git a/src/locomotive/EMU/EMU150/EMU150_graphic.pnml b/src/locomotive/EMU/EMU150/EMU150_graphic.pnml
@@ -13,37 +13,21 @@ alternative_sprites(set_EMU150_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "sr
 1. EMU150R
 --------------------------------------------------------------------*/
 spriteset(set_EMU150RH_purchase, "src/locomotive/EMU/EMU150/EMU150R.png"){
-	tmpl_purchase_for_dualhead(0, 108)
-}
-
-alternative_sprites(set_EMU150RH_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
-    tmpl_purchase_for_dualhead(0, 108)
+	tmpl_purchase_for_dualhead(0, 135)
 }
 
 spriteset(set_EMU150R_engineH, "src/locomotive/EMU/EMU150/EMU150R.png"){
 	engine(80, 0)
 }
 
-alternative_sprites(set_EMU150R_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
-    engine(80, 0)
-}
-
 spriteset(set_EMU150R_1F_panto_wagon, "src/locomotive/EMU/EMU150/EMU150R.png"){
 	wagon_1F_F(80, 27)
 }
 
-alternative_sprites(set_EMU150R_1F_panto_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
-    wagon_1F_F(80, 27)
-}
-
 spriteset(set_EMU150R_1F_wagon, "src/locomotive/EMU/EMU150/EMU150R.png") {
     wagon_1F_F(80, 54)
 }
 
-alternative_sprites(set_EMU150R_1F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
-    wagon_1F_F(80, 54)
-}
-
 spriteset(set_EMU150R_2F_wagon, "src/locomotive/EMU/EMU150/EMU150R.png") {
     wagon_1F_F(80, 81)
 }
@@ -52,53 +36,60 @@ spriteset(set_EMU150R_1F_panto_wagon_r, "src/locomotive/EMU/EMU150/EMU150R.png")
     wagon_1F_F(80, 108)
 }
 
-alternative_sprites(set_EMU150R_1F_panto_wagon_r, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+spriteset(set_EMU150R_engineT, "src/locomotive/EMU/EMU150/EMU150R.png"){
+	engine_r(80, 135)
+}
+
+/*--------------------------------------------------------------------
+1-1. EMU150R 32bpp
+--------------------------------------------------------------------*/
+alternative_sprites(set_EMU150RH_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+    tmpl_purchase_for_dualhead(0, 135)
+}
+
+alternative_sprites(set_EMU150R_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+    engine(80, 0)
+}
+
+alternative_sprites(set_EMU150R_1F_panto_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+    wagon_1F_F(80, 27)
+}
+
+alternative_sprites(set_EMU150R_1F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+    wagon_1F_F(80, 54)
+}
+
+alternative_sprites(set_EMU150R_2F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
     wagon_1F_F(80, 81)
 }
 
-spriteset(set_EMU150R_engineT, "src/locomotive/EMU/EMU150/EMU150R.png"){
-	engine_r(80, 135)
+alternative_sprites(set_EMU150R_1F_panto_wagon_r, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
+    wagon_1F_F(80, 108)
 }
 
 alternative_sprites(set_EMU150R_engineT, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150R_32bpp.png"){
-    engine_r(80, 108)
+    engine_r(80, 135)
 }
 
 /*--------------------------------------------------------------------
 2. EMU150G
 --------------------------------------------------------------------*/
 spriteset(set_EMU150GH_purchase, "src/locomotive/EMU/EMU150/EMU150G.png"){
-	tmpl_purchase_for_dualhead(0, 108)
-}
-
-alternative_sprites(set_EMU150GH_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
-    tmpl_purchase_for_dualhead(0, 108)
+	tmpl_purchase_for_dualhead(0, 135)
 }
 
 spriteset(set_EMU150G_engineH, "src/locomotive/EMU/EMU150/EMU150G.png"){
 	engine(80, 0)
 }
 
-alternative_sprites(set_EMU150G_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
-    engine(80, 0)
-}
-
 spriteset(set_EMU150G_1F_panto_wagon, "src/locomotive/EMU/EMU150/EMU150G.png"){
 	wagon_1F_F(80, 27)
 }
 
-alternative_sprites(set_EMU150G_1F_panto_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
-    wagon_1F_F(80, 27)
-}
-
 spriteset(set_EMU150G_1F_wagon, "src/locomotive/EMU/EMU150/EMU150G.png") {
     wagon_1F_F(80, 54)
 }
 
-alternative_sprites(set_EMU150G_1F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
-    wagon_1F_F(80, 54)
-}
-
 spriteset(set_EMU150G_2F_wagon, "src/locomotive/EMU/EMU150/EMU150G.png") {
     wagon_1F_F(80, 81)
 }
@@ -107,16 +98,39 @@ spriteset(set_EMU150G_1F_panto_wagon_r, "src/locomotive/EMU/EMU150/EMU150G.png")
     wagon_1F_F(80, 108)
 }
 
-alternative_sprites(set_EMU150G_1F_panto_wagon_r, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+spriteset(set_EMU150G_engineT, "src/locomotive/EMU/EMU150/EMU150G.png"){
+	engine_r(80, 135)
+}
+
+/*--------------------------------------------------------------------
+2-1. EMU150G_32bpp
+--------------------------------------------------------------------*/
+alternative_sprites(set_EMU150GH_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+    tmpl_purchase_for_dualhead(0, 135)
+}
+
+alternative_sprites(set_EMU150G_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+    engine(80, 0)
+}
+
+alternative_sprites(set_EMU150G_1F_panto_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+    wagon_1F_F(80, 27)
+}
+
+alternative_sprites(set_EMU150G_1F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+    wagon_1F_F(80, 54)
+}
+
+alternative_sprites(set_EMU150G_2F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
     wagon_1F_F(80, 81)
 }
 
-spriteset(set_EMU150G_engineT, "src/locomotive/EMU/EMU150/EMU150G.png"){
-	engine_r(80, 135)
+alternative_sprites(set_EMU150G_1F_panto_wagon_r, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
+    wagon_1F_F(80, 108)
 }
 
 alternative_sprites(set_EMU150G_engineT, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150G_32bpp.png"){
-    engine_r(80, 108)
+    engine_r(80, 135)
 }
 
 /*--------------------------------------------------------------------
@@ -150,6 +164,37 @@ spriteset(set_EMU150W_engineT, "src/locomotive/EMU/EMU150/EMU150W.png"){
 	engine_r(80, 135)
 }
 
+/*--------------------------------------------------------------------
+3-1. EMU150W_32bpp
+--------------------------------------------------------------------*/
+alternative_sprites(set_EMU150WH_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    tmpl_purchase_for_dualhead(0, 135)
+}
+
+alternative_sprites(set_EMU150W_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    engine(80, 0)
+}
+
+alternative_sprites(set_EMU150W_1F_panto_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    wagon_1F_F(80, 27)
+}
+
+alternative_sprites(set_EMU150W_1F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    wagon_1F_F(80, 54)
+}
+
+alternative_sprites(set_EMU150W_2F_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    wagon_1F_F(80, 81)
+}
+
+alternative_sprites(set_EMU150W_1F_panto_wagon_r, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    wagon_1F_F(80, 108)
+}
+
+alternative_sprites(set_EMU150W_engineT, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/locomotive/EMU/EMU150/EMU150W_32bpp.png"){
+    engine_r(80, 135)
+}
+
 /*--------------------------------------------------------------------
 구매정보
 --------------------------------------------------------------------*/

diff --git a/src/locomotive/EMU/EMU150/EMU150_switch.pnml b/src/locomotive/EMU/EMU150/EMU150_switch.pnml
@@ -43,11 +43,11 @@ switch(FEAT_TRAINS, SELF, sw_EMU150_panto_wagon, cargo_subtype) {
 }
 
 switch(FEAT_TRAINS, SELF, sw_EMU150_panto_wagon_r, cargo_subtype) {
-    1: set_EMU150G_1F_panto_wagon_r; // 1층 녹색
-    2: set_EMU150W_1F_panto_wagon_r; // 1층 하양
-    3: set_EMU150R_1F_panto_wagon_r;   // 2층 빨강 (1층 빨강 동일)
-    4: set_EMU150G_1F_panto_wagon_r;   // 2층 녹색 (1층 녹색 동일)
-    5: set_EMU150W_1F_panto_wagon_r;   // 2층 하양 (1층 하양 동일)
+    1: set_EMU150G_1F_panto_wagon_r;  // 1층 녹색
+    2: set_EMU150W_1F_panto_wagon_r;  // 1층 하양
+    3: set_EMU150R_1F_panto_wagon_r;  // 2층 빨강 (1층 빨강 동일)
+    4: set_EMU150G_1F_panto_wagon_r;  // 2층 녹색 (1층 녹색 동일)
+    5: set_EMU150W_1F_panto_wagon_r;  // 2층 하양 (1층 하양 동일)
     set_EMU150R_1F_panto_wagon_r;
 }
 

diff --git a/src/locomotive/GT26CW/GT26CW.png b/src/locomotive/GT26CW/GT26CW.png
diff --git a/src/locomotive/GT26CW/GT26CW_graphic.pnml b/src/locomotive/GT26CW/GT26CW_graphic.pnml
@@ -21,6 +21,10 @@ spriteset(set_GT26CW_LB_engine, "src/locomotive/GT26CW/GT26CW.png"){
     engine(80, 81)
 }
 
+spriteset(set_GT26CW_ST_engine, "src/locomotive/GT26CW/GT26CW.png"){
+    engine(80, 108)
+}
+
 /*-------------------------------------------------------------------
 구매정보
 --------------------------------------------------------------------*/

diff --git a/src/locomotive/GT26CW/GT26CW_switch.pnml b/src/locomotive/GT26CW/GT26CW_switch.pnml
@@ -5,12 +5,14 @@ switch(FEAT_TRAINS, SELF, sw_GT26CW_cargo_subtype_text, cargo_subtype) {
     1: return string(STR_REFIT_LIVERY_GT26CW_CL);    // Cl
     2: return string(STR_REFIT_LIVERY_GT26CW_CY_GW); // 충북영동국악와인열차
     3: return string(STR_REFIT_LIVERY_GT26CW_LB);    // 레이디 버드
+    4: return string(STR_REFIT_LIVERY_GT26CW_ST);    // S-train
     return string(STR_REFIT_LIVERY_GT26CW_Korail);
 }
 
 switch(FEAT_TRAINS, SELF, sw_GT26CW_engine, cargo_subtype) {
     1: set_GT26CW_CL_engine;    // CL
     2: set_GT26CW_CY_GW_engine; // 충북영동국악와인열차
     3: set_GT26CW_LB_engine;    // 레이디 버드
+    4: set_GT26CW_ST_engine;    // S-train
     set_GT26CW_engine;
 }
diff --git a/src/locomotive/HEMU_430X/HEMU_430X.png b/src/locomotive/HEMU_430X/HEMU_430X.png
diff --git a/src/locomotive/HEMU_430X/HEMU_430X.pnml b/src/locomotive/HEMU_430X/HEMU_430X.pnml
@@ -56,12 +56,14 @@ item(FEAT_TRAINS, HEMU_430X, 1068){
         cost_factor:                    10;
         running_cost_factor:            150;
         can_attach_wagon:               sw_HEMU_430_wagon_attach;
+        cargo_subtype_text:             sw_HEMU_430X_cargo_subtype_text;
         additional_text:                string(STR_REFIT_ADDITIONAL_HEMU_430X);
         }
 
     livery_override(KTS_Passenger_Car) {
         default:                        sw_HEMU_430X_wagon;
-        cargo_capacity:                 80;
+        cargo_capacity:                 sw_HEMU_430X_wagon_capacity_in_custom;
+        cargo_subtype_text:             sw_HEMU_430X_cargo_subtype_text;
         loading_speed:                  25;
         running_cost_factor:            100;
         }

diff --git a/src/locomotive/HEMU_430X/HEMU_430X_graphic.pnml b/src/locomotive/HEMU_430X/HEMU_430X_graphic.pnml
@@ -13,28 +13,28 @@ spriteset(set_HEMU_430X_engineH, "src/locomotive/HEMU_430X/HEMU_430X.png"){
     engine(80, 0)
 }
 
-spriteset(set_HEMU_430X_wagon_start, "src/locomotive/HEMU_430X/HEMU_430X.png"){
-    wagon_panto(80, 27)
+spriteset(set_HEMU_430X_panto_wagon, "src/locomotive/HEMU_430X/HEMU_430X.png"){
+    wagon_1F_F(80, 27)
 }
 
 spriteset(set_HEMU_430X_wagon_bar, "src/locomotive/HEMU_430X/HEMU_430X.png") {
     wagon_1F_F(80, 54)
 }
 
-spriteset(set_HEMU_430X_wagon, "src/locomotive/HEMU_430X/HEMU_430X.png") {
-    wagon_1F(80, 81)
+spriteset(set_HEMU_430X_2F_wagon, "src/locomotive/HEMU_430X/HEMU_430X.png") {
+    wagon_1F_F(80, 81)
 }
 
-spriteset(set_HEMU_430X_wagon_r, "src/locomotive/HEMU_430X/HEMU_430X.png") {
-    wagon_1F_r(80, 81)
+spriteset(set_HEMU_430X_1F_wagon, "src/locomotive/HEMU_430X/HEMU_430X.png") {
+    wagon_1F_F(80, 108)
 }
 
-spriteset(set_HEMU_430X_wagon_end, "src/locomotive/HEMU_430X/HEMU_430X.png"){
-    wagon_panto(80, 108)
+spriteset(set_HEMU_430X_panto_wagon_r, "src/locomotive/HEMU_430X/HEMU_430X.png"){
+    wagon_1F_F(80, 135)
 }
 
 spriteset(set_HEMU_430X_engineT, "src/locomotive/HEMU_430X/HEMU_430X.png"){
-    engine_r(80, 135)
+    engine_r(80, 162)
 }
 
 /*--------------------------------------------------------------------