starting on PapaJoesSoup#515, need logic input

gomker · Jul 8, 2018 · 1cc800d · 1cc800d
1 parent 9a9b7af
commit 1cc800d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/BDArmory.Core/BDAPersistantSettingsField.cs b/BDArmory.Core/BDAPersistantSettingsField.cs
@@ -12,7 +12,6 @@ public class BDAPersistantSettingsField : Attribute
         public BDAPersistantSettingsField()
         {
         }
-
         public static void Save()
         {
             ConfigNode fileNode = ConfigNode.Load(BDArmorySettings.settingsConfigURL);
@@ -34,7 +33,6 @@ public static void Save()
             field.Dispose();
             fileNode.Save(BDArmorySettings.settingsConfigURL);
         }
-
         public static void Load()
         {
             ConfigNode fileNode = ConfigNode.Load(BDArmorySettings.settingsConfigURL);

diff --git a/BDArmory.Core/BDArmorySettings.cs b/BDArmory.Core/BDArmorySettings.cs
@@ -48,6 +48,7 @@ public class BDArmorySettings
 
         [BDAPersistantSettingsField] public static float RECOIL_FACTOR = 0.75f;
         [BDAPersistantSettingsField] public static float DMG_MULTIPLIER = 100f;
+        [BDAPersistantSettingsField] public static float BALLISTIC_DMG_FACTOR = 1f;
         [BDAPersistantSettingsField] public static float HITPOINT_MULTIPLIER = 2.0f;
         [BDAPersistantSettingsField] public static float EXP_DMG_MOD_BALLISTIC;
         [BDAPersistantSettingsField] public static float EXP_DMG_MOD_MISSILE;

diff --git a/BDArmory/Distribution/GameData/BDArmory/settings.cfg b/BDArmory/Distribution/GameData/BDArmory/settings.cfg
@@ -5,8 +5,8 @@ BDASettings
 	PHYSICS_RANGE = 200000
 	MAX_BULLET_RANGE = 8000
 	MAX_GUARD_VISUAL_RANGE = 200000
-  MAX_ACTIVE_RADAR_RANGE = 200000
-  MAX_ENGAGEMENT_RANGE = 200000
+    MAX_ACTIVE_RADAR_RANGE = 200000
+    MAX_ENGAGEMENT_RANGE = 200000
 	EJECT_SHELLS = True
 	INFINITE_AMMO = False
 	DRAW_DEBUG_LINES = False
@@ -23,8 +23,8 @@ BDASettings
 	SMOKE_DEFLECTION_FACTOR = 10
 	FLARE_THERMAL = 1350
 	RWR_WINDOW_SIZE = 1.0
-  RADAR_WINDOW_SIZE = 1.0
-  BDARMORY_UI_VOLUME = 0.35
+    RADAR_WINDOW_SIZE = 1.0
+    BDARMORY_UI_VOLUME = 0.35
 	BDARMORY_WEAPONS_VOLUME = 0.45
 	GLOBAL_LIFT_MULTIPLIER = 0.25
 	GLOBAL_DRAG_MULTIPLIER = 6
@@ -34,6 +34,7 @@ BDASettings
 	HITPOINT_MULTIPLIER = 2.0
 	RECOIL_FACTOR = 0.75
 	DMG_MULTIPLIER =  100
+	BALLISTIC_DMG_FACTOR = 1
 	EXP_DMG_MOD_BALLISTIC = 1.125
 	EXP_DMG_MOD_MISSILE = 6.75
 	EXP_IMP_MOD = 0.125