| {intl.translate("攻撃力", locale)} |
diff --git a/src/epic.js b/src/epic.js
new file mode 100644
index 000000000..ff8e3c343
--- /dev/null
+++ b/src/epic.js
@@ -0,0 +1,120 @@
+'use strict';
+
+
+// ported from #201 (not-merged yet)
+const zip = (arr, ...args) =>
+ arr.map((val, idx) => args.reduce((x, xs) => [...x, xs[idx]], [val]));
+
+const sumBy = (arr, key) =>
+ arr.reduce((total, item) => total + item[key], 0);
+
+
+const _strip_arm_name = (name) => name.replace(/\s*\+\s*\w+\s*/, '');
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {Array} arm list with "count"
+ */
+const armListWithCount = (arml, comb) =>
+ zip(arml, comb).map(([arm, count]) => Object.assign({}, arm, {count}));
+
+/**
+ * TODO: how to document Types for "higher-order function"
+ */
+const genCountWeaponFunc = (func) => (arml, comb) =>
+ sumBy(armListWithCount(arml, comb).filter(func), "count");
+
+
+// #326 discussion for how to detect epic weapon
+const isEpicWeapon = (arm) => arm.series && arm.series === "epic";
+
+
+const isWandType = (arm) => arm.armType === "wand";
+
+
+// public
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {number} count of epic weapon
+ */
+const countEpicWeapon = genCountWeaponFunc(isEpicWeapon);
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {number} count of wand type weapon
+ */
+const countWandType = genCountWeaponFunc(isWandType);
+
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {number} is all unique arm name
+ */
+const countUniqueArm = (arml, comb) => (new Set(
+ armListWithCount(arml, comb)
+ .filter(arm => arm.name && arm.count === 1)
+ .map(arm => _strip_arm_name(arm.name)))).size;
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {number} is all unique arm type
+ */
+const countUniqueArmType = (arml, comb) => (new Set(
+ armListWithCount(arml, comb)
+ .filter(arm => arm.name && arm.count === 1)
+ .map(arm => arm.armType))).size;
+
+/**
+ * @param {Array} comb combinations
+ * @return {number} count unique arm
+ */
+const countComb = (arml, comb) =>
+ armListWithCount(arml, comb)
+ .filter(arm => arm.name && arm.count > 0).length;
+
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {boolean} is all unique arm
+ */
+const isAllUniqueArm = (arml, comb) =>
+ countUniqueArm(arml, comb) === countComb(arml, comb);
+
+
+/**
+ * @param {Array} arml arm list
+ * @param {Array} comb combinations
+ * @return {boolean} is all unique arm type
+ */
+const isAllUniqueArmType = (arml, comb) =>
+ countUniqueArmType(arml, comb) === 10 && countComb(arml, comb) === 10;
+
+
+// FIXME: it is not enough completed implementation, yet.
+// - if arml contained blank data
+// - if comb contained value 0
+
+// FIXME: this logic can't check following:
+// - if same weapon was added as different item, with different Lv or plug bonus etc.
+// - Omega, JMP, different colors can be different weapon? Cosmos types too.
+
+
+module.exports = {
+ _strip_arm_name: _strip_arm_name,
+ isEpicWeapon: isEpicWeapon,
+ isWandType: isWandType,
+ countEpicWeapon: countEpicWeapon,
+ countWandType: countWandType,
+ countUniqueArm: countUniqueArm,
+ countUniqueArmType: countUniqueArmType,
+ countComb: countComb,
+ isAllUniqueArm: isAllUniqueArm,
+ isAllUniqueArmType: isAllUniqueArmType,
+};
diff --git a/src/epic.test.js b/src/epic.test.js
new file mode 100644
index 000000000..e9b9d52c9
--- /dev/null
+++ b/src/epic.test.js
@@ -0,0 +1,130 @@
+
+const {
+ _strip_arm_name,
+ isEpicWeapon,
+ isWandType,
+ countEpicWeapon,
+ countWandType,
+ countUniqueArm,
+ countUniqueArmType,
+ countComb,
+ isAllUniqueArm,
+ isAllUniqueArmType,
+} = require('./epic');
+
+
+// Dummy arm data for tests
+const Arm = (armType, name="") => ({name:name||armType, armType});
+const EpicArm = (armType, name="") => Object.assign(Arm(armType, name), {series:"epic"})
+
+
+describe('New Epic Weapons skills', () => {
+
+ const ALL_ARM_TYPES = ["spear", "bow", "axe", "dagger", "wand", "fist", "sword", "katana", "music", "gun"];
+ // console.assert(ALL_ARM_TYPES.length === 10);
+
+ const allUniqueTypes = {
+ arml: ALL_ARM_TYPES.map(armType => EpicArm(armType, name=armType)),
+ comb: ALL_ARM_TYPES.map(() => 1),
+ };
+
+ describe('#_strip_arm_name', () => {
+ it('checks ignore plus and whitespaces', () => {
+ expect(_strip_arm_name("AAA+99")).toBe("AAA");
+ expect(_strip_arm_name("AAA +99")).toBe("AAA");
+ expect(_strip_arm_name("AAA + 99")).toBe("AAA");
+ expect(_strip_arm_name("AAA + 99 ")).toBe("AAA");
+ });
+ // TODO: ignore lv/slv
+ // TODO: ignore uncap? (require verification)
+ // TODO: ignore element change name (require verification)
+ });
+
+ describe('#isEpicWeapon', () => {
+ it('checks the series is "epic"', () => {
+ expect(isEpicWeapon(EpicArm("sword"))).toBeTruthy();
+ expect(isEpicWeapon(Arm("sword"))).toBeFalsy();
+ });
+ });
+
+ describe('#isWandType', () => {
+ it('checks armType is "wand"', () => {
+ expect(isWandType(EpicArm("wand"))).toBeTruthy();
+ expect(isWandType(Arm("wand"))).toBeTruthy();
+ expect(isWandType(EpicArm("sword"))).toBeFalsy();
+ expect(isWandType(Arm("dagger"))).toBeFalsy();
+ });
+ });
+
+ describe('#countEpicWeapon', () => {
+ it('checks total 3 epic weapons', () => {
+ const arml = [EpicArm(), EpicArm(), Arm(), Arm()];
+ const comb = [1, 2, 2, 1];
+ expect(countEpicWeapon(arml, comb)).toBe(3);
+ });
+ });
+
+ describe('#countWandWeapon', () => {
+ it('checks total 3 wand weapons', () => {
+ const arml = [EpicArm("sword"), EpicArm("wand"), Arm("dagger"), Arm("wand")];
+ const comb = [1, 2, 2, 1];
+ expect(countEpicWeapon(arml, comb)).toBe(3);
+ });
+ });
+
+ describe('#countUniqueArm', () => {
+ it('check unique arm', () => {
+ const arml = [Arm("sword"), Arm("dagger"), Arm("axe"), Arm(), Arm()];
+ const comb = [1, 1, 1, 1, 0];
+ expect(countUniqueArm(arml, comb)).toBe(3);
+ expect(isAllUniqueArm(arml, comb)).toBeTruthy();
+ });
+ });
+
+ describe('#countComb', () => {
+ it('checks ignore count 0', () => {
+ const arml = ["A", "B", "C", "D", "E"].map(type => Arm(type));
+ const comb = [1, 0, 1, 2, 0];
+ expect(countComb(arml, comb)).toBe(3);
+ });
+ });
+
+ describe('#isAllUniqueArm', () => {
+ it('should false if two or more weapons', () => {
+ const arml = ["A", "B", "C", "D", "E"].map(type => Arm(type));
+ const comb = [0, 1, 1, 1, 2];
+ expect(countComb(arml, comb)).toBe(4); // count > 0
+ expect(countUniqueArm(arml, comb)).toBe(3); // count === 1
+ expect(isAllUniqueArm(arml, comb)).toBeFalsy();
+ });
+ });
+
+ describe('#isAllUniqueArmType', () => {
+ it('checks all unique armType and the length 10', () => {
+ const {arml, comb} = allUniqueTypes;
+ expect(countUniqueArmType(arml, comb)).toBe(10);
+ expect(countComb(arml, comb)).toBe(10);
+ expect(isAllUniqueArm(arml, comb)).toBeTruthy();
+ expect(isAllUniqueArmType(arml, comb)).toBeTruthy();
+ });
+
+ it('should ignore blank slots', () => {
+ // initial setting has blank slots
+ const arml = [Arm("sword"), Arm("dagger"), Arm("axe"), Arm(), Arm(), Arm()];
+ const comb = [1, 1, 1, 1, 1, 1];
+ expect(countUniqueArmType(arml, comb)).toBe(3);
+ expect(countComb(arml, comb)).toBe(3);
+ expect(isAllUniqueArm(arml, comb)).toBeTruthy();
+ expect(isAllUniqueArmType(arml, comb)).toBeFalsy();
+ });
+
+ it('should detect same weapon in different entry', () => {
+ const arml = [Arm("sword"), Arm("axe", name="AAA"), Arm("axe", name="AAA+99")];
+ const comb = [1, 1, 1];
+ expect(countUniqueArm(arml, comb)).toBe(2);
+ expect(countComb(arml, comb)).toBe(3);
+ expect(isAllUniqueArm(arml, comb)).toBeFalsy();
+ expect(isAllUniqueArmType(arml, comb)).toBeFalsy();
+ });
+ });
+});
diff --git a/src/global_const.js b/src/global_const.js
index 47e74bc77..a0f80cfdd 100644
--- a/src/global_const.js
+++ b/src/global_const.js
@@ -100,6 +100,7 @@ module.exports.LIMIT = {
otherTA: UNLIMIT_VALUE,
chainDamageUP: 1.20,
chainDamageLimit: 0.50,
+ grandEpic: 80.0,
};
module.exports.DEFAULT = {
ougiRatio: 4.5,
@@ -991,6 +992,10 @@ var skilltypes = {
"tenshiShukufuku": {name: "天司の祝福", type: "tenshiShukufuku", amount: "M"},
"tenshiShukufukuII": {name: "天司の祝福II", type: "tenshiShukufuku", amount: "L"},
"tenshiShukufukuIII": {name: "天司の祝福III", type: "tenshiShukufuku", amount: "LL"},
+ "epic-grandEpic": {name: "エピックブランド・ゲイン", type: "epic", amount: "count-epic"},
+ "epic-staffResonance": {name: "レゾナンス・スタッフ", type: "epic", amount: "count-wand"},
+ "epic-heroicTale": {name: "ヒロイック・テイル", type: "epic", amount: "all-unique-type"},
+ "epic-absoluteEquality": {name: "ソール・イコーリティ", type: "epic", amount: "all-unique"},
"extendedDjeetaNormalDATA5": {name: "[ジータのみ] 通常枠DATA 5%", type: "extendedDjeetaNormalDATA", amount: 5.0},
"extendedDjeetaNormalDATA10": {name: "[ジータのみ] 通常枠DATA 10%", type: "extendedDjeetaNormalDATA", amount: 10.0},
"extendedDjeetaNormalDATA15": {name: "[ジータのみ] 通常枠DATA 15%", type: "extendedDjeetaNormalDATA", amount: 15.0},
@@ -1163,6 +1168,11 @@ var elementTypes = {
"dark": "闇",
};
+var series = {
+ "epic": "エピックウェポン",
+ "none": "無",
+};
+
var enemyElementTypes = {
"fire": "火",
"wind": "風",
@@ -2648,6 +2658,16 @@ module.exports.selector.zh.sexes = Object.keys(sexTypes).map(function (opt) {
return ;
});
+module.exports.selector.ja.series = Object.keys(series).map(function (opt) {
+ return ;
+});
+module.exports.selector.en.series = Object.keys(series).map(function (opt) {
+ return ;
+});
+module.exports.selector.zh.series = Object.keys(series).map(function (opt) {
+ return ;
+});
+
module.exports.selector.ja.elements = Object.keys(elementTypes).map(function (opt) {
return ;
});
diff --git a/src/global_logic.js b/src/global_logic.js
index d7ccb3bef..b89b7df2a 100644
--- a/src/global_logic.js
+++ b/src/global_logic.js
@@ -40,6 +40,7 @@ const {
raceCharaContains,
} = require('./skill_filter.js');
const {range, when} = require('./support_filter');
+const epic = require('./epic');
module.exports.isCosmos = function (arm) {
@@ -600,6 +601,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) {
// for DA and TA
var normalNite = totals[key]["normalNite"] * totalSummon["zeus"];
+ normalNite += totals[key]["normalOtherNite"];
var magnaNite = totals[key]["magnaNite"] * totalSummon["magna"];
var normalSante = totals[key]["normalSante"] * totalSummon["zeus"] + totals[key]["normalOtherSante"];
var magnaSante = totals[key]["magnaSante"] * totalSummon["magna"];
@@ -1562,6 +1564,14 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) {
"spear": false,
};
+ // New Epic 2nd skill is party shared setting, affected to EX fields
+ var numGrandEpic = 0; // number of Grand Epic skills
+ var numResonanceStaff = 0; // number of Resonance Staff skills
+ var countEpic = 0;
+ var countWand = 0;
+ var isAllUniqueArm = false;
+ var isAllUniqueArmType = false;
+
var index = 0;
for (var key in totals) {
index = index + 1 | 0;
@@ -1807,6 +1817,21 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) {
buff["enemyDebuffCount"] = arm[skillkey + "Detail"];
}
}
+ } else if (stype === 'epic' && key === 'Djeeta') {
+ // This implementation assume 'Djeeta'
+ // To collect skill information only once per grid.
+ // skill are affect to all allies
+ if (amount === 'count-epic') {
+ numGrandEpic += comb[i];
+ countEpic = countEpic ? countEpic : epic.countEpicWeapon(arml, comb);
+ } else if (amount === 'count-wand') {
+ numResonanceStaff += comb[i];
+ countWand = countWand ? countWand : epic.countWandType(arml, comb);
+ } else if (amount === 'all-unique-type') {
+ isAllUniqueArmType = epic.isAllUniqueArmType(arml, comb);
+ } else if (amount === 'all-unique') {
+ isAllUniqueArm = epic.isAllUniqueArm(arml, comb);
+ }
} else if (stype == 'cherubimKonshin') {
totals[key]["normalSupportKonshinWeapon"] = Math.max(module.exports.calcHaisuiValue("normalSupportKonshin", "M", "1", totals["Djeeta"]["remainHP"]), totals[key]["normalSupportKonshinWeapon"]);
} else if (stype == 'sunbladeKonshin') {
@@ -2043,6 +2068,27 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) {
if (totals[key]["bahaAT"] > 50) totals[key]["bahaAT"] = 50;
if (totals[key]["bahaHP"] > 50) totals[key]["bahaHP"] = 50;
}
+
+ // new epic 2nd skills
+ Object.values(totals).forEach(chara => {
+ if (numGrandEpic > 0) {
+ chara["ex"] += Math.min(LIMIT.grandEpic, numGrandEpic * countEpic * 4.0);
+ }
+ if (numResonanceStaff > 0) {
+ chara["normalOtherSante"] += Math.min(10, countWand) * 1.0;
+ }
+ if (isAllUniqueArm) {
+ chara["ex"] += 20.0;
+ chara["normalDamageLimit"] += 0.10;
+ chara["ougiDamageLimit"] += 0.10;
+ }
+ if (isAllUniqueArmType) {
+ // TODO: remove copy-pasted codes, if confirmed same and stack.
+ chara["ex"] += 20.0;
+ chara["normalDamageLimit"] += 0.10;
+ chara["ougiDamageLimit"] += 0.10;
+ }
+ });
};
module.exports.calcBaseATK = function (rank) {
diff --git a/src/translate.js b/src/translate.js
index c8ef4b442..1b492e16f 100644
--- a/src/translate.js
+++ b/src/translate.js
@@ -112,7 +112,7 @@ var multiLangData = {
"zh": "无职业",
},
"無し": {
- "en": "none",
+ "en": "None",
"ja": "無し",
"zh": "无",
},
@@ -207,12 +207,12 @@ var multiLangData = {
"zh": "全属性",
},
"無": {
- "en": "Non",
+ "en": "None",
"ja": "無",
"zh": "无",
},
"無（技巧あり）": {
- "en": "Non (but Crit.)",
+ "en": "None (with Crit.)",
"ja": "無（技巧あり）",
"zh": "无 (有技巧)",
},
@@ -1430,7 +1430,7 @@ var multiLangData = {
"zh": "有利",
},
"非有利": {
- "en": "Non-advantage",
+ "en": "Unfavorable",
"ja": "非有利",
"zh": "非有利",
},
@@ -1965,6 +1965,11 @@ var multiLangData = {
"ja": "武器名",
"zh": "武器名",
},
+ "カテゴリー": {
+ "en": "Category",
+ "ja": "カテゴリー",
+ "zh": "カテゴリー",
+ },
"スキル": {
"en": "Skill",
"ja": "スキル",
@@ -2052,6 +2057,13 @@ var multiLangData = {
"ja": "不詳",
"zh": "不詳",
},
+ // Series
+ "エピックウェポン": {
+ "en": "Epic Weapon",
+ "ja": "エピックウェポン",
+ "zh": "エピックウェポン",
+ },
+
//support abilities
"なし": {
"en": "None",
@@ -3445,6 +3457,26 @@ var multiLangData = {
"ja": "天司の祝福III",
"zh": "天司的祝福III",
},
+ "エピックブランド・ゲイン": {
+ "en": "Grand Epic",
+ "ja": "エピックブランド・ゲイン",
+ "zh": "Grand Epic",
+ },
+ "レゾナンス・スタッフ": {
+ "en": "Staff Resonance",
+ "ja": "レゾナンス・スタッフ",
+ "zh": "Staff Resonance",
+ },
+ "ヒロイック・テイル": {
+ "en": "Heroic Tale",
+ "ja": "ヒロイック・テイル",
+ "zh": "Heroic Tale",
+ },
+ "ソール・イコーリティ": {
+ "en": "Absolute Equality",
+ "ja": "ソール・イコーリティ",
+ "zh": "Absolute Equality",
+ },
"通常上限UP(2.5%)": {
"en": "Damage Cap UP(2.5%)",
"ja": "通常上限UP(2.5%)",
@@ -4098,7 +4130,7 @@ var multiLangData = {
"zh": "2017/06/17: 修正了Rank175以上的基础HP/HP公式。",
},
"notice-20170704-1": {
- "en": "04/07/2017: Added new weapons. Implemented 'Non' element type. Implemented critical ratio array displaying.",
+ "en": "04/07/2017: Added new weapons. Implemented 'None' element type. Implemented critical ratio array displaying.",
"ja": "2017/07/04: 武器追加. 無属性と無属性（技巧あり）を実装. 技巧倍率毎の発生確率表示を実装.",
"zh": "2017/07/04: 增加新武器。 实装了无属性和无属性(考虑技巧)的计算。实装了显示每个技巧倍率的发生概率。",
},
diff --git a/txt_source/arm-translation.json b/txt_source/arm-translation.json
index c22cb1aa9..127b6a1d9 100644
--- a/txt_source/arm-translation.json
+++ b/txt_source/arm-translation.json
@@ -7,6 +7,18 @@
"[4凸]ラブライブ！ライト": "[4★] Love Live Light",
"凛のマラカス": "Rin's Maracas",
"[4凸]凛のマラカス": "[4★] Rin's Maracas",
+ "チェーン・オブ・カウカソス": "Chains of Caucasus",
+ "[4凸]チェーン・オブ・カウカソス": "[4★] Chains of Caucasus",
+ "聖域の錫杖": "Savior of Hallowed Ground",
+ "[4凸]聖域の錫杖": "[4★] Savior of Hallowed Ground",
+ "英雄王の戦斧": "All-Might Battle-Axe",
+ "[4凸]英雄王の戦斧": "[4★] All-Might Battle-Axe",
+ "ウニウス": "Unius",
+ "[4凸]ウニウス": "[4★] Unius",
+ "不毀の籠手": "Adamantine Gauntlet",
+ "[4凸]不毀の籠手": "[4★] Adamantine Gauntlet",
+ "支配の天秤": "Scales of Dominion",
+ "[4凸]支配の天秤": "[4★] Scales of Dominion",
"サマーメモリーリークス": "Forbidden Memories",
"クリスタルベルフラワー": "Crystal Bellflowers",
"蒼宵光華": "Midnight Radiance",
diff --git a/txt_source/armData-ssr.txt b/txt_source/armData-ssr.txt
index 375804ec2..e3da5baba 100644
--- a/txt_source/armData-ssr.txt
+++ b/txt_source/armData-ssr.txt
@@ -406,18 +406,30 @@
|&attachref(img/1040705200.png,15%);|[4凸]インドラリム|&color(#339966){風};|弓|60|[[インドラの矢>奥義一覧#indranoya]]|[[竜巻の刹那>スキル一覧#tatsumakinosetuna]]|[[乱気の堅守>スキル一覧#rannkinokensyu]]|33|380|380|2716|ショップ|武勲の輝き交換|○|211|2326|
|&attachref(img/1040805200.png,15%);|スレイプニルシュー|&color(#ff9900){光};|楽器|60|[[シェングヴィーデ>奥義一覧#shengvide]]|[[光の背水>スキル一覧#hikarinohaisui]]|[[天光の堅守>スキル一覧#tennkounokensyu]]|63|332|224|2054|ショップ|武勲の輝き交換||
|&attachref(img/1040805200.png,15%);|[4凸]スレイプニルシュー|&color(#ff9900){光};|楽器|60|[[シェングヴィーデ>奥義一覧#shengvide]]|[[雷電の背水>スキル一覧#raidennnohaisui]]|[[天光の堅守>スキル一覧#tennkounokensyu]]|63|332|256|2399|ショップ|武勲の輝き交換|○|224|2054|
-|&attachref(img/1040011200.png,15%);|聖域の守護剣|&color(#3366ff){水};|剣|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の攻刃II>スキル一覧#muhyounokoujin2]]|[[チェインフォース>スキル一覧#chainforce]]|34|367|202|2332|カー・オン討伐戦|ハイグレード武器||
-|&attachref(img/1040011200.png,15%);|[4凸]聖域の守護剣|&color(#3366ff){水};|剣|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の攻刃II>スキル一覧#muhyounokoujin2]]|[[チェインフォース>スキル一覧#chainforce]]|34|367|240|2810|カー・オン討伐戦|ハイグレード武器|○|202|2332|
-|&attachref(img/1040109000.png,15%);|ル・フェイ|&color(#339966){風};|短剣|60|[[テスラ>武器奥義#tesura]]|[[乱気の暴君>スキル一覧#rannkinoboukun]]|[[乱気の三手>スキル一覧#rannkinosante]]|40|340|241|2127|バイヴカハ討伐戦|ハイグレード武器||
-|&attachref(img/1040109000.png,15%);|[4凸]ル・フェイ|&color(#339966){風};|短剣|60|[[テスラ>武器奥義#tesura]]|[[乱気の暴君>スキル一覧#rannkinoboukun]]|[[乱気の三手>スキル一覧#rannkinosante]]|40|340|290|2570|バイヴカハ討伐戦|ハイグレード武器|○|241|2127|
-|&attachref(img/1040208100.png,15%);|英雄王の槍|&color(#993300){土};|槍|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[地裂の攻刃II>スキル一覧#tiretunokoujin2]]|[[イクシード・アース>スキル一覧#limitbreakearth]]|35|364|221|2226|ギルガメッシュ討伐戦|ハイグレード武器||
-|&attachref(img/1040208100.png,15%);|[4凸]英雄王の槍|&color(#993300){土};|槍|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[地裂の攻刃II>スキル一覧#tiretunokoujin2]]|[[イクシード・アース>スキル一覧#limitbreakearth]]|35|364|270|2690|ギルガメッシュ討伐戦|ハイグレード武器|○|221|2226|
-|&attachref(img/1040307100.png,15%);|ヘルマニビス|&color(#800080){闇};|斧|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[憎悪の神威>スキル一覧#zouonokamui]]|[[イクシード・ダーク>スキル一覧#limitbreakdark]]|25|415|174|2463|アヌビス討伐戦|ハイグレード武器||
-|&attachref(img/1040307100.png,15%);|[4凸]ヘルマニビス|&color(#800080){闇};|斧|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[憎悪の神威>スキル一覧#zouonokamui]]|[[イクシード・ダーク>スキル一覧#limitbreakdark]]|25|415|210|2980|アヌビス討伐戦|ハイグレード武器|○|174|2463|
-|&attachref(img/1040410100.png,15%);|ファイア・オブ・プロメテウス|&color(#ff0000){火};|杖|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[紅蓮の呪印>スキル一覧#gurennojyuin]]|[[業火の無双>スキル一覧#goukanomusou]]|41|333|264|2009|プロメテウス討伐戦|ハイグレード武器||
-|&attachref(img/1040410100.png,15%);|[4凸]ファイア・オブ・プロメテウス|&color(#ff0000){火};|杖|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[紅蓮の呪印>スキル一覧#gurennojyuin]]|[[業火の無双>スキル一覧#goukanomusou]]|41|333|320|2430|プロメテウス討伐戦|ハイグレード武器|○|264|2009|
-|&attachref(img/1040706200.png,15%);|イーリアスボウ|&color(#ff9900){光};|弓|60|[[畏れ無き剛弓>武器奥義#osorenakigoukyuu]]|[[白星の渾身>スキル一覧#shiroboshinokonshin]]|[[雷電の二手>スキル一覧#raidennnonite]]|34|375|212|2321|ヘクトル討伐戦|ハイグレード武器||
-|&attachref(img/1040706200.png,15%);|[4凸]イーリアスボウ|&color(#ff9900){光};|弓|60|[[畏れ無き剛弓>武器奥義#osorenakigoukyuu]]|[[白星の渾身>スキル一覧#shiroboshinokonshin]]|[[雷電の二手>スキル一覧#raidennnonite]]|34|375|260|2810|ヘクトル討伐戦|ハイグレード武器|○|212|2321|
+|&attachref(img/1040011200.png,15%);|聖域の守護剣|&color(#3366ff){水};|剣|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の攻刃II>スキル一覧#muhyounokoujin2]]|[[チェインフォース>スキル一覧#chainforce]]|34|367|202|2332|カー・オン討伐戦|エピックウェポン||
+|&attachref(img/1040011200.png,15%);|[4凸]聖域の守護剣|&color(#3366ff){水};|剣|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の攻刃II>スキル一覧#muhyounokoujin2]]|[[チェインフォース>スキル一覧#chainforce]]|34|367|240|2810|カー・オン討伐戦|エピックウェポン|○|202|2332|
+|&attachref(img/1040018900.png,15%);|チェーン・オブ・カウカソス|&color(#ff0000){火};|剣|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[業火の背水>スキル一覧#goukanohaisui]]||30|385|199|2340|プロメテウスHL討伐戦|エピックウェポン||
+|&attachref(img/1040018900.png,15%);|[4凸]チェーン・オブ・カウカソス|&color(#ff0000){火};|剣|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[業火の背水>スキル一覧#goukanohaisui]]|[[エピックブランド・ゲイン>スキル一覧#epicbland]]|30|385|240|2830|プロメテウスHL討伐戦|エピックウェポン|○|199|2340|
+|&attachref(img/1040109000.png,15%);|ル・フェイ|&color(#339966){風};|短剣|60|[[テスラ>武器奥義#tesura]]|[[乱気の暴君>スキル一覧#rannkinoboukun]]|[[乱気の三手>スキル一覧#rannkinosante]]|40|340|241|2127|バイヴカハ討伐戦|エピックウェポン||
+|&attachref(img/1040109000.png,15%);|[4凸]ル・フェイ|&color(#339966){風};|短剣|60|[[テスラ>武器奥義#tesura]]|[[乱気の暴君>スキル一覧#rannkinoboukun]]|[[乱気の三手>スキル一覧#rannkinosante]]|40|340|290|2570|バイヴカハ討伐戦|エピックウェポン|○|241|2127|
+|&attachref(img/1040208100.png,15%);|英雄王の槍|&color(#993300){土};|槍|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[地裂の攻刃II>スキル一覧#tiretunokoujin2]]|[[イクシード・アース>スキル一覧#limitbreakearth]]|35|364|221|2226|ギルガメッシュ討伐戦|エピックウェポン||
+|&attachref(img/1040208100.png,15%);|[4凸]英雄王の槍|&color(#993300){土};|槍|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[地裂の攻刃II>スキル一覧#tiretunokoujin2]]|[[イクシード・アース>スキル一覧#limitbreakearth]]|35|364|270|2690|ギルガメッシュ討伐戦|エピックウェポン|○|221|2226|
+|&attachref(img/1040307100.png,15%);|ヘルマニビス|&color(#800080){闇};|斧|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[憎悪の神威>スキル一覧#zouonokamui]]|[[イクシード・ダーク>スキル一覧#limitbreakdark]]|25|415|174|2463|アヌビス討伐戦|エピックウェポン||
+|&attachref(img/1040307100.png,15%);|[4凸]ヘルマニビス|&color(#800080){闇};|斧|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[憎悪の神威>スキル一覧#zouonokamui]]|[[イクシード・ダーク>スキル一覧#limitbreakdark]]|25|415|210|2980|アヌビス討伐戦|エピックウェポン|○|174|2463|
+|&attachref(img/1040311100.png,15%);|英雄王の戦斧|&color(#993300){土};|斧|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[アンバー・アーツ>スキル一覧#amberarts]]||30|390|178|2440|ギルガメッシュHL討伐戦|エピックウェポン||
+|&attachref(img/1040311100.png,15%);|[4凸]英雄王の戦斧|&color(#993300){土};|斧|60|[[シュメル・ウィンド>武器奥義#syumeruwind]]|[[アンバー・アーツ>スキル一覧#amberarts]]|[[ヒロイック・テイル>スキル一覧#hiroictale]]|30|390|220|2950|ギルガメッシュHL討伐戦|エピックウェポン|○|178|2440|
+|&attachref(img/1040410100.png,15%);|ファイア・オブ・プロメテウス|&color(#ff0000){火};|杖|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[紅蓮の呪印>スキル一覧#gurennojyuin]]|[[業火の無双>スキル一覧#goukanomusou]]|41|333|264|2009|プロメテウス討伐戦|エピックウェポン||
+|&attachref(img/1040410100.png,15%);|[4凸]ファイア・オブ・プロメテウス|&color(#ff0000){火};|杖|60|[[フェルラ・ネーザックス>武器奥義#ferula]]|[[紅蓮の呪印>スキル一覧#gurennojyuin]]|[[業火の無双>スキル一覧#goukanomusou]]|41|333|320|2430|プロメテウス討伐戦|エピックウェポン|○|264|2009|
+|&attachref(img/1040415700.png,15%);|聖域の錫杖|&color(#3366ff){水};|杖|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の渾身>スキル一覧#aobosinokonsin]]||43|320|266|2000|カー・オンHL討伐戦|エピックウェポン||
+|&attachref(img/1040415700.png,15%);|[4凸]聖域の錫杖|&color(#3366ff){水};|杖|60|[[レゾナンス・メロディ>武器奥義#resonancemelody]]|[[霧氷の渾身>スキル一覧#aobosinokonsin]]|[[レゾナンス・スタッフ>スキル一覧#resonancestaff]]|43|320|320|2420|カー・オンHL討伐戦|エピックウェポン|○|266|2000|
+|&attachref(img/1040415800.png,15%);|支配の天秤|&color(#800080){闇};|杖|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[グラファイト・アーツ>スキル一覧#grafightarts]]||38|345|261|2020|アヌビスHL討伐戦|エピックウェポン||
+|&attachref(img/1040415800.png,15%);|[4凸]支配の天秤|&color(#800080){闇};|杖|60|[[死罪の計量>武器奥義#shizainokeiryou]]|[[グラファイト・アーツ>スキル一覧#grafightarts]]|[[ソール・イコーリティ>スキル一覧#saulequality]]|38|345|320|2440|アヌビスHL討伐戦|エピックウェポン|○|261|2020|
+|&attachref(img/1040611700.png,15%);|不毀の籠手|&color(#ff9900){光};|格闘|60|[[畏れ無き剛爪>武器奥義#osorenaki]]|[[雷電の技巧>スキル一覧#raidennnogikou]]||36|355|230|2180|ヘクトルHL討伐戦|エピックウェポン||
+|&attachref(img/1040611700.png,15%);|[4凸]不毀の籠手|&color(#ff9900){光};|格闘|60|[[畏れ無き剛爪>武器奥義#osorenaki]]|[[雷電の技巧>スキル一覧#raidennnogikou]]|[[エピックブランド・ゲイン>スキル一覧#epicbland]]|36|355|280|2640|ヘクトルHL討伐戦|エピックウェポン|○|230|2180|
+|&attachref(img/1040706200.png,15%);|イーリアスボウ|&color(#ff9900){光};|弓|60|[[畏れ無き剛弓>武器奥義#osorenakigoukyuu]]|[[白星の渾身>スキル一覧#shiroboshinokonshin]]|[[雷電の二手>スキル一覧#raidennnonite]]|34|375|212|2321|ヘクトル討伐戦|エピックウェポン||
+|&attachref(img/1040706200.png,15%);|[4凸]イーリアスボウ|&color(#ff9900){光};|弓|60|[[畏れ無き剛弓>武器奥義#osorenakigoukyuu]]|[[白星の渾身>スキル一覧#shiroboshinokonshin]]|[[雷電の二手>スキル一覧#raidennnonite]]|34|375|260|2810|ヘクトル討伐戦|エピックウェポン|○|212|2321|
+|&attachref(img/1040709200.png,15%);|ウニウス|&color(#339966){風};|弓|60|[[テスラ>武器奥義#tesura]]|[[竜巻の攻刃>スキル一覧#tatumakinokoujin]]||33|380|210|2330|バイヴカハHL討伐戦|エピックウェポン||
+|&attachref(img/1040709200.png,15%);|[4凸]ウニウス|&color(#339966){風};|弓|60|[[テスラ>武器奥義#tesura]]|[[竜巻の攻刃>スキル一覧#tatumakinokoujin]]|[[エピックブランド・ゲイン>スキル一覧#epicbland]]|33|380|250|2820|バイヴカハHL討伐戦|エピックウェポン|○|210|2330|
|&attachref(img/1040000000.png,15%);|ダーインスレイブ|&color(#ff0000){火};|剣|15|[[ヒャズニングルーン>武器奥義#hyazning]]|[[紅蓮の攻刃>スキル一覧#gurennokoujin]]||33|445|216|2580|[[アルタイル (SSR)]]加入|レジェンドガチャ||
|&attachref(img/1040000000.png,15%);|[4凸]ダーインスレイブ|&color(#ff0000){火};|剣|15|[[ヒャズニングルーン++>武器奥義#hyazning]]|[[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[軍師の気構え>スキル一覧#gunshinokigamae]]|33|445|253|3010|[[アルタイル (SSR)]]加入|レジェンドガチャ|○|216|2580|
|&attachref(img/1040000300.png,15%);|アスカロン|&color(#993300){土};|剣|10|[[ゲオルギウスブレード>武器奥義#georgius]]|[[地裂の攻刃>スキル一覧#tiretunokoujin]]|[[霧氷の攻刃>スキル一覧#muhyounokoujin]]|37|415|217|2515|[[ジークフリート (SSR)]]加入|レジェンドガチャ||
diff --git a/txt_source/armImageGameURLList.txt b/txt_source/armImageGameURLList.txt
index d1e7b7284..9aa28ae4c 100644
--- a/txt_source/armImageGameURLList.txt
+++ b/txt_source/armImageGameURLList.txt
@@ -257,11 +257,17 @@ http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040705100.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040705200.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040805200.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040011200.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040018900.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040109000.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040208100.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040307100.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040311100.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040410100.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040415700.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040415800.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040611700.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040706200.png
+http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040709200.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040000000.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040000300.png
http://gbf.game-a.mbga.jp/assets/img/sp/assets/weapon/b/1040000500.png
diff --git a/txt_source/armImageWikiURLList.txt b/txt_source/armImageWikiURLList.txt
index 8c9253f7b..f41a27719 100644
--- a/txt_source/armImageWikiURLList.txt
+++ b/txt_source/armImageWikiURLList.txt
@@ -257,11 +257,17 @@ http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040705100.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040705200.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040805200.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040011200.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040018900.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040109000.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040208100.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040307100.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040311100.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040410100.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040415700.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040415800.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040611700.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040706200.png
+http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040709200.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040000000.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040000300.png
http://gbf-wiki.com/index.php?plugin=attach&refer=img&openfile=1040000500.png
From f1db7aedfc23800e6b0a8e5cd33279f2e0c4383c 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: Fri, 6 Sep 2019 18:18:45 +0900
Subject: [PATCH 2/3] Update Bahamut skills (#349)
---
src/global_const.js | 43 ++++++++++++++++++++++++-------------------
src/global_logic.js | 8 ++++----
2 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/global_const.js b/src/global_const.js
index a0f80cfdd..6919947cd 100644
--- 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
index b89b7df2a..4b1ec2fce 100644
--- 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') {
From 9c10dfcc2f4ca285a169bd3c29801eac1373b14f 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: Sun, 15 Sep 2019 00:51:12 +0900
Subject: [PATCH 3/3] Display damage thousand separator (#348)
- Display comma separated numbers (HP and Damages)
- Fixed display number may over the cell border
- use proportional font for comma separated number
- Fixed averageCyclePerTurn Math.round timing
---
css/style.css | 1 +
src/result.js | 64 ++++++++++++++++++++++++++++-----------------------
2 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/css/style.css b/css/style.css
index 419864eb6..b6e191fe5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -229,6 +229,7 @@
vertical-align: middle;
font-size: 11pt;
text-align: center;
+ font-family: arial, sans-serif;
}
tbody.result>tr>td:first-child {
diff --git a/src/result.js b/src/result.js
index 8aeb07595..a464a154c 100644
--- a/src/result.js
+++ b/src/result.js
@@ -990,6 +990,7 @@ var Result = CreateClass({
var prof = this.props.prof;
var onClick = this.onClick;
var locale = this.props.locale;
+ const formatCommaSeparatedNumber = num => String(Math.round(num)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,');
return (
@@ -1004,12 +1005,14 @@ var Result = CreateClass({
}
if (sw.switchTotalAttack) {
- tablebody.push(m.data.Djeeta.totalAttack);
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.totalAttack));
++colSize;
}
if (sw.switchATKandHP) {
- var senryoku = Math.round(m.data.Djeeta.displayAttack) + Math.round(m.data.Djeeta.displayHP);
- tablebody.push(senryoku + "\n(" + Math.round(m.data.Djeeta.displayAttack) + ' + ' + Math.round(m.data.Djeeta.displayHP) + ')');
+ // senryoku = 戦力 = PWR
+ let {displayAttack, displayHP} = m.data.Djeeta;
+ let senryoku = displayAttack + displayHP;
+ tablebody.push(formatCommaSeparatedNumber(senryoku) + "\n(" + formatCommaSeparatedNumber(displayAttack) + ' + ' + formatCommaSeparatedNumber(displayHP) + ')');
++colSize;
}
@@ -1018,7 +1021,7 @@ var Result = CreateClass({
charaDetail[key].push(
{intl.translate("攻撃力", locale)} {m.data[key].totalAttack}
+ className="label label-primary">{intl.translate("攻撃力", locale)} {formatCommaSeparatedNumber(m.data[key].totalAttack)}
);
}
@@ -1065,13 +1068,14 @@ var Result = CreateClass({
}
if (sw.switchExpectedAttack) {
- var expectedAttack = Math.round(m.data.Djeeta.expectedAttack * m.data.Djeeta.totalAttack);
- tablebody.push(m.data.Djeeta.expectedAttack.toFixed(4) + "\n(" + expectedAttack + ")");
+ let {expectedAttack, totalAttack} = m.data.Djeeta;
+ let attack = expectedAttack * totalAttack;
+ tablebody.push(expectedAttack.toFixed(4) + "\n(" + formatCommaSeparatedNumber(attack) + ")");
++colSize;
}
if (sw.switchCriticalAttack) {
- tablebody.push(m.data.Djeeta.criticalAttack);
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.criticalAttack));
++colSize;
}
@@ -1086,34 +1090,36 @@ var Result = CreateClass({
}
if (sw.switchHP) {
- tablebody.push(m.data.Djeeta.totalHP + "\n(" + Math.round(m.data.Djeeta.totalHP * m.data.Djeeta.remainHP) + ")");
+ let {totalHP, remainHP} = m.data.Djeeta;
+ tablebody.push(formatCommaSeparatedNumber(totalHP) + "\n(" + formatCommaSeparatedNumber(totalHP * remainHP) + ")");
++colSize;
}
if (sw.switchCharaHP) {
+ let {totalHP, remainHP} = m.data[key];
for (key in m.data) {
charaDetail[key].push(
{intl.translate("残HP", locale)} / HP
- {Math.round(m.data[key].totalHP * m.data[key].remainHP)} / {m.data[key].totalHP}
+ {formatCommaSeparatedNumber(totalHP * remainHP)} / {formatCommaSeparatedNumber(totalHP)}
);
}
}
if (sw.switchAverageAttack) {
- tablebody.push(Math.round(m.data.Djeeta.averageAttack));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.averageAttack));
++colSize;
}
if (sw.switchAverageCriticalAttack) {
- tablebody.push(Math.round(m.data.Djeeta.averageCriticalAttack));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.averageCriticalAttack));
++colSize;
}
if (sw.switchTotalExpected) {
- tablebody.push(m.data.Djeeta.totalExpected);
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.totalExpected));
++colSize;
}
@@ -1122,19 +1128,19 @@ var Result = CreateClass({
charaDetail[key].push(
{intl.translate("総回技", locale)}{m.data[key].totalExpected}
+ className="label label-primary">{intl.translate("総回技", locale)}{formatCommaSeparatedNumber(m.data[key].totalExpected)}
);
}
}
if (sw.switchAverageTotalExpected) {
- tablebody.push(Math.round(m.data.Djeeta.averageTotalExpected));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.averageTotalExpected));
++colSize;
}
if (sw.switchPureDamage) {
- tablebody.push(Math.round(m.data.Djeeta.pureDamage));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.pureDamage));
++colSize;
}
@@ -1143,24 +1149,24 @@ var Result = CreateClass({
charaDetail[key].push(
{intl.translate("単攻撃ダメージ(技巧連撃無)", locale)} {m.data[key].pureDamage.toFixed(0)}
+ className="label label-primary">{intl.translate("単攻撃ダメージ(技巧連撃無)", locale)} {formatCommaSeparatedNumber(m.data[key].pureDamage)}
);
}
}
if (sw.switchDamageWithCritical) {
- tablebody.push(Math.round(m.data.Djeeta.damageWithCritical));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.damageWithCritical));
++colSize;
}
if (sw.switchDamageWithMultiple) {
- tablebody.push(Math.round(m.data.Djeeta.damageWithMultiple));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.damageWithMultiple));
++colSize;
}
if (sw.switchDamage) {
- tablebody.push(Math.round(m.data.Djeeta.damage));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.damage));
++colSize;
}
@@ -1170,7 +1176,7 @@ var Result = CreateClass({
}
if (sw.switchOugiDamage) {
- tablebody.push(Math.round(m.data.Djeeta.totalOugiDamage));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.totalOugiDamage));
++colSize;
}
@@ -1181,7 +1187,7 @@ var Result = CreateClass({
charaDetail[key].push(
{intl.translate("奥義ダメージ", locale)} {m.data[key].ougiDamage.toFixed(0)}
+ className="label label-primary">{intl.translate("奥義ダメージ", locale)} {formatCommaSeparatedNumber(m.data[key].ougiDamage)}
);
}
@@ -1199,15 +1205,15 @@ var Result = CreateClass({
}
if (sw.switchChainBurst) {
- tablebody.push(Math.round(m.data.Djeeta.averageChainBurst));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.averageChainBurst));
++colSize;
}
if (sw.switchTotalOugiDamageWithChain) {
- tablebody.push(Math.round(m.data.Djeeta.totalOugiDamageWithChain));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.totalOugiDamageWithChain));
++colSize;
}
if (sw.switchCycleDamage) {
- tablebody.push(Math.round(m.data.Djeeta.expectedCycleDamagePerTurn));
+ tablebody.push(formatCommaSeparatedNumber(m.data.Djeeta.expectedCycleDamagePerTurn));
++colSize;
}
@@ -1216,15 +1222,15 @@ var Result = CreateClass({
charaDetail[key].push(
{intl.translate("予想ターン毎ダメージ", locale)} {m.data[key].expectedCycleDamagePerTurn.toFixed(0)}
+ className="label label-primary">{intl.translate("予想ターン毎ダメージ", locale)} {formatCommaSeparatedNumber(m.data[key].expectedCycleDamagePerTurn)}
);
}
}
if (sw.switchAverageCycleDamage) {
- var val = Math.round(m.data.Djeeta.averageCyclePerTurn);
- tablebody.push(val.toString() + " (" + (4 * val).toString() + ")");
+ let averageCyclePerTurn = m.data.Djeeta.averageCyclePerTurn;
+ tablebody.push(formatCommaSeparatedNumber(averageCyclePerTurn) + " (" + formatCommaSeparatedNumber(4 * averageCyclePerTurn) + ")");
++colSize;
}
@@ -1257,9 +1263,9 @@ var Result = CreateClass({
{intl.translate("実質通常上限", locale)}
- {Math.round(normalDamageRealLimit).toLocaleString()}
+ {formatCommaSeparatedNumber(normalDamageRealLimit)}
{intl.translate("実質奥義上限", locale)}
- {Math.round(ougiDamageRealLimit).toLocaleString()}
+ {formatCommaSeparatedNumber(ougiDamageRealLimit)}
);
|