From dcb840f290650e4ace8409b22033651b670aebd4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 7 Aug 2018 11:17:32 -0400 Subject: [PATCH] Many bugfixes / Dagger unit buffed / Build times increased --- core/assets/bundles/bundle.properties | 2 ++ core/src/io/anuke/mindustry/content/UnitTypes.java | 4 ++-- core/src/io/anuke/mindustry/content/Weapons.java | 2 +- .../anuke/mindustry/content/blocks/UnitBlocks.java | 12 ++++++------ core/src/io/anuke/mindustry/entities/Player.java | 2 +- core/src/io/anuke/mindustry/game/Difficulty.java | 2 +- core/src/io/anuke/mindustry/input/MobileInput.java | 5 ++--- .../io/anuke/mindustry/ui/dialogs/MissionDialog.java | 9 +++++++-- .../io/anuke/mindustry/ui/dialogs/PausedDialog.java | 2 +- .../anuke/mindustry/world/blocks/units/UnitPad.java | 2 +- 10 files changed, 24 insertions(+), 18 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 06d116d4ea..1c5841f77b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -65,6 +65,8 @@ text.none= text.close=Close text.quit=Quit text.maps=Maps +text.continue=Continue +text.nextmission=Next Mission text.maps.none=[LIGHT_GRAY]No maps found! text.about.button=About text.name=Name: diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index c53c66468c..a61780afef 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -29,7 +29,7 @@ public class UnitTypes implements ContentList{ drag = 0.4f; range = 40f; weapon = Weapons.chainBlaster; - health = 70; + health = 90; }}; titan = new UnitType("titan", Titan.class, Titan::new){{ @@ -38,7 +38,7 @@ public class UnitTypes implements ContentList{ drag = 0.4f; range = 10f; weapon = Weapons.chainBlaster; - health = 260; + health = 280; }}; interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{ diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 75b34448b7..934b05ea69 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -35,7 +35,7 @@ public class Weapons implements ContentList{ chainBlaster = new Weapon("chain-blaster"){{ length = 1.5f; - reload = 30f; + reload = 28f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; setAmmo(AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletTungsten, AmmoTypes.bulletSilicon, AmmoTypes.bulletThorium); diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 17c9fe723c..7fb1bc9d38 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -16,7 +16,7 @@ public class UnitBlocks extends BlockList implements ContentList{ public void load(){ dronePad = new UnitPad("drone-pad"){{ type = UnitTypes.drone; - produceTime = 4000; + produceTime = 4300; size = 2; consumes.power(0.08f); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)}); @@ -32,7 +32,7 @@ public class UnitBlocks extends BlockList implements ContentList{ interceptorPad = new UnitPad("interceptor-pad"){{ type = UnitTypes.interceptor; - produceTime = 1700; + produceTime = 1900; size = 2; consumes.power(0.1f); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)}); @@ -40,7 +40,7 @@ public class UnitBlocks extends BlockList implements ContentList{ monsoonPad = new UnitPad("monsoon-pad"){{ type = UnitTypes.monsoon; - produceTime = 3300; + produceTime = 3600; size = 3; consumes.power(0.2f); shadow = "shadow-round-3"; @@ -49,15 +49,15 @@ public class UnitBlocks extends BlockList implements ContentList{ daggerPad = new UnitPad("dagger-pad"){{ type = UnitTypes.dagger; - produceTime = 700; + produceTime = 1800; size = 2; consumes.power(0.05f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 5), new ItemStack(Items.tungsten, 10)}); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.tungsten, 15)}); }}; titanPad = new UnitPad("titan-pad"){{ type = UnitTypes.titan; - produceTime = 2300; + produceTime = 3700; size = 3; consumes.power(0.15f); shadow = "shadow-round-3"; diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index c87220c501..8f850da16f 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -607,7 +607,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra movement.setZero(); } - velocity.add(movement); + velocity.add(movement.scl(Timers.delta())); if(velocity.len() <= 0.2f){ rotation += Mathf.sin(Timers.time() + id * 99, 10f, 1f); diff --git a/core/src/io/anuke/mindustry/game/Difficulty.java b/core/src/io/anuke/mindustry/game/Difficulty.java index afa18b4204..643692dab6 100644 --- a/core/src/io/anuke/mindustry/game/Difficulty.java +++ b/core/src/io/anuke/mindustry/game/Difficulty.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.game; import io.anuke.ucore.util.Bundles; public enum Difficulty{ - easy(2f, 1.5f), + easy(1.2f, 1.5f), normal(1f, 1f), hard(0.5f, 0.75f), insane(0.25f, 0.5f); diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index f4e6bfe12d..c28cc5d0c1 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -565,9 +565,8 @@ public class MobileInput extends InputHandler implements GestureListener{ //add to selection queue if it's a valid BREAK position cursor = cursor.target(); selection.add(new PlaceRequest(cursor.worldx(), cursor.worldy())); - }else if(!tileTapped(cursor.target()) && !canTapPlayer(worldx, worldy)){ - tryBeginMine(cursor); - }else{ //else, try and carry units + }else if(!tileTapped(cursor.target()) && !canTapPlayer(worldx, worldy) && !tryBeginMine(cursor)){ + //else, try and carry units if(player.getCarry() != null){ player.dropCarry(); //drop off unit }else{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java index 13094c7ec5..d41b2b7480 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java @@ -15,9 +15,14 @@ public class MissionDialog extends FloatingDialog{ buttons().clear(); content().clear(); - addCloseButton(); + buttons().addButton("$text.nextmission", () -> { + hide(); + Vars.ui.paused.runExitSave(); + Vars.ui.sectors.show(); + }).size(190f, 64f); + + buttons().addButton("$text.continue", this::hide).size(190f, 64f); - buttons().addButton("$text.quit", () -> Vars.ui.paused.runExitSave()).size(190f, 64f); content().add(Bundles.format("text.mission.complete.body", sector.x, sector.y)).pad(10); show(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index efa2a413e8..555aa6e309 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -43,7 +43,7 @@ public class PausedDialog extends FloatingDialog{ if(!Net.active()) state.set(State.paused); }); - content().table(t -> missionTable = t); + content().table(t -> missionTable = t).colspan(mobile ? 3 : 1); content().row(); if(!mobile){ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java index 76f7f80a36..1aa6ff464f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java @@ -38,7 +38,7 @@ import java.io.DataOutputStream; import java.io.IOException; public class UnitPad extends Block{ - protected float gracePeriodMultiplier = 20f; + protected float gracePeriodMultiplier = 16f; protected float speedupTime = 60f * 60f * 16; protected UnitType type;