Fix & Change #140: Nuriro's pantograph position & graphics

KoreanGRF · Apr 28, 2021 · 577a6d0 · 577a6d0
1 parent 484515f
commit 577a6d0
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 5 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -5,6 +5,7 @@
  * 변경: 증기 기관차 그래픽 및 길이 변경 [#210]
  * 변경: 의정부경전철 그래픽 [#211]
  * 변경: 인천공항자기부상열차 그래픽 [#211]
+ * 수정 & 변경: 누리로의 팬터그래프 방향이 잘못됨 + 누리로 그래픽 개선 [#140]
 
 2.0.4
 -----

diff --git a/docs/download_page/_static/NURIRO.png b/docs/download_page/_static/NURIRO.png
diff --git a/docs/download_page/_static/NURIRO_KOREAN_WAVE.png b/docs/download_page/_static/NURIRO_KOREAN_WAVE.png
diff --git a/docs/download_page/_static/NURIRO_O_TRAIN.png b/docs/download_page/_static/NURIRO_O_TRAIN.png
diff --git a/docs/download_page/_static/NURIRO_SANTA.png b/docs/download_page/_static/NURIRO_SANTA.png
diff --git a/src/locomotive/nuriro/NURIRO.png b/src/locomotive/nuriro/NURIRO.png
diff --git a/src/locomotive/nuriro/NURIRO_SANTA.png b/src/locomotive/nuriro/NURIRO_SANTA.png
diff --git a/src/locomotive/nuriro/nuriro_graphic.pnml b/src/locomotive/nuriro/nuriro_graphic.pnml
@@ -63,7 +63,7 @@ spriteset(set_NURIRO_wagon_panto, "./src/locomotive/nuriro/NURIRO.png") {
     tmpl_NURIRO_wagon_panto(60, 30)
 }
 spriteset(set_NURIRO_wagon, "./src/locomotive/nuriro/NURIRO.png") {
-    tmpl_NURIRO_wagon(60, 60)
+    tmpl_NURIRO_wagon_8dir(60, 60)
 }
 spriteset(set_NURIRO_engineT, "./src/locomotive/nuriro/NURIRO.png") {
     tmpl_NURIRO_engine_r(60, 90)
@@ -80,7 +80,7 @@ spriteset(set_NURIRO_KOREAN_WAVE_wagon_panto, "./src/locomotive/nuriro/NURIRO.pn
     tmpl_NURIRO_wagon_panto(60, 150)
 }
 spriteset(set_NURIRO_KOREAN_WAVE_wagon, "./src/locomotive/nuriro/NURIRO.png") {
-    tmpl_NURIRO_wagon(60, 180)
+    tmpl_NURIRO_wagon_8dir(60, 180)
 }
 spriteset(set_NURIRO_KOREAN_WAVE_engineT, "./src/locomotive/nuriro/NURIRO.png") {
     tmpl_NURIRO_engine_r(60, 210)
@@ -97,7 +97,7 @@ spriteset(set_NURIRO_O_TRAIN_wagon_panto, "./src/locomotive/nuriro/NURIRO.png")
     tmpl_NURIRO_wagon_panto(60, 270)
 }
 spriteset(set_NURIRO_O_TRAIN_wagon, "./src/locomotive/nuriro/NURIRO.png") {
-    tmpl_NURIRO_wagon(60, 300)
+    tmpl_NURIRO_wagon_8dir(60, 300)
 }
 spriteset(set_NURIRO_O_TRAIN_engineT, "./src/locomotive/nuriro/NURIRO.png") {
     tmpl_NURIRO_engine_r(60, 330)

diff --git a/src/locomotive/nuriro/nuriro_switch.pnml b/src/locomotive/nuriro/nuriro_switch.pnml
@@ -23,8 +23,8 @@ switch(FEAT_TRAINS, SELF, sw_NURIRO_SANTA_wagon_panto, position_in_consist % 2)
 }
 
 switch(FEAT_TRAINS, SELF, sw_NURIRO_SANTA_wagon, position_in_consist % 2) {
-    1: set_NURIRO_SANTA_wagon_B;
-    set_NURIRO_SANTA_wagon_A;
+    1: set_NURIRO_SANTA_wagon_A;
+    set_NURIRO_SANTA_wagon_B;
 }