From b911cde822d5ad71862896039d1c2b1b041a223f Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 29 Sep 2024 18:03:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8B=8D=E8=93=9D=E4=B9=8B=E6=AE=BF?=
 =?UTF-8?q?=E5=8C=97=E5=8C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/libs/events.js               |  1 -
 public/project/enemys.js            |  2 +-
 public/project/floors/MT76.js       | 10 +++---
 public/project/floors/MT77.js       | 12 +++----
 public/project/floors/MT78.js       | 14 ++++----
 public/project/floors/MT79.js       | 16 ++++-----
 public/project/floors/MT80.js       | 12 +++----
 public/project/floors/MT81.js       | 18 +++++-----
 public/project/floors/MT82.js       | 12 +++----
 public/project/floors/MT83.js       | 12 +++----
 public/project/floors/MT84.js       | 12 +++----
 public/project/floors/MT85.js       | 14 ++++----
 public/project/floors/MT86.js       | 25 +++++--------
 public/project/floors/MT87.js       | 22 ++++++------
 public/project/floors/MT88.js       | 22 ++++++------
 public/project/floors/MT89.js       | 12 +++----
 public/project/floors/MT90.js       | 27 ++++++++------
 public/project/floors/MT91.js       | 52 +++++++++++++--------------
 public/project/floors/MT92.js       | 38 ++++++++++----------
 public/project/floors/MT93.js       | 18 +++++-----
 public/project/items.js             |  7 ++--
 src/core/render/preset/layer.ts     |  5 ++-
 src/game/enemy/damage.ts            | 56 ++---------------------------
 src/plugin/game/enemy/checkblock.ts |  2 +-
 src/plugin/game/fallback.ts         |  5 +--
 src/plugin/game/skillTree.ts        |  2 +-
 src/ui/skillTree.vue                |  1 +
 src/ui/statusBar.vue                | 15 --------
 28 files changed, 189 insertions(+), 255 deletions(-)

diff --git a/public/libs/events.js b/public/libs/events.js
index d731916..213b83a 100644
--- a/public/libs/events.js
+++ b/public/libs/events.js
@@ -1833,7 +1833,6 @@ events.prototype._action_jumpHero = function (data, x, y, prefix) {
     } else {
         loc = this.__action_getHeroLoc(data.loc, prefix);
     }
-    console.log(1);
 
     this.__action_doAsyncFunc(
         data.async,
diff --git a/public/project/enemys.js b/public/project/enemys.js
index 631783c..9dad46c 100644
--- a/public/project/enemys.js
+++ b/public/project/enemys.js
@@ -203,5 +203,5 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E690": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E691": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E692": {"name":"苍蓝之灵-圣","hp":150000,"atk":15000,"def":5000,"money":20,"exp":5000,"point":0,"special":[4,28],"paleShield":25},
-	"E693": {"name":"苍蓝之灵-战","hp":150000,"atk":15000,"def":4000,"money":20,"exp":5000,"point":0,"special":[32],"assimilateRange":6}
+	"E693": {"name":"苍蓝之灵-战","hp":250000,"atk":25000,"def":6000,"money":20,"exp":5000,"point":0,"special":[32],"assimilateRange":6}
 }
\ No newline at end of file
diff --git a/public/project/floors/MT76.js b/public/project/floors/MT76.js
index ffa0b3d..6b32891 100644
--- a/public/project/floors/MT76.js
+++ b/public/project/floors/MT76.js
@@ -49,8 +49,8 @@ main.floors.MT76=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648, 34,378,513,484,648, 21,376,403,378, 34,648,378, 29,648],
-    [648,376, 34,648,  0,648,648,492,648,648,  0,648,484,376,648],
+    [648, 34,378,513,482,648, 21,376,403,378, 34,648,378, 29,648],
+    [648,376, 34,648,  0,648,648,492,648,648,  0,648,482,376,648],
     [648,648,648,648,682,648, 27, 29, 28,648,513,648,648,671,648],
     [648,  0,682, 33,  0,648,648,578,648,648,  0,232, 27, 33,648],
     [648,484,648,  0,381,  0,648,103,657,484,  0,648, 29, 28,648],
@@ -59,9 +59,9 @@ main.floors.MT76=
     [648,  0,492,  0, 22,  0,648, 27,484, 29,  0,648,648,648,648],
     [648,  0,648,381,  0,491,648,  0,648,657,648,648,  0,378,648],
     [648,657,648,648,682,648,648,658,648,  0,482,658,482,  0,648],
-    [648,  0, 33,  0,  0,648,  0,484,492, 27,  0,648,648,232,648],
-    [648,648,648,648,249,648,484,648,648,648,682,648, 29,376,648],
-    [648,  0,482,  0,  0,648,  0,484,648,  0,  0,648,378,484,648],
+    [648,  0, 33,  0,  0,648,  0,482,492, 27,  0,648,648,232,648],
+    [648,648,648,648,249,648,482,648,648,648,682,648, 29,376,648],
+    [648,  0,482,  0,  0,648,  0,482,648,  0,  0,648,378,482,648],
     [648,648,648, 93,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT77.js b/public/project/floors/MT77.js
index 53559b2..6a4053f 100644
--- a/public/project/floors/MT77.js
+++ b/public/project/floors/MT77.js
@@ -42,19 +42,19 @@ main.floors.MT77=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,  0,648,  0,648,  0,381,  0,648,378,484,648,484,376,648],
-    [648,482,648,482,648,376,491,378,494,482,381,671,381,484,648],
+    [648,  0,648,  0,648,  0,381,  0,648,378, 34,648,482,376,648],
+    [648,482,648,482,648,376,491,378,494, 34,381,671,381,482,648],
     [648,  0,648,  0,648,618,648,648,648,648,232,648,648,648,648],
-    [648,538,403,538,492,378,  0,677,  0,484,  0,  0,484,  0,648],
+    [648,538,403,538,492,378,  0,677,  0,482,  0,  0,482,  0,648],
     [648,648,648,648,648,648,648,648,658,648,648,492,648,682,648],
-    [648,396,390,658,491,378,491,671,103,  0,491,  0,648,482,648],
+    [648,396,390,658,482,378,482,671,103,  0,484,  0,648,482,648],
     [648,648,648,648,648,648,648,648,658,648,648,682,648,  0, 94],
-    [648,682,  0,682,  0,376,677,648,  0,491,648,  0,648,482,648],
+    [648,682,  0,682,  0,376,677,648,  0,482,648,  0,648,482,648],
     [648,  0,648,  0,648,648,  0,648,578,648,648,492,648,682,648],
     [648, 27,599, 28,  0,492,484,648, 29,  0,648, 27,  0, 28,648],
     [648,648,648,648,  0,648,  0,658,103, 29,578,  0, 29,  0,648],
     [648,403,378,648,513,648,648,648,658,648,648,648,492,648,648],
