diff --git a/armData.json b/armData.json index f70396498..7e08c6111 100644 --- a/armData.json +++ b/armData.json @@ -19483,12 +19483,12 @@ "imageURL": "./imgs/1040911700.png", "en": "Blade of Purification" }, - "エクスカリバー・属性変更": { - "ja": "エクスカリバー・属性変更", + "エクスカリバー": { + "ja": "エクスカリバー", "element": "all", "type": "sword", "skill1": "non", - "skill2": "non", + "skill2": "rightway_pathfinder", "element2": "all", "skill3": "non", "element3": "all", @@ -19502,12 +19502,12 @@ "imageURL": "./imgs/1040007500.png", "en": "Excalibur" }, - "[4凸]エクスカリバー・属性変更": { - "ja": "[4凸]エクスカリバー・属性変更", + "[4凸]エクスカリバー": { + "ja": "[4凸]エクスカリバー", "element": "all", "type": "sword", "skill1": "non", - "skill2": "non", + "skill2": "rightway_pathfinderII", "element2": "all", "skill3": "non", "element3": "all", @@ -19523,8 +19523,8 @@ "imageURL": "./imgs/1040007500.png", "en": "[4★] Excalibur" }, - "ダマスカスナイフ・属性変更": { - "ja": "ダマスカスナイフ・属性変更", + "ダマスカスナイフ": { + "ja": "ダマスカスナイフ", "element": "all", "type": "dagger", "skill1": "non", @@ -19542,8 +19542,8 @@ "imageURL": "./imgs/1040106600.png", "en": "Damascus Knife" }, - "[4凸]ダマスカスナイフ・属性変更": { - "ja": "[4凸]ダマスカスナイフ・属性変更", + "[4凸]ダマスカスナイフ": { + "ja": "[4凸]ダマスカスナイフ", "element": "all", "type": "dagger", "skill1": "non", @@ -19563,12 +19563,12 @@ "imageURL": "./imgs/1040106600.png", "en": "[4★] Damascus Knife" }, - "ゲイボルグ・属性変更": { - "ja": "ゲイボルグ・属性変更", + "ゲイボルグ": { + "ja": "ゲイボルグ", "element": "all", "type": "spear", - "skill1": "non", - "skill2": "non", + "skill1": "victorys_promise", + "skill2": "one_sting_one_kill", "element2": "all", "skill3": "non", "element3": "all", @@ -19582,12 +19582,12 @@ "imageURL": "./imgs/1040205500.png", "en": "Gae Bulg" }, - "[4凸]ゲイボルグ・属性変更": { - "ja": "[4凸]ゲイボルグ・属性変更", + "[4凸]ゲイボルグ": { + "ja": "[4凸]ゲイボルグ", "element": "all", "type": "spear", - "skill1": "non", - "skill2": "non", + "skill1": "victorys_promise", + "skill2": "one_sting_one_killII", "element2": "all", "skill3": "non", "element3": "all", @@ -19603,12 +19603,12 @@ "imageURL": "./imgs/1040205500.png", "en": "[4★] Gae Bulg" }, - "ミョルニル・属性変更": { - "ja": "ミョルニル・属性変更", + "ミョルニル": { + "ja": "ミョルニル", "element": "all", "type": "axe", "skill1": "normalL", - "skill2": "non", + "skill2": "god_of_war", "element2": "all", "skill3": "non", "element3": "all", @@ -19622,12 +19622,12 @@ "imageURL": "./imgs/1040304400.png", "en": "Mjolnir" }, - "[4凸]ミョルニル・属性変更": { - "ja": "[4凸]ミョルニル・属性変更", + "[4凸]ミョルニル": { + "ja": "[4凸]ミョルニル", "element": "all", "type": "axe", "skill1": "normalL", - "skill2": "non", + "skill2": "god_of_warII", "element2": "all", "skill3": "non", "element3": "all", @@ -19643,8 +19643,8 @@ "imageURL": "./imgs/1040304400.png", "en": "[4★] Mjolnir" }, - "カドゥケウス・属性変更": { - "ja": "カドゥケウス・属性変更", + "カドゥケウス": { + "ja": "カドゥケウス", "element": "all", "type": "wand", "skill1": "normalKamui", @@ -19662,8 +19662,8 @@ "imageURL": "./imgs/1040406900.png", "en": "Caduceus" }, - "[4凸]カドゥケウス・属性変更": { - "ja": "[4凸]カドゥケウス・属性変更", + "[4凸]カドゥケウス": { + "ja": "[4凸]カドゥケウス", "element": "all", "type": "wand", "skill1": "normalKamui", @@ -19683,8 +19683,8 @@ "imageURL": "./imgs/1040406900.png", "en": "[4★] Caduceus" }, - "フライクーゲル・属性変更": { - "ja": "フライクーゲル・属性変更", + "フライクーゲル": { + "ja": "フライクーゲル", "element": "all", "type": "gun", "skill1": "normalBoukunL", @@ -19702,8 +19702,8 @@ "imageURL": "./imgs/1040504400.png", "en": "Freikugel" }, - "[4凸]フライクーゲル・属性変更": { - "ja": "[4凸]フライクーゲル・属性変更", + "[4凸]フライクーゲル": { + "ja": "[4凸]フライクーゲル", "element": "all", "type": "gun", "skill1": "normalBoukunL", @@ -19723,12 +19723,12 @@ "imageURL": "./imgs/1040504400.png", "en": "[4★] Freikugel" }, - "方天画戟・属性変更": { - "ja": "方天画戟・属性変更", + "方天画戟": { + "ja": "方天画戟", "element": "all", "type": "fist", "skill1": "non", - "skill2": "non", + "skill2": "apocalyptic_power", "element2": "all", "skill3": "non", "element3": "all", @@ -19742,12 +19742,12 @@ "imageURL": "./imgs/1040604500.png", "en": "Sky Piercer" }, - "[4凸]方天画戟・属性変更": { - "ja": "[4凸]方天画戟・属性変更", + "[4凸]方天画戟": { + "ja": "[4凸]方天画戟", "element": "all", "type": "fist", "skill1": "non", - "skill2": "non", + "skill2": "apocalyptic_powerII", "element2": "all", "skill3": "non", "element3": "all", @@ -19763,8 +19763,8 @@ "imageURL": "./imgs/1040604500.png", "en": "[4★] Sky Piercer" }, - "ヘラクレス・属性変更": { - "ja": "ヘラクレス・属性変更", + "ヘラクレス": { + "ja": "ヘラクレス", "element": "all", "type": "bow", "skill1": "normalKatsumiM", @@ -19782,8 +19782,8 @@ "imageURL": "./imgs/1040703600.png", "en": "Hercules" }, - "[4凸]ヘラクレス・属性変更": { - "ja": "[4凸]ヘラクレス・属性変更", + "[4凸]ヘラクレス": { + "ja": "[4凸]ヘラクレス", "element": "all", "type": "bow", "skill1": "normalKatsumiM", @@ -19803,8 +19803,8 @@ "imageURL": "./imgs/1040703600.png", "en": "[4★] Hercules" }, - "ウルリクムミ・属性変更": { - "ja": "ウルリクムミ・属性変更", + "ウルリクムミ": { + "ja": "ウルリクムミ", "element": "all", "type": "music", "skill1": "normalKatsumokuS", @@ -19822,8 +19822,8 @@ "imageURL": "./imgs/1040803700.png", "en": "Ullikummi" }, - "[4凸]ウルリクムミ・属性変更": { - "ja": "[4凸]ウルリクムミ・属性変更", + "[4凸]ウルリクムミ": { + "ja": "[4凸]ウルリクムミ", "element": "all", "type": "music", "skill1": "normalKatsumokuS", @@ -19843,12 +19843,12 @@ "imageURL": "./imgs/1040803700.png", "en": "[4★] Ullikummi" }, - "天羽々斬・属性変更": { - "ja": "天羽々斬・属性変更", + "天羽々斬": { + "ja": "天羽々斬", "element": "all", "type": "katana", "skill1": "normalSetsuna", - "skill2": "non", + "skill2": "slaysnakes_myth", "element2": "all", "skill3": "non", "element3": "all", @@ -19862,12 +19862,12 @@ "imageURL": "./imgs/1040904300.png", "en": "Ameno Habakiri" }, - "[4凸]天羽々斬・属性変更": { - "ja": "[4凸]天羽々斬・属性変更", + "[4凸]天羽々斬": { + "ja": "[4凸]天羽々斬", "element": "all", "type": "katana", "skill1": "normalSetsuna", - "skill2": "non", + "skill2": "slaysnakes_mythII", "element2": "all", "skill3": "non", "element3": "all", @@ -26180,4 +26180,4 @@ "imageURL": "./imgs/1039900000.png", "en": "Fury Stone" } -} \ No newline at end of file +} diff --git a/scripts/arm_data_converter.py b/scripts/arm_data_converter.py index 90d6374ce..76b45a3df 100644 --- a/scripts/arm_data_converter.py +++ b/scripts/arm_data_converter.py @@ -1055,6 +1055,20 @@ skillnamelist["normalL"][u"禁忌の悲恋"] = "dark" skillnamelist["normalL"][u"狙撃の極意"] = "water" +# Superlative skills +# Attribute as a temporary all +skillnamelist["rightway_pathfinderII"] = {u"王道を征く者II": "all"} +skillnamelist["rightway_pathfinder"] = {u"王道を征く者": "all"} +skillnamelist["victorys_promise"] = {u"必勝の誓い": "all"} +skillnamelist["one_sting_one_killII"] = {u"一刺一殺II": "all"} +skillnamelist["one_sting_one_kill"] = {u"一刺一殺": "all"} +skillnamelist["god_of_warII"] = {u"戦神の打擲II": "all"} +skillnamelist["god_of_war"] = {u"戦神の打擲": "all"} +skillnamelist["apocalyptic_powerII"] = {u"万物を砕く剛技II": "all"} +skillnamelist["apocalyptic_power"] = {u"万物を砕く剛技": "all"} +skillnamelist["slaysnakes_mythII"] = {u"戮蛇の神刀II": "all"} +skillnamelist["slaysnakes_myth"] = {u"戮蛇の神刀": "all"} + # Other weapons that require adjustment skillnamelist["extendedDjeetaNormalDATA30"] = {u"立体機動戦術": "wind"} skillnamelist["one_night_party"] = {u"ワンナイ・パーリー": "none"} diff --git a/src/global_const.js b/src/global_const.js index c2512ec90..418b69e55 100644 --- a/src/global_const.js +++ b/src/global_const.js @@ -203,7 +203,14 @@ var considerNum = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; var buffLevelList = [ 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, 190, 195, - 200, 205, 210, 215, 220, 225, 230, 235, 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, 290, 295, 300, + 200, 205, 210, 215, 220, 225, 230, 235, 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, 290, 295, + 300, 305, 310, 315, 320, 325, 330, 335, 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, 390, 395, + 400, 405, 410, 415, 420, 425, 430, 435, 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, 490, 495, + 500, 505, 510, 515, 520, 525, 530, 535, 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, 590, 595, + 600, 605, 610, 615, 620, 625, 630, 635, 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, 690, 695, + 700, 705, 710, 715, 720, 725, 730, 735, 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, 790, 795, + 800, 805, 810, 815, 820, 825, 830, 835, 840, 845, 850, 855, 860, 865, 870, 875, 880, 885, 890, 895, + 900, 905, 910, 915, 920, 925, 930, 935, 940, 945, 950, 955, 960, 965, 970, 975, 980, 985, 990, 995, 1000, -5, -10, -15, -20, -25, -30, -35, -40, -45, -50, -55, -60, -65, -70, -75, -80, -85, -90, -95, -100 ]; var ougiGageUpOugiBuffLevelList = [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95,]; @@ -1030,20 +1037,34 @@ var skilltypes = { "downfall_of_ignorance": {name: "弓キャラの攻撃力とHP上昇(中)", type: "downfall_of_ignorance", amount: "M"}, "succession_of_knighthood": {name: "剣キャラの攻撃力とTA上昇(小)", type: "succession_of_knighthood", amount: "S"}, "shinTenNoInori": {name: "味方の属性攻撃力10%UP(累積/最大5回)", type: "shinTenNoInori", amount: 10.0}, - "kaijinnoyogen": {name: "装備している「杖」の数が多いほど最大HP上昇", type: "wandCountHP", amount: 2.0} + "kaijinnoyogen": {name: "装備している「杖」の数が多いほど最大HP上昇", type: "wandCountHP", amount: 2.0}, + "rightway_pathfinder": {name: "王道を征く者", type: "rightway_pathfinder", amount: "I"}, + "rightway_pathfinderII": {name: "王道を征く者II", type: "rightway_pathfinder", amount: "II"}, + "victorys_promise": {name: "必勝の誓い", type: "victorys_promise", amount: 10.0}, + "one_sting_one_kill": {name: "一刺一殺", type: "one_sting_one_kill", amount: "I"}, + "one_sting_one_killII": {name: "一刺一殺II", type: "one_sting_one_kill", amount: "II"}, + "god_of_war": {name: "戦神の打擲", type: "god_of_war", amount: "I"}, + "god_of_warII": {name: "戦神の打擲II", type: "god_of_war", amount: "II"}, + "apocalyptic_power": {name: "万物を砕く剛技", type: "apocalyptic_power", amount: "I"}, + "apocalyptic_powerII": {name: "万物を砕く剛技II", type: "apocalyptic_power", amount: "II"}, + "slaysnakes_myth": {name: "戮蛇の神刀", type: "slaysnakes_myth", amount: "I"}, + "slaysnakes_mythII": {name: "戮蛇の神刀II", type: "slaysnakes_myth", amount: "II"}, }; // additional selection when template is selected module.exports.skillDetails = { 'victorious-covenant': 'victorious_calamitous_covenant', 'calamitous-covenant': 'victorious_calamitous_covenant', - 'shinTenNoInori': 'shinTenNoInori' + 'shinTenNoInori': 'shinTenNoInori', + 'slaysnakes_myth': 'slaysnakes_myth', + 'slaysnakes_mythII': 'slaysnakes_myth', }; var skillDetailsDescription = { 'victorious-covenant': 'ジータバフの数', 'calamitous-covenant': '敵の弱体効果', 'shinTenNoInori': '累積の数', + 'slaysnakes_myth': '累積の数', }; var victorious_calamitous_covenant = { @@ -1067,6 +1088,14 @@ var shinTenNoInori = { "4": 4, "5": 5, }; +var slaysnakes_myth = { + "0": 0, + "1": 1, + "2": 2, + "3": 3, + "4": 4, + "5": 5, +}; var sishoSeiryu = { "non": {name: "無し", type: "non", amount: "non"}, @@ -2800,7 +2829,77 @@ module.exports.additionalSelectList = { selectKeys: ["skill2Detail"], selectors: ["shinTenNoInori"], defaultKeys: ["0"], - } + }, + "エクスカリバー": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "ゲイボルグ": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch_all", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "ダマスカスナイフ": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch_all", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "カドゥケウス": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "ミョルニル": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "フライクーゲル": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "方天画戟": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch_all", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "ヘラクレス": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "ウルリクムミ": { + selectKeysNotation: "", + notationText: "", + selectKeys: ["main_weapon_switch", "elements"], + selectors: ["mainWeapon", "elements"], + defaultKeys: [0, "light"], + }, + "天羽々斬": { + selectKeysNotation: skillDetailsDescription["slaysnakes_myth"], + notationText: "", + selectKeys: ["main_weapon_switch", "elements", "skill2Detail"], + selectors: ["mainWeapon", "elements", "slaysnakes_myth"], + defaultKeys: [0, "light", "0"], + }, }; @@ -2962,6 +3061,16 @@ module.exports.selector.zh.shinTenNoInori = Object.keys(shinTenNoInori).map(func return ; }); +module.exports.selector.ja.slaysnakes_myth = Object.keys(slaysnakes_myth).map(function (key) { + return ; +}); +module.exports.selector.en.slaysnakes_myth = Object.keys(slaysnakes_myth).map(function (key) { + return ; +}); +module.exports.selector.zh.slaysnakes_myth = Object.keys(slaysnakes_myth).map(function (key) { + return ; +}); + // オメガウェポンテンプレート用セレクタ module.exports.selector.ja.omegaWeaponSkill1 = Object.keys(omegaWeaponSkill1).map(function (key) { return ; diff --git a/src/global_logic.js b/src/global_logic.js index e63d66cdf..ff6abf63d 100644 --- a/src/global_logic.js +++ b/src/global_logic.js @@ -550,7 +550,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { elementCoeff += totals[key]["opusnormalElement"] * totalSummon["zeus"]; elementCoeff += totals[key]["opusmagnaElement"] * totalSummon["magna"]; elementCoeff += Math.min(totals[key]["normalElement"] * totalSummon["zeus"], 0.75); - elementCoeff += 0.01 * totals[key]["shinTenNoInori"][0] * totals[key]["shinTenNoInori"][1]; //[0]: amount. [1]: stacks number + elementCoeff += 0.01 * totals[key]["shinTenNoInori"]; elementCoeff += 0.01 * totals[key]["LB"].Element; if (key == "Djeeta") { @@ -567,6 +567,11 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { otherEternal += 0.10; } otherCoeff *= otherEternal; + if (key == "Djeeta") { + // Verified by weapon users, not by wiki + otherCoeff *= 1.0 + (0.01 * totals[key]["slaysnakes_myth"]); + otherCoeff *= 1.0 + (0.01 * totals[key]["victorys_promise"]); + } otherCoeff *= prof.retsujitsuNoRakuen ? 1.20 : 1; otherCoeff *= prof.shiToAiNoSekai ? 1.20 : 1; @@ -647,6 +652,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { if (key == "Djeeta") { totalTA += buff["masterTA"]; totalTA += buff["zenithTA"]; + totalTA += 0.01 * totals[key]["superTA"]; } // Fit 0% < TA < 100% @@ -666,7 +672,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { damageUP += 0.01 * totalSummon["tenshiDamageUP"]; damageUPOnlyNormalDamage += totals[key]["damageUPOnlyNormalBuff"] + buff["damageUPOnlyNormal"]; } - + var criticalArray = {}; var criticalRatio = 1.0; if (totals[key]["typeBonus"] == 1.5 @@ -705,7 +711,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { var uplift = 100 * (buff["uplift"] + totals[key]["uplift"]); var ougiGageBuff = buff["ougiGage"] + totals[key]["ougiGageBuff"] + (0.01 * totals[key]["LB"]["OugiGageBuff"]) - totals[key]["ougiDebuff"]; const gainOugiGage = totals[key]["gainOugiGage"]; - + var expectedOugiGage = Math.ceil(uplift * ougiGageBuff); expectedOugiGage += (taRate * Math.ceil(37.0 * ougiGageBuff) + (1.0 - taRate) * (daRate * Math.ceil(22.0 * ougiGageBuff) + (1.0 - daRate) * Math.ceil(10.0 * ougiGageBuff))); expectedOugiGage += Math.ceil(gainOugiGage * ougiGageBuff); @@ -726,6 +732,9 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { additionalDamage += totals[key]["additionalDamageBuff"]; additionalDamage += buff["additionalDamage"]; additionalDamage += prof.shiToAiNoSekai ? 0.30 : 0; + if (key == "Djeeta") { + additionalDamage += totals[key]["superAdditionalDamage"]; + } if (this.sum(totals[key]["additionalDamageXA"]) > 0) { //additionalDamage based on attacks per turn (sturm support ability-like) let [saDamage, daDamage, taDamage] = totals[key]["additionalDamageXA"]; @@ -784,6 +793,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { if (key == "Djeeta") { ougiDamageExceptSkill += buff["zenithOugiDamage"]; + ougiDamageExceptSkill += totals[key]["superOugiDamage"]; } var ougiDamageUP = (1.0 + ougiDamageSkill) * (1.0 + ougiDamageExceptSkill) - 1.0; @@ -820,7 +830,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { ougiDamageLimitValues = _initLimitValues(1.0 + criticalOugiDamageLimit, totals[key]["ougiLimitValues"]); ougiDamageLimitValuesWithoutCritical = _initLimitValues(1.0 + ougiDamageLimit, totals[key]["ougiLimitValues"]); } - + const _addShivaLimitUp = (values) => values.map(([threshold, ratio]) => [threshold+500000, ratio]); if (totalSummon["shivaBuff"]) { normalDamageLimitValues = _initLimitValues(1.0 + criticalDamageLimit, BASE_LIMIT_VALUES.shivaNormalDamage); @@ -843,6 +853,12 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSkillCoeff, criticalRatio, prof.enemyDefense, prof.defenseDebuff, enemyResistance, totals[key]["ougiRatio"], ougiDamageUP, damageUP, ougiFixedDamage, totals[key]["ougiBonusPlainDamage"], ougiDamageLimitValues); + // Accuracy calculation + var accuracy = 1.0; + accuracy -= totals[key]["accuracyDebuff"]; + damage *= accuracy; + damageWithoutCritical *= accuracy; + var chainBurstSupplemental = 0; //Supplemental Damage is a "static" damage that is added after damage cap/defense/etc is calculated. var supplementalDamageArray = {}; @@ -992,6 +1008,8 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) { coeffs["bahaTA"] = armTAupBaha; coeffs["otherTA"] = (buff["ta"] + totals[key]["TABuff"] + totalSummon["ta"]) * 100 + armTAupOther; + coeffs["accuracyDebuff"] = 1.0 + totals[key]["accuracyDebuff"]; + res[key] = { totalAttack: Math.ceil(totalAttack), displayAttack: Math.ceil(summedAttack), @@ -2132,9 +2150,57 @@ module.exports.addSkilldataToTotals = function (totals, comb, arml, buff) { var turns2max = 0.10 / skillAmounts["elementATK"][amount][slv - 1]; totals[key][stype] += comb[i] * turns2max * skillAmounts["elementATK"][amount][slv - 1]; } else if (stype == 'shinTenNoInori') { - totals[key][stype] = [amount, Math.max(totals[key][stype][1], arm[skillkey + "Detail"])]; + totals[key][stype] = Math.max(totals[key][stype], amount * arm[skillkey + "Detail"]); } else if (stype == 'echoThirdHit') { totals[key][stype] = Math.min(0.20, amount); + } else if (stype == 'rightway_pathfinder') { + if (key == 'Djeeta') { + totals[key]["superOugiDamage"] += totals[key]["remainHP"] * 2; + if (amount == "II") { + totals[key]["exceedOugiDamageLimit"] += 0.25; + } + } + } else if (stype == 'victorys_promise') { + if (key == 'Djeeta') { + totals[key][stype] = Math.max(totals[key][stype], amount * 20); // TODO: replace 20 when #342 is merged + } + } else if (stype == 'one_sting_one_kill') { + if (key == 'Djeeta') { + totals[key]["normalOtherCritical"].push({ + "value": 0.05, + "attackRatio": 9.00 + }); + if (amount == "II") { + totals[key]["criticalDamageLimit"] += 0.30; + } + } + } else if (stype == 'god_of_war') { + if (key == 'Djeeta') { + totals[key]["normalOtherCritical"].push({ + "value": 1.0, + "attackRatio": 5.00 + }); + totals[key]["accuracyDebuff"] += 0.50; + if (amount == "II") { + totals[key]["criticalDamageLimit"] += 0.30; + } + } + } else if (stype == 'apocalyptic_power') { + if (key == 'Djeeta') { + totals[key]["superTA"] += 1000.0; + if (amount == "II") { + totals[key]["superAdditionalDamage"] += 0.30; + } + } + } else if (stype == 'slaysnakes_myth') { + if (key == 'Djeeta') { + // Verified by weapon users, not by wiki + totals[key][stype] = Math.max(totals[key][stype], 10.0 * arm[skillkey + "Detail"]); + if (amount == "II") { + totals[key]["normalDamageLimit"] += 0.10; + totals[key]["exceedOugiDamageLimit"] += 0.10; + } + } } else { totals[key][stype] += comb[i] * skillAmounts[stype][amount][slv - 1]; } @@ -2356,6 +2422,7 @@ module.exports.getInitialTotals = function (prof, chara, summon) { normalOtherNite: 0, normalOtherSante: 0, normalOtherLesserSante: 0, + superTA: 0, normalCritical: 0, normalOtherCritical: [], magnaCritical: 0, @@ -2368,9 +2435,12 @@ module.exports.getInitialTotals = function (prof, chara, summon) { opusnormalElement: 0, opusmagnaElement: 0, normalElement: 0, - shinTenNoInori: [0, 0], + shinTenNoInori: 0, + slaysnakes_myth: 0, + victorys_promise: 0, normalOugiDamage: 0, magnaOugiDamage: 0, + superOugiDamage: 0, chainDamage: 0, normalChainDamage: 0, normalDamageLimit: 0, @@ -2387,6 +2457,7 @@ module.exports.getInitialTotals = function (prof, chara, summon) { normalChainDamageLimit: 0, additionalDamage: 0, additionalDamageXA: [0, 0, 0], + superAdditionalDamage: 0, ougiDebuff: 0, isConsideredInAverage: true, job: job, @@ -2432,6 +2503,7 @@ module.exports.getInitialTotals = function (prof, chara, summon) { buffCount: 0, echoThirdHit: 0, //debuffCount: 0, + accuracyDebuff: 0, } }; @@ -2536,6 +2608,7 @@ module.exports.getInitialTotals = function (prof, chara, summon) { normalOtherNite: 0, normalOtherSante: 0, normalOtherLesserSante: 0, + superTA: 0, normalCritical: 0, normalOtherCritical: [], magnaCritical: 0, @@ -2548,10 +2621,13 @@ module.exports.getInitialTotals = function (prof, chara, summon) { opusnormalElement: 0, opusmagnaElement: 0, normalElement: 0, - shinTenNoInori: [0, 0], + shinTenNoInori: 0, + slaysnakes_myth: 0, + victorys_promise: 0, chainDamage: 0, normalOugiDamage: 0, magnaOugiDamage: 0, + superOugiDamage: 0, normalChainDamage: 0, normalDamageLimit: 0, cosmosNormalDamageLimit: 0, @@ -2567,6 +2643,7 @@ module.exports.getInitialTotals = function (prof, chara, summon) { normalChainDamageLimit: 0, additionalDamage: 0, additionalDamageXA: [0, 0, 0], + superAdditionalDamage: 0, ougiDebuff: 0, isConsideredInAverage: charaConsidered, normalBuff: charaBuffList["normalBuff"], @@ -2608,9 +2685,10 @@ module.exports.getInitialTotals = function (prof, chara, summon) { supplementalDamageBuff: 100 * charaBuffList['supplementalDamageBuff'], supplementalThirdHit: [], covenant: null, - echoThirdHit: 0 + echoThirdHit: 0, //buffCount: 0, //debuffCount: 0, + accuracyDebuff: 0, }; } } @@ -3179,6 +3257,9 @@ module.exports.generateHaisuiData = function (res, arml, summon, prof, chara, st var newTotalExpected = newTotalAttack * onedata[key].criticalRatio * onedata[key].expectedAttack; var newDamage = module.exports.calcDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].skilldata.additionalDamage, onedata[key].skilldata.damageUP + onedata[key].skilldata.damageUPOnlyNormalDamage, onedata[key].normalDamageLimitValues) + var accuracy = 1.0; + accuracy -= (onedata[key].skilldata.accuracyDebuff - 1.0); + newDamage *= accuracy; var newOugiDamage = module.exports.calcOugiDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].ougiRatio, onedata[key].skilldata.ougiDamageUP, onedata[key].skilldata.damageUP, onedata[key].ougiFixedDamage, onedata[key].ougiBonusPlainDamage, onedata[key].ougiDamageLimitValues) var chainBurstSupplemental = 0; @@ -3443,6 +3524,9 @@ module.exports.generateSimulationData = function (res, turnBuff, arml, summon, p } else { // Regular attack var newDamage = module.exports.calcDamage(onedata[key].displayAttack, onedata[key].totalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].skilldata.additionalDamage, onedata[key].skilldata.damageUP + onedata[key].skilldata.damageUPOnlyNormalDamage, onedata[key].normalDamageLimitValues); + var accuracy = 1.0; + accuracy -= (onedata[key].skilldata.accuracyDebuff - 1.0); + newDamage *= accuracy; if (key == "Djeeta") { ExpectedDamage[t].push(parseInt(newDamage * onedata[key].expectedAttack)); AverageExpectedDamage[t][j + 1] += parseInt(onedata[key].expectedAttack * newDamage / cnt) diff --git a/src/result.js b/src/result.js index b088e6bb2..c30bf734c 100644 --- a/src/result.js +++ b/src/result.js @@ -1290,20 +1290,21 @@ var Result = CreateClass({ }; pushSkillInfoElement1("normal", "通常攻刃", "danger"); - pushSkillInfoElement1("normalHaisui", "通常背水", "light"); - pushSkillInfoElement1("normalKonshin", "通常渾身", "success"); - pushSkillInfoElement1("element", "属性", "primary"); + pushSkillInfoElement1("normalHaisui", "通常背水", "dark"); + pushSkillInfoElement1("normalKonshin", "通常渾身", "light"); + pushSkillInfoElement1("element", "属性", "default"); pushSkillInfoElement1("magna", "マグナ", "primary"); - pushSkillInfoElement1("magnaHaisui", "マグナ背水", "light"); - pushSkillInfoElement1("magnaKonshin", "マグナ渾身", "success"); - pushSkillInfoElement1("ex", "EX", "primary"); - pushSkillInfoElement1("exHaisui", "EX背水", "light"); - pushSkillInfoElement1("charaHaisui", "キャラ背水", "light"); - pushSkillInfoElement1("LBHaisui", "LB背水ラベル", "light"); + pushSkillInfoElement1("magnaHaisui", "マグナ背水", "dark"); + pushSkillInfoElement1("magnaKonshin", "マグナ渾身", "light"); + pushSkillInfoElement1("ex", "EX", "warning"); + pushSkillInfoElement1("exHaisui", "EX背水", "dark"); + pushSkillInfoElement1("charaHaisui", "キャラ背水", "dark"); + pushSkillInfoElement1("LBHaisui", "LB背水ラベル", "dark"); pushSkillInfoElement1("LBKonshin", "LB渾身ラベル", "light"); pushSkillInfoElement1("hpRatio", "HP増加", "success"); pushSkillInfoElement1("other", "その他バフ", "primary"); - pushSkillInfoElement1("ATKDebuff", "攻撃力減少(特殊)", "primary"); + pushSkillInfoElement1("ATKDebuff", "攻撃力減少(特殊)", "danger"); + pushSkillInfoElement1("accuracyDebuff", "攻撃命中率減少(特殊)", "dark"); var multipleAttackSkillInfo = []; // For batting skill @@ -1322,15 +1323,15 @@ var Result = CreateClass({ }; pushSkillInfoElement2("normalDA", "DA上昇(通常)", "danger"); - pushSkillInfoElement2("magnaDA", "DA上昇(マグナ)", "danger"); - pushSkillInfoElement2("exDA", "DA上昇(EX)", "danger"); - pushSkillInfoElement2("bahaDA", "DA上昇(バハ)", "danger"); - pushSkillInfoElement2("cosmosDA", "DA上昇(コスモス)", "danger"); - pushSkillInfoElement2("otherDA", "DA上昇(その他)", "danger"); + pushSkillInfoElement2("magnaDA", "DA上昇(マグナ)", "primary"); + pushSkillInfoElement2("exDA", "DA上昇(EX)", "default"); + pushSkillInfoElement2("bahaDA", "DA上昇(バハ)", "dark"); + pushSkillInfoElement2("cosmosDA", "DA上昇(コスモス)", "light"); + pushSkillInfoElement2("otherDA", "DA上昇(その他)", "default"); pushSkillInfoElement2("normalTA", "TA上昇(通常)", "danger"); - pushSkillInfoElement2("magnaTA", "TA上昇(マグナ)", "danger"); - pushSkillInfoElement2("bahaTA", "TA上昇(バハ)", "danger"); - pushSkillInfoElement2("otherTA", "TA上昇(その他)", "danger"); + pushSkillInfoElement2("magnaTA", "TA上昇(マグナ)", "primary"); + pushSkillInfoElement2("bahaTA", "TA上昇(バハ)", "dark"); + pushSkillInfoElement2("otherTA", "TA上昇(その他)", "default"); var criticalInfo = []; if (Object.keys(skilldata.criticalArray).length > 0) { @@ -1435,15 +1436,15 @@ var Result = CreateClass({ ); } }; - pushSkillInfoElement3("ougiGageBuff", "奥義ゲージ上昇量", "default"); - pushSkillInfoElement3("additionalDamage", "追加ダメージ", "default"); - pushSkillInfoElement3("damageUP", "与ダメージUP", "default"); - pushSkillInfoElement3("damageUPOnlyNormalDamage", "与ダメージUP(通常攻撃のみ)", "default"); - pushSkillInfoElement3("damageLimit", "ダメージ上限アップ", "default"); - pushSkillInfoElement3("ougiDamageLimit", "奥義ダメージ上限アップ", "default"); - pushSkillInfoElement3("ougiDamageUP", "奥義ダメージアップ", "default"); - pushSkillInfoElement3("chainDamageLimit", "チェインダメージ上限アップ", "default"); - pushSkillInfoElement3("chainDamageUP", "チェインダメージアップ", "default"); + pushSkillInfoElement3("additionalDamage", "追加ダメージ", "primary"); + pushSkillInfoElement3("damageUP", "与ダメージUP", "danger"); + pushSkillInfoElement3("damageUPOnlyNormalDamage", "与ダメージUP(通常攻撃のみ)", "danger"); + pushSkillInfoElement3("damageLimit", "ダメージ上限アップ", "danger"); + pushSkillInfoElement3("ougiDamageUP", "奥義ダメージアップ", "warning"); + pushSkillInfoElement3("ougiDamageLimit", "奥義ダメージ上限アップ", "warning"); + pushSkillInfoElement3("chainDamageUP", "チェインダメージアップ", "succes"); + pushSkillInfoElement3("chainDamageLimit", "チェインダメージ上限アップ", "succes"); + pushSkillInfoElement3("ougiGageBuff", "奥義ゲージ上昇量", "warning"); if (skilldata["criticalDamageLimit"] != 0) { otherSkillInfo.push( @@ -1469,7 +1470,7 @@ var Result = CreateClass({ }; pushOugiInfo("ougiRatio", "奥義倍率", "warning"); pushOugiInfo("ougiFixedDamage", "奥義固定ダメージ", "warning"); - pushOugiInfo("ougiBonusPlainDamage", "奥義追加ダメージ(無属性固定)", "warning"); + pushOugiInfo("ougiBonusPlainDamage", "奥義追加ダメージ(無属性固定)", "default"); charaDetail[key].push(
{mainSkillInfo}
); charaDetail[key].push(
{multipleAttackSkillInfo}
); diff --git a/src/template.js b/src/template.js index c37ca2538..94c5656cc 100644 --- a/src/template.js +++ b/src/template.js @@ -428,11 +428,18 @@ var RegisteredArm = CreateClass({ arm["skill3"] = "non"; } } else if (additionalKeys === "main_weapon_switch") { - // The skill that turns on the effect at the time of main equipment is placed second + // The skill that turns off the effect at the time of main equipment is placed second and third if (!this.state.main_weapon_switch) { arm["skill2"] = "non"; arm["skill3"] = "non"; } + } else if (additionalKeys === "main_weapon_switch_all") { + // The skill that turns off the effect at the time of main equipment is placed first, second and third + if (!this.state.main_weapon_switch_all) { + arm["skill1"] = "non"; + arm["skill2"] = "non"; + arm["skill3"] = "non"; + } } else if (additionalKeys === "skill1Detail") { arm["skill1Detail"] = this.state.skill1Detail; } else if (additionalKeys === "skill2Detail") { diff --git a/src/translate.js b/src/translate.js index 2bfbf4db8..9f2cd7a9b 100644 --- a/src/translate.js +++ b/src/translate.js @@ -1634,7 +1634,7 @@ var multiLangData = { "zh": "HP增加", }, "通常攻刃": { - "en": "Normal Might", + "en": "Normal", "ja": "通常攻刃", "zh": "通常攻刃", }, @@ -1693,6 +1693,11 @@ var multiLangData = { "ja": "攻撃力減少(特殊)", "zh": "攻击力減少(特殊)", }, + "攻撃命中率減少(特殊)": { + "en": "Accuracy Debuff (Special)", + "ja": "攻撃命中率減少(特殊)", + "zh": "攻击命中率減少(特殊)", + }, "DA上昇(通常)": { "en": "DA Up (Normal)", "ja": "DA上昇(通常)", @@ -3732,6 +3737,61 @@ var multiLangData = { "ja": "天司の祝福III", "zh": "天司的祝福III", }, + "王道を征く者": { + "en": "Rightway Pathfinder", + "ja": "王道を征く者", + "zh": "王道を征く者", + }, + "王道を征く者II": { + "en": "Rightway Pathfinder II", + "ja": "王道を征く者II", + "zh": "王道を征く者II", + }, + "必勝の誓い": { + "en": "Victory's Promise (Maximum time)", + "ja": "必勝の誓い(最大時)", + "zh": "必勝の誓い(最大時)", + }, + "一刺一殺": { + "en": "One Sting, One Kill", + "ja": "一刺一殺", + "zh": "一刺一殺", + }, + "一刺一殺II": { + "en": "One Sting, One Kill II", + "ja": "一刺一殺II", + "zh": "一刺一殺II", + }, + "戦神の打擲": { + "en": "God of War", + "ja": "戦神の打擲", + "zh": "戦神の打擲", + }, + "戦神の打擲II": { + "en": "God of War II", + "ja": "戦神の打擲II", + "zh": "戦神の打擲II", + }, + "万物を砕く剛技": { + "en": "Apocalyptic Power", + "ja": "万物を砕く剛技", + "zh": "万物を砕く剛技", + }, + "万物を砕く剛技II": { + "en": "Apocalyptic Power II", + "ja": "万物を砕く剛技II", + "zh": "万物を砕く剛技II", + }, + "戮蛇の神刀": { + "en": "Slaysnake's Myth", + "ja": "戮蛇の神刀", + "zh": "戮蛇の神刀", + }, + "戮蛇の神刀II": { + "en": "Slaysnake's Myth II", + "ja": "戮蛇の神刀II", + "zh": "戮蛇の神刀II", + }, "エピックブランド・ゲイン": { "en": "Grand Epic", "ja": "エピックブランド・ゲイン", diff --git a/txt_source/arm-translation.json b/txt_source/arm-translation.json index 7526329f4..f871870e3 100644 --- a/txt_source/arm-translation.json +++ b/txt_source/arm-translation.json @@ -984,26 +984,26 @@ "ガンバンテイン": "Gambanteinn", "ベネディーア": "Benedia", "緋舞扇": "Scarlet Vane", - "[4凸]エクスカリバー・属性変更": "[4★] Excalibur", - "エクスカリバー・属性変更": "Excalibur", - "[4凸]ダマスカスナイフ・属性変更": "[4★] Damascus Knife", - "ダマスカスナイフ・属性変更": "Damascus Knife", - "[4凸]ゲイボルグ・属性変更": "[4★] Gae Bulg", - "ゲイボルグ・属性変更": "Gae Bulg", - "[4凸]ミョルニル・属性変更": "[4★] Mjolnir", - "ミョルニル・属性変更": "Mjolnir", - "[4凸]カドゥケウス・属性変更": "[4★] Caduceus", - "カドゥケウス・属性変更": "Caduceus", - "[4凸]フライクーゲル・属性変更": "[4★] Freikugel", - "フライクーゲル・属性変更": "Freikugel", - "[4凸]方天画戟・属性変更": "[4★] Sky Piercer", - "方天画戟・属性変更": "Sky Piercer", - "[4凸]ヘラクレス・属性変更": "[4★] Hercules", - "ヘラクレス・属性変更": "Hercules", - "[4凸]ウルリクムミ・属性変更": "[4★] Ullikummi", - "ウルリクムミ・属性変更": "Ullikummi", - "[4凸]天羽々斬・属性変更": "[4★] Ameno Habakiri", - "天羽々斬・属性変更": "Ameno Habakiri", + "[4凸]エクスカリバー": "[4★] Excalibur", + "エクスカリバー": "Excalibur", + "[4凸]ダマスカスナイフ": "[4★] Damascus Knife", + "ダマスカスナイフ": "Damascus Knife", + "[4凸]ゲイボルグ": "[4★] Gae Bulg", + "ゲイボルグ": "Gae Bulg", + "[4凸]ミョルニル": "[4★] Mjolnir", + "ミョルニル": "Mjolnir", + "[4凸]カドゥケウス": "[4★] Caduceus", + "カドゥケウス": "Caduceus", + "[4凸]フライクーゲル": "[4★] Freikugel", + "フライクーゲル": "Freikugel", + "[4凸]方天画戟": "[4★] Sky Piercer", + "方天画戟": "Sky Piercer", + "[4凸]ヘラクレス": "[4★] Hercules", + "ヘラクレス": "Hercules", + "[4凸]ウルリクムミ": "[4★] Ullikummi", + "ウルリクムミ": "Ullikummi", + "[4凸]天羽々斬": "[4★] Ameno Habakiri", + "天羽々斬": "Ameno Habakiri", "ピンクグリモワール": "Pink Magazine", "リサウンドワンド": "Resonating Wand", "メロビィ": "Vyrnstrument", diff --git a/txt_source/armData-ssr.txt b/txt_source/armData-ssr.txt index 14d7f5e92..a275c6e1b 100644 --- a/txt_source/armData-ssr.txt +++ b/txt_source/armData-ssr.txt @@ -978,23 +978,23 @@ |&attachref(img/1040911400.png,15%);|黒竜のアギト|&color(#ff0000){火};|刀|10|[[黒焔牙>武器奥義#kokuenga]]|[[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[火の秘奥>スキル一覧#hinohioku]]|30|455|180|2707|[[ジークフリート(火属性ver) (SSR)>ジークフリート (SSR)火属性バージョン]]加入|レジェンドガチャ|| |&attachref(img/1040911600.png,15%);|数珠丸|&color(#800080){闇};|刀|10|[[桜花爛漫>武器奥義#oukaranman]]|[[奈落の秘奥>スキル一覧#narakunohioku]]|[[先制の闇刃>スキル一覧#senseinoyamiba]]|28|465|180|2710|[[コウ (SSR)]]加入|レジェンドガチャ|| |&attachref(img/1040911700.png,15%);|清めと祓いの刃|&color(#993300){土};|刀|10|[[瀑布大一閃>武器奥義#bakuhu]]|[[地裂の攻刃>スキル一覧#tiretunokoujin]]|[[土の秘奥>スキル一覧#tutinohioku]]|26|475|155|2800|[[ナルメア(クリスマスver) (SSR)]]加入|レジェンドガチャ|| -|&attachref(img/1040007500.png,15%);|エクスカリバー・属性変更|&color(#ff0000){全属性};|剣|50|[[王の剣>武器奥義#ounoturugi]]|&color(#ff0000){火}; [[紅蓮の堅守>スキル一覧#gurennokensyu]]|[[王道を征く者>スキル一覧#oudouwoyukumono]]|41|475|244|2848|100|ムーン交換| -|&attachref(img/1040007500.png,15%);|[4凸]エクスカリバー・属性変更|&color(#ff0000){全属性};|剣|50|[[王の剣>武器奥義#ounoturugi]]|&color(#ff0000){火}; [[紅蓮の堅守>スキル一覧#gurennokensyu]]|[[王道を征く者>スキル一覧#oudouwoyukumono]]|41|475|280|3320|100|ムーン交換|○|244|2848| -|&attachref(img/1040106600.png,15%);|ダマスカスナイフ・属性変更|&color(#ff0000){全属性};|短剣|50|[[失伝の刃>武器奥義#situdennoyaiba]]|[[仄暗い稼業>スキル一覧#honoguraikagyou]]|[[引き際の心得>スキル一覧#hikigiwanokokoroe]]|41|472|267|2732|100|ムーン交換| -|&attachref(img/1040106600.png,15%);|[4凸]ダマスカスナイフ・属性変更|&color(#ff0000){全属性};|短剣|50|[[失伝の刃>武器奥義#situdennoyaiba]]|[[仄暗い稼業>スキル一覧#honoguraikagyou]]|[[引き際の心得>スキル一覧#hikigiwanokokoroe]]|41|472|560|3230|100|ムーン交換|○|267|2732| -|&attachref(img/1040205500.png,15%);|ゲイボルグ・属性変更|&color(#ff0000){全属性};|槍|50|[[破裂する槍>武器奥義#haretusuruyari]]|[[必勝の誓い>スキル一覧#hissyounotikai]]|[[一刺一殺>スキル一覧#issiissatu]]|45|454|289|2624|100|ムーン交換| -|&attachref(img/1040205500.png,15%);|[4凸]ゲイボルグ・属性変更|&color(#ff0000){全属性};|槍|50|[[破裂する槍>武器奥義#haretusuruyari]]|[[必勝の誓い>スキル一覧#hissyounotikai]]|[[一刺一殺>スキル一覧#issiissatu]]|45|454|340|3060|100|ムーン交換|○|289|2624| -|&attachref(img/1040304400.png,15%);|ミョルニル・属性変更|&color(#ff0000){全属性};|斧|50|[[大雷の槌>武器奥義#dairainotuti]]|&color(#ff0000){火}; [[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[戦神の打擲>スキル一覧#sennshinnno]]|36|497|217|2983|100|ムーン交換| -|&attachref(img/1040304400.png,15%);|[4凸]ミョルニル・属性変更|&color(#ff0000){全属性};|斧|50|[[大雷の槌>武器奥義#dairainotuti]]|&color(#ff0000){火}; [[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[戦神の打擲>スキル一覧#sennshinnno]]|36|497|250|3480|100|ムーン交換|○|217|2983| -|&attachref(img/1040406900.png,15%);|カドゥケウス・属性変更|&color(#ff0000){全属性};|杖|50|[[救いの杖>武器奥義#sukuinotue]]|&color(#ff0000){火}; [[火の神威>スキル一覧#hinosini]]|[[窮地の救い手>スキル一覧#kyuutino]]|54|407|325|2441|100|ムーン交換| -|&attachref(img/1040406900.png,15%);|[4凸]カドゥケウス・属性変更|&color(#ff0000){全属性};|杖|50|[[救いの杖>武器奥義#sukuinotue]]|&color(#ff0000){火}; [[火の神威>スキル一覧#hinosini]]|[[窮地の救い手>スキル一覧#kyuutino]]|54|407|380|2850|100|ムーン交換|○|325|2441| -|&attachref(img/1040504400.png,15%);|フライクーゲル・属性変更|&color(#ff0000){全属性};|銃|50|[[命奪う弾丸>武器奥義#inotiubaudangan]]|&color(#ff0000){火}; [[紅蓮の暴君>スキル一覧#gurennoboukun]]|[[好機到来>スキル一覧#koukitourai]]|34|509|203|3051|100|ムーン交換| -|&attachref(img/1040504400.png,15%);|[4凸]フライクーゲル・属性変更|&color(#ff0000){全属性};|銃|50|[[命奪う弾丸>武器奥義#inotiubaudangan]]|&color(#ff0000){火}; [[紅蓮の暴君>スキル一覧#gurennoboukun]]|[[好機到来>スキル一覧#koukitourai]]|34|509|240|3560|100|ムーン交換|○|203|3051| -|&attachref(img/1040604500.png,15%);|方天画戟・属性変更|&color(#ff0000){全属性};|格闘|50|[[月牙>武器奥義#getuga]]|[[剛技の代償>スキル一覧#gouginodaisyou]]|[[万物を砕く剛技>スキル一覧#bannbutsu]]|43|463|278|2678|100|ムーン交換| -|&attachref(img/1040604500.png,15%);|[4凸]方天画戟・属性変更|&color(#ff0000){全属性};|格闘|50|[[月牙>武器奥義#getuga]]|[[剛技の代償>スキル一覧#gouginodaisyou]]|[[万物を砕く剛技>スキル一覧#bannbutsu]]|43|463|330|3120|100|ムーン交換|○|278|2678| -|&attachref(img/1040703600.png,15%);|ヘラクレス・属性変更|&color(#ff0000){全属性};|弓|50|[[狂気の炎>武器奥義#kyoukinohonoo]]|&color(#ff0000){火}; [[業火の克己>スキル一覧#goukanokokki]]|[[不死をも殺す神弓>スキル一覧#fushiwomo]]|39|492|255|2854|100|ムーン交換| -|&attachref(img/1040703600.png,15%);|[4凸]ヘラクレス・属性変更|&color(#ff0000){全属性};|弓|50|[[狂気の炎>武器奥義#kyoukinohonoo]]|&color(#ff0000){火}; [[業火の克己>スキル一覧#goukanokokki]]|[[不死をも殺す神弓>スキル一覧#fushiwomo]]|39|492|300|3330|100|ムーン交換|○|255|2854| -|&attachref(img/1040803700.png,15%);|ウルリクムミ・属性変更|&color(#ff0000){全属性};|楽器|50|[[巨人の歌>武器奥義#kyojinnouta]]|[[紅蓮の括目>スキル一覧#gurennokatumoku]]|[[流行詩歌>スキル一覧#ryuukousiika]]|76|438|271|2529|100|ムーン交換| -|&attachref(img/1040803700.png,15%);|[4凸]ウルリクムミ・属性変更|&color(#ff0000){全属性};|楽器|50|[[巨人の歌>武器奥義#kyojinnouta]]|[[紅蓮の括目>スキル一覧#gurennokatumoku]]|[[流行詩歌>スキル一覧#ryuukousiika]]|76|438|310|2950|100|ムーン交換|○|271|2529| -|&attachref(img/1040904300.png,15%);|天羽々斬・属性変更|&color(#ff0000){全属性};|刀|50|[[蛇之麁正>武器奥義#orotinoaramasa]]|[[業火の刹那>スキル一覧#goukanosetuna]]|[[戮蛇の神刀>スキル一覧#rikuja]]|37|504|213|3024|100|ムーン交換| -|&attachref(img/1040904300.png,15%);|[4凸]天羽々斬・属性変更|&color(#ff0000){全属性};|刀|50|[[蛇之麁正>武器奥義#orotinoaramasa]]|[[業火の刹那>スキル一覧#goukanosetuna]]|[[戮蛇の神刀>スキル一覧#rikuja]]|37|504|250|3530|100|ムーン交換|○|213|3024| +|&attachref(img/1040007500.png,15%);|エクスカリバー|&color(#ff0000){全属性};|剣|50|[[王の剣>武器奥義#ounoturugi]]|[[紅蓮の堅守>スキル一覧#gurennokensyu]]|[[王道を征く者>スキル一覧#oudouwoyukumono]]|41|475|244|2848|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040007500.png,15%);|[4凸]エクスカリバー|&color(#ff0000){全属性};|剣|50|[[王の剣>武器奥義#ounoturugi]]|[[紅蓮の堅守>スキル一覧#gurennokensyu]]|[[王道を征く者II>スキル一覧#oudouwoyukumono2]]|41|475|280|3320|ムーン交換|スペリオルシリーズ|○|244|2848| +|&attachref(img/1040106600.png,15%);|ダマスカスナイフ|&color(#ff0000){全属性};|短剣|50|[[失伝の刃>武器奥義#situdennoyaiba]]|[[仄暗い稼業>スキル一覧#honoguraikagyou]]|[[引き際の心得>スキル一覧#hikigiwanokokoroe]]|41|472|267|2732|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040106600.png,15%);|[4凸]ダマスカスナイフ|&color(#ff0000){全属性};|短剣|50|[[失伝の刃>武器奥義#situdennoyaiba]]|[[仄暗い稼業II>スキル一覧#honoguraikagyou2]]|[[引き際の心得>スキル一覧#hikigiwanokokoroe]]|41|472|560|3230|ムーン交換|スペリオルシリーズ|○|267|2732| +|&attachref(img/1040205500.png,15%);|ゲイボルグ|&color(#ff0000){全属性};|槍|50|[[破裂する槍>武器奥義#haretusuruyari]]|[[必勝の誓い>スキル一覧#hissyounotikai]]|[[一刺一殺>スキル一覧#issiissatu]]|45|454|289|2624|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040205500.png,15%);|[4凸]ゲイボルグ|&color(#ff0000){全属性};|槍|50|[[破裂する槍>武器奥義#haretusuruyari]]|[[必勝の誓い>スキル一覧#hissyounotikai]]|[[一刺一殺II>スキル一覧#issiissatu2]]|45|454|340|3060|ムーン交換|スペリオルシリーズ|○|289|2624| +|&attachref(img/1040304400.png,15%);|ミョルニル|&color(#ff0000){全属性};|斧|50|[[大雷の槌>武器奥義#dairainotuti]]|[[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[戦神の打擲>スキル一覧#sennshinnno]]|36|497|217|2983|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040304400.png,15%);|[4凸]ミョルニル|&color(#ff0000){全属性};|斧|50|[[大雷の槌>武器奥義#dairainotuti]]|[[紅蓮の攻刃>スキル一覧#gurennokoujin]]|[[戦神の打擲II>スキル一覧#sennshinnno2]]|36|497|250|3480|ムーン交換|スペリオルシリーズ|○|217|2983| +|&attachref(img/1040406900.png,15%);|カドゥケウス|&color(#ff0000){全属性};|杖|50|[[救いの杖>武器奥義#sukuinotue]]|[[火の神威>スキル一覧#hinosini]]|[[窮地の救い手>スキル一覧#kyuutino]]|54|407|325|2441|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040406900.png,15%);|[4凸]カドゥケウス|&color(#ff0000){全属性};|杖|50|[[救いの杖>武器奥義#sukuinotue]]|[[火の神威>スキル一覧#hinosini]]|[[窮地の救い手II>スキル一覧#kyuutino2]]|54|407|380|2850|ムーン交換|スペリオルシリーズ|○|325|2441| +|&attachref(img/1040504400.png,15%);|フライクーゲル|&color(#ff0000){全属性};|銃|50|[[命奪う弾丸>武器奥義#inotiubaudangan]]|[[紅蓮の暴君>スキル一覧#gurennoboukun]]|[[好機到来>スキル一覧#koukitourai]]|34|509|203|3051|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040504400.png,15%);|[4凸]フライクーゲル|&color(#ff0000){全属性};|銃|50|[[命奪う弾丸>武器奥義#inotiubaudangan]]|[[紅蓮の暴君>スキル一覧#gurennoboukun]]|[[好機到来II>スキル一覧#koukitourai2]]|34|509|240|3560|ムーン交換|スペリオルシリーズ|○|203|3051| +|&attachref(img/1040604500.png,15%);|方天画戟|&color(#ff0000){全属性};|格闘|50|[[月牙>武器奥義#getuga]]|[[剛技の代償>スキル一覧#gouginodaisyou]]|[[万物を砕く剛技>スキル一覧#bannbutsu]]|43|463|278|2678|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040604500.png,15%);|[4凸]方天画戟|&color(#ff0000){全属性};|格闘|50|[[月牙>武器奥義#getuga]]|[[剛技の代償>スキル一覧#gouginodaisyou]]|[[万物を砕く剛技II>スキル一覧#bannbutsu2]]|43|463|330|3120|ムーン交換|スペリオルシリーズ|○|278|2678| +|&attachref(img/1040703600.png,15%);|ヘラクレス|&color(#ff0000){全属性};|弓|50|[[狂気の炎>武器奥義#kyoukinohonoo]]|[[業火の克己>スキル一覧#goukanokokki]]|[[不死をも殺す神弓>スキル一覧#fushiwomo]]|39|492|255|2854|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040703600.png,15%);|[4凸]ヘラクレス|&color(#ff0000){全属性};|弓|50|[[狂気の炎>武器奥義#kyoukinohonoo]]|[[業火の克己>スキル一覧#goukanokokki]]|[[不死をも殺す神弓II>スキル一覧#fushiwomo2]]|39|492|300|3330|ムーン交換|スペリオルシリーズ|○|255|2854| +|&attachref(img/1040803700.png,15%);|ウルリクムミ|&color(#ff0000){全属性};|楽器|50|[[巨人の歌>武器奥義#kyojinnouta]]|[[紅蓮の括目>スキル一覧#gurennokatumoku]]|[[流行詩歌>スキル一覧#ryuukousiika]]|76|438|271|2529|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040803700.png,15%);|[4凸]ウルリクムミ|&color(#ff0000){全属性};|楽器|50|[[巨人の歌>武器奥義#kyojinnouta]]|[[紅蓮の括目>スキル一覧#gurennokatumoku]]|[[流行詩歌II>スキル一覧#ryuukousiika2]]|76|438|310|2950|ムーン交換|スペリオルシリーズ|○|271|2529| +|&attachref(img/1040904300.png,15%);|天羽々斬|&color(#ff0000){全属性};|刀|50|[[蛇之麁正>武器奥義#orotinoaramasa]]|[[業火の刹那>スキル一覧#goukanosetuna]]|[[戮蛇の神刀>スキル一覧#rikuja]]|37|504|213|3024|ムーン交換|スペリオルシリーズ|| +|&attachref(img/1040904300.png,15%);|[4凸]天羽々斬|&color(#ff0000){全属性};|刀|50|[[蛇之麁正>武器奥義#orotinoaramasa]]|[[業火の刹那>スキル一覧#goukanosetuna]]|[[戮蛇の神刀II>スキル一覧#rikuja2]]|37|504|250|3530|ムーン交換|スペリオルシリーズ|○|213|3024|