This commit is contained in:
libccy 2017-02-17 11:25:37 +08:00
parent b7c2e99ddc
commit 1d24aa191b
7 changed files with 48 additions and 30 deletions

View File

@ -69,15 +69,15 @@ card.hearth={
content:function(){ content:function(){
'step 0' 'step 0'
if(target.num('hej')){ if(target.num('hej')){
player.choosePlayerCard('hej','重铸'+get.translation(target)+'的一张牌',target,true).visible=true; var next=player.discardPlayerCard('hej',target,true);
next.visible=true;
next.delay=false;
} }
else{ else{
event.goto(2); event.goto(2);
} }
'step 1' 'step 1'
if(result.bool){ if(result.bool){
target.$throw(result.links,1000);
target.lose(result.links);
game.delay(0.5); game.delay(0.5);
} }
'step 2' 'step 2'
@ -686,7 +686,7 @@ card.hearth={
shijieshu:'视界术', shijieshu:'视界术',
shijieshu_info:'目标随机装备两张装备牌,然后弃置一张手牌', shijieshu_info:'目标随机装备两张装备牌,然后弃置一张手牌',
zhaomingdan:'照明弹', zhaomingdan:'照明弹',
zhaomingdan_info:'观看一名其他角色的手牌,并重置其区域内的一张牌,然后摸一张牌', zhaomingdan_info:'观看一名其他角色的手牌,并弃置其区域内的一张牌,然后其与你各摸一张牌',
jihuocard:'激活', jihuocard:'激活',
jihuocard_info:'摸一张牌,本回合手牌上限+2', jihuocard_info:'摸一张牌,本回合手牌上限+2',
}, },

View File

@ -462,16 +462,7 @@ character.gujian={
}, },
result:{ result:{
target:function(player,target){ target:function(player,target){
var card=get.card(); return ai.get.equipResult(player,target,name);
if(card==undefined){
card={name:name};
}
var value1=ai.get.value(card,target);
var value2=0;
if(target[get.subtype(card)]&&target[get.subtype(card)]!=card){
value2=ai.get.value(target[get.subtype(card)],target);
}
return Math.max(0,value1-value2)/5;
} }
} }
} }

View File

