diff --git a/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java b/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java index d17edda..7a2a005 100755 --- a/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java +++ b/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java @@ -52,6 +52,7 @@ public class Shard extends Entity { public void reset() { hp = 0; maxHp = 0; + super.reset(); } @Override diff --git a/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java b/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java index 974804c..5617ae0 100755 --- a/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java +++ b/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java @@ -15,7 +15,6 @@ import com.badlogic.gdx.utils.Array; import zero1hd.rhythmbullet.entity.Entity; import zero1hd.rhythmbullet.entity.EntityFrame; -import zero1hd.rhythmbullet.entity.EntityIndex; import zero1hd.rhythmbullet.entity.EntityManager; import zero1hd.rhythmbullet.entity.ally.Laser; import zero1hd.rhythmbullet.entity.coordinator.Coordinator; @@ -28,7 +27,6 @@ import zero1hd.rhythmbullet.entity.enemies.Shard; import zero1hd.rhythmbullet.entity.enemies.VoidCircle; public class SpawnerWindow extends Window { - private EntityManager ec; private Stage stage; private HashMap params = new HashMap<>(); @@ -48,14 +46,17 @@ public class SpawnerWindow extends Window { public SpawnerWindow(String title, Skin skin, EntityManager em, CoordinatorManager cm, Stage stageForEntities) { super(title, skin, "tinted"); - this.ec = em; stage = stageForEntities; + defaults().pad(15f); + mod1 = new Slider(0.1f, 50f, 0.01f, true, skin); mod2 = new Slider(0f, 15f, 0.01f, true, skin); mod3 = new Slider(0.1f, 15f, 0.01f, true, skin); mod4 = new Slider(1f, 12f, 0.01f, true, skin); + add(mod1, mod2, mod3, mod4); + listOfEntities = new List<>(skin); entityFrames.add(em.bar); entityFrames.add(em.flake); @@ -66,7 +67,7 @@ public class SpawnerWindow extends Window { listOfEntities.setItems(entityFrames); entityListScroller = new ScrollPane(listOfEntities, skin); - add(entityListScroller).height(350f).width(200f); + add(entityListScroller).width(100f).fillY(); listOfCoordinators = new List<>(skin); @@ -75,9 +76,8 @@ public class SpawnerWindow extends Window { listOfCoordinators.setItems(coordinatorFrames); coordinatorListScroller = new ScrollPane(listOfCoordinators, skin); - add(coordinatorListScroller).height(350f).width(200f); + add(coordinatorListScroller).width(100f).fillY(); - add(mod1, mod2, mod3, mod4); pack(); }