Merge pull request #3103 from xiyang141/PR-Branch

xizifu · web-flow · commit a9a78b27dbbf · 2025-11-10T13:12:40.000+08:00
寒冰剑藤甲
diff --git a/character/newjiang/character.js b/character/newjiang/character.js
@@ -1,11 +1,25 @@
 const characters = {
+	yj_hanbing: {
+		sex: "female",
+		group: "qun",
+		hp: 3,
+		skills: ["bingling"],
+		names: "null|null",
+	},
+	yj_tengjia: {
+		sex: "male",
+		group: "qun",
+		hp: 4,
+		skills: ["renjia", "yj_yanyu"],
+		names: "null|null",
+	},
 	yj_puyuan: {
 		sex: "male",
 		group: "shu",
 		hp: 4,
 		skills: ["biancai", "cuiren", "shenfeng"],
 	},
-	
+
 	v_sunce: {
 		sex: "male",
 		group: "wu",
diff --git a/character/newjiang/intro.js b/character/newjiang/intro.js
diff --git a/character/newjiang/skill.js b/character/newjiang/skill.js
@@ -2,6 +2,206 @@ import { lib, game, ui, get, ai, _status } from "../../noname.js";
 
 /** @type { importCharacterConfig['skill'] } */
 const skills = {
+	bingling: {
+		trigger: { player: ["useCardToPlayer"] },
+		filter(event, player) {
+			return get.name(event.card) == "sha" && event.target.countDiscardableCards("he") >= 2;
+		},
+		logTarget: "target",
+		async cost(event, trigger, player) {
+			const target = trigger.target;
+			event.result = await player.discardPlayerCard(target, "hej", get.prompt2("bingling"), 2).set("chooseonly", true).forResult();
+		},
+		async content(event, trigger, player) {
+			const next = trigger.target.discard(event.cards);
+			next.set("discarder", player);
+			await next;
+			if (event.cards.length > 1) {
+				const card = event.cards[0],
+					cardx = event.cards[1];
+				let num = 0;
+				if (get.type2(card, false) == get.type2(cardx, false)) {
+					await player.gain(event.cards, "gain2");
+					num++;
+				}
+				if (get.suit(card, false) == get.suit(cardx, false)) {
+					await player.recover();
+					num++;
+				}
+				if (get.cardNameLength(card, false) == get.cardNameLength(cardx, false)) {
+					await player.draw(get.cardNameLength(card));
+					num++;
+				}
+				if (get.number(card, false) == get.number(cardx, false)) {
+					await trigger.target.loseHp(trigger.target.getHp());
+					num++;
+				}
+				if (num == 0) {
+					await player.damage(1, "fire", "nosource");
+				}
+			}
+		},
+	},
+	renjia: {
+		trigger: {
+			player: ["damageBegin3", "damageAfter"],
+			source: ["damageSource"],
+		},
+		forced: true,
+		filter(event, player, triggername) {
+			if (triggername == "damageBegin3") {
+				if (!event.hasNature()) {
+					return player.getRoundHistory("damage", evt => !evt.hasNature()).indexOf(event) < 2;
+				}
+				return event.hasNature("fire");
+			}
+			return event.hasNatrue();
+		},
+		async content(event, trigger, player) {
+			if (event.triggername == "damageBegin3") {
+				if (trigger.hasNature("fire")) {
+					trigger.num++;
+				} else {
+					trigger.num--;
+				}
+			} else if (trigger.hasNature()) {
+				await player.draw();
+			}
+		},
+		group: ["renjia_gain"],
+		subSkill: {
+			gain: {
+				trigger: { player: ["expandEquipBegin", "enableEquipBegin"] },
+				forced: true,
+				init(player, skill) {
+					player.disableEquip(2);
+				},
+				onremove(player, skill) {
+					player.enableEquip(2);
+				},
+				filter(event, player) {
+					return event.slots.includes("equip2");
+				},
+				async content(event, trigger, player) {
+					trigger.slots.remove("equip2");
+					if (trigger.slots.length == 0) {
+						trigger.cancel();
+					}
+				},
+			},
+		},
+		ai: {
+			effect: {
+				target(card, player, target) {
+					if (get.tag(card, "fireDamage")) {
+						return [1, 0, 1, -3];
+					}
+					if (!get.natureList(card).length && target.getRoundHistory("damage", evt => evt.hasNature()).length < 2) {
+						return [1, -1];
+					}
+				},
+			},
+		},
+	},
+	yj_yanyu: {
+		enable: ["phaseUse"],
+		limited: true,
+		lose: false,
+		discard: false,
+		selectCard: 2,
+		check(card) {
+			if (ui.selected.cards.some(cardx => get.suit(cardx) == get.suit(card))) {
+				return 0;
+			}
+			return 1;
+		},
+		filterCard: () => true,
+		filter(event, player) {
+			return player.countCards("h") >= 2;
+		},
+		filterTarget(card, player, target) {
+			return target != player;
+		},
+		async content(event, trigger, player) {
+			player.awakenSkill(event.name);
+			await player.showCards(event.cards);
+			const card = get.cardPile2("tengjia"),
+				suits = event.cards.map(card => get.suit(card));
+			if (card && event.targets[0].canEquip("tengjia", true)) {
+				await event.targets[0].equip(card);
+			} else {
+				player.popup("杯具");
+			}
+			player.addSkill("yj_yanyu_use");
+			const targets = game.filterPlayer(curr => curr != event.targets[0]);
+			targets.forEach(curr => {
+				curr.markAuto("yj_yanyu_fire", suits);
+				const list = curr.getStorage("yj_yanyu_source");
+				list.add(player);
+				curr.setStorage("yj_yanyu_source", list);
+				curr.addSkill("yj_yanyu_fire");
+			});
+		},
+		subSkill: {
+			use: {
+				forced: true,
+				charlotte: true,
+				trigger: { global: ["useCardAfter"] },
+				filter(event, player) {
+					if (!event.player.getStorage("yj_yanyu_source").includes(player)) {
+						return false;
+					}
+					const suits = event.cards.map(card => get.suit(card, false));
+					return event.player.getStorage("yj_yanyu_fire").some(suit => suits.includes(suit)) && ["basic", "trick", "equip"].includes(get.type2(event.card, false));
+				},
+				async content(event, trigger, player) {
+					await player.draw();
+				},
+			},
+			fire: {
+				marktext: "焰",
+				charlotte: true,
+				intro: {
+					name: "焰狱",
+					mark(dialog, storage, player) {
+						const str = get.translation(storage).split("、"),
+							sources = get.translation(player.getStorage("yj_yanyu_source")).split("、");
+						dialog.addText(`${str}花色的手牌遵循:基本牌:火杀,锦囊牌:火攻,装备牌:铁索连环且使用后${sources}摸一张牌`);
+					},
+				},
+				mod: {
+					cardname(card, player, name) {
+						const suits = player.getStorage("yj_yanyu_fire"),
+							suit = get.suit(card);
+						if (!suits.includes(suit)) {
+							return;
+						}
+						if (get.type(name, null, false) == "basic") {
+							return "sha";
+						} else if (get.type2(name, false) == "trick") {
+							return "huogong";
+						} else if (get.type(name, null, false) == "equip") {
+							return "tiesuo";
+						}
+					},
+					cardnature(card, player) {
+						const suits = player.getStorage("yj_yanyu_fire"),
+							suit = get.suit(card, false);
+						if (suits.includes(suit) && get.type(card, null, false) == "basic") {
+							return "fire";
+						}
+					},
+				},
+			},
+		},
+		ai: {
+			order: 10,
+			result: {
+				player: 1,
+				target: -1,
+			},
+		},
+	},
 	biancai: {
 		trigger: {
 			global: ["phaseBegin"],
@@ -214,7 +414,10 @@ const skills = {
 					game.initCharacterList();
 				}
 				_status.characterlist.map(character => {
-					const names = get.characterSurname(character).map(info => info.join("")).concat([get.rawName(character)]),
+					const names = get
+							.characterSurname(character)
+							.map(info => info.join(""))
+							.concat([get.rawName(character)]),
 						skills = get.character(character, 3);
 					names.forEach(name => {
 						if (bingzhuSkill[name]) {
@@ -275,10 +478,12 @@ const skills = {
 				}
 			}
 			if (target != player) {
-				await player.draw(target.getSkills(null, false, false).filter(skill => {
-					const info = get.info(skill);
-					return info && !info.charlotte && get.skillInfoTranslation(skill, target).length;
-				}).length);
+				await player.draw(
+					target.getSkills(null, false, false).filter(skill => {
+						const info = get.info(skill);
+						return info && !info.charlotte && get.skillInfoTranslation(skill, target).length;
+					}).length
+				);
 			}
 		},
 	},
diff --git a/character/newjiang/sort.js b/character/newjiang/sort.js
@@ -3,7 +3,7 @@ const characterSort = {
 	yijiang_2022: ["yj_huangzhong", "lukai", "kebineng", "zhugeshang", "liwan", "wuanguo", "hanlong", "yj_sufei", "yj_qiaozhou"],
 	yijiang_2023: ["yj_majun", "mp_liuling", "yj_weiyan", "xiahoumao", "chenshi", "sunli", "feiyao"],
 	yijiang_2024: ["fj_peixiu", "new_yj_dongzhuo", "mp_wangrong", "yj_zhoubuyi", "linghuyu", "yj_simafu", "yj_xuangongzhu", "xukun", "xunyuxunyou", "yj_sb_guojia", "mp_xiangxiu"],
-	yijiang_2025: ["wufu", "yao_yuanshu", "yj_zhanghuan", "yj_zhangyan", "yj_puyuan", "v_sunce"],
+	yijiang_2025: ["wufu", "yao_yuanshu", "yj_zhanghuan", "yj_zhangyan", "yj_puyuan", "v_sunce", "yj_hanbing", "yj_tengjia"],
 };
 
 const characterSortTranslate = {
diff --git a/character/newjiang/translate.js b/character/newjiang/translate.js
@@ -233,6 +233,14 @@ const translates = {
 	pyhuanling_info: "出牌阶段开始时或当你受到伤害后，你可以重铸一张牌，然后获得场上、弃牌堆或牌堆一张花色相同的装备牌，并从随机出现该装备的三个兵主技能选择其中一个令一名角色获得。若该角色不为你，你摸X张牌（X为其技能数）。",
 	pyshenduan: "神锻",
 	pyshenduan_info: "锁定技，每个副类别每回合限一次，你使用一张装备牌后，根据副类别执行对应效果：武器：视为使用一张【杀】；防具：增加1点体力上限并回复1点体力；进攻马：弃置每名其他角色各一张牌；防御马：摸一张牌且本局手牌上限+1。",
+	yj_hanbing: "寒冰剑少女",
+	bingling: "冰伶",
+	bingling_info: "当你使用【杀】指定目标时，你可弃置目标角色两张牌。若这两张牌类别/花色/牌名字数/点数相同，则你获得这两张牌/回复1点体力/摸X张牌/令其失去所有体力（X为其中一张牌的牌名字数）；若皆不同，则你受到1点无来源的火焰伤害。",
+	yj_tengjia: "藤甲男孩",
+	renjia: "韧甲",
+	renjia_info: "锁定技，你没有防具区；你每轮前两次受到的非属性伤害-1，受到的火焰伤害+1，且你造成或受到属性伤害后摸一张牌。",
+	yj_yanyu: "焰狱",
+	yj_yanyu_info: "限定技。出牌阶段，你可以展示两张手牌然后选择一名其他角色A，将牌堆中的一张【藤甲】置入其防具区内（顶替原装备），若如此做，你与所有其他不为A的角色手牌中与这两张牌花色相同的基本牌视为火【杀】、锦囊牌视为【火攻】、装备牌视为【铁索连环】，且这些牌被使用后你摸一张牌。",
 };
 
 export default translates;
diff --git a/character/rank.js b/character/rank.js
@@ -93,6 +93,8 @@ window.noname_character_rank = {
 		"eu_yuejin",
 	],
 	a: [
+		"yj_hanbing",
+		"yj_tengjia",
 		"yj_puyuan",
 		"scl_jiaxu",
 		"linglie",
diff --git a/character/replace.js b/character/replace.js
@@ -107,6 +107,7 @@ window.noname_character_replace = {
 	guotufengji: ["guotufengji", "re_guotufengji"],
 	guozhao: ["ol_guozhao", "guozhao", "xin_guozhao", "jsrg_guozhao", "std_guozhao", "pe_guozhao"],
 	guyong: ["guyong", "re_guyong", "xin_guyong", "tw_guyong"],
+	yj_hanbing: [],
 	handang: ["handang", "xin_handang", "re_handang", "sb_handang", "tw_handang", "old_handang"],
 	hanfu: ["hanfu", "ol_hanfu", "clan_hanfu"],
 	hanhaoshihuan: ["hanhaoshihuan", "re_hanhaoshihuan"],
@@ -243,6 +244,7 @@ window.noname_character_replace = {
 	taishici: ["taishici", "re_taishici", "ol_sb_taishici", "sp_taishici", "re_sp_taishici", "pot_taishici", "star_taishici", "zc26_taishici"],
 	taoqian: ["ol_taoqian", "re_taoqian", "taoqian", "std_taoqian"],
 	tengfanglan: ["tengfanglan", "dc_tengfanglan"],
+	yj_tengjia: [],
 	tianfeng: ["dc_tianfeng", "tianfeng", "mb_tianfeng", "std_tianfeng"],
 	tianyu: ["tianyu", "tw_tianyu"],
 	tongyuan: ["tongyuan", "xia_tongyuan"],
