From 5fe11d0e078c9fa002450f29135fc710ab9481c9 Mon Sep 17 00:00:00 2001
From: bdf1 <baodongfang@yeah.net>
Date: Sat, 21 Sep 2024 00:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=9C=80=E4=BC=98=E8=A3=85=E5=A4=87=E8=AE=A1=E7=AE=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B=E8=B5=B7=E5=A7=8B=E5=B1=82=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=BC=9A=E8=AE=BF=E9=97=AE=E9=95=BF=E8=80=81?=
 =?UTF-8?q?=E4=BC=9A=EF=BC=9B=E5=BD=93=E4=B8=8D=E8=83=BD=E5=8E=BB=E9=AA=91?=
 =?UTF-8?q?=E5=A3=AB=E5=9B=A2=E6=97=B6=E4=BC=9A=E6=9C=89=E4=B8=9C=E8=A5=BF?=
 =?UTF-8?q?=E9=98=BB=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/floors/GM1.js | 18 ++++++++++++++++++
 project/floors/GM2.js |  2 +-
 project/plugins.js    |  9 +++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/project/floors/GM1.js b/project/floors/GM1.js
index 9f3e856..893cc51 100644
--- a/project/floors/GM1.js
+++ b/project/floors/GM1.js
@@ -119,6 +119,24 @@ main.floors.GM1=
                     "type": "changeFloor",
                     "floorId": "GM4"
                 },
+                {
+                    "type": "changeFloor",
+                    "floorId": "GM5"
+                },
+                {
+                    "type": "trigger",
+                    "loc": [
+                        4,
+                        9
+                    ]
+                },
+                {
+                    "type": "trigger",
+                    "loc": [
+                        8,
+                        5
+                    ]
+                },
                 {
                     "type": "changeFloor",
                     "floorId": "BH1"
diff --git a/project/floors/GM2.js b/project/floors/GM2.js
index bcc8e54..d90ad9a 100644
--- a/project/floors/GM2.js
+++ b/project/floors/GM2.js
@@ -303,7 +303,7 @@ main.floors.GM2=
     [50049,50165,60356,442,  0,  0,  0,  0,  0,441,60356,50165,50049],
     [50049,101,  0,  0,  0,60330,60331,60332,  0,  0,  0,101,50049],
     [50049,102,  0,  0,  0,60336,465,60337,466,  0,  0,102,50049],
-    [50049, 92,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,50049],
+    [50049, 92,  0,  0,  0,  0,  0,  0,  0,  0,30204, 94,50049],
     [50049,101,  0,  0,60353,552,  0,547,60354,  0,  0,101,50049],
     [50049,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,50049],
     [50049,  0,  0,580,60353,568,  0,490,60354,474,  0,  0,50049],
diff --git a/project/plugins.js b/project/plugins.js
index 069b5df..a6db562 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -185,16 +185,21 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		for (var i of fazhang_)
 			if (core.status.hero.equipment.includes(i) || core.hasItem(i)) fazhang = i;
 		juanzhou = core.clone(juanzhou_).filter(i => core.status.hero.equipment.includes(i) || core.hasItem(i));
+		var haveI720 = juanzhou.includes('I720');
 		flags.saveEquips = []
 		if (flags.shop3) {
 			while (juanzhou.length < 2) juanzhou.push(null);
 			for (var i = 0; i < juanzhou.length; i++)
 				for (var j = i + 1; j < juanzhou.length; j++)
-					flags.saveEquips.push([yifu, juanzhou[i], fazhang, juanzhou[j]]);
+					if (haveI720 && (![juanzhou[i], juanzhou[j]].includes('I720')) && (['I718', 'I719'].includes(juanzhou[i]) || ['I718', 'I719'].includes(juanzhou[j])));
+					else
+						flags.saveEquips.push([yifu, juanzhou[i], fazhang, juanzhou[j]]);
 		} else {
 			while (juanzhou.length < 1) juanzhou.push(null);
 			for (var i = 0; i < juanzhou.length; i++)
-				flags.saveEquips.push([yifu, juanzhou[i], fazhang]);
+				if (haveI720 && juanzhou[i] != 'I720' && ['I718', 'I719'].includes(juanzhou[i]));
+				else
+					flags.saveEquips.push([yifu, juanzhou[i], fazhang]);
 		}