From e7eb7aff9c9b78af3380275bbb523dbad8809d40 Mon Sep 17 00:00:00 2001
From: lucilor <lucilor@me.com>
Date: Mon, 2 Oct 2023 07:13:46 +0800
Subject: [PATCH] fix: bugs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 万智牌 - 地牌改变背景失效
* 昆特牌 - 凯瑞斯【卫土】无法触发护甲抵挡效果
* 炉石传说 - 阿玛拉【守望】当目标技能被禁用时可以无限对其发动
---
 character/gwent.js  | 6 ++----
 character/hearth.js | 1 +
 game/game.js        | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/character/gwent.js b/character/gwent.js
index 585077e3c..2c449aae8 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -999,10 +999,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				group:'gwweitu_gain',
 				subSkill:{
 					gain:{
-						trigger:{player:'damageZero'},
-						filter:function(event){
-							return event.hujia;
-						},
+						trigger: {player: 'changeHujiaAfter'},
+						filter: (event) => event.num < 0,
 						forced:true,
 						content:function(){
 							player.storage.gwweitu++;
diff --git a/character/hearth.js b/character/hearth.js
index 609940240..bbd02ebd9 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -2023,6 +2023,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			shouwang2:{
+				charlotte: true,
 				mark:true,
 				intro:{
 					content:'已发动'
diff --git a/game/game.js b/game/game.js
index 99532dbcc..aba6bf569 100644
--- a/game/game.js
+++ b/game/game.js
@@ -34345,7 +34345,7 @@
 			game.addVideo('changeLand',player,url);
 			const parsedPath=lib.path.parse(url);
 			delete parsedPath.base;
-			if(!parsedPath.dir) parsedPath.dir='image/card';
+			if(!parsedPath.dir) parsedPath.dir='image/card/';
 			if(!parsedPath.ext) parsedPath.ext='.jpg';
 			game.broadcastAll((formattedPath,name,skill,player)=>{
 				const node=ui.create.div('.background.upper.land');