diff --git a/docs/changelog.md b/docs/changelog.md index a94325e..5a678e3 100644 --- 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 index 4f439d1..a5d975e 100644 --- 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 index f49cbf6..56892cf 100644 --- 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 index 11f5c90..a425fc0 100644 Binary files a/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_G.png and b/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_G.png differ diff --git a/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png b/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png index c8d9f1f..79272c1 100644 Binary files a/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png and b/src/locomotive/Bicheuro_DUPLEX/Bicheuro2_R.png differ diff --git a/src/locomotive/EMU/EMU150/EMU150G_32bpp.png b/src/locomotive/EMU/EMU150/EMU150G_32bpp.png index 8dcb042..58ef702 100644 Binary files a/src/locomotive/EMU/EMU150/EMU150G_32bpp.png and b/src/locomotive/EMU/EMU150/EMU150G_32bpp.png differ diff --git a/src/locomotive/EMU/EMU150/EMU150R_32bpp.png b/src/locomotive/EMU/EMU150/EMU150R_32bpp.png index 8661725..a2aa5d8 100644 Binary files a/src/locomotive/EMU/EMU150/EMU150R_32bpp.png and b/src/locomotive/EMU/EMU150/EMU150R_32bpp.png differ diff --git a/src/locomotive/EMU/EMU150/EMU150W_32bpp.png b/src/locomotive/EMU/EMU150/EMU150W_32bpp.png new file mode 100644 index 0000000..df84b9f Binary files /dev/null and b/src/locomotive/EMU/EMU150/EMU150W_32bpp.png differ diff --git a/src/locomotive/EMU/EMU150/EMU150_graphic.pnml b/src/locomotive/EMU/EMU150/EMU150_graphic.pnml index d9c2097..fe90afc 100644 --- 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 index 3716ba7..f658b5e 100644 --- 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 index 54a87e1..2e13159 100644 Binary files a/src/locomotive/GT26CW/GT26CW.png and b/src/locomotive/GT26CW/GT26CW.png differ diff --git a/src/locomotive/GT26CW/GT26CW_graphic.pnml b/src/locomotive/GT26CW/GT26CW_graphic.pnml index 5728d47..293c051 100644 --- 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 index 97d0472..3ce0458 100644 --- a/src/locomotive/GT26CW/GT26CW_switch.pnml +++ b/src/locomotive/GT26CW/GT26CW_switch.pnml @@ -5,6 +5,7 @@ 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); } @@ -12,5 +13,6 @@ 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; } \ No newline at end of file diff --git a/src/locomotive/HEMU_430X/HEMU_430X.png b/src/locomotive/HEMU_430X/HEMU_430X.png index 5bceca7..024c26c 100644 Binary files a/src/locomotive/HEMU_430X/HEMU_430X.png and b/src/locomotive/HEMU_430X/HEMU_430X.png differ diff --git a/src/locomotive/HEMU_430X/HEMU_430X.pnml b/src/locomotive/HEMU_430X/HEMU_430X.pnml index b3fc871..51dd284 100644 --- 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 index b1b6c9e..40af131 100644 --- 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) } /*-------------------------------------------------------------------- diff --git a/src/locomotive/HEMU_430X/HEMU_430X_switch.pnml b/src/locomotive/HEMU_430X/HEMU_430X_switch.pnml index 73b3ea5..7e192a0 100644 --- a/src/locomotive/HEMU_430X/HEMU_430X_switch.pnml +++ b/src/locomotive/HEMU_430X/HEMU_430X_switch.pnml @@ -1,29 +1,49 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_TRAINS, SELF, sw_HEMU_430X_engine, position_in_consist_from_end == 0 && num_vehs_in_consist > 1){ - 1: set_HEMU_430X_engineT; +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_HEMU_430X_2F); // 2층 + return string(STR_REFIT_LIVERY_HEMU_430X_1F); +} + +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_engineH, cargo_subtype) { + 1: set_HEMU_430X_engineH; // 2층 (1층 동일) set_HEMU_430X_engineH; } -switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon_middle, (position_in_consist)) { - 1: set_HEMU_430X_wagon_r; - set_HEMU_430X_wagon; +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_engineT, cargo_subtype) { + 1: set_HEMU_430X_engineT; // 2층 (1층 동일) + set_HEMU_430X_engineT; +} + +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_engine, position_in_consist_from_end == 0 && num_vehs_in_consist > 1){ + 1: sw_HEMU_430X_engineT; + sw_HEMU_430X_engineH; +} + +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon_middle, cargo_subtype) { + 1: set_HEMU_430X_2F_wagon; // 2층 + set_HEMU_430X_1F_wagon; } -switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon_bar_rear, [STORE_TEMP(2, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]){ +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_bar_wagon, [STORE_TEMP(-2, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]) { HEMU_430X: set_HEMU_430X_wagon_bar; sw_HEMU_430X_wagon_middle; } -switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon_rear, [STORE_TEMP(1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]){ - HEMU_430X: set_HEMU_430X_wagon_end; - sw_HEMU_430X_wagon_bar_rear; +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_rear, [STORE_TEMP(1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]){ + HEMU_430X: set_HEMU_430X_panto_wagon_r; + sw_HEMU_430X_bar_wagon; } switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon, [STORE_TEMP(-1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]) { - HEMU_430X: set_HEMU_430X_wagon_start; - sw_HEMU_430X_wagon_rear; + HEMU_430X: set_HEMU_430X_panto_wagon; + sw_HEMU_430X_rear; +} + +switch(FEAT_TRAINS, SELF, sw_HEMU_430X_wagon_capacity_in_custom, cargo_subtype) { + 1: return 112; + 80; } switch(FEAT_TRAINS, SELF, sw_HEMU_430_wagon_attach, vehicle_type_id) { diff --git a/src/template/locomotive_and_wagon.pnml b/src/template/locomotive_and_wagon.pnml index 9935553..514b11e 100644 --- a/src/template/locomotive_and_wagon.pnml +++ b/src/template/locomotive_and_wagon.pnml @@ -168,14 +168,14 @@ template wagon_1F_F_mini_7(x, y) { } template wagon_1F_F_mini_6(x, y) { - [x, y, 8, 19, -3, -14] - [x+13, y, 19, 17, -11, -9] - [x+37, y, 24, 14, -11, -10] - [x+70, y, 19, 17, -4, -9] - [x+94, y, 8, 19, -3, -12] - [x+107, y, 19, 17, -14, -8] - [x+131, y, 24, 14, -18, -9] - [x+164, y, 19, 17, -7, -10] + [x, y, 8, 18, -3, -14] + [x+13, y, 17, 15, -10, -8] + [x+37, y, 24, 14, -10, -10] + [x+70, y, 17, 15, -2, -7] + [x+94, y, 8, 18, -3, -10] + [x+107, y, 17, 15, -14, -6] + [x+131, y, 24, 14, -18, -10] + [x+164, y, 17, 15, -7, -9] } template wagon_1F_F_r_mini_7(x, y) { diff --git a/src/wagon/Generatar_Car/Generatar_Car.png b/src/wagon/Generatar_Car/Generatar_Car.png index 6fce846..fc41c30 100644 Binary files a/src/wagon/Generatar_Car/Generatar_Car.png and b/src/wagon/Generatar_Car/Generatar_Car.png differ diff --git a/src/wagon/Generatar_Car/Generatar_Car_graphic.pnml b/src/wagon/Generatar_Car/Generatar_Car_graphic.pnml index 59a221f..d8f834f 100644 --- a/src/wagon/Generatar_Car/Generatar_Car_graphic.pnml +++ b/src/wagon/Generatar_Car/Generatar_Car_graphic.pnml @@ -25,6 +25,9 @@ spriteset(set_Lady_Bird_Generatar_Car, "src\wagon\Generatar_Car\Generatar_Car.pn wagon_1F_F_mini_6(80, 100) } +spriteset(set_S_Train_New_Generatar_Car, "src\wagon\Generatar_Car\Generatar_Car.png") { + wagon_1F_F_mini_7(80, 124) +} /*-------------------------------------------------------------------- 구매정보 diff --git a/src/wagon/Generatar_Car/Generatar_Car_switch.pnml b/src/wagon/Generatar_Car/Generatar_Car_switch.pnml index f75de71..55b0b49 100644 --- a/src/wagon/Generatar_Car/Generatar_Car_switch.pnml +++ b/src/wagon/Generatar_Car/Generatar_Car_switch.pnml @@ -2,18 +2,20 @@ 스위치 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_Generatar_wagon_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_CY_GW_Generatar_Car); // 충북영동국악와인열차 - 2: return string(STR_REFIT_LIVERY_JA_a_Old_Generatar_Car); // 정선아리랑 유람열차 구도색 - 3: return string(STR_REFIT_LIVERY_JA_a_New_Generatar_Car); // 정선아리랑 유람열차 신도색 - 4: return string(STR_REFIT_LIVERY_Lady_Bird_Generatar_Car); // 레이디 버드 + 1: return string(STR_REFIT_LIVERY_CY_GW_Generatar_Car); // 충북영동국악와인열차 + 2: return string(STR_REFIT_LIVERY_JA_a_Old_Generatar_Car); // 정선아리랑 유람열차 구도색 + 3: return string(STR_REFIT_LIVERY_JA_a_New_Generatar_Car); // 정선아리랑 유람열차 신도색 + 4: return string(STR_REFIT_LIVERY_Lady_Bird_Generatar_Car); // 레이디 버드 + 5: return string(STR_REFIT_LIVERY_S_Train_New_Generatar_Car); // S-Train New return string(STR_REFIT_LIVERY_Eco_Rail_Generatar_Car); } switch(FEAT_TRAINS, SELF, sw_Generatar_wagon, cargo_subtype) { - 1: set_CY_GW_Generatar_Car; // 충북영동국악와인열차 - 2: set_JA_A_Old_Generatar_Car; // 정선아리랑 유람열차 구도색 - 3: set_JA_A_New_Generatar_Car; // 정선아리랑 유람열차 신도색 - 4: set_Lady_Bird_Generatar_Car; // 레이디 버드 + 1: set_CY_GW_Generatar_Car; // 충북영동국악와인열차 + 2: set_JA_A_Old_Generatar_Car; // 정선아리랑 유람열차 구도색 + 3: set_JA_A_New_Generatar_Car; // 정선아리랑 유람열차 신도색 + 4: set_Lady_Bird_Generatar_Car; // 레이디 버드 + 5: set_S_Train_New_Generatar_Car; // S-Train New set_Generatar_Car; } diff --git a/src/wagon/SPassenger_wagon/SPassenger_wagon_graphic.pnml b/src/wagon/SPassenger_wagon/SPassenger_wagon_graphic.pnml index 541b0b7..ac26362 100644 --- a/src/wagon/SPassenger_wagon/SPassenger_wagon_graphic.pnml +++ b/src/wagon/SPassenger_wagon/SPassenger_wagon_graphic.pnml @@ -218,6 +218,29 @@ spriteset(set_Lady_Bird_9wagon, "src\wagon\SPassenger_wagon\Travel_wagon\Ladybir wagon_1F_F(18, 216) } +/*-------------------------------------------------------------------- +8. S-Train 신도색 +--------------------------------------------------------------------*/ +spriteset(set_S_Train_New_1wagon, "src\wagon\SPassenger_wagon\Travel_wagon\S_Train_New.png") { + wagon_1F_F(0, 0) +} + +spriteset(set_S_Train_New_2wagon, "src\wagon\SPassenger_wagon\Travel_wagon\S_Train_New.png") { + wagon_1F_F(0, 27) +} + +spriteset(set_S_Train_New_3wagon, "src\wagon\SPassenger_wagon\Travel_wagon\S_Train_New.png") { + wagon_1F_F(0, 54) +} + +spriteset(set_S_Train_New_4wagon, "src\wagon\SPassenger_wagon\Travel_wagon\S_Train_New.png") { + wagon_1F_F(0, 81) +} + +spriteset(set_S_Train_New_5wagon, "src\wagon\SPassenger_wagon\Travel_wagon\S_Train_New.png") { + wagon_1F_F(0, 108) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ diff --git a/src/wagon/SPassenger_wagon/SPassenger_wagon_switch.pnml b/src/wagon/SPassenger_wagon/SPassenger_wagon_switch.pnml index 03aacab..30bb843 100644 --- a/src/wagon/SPassenger_wagon/SPassenger_wagon_switch.pnml +++ b/src/wagon/SPassenger_wagon/SPassenger_wagon_switch.pnml @@ -9,6 +9,7 @@ switch(FEAT_TRAINS, SELF, sw_SPassenger_cargo_subtype_text, cargo_subtype) { 5: return string(STR_REFIT_LIVERY_Wine_Panax_Passenger_Car); // 와인인삼트레인 6: return string(STR_REFIT_LIVERY_wine_Cinema_Passenger_Car); // 와인시네마트레인 7: return string(STR_REFIT_LIVERY_Lady_Bird_Passenger_Car); // 레이디 버드 + 8: return string(STR_REFIT_LIVERY_S_Train_New_Passenger_Car); // S-Train 신도색 return string(STR_REFIT_LIVERY_Eco_Rail_Passenger_Car); } @@ -84,6 +85,18 @@ switch(FEAT_TRAINS, SELF, sw_Lady_Bird_wagon, position_in_consist % 9) { set_Lady_Bird_4wagon; } +/*-------------------------------------------------------------------- +6. S-Trian New +--------------------------------------------------------------------*/ +switch(FEAT_TRAINS, SELF, sw_S_Train_New_wagon, position_in_consist % 5) { + 1: set_S_Train_New_1wagon; + 2: set_S_Train_New_2wagon; + 3: set_S_Train_New_3wagon; + 4: set_S_Train_New_4wagon; + 0: set_S_Train_New_5wagon; + set_S_Train_New_4wagon; +} + /*-------------------------------------------------------------------- 객차형 스위치 공통 --------------------------------------------------------------------*/ @@ -95,6 +108,7 @@ switch(FEAT_TRAINS, SELF, sw_SPassenger_wagon, cargo_subtype) { 5: sw_wine_Panax_wagon; // 와인인삼트레인 6: sw_wine_cinema_wagon; // 와인시네마트레인 7: sw_Lady_Bird_wagon; // 레이디 버드 + 8: sw_S_Train_New_wagon; // S-Train New set_Eco_Rail_wagon; } @@ -102,5 +116,6 @@ switch(FEAT_TRAINS, SELF, sw_SPassenger_wagon_capacity_in_custom, cargo_subtype) 1: return 72; 2: return 56; 3: return 56; + 8: return 72; 64; } diff --git a/src/wagon/SPassenger_wagon/Travel_wagon/Ladybird.png b/src/wagon/SPassenger_wagon/Travel_wagon/Ladybird.png index 870b3bc..5a94055 100644 Binary files a/src/wagon/SPassenger_wagon/Travel_wagon/Ladybird.png and b/src/wagon/SPassenger_wagon/Travel_wagon/Ladybird.png differ diff --git a/src/wagon/SPassenger_wagon/Travel_wagon/S_Train_New.png b/src/wagon/SPassenger_wagon/Travel_wagon/S_Train_New.png new file mode 100644 index 0000000..e1b5642 Binary files /dev/null and b/src/wagon/SPassenger_wagon/Travel_wagon/S_Train_New.png differ diff --git a/src/wagon/SPassenger_wagon/Travel_wagon/wine_Panax_train.png b/src/wagon/SPassenger_wagon/Travel_wagon/wine_Panax_train.png index cb646e6..1c888e7 100644 Binary files a/src/wagon/SPassenger_wagon/Travel_wagon/wine_Panax_train.png and b/src/wagon/SPassenger_wagon/Travel_wagon/wine_Panax_train.png differ diff --git a/src/wagon/SPassenger_wagon/Travel_wagon/wine_cinema_train.png b/src/wagon/SPassenger_wagon/Travel_wagon/wine_cinema_train.png index 9f62472..16a4b65 100644 Binary files a/src/wagon/SPassenger_wagon/Travel_wagon/wine_cinema_train.png and b/src/wagon/SPassenger_wagon/Travel_wagon/wine_cinema_train.png differ