diff --git a/card/gujian.js b/card/gujian.js index f3ac376a6..1945f58bd 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -308,19 +308,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ range:{global:1}, content:function(){ target.$gain2(cards); - target.discard(target.getCards('j')); target.storage.molicha=card; - target.storage.molicha_markcount=5; + target.storage.molicha_markcount=4; target.addSkill('molicha'); }, ai:{ order:2, value:4, result:{ - target:function(player,target){ - if(target.countCards('j')) return 2; - return 1; - } + target:1 } } }, @@ -1172,12 +1168,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){ nopop:true, intro:{ content:function(storage,player){ - return '你不能成为过河拆桥或延时锦囊牌的目标(剩余'+player.storage.molicha_markcount+'回合)' + return '你不能成为其他角色的黑色牌的目标(剩余'+player.storage.molicha_markcount+'回合)' } }, mod:{ - targetEnabled:function(card){ - if(get.type(card)=='delay'||card.name=='guohe'){ + targetEnabled:function(card,player,target){ + if(player!=target&&get.color(card)=='black'){ return false; } } @@ -1188,6 +1184,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ delete player.storage.molicha; delete player.storage.molicha_markcount; player.removeSkill('molicha'); + player.logSkill('molicha'); } else{ player.updateMarks(); @@ -1607,7 +1604,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ yuanbaorou:'元宝肉', yuanbaorou_info:'你在出牌阶段可以额外使用一张杀,持续三回合', molicha:'茉莉茶', - molicha_info:'弃置判定区内的所有牌;你不能成为过河拆桥或延时锦囊牌的目标,持续五回合', + molicha_info:'你不能成为其他角色的黑色牌的目标,持续四回合', mapodoufu:'麻婆豆腐', mapodoufu_info:'结束阶段,你弃置一名随机敌人的一张随机牌,持续两回合', }, diff --git a/character/gwent.js b/character/gwent.js index 644a7b5ec..9fcafd7e8 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -56,6 +56,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_nvyemo:['female','shu',3,['gwgouhun']], gw_kairuisi:['female','qun',3,['gwweitu']], + gw_oudimu:['male','shu',3,['gwjingshi']], + gw_shasixiwusi:['male','qun',4,['gwjingtian']], }, characterIntro:{ gw_huoge:'那个老年痴呆?不知道他是活着还是已经被制成标本了!', @@ -2657,7 +2659,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_kanbi:'坎毕', gw_hanmuduoer:'汉姆多尔', gw_kairuisi:'凯瑞斯', + gw_oudimu:'欧迪姆', + gw_shasixiwusi:'沙斯西乌斯', + gwjingshi:'镜师', + gwjingshi_info:'出牌阶段限一次,你可以猜测手牌中黑色牌最多的角色是谁,若猜对,你可以执行任意一项操作', + gwjingtian:'经天', + gwjingtian_info:'锁定技,牌堆顶的9张牌对你始终可见;你可以跳过摸牌阶段,改为选择至多3名其他角色,在他们的下个准备阶段获得牌堆顶前9张中的任意一张牌', gwweitu:'卫土', gwweitu_info:'锁定技,每当你弃置一张牌,若你的护甲数小于3,你获得一点护甲;每当你的护甲为你累计抵消3次伤害,你获得一张随机银卡法术', gwzhongmo:'终末', @@ -2708,7 +2716,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ bolang:'搏浪', bolang_info:'准备阶段,你可以观看牌堆顶的6张牌,然后将其中至多3张移入弃牌堆;每当你造成一次伤害,你可以从弃牌堆中获得一张以此法移入弃牌堆的牌(每回合限发动一次)', lingji:'灵计', - lingji_info:'出牌阶段限一次,你可以摸两张牌并弃置两张牌,若弃置的牌花色相同,你获得一张随机铜卡;若弃置的牌点数相同,你获得一张随机银卡', + lingji_info:'出牌阶段限一次,你可以摸两张牌并弃置两张牌,若弃置的牌花色相同,你获得一张随机铜卡并展示;若弃置的牌点数相同,你获得一张随机银卡并展示', gwjinyan:'金焰', gwjinyan_info:'锁定技,准备阶段,若游戏轮数为3的倍数,你获得一张随机金卡;当游戏轮数不是3的倍数时,你防止所有伤害', gwshenyu:'神愈', diff --git a/game/asset.js b/game/asset.js index 9c20185d7..682ddea43 100644 --- a/game/asset.js +++ b/game/asset.js @@ -414,10 +414,12 @@ window.noname_asset_list=[ 'image/character/gw_mieren.jpg', 'image/character/gw_nitelila.jpg', 'image/character/gw_nvyemo.jpg', + 'image/character/gw_oudimu.jpg', 'image/character/gw_puxila.jpg', 'image/character/gw_qigaiwang.jpg', 'image/character/gw_sanhanya.jpg', 'image/character/gw_shanhu.jpg', + 'image/character/gw_shasixiwusi.jpg', 'image/character/gw_telisi.jpg', 'image/character/gw_xigedelifa.jpg', 'image/character/gw_xili.jpg', diff --git a/image/character/gw_oudimu.jpg b/image/character/gw_oudimu.jpg new file mode 100644 index 000000000..f0b6e6c2f Binary files /dev/null and b/image/character/gw_oudimu.jpg differ diff --git a/image/character/gw_shasixiwusi.jpg b/image/character/gw_shasixiwusi.jpg new file mode 100644 index 000000000..c421b306c Binary files /dev/null and b/image/character/gw_shasixiwusi.jpg differ