From f4b99a5f7db641a6efe126c4f6acf85fee2e4656 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 28 Jul 2023 22:06:50 +0300
Subject: [PATCH] Add Patch 4.1 Closes #1431

---
 .../build-analyzer/core/weapon-params.json    | 66 +++++++++----------
 .../build-analyzer/routes/analyzer.tsx        |  2 +-
 .../routes/object-damage-calculator.tsx       |  2 +-
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/app/features/build-analyzer/core/weapon-params.json b/app/features/build-analyzer/core/weapon-params.json
index 18e3b1606..56e58cb1e 100644
--- a/app/features/build-analyzer/core/weapon-params.json
+++ b/app/features/build-analyzer/core/weapon-params.json
@@ -87,7 +87,7 @@
       "Jump_DegSwerve": 16,
       "Stand_DegSwerve": 13,
       "InkRecoverStop": 15,
-      "InkConsume": 0.0055
+      "InkConsume": 0.005
     },
     "31": {
       "SpecialPoint": 200,
@@ -100,7 +100,7 @@
       "Jump_DegSwerve": 16,
       "Stand_DegSwerve": 13,
       "InkRecoverStop": 15,
-      "InkConsume": 0.0055
+      "InkConsume": 0.005
     },
     "40": {
       "SpecialPoint": 190,
@@ -110,7 +110,7 @@
       "DamageParam_ValueMax": 360,
       "DamageParam_ValueMin": 180,
       "Jump_DegSwerve": 12,
-      "Stand_DegSwerve": 6,
+      "Stand_DegSwerve": 5,
       "InkConsume": 0.0092
     },
     "41": {
@@ -121,7 +121,7 @@
       "DamageParam_ValueMax": 360,
       "DamageParam_ValueMin": 180,
       "Jump_DegSwerve": 12,
-      "Stand_DegSwerve": 6,
+      "Stand_DegSwerve": 5,
       "InkConsume": 0.0092
     },
     "45": {
@@ -132,7 +132,7 @@
       "DamageParam_ValueMax": 360,
       "DamageParam_ValueMin": 180,
       "Jump_DegSwerve": 12,
-      "Stand_DegSwerve": 6,
+      "Stand_DegSwerve": 5,
       "InkConsume": 0.0092
     },
     "50": {
@@ -155,7 +155,7 @@
       "DamageParam_ValueMax": 280,
       "DamageParam_ValueMin": 140,
       "Jump_DegSwerve": 12,
-      "Stand_DegSwerve": 6,
+      "Stand_DegSwerve": 5,
       "InkConsume": 0.008
     },
     "61": {
@@ -167,7 +167,7 @@
       "DamageParam_ValueMax": 280,
       "DamageParam_ValueMin": 140,
       "Jump_DegSwerve": 12,
-      "Stand_DegSwerve": 6,
+      "Stand_DegSwerve": 5,
       "InkConsume": 0.008
     },
     "70": {
@@ -280,7 +280,7 @@
           "Mid": 0.7
         },
         "ReduceJumpSwerveRate": {
-          "Mid": 0.5
+          "Mid": 0.625
         }
       },
       "WeaponSpeedType": "Fast",
@@ -296,7 +296,7 @@
           "Distance": 3.57
         }
       ],
-      "Jump_DegSwerve": 8,
+      "Jump_DegSwerve": 6,
       "Stand_DegSwerve": 0,
       "InkRecoverStop": 55,
       "InkConsume": 0.075
@@ -311,7 +311,7 @@
           "Mid": 0.7
         },
         "ReduceJumpSwerveRate": {
-          "Mid": 0.5
+          "Mid": 0.625
         }
       },
       "WeaponSpeedType": "Fast",
@@ -327,7 +327,7 @@
           "Distance": 3.57
         }
       ],
-      "Jump_DegSwerve": 8,
+      "Jump_DegSwerve": 6,
       "Stand_DegSwerve": 0,
       "InkRecoverStop": 55,
       "InkConsume": 0.075
@@ -412,7 +412,7 @@
       "InkConsume": 0.04
     },
     "231": {
-      "SpecialPoint": 180,
+      "SpecialPoint": 170,
       "subWeaponId": 6,
       "specialWeaponId": 16,
       "overwrites": {
@@ -517,7 +517,7 @@
       "InkConsume": 0.08
     },
     "251": {
-      "SpecialPoint": 180,
+      "SpecialPoint": 190,
       "subWeaponId": 12,
       "specialWeaponId": 9,
       "overwrites": {
@@ -648,7 +648,7 @@
       "InkConsume": 0.022
     },
     "1000": {
-      "SpecialPoint": 180,
+      "SpecialPoint": 170,
       "subWeaponId": 7,
       "specialWeaponId": 3,
       "WeaponSpeedType": "Fast",
@@ -781,7 +781,7 @@
       "BodyParam_Damage": 300,
       "SwingUnitGroupParam_DamageParam_DamageMinValue": 250,
       "SwingUnitGroupParam_DamageParam_DamageMaxValue": 600,
-      "InkConsume_WeaponSwingParam": 0.064
+      "InkConsume_WeaponSwingParam": 0.048
     },
     "2000": {
       "SpecialPoint": 190,
@@ -951,7 +951,7 @@
       "InkConsumeSlosher": 0.06
     },
     "3011": {
-      "SpecialPoint": 180,
+      "SpecialPoint": 190,
       "subWeaponId": 5,
       "specialWeaponId": 15,
       "WeaponSpeedType": "Fast",
@@ -998,7 +998,7 @@
       "InkConsumeSlosher": 0.117
     },
     "4000": {
-      "SpecialPoint": 180,
+      "SpecialPoint": 190,
       "subWeaponId": 2,
       "specialWeaponId": 11,
       "overwrites": {
@@ -1103,7 +1103,7 @@
       "InkConsumeFullChargeSplatling": 0.35
     },
     "4030": {
-      "SpecialPoint": 200,
+      "SpecialPoint": 210,
       "subWeaponId": 5,
       "specialWeaponId": 10,
       "overwrites": {
@@ -1304,12 +1304,12 @@
       "SpecialPoint": 190,
       "subWeaponId": 11,
       "specialWeaponId": 9,
-      "MoveSpeedFullCharge": 0.06,
+      "MoveSpeedFullCharge": 0.068,
       "DamageParam_ValueMax": 350,
       "DamageParam_ValueMin": 300,
       "BlastParam_DistanceDamage": [
         {
-          "Damage": 280,
+          "Damage": 300,
           "Distance": 2
         }
       ],
@@ -1434,9 +1434,9 @@
     "3": {
       "overwrites": {
         "PeriodFirst": {
-          "High": 600,
-          "Low": 300,
-          "Mid": 450
+          "High": 780,
+          "Low": 480,
+          "Mid": 630
         },
         "PeriodSecond": {
           "High": 1020,
@@ -1650,7 +1650,7 @@
       "SubInkSaveLv": 0,
       "InkConsume": 0.4,
       "InkRecoverStop": 50,
-      "DirectDamage": 350
+      "DirectDamage": 400
     },
     "13": {
       "overwrites": {
@@ -1702,7 +1702,7 @@
       },
       "DistanceDamage": [
         {
-          "Damage": 400,
+          "Damage": 600,
           "Distance": 4
         }
       ],
@@ -1826,13 +1826,13 @@
       "ExhaleBlastParamMinChargeDistanceDamage": [
         {
           "Damage": 2200,
-          "Distance": 4
+          "Distance": 6
         }
       ],
       "ExhaleBlastParamMaxChargeDistanceDamage": [
         {
           "Damage": 2200,
-          "Distance": 8
+          "Distance": 10
         }
       ]
     },
@@ -1877,7 +1877,7 @@
       "DistanceDamage": [
         {
           "Damage": 500,
-          "Distance": 3
+          "Distance": 2.55
         },
         {
           "Damage": 300,
@@ -2011,16 +2011,12 @@
       },
       "DistanceDamage": [
         {
-          "Damage": 600,
-          "Distance": 2.6
+          "Damage": 700,
+          "Distance": 3.6
         },
         {
           "Damage": 350,
-          "Distance": 3.8
-        },
-        {
-          "Damage": 350,
-          "Distance": 5
+          "Distance": 6
         }
       ]
     },
diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx
index b21737adb..009c7a6c3 100644
--- a/app/features/build-analyzer/routes/analyzer.tsx
+++ b/app/features/build-analyzer/routes/analyzer.tsx
@@ -66,7 +66,7 @@ import {
 import { useUser } from "~/modules/auth";
 import { atOrError } from "~/utils/arrays";
 
-export const CURRENT_PATCH = "4.0";
+export const CURRENT_PATCH = "4.1";
 
 export const meta: V2_MetaFunction = () => {
   return [
diff --git a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
index 8e7de3017..b84935d6d 100644
--- a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
+++ b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
@@ -36,7 +36,7 @@ import { useObjectDamage } from "../calculator-hooks";
 import type { DamageReceiver } from "../calculator-types";
 import styles from "../calculator.css";
 
-export const CURRENT_PATCH = "4.0";
+export const CURRENT_PATCH = "4.1";
 
 export const shouldRevalidate: ShouldRevalidateFunction = () => false;