From 94d6b5f67b0018c342927ed386acf177fb2577fe Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 14 Feb 2023 10:22:11 +0100
Subject: [PATCH] update
---
.../adventure/character/CharacterSprite.java | 8 ++-----
.../src/forge/adventure/data/EnemyData.java | 6 +++---
.../Shandalar/maps/map/kobold_mine.tmx | 12 +++++------
.../Shandalar/maps/map/slimefoot_boss.tmx | 4 ++--
.../Shandalar/sprites/dungeon/kobold.atlas | 20 ------------------
.../Shandalar/sprites/dungeon/kobold.png | Bin 12199 -> 0 bytes
.../adventure/Shandalar/world/enemies.json | 7 +++---
7 files changed, 16 insertions(+), 41 deletions(-)
delete mode 100644 forge-gui/res/adventure/Shandalar/sprites/dungeon/kobold.atlas
delete mode 100644 forge-gui/res/adventure/Shandalar/sprites/dungeon/kobold.png
diff --git a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
index cb7abbc179d..66d9a30f106 100644
--- a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
+++ b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
@@ -33,12 +33,8 @@ public class CharacterSprite extends MapActor {
}
@Override
- void updateBoundingRect() {
- float scale = 1f;
- if (this instanceof EnemySprite) {
- scale = ((EnemySprite) this).getData().scale;
- }//We want a slimmer box for the player entity so it can navigate terrain without getting stuck.
- boundingRect.set(getX() + 4, getY(), getWidth()*scale - 6, getHeight() * collisionHeight * scale);
+ void updateBoundingRect() {//We want a slimmer box for the player entity so it can navigate terrain without getting stuck.
+ boundingRect.set(getX() + 4, getY(), getWidth() - 6, getHeight() * collisionHeight);
}
protected void load(String path) {
diff --git a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
index c48412ca620..6bcce3e2296 100644
--- a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
@@ -19,7 +19,7 @@ public class EnemyData {
public float spawnRate;
public float difficulty;
public float speed;
- public float scale;
+ public float scale = 1.0f;
public int life;
public RewardData[] rewards;
public String[] equipment;
@@ -45,9 +45,9 @@ public class EnemyData {
equipment = enemyData.equipment;
colors = enemyData.colors;
teamNumber = enemyData.teamNumber;
- nextEnemy =enemyData.nextEnemy==null?null: new EnemyData(enemyData.nextEnemy);
+ nextEnemy =enemyData.nextEnemy==null?null: new EnemyData(enemyData.nextEnemy);
if(enemyData.scale == 0.0f) {
- scale=1.0f;
+ scale =1.0f;
}
if(enemyData.rewards == null) {
rewards=null;
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/kobold_mine.tmx b/forge-gui/res/adventure/Shandalar/maps/map/kobold_mine.tmx
index ee483edb5ae..bc7cf7852d0 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/kobold_mine.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/kobold_mine.tmx
@@ -35,34 +35,34 @@
-