From 22293a4314ad9897a847b73cd5deec81606d28ba Mon Sep 17 00:00:00 2001
From: TELK <telk5093@gmail.com>
Date: Sat, 8 Jun 2024 16:48:34 +0900
Subject: [PATCH] Add #30: Shunt signals This is an initial application for
 shunt singals and related to #31. Closes #30

---
 docs/changelog.md                   |   3 +-
 ko_signal_set.pnml                  |  52 ++++++++++++++++++++++------
 lang/english.lng                    |   6 ++++
 lang/korean.lng                     |   6 ++++
 src/shunt.pnml                      |  36 +++++++++++++++++++
 src/shunt/shunt.colour_multiple.png | Bin 0 -> 3012 bytes
 src/shunt/shunt.colour_single.png   | Bin 0 -> 1893 bytes
 src/shunt/shunt.position.png        | Bin 0 -> 2777 bytes
 8 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 src/shunt.pnml
 create mode 100644 src/shunt/shunt.colour_multiple.png
 create mode 100644 src/shunt/shunt.colour_single.png
 create mode 100644 src/shunt/shunt.position.png

diff --git a/docs/changelog.md b/docs/changelog.md
index 7862c44..41921c3 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,5 +1,6 @@
-1.2.2
+1.3.0
 -----
+ * 추가: [JGRPP] 입환 신호기 [#30]
  * 수정: [JGRPP] 복합, 출구 신호기 주의 표시 매개변수가 JGRPP 한정으로 적용되지 않던 현상
  * 수정: [JGRPP] 프로그램 신호기가 기본 그래픽으로 보이는 현상 [#28]
 
diff --git a/ko_signal_set.pnml b/ko_signal_set.pnml
index db498a1..025ade0 100644
--- a/ko_signal_set.pnml
+++ b/ko_signal_set.pnml
@@ -149,6 +149,9 @@ if (!extended_feature_test("action3_signals_custom_signal_sprites")) {
 // Electric signals
 #include "./src/electric.pnml"
 
+// Shunt
+#include "./src/shunt.pnml"
+
 param[10] = reserve_sprites(1);
 replace (param[10]) {
     // No recolouring
@@ -168,8 +171,15 @@ replace (param[10]) {
 
 // General signal switches
 switch (FEAT_SIGNALS, SELF, sw_signal_types, [
+    // Recolouring by parameter
     STORE_TEMP(param[10] + (hasbit(extra_callback_info2, 24) ? 1 : 0), 0x100),
-    ((extra_callback_info2 & 0x00FFFF00) | signal_style)
+
+    // Assign signal type
+    (
+          (extra_callback_info2 & 0x0000FF00)    // 00: electric, 01: semaphore
+        | (extra_callback_info2 & 0x00FF0000)   // from 00, block, entry, exit, combo, path, oneway path, programmable, no-entry signals
+        | signal_style
+    )
 ]) {
     // Signals
     0x00000: sw_signal_block;        // Block
@@ -180,17 +190,16 @@ switch (FEAT_SIGNALS, SELF, sw_signal_types, [
     0x50000: sw_signal_oneway_path;  // Oneway path
     0x60000: sw_signal_programmable; // Programmable
     0x70000: sw_signal_noentry;      // No-entry
-/*
+
     // (Reserved) Shunt
-    0x00001: sw_shunt_block;        // Block
-    0x10001: sw_shunt_entry;        // Entry
-    0x20001: sw_shunt_exit;         // Exit
-    0x30001: sw_shunt_combo;        // Combo
-    0x40001: sw_shunt_path;         // Path
-    0x50001: sw_shunt_oneway_path;  // Oneway path
-    0x60001: sw_shunt_programmable; // Programmable
-    0x70001: sw_shunt_noentry;      // No-entry
-*/
+    0x40001: sw_shunt_single;        // Path
+    0x70001: sw_shunt_single;        // No-entry
+    0x40101: sw_shunt_multiple;      // Path, semaphore
+    0x70101: sw_shunt_multiple;      // No-entry, semaphore
+
+    0x40102: sw_shunt_position;      // Path, semaphore
+    0x70102: sw_shunt_position;      // No-entry, semaphore
+
     CB_FAILED;
 }
 
@@ -208,3 +217,24 @@ item (FEAT_SIGNALS, ko_signal_set, 0) {
         sw_signal_types;
     }
 }
+
+// Additional signals
+item (FEAT_SIGNALS, custom_signals, 0) {
+    property {
+        define_style: 1;
+        style_name: string(STR_STYLE_SHUNT_COLOUR);
+        style_electric_enabled: bitmask(SIGNAL_TYPE_PBS, SIGNAL_TYPE_NO_ENTRY);
+        style_semaphore_enabled: bitmask(SIGNAL_TYPE_PBS, SIGNAL_TYPE_NO_ENTRY);
+        style_no_aspect_increase: 1;
+        style_always_reserve_through: 1;
+        style_lookahead_single_signal_only: 1;
+
+        define_style: 2;
+        style_name: string(STR_STYLE_SHUNT_POSITION);
+        style_electric_enabled: 0;
+        style_semaphore_enabled: bitmask(SIGNAL_TYPE_PBS, SIGNAL_TYPE_NO_ENTRY);
+        style_no_aspect_increase: 1;
+        style_always_reserve_through: 1;
+        style_lookahead_single_signal_only: 1;
+    }
+}
diff --git a/lang/english.lng b/lang/english.lng
index 61832e6..b820171 100644
--- a/lang/english.lng
+++ b/lang/english.lng
@@ -35,5 +35,11 @@ STR_PARAM_USE_BLUE_AS_OPEN_ONEWAY_PATH_DESC      :If enabled, use blue signal fo
 STR_PARAM_USE_BLUE_AS_OPEN_PROGRAMMABLE_NAME     :Use blue signal for programmable signal
 STR_PARAM_USE_BLUE_AS_OPEN_PROGRAMMABLE_DESC     :If enabled, use blue signal for programmable signal instead of green.{}{ORANGE}It only affects in JGRPP{BLACK} (default: disabled)
 
+
+# Shunt
+STR_STYLE_SHUNT_COLOUR                           :Shunt (Colour)
+STR_STYLE_SHUNT_POSITION                         :Shunt (Position light)
+
+
 # Errors
 STR_UNSUPPORTED_VERSION                          :This NewGRF requires OpenTTD JGRPP 0.43.0 or higher to experience full features like multi-aspect signals.
diff --git a/lang/korean.lng b/lang/korean.lng
index caf87bd..0b36be9 100644
--- a/lang/korean.lng
+++ b/lang/korean.lng
@@ -35,5 +35,11 @@ STR_PARAM_USE_BLUE_AS_OPEN_ONEWAY_PATH_DESC      :이 설정을 켜면, 단방
 STR_PARAM_USE_BLUE_AS_OPEN_PROGRAMMABLE_NAME     :프로그램 신호기에 청색 신호 사용
 STR_PARAM_USE_BLUE_AS_OPEN_PROGRAMMABLE_DESC     :이 설정을 켜면, 단방향 경로 신호기에 녹색 신호 대신 청색 신호를 사용합니다.{}{ORANGE}JGRPP에서만 적용됩니다{BLACK} (기본값: 끔)
 
+
+# Shunt
+STR_STYLE_SHUNT_COLOUR                           :입환 (색등식)
+STR_STYLE_SHUNT_POSITION                         :입환 (등열식)
+
+
 # Errors
 STR_UNSUPPORTED_VERSION                          :이 NewGRF의 모든 기능(eg. 다현시 신호)을 사용하려면 OpenTTD JGRPP 0.43.0 또는 그 이상의 버전이 필요합니다.
diff --git a/src/shunt.pnml b/src/shunt.pnml
new file mode 100644
index 0000000..f12a00d
--- /dev/null
+++ b/src/shunt.pnml
@@ -0,0 +1,36 @@
+/*------------------------------------------------------------------------------
+ * 한국 신호기 세트(Korean Signal Set)
+ * https://github.com/KoreanGRF/KoreanSignalSet
+------------------------------------------------------------------------------*/
+
+// Templates for shunt signal
+template shunt_signal(file, x, y) {
+    [x+0,   y+0,   6,   9,   -3,   -7, file]
+    [x+15,  y+0,   6,   9,   -1,   -7, file]
+    [x+30,  y+0,   6,   9,   -3,   -7, file]
+    [x+45,  y+0,   6,   9,   -1,   -6, file]
+    [x+60,  y+0,   7,   9,   -1,   -7, file]
+    [x+75,  y+0,   7,   9,   -4,   -7, file]
+    [x+90,  y+0,   4,   9,   -1,   -7, file]
+    [x+105, y+0,   4,   9,   -1,   -7, file]
+}
+
+spriteset(set_shunt_multiple_off) { shunt_signal("./src/shunt/shunt.colour_multiple.png", 0, 0) }
+spriteset(set_shunt_multiple_on)  { shunt_signal("./src/shunt/shunt.colour_multiple.png", 0, 15) }
+spriteset(set_shunt_single_off)   { shunt_signal("./src/shunt/shunt.colour_single.png", 0, 0) }
+spriteset(set_shunt_single_on)    { shunt_signal("./src/shunt/shunt.colour_single.png", 0, 15) }
+spriteset(set_shunt_position_off) { shunt_signal("./src/shunt/shunt.position.png", 0, 0) }
+spriteset(set_shunt_position_on)  { shunt_signal("./src/shunt/shunt.position.png", 0, 15) }
+
+switch(FEAT_SIGNALS, SELF, sw_shunt_multiple, extra_callback_info2 & 0x000000FF) {
+    0: set_shunt_multiple_off;
+    set_shunt_multiple_on;
+}
+switch(FEAT_SIGNALS, SELF, sw_shunt_single, extra_callback_info2 & 0x000000FF) {
+    0: set_shunt_single_off;
+    set_shunt_single_on;
+}
+switch(FEAT_SIGNALS, SELF, sw_shunt_position, extra_callback_info2 & 0x000000FF) {
+    0: set_shunt_position_off;
+    set_shunt_position_on;
+}
diff --git a/src/shunt/shunt.colour_multiple.png b/src/shunt/shunt.colour_multiple.png
new file mode 100644
index 0000000000000000000000000000000000000000..41dfdd7d7a1a8f3408cd19e34fd59813abaec366
GIT binary patch
literal 3012
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
A3;+NC

literal 0
HcmV?d00001

diff --git a/src/shunt/shunt.colour_single.png b/src/shunt/shunt.colour_single.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce1ad3f7c81c00cf3b8d8c33fb272bc1558638e4
GIT binary patch
literal 1893
zcmaJ>Z)_Xo8Gp3qgH_teh*X%>gTqac5srO!u8D1&_S#%hM>ypgjCvB*cCPQ5Gd=qb
z`?_3P3t5{#xYVLy7%3nN%#;alvNmrNFwCQ2^M?$qsbbdTRUR|{MpQ*K4Qb;xFJ$M^
zw0s~ty?5`Qdw##?dEV#uzNhE|`?qfX(PjYHI_jmywO-QRdv%+%?>4^FuXXn*!;JEn
zbVQj9#(3DvNr!oCG!mTP$N3<4{Hee39)L~vhy9GgjQQLlDPj$FY^-WT*3bZ+J*pfG
z9px45Fh3EF4w^3g>6{4*bAzTsyT<S_d59On-V-tYu@eXUp%X_#F3z-PH|9~@8bO3t
zf|wc+qj9%7Xu84c*2bM>n+dyNq8uGGeH#=rMq@)#jK_9a`+Gxn!hsFAtoDA~<sdAW
z1Gf*@@By2>uNSww@qTxo3%mK4G;cBPh<ltGx#>%r4VnZ+k=-`i<m9Avvd=2TCTw<>
z%VonIHix5Ev*?W<k19d6HyYou&Oq_;P%JDfVJV7r7=wqUW6GdOi}c$RBJwTTX#D0j
zX&Yu!gR;$T#XBjj8;*_rf73|hmUUbi=WoaRy~J_<ahbP`^Kt1|ETk3g$c~OH**z5F
zgNhXMOOm+0i?kpqQe2Q^Y-k8G9|}h~X)^xc4fC-v_h>Y(1fwB-lo~W?1lDkvbN4xh
z2&!+d!?CM>z-}KNaZ<#HYsfi_?;9BzaP<wWV<{<gEW$^Xbu4!q+qWUMqlAd8d8YVS
z_-8yf5|bj>jf~yljbp(#<hzOGHjc%<A=ah^W9!uQJ9S=P(!|pl-cqeLxuttPs);?O
zsrscCo_$U`EI|AG!vJev!k3re(jqKghRaK^^c8%y49i#G%2l{pC=|-&^4#29qtTe3
zpGOE09xvq!Fsv*psZ?e<moJve)!O+cZs{UDTWDW58!)OWnay&gQmR%fa2%&7ia=Wu
zf_FL<DCgCBCA-`#rBW%TOE2rOG)Cl|zKUP035jNEY9Tj+DzoT3pm`5MNuL>5k4|BX
zX~mgK)1{nPJ)5Qsz*@SJlrG2W%c`NC!{*C+R0q^fA~cJ20okqd8}*{am~@)6US}cT
zD~n7uDb}+|9RYe0FuDt8yGVJ9Kh-T{jmd(ABuNW}c^I4)JVL^k%m$`Q;@Mh4PZ%(-
z#mRbo3d5#FbtXMMTPQc@FatP^K+`lsY!OI9!f(llWIoCG%zBnED3m$vch0b6S*B}A
zww{$+h2%mdOB=g5bGPa=XMALyW6SAukD0;=KS^>lt#DjAm6|CQXY2JAj^m_diXn@F
zuc|VwjDYfKR4E`Zh|rS)A`jj&uyuplbWY7Pg~enQRa!_-vIbf-vnnB{=uBQI&gN>(
z+9E0vM4cdz);I=DB~Uq!8gpoQ!P_kdEE$<9WVmV}-I^=4&zINc&m-+F4FDto@&HwU
z768&34M+r(1~da`7Eluqf?8Vl*;E(G0V?6B%Av-z&cJNx5xR+lk;<3@GfuVQoo;Z&
zRv<@+B{DJRn`#AG%V=()eYUxfsx+ACqF%4>T!NI`<5kQ))j}t5f6~iMaj8OM8L`P3
zip}^8I?-a7@)9M{|KTs6)<Q&nKmwoype&#wpem4>ngMVeNKz{etgS&dn_YpGHngw7
zwd-(w6;=_Tui@)&;F~q=|JvFa<NNyo;P0c<UcY)_;f43M{uS2^|LZTA)0VgHC}jqM
zIpUcA)T6&DL?2qw$5(&&$>+n*-T&kpm5aadzGm;g>%|uz-ewmZci#QVpWnSFwtc5Q
zSa<*C@hcV6$G`45`IDWWJ>LD>mnXJ8@QC$~Uwr=K-=k*^U0AsMpXVP&&bIx!y=}km
z+QG%sp5;3#?V)!+ojmvUKXzf47Q&}z<Nxk$AADkk{mAj=1Jcqv>fMd~7yfXDXihw{
zZ}ZA)7eC(p;j^pPw|{i*>cNYPkGyAl^`}2Lm;LYVmsW)(Ywe^Chu5Fj{lW9wm;R|`
O2BX6VsNd~lfBrw*7VHoJ

literal 0
HcmV?d00001

diff --git a/src/shunt/shunt.position.png b/src/shunt/shunt.position.png
new file mode 100644
index 0000000000000000000000000000000000000000..b50e2239804c5b884e6f09e4bb0acbc7a42c08d9
GIT binary patch
literal 2777
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
O+{XH~)N6I_J^upSe;-Ex

literal 0
HcmV?d00001