-    [648,376,484,618,  0,484,  0,658,  0,  0,648,  0,  0,484,648],
+    [648,376, 33,618,  0, 33,  0,658,  0,  0,648,  0,  0, 33,648],
     [648,648,648,648,648,648,648,648,648,648,648,648, 93,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT78.js b/public/project/floors/MT78.js
index bc498ce..b2220c9 100644
--- a/public/project/floors/MT78.js
+++ b/public/project/floors/MT78.js
@@ -63,18 +63,18 @@ main.floors.MT78=
     "cannotMoveIn": {},
     "map": [
     [648,648,648, 91,648,648,648,648,648,648,648,648,648,648,648],
-    [648,  0,648,  0,  0,648, 33,  0,682,  0,484,648,484,  0,648],
+    [648,  0,648,  0,  0,648, 33,  0,682,  0, 34,648, 34,  0,648],
     [648,482,648, 34,  0,657,  0,  0,648, 28,  0,578,  0, 27,648],
-    [648,  0,648,648,648,648,648,677,648,648,648,648,648,492,648],
+    [648,  0,648,648,492,648,648,677,648,648,648,648,648,492,648],
     [648, 27,  0,249,  0,648, 29,  0,648, 27,381,  0,381, 28,648],
-    [648,648,648,648,482,648,  0,648,648,232,648,648,648,648,648],
-    [ 92,  0,484,648, 28,648, 21,  0,648,  0,  0,648,482,  0,648],
+    [648,492,648,648,482,648,  0,648,648,232,648,648,648,648,648],
+    [ 92,  0, 33,648, 28,648, 21,  0,648,  0,  0,648,482,  0,648],
     [648,  0,  0,578,  0,648,648,648,648,648,  0,513,  0,  0, 94],
-    [648,648,648,648,648,648,494,  0, 21,648,484,648,482,  0,648],
+    [648,492,648,648,648,648,494,  0, 21,648,484,648,482,  0,648],
     [648,  0,  0,677,  0,491,  0,648,  0,648,  0,648,648,494,648],
     [ 92,  0,484,648,648,648,659,648,682,648,682,648,  0,381,648],
-    [648,648,648,648,376,232,  0,648,491,657,491,658,491,  0,648],
-    [648,376,487,648,378,648,378,648,648,648,648,648,648,677,648],
+    [648,648,648,648,376,232,  0,492,  0,657,  0,658, 33,  0,648],
+    [648,376,482,648,378,648,378,648,648,648,648,648,648,677,648],
     [648,403,378,618,381,648,  0,  0,679,  0,  0,376,  0,  0,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
diff --git a/public/project/floors/MT79.js b/public/project/floors/MT79.js
index ea3d5e6..e4ed164 100644
--- a/public/project/floors/MT79.js
+++ b/public/project/floors/MT79.js
@@ -63,19 +63,19 @@ main.floors.MT79=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648, 91,648,648],
-    [648, 21,  0,484,  0,648,  0,381,  0,  0,677,  0,  0,  0,648],
-    [648,648,648,648,671,648,513,648,648,648,648,482,  0,482,648],
-    [648, 28,  0,648, 27,648, 28,648, 28,484,648,648,648,648,648],
-    [648,  0, 29,648,  0,484,  0,492,  0, 29,  0,492,  0,  0,648],
+    [648, 21,  0, 33,  0,648,  0,381,  0,  0,677,  0,  0,  0,648],
+    [648,648,648,648,671,648,513,648,648,648,648, 34,  0, 34,648],
+    [648, 28,  0,648, 27,648, 28,648, 28, 33,648,648,648,648,648],
+    [648,  0, 29,648,  0,482,  0,492,  0, 29,  0,492,  0,  0,648],
     [648,648,538,648,494,648,648,648,648,648,658,648,  0,  0,648],
     [648,  0,  0,378,  0,648,376,  0,378,648,  0,578,  0,  0, 94],
-    [ 92,  0,491,  0,103,648,  0,487,  0,648,  0,648,648,494,648],
+    [ 92,  0,484,  0,103,648,  0,487,  0,648,  0,648,648,494,648],
     [648,671,648,648,232,648,378,  0,376,648,484,  0,648,  0,648],
     [648, 28,403,648,  0,648,648,648,648,648,648,682,648,  0,648],
-    [648,376,491,492,  0,648,  0,482,  0,657, 29,  0,648,  0, 94],
+    [648,376,484,492,  0,648,  0,482,  0,657, 29,  0,648,  0, 94],
     [648,492,648,648,648,648,648,648,648,648,  0,482,492,  0,648],
-    [648,  0,403,648,  0,648,484,  0,484,648,658,648,648,513,648],
-    [648, 27,491,599, 28,578,  0,103,  0,492,  0,  0,484,  0,648],
+    [648,  0,403,648,  0,648,482,  0,482,648,658,648,648,513,648],
+    [648, 27,482,599, 28,578,  0,103,  0,492,  0,  0,484,  0,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT80.js b/public/project/floors/MT80.js
index abc7d56..10bb88c 100644
--- a/public/project/floors/MT80.js
+++ b/public/project/floors/MT80.js
@@ -50,19 +50,19 @@ main.floors.MT80=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,381,  0,484,  0,492,376, 93,513,  0,618,484,376,484,648],
+    [648,381,  0, 33,  0,492,376, 93,513,  0,618,482,376,482,648],
     [648,648,648,648,682,648,648,660,648,  0,648,648,648,378,648],
-    [648,  0,484,648,  0,484,648,648,648,487,648,396,648,381,648],
+    [648,  0, 33,648,  0,484,648,648,648,491,648,396,648,381,648],
     [648, 27, 29,658,376,103,672,  0,657,  0,494,403,599, 21,648],
     [648,648,648,648,492,648,648,494,648,232,648,648,648,648,648],
-    [648,491,618,  0, 27,648, 28,  0,648,  0,482,  0,578,  0,648],
+    [648,484,618,  0, 27,648, 28,  0,648,  0,482,  0,578,  0,648],
     [648,  0,648, 21,482,648,482, 29,658,  0, 29,103,648,  0, 94],
     [648,376,648,  0, 28,682, 27,  0,648,492,648,682,648,484,648],
     [648,494,648,648,648,648,659,648,648,484,648,  0,648,  0,648],
-    [648,378,648,  0,484,682,  0,376,494, 28,658,491,657,  0,648],
+    [648,378,648,  0,484,682,  0,376,494, 28,658,484,657,  0,648],
     [648,381,648,492,648,648,648,232,648,648,648,  0,648,492,648],
-    [648,491,648,482,  0, 28,648,103,  0,  0,648,682,648,491,648],
-    [648,  0,671,  0, 29,  0,677,  0,484,  0,677,491,578,491,648],
+    [648,484,648,482,  0, 28,648,103,  0,  0,648,682,648, 33,648],
+    [648,  0,671,  0, 29,  0,677,  0,484,  0,677, 34,578, 33,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT81.js b/public/project/floors/MT81.js
index bd1cce9..2dc6325 100644
--- a/public/project/floors/MT81.js
+++ b/public/project/floors/MT81.js
@@ -49,19 +49,19 @@ main.floors.MT81=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648, 27,  0, 29,  0, 28,648,  0,  0,578,  0,484,  0,249,648],
+    [648, 27,  0, 29,  0, 28,648,  0,  0,578,  0,482,  0,249,648],
     [648,671,648,648,648,682,648,484,  0,648,492,648,648,  0,648],
-    [648,  0,378,648,682,484,648,648,232,648, 28, 29,648,484,648],
-    [648,381,491,494,  0,648,648,  0,484,648,484, 27,648,  0,648],
+    [648,  0,378,648,682, 33,648,648,232,648, 28, 29,648,482,648],
+    [648,381,484,494,  0,648,648,  0, 34,648,482, 27,648,  0,648],
     [648,  0,376,648,682,  0,648,103,376,648,658,648,648,648,648],
-    [648,679,648,648,648,491,658,  0,484,658,  0,648,482,  0,648],
+    [648,679,648,648,648, 33,658,  0, 34,658,  0,648,482,  0,648],
     [ 92,  0,484,381,648,648,648,648,648,648,  0,659,  0,  0, 94],
     [648,648,648,677,648,  0,491,  0,378,492,  0,648,482,  0,648],
-    [648, 27,  0,484,648,648,648,648,677,648,491,648,648,648,648],
-    [648,  0, 29,103,682,376,484,648,484,648,  0,682,  0, 27,648],
-    [648,648,648,494,648,648,659,648,  0,682,  0,648,491,  0,648],
-    [648,  0,648,  0,648,484,  0,648,492,648,648,648,677,648,648],
-    [648,484,249,484,578,  0,378,648,  0, 21,  0, 28,  0, 27,648],
+    [648, 27,  0, 33,648,648,648,648,677,648, 33,648,648,648,648],
+    [648,  0, 29,103,682,376,482,648,484,648,  0,682,  0, 27,648],
+    [648,648,648,494,648,648,659,648,  0,682,  0,648, 33,  0,648],
+    [648,  0,648,  0,648,482,  0,648,492,648,648,648,677,648,648],
+    [648,  0,249, 33,578,  0,378,648,  0, 21,  0, 28,  0, 27,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT82.js b/public/project/floors/MT82.js
index 0d9f03f..9013883 100644
--- a/public/project/floors/MT82.js
+++ b/public/project/floors/MT82.js
@@ -49,14 +49,14 @@ main.floors.MT82=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,482, 29,658, 29,482,249,  0,491,513,484,648, 29, 28,648],
-    [648,376,482,648,482,378,648,  0,  0,648,  0,671, 27,491,648],
+    [648, 32, 29,658, 29, 32,249,  0,482,513,484,648, 29, 28,648],
+    [648,376, 32,648, 32,378,648,  0,  0,648,  0,671, 27,484,648],
     [648,648,648,648,672,648,648,648,232,648,648,648,648,648,648],
-    [648,378,491,648,484,484,494,  0,491,648,  0,492,484, 21,648],
-    [648,381,376,494,484,484,648,103,  0,492, 28,648, 27, 29,648],
+    [648,378, 33,648, 34, 34,494,  0,491,648,  0,492,484, 21,648],
+    [648,381,376,494, 34, 34,648,103,  0,492, 28,648, 27, 29,648],
     [648,671,648,648,648,648,648,578,648,648,  0,648,648,677,648],
-    [ 92,  0,484,378,  0,599,648,  0, 27,  0,682,648,484,  0, 94],
-    [648,492,648,648,648,  0,648,648,648,648,484,658,  0,  0,648],
+    [ 92,  0,484,378,  0,599,648,  0, 27,  0,682,648,  0,  0, 94],
+    [648,492,648,648,648,  0,648,648,648,648,482,658,  0,  0,648],
     [648,  0,376,484,  0,232,648, 27, 28,648,492,648,648,657,648],
     [648,677,648,648,648,  0,679,484, 21,648,  0,657,  0,  0,648],
     [648,  0,484,  0,492,  0,648, 28, 27,648,  0,648,  0,482,648],
diff --git a/public/project/floors/MT83.js b/public/project/floors/MT83.js
index ee20ef6..fdaa6c7 100644
--- a/public/project/floors/MT83.js
+++ b/public/project/floors/MT83.js
@@ -49,19 +49,19 @@ main.floors.MT83=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,  0,491,378,  0,232,  0,  0,  0,671,  0, 27,484,  0,648],
+    [648,  0,482,378,  0,232,  0,  0,  0,671,  0, 27,482,  0,648],
     [648,679,648,648,494,648,484,  0,484,648,494,648,648,677,648],
     [648, 29,  0,618,  0,648,648,648,648,648,  0,658,  0, 29,648],
-    [648,  0,484,648,396,648, 28, 22, 27,648,390,648,484,  0,648],
+    [648,  0,482,648,396,648, 28, 22, 27,648,390,648,482,  0,648],
     [648,682,648,648,  0,599, 27,491, 28,672,  0,648,648,682,648],
     [648,  0,484,648,648,648,648,494,648,648,648,648,484,  0,648],
-    [ 92,  0,  0,648,  0,491,  0,538,  0,376,  0,648,  0,  0, 94],
+    [ 92,  0,  0,648,  0,484,  0,538,  0,376,  0,648,  0,  0, 94],
     [648,648,679,648,378,103,648,648,648,103,378,648,513,648,648],
-    [648,487,  0,648,  0,376,  0,492,  0,491,  0,648,  0,484,648],
+    [648,484,  0,648,  0,376,  0,492,  0,484,  0,648,  0,482,648],
     [648,671,648,648,648,648,658,648,658,648,648,648,648,232,648],
-    [648,  0,376,491,  0,648,484,648,484,648,  0,484, 28,  0,648],
+    [648,  0,376,484,  0,648, 33,648, 33,648,  0,482, 28,  0,648],
     [648,492,648,677,648,648,682,648,682,648,648,578,648,492,648],
-    [648, 27,  0,484,657,  0,484,494,484,  0,657,484,  0, 28,648],
+    [648, 27,  0,482,657,  0, 33,494, 33,  0,657, 34,  0, 28,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT84.js b/public/project/floors/MT84.js
index 1f04de9..cada03a 100644
--- a/public/project/floors/MT84.js
+++ b/public/project/floors/MT84.js
@@ -88,19 +88,19 @@ main.floors.MT84=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,671,  0,491,378,  0,679,648,578,  0, 28,484,658,482,648],
+    [648,671,  0,484,378,  0,679,648,578,  0, 28, 34,658,  0,648],
     [648,  0,648,648,648,648,  0,648,  0,648,648,648,648,658,648],
-    [648,378,648,  0,491,648,491,648,484,648,484,  0,648, 28,648],
+    [648,378,648,  0,482,648,484,648, 34,648, 33,  0,648, 28,648],
     [648,232,648,648,538,648,378,648, 28,648,513,648,648,  0,648],
-    [648,  0,491,381,  0,648,  0,648,  0,648,  0, 29,484,677,648],
+    [648,  0,482,381,  0,648,  0,648,  0,648,  0, 29, 33,677,648],
     [648,648,648,648,648,648,618,648,682,648,648,648,648,648,648],
     [648,466,467,468,695,664,692,648,  0,  0,484,  0,484,  0, 94],
     [648,648,648,648,648,648,618,648,682,648,648,648,648,648,648],
-    [648,  0,491,381,  0,648,  0,648,  0,648,  0, 29,484,677,648],
+    [648,  0,482,381,  0,648,  0,648,  0,648,  0, 29, 33,677,648],
     [648,232,648,648,538,648,376,648, 27,648,513,648,648,  0,648],
-    [648,376,648,  0,491,648,491,648,484,648,484,  0,648, 27,648],
+    [648,376,648,  0,482,648,484,648, 34,648, 33,  0,648, 27,648],
     [648,  0,648,648,648,648,  0,648,  0,648,648,648,648,658,648],
-    [648,671,  0,491,376,  0,679,648,578,  0, 27,484,658,482,648],
+    [648,671,  0,484,376,  0,679,648,578,  0, 27, 34,658,  0,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT85.js b/public/project/floors/MT85.js
index 71d7eb2..b47e1de 100644
--- a/public/project/floors/MT85.js
+++ b/public/project/floors/MT85.js
@@ -50,18 +50,18 @@ main.floors.MT85=
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
     [648,  0,  0,  0,  0,484,  0,  0,  0,  0,676,648,  0,  0,648],
-    [648,679,648,648,513,648,648,648,648,648,  0,648,  0,484,648],
-    [648,491,  0,648, 27,484,648,  0, 28,648,  0,648,484,  0, 94],
+    [648,679,648,648,513,648,648,648,648,648,  0,648,  0, 34,648],
+    [648,482,  0,648, 27,484,648,  0, 28,648,  0,648, 34,  0, 94],
     [648,  0,378,648,381, 28,492,491,  0,492,  0,578,  0,  0,648],
     [648,648,648,648,648,648,648,648,659,648,  0,648,648,513,648],
-    [648,  0,484,648,  0,578,  0,648,  0,648,  0,648, 28,  0,648],
+    [648,  0,482,648,  0,578,  0,648,  0,648,  0,648, 28,  0,648],
     [ 92,  0,  0,249,482,648, 29,  0,484,648,  0,648,  0, 27,648],
-    [648,  0,484,648,  0,648,648,648,648,648,484,648,648,618,648],
+    [648,  0,482,648,  0,648,648,648,648,648,484,648,648,618,648],
     [648,648,648,648, 27,  0,492, 21,376,677,  0,  0,648,381,648],
-    [648,484,  0,682,  0,  0,648,648,648,648,648,658,648,491,648],
+    [648,482,  0,682,  0,  0,648,648,648,648,648,658,648,484,648],
     [648,658,648,648,648,682,648,378,  0,578, 29,  0,648,376,648],
-    [648,  0,491,648,  0, 28,648,  0,  0,648,  0,  0,648, 22,648],
-    [648, 27,  0,492,484,  0,682,  0,484,648,  0, 29,494,378,648],
+    [648,  0,484,648,  0, 28,648,  0,  0,648,  0,  0,648, 22,648],
+    [648, 27,  0,492, 33,  0,682,  0, 33,648,  0, 29,494,378,648],
     [648,648,648,648,648,648,648,648,648,648, 93,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT86.js b/public/project/floors/MT86.js
index 9f0be85..fc7c970 100644
--- a/public/project/floors/MT86.js
+++ b/public/project/floors/MT86.js
@@ -36,13 +36,6 @@ main.floors.MT86=
                 14,
                 3
             ]
-        },
-        "14,7": {
-            "floorId": "MT91",
-            "loc": [
-                0,
-                7
-            ]
         }
     },
     "beforeBattle": {},
@@ -54,19 +47,19 @@ main.floors.MT86=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,491,376,491,  0,648,  0,  0,482,  0,  0,482,  0,  0,648],
+    [648,482,376,482,  0,492,  0,  0, 34,  0,  0, 34,  0,  0,648],
     [648,648,648,648,671,648,676,648,648,648,648,677,648,492,648],
-    [ 92,  0,  0,648,  0,648,  0,  0,232,487,648,  0, 27,  0,648],
-    [648,  0,  0,129,484,  0,378,  0,648,487,492,484,  0,484,648],
+    [ 92,  0,  0,648,  0,648,  0,  0,232,491,648,  0, 27,  0,648],
+    [648,  0,  0,129, 33,  0,378,  0,648,491,492, 33,  0, 33,648],
     [648,249,648,648,648,494,648,648,648,644,648,648,648,249,648],
-    [648,  0,484,648,376, 21,378,648, 29,  0,648,484,  0,484,648],
-    [648,  0,  0,648,484,403,484,648,  0,484,578,  0, 28,  0, 94],
+    [648,  0,482,648,376, 21,378,648, 29,  0,648, 33,  0, 33,648],
+    [648,  0,  0,648,482,403,482,648,  0,484,578,  0, 28,  0,648],
     [648, 29,  0,648,648,618,648,648,657,648,648,648,648,494,648],
     [648,648,657,648,682,  0,  0,  0,103,658, 28,  0,648,378,648],
