From 1c93b97474b7ea22bcc01fb9e8e1fbab5ddc6cba Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 10 Aug 2018 17:29:29 +0800 Subject: [PATCH] zuoci --- .../{luoying11.mp3 => luoying_discard1.mp3} | Bin .../{luoying12.mp3 => luoying_discard2.mp3} | Bin .../{luoying21.mp3 => luoying_judge1.mp3} | Bin .../{luoying22.mp3 => luoying_judge2.mp3} | Bin character/diy.js | 22 +- character/extra.js | 22 +- character/hearth.js | 4 +- character/shenhua.js | 86 ++-- character/sp.js | 22 +- character/yijiang.js | 112 ++--- game/asset.js | 13 +- game/directory.js | 16 + game/game.js | 288 +++++++++---- game/update.js | 24 +- image/character/liqueguosi.jpg | Bin 0 -> 43736 bytes image/skin/zuoci/4.jpg | Bin 0 -> 65501 bytes mode/guozhan.js | 381 +++++++++++++++++- 17 files changed, 722 insertions(+), 268 deletions(-) rename audio/skill/{luoying11.mp3 => luoying_discard1.mp3} (100%) rename audio/skill/{luoying12.mp3 => luoying_discard2.mp3} (100%) rename audio/skill/{luoying21.mp3 => luoying_judge1.mp3} (100%) rename audio/skill/{luoying22.mp3 => luoying_judge2.mp3} (100%) create mode 100644 image/character/liqueguosi.jpg create mode 100644 image/skin/zuoci/4.jpg diff --git a/audio/skill/luoying11.mp3 b/audio/skill/luoying_discard1.mp3 similarity index 100% rename from audio/skill/luoying11.mp3 rename to audio/skill/luoying_discard1.mp3 diff --git a/audio/skill/luoying12.mp3 b/audio/skill/luoying_discard2.mp3 similarity index 100% rename from audio/skill/luoying12.mp3 rename to audio/skill/luoying_discard2.mp3 diff --git a/audio/skill/luoying21.mp3 b/audio/skill/luoying_judge1.mp3 similarity index 100% rename from audio/skill/luoying21.mp3 rename to audio/skill/luoying_judge1.mp3 diff --git a/audio/skill/luoying22.mp3 b/audio/skill/luoying_judge2.mp3 similarity index 100% rename from audio/skill/luoying22.mp3 rename to audio/skill/luoying_judge2.mp3 diff --git a/character/diy.js b/character/diy.js index c8a572204..40d015f29 100644 --- a/character/diy.js +++ b/character/diy.js @@ -2246,24 +2246,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){ skillAnimation:true, animationColor:'water', unique:true, - mark:true, - init:function(player){ - player.storage.nshaoling=false; - }, + limited:true, enable:'phaseUse', - filter:function(event,player){ - return !player.storage.nshaoling; - }, - intro:{ - content:'limited' - }, filterTarget:function(card,player,target){ return target!=player; }, content:function(){ "step 0" player.awakenSkill('nshaoling'); - player.storage.nshaoling=true; event.targets=game.filterPlayer(); event.targets.remove(player); event.targets.remove(target); @@ -4069,15 +4059,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ guihan:{ unique:true, enable:'chooseToUse', - mark:true, skillAnimation:'epic', - init:function(player){ - player.storage.guihan=false; - }, + limited:true, filter:function(event,player){ if(event.type!='dying') return false; if(player!=event.dying) return false; - if(player.storage.guihan) return false; return true; }, filterTarget:function(card,player,target){ @@ -4087,7 +4073,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ "step 0" player.awakenSkill('guihan'); player.recover(); - player.storage.guihan=true; "step 1" player.draw(2); "step 2" @@ -4115,9 +4100,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ threaten:function(player,target){ if(!target.storage.guihan) return 0.8; } - }, - intro:{ - content:'limited' } }, luweiyan:{ diff --git a/character/extra.js b/character/extra.js index a697ce890..f1bdc0389 100644 --- a/character/extra.js +++ b/character/extra.js @@ -143,18 +143,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){ unique:true, enable:'phaseUse', filter:function(event,player){ - return !player.storage.shenfen&&player.storage.baonu>=6; - }, - init:function(player){ - player.storage.shenfen=false; + return player.storage.baonu>=6; }, skillAnimation:true, animationColor:'metal', - mark:true, + limited:true, content:function(){ "step 0" player.awakenSkill('shenfen'); - player.storage.shenfen=true; player.storage.baonu-=6; event.targets=game.filterPlayer(); event.targets.remove(player); @@ -175,9 +171,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ event.redo(); } }, - intro:{ - content:'limited' - }, ai:{ order:10, result:{ @@ -845,12 +838,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:3, animationColor:'fire', skillAnimation:'legend', - filter:function(event,player){ - return !player.storage.yeyan; - }, - init:function(player){ - player.storage.yeyan=false; - }, filterTarget:function(card,player,target){ var length=ui.selected.cards.length; return (length==0||length==4); @@ -863,7 +850,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return true; }, complexCard:true, - mark:true, + limited:true, selectCard:[0,4], line:'fire', check:function(){return -1}, @@ -884,9 +871,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ target.damage('fire','nocard'); } }, - intro:{ - content:'limited' - }, ai:{ order:1, result:{ diff --git a/character/hearth.js b/character/hearth.js index 670e009a4..807a8d4a5 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -7364,7 +7364,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ huanfeng:{ skillAnimation:'epic', animationColor:'thunder', - trigger:{player:'phaseBegin'}, + trigger:{player:'phaseBeginStart'}, forced:true, unique:true, filter:function(event,player){ @@ -7392,7 +7392,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ hs:get.cards(4) }); player.callSubPlayer(player.storage.huanfeng_end); - game.createTrigger('phaseBegin','shengdun',player,trigger); + // game.createTrigger('phaseBegin','shengdun',player,trigger); }, // group:'huanfeng_end', subSkill:{ diff --git a/character/shenhua.js b/character/shenhua.js index fa5fa0d20..868043886 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -43,6 +43,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zuoci:['male','qun',3,['huashen','xinsheng']], }, perfectPair:{ + jiaxu:['liqueguosi'], yuanshao:['yanwen'], menghuo:['zhurong'], sp_zhugeliang:['pangtong'], @@ -700,7 +701,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ unique:true, priority:-10, derivation:'guanxing', - trigger:{player:'phaseBegin'}, + trigger:{player:'phaseBeginStart'}, forced:true, filter:function(event,player){ if(player.storage.zhiji) return false; @@ -726,7 +727,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(player.hp>player.maxHp) player.hp=player.maxHp; player.update(); player.addSkill('guanxing'); - game.createTrigger('phaseBegin','guanxing',player,trigger); } }, xiangle:{ @@ -1196,7 +1196,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, derivation:['reyingzi','yinghun'], unique:true, - trigger:{player:'phaseBegin'}, + trigger:{player:'phaseBeginStart'}, filter:function(event,player){ return player.hp==1&&!player.storage.hunzi; }, @@ -1208,7 +1208,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.addSkill('yinghun'); player.awakenSkill('hunzi'); player.storage.hunzi=true; - game.createTrigger('phaseBegin','yinghun',player,trigger); }, ai:{ threaten:function(player,target){ @@ -1605,7 +1604,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, huashen2:{ audio:2, - trigger:{player:['phaseBegin','phaseEnd','huashenStart']}, + trigger:{player:['phaseBeginStart','phaseEnd','huashenStart']}, filter:function(event,player,name){ if(name=='phaseBegin'&&game.phaseNumber==1) return false; return true; @@ -1685,37 +1684,37 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } } - if(event.triggername=='phaseBegin'){ - (function(){ - var skills=[link]; - var list=[]; - game.expandSkills(skills); - var triggerevent=event._trigger; - var name='phaseBegin'; - for(i=0;igame.players.length*num&&game.showIdentity){ + if(!_status.video) player.popup('显示身份'); + _status.identityShown=true; + game.showIdentity(false); + } + } + player.ai.tempIgnore=[]; + player.stat.push({card:{},skill:{}}); + 'step 1' + event.trigger('phaseBeginStart'); + }, toggleSubPlayer:function(){ 'step 0' var list=event.list||player.storage.subplayer.skills.slice(0); @@ -9486,8 +9537,23 @@ }, createTrigger:function(){ "step 0" + if(player._hookTrigger){ + for(var i=0;i