Compile for KSP 1.4.1. Move NIMBY Beacons file to PluginData

magico13 · Mar 21, 2018 · 653b18e · 653b18e
1 parent 18c6451
commit 653b18e
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -186,4 +186,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+/.vs/Modlets/v15/Server/sqlite3
+/.vs/slnx.sqlite
diff --git a/Dated_QuickSaves/Properties/AssemblyInfo.cs b/Dated_QuickSaves/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DatedQuickSaves")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/EditorTime/Properties/AssemblyInfo.cs b/EditorTime/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("EditorTime")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
diff --git a/GameData/NIMBY/.version b/GameData/NIMBY/.version
@@ -1,19 +1,19 @@
 {
     "NAME":"NIMBY",
-    "VERSION":"1.1.0.0",
+    "VERSION":"1.1.1.0",
     "KSP_VERSION":{
         "MAJOR":1,
-        "MINOR":3,
-        "PATCH":0
+        "MINOR":4,
+        "PATCH":1
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":2
+         "MINOR":4,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":3,
-         "PATCH":0
+         "MINOR":4,
+         "PATCH":8
      }
 }
diff --git a/NotInMyBackYard/NotInMyBackYard.cs b/NotInMyBackYard/NotInMyBackYard.cs
@@ -17,7 +17,7 @@ public class NotInMyBackYard : MonoBehaviour
         public void Start()
         {
             //initialize beacons
-            LoadBeacons(KSPUtil.ApplicationRootPath+"/GameData/NIMBY/Beacons.cfg", true);
+            LoadBeacons(KSPUtil.ApplicationRootPath+"/GameData/NIMBY/PluginData/Beacons.cfg", true);
         }
 
         public void LoadBeacons(string beaconFile, bool createIfNotExists = false)
@@ -105,12 +105,16 @@ public IList<IBeacon> GetAllBeacons()
             //find all vessels that have a mobile beacon module
             foreach (Vessel vessel in FlightGlobals.Vessels)
             {
+                if (vessel == FlightGlobals.ActiveVessel)
+                {
+                    continue;
+                }
                 //make sure it's active
                 IEnumerable<ModuleMobileRecoveryBeacon> modules;
                 if (vessel.loaded && (modules = vessel.Parts.Select(p => p.Modules.GetModule<ModuleMobileRecoveryBeacon>())) != null)
                 {
                     Debug.Log($"[NIMBY] {vessel.GetDisplayName()} has module");
-                    IBeacon active = modules.FirstOrDefault(m => m.Active);
+                    IBeacon active = modules?.FirstOrDefault(m => m?.Active ?? false);
                     if (active != null)
                     {
                         Debug.Log($"[NIMBY] Module is Active.");

diff --git a/NotInMyBackYard/Properties/AssemblyInfo.cs b/NotInMyBackYard/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NotInMyBackYard")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/Sensible_Screenshot/Properties/AssemblyInfo.cs b/Sensible_Screenshot/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SensibleScreenshot")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.3.0")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyVersion("1.2.4.0")]
+[assembly: AssemblyFileVersion("1.2.4.0")]
diff --git a/ShipSaveSplicer/Properties/AssemblyInfo.cs b/ShipSaveSplicer/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ShipSaveSplicer")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3.0")]
-[assembly: AssemblyFileVersion("1.1.3.0")]
+[assembly: AssemblyVersion("1.1.4.0")]
+[assembly: AssemblyFileVersion("1.1.4.0")]
diff --git a/ShipSaveSplicer/ShipSaveSplicer.cs b/ShipSaveSplicer/ShipSaveSplicer.cs
@@ -65,18 +65,6 @@ public void OnClick()
             SpaceTracking trackingStation = (SpaceTracking)FindObjectOfType(typeof(SpaceTracking));
             Vessel selectedVessel = trackingStation.SelectedVessel;
 
-            //1.2 made this non-private
-            //foreach (FieldInfo f in trackingStation.GetType().GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
-            //{
-            //    if (f.FieldType == typeof(Vessel))
-            //    {
-            //        //FYI: the first one (0) is the currently selected vessel
-            //        //The second one (1) is the one that the mouse is hovering over
-            //        selectedVessel = f.GetValue(trackingStation) as Vessel;
-            //        break;
-            //    }
-            //}
-
             if (ctrlHeld || includeCrew) //ctrl or modifier held
             {
                 OpenImportWindow();

diff --git a/TreeToppler/Properties/AssemblyInfo.cs b/TreeToppler/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TreeToppler")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3.0")]
+[assembly: AssemblyFileVersion("1.1.3.0")]
diff --git a/Wwwwwwwww/Properties/AssemblyInfo.cs b/Wwwwwwwww/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Wwwwwwwww")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]