This commit is contained in:
libccy 2017-11-10 16:59:59 +08:00
parent 4b4b2d66f4
commit 70864a02d7
2 changed files with 77 additions and 35 deletions

View File

@ -1279,7 +1279,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(get.effect(event.target,card,player,player)>0){
if(get.attitude(player,event.target)>0&&get.tag(card,'damage')){
for(var i=0;i<ui.selected.cards.length;i++){
if(get.tag(ui.selected.cards[i]),'damage'){
if(get.tag(ui.selected.cards[i],'damage')){
return 0;
}
}
@ -3025,7 +3025,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
for(var i=0;i<player.storage.shuiyun.length;i++){
types.add(get.type(player.storage.shuiyun[i],'trick'));
}
player.chooseCard(get.prompt('shuiyun'),function(card){
player.chooseCard(get.prompt2('shuiyun'),function(card){
return !types.contains(get.type(card,'trick'));
}).ai=function(card){
return 11-get.value(card);
@ -3080,17 +3080,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:['shuiyun5']
},
shuiyun5:{
trigger:{global:'dying'},
priority:6,
enable:'chooseToUse',
filter:function(event,player){
return event.player.hp<=0&&player.storage.shuiyun&&player.storage.shuiyun.length;
return event.type=='dying'&&event.dying&&event.dying.hp<=0&&player.storage.shuiyun.length>0;
},
direct:true,
filterTarget:function(card,player,target){
return target==_status.event.dying;
},
delay:0,
selectTarget:-1,
content:function(){
"step 0"
player.chooseCardButton(player.storage.shuiyun,get.prompt('shuiyun',trigger.player)).ai=function(button){
return get.attitude(player,trigger.player)>2?1:0;
}
player.chooseCardButton(get.translation('shuiyun'),player.storage.shuiyun,true);
"step 1"
if(result.bool){
player.storage.shuiyun.remove(result.links[0]);
@ -3099,26 +3100,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
player.$throw(result.links);
ui.discardPile.appendChild(result.links[0]);
trigger.player.recover();
// if(trigger.player!=player){
// trigger.player.draw();
// }
player.logSkill('shuiyun5',trigger.player,'thunder');
target.recover();
if(typeof player.storage.shuiyun_count=='number'){
player.storage.shuiyun_count++;
}
game.addVideo('storage',player,['shuiyun',get.cardsInfo(player.storage.shuiyun),'cards']);
player.syncStorage('shuiyun');
}
else{
event.finish();
}
"step 2"
if(trigger.player!=player){
game.delay();
}
},
ai:{
expose:0.3
order:6,
skillTagFilter:function(player){
return player.storage.shuiyun.length>0;
},
save:true,
result:{
target:3
},
threaten:1.6
}
},
wangyou:{
@ -4286,8 +4287,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
shuiyun2:'水蕴',
shuiyun5:'水蕴',
shuiyun3:'水蕴',
shuiyun_info:'结束阶段,你可以将一张与武将牌上的牌类别均不相同的手牌置于武将牌上称为“蕴”;任意一名角色进入濒死状态时你可以弃置一张“蕴”令其回复1点体力',
shuiyun_info_alter:'结束阶段你可以将一张与武将牌上的牌类别均不相同的手牌置于武将牌上称为“蕴”不能超过2张任意一名角色进入濒死状态时你可以弃置一张“蕴”令其回复1点体力',
shuiyun_info:'结束阶段,你可以将一张与武将牌上的牌类别均不相同的手牌置于武将牌上称为“蕴”;任意一名角色处于濒死状态时你可以弃置一张“蕴”令其回复1点体力',
shuiyun_info_alter:'结束阶段你可以将一张与武将牌上的牌类别均不相同的手牌置于武将牌上称为“蕴”不能超过2张任意一名角色处于濒死状态时你可以弃置一张“蕴”令其回复1点体力',
wangyou:'忘忧',
wangyou_info:'其他角色的结束阶段,你可以弃置一张牌,令此回合内受过伤害的所有角色各摸一张牌',
changnian:'长念',

View File

@ -325,13 +325,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
ai:{
effect:{
target:{
function(card,player,target,current){
target:function(card,player,target,current){
if(card.name=='sha'&&current<0) return 0.7;
}
}
}
}
},
tianbian:{
trigger:{player:'chooseCardBegin'},
@ -3399,6 +3397,48 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:'chunlao2'
},
chunlao2:{
enable:'chooseToUse',
filter:function(event,player){
return event.type=='dying'&&event.dying&&event.dying.hp<=0&&player.storage.chunlao.length>0;
},
filterTarget:function(card,player,target){
return target==_status.event.dying;
},
direct:true,
delay:0,
selectTarget:-1,
content:function(){
"step 0"
player.chooseCardButton(get.translation('chunlao'),player.storage.chunlao,true);
"step 1"
if(result.bool){
player.logSkill('chunlao');
player.$throw(result.links);
player.storage.chunlao.remove(result.links[0]);
ui.discardPile.appendChild(result.links[0]);
player.syncStorage('chunlao');
target.useCard({name:'jiu'},target);
if(!player.storage.chunlao.length){
player.unmarkSkill('chunlao');
}
else{
player.markSkill('chunlao');
}
}
},
ai:{
order:6,
skillTagFilter:function(player){
return player.storage.chunlao.length>0;
},
save:true,
result:{
target:3
},
threaten:1.6
},
},
chunlao2_old:{
trigger:{global:'dying'},
priority:6,
filter:function(event,player){
@ -9099,6 +9139,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
jinjiu:'禁酒',
jinjiu_info:'锁定技,你的【酒】均视为【杀】',
chunlao:'醇醪',
chunlao2:'醇醪',
chunlao_info:'结束阶段开始时,若没有“醇”,你可以将至少一张【杀】置于你的武将牌上,称为“醇”。当一名角色处于濒死状态时,你可以移去一张“醇”,视为该角色使用一张【酒】',
lihuo:'疠火',
lihuo_info:'你可以将一张普通【杀】当火【杀】使用。若以此法使用的【杀】造成了伤害则此【杀】结算后你失去1点体力你使用火【杀】指定目标后可以额外指定一个目标',