From 1c80683acc79c2895f68284b300103926a811946 Mon Sep 17 00:00:00 2001
From: Trungel <29035983+Trungel@users.noreply.github.com>
Date: Tue, 28 Sep 2021 00:07:00 +0200
Subject: [PATCH] Bug Fixes
---
src/components/Tile.vue | 16 ++++++++--------
src/store/index.js | 11 ++++++-----
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/Tile.vue b/src/components/Tile.vue
index 6ded551..cbb97bb 100644
--- a/src/components/Tile.vue
+++ b/src/components/Tile.vue
@@ -48,20 +48,20 @@ export default {
const isViewRadiusBorder = function() {
var borders = [];
//leftBorder
- if( props.tile.x == (this.store.state.centerX-this.store.state.radiusX) &&
- ((this.store.state.centerY-this.store.state.radiusY) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY))){
+ if( props.tile.x == (this.store.state.centerX-this.store.state.radiusX+1) &&
+ ((this.store.state.centerY-this.store.state.radiusY+1) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY-1))){
borders.push("viewBorderLeft");
}
- if( props.tile.x == (this.store.state.centerX+this.store.state.radiusX) &&
- ((this.store.state.centerY-this.store.state.radiusY) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY))){
+ if( props.tile.x == (this.store.state.centerX+this.store.state.radiusX-1) &&
+ ((this.store.state.centerY-this.store.state.radiusY+1) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY-1))){
borders.push("viewBorderRight")
}
- if( props.tile.y == (this.store.state.centerY+this.store.state.radiusY) &&
- ((this.store.state.centerX-this.store.state.radiusX) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX))){
+ if( props.tile.y == (this.store.state.centerY+this.store.state.radiusY-1) &&
+ ((this.store.state.centerX-this.store.state.radiusX+1) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX-1))){
borders.push("viewBorderTop")
}
- if( props.tile.y == (this.store.state.centerY-this.store.state.radiusY) &&
- ((this.store.state.centerX-this.store.state.radiusX) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX))){
+ if( props.tile.y == (this.store.state.centerY-this.store.state.radiusY+1) &&
+ ((this.store.state.centerX-this.store.state.radiusX+1) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX-1))){
borders.push("viewBorderBottom")
}
diff --git a/src/store/index.js b/src/store/index.js
index 2c14e51..28758a8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -42,13 +42,10 @@ const methods = {
},
loadMap(mapData) {
+ let tileSetData = this.getMultDimArrayFromFlattendArray(mapData.tileSet);
+
state.mapID = mapData.mapID;
state.mapName = mapData.mapName;
- state.initialViewRadiusX = mapData.initialViewRadiusX;
- state.initialViewRadiusY = mapData.initialViewRadiusY;
- state.initialVieCenterX = mapData.initialVieCenterX;
- state.initialViewCenterY = mapData.initialViewCenterY;
- let tileSetData = this.getMultDimArrayFromFlattendArray(mapData.tileSet);
state.mapSizeX = tileSetData.mapSizeX;
state.mapSizeY = tileSetData.mapSizeY;
state.lttMap = tileSetData.map;
@@ -56,6 +53,10 @@ const methods = {
state.minX = tileSetData.minX;
state.maxY = tileSetData.maxY;
state.minY = tileSetData.minY;
+ state.radiusX = mapData.initialViewRadiusX;
+ state.radiusY = mapData.initialViewRadiusY;
+ state.centerX = mapData.initialViewCenterX;
+ state.centerY = mapData.initialViewCenterY;
},
getMultDimArrayFromFlattendArray(arr){
--
GitLab