Merge pull request #1738 from libccy/PR-Branch

v1.10.15

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,8 @@
 <!-- 在提交PR之前，请确保检查清单框都经过了检查 -->
 
 ### PR受影响的平台
-<!-- PR的内容涉及到哪些客户端? 浏览器端，电脑端(win, mac), 手机端(android, ios, other)或者是所有平台 -->
+<!-- PR的代码内容涉及到哪些客户端? 浏览器端，电脑端(win, mac), 手机端(android, ios, other)或者是所有平台 -->
+<!-- 如果是通用的代码，填写无即可。只需要涉及到某个平台才需要填写 -->
 
 
 ### 诱因和背景
@@ -26,9 +27,10 @@
 
 
 ### 检查清单
-<!-- 请在`[]`中加一个`x`来勾选方框且周围没有空格，如下所示：`[x]` -->
-- [ ] 我已经进行了充足的测试，且现有的测试都已通过
+<!-- 请在`[]`中加一个`x`来勾选方框且周围没有空格，如下所示：`[x]`。注意其中没有空格 -->
 - [ ] 我没有把该PR提交到`master`分支
+- [ ] commit中没有无用信息，和没有具体内容的“bugfix”
+- [ ] 我已经进行了充足的测试，且现有的测试都已通过
 - [ ] 如果此次PR中添加了新的武将，则我已在`character/rank.js`中添加对应的武将强度评级，并对双人武将/复姓武将添加`name:xxx`的参数
 - [ ] 如果此次PR中添加了新的语音文件，则我已在`lib.translate`中加入语音文件的文字台词
 - [ ] 如果此次PR涉及到新功能的添加，我已在`PR描述`中写入详细文档

.gitignore

@@ -32,3 +32,4 @@ package.json
 Thumbs.db
 bun.lockb
 deno.lock
+game/*.zip  

.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+node = "20"

Dockerfile

@@ -1,14 +1,14 @@
-FROM node:18
-
-WORKDIR /app
-
-COPY ./docker/* ./
-
-RUN npm install body-parser express minimist
-
-COPY . .
-
-EXPOSE 8080
-EXPOSE 8089
-
-CMD [ "sh","./start.sh" ]
+FROM node:20
+
+WORKDIR /app
+
+COPY ./docker/* ./
+
+RUN npm install ws body-parser express minimist
+
+COPY . .
+
+EXPOSE 8080
+EXPOSE 8089
+
+CMD [ "sh","./start.sh" ]

README.md

@@ -14,10 +14,6 @@ https://github.com/nonameShijian/noname-server
 
 [《无名杀》项目 Pull Request 提交规范](https://github.com/libccy/noname/wiki/%E3%80%8A%E6%97%A0%E5%90%8D%E6%9D%80%E3%80%8B%E9%A1%B9%E7%9B%AE-Pull-Request-%E6%8F%90%E4%BA%A4%E8%A7%84%E8%8C%83)
 
-在线试玩：
-
-https://spmario233.github.io/noname/index.html (图片素材加载速度较慢，不推荐)
-
 客户端下载戳这里：
 
 GitHub： https://github.com/libccy/noname/releases/tag/chromium85-client
@@ -26,7 +22,7 @@ docker: [docker.md](./docker/docker.md)
 
 网页端推荐使用 Chrome 系内核浏览器游玩，不推荐使用低版本 Firefox 浏览器
 
-请尽量保证游玩的 Chrome 系浏览器或手机 Webview 的`内核版本大于等于77`
+请尽量保证游玩的 Chrome 系浏览器或手机 Webview 的`内核版本大于等于85`
 
 提交 Pull Request 时请推送到"PR-Branch"分支！
 

card/extra.js

@@ -10,27 +10,27 @@ game.import("card", function () {
 				subtype: "equip5",
 				nomod: true,
 				onEquip: function () {
-					if (card && card.cards && card.cards.length) {
-						player.directgains(card.cards, null, "muniu");
+					if (card && card.storages?.length) {
+						player.directgains(card.storages, null, "muniu");
 					}
 					player.markSkill("muniu_skill");
 				},
 				forceDie: true,
 				onLose: function () {
 					delete player.getStat("skill").muniu_skill;
 					player.unmarkSkill("muniu_skill");
-					if (!card || !card.cards || !card.cards.length) return;
+					if (!card || !card.storages || !card.storages.length) return;
 					if (
-						(!event.getParent(2) || event.getParent(2).name != "swapEquip") &&
+						(!event.getParent(3) || event.getParent(3).name != "swapEquip") &&
 						(event.getParent().type != "equip" || event.getParent().swapEquip)
 					) {
-						player.lose(card.cards, ui.discardPile);
-						player.$throw(card.cards, 1000);
+						player.lose(card.storages, ui.discardPile);
+						player.$throw(card.storages, 1000);
 						player.popup("muniu");
-						game.log(card, "掉落了", card.cards);
-						card.cards.length = 0;
+						game.log(card, "掉落了", card.storages);
+						card.storages.length = 0;
 					} else {
-						player.lose(card.cards, ui.special);
+						player.lose(card.storages, ui.special);
 					}
 				},
 				clearLose: true,
@@ -39,7 +39,7 @@ game.import("card", function () {
 				skills: ["muniu_skill", "muniu_skill7"],
 				ai: {
 					equipValue: function (card) {
-						if (card.card) return 7 + card.card.length;
+						if (card.storages) return 7 + card.storages.length;
 						return 7;
 					},
 					basic: {
@@ -596,6 +596,27 @@ game.import("card", function () {
 					},
 					basic: {
 						equipValue: 5,
+						useful: (card, i) => {
+							let player = get.event().player, num;
+							if (player.isDamaged() && player.hp < 2 && get.recoverEffect(player, player, player) > 0) return -10;
+							num = player.hasSkillTag("filterDamage", null, {
+								card: new lib.element.VCard("sha"),
+								jiu: true
+							}, true) ? 0.6 : 1.2;
+							if (
+								player.canAddJudge("shandian") &&
+								get.effect(player, { name: "shandian" }, player, player) < 0 &&
+								!player.hasSkillTag("rejudge")
+							) {
+								if (game.hasPlayer(cur => cur.hasJudge("shandian"))) num += 2;
+								else num++;
+							}
+							num += game.countPlayer(cur => {
+								if (get.attitude(cur, player) <= 0) return cur.hasSkillTag("damageBonus");
+							});
+							if (player.isDamaged()) num /= player.getDamagedHp();
+							return num;
+						}
 					},
 				},
 			},
@@ -642,20 +663,20 @@ game.import("card", function () {
 					if (game.online) {
 						return;
 					}
-					if (!muniu.cards) {
-						muniu.cards = [];
+					if (!muniu.storages) {
+						muniu.storages = [];
 					}
-					for (var i = 0; i < muniu.cards.length; i++) {
-						if (get.position(muniu.cards[i]) != "s") {
-							muniu.cards.splice(i--, 1);
+					for (var i = 0; i < muniu.storages.length; i++) {
+						if (get.position(muniu.storages[i]) != "s") {
+							muniu.storages.splice(i--, 1);
 						}
 					}
 					game.broadcast(
 						function (muniu, cards) {
-							muniu.cards = cards;
+							muniu.storages = cards;
 						},
 						muniu,
-						muniu.cards
+						muniu.storages
 					);
 				},
 				filter: function (event, player) {
@@ -678,26 +699,26 @@ game.import("card", function () {
 							cards.splice(i--, 1);
 						}
 					}
-					var muniu = player.getEquip("muniu");
+					var muniu = player.getVEquip("muniu");
 					if (!muniu || !cards.length) {
 						for (var i = 0; i < cards.length; i++) {
 							cards[i].discard();
 						}
 						event.finish();
 						return;
 					}
-					if (muniu.cards == undefined) muniu.cards = [];
-					muniu.cards.push(cards[0]);
+					if (muniu.storages == undefined) muniu.storages = [];
+					muniu.storages.push(cards[0]);
 					game.broadcast(
 						function (muniu, cards) {
-							muniu.cards = cards;
+							muniu.storages = cards;
 						},
 						muniu,
-						muniu.cards
+						muniu.storages
 					);
 					game.delayx();
 					"step 2";
-					var muniu = player.getEquip("muniu");
+					var muniu = player.getVEquip("muniu");
 					var players = game.filterPlayer(function (current) {
 						if (
 							current.canEquip(muniu) &&
@@ -724,9 +745,9 @@ game.import("card", function () {
 					next.set("choice", choice);
 					"step 3";
 					if (result.bool) {
-						var card = player.getEquip("muniu");
+						var card = player.getVEquip("muniu");
 						result.targets[0].equip(card);
-						player.$give(card, result.targets[0]);
+						player.$give(card.cards, result.targets[0]);
 						player.line(result.targets, "green");
 						game.delay();
 					} else {
@@ -743,38 +764,38 @@ game.import("card", function () {
 				mod: {
 					cardEnabled2: function (card, player) {
 						if (!ui.selected.cards.length) return;
-						var muniu = player.getEquip("muniu");
-						if (!muniu || !muniu.cards || !muniu.cards.length) return;
+						var muniu = player.getVEquip("muniu");
+						if (!muniu || !muniu.storages || !muniu.storages.length) return;
 						for (var i of ui.selected.cards) {
-							if (i == muniu && muniu.cards.includes(card)) return false;
-							if (muniu.cards.includes(i) && card == muniu) return false;
+							if (muniu.cards?.includes(i) && muniu.storages.includes(card)) return false;
+							if (muniu.storages.includes(i) && card == muniu) return false;
 						}
 					},
 				},
 				mark: true,
 				markimage2: "image/card/muniu_small.png",
 				intro: {
 					content: function (storage, player) {
-						var muniu = player.getEquip("muniu");
-						if (!muniu || !muniu.cards || !muniu.cards.length) return "共有零张牌";
+						var muniu = player.getVEquip("muniu");
+						if (!muniu || !muniu.storages || !muniu.storages.length) return "共有零张牌";
 						if (player.isUnderControl(true)) {
-							return get.translation(muniu.cards);
+							return get.translation(muniu.storages);
 						} else {
-							return "共有" + get.cnNumber(muniu.cards.length) + "张牌";
+							return "共有" + get.cnNumber(muniu.storages.length) + "张牌";
 						}
 					},
 					mark: function (dialog, storage, player) {
-						var muniu = player.getEquip("muniu");
-						if (!muniu || !muniu.cards || !muniu.cards.length) return "共有零张牌";
+						var muniu = player.getVEquip("muniu");
+						if (!muniu || !muniu.storages || !muniu.storages.length) return "共有零张牌";
 						if (player.isUnderControl(true)) {
-							dialog.addAuto(muniu.cards);
+							dialog.addAuto(muniu.storages);
 						} else {
-							return "共有" + get.cnNumber(muniu.cards.length) + "张牌";
+							return "共有" + get.cnNumber(muniu.storages.length) + "张牌";
 						}
 					},
 					markcount: function (storage, player) {
-						var muniu = player.getEquip("muniu");
-						if (muniu && muniu.cards) return muniu.cards.length;
+						var muniu = player.getVEquip("muniu");
+						if (muniu && muniu.storages) return muniu.storages.length;
 						return 0;
 					},
 				},
@@ -786,18 +807,18 @@ game.import("card", function () {
 				//silent:true,
 				filter: function (event, player) {
 					if (!event.ss || !event.ss.length || event.parent.name == "lose_muniu") return false;
-					var muniu = player.getEquip("muniu");
-					if (!muniu || !muniu.cards) return false;
+					var muniu = player.getVEquip("muniu");
+					if (!muniu || !muniu.storages) return false;
 					return (
 						event.ss.filter(function (card) {
-							return muniu.cards.includes(card);
+							return muniu.storages.includes(card);
 						}).length > 0
 					);
 				},
 				content: function () {
-					var muniu = player.getEquip("muniu");
-					if (muniu && muniu.cards) {
-						muniu.cards.removeArray(trigger.ss);
+					var muniu = player.getVEquip("muniu");
+					if (muniu && muniu.storages) {
+						muniu.storages.removeArray(trigger.ss);
 						lib.skill.muniu_skill.sync(muniu);
 					}
 					player.updateMarks();
@@ -922,7 +943,7 @@ game.import("card", function () {
 				},
 				ai: {
 					effect: {
-						target_use(card, player, target, current) {
+						target(card, player, target, current) {
 							if (target.hasSkillTag("unequip2")) return;
 							if (
 								player.hasSkillTag("unequip", false, {
@@ -937,12 +958,11 @@ game.import("card", function () {
 								})
 							)
 								return;
-							//if(card.name=='nanman'||card.name=='wanjian'||card.name=='chuqibuyi') return 'zerotarget';
-							if (card.name == "nanman" || card.name == "wanjian") return "zerotarget";
+							if (card.name == "nanman" || card.name == "wanjian") return "zeroplayertarget";
 							if (card.name == "sha") {
 								var equip1 = player.getEquip("zhuque");
 								if (equip1 && equip1.name == "zhuque") return 1.9;
-								if (!game.hasNature(card)) return "zerotarget";
+								if (!game.hasNature(card)) return "zeroplayertarget";
 							}
 						},
 					},
@@ -1045,17 +1065,19 @@ game.import("card", function () {
 							],
 						},
 						filter: (event, player) => {
-							if (player.isHealthy() || player.hasSkillTag("unequip2")) return false;
-							var evt = event.getl(player);
-							return evt && evt.es.some((card) => card.name == "baiyin");
+							return (player.isDamaged() && !player.hasSkillTag("unequip2"))
 						},
-						content: function () {
-							var evt = trigger.getl(player);
+						getIndex(event, player){
+							const evt = event.getl(player);
+							const lostCards = [];
 							evt.es.forEach((card) => {
-								if (card.name == "baiyin") {
-									player.recover();
-								}
+								const VEquip = evt.vcard_map.get(card);
+								if(VEquip.name === "baiyin") lostCards.add(VEquip);
 							});
+							return lostCards.length;
+						},
+						async content(event, trigger, player) {
+							await player.recover();
 						},
 					},
 				},
@@ -1094,15 +1116,14 @@ game.import("card", function () {
 				},
 				audio: true,
 				check: function (event, player) {
-					var eff = 0;
-					for (var i = 0; i < event.targets.length; i++) {
-						var target = event.targets[i];
-						var eff1 = get.damageEffect(target, player, player);
-						var eff2 = get.damageEffect(target, player, player, "fire");
-						eff += eff2;
-						eff -= eff1;
+					let eff = 0, nature = event.card.nature;
+					for (let i = 0; i < event.targets.length; i++) {
+						eff -= get.effect(event.targets[i], event.card, player, player);
+						event.card.nature = "fire";
+						eff += get.effect(event.targets[i], event.card, player, player);
+						event.card.nature = nature;
 					}
-					return eff >= 0;
+					return eff > 0;
 				},
 				prompt2: function (event, player) {
 					return "将" + get.translation(event.card) + "改为火属性";