diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java index 19c2836f7d1..d4eaaacedc9 100644 --- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java @@ -49,7 +49,10 @@ public class EnemySprite extends CharacterSprite { @Override void updateBoundingRect() { //We want enemies to take the full tile. - boundingRect.set(getX(), getY(), getWidth(), getHeight()); + float scale = data == null ? 1f : data.scale; + if (scale < 0) + scale = 1f; + boundingRect.set(getX(), getY(), getWidth()*scale, getHeight()*scale); } public void moveTo(Actor other, float delta) { diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.atlas index 93a676e8172..a676ae23464 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.atlas @@ -1,93 +1,90 @@ ooze.png -size: 256,160 +size: 242, 106 format: RGBA8888 -filter: Nearest,Nearest -repeat: none +filter: Nearest, Nearest +repeat: none Avatar - xy: 9, 151 - size: 15, 9 -Idle - xy: 0, 0 - size: 32, 32 -Idle - xy: 32, 0 - size: 32, 32 -Idle - xy: 64, 0 - size: 32, 32 -Idle - xy: 96, 0 + xy: 36, 4 size: 32, 32 -Idle - xy: 0, 96 - size: 32, 32 -Idle - xy: 32, 96 - size: 32, 32 -Idle - xy: 64, 96 - size: 32, 32 -Idle - xy: 96, 96 - size: 32, 32 -Walk - xy: 0, 32 - size: 32, 32 -Walk - xy: 32, 32 - size: 32, 32 -Walk - xy: 64, 32 - size: 32, 32 -Walk - xy: 96, 32 - size: 32, 32 -Walk - xy: 128, 32 - size: 32, 32 -Walk - xy: 160, 32 - size: 32, 32 -Walk - xy: 192, 32 - size: 32, 32 -Walk - xy: 224, 32 - size: 32, 32 -Attack - xy: 0, 64 - size: 32, 32 -Attack - xy: 32, 64 - size: 32, 32 -Attack - xy: 64, 64 - size: 32, 32 -Attack - xy: 96, 64 - size: 32, 32 -Attack - xy: 128, 64 - size: 32, 32 -Attack - xy: 160, 64 - size: 32, 32 -Death - xy: 0, 128 +Idle + xy: 172, 4 + size: 32, 32 +Idle + xy: 2, 4 + size: 32, 32 + orig: 32, 32 +Idle + xy: 36, 4 + size: 32, 32 +Idle + xy: 172, 4 + size: 32, 32 +Idle + xy: 70, 4 + size: 32, 32 +Idle + xy: 104, 4 + size: 32, 32 +Idle + xy: 138, 4 + size: 32, 32 +Walk + xy: 172, 4 + size: 32, 32 +Walk + xy: 2, 4 + size: 32, 32 +Walk + xy: 206, 4 + size: 32, 32 +Walk + xy: 2, 38 + size: 32, 32 +Walk + xy: 36, 38 + size: 32, 32 +Walk + xy: 70, 38 + size: 32, 32 +Walk + xy: 104, 38 + size: 32, 32 +Walk + xy: 138, 38 + size: 32, 32 +Attack + xy: 172, 4 + size: 32, 32 +Attack + xy: 2, 4 + size: 32, 32 +Attack + xy: 172, 38 + size: 32, 32 +Attack + xy: 206, 38 + size: 32, 32 +Attack + xy: 2, 72 + size: 32, 32 +Attack + xy: 36, 72 + size: 32, 32 +Death + xy: 172, 4 + size: 32, 32 +Death + xy: 70, 72 + size: 32, 32 +Death + xy: 104, 72 + size: 32, 32 +Death + xy: 138, 72 + size: 32, 32 +Death + xy: 172, 72 + size: 32, 32 +Death + xy: 206, 72 size: 32, 32 -Death - xy: 32, 128 - size: 32, 32 -Death - xy: 64, 128 - size: 32, 32 -Death - xy: 96, 128 - size: 32, 32 -Death - xy: 128, 128 - size: 32, 32 -Death - xy: 160, 128 - size: 32, 32 - diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.png index a6a51e31168..af32ad89d52 100644 Binary files a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.png and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/ooze.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index 1ceb38ff47a..14ca4d37a2f 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -3993,6 +3993,7 @@ { "name": "Ooze", "sprite": "sprites/dungeon/ooze.atlas", + "scale": 0.6, "deck": [ "decks/ooze.json" ],