From 68079ac90841f9916042b459f403e9b980b5fb2c Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue, 14 Feb 2023 09:26:31 +0100 Subject: [PATCH] update --- .../adventure/character/CharacterSprite.java | 17 +++++++++++------ .../src/forge/adventure/data/EnemyData.java | 7 +++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java index fe459fb5394..cb7abbc179d 100644 --- a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.utils.Array; import forge.adventure.stage.SpriteGroup; import forge.adventure.util.Config; import java.util.HashMap; - /** * CharacterSprite base class for animated sprites on the map */ @@ -34,8 +33,12 @@ public class CharacterSprite extends MapActor { } @Override - 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); + 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); } protected void load(String path) { @@ -226,9 +229,11 @@ public class CharacterSprite extends MapActor { setWidth(currentFrame.getRegionWidth()); Color oldColor=batch.getColor().cpy(); batch.setColor(getColor()); - batch.draw(currentFrame, getX(), getY()); - float scale = this instanceof EnemySprite ? 2f : 1f ; - batch.draw(currentFrame, getX(), getY(), getWidth()*scale, getHeight()*scale); + float scale = 1f; + if (this instanceof EnemySprite) { + scale = ((EnemySprite) this).getData().scale; + } + batch.draw(currentFrame, getX(), getY(), getWidth()*scale, getHeight()*scale); batch.setColor(oldColor); super.draw(batch,parentAlpha); //batch.draw(getDebugTexture(),getX(),getY()); diff --git a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java index b647fc61f9a..c48412ca620 100644 --- a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java +++ b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java @@ -35,7 +35,7 @@ public class EnemyData { deck = enemyData.deck; ai = enemyData.ai; boss = enemyData.boss; - flying = enemyData.flying; + flying = enemyData.flying; spawnRate = enemyData.spawnRate; copyPlayerDeck = enemyData.copyPlayerDeck; difficulty = enemyData.difficulty; @@ -46,13 +46,16 @@ public class EnemyData { colors = enemyData.colors; teamNumber = enemyData.teamNumber; nextEnemy =enemyData.nextEnemy==null?null: new EnemyData(enemyData.nextEnemy); + if(enemyData.scale == 0.0f) { + scale=1.0f; + } if(enemyData.rewards == null) { rewards=null; } else { rewards = new RewardData[enemyData.rewards.length]; for(int i=0; i