v1.9.95.4
This commit is contained in:
parent
e97cadd014
commit
1f86656da4
|
@ -457,6 +457,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
discard:false,
|
||||
lose:true,
|
||||
toStorage:true,
|
||||
sync:function(muniu){
|
||||
if(game.online){
|
||||
return;
|
||||
|
@ -503,7 +504,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
game.broadcast(function(muniu,cards){
|
||||
muniu.cards=cards;
|
||||
},muniu,muniu.cards);
|
||||
event.trigger("addCardToStorage");
|
||||
var players=game.filterPlayer(function(current){
|
||||
if(!current.getEquip(5)&¤t!=player&&!current.isTurnedOver()&&
|
||||
get.attitude(player,current)>=3&&get.attitude(current,player)>=3){
|
||||
|
@ -904,7 +904,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
})) return false;
|
||||
return true;
|
||||
},
|
||||
priority:-10,
|
||||
//priority:-10,
|
||||
content:function(){
|
||||
trigger.num=1;
|
||||
}
|
||||
|
@ -912,7 +912,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
zhuque_skill:{
|
||||
equipSkill:true,
|
||||
trigger:{player:'useCard1'},
|
||||
priority:7,
|
||||
//priority:7,
|
||||
filter:function(event,player){
|
||||
if(event.card.name=='sha'&&!event.card.nature) return true;
|
||||
},
|
||||
|
|
|
@ -1021,7 +1021,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
var evt=event.getParent('damage');
|
||||
return evt&&evt.card&&evt.card.name=='sha'&&event.player.countGainableCards(player,'h')>0;
|
||||
},
|
||||
priority:7,
|
||||
//priority:7,
|
||||
check:function(event,player){
|
||||
return get.attitude(player,event.player)<0;
|
||||
},
|
||||
|
@ -1281,7 +1281,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
huxinjing2:{
|
||||
equipSkill:true,
|
||||
trigger:{player:['damageEnd','damageZero']},
|
||||
priority:10,
|
||||
//priority:10,
|
||||
forced:true,
|
||||
popup:false,
|
||||
content:function(){
|
||||
|
|
11
card/sp.js
11
card/sp.js
|
@ -189,7 +189,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
fullskin:true,
|
||||
type:'equip',
|
||||
subtype:'equip1',
|
||||
skills:['qibaodao'],
|
||||
skills:['qibaodao','qibaodao2'],
|
||||
distance:{attackFrom:-1},
|
||||
ai:{
|
||||
equipValue:function(card,player){
|
||||
|
@ -520,11 +520,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
trigger.num++;
|
||||
},
|
||||
ai:{
|
||||
unequip:true,
|
||||
skillTagFilter:function(player,tag,arg){
|
||||
if(arg&&arg.name=='sha') return true;
|
||||
return false;
|
||||
},
|
||||
effect:{
|
||||
player:function(card,player,target){
|
||||
if(card.name=='sha'&&target.isHealthy()&&get.attitude(player,target)>0){
|
||||
|
@ -534,6 +529,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
}
|
||||
}
|
||||
},
|
||||
qibaodao2:{
|
||||
inherit:'qinggang_skill',
|
||||
},
|
||||
g_jinchan:{
|
||||
cardSkill:true,
|
||||
trigger:{target:'useCardToBefore'},
|
||||
|
@ -655,6 +653,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
fulei_info:'出牌阶段,对你使用。将【浮雷】放置于你的判定区里,若判定结果为黑桃,则目标角色受到X点雷电伤害(X为此锦囊判定结果为黑桃的次数)。判定完成后,将此牌移动到下家的判定区里。',
|
||||
qibaodao:'七宝刀',
|
||||
qibaodao_info:'攻击范围2;锁定技,你使用【杀】无视目标防具,若目标角色未损失体力值,此【杀】伤害+1',
|
||||
qibaodao2:'七宝刀',
|
||||
zhungangshuo:'衠钢槊',
|
||||
zhungangshuo_info:'当你使用【杀】指定一名角色为目标后,你可令该角色弃置你的一张手牌,然后你弃置其一张手牌',
|
||||
lanyinjia:'烂银甲',
|
||||
|
|
|
@ -75,14 +75,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
if(typeof event.shanRequired!='number'||!event.shanRequired||event.shanRequired<0){
|
||||
event.shanRequired=1;
|
||||
}
|
||||
var evt=event.getParent('useCard')
|
||||
if(evt&&(typeof evt.baseDamage=='number'&&evt.baseDamage>0)){
|
||||
event.baseDamage=evt.baseDamage;
|
||||
}
|
||||
else event.baseDamage=1;
|
||||
if(typeof event.extraDamage!='number'){
|
||||
event.extraDamage=0;
|
||||
}
|
||||
if(typeof event.baseDamage!='number') event.baseDamage=1;
|
||||
if(typeof event.extraDamage!='number') event.extraDamage=0;
|
||||
"step 1"
|
||||
if(event.directHit){
|
||||
event._result={bool:false};
|
||||
|
@ -703,6 +697,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
reverseOrder:true,
|
||||
content:function(){
|
||||
"step 0"
|
||||
if(typeof event.baseDamage!='number') event.baseDamage=1;
|
||||
if(event.directHit) event._result={bool:false};
|
||||
else{
|
||||
var next=target.chooseToRespond({name:'sha'});
|
||||
|
@ -717,7 +712,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
}
|
||||
"step 1"
|
||||
if(result.bool==false){
|
||||
target.damage();
|
||||
target.damage(event.baseDamage);
|
||||
}
|
||||
},
|
||||
ai:{
|
||||
|
@ -764,6 +759,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
content:function(){
|
||||
"step 0"
|
||||
if(typeof event.baseDamage!='number') event.baseDamage=1;
|
||||
if(event.directHit) event._result={bool:false};
|
||||
else{
|
||||
var next=target.chooseToRespond({name:'shan'});
|
||||
|
@ -781,7 +777,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
}
|
||||
"step 1"
|
||||
if(result.bool==false){
|
||||
target.damage();
|
||||
target.damage(event.baseDamage);
|
||||
}
|
||||
},
|
||||
ai:{
|
||||
|
@ -868,30 +864,34 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
content:function(){
|
||||
"step 0"
|
||||
if(event.turn==undefined) event.turn=target;
|
||||
var evt=event.getParent('useCard')
|
||||
if(evt&&(typeof evt.baseDamage=='number'&&evt.baseDamage>0)){
|
||||
event.baseDamage=evt.baseDamage;
|
||||
}
|
||||
else event.baseDamage=1;
|
||||
if(typeof event.baseDamage!='number') event.baseDamage=1;
|
||||
if(typeof event.extraDamage!='number'){
|
||||
event.extraDamage=0;
|
||||
if(!event.shaReq) event.shaReq={};
|
||||
if(typeof event.shaReq[player.playerid]!='number') event.shaReq[player.playerid]=1;
|
||||
if(typeof event.shaReq[target.playerid]!='number') event.shaReq[target.playerid]=1;
|
||||
}
|
||||
event.playerCards=[];
|
||||
event.targetCards=[];
|
||||
"step 1"
|
||||
event.trigger('juedou');
|
||||
event.shaRequired=event.shaReq[event.turn.playerid];
|
||||
"step 2"
|
||||
if(event.directHit){
|
||||
event._result={bool:false};
|
||||
}
|
||||
else{
|
||||
var next=event.turn.chooseToRespond({name:'sha'});
|
||||
if(event.shaRequired>1){
|
||||
next.set('prompt2','共需打出'+event.shaRequired+'张杀')
|
||||
}
|
||||
next.set('ai',function(card){
|
||||
var event=_status.event;
|
||||
var player=event.splayer;
|
||||
var target=event.starget;
|
||||
if(player.hasSkillTag('notricksource')) return 0;
|
||||
if(target.hasSkillTag('notrick')) return 0;
|
||||
if(event.shaRequired>1&&player.countCards('h','sha')<event.shaRequired) return 0;
|
||||
if(event.player==target){
|
||||
if(player.hasSkill('naman')) return -1;
|
||||
if(get.attitude(target,player)<0||event.player.hp<=1){
|
||||
|
@ -909,6 +909,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
});
|
||||
next.set('splayer',player);
|
||||
next.set('starget',target);
|
||||
next.set('shaRequired',event.shaRequired);
|
||||
next.autochoose=lib.filter.autoRespondSha;
|
||||
if(event.turn==target){
|
||||
next.source=player;
|
||||
|
@ -923,15 +924,23 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
}
|
||||
else{
|
||||
if(result.bool){
|
||||
event.shaRequired--;
|
||||
if(event.turn==target){
|
||||
if(result.cards) event.targetCards.addArray(result.cards);
|
||||
event.turn=player;
|
||||
if(event.shaRequired>0) event.goto(2);
|
||||
else{
|
||||
event.turn=player;
|
||||
event.goto(1);
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(result.cards) event.playerCards.addArray(result.cards);
|
||||
event.turn=target;
|
||||
if(event.shaRequired>0) event.goto(2);
|
||||
else{
|
||||
event.turn=target;
|
||||
event.goto(1);
|
||||
}
|
||||
}
|
||||
event.goto(1);
|
||||
}
|
||||
else{
|
||||
if(event.turn==target){
|
||||
|
@ -1443,7 +1452,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
filter:function(event){
|
||||
return event.card&&event.card.name=='sha'&&event.notLink()&&event.player.getCards('he').length>0;
|
||||
},
|
||||
priority:1,
|
||||
//priority:1,
|
||||
check:function(event,player){
|
||||
var target=event.player;
|
||||
var eff=get.damageEffect(target,player,player);
|
||||
|
@ -1848,7 +1857,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
event._global_waiting=true;
|
||||
event.tempnowuxie=(trigger.targets&&trigger.targets.length>1&&!trigger.multitarget);
|
||||
event.filterCard=function(card,player){
|
||||
if(card.name!='wuxie') return false;
|
||||
if(get.name(card)!='wuxie') return false;
|
||||
return lib.filter.cardEnabled(card,player,'forceEnable');
|
||||
};
|
||||
event.send=function(player,state,isJudge,card,source,target,targets,id,id2,tempnowuxie,skillState){
|
||||
|
@ -1881,7 +1890,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
}
|
||||
var next=player.chooseToUse({
|
||||
filterCard:function(card,player){
|
||||
if(card.name!='wuxie') return false;
|
||||
if(get.name(card)!='wuxie') return false;
|
||||
return lib.filter.cardEnabled(card,player,'forceEnable');
|
||||
},
|
||||
prompt:str,
|
||||
|
|
Loading…
Reference in New Issue