This commit is contained in:
libccy 2017-02-28 13:24:12 +08:00
parent 4e6c5692ca
commit 58ef1638b3
3 changed files with 15 additions and 18 deletions

View File

@ -424,7 +424,7 @@ card.extra={
priority:6, priority:6,
audio:true, audio:true,
filter:function(event,player){ filter:function(event,player){
if(event.player.num('s','unequip')) return false; if(event.player.hasSkillTag('unequip',false,event.card)) return false;
if(event.card.name=='nanman') return true; if(event.card.name=='nanman') return true;
if(event.card.name=='wanjian') return true; if(event.card.name=='wanjian') return true;
if(event.card.name=='sha'&&!event.card.nature) return true; if(event.card.name=='sha'&&!event.card.nature) return true;
@ -436,7 +436,7 @@ card.extra={
ai:{ ai:{
effect:{ effect:{
target:function(card,player,target,current){ target:function(card,player,target,current){
if(player.num('s','unequip')) return; if(player.hasSkillTag('unequip',false,card)) return;
if(card.name=='nanman'||card.name=='wanjian') return 'zerotarget'; if(card.name=='nanman'||card.name=='wanjian') return 'zerotarget';
if(card.name=='sha'){ if(card.name=='sha'){
var equip1=player.get('e','1'); var equip1=player.get('e','1');
@ -475,7 +475,7 @@ card.extra={
audio:true, audio:true,
filter:function(event,player){ filter:function(event,player){
if(event.num<=1) return false; if(event.num<=1) return false;
if(event.parent.player.num('s','unequip')) return false; if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
return true; return true;
}, },
priority:-10, priority:-10,

View File

@ -758,7 +758,7 @@ card.guozhan={
taipingyaoshu:{ taipingyaoshu:{
trigger:{player:'damageBefore'}, trigger:{player:'damageBefore'},
filter:function(event){ filter:function(event){
if(event.source&&event.source.num('s','unequip')) return; if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
if(event.nature) return true; if(event.nature) return true;
}, },
forced:true, forced:true,

View File

@ -1342,7 +1342,7 @@ card.standard={
priority:6, priority:6,
audio:true, audio:true,
filter:function(event){ filter:function(event){
if(event.player.num('s','unequip')) return false; if(event.player.hasSkillTag('unequip',false,event.card)) return false;
return (event.card.name=='sha'&&get.color(event.card)=='black') return (event.card.name=='sha'&&get.color(event.card)=='black')
}, },
content:function(){ content:function(){
@ -1352,9 +1352,7 @@ card.standard={
ai:{ ai:{
effect:{ effect:{
target:function(card,player){ target:function(card,player){
var equip1=player.get('e','1'); if(player.hasSkillTag('unequip',false,card)) return;
if(equip1&&equip1.name=='qinggang') return 1;
if(player.num('s','unequip')) return;
if(card.name=='sha'&&get.color(card)=='black') return 'zerotarget'; if(card.name=='sha'&&get.color(card)=='black') return 'zerotarget';
} }
} }
@ -1393,14 +1391,12 @@ card.standard={
} }
}, },
qinggang_skill:{ qinggang_skill:{
trigger:{player:'useCard'}, ai:{
forced:true, unequip:true,
priority:10, skillTagFilter:function(player,tag,arg){
filter:function(event){ if(arg&&arg.name=='sha') return true;
return event.card.name=='sha'; return false;
}, }
content:function(){
player.addTempSkill('unequip','useCardAfter');
} }
}, },
qinglong_skill:{ qinglong_skill:{
@ -1529,7 +1525,8 @@ card.standard={
filter:function(event,player){ filter:function(event,player){
if(event.responded) return false; if(event.responded) return false;
if(!event.filterCard({name:'shan'})) return false; if(!event.filterCard({name:'shan'})) return false;
if(event.getParent().player.num('s','unequip')) return false; var evt=event.getParent();
if(evt.player&&evt.player.hasSkillTag('unequip',false,evt.card)) return false;
return true; return true;
}, },
audio:true, audio:true,
@ -1550,7 +1547,7 @@ card.standard={
ai:{ ai:{
effect:{ effect:{
target:function(card,player,target,effect){ target:function(card,player,target,effect){
if(player.num('s','unequip')) return; if(player.hasSkillTag('unequip',false,card)) return;
if(get.tag(card,'respondShan')) return 0.5; if(get.tag(card,'respondShan')) return 0.5;
} }
} }