Add: Old Mugunghwa & Tongil sleeping car livery

Add old Mugunghwa & Tongil sleeping car livery Closes #220
KoreanGRF · Jul 25, 2023 · a26d14e · a26d14e
1 parent 7845c39
commit a26d14e
Show file tree

Hide file tree

Showing 20 changed files with 99 additions and 24 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -4,6 +4,8 @@
  * 추가: "차량 길이 제한 끄기" 매개 변수 추가
  * 추가: 수도권 4호선 4차 도입분 도색
  * 추가: 부산 1호선 3세대 도색
+ * 추가: 무궁화호 구형 침대차 도색 [#220]
+ * 추가: 통일호 침대차 도색
  * 추가: 벌크시멘트 화차 [#372]
  * 변경: 컨테이너 평판화차, 평판화차의 그래픽과 길이 변경 [#403, #157]
  * 변경: 유조차 그래픽 변경 [#372]

diff --git a/docs/download_page/_static/SLEEPING_CAR_1.png b/docs/download_page/_static/SLEEPING_CAR_1.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_2.png b/docs/download_page/_static/SLEEPING_CAR_2.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_5.png b/docs/download_page/_static/SLEEPING_CAR_5.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_6.png b/docs/download_page/_static/SLEEPING_CAR_6.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_7.png b/docs/download_page/_static/SLEEPING_CAR_7.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_8.png b/docs/download_page/_static/SLEEPING_CAR_8.png
diff --git a/docs/download_page/_static/SLEEPING_CAR_9.png b/docs/download_page/_static/SLEEPING_CAR_9.png
diff --git a/docs/download_page/english.html b/docs/download_page/english.html
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="Sleeping car"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="Sleeping car"></div></td>
         <td class="name">Sleeping car</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/docs/download_page/english.md b/docs/download_page/english.md
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="Sleeping car"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="Sleeping car"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="Sleeping car"></div></td>
         <td class="name">Sleeping car</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/docs/download_page/japanese.html b/docs/download_page/japanese.html
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="寝台車"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="寝台車"></div></td>
         <td class="name">寝台車</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/docs/download_page/japanese.md b/docs/download_page/japanese.md
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="寝台車"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="寝台車"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="寝台車"></div></td>
         <td class="name">寝台車</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/docs/download_page/korean.html b/docs/download_page/korean.html
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="침대차"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="침대차"></div></td>
         <td class="name">침대차</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/docs/download_page/korean.md b/docs/download_page/korean.md
@@ -690,7 +690,7 @@
         <td class="introduction">1950</td>
     </tr>
     <tr data-veh_id="SLEEPING_CAR">
-        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="침대차"></div></td>
+        <td class="refit"><div><img src="./_static/SLEEPING_CAR_1.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_2.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_5.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_6.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_7.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_8.png" alt="침대차"><br /><img src="./_static/SLEEPING_CAR_9.png" alt="침대차"></div></td>
         <td class="name">침대차</td>
         <td class="speed"></td>
         <td class="speed_designed"></td>

diff --git a/lang/english.lng b/lang/english.lng
@@ -214,8 +214,14 @@ STR_REFIT_LIVERY_RESTAURENT_SAEMAEUL_BLUE_YELLOW           : (Saemaeul restauran
 STR_REFIT_LIVERY_CAFE_SAEMAEUL_BLUE_YELLOW                 : (Saemaeul cafe / Korail current livery)
 
 # Refit (Sleeping car)
-STR_REFIT_LIVERY_SLEEPING_CAR_OLD                          : (Old livery)
-STR_REFIT_LIVERY_SLEEPING_CAR_RECENT                       : (Recent livery)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN                       : (1966 livery: Green)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN_COOLER                : (1966 livery: Green with cooler)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       : (reserved)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       : (reserved)
+STR_REFIT_LIVERY_SLEEPING_1977_GREEN                       : (1977 livery: Green)
+STR_REFIT_LIVERY_SLEEPING_1977_RED                         : (1977 livery: Red)
+STR_REFIT_LIVERY_SLEEPING_1977_YELLOW_RED                  : (1977 livery: Yellow & Red)
+STR_REFIT_LIVERY_SLEEPING_2001_YELLOW_RED                  : (2001 livery: Yellow & Red)
 
 # Refit (NDC)
 STR_REFIT_LIVERY_NDC_1                                     : (Livery: 1984~1994)

diff --git a/lang/japanese.lng b/lang/japanese.lng
@@ -213,8 +213,14 @@ STR_REFIT_LIVERY_RESTAURENT_SAEMAEUL_BLUE_YELLOW           :(セマウル号食
 STR_REFIT_LIVERY_CAFE_SAEMAEUL_BLUE_YELLOW                 :(セマウル号カフェ車・Korail現在塗色)
 
 # Refit (Sleeping car)
-STR_REFIT_LIVERY_SLEEPING_CAR_OLD                          :(旧塗色)
-STR_REFIT_LIVERY_SLEEPING_CAR_RECENT                       :(新塗色)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN                       :(1966年：緑色)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN_COOLER                :(1966年：冷房機ある緑色)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       :(reserved)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       :(reserved)
+STR_REFIT_LIVERY_SLEEPING_1977_GREEN                       :(1977年：緑色)
+STR_REFIT_LIVERY_SLEEPING_1977_RED                         :(1977年：赤色)
+STR_REFIT_LIVERY_SLEEPING_1977_YELLOW_RED                  :(1977年：黄色＆赤色)
+STR_REFIT_LIVERY_SLEEPING_2001_YELLOW_RED                  :(2001年：黄色＆赤色)
 
 # Refit (NDC)
 STR_REFIT_LIVERY_NDC_1                                     :(1984~1994年塗色)

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -214,8 +214,14 @@ STR_REFIT_LIVERY_RESTAURENT_SAEMAEUL_BLUE_YELLOW           : (새마을호 식
 STR_REFIT_LIVERY_CAFE_SAEMAEUL_BLUE_YELLOW                 : (새마을호 카페차 / Korail 현 도색)
 
 # Refit (Sleeping car)
-STR_REFIT_LIVERY_SLEEPING_CAR_OLD                          : (구 도색)
-STR_REFIT_LIVERY_SLEEPING_CAR_RECENT                       : (신 도색)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN                       : (1966년: 녹색)
+STR_REFIT_LIVERY_SLEEPING_1966_GREEN_COOLER                : (1966년: 냉방기 있는 녹색)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       : (reserved)
+# STR_REFIT_LIVERY_SLEEPING_RESERVED                       : (reserved)
+STR_REFIT_LIVERY_SLEEPING_1977_GREEN                       : (1977년: 녹색)
+STR_REFIT_LIVERY_SLEEPING_1977_RED                         : (1977년: 빨강)
+STR_REFIT_LIVERY_SLEEPING_1977_YELLOW_RED                  : (1977년: 노랑 & 빨강)
+STR_REFIT_LIVERY_SLEEPING_2001_YELLOW_RED                  : (2001년: 노랑 & 빨강)
 
 # Refit (NDC)
 STR_REFIT_LIVERY_NDC_1                                     : (1984~1994년 도색)

diff --git a/src/wagon/sleeping_car/SLEEPING_CAR.png b/src/wagon/sleeping_car/SLEEPING_CAR.png
diff --git a/src/wagon/sleeping_car/sleeping_car_graphic.pnml b/src/wagon/sleeping_car/sleeping_car_graphic.pnml
@@ -4,23 +4,64 @@
   * Github repository      : https://github.com/KoreanGRF/KoreanTrainSet
 ------------------------------------------------------------------------------*/
 
-// Graphic
-spriteset(set_SLEEPING_CAR_1_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+// 1966: Green
+spriteset(set_SLEEPING_CAR_1966_GREEN_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
     tmpl_purchase_common(0, 0)
 }
-spriteset(set_SLEEPING_CAR_1_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
-    tmpl_wagon_by_coor_8dir(80, 0)
+spriteset(set_SLEEPING_CAR_1966_GREEN_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 0)
 }
 
-spriteset(set_SLEEPING_CAR_2_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+// 1966: Green with cooler
+spriteset(set_SLEEPING_CAR_1966_GREEN_COOLER_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
     tmpl_purchase_common(0, 30)
 }
-spriteset(set_SLEEPING_CAR_2_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
-    tmpl_wagon_by_coor_8dir(80, 30)
+spriteset(set_SLEEPING_CAR_1966_GREEN_COOLER_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 30)
+}
+
+// 1977: Green
+spriteset(set_SLEEPING_CAR_1977_GREEN_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_purchase_common(0, 120)
+}
+spriteset(set_SLEEPING_CAR_1977_GREEN_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 120)
+}
+
+// 1977: Red
+spriteset(set_SLEEPING_CAR_1977_RED_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_purchase_common(0, 150)
+}
+spriteset(set_SLEEPING_CAR_1977_RED_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 150)
+}
+
+// 1977: Yellow & Red
+spriteset(set_SLEEPING_CAR_1977_YELLOW_RED_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_purchase_common(0, 180)
+}
+spriteset(set_SLEEPING_CAR_1977_YELLOW_RED_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 180)
+}
+
+// 2001: Yellow & Red
+spriteset(set_SLEEPING_CAR_2001_YELLOW_RED_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_purchase_common(0, 210)
+}
+spriteset(set_SLEEPING_CAR_2001_YELLOW_RED_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 210)
+}
+
+// 2001: Blue & Red, Current Livery
+spriteset(set_SLEEPING_CAR_2001_BLUE_RED_purchase, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_purchase_common(0, 240)
+}
+spriteset(set_SLEEPING_CAR_2001_BLUE_RED_wagon, "./src/wagon/sleeping_car/SLEEPING_CAR.png") {
+    tmpl_standard(80, 240)
 }
 
 
 // Alias of purchase image
 switch(FEAT_TRAINS, SELF, sw_SLEEPING_CAR_purchase, cargo_subtype) {
-    set_SLEEPING_CAR_2_purchase;
+    set_SLEEPING_CAR_2001_BLUE_RED_purchase;
 }
diff --git a/src/wagon/sleeping_car/sleeping_car_switch.pnml b/src/wagon/sleeping_car/sleeping_car_switch.pnml
@@ -6,12 +6,26 @@
 
 // Cargo subtype
 switch(FEAT_TRAINS, SELF, sw_SLEEPING_CAR_cargo_subtype_text, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_SLEEPING_CAR_OLD);
-    return string(STR_REFIT_LIVERY_SLEEPING_CAR_RECENT);
+    1: return string(STR_REFIT_LIVERY_SLEEPING_1966_GREEN);
+    2: return string(STR_REFIT_LIVERY_SLEEPING_1966_GREEN_COOLER);
+    // 3: // RESERVED
+    // 4: // RESERVED
+    5: return string(STR_REFIT_LIVERY_SLEEPING_1977_GREEN);
+    6: return string(STR_REFIT_LIVERY_SLEEPING_1977_RED);
+    7: return string(STR_REFIT_LIVERY_SLEEPING_1977_YELLOW_RED);
+    8: return string(STR_REFIT_LIVERY_SLEEPING_2001_YELLOW_RED);
+    return string(STR_REFIT_LIVERY_THESEDAYS);
 }
 
 // Graphic
 switch(FEAT_TRAINS, SELF, sw_SLEEPING_CAR_wagon, cargo_subtype) {
-    1: set_SLEEPING_CAR_1_wagon;
-    set_SLEEPING_CAR_2_wagon;
+    1: set_SLEEPING_CAR_1966_GREEN_wagon;
+    2: set_SLEEPING_CAR_1966_GREEN_COOLER_wagon;
+    // 3: // RESERVED
+    // 4: // RESERVED
+    5: set_SLEEPING_CAR_1977_GREEN_wagon;
+    6: set_SLEEPING_CAR_1977_RED_wagon;
+    7: set_SLEEPING_CAR_1977_YELLOW_RED_wagon;
+    8: set_SLEEPING_CAR_2001_YELLOW_RED_wagon;
+    set_SLEEPING_CAR_2001_BLUE_RED_wagon;
 }