Add #198: 4x00 Diesel locomotive

KoreanGRF · May 5, 2024 · e422163 · e422163
1 parent d6ce174
commit e422163
Show file tree

Hide file tree

Showing 20 changed files with 248 additions and 22 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,6 +1,7 @@
 2.7.1+
 -----
  * 추가: 3x00호대 디젤 기관차 [#198]
+ * 추가: 4x00호대 디젤 기관차 [#198]
  * 변경: KTX-이음 그래픽 및 템플릿 변경
  * 변경: KTX-이음의 기관차 출력을 8800kW에서 6080kW로 변경 
  * 변경: 4x00호대 디젤 기관차의 이름을 4400호대로 변경

diff --git a/docs/download_page/_static/K4x00_1.png b/docs/download_page/_static/K4x00_1.png
diff --git a/docs/download_page/english.html b/docs/download_page/english.html
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00 Diesel Locomotive"><br /><img src="./_static/K4400_2.png" alt="4x00 Diesel Locomotive"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00 Diesel Locomotive"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00 Diesel Locomotive"></div></td>
         <td class="name">4x00 Diesel Locomotive</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400 Diesel Locomotive"><br /><img src="./_static/K4400_2.png" alt="4400 Diesel Locomotive"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400 Diesel Locomotive"></div></td>
+        <td class="name">4400 Diesel Locomotive</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/docs/download_page/english.md b/docs/download_page/english.md
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00 Diesel Locomotive"><br /><img src="./_static/K4400_2.png" alt="4x00 Diesel Locomotive"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00 Diesel Locomotive"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00 Diesel Locomotive"></div></td>
         <td class="name">4x00 Diesel Locomotive</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400 Diesel Locomotive"><br /><img src="./_static/K4400_2.png" alt="4400 Diesel Locomotive"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400 Diesel Locomotive"></div></td>
+        <td class="name">4400 Diesel Locomotive</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/docs/download_page/japanese.html b/docs/download_page/japanese.html
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00号帯ディーゼル機関車"><br /><img src="./_static/K4400_2.png" alt="4x00号帯ディーゼル機関車"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00号帯ディーゼル機関車"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00号帯ディーゼル機関車"></div></td>
         <td class="name">4x00号帯ディーゼル機関車</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400号帯ディーゼル機関車"><br /><img src="./_static/K4400_2.png" alt="4400号帯ディーゼル機関車"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400号帯ディーゼル機関車"></div></td>
+        <td class="name">4400号帯ディーゼル機関車</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/docs/download_page/japanese.md b/docs/download_page/japanese.md
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00号帯ディーゼル機関車"><br /><img src="./_static/K4400_2.png" alt="4x00号帯ディーゼル機関車"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00号帯ディーゼル機関車"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00号帯ディーゼル機関車"></div></td>
         <td class="name">4x00号帯ディーゼル機関車</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400号帯ディーゼル機関車"><br /><img src="./_static/K4400_2.png" alt="4400号帯ディーゼル機関車"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400号帯ディーゼル機関車"></div></td>
+        <td class="name">4400号帯ディーゼル機関車</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/docs/download_page/korean.html b/docs/download_page/korean.html
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00호대 디젤 기관차"><br /><img src="./_static/K4400_2.png" alt="4x00호대 디젤 기관차"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00호대 디젤 기관차"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00호대 디젤 기관차"></div></td>
         <td class="name">4x00호대 디젤 기관차</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400호대 디젤 기관차"><br /><img src="./_static/K4400_2.png" alt="4400호대 디젤 기관차"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400호대 디젤 기관차"></div></td>
+        <td class="name">4400호대 디젤 기관차</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/docs/download_page/korean.md b/docs/download_page/korean.md
@@ -55,16 +55,26 @@
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
-        <td class="power">1173 kW</td>
+        <td class="power">875 kW</td>
         <td class="weight">75 t</td>
         <td class="introduction">1958</td>
     </tr>
-    <tr data-veh_id="K4400">
-        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4x00호대 디젤 기관차"><br /><img src="./_static/K4400_2.png" alt="4x00호대 디젤 기관차"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4x00호대 디젤 기관차"></div></td>
+    <tr data-veh_id="K4X00">
+        <td class="refit"><div><img src="./_static/K4x00_1.png" alt="4x00호대 디젤 기관차"></div></td>
         <td class="name">4x00호대 디젤 기관차</td>
         <td class="speed">105 km/h</td>
         <td class="speed_designed">105 km/h</td>
         <td class="capacity"></td>
+        <td class="power">1310 kW</td>
+        <td class="weight">78 t</td>
+        <td class="introduction">1963</td>
+    </tr>
+    <tr data-veh_id="K4400">
+        <td class="refit"><div><img src="./_static/K4400_1.png" alt="4400호대 디젤 기관차"><br /><img src="./_static/K4400_2.png" alt="4400호대 디젤 기관차"><br /><img src="./_static/K4400_V_TRAIN.png" alt="4400호대 디젤 기관차"></div></td>
+        <td class="name">4400호대 디젤 기관차</td>
+        <td class="speed">105 km/h</td>
+        <td class="speed_designed">105 km/h</td>
+        <td class="capacity"></td>
         <td class="power">1230 kW</td>
         <td class="weight">88 t</td>
         <td class="introduction">2001</td>

diff --git a/lang/english.lng b/lang/english.lng
@@ -16,7 +16,8 @@ STR_PASHI5_NAME                                            :Pashi 5 Steam Locomo
 STR_MIKA3_NAME                                             :Mika 3 Steam Locomotive
 STR_K2x00_NAME                                             :2x00 Diesel Locomotive
 STR_K3x00_NAME                                             :3x00 Diesel Locomotive
-STR_K4400_NAME                                             :4x00 Diesel Locomotive
+STR_K4x00_NAME                                             :4x00 Diesel Locomotive
+STR_K4400_NAME                                             :4400 Diesel Locomotive
 STR_K5000_NAME                                             :5000 Diesel Locomotive
 STR_K6x00_NAME                                             :6x00 Diesel Locomotive
 STR_K7000_NAME                                             :7000 Diesel Locomotive
@@ -101,6 +102,9 @@ STR_REFIT_LIVERY_THESEDAYS                                 : (Current livery)
 STR_REFIT_LIVERY_2x00_BLACK                                : (US Army livery: Black)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_1                       : (KNR first livery: Black & Narrow Orange)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_2                       : (KNR first livery: Black & Wide Orange)
+STR_REFIT_LIVERY_4x00_BLACK_ORANGE_LOWER_AIR_CHAMBER       : (KNR old livery: Black & Orange, Lower air chamber)
+STR_REFIT_LIVERY_4x00_GREEN_YELLOW_LOWER_AIR_CHAMBER       : (KNR old livery: Green & Yellow, Lower air chamber)
+STR_REFIT_LIVERY_4300_BLUE_WHITE                           : (KNR: 4300 Blue & White)
 STR_REFIT_LIVERY_6000_BLACK_ORANGE                         : (KNR: 6000 Black & Orange)
 STR_REFIT_LIVERY_6100_BLACK_ORANGE                         : (KNR: 6100 Black & Orange)
 STR_REFIT_LIVERY_6200_BLACK_ORANGE                         : (KNR: 6200 Black & Orange)
@@ -112,6 +116,7 @@ STR_REFIT_LIVERY_7x00_CARGO                                : (Cargo livery)
 STR_REFIT_LIVERY_7x00_BLACK_ORANGE                         : (KNR first livery: Black & Orange)
 STR_REFIT_LIVERY_7x00_FIRST_KORAIL                         : (KNR first livery: Blue & White)
 STR_REFIT_LIVERY_KWANKWANG                                 : (Kwankwang-ho)
+STR_REFIT_LIVERY_BLUE_WHITE                                : (KNR old livery: Blue & White)
 STR_REFIT_LIVERY_BLACK_ORANGE                              : (KNR old livery: Black & Orange)
 STR_REFIT_LIVERY_GREEN_YELLOW                              : (KNR old livery: Green & Yellow)
 STR_REFIT_LIVERY_HAERANG                                   : (Rail cruise 'Haerang')

diff --git a/lang/japanese.lng b/lang/japanese.lng
@@ -15,7 +15,8 @@ STR_PASHI5_NAME                                            :バシ５形蒸気
 STR_MIKA3_NAME                                             :ミカ３形蒸気機関車
 STR_K2x00_NAME                                             :2x00号帯ディーゼル機関車
 STR_K3x00_NAME                                             :3x00号帯ディーゼル機関車
-STR_K4400_NAME                                             :4x00号帯ディーゼル機関車
+STR_K4x00_NAME                                             :4x00号帯ディーゼル機関車
+STR_K4400_NAME                                             :4400号帯ディーゼル機関車
 STR_K5000_NAME                                             :5000号帯ディーゼル機関車
 STR_K6x00_NAME                                             :6x00号帯ディーゼル機関車
 STR_K7000_NAME                                             :7000号帯ディーゼル機関車
@@ -100,6 +101,9 @@ STR_REFIT_LIVERY_THESEDAYS                                 :(現在塗色)
 STR_REFIT_LIVERY_2x00_BLACK                                :(米軍塗色：黒色)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_1                       :(韓国鉄道初期塗色：黒色＆狭い橙色)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_2                       :(韓国鉄道初期塗色：黒色＆広い橙色)
+STR_REFIT_LIVERY_4x00_BLACK_ORANGE_LOWER_AIR_CHAMBER       :(韓国鉄道旧塗色：黒色＆橙色、低い空気室)
+STR_REFIT_LIVERY_4x00_GREEN_YELLOW_LOWER_AIR_CHAMBER       :(韓国鉄道旧塗色：緑色＆黄色、低い空気室)
+STR_REFIT_LIVERY_4300_BLUE_WHITE                           :(韓国鉄道：4300号帯青色＆白色)
 STR_REFIT_LIVERY_6000_BLACK_ORANGE                         :(韓国鉄道初期塗色：6000号帯黒色＆狭い橙色)
 STR_REFIT_LIVERY_6100_BLACK_ORANGE                         :(韓国鉄道初期塗色：6100号帯黒色＆狭い橙色)
 STR_REFIT_LIVERY_6200_BLACK_ORANGE                         :(韓国鉄道初期塗色：6200号帯黒色＆狭い橙色)
@@ -113,6 +117,7 @@ STR_REFIT_LIVERY_7x00_FIRST_KORAIL                         :(韓国鉄道初期
 STR_REFIT_LIVERY_BLACK_ORANGE                              :(韓国鉄道旧塗色：黒色＆橙色)
 STR_REFIT_LIVERY_GREEN_YELLOW                              :(韓国鉄道旧塗色：緑色＆黄色)
 STR_REFIT_LIVERY_KWANKWANG                                 :(観光号)
+STR_REFIT_LIVERY_BLUE_WHITE                                :(韓国鉄道旧塗色：青色＆白色)
 STR_REFIT_LIVERY_HAERANG                                   :(ヘラン)
 STR_REFIT_LIVERY_S_TRAIN1                                  :(S-train·青色)
 STR_REFIT_LIVERY_S_TRAIN2                                  :(S-train·ピンク)

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -16,7 +16,8 @@ STR_PASHI5_NAME                                            :파시 5형 증기
 STR_MIKA3_NAME                                             :미카 3형 증기 기관차
 STR_K2x00_NAME                                             :2x00호대 디젤 기관차
 STR_K3x00_NAME                                             :3x00호대 디젤 기관차
-STR_K4400_NAME                                             :4x00호대 디젤 기관차
+STR_K4x00_NAME                                             :4x00호대 디젤 기관차
+STR_K4400_NAME                                             :4400호대 디젤 기관차
 STR_K5000_NAME                                             :5000호대 디젤 기관차
 STR_K6x00_NAME                                             :6x00호대 디젤 기관차
 STR_K7000_NAME                                             :7000호대 디젤 기관차
@@ -101,6 +102,9 @@ STR_REFIT_LIVERY_THESEDAYS                                 : (현재 도색)
 STR_REFIT_LIVERY_2x00_BLACK                                : (미군 도색: 검정)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_1                       : (철도청 초기 도색: 검정 & 좁은 주황)
 STR_REFIT_LIVERY_2x00_BLACK_ORANGE_2                       : (철도청 초기 도색: 검정 & 넓은 주황)
+STR_REFIT_LIVERY_4x00_BLACK_ORANGE_LOWER_AIR_CHAMBER       : (철도청 구 도색: 검정 & 주황, 낮은 공기실함)
+STR_REFIT_LIVERY_4x00_GREEN_YELLOW_LOWER_AIR_CHAMBER       : (철도청 구 도색: 녹색 & 황색, 낮은 공기실함)
+STR_REFIT_LIVERY_4300_BLUE_WHITE                           : (철도청: 4300호대 청색 & 백색)
 STR_REFIT_LIVERY_6000_BLACK_ORANGE                         : (철도청: 6000호대 검정 & 주황)
 STR_REFIT_LIVERY_6100_BLACK_ORANGE                         : (철도청: 6100호대 검정 & 주황)
 STR_REFIT_LIVERY_6200_BLACK_ORANGE                         : (철도청: 6200호대 검정 & 주황)
@@ -113,6 +117,7 @@ STR_REFIT_LIVERY_7x00_BLACK_ORANGE                         : (철도청 초기
 STR_REFIT_LIVERY_7x00_FIRST_KORAIL                         : (철도청 초기 도색: 청색 & 백색)
 STR_REFIT_LIVERY_BLACK_ORANGE                              : (철도청 구 도색: 검정 & 주황)
 STR_REFIT_LIVERY_GREEN_YELLOW                              : (철도청 구 도색: 녹색 & 황색)
+STR_REFIT_LIVERY_BLUE_WHITE                                : (철도청 구 도색: 청색 & 백색)
 STR_REFIT_LIVERY_KWANKWANG                                 : (관광호)
 STR_REFIT_LIVERY_HAERANG                                   : (해랑)
 STR_REFIT_LIVERY_S_TRAIN1                                  : (S-train - 파랑)

diff --git a/src/locomotive/K4400/K4400.pnml b/src/locomotive/K4400/K4400.pnml
@@ -28,6 +28,7 @@ item(FEAT_TRAINS, ko_train_K4400, 5440) {
         engine_class:                   ENGINE_CLASS_DIESEL;
         sprite_id:                      SPRITE_ID_NEW_TRAIN;
         length:                         6;
+        variant_group:                  ko_train_K4x00;
 
         // Spec
         speed:                          105 km/h;

diff --git a/src/locomotive/K4x00/K4x00.png b/src/locomotive/K4x00/K4x00.png