Add #304: Seoul Line 4 4th livery

수도권 4호선 4차 도입분 도색
KoreanGRF · Jul 14, 2023 · 51b76d5 · 51b76d5
1 parent 9a9f52e
commit 51b76d5
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 6 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,7 @@
 -----
  * 추가: "차량 연결 제한 끄기" 매개 변수 추가
  * 추가: "차량 길이 제한 끄기" 매개 변수 추가
+ * 추가: 수도권 4호선 4차 도입분 도색
  * 변경: 컨테이너 평판화차, 평판화차의 그래픽과 길이 변경 [#403, #157]
  * 수정: 수도권 1호선, 통근형 - 371k 무도색 차량의 ↖방향 정렬이 어긋난 현상 [#416]
 

diff --git a/docs/download_page/_static/SMETRO_4K_VVVF_4TH.png b/docs/download_page/_static/SMETRO_4K_VVVF_4TH.png
diff --git a/docs/download_page/english.html b/docs/download_page/english.html
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2019.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2021.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="Seoul Line 4"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2019.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2021.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="Seoul Line 4"></div></td>
         <td class="name">Seoul Line 4</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/docs/download_page/english.md b/docs/download_page/english.md
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2019.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2021.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="Seoul Line 4"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="Seoul Line 4"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2019.png" alt="Seoul Line 4"><br /><img src="./_static/LINE_4_2021.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="Seoul Line 4"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="Seoul Line 4"></div></td>
         <td class="name">Seoul Line 4</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/docs/download_page/japanese.html b/docs/download_page/japanese.html
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2019.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2021.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="首都圏4号線"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2019.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2021.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="首都圏4号線"></div></td>
         <td class="name">首都圏4号線</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/docs/download_page/japanese.md b/docs/download_page/japanese.md
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2019.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2021.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="首都圏4号線"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="首都圏4号線"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2019.png" alt="首都圏4号線"><br /><img src="./_static/LINE_4_2021.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="首都圏4号線"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="首都圏4号線"></div></td>
         <td class="name">首都圏4号線</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/docs/download_page/korean.html b/docs/download_page/korean.html
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2019.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2021.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="수도권 4호선"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2019.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2021.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="수도권 4호선"></div></td>
         <td class="name">수도권 4호선</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/docs/download_page/korean.md b/docs/download_page/korean.md
@@ -340,7 +340,7 @@
         <td class="introduction">1983</td>
     </tr>
     <tr data-veh_id="SEOUL_METRO_4">
-        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2019.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2021.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="수도권 4호선"></div></td>
+        <td class="refit"><div><img src="./_static/341K_VVVF_2ND_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_1.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_1ST_2.png" alt="수도권 4호선"><br /><img src="./_static/341K_VVVF_2ND_2.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2019.png" alt="수도권 4호선"><br /><img src="./_static/LINE_4_2021.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_1ST_2ND.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_3RD.png" alt="수도권 4호선"><br /><img src="./_static/SMETRO_4K_VVVF_4TH.png" alt="수도권 4호선"></div></td>
         <td class="name">수도권 4호선</td>
         <td class="speed">100 km/h</td>
         <td class="speed_designed">100 km/h</td>

diff --git a/lang/english.lng b/lang/english.lng
@@ -306,6 +306,7 @@ STR_REFIT_METRO_LINE_4_2019_NAME                           : (Korail, introduced
 STR_REFIT_METRO_LINE_4_2021_NAME                           : (Korail, introduced in 2021)
 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)
 
 # 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
@@ -305,6 +305,7 @@ STR_REFIT_METRO_LINE_4_2019_NAME                           :(Korail 4号線 2019
 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年導入分)
 
 # 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
@@ -306,6 +306,7 @@ STR_REFIT_METRO_LINE_4_2019_NAME                           : (Korail 4호선 201
 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년 도입분)
 
 # 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_4TH.png b/src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.png
diff --git a/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml b/src/metro/seoul_metro_4/seoul_metro_4_graphic.pnml
@@ -146,6 +146,23 @@ spriteset(set_SMETRO_4K_VVVF_3RD_purchase, "./src/metro/seoul_metro_4/SMETRO_4K_
     tmpl_purchase_common_dualhead(0, 0)
 }
 
+// SMETRO_4K_VVVF_4TH
+spriteset(set_SMETRO_4K_VVVF_4TH_engineH, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.png") {
+    tmpl_standard(0, 0)
+}
+spriteset(set_SMETRO_4K_VVVF_4TH_wagon_panto, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.png") {
+    tmpl_standard(0, 30)
+}
+spriteset(set_SMETRO_4K_VVVF_4TH_wagon, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.png") {
+    tmpl_standard(0, 60)
+}
+spriteset(set_SMETRO_4K_VVVF_4TH_engineT, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.png") {
+    tmpl_standard(0, 90)
+}
+spriteset(set_SMETRO_4K_VVVF_4TH_purchase, "./src/metro/seoul_metro_4/SMETRO_4K_VVVF_4TH.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
@@ -15,6 +15,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_cargo_subtype_text, cargo_subtype) {
     6: return string(STR_REFIT_METRO_LINE_4_2019_NAME);
     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);
     return string(STR_REFIT_METRO_341K_VVVF_2ND_2_NAME);
 }
 
@@ -29,6 +30,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineH, cargo_subtype) {
     6: set_LINE_4_2019_engineH;
     7: set_SMETRO_4K_VVVF_3RD_engineH;
     8: set_LINE_4_2021_engineH;
+    9: set_SMETRO_4K_VVVF_4TH_engineH;
     set_341K_VVVF_2ND_2_engineH;
 }
 switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineT, cargo_subtype) {
@@ -41,6 +43,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_engineT, cargo_subtype) {
     6: set_LINE_4_2019_engineT;
     7: set_SMETRO_4K_VVVF_3RD_engineT;
     8: set_LINE_4_2021_engineT;
+    9: set_SMETRO_4K_VVVF_4TH_engineT;
     set_341K_VVVF_2ND_2_engineT;
 }
 
@@ -67,6 +70,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_panto_cargo_subtype, cargo_subt
     6: sw_LINE_4_2019_wagon_panto;
     7: set_SMETRO_4K_VVVF_3RD_wagon_panto;
     8: sw_LINE_4_2021_wagon_panto;
+    9: set_SMETRO_4K_VVVF_4TH_wagon_panto;
     set_341K_VVVF_2ND_2_wagon_panto;
 }
 switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_cargo_subtype, cargo_subtype) {
@@ -79,6 +83,7 @@ switch(FEAT_TRAINS, SELF, sw_SEOUL_METRO_4_wagon_cargo_subtype, cargo_subtype) {
     6: set_LINE_4_2019_wagon;
     7: set_SMETRO_4K_VVVF_3RD_wagon;
     8: set_LINE_4_2021_wagon;
+    9: set_SMETRO_4K_VVVF_4TH_wagon;
     set_341K_VVVF_2ND_2_wagon;
 }