merge

nrebei2 · May 20, 2023 · 7443a24 · 7443a24
2 parents 2b50dbd + 77ed687
commit 7443a24
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 5 deletions.
diff --git a/assets/images/villager/Village1_Down_Attack.png b/assets/images/villager/Village1_Down_Attack.png
diff --git a/assets/images/villager/Village1_Down_Walking.png b/assets/images/villager/Village1_Down_Walking.png
diff --git a/assets/images/villager/Village1_Left_Attacking.png b/assets/images/villager/Village1_Left_Attacking.png
diff --git a/assets/images/villager/Village1_Left_Walking.png b/assets/images/villager/Village1_Left_Walking.png
diff --git a/assets/images/villager/Village1_Right_Attacking.png b/assets/images/villager/Village1_Right_Attacking.png
diff --git a/assets/images/villager/Village1_Right_Walking.png b/assets/images/villager/Village1_Right_Walking.png
diff --git a/assets/images/villager/Village1_Up_Attacking.png b/assets/images/villager/Village1_Up_Attacking.png
diff --git a/assets/images/villager/Village1_Up_Walking.png b/assets/images/villager/Village1_Up_Walking.png
diff --git a/assets/images/villager/idle-b.png b/assets/images/villager/idle-b.png
diff --git a/assets/images/villager/idle-f.png b/assets/images/villager/idle-f.png
diff --git a/assets/jsons/enemies.json b/assets/jsons/enemies.json
@@ -97,7 +97,7 @@
     "texture": {
       "name": "idle-r",
       "origin": [
-        247,
+        350,
         36
       ],
       "scale": 0.3

diff --git a/assets/screens/pause-screen/pause_editor.png b/assets/screens/pause-screen/pause_editor.png
diff --git a/core/src/infinityx/lunarhaze/controllers/EnemyState.java b/core/src/infinityx/lunarhaze/controllers/EnemyState.java
@@ -232,7 +232,7 @@ public void update(EnemyController entity) {
 
                 //if in stealth just walk towards target and attack if close enough
                 if (!entity.getEnemy().isInBattle()) {
-                    if (targetDst <= entity.getEnemy().getAttackRange() && entity.getAttackHandler().canStartNewAttack()) {
+                    if (targetDst <= entity.getEnemy().getAttackRange() - 0.1f && entity.getAttackHandler().canStartNewAttack()) {
                         entity.getStateMachine().changeState(ATTACK);
                         return;
                     }
@@ -245,7 +245,7 @@ public void update(EnemyController entity) {
                         entity.time = 0;
                     }
                 } else {
-                    if (targetDst <= entity.getEnemy().getAttackRange() && entity.getAttackHandler().canStartNewAttack()) {
+                    if (targetDst <= entity.getEnemy().getAttackRange() - 0.1f && entity.getAttackHandler().canStartNewAttack()) {
                         entity.getStateMachine().changeState(ATTACK);
                         return;
                     }

diff --git a/core/src/infinityx/lunarhaze/models/Board.java b/core/src/infinityx/lunarhaze/models/Board.java
@@ -249,8 +249,8 @@ public void draw(GameCanvas canvas, Vector2 pos, boolean editor) {
             }
         } else {
             // Draw any out of bounds tiles close to player
-            for (int i = worldToBoardX(pos.x) - 12; i < worldToBoardX(pos.x) + 12; i++) {
-                for (int j = worldToBoardY(pos.y) - 12; j < worldToBoardY(pos.y) + 12; j++) {
+            for (int i = worldToBoardX(pos.x) - 13; i < worldToBoardX(pos.x) + 13; i++) {
+                for (int j = worldToBoardY(pos.y) - 13; j < worldToBoardY(pos.y) + 13; j++) {
                     if (!inBounds(i, j)) {
                         drawTile(i, j, canvas, pos, false);
                     }