-    [648,  0,  0,491,  0,648,648,682,648,648,  0,491,648,  0,648],
-    [648,648,648,648,513,  0,648,484,484,648, 27,  0,648,376,648],
-    [648,484,381,648,648,  0,648,648,538,648,648,648,648,  0,648],
-    [648,376,484,679,  0,491,492,  0,  0,484,  0,  0,232,491,648],
+    [648,  0,  0,484,  0,648,648,682,648,648,  0,491,492,  0,648],
+    [648,648,648,648,513,  0,648,482,482,648, 27,  0,648,376,648],
+    [648, 33,381,648,648,  0,648,648,538,648,648,648,648,  0,648],
+    [648,376, 33,679,  0,484,492,  0,  0,484,  0,  0,232,491,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT87.js b/public/project/floors/MT87.js
index 5c8c4cd..1e4b48a 100644
--- a/public/project/floors/MT87.js
+++ b/public/project/floors/MT87.js
@@ -61,19 +61,19 @@ main.floors.MT87=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648, 91,648,648,648,648],
-    [648,484,376,484,  0,648,  0,249,  0,484,  0,513,  0,381,648],
-    [648,648,648,648,679,648,491,648, 28,103, 28,648,484,  0,648],
+    [648,482,376,482,  0,648,  0,249,  0, 33,  0,513,  0,381,648],
+    [648,648,648,648,679,648,484,648, 28,103, 28,648,482,  0,648],
     [648,  0,482,648,  0,648,494,648,648,644,648,648,648,492,648],
