diff --git a/character/mobile.js b/character/mobile.js index 05fda5c66..840c2e160 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -14146,7 +14146,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ mbaosi_info:'锁定技。当你于出牌阶段对一名攻击范围内的角色造成伤害后,你于此阶段对其使用牌无次数限制。', xin_zhoutai:'手杀周泰', re_yanwen:"手杀颜良文丑", - qianzhao:'牵招', + qianzhao:'手杀牵招', mbshihe:'势吓', mbshihe_info_identity:'出牌阶段限一次。你可以与一名角色拼点。若你:赢,当其于其下回合结束前对你造成伤害时,取消之;没赢,你随机弃置一张牌。', mbshihe_info:'出牌阶段限一次。你可以与一名角色拼点。若你:赢,当其于其下回合结束前对你和你的友方角色造成伤害时,取消之;没赢,你随机弃置一张牌。', diff --git a/character/rank.js b/character/rank.js index 8d83d646f..3976b6b47 100644 --- a/character/rank.js +++ b/character/rank.js @@ -1247,6 +1247,7 @@ window.noname_character_rank={ 'jsrg_zhanghe', 'jsrg_zoushi', 'gaoxiang', + 'ol_qianzhao', ], bm:[ 'diy_xizhenxihong', diff --git a/character/sp.js b/character/sp.js index 0b293ec90..54d25615f 100755 --- a/character/sp.js +++ b/character/sp.js @@ -10,7 +10,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sp_tianzhu:['niujin','hejin','hansui',"wutugu","yanbaihu","shamoke","panfeng","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna",'ol_wenqin'], sp_nvshi:["lingju","guanyinping","zhangxingcai","mayunlu","dongbai","zhaoxiang",'ol_zhangchangpu','ol_xinxianying',"daxiaoqiao","jin_guohuai"], sp_shaowei:["simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','zhangzhi','lushi'], - sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_huban','haopu'], + sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_huban','haopu','ol_qianzhao'], sp_liesi:['mizhu','weizi','ol_liuba','zhangshiping'], sp_default:["sp_diaochan","sp_zhaoyun","sp_sunshangxiang","sp_caoren","sp_jiangwei","sp_machao","sp_caiwenji","jsp_guanyu","jsp_huangyueying","sp_pangde","sp_jiaxu","yuanshu",'sp_zhangliao','sp_ol_zhanghe','sp_menghuo'], sp_waitforsort:[], @@ -27,6 +27,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, character:{ + ol_qianzhao:['male','wei',4,['olweifu','olkuansai']], niujin:['male','wei',4,['olcuorui','liewei']], hejin:['male','qun',4,['olmouzhu','olyanhuo']], hansui:['male','qun',4,['olniluan','olxiaoxi']], @@ -691,6 +692,185 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, skill:{ + //OL牵招 + olweifu:{ + audio:2, + enable:'phaseUse', + filterCard:true, + position:'he', + check:function(card){ + var player=_status.event.player; + return (5-get.value(card))/Math.pow(Math.max(0.1,player.getUseValue(card)),0.33); + }, + content:function(){ + 'step 0' + player.judge(card=>{ + var evt=_status.event.getParent(); + var cardx=evt.cards[0]; + if(get.type2(card)==get.type2(cardx)) return 0.5; + return 0.1; + }).set('callback',function(){ + var card=event.judgeResult.card; + player.addTempSkill('olweifu_clear'); + player.addTempSkill('olweifu_add'); + if(!get.is.object(player.storage.olweifu_add)) player.storage.olweifu_add={}; + var type=get.type2(card,player); + if(typeof player.storage.olweifu_add[type]!='number') player.storage.olweifu_add[type]=0; + player.storage.olweifu_add[type]++; + player.markSkill('olweifu_add'); + if(type==get.type2(event.getParent(2).cards[0],player)) player.draw(); + }).set('judge2',result=>result.bool); + }, + ai:{ + order:7, + result:{ + player:function(player){ + return player.hasCard(card=>{ + var type=get.type2(card); + if(type=='equip') return false; + return player.hasUseTarget(card)&&player.getUseValue(card)>5&&game.countPlayer(current=>{ + return lib.filter.targetEnabled2(card,player,current)&&get.effect(current,card,player,player)>0; + })+1>(get.is.object(player.storage.olweifu_add)?(player.storage.olweifu_add[type]||0):0); + },'hs')?1:0; + }, + }, + }, + subSkill:{ + clear:{ + trigger:{player:'useCard1'}, + filter:function(event,player){ + var type=get.type2(event.card); + if(get.is.object(player.storage.olweifu_add)&&typeof player.storage.olweifu_add[type]=='number') return true; + return false; + }, + silent:true, + firstDo:true, + charlotte:true, + content:function(){ + var type=get.type2(trigger.card); + var num=player.storage.olweifu_add[type]; + delete player.storage.olweifu_add[type]; + if(get.is.empty(player.storage.olweifu_add)){ + delete player.storage.olweifu_add; + player.unmarkSkill('olweifu_add'); + } + trigger._olweifu_clear=num; + } + }, + add:{ + trigger:{player:'useCard2'}, + filter:function(event,player){ + if(!event._olweifu_clear) return false; + var info=get.info(event.card); + if(info.allowMultiple==false) return false; + if(event.targets&&!info.multitarget){ + if(game.hasPlayer(current=>{ + return !event.targets.contains(current)&&lib.filter.targetEnabled2(event.card,player,current); + })) return true; + } + return false; + }, + onremove:true, + charlotte:true, + direct:true, + content:function(){ + 'step 0' + var num=trigger._olweifu_clear; + player.chooseTarget(get.prompt('olweifu'),'为'+get.translation(trigger.card)+'额外指定'+get.cnNumber(num)+'个目标。',[1,num],(card,player,target)=>{ + return !_status.event.sourcex.contains(target)&&lib.filter.targetEnabled2(_status.event.card,player,target); + }).set('sourcex',trigger.targets).set('ai',function(target){ + var player=_status.event.player; + return get.effect(target,_status.event.card,player,player); + }).set('card',trigger.card); + 'step 1' + if(result.bool){ + var targets=result.targets; + player.logSkill('olweifu_add',targets); + trigger.targets.addArray(targets); + if(!event.isMine()&&!event.isOnline()) game.delayex(); + } + }, + intro:{ + markcount:()=>0, + content:(storage,player)=>{ + if(!get.is.object(storage)) return; + var str='使用下一张以下类型的牌无距离限制,且可以额外指定对应数量个目标:'; + for(var type in storage){ + str+='