From d253a27551fd54435eba7ec56df86806f0880ae8 Mon Sep 17 00:00:00 2001 From: Tipx-L <138244655+Tipx-L@users.noreply.github.com> Date: Thu, 3 Aug 2023 05:27:05 -0700 Subject: [PATCH 1/3] Add lib.element.player.getHp and change lib.element.player.getDamagedHp. --- game/game.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/game/game.js b/game/game.js index 12a2362e0..e4aaf2e97 100644 --- a/game/game.js +++ b/game/game.js @@ -18468,8 +18468,11 @@ inRangeOf:function(source){ return source.inRange(this); }, + getHp:function(){ + return Math.max(0,this.hp); + }, getDamagedHp:function(){ - return this.maxHp-Math.max(0,this.hp); + return this.maxHp-this.getHp(); }, changeGroup:function(group,log,broadcast){ var next=game.createEvent('changeGroup'); From d2c3cc131a5189558ed5198de397220e76b7b907 Mon Sep 17 00:00:00 2001 From: Tipx-L <138244655+Tipx-L@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:13:02 -0700 Subject: [PATCH 2/3] =?UTF-8?q?Change=20from=20=E5=86=B0=E6=9D=80=20to=20?= =?UTF-8?q?=E5=86=B0=E5=86=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/standard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/card/standard.js b/card/standard.js index 1838c17ad..f067a5fca 100644 --- a/card/standard.js +++ b/card/standard.js @@ -3244,7 +3244,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ wuxie_info:'一张锦囊牌生效前,对此牌使用。抵消此牌对一名角色产生的效果,或抵消另一张【无懈可击】产生的效果。', lebu_info:'出牌阶段,对一名其他角色使用。若判定结果不为红桃,跳过其出牌阶段。', shandian_info:'出牌阶段,对自己使用。若判定结果为黑桃2~9,则目标角色受到3点雷电伤害。若判定不为黑桃2~9,将之移动到下家的判定区里。', - icesha_skill:'冰杀', + icesha_skill:'冰冻', icesha_skill_info:'防止即将造成的伤害,改为依次弃置其两张牌。', qinggang2:'破防', }, From 4885bba03a33d59a6b1b5bbd505d944333d13740 Mon Sep 17 00:00:00 2001 From: Tipx-L <138244655+Tipx-L@users.noreply.github.com> Date: Fri, 4 Aug 2023 00:24:49 -0700 Subject: [PATCH 3/3] Fix the chooseToDiscard prompt error in xinqingxi. --- character/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/mobile.js b/character/mobile.js index 25af8be07..e89087ac7 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -1704,7 +1704,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ event._result={bool:false}; } else{ - trigger.player.chooseToDiscard(num,'弃置'+get.cnNumber(num)+'张手牌,或令杀的伤害+1').set('ai',function(card){ + trigger.player.chooseToDiscard(num,'弃置'+get.cnNumber(num)+'张手牌,或令'+get.translation(player)+'对你造成的此伤害+1').set('ai',function(card){ var player=_status.event.player; if(player.hp==1){ if(get.type(card)=='basic'){