diff --git a/card/gwent.js b/card/gwent.js index 44de20ff1..ccf17ccec 100644 --- a/card/gwent.js +++ b/card/gwent.js @@ -1356,19 +1356,16 @@ game.import('card',function(lib,game,ui,get,ai,_status){ source.line(player); source.addExpose(0.1); player.damage(source); - player.changeHujia(); + player.recover(); } } }, ai:{ - value:[7,1], + value:[8,1], useful:[3,1], result:{ target:function(player,target){ if(target.hp<=1||target.hujia) return 0; - if(target.hasSkillTag('maixie_hp')) return 1; - if(target.hp==2&&target.needsToDiscard(1)) return 0; - if(target.hp==3&&target.needsToDiscard()) return 0; return 1; } }, @@ -2144,7 +2141,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ spell_bronze:'铜卡法术', gw_guaiwuchaoxue:'怪物巢穴', - gw_guaiwuchaoxue_info:'随机获得一个卖血技能直到下一回合开始；令一名随机敌方角色对你造成一点伤害，然后获得一点护甲', + gw_guaiwuchaoxue_info:'随机获得一个卖血技能直到下一回合开始；令一名随机敌方角色对你造成一点伤害，然后你回复一点体力', gw_baobaoshu:'雹暴术', gw_baobaoshu_info:'天气牌，出牌阶段对至多两名角色使用，目标每使用一张基本牌或锦囊牌，需弃置一张牌，直到下一回合结束', gw_baishuang:'白霜', diff --git a/character/gwent.js b/character/gwent.js index e013c8de1..644a7b5ec 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -54,6 +54,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_linjing:['male','wu',4,['gwyewu']], gw_kanbi:['male','qun',1,['gwfutian']], gw_nvyemo:['female','shu',3,['gwgouhun']], + + gw_kairuisi:['female','qun',3,['gwweitu']], }, characterIntro:{ gw_huoge:'那个老年痴呆?不知道他是活着还是已经被制成标本了!', @@ -69,6 +71,69 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个', }, skill:{ + gwweitu:{ + trigger:{player:'discardAfter'}, + forced:true, + filter:function(event,player){ + return player.hujia<3; + }, + content:function(){ + var num=Math.min(trigger.cards.length,3-player.hujia); + if(num>0){ + player.changeHujia(num); + } + }, + init:function(player){ + player.storage.gwweitu=0; + }, + intro:{ + content:'护甲自上次计算起已抵挡#点伤害' + }, + group:'gwweitu_gain', + subSkill:{ + gain:{ + trigger:{player:'damageZero'}, + filter:function(event){ + return event.hujia; + }, + forced:true, + content:function(){ + player.storage.gwweitu++; + if(player.storage.gwweitu>=3){ + player.storage.gwweitu-=3; + player.unmarkSkill('gwweitu'); + var list=get.typeCard('spell_silver'); + if(list.length){ + player.gain(game.createCard(list.randomGet()),'draw'); + } + } + else{ + player.markSkill('gwweitu',true); + } + } + } + }, + ai:{ + threaten:0.7, + effect:{ + target:function(card,player,target,current){ + if(get.tag(card,'discard')&&target.hujia<3&& + target.countCards('he')&¤t<0){ + return 0; + } + }, + player:function(card,player){ + if(player.hujia>=3) return; + if(_status.event.name!='chooseToUse'||_status.event.player!=player) return; + if(get.type(card)=='basic') return; + if(get.tag(card,'gain')) return; + if(get.value(card,player,'raw')>=7) return; + if(player.needsToDiscard()>1) return; + return 'zeroplayertarget'; + } + } + } + }, gwgouhun:{ enable:'phaseUse', usable:1, @@ -2591,7 +2656,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_mierjiata:'米尔加塔', gw_kanbi:'坎毕', gw_hanmuduoer:'汉姆多尔', + gw_kairuisi:'凯瑞斯', + gwweitu:'卫土', + gwweitu_info:'锁定技，每当你弃置一张牌，若你的护甲数小于3，你获得一点护甲；每当你的护甲为你累计抵消3次伤害，你获得一张随机银卡法术', gwzhongmo:'终末', gwzhongmo_info:'锁定技，你跳过摸牌阶段，改为获得两张随机的稀有度不同的法术牌', gwfutian:'覆天', @@ -2659,7 +2727,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yunhuo:'陨火', yunhuo_info:'锁定技，准备阶段，若游戏轮数为4的倍数，你令所有敌方角色随机弃置一张手牌（若没有手牌改为受到一点火焰伤害），然后在此回合结束后获得一个额外回合', yinzhang:'银杖', - yinzhang_info:'出牌阶段限一次，你可以弃置一张牌，然后从3张随机亮出的牌中选择一张加入手牌', + yinzhang_info:'出牌阶段限一次，你可以弃置一张牌，然后从3张随机亮出的银卡法术中选择一张加入手牌', tianbian:'天变', tianbian_info:'出牌阶段开始时，你可以选择一项：随机使用一张对全场有正面效果的牌；或随机使用一张对全场有负面效果的牌', gwxiaoshou:'枭首', diff --git a/character/rank.js b/character/rank.js index 1b6f19123..fff3a4535 100644 --- a/character/rank.js +++ b/character/rank.js @@ -57,6 +57,7 @@ window.noname_character_rank={ 'pal_yueqi', ], a:[ + 'gw_kairuisi', 'gw_kanbi', 'gw_nvyemo', 'gw_linjing', diff --git a/game/asset.js b/game/asset.js index ec68450c2..9c20185d7 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.37', + '1.9.37.3', 'image/background/huangtian_bg.jpg', 'image/background/ol_bg.jpg', 'image/background/september_bg.jpg', @@ -400,6 +400,7 @@ window.noname_asset_list=[ 'image/character/gw_huoge.jpg', 'image/character/gw_jieluote.jpg', 'image/character/gw_kaerweite.jpg', + 'image/character/gw_kairuisi.jpg', 'image/character/gw_kanbi.jpg', 'image/character/gw_kaxier.jpg', 'image/character/gw_kuite.jpg', diff --git a/game/game.js b/game/game.js index 2c720a36d..492390fdd 100644 --- a/game/game.js +++ b/game/game.js @@ -16840,7 +16840,7 @@ } else{ var info=lib.skill[skill]; - if(info&&info.fixed) return skill; + if(info&&info.fixed&&arguments[1]!==true) return skill; this.unmarkSkill(skill); game.broadcastAll(function(player,skill){ player.skills.remove(skill); diff --git a/game/update.js b/game/update.js index 9d4c288f0..be5974a7d 100644 --- a/game/update.js +++ b/game/update.js @@ -1,6 +1,6 @@ window.noname_update={ - version:'1.9.37.2', - update:'1.9.37', + version:'1.9.37.3', + update:'1.9.37.2', changeLog:[ 'bug修复' ], @@ -10,30 +10,30 @@ window.noname_update={ // 'game/config.js', // 'game/source.js', // 'game/pressure.js', - // 'game/asset.js', + 'game/asset.js', // 'card/*', // 'card/standard.js', - 'card/gwent.js', + // 'card/gwent.js', // 'card/gujian.js', // 'character/*', // 'character/hearth.js', // 'character/old.js', - 'character/standard.js', - 'character/sp.js', - 'character/swd.js', + // 'character/standard.js', + // 'character/sp.js', + // 'character/swd.js', // 'character/rank.js', // 'character/yijiang.js', // 'character/xianjian.js', // 'mode/identity.js', 'mode/boss.js', - 'mode/guozhan.js', - 'mode/versus.js', + // 'mode/guozhan.js', + // 'mode/versus.js', // 'mode/connect.js', - 'mode/chess.js', - 'mode/tafang.js', + // 'mode/chess.js', + // 'mode/tafang.js', // 'mode/guozhan.js', // 'mode/stone.js', - 'theme/music/style.css', + // 'theme/music/style.css', // 'theme/woodden/style.css', // 'theme/simple/style.css', // 'layout/default/layout.css', @@ -44,7 +44,7 @@ window.noname_update={ // 'layout/long2/layout.css', // 'layout/mobile/layout.css', // 'layout/newlayout/global.css', - 'layout/mode/chess.css', + // 'layout/mode/chess.css', // 'extension/boss/extension.js', ] } diff --git a/image/character/gw_kairuisi.jpg b/image/character/gw_kairuisi.jpg new file mode 100644 index 000000000..e9342bc91 Binary files /dev/null and b/image/character/gw_kairuisi.jpg differ diff --git a/mode/boss.js b/mode/boss.js index aec236c3c..9025f232e 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -5444,6 +5444,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }).set('prompt','选择一个形态'); 'step 2' var hp=player.hp; + player.removeSkill('boss_baonu',true); if(result.control=='暴怒战神'){ player.init('boss_lvbu2'); }