From 30159be6f7d172685c7e7e93ec5b9bc48db9da75 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:38:30 +0300
Subject: [PATCH] Fix Brella for consumption table

---
 app/modules/analyzer/stats.ts           |  2 +-
 app/modules/analyzer/weapon-params.json |  1 -
 app/routes/analyzer.tsx                 | 20 +++++++++++---------
 scripts/create-analyzer-json.ts         |  4 +++-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/modules/analyzer/stats.ts b/app/modules/analyzer/stats.ts
index 1be0543dc..e1f33b991 100644
--- a/app/modules/analyzer/stats.ts
+++ b/app/modules/analyzer/stats.ts
@@ -217,7 +217,7 @@ function inkConsumeTypeToParamsKeys(
 ): Array<keyof MainWeaponParams> {
   switch (type) {
     case "NORMAL":
-      return ["InkConsume"];
+      return ["InkConsume", "InkConsume_WeaponShelterShotgunParam"];
     case "SWING":
       return ["InkConsume_SwingParam", "InkConsume_WeaponSwingParam"];
     case "SLOSH":
diff --git a/app/modules/analyzer/weapon-params.json b/app/modules/analyzer/weapon-params.json
index cabe35531..b8baa1431 100644
--- a/app/modules/analyzer/weapon-params.json
+++ b/app/modules/analyzer/weapon-params.json
@@ -597,7 +597,6 @@
       "WeaponSpeedType": "Fast",
       "DamageParam_ValueMax": 400,
       "CanopyHP": 2000,
-      "InkConsumeUmbrella_WeaponShelterCanopyParam": 0,
       "InkConsume_WeaponShelterShotgunParam": 0.04
     },
     "7010": {
diff --git a/app/routes/analyzer.tsx b/app/routes/analyzer.tsx
index ddb979145..d652ef22e 100644
--- a/app/routes/analyzer.tsx
+++ b/app/routes/analyzer.tsx
@@ -94,15 +94,17 @@ export default function BuildAnalyzerPage() {
               />
             </StatCategory>
           )}
-          <StatCategory
-            title={t("stat.category.actionsPerInkTank")}
-            containerClassName="analyzer__table-container"
-          >
-            <ConsumptionTable
-              options={analyzed.stats.fullInkTankOptions}
-              subWeaponId={analyzed.weapon.subWeaponSplId}
-            />
-          </StatCategory>
+          {analyzed.stats.fullInkTankOptions.length > 0 && (
+            <StatCategory
+              title={t("stat.category.actionsPerInkTank")}
+              containerClassName="analyzer__table-container"
+            >
+              <ConsumptionTable
+                options={analyzed.stats.fullInkTankOptions}
+                subWeaponId={analyzed.weapon.subWeaponSplId}
+              />
+            </StatCategory>
+          )}
           <StatCategory title={t("stat.category.movement")}>
             <StatCard
               stat={analyzed.stats.swimSpeed}
diff --git a/scripts/create-analyzer-json.ts b/scripts/create-analyzer-json.ts
index 44fbfafcf..0a9b4e431 100644
--- a/scripts/create-analyzer-json.ts
+++ b/scripts/create-analyzer-json.ts
@@ -159,7 +159,9 @@ function parametersToMainWeaponResult(
     InkConsume_WeaponWideSwingParam:
       params["WeaponWideSwingParam"]?.["InkConsume"],
     InkConsumeUmbrella_WeaponShelterCanopyParam:
-      params["spl__WeaponShelterCanopyParam"]?.["InkConsumeUmbrella"],
+      params["spl__WeaponShelterCanopyParam"]?.["InkConsumeUmbrella"] !== 0
+        ? params["spl__WeaponShelterCanopyParam"]?.["InkConsumeUmbrella"]
+        : undefined,
     InkConsume_WeaponShelterShotgunParam:
       params["spl__WeaponShelterShotgunParam"]?.["InkConsume"],
     InkConsume_SideStepParam: params["SideStepParam"]?.["InkConsume"],