国战吕玲绮、手杀王允修复

libccy · Oct 14, 2024 · 2486af9 · 2486af9
1 parent 2f753e1
commit 2486af9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/character/mobile/skill.js b/character/mobile/skill.js
@@ -16084,19 +16084,15 @@ const skills = {
 					return get.subtype(card) == "equip1" && target.canUse(card, target);
 				});
 			}
-			if (!equip1) {
-				player.popup("连计失败");
-				game.log("牌堆中无装备");
-				event.finish();
-				return;
-			}
-			if (equip1.name == "qinggang" && !lib.inpile.includes("qibaodao")) {
-				game.broadcastAll(function (card) {
-					card.init([card.suit, card.number, "qibaodao"]);
-				}, equip1);
+			if (equip1) {
+				if (equip1.name == "qinggang" && !lib.inpile.includes("qibaodao")) {
+					game.broadcastAll(function (card) {
+						card.init([card.suit, card.number, "qibaodao"]);
+					}, equip1);
+				}
+				target.$draw(equip1);
+				target.chooseUseTarget(equip1, "noanimate", "nopopup", true);
 			}
-			target.$draw(equip1);
-			target.chooseUseTarget(equip1, "noanimate", "nopopup", true);
 			"step 2";
 			game.updateRoundNumber();
 			var list = ["nanman", "wanjian", "huogong", "juedou", "sha"];

diff --git a/mode/guozhan.js b/mode/guozhan.js
@@ -479,7 +479,7 @@ export default () => {
 				gz_re_nanhualaoxian: ["male", "qun", 3, ["gzgongxiu", "gztaidan", "gzjinghe_new"]],
 				gz_zhouyi: ["female", "wu", 3, ["gzzhukou", "gzduannian", "gzlianyou"]],
 				gz_re_xunchen: ["male", "qun", 3, ["gzfenglve", "gzanyong"]],
-				gz_lvlingqi: ["female", "qun", 4, ["gzguowu", "gzshenwei", "gzzhuangrong"], ["gzskin"]],
+				gz_lvlingqi: ["female", "qun", 4, ["guowu", "gzshenwei", "gzzhuangrong"], ["gzskin"]],
 				gz_dc_yanghu: ["male", "wei", 3, ["gzdeshao", "gzmingfa"]],
 
 				gz_cuimao: ["male", "wei", 3, ["gzzhengbi", "gzfengying"], []],

diff --git a/noname/library/element/GameEvent/GameEventManager.js b/noname/library/element/GameEvent/GameEventManager.js
@@ -11,8 +11,8 @@ export default class GameEventManager{
 		return this.getStatusEvent();
 	}
     getStartedEvent(){
-        return this.tempEvent || this.eventStack.at(-1);
-    }
+		return this.tempEvent || this.eventStack.at(-1);
+	}
 	getStatusEvent() {
 		return this.tempEvent || this.eventStack.at(-1) || this.rootEvent;
 	}
@@ -22,4 +22,4 @@ export default class GameEventManager{
 		else if (this.eventStack.includes(event)) this.tempEvent = event;
 		else throw new Error("Cannot assign a value to _status.event that is not in eventStack.");
 	}
-}
+}