From 8281249806eca3ae8447bddde9d00a1a9b3ae7a9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 10 Mar 2018 21:48:20 +0900
Subject: [PATCH] Fix bug

---
 src/common/othello/core.ts | 13 +++++++++----
 src/common/othello/maps.ts | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/common/othello/core.ts b/src/common/othello/core.ts
index e7e725aaf0..3a181a3eb9 100644
--- a/src/common/othello/core.ts
+++ b/src/common/othello/core.ts
@@ -224,10 +224,15 @@ export default class Othello {
 
 				// 座標が指し示す位置がボード外に出たとき
 				if (this.opts.loopedBoard) {
-					if (x <  0             ) x = this.mapWidth - (-x);
-					if (y <  0             ) y = this.mapHeight - (-y);
-					if (x >= this.mapWidth ) x = x - this.mapWidth;
-					if (y >= this.mapHeight) y = y - this.mapHeight;
+					if (x <  0             ) x = this.mapWidth - ((-x) % this.mapWidth);
+					if (y <  0             ) y = this.mapHeight - ((-y) % this.mapHeight);
+					if (x >= this.mapWidth ) x = x % this.mapWidth;
+					if (y >= this.mapHeight) y = y % this.mapHeight;
+
+					// for debug
+					//if (x < 0 || y < 0 || x >= this.mapWidth || y >= this.mapHeight) {
+					//	console.log(x, y);
+					//}
 
 					// 一周して自分に帰ってきたら
 					if (this.transformXyToPos(x, y) == initPos) break;
diff --git a/src/common/othello/maps.ts b/src/common/othello/maps.ts
index 3518259bba..81b9663c38 100644
--- a/src/common/othello/maps.ts
+++ b/src/common/othello/maps.ts
@@ -815,3 +815,22 @@ export const test2: Map = {
 		'-w--b-'
 	]
 };
+
+export const test3: Map = {
+	name: 'Test3',
+	category: 'Test',
+	data: [
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'---',
+		'b--',
+	]
+};