-    [648, 29,  0,578,  0,648,491,648, 27,103, 27,648,484,  0,648],
-    [648,648,249,648,  0,657,  0,578,  0,484,  0,657,  0, 29,648],
-    [648,  0,484,648,648,648,648,648,648,648,648,648,682,648,648],
-    [ 92,  0,  0,492,  0,491,  0,682,  0,484,658,484,  0,  0, 94],
-    [648,  0,484,648,648,648,648,648, 28,  0,648,  0, 27,  0,648],
+    [648, 29,  0,578,  0,648,484,648, 27,103, 27,648,482,  0,648],
+    [648,648,249,648,  0,657,  0,578,  0, 33,  0,657,  0, 29,648],
+    [648,  0,482,648,648,648,648,648,648,648,648,648,682,648,648],
+    [ 92,  0,  0,492,  0,491,  0,682,  0, 33,658, 33,  0,  0, 94],
+    [648,  0,482,648,648,648,648,648, 28,  0,648,  0, 27,  0,648],
     [648,129,648,648, 27,  0, 29,648,648,648,648,648,648,677,648],
-    [648,378,487,232,  0,484,  0,648, 21,  0,484,648, 29,  0,648],
-    [648,648,648,648,648,648,677,648,648,648,682,648,  0,484,648],
-    [648,491, 27,671,491,648,482,  0,482,659,  0,648,657,648,648],
-    [648, 28,491,648,  0,513,  0,  0,  0,648,  0,682,  0,  0,648],
+    [648,378,491,232,  0,482,  0,492, 21,  0,482,648, 29,  0,648],
+    [648,492,648,648,648,648,677,648,648,648,682,648,  0,482,648],
+    [648,484, 27,671,484,648, 33,  0, 33,659,  0,648,657,648,648],
+    [648, 28,484,648,  0,513,  0,  0,  0,648,  0,682,  0,  0,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT88.js b/public/project/floors/MT88.js
index 7ebf34c..180f213 100644
--- a/public/project/floors/MT88.js
+++ b/public/project/floors/MT88.js
@@ -49,19 +49,19 @@ main.floors.MT88=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,  0,677,  0,491,657,  0,  0,  0,  0,492,  0,  0,491,648],
-    [648,484,648,648,648,648,484,  0,484,  0,648,648,648,  0,648],
-    [648,  0,648,  0,484,648,492,648,648,243,648,482,648,682,648],
+    [648,  0,677,  0,491,657,  0,  0,  0,  0,492,  0,  0,484,648],
+    [648, 33,648,648,648,648, 33,  0, 33,  0,648,648,648,  0,648],
+    [648,  0,648,  0, 33,648,492,648,648,243,648,482,648,682,648],
     [648, 27,648, 29,  0,648,  0,682,  0,484,648,  0,682,  0,648],
-    [648,492,648,648,658,648,491,648, 29,  0,648,  0,648,491,648],
-    [648,  0,484,648,  0,657,  0,648,648,492,648,482,648,648,648],
-    [ 92,  0,  0,578,  0,648,  0,682,  0,381,578,  0,679,487,648],
-    [648,  0,484,648,491,648,538,648,648,  0,648,  0,648,487,648],
-    [648,648,648,648,  0,648,  0,491,648,249,648,  0,648,648,648],
-    [648, 28,682,  0,682,648, 27,  0,648, 27,648,  0,648,482,648],
+    [648,492,648,648,658,648,484,648, 29,  0,648,  0,648,484,648],
+    [648,  0,482,648,  0,657,  0,648,648,492,648,482,648,648,648],
+    [ 92,  0,  0,578,  0,648,  0,682,  0,381,578,  0,679,491,648],
+    [648,  0,482,648,484,648,538,648,648,  0,648,  0,648,491,648],
+    [648,648,648,648,  0,648,  0,484,648,249,648,  0,648,648,648],
+    [648, 28,682,  0,682,648, 27,  0,648, 27,648,  0,648, 34,648],
     [648,  0,648,648,648,648,648,492,648,  0,648,  0,648,  0, 94],
-    [648,  0,648,484, 27,679, 28,491,648,  0,648,  0,648,  0,648],
-    [648,484,513, 27,484,648,491, 28,232,491,492,676,  0,482,648],
+    [648,  0,648, 33, 27,679, 28,484,648,  0,648,  0,648,  0,648],
+    [648,482,513, 27, 33,648,484, 28,232,484,492,676,  0, 34,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT89.js b/public/project/floors/MT89.js
index ea49ac8..85b6119 100644
--- a/public/project/floors/MT89.js
+++ b/public/project/floors/MT89.js
@@ -56,19 +56,19 @@ main.floors.MT89=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,249, 29,  0,491,578, 27,  0,658,  0,381,648,484,484,648],
+    [648,249, 29,  0,482,578, 27,  0,658,  0,381,648,484,484,648],
     [648, 29,648,648,648,648,  0,648,648,648,648,648,492,648,648],
-    [648,  0,648,487,378,648,484,492,  0,  0,676,648,378,484,648],
-    [648,491,648,378, 21,618,  0,648,  0,648,  0,679,484, 27,648],
-    [648,578,648,648,648,648,679,648,  0,648,491,648,648,648,648],
+    [648,  0,648,484,378,648,484,492,  0,  0,676,648,378, 33,648],
+    [648,484,648,378, 21,618,  0,648,  0,648,  0,679, 33, 27,648],
+    [648,578,648,648,648,648,679,648,  0,648,484,648,648,648,648],
     [648,  0,  0,  0,484,  0,  0,648,  0,648,  0,513,  0,  0,648],
     [ 92,  0,648,492,648,648,  0,648,494,648,648,648,484,  0, 94],
     [648,  0,682,  0,491,648,  0,644,420,249,482,648,648,682,648],
     [648,682,648, 29,  0,648,648,648,578,648,482,648,  0,484,648],
     [648,482,648,648,657,648,  0,648,494,648,492,648,657,648,648],
-    [648, 29,492,484,  0,538,  0,676,  0,648,487,677,491,  0,648],
+    [648, 29,492, 33,  0,538,  0,676,  0,648,487,677,491,  0,648],
     [648,648,648,648,677,648,648,  0,648,648,648,648,657,648,648],
-    [648, 27,484, 28,  0,648,491,  0,  0,232,  0,378,  0,484,648],
+    [648, 27,482, 28,  0,648,484,  0,  0,232,  0,378,  0,482,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT90.js b/public/project/floors/MT90.js
index 14e84d0..86950bf 100644
--- a/public/project/floors/MT90.js
+++ b/public/project/floors/MT90.js
@@ -31,6 +31,13 @@ main.floors.MT90=
                 7,
                 14
             ]
+        },
+        "14,8": {
+            "floorId": "MT91",
+            "loc": [
+                0,
+                8
+            ]
         }
     },
     "beforeBattle": {},
