diff --git a/core/assets/Ai.png b/core/assets/Ai.png index 0f0e48b..9276e8b 100644 Binary files a/core/assets/Ai.png and b/core/assets/Ai.png differ diff --git a/core/assets/libgdxsplash.png b/core/assets/libgdxsplash.png index ff5f67d..570d1fb 100644 Binary files a/core/assets/libgdxsplash.png and b/core/assets/libgdxsplash.png differ diff --git a/core/src/se/angergard/game/system/DrawPossibleFloorPlacementsSystem.java b/core/src/se/angergard/game/system/DrawPossibleFloorPlacementsSystem.java index 9fbe5a2..d858880 100644 --- a/core/src/se/angergard/game/system/DrawPossibleFloorPlacementsSystem.java +++ b/core/src/se/angergard/game/system/DrawPossibleFloorPlacementsSystem.java @@ -62,7 +62,7 @@ public void update(float deltaTime) { } Objects.BATCH.setProjectionMatrix(Objects.camera.combined); - Objects.BATCH.setColor(new Color(0.0f, 0.0f, 1.0f, 0.6f)); + Objects.BATCH.setColor(new Color(0.0f, 0.0f, 1.0f, 0.4f)); Objects.BATCH.begin(); for(int i = 1; i < 8; i += 2){ diff --git a/core/src/se/angergard/game/system/MapControllerSystem.java b/core/src/se/angergard/game/system/MapControllerSystem.java index d125384..a294147 100644 --- a/core/src/se/angergard/game/system/MapControllerSystem.java +++ b/core/src/se/angergard/game/system/MapControllerSystem.java @@ -74,7 +74,6 @@ public class MapControllerSystem extends EntitySystem implements Initializable, public MapControllerSystem(MainGame game){ //Because MapControllerSystem checks alot of things this.game = game; } - private MainGame game; private Engine engine; private Entity player; @@ -89,7 +88,7 @@ public MapControllerSystem(MainGame game){ //Because MapControllerSystem checks private int lastGate = -1; @Override - public void init() { + public void init() { maps = new TiledMap[Values.MAPS]; TmxMapLoader mapLoader = new TmxMapLoader(new InternalFileHandleResolver()); @@ -292,10 +291,12 @@ private void spawnEnemies(TiledMap tiledMap, int level) { if(numberOfEnemies >= 8){ numberOfEnemies = 8; } - float speed = (float) Math.pow(1.04, level); + float speed = (float) Math.pow(1.045, level); for(int i = 0; i < numberOfEnemies; i++){ - Vector2 vec = spawnpoints.get(MathUtils.random(0, spawnpoints.size - 1)); + int random = MathUtils.random(0, spawnpoints.size - 1); + Vector2 vec = spawnpoints.get(random); + spawnpoints.removeIndex(random); Entity enemy = EntityUtils.createEnemyAStar(vec.x, vec.y, speed); enemies.add(enemy); engine.addEntity(enemy); diff --git a/core/src/se/angergard/game/tween/FloatTweener.java b/core/src/se/angergard/game/tween/FloatTweener.java index 259993d..fab9e55 100644 --- a/core/src/se/angergard/game/tween/FloatTweener.java +++ b/core/src/se/angergard/game/tween/FloatTweener.java @@ -27,7 +27,6 @@ public int getValues(FloatValue target, int tweenType, float[] returnValues) { @Override public void setValues(FloatValue target, int tweenType, float[] newValues) { - System.out.println(newValues[0]); target.value = newValues[0]; }