diff --git a/character/offline.js b/character/offline.js index 6119e68cf..44ce10bbb 100644 --- a/character/offline.js +++ b/character/offline.js @@ -6,7 +6,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ connectBanned:['zhangliang'], characterSort:{ offline:{ - offline_star:["sp_xiahoushi","jsp_zhaoyun","huangjinleishi","sp_pangtong","sp_daqiao","sp_ganning","sp_xiahoudun","sp_lvmeng","sp_zhangfei","sp_liubei","old_machao","zhangliang","jsp_caoren"], + offline_star:['jsp_ganfuren',"sp_xiahoushi","jsp_zhaoyun","huangjinleishi","sp_pangtong","sp_daqiao","sp_ganning","sp_xiahoudun","sp_lvmeng","sp_zhangfei","sp_liubei","old_machao","zhangliang","jsp_caoren"], offline_sticker:['sp_gongsunzan','sp_simazhao','sp_wangyuanji','sp_xinxianying','sp_liuxie'], offline_yijiang:['ol_xinxianying'], offline_luanwu:["ns_lijue","ns_zhangji","ns_fanchou"], @@ -19,6 +19,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, character:{ + jsp_ganfuren:['female','shu',3,['shushen','shenzhi'],['character:gz_ganfuren']], ol_xinxianying:['female','wei',3,['xincaishi','xinzhongjian']], zhangliang:["male","qun",4,["old_jijun","old_fangtong"]], jsp_caoren:['male','wei',4,['kuiwei','yanzheng']], @@ -6683,6 +6684,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ old_machao_prefix:'J.SP', jsp_caoren:'☆SP曹仁', jsp_caoren_prefix:'☆SP', + jsp_ganfuren:'☆SP甘夫人', + jsp_ganfuren_prefix:'☆SP', zhangliang:'SP张梁', zhangliang_prefix:'SP', ol_xinxianying:'将辛宪英', diff --git a/character/sp.js b/character/sp.js index 25e7a6f12..c163b76fc 100755 --- a/character/sp.js +++ b/character/sp.js @@ -5,7 +5,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ connect:true, characterSort:{ sp:{ - sp_tianji:["sunhao","liuxie","caoang","hetaihou","sunluyu",'ol_wangrong',"zuofen","ganfuren","ol_bianfuren","qinghegongzhu","tengfanglan","ruiji",'caoxiancaohua'], + sp_tianji:["sunhao","liuxie","caoang","hetaihou","sunluyu",'ol_wangrong',"zuofen","ol_bianfuren","qinghegongzhu","tengfanglan","ruiji",'caoxiancaohua'], sp_sibi:["yangxiu","chenlin","chengyu","shixie","fuwan","wangyun","zhugejin","simalang","maliang","buzhi","dongyun","kanze","sunqian","xizhicai","sunshao",'duxi',"jianggan",'ol_dengzhi','ol_yangyi','ol_dongzhao','ol_chendeng','jin_yanghu','wangyan','xiahouxuan','quhuang','zhanghua','wangguan','sunhong','caoxi'], 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',"daxiaoqiao","jin_guohuai"], @@ -182,7 +182,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ kanze:['male','wu',3,['xiashu','kuanshi']], heqi:['male','wu',4,['olqizhou','olshanxi']], - ganfuren:['female','shu',3,['shushen','shenzhi']], //mifuren:['female','shu',3,['guixiu','cunsi']], yuejin:['male','wei',4,['xiaoguo']], sp_dongzhuo:['male','qun',5,['hengzheng']], @@ -25263,7 +25262,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yuantanyuanshang:['yuantanyuanshang','yuantanyuanxiyuanshang'], ruiji:['ruiji','dc_ruiji'], jsp_huangyueying:['jsp_huangyueying','re_jsp_huangyueying'], - ganfuren:['ganfuren','dc_ganfuren'], + ganfuren:['ganfuren','dc_ganfuren','jsp_ganfuren'], wenqin:['wenqin','pe_wenqin'], zhouqun:['ol_zhouqun','zhouqun'], qianzhao:['ol_qianzhao','qianzhao'], @@ -25351,9 +25350,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zhugejin:'诸葛瑾', zhugeke:'诸葛恪', guanyinping:'关银屏', - gz_ganfuren:'甘夫人', - ganfuren:'SP甘夫人', - ganfuren_prefix:'SP', sunhao:'孙皓', chengyu:'程昱', simalang:'司马朗', diff --git a/character/standard.js b/character/standard.js index a96662ddd..9b1423e68 100755 --- a/character/standard.js +++ b/character/standard.js @@ -8,10 +8,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ standard_2008:["caocao","simayi","xiahoudun","zhangliao","xuzhu","guojia","zhenji","liubei","guanyu","zhangfei","zhugeliang","zhaoyun","machao","huangyueying","sunquan","ganning","lvmeng","huanggai","zhouyu","daqiao","luxun","sunshangxiang","huatuo","lvbu","diaochan"], standard_2013:["huaxiong","re_yuanshu","re_xushu","re_lidian"], standard_2019:["gongsunzan","xf_yiji"], - standard_2023:["std_panfeng"], + standard_2023:["std_panfeng",'ganfuren'], }, }, character:{ + ganfuren:['female','shu',3,['stdshushen','shenzhi']], std_panfeng:['male','qun',4,['stdkuangfu']], re_lidian:['male','wei',3,['xunxun','xinwangxi']], re_xushu:['male','shu',4,['zhuhai','qianxin']], @@ -94,6 +95,31 @@ game.import('character',function(lib,game,ui,get,ai,_status){ guanyu:['zhangfei','liaohua'], }, skill:{ + //标准版甘夫人 + stdshushen:{ + audio:'shushen', + trigger:{player:'recoverEnd'}, + direct:true, + content:function(){ + 'step 0' + event.num=trigger.num||1; + 'step 1' + player.chooseTarget(get.prompt2('stdshushen'),lib.filter.notMe).set('ai',function(target){ + return get.attitude(_status.event.player,target); + }); + 'step 2' + if(result.bool){ + var target=result.targets[0]; + player.logSkill('stdshushen',target); + target.draw(target.countCards('h')?1:2); + if(event.num>1&&player.hasSkill('stdshushen')){ + event.num--; + event.goto(1); + } + } + }, + ai:{threaten:0.8,expose:0.1}, + }, stdkuangfu:{ audio:'xinkuangfu', trigger:{source:'damageSource'}, @@ -2718,6 +2744,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ std_panfeng:'潘凤', stdkuangfu:'狂斧', stdkuangfu_info:'锁定技。出牌阶段限一次。当你使用【杀】对其他角色造成伤害后，若其体力值：小于你，你摸两张牌；不小于你，你失去1点体力。', + ganfuren:'甘夫人', + stdshushen:'淑慎', + stdshushen_info:'当你回复1点体力时，你可以令一名其他角色摸一张牌（若其没有手牌则改为摸两张牌）。', standard_2008:"2008版标准包", standard_2013:"2013版标准包",