From ce5fdfbb71016f6416399dd315fb03b8e489fdca Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sun, 18 Sep 2022 12:45:23 +0800 Subject: [PATCH] v1.9.115.2.1 --- character/diy.js | 2 +- character/sp.js | 7 ++++++- character/sp2.js | 2 +- game/game.js | 6 +++--- game/update.js | 26 +++++++++++++------------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/character/diy.js b/character/diy.js index d5127df31..b13252de8 100755 --- a/character/diy.js +++ b/character/diy.js @@ -609,7 +609,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var target=result.targets[0]; event.target=target; player.logSkill('nstuilun_effect',target); - if(!target.countCards('he')) event._result={index:1}; + if(!target.countCards('he')) event._result={index:0}; else player.chooseControl('摸一张牌','弃置一张牌').set('prompt','令'+get.translation(target)+'…').set('ai',function(player){ var evt=_status.event; return get.attitude(evt.player,evt.getParent().target)>0?0:1; diff --git a/character/sp.js b/character/sp.js index b3ada993e..3fb9e1ca1 100755 --- a/character/sp.js +++ b/character/sp.js @@ -1708,6 +1708,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:['phaseZhunbeiBegin','damageEnd']}, direct:true, filter:function(event,player){ + if(event.name=='damage'){ + var history=player.getHistory('damage'); + if(history.indexOf(event)!=0) return false; + } var storage1=player.storage.luochong_round,storage2=player.getStorage('luochong'); if(!storage1) storage1=[[],[]]; for(var i=0;i<4;i++){ @@ -4481,6 +4485,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ isCard:true, }, position:'he', + ignoreMod:true, check:function(card){ var player=_status.event.player,color=get.color(card,player); if(player.countCards('he',{color:color})<=player.countMark('jinzhi2')||(ui.selected.cards.length&&get.color(ui.selected.cards[0],player)!=color)) return -1; @@ -18535,7 +18540,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sppanqin_info:'出牌阶段或弃牌阶段结束时，你可将你于本阶段内弃置且位于弃牌堆的所有牌当做【南蛮入侵】使用。然后若此牌对应的实体牌数不大于此牌的目标数，则你执行并移除〖蛮王〗中的最后一个选项。', tengfanglan:'滕芳兰', luochong:'落宠', - luochong_info:'准备阶段开始时/当你受到伤害后，你可选择本轮内未选择过的一项（每名角色每轮限选一次）：⒈令一名角色回复1点体力。⒉令一名角色失去1点体力。⒊令一名角色弃置两张牌。⒋令一名角色摸两张牌。', + luochong_info:'准备阶段开始时/当你于一回合内首次受到伤害后，你可选择本轮内未选择过的一项（每名角色每轮限选一次）：⒈令一名角色回复1点体力。⒉令一名角色失去1点体力。⒊令一名角色弃置两张牌。⒋令一名角色摸两张牌。', aichen:'哀尘', aichen_info:'锁定技。当你进入濒死状态时，若〖落宠〗中的剩余选项数大于1，则你选择移去〖落宠〗中的一个选项。', weizi:'卫兹', diff --git a/character/sp2.js b/character/sp2.js index 9f06d62bb..bc298c43b 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -707,7 +707,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(!i.isIn()) return; } } - var next=player.useCard(get.copy(card),trigger.targets); + var next=player.useCard(get.copy(card),trigger.targets,false); if(trigger.addedTarget) next.addedTarget=trigger.addedTarget; if(trigger.addedTargets&&trigger.addedTargets.length) next.addedTargets=trigger.addedTargets.slice(0); if(event.count>0) event.redo(); diff --git a/game/game.js b/game/game.js index 7bd047e02..be9504fe9 100644 --- a/game/game.js +++ b/game/game.js @@ -12880,8 +12880,8 @@ } } var range=get.select(event.selectCard); - game.check(); if(event.isMine()){ + game.check(); if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){ ui.click.cancel(); return; @@ -13493,8 +13493,8 @@ event.dialog.style.display=''; event.dialog.open(); } - game.check(); if(event.isMine()){ + game.check(); if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){ ui.click.cancel(); return; @@ -13680,8 +13680,8 @@ }; } else{ - game.check(); if(event.isMine()){ + game.check(); game.pause(); if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){ ui.click.cancel(); diff --git a/game/update.js b/game/update.js index 963951f5a..2d8c8d368 100644 --- a/game/update.js +++ b/game/update.js @@ -1,6 +1,6 @@ window.noname_update={ - version:'1.9.115.2', - update:'1.9.115.1', + version:'1.9.115.2.1', + update:'1.9.115.2', changeLog:[ '李密入选稿公布', 'OL界荀彧', @@ -11,12 +11,12 @@ window.noname_update={ files:[ //'card/extra.js', //'card/gujian.js', - 'card/guozhan.js', + //'card/guozhan.js', //'card/gwent.js', //'card/huanlekapai.js', //'card/mtg.js', //'card/sp.js', - 'card/standard.js', + //'card/standard.js', //'card/swd.js', //'card/yunchou.js', //'card/yingbian.js', @@ -24,20 +24,20 @@ window.noname_update={ //'card/zhenfa.js', //'card/zhulu.js', 'character/diy.js', - 'character/extra.js', + //'character/extra.js', //'character/hearth.js', //'character/gujian.js', //'character/gwent.js', //'character/hearth.js', - 'character/mobile.js', + //'character/mobile.js', //'character/mtg.js', //'character/offline.js', //'character/old.js', //'character/ow.js', - 'character/rank.js', - 'character/refresh.js', - 'character/sb.js', - 'character/shenhua.js', + //'character/rank.js', + //'character/refresh.js', + //'character/sb.js', + //'character/shenhua.js', 'character/sp.js', 'character/sp2.js', //'character/standard.js', @@ -45,8 +45,8 @@ window.noname_update={ //'character/swd.js', //'character/xianjian.js', //'character/xinghuoliaoyuan.js', - 'character/yingbian.js', - 'character/yijiang.js', + //'character/yingbian.js', + //'character/yijiang.js', //'character/yxs.js', //'extension/boss/extension.js', //'layout/default/layout.css', @@ -59,7 +59,7 @@ window.noname_update={ //'mode/chess.js', //'mode/connect.js', //'mode/doudizhu.js', - 'mode/guozhan.js', + //'mode/guozhan.js', //'mode/identity.js', //'mode/single.js', //'mode/stone.js',