v1.9.91.5(Part 1)

This commit is contained in:
Spmario233 2019-08-13 12:37:11 +08:00 committed by GitHub
parent 574b09b761
commit aa284c639b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions

View File

@ -35,8 +35,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
if(cards&&cards.length){ if(cards&&cards.length){
card=cards[0]; card=cards[0];
} }
if(!player.storage.jiu) player.storage.jiu=0; if(!target.storage.jiu) target.storage.jiu=0;
player.storage.jiu++; target.storage.jiu++;
game.broadcastAll(function(target,card,gain2){ game.broadcastAll(function(target,card,gain2){
target.addSkill('jiu'); target.addSkill('jiu');
if(!target.node.jiu&&lib.config.jiu_effect){ if(!target.node.jiu&&lib.config.jiu_effect){
@ -79,6 +79,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
result:{ result:{
target:function(player,target){ target:function(player,target){
if(target&&target.isDying()) return 2; if(target&&target.isDying()) return 2;
if(target&&!target.isPhaseUsing()) return 0;
if(lib.config.mode=='stone'&&!player.isMin()){ if(lib.config.mode=='stone'&&!player.isMin()){
if(player.getActCount()+1>=player.actcount) return 0; if(player.getActCount()+1>=player.actcount) return 0;
} }

View File

@ -790,7 +790,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
} }
}, },
dinglanyemingzhu_skill:{ dinglanyemingzhu_skill:{
inherit:'gzzhiheng', inherit:'zhiheng',
filter:function(event,player){ filter:function(event,player){
return !player.hasSkill('gzzhiheng'); return !player.hasSkill('gzzhiheng');
}, },
@ -798,6 +798,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
var player=_status.event.player; var player=_status.event.player;
return [1,player.maxHp]; return [1,player.maxHp];
}, },
filterCard:function(card,player){
return card!=player.getEquip(5);
},
prompt:'出牌阶段限一次你可以弃置至多X张牌X为你的体力上限然后摸等量的牌' prompt:'出牌阶段限一次你可以弃置至多X张牌X为你的体力上限然后摸等量的牌'
}, },
g_dinglanyemingzhu_ai:{ g_dinglanyemingzhu_ai:{

View File

@ -1140,7 +1140,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
return game.hasPlayer(function(current){ return game.hasPlayer(function(current){
if(current.getEquip(1)){ if(current.getEquip(1)){
return game.hasPlayer(function(current2){ return game.hasPlayer(function(current2){
return lib.filter.filterTarget({name:'sha'},current,current2); return lib.filter.targetInRange({name:'sha'},current,current2);
}) })
} }
}); });
@ -1150,7 +1150,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
return (player!=target&&target.getCards('e',{subtype:'equip1'}).length); return (player!=target&&target.getCards('e',{subtype:'equip1'}).length);
} }
else{ else{
return lib.filter.filterTarget({name:'sha'},ui.selected.targets[0],target); return lib.filter.targetInRange({name:'sha'},ui.selected.targets[0],target);
} }
}, },
content:function(){ content:function(){
@ -1638,8 +1638,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
if(get.mode()!='guozhan') return; if(get.mode()!='guozhan') return;
if(!ui.selected.targets.length) return; if(!ui.selected.targets.length) return;
if(target.identity=='ye'||target.identity=='unknown') return; if(target.identity=='ye'||target.identity=='unknown') return;
for(var i=0;i<ui.selected.targets.length;i++){ var targets=ui.selected.targets.slice(0);
if(target!=ui.selected.targets[i]&&target.identity==ui.selected.targets[i].identity){ for(var i=0;i<targets.length;i++){
if(target!=targets[i]&&target.identity==targets[i].identity){
return false; return false;
} }
} }