diff --git a/Cargo.lock b/Cargo.lock index c13a22a..cd72f64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "oracle_engine" -version = "8.2.5" +version = "8.2.6" dependencies = [ "built", "console_error_panic_hook", diff --git a/Cargo.toml b/Cargo.toml index e3cd606..0da5402 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "oracle_engine" edition = "2021" -version = "8.2.5" +version = "8.2.6" rust-version = "1.65" repository = "https://github.com/d2foundry/oracle_engine/" build = "build.rs" diff --git a/build_resources/cached_build.ron b/build_resources/cached_build.ron index 9d03b6e..a71a57f 100644 --- a/build_resources/cached_build.ron +++ b/build_resources/cached_build.ron @@ -1,5 +1,5 @@ ( - last_manifest_version: "233040.25.04.12.2000-3-bnet.59314", + last_manifest_version: "233448.25.04.26.1930-2-bnet.59695", dim_perk_mappings: [ (23371658, 2551157718), (64332393, 2428997981), @@ -544,6 +544,7 @@ 3138242711524099245: 1712954145, 3139500059912092432: 1712954145, 3186246771228159269: 1738697919, + 3223381986297616445: 1746557846, 3390508203598542589: 1743384461, 3634363343471877770: 1736987995, 3656318235229422293: 1684379160, @@ -595,10 +596,8 @@ 6363452143098841417: 1706473954, 6473053250605466342: 1680496635, 6500812278097371025: 1684379160, - 6535290696833366531: 1730591368, 6573503137015225832: 1712898526, 6595410095464072111: 1710724046, - 6688404647401817261: 1730942218, 6699844844506846450: 1680496635, 6747805715162712253: 1680496635, 6855283399424678182: 1692393868, @@ -659,6 +658,7 @@ 10125484563990948716: 1680496635, 10152887516121825520: 1680496635, 10260991195514136372: 1717263753, + 10267429467613443045: 1746558592, 10362949304220229966: 1684377413, 10483893117766707920: 1710724046, 10560167714726377861: 1680496635, @@ -702,7 +702,6 @@ 12646758339643467371: 1700577766, 12692691720038358244: 1703362640, 12700919354009335382: 1712954145, - 12755130987517284058: 1730661143, 12795027126086721977: 1694536499, 13027179234752494412: 1684358756, 13042737382530873792: 1712954145, @@ -736,6 +735,7 @@ 14708901793184003398: 1712898526, 14708936092164057946: 1680496635, 14717924909128602966: 1718741000, + 14967293650962121975: 1746557846, 15020591728938159394: 1680496635, 15062350101154462364: 1693845529, 15186246421447868291: 1738697919, @@ -747,6 +747,7 @@ 15660932891370033553: 1712955561, 15838371886896816978: 1712898526, 15892735954122214721: 1680496635, + 15923546281216400653: 1746557846, 15949062174490237448: 1712955561, 15969424579882116223: 1698268764, 15970735762772118334: 1712898526, diff --git a/build_resources/weapon_formulas.json b/build_resources/weapon_formulas.json index 6491105..99034b5 100644 --- a/build_resources/weapon_formulas.json +++ b/build_resources/weapon_formulas.json @@ -55,10 +55,10 @@ "subFam": { "Rapid-Fire": {"damage": 13.597, "crit_mult": 10, "pve_damage": 13.41, "pve_crit_mult": 0, "burst_delay": 2.5, "burst_size": 1, "inner_burst_delay": 0}, - "High-Impact": {"damage": 23.003, "crit_mult": 15, "pve_damage": 22.000, "pve_crit_mult": 5, "burst_delay": 5, "burst_size": 1, "inner_burst_delay": 0}, + "High-Impact": {"damage": 24.0, "crit_mult": 15, "pve_damage": 22.000, "pve_crit_mult": 5, "burst_delay": 5, "burst_size": 1, "inner_burst_delay": 0}, "Adaptive": {"damage": 15.033, "crit_mult": 13, "pve_damage": 15.009, "pve_crit_mult": 3, "burst_delay": 3, "burst_size": 1, "inner_burst_delay": 0}, "Support-Frame": {"damage": 18.626, "crit_mult": 5.45, "pve_damage": 18.626, "pve_crit_mult": 5.45, "burst_delay": 3, "burst_size": 1, "inner_burst_delay": 0}, - "Precision": {"damage": 19.402, "crit_mult": 13, "pve_damage": 20.000, "pve_crit_mult": 3, "burst_delay": 4, "burst_size": 1, "inner_burst_delay": 0}, + "Precision": {"damage": 20.0, "crit_mult": 10, "pve_damage": 20.000, "pve_crit_mult": 3, "burst_delay": 4, "burst_size": 1, "inner_burst_delay": 0}, "Cerberus": {"damage": 18.615, "crit_mult": 17, "pve_damage": 18.000, "pve_crit_mult": 10, "burst_delay": 5, "burst_size": 4, "inner_burst_delay": 0}, "ChoirOfOne": {"damage": 40.27, "crit_mult": 15, "pve_damage": 148.905, "pve_crit_mult": 5, "burst_delay": 8, "burst_size": 1, "inner_burst_delay": 0}, "SweetBuiss": {"damage": 15.161, "crit_mult": -5, "pve_damage": 15.000, "pve_crit_mult": -5, "burst_delay": 4, "burst_size": 1, "inner_burst_delay": 0} @@ -258,7 +258,7 @@ "Aggressive": {"damage": 53.989, "crit_mult": -25.5, "pve_damage": 49.22, "pve_crit_mult": -25.5, "burst_delay": 20 , "burst_size": 7, "inner_burst_delay": 0, "one_ammo": true}, "Jotunn": {"damage": 326.0, "crit_mult": -25.5, "pve_damage": 348.82, "pve_crit_mult": -25.5, "burst_delay": 24.5, "burst_size": 1, "inner_burst_delay": 0 }, "Bastion": {"damage": 31.231, "crit_mult": -25.5, "pve_damage": 27.745, "pve_crit_mult": -25.5, "burst_delay": 22, "burst_size": 21,"inner_burst_delay": 0, "one_ammo": true}, - "Vex": {"damage": 23.003, "crit_mult": 15, "pve_damage": 23.54, "pve_crit_mult": 5, "burst_delay": 5, "burst_size": 1, "inner_burst_delay": 0 }, + "Vex": {"damage": 24.0, "crit_mult": 15, "pve_damage": 23.54, "pve_crit_mult": 5, "burst_delay": 5, "burst_size": 1, "inner_burst_delay": 0 }, "1KV": {"damage": 0, "crit_mult": -25.5, "pve_damage": 0, "pve_crit_mult": -25.5, "burst_delay": 30, "burst_size": 0, "inner_burst_delay": 0 }, "zero": {"damage": 0, "crit_mult": 0, "pve_damage": 0, "pve_crit_mult": 0, "burst_delay": 0, "burst_size": 0, "inner_burst_delay": 0 } }, @@ -715,7 +715,7 @@ "subFam": { "Aggressive": {"damage": 15.495, "crit_mult": 23, "pve_damage": 18.60, "pve_crit_mult": 10, "burst_delay": 10, "burst_size": 4, "inner_burst_delay": 2}, "High-Impact": {"damage": 21.496, "crit_mult": 15, "pve_damage": 26.4, "pve_crit_mult": 5, "burst_delay": 12, "burst_size": 3, "inner_burst_delay": 2}, - "Rapid-Fire": {"damage": 14.504, "crit_mult": 20, "pve_damage": 16.80, "pve_crit_mult": 10, "burst_delay": 6, "burst_size": 3, "inner_burst_delay": 2}, + "Rapid-Fire": {"damage": 15.0, "crit_mult": 18, "pve_damage": 16.80, "pve_crit_mult": 10, "burst_delay": 6, "burst_size": 3, "inner_burst_delay": 2}, "Adaptive": {"damage": 21.996, "crit_mult": 8, "pve_damage": 22.812, "pve_crit_mult": 8, "burst_delay": 10, "burst_size": 3, "inner_burst_delay": 2}, "Lightweight": {"damage": 19.7, "crit_mult": 5, "pve_damage": 19.2, "pve_crit_mult": 8, "burst_delay": 8, "burst_size": 3, "inner_burst_delay": 2}, "VigilanceWing": {"damage": 15.972, "crit_mult": 8, "pve_damage": 18.9, "pve_crit_mult": -2, "burst_delay": 9, "burst_size": 5, "inner_burst_delay": 2}, @@ -983,7 +983,7 @@ "Conditional": {"damage":26.70, "crit_mult":-20, "pve_damage":22.25, "pve_crit_mult":-20, "burst_delay":33, "burst_size":12, "inner_burst_delay":0, "one_ammo": true}, "Acrius": {"damage":26.70, "crit_mult":-20, "pve_damage":22.25, "pve_crit_mult":-20, "burst_delay":33, "burst_size":12, "inner_burst_delay":0, "one_ammo": true}, "Slug": {"damage":180.154, "crit_mult":13, "pve_damage":163.718, "pve_crit_mult":13, "burst_delay":27, "burst_size":1, "inner_burst_delay":0, "one_ammo": true}, - "HeavyBurst": {"damage":98.995, "crit_mult":13, "pve_damage":98.995, "pve_crit_mult":13, "burst_delay":27, "burst_size":2, "inner_burst_delay":2, "one_ammo": true}, + "HeavyBurst": {"damage":104.94, "crit_mult":13, "pve_damage":104.94, "pve_crit_mult":13, "burst_delay":27, "burst_size":2, "inner_burst_delay":2, "one_ammo": true}, "LoW": {"damage":41.923, "crit_mult":-3, "pve_damage":39.0, "pve_crit_mult":-3, "burst_delay":6, "burst_size":5, "inner_burst_delay":2}, "Lightweight": {"damage":22.01, "crit_mult":-20, "pve_damage":18.33, "pve_crit_mult":-20, "burst_delay":22, "burst_size":12, "inner_burst_delay":0, "one_ammo": true}, "Tractor": {"damage":22.01, "crit_mult":-20, "pve_damage":18.33, "pve_crit_mult":-20, "burst_delay":22, "burst_size":12, "inner_burst_delay":0, "one_ammo": true}, diff --git a/src/perks/buff_perks.rs b/src/perks/buff_perks.rs index 201c9ca..92b7ec1 100644 --- a/src/perks/buff_perks.rs +++ b/src/perks/buff_perks.rs @@ -306,7 +306,7 @@ pub fn buff_perks() { return DamageModifierResponse::default(); } - let buff = surge_buff(_input.cached_data, 2, _input.pvp); + let buff = surge_buff(_input.cached_data, 4, _input.pvp); DamageModifierResponse::surge_buff(buff) }), diff --git a/src/perks/exotic_armor.rs b/src/perks/exotic_armor.rs index 2ac2a43..3ab9178 100644 --- a/src/perks/exotic_armor.rs +++ b/src/perks/exotic_armor.rs @@ -220,7 +220,6 @@ pub fn exotic_armor() { }), ); - //TODO: AUTORELOAD FOR SEALED AHAMKARA GRASPS //TODO: LUCKY PANTS AFFECTING ACCURACY CONE //LUCKY PANTS ONLY WORKS FOR READY ?!?!?! crazy :( @@ -297,11 +296,7 @@ pub fn exotic_armor() { Perks::LionRampart, Box::new( |_input: ModifierResponseInput| -> HashMap { - let mut stats = HashMap::new(); - if _input.value > 0 { - stats.insert(StatHashes::AIRBORNE.into(), 50); - }; - stats + HashMap::from([(StatHashes::AIRBORNE.into(), 50)]) }, ), ); diff --git a/src/perks/perk_options_handler.rs b/src/perks/perk_options_handler.rs index 00a725f..cc2751e 100644 --- a/src/perks/perk_options_handler.rs +++ b/src/perks/perk_options_handler.rs @@ -429,7 +429,7 @@ fn hash_to_perk_option_data(_hash: u32) -> Option { Perks::NoBackupPlans => Some(PerkOptionData::toggle()), Perks::ActiumWarRig => Some(PerkOptionData::static_()), Perks::HallowfireHeart => Some(PerkOptionData::static_()), - Perks::LionRampart => Some(PerkOptionData::toggle()), + Perks::LionRampart => Some(PerkOptionData::static_()), Perks::Peacekeepers => Some(PerkOptionData::static_()), Perks::EyeOfAnotherWorld => Some(PerkOptionData::static_()), Perks::AstrocyteVerse => Some(PerkOptionData::toggle()), diff --git a/src/weapons/stat_calc.rs b/src/weapons/stat_calc.rs index 1115f29..a9c7a62 100644 --- a/src/weapons/stat_calc.rs +++ b/src/weapons/stat_calc.rs @@ -491,18 +491,20 @@ fn get_ads_multiplier(weapon_type: WeaponType, intrinsic_hash: u32) -> Result 2.0, (WeaponType::SIDEARM, _) => 1.2, + (WeaponType::SUBMACHINEGUN, 903) => 1.5, (WeaponType::SUBMACHINEGUN, _) => 1.4, (WeaponType::HANDCANNON, LAST_WORD) => 1.1, (WeaponType::HANDCANNON, CRIMSON) => 1.3, (WeaponType::HANDCANNON, ERIANAS_VOW) => 2.4, + (WeaponType::HANDCANNON, 907) => 1.6, (WeaponType::HANDCANNON, _) => 1.5, (WeaponType::AUTORIFLE, 901) => 1.7, (WeaponType::AUTORIFLE, _) => 1.6, (WeaponType::PULSERIFLE, 904 | 907) => 1.8, - (WeaponType::PULSERIFLE, 901) => 1.6, + (WeaponType::PULSERIFLE, 901 | 911) => 1.6, (WeaponType::PULSERIFLE, _) => 1.7, (WeaponType::BOW, _) => 1.8,