From 12ae6da679098f928c717a8e5c28bf46f5cef896 Mon Sep 17 00:00:00 2001 From: Cooper Date: Wed, 11 Oct 2023 21:08:59 -0500 Subject: [PATCH 1/3] add: Charged With Blight trait --- src/perks/exotic_perks.rs | 12 ++++++++++++ src/perks/mod.rs | 1 + src/perks/perk_options_handler.rs | 1 + 3 files changed, 14 insertions(+) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 639b9d2b..f319a03c 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -745,6 +745,18 @@ pub fn exotic_perks() { }), ); + add_dmr( + Perks::ChargedWithBlight, + Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { + DamageModifierResponse { + impact_dmg_scale: 1.5, + explosive_dmg_scale: 1.5, + crit_scale: 1.0, + } + }), + ); + + add_dmr( Perks::MarkovChain, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { diff --git a/src/perks/mod.rs b/src/perks/mod.rs index 3057f174..99b339e0 100644 --- a/src/perks/mod.rs +++ b/src/perks/mod.rs @@ -414,6 +414,7 @@ pub enum Perks { Broadhead = 2287699930, HuntersTrace = 891750160, Desperation = 525593296, + ChargedWithBlight = 2094939076, //energy exotic LagragianSight = 2881100038, diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 365a5131..f3017fd6 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -291,6 +291,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::SwordLogic => Some(PerkOptionData::stacking(4)), //exotics + Perks::ChargedWithBlight => Some(PerkOptionData::toggle()), Perks::CranialSpike => Some(PerkOptionData::stacking(5)), Perks::DarkForgedTrigger => Some(PerkOptionData::options_raw(["Hip-Fire", "ADS"].to_vec())), Perks::AgersCall => Some(PerkOptionData::static_()), From 9bc4bcc19083031eb9b915b4ac25183218303b86 Mon Sep 17 00:00:00 2001 From: Cooper Date: Wed, 11 Oct 2023 21:13:22 -0500 Subject: [PATCH 2/3] add: Charged With Blight trait stacking --- src/perks/exotic_perks.rs | 8 ++++++-- src/perks/perk_options_handler.rs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index f319a03c..5b7ddada 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -748,9 +748,13 @@ pub fn exotic_perks() { add_dmr( Perks::ChargedWithBlight, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { + let mut damage_mult = 1.0; + if _input.value == 10{ + damage_mult = 1.5 + } DamageModifierResponse { - impact_dmg_scale: 1.5, - explosive_dmg_scale: 1.5, + impact_dmg_scale: damage_mult, + explosive_dmg_scale: damage_mult, crit_scale: 1.0, } }), diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index f3017fd6..eee22e45 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -291,7 +291,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::SwordLogic => Some(PerkOptionData::stacking(4)), //exotics - Perks::ChargedWithBlight => Some(PerkOptionData::toggle()), + Perks::ChargedWithBlight => Some(PerkOptionData::stacking(10)), Perks::CranialSpike => Some(PerkOptionData::stacking(5)), Perks::DarkForgedTrigger => Some(PerkOptionData::options_raw(["Hip-Fire", "ADS"].to_vec())), Perks::AgersCall => Some(PerkOptionData::static_()), From aed40d9c9f5f9b60b12e4fd1d742e082afaa2cbb Mon Sep 17 00:00:00 2001 From: Cooper Date: Thu, 12 Oct 2023 10:38:37 -0500 Subject: [PATCH 3/3] add: Charged With Blight crit multiplier and switch trait back to toggle. data: remove mistaken damage multiplier for Charged With Blight --- src/perks/exotic_perks.rs | 12 ++++++------ src/perks/perk_options_handler.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 5b7ddada..b0a0588d 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -748,14 +748,14 @@ pub fn exotic_perks() { add_dmr( Perks::ChargedWithBlight, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { - let mut damage_mult = 1.0; - if _input.value == 10{ - damage_mult = 1.5 + let mut crit_mult = 1.0; + if _input.value == 1{ + crit_mult = 0.0 } DamageModifierResponse { - impact_dmg_scale: damage_mult, - explosive_dmg_scale: damage_mult, - crit_scale: 1.0, + impact_dmg_scale: 1.0, //Need to find out how much damage this does! + explosive_dmg_scale: 1.0, + crit_scale: crit_mult, } }), ); diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index eee22e45..f3017fd6 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -291,7 +291,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::SwordLogic => Some(PerkOptionData::stacking(4)), //exotics - Perks::ChargedWithBlight => Some(PerkOptionData::stacking(10)), + Perks::ChargedWithBlight => Some(PerkOptionData::toggle()), Perks::CranialSpike => Some(PerkOptionData::stacking(5)), Perks::DarkForgedTrigger => Some(PerkOptionData::options_raw(["Hip-Fire", "ADS"].to_vec())), Perks::AgersCall => Some(PerkOptionData::static_()),