Fix: Not applied

KoreanGRF · Jun 8, 2024 · 1b02699 · 1b02699
1 parent 5838fa1
commit 1b02699
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,7 @@
+1.2.2
+-----
+ * 수정: [JGRPP] 복합, 출구 신호기 주의 표시 매개변수가 JGRPP 한정으로 적용되지 않던 현상
+
 1.2.1
 -----
  * 변경: [JGRPP] 경로 탐색 프로그램이 있는 신호기 기둥을 파란색으로 표시 [#27]

diff --git a/src/electric/combo/code.pnml b/src/electric/combo/code.pnml
@@ -42,10 +42,21 @@ switch (FEAT_SIGNALS, SELF, sw_signal_combo_YG, (is_realistic << 1) + (use_blue_
     set_signal_combo_YG_nonreal;    // non realistic && green
 }
 
-switch (FEAT_SIGNALS, SELF, sw_signal_combo, extra_callback_info2 & 0x000000FF) {
+switch (FEAT_SIGNALS, SELF, sw_signal_combo_normal, (extra_callback_info2 & 0x000000FF)) {
     0: sw_signal_combo_R;
     1: sw_signal_combo_G;
     2: sw_signal_combo_Y;
     3: sw_signal_combo_YG;
     4: sw_signal_combo_G;
 }
+switch (FEAT_SIGNALS, SELF, sw_signal_combo_caution, (extra_callback_info2 & 0x000000FF)) {
+    0: sw_signal_combo_R;
+    1: sw_signal_combo_G;
+    2: sw_signal_combo_Y;
+    3: sw_signal_combo_YG;
+    4: sw_signal_combo_YG;
+}
+switch (FEAT_SIGNALS, SELF, sw_signal_combo, use_caution_signal) {
+    0: sw_signal_combo_normal;
+    1: sw_signal_combo_caution;
+}
diff --git a/src/electric/exit/code.pnml b/src/electric/exit/code.pnml
@@ -42,10 +42,21 @@ switch (FEAT_SIGNALS, SELF, sw_signal_exit_YG, (is_realistic << 1) + (use_blue_e
     set_signal_exit_YG_nonreal;    // non realistic && green
 }
 
-switch (FEAT_SIGNALS, SELF, sw_signal_exit, extra_callback_info2 & 0x000000FF) {
+switch (FEAT_SIGNALS, SELF, sw_signal_exit_normal, (extra_callback_info2 & 0x000000FF)) {
     0: sw_signal_exit_R;
     1: sw_signal_exit_G;
     2: sw_signal_exit_Y;
     3: sw_signal_exit_YG;
     4: sw_signal_exit_G;
 }
+switch (FEAT_SIGNALS, SELF, sw_signal_exit_caution, (extra_callback_info2 & 0x000000FF)) {
+    0: sw_signal_exit_R;
+    1: sw_signal_exit_G;
+    2: sw_signal_exit_Y;
+    3: sw_signal_exit_Y;
+    4: sw_signal_exit_Y;
+}
+switch (FEAT_SIGNALS, SELF, sw_signal_exit, use_caution_signal) {
+    0: sw_signal_exit_normal;
+    1: sw_signal_exit_caution;
+}