Merge branch 'PR-Branch' of https://github.com/xizifu/noname into PR-Branch

character/extra/skill.js

@@ -1438,7 +1438,7 @@ const skills = {
 				var info = lib.character[name];
 				if (
 					info[3].some(function (skill) {
-						var info = get.skillInfoTranslation(skill);
+						var info = get.plainText(get.skillInfoTranslation(skill));
 						if (!info.includes("【杀】")) return false;
 						var list = get.skillCategoriesOf(skill, player);
 						list.remove("锁定技");
@@ -1470,7 +1470,7 @@ const skills = {
 						var name = button.link;
 						var info = lib.character[name];
 						var skills = info[3].filter(function (skill) {
-							var info = get.skillInfoTranslation(skill);
+							var info = get.plainText(get.skillInfoTranslation(skill));
 							if (!info.includes("【杀】")) return false;
 							var list = get.skillCategoriesOf(skill, get.player());
 							list.remove("锁定技");
@@ -1509,7 +1509,7 @@ const skills = {
 			node = ui.create.buttonPresets.character(item, "character", position, noclick);
 			const info = lib.character[item];
 			const skills = info[3].filter(function (skill) {
-				var info = get.skillInfoTranslation(skill);
+				var info = get.plainText(get.skillInfoTranslation(skill));
 				if (!info.includes("【杀】")) return false;
 				var list = get.skillCategoriesOf(skill, get.player());
 				list.remove("锁定技");
@@ -1588,7 +1588,7 @@ const skills = {
 				var maxHp = get.infoMaxHp(info[2]);
 				if (maxHp != 1) card.distance = { attackFrom: 1 - maxHp };
 				var skills = info[3].filter(function (skill) {
-					var info = get.skillInfoTranslation(skill);
+					var info = get.plainText(get.skillInfoTranslation(skill));
 					if (!info.includes("【杀】")) return false;
 					var list = get.skillCategoriesOf(skill, get.player());
 					list.remove("锁定技");
@@ -1617,10 +1617,10 @@ const skills = {
 				if (skills.length) {
 					for (var skill of skills) {
 						if (lib.skill[skill].nobracket) {
-							append += '<div class="skilln">' + get.translation(skill) + '</div><div><span style="font-family: yuanli">' + get.skillInfoTranslation(skill) + "</span></div><br><br>";
+							append += '<div class="skilln">' + get.translation(skill) + '</div><div><span style="font-family: yuanli">' + get.plainText(get.skillInfoTranslation(skill)) + "</span></div><br><br>";
 						} else {
 							var translation = lib.translate[skill + "_ab"] || get.translation(skill).slice(0, 2);
-							append += '<div class="skill">【' + translation + '】</div><div><span style="font-family: yuanli">' + get.skillInfoTranslation(skill) + "</span></div><br><br>";
+							append += '<div class="skill">【' + translation + '】</div><div><span style="font-family: yuanli">' + get.plainText(get.skillInfoTranslation(skill)) + "</span></div><br><br>";
 						}
 					}
 					str = str.slice(0, str.length - 8);

character/refresh/skill.js

@@ -12253,6 +12253,7 @@ const skills = {
 	},
 	new_retuxi: {
 		audio: "retuxi",
+		audioname2: { gz_jun_caocao: "jianan_tuxi" },
 		trigger: {
 			player: "phaseDrawBegin2",
 		},

character/shenhua/skill.js

@@ -3449,6 +3449,7 @@ const skills = {
 	},
 	qiaobian: {
 		audio: 2,
+		audioname2: { gz_jun_caocao: "jianan_qiaobian" },
 		trigger: {
 			player: ["phaseJudgeBefore", "phaseDrawBefore", "phaseUseBefore", "phaseDiscardBefore"],
 		},

character/shiji/skill.js

@@ -943,6 +943,7 @@ const skills = {
 		audio: 2,
 		enable: "phaseUse",
 		usable: 1,
+		changeSeat: true,
 		limited: true,
 		skillAnimation: true,
 		animationColor: "orange",

character/yingbian/skill.js

@@ -1750,7 +1750,7 @@ const skills = {
 					var skill = lib.skill[j];
 					if (!skill || skill.juexingji || skill.hiddenSkill || skill.zhuSkill || skill.dutySkill || skill.chargeSkill || lib.skill.bolan.banned.includes(j)) continue;
 					if (skill.init || (skill.ai && (skill.ai.combo || skill.ai.notemp || skill.ai.neg))) continue;
-					var info = lib.translate[j + "_info"];
+					var info = get.plainText(lib.translate[j + "_info"]);
 					if (info && info.indexOf("出牌阶段限一次") != -1) skills.add(j);
 				}
 			}

mode/boss.js

@@ -7171,10 +7171,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 						return player.countCards("h") == 0;
 					},
 					x6: function (player, event) {
-						return event.hasNature("fire");
+						if(event.hasNature) return event.hasNature("fire");
 					},
 					x5: function (player, event) {
-						return event.hasNature("thunder");
+						if(event.hasNature) return event.hasNature("thunder");
 					},
 					x4: function (player, event) {
 						return event.name == "loseHp";

mode/guozhan.js

@@ -826,9 +826,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				gz_sp_dongzhuo: ["male", "qun", 4, ["hengzheng", "fakebaoling"]],
 				gz_zhangren: ["male", "qun", 4, ["chuanxin", "fengshi"]],
 
-				gz_jun_liubei: ["male", "shu", 4, ["zhangwu", "jizhao", "shouyue", "wuhujiangdaqi"]],
-				gz_jun_zhangjiao: ["male", "qun", 4, ["wuxin", "hongfa", "wendao", "huangjintianbingfu"]],
-				gz_jun_sunquan: ["male", "wu", 4, ["jiahe", "lianzi", "jubao", "yuanjiangfenghuotu"]],
+				gz_jun_liubei: ["male", "shu", 4, ["zhangwu", "jizhao", "shouyue"]],
+				gz_jun_zhangjiao: ["male", "qun", 4, ["wuxin", "hongfa", "wendao"]],
+				gz_jun_sunquan: ["male", "wu", 4, ["jiahe", "lianzi", "jubao"]],
 
 				gz_liqueguosi: ["male", "qun", 4, ["gzxiongsuan"]],
 				gz_zuoci: ["male", "qun", 3, ["fakeyigui", "fakejihun"], ["gzskin"]],
@@ -864,7 +864,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				gz_lukang: ["male", "wu", 4, ["fakejueyan", "fakekeshou"], ["gzskin"]],
 				gz_yuanshu: ["male", "qun", 4, ["gzweidi", "gzyongsi"], ["gzskin"]],
 				gz_zhangxiu: ["male", "qun", 4, ["gzfudi", "gzcongjian"], ["gzskin"]],
-				gz_jun_caocao: ["male", "wei", 4, ["jianan", "huibian", "gzzongyu", "wuziliangjiangdao"], []],
+				gz_jun_caocao: ["male", "wei", 4, ["jianan", "huibian", "gzzongyu"], []],
 
 				gz_jin_zhangchunhua: ["female", "jin", 3, ["gzhuishi", "fakeqingleng"]],
 				gz_jin_simayi: ["male", "jin", 3, ["fakequanbian", "smyyingshi", "fakezhouting"]],
@@ -925,6 +925,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			//官盗2023
 			fakexiaoguo: {
 				audio: "xiaoguo",
+				audioname2: { gz_jun_caocao: "jianan_xiaoguo" },
 				trigger: { global: "phaseZhunbeiBegin" },
 				filter(event, player) {
 					return (
@@ -15639,19 +15640,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			jianan: {
-				audio: 2,
+				audio: true,
 				unique: true,
 				forceunique: true,
-				group: "wuziliangjiangdao",
-				derivation: "wuziliangjiangdao",
+				derivation: ["wuziliangjiangdao", "new_retuxi", "qiaobian", "fakexiaoguo", "gzjieyue", "new_duanliang"],
 				lordSkill: true,
-				global: "g_jianan",
+				global: ["wuziliangjiangdao", "g_jianan"],
+				init(player) {
+					player.markSkill("wuziliangjiangdao");
+				},
 			},
 			g_jianan: {
 				trigger: {
 					player: ["phaseZhunbeiBegin", "phaseBefore", "dieBegin"],
 				},
-				audio: "jianan",
+				audio: "wuziliangjiangdao",
 				forceaudio: true,
 				filter: function (event, player, name) {
 					if (name != "phaseZhunbeiBegin") return get.is.jun(player) && player.identity == "wei";
@@ -15779,6 +15782,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			jianan_eff: {
 				ai: { nomingzhi: true },
 			},
+			jianan_tuxi: { audio: true },
+			jianan_qiaobian: { audio: true },
+			jianan_xiaoguo: { audio: true },
+			jianan_jieyue: { audio: true },
+			jianan_duanliang: { audio: true },
 			huibian: {
 				enable: "phaseUse",
 				audio: 2,
@@ -15823,9 +15831,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			},
 			gzzongyu: {
 				audio: 2,
+				derivation: "liulongcanjia",
 				unique: true,
 				forceunique: true,
-				group: ["gzzongyu_others", "gzzongyu_player"],
+				group: "gzzongyu_others",
+				global: "gzzongyu_player",
 				ai: {
 					threaten: 1.2,
 				},
@@ -15873,9 +15883,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 					},
 					player: {
 						audio: "gzzongyu",
+						forceaudio: true,
 						trigger: { player: "equipAfter" },
 						forced: true,
 						filter: function (event, player) {
+							if (!player.skills.includes("gzzongyu")) return false;
 							if (!["equip3", "equip4"].includes(get.subtype(event.card))) return false;
 							for (var i = 0; i < ui.discardPile.childElementCount; i++) {
 								if (ui.discardPile.childNodes[i].name == "liulongcanjia") return true;
@@ -15913,6 +15925,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			wuziliangjiangdao: {
+				audio: 2,
 				nopop: true,
 				unique: true,
 				forceunique: true,
@@ -16317,6 +16330,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 					},
 				},
 				audio: ["jieyue", 2],
+				audioname2: { gz_jun_caocao: "jianan_jieyue" },
 			},
 
 			jianglue: {
@@ -16857,6 +16871,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 				locked: false,
 				audio: "duanliang1",
+				audioname2: { gz_jun_caocao: "jianan_duanliang" },
 				enable: "chooseToUse",
 				filterCard: function (card) {
 					if (get.type(card) != "basic" && get.type(card) != "equip") return false;
@@ -18828,6 +18843,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				enable: "phaseUse",
 				usable: 1,
 				audio: 2,
+				derivation: "gzzhiheng",
 				filterCard: true,
 				check: function (card) {
 					if (get.type(card) == "equip") return 0;
@@ -18899,6 +18915,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 				trigger: { player: "phaseJieshuBegin" },
 				audio: 2,
+				derivation: "dinglanyemingzhu",
 				forced: true,
 				unique: true,
 				filter: function (event, player) {
@@ -18935,14 +18952,20 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			jiahe: {
+				audio: true,
 				unique: true,
 				forceunique: true,
 				lordSkill: true,
-				locked: false,
-				audio: 2,
-				derivation: "yuanjiangfenghuotu",
 				mark: true,
-				global: ["jiahe_put", "jiahe_skill"],
+				derivation: ["yuanjiangfenghuotu", "jiahe_reyingzi", "jiahe_haoshi", "jiahe_shelie", "jiahe_duoshi"],
+				global: ["yuanjiangfenghuotu", "jiahe_damage", "jiahe_put", "jiahe_skill"],
+				init(player) {
+					player.markSkill("yuanjiangfenghuotu");
+				},
+			},
+			jiahe_damage: {
+				audio: ["yuanjiangfenghuotu3.mp3", "yuanjiangfenghuotu4.mp3"],
+				forceaudio: true,
 				ai: {
 					threaten: 2,
 				},
@@ -18971,7 +18994,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			},
 			jiahe_put: {
 				enable: "phaseUse",
-				audio: 2,
+				audio: ["yuanjiangfenghuotu", 2],
 				forceaudio: true,
 				filter: function (event, player) {
 					var zhu = get.zhu(player, "jiahe");
@@ -19130,9 +19153,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				inherit: "shelie",
 			},
 			jiahe_duoshi: {
-				inherit: "duoshi",
+				inherit: "fakeduoshi",
 			},
 			yuanjiangfenghuotu: {
+				audio: 4,
 				unique: true,
 				forceunique: true,
 				nopop: true,
@@ -19150,7 +19174,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 							dialog.addSmall(content);
 						}
 						dialog.addText(
-							'<ul style="margin-top:5px;padding-left:22px;"><li>每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。<li>根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张以上~英姿；两张以上~好施；三张以上~涉猎；四张以上~度势；五张以上~可额外选择一项。<li>锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。',
+							'<ul style="margin-top:5px;padding-left:22px;"><li>每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。<li>根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张及以上~英姿；两张及以上~好施；三张及以上~涉猎；四张及以上~度势；五张及以上~可额外选择一项。<li>锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。',
 							false
 						);
 					},
@@ -19785,7 +19809,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			hongfa_respond: {
-				audio: "huangjintianbingfu",
+				audio: ["huangjintianbingfu", 2],
 				forceaudio: true,
 				trigger: { player: "chooseToRespondBegin" },
 				direct: true,
@@ -19823,7 +19847,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			hongfa_use: {
-				audio: "huangjintianbingfu",
+				audio: ["huangjintianbingfu", 2],
 				forceaudio: true,
 				enable: "chooseToUse",
 				filter: function (event, player) {
@@ -19883,13 +19907,16 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			hongfa: {
-				audio: 2,
+				audio: 3,
 				derivation: "huangjintianbingfu",
 				unique: true,
 				forceunique: true,
 				lordSkill: true,
 				trigger: { player: "phaseZhunbeiBegin" },
 				forced: true,
+				init(player) {
+					player.markSkill("huangjintianbingfu");
+				},
 				filter: function (event, player) {
 					return (
 						player.getExpansions("huangjintianbingfu").length == 0 && get.population("qun") > 0
@@ -19903,10 +19930,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 					threaten: 2,
 				},
 				group: "hongfa_hp",
-				global: ["hongfa_use", "hongfa_respond"],
+				global: ["huangjintianbingfu", "hongfa_use", "hongfa_respond"],
 				subSkill: {
 					hp: {
-						audio: true,
+						audio: "huangjintianbingfu3.mp3",
 						trigger: { player: "loseHpBefore" },
 						filter: function (event, player) {
 							return player.getExpansions("huangjintianbingfu").length > 0;
@@ -19924,7 +19951,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 								});
 							"step 1";
 							if (result.bool) {
-								player.logSkill("huangjintianbingfu");
+								player.logSkill("hongfa_hp");
 								player.loseToDiscardpile(result.links);
 								trigger.cancel();
 							}
@@ -19934,6 +19961,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			},
 			wendao: {
 				audio: 2,
+				derivation: "taipingyaoshu",
 				unique: true,
 				forceunique: true,
 				enable: "phaseUse",
@@ -19994,7 +20022,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			huangjintianbingfu: {
-				audio: 2,
+				audio: 3,
 				unique: true,
 				forceunique: true,
 				nopop: true,
@@ -20175,12 +20203,16 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			shouyue: {
+				audio: true,
 				unique: true,
 				forceunique: true,
-				group: "wuhujiangdaqi",
+				global: "wuhujiangdaqi",
 				derivation: "wuhujiangdaqi",
 				mark: true,
 				lordSkill: true,
+				init(player) {
+					player.markSkill("wuhujiangdaqi");
+				},
 			},
 			wuhujiangdaqi: {
 				unique: true,
@@ -20189,7 +20221,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				mark: true,
 				intro: {
 					content:
-						'@<div style="margin-top:-5px"><div class="skill">【武圣】</div><div class="skillinfo">将“红色牌”改为“任意牌”</div><div class="skill">【咆哮】</div><div class="skillinfo">增加描述“你使用的【杀】无视其他角色的防具”</div><div class="skill">【龙胆】</div><div class="skillinfo">增加描述“你每发动一次‘龙胆’便摸一张牌”</div><div class="skill">【烈弓】</div><div class="skillinfo">增加描述“你的攻击范围+1”</div><div class="skill">【铁骑】</div><div class="skillinfo">将“一张明置的武将牌”改为“所有明置的武将牌”</div></div>',
+						'@<div style="margin-top:-5px"><div class="skill">【武圣】</div><div class="skillinfo">将“红色牌”改为“任意牌”</div><div class="skill">【咆哮】</div><div class="skillinfo">增加描述“你使用的【杀】无视其他角色的防具”</div><div class="skill">【龙胆】</div><div class="skillinfo">增加描述“你每发动一次‘龙胆’便摸一张牌”</div><div class="skill">【铁骑】</div><div class="skillinfo">将“一张明置的武将牌”改为“所有明置的武将牌”</div><div class="skill">【烈弓】</div><div class="skillinfo">增加描述“你的攻击范围+1”</div></div>',
 				},
 			},
 			jizhao: {
@@ -21342,7 +21374,17 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 						var to = event.junzhu_name;
 						event.maxHp = player.maxHp;
 						player.reinit(player.name1, to, 4);
-						if (lib.skill[to]) game.trySkillAudio(to, player);
+						
+						// 修改君主亮将配音播放
+						// if (lib.skill[to]) game.trySkillAudio(to, player);
+						var map = {
+							gz_jun_liubei: "shouyue",
+							gz_jun_zhangjiao: "hongfa",
+							gz_jun_sunquan: "jiahe",
+							gz_jun_caocao: "jianan"
+						};
+						game.trySkillAudio(map[to],player);
+						
 						player.showCharacter(0);
 						var group = lib.character[to][1];
 						var yelist = game.filterPlayer(function (current) {
@@ -21562,10 +21604,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 					}
 				},
 			},
-			gz_jun_liubei: { audio: true },
-			gz_jun_caocao: { audio: true },
-			gz_jun_sunquan: { audio: true },
-			gz_jun_zhangjiao: { audio: true },
+			// gz_jun_liubei: { audio: true },
+			// gz_jun_caocao: { audio: true },
+			// gz_jun_sunquan: { audio: true },
+			// gz_jun_zhangjiao: { audio: true },
 			_zhenfazhaohuan: {
 				enable: "phaseUse",
 				usable: 1,
@@ -23457,12 +23499,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				"锁定技，你装备区里的宝物牌不能被其他角色获得。结束阶段，若场上或弃牌堆有【定澜夜明珠】，则你摸一张牌，然后获得装备区里有【定澜夜明珠】角色的一张牌。",
 			jiahe: "嘉禾",
 			jiahe_info: "君主技，只要此武将牌处于明置状态，你便拥有“缘江烽火图”。",
+			jiahe_damage: "缘江烽火图",
 			jiahe_put: "烽火",
 			jiahe_put_info: "出牌阶段限一次，你可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。",
 			jiahe_skill: "缘江烽火图",
 			yuanjiangfenghuotu: "缘江烽火图",
 			yuanjiangfenghuotu_info:
-				"每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。<br>根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张以上：〖英姿〗；两张以上：〖好施〗；三张以上：〖涉猎〗；四张以上：〖度势〗；五张以上：可额外选择一项。<br>锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。",
+				"每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。<br>根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张及以上：〖英姿〗；两张及以上：〖好施〗；三张及以上：〖涉猎〗；四张及以上：〖度势〗；五张及以上：可额外选择一项。<br>锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。",
 			yuanjiangfenghuotu_ab: "江图",
 			yuanjiangfenghuotu_bg: "图",
 			wuxin: "悟心",
@@ -23471,6 +23514,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			hongfa: "弘法",
 			hongfa_use: "天兵",
 			hongfa_respond: "天兵",
+			hongfa_hp: "黄巾天兵符",
 			hongfa_info:
 				"君主技，锁定技，此武将牌明置时，你获得“黄巾天兵符”；准备阶段，若没有“天兵”，你将牌堆顶的X张牌置于“黄巾天兵符”上，称为“天兵”（X为群势力角色的数量）。",
 			wendao: "问道",
@@ -23485,7 +23529,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			wuhujiangdaqi_ab: "将旗",
 			wuhujiangdaqi_bg: "旗",
 			wuhujiangdaqi_info:
-				"存活的蜀势力角色的技能按以下规则改动：<br><strong>武圣</strong>：将“红色牌”改为“任意牌”<br><strong>咆哮</strong>：增加描述“你使用的【杀】无视其他角色的防具”<br><strong>龙胆</strong>：增加描述“你发动〖龙胆〗使用或打出牌时摸一张牌”<br><strong>烈弓</strong>：增加描述“你的攻击范围+1”<br><strong>铁骑</strong>：将“一张明置的武将牌”改为“所有明置的武将牌”",
+				"存活的蜀势力角色的技能按以下规则改动：<br><strong>武圣</strong>：将“红色牌”改为“任意牌”<br><strong>咆哮</strong>：增加描述“你使用的【杀】无视其他角色的防具”<br><strong>龙胆</strong>：增加描述“你发动〖龙胆〗使用或打出牌时摸一张牌”<br><strong>铁骑</strong>：将“一张明置的武将牌”改为“所有明置的武将牌”<br><strong>烈弓</strong>：增加描述“你的攻击范围+1”",
 			zhangwu: "章武",
 			zhangwu_info:
 				"锁定技。当【飞龙夺凤】进入弃牌堆或其他角色的装备区后，你获得之。当你不因使用而失去【飞龙夺风】时，你展示此牌，将此牌置于牌堆底并摸两张牌。",
@@ -24207,21 +24251,36 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			"#jizhao2": "王业不偏安，起师再兴汉！",
 			"#rerende_gz_jun_liubei1": "勿以恶小而为之，勿以善小而不为。",
 			"#rerende_gz_jun_liubei2": "君才十倍于丕，必能安国成事。",
-			"#gz_jun_liubei:die": "若嗣子可辅，辅之。如其不才，君可自取……",
+			"#shouyue": "布德而昭仁，见旗如见朕！",
+			"#gz_jun_liubei:die": "若嗣子可辅，辅之；如其不才，君可自取……",
 			"#wuxin1": "冀悟迷惑之心。",
 			"#wuxin2": "吾已明此救世之术矣。",
-			"#hongfa1": "汝等安心，吾乃大贤良师矣。",
-			"#hongfa2": "此法可助汝等脱离苦海。",
+			"#hongfa1": "苍天已死，黄天当立！",
+			"#hongfa2": "汝等安心，吾乃大贤良师也。",
+			"#hongfa3": "此法可助汝等脱离苦海。",
 			"#huangjintianbingfu1": "此乃天将天兵，尔等妖孽看着！",
 			"#huangjintianbingfu2": "且作一法，召唤神力！",
-			"#hongfa_hp": "吾有天神护体！",
+			"#huangjintianbingfu3": "吾有天神护体！",
 			"#wendao1": "诚心求天地之道，救世之法。",
 			"#wendao2": "求太平之法以安天下。",
 			"#gz_jun_zhangjiao:die": "天，真要灭我……",
-			"#jiahe1": "有敌来犯，速速御敌。",
-			"#jiahe2": "来，扶孤上马迎敌！",
+			"#jiahe": "嘉禾生，大吴兴！",
+			"#yuanjiangfenghuotu1": "保卫国家，人人有责！",
+			"#yuanjiangfenghuotu2": "连绵的烽火，就是对敌人最好的震慑！",
+			"#yuanjiangfenghuotu3": "有敌来犯，速速御敌！",
+			"#yuanjiangfenghuotu4": "来，扶孤上马迎敌！",
+			"#jiahe_reyingzi1": "大吴江山，儒将辈出。",
+			"#jiahe_reyingzi2": "千夫奉儒将，百兽伏麒麟。",
+			"#jiahe_haoshi1": "朋友有难，当倾囊相助。",
+			"#jiahe_haoshi2": "好东西，就要跟朋友分享。",
+			"#jiahe_shelie1": "军中多务，亦当涉猎。",
+			"#jiahe_shelie2": "少说话，多看书。",
+			"#jiahe_duoshi1": "广施方略，以观其变。",
+			"#jiahe_duoshi2": "莫慌，观察好局势再做行动。",
 			"#lianzi1": "税以足食，赋以足兵。",
 			"#lianzi2": "府库充盈，国家方能强盛！",
+			"#zhiheng_gz_jun_sunquan1": "二宫并阙，孤之所愿。",
+			"#zhiheng_gz_jun_sunquan2": "鲁王才兼文武，堪比太子。",
 			"#jubao1": "四海之宝，孤之所爱。",
 			"#jubao2": "夷洲，扶南，辽东，皆大吴臣邦也！",
 			"#gz_jun_sunquan:die": "朕的江山，要倒下了么……",
@@ -24281,12 +24340,18 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			"#gzfudi2": "绣虽有降心，奈何贵营难容。",
 			"#drlt_congjian1": "听君谏言，去危亡，保宗祀！",
 			"#gz_zhangxiu:die": "若失文和，吾将何归？",
-			"#jianan1": "行为军锋，还为后拒！",
-			"#jianan2": "国之良将，五子为先。",
+			"#jianan": "设使天下无孤，不知几人称帝，几人称王？",
+			"#wuziliangjiangdao1": "行为军锋，还为后拒！",
+			"#wuziliangjiangdao2": "国之良将，五子为先。",
+			"#jianan_tuxi": "以百破万，让孤再看一次！",
+			"#jianan_qiaobian": "孤之兵道，此一时，彼一时。",
+			"#jianan_xiaoguo": "使孤梦回辽东者，卿之雄风也！",
+			"#jianan_jieyue": "孤之股肱，谁敢不从？嗯？",
+			"#jianan_duanliang": "孤以为断粮如断肠，卿意下如何？",
 			"#huibian1": "吾任天下之智力，以道御之，无所不可。",
-			"#huibian2": "青青子衿，悠悠我心，但为君故，沉吟至今。",
+			"#huibian2": "青青子衿，悠悠我心。但为君故，沉吟至今。",
 			"#gzzongyu1": "驾六龙，乘风而行。行四海，路下之八邦。",
-			"#gzzongyu2": "齐桓之功，为霸之首，九合诸侯，一匡天下。",
+			"#gzzongyu2": "齐桓之功，为霸之首。九合诸侯，一匡天下！",//配音错误？，应为：齐桓之功，为霸之道
 			"#gz_jun_caocao:die": "神龟虽寿，犹有竟时。腾蛇乘雾，终为土灰……",
 			"#sanchen1": "陈书弼国，当一而再、再而三。",
 			"#gz_duyu:die": "金瓯尚缺，死难瞑目……",

mode/single.js

@@ -1562,6 +1562,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 		},
 		get: {
 			attitude: function (from, to) {
+				if (!from || !to) return 0;
 				if (from.identity == to.identity) return 10;
 				return -10;
 			},

noname/get/index.js

@@ -974,6 +974,16 @@ export class Get {
 
 		return target;
 	}
+	/**
+	 * 用于将HTML代码转换为纯文本。
+	 * @param { string } htmlContent
+	 * @returns { string }
+	 */
+	plainText(htmlContent) {
+		var parser = new DOMParser();
+		var doc = parser.parseFromString(htmlContent || '', 'text/html');
+		return doc.body.textContent || doc.body.innerText;
+	}
 	inpilefull(type) {
 		var list = [];
 		for (var i in lib.cardPile) {