chore: patch 8.1.5 fixes (#138)

d2foundry · Jan 10, 2025 · 3ae1904 · 3ae1904
1 parent 6ad82f6
commit 3ae1904
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 14 deletions.
diff --git a/build_resources/cached_build.ron b/build_resources/cached_build.ron
@@ -639,6 +639,7 @@
         10260991195514136372: 1717263753,
         10362949304220229966: 1684377413,
         10483893117766707920: 1710724046,
+        10489299654812723847: 1733552679,
         10560167714726377861: 1680496635,
         10571952070840525441: 1680496635,
         10739615916985493409: 1730663402,

diff --git a/build_resources/weapon_formulas.json b/build_resources/weapon_formulas.json
@@ -704,7 +704,7 @@
             "Adaptive":      {"damage": 21.996, "crit_mult": 8, "pve_damage": 22.812, "pve_crit_mult": 8,    "burst_delay": 10, "burst_size": 3, "inner_burst_delay": 2},
             "Lightweight":   {"damage": 17.006, "crit_mult": 18,  "pve_damage": 19.2, "pve_crit_mult": 8,    "burst_delay": 8,  "burst_size": 3, "inner_burst_delay": 2},
             "VigilanceWing": {"damage": 15.972, "crit_mult": 8,  "pve_damage": 18.9, "pve_crit_mult": -2,   "burst_delay": 9,  "burst_size": 5, "inner_burst_delay": 2},
-            "GravitonLance": {"damage": 22.996, "crit_mult": 18, "pve_damage": 19.018, "pve_crit_mult": 8,    "burst_delay": 9, "burst_size": 2, "inner_burst_delay": 2},
+            "GravitonLance": {"damage": 19.555, "crit_mult": 18, "pve_damage": 19.018, "pve_crit_mult": 8,    "burst_delay": 9, "burst_size": 2, "inner_burst_delay": 2},
             "HeavyBurst": {"damage": 22.996, "crit_mult": 18, "pve_damage": 18.786, "pve_crit_mult": 16.728,    "burst_delay": 9, "burst_size": 2, "inner_burst_delay": 2}, 
             "test":          {"damage": 10.0, "crit_mult": 25.5,   "pve_damage": 10.0, "pve_crit_mult": 25.5,  "burst_delay": 2,  "burst_size": 5, "inner_burst_delay": 2}
         },

