From bb5ebdf4528a1e3510c11829206f148d1eea184e Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sat, 4 Jul 2020 20:29:47 +0800
Subject: [PATCH] v2.x bigmap

---
 project/functions.js | 9 ++++-----
 project/plugins.js   | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/project/functions.js b/project/functions.js
index c857e7f8..87a7c960 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -1167,7 +1167,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		type = {}, // 每个点的伤害类型
 		repulse = {}, // 每个点的阻击怪信息
 		ambush = {}; // 每个点的捕捉信息
-	var betweenAttackLocs = {}; // 所有带夹击的怪物
+	var betweenAttackLocs = {}; // 所有可能的夹击点
 	var needCache = false;
 	var canGoDeadZone = core.flags.canGoDeadZone;
 	core.flags.canGoDeadZone = true;
@@ -1294,8 +1294,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		if ((core.status.event.id == 'book' || core.status.event.id == 'bool-detail') && core.status.event.ui) needCache = true;
 	}
 
-	// 更新夹击伤害
-	// 如果要防止夹击伤害，可以简单的将 flag:no_betweenAttack 设为true
+	// 对每个可能的夹击点计算夹击伤害
 	for (var loc in betweenAttackLocs) {
 		var xy = loc.split(","),
 			x = parseInt(xy[0]),
@@ -1306,14 +1305,14 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		// 检查左右夹击
 		var leftBlock = blocks[(x - 1) + "," + y],
 			rightBlock = blocks[(x + 1) + "," + y];
-		if (leftBlock && !leftBlock.disable && rightBlock && !rightBlock.disable &&  leftBlock.id == rightBlock.id) {
+		if (leftBlock && !leftBlock.disable && rightBlock && !rightBlock.disable && leftBlock.id == rightBlock.id) {
 			if (core.hasSpecial(leftBlock.event.id, 16))
 				enemyId1 = leftBlock.event.id;
 		}
 		// 检查上下夹击
 		var topBlock = blocks[x + "," + (y - 1)],
 			bottomBlock = blocks[x + "," + (y + 1)];
-		if (topBlock && !topBlock.disable &&  bottomBlock && !bottomBlock.disable && topBlock.id == bottomBlock.id) {
+		if (topBlock && !topBlock.disable && bottomBlock && !bottomBlock.disable && topBlock.id == bottomBlock.id) {
 			if (core.hasSpecial(topBlock.event.id, 16))
 				enemyId2 = topBlock.event.id;
 		}
diff --git a/project/plugins.js b/project/plugins.js
index 95168369..dc8ec107 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -426,7 +426,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			"events", "changeFloor", "afterBattle", "afterGetItem", "afterOpenDoor", "cannotMove"
 		];
 	}
-
 	////// 绘制背景和前景层 //////
 	core.maps._drawBg_draw = function (floorId, toDrawCtx, cacheCtx, config) {
 		config.ctx = cacheCtx;
@@ -457,8 +456,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		if (config.onMap) core.drawImage('fg2', cacheCtx.canvas, core.bigmap.v2 ? -32 : 0, core.bigmap.v2 ? -32 : 0);
 		config.ctx = toDrawCtx;
 	}
-
-	/* cannotIn/cannotOut适配 start*/
+	////// 移动判定 //////
 	core.maps._generateMovableArray_arrays = function (floorId) {
 		return {
 			bgArray: this.getBgMapArray(floorId),