From ff14ff4651e89e6a00b79a6cde1a441014e1c25c Mon Sep 17 00:00:00 2001 From: libccy Date: Sun, 29 May 2016 10:40:12 +0800 Subject: [PATCH] i --- character/hearth.js | 94 ++++++++++++++---- game/asset.js | 1 + game/game.js | 20 ++-- game/update.js | 3 + image/character/caozhang.jpg | Bin 121108 -> 37103 bytes image/character/chess_mech_mutong.jpg | Bin 105088 -> 40276 bytes .../character/chess_mech_weixingxianjing.jpg | Bin 111848 -> 39361 bytes image/character/guanxingzhangbao.jpg | Bin 117235 -> 35623 bytes image/character/guohuanghou.jpg | Bin 299855 -> 65162 bytes image/character/hs_jiaziruila.jpg | Bin 132398 -> 54327 bytes image/character/hs_wujiyuansu.jpg | Bin 117798 -> 117444 bytes image/character/hs_yogg.jpg | Bin 0 -> 40519 bytes image/character/jiangfei.jpg | Bin 127305 -> 35745 bytes image/character/jsp_huangyueying.jpg | Bin 127862 -> 89119 bytes image/character/liuyu.jpg | Bin 154774 -> 55494 bytes image/character/re_zhangliao.jpg | Bin 120230 -> 39171 bytes image/character/shibing_qun.jpg | Bin 20905 -> 20796 bytes image/character/shibing_shu.jpg | Bin 18120 -> 18320 bytes image/character/shibing_wei.jpg | Bin 18798 -> 18542 bytes image/character/shibing_wu.jpg | Bin 15867 -> 15836 bytes image/character/shixie.jpg | Bin 38734 -> 38698 bytes image/character/simalang.jpg | Bin 48306 -> 46658 bytes image/character/simayi.jpg | Bin 30634 -> 32882 bytes image/character/sp_caiwenji.jpg | Bin 101740 -> 101778 bytes image/character/sp_caoren.jpg | Bin 36830 -> 39142 bytes image/character/sp_daqiao.jpg | Bin 34472 -> 36742 bytes image/character/sp_diaochan.jpg | Bin 31506 -> 33709 bytes image/character/sp_dongzhuo.jpg | Bin 38363 -> 35557 bytes image/character/sp_ganning.jpg | Bin 44163 -> 44094 bytes image/character/sp_jiangwei.jpg | Bin 48410 -> 36504 bytes image/character/sp_lvmeng.jpg | Bin 56340 -> 72214 bytes image/character/sp_machao.jpg | Bin 70078 -> 64495 bytes image/character/sp_pangtong.jpg | Bin 26298 -> 28250 bytes image/character/sp_sunshangxiang.jpg | Bin 42654 -> 45584 bytes image/character/sp_xiahoudun.jpg | Bin 69691 -> 72170 bytes image/character/sp_zhangfei.jpg | Bin 139098 -> 49709 bytes image/character/sp_zhangjiao.jpg | Bin 37063 -> 33757 bytes image/character/sp_zhaoyun.jpg | Bin 33520 -> 35769 bytes image/character/sp_zhugeliang.jpg | Bin 29328 -> 31072 bytes image/character/stone_aidewen.jpg | Bin 62022 -> 76468 bytes image/character/stone_aihaozhihun.jpg | Bin 43545 -> 42405 bytes image/character/stone_alaikesita.jpg | Bin 59741 -> 57687 bytes image/character/stone_andongni.jpg | Bin 96659 -> 120949 bytes image/character/stone_anyingzisi.jpg | Bin 49461 -> 45891 bytes image/character/stone_aolajier.jpg | Bin 23526 -> 48375 bytes image/character/stone_aomishouwei.jpg | Bin 46800 -> 54048 bytes image/character/stone_aoshushi.jpg | Bin 25806 -> 39220 bytes image/character/stone_baohuzhishu.jpg | Bin 102471 -> 54111 bytes image/character/stone_baoqishi.jpg | Bin 34207 -> 32550 bytes image/character/stone_baoweizhe.jpg | Bin 128154 -> 46446 bytes image/character/stone_beijunmushi.jpg | Bin 37202 -> 33986 bytes image/character/stone_caoyuanshi.jpg | Bin 29414 -> 32181 bytes image/character/stone_chidunshinv.jpg | Bin 46148 -> 49143 bytes image/character/stone_chidunweishi.jpg | Bin 53537 -> 52094 bytes image/character/stone_chilundashi.jpg | Bin 29210 -> 44556 bytes image/character/stone_cike.jpg | Bin 42786 -> 42402 bytes image/character/stone_conglinshouwei.jpg | Bin 62488 -> 39289 bytes image/character/stone_conglinxiaoshou.jpg | Bin 54511 -> 52997 bytes image/character/stone_damoshatuo.jpg | Bin 42835 -> 42724 bytes image/character/stone_daomufeizei.jpg | Bin 39143 -> 37530 bytes image/character/stone_dijieshicong.jpg | Bin 34711 -> 45734 bytes image/character/stone_diyuhuo.jpg | Bin 52609 -> 51260 bytes image/character/stone_diyuhuox.jpg | Bin 52609 -> 51260 bytes image/character/stone_duyanhaidao.jpg | Bin 56707 -> 55239 bytes image/character/stone_fachao.jpg | Bin 45723 -> 48780 bytes image/character/stone_falifulong.jpg | Bin 10901 -> 18151 bytes image/character/stone_famingjia.jpg | Bin 25419 -> 36599 bytes image/character/stone_faqishi.jpg | Bin 46133 -> 44834 bytes image/character/stone_fatiaozhuru.jpg | Bin 34633 -> 40895 bytes image/character/stone_fennuxiaoji.jpg | Bin 36780 -> 46451 bytes image/character/stone_fuding.jpg | Bin 40953 -> 40763 bytes image/character/stone_fuhuokaijia.jpg | Bin 53913 -> 50378 bytes image/character/stone_fukongmoyan.jpg | Bin 46231 -> 42496 bytes image/character/stone_gangtiewushi.jpg | Bin 48045 -> 43428 bytes image/character/stone_geluomashi.jpg | Bin 28866 -> 39827 bytes image/character/stone_guangmingquan.jpg | Bin 18527 -> 16174 bytes image/character/stone_guangyaozhizi.jpg | Bin 37204 -> 34889 bytes image/character/stone_guanliyuan.jpg | Bin 47247 -> 46523 bytes image/character/stone_guiqishi.jpg | Bin 53096 -> 51526 bytes image/character/stone_haidao.jpg | Bin 50939 -> 50521 bytes image/character/stone_haidaotoumu.jpg | Bin 47072 -> 44612 bytes image/character/stone_hanguangzhizhe.jpg | Bin 45352 -> 42667 bytes image/character/stone_heianjiaotu.jpg | Bin 100322 -> 38140 bytes image/character/stone_heishitanfan.jpg | Bin 39487 -> 37715 bytes image/character/stone_heitieairen.jpg | Bin 40923 -> 34744 bytes image/character/stone_heiyaoyaoshou.jpg | Bin 36977 -> 35668 bytes image/character/stone_honglongyongshi.jpg | Bin 50103 -> 46579 bytes image/character/stone_huangjialeixiang.jpg | Bin 48262 -> 46700 bytes image/character/stone_huangyeqishi.jpg | Bin 51830 -> 48208 bytes image/character/stone_hudunren.jpg | Bin 28124 -> 42871 bytes image/character/stone_huofu.jpg | Bin 41061 -> 44027 bytes image/character/stone_huoli.jpg | Bin 19066 -> 28422 bytes image/character/stone_huoqiangshou.jpg | Bin 20335 -> 31761 bytes image/character/stone_huoshanxiemu.jpg | Bin 92623 -> 51823 bytes image/character/stone_huoshe.jpg | Bin 32547 -> 35135 bytes image/character/stone_huoyanweishi.jpg | Bin 81779 -> 48714 bytes image/character/stone_huoyao.jpg | Bin 63873 -> 48624 bytes image/character/stone_huoyuansu.jpg | Bin 37960 -> 45143 bytes image/character/stone_jialakesi.jpg | Bin 49976 -> 60577 bytes image/character/stone_jialakesix.jpg | Bin 49543 -> 60054 bytes image/character/stone_jiangong.jpg | Bin 32470 -> 39931 bytes image/character/stone_jiewangzhu.jpg | Bin 59441 -> 52205 bytes image/character/stone_jingxiang.jpg | Bin 15306 -> 23450 bytes image/character/stone_jingyingweishi.jpg | Bin 139169 -> 53583 bytes image/character/stone_jujishou.jpg | Bin 54298 -> 51657 bytes image/character/stone_junxuguan.jpg | Bin 102139 -> 37326 bytes image/character/stone_juxingchanchu.jpg | Bin 40109 -> 39724 bytes image/character/stone_kaodalalong.jpg | Bin 34395 -> 33658 bytes image/character/stone_kelushi.jpg | Bin 110640 -> 45857 bytes image/character/stone_kongjuzhanma.jpg | Bin 35600 -> 32868 bytes image/character/stone_kuangyedoushi.jpg | Bin 32349 -> 31082 bytes image/character/stone_kuangzhanshi.jpg | Bin 59918 -> 57391 bytes image/character/stone_kutongsiseng.jpg | Bin 32863 -> 51688 bytes image/character/stone_langren.jpg | Bin 21262 -> 39328 bytes image/character/stone_lansaizhanshi.jpg | Bin 43111 -> 41237 bytes image/character/stone_leiouke.jpg | Bin 42784 -> 27218 bytes image/character/stone_liebao.jpg | Bin 42178 -> 31783 bytes image/character/stone_liegou.jpg | Bin 10818 -> 18565 bytes image/character/stone_liewangshouwei.jpg | Bin 60558 -> 59734 bytes image/character/stone_lieyanxiaogui.jpg | Bin 44575 -> 39805 bytes image/character/stone_lifaji.jpg | Bin 48446 -> 47245 bytes image/character/stone_lindishuyao.jpg | Bin 15128 -> 22280 bytes image/character/stone_linghunjisi.jpg | Bin 36609 -> 44312 bytes image/character/stone_longmianjiaoguan.jpg | Bin 45427 -> 43966 bytes image/character/stone_longwangpeiou.jpg | Bin 57226 -> 54197 bytes image/character/stone_mafengzhuru.jpg | Bin 104733 -> 45600 bytes image/character/stone_maligousi.jpg | Bin 63553 -> 68928 bytes image/character/stone_meimo.jpg | Bin 40991 -> 48437 bytes image/character/stone_mengmaren.jpg | Bin 37919 -> 36926 bytes image/character/stone_mianyang.jpg | Bin 92793 -> 32606 bytes image/character/stone_mingguangjisi.jpg | Bin 32645 -> 41473 bytes image/character/stone_misha.jpg | Bin 36725 -> 39100 bytes image/character/stone_morishouwei.jpg | Bin 27487 -> 33794 bytes image/character/stone_muguangchulong.jpg | Bin 56611 -> 29488 bytes image/character/stone_muyangren.jpg | Bin 25331 -> 33637 bytes image/character/stone_nianqingjisi.jpg | Bin 95780 -> 38301 bytes image/character/stone_nuoziduomu.jpg | Bin 34236 -> 31893 bytes image/character/stone_peilianshi.jpg | Bin 49190 -> 46979 bytes image/character/stone_qiezei.jpg | Bin 48455 -> 43544 bytes image/character/stone_qingwa.jpg | Bin 36963 -> 38840 bytes image/character/stone_renyaqishi.jpg | Bin 26775 -> 26753 bytes image/character/stone_sainaliusi.jpg | Bin 49332 -> 60562 bytes image/character/stone_senlinlang.jpg | Bin 19989 -> 34608 bytes image/character/stone_shachuisaman.jpg | Bin 31313 -> 42871 bytes image/character/stone_shalinxingzhe.jpg | Bin 46351 -> 44516 bytes image/character/stone_shengdianzhishi.jpg | Bin 36805 -> 43011 bytes image/character/stone_shengguanghuwei.jpg | Bin 33628 -> 40267 bytes image/character/stone_shengjiachong.jpg | Bin 33589 -> 33432 bytes image/character/stone_shenmiqishou.jpg | Bin 52162 -> 49209 bytes image/character/stone_shenshengyongshi.jpg | Bin 49603 -> 48467 bytes image/character/stone_shifazhe.jpg | Bin 49747 -> 42697 bytes image/character/stone_shihualong.jpg | Bin 44420 -> 43648 bytes image/character/stone_shishigui.jpg | Bin 119304 -> 47406 bytes image/character/stone_shixiangweishi.jpg | Bin 41730 -> 39920 bytes image/character/stone_shuiyuansu.jpg | Bin 45707 -> 40040 bytes image/character/stone_shumiao.jpg | Bin 105547 -> 39213 bytes image/character/stone_shuren.jpg | Bin 58906 -> 61876 bytes image/character/stone_shurenx.jpg | Bin 58906 -> 61876 bytes image/character/stone_shurenxx.jpg | Bin 58906 -> 61876 bytes image/character/stone_siwangzhiyi.jpg | Bin 106361 -> 105125 bytes image/character/stone_suoxiaojishi.jpg | Bin 41689 -> 39870 bytes image/character/stone_tegong.jpg | Bin 29561 -> 29121 bytes image/character/stone_tongkunvwang.jpg | Bin 48418 -> 47145 bytes image/character/stone_tujiu.jpg | Bin 92294 -> 35945 bytes image/character/stone_tuteng1.jpg | Bin 48581 -> 45756 bytes image/character/stone_tuteng2.jpg | Bin 48476 -> 46213 bytes image/character/stone_tuteng3.jpg | Bin 49856 -> 48160 bytes image/character/stone_tuteng4.jpg | Bin 42804 -> 41803 bytes image/character/stone_tutengshi.jpg | Bin 81403 -> 52817 bytes image/character/stone_tutengyongshi.jpg | Bin 35486 -> 35040 bytes image/character/stone_tuyuansu.jpg | Bin 38211 -> 38362 bytes image/character/stone_wanshiyuansu.jpg | Bin 47691 -> 45657 bytes image/character/stone_weilun.jpg | Bin 111712 -> 111582 bytes image/character/stone_wujiyuansu.jpg | Bin 50172 -> 53150 bytes image/character/stone_wushixuetu.jpg | Bin 61629 -> 53797 bytes image/character/stone_wuyi.jpg | Bin 25609 -> 38568 bytes image/character/stone_xiaogui.jpg | Bin 49893 -> 45507 bytes image/character/stone_xiaoguishouling.jpg | Bin 22911 -> 29626 bytes image/character/stone_xiaojingling.jpg | Bin 85953 -> 30466 bytes image/character/stone_xinbing.jpg | Bin 32185 -> 30890 bytes image/character/stone_xiushuihaidao.jpg | Bin 54645 -> 51632 bytes image/character/stone_xuefanzhanshi.jpg | Bin 38804 -> 37974 bytes image/character/stone_xuejuren.jpg | Bin 37113 -> 35947 bytes image/character/stone_xukongkongmo.jpg | Bin 41557 -> 53035 bytes image/character/stone_xukongxingzhe.jpg | Bin 29204 -> 35681 bytes image/character/stone_xulingwushi.jpg | Bin 55476 -> 52467 bytes image/character/stone_xunmashi.jpg | Bin 47580 -> 45918 bytes image/character/stone_xunmenglong.jpg | Bin 68400 -> 48301 bytes image/character/stone_xunshoushi.jpg | Bin 62491 -> 52438 bytes image/character/stone_yanjingshe.jpg | Bin 36396 -> 34567 bytes image/character/stone_yanshushi.jpg | Bin 29412 -> 38292 bytes image/character/stone_yaosaishouwei.jpg | Bin 36980 -> 46822 bytes image/character/stone_yingxiongzhihun.jpg | Bin 43474 -> 40889 bytes image/character/stone_yisela.jpg | Bin 84820 -> 68595 bytes image/character/stone_youlinglang.jpg | Bin 48707 -> 48213 bytes image/character/stone_yuanguanying.jpg | Bin 19903 -> 25593 bytes image/character/stone_yuanhou.jpg | Bin 30515 -> 41856 bytes image/character/stone_yurenqishi.jpg | Bin 36957 -> 34177 bytes image/character/stone_zhaohuanzhe.jpg | Bin 103398 -> 34565 bytes image/character/stone_zhifuzhe.jpg | Bin 29004 -> 37029 bytes image/character/stone_zhihuiguan.jpg | Bin 50535 -> 51449 bytes image/character/stone_zhiyuzhe.jpg | Bin 47129 -> 40486 bytes image/character/stone_zhongshi.jpg | Bin 49466 -> 45250 bytes image/character/stone_zhucangzhe.jpg | Bin 44746 -> 52828 bytes image/character/stone_zhujiashi.jpg | Bin 50043 -> 47778 bytes image/character/stone_zhumo.jpg | Bin 24273 -> 41001 bytes image/character/stone_zongxiong.jpg | Bin 68099 -> 34753 bytes image/character/stone_zousishangfan.jpg | Bin 39016 -> 37544 bytes image/character/sundeng.jpg | Bin 162587 -> 56498 bytes image/character/swd_quxian.jpg | Bin 138204 -> 118519 bytes mode/guozhan.js | 7 +- mode/identity.js | 7 +- mode/stone.js | 3 + mode/versus.js | 7 +- 214 files changed, 114 insertions(+), 28 deletions(-) create mode 100644 image/character/hs_yogg.jpg diff --git a/character/hearth.js b/character/hearth.js index 6c91b5780..12175ccd8 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -44,6 +44,7 @@ character.hearth={ hs_kcthun:['male','qun',4,['luanji','xianji']], hs_anomalus:['male','wei',4,['mobao']], hs_blingtron:['male','shu',3,['zengli','xiubu']], + hs_yogg:['male','wu',4,['kuangluan']], hs_zhishigushu:['male','shu',4,['jiaohui']], hs_zhanzhenggushu:['male','wei',6,['biri']], @@ -73,6 +74,51 @@ character.hearth={ hs_malfurion:['hs_malorne'], }, skill:{ + kuangluan:{ + trigger:{player:'damageEnd'}, + forced:true, + priority:10, + filter:function(event,player){ + return event.source&&event.source.isAlive()&&event.source!=player; + }, + intro:{ + content:'players' + }, + content:function(){ + trigger.source.goMad('phaseAfter'); + if(!player.storage.kuangluan){ + player.storage.kuangluan=[]; + } + player.storage.kuangluan.add(trigger.source); + player.markSkill('kuangluan'); + }, + ai:{ + threaten:0.3 + }, + group:['kuangluan2','kuangluan3'] + }, + kuangluan2:{ + trigger:{player:'phaseBegin'}, + priority:10, + forced:true, + filter:function(event,player){ + return player.storage.kuangluan&&player.storage.kuangluan.length>=2; + }, + content:function(){ + player.recover(player.maxHp); + player.goMad('phaseAfter'); + } + }, + kuangluan3:{ + trigger:{player:'phaseBegin'}, + forced:true, + popup:false, + silent:true, + content:function(){ + player.storage.kuangluan=[]; + player.unmarkSkill('kuangluan'); + } + }, xiubu:{ trigger:{player:'equipEnd'}, frequent:true, @@ -3668,7 +3714,6 @@ character.hearth={ }, hsbaowu_cangbaotu:{ type:'hsbaowu', - image:'card/hsbaowu_cangbaotu', fullimage:true, vanish:true, enable:true, @@ -3692,7 +3737,6 @@ character.hearth={ }, hsbaowu_huangjinyuanhou:{ type:'hsbaowu', - image:'card/hsbaowu_huangjinyuanhou', fullimage:true, vanish:true, enable:true, @@ -3727,7 +3771,6 @@ character.hearth={ }, hsshenqi_nengliangzhiguang:{ type:'hsshenqi', - image:'card/hsshenqi_nengliangzhiguang', fullimage:true, vanish:true, enable:true, @@ -3753,7 +3796,6 @@ character.hearth={ }, hsshenqi_kongbusangzhong:{ type:'hsshenqi', - image:'card/hsshenqi_kongbusangzhong', fullimage:true, vanish:true, enable:true, @@ -3781,7 +3823,6 @@ character.hearth={ }, hsshenqi_morijingxiang:{ type:'hsshenqi', - image:'card/hsshenqi_morijingxiang', fullimage:true, vanish:true, enable:true, @@ -3808,7 +3849,6 @@ character.hearth={ }, hsmengjing_feicuiyoulong:{ type:'hsmengjing', - image:'card/hsmengjing_feicuiyoulong', fullimage:true, vanish:true, enable:true, @@ -3831,7 +3871,6 @@ character.hearth={ }, hsmengjing_suxing:{ type:'hsmengjing', - image:'card/hsmengjing_suxing', fullimage:true, vanish:true, enable:true, @@ -3858,7 +3897,6 @@ character.hearth={ }, hsmengjing_mengye:{ type:'hsmengjing', - image:'card/hsmengjing_mengye', fullimage:true, vanish:true, enable:true, @@ -3882,7 +3920,6 @@ character.hearth={ }, hsmengjing_mengjing:{ type:'hsmengjing', - image:'card/hsmengjing_mengjing', fullimage:true, vanish:true, enable:true, @@ -3919,7 +3956,6 @@ character.hearth={ }, hsmengjing_huanxiaojiemei:{ type:'hsmengjing', - image:'card/hsmengjing_huanxiaojiemei', fullimage:true, vanish:true, enable:true, @@ -3947,44 +3983,52 @@ character.hearth={ } }, tuteng1:{ - image:'card/tuteng1', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng2:{ - image:'card/tuteng2', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng3:{ - image:'card/tuteng3', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng4:{ - image:'card/tuteng4', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng5:{ - image:'card/tuteng5', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng6:{ - image:'card/tuteng6', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng7:{ - image:'card/tuteng7', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, tuteng8:{ - image:'card/tuteng8', noname:true, fullimage:true, + type:'hstuteng', + // derivation:'hs_sthrall' }, }, translate:{ @@ -4051,12 +4095,16 @@ character.hearth={ hs_hudunren:'护盾人', hs_nate:'纳特', hs_shifazhe:'嗜法者', + hs_yogg:'尤格萨隆', + hstuteng:'图腾', + kuangluan:'狂乱', + kuangluan2:'狂乱', + kuangluan_info:'锁定技，每当一名其他角色对你造成伤害，该角色进入混乱状态直到当前回合结束；回合开始阶段，若上轮有至少两名不同角色因你而进入混乱状态，你回复全部体力并进入混乱状态进到本回合结束', zengli:'赠礼', zengli_info:'出牌阶段限一次，你指定一名其他角色与你各装备一把武器', xiubu:'修补', xiubu_info:'每当你装备一把武器，你可以获得数量等同于武器攻击范围的随机零件', - mobao:'魔爆', mobao_info:'出牌阶段限一次，你可以弃置至多三张黑色牌，然后对所有于上轮对你造成过伤害的角色造成等同于你弃牌数的雷电伤害', xianji:'献祭', @@ -4276,13 +4324,21 @@ character.hearth={ zuling:'祖灵', zuling_info:'觉醒技，回合开始阶段，若你拥有至少2个图腾，你失去一点体力上限，并将图腾描述中的“获得一个随机图腾”改为“获得任意一个图腾”', tuteng1:'治疗图腾', + tuteng1_info:'回合结束阶段，你回复一点体力', tuteng2:'灼热图腾', + tuteng2_info:'每当你造成一点伤害，你摸一张牌', tuteng3:'石爪图腾', + tuteng3_info:'你受到的伤害-1', tuteng4:'空气之怒图腾', + tuteng4_info:'你的锦囊牌造成的伤害+1', tuteng5:'法力之潮图腾', + tuteng5_info:'回合结束阶段，你摸一张牌', tuteng6:'火舌图腾', + tuteng6_info:'你的杀造成的伤害+1', tuteng7:'活力图腾', + tuteng7_info:'回合结束阶段，你令一名其他角色回复一点体力', tuteng8:'图腾魔像', + tuteng8_info:'当计算你与其它角色的距离时，始终-1', tzhenji:'震击', tzhenji_info:'每当你因弃置而失去黑色牌，可对一名角色造成1点雷电伤害，并随机弃置其一张牌，每回合限发动一次', fenliu:'分流', diff --git a/game/asset.js b/game/asset.js index 55e4e670f..ffbe65fc1 100644 --- a/game/asset.js +++ b/game/asset.js @@ -472,6 +472,7 @@ window.noname_asset_list=[ 'image/character/hs_yelise.jpg', 'image/character/hs_yngvar.jpg', 'image/character/hs_ysera.jpg', + 'image/character/hs_yogg.jpg', 'image/character/hs_zhanzhenggushu.jpg', 'image/character/hs_zhishigushu.jpg', 'image/character/hs_zhouzhuo.jpg', diff --git a/game/game.js b/game/game.js index 725ce9106..e7c9d6c24 100755 --- a/game/game.js +++ b/game/game.js @@ -8997,13 +8997,17 @@ isMad:function(){ return this.skills.contains('mad'); }, - goMad:function(){ - this.addSkill('mad'); + goMad:function(end){ + if(end){ + this.addTempSkill('mad',end); + } + else{ + this.addSkill('mad'); + } game.log(this,'进入混乱状态'); }, unMad:function(){ this.removeSkill('mad'); - game.log(this,'解除混乱状态'); }, equip:function(card){ var next=game.createEvent('equip'); @@ -11015,7 +11019,7 @@ if(this.node.background.innerHTML.length>1) this.node.background.classList.add('tight'); else this.node.background.classList.remove('tight'); } - if(lib.card[card[2]].noname){ + if(lib.card[card[2]].noname&&!this.classList.contains('button')){ this.node.name.style.display='none'; } if(lib.card[card[2]].color){ @@ -11966,7 +11970,10 @@ mark:true, intro:{ content:'已进入混乱状态', - name:'混乱' + name:'混乱', + onunmark:function(storage,player){ + game.log(player,'解除混乱状态'); + } } }, ghujia:{ @@ -23151,8 +23158,9 @@ break; case 'vcard': - node=ui.create.card(position,'noclick',noclick).init(item); + node=ui.create.card(position,'noclick',noclick); node.classList.add('button'); + node.init(item); node.link=item; break; diff --git a/game/update.js b/game/update.js index 298c7d07a..588f67cde 100644 --- a/game/update.js +++ b/game/update.js @@ -10,6 +10,9 @@ window.noname_update={ 'game/asset.js', 'game/game.js', 'mode/versus.js', + 'mode/identity.js', + 'mode/guozhan.js', + 'mode/stone.js', 'character/yijiang.js', 'character/shenhua.js', 'character/hearth.js', diff --git a/image/character/caozhang.jpg b/image/character/caozhang.jpg index 697207d58d7009d50b832aef404e326ae22ba082..d63948c1c44eaed4f0fa43064dc1b02bac523553 100755 GIT binary patch literal 37103 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