Merge pull request #1448 from xizifu/PR-Branch

屈原素材补充；陆郁生、蔡瑁、OL刘焉分包调整

character/collab/voices.js

@@ -1,4 +1,9 @@
 export default {
+	"#dcqiusuo1": "驾八龙之婉婉兮，载云旗之委蛇。。",
+	"#dcqiusuo2": "路漫漫其修远兮，吾将上下而求索。",
+	"#dclisao1": "朝饮木兰之坠露兮，夕餐秋菊之落英。",
+	"#dclisao2": "惟草木之零落兮，恐美人之迟暮。",
+	"#quyuan:die": "伏清白以死直兮，固前圣之所厚。",
 	"#dcjuejing1": "龙翔九天，曳日月于天地，换旧符于新岁。",
 	"#dcjuejing2": "御风万里，辟邪祟于宇外，映祥瑞于神州。",
 	"#dclonghun1": "龙诞新岁，普天同庆，魂佑宇内，裔泽炎黄。",

character/diy/character.js

@@ -101,6 +101,7 @@ const characters = {
 	junk_xuyou: ["male", "qun", 3, ["nzry_chenglve", "junkshicai", "nzry_cunmu"]],
 	junk_zhangjiao: ["male", "shen", 3, ["yizhao", "junksijun", "tianjie"], ["qun", "die:shen_zhangjiao"]],
 	junk_guanyu: ["male", "shu", 4, ["olsbfumeng", "olsbguidao"]],
+	junk_liuyan: ["male", "qun", "4/6", ["olpianan", "olyinji", "olkuisi"]],
 };
 
 export default characters;

character/diy/sort.js

@@ -7,7 +7,7 @@ const characterSort = {
 	diy_xushi: ["diy_feishi", "diy_hanlong", "diy_liufu", "diy_liuyan", "diy_liuzan", "diy_tianyu", "diy_xizhenxihong", "diy_yangyi", "diy_zaozhirenjun"],
 	diy_default: ["diy_yuji", "diy_caiwenji", "diy_lukang", "diy_zhenji", "old_majun"],
 	diy_noname: ["noname"],
-	diy_trashbin: ["junk_guanyu", "junk_zhangjiao", "old_jiakui", "ol_guohuai", "junk_zhangrang", "old_bulianshi", "ol_maliang", "junk_liubei", "junk_huangyueying", "junk_lidian", "junk_duanwei", "junk_xuyou"],
+	diy_trashbin: ["junk_guanyu", "junk_zhangjiao", "old_jiakui", "ol_guohuai", "junk_zhangrang", "old_bulianshi", "ol_maliang", "junk_liubei", "junk_huangyueying", "junk_lidian", "junk_duanwei", "junk_xuyou", "junk_liuyan"],
 };
 
 const characterSortTranslate = {

character/diy/translate.js

@@ -468,6 +468,8 @@ const translates = {
 	junksijun_info: "准备阶段，若“黄”数大于牌堆的牌数，你可以移去所有“黄”，然后从牌堆中随机获得任意张点数之和为36的牌（若牌堆没有点数和为36的组合则获得牌堆顶点数和刚好超过36的牌组）。",
 	junk_guanyu: "旧谋关羽",
 	junk_guanyu_prefix: "旧谋",
+	junk_liuyan: "OL刘焉",
+	junk_liuyan_prefix: "OL",
 };
 
 export default translates;

character/rank.js

@@ -1104,7 +1104,7 @@ window.noname_character_rank = {
 		"xin_zhangliang",
 		"liwei",
 		"xin_wuban",
-		"ol_liuyan",
+		"junk_liuyan",
 		"sunhuan",
 		"yue_caiyong",
 		"sb_huangyueying",

character/sp/character.js

@@ -31,7 +31,6 @@ const characters = {
 	haopu: ["male", "shu", 4, ["olzhenying"]],
 	ol_mengda: ["male", "shu", 4, ["olgoude"]],
 	ol_wanglang: ["male", "wei", 3, ["gushe", "oljici"]],
-	ol_liuyan: ["male", "qun", "4/6", ["olpianan", "olyinji", "olkuisi"]],
 	lushi: ["female", "qun", 3, ["olzhuyan", "releijie"]],
 	zhangshiping: ["male", "shu", 3, ["olhongji", "olxinggu"]],
 	sunhong: ["male", "wu", 3, ["olxianbi", "olzenrun"]],

character/sp/sort.js

@@ -1,10 +1,10 @@
 const characterSort = {
-	sp_tianji: ["sunhao", "liuxie", "caoang", "hetaihou", "sunluyu", "ol_wangrong", "zuofen", "ol_bianfuren", "qinghegongzhu", "tengfanglan", "ruiji", "caoxiancaohua", "caoyu"],
+	sp_tianji: ["sunhao", "liuxie", "caoang", "hetaihou", "sunluyu", "ol_wangrong", "zuofen", "ol_bianfuren", "qinghegongzhu", "tengfanglan", "ruiji", "caoxiancaohua", "caoyu", "ol_luyusheng"],
 	sp_sibi: ["ol_lukai", "yangxiu", "guotu", "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", "tianchou"],
 	sp_tianzhu: ["ol_liupi", "yadan", "liyi", "zhangyan", "niujin", "hejin", "hansui", "wutugu", "yanbaihu", "shamoke", "zhugedan", "huangzu", "gaogan", "tadun", "fanjiangzhangda", "ahuinan", "dongtuna", "ol_wenqin"],
 	sp_nvshi: ["ol_dingshangwan", "lingju", "guanyinping", "zhangxingcai", "mayunlu", "dongbai", "zhaoxiang", "ol_zhangchangpu", "daxiaoqiao", "jin_guohuai", "ol_hujinding"],
 	sp_shaowei: ["ol_pengyang", "simahui", "zhangbao", "zhanglu", "zhugeguo", "xujing", "zhangling", "huangchengyan", "zhangzhi", "lushi"],
-	sp_huben: ["duanjiong", "liupan", "ol_mengda", "caohong", "xiahouba", "zhugeke", "zumao", "wenpin", "litong", "mazhong", "heqi", "quyi", "luzhi", "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_huben: ["duanjiong", "liupan", "ol_mengda", "caohong", "xiahouba", "zhugeke", "zumao", "wenpin", "litong", "mazhong", "heqi", "quyi", "luzhi", "yuejin", "dingfeng", "wuyan", "ol_zhuling", "tianyu", "huojun", "zhaoyǎn", "dengzhong", "ol_furong", "macheng", "ol_zhangyì", "ol_zhujun", "maxiumatie", "luoxian", "ol_huban", "haopu", "ol_qianzhao", "caimao"],
 	sp_liesi: ["lvboshe", "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_sunce"],
 	sp_qifu: ["ol_feiyi", "caoying", "panshu", "caochun", "yuantanyuanshang", "caoshuang", "wolongfengchu", "guansuo", "baosanniang", "fengfangnv", "jin_zhouchu"],
@@ -12,7 +12,7 @@ const characterSort = {
 	sp_zhongdan: ["cuiyan", "huangfusong"],
 	sp_guozhan2: ["sp_dongzhuo", "zhangren"],
 	sp_others: ["hanba", "caiyang"],
-	sp_waitforsort: ["ol_luyusheng", "ol_tw_zhangji", "ol_liwan", "ol_liuyan", "ol_peixiu", "caimao", "ol_jiangwan"],
+	sp_waitforsort: ["ol_tw_zhangji", "ol_liwan", "ol_peixiu", "ol_jiangwan"],
 };
 
 const characterSortTranslate = {

character/sp/translate.js

@@ -1083,8 +1083,6 @@ const translates = {
 	olleijie_info: "准备阶段，你可以令一名角色判定，若结果为♠2~9，其受到2点雷电伤害，否则其摸两张牌。",
 	releijie: "雷劫",
 	releijie_info: "出牌阶段限一次，你可以令一名角色判定，若结果为黑桃2~9，则你视为依次对其使用两张雷【杀】，否则其摸两张牌。",
-	ol_liuyan: "OL刘焉",
-	ol_liuyan_prefix: "OL",
 	olpianan: "偏安",
 	olpianan_info: "锁定技。游戏开始或弃牌阶段结束时，你弃置所有不为【闪】的手牌（没有则不弃）。若你的手牌数小于体力值，你获得牌堆或弃牌堆中的前X张【闪】（X为你的体力值与手牌数的差）。",
 	olyinji: "殷积",

character/xinghuoliaoyuan/characterReplace.js

@@ -3,7 +3,7 @@ const characterReplaces = {
 	sp_taishici: ["sp_taishici", "re_sp_taishici"],
 	mazhong: ["mazhong", "re_mazhong"],
 	wenpin: ["wenpin", "re_wenpin"],
-	liuyan: ["liuyan", "jsrg_liuyan", "ol_liuyan"],
+	liuyan: ["liuyan", "jsrg_liuyan", "junk_liuyan"],
 };
 
 export default characterReplaces;