Merge branch 'feats/1.18' of https://github.com/MrTroble/Open-Signals …

…into feats/1.18
MrTroble · Nov 21, 2023 · a3b4eaf · a3b4eaf
2 parents 5d539df + 9db76ae
commit a3b4eaf
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 0 deletions.
diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hl_config.json
@@ -13,6 +13,7 @@
         "map(slow) && config(mainlightsignallightbar.OFF)": ["zs3v.Z4", "distantsignal.VR2"],
         "map(slow) && config(mainlightsignallightbar.GREEN)": ["zs3v.Z10", "distantsignal.VR1"],
         "map(slow) && config(mainlightsignallightbar.YELLOW)": ["zs3v.Z6", "distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
 
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json
@@ -10,6 +10,7 @@
         "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
         "map(drive)": ["distantsignal.VR1"],
         "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json
@@ -8,6 +8,7 @@
     "values": {
         "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
         "map(drive)": ["distantsignal.VR1"],
+        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1", "distantsignal.VR2"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2", "distantsignal.VR2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json
@@ -10,6 +10,7 @@
         "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
         "map(drive)": ["distantsignal.VR1"],
         "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hl_config.json
@@ -10,6 +10,7 @@
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
         "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
+        "map(drive) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
 
         "map(slow) && config(mainlightsignallightbar.OFF)": ["zs3v.Z4", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],        
         "map(slow) && config(mainlightsignallightbar.GREEN)": ["zs3v.Z10", "kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_hv_config.json
@@ -26,6 +26,7 @@
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
         "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
+        "map(drive) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
         "map(drive) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
         "map(drive) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
 

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_ks_config.json
@@ -26,6 +26,7 @@
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
         "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
+        "map(drive) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
         "map(drive) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
         "map(drive) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_BLINK_REPEAT"],
 

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/ks_sema.json
@@ -27,6 +27,7 @@
         "map(stop)": ["kombisignal.KS2", "kombisignal_main.KS1", "kombisignal_distant.KS2", "zs3v.OFF", "zs2v.OFF"],
         "map(stop) && signalRepeater(true)": ["kombisignal_distant.KS2_REPEAT"],
         "map(drive) || map(slow)": ["kombisignal.KS1", "kombisignal_main.KS1", "kombisignal_distant.KS1"],
+        "map(drive) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],
         "(map(drive) || map(slow)) && map(zs3)": ["kombisignal.KS1_BLINK", "kombisignal_main.KS1", "kombisignal_distant.KS1_BLINK"],
         "(map(drive) || map(slow)) && map(zs3) && signalRepeater(true)": ["kombisignal_distant.KS1_REPEAT"],