This commit is contained in:
libccy 2017-05-19 17:35:11 +08:00
parent 11df369534
commit 6af1604ea4
3 changed files with 1 additions and 49 deletions

View File

@ -493,8 +493,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
count:{ count:{
trigger:{player:'phaseUseBegin'}, trigger:{player:'phaseUseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.hunmo1=0; player.storage.hunmo1=0;
@ -922,8 +920,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
count1:{ count1:{
trigger:{global:'phaseBegin'}, trigger:{global:'phaseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.gwchuanxin=[]; player.storage.gwchuanxin=[];
@ -931,8 +927,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
count2:{ count2:{
trigger:{player:'useCard'}, trigger:{player:'useCard'},
forced:true,
popup:false,
silent:true, silent:true,
// filter:function(event){ // filter:function(event){
// return event.card&&event.card.name=='sha'; // return event.card&&event.card.name=='sha';
@ -1133,8 +1127,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
default:return false; default:return false;
} }
}, },
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
'step 0' 'step 0'
@ -1328,8 +1320,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
count:{ count:{
trigger:{player:'useCard'}, trigger:{player:'useCard'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
return _status.currentPhase==player; return _status.currentPhase==player;
@ -1347,8 +1337,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
count2:{ count2:{
trigger:{player:'phaseAfter'}, trigger:{player:'phaseAfter'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
delete player.storage.huihun; delete player.storage.huihun;

View File

@ -449,8 +449,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
zhaochao2:{ zhaochao2:{
trigger:{player:'shaMiss'}, trigger:{player:'shaMiss'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event){ filter:function(event){
return event.getParent(2).name=='zhaochao'; return event.getParent(2).name=='zhaochao';
@ -1088,8 +1086,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
add:{ add:{
trigger:{player:'useCard'}, trigger:{player:'useCard'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
return _status.currentPhase==player&&get.type(event.card,'trick')=='trick'; return _status.currentPhase==player&&get.type(event.card,'trick')=='trick';
@ -1890,8 +1886,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
yushou_lose:{ yushou_lose:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
var list=['yushou_misha','yushou_huofu','yushou_leiouke']; var list=['yushou_misha','yushou_huofu','yushou_leiouke'];
@ -1959,8 +1953,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
count:{ count:{
trigger:{player:'useCard'}, trigger:{player:'useCard'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
return event.card.name.indexOf('hsqingyu_')==0; return event.card.name.indexOf('hsqingyu_')==0;
@ -2430,8 +2422,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
peiyu2:{ peiyu2:{
trigger:{player:'damageAfter'}, trigger:{player:'damageAfter'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.removeAdditionalSkill('peiyu'); player.removeAdditionalSkill('peiyu');
@ -2894,8 +2884,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
count1:{ count1:{
trigger:{player:'useCard'}, trigger:{player:'useCard'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
return _status.currentPhase==player&&get.type(event.card)=='trick'; return _status.currentPhase==player&&get.type(event.card)=='trick';
@ -2906,8 +2894,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
count2:{ count2:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.kuangluan=0; player.storage.kuangluan=0;
@ -3004,8 +2990,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
kuangluan3:{ kuangluan3:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.kuangluan=[]; player.storage.kuangluan=[];
@ -3117,9 +3101,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
mobao2:{ mobao2:{
trigger:{player:'damageEnd'}, trigger:{player:'damageEnd'},
forced:true,
silent:true, silent:true,
popup:false,
filter:function(event,player){ filter:function(event,player){
return event.source&&event.source!=player; return event.source&&event.source!=player;
}, },
@ -3132,9 +3114,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
mobao3:{ mobao3:{
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
forced:true,
silent:true, silent:true,
popup:false,
content:function(){ content:function(){
delete player.storage.mobao; delete player.storage.mobao;
} }
@ -3670,8 +3650,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
hsbaowu_huangjinyuanhou2:{ hsbaowu_huangjinyuanhou2:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
player.removeSkill('hsbaowu_huangjinyuanhou'); player.removeSkill('hsbaowu_huangjinyuanhou');
@ -3746,9 +3724,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
fbeifa3:{ fbeifa3:{
trigger:{global:'phaseBegin'}, trigger:{global:'phaseBegin'},
forced:true,
silent:true, silent:true,
popup:false,
content:function(){ content:function(){
player.storage.fbeifa=0; player.storage.fbeifa=0;
} }
@ -3782,8 +3758,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function(event,player){ filter:function(event,player){
return event.source==_status.currentPhase&&event.source!=player; return event.source==_status.currentPhase&&event.source!=player;
}, },
popup:false,
forced:true,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.yufa=trigger.source; player.storage.yufa=trigger.source;
@ -3791,8 +3765,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
yufa3:{ yufa3:{
trigger:{global:'phaseBegin'}, trigger:{global:'phaseBegin'},
popup:false,
forced:true,
silent:true, silent:true,
content:function(){ content:function(){
player.storage.yufa=null; player.storage.yufa=null;
@ -4272,8 +4244,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
begin:{ begin:{
trigger:{global:'phaseUseBegin'}, trigger:{global:'phaseUseBegin'},
forced:true,
popup:false,
silent:true, silent:true,
content:function(){ content:function(){
trigger.player.storage.shixu_begin=get.time(); trigger.player.storage.shixu_begin=get.time();
@ -4281,8 +4251,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
end:{ end:{
trigger:{global:'phaseUseEnd'}, trigger:{global:'phaseUseEnd'},
forced:true,
popup:false,
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
return typeof event.player.storage.shixu_begin=='number'; return typeof event.player.storage.shixu_begin=='number';
@ -4363,9 +4331,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{ subSkill:{
clear:{ clear:{
trigger:{player:'phaseBefore'}, trigger:{player:'phaseBefore'},
forced:true,
silent:true, silent:true,
popup:false,
content:function(){ content:function(){
player.storage.qianghua=0; player.storage.qianghua=0;
} }
@ -5088,9 +5054,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
shengdun_old:{ shengdun_old:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true,
silent:true, silent:true,
popup:false,
priority:10, priority:10,
init2:function(player){ init2:function(player){
player.markSkill('shengdun'); player.markSkill('shengdun');

View File

@ -109,7 +109,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return !(player.storage.lingdi||[]).contains(get.suit(card)); return !(player.storage.lingdi||[]).contains(get.suit(card));
}, },
check:function(){ check:function(){
return 7-get.value(card); return 8-get.value(card);
}, },
content:function(){ content:function(){
game.asyncDraw([player,target]); game.asyncDraw([player,target]);