From 6a8f80d2c7612e82065fa8dae6bee99ede037ba6 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sun, 12 Feb 2023 23:21:39 +0100 Subject: [PATCH] update --- .../src/forge/adventure/character/EnemySprite.java | 4 ++-- forge-gui-mobile/src/forge/adventure/data/EnemyData.java | 2 ++ forge-gui/res/adventure/Shandalar/config.json | 2 +- forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx | 6 +++++- .../res/adventure/Shandalar/sprites/dungeon/kiora.atlas | 2 +- forge-gui/res/adventure/Shandalar/world/black.json | 2 +- forge-gui/res/adventure/Shandalar/world/enemies.json | 3 +++ .../res/adventure/Shandalar/world/points_of_interest.json | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java index 19c2836f7d1..0b5a9ef9e8a 100644 --- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java @@ -37,7 +37,6 @@ public class EnemySprite extends CharacterSprite { public String nameOverride = ""; //Override name of this enemy in battles. public RewardData[] rewards; //Additional rewards for this enemy. public DialogData.ConditionData spawnCondition; //Condition to spawn. - public EnemySprite(EnemyData enemyData) { this(0,enemyData); } @@ -49,7 +48,8 @@ public class EnemySprite extends CharacterSprite { @Override void updateBoundingRect() { //We want enemies to take the full tile. - boundingRect.set(getX(), getY(), getWidth(), getHeight()); + float scale = this instanceof EnemySprite ? 2f :1f; + boundingRect.set(getX(), getY(), getWidth()*scale, getHeight()*scale); } public void moveTo(Actor other, float delta) { diff --git a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java index 172dbceea43..b647fc61f9a 100644 --- a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java +++ b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java @@ -19,6 +19,7 @@ public class EnemyData { public float spawnRate; public float difficulty; public float speed; + public float scale; public int life; public RewardData[] rewards; public String[] equipment; @@ -39,6 +40,7 @@ public class EnemyData { copyPlayerDeck = enemyData.copyPlayerDeck; difficulty = enemyData.difficulty; speed = enemyData.speed; + scale = enemyData.scale; life = enemyData.life; equipment = enemyData.equipment; colors = enemyData.colors; diff --git a/forge-gui/res/adventure/Shandalar/config.json b/forge-gui/res/adventure/Shandalar/config.json index c2011c4e772..53519ec009f 100644 --- a/forge-gui/res/adventure/Shandalar/config.json +++ b/forge-gui/res/adventure/Shandalar/config.json @@ -210,7 +210,7 @@ "Dominaria United", "Brother's War", "Jumpstart 22", - "Phyrexia: All Will Be One", + "Phyrexia ONE", "(All)" ] } diff --git a/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx b/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx index 8ea537ec2cd..b679026879b 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx @@ -31,11 +31,13 @@ - + { "startBattleWithCard": [ "Kraken Hatchling","Tropical Island" ] } + + @@ -52,6 +54,8 @@ + + diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/kiora.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/kiora.atlas index 921c7116ad2..179c307c9e4 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/kiora.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/kiora.atlas @@ -7,5 +7,5 @@ Avatar xy: 1,18 size: 27,19 Idle - xy: 21,8 + xy: 0,0 size: 28, 51 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json index c61178bc640..dca50af2b11 100644 --- a/forge-gui/res/adventure/Shandalar/world/black.json +++ b/forge-gui/res/adventure/Shandalar/world/black.json @@ -91,7 +91,7 @@ "CaveB6", "CaveB8", "CaveBA", - "Slimefoot's Lair" + "Slimefoots Lair" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index 7d6aa7af391..90f46f2a8a3 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -7853,6 +7853,7 @@ { "name": "Slimefoot", "sprite": "sprites/dungeon/slimefoot.atlas", + "scale": 0.25, "deck": [ "decks/miniboss/slimefoot.dck" ], @@ -7959,6 +7960,7 @@ { "name": "Crab", "sprite": "sprites/dungeon/crab.atlas", + "scale": 0.5, "deck": [ "decks/crab.dck" ], @@ -8019,6 +8021,7 @@ { "name": "Kiora", "sprite": "sprites/dungeon/kiora.atlas", + "scale": 0.25, "deck": [ "decks/miniboss/kiora.dck" ], diff --git a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json index c9d01950080..2566c4a714e 100644 --- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json +++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json @@ -1833,7 +1833,7 @@ "map": "maps/map/kobold_mine.tmx" }, { - "name": "Slimefoot's Lair", + "name": "Slimefoots Lair", "type": "dungeon", "count": 1, "radiusFactor": 0.8,