From a6d8dd13354ddeec5c0bb7dfde3fd123efe10c6d Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Mon, 10 Mar 2025 06:23:50 -0700 Subject: [PATCH 1/2] Swap out Noble Rounds for Blessing of the Sky since the secondary trait is what grants the damage bonus Also use perk def.into() for NobleRounds instead of magic numbers where it's used --- src/perks/buff_perks.rs | 2 +- src/perks/exotic_armor.rs | 2 +- src/perks/mod.rs | 1 + src/perks/perk_options_handler.rs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/perks/buff_perks.rs b/src/perks/buff_perks.rs index 201c9ca..7cc4fd8 100644 --- a/src/perks/buff_perks.rs +++ b/src/perks/buff_perks.rs @@ -67,7 +67,7 @@ pub fn buff_perks() { ); add_dmr( - Perks::NobleRounds, + Perks::BlessingOfTheSky, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { if _input.value == 0 { return DamageModifierResponse::default(); diff --git a/src/perks/exotic_armor.rs b/src/perks/exotic_armor.rs index 2ac2a43..bc81c89 100644 --- a/src/perks/exotic_armor.rs +++ b/src/perks/exotic_armor.rs @@ -408,7 +408,7 @@ pub fn exotic_armor() { Box::new( |_input: ModifierResponseInput| -> HashMap { let mut stats = HashMap::new(); - if _input.calc_data.intrinsic_hash == 2144092201 { + if _input.calc_data.intrinsic_hash == Perks::NobleRounds.into() { //Lumina stats.insert(StatHashes::AIRBORNE.into(), 30); }; diff --git a/src/perks/mod.rs b/src/perks/mod.rs index 3f0c837..ee6fd55 100644 --- a/src/perks/mod.rs +++ b/src/perks/mod.rs @@ -471,6 +471,7 @@ pub enum Perks { RideTheBull = 630329983, HuntersTrance = 383825919, NobleRounds = 2144092201, + BlessingOfTheSky = 743139589, StormAndStress = 2238035098, Roadborn = 1658733671, MarkovChain = 2814973067, diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 09d7f14..6429b90 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -366,7 +366,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::RatPack => Some(PerkOptionData::stacking_min(5, 1)), Perks::HuntersTrance => Some(PerkOptionData::static_()), Perks::RideTheBull => Some(PerkOptionData::stacking(2)), - Perks::NobleRounds => Some(PerkOptionData::toggle()), + Perks::BlessingOfTheSky => Some(PerkOptionData::toggle()), Perks::MementoMori => Some(PerkOptionData::toggle()), Perks::TractorCannon => Some(PerkOptionData::static_()), Perks::HarmonicLaser => Some(PerkOptionData::stacking(2)), From ff6752c0680f818365316e175873a8732847d1df Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Mon, 10 Mar 2025 06:32:46 -0700 Subject: [PATCH 2/2] Add NobleRounds stacks --- src/perks/perk_options_handler.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 6429b90..bfb232a 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -366,6 +366,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::RatPack => Some(PerkOptionData::stacking_min(5, 1)), Perks::HuntersTrance => Some(PerkOptionData::static_()), Perks::RideTheBull => Some(PerkOptionData::stacking(2)), + Perks::NobleRounds => Some(PerkOptionData::stacking(6)), Perks::BlessingOfTheSky => Some(PerkOptionData::toggle()), Perks::MementoMori => Some(PerkOptionData::toggle()), Perks::TractorCannon => Some(PerkOptionData::static_()),