bungie: ep 2 act 3 patch (#139)

* bungie: ep 2 act 3 patch * chore: fix mag rounding test * lil tipsy --------- Co-authored-by: Harmon Brammer <[email protected]>
d2foundry · Jan 18, 2025 · 5e4fa9f · 5e4fa9f
1 parent 3ae1904
commit 5e4fa9f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/build_resources/cached_build.ron b/build_resources/cached_build.ron
@@ -1,5 +1,5 @@
 (
-    last_manifest_version: "229444.24.11.09.2354-1-bnet.57652",
+    last_manifest_version: "230605.25.01.08.2000-2-bnet.58050",
     dim_perk_mappings: [
         (23371658, 2551157718),
         (64332393, 2428997981),
@@ -476,6 +476,7 @@
         247756957047965770: 1713046196,
         286720667179379016: 1680496635,
         426551043894261173: 1710479452,
+        485640313694577333: 1736988848,
         493023904928987938: 1712898526,
         531962313230060982: 1730590632,
         592777914046834360: 1680496635,
@@ -499,12 +500,13 @@
         2010728171446193536: 1712954145,
         2022487631388811195: 1712954145,
         2191254335229349921: 1684295508,
+        2192363983314083941: 1736989414,
         2237942400504764581: 1680496635,
-        2267114322525280915: 1730661888,
         2271323569132994441: 1713058005,
         2277066384349976511: 1710724046,
         2299937750594665614: 1701181946,
         2315788172092275745: 1717263753,
+        2358271038554428192: 1736989414,
         2374942994341826470: 1684358756,
         2393307939511576024: 1689097957,
         2469018674064926201: 1712954145,
@@ -522,10 +524,11 @@
         3124694739480044178: 1710479452,
         3138242711524099245: 1712954145,
         3139500059912092432: 1712954145,
+        3634363343471877770: 1736987995,
         3656318235229422293: 1684379160,
         3986689097416667537: 1680496635,
         4147888747978803714: 1684362236,
-        4249787907601498364: 1730590662,
+        4211923665401322869: 1736989414,
         4311900104822630129: 1710479452,
         4315419827562734321: 1712955561,
         4382782997569268038: 1680496635,
@@ -548,7 +551,6 @@
         5184316860242985856: 1712949500,
         5227003031201474041: 1684358756,
         5490204527215486242: 1680496635,
-        5549937041145970107: 1712954145,
         5554258319145810390: 1684358756,
         5642771627529812769: 1712954145,
         5651488379692480574: 1680496635,
@@ -557,7 +559,6 @@
         5768830231017509325: 1712898526,
         5817710688730467837: 1692391910,
         5912581016949511866: 1680496635,
-        5943577166148364587: 1730662935,
         5960939197459801903: 1712898526,
         6037254698249202619: 1698268764,
         6054917076034235559: 1684379160,
@@ -569,7 +570,6 @@
         6230575109249907536: 1680496635,
         6243987267281908635: 1701181946,
         6274363714618169512: 1684295508,
-        6327658762308138670: 1710479452,
         6363452143098841417: 1706473954,
         6473053250605466342: 1680496635,
         6500812278097371025: 1684379160,
@@ -606,7 +606,6 @@
         8533260392798367949: 1730590632,
         8550895403021475289: 1713059795,
         8576565785560222210: 1680496635,
-        8587357221083748138: 1710479452,
         8615471135008404944: 1697663227,
         8730367188352136443: 1712954145,
         8735425768329619397: 1684377413,
@@ -618,6 +617,7 @@
         9047328011699883751: 1680496635,
         9141436661546404807: 1710479452,
         9305784101096151529: 1698268764,
+        9362682405296717505: 1736988675,
         9375916267349736633: 1709753985,
         9378186686951613294: 1680496635,
         9417994741245543692: 1710724046,
@@ -629,17 +629,16 @@
         9723841265787267527: 1731026189,
         9726296745744303979: 1717263753,
         9728586762901908904: 1680496635,
-        9754601202357263919: 1730591039,
         9834417392745968561: 1697573317,
         9844843869658332756: 1713160822,
         9910833339952022360: 1680496635,
         10092086471414989632: 1684377413,
+        10105384374228825374: 1737002938,
         10125484563990948716: 1680496635,
         10152887516121825520: 1680496635,
         10260991195514136372: 1717263753,
         10362949304220229966: 1684377413,
         10483893117766707920: 1710724046,
-        10489299654812723847: 1733552679,
         10560167714726377861: 1680496635,
         10571952070840525441: 1680496635,
         10739615916985493409: 1730663402,
@@ -648,6 +647,7 @@
         10998294304530301782: 1710479452,
         11013679018726612442: 1685489087,
         11322964994480880235: 1712942748,
+        11357575917436140770: 1736988899,
         11362993348484167678: 1689555684,
         11542548001101910997: 1701181946,
         11554811412464348675: 1680581901,
@@ -657,7 +657,6 @@
         11751416756124123391: 1696566906,
         11784808576698396833: 1684295508,
         11792866108024384582: 1680496635,
-        11827635086396145949: 1730590766,
         11839155587859974249: 1710479452,
         11884910338994267923: 1710724046,
         11891134467995490508: 1712430246,
@@ -668,7 +667,6 @@
         12232659098460778380: 1730661813,
         12263360506490505738: 1712898526,
         12325892118056368530: 1680496635,
-        12329802572898706721: 1680629457,
         12371901916224698061: 1684377413,
         12389450796888940047: 1680581901,
         12395815167029581576: 1710479452,
@@ -711,7 +709,6 @@
         14653711479586740022: 1711328341,
         14667149617307945063: 1730661414,
         14683820608543013062: 1684377413,
-        14703266489911587834: 1730661271,
         14708901793184003398: 1712898526,
         14708936092164057946: 1680496635,
         14717924909128602966: 1718741000,
@@ -735,9 +732,11 @@
         16054053762813903310: 1685489087,
         16057420393077654008: 1712898526,
         16078604900598086070: 1680496635,
+        16188417096415455623: 1737001279,
         16202432113701677798: 1684377413,
         16270071423718638549: 1680496635,
         16422354876371683779: 1680496635,
+        16449243212412459283: 1736988152,
         16475522862564448563: 1680496635,
         16475694329210003018: 1680496635,
         16508103034844284395: 1730663043,
@@ -751,6 +750,7 @@
         17115307512459561417: 1711327049,
         17200727046280595283: 1730590632,
         17283189678931478183: 1684377413,
+        17312898679998679286: 1736988639,
         17510475912938301460: 1680496635,
         17549300852572264387: 1684295508,
         17557903845863085098: 1684377413,

diff --git a/build_resources/weapon_formulas.json b/build_resources/weapon_formulas.json
@@ -53,7 +53,7 @@
         },
 
         "subFam": {
-            "Rapid-Fire":  {"damage": 13.497, "crit_mult": 10,  "pve_damage": 13.41, "pve_crit_mult": 0,  "burst_delay": 2.5, "burst_size": 1, "inner_burst_delay": 0},
+            "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},
             "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},
@@ -699,12 +699,12 @@
         },
         "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.996, "crit_mult": 15, "pve_damage": 26.4, "pve_crit_mult": 5,    "burst_delay": 12, "burst_size": 3, "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},
             "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": 17.006, "crit_mult": 18,  "pve_damage": 19.2, "pve_crit_mult": 8,    "burst_delay": 8,  "burst_size": 3, "inner_burst_delay": 2},
