This commit is contained in:
libccy 2016-08-14 12:27:55 +08:00
parent 01414fd4a6
commit 26d25d825e
2 changed files with 23 additions and 0 deletions

View File

@ -2318,6 +2318,7 @@ character.ow={
player.storage.shanxian_e[i]=game.createCard(player.storage.shanxian_e[i]); player.storage.shanxian_e[i]=game.createCard(player.storage.shanxian_e[i]);
} }
} }
player.clearEquipTrigger();
var cards=player.get('he'); var cards=player.get('he');
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
ui.discardPile.appendChild(cards[i]); ui.discardPile.appendChild(cards[i]);

View File

@ -7508,6 +7508,11 @@
if(num<cards.length){ if(num<cards.length){
if(cards[num].original=='e'){ if(cards[num].original=='e'){
var info=get.info(cards[num]); var info=get.info(cards[num]);
if(info.skills){
for(var i=0;i<info.skills.length;i++){
player.removeSkillTrigger(info.skills[i]);
}
}
if(info.onLose&&(!info.filterLose||info.filterLose(cards[num],player))){ if(info.onLose&&(!info.filterLose||info.filterLose(cards[num],player))){
event.goto(2); event.goto(2);
return; return;
@ -10693,6 +10698,17 @@
} }
return this; return this;
}, },
clearEquipTrigger:function(){
var es=this.get('e');
for(var i=0;i<es.length;i++){
var info=get.info(es[i]);
if(info.skills){
for(var j=0;j<info.skills.length;j++){
this.removeSkillTrigger(info.skills[j]);
}
}
}
},
removeSkillTrigger:function(skill){ removeSkillTrigger:function(skill){
var info=lib.skill[skill]; var info=lib.skill[skill];
if(!info) return; if(!info) return;
@ -11804,6 +11820,12 @@
if(!equipped){ if(!equipped){
player.node.equips.appendChild(card); player.node.equips.appendChild(card);
} }
var info=get.info(card);
if(info.skills){
for(var i=0;i<info.skills.length;i++){
player.addSkillTrigger(info.skills[i]);
}
}
return player; return player;
}, },
$gain:function(card,log,init){ $gain:function(card,log,init){