From fdf7173f14317e4ec20f2a928e8b4df51dfe9c7d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 28 Jun 2018 16:18:44 -0400 Subject: [PATCH] Added vault to recipe list, removed 'next wave' button --- core/src/io/anuke/mindustry/Vars.java | 2 +- core/src/io/anuke/mindustry/content/Recipes.java | 12 ++++++------ core/src/io/anuke/mindustry/core/World.java | 5 ----- .../io/anuke/mindustry/ui/fragments/HudFragment.java | 2 +- .../mindustry/world/blocks/storage/CoreBlock.java | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 441d671ead..7248c6125e 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -36,7 +36,7 @@ public class Vars{ //respawn time in frames public static final float respawnduration = 60*4; //time between waves in frames (on normal mode) - public static final float wavespace = 60*60*2; + public static final float wavespace = 60*60*1.5f; //waves can last no longer than 3 minutes, otherwise the next one spawns public static final float maxwavespace = 60*60*4f; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 2bd4cd917b..4322860dad 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -27,9 +27,9 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.carbide, 12*4), new ItemStack(Items.silicon, 8*4)); //TURRETS - new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.tungsten, 20)); - new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 20)); - new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 25)); + new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.tungsten, 40)); + new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 20)); + new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.tungsten, 60), new ItemStack(Items.carbide, 35)); new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 25), new ItemStack(Items.silicon, 25)); //TODO arc turret broken @@ -90,10 +90,10 @@ public class Recipes implements ContentList{ new Recipe(power, PowerBlocks.turbinegenerator, new ItemStack(Items.tungsten, 70), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); - //new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 50)); //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.carbide, 50)); - //new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 5)); - //new Recipe(distribution, StorageBlocks.sortedunloader, new ItemStack(Items.carbide, 5)); + new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 40), new ItemStack(Items.silicon, 50)); + new Recipe(distribution, StorageBlocks.sortedunloader, new ItemStack(Items.carbide, 40), new ItemStack(Items.silicon, 70)); + new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 300), new ItemStack(Items.thorium, 250)); //DRILLS, PRODUCERS new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 30)); diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 7b8c71ba77..596734a981 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -78,11 +78,6 @@ public class World extends Module{ return !wallSolid(x, y-1) || !wallSolid(x, y+1) || !wallSolid(x-1, y) ||!wallSolid(x+1, y); } - public boolean blends(Block block, int x, int y){ - return !floorBlends(x, y-1, block) || !floorBlends(x, y+1, block) - || !floorBlends(x-1, y, block) ||!floorBlends(x+1, y, block); - } - public boolean floorBlends(int x, int y, Block block){ Tile tile = tile(x, y); return tile == null || tile.floor().id <= block.id; diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 563f0b0508..42d7d56ce1 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -330,7 +330,7 @@ public class HudFragment implements Fragment{ new imagebutton("icon-play", 30f, () -> { state.wavetime = 0f; }).height(uheight).fillX().right().padTop(-8f).padBottom(-12f).padLeft(-15).padRight(-10).width(40f).update(l->{ - boolean vis = state.enemies <= 0 && (Net.server() || !Net.active()); + boolean vis = state.mode.disableWaveTimer && (Net.server() || !Net.active()); boolean paused = state.is(State.paused) || !vis; l.setVisible(vis); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 3bf387efce..6590444a8c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -59,7 +59,7 @@ public class CoreBlock extends StorageBlock { unbreakable = true; size = 3; hasItems = true; - itemCapacity = 1000; + itemCapacity = 2000; viewRange = 200f; flags = EnumSet.of(BlockFlag.resupplyPoint, BlockFlag.target); }