+            "Lightweight":   {"damage": 20.406, "crit_mult": 3,  "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},
-            "GravitonLance": {"damage": 19.555, "crit_mult": 18, "pve_damage": 19.018, "pve_crit_mult": 8,    "burst_delay": 9, "burst_size": 2, "inner_burst_delay": 2},
+            "GravitonLance": {"damage": 19.555, "crit_mult": 18, "pve_damage": 19.018, "pve_crit_mult": 8,    "burst_delay": 10, "burst_size": 2, "inner_burst_delay": 2},
             "HeavyBurst": {"damage": 22.996, "crit_mult": 18, "pve_damage": 18.786, "pve_crit_mult": 16.728,    "burst_delay": 9, "burst_size": 2, "inner_burst_delay": 2}, 
             "test":          {"damage": 10.0, "crit_mult": 25.5,   "pve_damage": 10.0, "pve_crit_mult": 25.5,  "burst_delay": 2,  "burst_size": 5, "inner_burst_delay": 2}
         },
@@ -881,7 +881,7 @@
         "subFam": {
             "High-Impact": {"damage":42.001, "crit_mult":26, "pve_damage":40.00, "pve_crit_mult":13, "burst_delay":12, "burst_size":1, "inner_burst_delay":0},
             "Rapid-Fire":  {"damage":27.996, "crit_mult":23, "pve_damage":27.50, "pve_crit_mult":10, "burst_delay":7,  "burst_size":1, "inner_burst_delay":0},
-            "Lightweight": {"damage":32.006, "crit_mult":26, "pve_damage":32.025, "pve_crit_mult":13, "burst_delay":9,  "burst_size":1, "inner_burst_delay":0},
+            "Lightweight": {"damage":38.006, "crit_mult":10, "pve_damage":32.025, "pve_crit_mult":13, "burst_delay":9,  "burst_size":1, "inner_burst_delay":0},
             "Precision":   {"damage":38.506, "crit_mult":15, "pve_damage":38.00, "pve_crit_mult":5,  "burst_delay":10, "burst_size":1, "inner_burst_delay":0},
             "Aggressive":  {"damage":53.995, "crit_mult":10, "pve_damage":70.2, "pve_crit_mult":-1, "burst_delay":15, "burst_size":1, "inner_burst_delay":0}
         },
