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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 O{+)q;XW;+u8Tdc9eqNsd 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 zcmeI0`BxKX+s8p`wR%Kcd*pynaNk97ZR@_&TA#{eMJ?5?R;^N%+P7*^+|ag)N^RZS zr>$5-QK9l!Gm}haGRZ8-WM-1gOqR($SqLO-iGoFa6W>4L{e}B`PJYPAIg|TyfA8;g zU6cRTvSsL)q@;p{>y~cW`BheGQc_ZKTuW{zC7oQKoYW&JHR;ojzWV4t@!!Oklq7v9 zd?+l`FVs^SO7ns81LbYmZP_TrD8<|8+vpnY8f~4i&iI?-H%Dh{XX{Y!P%p$oJW8R| z3C#)3IORCyS=m|HzZL&h>_zvYUu(bCvPRbUx8rX|kG39dSZGpBNemIS!lL4TU%%>G$uQe9YrlgEpw&0(iP!~@V)+f{cG537@!1{y@B2U zEvMz@Rp(Xjlkby-hC;&`@r)R0iZpHaZ}<1M^tRN}we%=_6kY{a!9KtTM8F8hA}q3x z*hh$r$dp)1tcIW=m=;P4<=S#>Ti7k^RpKhqiF6|A@^rZzkOReVG3>;gSU#OkhlQ|E zEEP-TE#)mM94j0$qs&;Ltub?1Eie+PAb{ z@m%qcJjoBy57GNIe$6fAE#+`vIKawTd9AAU#U64ExrR(JQ@qr8sSybvfplxS^&#_+ znLtb+>X14l2FAcPpba<=pND;z56h$T=&|Op<}1<_sj{WAWuIf8V~A;psY~0Xovfa$ zo(au_4#*D3WL{+NDDCtH#&s1NnIBCd$X?y>)A{L^?(drv!DJzPBfvCEYTd8P2G2HGUDfh&%(Ifyr?lh7ZG4SQQ58 zA$@^RAS8Q}y%p^h?b}`3T@_pf_a5~gwO6xOb3u7QnFr(nyquRGRvlLP2p_S5-N0V6 zUbE%|bApZWbx*t}HW``>dD=W}6i}yf)5-iw{7S4=tya~^>*Vu+`9OuTLU~AYNVAAqM6Ko4a-vgomb8_$ zjh05g;Pngr3w;bfhHpYPA#TtOrpC1k-UWY&eTluRe^>t#{}X@Cea>AFEr{;$?C?ww zCJ3aS)LSqM#=s1`72FD*i7N_6;eW7yu%JGuUn(pW4tWlFHb*x{E8UguTE3Pq))(t9 zVi⪻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 literal 0 HcmV?d00001 diff --git a/core/assets/sprites/moment.atlas b/core/assets/sprites/moment.atlas index df3b54a81e..47f7f3fe89 100644 --- a/core/assets/sprites/moment.atlas +++ b/core/assets/sprites/moment.atlas @@ -165,13 +165,6 @@ grass orig: 8, 8 offset: 0, 0 index: -1 -healturret - rotate: false - xy: 49, 21 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 icon-coal rotate: false xy: 247, 23 @@ -251,7 +244,7 @@ laserend index: -1 machineturret rotate: false - xy: 49, 9 + xy: 49, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -263,9 +256,9 @@ mech1 orig: 8, 8 offset: 0, 0 index: -1 -megahealturret +megarepairturret rotate: false - xy: 61, 21 + xy: 49, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -277,6 +270,13 @@ player orig: 8, 8 offset: 0, 0 index: -1 +repairturret + rotate: false + xy: 61, 21 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 router rotate: false xy: 198, 13 diff --git a/core/assets/sprites/moment.png b/core/assets/sprites/moment.png index b55ad4a78a9aef871a6b0ab885b72cdf16b349e4..ff944819a835ed1844d1d5bce34ab4ddedc3328f 100644 GIT binary patch literal 4244 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 Yiu+nZR`!LZgKq<{FtIYOHX_9T5Aj>L1ONa4 literal 4233 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 OL08M*YQYtY!2bdLJJ2lv 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;