Change & Fix: Graphics of DHC PP and livery names.

Closes #455
KoreanGRF · Dec 12, 2023 · b49a1c2 · b49a1c2
1 parent 848c748
commit b49a1c2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 8 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,6 +1,8 @@
 2.6.3+
 -----
+ * 변경: 디젤 유압동차 (DHC, PP) 그래픽 변경 [#455]
  * 변경: KTX-1 그래픽 변경 [#454]
+ * 수정: 디젤 유압동차 (DHC, PP)의 1970~1983년 도색 이름이 '우등 녹색'으로 표기되는 현상
 
 2.6.2
 -----

diff --git a/docs/download_page/_static/DHC_1.png b/docs/download_page/_static/DHC_1.png
diff --git a/docs/download_page/_static/DHC_2.png b/docs/download_page/_static/DHC_2.png
diff --git a/docs/download_page/_static/DHC_3.png b/docs/download_page/_static/DHC_3.png
diff --git a/lang/english.lng b/lang/english.lng
@@ -153,6 +153,7 @@ STR_REFIT_EUM320                                           : (EUM-320)
 
 # Refit (Saemaeul car)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_SILVER_BLUE            : (KNR old executive car livery: 1970~1983)
+STR_REFIT_LIVERY_SAEMAEUL_1970_1983                        : (Livery: 1970~1983, Red & Silver)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_GREEN_YELLOW           : (KNR old executive car livery: Green & Yellow)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_THESEDAYS              : (Korail recent executive car livery)
 STR_REFIT_LIVERY_SAEMAEUL_ITX                              : (ITX-Saemaeul livery)

diff --git a/lang/japanese.lng b/lang/japanese.lng
@@ -152,6 +152,7 @@ STR_REFIT_EUM320                                           :(イウム-320)
 
 # Refit (Saemaeul car)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_SILVER_BLUE            :(韓国鉄道旧塗色特室、1970~1983年)
+STR_REFIT_LIVERY_SAEMAEUL_1970_1983                        :(塗色：1970~1983年 / 赤色＆銀色)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_GREEN_YELLOW           :(韓国鉄道旧塗色特室、緑色＆黄色)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_THESEDAYS              :(Korail 現在塗色特室)
 STR_REFIT_LIVERY_SAEMAEUL_ITX                              :(ITX-セマウル塗色)

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -153,6 +153,7 @@ STR_REFIT_EUM320                                           : (이음 320)
 
 # Refit (Saemaeul car)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_SILVER_BLUE            : (철도청 구 도색 특실, 1970~1983년)
+STR_REFIT_LIVERY_SAEMAEUL_1970_1983                        : (1970~1983년 도색, 적색 & 은색)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_GREEN_YELLOW           : (철도청 구 도색 특실, 녹색 & 황색)
 STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_THESEDAYS              : (Korail 현 도색 특실)
 STR_REFIT_LIVERY_SAEMAEUL_ITX                              : (ITX-새마을 도색)

diff --git a/src/locomotive/saemaeul/DHC.png b/src/locomotive/saemaeul/DHC.png
diff --git a/src/locomotive/saemaeul/DHC_graphic.pnml b/src/locomotive/saemaeul/DHC_graphic.pnml
@@ -9,30 +9,30 @@ spriteset(set_DHC_1_purchase, "./src/locomotive/saemaeul/DHC.png") {
     tmpl_purchase_common_dualhead(0, 0)
 }
 spriteset(set_DHC_1_engineH, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 0)
+    tmpl_standard(80, 0)
 }
 spriteset(set_DHC_1_engineT, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 30)
+    tmpl_standard(80, 30)
 }
 
 spriteset(set_DHC_2_purchase, "./src/locomotive/saemaeul/DHC.png") {
     tmpl_purchase_common_dualhead(0, 60)
 }
 spriteset(set_DHC_2_engineH, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 60)
+    tmpl_standard(80, 60)
 }
 spriteset(set_DHC_2_engineT, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 90)
+    tmpl_standard(80, 90)
 }
 
 spriteset(set_DHC_3_purchase, "./src/locomotive/saemaeul/DHC.png") {
     tmpl_purchase_common_dualhead(0, 120)
 }
 spriteset(set_DHC_3_engineH, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 120)
+    tmpl_standard(80, 120)
 }
 spriteset(set_DHC_3_engineT, "./src/locomotive/saemaeul/DHC.png") {
-    tmpl_loco_saemaeul(80, 150)
+    tmpl_standard(80, 150)
 }
 
 // Alias of purchase image

diff --git a/src/locomotive/saemaeul/DHC_switch.pnml b/src/locomotive/saemaeul/DHC_switch.pnml
@@ -23,7 +23,7 @@ switch(FEAT_TRAINS, SELF, sw_DHC_engine, position_in_consist_from_end == 0 && nu
 // Cargo subtype
 // Same as sw_SAEMAEUL_CAR_subtype_text
 switch(FEAT_TRAINS, SELF, sw_DHC_subtype_text, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_MUGUNGHWA_1970_1983);
+    1: return string(STR_REFIT_LIVERY_SAEMAEUL_1970_1983);
     2: return string(STR_REFIT_LIVERY_GREEN_YELLOW);
     return string(STR_REFIT_LIVERY_THESEDAYS);
 }

diff --git a/src/wagon/saemaeul_car/saemaeul_car_switch.pnml b/src/wagon/saemaeul_car/saemaeul_car_switch.pnml
@@ -17,7 +17,7 @@ switch(FEAT_TRAINS, SELF, sw_SAEMAEUL_CAR_wagon, cargo_subtype) {
 // Cargo subtype
 // Same as sw_DHC_subtype_text
 switch(FEAT_TRAINS, SELF, sw_SAEMAEUL_CAR_subtype_text, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_MUGUNGHWA_1970_1983);
+    1: return string(STR_REFIT_LIVERY_SAEMAEUL_1970_1983);
     2: return string(STR_REFIT_LIVERY_GREEN_YELLOW);
     3: return string(STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_SILVER_BLUE);
     4: return string(STR_REFIT_LIVERY_SAEMAEUL_EXECUTIVE_GREEN_YELLOW);