From 793580451743738a15298a2788506818d99b934b Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 3 May 2017 14:24:20 -0400 Subject: [PATCH] Improved background --- core/assets/sprites/back.png | Bin 0 -> 11473 bytes core/src/io/anuke/mindustry/Control.java | 2 -- core/src/io/anuke/mindustry/GameState.java | 3 +-- core/src/io/anuke/mindustry/UI.java | 24 +++++++++++------- .../mindustry/world/blocks/WeaponBlocks.java | 2 +- 5 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 core/assets/sprites/back.png diff --git a/core/assets/sprites/back.png b/core/assets/sprites/back.png new file mode 100644 index 0000000000000000000000000000000000000000..1280a92827e9756bba9bea86ca8f94e69d427bcf GIT binary patch literal 11473 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 G2~7a8HDRLw literal 0 HcmV?d00001 diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index c7ce3becbf..926e83e78b 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -95,8 +95,6 @@ public class Control extends RendererModule{ Input.doInput(); } - - if(core.block() == ProductionBlocks.core) camera.position.set(player.x, player.y, 0f); else diff --git a/core/src/io/anuke/mindustry/GameState.java b/core/src/io/anuke/mindustry/GameState.java index 94ff7b532c..ae215bb403 100644 --- a/core/src/io/anuke/mindustry/GameState.java +++ b/core/src/io/anuke/mindustry/GameState.java @@ -58,7 +58,7 @@ public class GameState{ Enemy enemy = null; - if(wave%5 == 0 /*&& point == 1 */&& pos == 0){ + if(wave%5 == 0 & pos <= wave/5){ enemy = new BossEnemy(point); }else if(wave > 3 && pos < amount/2){ enemy = new FastEnemy(point); @@ -89,7 +89,6 @@ public class GameState{ Timers.run(i*2, ()->{ Effects.effect("explosion", core.worldx()+Mathf.range(40), core.worldy()+Mathf.range(40)); }); - } Effects.effect("coreexplosion", core.worldx(), core.worldy()); diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index 5afffd17d9..c645a20dd0 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -6,8 +6,6 @@ import java.util.function.BooleanSupplier; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.Texture.TextureWrap; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; @@ -15,6 +13,8 @@ import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.resource.*; import io.anuke.ucore.core.Draw; import io.anuke.ucore.core.Settings; +import io.anuke.ucore.graphics.Hue; +import io.anuke.ucore.graphics.Textures; import io.anuke.ucore.modules.SceneModule; import io.anuke.ucore.scene.Scene; import io.anuke.ucore.scene.builders.*; @@ -29,7 +29,7 @@ public class UI extends SceneModule{ SettingsDialog prefs; KeybindDialog keys; Dialog about, menu, restart, tutorial, levels; - Texture conveyor = new Texture("sprites/conveyor.png"), conveyort = new Texture("sprites/conveyort.png"); + //Texture conveyor = new Texture("sprites/conveyor.png"), conveyort = new Texture("sprites/conveyort.png"); int selectedMap = 0; BooleanSupplier play = () -> { @@ -46,8 +46,9 @@ public class UI extends SceneModule{ Dialog.closePadR = -1; Dialog.closePadT = 4; - conveyor.setWrap(TextureWrap.Repeat, TextureWrap.Repeat); - conveyort.setWrap(TextureWrap.Repeat, TextureWrap.Repeat); + + Textures.load("sprites/"); + Textures.repeatWrap("conveyor", "conveyort", "back"); } void drawBackground(){ @@ -57,16 +58,21 @@ public class UI extends SceneModule{ int w = gwidth(); int h = gheight(); - Draw.color("gray"); - - batch.draw(conveyor, 0, 0, (int)Timers.time(), 0, w, h); + Draw.color(Hue.lightness(0.6f)); int tw = w/64+1;//, th = h/64+1; + batch.draw(Textures.get("back"), 0, 0, 0, 0, w, h); + for(int x = 0; x < tw; x ++){ - batch.draw(conveyort, x*64, 0, 0, (int)Timers.time(), 32, h); + batch.draw(Textures.get("conveyort"), x*64, 0, 0, (int)(Timers.time()*2*(x%2-0.5f)), 32, h); } + //for(int y = 0; y < th; y ++){ + // batch.draw(Textures.get("conveyor"), 0, y*64, (int)(Timers.time()*2*(y%2-0.5f)), 0, w, 32); + //} + + Draw.color(); Draw.tscl(1.5f); diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java index 7abf10c4e4..f6fe62fd33 100644 --- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java @@ -53,7 +53,7 @@ public class WeaponBlocks{ shotgunturret = new Turret("shotgunturret"){ { range = 50; - reload = 40f; + reload = 30f; bullet = BulletType.iron; ammo = Item.iron; health = 70;