feat: pve_floor_percent

added for pellet shotty

Author: BarmonHammer

build.rs

@@ -573,6 +573,8 @@ pub struct RangeFormula {
     pub end: StatQuadraticFormula,
     pub floor_percent: f64,
     #[serde(default)]
+    pub pve_floor_percent: Option<f64>,
+    #[serde(default)]
     pub fusion: bool,
     #[serde(default)]
     pub timestamp: u64,
@@ -603,6 +605,7 @@ impl From<RangeJson> for RangeFormula {
             start,
             end,
             floor_percent: value.floor_percent,
+            pve_floor_percent: value.pve_floor_percent,
             fusion: value.fusion.unwrap_or_default(),
             timestamp: 0,
         }
@@ -770,6 +773,8 @@ struct RangeJson {
     vpp_end: f64,
     offset_end: f64,
     floor_percent: f64,
+    #[serde(default)]
+    pve_floor_percent: Option<f64>,
     fusion: Option<bool>,
 }
 

build_resources/weapon_formulas.json

@@ -926,7 +926,7 @@
         "3787406018": {"name": "Conditional Finality", "cat": "default",   "subFam": "Conditional",  "magProf": "conditional", "pve":1.245},
         "cat": {
             "default": {
-                "range":    {"vpp_start": 0.0294,"offset_start": 3.77,"vpp_end": 0.0,"offset_end": 14.5, "floor_percent": 0.001},
+                "range":    {"vpp_start": 0.0294,"offset_start": 3.77,"vpp_end": 0.0,"offset_end": 14.5, "floor_percent": 0.001, "pve_floor_percent": 0.4},
                 "reload":   {"evpp": 0.0000640462, "vpp": -0.0141721,   "offset": 1.25061},
                 "handling": {
                     "ready":{"vpp": -0.003271255061, "offset": 0.5388744939},

src/types/rs_types.rs

@@ -75,6 +75,7 @@ pub struct RangeFormula {
     pub start: StatQuadraticFormula,
     pub end: StatQuadraticFormula,
     pub floor_percent: f64,
+    pub pve_floor_percent: Option<f64>,
     pub fusion: bool,
     pub timestamp: u64,
 }

src/weapons/stat_calc.rs

@@ -115,19 +115,26 @@ impl Weapon {
             .unwrap_or(&Stat::new())
             .val();
         let ads_mult = get_ads_multiplier(self.weapon_type, self.intrinsic_hash).unwrap_or(1.0);
-        
+
         let modifiers = if let Some(calc_input) = _calc_input {
             get_range_modifier(self.list_perks(), &calc_input, _pvp, cached_data)
         } else {
             RangeModifierResponse::default()
         };
 
-        self.range_formula.calc_range_falloff_formula(
-            range_stat,
-            ads_mult,
-            modifiers,
-            self.range_formula.floor_percent,
-        )
+        let pve_floor = self
+            .range_formula
+            .pve_floor_percent
+            .unwrap_or(self.range_formula.floor_percent);
+
+        let floor = if _pvp {
+            self.range_formula.floor_percent
+        } else {
+            pve_floor
+        };
+
+        self.range_formula
+            .calc_range_falloff_formula(range_stat, ads_mult, modifiers, floor)
     }
 }