diff --git a/android/assets/1280x720/flake.png b/android/assets/1280x720/flake.png index d60baf8..cf099e0 100755 Binary files a/android/assets/1280x720/flake.png and b/android/assets/1280x720/flake.png differ diff --git a/android/assets/1280x800/flake.png b/android/assets/1280x800/flake.png index 32dd874..92372aa 100755 Binary files a/android/assets/1280x800/flake.png and b/android/assets/1280x800/flake.png differ diff --git a/android/assets/1366x768/flake.png b/android/assets/1366x768/flake.png index 5a7064a..d083b63 100755 Binary files a/android/assets/1366x768/flake.png and b/android/assets/1366x768/flake.png differ diff --git a/android/assets/1920x1080/flake.png b/android/assets/1920x1080/flake.png index 4c63c66..e5555a6 100755 Binary files a/android/assets/1920x1080/flake.png and b/android/assets/1920x1080/flake.png differ diff --git a/android/assets/1920x1200/flake.png b/android/assets/1920x1200/flake.png index c2fa5c5..a9b0ba2 100755 Binary files a/android/assets/1920x1200/flake.png and b/android/assets/1920x1200/flake.png differ diff --git a/android/assets/2560x1440/flake.png b/android/assets/2560x1440/flake.png index 909d5fb..70ce5e2 100755 Binary files a/android/assets/2560x1440/flake.png and b/android/assets/2560x1440/flake.png differ diff --git a/android/assets/3840x2160/flake.png b/android/assets/3840x2160/flake.png index d9365c0..2d1290a 100755 Binary files a/android/assets/3840x2160/flake.png and b/android/assets/3840x2160/flake.png differ diff --git a/android/assets/800x480/flake.png b/android/assets/800x480/flake.png index facd5c0..4e4de99 100755 Binary files a/android/assets/800x480/flake.png and b/android/assets/800x480/flake.png differ diff --git a/core/src/zero1hd/polyjet/entity/Entities.java b/core/src/zero1hd/polyjet/entity/Entities.java index f36ca74..63f7df9 100755 --- a/core/src/zero1hd/polyjet/entity/Entities.java +++ b/core/src/zero1hd/polyjet/entity/Entities.java @@ -1,9 +1,15 @@ package zero1hd.polyjet.entity; public enum Entities { - POLYJET, BAR, VOID_CIRCLE, SHARD, LASER, PELLET, FLAKE; + POLYJET(false), BAR(true), VOID_CIRCLE(true), SHARD(true), LASER(false), PELLET(true), FLAKE(true); - public float x; - public float y; - public float velocity; + private boolean enemy; + + private Entities(boolean enemy) { + this.enemy = enemy; + } + + public boolean isEnemy() { + return enemy; + } } diff --git a/core/src/zero1hd/polyjet/entity/EntityController.java b/core/src/zero1hd/polyjet/entity/EntityController.java index 7814abb..7e29bba 100755 --- a/core/src/zero1hd/polyjet/entity/EntityController.java +++ b/core/src/zero1hd/polyjet/entity/EntityController.java @@ -112,7 +112,11 @@ public class EntityController { } public void free(Entity entity) { - activeEnemies.removeValue(entity, true); + if (entity.getEntityType().isEnemy()) { + activeEnemies.removeValue(entity, true); + } else { + activeAllies.removeValue(entity, true); + } switch (entity.getEntityType()) { case VOID_CIRCLE: VoidCircle voidCircle = (VoidCircle) entity; @@ -130,6 +134,7 @@ public class EntityController { pelletPool.free(pellet); break; case SHARD: + System.out.println("freed"); Shard shard = (Shard) entity; shard.remove(); shardPool.free(shard); @@ -143,6 +148,7 @@ public class EntityController { Flake flake = (Flake) entity; flake.remove(); flakePool.free(flake); + break; default: break; } diff --git a/core/src/zero1hd/polyjet/entity/enemies/Flake.java b/core/src/zero1hd/polyjet/entity/enemies/Flake.java index b673c1a..f09018d 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/Flake.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Flake.java @@ -45,12 +45,9 @@ public class Flake extends Actor implements Poolable, Entity { timer -= delta; } moveBy(rot.x*delta*rate, rot.y*delta*rate); - System.out.println("START"); - System.out.println(getY()); for (int i = 0; i < shards.length; i++) { shards[i].setPosition(getX()+center.x-shards[i].getCenter().x, getY()+center.y-shards[i].getCenter().y); } - System.out.println(shards[0].getY()); hitbox.setPosition(getX(), getY()); diff --git a/core/src/zero1hd/polyjet/entity/enemies/Shard.java b/core/src/zero1hd/polyjet/entity/enemies/Shard.java index 07c8075..c0fd6f0 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/Shard.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Shard.java @@ -47,11 +47,11 @@ public class Shard extends Actor implements Entity, Poolable { @Override public void reset() { hp = 0; + maxHp = 0; setPosition(0, 0); angle.set(0, 0); center.set(0, 0); setSize(0, 0); - maxHp = 0; hitbox.set(0, 0, 0, 0); setSize(0, 0); sprite.setRotation(0); @@ -73,7 +73,7 @@ public class Shard extends Actor implements Entity, Poolable { public void draw(Batch batch, float parentAlpha) { sprite.setCenter(getX()+center.x, getY()+center.y); - sprite.setColor(1f, 0f, (float)hp/(float)maxHp, 1f); + sprite.setColor((float)hp/(float)maxHp, 1f, 0.5f, 1f); sprite.draw(batch); batch.setColor(Color.WHITE); super.draw(batch, parentAlpha);