From c65b35b0d5e87515959d2e63dc8465d34276a608 Mon Sep 17 00:00:00 2001 From: Crystal Date: Thu, 18 May 2023 14:58:57 -0700 Subject: [PATCH 1/3] added fan fire --- src/perks/exotic_perks.rs | 23 +++++++++++++++++++++++ src/perks/mod.rs | 1 + src/perks/perk_options_handler.rs | 1 + 3 files changed, 25 insertions(+) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index d0995e5a..a744d479 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -934,4 +934,27 @@ pub fn exotic_perks() { } }), ); + + //TODO: FAN FIRE AFFECTING ACCURACY CONE + + add_dmr( + Perks::FanFire, + Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { + DamageModifierResponse { + impact_dmg_scale: 1.3, + explosive_dmg_scale: 1.3, + crit_scale: 1.0, + } + }), + ); + + add_rmr( + Perks::FanFire, + Box::new(|_input: ModifierResponseInput| -> ReloadModifierResponse { + ReloadModifierResponse { + reload_stat_add: 5 * _input.value, + ..Default::default() + } + }), + ); } diff --git a/src/perks/mod.rs b/src/perks/mod.rs index 8635c05d..3a178d8b 100644 --- a/src/perks/mod.rs +++ b/src/perks/mod.rs @@ -389,6 +389,7 @@ pub enum Perks { Roadborn = 1658733671, MarkovChain = 2814973067, MementoMori = 647617635, + FanFire = 2770223582, //energy exotic LagragianSight = 2881100038, diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 2f0ecb68..a0f2e1d9 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -332,6 +332,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::NobleRounds => Some(PerkOptionData::toggle()), Perks::MementoMori => Some(PerkOptionData::toggle()), Perks::TractorCannon => Some(PerkOptionData::toggle()), + Perks::FanFire => Some(PerkOptionData::stacking(6)), //number is unknown Perks::DexterityMod => Some(PerkOptionData::stacking(3)), Perks::ReserveMod => Some(PerkOptionData::stacking(3)), From f7242bc08b3f56cff91e47e27b770652c9ecfabc Mon Sep 17 00:00:00 2001 From: Crystal Date: Thu, 18 May 2023 15:01:13 -0700 Subject: [PATCH 2/3] :) --- src/perks/exotic_perks.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index a744d479..12e5e441 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -934,7 +934,7 @@ pub fn exotic_perks() { } }), ); - + //TODO: FAN FIRE AFFECTING ACCURACY CONE add_dmr( @@ -948,7 +948,7 @@ pub fn exotic_perks() { }), ); - add_rmr( + add_rsmr( Perks::FanFire, Box::new(|_input: ModifierResponseInput| -> ReloadModifierResponse { ReloadModifierResponse { From 0fcb6aff5aeee6fe291c2a6de45aa30bb243b466 Mon Sep 17 00:00:00 2001 From: Crystal Date: Thu, 18 May 2023 15:03:17 -0700 Subject: [PATCH 3/3] man --- src/perks/exotic_perks.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 12e5e441..6c40cd09 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -952,7 +952,7 @@ pub fn exotic_perks() { Perks::FanFire, Box::new(|_input: ModifierResponseInput| -> ReloadModifierResponse { ReloadModifierResponse { - reload_stat_add: 5 * _input.value, + reload_stat_add: (5 * _input.value) as i32, ..Default::default() } }),