From cb6b81e7b5e7282970c04c251672219c7bd8f987 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sat, 12 Nov 2022 19:47:23 +0800 Subject: [PATCH] v1.9.116.3 --- audio/skill/tongqu1.mp3 | Bin 0 -> 13061 bytes audio/skill/tongqu2.mp3 | Bin 0 -> 13270 bytes card/extra.js | 2 +- card/guozhan.js | 10 +- character/mobile.js | 3 +- character/rank.js | 4 + character/refresh.js | 15 +- character/sp.js | 197 ++++-- character/sp2.js | 119 +++- character/yijiang.js | 5 +- character/yingbian.js | 20 +- game/asset.js | 4 +- game/game.js | 60 +- game/update.js | 33 +- image/character/guanhai.jpg | Bin 0 -> 84482 bytes image/character/huojun.jpg | Bin 0 -> 85668 bytes mode/guozhan.js | 1310 ++++++++++++++++++++++++++++++----- 17 files changed, 1502 insertions(+), 280 deletions(-) create mode 100644 audio/skill/tongqu1.mp3 create mode 100644 audio/skill/tongqu2.mp3 create mode 100644 image/character/guanhai.jpg create mode 100644 image/character/huojun.jpg diff --git a/audio/skill/tongqu1.mp3 b/audio/skill/tongqu1.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..faa825d06b660873386c13c73ffd92295335105f GIT binary patch literal 13061 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 OS$nhp$HM!cAO0Uknq5`^ literal 0 HcmV?d00001 diff --git a/card/extra.js b/card/extra.js index 54f8c056e..1533feea0 100644 --- a/card/extra.js +++ b/card/extra.js @@ -664,7 +664,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ player.updateMarks(); }, }, - huogong2:{}, + huogong2:{charlotte:true}, jiu:{ trigger:{player:'useCard1'}, filter:function(event){ diff --git a/card/guozhan.js b/card/guozhan.js index f28f87f5c..abee94516 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -644,7 +644,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ },targets); } } - }, + },/* contentBefore:function(){ if(get.mode()=='guozhan'){ var evt=event.getParent(); @@ -655,11 +655,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){ evt.targets.push(player); } } - }, + },*/ content:function(){ 'step 0' if(get.mode()!='guozhan'){ - if(player==target) target.draw(game.players.length); + if(player==target) target.draw(game.filterPlayer().length); else target.chooseDrawRecover(true); event.finish(); } @@ -1830,8 +1830,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){ lulitongxin_info:'出牌阶段，对所有大势力角色或所有小势力角色使用。若目标角色：不处于“连环状态”，其横置；处于“连环状态”，其摸一张牌', lulitongxin_info_versus:'出牌阶段，对所有敌方角色或所有己方角色使用。若目标角色：为敌方角色且不处于“连环状态”，其横置；为己方角色且处于“连环状态”，其摸一张牌。', lianjunshengyan:'联军盛宴', - lianjunshengyan_info:'出牌阶段，对你和你选择的除你的势力外的一个势力的所有角色。若目标角色：为你，你选择摸Y张牌并回复X-Y点体力（X为该势力的角色数，Y∈[0,X]）；不为你，其摸一张牌，然后重置。', - lianjunshengyan_info_boss:'出牌阶段，对场上所有角色使用。你摸X张牌（X为目存活角色数），其他角色依次选择回复1点体力或摸一张牌。', + lianjunshengyan_info:'出牌阶段，对你和你选择的除你的势力外的一个势力的所有角色使用。若目标角色：为你，你选择摸Y张牌并回复X-Y点体力（X为该势力的角色数，Y∈[0,X]）；不为你，其摸一张牌，然后重置。', + lianjunshengyan_info_boss:'出牌阶段，对场上所有角色使用。你摸X张牌（X为存活角色数），其他角色依次选择回复1点体力或摸一张牌。', chiling:'敕令', chiling_info:'出牌阶段，对所有没有势力的角色使用。目标角色选择一项：1、明置一张武将牌，然后摸一张牌；2、弃置一张装备牌；3、失去1点体力。当【敕令】因判定或弃置而置入弃牌堆时，系统将之移出游戏并将【诏书】置于牌堆底，然后系统于当前回合结束后视为对所有没有势力的角色使用【敕令】。', diaohulishan:'调虎离山', diff --git a/character/mobile.js b/character/mobile.js index ed2b6bcb2..bc8fb1196 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -14900,7 +14900,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var switchToAuto=function(){ game.pause(); game.countChoose(); - setTimeout(function(){ + event.timeout=setTimeout(function(){ _status.imchoosing=false; event._result={ bool:true, @@ -14947,6 +14947,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var skip=function(){ if(event.pingcai_delayed){ delete event.pingcai_delayed; + clearTimeout(event.timeout); event._result={ bool:true, }; diff --git a/character/rank.js b/character/rank.js index 76b108eaf..096aac82b 100644 --- a/character/rank.js +++ b/character/rank.js @@ -272,6 +272,7 @@ window.noname_character_rank={ 'ol_puyuan', 'ns_limi', 'jin_zhouchu', + 'huojun', 'key_misuzu', 'key_sunohara', 'key_umi', @@ -810,6 +811,7 @@ window.noname_character_rank={ 'niufu', 're_liufeng', 'huzhao', + 'guanhai', ], b:[ 'diy_feishi', @@ -1406,6 +1408,7 @@ window.noname_character_rank={ 'shen_sunquan', 'shen_machao', 'tw_shen_guanyu', + 'huojun', 'key_tomoya', 'key_masato', 'key_shiorimiyuki', @@ -2023,6 +2026,7 @@ window.noname_character_rank={ 'caoxiancaohua', 'huzhao', 're_liufeng', + 'guanhai', ], junk:[ 'sunshao', diff --git a/character/refresh.js b/character/refresh.js index 179ff2fa0..5bd9e9b7c 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -4045,8 +4045,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ filter:function(event,player,name){ if(name=='damageEnd') return true; if(!event.card) return false; - var evt=event.getParent(); - return evt&&evt.card==event.card&&evt.type=='card'&&evt.targets&&evt.targets.length==1; + if(player.hasHistory('useSkill',function(evt){ + return evt.skill=='gzquanji'&&evt.event.triggername==name; + })) return false; + return true; }, content:function(){ 'step 0' @@ -4104,7 +4106,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ result:{ target:function(player,target){ if(target!=player) return 0; - if(player.needsToDiscard()&&!player.getEquip('zhuge')&&!player.hasSkill('new_paoxiao')) return 0; + if(player.getExpansions('gzquanji').length<=1||(player.needsToDiscard()&&!player.getEquip('zhuge')&&!player.hasSkill('new_paoxiao'))) return 0; return 1; } }, @@ -4118,7 +4120,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var card=lib.skill.gzpaiyi_backup.card; player.loseToDiscardpile(card); "step 1" - target.draw(2); + var num=player.getExpansions('gzquanji').length; + if(num>0) target.draw(num); "step 2" if(target.countCards('h')>player.countCards('h')){ target.damage(); @@ -12459,10 +12462,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ xinjiefan:'解烦', xinjiefan_info:'限定技，出牌阶段，你可以选择一名角色，令攻击范围内含有该角色的所有角色依次选择一项：1.弃置一张武器牌；2.令其摸一张牌。然后若游戏轮数为1，则你于此回合结束时恢复此技能。', gzquanji:'权计', - gzquanji_info:'当你受到伤害后或当你使用牌指定唯一目标并对其造成伤害后，你可以摸一张牌，然后你将一张牌置于武将牌上，称为“权”；你的手牌上限+X（X为“权”的数量）。', + gzquanji_info:'每回合每项各限一次。当你受到伤害后或造成伤害后，你可以摸一张牌，然后你将一张牌置于武将牌上，称为“权”；你的手牌上限+X（X为“权”的数量）。', gzpaiyi:'排异', gzpaiyi_backup:'排异', - gzpaiyi_info:'出牌阶段限两次。你可以移去一张“权”，然后选择一名角色并令其摸两张牌。若其手牌数大于你，则你对其造成1点伤害。', + gzpaiyi_info:'出牌阶段限一次。你可以移去一张“权”并选择一名角色。令其摸X张牌（X为你的“权”数且至多为7）。然后若其手牌数大于你，则你对其造成1点伤害。', ol_zhurong:'界祝融', changbiao:'长标', changbiao_info:'出牌阶段限一次，你可以将任意张手牌当做【杀】使用（无距离限制）。若你因此【杀】对目标角色造成过伤害，则你于出牌阶段结束时摸X张牌（X为此【杀】对应的实体牌数量）。', diff --git a/character/sp.js b/character/sp.js index ea4ec7dd3..4bfc99fd8 100755 --- a/character/sp.js +++ b/character/sp.js @@ -10,7 +10,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sp_tianzhu:["wutugu","yanbaihu","shamoke","panfeng","zhugedan",'huangzu','gaogan',"tadun"], sp_nvshi:["lingju","guanyinping","zhangxingcai","mayunlu","dongbai","zhaoxiang",'ol_zhangchangpu','ol_xinxianying',"daxiaoqiao"], sp_shaowei:["simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','ol_puyuan'], - sp_huben:["caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","fanjiangzhangda"], + sp_huben:["caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","fanjiangzhangda","huojun"], sp_liesi:['mizhu','weizi'], sp_default:["sp_diaochan","sp_zhaoyun","sp_sunshangxiang","sp_caoren","sp_jiangwei","sp_machao","sp_caiwenji","jsp_guanyu","jsp_huangyueying","sp_pangde","sp_jiaxu","yuanshu",'sp_zhangliao','sp_ol_zhanghe','sp_menghuo'], sp_qifu:["caoying",'panshu',"caochun","yuantanyuanshang",'caoshuang','wolongfengchu','guansuo','baosanniang','fengfangnv','jin_zhouchu'], @@ -28,6 +28,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, character:{ + huojun:['male','shu',4,['qiongshou','fenrui']], caoxiancaohua:['female','qun',3,['huamu','qianmeng','liangyuan','jisi']], jin_zhouchu:['male','jin',4,['shanduan','yilie']], zhaoyǎn:['male','wei',4,['tongxie']], @@ -649,6 +650,117 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, skill:{ + //霍峻 + qiongshou:{ + audio:2, + trigger:{ + player:'enterGame', + global:'phaseBefore', + }, + forced:true, + filter:function(event,player){ + if(event.name=='phase'&&game.phaseNumber!=0) return false; + return player.countDisabled()<5; + }, + content:function(){ + for(var i=1;i<6;i++){ + if(!player.isDisabled(i)) player.disableEquip(i); + } + player.draw(4); + }, + mod:{ + maxHandcard:function(player,num){ + return num+4; + }, + }, + ai:{ + halfneg:true, + combo:'fenrui', + threaten:3.2, + }, + }, + fenrui:{ + audio:2, + trigger:{player:'phaseJieshuBegin'}, + direct:true, + onremove:true, + filter:function(event,player){ + var es=player.countCards('e'); + return (player.countDisabled()>0&&player.countCards('he')>0)||(!player.storage.fenrui&&game.hasPlayer(function(current){ + return current!=player&¤t.countCards('e')0&&player.countCards('he')>0){ + var str='弃置一张牌，恢复一个装备栏并使用一张对应装备牌'; + player.chooseToDiscard('he',get.prompt('fenrui'),str).set('ai',function(card){ + return 7-get.value(card); + }).logSkill='fenrui'; + } + else event.goto(3); + 'step 1' + if(result.bool){ + player.chooseToEnable().set('ai',function(){ + var player=_status.event.player; + var list=[2,5,1,3,4]; + for(var i of list){ + if(player.isDisabled(i)) return 'equip'+i; + } + }); + } + else{ + var es=player.countCards('e'); + if(player.storage.fenrui||!game.hasPlayer(function(current){ + return current!=player&¤t.countCards('e')0&&game.hasPlayer(function(current){ + return current!=player&¤t.countCards('e')target.countCards('e'); + }).set('ai',function(target){ + var player=_status.event.player; + var num=player.countCards('h')-target.countCards('h'); + if(get.attitude(player,target)>=0) return 0; + if(num>=Math.min(2,player.hp,target.hp)) return get.damageEffect(target,player,player); + return 0; + }); + } + else event.finish(); + 'step 4' + if(result.bool){ + var target=result.targets[0]; + player.logSkill('fenrui_animate',target); + player.storage.fenrui=true; + player.unmarkSkill('fenrui'); + game.delayx(); + target.damage(player.countCards('e')-target.countCards('e')); + } + }, + group:'fenrui_animate', + mark:true, + intro:{content:'王炸尚未使用'}, + subSkill:{ + animate:{ + skillAnimation:true, + animationColor:'fire', + }, + }, + }, //曹宪曹华 huamu:{ audio:2, @@ -9267,23 +9379,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){ logTarget:function(){ return _status.currentPhase; }, + preHidden:true, content:function(){ "step 0" event.count=trigger.num; "step 1" event.count--; var source=_status.currentPhase; - if(source.hasSkill('rehengjiang2')){ - source.storage.rehengjiang2++; - source.storage.rehengjiang3.push(player); - source.storage.rehengjiang3.sortBySeat(source); - source.updateMarks(); - } - else{ - source.storage.rehengjiang3=[player]; - source.storage.rehengjiang2=1; - source.addTempSkill('rehengjiang2'); - } + source.addTempSkill('rehengjiang2'); + source.addMark('rehengjiang2',1,false); + player.addTempSkill('rehengjiang3'); "step 2" if(event.count){ player.chooseBool(get.prompt2('rehengjiang',_status.currentPhase)).set('ai',function(){ @@ -9305,6 +9410,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ rehengjiang2:{ mark:true, charlotte:true, + onremove:true, intro:{ content:'手牌上限-#' }, @@ -9313,34 +9419,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return num-player.storage.rehengjiang2; } }, - onremove:function(player){ - delete player.storage.rehengjiang2; - delete player.storage.rehengjiang3; - }, - trigger:{player:'phaseDiscardEnd'}, - filter:function(event,player){ - if(event.cards&&event.cards.length) return false; - var players=player.storage.rehengjiang3; - for(var i=0;i0&&evt.getParent('phaseDiscard').player==event.player; + })) return false; + return true; + }, + logTarget:'player', content:function(){ - var players=player.storage.rehengjiang3; - var list=[]; - for(var i=0;i0) player.draw(num); + }, }, shuangren:{ trigger:{player:'phaseUseBegin'}, @@ -15545,7 +15643,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ check:function(event,player){ var num=game.countPlayer(function(current){ if(current.isLinked()&¤t.countCards('he')){ - return get.attitude(player,current); + return get.effect(current,{name:'guohe_copy2'},player,player); } }); return num<0; @@ -15589,13 +15687,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){ enable:'phaseUse', usable:1, audio:2, + filter:function(event,player){ + return !player.isLinked()&&game.hasPlayer(function(current){ + return current!=player&¤t.isLinked(); + }) + }, filterTarget:function(card,player,target){ return player!=target&&!target.isLinked(); }, + selectTarget:function(){ + return [1,Math.max(1,_status.event.player.getDamagedHp())]; + }, content:function(){ - "step 0" if(!target.isLinked()) target.link(); - "step 1" + }, + contentAfter:function(){ if(!player.isLinked()) player.link(); }, ai:{ @@ -18460,6 +18566,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ huangchengyan:['huangchengyan','dc_huangchengyan'], puyuan:['puyuan','ol_puyuan'], huangzu:['dc_huangzu','huangzu'], + huojun:['huojun','tw_huojun'], }, translate:{ "xinfu_lingren":"凌人", @@ -18783,6 +18890,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ hengjiang_info:'当你受到1点伤害后，你可以令当前回合角色本回合的手牌上限-1。然后若其弃牌阶段内没有弃牌，则你摸一张牌。', rehengjiang:'横江', rehengjiang2:'横江', + rehengjiang3:'横江', rehengjiang_info:'当你受到1点伤害后，你可以令当前回合角色本回合的手牌上限-1。然后若其弃牌阶段内没有弃牌，则你摸X张牌（X为你本回合内对其发动过〖横江〗的次数）。', shuangren:'双刃', shuangren_info:'出牌阶段开始时，你可以与一名角色拼点。若你赢，你视为对其或与其势力相同的另一名角色使用一张【杀】（不计入出牌阶段的次数限制）；若你没赢，你本回合内不能对其他角色使用牌。', @@ -19127,7 +19235,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yongjue_info:'每回合限一次。当其他角色于回合内使用的【杀】结算完成后，若你不是此【杀】的目标角色，则你可以获得之。', guixiu_info:'当你成为【杀】的目标后，若你的手牌数小于体力值，则你可以摸一张牌。', fenming_info:'结束阶段开始时，若你处于横置状态，你可以弃置所有处于横置状态的角色的各一张牌。', - duanxie_info:'出牌阶段限一次，你可以令一名其他角色横置，若如此做，你横置。', + duanxie_info:'出牌阶段限一次，你可以令至多X名其他角色横置（X为你已损失的体力值且至少为1），然后你横置。', xiaoguo_info:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌，然后你摸一张牌；2.受到你对其造成的1点伤害。', sijian_info:'当你失去最后的手牌时，你可以弃置一名其他角色的一张牌。', suishi_info:'当其他角色进入濒死状态时，伤害来源可以令你摸一张牌；当其他角色死亡时，伤害来源可以令你失去1点体力', @@ -19431,6 +19539,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ liangyuan_info:'每轮每项各限一次。你可以将场上所有的“灵杉”/“玉树”置于处理区，然后将这些牌当做【酒】/【桃】使用。', jisi:'羁肆', jisi_info:'限定技。准备阶段，你可以令一名其他角色获得你武将牌上的一个已发动过的其他技能。然后你弃置所有手牌，并视为对其使用一张【杀】（无距离关系的限制）。', + huojun:'霍峻', + qiongshou:'穷守', + qiongshou_info:'锁定技。①游戏开始时，你废除所有装备栏并摸四张牌。②你的手牌上限+4。', + fenrui:'奋锐', + fenrui_info:'结束阶段，你可以弃置一张牌并恢复一个装备栏。系统检索一张对应的装备牌，你使用之。然后你可以选择一名装备区内牌数小于你的其他角色，对其造成X点伤害（X为你与其装备区内的牌数之差，且每局限一次）。', sp_tianji:'天极·皇室宗亲', sp_sibi:'四弼·辅国文曲', diff --git a/character/sp2.js b/character/sp2.js index a768cf4a6..86c73c6ab 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -4,6 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ name:'sp2', connect:true, character:{ + guanhai:['male','qun',4,['suoliang','qinbao']], huzhao:['male','wei',3,['midu','xianwang']], niufu:['male','qun','4/7',['dcxiaoxi','xiongrao']], bianxi:['male','wei',4,['dunxi']], @@ -178,6 +179,65 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, skill:{ + //管亥 + suoliang:{ + audio:2, + trigger:{source:'damageSource'}, + logTarget:'player', + usable:1, + filter:function(event,player){ + return event.player!=player&&event.player.maxHp>0&&event.player.countCards('he')>0; + }, + check:function(event,player){ + return get.attitude(player,event.player)<=0; + }, + content:function(){ + 'step 0' + var target=trigger.player; + event.target=target; + player.choosePlayerCard(target,true,'he',[1,target.maxHp],'选择'+get.translation(target)+'的至多'+get.cnNumber(target.maxHp)+'张牌'); + 'step 1' + if(result.bool){ + var cards=result.cards.filter(function(card){ + var suit=get.suit(card,target); + if(suit!='heart'&&suit!='club') return false; + return lib.filter.canBeGained(card,target,player) + }); + if(cards.length) player.gain(cards,target,'giveAuto','bySelf'); + else{ + var cards=result.cards.filter(function(card){ + return lib.filter.canBeDiscarded(card,target,player) + }); + if(cards.length) target.discard(cards,'notBySelf'); + } + } + }, + }, + qinbao:{ + audio:2, + trigger:{player:'useCard'}, + forced:true, + filter:function(event,player){ + return (event.card.name=='sha'||get.type(event.card,null,false)=='trick')&&game.hasPlayer(function(current){ + return current!=player&¤t.countCards('h')>=player.countCards('h'); + }); + }, + content:function(){ + var hs=player.countCards('h'); + trigger.directHit.addArray(game.filterPlayer(function(current){ + return current!=player&¤t.countCards('h')>=hs; + })); + }, + ai:{ + threaten:1.4, + directHit_ai:true, + skillTagFilter:function(player,tag,arg){ + return player.countCards('h',function(card){ + return !ui.selected.cards.contains(card); + })<=arg.target.countCards('h'); + }, + }, + }, //胡昭 midu:{ audio:2, @@ -661,9 +721,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ ai:{ order:1, result:{ - target:function(player,target){ + player:function(player,target){ var eff=get.recoverEffect(target,player,player); - if(target.getDamagedHp()>1) eff+=get.effect(target,{name:'wuzhong'},player,target)/2; + if(target.getDamagedHp()>1) eff+=get.effect(target,{name:'wuzhong'},player,player)/2; return eff; }, }, @@ -714,21 +774,54 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, subSkill:{ gain:{ - trigger:{global:'loseAfter'}, + trigger:{global:['loseAfter','cardsDiscardAfter']}, forced:true, - logTarget:'player', + logTarget:()=>_status.currentPhase, filter:function(event,player){ - if(event.type!='discard'||event.player!=_status.currentPhase) return false; + var current=_status.currentPhase; + if(!current) return false; + if(event.name=='cardsDiscard'){ + var evtx=event.getParent(); + if(evtx.name!='orderingDiscard') return false; + var evtx2=(evtx.relatedEvent||evtx.getParent()); + return current.hasHistory('lose',function(evtx3){ + var evtx4=evtx3.relatedEvent||evtx3.getParent(); + if(evtx2!=evtx4) return false; + for(var i in evtx3.gaintag_map){ + if(evtx3.gaintag_map[i].contains('dcliuzhuan_tag')) return true; + } + }); + } + if(event.player!=current||event.position!=ui.discardPile) return false; for(var i in event.gaintag_map){ if(event.gaintag_map[i].contains('dcliuzhuan_tag')) return true; } return false; }, content:function(){ - var cards=trigger.hs.filter(function(i){ - return trigger.gaintag_map[i.cardid]&&trigger.gaintag_map[i.cardid].contains('dcliuzhuan_tag'); + var cards,current=_status.currentPhase; + if(trigger.name=='lose') cards=trigger.hs.filter(function(i){ + return trigger.gaintag_map[i.cardid]&&trigger.gaintag_map[i.cardid].contains('dcliuzhuan_tag')&&get.position(i,true)=='d'; }); - if(cards.length>0) player.gain(cards,'gain2'); + else{ + var evtx=trigger.getParent();; + var evtx2=(evtx.relatedEvent||evtx.getParent()); + var bool=false; + var history=current.getHistory('lose',function(evtx3){ + var evtx4=evtx3.relatedEvent||evtx3.getParent(); + if(evtx2!=evtx4) return false; + for(var i in evtx3.gaintag_map){ + if(evtx3.gaintag_map[i].contains('dcliuzhuan_tag')) return true; + } + }); + cards=trigger.cards.filter(function(i){ + for(var evt of history){ + if(evt.gaintag_map[i.cardid]&&evt.gaintag_map[i.cardid].contains('dcliuzhuan_tag')&&get.position(i,true)=='d') return true; + } + return false; + }); + } + if(cards&&cards.length>0) player.gain(cards,'gain2'); }, }, mark:{ @@ -2417,7 +2510,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ 'step 2' player.addToExpansion(result.cards,target,'give').gaintag.add('yuanyu'); 'step 3' - if(event.count>0&&target.countCards('he')>0&&player.hasSkill('yuanyu_damage')) event.goto(1); + if(event.count>0&&target.countCards('h')>0&&player.hasSkill('yuanyu_damage')) event.goto(1); }, }, }, @@ -17214,6 +17307,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ bianxi:'小说《三国演义》里的人物。汜水关守将，并州人氏。原是黄巾余党，后投曹操，拨来守汜水关。善使流星锤。在镇国寺设下伏兵欲谋害千里寻兄的关羽，但是寺中僧人普净暗示加以解救。最后被关羽斩杀。', niufu:'牛辅，东汉末年武将，东汉相国董卓的女婿。曾任中郎将，征讨白波军，不能取胜。董卓被杀时，牛辅别屯于陕地。吕布派李肃前去征讨牛辅，被牛辅击败。后来，牛辅营中有士兵半夜背叛出逃，造成内乱，牛辅以为整营皆叛，于是带着金银珠宝，独与亲信胡赤儿等五六人逾城北渡河。赤儿等人以绳索系在牛辅腰间将其从城头放下，但赤儿等因为谋财而在离地面数丈高的地方就松开了绳子使得牛辅重重摔在地上腰部受伤，而后赤儿与诸胡人将牛辅斩首，将其首级送去长安。', huzhao:'胡昭（162年－250年），字孔明，颍川（治今河南禹州）人。汉末三国时期隐士、书法家。胡昭善长隶书，与钟繇、邯郸淳、卫觊、韦诞齐名。有“钟氏小巧，胡氏豪放”之说，世人并称“钟胡”。', + guanhai:'管亥（生卒年不详），青州黄巾军渠帅，率军侵略北海，围北海相孔融于都昌。孔融派遣太史慈突围而出，前往平原向刘备求援，刘备率军来到，击退管亥。《三国演义》中管亥在单挑中为关羽斩杀。', }, characterTitle:{ wulan:'#b对决限定武将', @@ -18172,7 +18266,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dczhubi_info:'当有♦牌因弃置而进入弃牌堆后，你可以令系统从牌堆/弃牌堆中检索一张【无中生有】，并将此牌置于牌堆顶。', dcliuzhuan:'流转', dcliuzhuan_tag:'转', - dcliuzhuan_info:'锁定技。①其他角色于其回合内不于摸牌阶段而获得的牌称为“转”。②你不能成为实体牌中包含“转”的牌的目标。③当有“转”因弃置而进入弃牌堆后，你获得之。', + dcliuzhuan_info:'锁定技。①其他角色于其回合内不于摸牌阶段而获得的牌称为“转”。②你不能成为实体牌中包含“转”的牌的目标。③当有“转”直接进入弃牌堆或经由处理区进入弃牌堆后，你获得之。', xiahoulingnv:'夏侯令女', fuping:'浮萍', fuping_info:'①其他角色对你使用的结算结束后，若你未因此技能记录过此牌的名称且你有未废除的装备栏，则你可以废除一个装备栏，记录此牌的名称。②每回合每种牌名限一次。你可以将一张非基本牌当做〖浮萍①〗记录过的基本牌或锦囊牌使用或打出。③若你的所有装备栏均已被废除，则你使用牌无距离限制。', @@ -18191,6 +18285,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ midu_info:'出牌阶段限一次。你可以选择一项：⒈废除任意个装备栏，并令一名角色摸等量的牌。⒉恢复一个已经被废除的装备栏，然后你获得〖活墨〗直到下回合开始。', xianwang:'贤望', xianwang_info:'锁定技。若你有被废除的装备栏，则其他角色至你的距离+1；若废除的装备栏数大于2，则改为距离+2。', + guanhai:'管亥', + suoliang:'索粮', + suoliang_info:'每回合限一次。当你对其他角色造成伤害后，你可以选择其的至多X张牌（X为其体力上限且至多为5）。若这些牌中有♥或♣牌，则你获得这些牌；否则你弃置这些牌。', + qinbao:'侵暴', + qinbao_info:'锁定技。当你使用【杀】或普通锦囊牌时，你令所有手牌数不小于你的角色不能响应此牌。', sp_whlw:"文和乱武", sp_zlzy:"逐鹿中原", diff --git a/character/yijiang.js b/character/yijiang.js index 1a37f19fb..bbbe2f798 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -380,7 +380,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:'bingyi', trigger:{player:'loseAfter'}, filter:function(event,player){ - return event.type=='discard'&&player.countCards('h')>0&&!player.hasSkill('olbingyi_blocker',null,null,false); + return event.type=='discard'&&event.cards2.length>0&&player.countCards('h')>0&&!player.hasSkill('olbingyi_blocker',null,null,false); }, prompt2:function(event,player){ var str='展示所有手牌，然后',hs=player.getCards('h'); @@ -3002,6 +3002,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ markcount:'expansion', }, frequent:true, + locked:false, content:function(){ player.addToExpansion(get.cards(),'gain2').gaintag.add('bizhuan'); }, @@ -3912,7 +3913,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } } else{ - if(event.num10; }, + preHidden:true, content:function(){ trigger.targets.push(player); game.log(player,'也成为了',trigger.card,'的目标'); @@ -3173,7 +3177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ pozhu:{ enable:'phaseUse', viewAsFilter:function(player){ - return !player.hasSkill('pozhu3')&&player.countCards('hs')>0; + return !player.hasSkill('pozhu3',null,null,false)&&player.countCards('hs')>0; }, viewAs:{name:'chuqibuyi'}, filterCard:true, @@ -3195,7 +3199,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.addTempSkill('pozhu3'); }, }, - pozhu3:{}, + pozhu3:{charlotte:true}, xijue:{ audio:2, trigger:{ @@ -3488,7 +3492,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ characterFilter:{}, dynamicTranslate:{}, perfectPair:{ - jin_simayi:['jin_zhangchunhua','shibao'], + jin_simayi:['jin_zhangchunhua','shibao','duyu'], jin_simazhao:['jin_wangyuanji'], jin_simashi:['jin_xiahouhui','jin_yanghuiyu'], }, diff --git a/game/asset.js b/game/asset.js index 67c44aa5a..f96246a25 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.9.116.2', + 'v1.9.116.3', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', @@ -5070,6 +5070,8 @@ window.noname_asset_list=[ 'image/card/zhuangshu_trick.png', 'image/card/zhuangshu_equip.png', + 'image/character/guanhai.jpg', + 'image/character/huojun.jpg', 'image/character/bianxi.jpg', 'image/character/huzhao.jpg', 'image/character/niufu.jpg', diff --git a/game/game.js b/game/game.js index 056b9a65d..56e110e98 100644 --- a/game/game.js +++ b/game/game.js @@ -1,5 +1,9 @@ "use strict"; (function(){ + if(!localStorage.getItem('noname_alerted')){ + localStorage.setItem('noname_alerted',true); + alert('无名杀官方发布地址仅有GitHub仓库！\n其他所有的所谓“无名杀”社群（包括但不限于绝大多数“官方”QQ群、QQ频道等）均为粉丝自发组织，与无名杀官方无关！'); + } var _status={ paused:false, paused2:false, @@ -2827,7 +2831,7 @@ node.style.fontFamily=link; } else{ - node.style.fontFamily="'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif"; + node.style.fontFamily="'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei','Suits',Helvetica,Arial,sans-serif"; } node.style.fontSize='20px'; }, @@ -6665,6 +6669,7 @@ globalId:0, }, help:{ + '关于游戏':'
关于无名杀