diff --git a/build_resources/cached_build.ron b/build_resources/cached_build.ron index c2512c75..f00ac607 100644 --- a/build_resources/cached_build.ron +++ b/build_resources/cached_build.ron @@ -1,5 +1,5 @@ ( - last_manifest_version: "119335.23.09.27.1916-1-bnet.52347", + last_manifest_version: "119519.23.10.03.2001-1-bnet.52562", dim_perk_mappings: [ (23371658, 2551157718), (64866129, 3038247973), @@ -514,6 +514,7 @@ 10313888042765346288: 1685321158, 10354287176218452814: 1680496635, 10362949304220229966: 1684377413, + 10425714602225989462: 1697729587, 10560167714726377861: 1680496635, 10571952070840525441: 1680496635, 10651452440028158434: 1684377413, @@ -561,6 +562,7 @@ 13934321638601385216: 1684377413, 13950133909943157225: 1680496635, 13979088474823728554: 1680496635, + 14082788872549789563: 1697729587, 14136607665311751775: 1680496635, 14148555925010377664: 1680496635, 14356280413536622305: 1684377413, diff --git a/build_resources/weapon_formulas.json b/build_resources/weapon_formulas.json index 3afdb216..47b46b78 100644 --- a/build_resources/weapon_formulas.json +++ b/build_resources/weapon_formulas.json @@ -247,6 +247,7 @@ "4130495068": {"name": "Precision Frame", "cat": "heavy", "subFam": "Precision", "magProf": "adaptive", "pve":1.20 }, "1174163613": {"name": "Parasite", "cat": "parasite","subFam": "Parasite", "magProf": "adaptive" }, "1759472859": {"name": "Double Fire", "cat": "special", "subFam": "TODO", "magProf": "special" }, + "3821409356": {"name": "Ex Diris", "cat": "exdiris", "subFam": "ExDiris", "magProf": "special"}, "cat": { "special": { "range": {"vpp_start": 0.0,"offset_start": 999.0,"vpp_end": 0.0,"offset_end": 999.9, "floor_percent": 0.999}, @@ -287,6 +288,16 @@ "ads": {"vpp": -0.00187072, "offset": 0.50019128} }, "combatant_scalars": {"vehicle": 2.27, "boss": 2.27, "champion": 2.38, "miniboss": 2.38, "elite": 2.38, "minor": 3.125} + }, + "exdiris": { + "range": {"vpp_start": 0.0,"offset_start": 999.0,"vpp_end": 0.0,"offset_end": 999.9, "floor_percent": 0.999}, + "reload": {"evpp": 0, "vpp": 0, "offset": 0}, + "handling": { + "ready":{"vpp": -0.00272791, "offset": 0.55133684}, + "stow": {"vpp": -0.00232786, "offset": 0.48726765}, + "ads": {"vpp": -0.00187072, "offset": 0.50019128} + }, + "combatant_scalars": {"vehicle": 2.18, "boss": 2.18, "champion": 2.29, "miniboss": 2.29, "elite": 2.29, "minor": 3.83} } }, "subFam": { @@ -297,6 +308,7 @@ "Rapid-Fire": {"damage": 225.0, "crit_mult": -25.5, "burst_delay": 12, "burst_size": 1, "inner_burst_delay": 0.0}, "Precision": {"damage": 300.0, "crit_mult": -25.5, "burst_delay": 18, "burst_size": 1, "inner_burst_delay": 0.0}, "Parasite": {"damage": 835.0, "crit_mult": -25.5, "burst_delay": 18, "burst_size": 1, "inner_burst_delay": 0.0}, + "ExDiris": {"damage": 154.634, "crit_mult": -25.5, "burst_delay": 64, "burst_size": 1, "inner_burst_delay": 0.0}, "TODO": {"damage": 0.0, "crit_mult": -25.5, "burst_delay": 0, "burst_size": 0, "inner_burst_delay": 0.0} }, "magProf": { diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 7e72b1df..c3273bde 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -1148,4 +1148,31 @@ pub fn exotic_perks() { } }), ); + add_fmr( + Perks::CorruptedNucleosynthesis, + Box::new(|_input: ModifierResponseInput| -> FiringModifierResponse { + let bufflist = vec![0.0, -7.0, -12.0, -16.0, -18.0, -19.0]; + let bufflist_cat = vec![0.0, -14.0, -15.0]; + if _input + .calc_data + .perk_value_map + .get(&1826222780) + .is_some() + && + _input + .calc_data + .perk_value_map + .get(&880704824) + .is_some() { + return FiringModifierResponse { + burst_delay_add: bufflist_cat[clamp(_input.value, 0, 2) as usize], + ..Default::default() + } + } + FiringModifierResponse { + burst_delay_add: bufflist[clamp(_input.value, 0, 5) as usize], + ..Default::default() + } + }), + ); } diff --git a/src/perks/mod.rs b/src/perks/mod.rs index 4a013eb3..be3ab579 100644 --- a/src/perks/mod.rs +++ b/src/perks/mod.rs @@ -447,6 +447,7 @@ pub enum Perks { ColdFusion = 1036269296, BlackHole = 3905543891, TemporalUnlimiter = 806917387, + CorruptedNucleosynthesis = 3183537623, //heavy exotic ReignHavoc = 4148158229, diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index d0573f0b..335c8787 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -376,6 +376,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::Broadhead => Some(PerkOptionData::static_()), Perks::HuntersTrace => Some(PerkOptionData::toggle()), Perks::Desperation => Some(PerkOptionData::toggle()), + Perks::CorruptedNucleosynthesis => Some(PerkOptionData::stacking(5)), Perks::DragonShadow => Some(PerkOptionData::toggle()), Perks::OphidianAspect => Some(PerkOptionData::static_()),