diff --git a/character/hearth.js b/character/hearth.js
index cce71682e..bd170ec83 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -86,7 +86,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
hs_tanghangu:['male','shu',5,['zhongji']],
hs_aya:['female','wu',3,['ayuling','qingzun']],
- // hs_barnes:['male','wei',3,[]],
+ hs_barnes:['male','shu',4,['hsnitai']],
// hs_nuogefu:['male','wei',3,[]],
hs_kazhakusi:['male','shu',3,['lianjin']],
// hs_lazi:['male','wei',3,[]],
@@ -119,7 +119,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
// hs_wuyaowang:['male','qun',4,['hstianqi']],
// hs_aerfusi:['male','qun',4,['hstianqi']],
// hs_baiguyoulong:['male','qun',4,['hstianqi']],
- hs_yangyanwageli:['male','qun',4,['hstianqi']],
+ hs_yangyanwageli:['female','qun',3,['hspuzhao','hsyanxin']],
},
characterIntro:{
hs_jaina:'戴林·普罗德摩尔之女。 在吉安娜成年早期,她致力于阻止将引发第三次战争的天灾瘟疫传播,当战况加剧后,吉安娜获得了新部落大酋长萨尔的信任,成为团结艾泽拉斯各族携手对抗燃烧军团的关键人物。当战争结束后,吉安娜管理着塞拉摩岛,致力于促进部落与联盟间的关系。吉安娜的和平立场与性格在接任萨尔成为部落大酋长的加尔鲁什·地狱咆哮以一颗魔法炸弹夷平塞拉摩后改变了。身为肯瑞托的新领袖,她拥有让加尔鲁什为他酿成的惨剧付出血的代价的权力与决心。',
@@ -200,6 +200,298 @@ game.import('character',function(lib,game,ui,get,ai,_status){
hs_malfurion:['hs_malorne'],
},
skill:{
+ hsnitai:{
+ trigger:{player:'phaseUseBegin'},
+ forced:true,
+ video:function(player,data){
+ var skill=data[0];
+ var name=data[1];
+ console.log(skill,name);
+ lib.skill.hsnitai.process(skill,name);
+ },
+ onremove:function(player){
+ player.removeSkill('hsnitai_card');
+ },
+ process:function(skill,name){
+ var cardname='hsnitai_'+skill;
+ lib.translate[cardname]=lib.translate[skill];
+ lib.translate[cardname+'_info']='出牌阶段对自己使用,获得技能'+lib.translate[skill]+'(替换前一个以此法获得的技能)';
+ lib.translate[cardname+'_append']='
【'+lib.translate[skill]+'】
'+
+ get.skillInfoTranslation(skill)+'
';
+ lib.card[cardname]=lib.card[cardname]||{
+ enable:true,
+ type:'character',
+ image:'character/'+name,
+ fullimage:true,
+ vanish:true,
+ derivation:'hs_barnes',
+ filterTarget:function(card,player,target){
+ return player==target;
+ },
+ selectTarget:-1,
+ content:function(){
+ var skill=card.name.slice(8);
+ if(!target.hasSkill(skill)){
+ target.$gain2(card);
+ target.removeSkill('hsnitai_card');
+ target.storage.hsnitai_card=card;
+ player.syncStorage('hsnitai_card');
+ target.addAdditionalSkill('hsnitai_card',skill);
+ target.addSkill('hsnitai_card');
+ game.log(target,'获得技能','【'+get.translation(skill)+'】');
+ }
+ },
+ ai:{
+ order:function(){
+ if(_status.event.player.hasSkill('hsnitai_card')) return 1;
+ return 9;
+ },
+ result:{
+ target:function(player,target){
+ if(!player.hasSkill('hsnitai_card')||player.needsToDiscard()) return 1;
+ return 0;
+ }
+ }
+ }
+ };
+ },
+ content:function(){
+ var current=game.expandSkills(player.getSkills());
+ var list=get.gainableSkills(function(info,skill,name){
+ if(current.contains(skill)) return false;
+ return lib.characterPack.hearth&&lib.characterPack.hearth[name];
+ });
+ if(!list.length){
+ return;
+ }
+ var skill=list.randomGet();
+ var source=[];
+ for(var i in lib.characterPack.hearth){
+ if(lib.characterPack.hearth[i][3].contains(skill)){
+ source.push(i);
+ }
+ }
+ if(!source.length){
+ return;
+ }
+ var name=source.randomGet();
+ game.addVideo('skill',player,['hsnitai',[skill,name]]);
+ lib.skill.hsnitai.process(skill,name);
+ player.gain(game.createCard('hsnitai_'+skill),'gain2');
+ },
+ subSkill:{
+ card:{
+ mark:'card',
+ onremove:true,
+ intro:{
+ name:function(storage){
+ var skill=storage.name.slice(8);
+ return '拟态:'+lib.translate[skill];
+ },
+ content:function(storage){
+ var skill=storage.name.slice(8);
+ return lib.translate[skill+'_info'];
+ }
+ }
+ }
+ }
+ },
+ hspuzhao:{
+ enable:'phaseUse',
+ usable:1,
+ filterCard:{suit:'heart'},
+ position:'he',
+ filter:function(event,player){
+ return player.countCards('he',{suit:'heart'})>0;
+ },
+ check:function(card){
+ return 7-get.value(card);
+ },
+ content:function(){
+ var targets=player.getFriends();
+ if(targets.length){
+ targets.push(player);
+ if(targets.length>3){
+ targets=targets.randomGets(3);
+ }
+ targets.sortBySeat();
+ player.line(targets,'green');
+ for(var i=0;i0;
+ },
+ content:function(){
+ player.changeHujia(trigger.num);
+ }
+ },
ysjqisha:{
trigger:{source:'damageEnd',player:'damageEnd'},
forced:true,
@@ -6648,6 +6940,67 @@ game.import('character',function(lib,game,ui,get,ai,_status){
hsjixie:0.5
},
card:{
+ hstianqi_dalian:{
+ type:'equip',
+ subtype:'equip1',
+ distance:{attackFrom:-1},
+ fullimage:true,
+ vanish:true,
+ destroy:'hstianqi',
+ derivation:'hs_heifengqishi',
+ skills:['hstianqi_dalian'],
+ ai:{
+ equipValue:10
+ }
+ },
+ hstianqi_shali:{
+ type:'equip',
+ subtype:'equip2',
+ distance:{attackFrom:-1},
+ fullimage:true,
+ vanish:true,
+ destroy:'hstianqi',
+ derivation:'hs_heifengqishi',
+ skills:['hstianqi_shali'],
+ ai:{
+ equipValue:10
+ }
+ },
+ hstianqi_nazigelin:{
+ type:'equip',
+ subtype:'equip4',
+ distance:{globalFrom:-1},
+ fullimage:true,
+ vanish:true,
+ destroy:'hstianqi',
+ derivation:'hs_heifengqishi',
+ onEquip:function(){
+ player.changeHujia();
+ },
+ equipDelay:false,
+ ai:{
+ equipValue:10
+ }
+ },
+ hstianqi_suolasi:{
+ type:'equip',
+ subtype:'equip3',
+ distance:{globalTo:1},
+ fullimage:true,
+ vanish:true,
+ destroy:'hstianqi',
+ derivation:'hs_heifengqishi',
+ onLose:function(){
+ if(player.isDamaged()){
+ player.logSkill('hstianqi_suolasi');
+ player.recover();
+ }
+ },
+ loseDelay:false,
+ ai:{
+ equipValue:10
+ }
+ },
hsjixie_zhadan:{
enable:true,
fullimage:true,
@@ -7519,6 +7872,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
hs_baiguyoulong:'白骨幼龙',
hs_yangyanwageli:'阳焰瓦格里',
+ hstianqi_dalian:'达里安',
+ hstianqi_dalian_info:'每当你造成一次伤害,你回复等量的体力',
+ hstianqi_shali:'莎莉',
+ hstianqi_shali_info:'每当你回复体力,你获得等量的护甲',
+ hstianqi_nazigelin:'纳兹戈林',
+ hstianqi_nazigelin_info:'当你装备此牌时,你获得一点护甲',
+ hstianqi_suolasi:'索拉斯',
+ hstianqi_suolasi_info:'当你失去此牌时,你回复一点体力',
hschaoxi:'潮袭',
hschaoxi_info:'锁定技,每当你造成一次伤害,你获得两张随机鱼人牌',
hsnitai:'拟态',
@@ -7526,9 +7887,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
hstianqi:'天启',
hstianqi_info:'出牌阶段限一次,你可以选择一项:弃置一张手牌并随机装备一件天启骑士(不能替换现有装备),或弃置一张装备区内的牌并摸两张牌;若你此时装备区内集齐了4件天启骑士,你获得游戏胜利',
hspuzhao:'普照',
- hspuzhao_info:'出牌阶段限一次,你可以弃置一张红桃牌,然后令至多3名随机友方角色各摸一张牌',
+ hspuzhao_info:'出牌阶段限一次,你可以弃置一张红桃牌,然后令至多三名随机友方角色各摸一张牌(若你无其他队友,改为摸两张牌)',
hsyanxin:'炎心',
- hsyanxin_info:'锁定技,你摸到的首张牌为红色的概率比其他角色多50%',
+ hsyanxin_info:'锁定技,在你摸牌时,若牌堆中有红色牌,你摸到的首张牌必为红色',
ysjqisha:'七煞',
ysjqisha_ju:'惧之煞',
ysjqisha_kuang:'狂之煞',
@@ -7819,7 +8180,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
malymowang:'魔网',
malymowang2:'魔网',
malymowang_info:'锁定技,你的锦囊牌在每回合中造成的首次伤害+1;出牌阶段开始时,你从3张随机锦囊中选择一张加入手牌',
- malymowang_info_alter:'锁定技,你的锦囊牌在每回合中造成的首次伤害+1;出牌阶段开始时,随机获得一张普通锦牌牌',
+ malymowang_info_alter:'锁定技,你的锦囊牌在每回合中造成的首次伤害+1;出牌阶段开始时,你随机获得一张普通锦牌牌',
lingzhou:'灵咒',
lingzhou_info:'每当你使用一张非转化的锦囊牌,可令一名角色摸一张牌或回复一点体力',
mieshi:'灭世',
diff --git a/game/asset.js b/game/asset.js
index 94c53c3ef..3931bd2f1 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -108,6 +108,10 @@ window.noname_asset_list=[
'image/card/hsqizhou_huo.jpg',
'image/card/hsqizhou_shui.jpg',
'image/card/hsqizhou_tu.jpg',
+ 'image/card/hstianqi_dalian.jpg',
+ 'image/card/hstianqi_nazigelin.jpg',
+ 'image/card/hstianqi_shali.jpg',
+ 'image/card/hstianqi_suolasi.jpg',
'image/card/hslingjian_zhongxinghujia.jpg',
'image/card/hslingjian_xuanfengzhiren.jpg',
'image/card/hslingjian_yinmilichang.jpg',
diff --git a/game/game.js b/game/game.js
index 308fcd079..ec06f8b91 100644
--- a/game/game.js
+++ b/game/game.js
@@ -43596,6 +43596,9 @@
uiintro._place_text=placetext;
}
}
+ if(lib.translate[name+'_append']){
+ uiintro.add(''+lib.translate[name+'_append']+'
');
+ }
}
uiintro.add(ui.create.div('.placeholder.slim'));
}
diff --git a/image/card/hstianqi_dalian.jpg b/image/card/hstianqi_dalian.jpg
new file mode 100644
index 000000000..a06c577ad
Binary files /dev/null and b/image/card/hstianqi_dalian.jpg differ
diff --git a/image/card/hstianqi_nazigelin.jpg b/image/card/hstianqi_nazigelin.jpg
new file mode 100644
index 000000000..9f68c3cb7
Binary files /dev/null and b/image/card/hstianqi_nazigelin.jpg differ
diff --git a/image/card/hstianqi_shali.jpg b/image/card/hstianqi_shali.jpg
new file mode 100644
index 000000000..d8338b66e
Binary files /dev/null and b/image/card/hstianqi_shali.jpg differ
diff --git a/image/card/hstianqi_suolasi.jpg b/image/card/hstianqi_suolasi.jpg
new file mode 100644
index 000000000..81b92ecc2
Binary files /dev/null and b/image/card/hstianqi_suolasi.jpg differ