From 4e45b3f30d037e799c2c6e25b2c8acbb61dc9994 Mon Sep 17 00:00:00 2001 From: libccy Date: Wed, 13 Jan 2016 13:44:24 +0800 Subject: [PATCH] stone --- game/game.js | 43 +++++++++++++++++++++++++++-- layout/mobile/layout.css | 1 + mode/stone.js | 59 ++++++++++++++++++++++++++-------------- 3 files changed, 80 insertions(+), 23 deletions(-) diff --git a/game/game.js b/game/game.js index 3e64e8517..9eb918f6c 100755 --- a/game/game.js +++ b/game/game.js @@ -24,7 +24,8 @@ '不同模式可单独设置禁将、禁卡', '自定义技能禁配', '战棋对战选项', - '炉石模式平衡调整' + '炉石模式平衡调整', + 'ctrl+shift+R重置游戏' ], configprefix:'noname_0.9_', updates:[], @@ -21090,6 +21091,33 @@ window.lib=lib; window._status=_status; }, + uy:function(me){ + if(me){ + game.me.useCard({name:'spell_yexinglanghun'},game.me); + } + else{ + var enemy=game.me.getEnemy(); + enemy.useCard({name:'spell_yexinglanghun'},enemy); + } + }, + gs:function(name,act){ + var card=game.createCard('spell_'+name); + game.me.node.handcards1.appendChild(card); + if(!act){ + game.me.actused=-99; + } + ui.updatehl(); + setTimeout(game.check,300); + }, + gc:function(name,act){ + var card=game.createCard('stone_'+name+'_stonecharacter'); + game.me.node.handcards1.appendChild(card); + if(!act){ + game.me.actused=-99; + } + ui.updatehl(); + setTimeout(game.check,300); + }, aa:function(){ game.saveConfig('test_game',!lib.config.test_game); game.reload(); @@ -21405,8 +21433,17 @@ } } else if(e.keyCode==116||((e.ctrlKey||e.metaKey)&&e.keyCode==82)){ - _status.reloading=true; - game.reload(); + if(e.shiftKey){ + if(confirm('是否重置游戏？')){ + localStorage.clear(); + if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data'); + game.reload(); + return; + } + } + else{ + game.reload(); + } } }; window.onload=function(){ diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 922409edb..e5c855546 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -63,6 +63,7 @@ height: 120px; top: calc(100% - 150px); background: none !important; + border:none !important; pointer-events: none; } #arena:not(.chess) .player[data-position='0']:not(.selected):not(.selectable):not(.glow){ diff --git a/mode/stone.js b/mode/stone.js index 84be8772f..b284dc0c5 100755 --- a/mode/stone.js +++ b/mode/stone.js @@ -2396,24 +2396,22 @@ mode.stone={ stoneact:2, career:'rogue', filterTarget:true, - contentBefore:function(){ + content:function(){ 'step 0' - player.storage.spell_cigu=false; - if(player.num('he',{type:'equip'})){ - player.chooseToDiscard('he','是否弃置一张装备牌令伤害+1？',{type:'equip'}).ai=function(card){ + if(player.num('e')){ + player.chooseToDiscard('e','是否弃置一张装备区内的牌令伤害+1？').ai=function(card){ return 7-ai.get.value(card); } } else{ - event.finish(); + event.goto(2); } 'step 1' if(result.bool){ - player.storage.spell_cigu=true; + event.add=true; } - }, - content:function(){ - if(player.storage.spell_cigu){ + 'step 2' + if(event.add){ target.damage(2); } else{ @@ -2509,6 +2507,7 @@ mode.stone={ else{ target.damage(); } + player.unmarkSkill('spell_modaoyou'); }, contentAfter:function(){ player.storage.spell_modaoyou=0; @@ -2559,6 +2558,7 @@ mode.stone={ }, selectTarget:-1, content:function(){ + player.markSkill('spell_modaoyou'); if(typeof player.storage.spell_modaoyou!='number'){ player.storage.spell_modaoyou=1; } @@ -2572,7 +2572,10 @@ mode.stone={ } } if(list.length){ - list.randomGet().draw(2); + game.asyncDraw([player,list.randomGet()],2); + } + else{ + player.draw(2); } }, ai:{ @@ -3429,6 +3432,13 @@ mode.stone={ }, }, skill:{ + spell_modaoyou:{ + intro:{ + content:function(storage){ + return '下次剑刃乱舞的伤害+'+storage; + } + } + }, hunter_jiewang2:{ trigger:{global:'dieAfter'}, forced:true, @@ -3635,21 +3645,30 @@ mode.stone={ unique:true, filter:function(event,player){ var target=player.getLeader(); - return target.actcount-target.getActCount()>=2; + return target.num('e')>0; }, content:function(){ "step 0" event.chooser=player.getLeader(); - event.chooser.chooseTarget('偷袭：对一名对方随从角色一点伤害',function(card,playerx,target){ - return player.side!=target.side; - }).ai=function(target){ - return ai.get.damageEffect(target,player,player); - }; + event.chooser.chooseCardTarget({ + position:'e', + filterTarget:function(card,player,target){ + return player.side!=target.side; + }, + filterCard:true, + ai1:function(card){ + return 9-ai.get.value(card); + }, + ai2:function(target){ + return ai.get.damageEffect(target,player,player); + }, + prompt:'偷袭：弃置一张装备区内的牌并对一名敌方角色一点伤害' + }); player.line(event.chooser); "step 1" if(result.bool){ + event.chooser.discard(result.cards); event.chooser.line(result.targets[0]); - game.delay(); result.targets[0].damage(event.chooser); } } @@ -5416,7 +5435,7 @@ mode.stone={ stone_zibao_info:'结合结束后立即死亡', spell_cigu:'刺骨', - spell_cigu_info:'造成一点伤害，你可以弃置一张装备牌令伤害+1', + spell_cigu_info:'造成一点伤害，你可以弃置一张装备区内的牌令伤害+1', spell_jianrenluanwu:'剑刃乱舞', spell_jianrenluanwu_info:'弃置你的武器牌，并对所有敌方角色造成一点伤害', spell_daoshan:'刀扇', @@ -5426,7 +5445,7 @@ mode.stone={ spell_cisha:'刺杀', spell_cisha_info:'杀死一名随从', spell_modaoyou:'磨刀油', - spell_modaoyou_info:'令你下一次剑刃乱舞造成的伤害+1，令一名随机友方随从摸两张牌', + spell_modaoyou_info:'令你下一次剑刃乱舞造成的伤害+1，并与一名随机友方随从各摸两张牌', spell_fengxian:'奉献', spell_fengxian_info:'对所有敌方角色造成一点伤害', @@ -5512,7 +5531,7 @@ mode.stone={ rogue_cisha:'刺杀', rogue_cisha_info:'每当你对一名随从造成伤害，受伤害随从立即死亡', rogue_touxi:'偷袭', - rogue_touxi_info:'你出场时，若己方主将拥有至少两点剩余行动值，则可对一名角色造成一点伤害', + rogue_touxi_info:'你出场时，己方主将可弃置一张装备区内的牌并对一名敌方角色造成一点伤害', rogue_qiancang:'潜藏', rogue_qiancang_info:'你出场时，对所有未受伤害的敌方随从造成一点伤害', rogue_zhaomu:'结伙',