diff --git a/DTS.pnml b/DTS.pnml index ff99e7e3..cbe047b4 100644 --- a/DTS.pnml +++ b/DTS.pnml @@ -10,7 +10,7 @@ grf { name : string(STR_GRF_NAME_WITH_VER); desc : string(STR_GRF_DESC); url : string(STR_GRF_URL); - version : 20240807; + version : 20240808; min_compatible_version : 20240618; // Parameters 매개변수 diff --git a/README.md b/README.md index da06e015..3a8e3ca0 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,15 @@ ## 최근 등록 릴리즈 ``` -[1.52] 2024.08.02 +[1.53] 2024.08.08 [추가] -- [수소열차] PEX-SUPER (260km/h) -- [객차] PEX-SUPER +- [한큐] 7000, 7300, 8200 전동차 +- [6량] 한큐 6000 (고베, 다카라즈카) [변경] -- [그래픽] HYEL-150, HYEL-300, 건설차량, 한국철도공사 3세대 361K -- [그래픽 및 뒤집힘 방지] 한큐 1000, 1300, 6000, 6300 +- [그래픽변경&뒤집힘방지적용] 한큐 8000, 8300, 9000, 9300 +- [그래픽변경] 한큐 1000, 1300 +- [버그] 미사용 고상홈A, B +- [등장년도] 한큐 6000, 6300 ``` ## 인게임 등록 diff --git a/docs/changelog.md b/docs/changelog.md index 893862a5..1c2468b4 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,11 +1,12 @@ -[1.53] 2024.08.09 (예정) +[1.53] 2024.08.08 [추가] - [한큐] 7000, 7300, 8200 전동차 +- [6량] 한큐 6000 (고베, 다카라즈카) [변경] - [그래픽변경&뒤집힘방지적용] 한큐 8000, 8300, 9000, 9300 -- [그래픽오류수정] 한큐 1000, 1300 -- [버그수정] 미사용 고상홈A, B -- [리메이크] 한큐 6000 +- [그래픽변경] 한큐 1000, 1300 +- [버그] 미사용 고상홈A, B +- [등장년도] 한큐 6000, 6300 [1.52] 2024.08.02 [추가] diff --git a/lang/english.lng b/lang/english.lng index ff33cc51..8c3a12ab 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -956,6 +956,8 @@ STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_A : New 1998 6Car A STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_B : New 1998 6Car B STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_C : New 1998 6Car C STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_D : New 1998 6Car D +STR_REFIT_LIVERY_Hankyu_6300_A : A Type +STR_REFIT_LIVERY_Hankyu_6300_B : B Type STR_REFIT_LIVERY_Hankyu_7000 : orginal STR_REFIT_LIVERY_Hankyu_7000_1984 : 1984 STR_REFIT_LIVERY_Hankyu_7000_1998 : 1998 diff --git a/lang/korean.lng b/lang/korean.lng index 5a223858..be6ab02d 100644 --- a/lang/korean.lng +++ b/lang/korean.lng @@ -941,9 +941,9 @@ STR_REFIT_LIVERY_Nishitetsu_5000_SIV : 니시테츠 5000형 STR_REFIT_LIVERY_Nishitetsu_7000 : 니시테츠 7000형 STR_REFIT_LIVERY_Nishitetsu_7050 : 니시테츠 7050형 STR_REFIT_LIVERY_Hankyu_6000 : 구도색 -STR_REFIT_LIVERY_Hankyu_6000_6Car_A : 고베 -STR_REFIT_LIVERY_Hankyu_6000_6Car_B : 다카라즈카 -STR_REFIT_LIVERY_Hankyu_6000_1993 : 다카라즈카선 구도색 +STR_REFIT_LIVERY_Hankyu_6000_6Car_A : 고베선 구도색 +STR_REFIT_LIVERY_Hankyu_6000_6Car_B : 다카라즈카선 구도색 +STR_REFIT_LIVERY_Hankyu_6000_1993 : 구도색 쪽창개조 STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_A : 고베선 구도색 쪽창개조 STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_B : 다카라즈카 구도색 쪽창개조 STR_REFIT_LIVERY_Hankyu_6000_1998_A : 현도색 @@ -952,15 +952,17 @@ STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_A : 고베선 현도색 미 STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_B : 고베선 현도색 STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_C : 다카라즈카선 현도색 미개조 STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_D : 다카라즈카선 현도색 +STR_REFIT_LIVERY_Hankyu_6300_A : 0번대 +STR_REFIT_LIVERY_Hankyu_6300_B : 30번대 STR_REFIT_LIVERY_Hankyu_7000 : 구도색 STR_REFIT_LIVERY_Hankyu_7000_1984 : 구도색 재조정 STR_REFIT_LIVERY_Hankyu_7000_1998 : 현 도색 미개조 -STR_REFIT_LIVERY_Hankyu_7000_2009 : 7007F 8량 한정 +STR_REFIT_LIVERY_Hankyu_7000_2009 : 7007F STR_REFIT_LIVERY_Hankyu_7000_2011 : 현 도색 STR_REFIT_LIVERY_Hankyu_7000_2016 : 현 도색 (VVVF) STR_REFIT_LIVERY_Hankyu_7300 : 구도색 STR_REFIT_LIVERY_Hankyu_7300_1998 : 현 도색 미개조 -STR_REFIT_LIVERY_Hankyu_7300_2008 : 7320F 8량 한정 +STR_REFIT_LIVERY_Hankyu_7300_2008 : 7320F STR_REFIT_LIVERY_Hankyu_7300_2014 : 현 도색 STR_REFIT_LIVERY_Hankyu_7300_2014_VVVF : 현 도색 (VVVF) STR_REFIT_LIVERY_Hankyu_8000_Long_Seat : 한큐 8000형 롱 시트 diff --git a/src_Japanese/metro/Hankyu/6X00_series/6000_series/Hankyu_6000_switch_Year.pnml b/src_Japanese/metro/Hankyu/6X00_series/6000_series/Hankyu_6000_switch_Year.pnml index 2317b502..39e1d7d0 100644 --- a/src_Japanese/metro/Hankyu/6X00_series/6000_series/Hankyu_6000_switch_Year.pnml +++ b/src_Japanese/metro/Hankyu/6X00_series/6000_series/Hankyu_6000_switch_Year.pnml @@ -52,13 +52,12 @@ switch(FEAT_TRAINS, SELF, sw_Hankyu_6000_1993_6Car_cargo_subtype_text, cargo_sub switch(FEAT_TRAINS, SELF, sw_Hankyu_6000_1998_6Car_cargo_subtype_text, cargo_subtype) { 0: return string(STR_REFIT_LIVERY_Hankyu_6000_6Car_A); 1: return string(STR_REFIT_LIVERY_Hankyu_6000_6Car_B); - 2: return string(STR_REFIT_LIVERY_Hankyu_6000_1993); - 3: return string(STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_A); - 4: return string(STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_B); - 5: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_A); - 6: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_B); - 7: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_C); - 8: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_D); + 2: return string(STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_A); + 3: return string(STR_REFIT_LIVERY_Hankyu_6000_1993_6Car_B); + 4: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_A); + 5: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_B); + 6: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_C); + 7: return string(STR_REFIT_LIVERY_Hankyu_6000_1998_6Car_D); return CB_RESULT_NO_TEXT; } diff --git a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png index fcb8259c..68d09bf0 100644 Binary files a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png and b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png differ diff --git a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.pnml b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.pnml index 6526ffd8..7fcdce2e 100644 --- a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.pnml +++ b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.pnml @@ -129,6 +129,7 @@ item(FEAT_TRAINS, Hankyu_6300_8Car, 2180){ loading_speed: 25; cost_factor: 10; running_cost_factor: 150; + cargo_subtype_text: sw_Hankyu_6300_cargo_subtype_text; sound_effect: sw_Hankyu_6300_sound; } } \ No newline at end of file diff --git a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_graphic.pnml b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_graphic.pnml index dc9f69bd..44a848b2 100644 --- a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_graphic.pnml +++ b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_graphic.pnml @@ -4,36 +4,44 @@ Graphics /*-------------------------------------------------------------------- 한큐전철 6300형 --------------------------------------------------------------------*/ -spriteset(set_Hankyu_6300_engineH, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ +spriteset(set_Hankyu_6300_engineH_TC, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ engine(80, 0) } -spriteset(set_Hankyu_6300_engineH_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ +spriteset(set_Hankyu_6300_engineH_TC_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ engine(80, 27) } +spriteset(set_Hankyu_6300_engineH_MC, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ + engine(80, 54) +} + +spriteset(set_Hankyu_6300_engineH_MC_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ + engine(80, 81) +} + spriteset(set_Hankyu_6300_wagon, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png") { - wagon_1F_F(80, 54) + wagon_1F_F(80, 108) } spriteset(set_Hankyu_6300_wagon_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png") { - wagon_1F_F_r(80, 54) + wagon_1F_F_r(80, 108) } spriteset(set_Hankyu_6300_panto_wagon, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png") { - wagon_1F_F(80, 81) + wagon_1F_F(80, 135) } spriteset(set_Hankyu_6300_panto_wagon_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png") { - wagon_1F_F_r(80, 81) + wagon_1F_F_r(80, 135) } spriteset(set_Hankyu_6300_engineT_r, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ - engine(80, 108) + engine(80, 162) } spriteset(set_Hankyu_6300_engineT, "src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300.png"){ - engine(80, 135) + engine(80, 189) } /*-------------------------------------------------------------------- diff --git a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_switch.pnml b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_switch.pnml index ae5510af..660a5049 100644 --- a/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_switch.pnml +++ b/src_Japanese/metro/Hankyu/6X00_series/6300_series/Hankyu_6300_switch.pnml @@ -1,18 +1,24 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ +// 도색명 +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Hankyu_6300_B); + return string(STR_REFIT_LIVERY_Hankyu_6300_A); +} + // 4량 switch (FEAT_TRAINS, SELF, sw_Hankyu_6300_4car, position_in_vehid_chain % 4) { 1:set_Hankyu_6300_panto_wagon; 2:set_Hankyu_6300_wagon; 3:set_Hankyu_6300_engineT; - set_Hankyu_6300_engineH; //default + set_Hankyu_6300_engineH_MC; //default } switch (FEAT_TRAINS, SELF, sw_Hankyu_6300_4car_r, position_in_vehid_chain % 4) { 1:set_Hankyu_6300_wagon_r; 2:set_Hankyu_6300_panto_wagon_r; - 3:set_Hankyu_6300_engineH_r; + 3:set_Hankyu_6300_engineH_MC_r; set_Hankyu_6300_engineT_r; //default } @@ -26,27 +32,79 @@ switch(FEAT_TRAINS, PARENT, sw_Hankyu_6300_4car_reversed, vehicle_is_reversed){ sw_Hankyu_6300_4car_flipped; } +// 8량 +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_engineH, cargo_subtype) { + 1: set_Hankyu_6300_engineH_MC; + set_Hankyu_6300_engineH_TC; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon_2Car, cargo_subtype) { + 1: set_Hankyu_6300_wagon; + set_Hankyu_6300_panto_wagon; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon, cargo_subtype) { + 1: set_Hankyu_6300_wagon; + set_Hankyu_6300_wagon; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon_7Car, cargo_subtype) { + 1: set_Hankyu_6300_panto_wagon; + set_Hankyu_6300_wagon; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_engineT, cargo_subtype) { + 1: set_Hankyu_6300_engineT; + set_Hankyu_6300_engineT; +} + +// 8량 뒤집힘 +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_engineH_r, cargo_subtype) { + 1: set_Hankyu_6300_engineH_MC_r; + set_Hankyu_6300_engineH_TC_r; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon_2Car_r, cargo_subtype) { + 1: set_Hankyu_6300_wagon_r; + set_Hankyu_6300_panto_wagon_r; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon_r, cargo_subtype) { + 1: set_Hankyu_6300_wagon_r; + set_Hankyu_6300_wagon_r; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_wagon_7Car_r, cargo_subtype) { + 1: set_Hankyu_6300_panto_wagon_r; + set_Hankyu_6300_wagon_r; +} + +switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_engineT_r, cargo_subtype) { + 1: set_Hankyu_6300_engineT_r; + set_Hankyu_6300_engineT_r; +} + // 8량 switch (FEAT_TRAINS, SELF, sw_Hankyu_6300_8car, position_in_vehid_chain % 8) { - 1:set_Hankyu_6300_panto_wagon; - 2:set_Hankyu_6300_wagon; - 3:set_Hankyu_6300_wagon; - 4:set_Hankyu_6300_wagon; - 5:set_Hankyu_6300_wagon; - 6:set_Hankyu_6300_wagon; - 7:set_Hankyu_6300_engineT; - set_Hankyu_6300_engineH; //default + 1:sw_Hankyu_6300_8car_wagon_2Car; + 2:sw_Hankyu_6300_8car_wagon; + 3:sw_Hankyu_6300_8car_wagon; + 4:sw_Hankyu_6300_8car_wagon; + 5:sw_Hankyu_6300_8car_wagon_2Car; + 6:sw_Hankyu_6300_8car_wagon_7Car; + 7:sw_Hankyu_6300_8car_engineT; + sw_Hankyu_6300_8car_engineH; //default } switch (FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_r, position_in_vehid_chain % 8) { - 1:set_Hankyu_6300_wagon_r; - 2:set_Hankyu_6300_wagon_r; - 3:set_Hankyu_6300_wagon_r; - 4:set_Hankyu_6300_wagon_r; - 5:set_Hankyu_6300_wagon_r; - 6:set_Hankyu_6300_panto_wagon_r; - 7:set_Hankyu_6300_engineH_r; - set_Hankyu_6300_engineT_r; //default + 1:sw_Hankyu_6300_8car_wagon_7Car_r; + 2:sw_Hankyu_6300_8car_wagon_2Car_r; + 3:sw_Hankyu_6300_8car_wagon_r; + 4:sw_Hankyu_6300_8car_wagon_r; + 5:sw_Hankyu_6300_8car_wagon_r; + 6:sw_Hankyu_6300_8car_wagon_2Car_r; + 7:sw_Hankyu_6300_8car_engineH_r; + sw_Hankyu_6300_8car_engineT_r; //default } switch(FEAT_TRAINS, SELF, sw_Hankyu_6300_8car_flipped, vehicle_is_flipped){ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000.png b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000.png index f467b3c4..1fec5c93 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000.png and b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_1998.png b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_1998.png index 023a5fab..806cf7ba 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_1998.png and b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_1998.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2009.png b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2009.png index 89f9c774..534cddd6 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2009.png and b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2009.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2011.png b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2011.png index 4ac90fc3..69528536 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2011.png and b/src_Japanese/metro/Hankyu/7X00_series/7000_series/Hankyu_7000_2011.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300.png b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300.png index d1c64fe8..e064791d 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300.png and b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_1998.png b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_1998.png index 7bafbe3b..45329324 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_1998.png and b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_1998.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2008.png b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2008.png index e29901a1..f3b074c9 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2008.png and b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2008.png differ diff --git a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2014.png b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2014.png index 99d3b433..9a060133 100644 Binary files a/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2014.png and b/src_Japanese/metro/Hankyu/7X00_series/7300_series/Hankyu_7300_2014.png differ