diff --git a/languages/en.js b/languages/en.js
index 8e8b9211..de0e1f10 100644
--- a/languages/en.js
+++ b/languages/en.js
@@ -8,6 +8,8 @@
sort_attrs : "Attribute",
sort_evoRootId: "Cards Evolution Root",
sort_evoRoot_Attrs : "Cards Evolution Root's Attribute",
+ sort_rarity: "Rarity",
+ sort_cost: "Cost",
sort_skillLv1: "Maximum Skill Turn",
sort_skillLvMax: "Minimum Skill Turn",
sort_hpMax110: "Max HP (Lv110)",
@@ -16,8 +18,6 @@
sort_hpMax110_Multi: "Max Multi HP (Lv110)",
sort_atkMax110_Multi: "Max Multi ATK (Lv110)",
sort_rcvMax110_Multi: "Max Multi RCV (Lv110)",
- sort_rarity: "Rarity",
- sort_cost: "Cost",
},
}
diff --git a/languages/ja.js b/languages/ja.js
index 2df1de7a..d90d356b 100644
--- a/languages/ja.js
+++ b/languages/ja.js
@@ -8,6 +8,8 @@
sort_attrs : "属性",
sort_evoRootId: "カード進化ルート",
sort_evoRoot_Attrs : "カード進化ルートの属性",
+ sort_rarity: "レアリティ",
+ sort_cost: "コスト",
sort_skillLv1: "最大スキルターン",
sort_skillLvMax: "最小スキルターン",
sort_hpMax110: "最大 HP (Lv110)",
@@ -16,8 +18,6 @@
sort_hpMax110_Multi: "最大協力 HP (Lv110)",
sort_atkMax110_Multi: "最大協力攻撃 (Lv110)",
sort_rcvMax110_Multi: "最大協力回復 (Lv110)",
- sort_rarity: "レアリティ",
- sort_cost: "コスト",
},
}
diff --git a/languages/ko.js b/languages/ko.js
index eaa2b1f2..98d2b313 100644
--- a/languages/ko.js
+++ b/languages/ko.js
@@ -8,6 +8,8 @@
sort_attrs : "속성",
sort_evoRootId: "카드 진화 루트",
sort_evoRoot_Attrs : "카드 진화 루트의 특성",
+ sort_rarity: "래리티",
+ sort_cost: "비용",
sort_skillLv1: "최대 스킬 턴",
sort_skillLvMax: "최소 스킬 턴",
sort_hpMax110: "최대 HP (Lv110)",
@@ -16,8 +18,6 @@
sort_hpMax110_Multi: "최대 멀티 HP (Lv110)",
sort_atkMax110_Multi: "최대 멀티 공격 (Lv110)",
sort_rcvMax110_Multi: "최대 멀티 회복 (Lv110)",
- sort_rarity: "래리티",
- sort_cost: "비용",
},
}
diff --git a/languages/zh-TW.js b/languages/zh-TW.js
index cbc7eb0a..204039e7 100644
--- a/languages/zh-TW.js
+++ b/languages/zh-TW.js
@@ -8,6 +8,8 @@
sort_attrs : "屬性",
sort_evoRootId: "進化樹",
sort_evoRoot_Attrs : "進化根怪物的屬性",
+ sort_rarity: "稀有度",
+ sort_cost: "消耗",
sort_skillLv1: "技能最大冷卻時間",
sort_skillLvMax: "技能最小冷卻時間",
sort_hpMax110: "最大 HP(Lv110)",
@@ -16,8 +18,6 @@
sort_hpMax110_Multi: "最大協力 HP(Lv110)",
sort_atkMax110_Multi: "最大協力攻擊(Lv110)",
sort_rcvMax110_Multi: "最大協力回復(Lv110)",
- sort_rarity: "稀有度",
- sort_cost: "消耗",
},
}
diff --git a/multi.html b/multi.html
index ae7f5ab0..afdbc458 100644
--- a/multi.html
+++ b/multi.html
@@ -9,6 +9,10 @@
+
@@ -21,8 +25,6 @@
diff --git a/script-json_data.js b/script-json_data.js
index 18a47a18..a0cc626c 100644
--- a/script-json_data.js
+++ b/script-json_data.js
@@ -63,6 +63,8 @@ const sort_function_list = [
if (num === 0) num = card_a.attrs[1] - card_b.attrs[1];
return num;
}},
+ {tag:"sort_rarity",name:"稀有度",function:(a,b)=>a.rarity-b.rarity},
+ {tag:"sort_cost",name:"消耗",function:(a,b)=>a.cost-b.cost},
{tag:"sort_skillLv1",name:"技能最大冷却时间",function:(a,b)=>Skills[a.activeSkillId].initialCooldown-Skills[b.activeSkillId].initialCooldown},
{tag:"sort_skillLvMax",name:"技能最小冷却时间",function:(a,b)=>{
const skill_a = Skills[a.activeSkillId],skill_b = Skills[b.activeSkillId];
@@ -71,18 +73,22 @@ const sort_function_list = [
{tag:"sort_hpMax110",name:"最大HP(Lv110)",function:(a,b)=>a.hp.max * (1 + a.limitBreakIncr/100) - b.hp.max * (1 + b.limitBreakIncr/100)},
{tag:"sort_atkMax110",name:"最大攻击(Lv110)",function:(a,b)=>a.atk.max * (1 + a.limitBreakIncr/100) - b.atk.max * (1 + b.limitBreakIncr/100)},
{tag:"sort_rcvMax110",name:"最大回复(Lv110)",function:(a,b)=>a.rcv.max * (1 + a.limitBreakIncr/100) - b.rcv.max * (1 + b.limitBreakIncr/100)},
- {tag:"sort_hpMax110_Multi",name:"最大协力攻击(Lv110)",function:(a,b)=>
- a.atk.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
- b.atk.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
- },
- {tag:"sort_hpMax110_Multi",name:"最大协力HP(Lv110)",function:(a,b)=>
- a.hp.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
- b.hp.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
- },
- {tag:"sort_hpMax110_Multi",name:"最大协力回复(Lv110)",function:(a,b)=>
- a.rcv.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
- b.rcv.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
- },
- {tag:"sort_rarity",name:"稀有度",function:(a,b)=>a.rarity-b.rarity},
- {tag:"sort_cost",name:"消耗",function:(a,b)=>a.cost-b.cost},
-];
\ No newline at end of file
+];
+if (!solo)
+{
+ const multiSort = [
+ {tag:"sort_hpMax110_Multi",name:"最大协力攻击(Lv110)",function:(a,b)=>
+ a.atk.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
+ b.atk.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
+ },
+ {tag:"sort_hpMax110_Multi",name:"最大协力HP(Lv110)",function:(a,b)=>
+ a.hp.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
+ b.hp.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
+ },
+ {tag:"sort_hpMax110_Multi",name:"最大协力回复(Lv110)",function:(a,b)=>
+ a.rcv.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) -
+ b.rcv.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length)
+ },
+ ];
+ sort_function_list.push(...multiSort);
+}
\ No newline at end of file
diff --git a/solo.html b/solo.html
index bc3cb5a2..41205479 100644
--- a/solo.html
+++ b/solo.html
@@ -9,6 +9,10 @@
+
@@ -21,8 +25,6 @@
diff --git a/triple.html b/triple.html
index 1cfb212e..175490d7 100644
--- a/triple.html
+++ b/triple.html
@@ -9,6 +9,10 @@
+
@@ -21,8 +25,6 @@