diff --git a/docs/changelog.md b/docs/changelog.md index 000deb9b..adce2c72 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,7 @@ ----- * 추가: 3x00호대 디젤 기관차 [#198] * 추가: 4x00호대 디젤 기관차 [#198] + * 추가: 수도권 4호선 5차 도입분 도색 [#382] * 변경: KTX-이음 그래픽 및 템플릿 변경 * 변경: KTX-이음의 기관차 출력을 8800kW에서 6080kW로 변경 * 변경: 4x00호대 디젤 기관차의 이름을 4400호대로 변경 diff --git a/lang/english.lng b/lang/english.lng index 434e32d4..24e902ab 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -340,6 +340,7 @@ STR_REFIT_METRO_LINE_4_2021_NAME : (Korail, introduced STR_REFIT_METRO_SMETRO_4K_VVVF_1ST_2ND_NAME : (SMetro 4k 1st·2nd VVVF) STR_REFIT_METRO_SMETRO_4K_VVVF_3RD_NAME : (SMetro 4k 3rd VVVF in 2020) STR_REFIT_METRO_SMETRO_4K_VVVF_4TH_NAME : (SMetro 4k 4th VVVF in 2023) +STR_REFIT_METRO_SMETRO_4K_VVVF_5TH_NAME : (SMetro 4k 5th VVVF in 2024) # Refit (Seoul Metro Line 5-8, Seoul Metro Line9) STR_REFIT_METRO_SMETRO_SR0X_NAME : (SMetro SR0x VVVF) diff --git a/lang/japanese.lng b/lang/japanese.lng index 9860fa28..e70f616a 100644 --- a/lang/japanese.lng +++ b/lang/japanese.lng @@ -339,6 +339,7 @@ STR_REFIT_METRO_LINE_4_2021_NAME :(Korail 4号線 2021 STR_REFIT_METRO_SMETRO_4K_VVVF_1ST_2ND_NAME :(SMetro 4k 1·2世代 VVVF) STR_REFIT_METRO_SMETRO_4K_VVVF_3RD_NAME :(SMetro 4k 3世代 VVVF 2020年導入分) STR_REFIT_METRO_SMETRO_4K_VVVF_4TH_NAME :(SMetro 4k 4世代 VVVF 2023年導入分) +STR_REFIT_METRO_SMETRO_4K_VVVF_5TH_NAME :(SMetro 4k 5世代 VVVF 2024年導入分) # Refit (Seoul Metro Line 5-8、Seoul Metro Line9) STR_REFIT_METRO_SMETRO_SR0X_NAME :(ソウル交通公社 SR0x VVVF) diff --git a/lang/korean.lng b/lang/korean.lng index 999fbca2..dd59c2f0 100644 --- a/lang/korean.lng +++ b/lang/korean.lng @@ -340,6 +340,7 @@ STR_REFIT_METRO_LINE_4_2021_NAME : (Korail 4호선 202 STR_REFIT_METRO_SMETRO_4K_VVVF_1ST_2ND_NAME : (SMetro 4k 1·2세대 VVVF) STR_REFIT_METRO_SMETRO_4K_VVVF_3RD_NAME : (SMetro 4k 3세대 VVVF 2020년 도입분) STR_REFIT_METRO_SMETRO_4K_VVVF_4TH_NAME : (SMetro 4k 4세대 VVVF 2023년 도입분) +STR_REFIT_METRO_SMETRO_4K_VVVF_5TH_NAME : (SMetro 4k 5세대 VVVF 2024년 도입분) # Refit (Seoul Metro Line 5-8, Seoul Metro Line9) STR_REFIT_METRO_SMETRO_SR0X_NAME : (서울교통공사 SR0x VVVF) diff --git a/src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png b/src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png new file mode 100644 index 00000000..f548155c Binary files /dev/null and b/src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png differ diff --git a/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml b/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml index 60d79630..8f66a7df 100644 --- a/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml +++ b/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml @@ -163,6 +163,23 @@ spriteset(set_SMETRO_4K_VVVF_4TH_purchase, "./src/metro/seoul_metro_4/SMETRO_4K_ tmpl_purchase_common_dualhead(0, 0) } +// SMETRO_4K_VVVF_5TH +spriteset(set_SMETRO_4K_VVVF_5TH_engineH, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png") { + tmpl_standard(80, 0) +} +spriteset(set_SMETRO_4K_VVVF_5TH_wagon_panto, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png") { + tmpl_standard(80, 30) +} +spriteset(set_SMETRO_4K_VVVF_5TH_wagon, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png") { + tmpl_standard(80, 60) +} +spriteset(set_SMETRO_4K_VVVF_5TH_engineT, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png") { + tmpl_standard(80, 90) +} +spriteset(set_SMETRO_4K_VVVF_5TH_purchase, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png") { + tmpl_purchase_common_dualhead(0, 0) +} + // Alias of purchase image switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_purchase, cargo_subtype) { set_341K_VVVF_2ND_2_purchase; diff --git a/src/metro/seoul_metro_4/seoul_metro_4_switch.pnml b/src/metro/seoul_metro_4/seoul_metro_4_switch.pnml index 4207ea5f..c0a3e6b3 100644 --- a/src/metro/seoul_metro_4/seoul_metro_4_switch.pnml +++ b/src/metro/seoul_metro_4/seoul_metro_4_switch.pnml @@ -16,6 +16,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_cargo_subtype_text, cargo_subtype) { 7: return string(STR_REFIT_METRO_SMETRO_4K_VVVF_3RD_NAME); 8: return string(STR_REFIT_METRO_LINE_4_2021_NAME); 9: return string(STR_REFIT_METRO_SMETRO_4K_VVVF_4TH_NAME); + 10: return string(STR_REFIT_METRO_SMETRO_4K_VVVF_5TH_NAME); return string(STR_REFIT_METRO_341K_VVVF_2ND_2_NAME); } @@ -31,6 +32,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineH, cargo_subtype) { 7: set_SMETRO_4K_VVVF_3RD_engineH; 8: set_LINE_4_2021_engineH; 9: set_SMETRO_4K_VVVF_4TH_engineH; + 10: set_SMETRO_4K_VVVF_5TH_engineH; set_341K_VVVF_2ND_2_engineH; } switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineT, cargo_subtype) { @@ -44,6 +46,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineT, cargo_subtype) { 7: set_SMETRO_4K_VVVF_3RD_engineT; 8: set_LINE_4_2021_engineT; 9: set_SMETRO_4K_VVVF_4TH_engineT; + 10: set_SMETRO_4K_VVVF_5TH_engineT; set_341K_VVVF_2ND_2_engineT; } @@ -71,6 +74,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_panto_cargo_subtype, cargo_subt 7: set_SMETRO_4K_VVVF_3RD_wagon_panto; 8: sw_LINE_4_2021_wagon_panto; 9: set_SMETRO_4K_VVVF_4TH_wagon_panto; + 10: set_SMETRO_4K_VVVF_5TH_wagon_panto; set_341K_VVVF_2ND_2_wagon_panto; } switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_cargo_subtype, cargo_subtype) { @@ -84,6 +88,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_cargo_subtype, cargo_subtype) { 7: set_SMETRO_4K_VVVF_3RD_wagon; 8: set_LINE_4_2021_wagon; 9: set_SMETRO_4K_VVVF_4TH_wagon; + 10: set_SMETRO_4K_VVVF_5TH_wagon; set_341K_VVVF_2ND_2_wagon; }