@ -3177,6 +3177,7 @@ character.hearth={
malymowang:{ malymowang:{
trigger:{source:'damageBegin'}, trigger:{source:'damageBegin'},
forced:true, forced:true,
usable:1,
filter:function(event){ filter:function(event){
return event.card&&get.type(event.card)=='trick'&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2'; return event.card&&get.type(event.card)=='trick'&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
}, },
@ -3192,7 +3193,23 @@ character.hearth={
trigger:{player:'phaseUseBegin'}, trigger:{player:'phaseUseBegin'},
forced:true, forced:true,
content:function(){ content:function(){
player.gain(game.createCard(get.inpile('trick').randomGet()),'draw'); 'step 0'
var list=get.inpile('trick');
list=list.randomGets(3);
for(var i=0;i<list.length;i++){
list[i]=['锦囊','',list[i]];
}
var dialog=ui.create.dialog('选择一张锦囊牌加入你的手牌',[list,'vcard'],'hidden');
player.chooseButton(dialog,true).ai=function(button){
var card={name:button.link[2]};
var value=ai.get.value(card);
if(get.tag(card,'damage')) value++;
return value;
};
'step 1'
if(result.bool){
player.gain(game.createCard(result.buttons[0].link[2]),'draw');
}
} }
}, },
lingzhou:{ lingzhou:{
@ -6013,7 +6030,7 @@ character.hearth={
liehun_info:'锁定技,结束阶段,你获得手牌中所有非基本牌的复制', liehun_info:'锁定技,结束阶段,你获得手牌中所有非基本牌的复制',
malymowang:'魔网', malymowang:'魔网',
malymowang2:'魔网', malymowang2:'魔网',
malymowang_info:'锁定技,你的锦囊牌造成的伤害+1出牌阶段开始时你随机获得一张锦囊牌', malymowang_info:'锁定技,你的锦囊牌在每回合中造成的首次伤害+1出牌阶段开始时你从3张随机锦囊中选择一张加入手牌',
lingzhou:'灵咒', lingzhou:'灵咒',
lingzhou_info:'每当你使用一张锦囊牌,可令一名角色摸一张牌或回复一点体力', lingzhou_info:'每当你使用一张锦囊牌,可令一名角色摸一张牌或回复一点体力',
mieshi:'灭世', mieshi:'灭世',

View File

@ -378,6 +378,7 @@ window.characterRank={
'cuiyan', 'cuiyan',
'sp_zhugeliang', 'sp_zhugeliang',
'hs_guldan', 'hs_guldan',
're_ganning',
], ],
b:[ b:[
'diy_liufu', 'diy_liufu',
@ -451,7 +452,6 @@ window.characterRank={
'zhangyi', 'zhangyi',
'yxs_baosi', 'yxs_baosi',
'lingju', 'lingju',
're_ganning',
'xin_yujin', 'xin_yujin',
'diy_feishi', 'diy_feishi',
'yxs_lvzhi', 'yxs_lvzhi',

View File

@ -6915,7 +6915,7 @@ character.yijiang={
trigger:{player:'damageAfter'}, trigger:{player:'damageAfter'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
return player.num('h')>0; return player.num('h')>0&&player.isDamaged();
}, },
content:function(){ content:function(){
"step 0" "step 0"

View File

@ -2709,7 +2709,7 @@ character.yxs={
zhensha:'鸩杀', zhensha:'鸩杀',
zhensha_info:'当场上有角色进入濒死状态时,你可以弃置一张酒或两张黑色手牌,则该角色立即死亡。', zhensha_info:'当场上有角色进入濒死状态时,你可以弃置一张酒或两张黑色手牌,则该角色立即死亡。',
xumou:'蓄谋', xumou:'蓄谋',
xumou_info:'结束阶段,你可以将武将牌翻并摸3张牌', xumou_info:'结束阶段,你可以将武将牌翻并摸3张牌',
guifu:'鬼斧', guifu:'鬼斧',
guifu_info:'出牌阶段限一次,你可以指定一名角色装备区内的一张牌,将其弃掉,自己和对方同时摸取一张牌', guifu_info:'出牌阶段限一次,你可以指定一名角色装备区内的一张牌,将其弃掉,自己和对方同时摸取一张牌',
lshengong:'神工', lshengong:'神工',

View File

@ -8278,7 +8278,10 @@
cards.push(event.result.links[i]); cards.push(event.result.links[i]);
} }
event.result.cards=event.result.links.slice(0); event.result.cards=event.result.links.slice(0);
target.discard(cards); var next=target.discard(cards);
if(event.delay===false){
next.delay=event.delay;
}
} }
}, },
gainPlayerCard:function(){ gainPlayerCard:function(){
@ -22229,16 +22232,7 @@
} }
card.ai.result.target=(function(name){ card.ai.result.target=(function(name){
return (function(player,target){ return (function(player,target){
var card=get.card(); return ai.get.equipResult(player,target,name);
if(card==undefined){
card={name:name};
}
var value1=ai.get.value(card,target);
var value2=0;
if(target[get.subtype(card)]&&target[get.subtype(card)]!=card){
value2=ai.get.value(target[get.subtype(card)],target);
}
return Math.max(0,value1-value2)/5;
}); });
}(i)); }(i));
} }
@ -36772,6 +36766,22 @@
} }
return 0; return 0;
}, },
equipResult:function(player,target,name){
var card=get.card();
if(card==undefined){
card={name:name};
}
var value1=ai.get.value(card,target);
var value2=0;
var current=target.get('e',get.subtype(card)[5]);
if(current&&current!=card){
value2=ai.get.value(current,target);
if(value2>0&&!target.needsToDiscard()){
return 0;
}
}
return Math.max(0,value1-value2)/5;
},
equipValue:function(card,player){ equipValue:function(card,player){
if(player==undefined||get.itemtype(player)!='player') player=get.owner(card); if(player==undefined||get.itemtype(player)!='player') player=get.owner(card);
if(player==undefined||get.itemtype(player)!='player') player=_status.event.player; if(player==undefined||get.itemtype(player)!='player') player=_status.event.player;