diff --git a/android/assets/1280x720/flake.png b/android/assets/1280x720/flake.png index cf099e0..d73c496 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 92372aa..0c1543b 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 d083b63..7056272 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 e5555a6..818e80e 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 a9b0ba2..d2a0729 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 70ce5e2..c8d7937 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 2d1290a..43fcae4 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 4e4de99..4d9c737 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/EntityController.java b/core/src/zero1hd/polyjet/entity/EntityController.java index 7e29bba..2406e3b 100755 --- a/core/src/zero1hd/polyjet/entity/EntityController.java +++ b/core/src/zero1hd/polyjet/entity/EntityController.java @@ -134,7 +134,6 @@ public class EntityController { pelletPool.free(pellet); break; case SHARD: - System.out.println("freed"); Shard shard = (Shard) entity; shard.remove(); shardPool.free(shard); diff --git a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java index 7507045..63face4 100755 --- a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java +++ b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java @@ -24,6 +24,7 @@ public class PolyJetEntity extends Actor implements Entity { private float speed, accel; private float rate; public PolyJetEntity(AssetManager assets, float speed, float accel, String jet) { + health = 100; this.speed = speed; this.accel = accel; setSize(1.5f, 1.5f); diff --git a/core/src/zero1hd/polyjet/entity/enemies/Shard.java b/core/src/zero1hd/polyjet/entity/enemies/Shard.java index c0fd6f0..3d0741f 100755 --- a/core/src/zero1hd/polyjet/entity/enemies/Shard.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Shard.java @@ -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((float)hp/(float)maxHp, 1f, 0.5f, 1f); + sprite.setColor((float)hp/(float)maxHp, 0f, 0f, 1f); sprite.draw(batch); batch.setColor(Color.WHITE); super.draw(batch, parentAlpha); diff --git a/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java b/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java index 41da8ad..596b156 100755 --- a/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java @@ -40,7 +40,7 @@ public class SpawnerWindow extends Window { 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, 8f, 0.01f, true, skin); + mod4 = new Slider(1f, 12f, 0.01f, true, skin); listOfEntities = new List<>(skin); listOfEntities.setItems(Entities.values()); @@ -62,7 +62,7 @@ public class SpawnerWindow extends Window { private Vector2 coords = new Vector2(); @Override public void act(float delta) { - if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.SHIFT_LEFT)) { + if (Gdx.input.justTouched() && Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) { coords.set(Gdx.input.getX(), Gdx.input.getY()); stage.screenToStageCoordinates(coords);