This commit is contained in:
libccy 2018-08-13 17:15:15 +08:00
parent 5a62004aad
commit ab1120d8b0
3 changed files with 242 additions and 241 deletions

View File

@ -113,7 +113,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
xietianzi:{
fullskin:true,
type:'trick',
lianheng:true,
enable:function(card,player,event){
if(get.mode()=='guozhan'&&!player.isMajor()) return false;
if(player.hasSkill('xietianzi')) return false;
@ -372,7 +371,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
diaohulishan:{
fullskin:true,
type:'trick',
lianheng:true,
enable:true,
global:'g_diaohulishan',
filterTarget:function(card,player,target){
@ -408,7 +406,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
}
},
huxinjing:{
lianheng:true,
fullskin:true,
type:"equip",
subtype:"equip2",
@ -422,7 +419,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
huoshaolianying:{
fullskin:true,
type:'trick',
lianheng:true,
filterTarget:function(card,player,target){
if(get.mode()=='guozhan'){
var next=player.getNext();
@ -673,7 +669,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
fullskin:true,
type:'equip',
subtype:'equip4',
lianheng:true,
distance:{globalFrom:-1},
},
},
@ -1176,52 +1171,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
player.removeSkill('huxinjing2');
}
},
_lianheng:{
mode:['guozhan'],
enable:'phaseUse',
prompt:'将可连横的牌交给一名与你势力不同的角色,或未确定势力的角色,若你交给与你势力不同的角色,则你摸一张牌',
filter:function(event,player){
return (player.getCards('h',function(card){
return get.info(card).lianheng;
}).length);
},
filterCard:function(card){
return get.info(card).lianheng;
},
filterTarget:function(card,player,target){
if(target==player) return false;
if(player.isUnseen()) return target.isUnseen();
if(player.identity=='ye') return true;
return target.identity!=player.identity;
},
prepare:'give',
discard:false,
// delay:0.5,
content:function(){
"step 0"
target.gain(cards,player);
"step 1"
if(!target.isUnseen()){
player.draw();
}
},
ai:{
basic:{
order:2
},
result:{
player:function(player,target){
if(target.isUnseen()) return 0;
if(player.isMajor()) return 0;
return 0.5;
},
target:function(player,target){
if(target.isUnseen()) return 0;
return 1;
}
},
}
},
wuliu_skill:{},
g_wuliu_skill:{
mod:{
@ -1306,7 +1255,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
chiling_info:'出牌阶段对所有没有势力的角色使用。目标角色选择一项1、明置一张武将牌然后摸一张牌2、弃置一张装备牌3、失去1点体力。当【敕令】因判定或弃置而置入弃牌堆时系统将之移出游戏然后系统于当前回合结束后视为对所有没有势力的角色使用【敕令】',
diaohulishan:'调虎离山',
diaohulishan_info:'出牌阶段,对至多两名其他角色使用。目标角色于此回合结束之前不计入距离的计算且不能使用牌且不是牌的合法目标。此牌结算结束时,你摸一张牌',
_lianheng:'连横',
huoshaolianying:'火烧连营',
huoshaolianying_bg:'烧',
huoshaolianying_info_guozhan:'出牌阶段,对你的下家和与其处于同一队列的角色使用,每名角色受到一点火焰伤害',

View File

@ -20570,6 +20570,33 @@
if(!_status.connectMode&&!_status.video){
this.cardid=get.id();
}
var tags=[];
if(Array.isArray(card[4])){
tags.addArray(card[4]);
}
if(this.cardid){
if(!_status.cardtag){
_status.cardtag={};
}
for(var i in _status.cardtag){
if(_status.cardtag[i].contains(this.cardid)){
tags.add(i);
}
}
if(tags.length){
var tagstr=' <span class="cardtag">';
for(var i=0;i<tags.length;i++){
var tag=tags[i];
if(!_status.cardtag[tag]){
_status.cardtag[tag]=[];
}
_status.cardtag[tag].add(this.cardid);
tagstr+=lib.translate[tag+'_tag'];
}
tagstr+='</span>';
this.node.range.innerHTML+=tagstr;
}
}
return this;
},
updateTransform:function(bool,delay){
@ -44264,9 +44291,9 @@
}
else if(game.online){
card=ui.create.card();
card.cardid=id;
if(info&&info[2]) card.init(info);
lib.cardOL[id]=card;
card.cardid=id;
}
}
catch(e){

View File

@ -124,6 +124,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
game.chooseCharacter();
}
"step 2"
game.broadcast(function(cardtag){
_status.cardtag=cardtag;
console.log(ui.cardPile,lib.cardOL,cardtag)
},_status.cardtag);
if(ui.coin){
_status.coinCoeff=get.coinCoeff([game.me.name1,game.me.name2]);
}
@ -285,6 +289,52 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
skill:{
_lianheng:{
mode:['guozhan'],
enable:'phaseUse',
prompt:'将可连横的牌交给一名与你势力不同的角色,或未确定势力的角色,若你交给与你势力不同的角色,则你摸一张牌',
filter:function(event,player){
return (player.getCards('h',function(card){
return _status.cardtag.lianheng.contains(card.cardid);
}).length);
},
filterCard:function(card){
return _status.cardtag.lianheng.contains(card.cardid);
},
filterTarget:function(card,player,target){
if(target==player) return false;
if(player.isUnseen()) return target.isUnseen();
if(player.identity=='ye') return true;
return target.identity!=player.identity;
},
prepare:'give',
discard:false,
// delay:0.5,
content:function(){
"step 0"
target.gain(cards,player);
"step 1"
if(!target.isUnseen()){
player.draw();
}
},
ai:{
basic:{
order:2
},
result:{
player:function(player,target){
if(target.isUnseen()) return 0;
if(player.isMajor()) return 0;
return 0.5;
},
target:function(player,target){
if(target.isUnseen()) return 0;
return 1;
}
},
}
},
qianhuan:{
group:['qianhuan_add','qianhuan_use'],
init:function(player){
@ -4112,6 +4162,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
gz_masu:'马谡',
gz_yuji:'于吉',
_lianheng:'连横',
lianheng_tag:'连',
guo_tag:'国',
qianhuan:'千幻',
qianhuan_bg:'幻',
qianhuan_info:'当与你势力相同的一名角色受到伤害后,你可以将一张与你武将牌上花色均不同的牌置于你的武将牌上。当一名与你势力相同的角色成为基本牌或锦囊牌的唯一目标时,你可以移去一张“千幻”牌,取消之。',
@ -4253,202 +4306,175 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
junList:['liubei','zhangjiao','sunquan'],
guozhanPile:[
["spade",7,"sha"],
["spade",8,"sha"],
["spade",8,"sha"],
["spade",9,"sha"],
["spade",9,"sha"],
["spade",10,"sha"],
["spade",10,"sha"],
["club",2,"sha"],
["club",3,"sha"],
["club",4,"sha"],
["club",5,"sha"],
["club",6,"sha"],
["club",7,"sha"],
["club",8,"sha"],
["club",8,"sha"],
["club",9,"sha"],
["club",9,"sha"],
["club",10,"sha"],
["club",10,"sha"],
["club",11,"sha"],
["club",11,"sha"],
["heart",10,"sha"],
["heart",10,"sha"],
["heart",11,"sha"],
["diamond",6,"sha"],
["diamond",7,"sha"],
["diamond",8,"sha"],
["diamond",9,"sha"],
["diamond",10,"sha"],
["diamond",13,"sha"],
["heart",2,"shan"],
["heart",2,"shan"],
["heart",13,"shan"],
["diamond",2,"shan"],
["diamond",2,"shan"],
["diamond",3,"shan"],
["diamond",4,"shan"],
["diamond",5,"shan"],
["diamond",6,"shan"],
["diamond",7,"shan"],
["diamond",8,"shan"],
["diamond",9,"shan"],
["diamond",10,"shan"],
["diamond",11,"shan"],
["diamond",11,"shan"],
["heart",3,"tao"],
["heart",4,"tao"],
["heart",6,"tao"],
["heart",7,"tao"],
["heart",8,"tao"],
["heart",9,"tao"],
["heart",12,"tao"],
["diamond",12,"tao"],
['spade',1,'juedou'],
['spade',1,'shandian','thunder'],
['spade',2,'feilongduofeng'],
['spade',2,'bagua'],
['spade',2,'hanbing'],
['spade',3,'guohe'],
['spade',3,'shunshou'],
['spade',4,'guohe'],
['spade',4,'shunshou'],
['spade',5,'sha'],
['spade',5,'jueying'],
['spade',6,'qinggang'],
['spade',6,'sha','thunder'],
['spade',7,'sha'],
['spade',7,'sha','thunder'],
['spade',8,'sha'],
['spade',8,'sha'],
['spade',9,'sha'],
['spade',9,'jiu'],
['spade',10,'sha'],
['spade',10,'bingliang'],
['spade',11,'sha'],
['spade',11,'wuxie'],
['spade',12,'zhangba'],
['spade',12,'tiesuo'],
['spade',13,'nanman'],
['spade',13,'dawan'],
["spade",2,"bagua"],
["club",2,"bagua"],
["spade",5,"jueying"],
["club",5,"dilu"],
["heart",13,"zhuahuang"],
["heart",5,"chitu"],
["spade",13,"dawan"],
["diamond",13,"zixin"],
["club",1,"zhuge"],
["diamond",1,"zhuge"],
["spade",2,"feilongduofeng"],
["spade",6,"qinggang"],
["spade",5,"qinglong"],
["spade",12,"zhangba"],
["diamond",5,"guanshi"],
["diamond",12,"fangtian"],
["heart",5,"qilin"],
["heart",3,"wugu"],
["heart",4,"wugu"],
["heart",1,"taoyuan"],
["spade",7,"nanman"],
["spade",13,"nanman"],
["club",7,"nanman"],
["heart",1,"wanjian"],
["spade",1,"juedou"],
["club",1,"juedou"],
["diamond",1,"juedou"],
["heart",7,"wuzhong"],
["heart",8,"wuzhong"],
["heart",9,"wuzhong"],
["heart",11,"wuzhong"],
["spade",3,'shunshou'],
["spade",4,'shunshou'],
["spade",11,'shunshou'],
["diamond",3,'shunshou'],
["diamond",4,'shunshou'],
["spade",3,'guohe'],
["spade",4,'guohe'],
["spade",12,'guohe'],
["club",3,'guohe'],
["club",4,'guohe'],
["heart",12,'guohe'],
["club",12,'jiedao'],
["club",13,'jiedao'],
["spade",11,'wuxie'],
["club",12,'wuxie'],
["club",13,'wuxie'],
["spade",6,'lebu'],
["club",6,'lebu'],
["heart",6,'lebu'],
["spade",1,'shandian','thunder'],
["spade",2,'hanbing'],
["club",2,'renwang'],
["heart",12,'shandian','thunder'],
["diamond",12,'wuxie'],
["heart",4,"sha","fire"],
["heart",7,"sha","fire"],
["heart",10,"sha","fire"],
["diamond",4,"sha","fire"],
["diamond",5,"sha","fire"],
["spade",4,"sha","thunder"],
["spade",5,"sha","thunder"],
["spade",6,"sha","thunder"],
["spade",7,"sha","thunder"],
["spade",8,"sha","thunder"],
["club",5,"sha","thunder"],
["club",6,"sha","thunder"],
["club",7,"sha","thunder"],
["club",8,"sha","thunder"],
["heart",8,"shan"],
["heart",9,"shan"],
["heart",11,"shan"],
["heart",12,"shan"],
["diamond",6,"shan"],
["diamond",7,"shan"],
["diamond",8,"shan"],
["diamond",10,"shan"],
["diamond",11,"shan"],
["heart",5,"tao"],
["heart",6,"tao"],
["diamond",2,"tao"],
["diamond",3,"tao"],
["diamond",9,"jiu"],
["spade",3,"jiu"],
["spade",9,"jiu"],
["club",3,"jiu"],
["club",9,"jiu"],
["diamond",13,"hualiu"],
["club",1,"baiyin"],
["spade",2,"tengjia",'fire'],
["club",2,"tengjia",'fire'],
["spade",1,"guding"],
["diamond",1,"zhuque",'fire'],
["heart",2,"huogong","fire"],
["heart",3,"huogong","fire"],
["diamond",12,"huogong","fire"],
["spade",11,"tiesuo"],
["spade",12,"tiesuo"],
["club",10,"tiesuo"],
["club",11,"tiesuo"],
["club",12,"tiesuo"],
["club",13,"tiesuo"],
["heart",13,"wuxie"],
["heart",13,"wuxie"],
["spade",13,"wuxie"],
["spade",10,"bingliang"],
["club",4,"bingliang"],
['heart',9,'yuanjiao'],
['club',1,'juedou'],
['club',1,'baiyin'],
['club',2,'sha'],
['club',2,'tengjia','fire'],
['club',2,'renwang'],
['club',3,'sha'],
['club',3,'zhibi'],
['club',4,'sha'],
['club',4,'zhibi'],
['club',5,'sha'],
['club',5,'dilu'],
['club',6,'lebu'],
['club',6,'sha','thunder'],
['club',7,'nanman'],
['club',7,'sha','thunder'],
['club',8,'sha'],
['club',8,'sha','thunder'],
['club',9,'sha'],
['club',9,'jiu'],
['club',10,'sha'],
['club',10,'bingliang'],
['club',11,'sha'],
['club',11,'sha'],
['club',12,'jiedao'],
['club',12,'tiesuo'],
['club',13,'wuxie',null,['guo']],
['club',13,'tiesuo'],
['diamond',1,'zhuge'],
['diamond',1,'zhuque'],
['diamond',2,'shan'],
['diamond',2,'tao'],
['diamond',3,'shan'],
['diamond',3,'shunshou'],
['diamond',4,'yiyi'],
['heart',11,'yiyi'],
['diamond',4,'sha','fire'],
['diamond',5,'guanshi'],
['diamond',5,'sha','fire'],
['diamond',6,'shan'],
['diamond',6,'wuliu'],
['diamond',7,'shan'],
['diamond',7,'shan'],
['diamond',8,'shan'],
['diamond',8,'shan'],
['diamond',9,'shan'],
['diamond',9,'jiu'],
['diamond',10,'shan'],
['diamond',10,'sha'],
['diamond',11,'shan'],
['diamond',11,'sha'],
['diamond',12,'sha'],
['diamond',12,'sanjian'],
['heart',3,'jingfanma'],
["spade",4,'shunshou'],
["spade",12,'guohe'],
["spade",11,'wuxie'],
['spade',3,'huoshaolianying','fire'],
['club',11,'huoshaolianying','fire'],
['heart',12,'huoshaolianying','fire'],
['club',2,'huxinjing'],
['heart',2,'diaohulishan'],
['diamond',10,'diaohulishan'],
['heart',1,'lianjunshengyan'],
['club',3,'chiling'],
['spade',12,'lulitongxin'],
['club',10,'lulitongxin'],
['club',12,'shuiyanqijunx'],
['heart',13,'shuiyanqijunx'],
['spade',1,'xietianzi'],
['diamond',1,'xietianzi'],
['diamond',4,'xietianzi'],
['club',1,'yuxi'],
['diamond',12,'wuxie',null,['guo']],
['diamond',13,'shan'],
['diamond',13,'zixin'],
['heart',1,'taoyuan'],
['heart',1,'wanjian'],
['heart',2,'shan'],
['heart',2,'huogong','fire'],
['heart',3,'taipingyaoshu'],
['diamond',6,'dinglanyemingzhu'],
['heart',3,'huogong','fire'],
['heart',4,'tao'],
['heart',4,'sha','fire'],
['heart',5,'qilin'],
['heart',5,'chitu'],
['heart',6,'tao'],
['heart',6,'lebu'],
['heart',7,'tao'],
['heart',7,'wuzhong'],
['heart',8,'tao'],
['heart',8,'wuzhong'],
['heart',9,'tao'],
['heart',9,'yuanjiao'],
['heart',10,'tao'],
['heart',10,'sha'],
['heart',11,'shan'],
['heart',11,'yiyi'],
['heart',12,'tao'],
['heart',12,'sha'],
['heart',12,'guohe'],
['heart',13,'shan'],
['heart',13,'zhuahuang'],
['spade',1,'xietianzi',null,['lianheng']],
['spade',2,'minguangkai'],
['spade',3,'huoshaolianying','fire'],
['spade',4,'sha'],
['spade',5,'qinglong'],
['spade',6,'jiu',null,['lianheng']],
['spade',7,'sha'],
['spade',8,'sha'],
['spade',9,'sha','thunder'],
['spade',10,'sha','thunder'],
['spade',11,'sha','thunder',['lianheng']],
['spade',12,'lulitongxin'],
['spade',13,'wuxie'],
['heart',1,'lianjunshengyan'],
['heart',2,'diaohulishan'],
['heart',3,'jingfanma',null,['lianheng']],
['heart',4,'shan'],
['heart',5,'shan'],
['heart',6,'shan'],
['heart',7,'shan'],
['heart',8,'tao'],
['heart',9,'tao'],
['heart',10,'sha'],
['heart',11,'sha'],
['heart',12,'huoshaolianying','fire',['lianheng']],
['heart',13,'shuiyanqijunx','thunder'],
['club',1,'yuxi'],
['club',2,'huxinjing',null,['lianheng']],
['club',3,'chiling'],
['club',4,'sha'],
['club',5,'sha','thunder',['lianheng']],
['club',6,'sha'],
['club',7,'sha'],
['club',8,'sha'],
['club',9,'jiu'],
['club',10,'lulitongxin'],
['club',11,'huoshaolianying','fire',['lianheng']],
['club',12,'shuiyanqijunx','thunder'],
['club',13,'wuxie',null,['guo']],
['diamond',1,'xietianzi',null,['lianheng']],
['diamond',2,'tao'],
['diamond',3,'tao',null,['lianheng']],
['diamond',4,'xietianzi',null,['lianheng']],
['diamond',5,'muniu'],
['diamond',6,'shan'],
['diamond',7,'shan'],
['diamond',8,'sha','fire'],
['diamond',9,'sha','fire'],
['diamond',10,'diaohulishan',null,['lianheng']],
['diamond',11,'wuxie',null,['guo']],
['diamond',12,'fangtian'],
['diamond',13,'shan'],
['diamond',6,'dinglanyemingzhu'],
],
element:{
content:{