三维排序升到120级

languages/en.js

@@ -13,12 +13,12 @@
 		sort_cost: "Cost",
 		sort_skillLv1: "Maximum Skill Turn",
 		sort_skillLvMax: "Minimum Skill Turn",
-		sort_hpMax110: "Max HP",
-		sort_atkMax110: "Max ATK",
-		sort_rcvMax110: "Max RCV",
-		sort_hpMax110_awoken: "Max HP (+Awoken)",
-		sort_atkMax110_awoken: "Max ATK (+Awoken)",
-		sort_rcvMax110_awoken: "Max RCV (+Awoken)",
+		sort_hpMax120: "Max HP",
+		sort_atkMax120: "Max ATK",
+		sort_rcvMax120: "Max RCV",
+		sort_hpMax120_awoken: "Max HP (+Awoken)",
+		sort_atkMax120_awoken: "Max ATK (+Awoken)",
+		sort_rcvMax120_awoken: "Max RCV (+Awoken)",
 		sort_abilityIndex_awoken: "Maximum Weighted Ability Index (+Awakening)",
 	},
 	force_reload_data: `Force refresh data`,

languages/ja.js

@@ -14,12 +14,12 @@
 		sort_mp: "MP",
 		sort_skillLv1: "最大スキルターン",
 		sort_skillLvMax: "最小スキルターン",
-		sort_hpMax110: "最大 HP",
-		sort_atkMax110: "最大攻撃",
-		sort_rcvMax110: "最大回復",
-		sort_hpMax110_awoken: "最大 HP (+覚醒)",
-		sort_atkMax110_awoken: "最大攻撃 (+覚醒)",
-		sort_rcvMax110_awoken: "最大回復 (+覚醒)",
+		sort_hpMax120: "最大 HP",
+		sort_atkMax120: "最大攻撃",
+		sort_rcvMax120: "最大回復",
+		sort_hpMax120_awoken: "最大 HP (+覚醒)",
+		sort_atkMax120_awoken: "最大攻撃 (+覚醒)",
+		sort_rcvMax120_awoken: "最大回復 (+覚醒)",
 		sort_abilityIndex_awoken: "最大加重能力指数 (+覚醒)",
 	},
 	force_reload_data: "データの強制更新",

languages/zh-TW.js

@@ -14,12 +14,12 @@
 		sort_mp: "MP",
 		sort_skillLv1: "技能最大冷卻時間",
 		sort_skillLvMax: "技能最小冷卻時間",
-		sort_hpMax110: "最大 HP",
-		sort_atkMax110: "最大攻擊",
-		sort_rcvMax110: "最大回復",
-		sort_hpMax110_awoken: "最大 HP(+覺醒)",
-		sort_atkMax110_awoken: "最大攻擊(+覺醒)",
-		sort_rcvMax110_awoken: "最大回復(+覺醒)",
+		sort_hpMax120: "最大 HP",
+		sort_atkMax120: "最大攻擊",
+		sort_rcvMax120: "最大回復",
+		sort_hpMax120_awoken: "最大 HP(+覺醒)",
+		sort_atkMax120_awoken: "最大攻擊(+覺醒)",
+		sort_rcvMax120_awoken: "最大回復(+覺醒)",
 		sort_abilityIndex_awoken: "最大加權能力指數（+覺醒）",
 	},
 	force_reload_data: "強制刷新數據",

script-json_data.js

@@ -28,12 +28,12 @@ let localTranslating = {
 		sort_mp: "MP",
 		sort_skillLv1: "技能最大冷却时间",
 		sort_skillLvMax: "技能最小冷却时间",
-		sort_hpMax110: "最大 HP",
-		sort_atkMax110: "最大攻击",
-		sort_rcvMax110: "最大回复",
-		sort_hpMax110_awoken: "最大 HP（+觉醒）",
-		sort_atkMax110_awoken: "最大攻击（+觉醒）",
-		sort_rcvMax110_awoken: "最大回复（+觉醒）",
+		sort_hpMax120: "最大 HP",
+		sort_atkMax120: "最大攻击",
+		sort_rcvMax120: "最大回复",
+		sort_hpMax120_awoken: "最大 HP（+觉醒）",
+		sort_atkMax120_awoken: "最大攻击（+觉醒）",
+		sort_rcvMax120_awoken: "最大回复（+觉醒）",
 		sort_abilityIndex_awoken: "最大加权能力指数（+觉醒）",
 	},
 	force_reload_data: "强制刷新数据",
@@ -494,43 +494,43 @@ const sort_function_list = [
 		return (skill_a.initialCooldown - skill_a.maxLevel) - (skill_b.initialCooldown - skill_b.maxLevel);
 		}
 			},
