From 2094332c7a4e4e943b72fa1aa48354b1a4c82b54 Mon Sep 17 00:00:00 2001 From: h-yasha Date: Fri, 16 Aug 2019 04:13:50 +0300 Subject: [PATCH 1/2] Add Turn Counter - Applied Turn effect to (Normal/Magna) Element ATK L. --- src/global_const.js | 8 +++++++- src/global_logic.js | 13 ++++++++----- src/profile.js | 10 ++++++++++ src/result.js | 10 ++++++---- src/translate.js | 10 ++++++++++ 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/global_const.js b/src/global_const.js index 3ba53b857..f1e65737c 100644 --- a/src/global_const.js +++ b/src/global_const.js @@ -1897,7 +1897,13 @@ var skillAmounts = { }, "normalHigo": { "S": [0.5, 0.8, 1.1, 1.4, 1.7, 2.0, 2.3, 2.6, 2.7, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0] - } + }, + "opusnormalElement": { + "L": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.015] + }, + "opusmagnaElement": { + "L": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.015] + }, }; // chara support diff --git a/src/global_logic.js b/src/global_logic.js index 35d27b660..80aa2867b 100644 --- a/src/global_logic.js +++ b/src/global_logic.js @@ -549,8 +549,8 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { elementCoeff += buff["element"]; elementCoeff += totals[key]["elementBuff"]; elementCoeff += totals[key]["elementBuffBoostBuff"]; - elementCoeff += totals[key]["opusnormalElement"] * totalSummon["zeus"]; - elementCoeff += totals[key]["opusmagnaElement"] * totalSummon["magna"]; + elementCoeff += totals[key]["opusnormalElement"] * totalSummon["zeus"] * (Math.min(10, Math.max(0, buff["turn"]))); + elementCoeff += totals[key]["opusmagnaElement"] * totalSummon["magna"] * (Math.min(10, Math.max(0, buff["turn"]))); elementCoeff += 0.01 * totals[key]["LB"].Element; if (key == "Djeeta") { @@ -1468,7 +1468,8 @@ module.exports.getTotalBuff = function (prof) { uplift: 0, supplementalDamageBuff: 0, //enemyBuffCount: 0, - enemyDebuffCount: 0 + enemyDebuffCount: 0, + turn: 0, }; if (!isNaN(prof.masterBonus)) totalBuff["master"] += 0.01 * parseInt(prof.masterBonus); @@ -1504,6 +1505,8 @@ module.exports.getTotalBuff = function (prof) { totalBuff["criticalBuff"] = prof.criticalBuff != undefined ? prof.criticalBuff : []; totalBuff["supplementalDamageBuff"] += parseInt(prof.supplementalDamageBuff); + totalBuff["turn"] = parseInt(prof.turn); + return totalBuff }; @@ -2069,9 +2072,9 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) { totals[key]["magna"] += comb[i] * skillAmounts["magna"][amount][slv - 1]; } } else if (stype == 'opusnormalElement') { - totals[key][stype] += 0.15; + totals[key][stype] += skillAmounts[stype][amount][slv -1]; } else if (stype == 'opusmagnaElement') { - totals[key][stype] += 0.15; + totals[key][stype] += skillAmounts[stype][amount][slv -1]; } else { totals[key][stype] += comb[i] * skillAmounts[stype][amount][slv - 1]; } diff --git a/src/profile.js b/src/profile.js index 0496fac79..750b62e7e 100644 --- a/src/profile.js +++ b/src/profile.js @@ -228,6 +228,7 @@ var Profile = CreateClass({ personalCriticalBuffCount: 0, retsujitsuNoRakuen: false, shiToAiNoSekai: false, + turn: 1, }; }, switchBufflist: function (e) { @@ -949,6 +950,15 @@ var Profile = CreateClass({ + + + {intl.translate("ターン", locale)} + + + + + {intl.translate("敵防御固有値", locale)} diff --git a/src/result.js b/src/result.js index 8321246ea..b479454eb 100644 --- a/src/result.js +++ b/src/result.js @@ -479,6 +479,8 @@ var ResultList = CreateClass({ var addPercent = (value) => intl.translate("percent", locale).replace("{}", value === undefined ? "0" : value); + var turnStr = intl.translate("ターン", locale) + ": " + prof.turn; + // Create buff info line var buffInfo = []; buffInfo.push(intl.translate("通常バフ", locale) + addPercent(prof.normalBuff)); @@ -654,7 +656,7 @@ var ResultList = CreateClass({
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
@@ -688,7 +690,7 @@ var ResultList = CreateClass({ {intl.translate("背水渾身グラフ", locale)}
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
@@ -856,7 +858,7 @@ var ResultList = CreateClass({
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
@@ -895,7 +897,7 @@ var ResultList = CreateClass({ {intl.translate("背水渾身グラフ", locale)}
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
diff --git a/src/translate.js b/src/translate.js index cf76785ca..53763e648 100644 --- a/src/translate.js +++ b/src/translate.js @@ -477,6 +477,16 @@ var multiLangData = { "ja": "もっともっと詳しく計算したい方向けの項目です。", "zh": "适合想要进行更加详细的计算的人。", }, + "ターン": { + "en": "Turn", + "ja": "ターン", + "zh": "ターン", + }, + "ターン説明": { + "en": "Turn Number (affects various weapon skill/support ability/etc)", + "ja": "ターン", + "zh": "ターン", + }, "敵防御固有値": { "en": "Enemy Innate DEF", "ja": "敵防御固有値", From 946371a308015ef3f9413115349311ad201a18db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=83=E3=82=B1=E3=82=B6=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Mon, 23 Sep 2019 04:11:56 +0900 Subject: [PATCH 2/2] Update jp translation --- src/translate.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/translate.js b/src/translate.js index 5f6026fbc..75d10b788 100644 --- a/src/translate.js +++ b/src/translate.js @@ -479,12 +479,12 @@ var multiLangData = { }, "ターン": { "en": "Turn", - "ja": "ターン", - "zh": "ターン", + "ja": "想定ターン", + "zh": "想定ターン", }, "ターン説明": { "en": "Turn Number (affects various weapon skill/support ability/etc)", - "ja": "ターン", + "ja": "何ターン目を想定するか入力して下さい。(隆盛等の一部スキルやサポアビ等に影響)", "zh": "ターン", }, "敵防御固有値": {