This commit is contained in:
libccy 2017-02-24 09:11:01 +08:00
parent e394850a7e
commit 3b1cc9186e
3 changed files with 29 additions and 25 deletions

View File

@ -65,7 +65,7 @@ character.swd={
// swd_libai:['female','qun',3,['miaobi','zhexian']],
// swd_kendi:['male','qun',3,['guanxing','jianyan']],
// swd_lijing:['male','qun',4,['tianyi','zhuhai']],
swd_lilian:['female','qun',3,['swd_wuxie','qingcheng']],
swd_lilian:['female','qun',3,['swd_wuxie','lqingcheng']],
// swd_linming:['male','qun',3,['shelie','bifa']],
// swd_philis:['male','qun',4,['yicong','wangxi']],
// swd_pepin:['male','qun',4,['rejianxiong','quhu']],
@ -5437,7 +5437,7 @@ character.swd={
}
}
},
qingcheng:{
lqingcheng:{
trigger:{player:'phaseEnd'},
frequent:true,
content:function(){
@ -5457,7 +5457,7 @@ character.swd={
}
event.finish();
}
else if(lib.config.autoskilllist.contains('qingcheng')){
else if(lib.config.autoskilllist.contains('lqingcheng')){
player.chooseBool('是否再次发动?');
}
else{
@ -9135,7 +9135,7 @@ character.swd={
yishan:'异闪',
yishan2:'异闪',
swd_wuxie:'无邪',
qingcheng:'倾城',
lqingcheng:'倾城',
xianjiang:'仙匠',
xianjiang3:'仙匠',
shengong:'神工',
@ -9249,7 +9249,7 @@ character.swd={
huanhun_info:'当一名角色进入濒死状态时,你可以弃置一张红色牌并令其进行一次判定,若结果为红色,其回复一点体力',
daixing_info:'结束阶段,你可以任意张牌并获得等量的护甲,这些护甲将在你的下个准备阶段消失',
swd_wuxie_info:'锁定技,你不能成为其他角色的延时锦囊的目标',
qingcheng_info:'结束阶段你可以进行判定若为红色则可以继续判定最多判定3次判定结束后将判定成功的牌收入手牌',
lqingcheng_info:'结束阶段你可以进行判定若为红色则可以继续判定最多判定3次判定结束后将判定成功的牌收入手牌',
xianjiang_old_info:'出牌阶段,你可以将一张装备牌永久转化为任意一张其它装备牌,一张牌在一个阶段只能转化一次',
xianjiang_info:'出牌阶段限一次,你可以弃置一张锦囊牌并随机装备一件装备',
xianjiang_info_alter:'出牌阶段限一次,若你装备内没有牌,你可以弃置一张锦囊牌并随机装备一件装备',

View File

@ -10,7 +10,7 @@ character.xianjian={
// pal_shenqishuang:['female','wei',3,[]],
pal_jingtian:['male','wu',3,['sajin','jubao']],
pal_xuejian:['female','shu',3,['shuangren','shenmu','duci']],
pal_xuejian:['female','shu',3,['xshuangren','shenmu','duci']],
pal_longkui:['female','qun',3,['fenxing','diewu','lingyu']],
pal_zixuan:['female','wei',3,['shuiyun','wangyou','changnian']],
pal_changqing:['male','wei',4,['luanjian','tianfu']],
@ -1698,7 +1698,7 @@ character.xianjian={
}
}
},
shuangren:{
xshuangren:{
trigger:{player:['loseEnd']},
filter:function(event,player){
if(!player.equiping) return false;
@ -1715,25 +1715,25 @@ character.xianjian={
}
}
if(card){
if(player.storage.shuangren){
player.unmark(player.storage.shuangren,'shuangren');
player.discard(player.storage.shuangren);
game.addVideo('unmarkId',player,[get.cardInfo(player.storage.shuangren),'shuangren']);
if(player.storage.xshuangren){
player.unmark(player.storage.xshuangren,'xshuangren');
player.discard(player.storage.xshuangren);
game.addVideo('unmarkId',player,[get.cardInfo(player.storage.xshuangren),'xshuangren']);
}
if(card.clone){
card.clone.moveDelete(player);
game.addVideo('gain2',player,get.cardsInfo([card.clone]));
player.mark(card,'shuangren');
game.addVideo('markId',player,[get.cardInfo(card),'shuangren']);
player.mark(card,'xshuangren');
game.addVideo('markId',player,[get.cardInfo(card),'xshuangren']);
}
ui.special.appendChild(card);
player.storage.shuangren=card;
player.storage.xshuangren=card;
var info=get.info(card);
if(info.skills){
player.addAdditionalSkill('shuangren',info.skills);
player.addAdditionalSkill('xshuangren',info.skills);
}
else{
player.removeAdditionalSkill('shuangren');
player.removeAdditionalSkill('xshuangren');
}
}
@ -1748,20 +1748,20 @@ character.xianjian={
intro:{
content:'card'
},
group:'shuangren2'
group:'xshuangren2'
},
shuangren2:{
xshuangren2:{
trigger:{player:'dieBegin'},
forced:true,
popup:false,
silent:true,
filter:function(event,player){
return player.storage.shuangren?true:false;
return player.storage.xshuangren?true:false;
},
content:function(){
if(player.storage.shuangren){
ui.discardPile.appendChild(player.storage.shuangren);
player.$throw(player.storage.shuangren);
if(player.storage.xshuangren){
ui.discardPile.appendChild(player.storage.xshuangren);
player.$throw(player.storage.xshuangren);
}
}
},
@ -2564,8 +2564,8 @@ character.xianjian={
jubao_info:'当其他角色于你的回合外首次弃置非基本牌时,你可以获得其中的随机一张',
guiyuan:'归元',
guiyuan_info:'出牌阶段限一次,你可以弃置一张杀并回复一点体力',
shuangren:'双刃',
shuangren_info:'当你的武器牌被替换时,你可以将其置于你的武将牌上,并获得此装备的武器效果(不含距离)',
xshuangren:'双刃',
xshuangren_info:'当你的武器牌被替换时,你可以将其置于你的武将牌上,并获得此装备的武器效果(不含距离)',
duci:'毒刺',
duci_info:'每当你失去一次装备牌可以对距离1以内的一名其他角色造成一点伤害',
shenmu:'神木',

View File

@ -185,7 +185,7 @@ mode.guozhan={
gz_jiling:['male','qun',4,[]],
gz_tianfeng:['male','qun',3,['sijian','suishi']],
gz_panfeng:['male','qun',4,['kuangfu']],
gz_zoushi:['female','qun',3,[]],
gz_zoushi:['female','qun',3,['huoshui','qingcheng']],
gz_dengai:['male','wei',4,[]],
gz_caohong:['male','wei',4,[]],
@ -927,6 +927,10 @@ mode.guozhan={
tongshimingzhi:'同时明置',
mode_guozhan_character_config:'国战武将',
huoshui:'祸水',
huoshui_info:'出牌阶段,你可以明置此武将牌;你的回合内,若此武将牌处于明置状态,其他角色不能明置其武将牌',
qingcheng:'倾城',
qingcheng_info:'出牌阶段,你可以弃置一张装备牌并选择一名两张武将牌均明置的其他角色,你暗置其一张武将牌',
duoshi:'度势',
duoshi_info:'出牌阶段限四次,你可以将一张红色手牌当【以逸待劳】使用。',
gzxiaoguo:'骁果',