From 17cd865dc326253c5989124e068d3fc0b5c56869 Mon Sep 17 00:00:00 2001
From: Sidi Liang <1467329765@qq.com>
Date: Sat, 27 Jul 2019 15:05:00 +0800
Subject: [PATCH] System: Added custom light controller.

---
 .gitignore              |  13 +++
 Models/.DS_Store        | Bin 8196 -> 0 bytes
 Nasal/systems.nas       | 218 +++++++++++++++++++++++++++++++++++++++-
 followme_e-tron-set.xml |  33 +++++-
 4 files changed, 259 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 Models/.DS_Store

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8be089c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+# .gitignore
+####################################
+######## OS generated files ########
+####################################
+.DS_Store
+.DS_Store?
+*.swp
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
diff --git a/Models/.DS_Store b/Models/.DS_Store
deleted file mode 100644
index c98c2b4fe4fa86bac3d53ff3ddb890159357b8a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMO-~a+7=8z;Y(ZrCMxx2a#>4~;#ekd$rC=0|0oewMfMweb?Z)j+v%95yi0Loz
zF2BJa;K{^;2Y-Qy7yp0<FM9T!ohgu3q8AK-nP%pBJM+9VJI_pK_uT>jNmlY>07C$v
zVdkiJVDX2<+j(wEEwYCD5%dS}paLbJ;6l*ERuxJCrGQdEDWDWk3Y-T8@Se?+cFKKU
zw5n1mpcJ^23h?v6z|1iru_iD)I<N>s0K^DZhY4+r1417|VnSj~VCaf{is*qzS0Y0U
zBHXdv;B>@<#F{|i4n(*Eks}isp^$KN^fN*_kc2>0Dg~4R%?j{)e+SHC#O`CvelmXd
zvsJ&GbyyY|pR;Ah_Jer*3u$SMT)En&Y3*8jXZwa(WK}b;f{LHCyfyx9(F%%LX{Q)-
zj%+KtY}0B+@0(?AVA(G9LT5Wqk+QyGyLnbkvWlDc!+uQBplMMpn$d^$_s8x}jvDvk
z@q<xge{wQDYD|nz92`Wo!8>D9^P8pJz5Q1QuiuIp5_w8MSHp}CPoM6#>A4Pb3&`N!
z8a%}p89sh2C~)hd%F#4YJGU*@oqVXT`!`*$uY9z<<67tSF1@>_x4W;qf1rPGsQ<?B
z@Xd_go3(N;3m#v?S>`Y==~QUi&N0`t_h>qxI{`N`dQSsyiRND%SEY8#$mu(-2>W{I
zQR=Q0JUhRzwdK<wozc7eoW~qzk@<FDGk5hw>*~6XTX8<1rFnOY;fUL~^%lyU<}Xvv
zM{M#>uUejGxdocs-Egcdbr#$t3j$W+Ox_z#WYMF%r*I^*Y~^gX5S#uX_E;>jSU2tp
zLx-3!0Ah)iT4-xJNx4>uMx(LB6WOZ42+Y7^Frf%lcms#<4&K8j_zK_Q7m1Joa+{2h
zaWX}w$s_WNERhshCC|y4@NcPa_FJ+)2_%n3)9N;C^EOD~=H9{Ieg%L1^rCL^hG{y5
zF*C<X<r9K6FiLE0P9A>R`dZ8A&*0+>vYS}>e_)l1e;ch~QBGWzGL-^nr9i9bc!)m(
zJUIRR|5**M`c(=j1<rv2Br<2tCGkS)4-$>n#A9s(^Co7VIIku!bipDF#}UJD9P#K6
gL$nQ~a-W36nn0|<^#5N3;A4)u|A*SE;_@o+8<t_9FaQ7m

diff --git a/Nasal/systems.nas b/Nasal/systems.nas
index 0155697..0078457 100644
--- a/Nasal/systems.nas
+++ b/Nasal/systems.nas
@@ -23,7 +23,8 @@ var liveryFuse_update = {
 aircraft.livery.init("Aircraft/followme_e-tron/Models/Messages");
 liveryFuse.init("Aircraft/followme_e-tron/Models/Texture");
 
-props.getNode("/",1).setValue("/systems/horn",false);
+props.getNode("/",1).setValue("/systems/horn", 0);
+props.getNode("/",1).setValue("/systems/false-light", 0);
 
 var frontleft_door = aircraft.door.new("/controls/doors/frontleft", 1);
 var frontright_door = aircraft.door.new("/controls/doors/frontright", 1);
@@ -37,6 +38,221 @@ var beacon = aircraft.light.new( "/sim/model/lights/indicator-left", [0.8, 0.5],
 beacon_switch = props.globals.getNode("controls/switches/indicator-right", 2);
 var beacon = aircraft.light.new( "/sim/model/lights/indicator-right", [0.8, 0.5], "/controls/lighting/indicator-right");
 
+props.getNode("/",1).setValue("/controls/lighting/indicator-left", 0);
+props.getNode("/",1).setValue("/controls/lighting/indicator-right", 0);
+
+
+
+#var Led = {
+#    
+#    new: func() { return { parents:[Led] },
+#    node: props.getNode("/sim/model/livery/texture",1),
+#    blankTexture: "Messages/blanco.png",
+#    currentMessage: "",
+#    messageHistory : [],
+#    
+#    display: func(content){
+#        me.node.setValue(content);
+#    },
+#    
+#    
+#};
+
+
+
+var Indicator = {
+    
+    #     Usage:                                        #
+    #  var leftIndicator = Indicator.new("left");       #
+    #  var rightIndicator = Indicator.new("right");     #
+    #                                                   #
+    
+    type: "",
+    new: func(type) { return { parents:[Indicator], type: type}; },
+    state: 0,
+    switchOn: func(){
+        props.getNode("/", 1).setValue("/controls/lighting/indicator-"~me.type, 1);
+        me.state = 1;
+    },
+    switchOff: func(){
+        props.getNode("/", 1).setValue("/controls/lighting/indicator-"~me.type, 0);
+        me.state = 0;
+    },
+    isOn: func(){
+        return me.state;
+    },
+    isOff: func(){
+        if(me.state){
+            return 0;
+        }else{
+            return 1;
+        }
+    },
+};
+
+
+
+
+var IndicatorController = {
+    
+    #
+    #   Usage:
+    #       mode:
+    #           0:Off
+    #           1:Right without led
+    #           2:Left without led
+    #           3:both without led
+    #           4:Right with led
+    #           5:Left with led
+    #           6:both with led(WIP)
+    #       getMode(): Get currrent mode
+    #       setMode(mode): Set mode(0,1,2), return 0 if fail
+    #
+    #
+    #
+    #
+    #
+    
+    
+    
+    new: func() { return { parents:[IndicatorController]}; },
+    
+    leftIndicator : Indicator.new("left"),
+    rightIndicator : Indicator.new("right"),
+    
+    mode:0,
+    
+    falseLight: 0,
+    
+    ledMessage: props.getNode("/sim/model/livery/texture",1),
+    
+    currentMessage: "",
+    
+    textureRight: "Messages/right.png",
+    
+    textureLeft: "Messages/left.png",
+    
+    saveLedMessage: func(){
+        me.currentMessage = me.ledMessage.getValue();
+    },
+    
+    getSavedMessage: func(){
+        return me.currentMessage;
+    },
+    
+    clearSavedMessage: func(){
+        me.currentMessage = "";
+    },
+    
+    setLedMessage: func(content){
+        me.ledMessage.setValue(content);
+    },
+    
+    resumeLedMessage: func(){
+        if(me.getSavedMessage()){
+            me.setLedMessage(me.getSavedMessage());
+            me.clearSavedMessage();
+        }
+    },
+    
+    getMode: func(){
+        return me.mode;
+    },
+    
+    setMode: func(targetMode){
+        if(targetMode == 0){
+            me.resumeLedMessage();
+            me.rightIndicator.switchOff();
+            me.leftIndicator.switchOff();
+            me.mode = targetMode;
+            
+            if(me.falseLight == 1){
+                me.setMode(3);
+            }
+            
+        }else if(targetMode == 1){
+            me.resumeLedMessage();
+            me.rightIndicator.switchOn();
+            me.leftIndicator.switchOff();
+            me.mode = targetMode;
+        }else if(targetMode == 2){
+            me.resumeLedMessage();
+            me.rightIndicator.switchOff();
+            me.leftIndicator.switchOn();
+            me.mode = targetMode;
+        }else if(targetMode == 3){
+            me.resumeLedMessage();
+            me.rightIndicator.switchOn();
+            me.leftIndicator.switchOn();
+            me.mode = targetMode;
+        }else if(targetMode == 4){
+            
+            me.resumeLedMessage();
+            me.saveLedMessage();
+            
+            me.rightIndicator.switchOn();
+            me.leftIndicator.switchOff();
+            
+            me.setLedMessage(me.textureRight);
+            
+            me.mode = targetMode;
+        }else if(targetMode == 5){
+            
+            me.resumeLedMessage();
+            me.saveLedMessage();
+            
+            me.rightIndicator.switchOff();
+            me.leftIndicator.switchOn();
+            
+            me.setLedMessage(me.textureLeft);
+            
+            me.mode = targetMode;
+        }else if(targetMode == 6){
+            me.mode = targetMode;
+        }else{
+            return 0;
+        }
+    },
+    
+    right_indicator_toggle : func(){
+        if(me.getMode() != 4){
+            me.setMode(4);
+        }else if(me.getMode() == 4){
+            me.setMode(0);
+        }
+    },
+    
+    left_indicator_toggle : func(){
+        if(me.getMode() != 5){
+            me.setMode(5);
+        }else if(me.getMode() == 5){
+            me.setMode(0);
+        }
+    },
+    
+    falseLightOn : func(){
+        print("falseLight turned on");
+        me.falseLight = 1;
+        me.setMode(3);
+    },
+    
+    falseLightOff : func(){
+        print("falseLight turned off");
+        me.falseLight = 0;
+        me.setMode(0);
+    },
+    
+    false_light_toggle : func(){
+        if(me.falseLight == 0){
+            me.falseLightOn();
+        }else if(me.falseLight == 1){
+            me.falseLightOff();
+        }
+    },
+    
+};
+
+var indicatorController = IndicatorController.new();
 
 
 var brakesABS = func(){
diff --git a/followme_e-tron-set.xml b/followme_e-tron-set.xml
index 269128f..dab5292 100644
--- a/followme_e-tron-set.xml
+++ b/followme_e-tron-set.xml
@@ -107,6 +107,22 @@
 			<name>d</name>
 			<desc>Steer right 50%</desc>
 		</key>
+		<key>
+			<name>h</name>
+			<desc>Horn</desc>
+		</key>
+		<key>
+			<name>f</name>
+			<desc>Toggle false indicator light</desc>
+		</key>
+		<key>
+			<name>[</name>
+			<desc>Toggle left indicator light</desc>
+		</key>
+		<key>
+			<name>]</name>
+			<desc>Toggle right indicator light</desc>
+		</key>
 		<text>
 		You can select the message to be displayed on the bar, through the "Follow Me > Select message" menu.
 		</text>
@@ -190,18 +206,27 @@
 			<name>[</name>
 			<desc>Toggle left indicator lights</desc>
 			<binding> 
-				<command>property-toggle</command>
-				<property>/controls/lighting/indicator-left</property>
+				<command>nasal</command>
+                <script>followme.indicatorController.left_indicator_toggle();</script>
 			</binding>
 		</key>
 		<key n="93"> 
 			<name>]</name>
 			<desc>Toggle right indicator lights</desc>
 			<binding> 
-				<command>property-toggle</command>
-				<property>/controls/lighting/indicator-right</property>
+				<command>nasal</command>
+                <script>followme.indicatorController.right_indicator_toggle();</script>
 			</binding>
 		</key>
+        <key n="102">
+            <name>f</name>
+            <desc>false-light</desc>
+            <repeatable>false</repeatable>
+			<binding> 
+				<command>nasal</command>
+                <script>followme.indicatorController.false_light_toggle();</script>
+			</binding>
+        </key>
 		<key n="109"> 
 			<name>m</name>
 			<desc>Toggle direction</desc>