Merge pull request #687 from jrodrigv/master

PR for release KSP 1.7

.gitignore

@@ -153,3 +153,6 @@ BDArmory/LocalDev/Refs/UnityEngine.dll
 /Binaries
 /BDArmory/Distribution/GameData/BDArmory/Plugins
 /BDArmory/_ReSharper.Caches/ReSharperPlatformVs15182_74c703de.BDArmory.00
+/packages/Microsoft.Net.Compilers.2.8.0
+/_ReSharper.Caches/ReSharperPlatformVs15182_74c703de.BDArmory.00
+/BDArmory/_ReSharper.Caches/ReSharperPlatformVs15183_74c703de.BDArmory.00

BDArmory.Core/BDAPersistantSettingsField.cs

@@ -12,6 +12,7 @@ public class BDAPersistantSettingsField : Attribute
         public BDAPersistantSettingsField()
         {
         }
+
         public static void Save()
         {
             ConfigNode fileNode = ConfigNode.Load(BDArmorySettings.settingsConfigURL);
@@ -33,6 +34,7 @@ public static void Save()
             field.Dispose();
             fileNode.Save(BDArmorySettings.settingsConfigURL);
         }
+
         public static void Load()
         {
             ConfigNode fileNode = ConfigNode.Load(BDArmorySettings.settingsConfigURL);
@@ -55,6 +57,7 @@ public static void Load()
             }
             field.Dispose();
         }
+
         public static object ParseValue(Type type, string value)
         {
             if (type == typeof(string))
@@ -104,4 +107,4 @@ public static object ParseValue(Type type, string value)
             return null;
         }
     }
-}
+}

BDArmory.Core/BDArmorySettings.cs

@@ -1,15 +1,14 @@
-
-namespace BDArmory.Core
+namespace BDArmory.Core
 {
     public class BDArmorySettings
     {
         public static string settingsConfigURL = "GameData/BDArmory/settings.cfg";
-        
+
         [BDAPersistantSettingsField] public static bool INSTAKILL = false;
         [BDAPersistantSettingsField] public static bool BULLET_HITS = true;
         [BDAPersistantSettingsField] public static bool BULLET_DECALS = true;
         [BDAPersistantSettingsField] public static int MAX_NUM_BULLET_DECALS = 200;
-        [BDAPersistantSettingsField] public static float PHYSICS_RANGE = 0;                 //TODO: remove all references to this so it can be deprecated!
+        [BDAPersistantSettingsField] public static bool SHOW_AMMO_GAUGES = false;
         [BDAPersistantSettingsField] public static bool EJECT_SHELLS = true;
         [BDAPersistantSettingsField] public static bool SHELL_COLLISIONS = true;
         [BDAPersistantSettingsField] public static bool INFINITE_AMMO = false;
@@ -21,7 +20,6 @@ public class BDArmorySettings
         [BDAPersistantSettingsField] public static bool BOMB_CLEARANCE_CHECK = true;
         [BDAPersistantSettingsField] public static float MAX_BULLET_RANGE = 8000f;               //TODO: remove all references to this so it can be deprecated! all ranges should be supplied in part config!
         [BDAPersistantSettingsField] public static float TRIGGER_HOLD_TIME = 0.3f;
-        [BDAPersistantSettingsField] public static bool ALLOW_LEGACY_TARGETING = true;           //TODO: remove all references to this so it can be deprecated! legacy targeting should not be support anymore in future versions.
         [BDAPersistantSettingsField] public static float TARGET_CAM_RESOLUTION = 1024f;
         [BDAPersistantSettingsField] public static bool BW_TARGET_CAM = true;
         [BDAPersistantSettingsField] public static float SMOKE_DEFLECTION_FACTOR = 10f;
@@ -58,5 +56,7 @@ public class BDArmorySettings
         [BDAPersistantSettingsField] public static int MAX_FIRES_PER_VESSEL = 10;                   //controls fx for penetration only for landed or splashed
         [BDAPersistantSettingsField] public static float FIRELIFETIME_IN_SECONDS = 90f;             //controls fx for penetration only for landed or splashed
         [BDAPersistantSettingsField] public static bool PERFORMANCE_LOGGING = false;
+        [BDAPersistantSettingsField] public static bool AUTOCATEGORIZE_PARTS = true;
+        [BDAPersistantSettingsField] public static bool SHOW_CATEGORIES = false;
     }
 }

BDArmory.Core/Bootstrapper.cs

@@ -4,10 +4,10 @@
 namespace BDArmory.Core
 {
     [KSPAddon(KSPAddon.Startup.Flight, false)]
-    public class Bootstrapper :MonoBehaviour
+    public class Bootstrapper : MonoBehaviour
     {
         private void Awake()
-        {           
+        {
             Dependencies.Register<DamageService, ModuleDamageService>();
         }
     }

BDArmory.Core/BuildingDamage.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace BDArmory.Core
@@ -19,8 +16,6 @@ public override void OnAwake()
                 building.damageDecay = 600f;
                 building.impactMomentumThreshold *= 150;
             }
-
         }
-
     }
 }

BDArmory.Core/Dependencies.cs

@@ -3,15 +3,15 @@
 
 namespace BDArmory.Core
 {
-    public static  class Dependencies
+    public static class Dependencies
     {
         private static readonly Dictionary<Type, object> Systems = new Dictionary<Type, object>();
-        public static void Register<T,TN>()
+
+        public static void Register<T, TN>()
         {
             if (!Systems.ContainsKey(typeof(T)))
             {
-
-                 Systems.Add(typeof(T), Activator.CreateInstance<TN>());
+                Systems.Add(typeof(T), Activator.CreateInstance<TN>());
             }
         }
 

BDArmory.Core/Enum/DamageOperation.cs

@@ -5,4 +5,4 @@ public enum DamageOperation
         Set = 0,
         Add = 1
     }
-}
+}

BDArmory.Core/Events/DamageEventArgs.cs

@@ -12,4 +12,4 @@ public class DamageEventArgs : EventArgs
         public float Armor { get; set; }
         public DamageOperation Operation { get; set; }
     }
-}
+}

BDArmory.Core/Extension/DamageFX.cs

@@ -8,7 +8,6 @@ public class DamageFX : MonoBehaviour
 
         public void Start()
         {
-
         }
 
         public void FixedUpdate()
@@ -26,22 +25,20 @@ public void FixedUpdate()
             }
         }
 
-
         public static void SetEngineDamage(Part part)
         {
             ModuleEngines engine;
             engine = part.GetComponent<ModuleEngines>();
             engine.flameout = true;
             engine.heatProduction *= 1.0125f;
-            engine.maxThrust *= 0.825f;            
+            engine.maxThrust *= 0.825f;
         }
 
         public static void SetWingDamage(Part part)
         {
             ModuleLiftingSurface wing;
             wing = part.GetComponent<ModuleLiftingSurface>();
             wing.deflectionLiftCoeff *= 0.825f;
-
         }
     }
 }