@@ -1059,7 +1059,7 @@
             "Final-Warning":    {"damage":25.114,   "crit_mult":4, "pve_damage":25.00,   "pve_crit_mult":-5, "burst_delay":4, "burst_size":1, "inner_burst_delay":0},
             "Rapid-Fire":       {"damage":25.114,   "crit_mult":4, "pve_damage":25.00,   "pve_crit_mult":-5, "burst_delay":4, "burst_size":1, "inner_burst_delay":0},
             "Precision":        {"damage":40.154,   "crit_mult":5, "pve_damage":40.00,   "pve_crit_mult":-5, "burst_delay":7, "burst_size":1, "inner_burst_delay":0},
-            "Heavy_Burst":      {"damage":30.077,   "crit_mult":5, "pve_damage":30.00,   "pve_crit_mult":-5, "burst_delay":8, "burst_size":2, "inner_burst_delay":3},
+            "Heavy_Burst":      {"damage":33.077,   "crit_mult":5, "pve_damage":30.00,   "pve_crit_mult":-5, "burst_delay":8, "burst_size":2, "inner_burst_delay":3},
             "Adaptive_Burst":   {"damage":20.091,  "crit_mult":16, "pve_damage":20.00,   "pve_crit_mult":5,  "burst_delay":7, "burst_size":3, "inner_burst_delay":2},
             "Adaptive":         {"damage":36.083,   "crit_mult":5, "pve_damage":36.00,   "pve_crit_mult":-5, "burst_delay":6, "burst_size":1, "inner_burst_delay":0},
             "Lightweight":      {"damage":31.038,   "crit_mult":5, "pve_damage":31.00,   "pve_crit_mult":-5, "burst_delay":5, "burst_size":1, "inner_burst_delay":0},
