fix: no backup plans stacking with empowering buffs

d2foundry · Apr 11, 2024 · 26ec500 · 26ec500
1 parent 90a3745
commit 26ec500
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/perks/buff_perks.rs b/src/perks/buff_perks.rs
@@ -320,7 +320,7 @@ pub fn buff_perks() {
         Perks::LucentBlades,
         Box::new(|_input: ModifierResponseInput| -> HashMap<u32, i32> {
             if _input.calc_data.weapon_type != &WeaponType::SWORD {
-                return HashMap::new()
+                return HashMap::new();
             }
             let stat_bump = match _input.value {
                 0 => return HashMap::new(),
@@ -421,4 +421,19 @@ pub fn buff_perks() {
             }
         }),
     );
+    add_dmr(
+        Perks::NoBackupPlans,
+        Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {
+            if *_input.calc_data.weapon_type != WeaponType::SHOTGUN || _input.value == 0 {
+                return DamageModifierResponse::default();
+            }
+            let desired_buff = if _input.pvp { 1.10 } else { 1.35 };
+            let buff = emp_buff(_input.cached_data, desired_buff);
+            DamageModifierResponse {
+                impact_dmg_scale: buff,
+                explosive_dmg_scale: buff,
+                ..Default::default()
+            }
+        }),
+    );
 }
diff --git a/src/perks/exotic_armor.rs b/src/perks/exotic_armor.rs
@@ -258,22 +258,6 @@ pub fn exotic_armor() {
         ),
     );
 
-    add_dmr(
-        Perks::NoBackupPlans,
-        Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {
-            if *_input.calc_data.weapon_type != WeaponType::SHOTGUN || _input.value == 0 {
-                return DamageModifierResponse::default();
-            }
-
-            let buff = if _input.pvp { 1.10 } else { 1.35 };
-            DamageModifierResponse {
-                impact_dmg_scale: buff,
-                explosive_dmg_scale: buff,
-                ..Default::default()
-            }
-        }),
-    );
-
     add_sbr(
         Perks::ActiumWarRig,
         Box::new(