Merge pull request #2695 from AstralBarrage/PRBranch

Author: rintim

character/clan/skill.js

@@ -393,7 +393,7 @@ const skills = {
 				if (get.type(card, player) != "equip") {
 					return false;
 				}
-				return lib.filter.cardDiscardable(card, player, "clanjuewei") || lib.filter.cardRecastable(card, player, "clanjuewei");
+				return lib.filter.cardDiscardable(card, player, "clanjuewei") || lib.filter.cardRecastable(card, player);
 			});
 		},
 		usable: 1,
@@ -412,12 +412,13 @@ const skills = {
 					],
 				])
 				.set("filterButton", button => {
-					const player = get.player();
+					const player = get.player(),
+						source = button.link == "Recast" ? null : "clanjuewei";
 					return player.countCards("he", card => {
 						if (get.type(card, player) != "equip") {
 							return false;
 						}
-						return lib.filter[`card${button.link}able`](card, player, "clanjuewei");
+						return lib.filter[`card${button.link}able`](card, player, source);
 					});
 				})
 				.set("ai", button => {
@@ -452,8 +453,9 @@ const skills = {
 					"绝围",
 					link == "Recast" ? prompt1 : prompt2,
 					card => {
-						const { player, actType: type } = get.event();
-						return get.type(card, player) == "equip" && lib.filter[type](card, player, "clanjuewei");
+						const { player, actType: type } = get.event(),
+							source = type == "Recast" ? null : "clanjuewei";
+						return get.type(card, player) == "equip" && lib.filter[type](card, player, source);
 					},
 					"he"
 				)

character/mobile/dynamicTranslate.js

@@ -3,7 +3,7 @@ import { lib, game, ui, get, ai, _status } from "../../noname.js";
 const dynamicTranslates = {
 	potkuanggu(player) {
         if (player.getStorage("potkuanggu", 0)) {
-			return lib.translate["potkuanggu_rewrite_info"];
+			return lib.translate["potkuanggu_pot_weiyan_achieve_info"];
 		}
 		return lib.translate["potkuanggu_info"];
     },

character/offline/character.js

@@ -531,6 +531,7 @@ const characters = {
 		hp: 3,
 		skills: ["xkbimeng", "xkzhue", "xkfuzhu"],
 		doubleGroup: ["shu", "qun"],
+		names: "徐|庶",
 	},
 	xk_pengqi: {
 		sex: "female",

character/rank.js

@@ -387,6 +387,7 @@ window.noname_character_rank = {
 		"ps_caopi",
 		"ps2063_zhaoyun",
 		"shen_jiaxu",
+		"renwan",
 	],
 	am: [
 		"dc_zhaoxiang",
@@ -1811,8 +1812,8 @@ window.noname_character_rank = {
 		"old_majun",
 	],
 	bm: [
-		"std_zhangmeiren",
-		"std_wangmeiren",
+		"std_zhangyao",
+		"std_wangfuren",
 		"std_panglin",
 		"std_huangchong",
 		"std_caoxiong",
@@ -2728,6 +2729,7 @@ window.noname_character_rank = {
 			"diy_zhangfei",
 			"sxrm_caocao",
 			"wn_shen_machao",
+			"renwan",
 		],
 		epic: [
 			"pe_jun_liubei",
@@ -3244,8 +3246,8 @@ window.noname_character_rank = {
 			"sxrm_liubei",
 		],
 		rare: [
-			"std_zhangmeiren",
-			"std_wangmeiren",
+			"std_zhangyao",
+			"std_wangfuren",
 			"std_panglin",
 			"std_huangchong",
 			"std_caoxiong",

character/replace.js

@@ -286,7 +286,7 @@ window.noname_character_replace = {
 	xunyu: ["xunyu", "ol_xunyu", "dc_sb_xunyu", "star_xunyu", "re_xunyu", "sb_xunyu", "sxrm_xunyu"],
 	xushao: ["xushao", "jsrg_xushao"],
 	xusheng: ["xusheng", "xin_xusheng", "re_xusheng", "old_xusheng", "drag_xusheng"],
-	xushu: ["xin_xushu", "re_xushu", "dc_xushu", "friend_xushu", "xia_xushu", "std_xushu", "xushu"],
+	xushu: ["xin_xushu", "re_xushu", "dc_xushu", "friend_xushu", "xia_xushu", "std_xushu", "xushu", "xk_shanfu"],
 	xuyou: ["xuyou", "sp_xuyou", "jsrg_xuyou", "yj_xuyou", "junk_xuyou"],
 	xuzhu: ["xuzhu", "re_xuzhu"],
 	yangbiao: ["dc_yangbiao", "yangbiao", "jsrg_yangbiao", "clan_yangbiao", "std_yangbiao"],
@@ -417,4 +417,5 @@ window.noname_character_replace = {
 	zerong: ["zerong", "std_zerong"],
 	tw_zhugejun: ["tw_zhugejun", "dc_zhugejun"],
 	wufu: ["wufu", "hr_wufu"],
+	zhangyao: ["zhangyao", "std_zhangyao"],
 };

character/sixiang/character.js

@@ -1,12 +1,12 @@
 const characters = {
-	std_zhangmeiren: {
+	std_zhangyao: {
 		sex: "female",
 		group: "wu",
 		hp: 3,
 		skills: ["stdlianrong", "stdyuanzhuo"],
-		names: "张|null",
+		names: "张|媱",
 	},
-	std_wangmeiren: {
+	std_wangfuren: {
 		sex: "female",
 		group: "wu",
 		hp: 3,
@@ -39,7 +39,7 @@ const characters = {
 		names: "毛|null",
 	},
 	std_zhengcong: {
-		sex: "male",
+		sex: "female",
 		group: "qun",
 		hp: 4,
 		skills: ["stdqiyue", "stdjieji"],

character/sixiang/intro.js

@@ -1,6 +1,13 @@
 const characterIntro = {
 	guanxing: "关兴，名将关羽之子，继承了父亲汉寿亭侯的爵位。年少时即受诸葛亮器重，在蜀汉担任侍中、中监军之职，后在夷陵之战中报了杀父之仇。",
 	std_zhangbao: "张苞，张飞的长子，使用父亲的家传蛇矛为兵器，勇猛剽悍不弱其父。",
+	wangfuren: "敬怀皇后王氏，生卒年不详。荆州南阳（河南省南阳市）人。吴大帝孙权妃嫔。吴景帝孙休生母。又称南阳王夫人、小王夫人。王夫人在儿子即位前就已亡故，永安元年（258年），王夫人之子孙休继位，是为吴景帝。永安五年（262年），孙休追尊母王氏为敬怀皇后，将之改葬敬陵。",
+	panglin: "庞林，荆州襄阳（今湖北襄樊）人，三国时期蜀汉刘备重要谋士庞统的弟弟，起初为蜀汉官员，后来随黄权投降曹魏，成为魏国官员。《三国志》中对庞林的记载很少，只记在《庞统传》末。",
+	caoxiong: "曹熊（生卒年不详），字子威，沛国谯县（今安徽省亳州市）人。三国时期曹魏宗室，魏武帝曹操之子，魏文帝曹丕、曹彰、曹植同母弟，母为武宣皇后卞氏。体弱多病，英年早逝。曹魏建立后，追赠东平公。魏明帝太和三年，追封萧王，谥号为怀。",
+	huangchong: "黄崇（？～263年），巴西阆中（今四川省阆中市）人，三国时期蜀汉官员，黄权之子。官至尚书郎。景耀六年（263年），跟随诸葛瞻抗击邓艾。大军到达涪县，诸葛瞻止步不前，黄崇多次劝他应快速向前行军，占领险要地势，不让敌军进入平原，诸葛瞻犹豫不决，没有采纳黄崇的意见，邓艾得以长驱直入。诸葛瞻退守绵竹后，黄崇激励部下将士并决心战斗到死。后来，黄崇死于邓艾的乱军之中。",
+	maohuanghou: "明悼毛皇后（？～237年9月22日 [1]），河内郡人，魏明帝曹叡第一任皇后。黄初年间，毛氏选入平原王府，很受曹叡宠爱，进出常同乘一副辇同车。黄初七年（226年），曹叡即位，封毛氏为贵嫔。太和元年（227年），立为皇后。曹叡后来又宠幸郭夫人（明元郭皇后），对毛皇后日益淡漠。景初元年（237年），曹叡将毛皇后赐死，谥号“悼皇后”，葬于愍陵。",
+	zhengcong: "《三国志·周宣传》记载：“后东平刘桢梦蛇生四足，穴居门中，使宣占之，宣曰：‘此为国梦，非君家之事也。当杀女子而作贼者。’顷之，女贼郑、姜遂惧夷讨，以蛇女子之祥，足非蛇之所宜故也。”。",
+	jiangjie: "《三国志·周宣传》记载：“后东平刘桢梦蛇生四足，穴居门中，使宣占之，宣曰：‘此为国梦，非君家之事也。当杀女子而作贼者。’顷之，女贼郑、姜遂惧夷讨，以蛇女子之祥，足非蛇之所宜故也。”。",
 };
 
 export default characterIntro;

character/sixiang/sort.js

@@ -4,7 +4,7 @@ const characterSort = {
 	sixiang_shaoyang: ["std_zhangbao", "std_liuchen", "std_guansuo", "std_xiahouba", "std_caorui", "std_liuye", "std_guohuanghou", "std_lvfan", "std_dingfeng", "std_sunluban", "std_liuzan", "std_sunyi", "std_taoqian", "std_jiling", "std_liru", "std_wangyun"],
 	sixiang_taiyang: ["std_tianfeng", "std_liuxie", "std_simazhao", "std_guozhao", "std_jiakui", "std_yufan", "std_zhugeke", "std_mengda", "std_caozhen", "std_dongyun", "std_baosanniang", "std_liuba", "std_kongrong", "std_zoushi", "std_sunluyu", "std_zhoufang"],
 	sixiang_qinglong: ["std_baoxin", "std_peixiu", "std_yangbiao", "std_huangfusong", "std_zerong", "std_pangdegong", "std_nanhualaoxian"],
-	sixiang_zhencang: ["std_zhangmeiren", "std_wangmeiren", "std_panglin", "std_huangchong", "std_caoxiong", "std_maohuanghou", "std_zhencong", "std_jiangjie"],
+	sixiang_zhencang: ["std_zhangyao", "std_wangfuren", "std_panglin", "std_huangchong", "std_caoxiong", "std_maohuanghou", "std_zhencong", "std_jiangjie", "std_zhengcong"],
 	sixiang_trashBin: ["old_shen_zhaoyun"],
 };
 

character/sixiang/translate.js

@@ -390,16 +390,16 @@ const translates = {
 	stdtianshu: "天书",
 	stdtianshu_info: "锁定技，你的手牌上限+X（X为当前势力数-1）。",
 
-	std_zhangmeiren: "标张美人",
-	std_wangmeiren: "标王美人",
+	std_zhangyao: "标张美人",
+	std_wangfuren: "标王夫人",
 	std_panglin: "标庞林",
 	std_huangchong: "标黄崇",
 	std_caoxiong: "标曹熊",
 	std_maohuanghou: "标毛皇后",
 	std_zhengcong: "标郑聪",
 	std_jiangjie: "标姜婕",
-	std_zhangmeiren_prefix: "标",
-	std_wangmeiren_prefix: "标",
+	std_zhangyao_prefix: "标",
+	std_wangfuren_prefix: "标",
 	std_panglin_prefix: "标",
 	std_huangchong_prefix: "标",
 	std_caoxiong_prefix: "标",

character/sp/skill.js

@@ -5337,12 +5337,17 @@ const skills = {
 				},
 				async content(event, trigger, player) {
 					await player.draw(2);
-					let card = get
+					let cards = get
 						.discarded()
-						.filter(c => get.type(c) === "trick")
-						.randomGet();
-					if (card) {
-						await player.gain(card, "gain2");
+						.filter(c => get.type(c) === "trick");
+					if (cards?.length) {
+						const result = await player
+							.chooseButton(["累卵：获得一张普通锦囊牌", cards], true)
+							.set("ai", button => get.buttonValue(button))
+							.forResult();
+						if (result?.bool && result?.links?.length) {
+							await player.gain(result.links, "gain2");
+						}
 					}
 					player.tempBanSkill("leiluan", { player: "damageEnd" });
 				},