@@ -42,19 +49,19 @@ main.floors.MT90=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,376,  0,648,487,232,  0,  0,484,  0,648,  0,494,  0,648],
-    [648,491,381,671,  0,648,492,648,648,513,648, 21,648,376,648],
+    [648,376,  0,648,491,232,  0,  0,484,  0,648,  0,494,  0,648],
+    [648,484,381,671,  0,648,492,648,648,513,648, 21,648,376,648],
     [648,648,648,648,492,648, 27,  0,484,  0,538,  0,648,491,648],
-    [648,491,381,679,  0,648,492,648,648,492,648,677,648,378,648],
-    [648,378,  0,648,491,232, 27,491,648,  0,658,  0,648,618,648],
-    [648,648,648,648,648,648,491, 28,648,381,648,484,658,  0,648],
+    [648,484,381,679,  0,648,492,648,648,492,648,677,648,378,648],
+    [648,378,  0,648,484,232, 27,482,648,  0,658,  0,648,618,648],
+    [648,648,648,648,648,648,482, 28,648,381,648, 33,658,  0,648],
     [648,  0,578,  0, 28,648,644,648,648,  0,648,648,648,  0,648],
-    [648,  0,648,484,  0,682,103,657,  0,484,648,484,657,  0,648],
-    [648,484,648,  0, 27,648,249,648,648,648,648,492,648,648,648],
-    [648,  0,648,648,648,648,  0,491,  0,492, 27,484,677,  0,648],
-    [ 92,  0,  0,484,  0,648,494,648,513,648,  0, 29,648,  0,648],
+    [648,  0,648,484,  0,682,103,657,  0, 33,648,482,657,  0, 94],
+    [648, 33,648,  0, 27,648,249,648,648,648,648,492,648,648,648],
+    [648,  0,648,648,648,648,  0,484,  0,492, 27,482,677,  0,648],
+    [ 92,  0,  0, 33,  0,648,494,648,513,648,  0, 29,648,  0,648],
     [648,492,648,648,513,648,491,648,  0,648,648,648,648,  0,648],
