This commit is contained in:
parent
58ef1638b3
commit
340cb0e8d8
|
@ -771,6 +771,7 @@ card.guozhan={
|
|||
nothunder:true,
|
||||
effect:{
|
||||
target:function(card,player,target,current){
|
||||
if(player.hasSkillTag('unequip',false,card)) return;
|
||||
if(get.tag(card,'natureDamage')) return 'zerotarget';
|
||||
if(card.name=='tiesuo'){
|
||||
return [0,0];
|
||||
|
|
|
@ -4462,9 +4462,8 @@ card.swd={
|
|||
trigger:{player:'damageBegin'},
|
||||
forced:true,
|
||||
filter:function(event,player){
|
||||
if(event.source&&event.source.num('s','unequip')) return false;
|
||||
if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
|
||||
if(Math.random()>1/3) return false;
|
||||
if(event.parent.player.num('s','unequip')) return false;
|
||||
return true;
|
||||
},
|
||||
content:function(){
|
||||
|
|
|
@ -992,7 +992,7 @@ card.yunchou={
|
|||
suolianjia:{
|
||||
trigger:{player:'damageBefore'},
|
||||
filter:function(event){
|
||||
if(event.source&&event.source.num('s','unequip')) return;
|
||||
if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return;
|
||||
if(event.nature) return true;
|
||||
},
|
||||
forced:true,
|
||||
|
@ -1005,6 +1005,7 @@ card.yunchou={
|
|||
nothunder:true,
|
||||
effect:{
|
||||
target:function(card,player,target,current){
|
||||
if(player.hasSkillTag('unequip',false,card)) return;
|
||||
if(get.tag(card,'natureDamage')) return 'zerotarget';
|
||||
if(card.name=='tiesuo'){
|
||||
return [0,0];
|
||||
|
|
|
@ -2642,8 +2642,7 @@ character.shenhua={
|
|||
audio:2,
|
||||
inherit:'bagua_skill',
|
||||
filter:function(event,player){
|
||||
if(!event.filterCard({name:'shan'})) return false;
|
||||
if(event.getParent().player.num('s','unequip')) return false;
|
||||
if(!lib.skill.bagua_skill.filter(event,player)) return false;
|
||||
if(player.get('e','2')) return false;
|
||||
return true;
|
||||
},
|
||||
|
@ -2651,10 +2650,10 @@ character.shenhua={
|
|||
effect:{
|
||||
target:function(card,player,target){
|
||||
if(player==target&&get.subtype(card)=='equip2'){
|
||||
if(ai.get.equipValue(card)<=8) return 0;
|
||||
if(ai.get.equipValue(card)<=7.5) return 0;
|
||||
}
|
||||
if(target.get('e','2')) return;
|
||||
if(player.hasSkill('unequip')) return;
|
||||
if(player.hasSkillTag('unequip',false,card)) return;
|
||||
if(get.tag(card,'respondShan')) return [0.5,0];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3009,8 +3009,7 @@ character.sp={
|
|||
linglong:{
|
||||
inherit:'bagua_skill',
|
||||
filter:function(event,player){
|
||||
if(!event.filterCard({name:'shan'})) return false;
|
||||
if(event.parent.player.num('s','unequip')) return false;
|
||||
if(!lib.skill.bagua_skill.filter(event,player)) return false;
|
||||
if(player.get('e','2')) return false;
|
||||
return true;
|
||||
},
|
||||
|
@ -3018,10 +3017,10 @@ character.sp={
|
|||
effect:{
|
||||
target:function(card,player,target){
|
||||
if(player==target&&get.subtype(card)=='equip2'){
|
||||
if(ai.get.equipValue(card)<=8) return 0;
|
||||
if(ai.get.equipValue(card)<=7.5) return 0;
|
||||
}
|
||||
if(target.get('e','2')) return;
|
||||
if(player.hasSkill('unequip')) return;
|
||||
if(player.hasSkillTag('unequip',false,card)) return;
|
||||
if(get.tag(card,'respondShan')) return [0.5,0];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -763,14 +763,13 @@ character.standard={
|
|||
if(card.name=='sha') return Infinity;
|
||||
}
|
||||
},
|
||||
trigger:{player:'useCard'},
|
||||
forced:true,
|
||||
priority:10,
|
||||
filter:function(event,player){
|
||||
return get.zhu(player,'shouyue')&&event.card.name=='sha';
|
||||
},
|
||||
content:function(){
|
||||
player.addTempSkill('unequip','useCardAfter');
|
||||
ai:{
|
||||
unequip:true,
|
||||
skillTagFilter:function(player,tag,arg){
|
||||
if(!get.zhu(player,'shouyue')) return false;
|
||||
if(arg&&arg.name=='sha') return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
},
|
||||
guanxing:{
|
||||
|
|
|
@ -5885,6 +5885,9 @@ character.yijiang={
|
|||
ai:{
|
||||
effect:{
|
||||
target:function(card,player,target){
|
||||
if(player==target&&get.subtype(card)=='equip2'){
|
||||
if(ai.get.equipValue(card)<=8) return 0;
|
||||
}
|
||||
if(target.get('e','2')) return;
|
||||
if(card.name=='sha'&&get.color(card)=='black') return 'zerotarget';
|
||||
}
|
||||
|
|
11
game/game.js
11
game/game.js
|
@ -35639,7 +35639,7 @@
|
|||
id:function(){
|
||||
return (Math.floor(1000000+9000000*Math.random())).toString()+(10+lib.status.globalId++);
|
||||
},
|
||||
zhu:function(player,skill){
|
||||
zhu:function(player,skill,unseen){
|
||||
if(typeof player=='string'){
|
||||
skill=player;
|
||||
player=null;
|
||||
|
@ -35662,10 +35662,13 @@
|
|||
}
|
||||
else if(mode=='guozhan'){
|
||||
for(var i=0;i<game.players.length;i++){
|
||||
if(get.is.jun(game.players[i])){
|
||||
if(skill&&!(game.players[i].get('s').contains(skill))) continue;
|
||||
if(get.is.jun(game.players[i])&&!game.players[i].isUnseen()){
|
||||
if(skill&&!game.players[i].get('s').contains(skill)) continue;
|
||||
if(!player) return game.players[i];
|
||||
if(player._group==game.players[i].identity){
|
||||
if(player.identity==game.players[i].identity){
|
||||
return game.players[i];
|
||||
}
|
||||
else if(unseen&&player._group==game.players[i].identity){
|
||||
return game.players[i];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue