From 77a8e5d68e6512ad02273f0a50d3fac832562981 Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 20 Mar 2017 15:45:24 +0800 Subject: [PATCH] v1.9.12.3 --- character/diy.js | 6 +++++- game/game.js | 14 +++++++------- game/update.js | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/character/diy.js b/character/diy.js index 5035a5553..500ba3182 100644 --- a/character/diy.js +++ b/character/diy.js @@ -97,7 +97,11 @@ character.diy={ return _status.event.getTrigger().targets.contains(target); }).set('ai',function(target){ var trigger=_status.event.getTrigger(); - return -ai.get.effect(target,trigger.card,trigger.player,_status.event.player); + var eff=-ai.get.effect(target,trigger.card,trigger.player,_status.event.player); + if(trigger.card.name=='wugu'&&eff==0&&ai.get.attitude(player,target)<0){ + return 0.01; + } + return eff; }); "step 1" if(result.bool){ diff --git a/game/game.js b/game/game.js index bdb63f816..7273187f7 100644 --- a/game/game.js +++ b/game/game.js @@ -11010,15 +11010,15 @@ player.dying(event); } "step 2" - if(player.node.framebg.dataset.auto&&!player.node.framebg.dataset.decoration){ + if(source&&source.node.framebg.dataset.auto&&!source.node.framebg.dataset.decoration){ var dnum=0; - for(var j=0;j=9) player.node.framebg.dataset.decoration='gold';break; - case 'silver':if(dnum>=6) player.node.framebg.dataset.decoration='silver';break; - case 'bronze':if(dnum>=3) player.node.framebg.dataset.decoration='bronze';break; + switch(source.node.framebg.dataset.auto){ + case 'gold':if(dnum>=9) source.node.framebg.dataset.decoration='gold';break; + case 'silver':if(dnum>=6) source.node.framebg.dataset.decoration='silver';break; + case 'bronze':if(dnum>=3) source.node.framebg.dataset.decoration='bronze';break; } } }, diff --git a/game/update.js b/game/update.js index 8a3607f29..fa14dd4df 100644 --- a/game/update.js +++ b/game/update.js @@ -10,12 +10,12 @@ window.noname_update={ // 'game/config.js', // 'game/source.js', 'game/asset.js', - // 'card/guozhan.js', + // 'card/standard.js', // 'character/rank.js', // 'character/gwent.js', // 'character/ow.js', // 'character/swd.js', - // 'character/diy.js', + 'character/diy.js', // 'character/extra.js', // 'character/sp.js', // 'mode/boss.js',