From d04957377ff9548d1fe161696345a20cca6c7004 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Mon, 2 Oct 2023 13:35:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BA=BF=E4=B8=8B=E6=AD=A6?= =?UTF-8?q?=E5=B0=86=E4=BB=A5=E5=A4=96=E7=9A=84prefix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/collab.js | 6 +-- character/extra.js | 5 +- character/mobile.js | 13 ++++- character/offline.js | 32 +++++++++--- character/old.js | 67 +++++++++++++++++++------ character/refresh.js | 2 - character/shenhua.js | 8 +++ character/sp.js | 3 -- character/sp2.js | 17 +++++-- character/tw.js | 9 ++-- character/xianding.js | 15 ++++-- character/yijiang.js | 12 +++-- character/yingbian.js | 13 ++++- font/motoyamaru.woff2 | Bin 0 -> 27512 bytes font/suits.woff2 | Bin 4680 -> 4692 bytes game/game.js | 112 +++++++++++++++++++++--------------------- 16 files changed, 206 insertions(+), 108 deletions(-) create mode 100644 font/motoyamaru.woff2 diff --git a/character/collab.js b/character/collab.js index 1defc44ce..c968ed6a1 100644 --- a/character/collab.js +++ b/character/collab.js @@ -1600,15 +1600,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcbianzhuang:'变装', dcbianzhuang_info:'①出牌阶段限一次，你可以从系统随机选择的两个技能中获得一个，并视为使用一张【杀】（无距离次数限制），然后失去以此法获得的技能。②当你使用装备牌后，你清空此技能的发动次数记录。③当你发动〖变装①〗后，若你发动〖变装①〗的次数大于2，则你将武将牌变更为诸葛亮，并将系统选择的技能数改为三个。', dc_caocao:'经典曹操', - dc_caocao_ab:'曹操', + dc_caocao_prefix:'经典', dcjianxiong:'奸雄', dcjianxiong_info:'当你受到伤害后，你可以摸一张牌并获得对你造成伤害的牌，然后你令此技能摸牌数+1（至多为5）。', dc_liubei:'经典刘备', - dc_liubei_ab:'刘备', + dc_liubei_prefix:'经典', dcrende:'仁德', dcrende_info:'出牌阶段每名角色限一次。你可以获得一名其他角色两张手牌，然后视为使用一张基本牌。', dc_sunquan:'经典孙权', - dc_sunquan_ab:'孙权', + dc_sunquan_prefix:'经典', dczhiheng:'制衡', dczhiheng_info:'①出牌阶段限一次。你可以弃置任意张牌并摸等量的牌，若你在发动〖制衡〗时弃置了所有手牌，则你多摸一张牌。②每回合每名角色限一次。当你对其他角色造成伤害后，你令〖制衡①〗于此回合发动次数上限+1。', diff --git a/character/extra.js b/character/extra.js index 9df78fa41..1b5661d03 100755 --- a/character/extra.js +++ b/character/extra.js @@ -7253,6 +7253,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ huoxin_info:'出牌阶段限一次，你可以展示两张花色相同的手牌并分别交给两名其他角色，然后令这两名角色拼点，没赢的角色获得1个“魅惑”标记。拥有2个或更多“魅惑”的角色回合即将开始时，该角色移去其所有“魅惑”，此回合改为由你操控。', boss_zhaoyun:'高达一号', boss_zhaoyun_ab:'神赵云', + boss_zhaoyun_prefix:'神', boss_juejing:'绝境', boss_juejing2:'绝境', boss_juejing_info:'锁定技，摸牌阶段开始前，你跳过此阶段。当你得到牌/失去手牌后，若你的手牌数大于4/小于4，则你将手牌摸至4张/弃置至4张。', @@ -7365,6 +7366,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ hina_xingzhi:'幸凪', hina_xingzhi_info:'键势力技。每回合限一次，你可以通过“助战”触发一张牌的全部应变效果，且响应助战的角色摸两张牌。', tw_shen_guanyu:'TW神关羽', + tw_shen_guanyu_prefix:'TW神', twwushen:'武神', twwushen_info:'锁定技。①你的♥手牌均视为普【杀】。②你于每阶段使用的第一张【杀】不可被响应。③你使用♥【杀】无距离和次数限制。④当你使用♥【杀】选择目标后，你令所有拥有“梦魇”标记的角色均成为此【杀】的目标。', twwuhun:'武魂', @@ -7385,7 +7387,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sanshou_info:'当你受到伤害时，你可以亮出牌堆顶三张牌。若其中有本回合未被使用过的牌的类型，防止此伤害。', tianjie:'天劫', tianjie_info:'一名角色的回合结束时，若本回合牌堆洗过牌，你可以选择至多三名其他角色。你依次对每名目标角色造成X点雷电伤害（X为其手牌中【闪】的数量，至少为1）。', - tw_shen_lvmeng: 'TW神吕蒙', + tw_shen_lvmeng:'TW神吕蒙', + tw_shen_lvmeng_prefix:'TW神', twshelie:'涉猎', twshelie_info:'①摸牌阶段，你可放弃摸牌并亮出牌堆顶的五张牌，然后选择获得其中每种花色的牌各一张。②每轮限一次。结束阶段，若你本回合使用的花色数不小于你的体力值，你执行一个额外的摸牌阶段或出牌阶段。', twgongxin:'攻心', diff --git a/character/mobile.js b/character/mobile.js index 38bafe590..e84260180 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -14249,7 +14249,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ wanlan_info:'限定技，当一名角色进入濒死状态时，你可以弃置所有手牌（无牌可不弃）。其回复体力至1点，然后你对当前回合角色造成1点伤害。', re_jikang:'手杀嵇康', re_jikang_prefix:'手杀', - old_caochun:'旧曹纯', shenpei:'审配', re_wangyun:'手杀王允', re_wangyun_prefix:'手杀', @@ -14874,6 +14873,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){ re_caozhi_prefix:'手杀', re_sunjian:'手杀孙坚', re_sunjian_prefix:'手杀', + sunru:'手杀孙茹', + sunru_prefix:'手杀', + pangdegong:"手杀庞德公", + pangdegong_prefix:'手杀', + zhaotongzhaoguang:"手杀赵统赵广", + zhaotongzhaoguang_prefix:'手杀', + re_liru:'手杀李儒', + re_liru_prefix:'李儒', + re_chenqun:'手杀陈群', + re_chenqun_prefix:'手杀', + old_yuanshu:'手杀袁术', + old_yuanshu_prefix:'手杀', mobile_standard:'手杀异构·标准包', mobile_shenhua_feng:'手杀异构·其疾如风', diff --git a/character/offline.js b/character/offline.js index 37fd98f9b..ef0f01763 100644 --- a/character/offline.js +++ b/character/offline.js @@ -5,7 +5,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ connect:true, characterSort:{ offline:{ - offline_star:["sp_xiahoushi","jsp_zhaoyun","huangjinleishi","sp_pangtong","sp_daqiao","sp_ganning","sp_xiahoudun","sp_lvmeng","sp_zhangfei","sp_liubei"], + 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_sticker:['sp_gongsunzan','sp_simazhao','sp_wangyuanji','sp_xinxianying','sp_liuxie'], offline_luanwu:["ns_lijue","ns_zhangji","ns_fanchou"], offline_yongjian:["ns_chendao","yj_caoang","yj_caocao",'yj_liru','yj_caohong','yj_zhangfei','yongjian_ganning','yj_dongzhuo','yj_xuyou','yj_jiaxu','yj_zhenji'], @@ -17,6 +17,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, character:{ + zhangliang:["male","qun",4,["old_jijun","old_fangtong"]], + jsp_caoren:['male','wei',4,['kuiwei','yanzheng']], + old_machao:['male','qun',4,['zhuiji','oldcihuai']], vtb_xiaosha:['female','qun',4,['vtbguisha','vtbshuli']], vtb_xiaoshan:['female','qun',4,['vtbshanwu','vtbxianli']], vtb_xiaotao:['female','qun',4,['vtbtaoyan','vtbyanli']], @@ -6357,7 +6360,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ xinfu_yanyu2:"燕语", xinfu_xiaode:"孝德", xinfu_xiaode_info:"其他角色死亡后，你可以声明该角色武将牌上的一个技能（主公技、觉醒技、隐匿技、使命技除外）。若如此做，你获得此技能且不能再发动〖孝德〗直到你的回合结束。", - jsp_zhaoyun:'☆SP赵云', + jsp_zhaoyun:'★SP赵云', + jsp_zhaoyun_prefix:'★SP', chixin:'赤心', chixin1:'赤心', chixin2:'赤心', @@ -6378,40 +6382,46 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zuixiang:'醉乡', zuixiang2:'醉乡', zuixiang_info:'限定技，准备阶段开始时，你可以展示牌堆顶的3张牌并置于你的武将牌上。你不能使用或打出与该些牌同类的牌，所有同类牌对你无效。之后的每个准备阶段，你须重复展示一次，直到这些牌中任意两张点数相同。然后，你获得这些牌。', - sp_daqiao:'☆SP大乔', + sp_daqiao:'★SP大乔', + sp_daqiao_prefix:'★SP', yanxiao:'言笑', yanxiao_info:'出牌阶段，你可以将一张♦牌置于一名角色的判定区内。判定区内有〖言笑〗牌的角色下个判定阶段开始时，其获得判定区里的所有牌。', anxian:'安娴', anxian_info:'当你使用【杀】对目标角色造成伤害时，你可以防止此伤害，令其弃置一张手牌，然后你摸一张牌；当你成为【杀】的目标后，你可以弃置一张手牌，令此【杀】对你无效，然后此【杀】的使用者摸一张牌。', - sp_ganning:'☆SP甘宁', + sp_ganning:'★SP甘宁', + sp_ganning_prefix:'★SP', yinling:'银铃', yinling_bg:'锦', yinling_info:'出牌阶段，若你的“锦”小于四张，你可以弃置一张黑色牌并指定一名其他角色。若如此做，你将其的一张牌置于你的武将牌上，称为“锦”。', junwei:'军威', junwei2:'军威', junwei_info:'结束阶段开始时，你可以移去三张“锦”。若如此做，你须指定一名角色并令其选择一项：1.展示一张【闪】，然后你将此【闪】交给一名其他角色。2.该角色失去1点体力，然后你将其装备区内的一张牌移出游戏。该角色的回合结束后，将以此法移出游戏的装备牌移回原处。', - sp_xiahoudun:'☆SP夏侯惇', + sp_xiahoudun:'★SP夏侯惇', + sp_xiahoudun_prefix:'★SP', fenyong:'愤勇', fenyong2:'愤勇', fenyong2_bg:'勇', fenyong_info:'每当你受到一次伤害后，你可以获得一枚「愤勇」标记；当你拥有「愤勇」标记时，防止你受到的所有伤害。', xuehen:'雪恨', xuehen_info:'每个角色的结束阶段开始时，若你有愤勇标记，你弃置之，然后选择一项：1.弃置当前回合角色X张牌（X为你已损失的体力值）；2.视为对一名任意角色使用一张【杀】。', - sp_lvmeng:'☆SP吕蒙', + sp_lvmeng:'★SP吕蒙', + sp_lvmeng_prefix:'★SP', tanhu:'探虎', tanhu2:'探虎', tanhu3:'探虎', tanhu_info:'出牌阶段限一次，你可以与一名其他角色拼点。若你赢，你获得以下效果直到回合结束：你与该角色的距离为1，你对该角色使用的普通锦囊牌不能被【无懈可击】响应。', mouduan:'谋断', mouduan_info:'游戏开始时，你获得标记“武”并获得技能〖激昂〗和〖谦逊〗。当你失去手牌后，若手牌数不大于2，你须将你的标记变为“文”，将这两项技能改为〖英姿〗和〖克己〗。一名角色的回合开始前，你可弃一张牌将标记翻回。', - sp_zhangfei:'☆SP张飞', + sp_zhangfei:'★SP张飞', + sp_zhangfei_prefix:'★SP', jie:'嫉恶', jie_info:'锁定技，当你使用红色【杀】造成伤害时，此伤害+1。', dahe:'大喝', dahe2:'大喝', dahe2_bg:'喝', dahe_info:'出牌阶段限一次，你可以与一名其他角色拼点。若你赢，该角色不能使用或打出不为♥花色的【闪】直到回合结束，且你可将该角色拼点的牌交给场上一名体力不多于你的角色。若你没赢，你须展示手牌并弃置其中的一张。', - sp_liubei:'☆SP刘备', + sp_liubei:'★SP刘备', + sp_liubei_prefix:'★SP', zhaolie:'昭烈', zhaolie_info:'摸牌阶段摸牌时，你可以少摸一张牌并指定攻击范围内的一名角色。你展示牌堆顶的三张牌，将其中的非基本牌和【桃】置于弃牌堆，然后该角色选择一项：1.你对其造成X点伤害，然后其获得这些基本牌；2.其弃置X张牌，然后你获得这些基本牌。（X为其中非基本牌的数量）', shichou:'誓仇', @@ -6642,6 +6652,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ vtbmeiniang_info:'其他角色的出牌阶段开始时，你可以令其视为使用一张无次数限制且不计入次数的【酒】。', vtbyaoli:'媱丽', vtbyaoli_info:'其他角色于其出牌阶段内使用【酒】后，你可以令其于本回合内使用的下一张【杀】不能被响应且可以额外指定一个目标。', + old_machao:'★SP马超', + old_machao_prefix:'★SP', + jsp_caoren:'★SP曹仁', + jsp_caoren_prefix:'★SP', + zhangliang:'SP张梁', + zhangliang_prefix:'SP', offline_star:'桌游志·SP', offline_sticker:'桌游志·贴纸', diff --git a/character/old.js b/character/old.js index a53f4454d..5b2ac7742 100755 --- a/character/old.js +++ b/character/old.js @@ -15,7 +15,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ old_yijiang4:["old_caozhen","old_chenqun","old_zhuhuan",'old_caorui'], old_yijiang5:["old_caoxiu","old_zhuzhi"], old_yijiang67:["ol_zhangrang",'old_huanghao','old_liyan'], - old_sp:["old_wanglang","old_maliang","old_machao","zhangliang","jsp_caoren","old_zhangxingcai","old_wangyun",'old_dingfeng'], + old_sp:["old_wanglang","old_maliang","old_zhangxingcai","old_wangyun",'old_dingfeng'], old_yingbian:['junk_simayi','old_yangyan','old_yangzhi'], old_mobile:["old_caochun",'old_majun'], }, @@ -58,7 +58,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ old_zhangfei:['male','shu',4,['new_repaoxiao','new_tishen']], old_zhaoyun:['male','shu',4,['longdan','new_yajiao']], old_huatuo:['male','qun',3,['jijiu','chulao']], - jsp_caoren:['male','wei',4,['kuiwei','yanzheng']], old_caochun:['male','wei',4,['shanjia']], masu:['male','shu',3,['xinzhan','huilei']], xushu:['male','shu',3,['xswuyan','jujian'],['border:wei']], @@ -77,9 +76,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ old_zhuhuan:['male','wu',4,['youdi']], old_zhuzhi:['male','wu',4,['anguo']], - old_machao:['male','qun',4,['zhuiji','oldcihuai']], old_zhugezhan:["male","shu",3,["old_zuilun","old_fuyin"]], - zhangliang:["male","qun",4,["old_jijun","old_fangtong"]], ol_zhangrang:['male','qun',3,['xintaoluan'],['sex:male_castrated']], //ol_manchong:['male','wei',3,['yuce','junxing']], old_guanqiujian:["male","wei",4,["drlt_zhenrong","drlt_hongju"],[]], @@ -1015,39 +1012,60 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, translate:{ old_zhangxingcai:'旧张星彩', + old_zhangxingcai_prefix:'旧', old_majun:'骰子马钧', - old_yuanshu:'手杀袁术', old_xusheng:'旧徐盛', + old_xusheng_prefix:'旧', old_lingtong:'旧凌统', + old_lingtong_prefix:'旧', old_zhuran:'旧朱然', + old_zhuran_prefix:'旧', old_caoxiu:'旧曹休', + old_caoxiu_prefix:'旧', old_caozhen:'旧曹真', + old_caozhen_prefix:'旧', old_maliang:'旧马良', + old_maliang_prefix:'旧', old_chenqun:'旧陈群', + old_chenqun_prefix:'旧', old_zhuhuan:'旧朱桓', + old_zhuhuan_prefix:'旧', old_zhuzhi:'旧朱治', - old_machao:'☆SP马超', - old_zhugezhan:"旧诸葛瞻", - zhangliang:'SP张梁', + old_zhuzhi_prefix:'旧', + old_zhugezhan:'旧诸葛瞻', + old_zhugezhan_prefix:'旧', yuji:'旧于吉', + yuji_prefix:'旧', old_zhangfei:'新杀张飞', - old_zhangfei_ab:'张飞', + old_zhangfei_prefix:'新杀', old_huatuo:'OL华佗', - jsp_caoren:'☆SP曹仁', + old_huatuo_prefix:'OL', ol_zhangrang:'旧张让', + ol_zhangrang_prefix:'旧', ol_liaohua:'OL廖化', + ol_liaohua_prefix:'OL', ol_zhuran:'OL朱然', + ol_zhuran_prefix:'OL', ol_manchong:'OL满宠', + ol_manchong_prefix:'OL', old_fuhuanghou:'旧伏寿', + old_fuhuanghou_prefix:'旧', old_caochong:'旧曹冲', + old_caochong_prefix:'旧', old_guanqiujian:'旧毌丘俭', + old_guanqiujian_prefix:'旧', old_wangyun:'旧王允', + old_wangyun_prefix:'旧', old_zhaoyun:'新杀赵云', - old_zhaoyun_ab:'赵云', + old_zhaoyun_prefix:'新杀', ol_huaxiong:'旧华雄', + ol_huaxiong_prefix:'旧', old_xiaoqiao:'旧小乔', + old_xiaoqiao_prefix:'旧', old_wanglang:'旧王朗', + old_wanglang_prefix:'旧', old_wangyi:'旧王异', + old_wangyi_prefix:'旧', xin_yujin:'节钺于禁', re_yujin:'毅重于禁', @@ -1069,43 +1087,60 @@ game.import('character',function(lib,game,ui,get,ai,_status){ oldxuanfeng:'旋风', oldxuanfeng_info:'当你失去装备区里的牌后，你可以选择一项：1.视为对一名其他角色使用一张【杀】；2.对一名距离为1的角色造成1点伤害。', ol_yuanshu:'旧袁术', + ol_yuanshu_prefix:'旧', fazheng:'旧法正', + fazheng_prefix:'旧', junk_simayi:'旧晋司马懿', + junk_simayi_prefix:'旧', junk_simayi_ab:'司马懿', madai:'旧马岱', + madai_prefix:'旧', old_yangzhi:'旧杨芷', + old_yangzhi_prefix:'旧', old_yangyan:'旧杨艳', + old_yangyan_prefix:'旧', old_caorui:'旧曹叡', + old_caorui_prefix:'旧', oldmingjian:'明鉴', oldmingjian_info:'出牌阶段开始前，你可以跳过此阶段并将所有手牌交给一名其他角色。若如此做，你结束当前回合，然后其获得一个额外的回合（仅包含出牌阶段）。', old_handang:'旧韩当', + old_handang_prefix:'旧', oldgongji:'弓骑', oldgongji_info:'你可以将一张装备牌当做无距离限制的【杀】使用或打出。', oldjiefan:'解烦', oldjiefan_info:'当一名角色A于你的回合外处于濒死状态时，你可以对当前回合角色使用一张【杀】。当此【杀】造成伤害时，你防止此伤害，视为对A使用一张【桃】。', old_gaoshun:'旧高顺', + old_gaoshun_prefix:'旧', old_liubiao:'旧刘表', + old_liubiao_prefix:'旧', oldre_liubiao:'RE刘表', oldre_liubiao_ab:'刘表', oldzishou:'自守', oldzishou_info:'摸牌阶段，若你已受伤，你可令额定摸牌数+X（X为你已损失的体力值），然后跳过下一个出牌阶段。', old_huanghao:'旧黄皓', + old_huanghao_prefix:'旧', oldqinqing:'寝情', oldqinqing_info:'结束阶段，你可以选择一名攻击范围内含有主公的其他角色，然后你弃置该角色的一张牌（无牌则不弃），并令其摸一张牌。若该角色的手牌数大于主公，你摸一张牌。', oldhuisheng:'贿生', oldhuisheng_info:'每名角色限一次。当你受到其他角色对你造成的伤害时，你可以令其观看你任意数量的牌并令其选择一项：1.获得这些牌中的一张并防止此伤害；2.弃置等量的牌', old_dingfeng:'旧丁奉', - junk_sunquan:'改版神孙权', - junk_sunquan_ab:'神孙权', + old_dingfeng_prefix:'旧', + junk_sunquan:'旧神孙权', + junk_sunquan_prefix:'旧神', new_caoren:'旧曹仁', - new_caoren_ab:'旧曹仁', + new_caoren_prefix:'旧', old_re_lidian:'旧李典', + old_re_lidian_prefix:'旧', old_liyan:'旧李严', + old_liyan_prefix:'旧', old_chendao:'旧陈到', - old_caocao:'神曹操', - old_caocao_ab:'魏武帝', + old_chendao_prefix:'旧', + old_caocao:'旧神曹操', + old_caocao_prefix:'旧神', junkguixin:'归心', junkguixin_info:'回合结束时，你可以选择一项：①获得剩余武将牌堆的所有主公技的其中一个技能；②更改一名其他角色的势力。', + old_caochun:'旧曹纯', + old_caochun_prefix:'旧', old_standard:'标准包', old_shenhua:'神话再临', diff --git a/character/refresh.js b/character/refresh.js index 2abc86cdc..5132aa061 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -14846,7 +14846,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ decadechunlao:'醇醪', decadechunlao2:'醇醪', decadechunlao_info:'你可以对其他角色使用【酒（使用方法②）】。当你需要使用【酒】时，若你的武将牌未横置，则你可以将武将牌横置，然后视为使用【酒】。当你受到或造成伤害后，若伤害值大于1且你的武将牌横置，则你可以重置武将牌。', - re_liru:'手杀李儒', rejuece:'绝策', rejuece_info:'结束阶段，你可以对一名本回合内失去过牌的角色造成1点伤害。', remieji:'灭计', @@ -14936,7 +14935,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ ollihuo_info:'你使用普通的【杀】可以改为火【杀】，若此【杀】造成过伤害，你失去1点体力；你使用火【杀】可以多选择一个目标。你每回合使用的第一张牌如果是【杀】，则此【杀】结算完毕后可置于你的武将牌上。', xinjiangchi:'将驰', xinjiangchi_info:'出牌阶段开始时，你可选择：①摸一张牌。②摸两张牌，然后本回合内不能使用或打出【杀】。③弃置一张牌，然后本回合内可以多使用一张【杀】，且使用【杀】无距离限制。', - re_chenqun:'手杀陈群', redingpin:'定品', redingpin_info:'出牌阶段，你可以弃置一张本回合未使用过/弃置过的类型的牌并选择一名角色。其进行判定，若结果为：黑色，其摸X张牌（X为其体力值且至多为3）且本回合内不能再成为〖定品〗的目标；红桃，你令此次弃置的牌不计入〖定品〗弃置牌合法性的检测；方片，你将武将牌翻面。', refaen:'法恩', diff --git a/character/shenhua.js b/character/shenhua.js index 78bfa304a..aa6ade50b 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -7946,6 +7946,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ caopi:'曹丕', re_xuhuang:'徐晃', lusu:'旧鲁肃', + lusu_prefix:'旧', sunjian:'孙坚', dongzhuo:'董卓', jiaxu:'贾诩', @@ -8005,6 +8006,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ taishici:'太史慈', yanwen:'颜良文丑', yuanshao:'旧袁绍', + yuanshao_prefix:'旧', re_pangde:'庞德', huoji:'火计', bazhen:'八阵', @@ -8062,13 +8064,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){ old_zhoutai:'周泰', old_caoren:'曹仁', xuhuang:'旧徐晃', + xuhuang_prefix:'旧', pangde:'旧庞德', + pangde_prefix:'旧', xiahouyuan:'旧夏侯渊', + xiahouyuan_prefix:'旧', huangzhong:'旧黄忠', + huangzhong_prefix:'旧', sp_zhangjiao:'张角', weiyan:'旧魏延', + weiyan_prefix:'旧', xiaoqiao:'小乔', zhangjiao:'旧张角', + zhangjiao_prefix:'旧', //yuji:'于吉', shensu:'神速', shensu1:'神速', diff --git a/character/sp.js b/character/sp.js index a26fd47aa..58d76fbc6 100755 --- a/character/sp.js +++ b/character/sp.js @@ -24577,7 +24577,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sp_caiwenji_prefix:'SP', zhugeguo:'诸葛果', lingcao:'凌操', - sunru:'手杀孙茹', lingju:'灵雎', lifeng:'李丰', jsp_guanyu:'SP关羽', @@ -24625,8 +24624,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ caoying:"曹婴", simahui:"司马徽", baosanniang:"鲍三娘", - pangdegong:"手杀庞德公", - zhaotongzhaoguang:"手杀赵统赵广", majun:"马钧", simazhao:"司马昭", wangyuanji:"王元姬", diff --git a/character/sp2.js b/character/sp2.js index 840d61a01..2ad877f87 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -10259,6 +10259,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yuanlve:'远略', yuanlve_info:'出牌阶段限一次，你可以将一张非装备牌交给一名角色，然后该角色可以使用该牌并令你摸一张牌。', xunchen:'OL荀谌', + xunchen_prefix:'OL', fenglve:'锋略', fenglve2:'锋略', fenglve_info:'出牌阶段开始时，你可以与一名角色拼点，若你赢，该角色将其区域内的各一张牌交给你；若你没赢，你交给其一张牌。当你的单人拼点结算后，你可以令对方获得你拼点的牌。', @@ -10273,10 +10274,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ beizhan2:'备战', beizhan_info:'结束阶段，你可以令一名角色将手牌摸至体力上限（至多为5）。其下个回合开始时，若其手牌数为全场最多，则其此回合内使用的牌不能指定其他角色为目标。', gaolan:'OL高览', + gaolan_prefix:'OL', xiying:'袭营', xiying2:'袭营', xiying_info:'出牌阶段开始时，你可以弃置一张非基本手牌，然后令所有其他角色依次选择一项：弃置一张牌，或本回合内不能使用或打出牌；且你本回合内获得如下效果：结束阶段，若你于本回合的出牌阶段内造成过伤害，则你从牌堆中获得一张伤害性基本牌或普通锦囊牌。', lvkuanglvxiang:'OL吕旷吕翔', + lvkuanglvxiang_prefix:'OL', liehou:'列侯', liehou_info:'出牌阶段限一次，你可以令一名攻击范围内的角色交给你一张手牌，然后你将一张手牌交给攻击范围内的另一名角色。', qigong:'齐攻', @@ -10318,6 +10321,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ juanhui2_backup:'绢绘', juanhui_info:'结束阶段，你可以选择一名其他角色。记录该角色下回合的出牌阶段里使用的基本牌和普通锦囊牌（每种牌名限记一次），你的下回合出牌阶段，可将一张手牌当这些牌里的任意一张牌使用（每张限使用一次，且【杀】不计次数）。当"绢绘"的牌全部用完时，你回复1点体力并将手牌摸至三张。', re_maliang:'新杀马良', + re_maliang_prefix:'新杀', rexiemu:'协穆', rexiemu_info:'结束阶段，若全场没有“协穆”标记，你可以选择一名角色获得“协穆”标记直到你的下回合开始。你或该角色在各自的回合外使用或打出手牌时，你与其各摸一张牌（每回合限一次）。', heli:'贺励', @@ -10338,7 +10342,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ tuxing2:'图兴', tuxing_info:'锁定技，当你废除一个装备栏时，你加1点体力上限并回复1点体力。然后若你所有的装备栏均已被废除，则你减4点体力上限，且本局游戏内造成的伤害+1。', re_hejin:'新杀何进', + re_hejin_prefix:'新杀', xin_baosanniang:'新杀鲍三娘', + xin_baosanniang_prefix:'新杀', decadexushen:"许身", decadexushen2:'许身', decadexushen_info:"限定技，当你进入濒死状态后，你可以回复1点体力并获得技能“镇南”，然后如果你脱离濒死状态且“关索”不在场，你可令一名其他角色选择是否用“关索”代替其武将并令其摸三张牌。", @@ -10380,7 +10386,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ quanbian2:'权变', quanbian_info:'当你于出牌阶段内使用/打出手牌时，若此牌有花色且你本回合内未使用/打出过该花色的其他手牌，则你可以选择一项：①摸一张牌。②将牌堆顶X张牌中的一张置于牌堆底（X为你的体力上限）。若你发动此技能，则你本回合内不能再使用与此牌花色相同的手牌。', re_hansui:'新杀韩遂', + re_hansui_prefix:'新杀', re_quyi:'新杀麴义', + re_quyi_prefix:'新杀', refuqi:'伏骑', refuqi_info:'锁定技，当你使用牌时，你令所有距离为1的其他角色不能使用或打出牌响应此牌。', hanfu:'韩馥', @@ -10390,11 +10398,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ hfjieying_info:'结束阶段，你可以选择一名其他角色，该角色下回合使用【杀】或普通锦囊牌无距离限制且可多指定一个目标，且当其造成伤害后，其无法再使用牌直到回合结束。 ', weipo:'危迫', weipo_info:'锁定技，其他角色使用【杀】或普通锦囊牌指定你为目标后，若你的手牌数小于X，则你将手牌摸至X张，并记录摸牌事件结算后的手牌数Y。此牌结算结束后，若你的手牌数小于Y，则你将一张手牌交给此牌的使用者，且此技能失效直到你的下回合开始。（X为你的体力上限且至多为5） ', - ol_lisu:'OL李肃', - qiaoyan:'巧言', - qiaoyan_info:'锁定技，当你于回合外受到其他角色造成的伤害时，若你：有“珠”，则你令伤害来源获得“珠”；没有“珠”，则你防止此伤害，然后摸一张牌，并将一张牌正面朝上置于武将牌上，称为“珠”。', - xianzhu:'献珠', - xianzhu_info:'锁定技，出牌阶段开始时，你令一名角色A获得“珠”。若A不为你自己，则你选择A攻击范围内的一名角色B，视为A对B使用一张【杀】。', zhaozhong:'赵忠', yangzhong:'殃众', yangzhong_info:'当你造成或受到伤害后，若受伤角色和伤害来源均存活，则伤害来源可弃置两张牌，然后令受伤角色失去1点体力。', @@ -10424,6 +10427,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zhangu:'战孤', zhangu_info:'锁定技，准备阶段，若你的体力上限大于1且没有手牌/装备区内没有牌，则你减1点体力上限，然后从牌堆中获得三张类型不同的牌。', re_niujin:'新杀牛金', + re_niujin_prefix:'新杀', recuorui:'摧锐', recuorui_info:'限定技，出牌阶段，你可以依次获得至多X名角色的各一张手牌（X为你的体力值）。', reliewei:'裂围', @@ -10607,6 +10611,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcniji:'逆击', dcniji_info:'①当你成为非装备牌的目标后，你可以摸一张牌，称为“逆击”。②一名角色的结束阶段，若你于本回合获得的“逆击”数不小于你的体力值，你可以使用一张“逆击”。你弃置所有“逆击”。', //dc_fuwan:'新杀伏完', + //dc_fuwan_prefix:'新杀', //dc_fuwan_ab:'伏完', dcmoukui:'谋溃', dcmoukui_info:'当你使用【杀】指定第一个目标后，你可以选择任意项：1.摸一张牌；2.弃置其中一个目标角色一张牌。若你均选择，当此【杀】被无效后或被抵消后，该角色弃置你一张牌。', @@ -10628,11 +10633,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcwujie:'无节', dcwujie_info:'锁定技。①你使用无色牌无任何次数限制且无距离限制。②当其他角色执行杀死你的奖惩而摸牌或弃牌时，取消之。', dc_jsp_guanyu:'魏关羽', + dc_jsp_guanyu_prefix:'魏', dcdanji:'单骑', dcdanji_info:'觉醒技。准备阶段，若你的手牌数大于体力值，你减1点体力上限，将体力回复至体力上限，然后获得〖马术〗和〖怒嗔〗。', dcnuchen:'怒嗔', dcnuchen_info:'出牌阶段限一次。你可以展示一名其他角色的一张手牌，然后选择一项：1.弃置任意张该花色的牌，对其造成等量伤害；2.获得该角色手牌中所有此花色的牌。', dc_jikang:'新杀嵇康', + dc_jikang_prefix:'新杀', dcjuexiang:'绝响', dcjuexiang_info:'当你死亡时，杀死你的角色弃置其装备区内的所有牌并失去1点体力，然后你可以令一名其他角色获得〖残韵〗。', dccanyun:'残韵', diff --git a/character/tw.js b/character/tw.js index dd450e626..8d9384385 100644 --- a/character/tw.js +++ b/character/tw.js @@ -14052,8 +14052,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ tw_caoang_prefix:'TW', tw_dingfeng:'TW丁奉', tw_dingfeng_prefix:'TW', - tw_caohong:'TW曹洪', - tw_caohong_prefix:'TW', + tw_caohong:'TW将曹洪', + tw_caohong_prefix:'TW将', tw_maliang:'TW马良', tw_maliang_prefix:'TW', @@ -14156,8 +14156,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ tw_mayunlu_prefix:'TW', twfengpo:'凤魄', twfengpo_info:'①当你使用【杀】或【决斗】指定唯一目标后，你可观看目标角色的手牌并选择一项：⒈摸X张牌。⒉令此牌的伤害值基数+X（X为其手牌中的♦数）。②当你杀死一名角色后，你将〖凤魄①〗中的“♦数”改为“红色牌数”。', - tw_re_caohong:'TW手杀曹洪', - tw_re_caohong_ab:'曹洪', + tw_re_caohong:'TW曹洪', + tw_re_caohong_prefix:'TW', twyuanhu:'援护', twyuanhu_info:'出牌阶段限一次。你可将一张装备牌置入一名角色的装备区内。若此牌为：武器牌，你弃置与其距离为1的另一名角色区域的一张牌；防具牌，其摸一张牌；坐骑牌或宝物牌，其回复1点体力。然后若其体力值或手牌数不大于你，则你摸一张牌，且你可以于本回合的结束阶段发动一次〖援护〗。', twjuezhu:'决助', @@ -14522,6 +14522,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ twyuejian:'约俭', twyuejian_info:'出牌阶段限一次。你可以将X张牌置于牌堆顶或牌堆底（X为你的手牌数减你的手牌上限且至少为1）。若你以此法失去的牌数：不小于3，你的体力上限+1；不小于2，你回复1点体力；不小于1，你的手牌上限+1。', tw_chenzhen:'TW陈震', + tw_chenzhen_prefix:'TW', twmuyue:'睦约', twmuyue_info:'出牌阶段限一次。你可以弃置一张牌并选择一个基本牌或普通锦囊牌的牌名，然后令一名角色从牌堆中获得一张此牌名的牌。若你以此法弃置的牌的牌名与你选择的牌名相同，你下次发动〖睦约〗无需弃牌。', twchayi:'察异', diff --git a/character/xianding.js b/character/xianding.js index dec9654c9..a266fc1b3 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -3688,7 +3688,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ else event.finish(); 'step 2' var card={name:event.list.shift(),isCard:true}; - if(player.canUse(card,target,false)) player.useCard(card,target,false); + if(target.isIn()&&player.canUse(card,target,false)) player.useCard(card,target,false); if(event.list.length) event.redo(); 'step 3' player.removeSkill('dccansi_draw'); @@ -12302,6 +12302,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yuwei:'余威', yuwei_info:'主公技，锁定技，其他群雄角色的回合内，你将〖诗怨〗改为“每回合每项限两次”。', re_xinxianying:'新杀辛宪英', + re_xinxianying_prefix:'新杀', rezhongjian:'忠鉴', rezhongjian2:'忠鉴', rezhongjian_info:'出牌阶段限一次，你可以选择一名本回合内未选择过的角色。你令其获得一项效果直至你的下回合开始：①其下次造成伤害后弃置两张牌，然后你摸一张牌。②其下次受到伤害后摸两张牌，然后你摸一张牌。', @@ -12402,7 +12403,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcjinggong_info:'你可以将一张装备牌当做无距离限制的【杀】使用。当你声明使用此【杀】后，你将此杀的伤害值基数改为X（X为你至此【杀】第一个目标角色的距离且至多为5）。', dcxiaojuan:'骁隽', dcxiaojuan_info:'当你使用牌指定其他角色为唯一目标后，你可以弃置其一半的手牌（向下取整）。若这些牌中有与你使用牌花色相同的牌，则你弃置一张手牌。', - dc_liuyu:'刘虞', + dc_liuyu:'新杀刘虞', + dc_liuyu_prefix:'新杀', dcsuifu:'绥抚', dcsuifu_info:'其他角色的结束阶段开始时，若你和一号位本回合内累计受到过的伤害值大于1，则你可以将该角色的所有手牌置于牌堆顶，然后视为使用一张【五谷丰登】。', dcpijing:'辟境', @@ -12524,7 +12526,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dczhanmeng:'占梦', dczhanmeng_info:'当你使用牌时，你可以选择本回合未选择过的一项：1.上一回合内，若没有同名牌被使用过，你获得一张非伤害牌；2.下一回合内，当同名牌首次被使用后，你获得一张伤害牌；3.令一名其他角色弃置两张牌，若点数之和大于10，你对其造成1点火焰伤害。', dc_wangyun:'新杀王允', - dc_wangyun_ab:'王允', + dc_wangyun_prefix:'新杀', dclianji:'连计', dclianji_info:'出牌阶段限一次。你可以弃置一张手牌并选择一名其他角色，其随机使用牌堆中的一张武器牌，然后其选择一项：1.对另一名其他角色使用一张【杀】，并将武器牌交给其中一个目标；2.令你视为对其使用一张【杀】，并将武器牌交给你。', dcmoucheng:'谋逞', @@ -12659,16 +12661,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcxiaoren:'绡刃', dcxiaoren_info:'每回合限一次，当你造成伤害后，你可以进行判定，若结果为：红色，你可以令一名角色回复1点体力；黑色，你可以对受伤角色的上家或下家造成1点伤害，然后你可以重复此方向的伤害流程直到有角色因此死亡或下个目标角色为你。', dc_daxiaoqiao:'新杀大乔小乔', + dc_daxiaoqiao_prefix:'新杀', dcxingwu:'星舞', dcxingwu_info:'弃牌阶段开始时，你可以将一张手牌置于武将牌上，称为“星舞”。若你的“星舞”牌达到三张，则你可移去三张“星舞”，弃置一名其他角色装备区里的所有牌，然后对其造成X点伤害（X为移去的“星舞”牌的花色数，若为女性角色则改为1点伤害）。', dcluoyan:'落雁', dcluoyan_info:'锁定技，若你有“星舞”牌，你视为拥有技能〖天香〗和〖流离〗。', dc_xiahouba:'新杀夏侯霸', + dc_xiahouba_prefix:'新杀', old_huangfusong:'新杀皇甫嵩', + old_huangfusong_prefix:'新杀', dc_sp_machao:'群马超', + dc_sp_machao_prefix:'群', dc_shixie:'新杀士燮', + dc_shixie_prefix:'新杀', ol_guansuo:'新杀关索', + ol_guansuo_prefix:'新杀', dc_zhaoxiang:'新杀赵襄', + dc_zhaoxiang_prefix:'新杀', dc_xujing:'许靖', dcshangyu:'赏誉', dcshangyu_tag:'赏誉', diff --git a/character/yijiang.js b/character/yijiang.js index aee7c9ff0..adaaaf44e 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -13966,9 +13966,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, translate:{ old_huaxiong:'将华雄', - old_huaxiong_ab:'华雄', + old_huaxiong_prefix:'将', yufan:'虞翻', xushu:'旧徐庶', + xushu_prefix:'旧', caozhi:'曹植', zhangchunhua:'张春华', lingtong:'凌统', @@ -13977,6 +13978,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zhuran:'朱然', yujin:'于禁', masu:'旧马谡', + masu_prefix:'旧', xin_masu:'马谡', xin_fazheng:'法正', wuguotai:'吴国太', @@ -13990,6 +13992,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ caifuren:'蔡夫人', zhonghui:'钟会', old_zhonghui:'旧钟会', + old_zhonghui_prefix:'旧', sunluban:'孙鲁班', chenqun:'陈群', zhangsong:'张松', @@ -14001,6 +14004,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ manchong:'满宠', liufeng:'刘封', liru:'旧李儒', + liru_prefix:'旧', yj_jushou:'沮授', zhuhuan:'朱桓', xiahoushi:'夏侯氏', @@ -14025,14 +14029,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gaoshun:'高顺', xin_liru:'李儒', guohuanghou:'郭皇后', - liuyu:'OL刘虞', + liuyu:'刘虞', sundeng:'孙登', liyan:'李严', sunziliufang:'孙资刘放', huanghao:'黄皓', zhangrang:'张让', cenhun:'岑昏', - xinxianying:'OL辛宪英', + xinxianying:'将辛宪英', + xinxianying_prefix:'将', wuxian:'吴苋', xushi:'徐氏', caojie:'曹节', @@ -14515,6 +14520,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ shiyong:'恃勇', shiyong_info:'锁定技，当你受到一次红色【杀】或【酒】【杀】造成的伤害后，须减1点体力上限', old_guanzhang:'旧关兴张苞', + old_guanzhang_prefix:'旧', wangyi:'王异', oldqianxi:'潜袭', oldqianxi_info:'当你使用【杀】对距离为1的目标角色造成伤害时，你可以进行一次判定，若判定结果不为红桃，你防止此伤害，令其减1点体力上限', diff --git a/character/yingbian.js b/character/yingbian.js index 8f69c72b8..604694ef7 100644 --- a/character/yingbian.js +++ b/character/yingbian.js @@ -3611,7 +3611,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ xijue_xiaoguo:'骁果', xijue_xiaoguo_info:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌，然后你摸一张牌；2.受到你对其造成的1点伤害。', xijue_xiaoguo_info_guozhan:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌；2.受到你对其造成的1点伤害。', - duyu:'OL杜预', + duyu:'晋杜预', + duyu_prefix:'晋', sanchen:'三陈', sanchen_info:'出牌阶段限一次。你可选择一名本回合内未选择过的角色。其摸三张牌，然后弃置三张牌。若其未以此法弃置牌或以此法弃置的牌的类别均不相同，则其摸一张牌且〖三陈〗于此阶段内使用次数上限+1。', sanchen_info_guozhan:'出牌阶段，你可选择一名本回合内未选择过的角色。其摸三张牌，然后弃置三张牌。若其未以此法弃置牌或以此法弃置的牌的类别均不相同，则其摸一张牌且你获得技能〖破竹〗直到回合结束。否则你本阶段内不能再发动〖三陈〗。', @@ -3719,6 +3720,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yifa2:'仪法', yifa_info:'锁定技，其他角色使用【杀】或黑色普通锦囊牌指定你为目标后，其手牌上限-1直到其回合结束。', ol_huaxin:'OL华歆', + ol_huaxin_prefix:'OL', caozhao:'草诏', caozhao_backup:'草诏', caozhao_info:'出牌阶段限一次，你可展示一张手牌并声明一种未以此法声明过的基本牌或普通锦囊牌，令一名体力不大于你的其他角色选择一项：令此牌视为你声明的牌，或其失去1点体力。然后若此牌声明成功，然后你可将其交给一名其他角色。', @@ -3751,7 +3753,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ qimei_info:'准备阶段，你可以选择一名其他角色。你获得如下效果直到下回合开始：①每回合限一次，当你或其获得牌/失去手牌后，若你与其手牌数相等，则另一名角色摸一张牌。②每回合限一次，当你或其的体力值变化后，若你与其体力值相等，则另一名角色摸一张牌。', ybzhuiji:'追姬', ybzhuiji_info:'出牌阶段开始时，你可选择一项：①摸两张牌，并于出牌阶段结束时失去1点体力；②回复1点体力，并于出牌阶段结束时弃置两张牌。', - jin_yanghu:'OL羊祜', + jin_yanghu:'晋羊祜', + jin_yanghu_prefix:'晋', huaiyuan:'怀远', huaiyuanx:'绥', huaiyuan_info:'①游戏开始时，你将你的手牌标记为“绥”。②当你失去一张“绥”后，你令一名角色执行一项：⒈其的手牌上限+1。⒉其的攻击范围+1。⒊其摸一张牌。③当你死亡时，你可令一名其他角色的手牌上限+X，且攻击范围+Y（X和Y为你自己被执行过〖怀远②〗的选项一和选项二的次数）。', @@ -3778,6 +3781,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ wangxiang:'王祥', bingxin:'冰心', bingxin_info:'每种牌名每回合限一次。当你需要使用基本牌时，若你的手牌数等于体力值且这些牌的颜色均相同，则你可以摸一张牌，视为使用一张基本牌。', + ol_lisu:'OL李肃', + ol_lisu_prefix:'OL', + qiaoyan:'巧言', + qiaoyan_info:'锁定技，当你于回合外受到其他角色造成的伤害时，若你：有“珠”，则你令伤害来源获得“珠”；没有“珠”，则你防止此伤害，然后摸一张牌，并将一张牌正面朝上置于武将牌上，称为“珠”。', + xianzhu:'献珠', + xianzhu_info:'锁定技，出牌阶段开始时，你令一名角色A获得“珠”。若A不为你自己，则你选择A攻击范围内的一名角色B，视为A对B使用一张【杀】。', yingbian_pack1:'文德武备·理', yingbian_pack2:'文德武备·备', diff --git a/font/motoyamaru.woff2 b/font/motoyamaru.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..3aa05392e83ba3bfff1d54a4524f24843d078b0c GIT binary patch literal 27512 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 delta 4657 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 nk^!>tUtaI407QeAj{ + return `旧`; + }, + }], + ['★SP',{ + showName:'★', + }], ['手杀',{ getSpan:(prefix,name)=>{ if(lib.characterPack.shiji&&name in lib.characterPack.shiji){ @@ -33719,17 +33736,37 @@ }], ['TW',{ getSpan:(prefix,name)=>{ - return `TW`; + return `TW`; + }, + }], + ['TW神',{ + getSpan:(prefix,name)=>{ + return get.prefixSpan('TW')+get.prefixSpan('神') + }, + }], + ['TW将',{ + getSpan:(prefix,name)=>{ + return get.prefixSpan('TW')+get.prefixSpan('将') + }, + }], + ['OL神',{ + getSpan:(prefix,name)=>{ + return get.prefixSpan('OL')+get.prefixSpan('神') + }, + }], + ['旧神',{ + getSpan:(prefix,name)=>{ + return get.prefixSpan('旧')+get.prefixSpan('神') }, }], ['SP',{ getSpan:(prefix,name)=>{ - return `SP`; + return `SP`; }, }], ['OL',{ getSpan:(prefix,name)=>{ - return `OL`; + return `OL`; }, }], ['界SP',{ @@ -54436,7 +54473,7 @@ if(lib.config.show_characternamepinyin=='showPinyin2'||lib.config.show_skillnamepinyin=='showPinyin2'||lib.config.show_characternamepinyin=='showCodeIdentifier2'||lib.config.show_skillnamepinyin=='showCodeIdentifier2'){ var intro=ui.create.div('.characterintro',get.characterIntro(name),uiintro); if(lib.config.show_characternamepinyin=='showPinyin2'||lib.config.show_characternamepinyin=='showCodeIdentifier2'){ - var charactername=get.rawName(name); + var charactername=get.rawName2(name); var characterpinyin=lib.config.show_characternamepinyin=='showCodeIdentifier2'?name:get.pinyin(charactername); var nameinfo=get.character(name); var charactersex=get.translation(nameinfo[0]); @@ -54529,7 +54566,7 @@ if(showCharacterNamePinyin!='doNotShow'){ const characterIntroTable=ui.create.div('.character-intro-table',introduction),span=document.createElement('span'); span.style.fontWeight='bold'; - const nameInfo=get.character(name),exInfo=nameInfo[4],characterName=exInfo&&exInfo.includes('ruby')?lib.translate[name]:get.rawName(name); + const nameInfo=get.character(name),exInfo=nameInfo[4],characterName=exInfo&&exInfo.includes('ruby')?lib.translate[name]:get.rawName2(name); span.innerHTML=characterName; const ruby=document.createElement('ruby'); ruby.appendChild(span); @@ -57399,41 +57436,20 @@ return num.toString(); }, rawName:function(str){ - var str2=lib.translate[str]; - if(lib.translate[str+'_ab']) return lib.translate[str+'_ab']; + let str2=lib.translate[str]; + if(lib.translate[str+'_ab']) str2=lib.translate[str+'_ab']; if(!str2) return ''; - if(lib.translate[str+'_prefix']){ + if(lib.translate[str+'_prefix']&&str2.startsWith(lib.translate[str+'_prefix'])){ return str2.slice(lib.translate[str+'_prefix'].length); } - if(str2.indexOf('JSP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('☆SP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('新杀')==0){ - str2=str2.slice(2); - } - else if(str2.indexOf('旧')==0&&(lib.characterPack.old||lib.characterPack.mobile)&&(lib.characterPack.old[str]||lib.characterPack.mobile[str])){ - str2=str2.slice(1); - } - else if(str2.indexOf('新')==0&&(str.indexOf('re_')==0||str.indexOf('new_')==0)){ - str2=str2.slice(1); - } return str2; }, + //作用修改：只读前缀 不读_ab rawName2:function(str){ - if(lib.translate[str+'_ab']) return lib.translate[str+'_ab']; - var str2=lib.translate[str]; + let str2=lib.translate[str]; if(!str2) return ''; - if(str2.indexOf('JSP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('☆SP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('新杀')==0){ - str2=str2.slice(2); + if(lib.translate[str+'_prefix']&&str2.startsWith(lib.translate[str+'_prefix'])){ + return str2.slice(lib.translate[str+'_prefix'].length); } return str2; }, @@ -57441,28 +57457,10 @@ var str2=lib.translate[str]; if(lib.translate[str+'_ab']) str2=lib.translate[str+'_ab']; if(!str2) return ''; - if(lib.translate[str+'_prefix']){ + if(lib.translate[str+'_prefix']&&str2.startsWith(lib.translate[str+'_prefix'])){ return `${get.prefixSpan(lib.translate[str+'_prefix'],str)}${str2.slice(lib.translate[str+'_prefix'].length)}`; } - if(str2.indexOf('TW')==0){ - str2=str2.slice(2); - } - else if(str2.indexOf('OL')==0){ - str2=str2.slice(2); - } - else if(str2.indexOf('JSP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('☆SP')==0){ - str2=str2.slice(3); - } - else if(str2.indexOf('手杀')==0){ - str2=str2.slice(2); - } - else if(str2.indexOf('新杀')==0){ - str2=str2.slice(2); - } - return get.verticalStr(str2,true); + return str2; }, prefixSpan:function(prefix,name){ let color='#ffffff',nature=false; @@ -59552,7 +59550,7 @@ else if(node.classList.contains('equips')&&ui.arena.classList.contains('selecting')){ (function(){ uiintro.add('选择装备'); - uiintro.addSmall(Array.from(node.childNodes),true); + uiintro.addSmall(Array.from(node.childNodes).filter(node=>!node.classList.contains('feichu')),true); uiintro.clickintro=true; ui.control.hide(); uiintro._onclose=function(){