@@ -1188,23 +1188,23 @@
             }
         },
         "subFam": {
-            "Aggressive": {"damage":13.613,  "crit_mult":13,"pve_damage":14.00, "pve_crit_mult":0, "burst_delay":2.5, "burst_size":1, "inner_burst_delay":0},
+            "Aggressive": {"damage":13.604,  "crit_mult":13,"pve_damage":14.00, "pve_crit_mult":0, "burst_delay":2.5, "burst_size":1, "inner_burst_delay":0},
             "Lightweight":{"damage":10.6, "crit_mult":21, "pve_damage":10.86, "pve_crit_mult":8,  "burst_delay":2.0, "burst_size":1, "inner_burst_delay":0},
-            "Precision":  {"damage":16.701,  "crit_mult":5, "pve_damage":17.01, "pve_crit_mult":-5, "burst_delay":3.0, "burst_size":1, "inner_burst_delay":0},
+            "Precision":  {"damage":16.551,  "crit_mult":5, "pve_damage":17.01, "pve_crit_mult":-5, "burst_delay":3.0, "burst_size":1, "inner_burst_delay":0},
             "Adaptive":   {"damage":11.498, "crit_mult":11, "pve_damage":11.25, "pve_crit_mult":0,  "burst_delay":2.0, "burst_size":1, "inner_burst_delay":0},
             "Osteo"   :   {"damage":18.202, "crit_mult":6,  "pve_damage":18.73, "pve_crit_mult":-5,  "burst_delay":3.0, "burst_size":1, "inner_burst_delay":0}
         },
         "magProf": {
             "small": {
-                "mag": {"evpp": 0.0, "vpp": 0.095, "offset": 22.6},
+                "mag": {"evpp": 0.0, "vpp": 0.095, "offset": 25.6},
                 "reserve_id": 0
             },
             "precision": {
-                "mag": {"evpp": 0.0, "vpp": 0.1, "offset": 23.5},
+                "mag": {"evpp": 0.0, "vpp": 0.1, "offset": 26.5},
                 "reserve_id": 0
             },
             "large": {
-                "mag": {"evpp": 0.0, "vpp": 0.12, "offset": 28.3},
+                "mag": {"evpp": 0.0, "vpp": 0.12, "offset": 31.3},
                 "reserve_id": 0
             }
         }

diff --git a/src/perks/year_5_perks.rs b/src/perks/year_5_perks.rs
@@ -305,7 +305,12 @@ pub fn year_5_perks() {
         Perks::TargetLock,
         Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse {
             let nerf = 0.625; //patch 7.1.5
-            let enh_increase = if _input.is_enhanced { 1.2 } else { 1.0 };
+            let enh_increase = match (_input.is_enhanced, _input.pvp) {
+                (false, _) => 1.0,
+                (true, false) => 1.125,
+                (true, true) => 1.2,
+            };
+
             let low_end_dmg = 0.0934 * enh_increase * nerf;
             let high_end_dmg = 0.4005 * enh_increase * nerf;
 
@@ -314,11 +319,7 @@ pub fn year_5_perks() {
 
             let percent_of_mag = _input.calc_data.shots_fired_this_mag / _input.calc_data.base_mag;
 
-            let buff = if (percent_of_mag < 0.125
-                && *_input.calc_data.weapon_type != WeaponType::SUBMACHINEGUN)
-                || (percent_of_mag < 0.2
-                    && *_input.calc_data.weapon_type == WeaponType::SUBMACHINEGUN)
-            {
+            let buff = if percent_of_mag < 0.125 {
                 0.0
             } else if percent_of_mag > formula_end {
                 high_end_dmg

diff --git a/src/test.rs b/src/test.rs
@@ -345,5 +345,5 @@ fn test_phase_mag() {
     let p_data = precision.calc_firing_data(Some(precision.static_calc_input()), None, true);
     assert_eq!(lw_data.burst_delay, p_data.burst_delay);
     assert_eq!(lw_data.pvp_crit_mult, p_data.pvp_crit_mult);
-    assert_eq!(f64::trunc(lw_data.pvp_impact_damage*10000.0)/10000.0, p_data.pvp_impact_damage);
+    assert_eq!(f64::trunc(lw_data.pvp_impact_damage*1000.0)/1000.0, p_data.pvp_impact_damage);
 }
diff --git a/src/weapons/stat_calc.rs b/src/weapons/stat_calc.rs
@@ -495,6 +495,7 @@ fn get_ads_multiplier(weapon_type: WeaponType, intrinsic_hash: u32) -> Result<f6
         (WeaponType::AUTORIFLE, _) => 1.6,
 
         (WeaponType::PULSERIFLE, 904 | 907) => 1.8,
+        (WeaponType::PULSERIFLE, 901) => 1.6,
         (WeaponType::PULSERIFLE, _) => 1.7,
 
         (WeaponType::BOW, _) => 1.8,