From 50be9d04b818e351a725f5761dbcc11a0d37f7da Mon Sep 17 00:00:00 2001 From: EightonEight Date: Wed, 29 May 2024 16:06:00 +0900 Subject: [PATCH] Add #382: Seoul Line 4 5th livery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 추가: 수도권 4호선 5차 도입분 도색 --- docs/changelog.md | 1 + lang/english.lng | 1 + lang/japanese.lng | 1 + lang/korean.lng | 1 + src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png | Bin 0 -> 5710 bytes .../seoul_metro_4/seoul_metro_4_graphic.pnml | 17 +++++++++++++++++ .../seoul_metro_4/seoul_metro_4_switch.pnml | 5 +++++ 7 files changed, 26 insertions(+) create mode 100644 src/metro/seoul_metro_4/SMETRO_4K_VVVF_5TH.png 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 0000000000000000000000000000000000000000..f548155cbcdbd3910c654dc01648a0872e18caf9 GIT binary patch literal 5710 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