This commit is contained in:
libccy 2016-09-23 11:26:32 +08:00
parent 36c094d6e0
commit 282a504269
4 changed files with 66 additions and 66 deletions

View File

@ -644,7 +644,7 @@ card.swd={
target.discard(target.get('he').randomGet()); target.discard(target.get('he').randomGet());
}, },
ai:{ ai:{
order:6.5, order:9,
result:{ result:{
target:-1, target:-1,
}, },
@ -722,7 +722,7 @@ card.swd={
} }
}, },
ai:{ ai:{
order:1, order:9,
result:{ result:{
target:function(player,target){ target:function(player,target){
if(target.num('h')<target.hp) return 1; if(target.num('h')<target.hp) return 1;
@ -778,7 +778,7 @@ card.swd={
target.turnOver(); target.turnOver();
}, },
ai:{ ai:{
order:2, order:9,
result:{ result:{
target:-1, target:-1,
}, },
@ -3156,7 +3156,11 @@ card.swd={
} }
return 0; return 0;
} }
return 1+ai.get.value(card); var num=1+ai.get.value(card);
if(get.position(card)=='e'){
num+=0.1;
}
return num;
}, },
filterCard:function(card){ filterCard:function(card){
var type=get.type(card); var type=get.type(card);
@ -3173,17 +3177,6 @@ card.swd={
else{ else{
return type=='equip'||type=='hslingjian'||type=='jiqi'; return type=='equip'||type=='hslingjian'||type=='jiqi';
} }
// if(type=='equip'&&!lib.inpile.contains(card.name)) return false;
// for(var i=0;i<ui.selected.cards.length;i++){
// if(get.type(ui.selected.cards[i])=='equip') return type=='hslingjian'||type=='jiqi';
// }
// if(_status.event.player.hasSkill('jiguanyaoshu_skill')){
// if(ui.selected.cards.length==2) return type=='equip';
// }
// else{
// if(ui.selected.cards.length==1) return type=='equip';
// }
// return type=='equip'||type=='hslingjian';
}, },
process:function(cards){ process:function(cards){
var equip; var equip;
@ -3204,28 +3197,9 @@ card.swd={
name+='_'+cards[0].name; name+='_'+cards[0].name;
} }
if(lib.card[name]) return name; if(lib.card[name]) return name;
lib.card[name]={}; lib.card[name]=get.copy(lib.card[equip.name]);
lib.card[name].cardimage=equip.name; lib.card[name].cardimage=lib.card[name].cardimage||equip.name;
lib.card[name].vanish=true; lib.card[name].vanish=true;
for(var i in lib.card[equip.name]){
if(i=='ai'){
lib.card[name][i]={};
for(var j in lib.card[equip.name][i]){
if(j=='basic'){
lib.card[name][i][j]={};
for(var k in lib.card[equip.name][i][j]){
lib.card[name][i][j][k]=lib.card[equip.name][i][j][k];
}
}
else{
lib.card[name][i][j]=lib.card[equip.name][i][j];
}
}
}
else{
lib.card[name][i]=lib.card[equip.name][i];
}
}
if(type=='jiqi'){ if(type=='jiqi'){
lib.card[name].legend=true; lib.card[name].legend=true;
} }
@ -3270,11 +3244,11 @@ card.swd={
else{ else{
lib.card[name].skills=[]; lib.card[name].skills=[];
} }
lib.card[name].filterTarget=function(card,player,target){ // lib.card[name].filterTarget=function(card,player,target){
return !target.isMin(); // return !target.isMin();
}; // };
lib.card[name].selectTarget=1; // lib.card[name].selectTarget=1;
lib.card[name].range={global:1}; // lib.card[name].range={global:1};
var str=lib.translate[cards[0].name+'_duanzao']; var str=lib.translate[cards[0].name+'_duanzao'];
var str2=get.translation(equip.name,'skill'); var str2=get.translation(equip.name,'skill');
lib.translate[name]=str+str2; lib.translate[name]=str+str2;
@ -3307,15 +3281,6 @@ card.swd={
return name; return name;
}, },
selectCard:2, selectCard:2,
// selectCard:function(){
// if(ui.selected.cards.length==2&&
// get.type(ui.selected.cards[0])=='hslingjian'&&
// get.type(ui.selected.cards[1])=='hslingjian'){
// return [3,3];
// }
// if(_status.event.player.hasSkill('jiguanyaoshu_skill')) return [2,3];
// return 2;
// },
filter:function(event,player){ filter:function(event,player){
if(!player.num('h',{type:['hslingjian','jiqi']})) return false; if(!player.num('h',{type:['hslingjian','jiqi']})) return false;
var es=player.get('he',{type:'equip'}); var es=player.get('he',{type:'equip'});
@ -3328,11 +3293,29 @@ card.swd={
player.$throw(cards); player.$throw(cards);
}, },
content:function(){ content:function(){
'step 0'
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]);
} }
var name=lib.skill._lingjianduanzao.process(cards); var name=lib.skill._lingjianduanzao.process(cards);
player.gain(game.createCard(name),'gain2'); var card=game.createCard(name);
player.chooseTarget(function(card,player,target){
return !target.isMin()&&get.distance(player,target)<=1;
},'选择一个目标装备'+get.translation(card.name)).ai=function(target){
return ai.get.effect(target,card,player,player);
}
event.card=card;
'step 1'
if(result.bool){
var target=result.targets[0];
player.line(target,'green');
target.equip(event.card);
target.$gain2(event.card);
game.delay();
}
else{
player.gain(event.card,'gain2');
}
}, },
ai:{ ai:{
order:function(card,player){ order:function(card,player){
@ -4041,7 +4024,7 @@ card.swd={
hslingjian_shijianhuisu_equip4_info:'当你的装备区内没有其他牌时,你的进攻距离+1', hslingjian_shijianhuisu_equip4_info:'当你的装备区内没有其他牌时,你的进攻距离+1',
hslingjian_shijianhuisu_equip5_info:'出牌阶段限一次,你可以弃置一张牌,然后令一名其他角色将其装备区内的牌收回手牌', hslingjian_shijianhuisu_equip5_info:'出牌阶段限一次,你可以弃置一张牌,然后令一名其他角色将其装备区内的牌收回手牌',
_lingjianduanzao:'煅造', _lingjianduanzao:'煅造',
_lingjianduanzao_info:'出牌阶段,你可以将一张装备牌和一张可煅造的牌合成为一件强化装备强化装备可以装备给距离1以内的角色', _lingjianduanzao_info:'出牌阶段,你可以将一张装备牌和一张可煅造的牌合成为一件强化装备并可装备给距离1以内的一名角色',
jiguanshu:'机关鼠', jiguanshu:'机关鼠',
jiguanshu_info:'出牌阶段对一名角色使用,用随机零件强化目标装备区内的装备', jiguanshu_info:'出牌阶段对一名角色使用,用随机零件强化目标装备区内的装备',
lingjiandai:'零件袋', lingjiandai:'零件袋',

View File

@ -11173,7 +11173,16 @@
} }
return this; return this;
}, },
clearEquipTrigger:function(){ clearEquipTrigger:function(card){
if(card){
var info=get.info(card);
if(info.skills){
for(var j=0;j<info.skills.length;j++){
this.removeSkillTrigger(info.skills[j]);
}
}
}
else{
var es=this.get('e'); var es=this.get('e');
for(var i=0;i<es.length;i++){ for(var i=0;i<es.length;i++){
var info=get.info(es[i]); var info=get.info(es[i]);
@ -11183,6 +11192,7 @@
} }
} }
} }
}
}, },
removeSkillTrigger:function(skill,triggeronly){ removeSkillTrigger:function(skill,triggeronly){
var info=lib.skill[skill]; var info=lib.skill[skill];
@ -19594,15 +19604,19 @@
if(typeof equipValue=='function') return equipValue(card,player)-value; if(typeof equipValue=='function') return equipValue(card,player)-value;
return equipValue-value; return equipValue-value;
} }
card.ai.result.target=function(player,target){ card.ai.result.target=(function(name){
return (function(player,target){
var card=get.card(); var card=get.card();
if(card==undefined) return 0; if(card==undefined){
card={name:name};
}
var value1=ai.get.value(card,target); var value1=ai.get.value(card,target);
var value2=0; var value2=0;
if(target[get.subtype(card)]&&target[get.subtype(card)]!=card) if(target[get.subtype(card)]&&target[get.subtype(card)]!=card)
value2=ai.get.value(target[get.subtype(card)],target); value2=ai.get.value(target[get.subtype(card)],target);
return Math.max(0,value1-value2); return Math.max(0,value1-value2);
}; });
}(i));
} }
else if(card.type=='delay'){ else if(card.type=='delay'){
if(card.enable==undefined) card.enable=true; if(card.enable==undefined) card.enable=true;

View File

@ -14,7 +14,7 @@ character.pack={
gujian:'古剑奇谭', gujian:'古剑奇谭',
xianjian:'仙剑', xianjian:'仙剑',
xiake:'侠客', xiake:'侠客',
boss:'BOSS' // boss:'BOSS'
}; };
card.pack={ card.pack={
standard:'标准', standard:'标准',

View File

@ -18,3 +18,6 @@ window.noname_update={
'1.9.1.1':[] '1.9.1.1':[]
} }
} }
// 'card/swd.js',
// 'game/package.js',