From 62cff96b886f1e25f609139111b2a1993429211a Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 10:39:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=8B=E9=BB=84?= =?UTF-8?q?=E6=9C=88=E8=8B=B1=E3=80=90=E5=A5=87=E6=89=8D=E3=80=91=E6=8B=BC?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/sb.js b/character/sb.js index 8f30a4ca6..44374ec42 100644 --- a/character/sb.js +++ b/character/sb.js @@ -645,7 +645,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, filterCardx:function(card,player){ //if(player.getStorage('sbqicai').includes(card.name)) return false; - return get.type(card)=='equip'&&get.hasPlayer(target=>target!=player&&target.hasEmptySlot(get.subtype(card))); + return get.type(card)=='equip'&&game.hasPlayer(target=>target!=player&&target.hasEmptySlot(get.subtype(card))); }, usable:1, chooseButton:{ From b61548fe773c4404aca6822e1b7c8eafc67ff3c0 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 11:23:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E4=B9=94?= =?UTF-8?q?=E5=B0=8F=E4=B9=94=E3=80=90=E6=98=9F=E8=88=9E=E3=80=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/character/sp.js b/character/sp.js index 84e49c35a..978f6fc44 100755 --- a/character/sp.js +++ b/character/sp.js @@ -14987,7 +14987,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.chooseCard('he',get.prompt('new_xingwu'),'将一张牌置于武将牌上作为“舞”').set('ai',function(card){ if(_status.event.goon) return 20-get.value(card); return 7-get.value(card); - }).set('goon',player.needsToDiscard()||player.getStorage('new_xingwu').length>1); + }).set('goon',player.needsToDiscard()||player.getExpansions('new_xingwu').length>1); 'step 1' if(result.bool){ player.logSkill('new_xingwu'); @@ -15061,7 +15061,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, new_luoyan:{ init:function(player){ - if(player.getStorage('new_xingwu').length) player.addAdditionalSkill('new_luoyan',['oltianxiang','liuli']); + if(player.getExpansions('new_xingwu').length) player.addAdditionalSkill('new_luoyan',['oltianxiang','liuli']); }, onremove:function(player){ player.removeAdditionalSkill('new_luoyan'); From 8c7ae738d6f90129fd65ae0934dd3918986d9269 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 11:26:22 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E5=A4=AA?= =?UTF-8?q?=E5=B9=B3=E8=A6=81=E6=9C=AF=E3=80=91ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/card/guozhan.js b/card/guozhan.js index 12c4a36de..3171ef9e7 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -1343,7 +1343,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, target:(card,player,target)=>{ if(target._g_taipingyaoshu_temp) return; - if(get.subtype(card)==='equip2'&&target.getEquip('taipingyaoshu')&&!target.countEmpty(2)){ + if(get.subtype(card)==='equip2'&&target.getEquip('taipingyaoshu')&&!target.countEmptySlot(2)){ target._g_taipingyaoshu_temp=true; let lose=get.effect(target,{name:'losehp'},target,target), draw=2*get.effect(target,{name:'draw'},target,target); From 45fed0a5738a83b02d8801c72a86be65fcfaaf5c Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 11:36:49 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A9=AC=E5=85=83?= =?UTF-8?q?=E4=B9=89=E3=80=90=E9=9B=86=E5=85=B5=E3=80=91ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/mobile.js b/character/mobile.js index c7a38fd83..8b4bf1a37 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -6760,7 +6760,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ mingzhi:false, effect:{ target:function(card,player,target,current){ - if((get.tag(card,'respondShan')||get.tag(card,'respondSha'))&&target.getStorage('jibing').length>0&&player.isMaxHp()){ + if((get.tag(card,'respondShan')||get.tag(card,'respondSha'))&&target.getExpansions('jibing').length>0&&player.isMaxHp()){ if(get.attitude(target,player)<=0){ return [0,0,1,0.3]; } From a224ac5f6220b670cc5d4b0c6f8f0d5de9d5fadc Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 11:46:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=81=E5=91=A8?= =?UTF-8?q?=E5=B9=B4=E5=A4=A7=E5=B0=8F=E4=B9=94=E3=80=90=E6=98=9F=E8=88=9E?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/xianding.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/xianding.js b/character/xianding.js index 1aea633f0..dd162c7eb 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -1700,7 +1700,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if (!list.includes(get.suit(card))) att = 2; if (_status.event.goon) return (20 - get.value(card)) * att; return (7 - get.value(card)) * att; - }).set('goon', player.needsToDiscard() || player.getStorage('dcxingwu').length == 2); + }).set('goon', player.needsToDiscard() || player.getExpansions('dcxingwu').length == 2); 'step 1' if (result.bool) { player.logSkill('dcxingwu'); From a9c3ddf12cfd264b82b5b3afabada2c5b6c6a123 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 11:51:26 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E7=BB=8F?= =?UTF-8?q?=E5=90=88=E3=80=91=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/sp2.js b/character/sp2.js index 15f3537a5..6d604fca9 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -10998,7 +10998,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gongxiu:'共修', gongxiu_info:'结束阶段，若你本回合内发动过〖经合〗，则你选择一项：①令所有本回合内成为过〖经合〗目标的角色各摸一张牌；②令所有本回合内未成为过〖经合〗目标的角色各弃置一张手牌。', jinghe:'经合', - jinghe_info:'出牌阶段限一次，你可以展示四张牌名各不相同的牌并选择等量的角色。系统从“写满技能的天书”中随机选择等量的技能，然后这些角色依次选择获得其中的一个。', + jinghe_info:'出牌阶段限一次，你可以展示至多四张牌名各不相同的牌并选择等量的角色。系统从“写满技能的天书”中随机选择等量的技能，然后这些角色依次选择获得其中的一个。', nhyinbing:'阴兵', nhyinbing_info:'锁定技，你使用的【杀】造成伤害改为失去体力。其他角色失去体力后，你摸一张牌。', nhhuoqi:'活气', From ba80696c1047db8aa17225fd372f69257a60ed75 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 17:17:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E9=99=84?= =?UTF-8?q?=E4=B9=89=E3=80=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/ddd.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/ddd.js b/character/ddd.js index 509e4ebbc..d546a0cb9 100644 --- a/character/ddd.js +++ b/character/ddd.js @@ -4563,7 +4563,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, filter:function(event,player){ if(!event.source||!event.source.isIn()||event.source.group!='qun') return false; - if(!event.souce.countCards('he')<2) return false; + if(!event.source.countCards('he')<2) return false; if(!player.hasZhuSkill('dddfuyi',event.source)) return false; const skills=player.getStockSkills(true,true).filter(skill=>{ return !player.hasSkill(skill,null,false,false); From 95e8a7b91e701765b3c1ef788dbc2b841139e442 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 17:50:13 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=95=E8=BF=9B?= =?UTF-8?q?=E3=80=90=E8=B0=8B=E8=AF=9B=E3=80=91=E6=B2=A1=E6=9C=89=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E6=9D=80=E7=9B=AE=E6=A0=87=E4=BC=A0=E7=A9=BA=E5=8F=82?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/character/sp.js b/character/sp.js index 978f6fc44..127af83fe 100755 --- a/character/sp.js +++ b/character/sp.js @@ -3038,13 +3038,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var aimx=game.filterPlayer(current=>{ return target.canUse({name:'sha'},current)&&get.effect(current,{name:'sha'},target,target)>0; }).sort((a,b)=>get.effect(b,{name:'sha'},target,target)-get.effect(a,{name:'sha'},target,target))[0]; - if(get.effect(aimx,{name:'sha'},target,player)<0&&get.effect(aimx,{name:'sha'},target,aimx)<0&&!canSave(player,aimx)) return 0; + if(aimx&&get.effect(aimx,{name:'sha'},target,player)<0&&get.effect(aimx,{name:'sha'},target,aimx)<0&&!canSave(player,aimx)) return 0; } if(target.hasValueTarget({name:'juedou'})){ var aimy=game.filterPlayer(current=>{ return target.canUse({name:'juedou'},current)&&get.effect(current,{name:'juedou'},target,target)>0; }).sort((a,b)=>get.effect(b,{name:'juedou'},target,target)-get.effect(a,{name:'juedou'},target,target))[0]; - if(get.effect(aimy,{name:'juedou'},target,player)<0&&get.effect(aimy,{name:'sha'},target,aimy)<0&&!canSave(player,aimy)) return 0; + if(aimy&&get.effect(aimy,{name:'juedou'},target,player)<0&&get.effect(aimy,{name:'sha'},target,aimy)<0&&!canSave(player,aimy)) return 0; } return -1; }, From 983846ad0195394ff9ed2e4270cc89ccbdc4fdcb Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 18:40:57 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E8=AF=8F?= =?UTF-8?q?=E5=9B=BE=E3=80=91=E6=97=A0=E6=AC=A1=E6=95=B0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index 7234198a9..81578b62e 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -1214,6 +1214,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ enable:'chooseToUse', viewAs:{name:'lebu'}, position:'hes', + round:1, viewAsFilter(player){ return player.countCards('hes'); }, From 29a54651b89598dfbc54eb74a03c234c93011406 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 23 Jan 2024 19:00:13 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9D=80?= =?UTF-8?q?=E6=9C=B1=E6=B2=BB=E3=80=90=E5=AE=89=E5=9B=BD=E3=80=91=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=BF=92=E6=AD=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/mobile.js b/character/mobile.js index 8b4bf1a37..e28ef1fed 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -4112,7 +4112,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ 'step 1' var hp=player.hp-1,maxhp=player.maxHp-1; if(hp>0&&maxhp>0){ - player.chooseControl(choices).set('prompt','安国：请选择一项').set('choiceList',[ + player.chooseControl().set('prompt','安国：请选择一项').set('choiceList',[ '失去'+hp+'点体力，令'+get.translation(trigger.player)+'获得1点护甲', '减'+maxhp+'点体力上限，令'+get.translation(trigger.player)+'获得1点护甲' ]).set('ai',()=>'选项一');