Merge pull request #16 from Li0n-0/DEV

1.9
Li0n-0 · Sep 22, 2017 · 1a011d8 · 1a011d8
2 parents 5ea333b + 5c429c8
commit 1a011d8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/GameData/CrewLight/CrewLight.dll b/GameData/CrewLight/CrewLight.dll
diff --git a/GameData/CrewLight/CrewLight.version b/GameData/CrewLight/CrewLight.version
@@ -5,7 +5,7 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":8,
+        "MINOR":9,
         "PATCH":0,
         "BUILD":0
     },

diff --git a/GameData/CrewLight/MMPatch/ModuleLightToggle.cfg b/GameData/CrewLight/MMPatch/ModuleLightToggle.cfg
@@ -31,6 +31,14 @@
 }
 
 @PART[*]:HAS[@MODULE[ModuleKELight],!MODULE[ModuleLightEVAToggle],!MODULE[ModuleStatusLight],~CrewCapacity[]]:NEEDS[KerbalElectric]:FOR[CrewLight]
+{
+    MODULE
+    {
+		name = ModuleLightEVAToggle
+    }
+}
+
+@PART[*]:HAS[@MODULE[ModuleNavLight],!MODULE[ModuleLightEVAToggle],!MODULE[ModuleStatusLight],~CrewCapacity[]]:NEEDS[AviationLights]:FOR[CrewLight]
 {
     MODULE
     {

diff --git a/Source/CLSettings.cs b/Source/CLSettings.cs
@@ -53,6 +53,7 @@ public static class CLSettings
 		// Toggle vessel lights on EVA
 		public static bool useVesselLightsOnEVA = true;
 		public static bool lightSymLights = false;
+		public static bool onAviationLights = true;
 
 		// Transfer Crew
 		public static bool useTransferCrew = true;
@@ -288,6 +289,12 @@ static CLSettings ()
 			}
 			nodeVesselLightsOnEVA.SetValue ("toggle_symmetric_lights", lightSymLights, 
 				"if true all symmetrical lights will respond to the toggle", true);
+
+			if (nodeVesselLightsOnEVA.HasValue ("enable_on_AviationLights_light")) {
+				onAviationLights = bool.Parse (nodeVesselLightsOnEVA.GetValue ("enable_on_AviationLights_light"));
+			}
+			nodeVesselLightsOnEVA.SetValue ("enable_on_AviationLights_lights", onAviationLights, 
+				"AviationLights lights will use the preset defined below", true);
 			//
 			// Transfer Crew
 			//

diff --git a/Source/ModuleLightEVAToggle.cs b/Source/ModuleLightEVAToggle.cs
@@ -10,7 +10,9 @@ public class ModuleLightEVAToggle : PartModule
 
 		public override void OnStart (StartState state)
 		{
-			if ((part.Modules.Contains<ModuleLight> () || part.Modules.Contains ("ModuleKELight")) && CLSettings.useVesselLightsOnEVA) {
+			if ((part.Modules.Contains<ModuleLight> () || part.Modules.Contains ("ModuleKELight") 
+				|| (part.Modules.Contains ("ModuleNavLight") && CLSettings.onAviationLights)) 
+				&& CLSettings.useVesselLightsOnEVA) {
 				ogSymPart = new List<Part> (part.symmetryCounterparts);
 			} else {
 				Destroy (this);
@@ -46,6 +48,17 @@ public void LightToggleEVA ()
 					}
 				}
 			}
+			if (part.Modules.Contains ("ModuleNavLight")) {
+				foreach (PartModule partM in part.Modules) {
+					if (partM.ClassName == "ModuleNavLight") {
+						if ((int)partM.GetType ().InvokeMember ("navLightSwitch", System.Reflection.BindingFlags.GetField, null, partM, null) != 0) {
+							SwitchLight.Off (part);
+						} else {
+							SwitchLight.On (part);
+						}
+					}
+				}
+			}
 
 			if (! CLSettings.lightSymLights) {
 				part.symmetryCounterparts = ogSymPart;

diff --git a/Source/SwitchLight.cs b/Source/SwitchLight.cs
@@ -66,6 +66,10 @@ public static void On (PartModule light)
 						light.GetType ().InvokeMember ("navLightSwitch", BindingFlags.SetField, null, light, 
 							new object[] { CLSettings.strobeWhite });
 						break;
+					default:
+						light.GetType ().InvokeMember ("navLightSwitch", BindingFlags.SetField, null, light, 
+							new object[] { 4 });
+						break;
 					}
 				} else {
 					light.GetType ().InvokeMember ("navLightSwitch", BindingFlags.SetField, null, light, new object[] {4});
@@ -159,13 +163,22 @@ private static List<PartModule> GetLightModule (Part part)
 					}
 				}
 			}
+			// Wild Blue Industry
 			if (part.Modules.Contains ("WBILight")) {
 				foreach (PartModule module in part.Modules) {
 					if (module.moduleName == "WBILight") {
 						lightList.Add (module);
 					}
 				}
 			}
+			// AviationLights
+			if (part.Modules.Contains ("ModuleNavLight")) {
+				foreach (PartModule module in part.Modules) {
+					if (module.moduleName == "ModuleNavLight") {
+						lightList.Add (module);
+					}
+				}
+			}
 			// Kerbal Electric Lights
 			if (part.Modules.Contains ("ModuleKELight")) {
 				foreach (PartModule module in part.Modules) {