From bd28f8720f63191c3a8b182daef1dd0f6b64e591 Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Mon, 14 Aug 2023 00:48:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=8F=E9=92=9F=E4=BC=9A=E3=80=90?= =?UTF-8?q?=E8=BF=82=E5=BF=97=E3=80=91=E6=B7=BB=E5=8A=A0=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/clan.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/character/clan.js b/character/clan.js index 54e6b92b7..505af2ff3 100644 --- a/character/clan.js +++ b/character/clan.js @@ -83,18 +83,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }).set('ai',function(card){ if(_status.event.dying&&_status.event.num>0&&lib.skill.dcweidang.getLength(card)>_status.event.num) return 1/lib.skill.dcweidang.getLength(card);//怂 return lib.skill.dcweidang.getLength(card);//勇 - }).set('dying',player.hp+player.countCards('hs',{name:['tao','jiu']})<1).set('num',event.num); + }).set('dying',player.hp+player.countCards('hs',{name:['tao','jiu']})<1).set('num',event.num1); 'step 4' if(result.bool){ player.logSkill('clanyuzhi'); player.showCards(result.cards,get.translation(player)+'发动了【迂志】'); player.draw(lib.skill.dcweidang.getLength(result.cards[0])); + player.storage.clanyuzhi=lib.skill.dcweidang.getLength(result.cards[0]); + player.markSkill('clanyuzhi'); } + else player.unmarkSkill('clanyuzhi'); }, ai:{ threaten:3, nokeep:true, }, + onremove:true, + intro:{content:'本轮野心：#张'}, }, clanxieshu:{ audio:2, From a083366f37628f45c6350773b0fa8b292b77e67d Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Mon, 14 Aug 2023 00:57:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=8F=A0=E8=81=94=E7=92=A7=E5=90=88?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/guozhan.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mode/guozhan.js b/mode/guozhan.js index e94f1d4d4..3d5cef6e3 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -16050,7 +16050,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ name2=name2.slice(name2.indexOf('_')+1); } } - return (lib.perfectPair[name1]&&lib.perfectPair[name1].contains(name2))||(lib.perfectPair[name2]&&lib.perfectPair[name2].contains(name1)); + var list=Object.keys(lib.perfectPair).concat(Object.values(lib.perfectPair)).flat(Infinity); + if(!list.contains(name1)||!list.contains(name2)) return false; + return (lib.perfectPair[name1]&&lib.perfectPair[name1].flat(Infinity).contains(name2))||(lib.perfectPair[name2]&&lib.perfectPair[name2].flat(Infinity).contains(name1)); }, siege:function(player){ if(this.identity=='unknown'||this.hasSkill('undist')) return false; From d2479b959f8034efb5028d619870c0efc80013f5 Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:59:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=B8=E5=8A=AD?= =?UTF-8?q?=E9=81=97=E7=95=99=E7=9A=84=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp2.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/character/sp2.js b/character/sp2.js index 200331283..04de4f2c7 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -8005,10 +8005,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.markAuto('pingjian',[result.control]); player.addTempSkill(result.control); player.storage.pingjian_check[result.control]=(trigger.name=='damage'?trigger:'phaseJieshu'); - if(trigger.name=='damage'){ - var info=lib.translate[result.control+'_info']; - if(info&&info.indexOf('1点伤害')+info.indexOf('一点伤害')!=-2) trigger.num=1;//暂时想到的让多点伤害只执行一次的拙见 - } }, group:'pingjian_use', phaseUse_special:[], From 6d500003f05eb0c38946c4de097f50ce885c1f14 Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Mon, 14 Aug 2023 12:49:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=AF=9B=E7=8E=A0=E3=80=90=E7=A7=89?= =?UTF-8?q?=E6=B8=85=E3=80=91=E9=99=90=E5=88=B6=E8=AE=A1=E7=AE=97=E7=9A=84?= =?UTF-8?q?=E7=89=8C=E9=A1=BB=E4=B8=BA=E5=B7=B2=E7=BB=93=E7=AE=97=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E7=9A=84=E7=89=8C=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=B5=8C?= =?UTF-8?q?=E5=A5=97=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/mobile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/character/mobile.js b/character/mobile.js index 40b951967..f105c27bd 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -3786,7 +3786,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var suit2=get.suit(i.card); if(!lib.suit.contains(suit2)) continue; if(i!=event&&suit2==suit) return false; - list.add(suit2); + if(i.finished) list.add(suit2); } return list.length>1&&list.length<5; }, @@ -3799,7 +3799,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(i.getParent('phaseUse')!=evt) continue; var suit2=get.suit(i.card); if(!lib.suit.contains(suit2)) continue; - list.add(suit2); + if(i.finished) list.add(suit2); } var prompt,filterTarget,ai; switch(list.length){ @@ -13525,7 +13525,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ spqishe_info:'你可以将一张装备牌当做【酒】使用。你的手牌上限+X（X为你装备区内的牌数）。', sp_maojie:'毛玠', bingqing:'秉清', - bingqing_info:'当你于出牌阶段内使用的牌结算结束后，若你于本阶段内使用的所有其他牌与此牌花色均不相同，则你可根据X的值执行对应效果：为2，你令一名角色摸两张牌；为3，你弃置一名角色区域内的一张牌；为4，你对一名其他角色造成1点伤害。（X为你本阶段内使用过的牌中包含的花色数）', + bingqing_info:'当你于出牌阶段内使用的牌结算结束后，若你于本阶段内使用的所有已结算结束的其他牌与此牌花色均不相同，则你可根据X的值执行对应效果：为2，你令一名角色摸两张牌；为3，你弃置一名角色区域内的一张牌；为4，你对一名其他角色造成1点伤害。（X为你本阶段内使用过的已结算结束的牌中包含的花色数）', yingfeng:'迎奉', yingfeng_info:'准备阶段，你可以令一名角色获得“奉”标记并移除场上所有其他的“奉”标记。有“奉”标记的角色使用牌没有距离限制。', xin_sunxiu:'手杀孙休',