diff --git a/src/perks/mod.rs b/src/perks/mod.rs
@@ -431,6 +431,7 @@ pub enum Perks {
     AirTrigger = 1421772400,
     ClosingTime = 1194056669,
     LoneWolf = 2579169598,
+    SplicerSurge = 3404929162,
 
     //subclass
     OnYourMark = 3066103999,

diff --git a/src/perks/other_perks.rs b/src/perks/other_perks.rs
@@ -21,13 +21,17 @@ pub fn other_perks() {
     add_rsmr(
         Perks::AlloyMag,
         Box::new(|_input: ModifierResponseInput| -> ReloadModifierResponse {
-            if _input.value > 0 {
-                ReloadModifierResponse {
-                    reload_stat_add: 0,
-                    reload_time_scale: 0.85,
-                }
-            } else {
-                ReloadModifierResponse::default()
+            if _input.value == 0 {
+                ReloadModifierResponse::default();
+            }
+            let reload_time_scale = match _input.value {
+                0 => 1.0,
+                1 => 0.9,
+                2.. => 0.8
+            }; 
+            ReloadModifierResponse {
+                reload_time_scale,
+                ..Default::default()
             }
         }),
     );

diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs
@@ -93,7 +93,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option<PerkOptionData> {
         Perks::SwapMag => Some(PerkOptionData::static_()),
         Perks::FullChoke => Some(PerkOptionData::static_()),
         Perks::SpikeGrenades => Some(PerkOptionData::static_()),
-        Perks::AlloyMag => Some(PerkOptionData::toggle()),
+        Perks::AlloyMag => Some(PerkOptionData::options(["Base", "Max Effect"].to_vec())),
         Perks::LiquidCoils => Some(PerkOptionData::static_()),
         Perks::AcceleratedCoils => Some(PerkOptionData::static_()),
         Perks::ChargetimeMW => Some(PerkOptionData::static_()),
@@ -310,6 +310,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option<PerkOptionData> {
         Perks::AirTrigger => Some(PerkOptionData::toggle()),
         Perks::ClosingTime => Some(PerkOptionData::options(["Base", "Max Effect"].to_vec())),
         Perks::LoneWolf => Some(PerkOptionData::options(["Base", "Alone"].to_vec())),
+        Perks::SplicerSurge => Some(PerkOptionData::stacking(3)),
 
         //exotics
         Perks::CranialSpike => Some(PerkOptionData::stacking(5)),

diff --git a/src/perks/year_6_perks.rs b/src/perks/year_6_perks.rs
@@ -386,7 +386,7 @@ pub fn year_6_perks() {
                 (1, false) => 1.1,
                 (2, false) => 1.175,
                 (3.., false) => 1.25,
-                (1..=2, true) => 1.1,
+                (1..=2, true) => 1.05,
                 (3.., true) => 1.15,
             };
 

diff --git a/src/perks/year_7_perks.rs b/src/perks/year_7_perks.rs
@@ -75,9 +75,16 @@ pub fn year_7_perks() {
         Perks::LoneWolf,
         Box::new(|_input: ModifierResponseInput| -> HashMap<u32, i32> {
             let mut stats = HashMap::new();
+            let enhance_buff = if _input.is_enhanced { 1 } else { 0 };
             if _input.value > 0 {
-                stats.insert(StatHashes::AIRBORNE.into(), 10 * _input.value as i32);
-                stats.insert(StatHashes::AIM_ASSIST.into(), 10 * _input.value as i32);
+                stats.insert(
+                    StatHashes::AIRBORNE.into(),
+                    (10 + 2 * enhance_buff) * _input.value as i32,
+                );
+                stats.insert(
+                    StatHashes::AIM_ASSIST.into(),
+                    (10 + enhance_buff) * _input.value as i32,
+                );
             }
             stats
         }),
@@ -89,8 +96,9 @@ pub fn year_7_perks() {
                 if _input.value == 0 {
                     HandlingModifierResponse::default();
                 }
+                let enhance_buff = if _input.is_enhanced { 0.05 } else { 0.0 };
                 HandlingModifierResponse {
-                    ads_scale: 1.0 - (0.1 * _input.value as f64),
+                    ads_scale: 1.0 - (0.1 * _input.value as f64) - enhance_buff,
                     ..Default::default()
                 }
             },
@@ -118,10 +126,80 @@ pub fn year_7_perks() {
                     stat_add: 25 * _input.value as i32,
                     stow_scale: 1.0 - (0.1 * _input.value as f64),
                     draw_scale: 1.0 - (0.1 * _input.value as f64),
-                    ads_scale:  1.0 - (0.1 * _input.value as f64),
+                    ads_scale: 1.0 - (0.1 * _input.value as f64),
                     ..Default::default()
                 }
             },
         ),
     );
+    add_rmr(
+        Perks::ClosingTime,
+        Box::new(|_input: ModifierResponseInput| -> RangeModifierResponse {
+            if _input.value == 0 {
+                RangeModifierResponse::default();
+            }
+            RangeModifierResponse {
+                range_stat_add: 25 * _input.value as i32,
+                ..Default::default()
+            }
+        }),
+    );
+    add_sbr(
+        Perks::SplicerSurge,
+        Box::new(|_input: ModifierResponseInput| -> HashMap<u32, i32> {
+            let mut stats = HashMap::new();
+            let buff = match _input.value {
+                0 => 0,
+                1 => 10,
+                2 => 20,
+                3.. => 45,
+            };
+            if _input.value > 0 {
+                stats.insert(StatHashes::RELOAD.into(), buff);
+                stats.insert(StatHashes::HANDLING.into(), buff);
+            }
+            stats
+        }),
+    );
+    add_sbr(
+        Perks::SplicerSurge,
+        Box::new(|_input: ModifierResponseInput| -> HashMap<u32, i32> {
+            let mut stats = HashMap::new();
+            let buff = match _input.value {
+                0 => 0,
+                1 => 10,
+                2 => 20,
+                3.. => 45,
+            };
+            if _input.value > 0 {
+                stats.insert(StatHashes::RELOAD.into(), buff);
+                stats.insert(StatHashes::HANDLING.into(), buff);
+            }
+            stats
+        }),
+    );
+    add_rsmr(
+        Perks::SplicerSurge,
+        Box::new(|_input: ModifierResponseInput| -> ReloadModifierResponse {
+            if _input.value == 0 {
+                ReloadModifierResponse::default();
+            }
+            let reload_stat_add = match _input.value {
+                0 => 0,
+                1 => 10,
+                2 => 20,
+                3.. => 45,
+            };
+            let reload_time_scale = match _input.value {
+                0 => 1.00,
+                1 => 0.967,
+                2 => 0.934,
+                3.. => 0.9,
+            };
+            ReloadModifierResponse {
+                reload_stat_add,
+                reload_time_scale,
+            }
+        }),
+    )
 }