Update Bahamut skills (#349)

MotocalDevelopers · Sep 6, 2019 · f1db7ae · f1db7ae
1 parent 0450539
commit f1db7ae
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/src/global_const.js b/src/global_const.js
@@ -945,8 +945,8 @@ var skilltypes = {
     "bahaAT-axe": {name: "バハ攻-斧", type: "bahaAT", amount: "L"},
     "bahaAT-spear": {name: "バハ攻-槍", type: "bahaAT", amount: "L"},
     "bahaAT-gun": {name: "バハ攻-銃", type: "bahaAT", amount: "L"},
-    "bahaATHP-sword": {name: "バハ攻HP-剣", type: "bahaATHP", amount: "M"},
-    "bahaATHP-wand": {name: "バハ攻HP-杖", type: "bahaATHP", amount: "M"},
+    "bahaATHP-sword": {name: "バハ攻HP-剣", type: "bahaATHP", amount: "L"},
+    "bahaATHP-wand": {name: "バハ攻HP-杖", type: "bahaATHP", amount: "L"},
     "bahaHP-fist": {name: "バハHP-格闘", type: "bahaHP", amount: "L"},
     "bahaHP-katana": {name: "バハHP-刀", type: "bahaHP", amount: "L"},
     "bahaHP-bow": {name: "バハHP-弓", type: "bahaHP", amount: "L"},
@@ -1789,25 +1789,30 @@ var skillAmounts = {
         "L": [6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 15.6, 16.2, 16.8, 17.4, 18.0, 18.6, 19.2, 19.8, 20.4, 21.0],
     },
     "bahaAT": {
-        // Daggers etc.
-        "M": [10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, 30.4, 30.8, 31.2, 31.6, 32.0, 32.0, 32.0, 32.0, 32.0, 32.0],
-        "L": [20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 30.0, 30.4, 30.8, 31.2, 31.6, 32.0, 32.0, 32.0, 32.0, 32.0, 32.0],
+        // Dagger, Axe, Spear, Gun.
+        "AT": [20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0],
+    },
+    "bahaATHP": {
+        // Sword, Wand.
+        "AT": [10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0],
+        "HP": [10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0],
     },
     "bahaHP": {
-        // Sword etc.
-        "M": [10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, 15.6, 16.2, 16.8, 17.4, 18.0, 18.0, 18.0, 18.0, 18.0, 18.0],
-        "L": [20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 30.0, 30.4, 30.8, 31.2, 31.6, 32.0, 32.0, 32.0, 32.0, 32.0, 32.0],
+        // Fist, Katana, Bow, Music.
+        "HP": [20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0],
     },
+
+    // Bahamut Coda(フツルフ)
     "bahaFUATHP": {
-        // Dagger, sword etc.
+        // Dagger, Axe, Spear, Gun, Sword, Wand.
         "HP": [15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.0, 15.6, 16.2, 16.8, 17.4, 18.0, 18.0, 18.0, 18.0, 18.0, 18.0],
         "AT": [30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.4, 30.8, 31.2, 31.6, 32.0, 32.0, 32.0, 32.0, 32.0, 32.0],
     },
     "bahaFUHP": {
-        // Fist etc
-        "HP": [30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.4, 30.8, 31.2, 31.6, 32.0, 32.0, 32.0, 32.0, 32.0, 32.0],
+        // Fist, Katana, Bow, Music.
+        "HP": [30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 30.0, 32.0, 34.0, 36.0, 38.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0],
         "DA": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 5.6, 6.2, 6.8, 7.4, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0],
-        "TA": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 5.4, 5.8, 6.2, 6.6, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0],
+        "TA": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 5.6, 6.2, 6.8, 7.4, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0],
     },
     "omega": {
         "rawATK": [2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 14.0, 16.0, 18.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0],
@@ -1852,34 +1857,34 @@ var skillAmounts = {
     "sensei": {
         "M": [5.0, 6.0, 7.0, 8.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0],
     },
-    // Royal Wing Barrier
+    // Royal Wing Barrier(鷲王の結界)
     "washiouKekkai": {
         "M": [6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.0, 13.0, 13.0, 13.0, 13.0],
     },
-    // normal Mystery + Sentence(通常秘奥/必殺(奥義ダメージ))
+    // normal Mystery + Sentence(通常秘奥/通常必殺(奥義ダメージ部分))
     "normalHiou": {
         "S": [0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 7.5, 7.5, 7.5, 7.5, 7.5],
         "M": [2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 9.5, 9.5, 9.5, 9.5, 9.5],
         "L": [5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 12.5, 12.5, 12.5, 12.5, 12.5]
     },
-    // normal Sentence limit up (必殺(奥義上限))
+    // normal Sentence limit up (通常必殺(奥義上限部分))
     "normalOugiDamageLimitHissatsu": {
         "M": [0.8, 1.1, 1.4, 1.7, 2.0, 2.3, 2.6, 2.9, 3.2, 3.5, 3.8, 4.1, 4.4, 4.7, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0],
         "L": [1.2, 1.6, 2.0, 2.4, 2.8, 3.2, 3.6, 4.0, 4.4, 4.8, 5.2, 5.6, 6.0, 6.4, 6.8, 6.8, 6.8, 6.8, 6.8, 6.8]
     },
-    // normal Glory chain up
+    // normal Glory(英傑) chain up 
     "normalEiketsu": {
         "L": [3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 12.5, 13.0, 13.5, 14.0, 14.5, 14.5, 14.5, 14.5, 14.5, 14.5]
     },
-    // normal Glory limit up
+    // normal Glory(英傑) limit up
     "normalEiketsuDamageLimit": {
         "L": [1.2, 1.6, 2.0, 2.4, 2.8, 3.2, 3.6, 4.0, 4.4, 4.8, 5.2, 5.6, 6.0, 6.4, 6.8, 6.8, 6.8, 6.8, 6.8, 6.8]
     },
-    // magna Sentence
+    // magna Sentence(方陣秘奥/方陣必殺(奥義ダメージ部分))
     "magnaHiou": {
         "M": [2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 9.5, 9.5, 9.5, 9.5, 9.5]
     },
-    // magna Sentence limit up
+    // magna Sentence limit up(方陣必殺(奥義上限部分))
     "magnaOugiDamageLimitHissatsu": {
         "M": [2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 9.5, 9.5, 9.5, 9.5, 9.5]
     },

diff --git a/src/global_logic.js b/src/global_logic.js
@@ -1636,20 +1636,20 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) {
                     if (stype == 'bahaAT') {
                         if (!isBahaAtIncluded && bahaRaceCharaContains(skillname, totals[key])) {
                             // Baha dagger etc.
-                            totals[key]["bahaAT"] += comb[i] * skillAmounts["bahaAT"][amount][slv - 1];
+                            totals[key]["bahaAT"] += comb[i] * skillAmounts["bahaAT"]["AT"][slv - 1];
                             isBahaAtIncluded = true;
                         }
                     } else if (stype == 'bahaATHP') {
                         if (!isBahaAthpIncluded && bahaRaceCharaContains(skillname, totals[key])) {
                             // Baha sword etc.
-                            totals[key]["bahaAT"] += comb[i] * skillAmounts["bahaAT"][amount][slv - 1];
-                            totals[key]["bahaHP"] += comb[i] * skillAmounts["bahaHP"][amount][slv - 1];
+                            totals[key]["bahaAT"] += comb[i] * skillAmounts["bahaATHP"]["AT"][slv - 1];
+                            totals[key]["bahaHP"] += comb[i] * skillAmounts["bahaATHP"]["HP"][slv - 1];
                             isBahaAthpIncluded = true;
                         }
                     } else if (stype == 'bahaHP') {
                         if (!isBahaHpIncluded && bahaRaceCharaContains(skillname, totals[key])) {
                             // Baha Fist etc
-                            totals[key]["bahaHP"] += comb[i] * skillAmounts["bahaHP"][amount][slv - 1];
+                            totals[key]["bahaHP"] += comb[i] * skillAmounts["bahaHP"]["HP"][slv - 1];
                             isBahaHpIncluded = true;
                         }
                     } else if (stype == 'bahaFUATHP') {