Merge branch 'main' into aeon-force

d2foundry · Aug 29, 2024 · 4666c67 · 4666c67
2 parents 5f8eb95 + a354fb0
commit 4666c67
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/perks/buff_perks.rs b/src/perks/buff_perks.rs
@@ -383,5 +383,19 @@ pub fn buff_perks() {
                 }
             },
         ),
-    )
+    );
+    add_dmr(
+        Perks::DoomFang,
+        Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {
+            if *_input.calc_data.damage_type != DamageType::VOID || _input.value == 0 {
+                return DamageModifierResponse::default();
+            }
+            let buff = surge_buff(_input.cached_data, _input.value, _input.pvp);
+            DamageModifierResponse {
+                impact_dmg_scale: buff,
+                explosive_dmg_scale: buff,
+                ..Default::default()
+            }
+        }),
+    );
 }
diff --git a/src/perks/mod.rs b/src/perks/mod.rs
@@ -150,6 +150,7 @@ pub enum Perks {
     EternalWarrior = 926976844,
     TritonVice = 187957397,
     GlacialGuard = 185514250,
+    DoomFang = 1155472387,
 
     //parts
     ImpactCasing = 3796465595,

diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs
@@ -438,7 +438,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option<PerkOptionData> {
         Perks::PickYourPoison => Some(PerkOptionData::options(["ADS", "Hip-Fire"].to_vec())),
         Perks::StringTheory => Some(PerkOptionData::static_()),
         Perks::Judgement => Some(PerkOptionData::toggle()),
-
+        Perks::DoomFang => Some(PerkOptionData::stacking(4)),
 
         //misc
         Perks::UmbralSharpening => Some(PerkOptionData::stacking(5)),