-	{tag:"sort_hpMax110",name:"Lv110最大HP",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_hpMax120",name:"Lv120最大HP",function:(a,b)=>a.hp.max * (a.limitBreakIncr ? (1 + a.limitBreakIncr/100) * 1.1 : 1) - b.hp.max * (b.limitBreakIncr ? (1 + b.limitBreakIncr/100) * 1.1 : 1)},
+	{tag:"sort_atkMax120",name:"Lv120最大攻击",function:(a,b)=>a.atk.max * (a.limitBreakIncr ? (1 + a.limitBreakIncr/100) * 1.05 : 1) - b.atk.max * (b.limitBreakIncr ? (1 + b.limitBreakIncr/100) * 1.05 : 1)},
+	{tag:"sort_rcvMax120",name:"Lv120最大回复",function:(a,b)=>a.rcv.max * (a.limitBreakIncr ? (1 + a.limitBreakIncr/100) * 1.05 : 1) - b.rcv.max * (b.limitBreakIncr ? (1 + b.limitBreakIncr/100) * 1.05 : 1)},
 	
-	{tag:"sort_atkMax110_awoken",name:"Lv110最大攻击(+觉醒)",function:(a,b)=>
+	{tag:"sort_atkMax110_awoken",name:"Lv120最大攻击(+觉醒)",function:(a,b)=>
 		{
-			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount),
-				  abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount);
+			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount, 120),
+				  abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount, 120);
 			const abA = abilities_2statusA ? abilities_2statusA.withAwoken.atk : 0,
 				  abB = abilities_2statusB ? abilities_2statusB.withAwoken.atk : 0;
 			return abA - abB;
 		}
 	},
-	{tag:"sort_hpMax110_awoken",name:"Lv110最大HP(+觉醒)",function:(a,b)=>
+	{tag:"sort_hpMax120_awoken",name:"Lv120最大HP(+觉醒)",function:(a,b)=>
 		{
-			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount),
-				abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount);
+			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount, 120),
+				  abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount, 120);
 			const abA = abilities_2statusA ? abilities_2statusA.withAwoken.hp : 0,
-				abB = abilities_2statusB ? abilities_2statusB.withAwoken.hp : 0;
+				  abB = abilities_2statusB ? abilities_2statusB.withAwoken.hp : 0;
 			return abA - abB;
 		}
 	},
-	{tag:"sort_rcvMax110_awoken",name:"Lv110最大回复(+觉醒)",function:(a,b)=>
+	{tag:"sort_rcvMax120_awoken",name:"Lv120最大回复(+觉醒)",function:(a,b)=>
 		{
-			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount),
-				abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount);
+			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount, 120),
+				  abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount, 120);
 			const abA = abilities_2statusA ? abilities_2statusA.withAwoken.rcv : 0,
-				abB = abilities_2statusB ? abilities_2statusB.withAwoken.rcv : 0;
+				  abB = abilities_2statusB ? abilities_2statusB.withAwoken.rcv : 0;
 			return abA - abB;
 		}
 	},
-	{tag:"sort_abilityIndex_awoken",name:"Lv110最大加权能力指数(+觉醒)",function:(a,b)=>
+	{tag:"sort_abilityIndex_awoken",name:"Lv120最大加权能力指数(+觉醒)",function:(a,b)=>
 		{
-			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount),
-				abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount);
+			const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount, 120),
+				  abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount, 120);
 			const abA = abilities_2statusA ? abilities_2statusA.withAwoken.hp / 10 + abilities_2statusA.withAwoken.atk / 5 + abilities_2statusA.withAwoken.rcv / 3 : 0,
-				abB = abilities_2statusB ? abilities_2statusB.withAwoken.hp / 10 + abilities_2statusB.withAwoken.atk / 5 + abilities_2statusB.withAwoken.rcv / 3 : 0;
+				  abB = abilities_2statusB ? abilities_2statusB.withAwoken.hp / 10 + abilities_2statusB.withAwoken.atk / 5 + abilities_2statusB.withAwoken.rcv / 3 : 0;
 			return abA - abB;
 		}
 	},

script-universal_function.js

@@ -474,7 +474,7 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) {
 
 	const bonusScale = [0.1, 0.05, 0.15]; //辅助宠物附加的属性倍率
 	const plusAdd = [10, 5, 3]; //加值的增加值
-	const limitBreakIncr120 = [10, 5, 5]; //120三维增加比例
+	const limitBreakIncr120 = [10, 5, 5]; //120三维增加百分比例
 
 	const awokenAdd = [ //对应加三维觉醒的序号与增加值
 		[{ index: 1, value: 500 }, { index: 65, value: -2500 }], //HP
@@ -591,11 +591,11 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) {
 	return abilitys;
 }
 
-function calculateAbility_max(id, solo, teamsCount) {
+function calculateAbility_max(id, solo, teamsCount, maxLevel = 110) {
 	const card = Cards[id];
 	const tempMon = {
 		id: id,
-		level: card.limitBreakIncr ? 110 : card.maxLevel,
+		level: card.limitBreakIncr ? maxLevel : card.maxLevel,
 		plus: (card.overlay || card.types[0] == 15 && card.types[1] == -1) ? [0, 0, 0] : [99, 99, 99], //当可以叠加时，不能打297
 		awoken: card.awakenings.length,
 	};

script.js

@@ -2588,7 +2588,7 @@ function initialize(event) {
 		}
 		if (options.showAbilities || options.showAbilitiesWithAwoken)
 		{
-			const abilities_2status = calculateAbility_max(id, solo, teamsCount);
+			const abilities_2status = calculateAbility_max(id, solo, teamsCount, 120);
 			if (options.showAbilities && abilities_2status)
 			{
 				const abilitiesPreview = cli.appendChild(creatAbilitiesList(abilities_2status.noAwoken));