diff --git a/card/gujian.js b/card/gujian.js index eeebfa547..856ef8efe 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -1320,6 +1320,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ mutoumianju_skill:{ enable:'chooseToUse', filterCard:true, + usable:1, viewAs:{name:'sha'}, viewAsFilter:function(player){ if(!player.countCards('h')) return false; @@ -1577,7 +1578,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ mutoumianju:'木头面具', mutoumianju_info:'你可以将一张手牌当作杀使用', mutoumianju_skill:'木杀', - mutoumianju_skill_info:'你可以将一张手牌当作杀使用', + mutoumianju_skill_info:'出牌阶段限一次,你可以将一张手牌当作杀使用', heilonglinpian:'黑龙鳞片', heilonglinpian_info:'出牌阶段对自己使用,获得一点护甲,直到下一回合开始,你的防御距离+1', diff --git a/card/standard.js b/card/standard.js index 2a28ba01e..99f32f20f 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1561,6 +1561,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ popup:false, forced:true, filter:function(event,player){ + if(event.card.storage&&event.card.storage.nowuxie) return false; if(event.name!='phaseJudge'){ var info=get.info(event.card); if(!event.target){ diff --git a/character/mtg.js b/character/mtg.js new file mode 100644 index 000000000..48cf38d47 --- /dev/null +++ b/character/mtg.js @@ -0,0 +1,205 @@ +'use strict'; +game.import('character',function(lib,game,ui,get,ai,_status){ + return { + name:'mtg', + character:{ + mtg_jiding:['male','qun',4,['mbaizhan','msilian']], + // mtg_qianzhuo:['female','shu',3,[]], + mtg_jiesi:['male','wei',3,['mtongnian','msuoling','mhuanyi']], + // mtg_lilianna:['female','qun',3,[]], + // mtg_nisha:['female','wu',3,[]], + // mtg_ayeni:['male','qun',4,[]], + }, + characterIntro:{ + mtg_jiding:'这名白色魔法的使用者极其注重忠诚,正义和荣誉。他曾全力追捕茜卓纳拉,如今已不可思议地与这位火焰法师成为伙伴。', + mtg_qianzhuo:'茜卓纳拉是使用红色法术力的旅法师。她擅长使用火焰:除了火焰,还是火焰。茜卓性格冲动、易怒、富有激情,不断增长的火焰法术能力随时都准备爆发。她的火花在还很年轻时便已点燃,如今已是相当有经验的烈焰术士和旅法师。', + mtg_jiesi:'杰斯贝连是使用蓝色法术的鹏洛客。他擅长心灵法术:读取心灵,幻影,知识,以及欺瞒的咒语。', + mtg_lilianna:'莉莲娜维斯是一位精通死灵术的旅法师,她擅长用黑色法术力来复活死者,腐化生者,并从死亡中召唤力量。', + mtg_nisha:'赞迪卡妖精部落玖瑞加的一名战士,做事倾尽全力,与大地有密切的联系,还擅使元素魔法。她能够引导时空的魔法生机地脉,为土地赋予生命。', + mtg_ayeni:'金鬃阿耶尼是使用白色法术的鹏洛客。他长于净化身体与心灵的法术:用咒语来治疗、强化盟友,以及唤醒他人内在的心灵精华。', + }, + skill:{ + msuoling:{ + enable:'chooseToUse', + // round:1, + filterCard:function(card){ + return get.type(card,'trick')=='trick'; + }, + viewAsFilter:function(player){ + return player.countCards('h',{type:['trick','delay']})>0; + }, + viewAs:{name:'wuxie',{storage:{nowuxie:true}}}, + prompt:'将一张锦囊牌当无懈可击使用', + check:function(card){return 8-get.value(card)}, + threaten:1.2 + }, + mtongnian:{ + trigger:{player:'phaseUseBegin'}, + forced:true, + filter:function(event,player){ + var enemies=player.getEnemies(); + for(var i=0;i0; + }, + content:function(){ + player.changeHujia(trigger.num); + } + }, + msilian:{ + trigger:{player:'phaseEnd'}, + filter:function(event,player){ + return player.hujia>0; + }, + check:function(event,player){ + return player.hujia>1&&player.hp>1; + }, + content:function(){ + player.storage.msilian=player.hujia; + player.changeHujia(-player.hujia); + player.insertPhase(); + }, + group:['msilian_hp','msilian_draw'], + subSkill:{ + hp:{ + trigger:{player:'phaseAfter'}, + silent:true, + filter:function(event,player){ + return event.skill=='msilian'&&!player.getStat('damage'); + }, + content:function(){ + player.loseHp(); + } + }, + draw:{ + trigger:{player:'phaseDrawBegin'}, + filter:function(event){ + return event.getParent('phase').skill=='msilian'; + }, + silent:true, + content:function(){ + trigger.num+=player.storage.msilian-2; + } + } + } + } + }, + translate:{ + mtg_jiding:'基定', + mtg_qianzhuo:'茜卓', + mtg_jiesi:'杰斯', + mtg_lilianna:'莉莲娜', + mtg_nisha:'妮莎', + mtg_ayeni:'阿耶尼', + + mbaizhan:'百战', + mbaizhan_info:'锁定技,每当你造成一点伤害,你获得一点护甲', + msilian:'祀炼', + msilian_info:'结束阶段,若你有护甲,你可以移去全部护甲,然后进行一个额外回合;在额外回合中,你的摸牌阶段摸牌基数为你移去的护甲数;额外回合结束后,若你未造成伤害,你失去一点体力', + mtongnian:'通念', + mtongnian_info:'锁定技,出牌阶段开始时,你获得一张替身牌,此牌对应一名随机敌人的一张随机手牌;每当你使用一张非替身牌,随机更换替身牌对应的牌;当你使用替身牌时,改为使用替身牌对应的牌;当出牌阶段结束,或替身牌离开手牌区,或敌方角色没有手牌时,销毁替身牌', + msuoling:'塑灵', + msuoling_info:'你可以将一张锦囊牌当作无懈可击使用,此无懈可击不能被其它无懈可击响应', + mhuanyi:'幻逸', + mhuanyi_info:'结束阶段,你可以将【效果1】分配给任意名角色,然后将【效果2】分配给其余角色(分配结果对其他角色不可见)。效果1:当目标对你首次使用卡牌时,若此牌为基本牌,则取消之;效果2:当目标对你首次使用卡牌时,若此牌为非基本牌,则取消之', + }, + }; +}); diff --git a/character/xianjian.js b/character/xianjian.js index 8cbdea5b4..391700dbe 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -427,7 +427,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, xiaoyue:{ - trigger:{player:'phaseBegin'}, + trigger:{global:'roundStart'}, forced:true, filter:function(event,player){ return player.countCards('h','sha'); @@ -4149,7 +4149,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ lingdi:'灵笛', lingdi_info:'出牌阶段,你可以弃置一张本回合与此法弃置的牌花色均不同的手牌,然后选择一名与你距离为X的角色与其各摸一张牌,X为本回合发动灵笛的次数(含此次)', xiaoyue:'啸月', - xiaoyue_info:'锁定技,准备阶段,若你手牌中有杀,你将手牌中的一张随机杀对一名随机敌方角色使用,然后获得一点护甲', + xiaoyue_info:'锁定技,每轮开始时,若你手牌中有杀,你将手牌中的一张随机杀对一名随机敌方角色使用,然后获得一点护甲', minsha:'冥煞', minsha_info:'出牌阶段限一次,你可以弃置两张牌,对一名体力值大于1的其他角色造成一点雷属性伤害,然后距离目标1以内的所有其他角色随机弃置一张牌', xhuanlei:'唤雷', diff --git a/character/yijiang.js b/character/yijiang.js index 802898c42..ed43fc2a9 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -5534,7 +5534,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, mieji:{ - trigger:{player:'useCardBegin'}, + trigger:{player:'useCard'}, direct:true, audio:2, filter:function(event,player){ @@ -5546,7 +5546,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.chooseTarget(get.prompt('mieji'),function(card,player,target){ var trigger=_status.event.getTrigger(); return lib.filter.filterTarget(trigger.card,player,target)&&target!=trigger.targets[0]; - }).set('ai',function(target){ + }).set('autodelay',true).set('ai',function(target){ var trigger=_status.event.getTrigger(); var player=_status.event.player; return get.effect(target,trigger.card,player,player); diff --git a/game/asset.js b/game/asset.js index 1a4254775..6ed1e24bd 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.40', + '1.9.41', 'image/background/huangtian_bg.jpg', 'image/background/ol_bg.jpg', 'image/background/september_bg.jpg', @@ -605,6 +605,12 @@ window.noname_asset_list=[ 'image/character/mifuren.jpg', 'image/character/miheng.jpg', 'image/character/mizhu.jpg', + 'image/character/mtg_ayeni.jpg', + 'image/character/mtg_lilianna.jpg', + 'image/character/mtg_jiding.jpg', + 'image/character/mtg_jiesi.jpg', + 'image/character/mtg_nisha.jpg', + 'image/character/mtg_qianzhuo.jpg', 'image/character/nianshou.jpg', 'image/character/niutou.jpg', 'image/character/old_caoxiu.jpg', diff --git a/game/game.js b/game/game.js index 2eff453e2..0eb5d6203 100644 --- a/game/game.js +++ b/game/game.js @@ -8839,8 +8839,16 @@ for(var i=0;i0){ - player.draw(event.num); + var num=event.num; + if(event.attachDraw){ + for(var i=0;inum){ event.drawDeck=num; @@ -12385,9 +12406,9 @@ cards[i].classList.remove('glow'); cards[i].recheck(); var info=lib.card[cards[i].name]; - if(info.destroy){ + if(info.destroy||cards[i]._destroy){ cards[i].delete(); - cards[i].destroyed=info.destroy; + cards[i].destroyed=info.destroy||cards[i]._destroy; } else if(event.position){ cards[i].goto(event.position); @@ -19127,6 +19148,9 @@ card[3]='thunder'; } } + else if(typeof card=='object'){ + card=[card.suit,card.number,card.name,card.nature]; + } if(!lib.card[card[2]]){ lib.card[card[2]]={}; } @@ -19177,6 +19201,7 @@ this.classList.remove('fullimage'); this.classList.remove('fullborder'); this.node.name.dataset.nature=''; + this.node.info.classList.remove('red'); if(!lib.config.hide_card_image&&lib.card[bg].fullskin){ this.classList.add('fullskin'); if(img){ @@ -41820,6 +41845,7 @@ for(var i in lib.card){ if(lib.card[i].mode&&lib.card[i].mode.contains(get.mode())==false) continue; // if(lib.card[i].vanish||lib.card[i].destroy) continue; + if(lib.card[i].destroy) continue; if(typeof filter=='function'&&!filter(i)) continue; if(lib.config.bannedcards.contains(i)) continue; if(!lib.translate[i+'_info']) continue; @@ -41838,7 +41864,8 @@ var list=[]; for(var i in lib.card){ if(lib.card[i].mode&&lib.card[i].mode.contains(get.mode())==false) continue; - if(lib.card[i].vanish||lib.card[i].destroy) continue; + // if(lib.card[i].vanish||lib.card[i].destroy) continue; + if(lib.card[i].destroy) continue; if(lib.config.bannedcards.contains(i)) continue; if(!lib.translate[i+'_info']) continue; if(filter(lib.card[i],i)){ diff --git a/game/package.js b/game/package.js index 5cbc02579..c92c03504 100644 --- a/game/package.js +++ b/game/package.js @@ -11,6 +11,7 @@ window.noname_package={ yxs:'英雄杀', hearth:'炉石传说', gwent:'昆特牌', + mtg:'万智牌', ow:'守望先锋', swd:'轩辕剑', gujian:'古剑奇谭', diff --git a/game/source.js b/game/source.js index aec8541e9..a0a98a400 100644 --- a/game/source.js +++ b/game/source.js @@ -14,6 +14,7 @@ window.noname_source_list=[ 'character/gujian.js', 'character/gwent.js', 'character/hearth.js', + 'character/mtg.js', 'character/old.js', 'character/ow.js', 'character/rank.js', diff --git a/game/update.js b/game/update.js index 481953b76..6a6ff2b34 100644 --- a/game/update.js +++ b/game/update.js @@ -1,13 +1,11 @@ window.noname_update={ - version:'1.9.40.2', + version:'1.9.41', // update:'1.9.38.1', changeLog:[ - // '武将称号', - // '神之试炼', 'bug修复' ], files:[ - 'game/game.js', + // 'game/game.js', // 'game/package.js', // 'game/config.js', // 'game/source.js', @@ -22,13 +20,13 @@ window.noname_update={ // 'character/gwent.js', // 'character/old.js', // 'character/standard.js', - 'character/sp.js', + // 'character/sp.js', // 'character/swd.js', // 'character/rank.js', - 'character/yijiang.js', + // 'character/yijiang.js', // 'character/xianjian.js', // 'mode/identity.js', - 'mode/boss.js', + // 'mode/boss.js', // 'mode/guozhan.js', // 'mode/versus.js', // 'mode/connect.js', @@ -39,7 +37,7 @@ window.noname_update={ // 'theme/music/style.css', // 'theme/woodden/style.css', // 'theme/simple/style.css', - 'layout/default/layout.css', + // 'layout/default/layout.css', // 'layout/default/phone.css', // 'layout/default/menu.css', // 'theme/style/cardback/*', diff --git a/image/character/mtg_ayeni.jpg b/image/character/mtg_ayeni.jpg new file mode 100644 index 000000000..c3b5e65da Binary files /dev/null and b/image/character/mtg_ayeni.jpg differ diff --git a/image/character/mtg_jiding.jpg b/image/character/mtg_jiding.jpg new file mode 100644 index 000000000..befe5a4ac Binary files /dev/null and b/image/character/mtg_jiding.jpg differ diff --git a/image/character/mtg_jiesi.jpg b/image/character/mtg_jiesi.jpg new file mode 100644 index 000000000..ee17db9f7 Binary files /dev/null and b/image/character/mtg_jiesi.jpg differ diff --git a/image/character/mtg_lilianna.jpg b/image/character/mtg_lilianna.jpg new file mode 100644 index 000000000..d9eb7d1fe Binary files /dev/null and b/image/character/mtg_lilianna.jpg differ diff --git a/image/character/mtg_nisha.jpg b/image/character/mtg_nisha.jpg new file mode 100644 index 000000000..f2d043c3c Binary files /dev/null and b/image/character/mtg_nisha.jpg differ diff --git a/image/character/mtg_qianzhuo.jpg b/image/character/mtg_qianzhuo.jpg new file mode 100644 index 000000000..403cf1b1b Binary files /dev/null and b/image/character/mtg_qianzhuo.jpg differ