diff --git a/src/global_const.js b/src/global_const.js index 6caa49126..160de18ce 100644 --- a/src/global_const.js +++ b/src/global_const.js @@ -1943,8 +1943,7 @@ var skillAmounts = { }, "darkOpusElementATK": { //per turn increase, maximum 10 turns - //"L": [0.0055, 0.0060, 0.0065, 0.0070, 0.0075, 0.0080, 0.0085, 0.0090, 0.0095, 0.0100, 0.0105, 0.0110, 0.0115, 0.0120, 0.0125, 0.0130, 0.0135, 0.0140, 0.0145, 0.0150], - "L": [0.055, 0.060, 0.065, 0.070, 0.075, 0.080, 0.085, 0.090, 0.095, 0.100, 0.105, 0.110, 0.115, 0.120, 0.125, 0.130, 0.135, 0.140, 0.145, 0.150], + "L": [0.0055, 0.0060, 0.0065, 0.0070, 0.0075, 0.0080, 0.0085, 0.0090, 0.0095, 0.0100, 0.0105, 0.0110, 0.0115, 0.0120, 0.0125, 0.0130, 0.0135, 0.0140, 0.0145, 0.0150], } }; diff --git a/src/global_logic.js b/src/global_logic.js index a9b04acc9..0abbdcdeb 100644 --- a/src/global_logic.js +++ b/src/global_logic.js @@ -563,8 +563,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]["shinTenNoInori"][0] * totals[key]["shinTenNoInori"][1]; //[0]: amount. [1]: stacks number elementCoeff += 0.01 * totals[key]["LB"].Element; @@ -1495,6 +1495,7 @@ module.exports.getTotalBuff = function (prof) { supplementalDamageBuff: 0, //enemyBuffCount: 0, enemyDebuffCount: 0, + turn: 0, retsujitsuNoRakuen: false, }; @@ -1531,6 +1532,7 @@ module.exports.getTotalBuff = function (prof) { totalBuff["criticalBuff"] = prof.criticalBuff != undefined ? prof.criticalBuff : []; totalBuff["supplementalDamageBuff"] += parseInt(prof.supplementalDamageBuff); + totalBuff["turn"] = parseInt(prof.turn); totalBuff["retsujitsuNoRakuen"] = prof.retsujitsuNoRakuen; return totalBuff; 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 a464a154c..68d5f3eb1 100644 --- a/src/result.js +++ b/src/result.js @@ -482,6 +482,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)); @@ -660,7 +662,7 @@ var ResultList = CreateClass({
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
@@ -694,7 +696,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})
@@ -864,7 +866,7 @@ var ResultList = CreateClass({
{charaInfo} -
{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
+
{turnStr + " | "}{intl.translate("パーティ全体バフ", locale)}: {buffInfoStr}
{getElementColorLabel(prof.enemyElement, locale)} {intl.translate("敵", locale)} ({enemyInfoStr})
@@ -903,7 +905,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 a044dcdf6..427f5b5a1 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": "敵防御固有値",