Skip to content

fix: divinity intrinsic typo, use perk def.into() instead of magic number #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BarmonHammer merged 2 commits into from
Mar 10, 2025
Merged

fix: divinity intrinsic typo, use perk def.into() instead of magic number #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993bd11
Fix divinity intrinsic typo, use perk def.into() instead of magic number
FlaminSarge Mar 10, 2025
eb9ecbf
Update Judgment to use into() for everything
FlaminSarge Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/perks/exotic_perks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,21 +1325,19 @@ pub fn exotic_perks() {
}),
);
add_dmr(
Perks::Judgement,
Perks::Judgment,
Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {
const JUDGEMENT_HASH: u32 = 1797707170;

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 != Perks::Judgment.into()
&& _input.value == 0
{
return DamageModifierResponse::default();
}

let buff = match (_input.calc_data.intrinsic_hash, _input.pvp) {
(JUDGEMENT_HASH, _) | (_, true) => 1.3,
let buff = match (_input.calc_data.intrinsic_hash.into(), _input.pvp) {
(Perks::Judgment, _) | (_, true) => 1.3,
(_, false) => 1.15,
};

Expand Down
2 changes: 1 addition & 1 deletion src/perks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ pub enum Perks {
InverseRelationship = 1833111001,
Spindle = 1180907940,
TheRightChoice = 34498892,
Judgement = 1797707170,
Judgment = 1797707170,
TempestCascade = 1208312843,

//heavy exotic
Expand Down
2 changes: 1 addition & 1 deletion src/perks/perk_options_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option<PerkOptionData> {
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
Expand Down