From 6ce42c03178655775d7391661b5cb29607a32e2c Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 19 Dec 2016 17:40:20 +0800 Subject: [PATCH] 3 --- card/hearth.js | 15 ++-- card/swd.js | 12 +++- character/hearth.js | 35 ++++++++-- character/swd.js | 5 +- extension/boss/extension.js | 89 ++++++++++++++++++++++-- extension/hsmod/extension.js | 92 +------------------------ game/game.js | 128 ++++++++++++++++++----------------- game/package.js | 2 +- game/update.js | 9 ++- 9 files changed, 211 insertions(+), 176 deletions(-) diff --git a/card/hearth.js b/card/hearth.js index 7833fd294..f9f106556 100644 --- a/card/hearth.js +++ b/card/hearth.js @@ -551,17 +551,12 @@ card.hearth={ 'step 0' target.recover(); 'step 1' - if(target.hp0; }, @@ -139,6 +140,7 @@ character.hearth={ miss:{ trigger:{player:'shaMiss'}, frequent:true, + usable:1, filter:function(event){ return event.target.num('e')>0; }, @@ -3289,12 +3291,13 @@ character.hearth={ content:function(){ 'step 0' player.showCards([player.storage.bingjia],get.translation(player)+'发动了【冰甲】'); + player.removeSkill('bingjia2'); + game.addVideo('storage',player,['bingjia',null]); 'step 1' ui.discardPile.appendChild(player.storage.bingjia); delete player.storage.bingjia; player.changeHujia(); - player.removeSkill('bingjia2'); - game.addVideo('storage',player,['bingjia',null]); + player.addTempSkill('bingjia3','phaseAfter'); }, intro:{ mark:function(dialog,content,player){ @@ -3313,6 +3316,28 @@ character.hearth={ } } }, + bingjia3:{ + trigger:{player:'damageBefore'}, + mark:true, + forced:true, + content:function(){ + trigger.untrigger(); + trigger.finish(); + }, + ai:{ + nofire:true, + nothunder:true, + nodamage:true, + effect:{ + target:function(card,player,target,current){ + if(get.tag(card,'damage')) return [0,0]; + } + }, + }, + intro:{ + content:'防止所有伤害' + } + }, bianxing2:{}, moying:{ trigger:{player:'phaseBegin'}, @@ -4792,7 +4817,7 @@ character.hearth={ lianjin:'炼金', lianjin_info:'出牌阶段限两次，你可以弃置一张手牌，并从3张随机锦囊牌中选择一张加入手牌', shouji:'收集', - shouji_info:'每当你使用一张杀，你可以获得一张目标随机手牌的复制；每当你的杀被闪避，你可以获得一张目标随机装备牌的复制', + shouji_info:'每回合限发动一次，每当你使用一张杀，你可以获得一张目标随机手牌的复制；每当你的杀被闪避，你可以获得一张目标随机装备牌的复制', guimou:'鬼谋', guimou_info:'每当你受到一次伤害，你可以获得伤害来源的一张手牌，若此牌是黑色，你展示此牌并重复此过程', yingxi:'影袭', @@ -5017,7 +5042,9 @@ character.hearth={ shengguang_info:'出牌阶段限一次，你可以弃置一张红色牌令一名角色回复一点体力', bingjia:'冰甲', bingjia2:'冰甲', - bingjia_info:'出牌阶段，若你武将牌上没有牌，你可以将一张手牌背面朝上置于你的武将牌上，当你成为其他角色的与此牌花色相同的牌的目标时，你将此牌置于弃牌堆，并获得一点护甲值', + bingjia3:'冰甲', + bingjia3_bg:'免', + bingjia_info:'出牌阶段，若你武将牌上没有牌，你可以将一张手牌背面朝上置于你的武将牌上，当你成为其他角色的与此牌花色相同的牌的目标时，你将此牌置于弃牌堆，获得一点护甲，并且本回合内防止所有伤害', bianxing:'变形', bianxing_info:'当一其他角色于回合内使用卡牌指定了惟一的其他目标后，你可以用一张合理的基本牌替代此牌，每名角色的回合限一次', xianzhi:'先知', diff --git a/character/swd.js b/character/swd.js index ae9bdd493..c7a6f6e4b 100644 --- a/character/swd.js +++ b/character/swd.js @@ -9,7 +9,7 @@ character.swd={ // swd_miles:['male','qun',4,['aojian','miles_xueyi','mohua2']], swd_nicole:['female','qun',3,['huanjian','lingwu','minjing']], swd_wangsiyue:['female','wei',3,['duishi','biyue']], - swd_weida:['female','qun',3,['yueren','duijue']], + swd_weida:['female','qun',3,['yueren','zhenlie','duijue']], swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian']], swd_chenjingchou:['male','wu',3,['youyin','yihua']], @@ -8344,7 +8344,7 @@ character.swd={ polang_info:'每当你造成一次伤害，可以一张对方的装备牌', jikong:'亟空', jikong2:'亟空', - jikong_info:'当你失去最后一手手牌，或在回合开始阶段时，你可以指定一名角色视为对其使用一张雷杀', + jikong_info:'当你失去最后一张手牌，或在回合开始阶段时，你可以指定一名角色视为对其使用一张雷杀', xiangu:'仙骨', xiangu_info:'锁定技，你的手牌上限不会因体力值的减少而减少。', yiesheng:'回雪', @@ -8452,6 +8452,7 @@ character.swd={ xiehun3:'邪魂', jumo:'聚魔', duijue:'对决', + duijue_bg:'决', yueren:'月刃', busi:'不死', xuying:'虚影', diff --git a/extension/boss/extension.js b/extension/boss/extension.js index bf63690f1..c48621a9c 100644 --- a/extension/boss/extension.js +++ b/extension/boss/extension.js @@ -48,6 +48,44 @@ play.boss={ lib.config.forbidai.push(i); } } + var list2={ + boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'], + boss_gongshenyueying:['male','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'], + boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'], + boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'], + boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'], + boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'], + boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'], + boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'], + + boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'], + boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'], + boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'], + boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'], + boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'], + boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'], + boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'], + boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'], + } + if(get.mode()!='versus'){ + lib.characterPack.mode_extension_jiange=list2; + for(var i in list2){ + lib.characterPack.mode_extension_jiange[i]=list2[i]; + lib.characterPack.mode_extension_jiange[i][4].push('mode:versus'); + lib.character[i]=list2[i]; + if(!lib.config.boss_enableai_playpackconfig){ + lib.config.forbidai.push(i); + } + } + } + else if(_status.mode!='jiange'){ + for(var i in list2){ + lib.character[i]=list2[i]; + if(!lib.config.boss_enableai_playpackconfig){ + lib.config.forbidai.push(i); + } + } + } var list={ boss_chi:'魑', boss_mo:'魅', @@ -90,15 +128,51 @@ play.boss={ boss_zhaoyun:'高达一号', boss_zhuoguiquxie:'捉鬼驱邪', - mode_extension_boss_character_config:'挑战模式' + boss_liedixuande:'烈帝玄德', + boss_gongshenyueying:'工神月英', + boss_tianhoukongming:'天侯孔明', + boss_yuhuoshiyuan:'浴火士元', + boss_qiaokuijunyi:'巧魁儁乂', + boss_jiarenzidan:'佳人子丹', + boss_duanyuzhongda:'断狱仲达', + boss_juechenmiaocai:'绝尘妙才', + + boss_jileibaihu:'机雷白虎', + boss_yunpingqinglong:'云屏青龙', + boss_lingjiaxuanwu:'灵甲玄武', + boss_chiyuzhuque:'炽羽朱雀', + boss_fudibian:'缚地狴犴', + boss_tuntianchiwen:'吞天螭吻', + boss_shihuosuanni:'食火狻猊', + boss_lieshiyazi:'裂石睚眦', + + mode_extension_boss_character_config:'挑战武将', + mode_extension_jiange_character_config:'剑阁武将', }; for(var i in list){ - lib.translate[i]=list[i]; + lib.translate[i]=lib.translate[i]||list[i]; } } }, arenaReady:function(){ + var loadversus=function(){ + if(get.mode()!='versus'){ + window.mode={}; + lib.init.js(lib.assetURL+'mode','versus',function(){ + for(var i in mode.versus.translate){ + lib.translate[i]=lib.translate[i]||mode.versus.translate[i]; + } + for(var i in mode.versus.skill){ + if(i!='versus_swap'){ + lib.skill[i]=lib.init.eval(mode.versus.skill[i]); + game.finishSkill(i); + } + } + delete window.mode; + }); + } + }; if(get.mode()!='boss'){ window.mode={}; lib.init.js(lib.assetURL+'mode','boss',function(){ @@ -106,11 +180,18 @@ play.boss={ lib.translate[i]=lib.translate[i]||mode.boss.translate[i]; } for(var i in mode.boss.skill){ - lib.skill[i]=lib.init.eval(mode.boss.skill[i]); - game.finishSkill(i); + if(i!='_bossswap'){ + lib.skill[i]=lib.init.eval(mode.boss.skill[i]); + game.finishSkill(i); + } } + delete window.mode; + loadversus(); }); } + else{ + loadversus(); + } }, help:{ '挑战武将':'