Clear up confusion around SneakSpreadModifier/Multiplier, fix incorre…

…ct spread bug
Unknown025 · Aug 16, 2023 · c0dd40c · c0dd40c
1 parent 0dfe152
commit c0dd40c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/main/java/com/flansmod/common/guns/GunType.java b/src/main/java/com/flansmod/common/guns/GunType.java
@@ -112,8 +112,8 @@ public class GunType extends PaintableType implements IScope {
      * The amount that bullets spread out when fired from this gun
      */
     public float bulletSpread;
-    public float sneakSpreadMultiplier = 0.63F;
-    public float sprintSpreadMultiplier = 1.75F;
+    public float sneakSpreadModifier = 0.63F;
+    public float sprintSpreadModifier = 1.75F;
     /**
      * If true, spread determined by loaded ammo type
      */
@@ -513,8 +513,8 @@ protected void read(ConfigMap config, TypeFile file) {
         recoilCounterCoefficient = ConfigUtils.configFloat(config, "CounterRecoilForce", recoilCounterCoefficient);
         recoilCounterCoefficientSneaking = ConfigUtils.configFloat(config, "CounterRecoilForceSneaking", recoilCounterCoefficientSneaking);
         recoilCounterCoefficientSprinting = ConfigUtils.configFloat(config, "CounterRecoilForceSprinting", recoilCounterCoefficientSprinting);
-        sneakSpreadMultiplier = ConfigUtils.configFloat(config, "SneakSpreadModifier", sneakSpreadMultiplier);
-        sprintSpreadMultiplier = ConfigUtils.configFloat(config, "SprintSpreadModifier", sprintSpreadMultiplier);
+        sneakSpreadModifier = ConfigUtils.configFloat(config, new String[] { "SneakSpreadModifier", "SneakSpreadMultiplier" }, sneakSpreadModifier);
+        sprintSpreadModifier = ConfigUtils.configFloat(config, new String[] { "SprintSpreadModifier", "SprintSpreadMultiplier"}, sprintSpreadModifier);
         canForceReload = ConfigUtils.configBool(config, "CanForceReload", canForceReload);
         allowRearm = ConfigUtils.configBool(config, "AllowRearm", allowRearm);
         reloadTime = ConfigUtils.configInt(config, "ReloadTime", reloadTime);
@@ -543,7 +543,7 @@ protected void read(ConfigMap config, TypeFile file) {
         recoilSprintingMultiplier = ConfigUtils.configFloat(config, "RecoilSprintingMultiplier", recoilSprintingMultiplier);
         recoilSneakingMultiplierYaw = ConfigUtils.configFloat(config, "RecoilSneakingMultiplierYaw", recoilSneakingMultiplierYaw);
         recoilSprintingMultiplierYaw = ConfigUtils.configFloat(config, "RecoilSprintingMultiplierYaw", recoilSprintingMultiplierYaw);
-        defaultSpread = ConfigUtils.configFloat(config, new String[]{"Accuracy", "Spread"}, defaultSpread);
+        defaultSpread = bulletSpread = ConfigUtils.configFloat(config, new String[]{"Accuracy", "Spread"}, defaultSpread);
         adsSpreadModifier = ConfigUtils.configFloat(config, "ADSSpreadModifier", adsSpreadModifier);
         adsSpreadModifierShotgun = ConfigUtils.configFloat(config, "ADSSpreadModifierShotgun", adsSpreadModifierShotgun);
         numBullets = ConfigUtils.configInt(config, "NumBullets", numBullets);
@@ -1300,9 +1300,9 @@ public float getSpread(ItemStack stack, boolean sneaking, boolean sprinting) {
             stackSpread *= attachment.spreadMultiplier;
         }
         if (sprinting) {
-            stackSpread *= sprintSpreadMultiplier;
+            stackSpread *= sprintSpreadModifier;
         } else if (sneaking) {
-            stackSpread *= sneakSpreadMultiplier;
+            stackSpread *= sneakSpreadModifier;
         }
         return stackSpread;
     }