From cbccf48963033a9cd7371aade336e4bacdbd7a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Wed, 18 Nov 2020 14:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E5=90=8E?=
 =?UTF-8?q?=E9=80=80=E6=92=A4=E9=94=80=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 languages/zh-CN.js | 10 ++++++++++
 script.js          |  9 +++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/languages/zh-CN.js b/languages/zh-CN.js
index 56a930c1..185d11ce 100644
--- a/languages/zh-CN.js
+++ b/languages/zh-CN.js
@@ -2965,6 +2965,16 @@ function parseBigNumber(number)
 				getReduceScale(getSubskill(b_s));
 			return b_pC - a_pC;
 		})},
+		{name:"玩家回血",function:cards=>cards.filter(card=>{
+			const searchTypeArray = [7,8,35,115];
+			const skill = Skills[card.activeSkillId];
+			if (searchTypeArray.includes(skill.type) || skill.type == 117 && (skill.params[1] || skill.params[2] || skill.params[3]))
+				return true;
+			else if (skill.type == 116 || skill.type == 118){
+				const subskills = skill.params.map(id=>Skills[id]);
+				return subskills.some(subskill=>searchTypeArray.includes(subskill.type) || subskill.type == 117 && (subskill.params[1] || subskill.params[2] || subskill.params[3]));
+			}
+		})},
 		{name:"-----对敌 buff 类-----",function:cards=>cards},
 		{name:"威吓（按推迟回合排序）",function:cards=>cards.filter(card=>{
 			const searchType = 18;
diff --git a/script.js b/script.js
index b67063b6..2117be20 100644
--- a/script.js
+++ b/script.js
@@ -737,11 +737,8 @@ function reloadFormationData(event) {
 		}
 	}
 
-	if (formationData)
-	{
-		formation.loadObj(formationData);
-		refreshAll(formation);
-	}
+	formation.loadObj(formationData);
+	refreshAll(formation);
 
 	if (isGuideMod)
 	{
@@ -772,7 +769,7 @@ function creatNewUrl(arg) {
 	if (!!(window.history && history.pushState)) { // 支持History API
 		const language_i18n = arg.language || getQueryString("l") || getQueryString("lang"); //获取参数指定的语言
 		const datasource = arg.datasource || getQueryString("s");
-		const outObj = getQueryString("d") ? formation.outObj() : null;
+		const outObj = formation.outObj();
 
 		const newSearch = new URLSearchParams();
 		if (language_i18n) newSearch.set("l", language_i18n);