diff --git a/build_resources/cached_build.ron b/build_resources/cached_build.ron index 02ec10d9..41525115 100644 --- a/build_resources/cached_build.ron +++ b/build_resources/cached_build.ron @@ -389,7 +389,6 @@ 592777914046834360: 1680496635, 743673170876272541: 1684295508, 771627836848731769: 1685319141, - 827170617249343681: 1698259743, 857281027115827323: 1684377413, 901300984310592933: 1696566906, 908784266184609925: 1697667052, @@ -415,9 +414,11 @@ 2563303734963395229: 1680496635, 2579867287616434221: 1680496635, 2597880173623818285: 1680496635, + 2712361922010411279: 1698268764, 2760168780730167984: 1684379160, 2847509231752620357: 1700577993, 2866395278116570199: 1684377413, + 2982311651344743542: 1698268764, 3008335480088787758: 1684377413, 3042919543336805454: 1680496635, 3180044651460424247: 1680496635, @@ -428,6 +429,7 @@ 3831462598343004653: 1692633660, 3986689097416667537: 1680496635, 4126682208046242342: 1680496635, + 4138899407234303619: 1698268764, 4147888747978803714: 1684362236, 4327361146347058649: 1684456490, 4382782997569268038: 1680496635, @@ -439,6 +441,7 @@ 4815557869149372771: 1680496635, 4816221952429960419: 1680496635, 4835386227489321687: 1684377413, + 4912320138215754782: 1698268764, 4920255861486214388: 1680496635, 4994365470176756973: 1681936834, 5114335091073696390: 1680496635, @@ -446,18 +449,19 @@ 5227003031201474041: 1684358756, 5399420322368908073: 1684377413, 5490204527215486242: 1680496635, - 5529566079520105729: 1680496635, 5554258319145810390: 1684358756, 5651488379692480574: 1680496635, 5817710688730467837: 1692391910, 5848512497816040031: 1680496635, 5912581016949511866: 1680496635, 5989485067859430767: 1680496635, + 6037254698249202619: 1698268764, 6054917076034235559: 1684379160, 6076666098403797320: 1680496635, 6104156210913058229: 1684377413, 6166901366238703200: 1680496635, 6171632965286385181: 1680496635, + 6194319785651399808: 1698268764, 6230575109249907536: 1680496635, 6274363714618169512: 1684295508, 6473053250605466342: 1680496635, @@ -469,7 +473,7 @@ 6908568959876379152: 1680496635, 6933808191514592685: 1684377413, 6944715218863357907: 1680628406, - 7149173846829863456: 1684377413, + 7122621605219302199: 1698268764, 7313615483250839220: 1680496635, 7419111073518545590: 1680496635, 7493169524533961427: 1680496635, @@ -496,12 +500,11 @@ 8975703301685919073: 1684377413, 8991469619888284264: 1680496635, 9047328011699883751: 1680496635, - 9098225376032943580: 1698259743, 9289298587485457996: 1681090557, + 9305784101096151529: 1698268764, 9378186686951613294: 1680496635, 9438321702190756920: 1683126634, 9489004956803206137: 1680496635, - 9498553536528673899: 1680496635, 9507563445008379657: 1680496635, 9620626056191743501: 1680496635, 9728586762901908904: 1680496635, @@ -514,9 +517,11 @@ 10110422396809370243: 1689622726, 10125484563990948716: 1680496635, 10152887516121825520: 1680496635, + 10282911811809555103: 1698268764, 10313888042765346288: 1685321158, 10354287176218452814: 1680496635, 10362949304220229966: 1684377413, + 10381426149914940208: 1698268764, 10560167714726377861: 1680496635, 10571952070840525441: 1680496635, 10651452440028158434: 1684377413, @@ -563,11 +568,11 @@ 13979088474823728554: 1680496635, 14136607665311751775: 1680496635, 14148555925010377664: 1680496635, + 14197348256854151859: 1698268764, 14356280413536622305: 1684377413, - 14481705511127857889: 1684377413, + 14394375088436301486: 1698268764, 14618821624400036489: 1689441434, 14633952268396238333: 1680496635, - 14671631171009889984: 1680496635, 14683820608543013062: 1684377413, 14708936092164057946: 1680496635, 15020591728938159394: 1680496635, @@ -575,13 +580,12 @@ 15207095098433440528: 1680496635, 15502824796685688181: 1684377413, 15555440237134489310: 1680496635, - 15745713003128021701: 1684876588, 15805016494914155642: 1680496635, 15814150096581383263: 1684377413, 15850401001612907326: 1680496635, - 15876501865881324709: 1680496635, 15892735954122214721: 1680496635, 15908530696468011928: 1680496635, + 15969424579882116223: 1698268764, 16015876281474265523: 1684377413, 16024709382890568553: 1686522956, 16054053762813903310: 1685489087, @@ -601,7 +605,6 @@ 16902030042329507235: 1684377413, 17283189678931478183: 1684377413, 17366015059075794775: 1680496635, - 17451254373143654773: 1698259743, 17510475912938301460: 1680496635, 17522344794966508264: 1684377413, 17549300852572264387: 1684295508, diff --git a/build_resources/weapon_formulas.json b/build_resources/weapon_formulas.json index 44642aab..ad8fe399 100644 --- a/build_resources/weapon_formulas.json +++ b/build_resources/weapon_formulas.json @@ -24,7 +24,7 @@ "stow": {"vpp": -0.00268436, "offset": 0.48414822}, "ads": {"vpp": -0.001875, "offset": 0.38975 } }, - "combatant_scalars": {"vehicle": 1.15, "boss": 1.15, "champion": 1.2, "miniboss": 1.2, "elite": 1.63, "minor": 1.63} + "combatant_scalars": {"vehicle": 1.15, "boss": 1.15, "champion": 1.2, "miniboss": 1.2, "elite": 1.63, "minor": 1.79} }, "Cerberus":{ "range": {"vpp_start": 0.0, "offset_start": 0.0, "vpp_end": 0.0, "offset_end": 0.0, "floor_percent": 0.0}, @@ -34,7 +34,7 @@ "stow": {"vpp": -0.00268436, "offset": 0.48414822}, "ads": {"vpp": -0.001875, "offset": 0.38975 } }, - "combatant_scalars": {"vehicle": 0.86, "boss": 0.86, "champion": 0.90, "miniboss": 0.90, "elite": 1.63, "minor": 2.28} + "combatant_scalars": {"vehicle": 0.86, "boss": 0.86, "champion": 0.90, "miniboss": 0.90, "elite": 1.63, "minor": 2.51} }, "hard_light": { "range": {"vpp_start": 0.125, "offset_start": 10.75, "vpp_end": 0.0, "offset_end": 40.0, "floor_percent": 0.7}, @@ -44,7 +44,7 @@ "stow": {"vpp": -0.00268436, "offset": 0.48414822}, "ads": {"vpp": -0.001875, "offset": 0.38975 } }, - "combatant_scalars": {"vehicle": 1.15, "boss": 1.15, "champion": 1.2, "miniboss": 1.2, "elite": 1.63, "minor": 1.63} + "combatant_scalars": {"vehicle": 1.15, "boss": 1.15, "champion": 1.2, "miniboss": 1.2, "elite": 1.63, "minor": 1.79} } }, @@ -207,7 +207,7 @@ "stow": {"vpp": -0.00268436, "offset": 0.48414822}, "ads": {"vpp": -0.001875, "offset": 0.38975 } }, - "combatant_scalars": {"vehicle": 2.0, "boss": 2.0, "champion": 2.0, "miniboss": 2.0, "elite": 2.0, "minor": 2.0} + "combatant_scalars": {"vehicle": 2.0, "boss": 2.5, "champion": 2.0, "miniboss": 2.0, "elite": 2.0, "minor": 2.2} } }, "subFam": { @@ -545,10 +545,10 @@ "4208418110": {"name": "Outbreak Perfected", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, "4172222323": {"name": "Legacy PR-55 Frame", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, "3441203855": {"name": "Collective Obligation", "cat": "default", "subFam": "Adaptive", "magProf": "default"}, - "891750160": {"name": "Revision Zero IV", "cat": "default", "subFam": "Aggressive", "magProf": "aggressive"}, - "891750167": {"name": "Revision Zero III", "cat": "default", "subFam": "Aggressive", "magProf": "aggressive"}, - "891750166": {"name": "Revision Zero II", "cat": "default", "subFam": "Aggressive", "magProf": "aggressive"}, - "3834106778": {"name": "Revision Zero I", "cat": "default", "subFam": "Aggressive", "magProf": "aggressive"}, + "891750160": {"name": "Revision Zero IV", "cat": "revisionZero", "subFam": "Aggressive", "magProf": "aggressive"}, + "891750167": {"name": "Revision Zero III", "cat": "revisionZero", "subFam": "Aggressive", "magProf": "aggressive"}, + "891750166": {"name": "Revision Zero II", "cat": "revisionZero", "subFam": "Aggressive", "magProf": "aggressive"}, + "3834106778": {"name": "Revision Zero I", "cat": "revisionZero", "subFam": "Aggressive", "magProf": "aggressive"}, "69420": {"name": "test_weapon", "cat": "test", "subFam": "test", "magProf": "test"}, "cat": { "default": { @@ -559,7 +559,17 @@ "stow": {"vpp": -0.00355450, "offset": 0.55005845}, "ads": {"vpp": -0.00196208, "offset": 0.45746870} }, - "combatant_scalars": {"vehicle": 0.90, "boss": 1.00, "champion": 1.05, "miniboss": 1.05, "elite": 1.26, "minor": 1.782} + "combatant_scalars": {"vehicle": 0.90, "boss": 1.00, "champion": 1.05, "miniboss": 1.05, "elite": 1.4175, "minor": 2.00475} + }, + "revisionZero": { + "range": {"vpp_start": 0.075, "offset_start": 16, "vpp_end": 0.0,"offset_end": 40, "floor_percent": 0.5}, + "reload": {"evpp": 0.0000926208, "vpp": -0.0256877, "offset": 2.92627266666667}, + "handling": { + "ready":{"vpp": -0.00312085, "offset": 0.54370932}, + "stow": {"vpp": -0.00355450, "offset": 0.55005845}, + "ads": {"vpp": -0.00196208, "offset": 0.45746870} + }, + "combatant_scalars": {"vehicle": 0.90, "boss": 1.00, "champion": 2.1, "miniboss": 1.05, "elite": 1.4175, "minor": 2.00475} }, "test": { "range": {"vpp_start": 0.1, "offset_start": 10.0, "vpp_end": 0.2, "offset_end": 20.0, "floor_percent": 0.5}, @@ -881,14 +891,14 @@ } }, "Sniper Rifle": { - "281315705": {"name": "Whisper of the Worm", "cat": "default", "subFam": "Whisper", "magProf": "default", "pve": 1.1}, - "878286503": {"name": "Rapid-Fire Frame", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.1}, - "938999636": {"name": "D.A.R.C.I.", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.1}, - "1070100196": {"name": "Izanagi's Burden", "cat": "default", "subFam": "Adaptive", "magProf": "default"}, - "1294026524": {"name": "Adaptive Frame", "cat": "default", "subFam": "Adaptive", "magProf": "default", "pve": 1.1}, - "2909403175": {"name": "Cloudstrike", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.1}, - "3081173348": {"name": "Borealis", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.1}, - "3468089894": {"name": "Aggressive Frame", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.1}, + "281315705": {"name": "Whisper of the Worm", "cat": "default", "subFam": "Whisper", "magProf": "default", "pve": 1.265}, + "878286503": {"name": "Rapid-Fire Frame", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.265}, + "938999636": {"name": "D.A.R.C.I.", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.265}, + "1070100196": {"name": "Izanagi's Burden", "cat": "default", "subFam": "Adaptive", "magProf": "default", "pve": 1.15}, + "1294026524": {"name": "Adaptive Frame", "cat": "default", "subFam": "Adaptive", "magProf": "default", "pve": 1.265}, + "2909403175": {"name": "Cloudstrike", "cat": "default", "subFam": "Rapid-Fire", "magProf": "default", "pve": 1.265}, + "3081173348": {"name": "Borealis", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.265}, + "3468089894": {"name": "Aggressive Frame", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.265}, "cat": { "default": { "range": {"vpp_start": 0.0,"offset_start": 999.0,"vpp_end": 0.0,"offset_end": 999.9, "floor_percent": 0.999}, @@ -967,16 +977,16 @@ } }, "Glaive":{ - "1900919151": {"name": "Edge Of Action", "cat": "default", "subFam": "Adaptive", "magProf": "default"}, - "3551884421": {"name": "Edge Of Concurrence", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, - "3024740338": {"name": "Edge Of Intent", "cat": "default", "subFam": "Aggressive", "magProf": "default"}, - "1316753551": {"name": "Adaptive Glaive", "cat": "default", "subFam": "Adaptive", "magProf": "default"}, - "1986105578": {"name": "Aggressive Glaive", "cat": "default", "subFam": "Aggressive", "magProf": "default"}, - "2751656639": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, - "2898674463": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, - "2898674462": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, - "2898674457": {"name": "Vexcaliber", "cat": "default", "subFam": "Vexcaliber", "magProf": "default"}, - "1956005708": {"name": "Rapid-Fire Glaive", "cat": "default", "subFam": "Lightweight", "magProf": "default"}, + "1900919151": {"name": "Edge Of Action", "cat": "default", "subFam": "Adaptive", "magProf": "default", "pve": 1.25}, + "3551884421": {"name": "Edge Of Concurrence", "cat": "default", "subFam": "Lightweight", "magProf": "default", "pve": 1.25}, + "3024740338": {"name": "Edge Of Intent", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.25}, + "1316753551": {"name": "Adaptive Glaive", "cat": "default", "subFam": "Adaptive", "magProf": "default", "pve": 1.25}, + "1986105578": {"name": "Aggressive Glaive", "cat": "default", "subFam": "Aggressive", "magProf": "default", "pve": 1.25}, + "2751656639": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default", "pve": 1.25}, + "2898674463": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default", "pve": 1.25}, + "2898674462": {"name": "Vexcaliber", "cat": "default", "subFam": "Lightweight", "magProf": "default", "pve": 1.25}, + "2898674457": {"name": "Vexcaliber", "cat": "default", "subFam": "Vexcaliber", "magProf": "default", "pve": 1.25}, + "1956005708": {"name": "Rapid-Fire Glaive", "cat": "default", "subFam": "Lightweight", "magProf": "default", "pve": 1.25}, "cat": { "default": { "range": {"vpp_start": 0.0546,"offset_start": 15.0,"vpp_end": 0.198,"offset_end": 30.33, "floor_percent": 0.33}, @@ -990,9 +1000,9 @@ } }, "subFam": { - "Lightweight": {"damage":105.77, "crit_mult":-25.5, "burst_delay":22.0, "burst_size":1, "inner_burst_delay":0}, - "Aggressive": {"damage":146.05, "crit_mult":-25.5, "burst_delay":30.0, "burst_size":1, "inner_burst_delay":0}, - "Adaptive": {"damage":130.94, "crit_mult":-25.5, "burst_delay":27.0, "burst_size":1, "inner_burst_delay":0}, + "Lightweight": {"damage":101.0, "crit_mult":-25.5, "burst_delay":22.0, "burst_size":1, "inner_burst_delay":0}, + "Aggressive": {"damage":125.0, "crit_mult":-25.5, "burst_delay":30.0, "burst_size":1, "inner_burst_delay":0}, + "Adaptive": {"damage":113.0, "crit_mult":-25.5, "burst_delay":27.0, "burst_size":1, "inner_burst_delay":0}, "Vexcaliber": {"damage":28.85, "crit_mult":-25.5, "burst_delay":22.0, "burst_size":5, "inner_burst_delay":0, "one_ammo":true} }, "magProf": { diff --git a/src/perks/exotic_armor.rs b/src/perks/exotic_armor.rs index cafe41e8..4d06f0a2 100644 --- a/src/perks/exotic_armor.rs +++ b/src/perks/exotic_armor.rs @@ -37,7 +37,7 @@ pub fn exotic_armor() { return DamageModifierResponse::default(); }; - let damage_mult = if _input.pvp { 1.35 } else { 2.0 }; + let damage_mult = if _input.pvp { 1.10 } else { 2.0 }; DamageModifierResponse { explosive_dmg_scale: damage_mult, impact_dmg_scale: damage_mult, diff --git a/src/perks/exotic_perks.rs b/src/perks/exotic_perks.rs index 28f9696a..65d41f2a 100644 --- a/src/perks/exotic_perks.rs +++ b/src/perks/exotic_perks.rs @@ -1054,15 +1054,20 @@ pub fn exotic_perks() { add_dmr( Perks::TemporalUnlimiter, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { - let buff = if _input.pvp { 7.545 } else { 14.0 }; - if _input.value > 0 { - return DamageModifierResponse { - impact_dmg_scale: buff, - crit_scale: 1.875, - ..Default::default() - }; + if _input.value == 0 { + return DamageModifierResponse::default(); + } + let mut buff = if _input.pvp { 7.545 } else { 14.0 }; + //season 23 + //https://www.bungie.net/7/en/News/Article/season-23-weapons-preview + if *_input.calc_data.enemy_type == EnemyType::CHAMPION { + buff *= 2.0; + } + DamageModifierResponse { + impact_dmg_scale: buff, + crit_scale: 1.875, + ..Default::default() } - DamageModifierResponse::default() }), ); diff --git a/src/perks/year_6_perks.rs b/src/perks/year_6_perks.rs index 81ccd882..fdd42f28 100644 --- a/src/perks/year_6_perks.rs +++ b/src/perks/year_6_perks.rs @@ -338,7 +338,7 @@ pub fn year_6_perks() { add_dmr( Perks::PrecisionInstrument, Box::new(|_input: ModifierResponseInput| -> DamageModifierResponse { - let max_percent = if _input.is_enhanced { 0.26 } else { 0.25 }; + let max_percent = if _input.is_enhanced { 0.30 } else { 0.25 }; let max_stacks = 6.0; let shots_hit = _input.calc_data.total_shots_hit; diff --git a/src/weapons/stat_calc.rs b/src/weapons/stat_calc.rs index f425fb1c..0de22c02 100644 --- a/src/weapons/stat_calc.rs +++ b/src/weapons/stat_calc.rs @@ -524,8 +524,8 @@ impl Weapon { .unwrap_or(&Stat::new()) .perk_val() .clamp(0, 100), - ) * 0.4 - + 60.0 + ) * 0.52 + + 78.0 } WeaponType::GRENADELAUNCHER => { f64::from(