From 993bd1120eb9bef4042429a5657f1871395cd418 Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Mon, 10 Mar 2025 06:25:49 -0700 Subject: [PATCH 1/2] Fix divinity intrinsic typo, use perk def.into() instead of magic number --- src/perks/exotic_perks.rs | 8 ++++---- src/perks/mod.rs | 2 +- src/perks/perk_options_handler.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 83422fb..3867dfa 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -1325,21 +1325,21 @@ pub fn exotic_perks() { }), ); add_dmr( - Perks::Judgement, + Perks::Judgment, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { - const JUDGEMENT_HASH: u32 = 1797707170; + const JUDGMENT_HASH: u32 = Perks::Judgment.into(); let hits_needed = if _input.pvp { 5 } else { 14 }; if _input.calc_data.shots_fired_this_mag < (hits_needed as f64) - && _input.calc_data.intrinsic_hash != JUDGEMENT_HASH + && _input.calc_data.intrinsic_hash != JUDGMENT_HASH && _input.value == 0 { return DamageModifierResponse::default(); } let buff = match (_input.calc_data.intrinsic_hash, _input.pvp) { - (JUDGEMENT_HASH, _) | (_, true) => 1.3, + (JUDGMENT_HASH, _) | (_, true) => 1.3, (_, false) => 1.15, }; diff --git a/src/perks/mod.rs b/src/perks/mod.rs index 3f0c837..35e0968 100644 --- a/src/perks/mod.rs +++ b/src/perks/mod.rs @@ -516,7 +516,7 @@ pub enum Perks { InverseRelationship = 1833111001, Spindle = 1180907940, TheRightChoice = 34498892, - Judgement = 1797707170, + Judgment = 1797707170, TempestCascade = 1208312843, //heavy exotic diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 09d7f14..00a725f 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -448,7 +448,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::GlacialGuard => Some(PerkOptionData::toggle()), Perks::PickYourPoison => Some(PerkOptionData::options(["ADS", "Hip-Fire"].to_vec())), Perks::StringTheory => Some(PerkOptionData::static_()), - Perks::Judgement => Some(PerkOptionData::toggle()), + Perks::Judgment => Some(PerkOptionData::toggle()), Perks::DoomFang => Some(PerkOptionData::stacking(4)), //misc From eb9ecbf48c8118f90cc73ff886ee5d96aa4bfa53 Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Mon, 10 Mar 2025 06:36:26 -0700 Subject: [PATCH 2/2] Update Judgment to use into() for everything --- src/perks/exotic_perks.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 3867dfa..ae81c2e 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -1327,19 +1327,17 @@ pub fn exotic_perks() { add_dmr( Perks::Judgment, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { - const JUDGMENT_HASH: u32 = Perks::Judgment.into(); - let hits_needed = if _input.pvp { 5 } else { 14 }; if _input.calc_data.shots_fired_this_mag < (hits_needed as f64) - && _input.calc_data.intrinsic_hash != JUDGMENT_HASH + && _input.calc_data.intrinsic_hash != Perks::Judgment.into() && _input.value == 0 { return DamageModifierResponse::default(); } - let buff = match (_input.calc_data.intrinsic_hash, _input.pvp) { - (JUDGMENT_HASH, _) | (_, true) => 1.3, + let buff = match (_input.calc_data.intrinsic_hash.into(), _input.pvp) { + (Perks::Judgment, _) | (_, true) => 1.3, (_, false) => 1.15, };