From f5e30f53e00dde2c72e446f9193d28150e6627b1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 30 Apr 2017 20:11:15 -0400 Subject: [PATCH] More fixes --- core/assets/music/place.wav | Bin 0 -> 24620 bytes core/assets/music/shoot.wav | Bin 0 -> 10188 bytes core/assets/sprites/moment.atlas | 20 ++++++++-------- core/assets/sprites/moment.png | Bin 4233 -> 4244 bytes core/src/io/anuke/moment/Control.java | 9 ++++--- core/src/io/anuke/moment/Moment.java | 22 ++++++++++-------- core/src/io/anuke/moment/UI.java | 4 +++- core/src/io/anuke/moment/entities/Enemy.java | 8 ++++++- core/src/io/anuke/moment/entities/Player.java | 4 ++-- core/src/io/anuke/moment/resource/Recipe.java | 4 ++-- core/src/io/anuke/moment/world/TileType.java | 4 ++-- 11 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 core/assets/music/place.wav create mode 100644 core/assets/music/shoot.wav diff --git a/core/assets/music/place.wav b/core/assets/music/place.wav new file mode 100644 index 0000000000000000000000000000000000000000..f9f194d208462010074f84db55dcb01bb32ab0aa GIT binary patch literal 24620 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 G2mk=LeqNsd literal 0 HcmV?d00001 diff --git a/core/assets/music/shoot.wav b/core/assets/music/shoot.wav new file mode 100644 index 0000000000000000000000000000000000000000..df95d03a3c8bf66f60e25e8499d4e3a201717407 GIT binary patch literal 10188 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 literal 4233 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 diff --git a/core/src/io/anuke/moment/Control.java b/core/src/io/anuke/moment/Control.java index b55590a45c..fb48c76c5e 100644 --- a/core/src/io/anuke/moment/Control.java +++ b/core/src/io/anuke/moment/Control.java @@ -12,7 +12,6 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; -import io.anuke.gif.GifRecorder; import io.anuke.moment.ai.Pathfind; import io.anuke.moment.entities.TileEntity; import io.anuke.moment.resource.ItemStack; @@ -29,7 +28,7 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Timers; public class Control extends RendererModule{ - GifRecorder recorder = new GifRecorder(batch); + //GifRecorder recorder = new GifRecorder(batch); int rangex = 10, rangey = 10; float breaktime = 0; float breakdur = 50; @@ -290,7 +289,7 @@ public class Control extends RendererModule{ drawDefault(); - recorder.update(); + //recorder.update(); } @Override @@ -431,7 +430,7 @@ public class Control extends RendererModule{ buffers.remove("shadow"); buffers.add("shadow", (int) (Gdx.graphics.getWidth() / cameraScale), (int) (Gdx.graphics.getHeight() / cameraScale)); - rangex = (int) (width / tilesize / cameraScale/2)+1; - rangey = (int) (height / tilesize / cameraScale/2)+1; + rangex = (int) (width / tilesize / cameraScale/2)+2; + rangey = (int) (height / tilesize / cameraScale/2)+2; } } diff --git a/core/src/io/anuke/moment/Moment.java b/core/src/io/anuke/moment/Moment.java index 7436ad0a55..46f20f0be5 100644 --- a/core/src/io/anuke/moment/Moment.java +++ b/core/src/io/anuke/moment/Moment.java @@ -34,7 +34,7 @@ public class Moment extends ModuleController{ public float respawntime = 60*5; public int wave = 1; - public float wavespace = 20*60; + public float wavespace = 35*60; public float wavetime; public float spawnspace = 65; public Tile core; @@ -90,6 +90,7 @@ public class Moment extends ModuleController{ //if(UInput.keyUp(Keys.Q)) // System.out.println("Enemies: " + Enemy.amount + " Wavetime: " + wavetime + " Wave: " + wave + " Wavespace: " + wavespace); + //System.out.println(Enemy.amount); if(Enemy.amount <= 0) wavetime -= delta(); @@ -123,13 +124,13 @@ public class Moment extends ModuleController{ generate(); player.x = core.worldx(); - player.y = core.worldy()+10; + player.y = core.worldy()-8; items.put(Item.stone, 20); - items.put(Item.stone, 2000); - items.put(Item.iron, 2000); - items.put(Item.steel, 2000); + //items.put(Item.stone, 2000); + //items.put(Item.iron, 2000); + //items.put(Item.steel, 2000); if(get(UI.class).about != null) get(UI.class).updateItems(); @@ -160,19 +161,20 @@ public class Moment extends ModuleController{ int x = core.x, y = core.y; set(x, y-1, TileType.conveyor, 1); - set(x, y-2, TileType.router, 0); + set(x, y-2, TileType.conveyor, 1); set(x, y-3, TileType.conveyor, 1); set(x, y-4, TileType.stonedrill, 0); //just in case tiles[x][y-4].setFloor(TileType.stone); - set(x+1, y-2, TileType.conveyor, 0); - set(x+2, y-2, TileType.conveyor, 1); + + tiles[x+2][y-2].setFloor(TileType.stone); + set(x+2, y-2, TileType.stonedrill, 0); set(x+2, y-1, TileType.conveyor, 1); set(x+2, y, TileType.turret, 0); - set(x-1, y-2, TileType.conveyor, 2); - set(x-2, y-2, TileType.conveyor, 1); + tiles[x-2][y-2].setFloor(TileType.stone); + set(x-2, y-2, TileType.stonedrill, 0); set(x-2, y-1, TileType.conveyor, 1); set(x-2, y, TileType.turret, 0); } diff --git a/core/src/io/anuke/moment/UI.java b/core/src/io/anuke/moment/UI.java index 78d222964c..3ac2d554c1 100644 --- a/core/src/io/anuke/moment/UI.java +++ b/core/src/io/anuke/moment/UI.java @@ -169,12 +169,14 @@ public class UI extends SceneModule{ tutorial.content().add( "[GREEN]Default Controls:[WHITE]\n[YELLOW][[WASD][] to move, [YELLOW][[R][] to rotate blocks." - + "\n[YELLOW][[R-MOUSE][] to destroy blocks, [YELLOW][[L-MOUSE][] to place them." + + "\nHold [YELLOW][[R-MOUSE][] to destroy blocks, click [YELLOW][[L-MOUSE][] to place them." + "\n[YELLOW][[L-MOUSE][] to shoot." + "\n\n[GOLD]Every 20 seconds, a new wave will appear." + "\nBuild turrets to defend the core." + "\nIf the core is destroyed, you lose the game." + "\n[LIME]To collect building resources, \nmove them into the core with conveyors." + + "\n[LIME]Place [ORANGE]drills[] on the right material,\nthey will automatically mine material\nand dump it to nearby conveyors or turrets." + + "\n\n[SCARLET]To produce steel, feed coal and iron into a smelter." ); tutorial.content().pad(8); diff --git a/core/src/io/anuke/moment/entities/Enemy.java b/core/src/io/anuke/moment/entities/Enemy.java index 6f342ef919..ccb814d791 100644 --- a/core/src/io/anuke/moment/entities/Enemy.java +++ b/core/src/io/anuke/moment/entities/Enemy.java @@ -45,7 +45,13 @@ public class Enemy extends DestructibleEntity{ Moment.module(Control.class).tryMove(this, vec.x*delta, vec.y*delta); //if(Timers.get(this, 10)) - target = TileType.findTileTarget(x, y, null, range, false); + target = TileType.findTileTarget(x, y, null, range, false); + + //no tile found + if(target == null) + target = Entities.getClosest(x, y, range, e->{ + return e instanceof Player; + }); if(target != null){ if(Timers.get(this, reload)){ diff --git a/core/src/io/anuke/moment/entities/Player.java b/core/src/io/anuke/moment/entities/Player.java index 77b3589e76..8cb660812c 100644 --- a/core/src/io/anuke/moment/entities/Player.java +++ b/core/src/io/anuke/moment/entities/Player.java @@ -36,7 +36,7 @@ public class Player extends DestructibleEntity{ Effects.effect("respawn", this); Timers.run(Moment.i.respawntime, ()->{ - set(Moment.i.core.worldx(), Moment.i.core.worldy()+8); + set(Moment.i.core.worldx(), Moment.i.core.worldy()-8); heal(); add(); }); @@ -53,7 +53,7 @@ public class Player extends DestructibleEntity{ @Override public void update(){ - if(health < maxhealth && Timers.get(this, 30)) + if(health < maxhealth && Timers.get(this, 50)) health ++; vector.set(0, 0); diff --git a/core/src/io/anuke/moment/resource/Recipe.java b/core/src/io/anuke/moment/resource/Recipe.java index 5d36747ee3..a9bf9cfe95 100644 --- a/core/src/io/anuke/moment/resource/Recipe.java +++ b/core/src/io/anuke/moment/resource/Recipe.java @@ -22,8 +22,8 @@ public enum Recipe{ flameturret(defense, TileType.flameturret, stack(Item.iron, 25), stack(Item.steel, 18)), sniperturret(defense, TileType.sniperturret, stack(Item.iron, 30), stack(Item.steel, 20)), - healturret(defense, TileType.healturret, stack(Item.iron, 40)), - megahealturret(defense, TileType.megahealturret, stack(Item.iron, 30), stack(Item.steel, 40)), + healturret(defense, TileType.repairturret, stack(Item.iron, 40)), + megahealturret(defense, TileType.megarepairturret, stack(Item.iron, 30), stack(Item.steel, 40)), drill(production, TileType.stonedrill, stack(Item.stone, 6)), irondrill(production, TileType.irondrill, stack(Item.stone, 40)), diff --git a/core/src/io/anuke/moment/world/TileType.java b/core/src/io/anuke/moment/world/TileType.java index 6ea158ae88..c9d484ec8c 100644 --- a/core/src/io/anuke/moment/world/TileType.java +++ b/core/src/io/anuke/moment/world/TileType.java @@ -415,7 +415,7 @@ public enum TileType{ } }, - healturret(true, true, false){ + repairturret(true, true, false){ { range = 30; reload = 40f; @@ -469,7 +469,7 @@ public enum TileType{ return "Heals nearby tiles."; } }, - megahealturret(true, true, false){ + megarepairturret(true, true, false){ { range = 30; reload = 20f;