-    [648, 28,  0,484,  0,648,491,648, 28,  0, 29,658,  0,491,648],
+    [648, 28,  0, 33,  0,648,491,648, 28,  0, 29,658,  0,484,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/floors/MT91.js b/public/project/floors/MT91.js
index 48e09d0..970132c 100644
--- a/public/project/floors/MT91.js
+++ b/public/project/floors/MT91.js
@@ -18,26 +18,26 @@ main.floors.MT91=
     "parallelDo": "",
     "events": {},
     "changeFloor": {
-        "0,7": {
-            "floorId": "MT86",
-            "loc": [
-                14,
-                7
-            ]
-        },
-        "7,14": {
-            "floorId": "MT92",
-            "loc": [
-                7,
-                0
-            ]
-        },
         "14,7": {
             "floorId": "MT93",
             "loc": [
                 0,
                 7
             ]
+        },
+        "0,8": {
+            "floorId": "MT90",
+            "loc": [
+                14,
+                8
+            ]
+        },
+        "7,0": {
+            "floorId": "MT92",
+            "loc": [
+                7,
+                14
+            ]
         }
     },
     "beforeBattle": {},
@@ -48,21 +48,21 @@ main.floors.MT91=
     "cannotMove": {},
     "cannotMoveIn": {},
     "map": [
-    [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648, 27,381, 28,648,376,  0,679,  0,484,381,  0,492,  0,648],
-    [648, 27, 21, 28,618,491,381,648,492,648,  0,378,648,484,648],
-    [648,494,648,648,648,648,648,648,484,648,232,648,648,  0,648],
+    [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
+    [648, 27,381, 28,648,376,679,  0,  0,484,381,  0,492,  0,648],
+    [648, 27, 21, 28,618, 33,381,648,492,648,  0,378,648,482,648],
+    [648,494,648,648,648,648,648,648, 33,648,232,648,648,  0,648],
     [648,  0,648,  0,599,  0,513,  0, 28,648,  0,677,  0, 28,648],
-    [648, 28,  0,484,648,491,648,648,492,648,  0,648,648,648,648],
-    [648,648,648,648,648,  0,232,403,  0,648, 27,648,  0,484,648],
-    [ 92,  0,  0,  0,648,491,648,648,  0,644,  0,648,381,  0, 94],
-    [648,  0,484,  0,658,  0,  0,648,658,648,648,648,679,648,648],
+    [648, 28,  0,482,648, 33,648,648,492,648,  0,648,648,648,648],
+    [648,648,648,648,648,  0,232,403,  0,648, 27,648,  0, 33,648],
+    [648,  0,  0,  0,648, 33,648,648,  0,644,  0,648,381,  0, 94],
+    [ 92,  0,484,  0,658,  0,  0,648,658,648,648,648,679,648,648],
     [648,492,648,648,648,648,682,648,  0,378,682,  0,  0,676,648],
-    [648,  0,  0,578,  0,484,  0,648,484,  0,648,491,648,484,648],
+    [648,  0,  0,578,  0,484,  0,648,482,  0,648,482,648,484,648],
     [648,658,648,648,682,648,648,648,648,648,648,657,648,  0,648],
-    [648,  0, 28,648,  0,648,482,  0,482,648, 27,  0,648,  0,648],
-    [648, 27,491,492,491,492,  0,  0,  0,513,  0, 28,492,376,648],
-    [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
+    [648,  0, 28,648,  0,648, 34,  0, 34,648, 27,  0,648,  0,648],
+    [648, 27,482,492, 34,492,  0,  0,  0,513,  0, 28,492,376,648],
+    [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
 
diff --git a/public/project/floors/MT92.js b/public/project/floors/MT92.js
index ac76216..d0c38dc 100644
--- a/public/project/floors/MT92.js
+++ b/public/project/floors/MT92.js
@@ -18,19 +18,19 @@ main.floors.MT92=
     "parallelDo": "",
     "events": {},
     "changeFloor": {
-        "7,0": {
-            "floorId": "MT91",
-            "loc": [
-                7,
-                14
-            ]
-        },
         "0,7": {
             "floorId": "MT89",
             "loc": [
                 14,
                 7
             ]
+        },
+        "7,14": {
+            "floorId": "MT91",
+            "loc": [
+                7,
+                0
+            ]
         }
     },
     "beforeBattle": {},
@@ -41,21 +41,21 @@ main.floors.MT92=
     "cannotMove": {},
     "cannotMoveIn": {},
     "map": [
-    [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648],
-    [648,376,  0,491,679,  0,484,  0,  0,648,  0,381,648, 27,648],
+    [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
+    [648,376,  0,482,679,  0, 33,  0,  0,648,  0,381,648, 27,648],
     [648,671,648,648,648,682,648,648,648,648,658,648,648,  0,648],
-    [648,381,484,648,484,  0,648,482,494,376,  0,491,232, 28,648],
-    [648,484,378,492,  0, 28,657,  0,648,648,648,648,648,  0,648],
-    [648,648,648,648,658,648,648,492,648,  0,644,  0,648,484,648],
-    [648,  0,482,648,491,648, 28,  0,648,491,648,484,677,  0,648],
+    [648,381, 33,648,482,  0,648,482,494,376,  0, 33,232, 28,648],
+    [648, 33,378,492,  0, 28,657,  0,648,648,648,648,648,  0,648],
+    [648,648,648,648,658,648,648,492,648,  0,644,  0,648, 33,648],
+    [648,  0,482,648, 33,648, 28,  0,648,484,648,484,677,  0,648],
     [ 92,  0,  0,682,  0,658,  0,484,648,378,648,648,648,494,648],
-    [648,513,648,648,648,648,648,492,648,  0,679,491,  0, 27,648],
-    [648, 27,648,484,578,484,  0,381,648,648,648,648,648,677,648],
+    [648,513,648,648,648,648,648,492,648,  0,679,482,  0, 27,648],
+    [648, 27,648, 32,578, 34,  0,381,648,648,648,648,648,677,648],
     [648,  0,648,  0,648,648,648,682,648, 27,538,376,492,378,648],
-    [648,484,249, 28,648, 28,  0,482,648,  0,648,484,648,484,648],
-    [648,648,648,648,648,657,648,648,648,484,648,658,648,682,648],
-    [648,487,376,378,618,  0,491,  0,513,  0,492,  0,682,  0,648],
-    [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
+    [648, 32,249, 28,648, 28,  0, 34,648,  0,648,482,648,482,648],
+    [648,648,648,648,648,657,648,648,648, 33,648,658,648,682,648],
+    [648,491,376,378,618,  0, 33,  0,513,  0,492,  0,682,  0,648],
+    [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
 
diff --git a/public/project/floors/MT93.js b/public/project/floors/MT93.js
index 02b91b2..6f529c0 100644
--- a/public/project/floors/MT93.js
+++ b/public/project/floors/MT93.js
@@ -88,19 +88,19 @@ main.floors.MT93=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,  0,491,  0,648,  0,648,  0,491,  0,648,  0,491,  0,648],
-    [648, 28,  0, 29,578,491,648,378,  0,381,648,381,  0,376,648],
+    [648,  0, 34,  0,648,  0,648,  0,484,  0,648,  0,484,  0,648],
+    [648, 28,  0, 29,578, 33,648,378,  0,381,648,381,  0,376,648],
     [648,648,648,648,648,  0,648,648,648,232,648,648,648,671,648],
-    [648, 27,  0, 29,249,491,648, 27,  0, 28,  0,  0,  0,  0,648],
-    [648,  0,491,  0,648,  0,648,  0,491,  0,648,648,648,648,648],
+    [648, 27,  0, 29,249, 33,648, 27,  0, 28,  0,  0,  0,  0,648],
+    [648,  0, 34,  0,648,  0,648,  0, 33,  0,648,648,648,648,648],
     [648,648,648,648,648,682,648,648,648,677,648,466,  0,467,648],
-    [ 92,  0,  0,  0,  0,  0,513,  0,487,  0,693,  0,665,  0,648],
+    [ 92,  0,  0,  0,  0,  0,513,  0,491,  0,693,  0,665,  0,648],
     [648,648,648,648,648,682,648,648,648,677,648,468,  0,695,648],
-    [648,  0,491,  0,648,  0,648,  0,491,  0,648,648,648,648,648],
-    [648, 28,  0, 29,249,491,648, 28,  0, 27,  0,  0,  0,  0,648],
+    [648,  0, 34,  0,648,  0,648,  0, 33,  0,648,648,648,648,648],
+    [648, 28,  0, 29,249, 33,648, 28,  0, 27,  0,  0,  0,  0,648],
     [648,648,648,648,648,  0,648,648,648,232,648,648,648,671,648],
-    [648, 27,  0, 29,578,491,648,376,  0,381,648,381,  0,378,648],
-    [648,  0,491,  0,648,  0,648,  0,491,  0,648,  0,491,  0,648],
+    [648, 27,  0, 29,578, 33,648,376,  0,381,648,381,  0,378,648],
+    [648,  0, 34,  0,648,  0,648,  0,484,  0,648,  0,484,  0,648],
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/public/project/items.js b/public/project/items.js
index 7c2ed3a..f38f6dc 100644
--- a/public/project/items.js
+++ b/public/project/items.js
@@ -1269,6 +1269,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"text": "吸收白日之精华锻造而成。攻击+500，额外攻击+50",
 		"equip": {
 			"type": "武器",
+			"animate": "jianji",
 			"value": {
 				"mana": 50,
 				"atk": 500
@@ -1280,12 +1281,12 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "equips",
 		"name": "永夜盾",
 		"canUseItemEffect": "true",
-		"text": "集月光之精华锻造而成。防御+400，生命回复+25。",
+		"text": "集月光之精华锻造而成。防御+400，生命回复+40。",
 		"equip": {
 			"type": "盾牌",
 			"value": {
-				"def": 400,
-				"hpmax": 25
+				"hpmax": 40,
+				"def": 400
 			},
 			"percentage": {}
 		}
diff --git a/src/core/render/preset/layer.ts b/src/core/render/preset/layer.ts
index 5f69b14..c48ae70 100644
--- a/src/core/render/preset/layer.ts
+++ b/src/core/render/preset/layer.ts
@@ -1209,7 +1209,10 @@ export class Layer extends Container {
 
         const extend = this.getExtends('floor-binder') as LayerFloorBinder;
         const floor = extend ? extend.getFloor() : void 0;
-        const map = floor ? core.status.mapBlockObjs[floor] : void 0;
+        const map =
+            this.layer === 'event' && floor
+                ? core.status.mapBlockObjs[floor]
+                : void 0;
         render.forEach(v => {
             const x = v % width;
             const y = Math.floor(v / width);
diff --git a/src/game/enemy/damage.ts b/src/game/enemy/damage.ts
index 26b3c32..891a365 100644
--- a/src/game/enemy/damage.ts
+++ b/src/game/enemy/damage.ts
@@ -989,11 +989,7 @@ export function calDamageWith(
     info: EnemyInfo,
     hero: Partial<HeroStatus>
 ): number | null {
-    const {
-        hp,
-        mdef,
-        special: heroSpec = { num: [], last: [] }
-    } = core.status.hero;
+    const { hp, mdef } = core.status.hero;
     let { atk, def, hpmax, mana, magicDef } = hero as HeroStatus;
     let { hp: monHp, atk: monAtk, def: monDef, special, enemy } = info;
 
@@ -1008,13 +1004,6 @@ export function calDamageWith(
         monAtk += delta;
     }
 
-    // 勇士学习的饥渴
-    if (heroSpec.num.includes(7)) {
-        const delta = Math.floor((monAtk * heroSpec.hungry!) / 100);
-        atk += delta;
-        monAtk -= delta;
-    }
-
     let heroPerDamage: number;
 
     // 绝对防御
@@ -1038,11 +1027,6 @@ export function calDamageWith(
 
     heroPerDamage *= 1 - info.damageDecline / 100;
 
-    // 勇士学习勇气之刃
-    if (heroSpec.num.includes(10)) {
-        monHp -= (heroSpec.courage / 100 - 1) * heroPerDamage;
-    }
-
     let enemyPerDamage: number;
 
     // 魔攻
@@ -1058,16 +1042,6 @@ export function calDamageWith(
     if (special.includes(5)) enemyPerDamage *= 3;
     if (special.includes(6)) enemyPerDamage *= info.n!;
 
-    // 勇士学习霜冻
-    if (heroSpec.num.includes(20)) {
-        enemyPerDamage *= 1 - heroSpec.ice / 100;
-    }
-
-    // 勇士学习苍蓝刻
-    if (heroSpec.num.includes(28)) {
-        enemyPerDamage *= 1 - heroSpec.paleShield / 100;
-    }
-
     if (enemyPerDamage < 0) enemyPerDamage = 0;
 
     // 苍蓝刻
@@ -1075,34 +1049,8 @@ export function calDamageWith(
         heroPerDamage *= 1 - info.paleShield! / 100;
     }
 
-    // 勇士学习的连击
-    if (heroSpec.num.includes(4)) heroPerDamage *= 2;
-    if (heroSpec.num.includes(5)) heroPerDamage *= 3;
-    if (heroSpec.num.includes(6)) heroPerDamage *= heroSpec.n;
-
-    // 勇士学习勇气冲锋
-    const hasCharge = heroSpec.num.includes(11);
-    if (hasCharge) {
-        monHp -= (heroSpec.charge / 100) * heroPerDamage;
-    }
-
     let turn = Math.ceil(monHp / heroPerDamage);
 
-    // 勇士学习致命一击
-    if (heroSpec.num.includes(1)) {
-        const five =
-            4 * heroPerDamage + (heroPerDamage * (info.crit! - 100)) / 100;
-        const fTurn = Math.floor(monHp / five);
-        const last = monHp - fTurn * five;
-        const lastTurn = Math.min(last / heroPerDamage, 5);
-        turn = fTurn * 5 + lastTurn;
-    }
-
-    if (hasCharge) {
-        turn -= 5;
-        if (turn < 0) turn = 0;
-    }
-
     // 致命一击
     if (special.includes(1)) {
         const times = Math.floor(turn / 5);
@@ -1115,7 +1063,7 @@ export function calDamageWith(
     }
 
     // 勇气冲锋
-    if (special.includes(11) && !hasCharge) {
+    if (special.includes(11)) {
         damage += (info.charge! / 100) * enemyPerDamage;
         turn += 5;
     }
diff --git a/src/plugin/game/enemy/checkblock.ts b/src/plugin/game/enemy/checkblock.ts
index 2ca4aef..071cb67 100644
--- a/src/plugin/game/enemy/checkblock.ts
+++ b/src/plugin/game/enemy/checkblock.ts
@@ -116,7 +116,7 @@ function checkHunt(loc: string) {
 
     for (const [x, y, dir] of hunt) {
         const [tx, ty] = ofDir(x, y, dir);
-        if (core.noPass(tx, ty)) continue;
+        if (core.getBlock(tx, ty)) continue;
         action.push(
             {
                 type: 'move',
diff --git a/src/plugin/game/fallback.ts b/src/plugin/game/fallback.ts
index 6f367b1..4f9d5ce 100644
--- a/src/plugin/game/fallback.ts
+++ b/src/plugin/game/fallback.ts
@@ -313,7 +313,7 @@ export function init() {
                 const animate = fallbackIds++;
                 core.animateFrame.lastAsyncId = animate;
                 core.animateFrame.asyncId[animate] = cb;
-                this._openDoor_animate(block, x, y, callback);
+                // this._openDoor_animate(block, x, y, callback);
             }
         };
 
@@ -518,8 +518,6 @@ export function init() {
             time: number = 500,
             callback?: () => void
         ) {
-            console.log(heroMover.moving);
-
             if (heroMover.moving) return;
 
             const sx = core.getHeroLoc('x');
@@ -546,7 +544,6 @@ export function init() {
                     );
                 })
             );
-            console.log(ex, ey);
 
             if (!locked) core.unlockControl();
             core.setHeroLoc('x', ex);
diff --git a/src/plugin/game/skillTree.ts b/src/plugin/game/skillTree.ts
index af5775a..45aff28 100644
--- a/src/plugin/game/skillTree.ts
+++ b/src/plugin/game/skillTree.ts
@@ -181,7 +181,7 @@ export const skills: Record<Chapter, Skill[]> = {
                 level > 5 ? 100 * level ** 2 : 250 * level + 1250,
             front: [[10, 3]],
             loc: [4, 5],
-            max: 20,
+            max: 10,
             effect: level => [`增加${level * 2}%的血瓶回血量`]
         },
         {
diff --git a/src/ui/skillTree.vue b/src/ui/skillTree.vue
index 9976d9b..5b200b3 100644
--- a/src/ui/skillTree.vue
+++ b/src/ui/skillTree.vue
@@ -144,6 +144,7 @@ const desc = computed(() => {
 
 const effect = computed(() => {
     return [0, 1].map(v => {
+        update.value = update.value;
         const prefix = v === 0 ? '当前效果：' : '下一级效果：';
         const level = skillTree.getSkillLevel(skill.value.index);
         const content = skill.value.effect(level + v);
diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue
index ba0e019..47e7311 100644
--- a/src/ui/statusBar.vue
+++ b/src/ui/statusBar.vue
@@ -108,17 +108,6 @@
                             >查看技能</span
                         >
                     </div>
-                    <div v-if="studyOpened" class="status-item">
-                        <span
-                            id="status-study"
-                            class="button-text"
-                            @click.stop="openStudy"
-                            >学习</span
-                        >
-                    </div>
-                    <div v-if="studyOpened" class="status-item">
-                        <!-- 当前学习的技能 -->
-                    </div>
                 </div>
             </Scroll>
         </Box>
@@ -138,8 +127,6 @@ let main: HTMLDivElement;
 
 const imgs = core.material.images.images;
 
-const skillTree = Mota.Plugin.require('skillTree_g');
-
 const width = ref(
     isMobile ? window.innerWidth - 60 : window.innerWidth * 0.175
 );
@@ -159,7 +146,6 @@ const skill = ref<string>(flags.autoSkill ? '自动切换' : '无');
 const up = ref(0);
 const spring = ref<number>();
 const skillOpened = ref(core.getFlag('chapter', 0) > 0);
-const studyOpened = ref(skillTree.getSkillLevel(11) > 0);
 const jumpCnt = ref<number>();
 /**
  * 要展示的勇士属性
@@ -209,7 +195,6 @@ function update() {
         spring.value = void 0;
     }
     skillOpened.value = core.getFlag('chapter', 0) > 0;
-    studyOpened.value = skillTree.getSkillLevel(11) > 0;
     jumpCnt.value =
         flags.skill2 &&
         !Mota.Plugin.require('skill_g').jumpIgnoreFloor.has(core.status.floorId)