diff --git a/core/assets/shaders/menu.fragment b/core/assets/shaders/menu.fragment index 46d34f892c..47e0584215 100644 --- a/core/assets/shaders/menu.fragment +++ b/core/assets/shaders/menu.fragment @@ -28,5 +28,5 @@ void main() { m = float(int(m / roundm)) * roundm + roundm; gl_FragColor.rgb = mix(v_color.rgb, vec3(0.0), m); - gl_FragColor.a = mod(abs(coords.x) + abs(coords.y), 100.0) < 30.0 ? 1.0 : 0.0; + gl_FragColor.a = mod(abs(coords.x) + abs(coords.y), 110.0) < 35.0 ? 1.0 : 0.0; } \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 5fd7dc6dcc..7fd7edda63 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -69,15 +69,14 @@ public class Recipes implements ContentList{ //CRAFTING //smelting - new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.copper, 70)); - new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 90), new ItemStack(Items.densealloy, 60), new ItemStack(Items.lead, 50)); + new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.copper, 100)); + new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 110), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 50)); new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); //advanced fabrication new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.densealloy, 120), new ItemStack(Items.titanium, 160)); new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.silicon, 260), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150)); - //TODO implement alloy smelter new Recipe(crafting, CraftingBlocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140)); //misc @@ -147,7 +146,7 @@ public class Recipes implements ContentList{ new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); - new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 80)).setMode(GameMode.noWaves); + new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)).setMode(GameMode.noWaves); new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves); new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves); diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java index 148c41b06b..02134030e6 100644 --- a/core/src/io/anuke/mindustry/game/Waves.java +++ b/core/src/io/anuke/mindustry/game/Waves.java @@ -13,7 +13,7 @@ public class Waves{ return Array.with( new SpawnGroup(UnitTypes.dagger){{ end = 8; - unitScaling = 2; + unitScaling = 1; }}, new SpawnGroup(UnitTypes.interceptor){{ diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index e9a4c10323..2eb40dbf7a 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -159,9 +159,9 @@ public class Sectors{ }else if(sector.difficulty > 3){ //now with carbide sector.startingItems = Array.with(new ItemStack(Items.copper, 700), new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 130)); }else if(sector.difficulty > 1){ //more starter items for faster start - sector.startingItems = Array.with(new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 100)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 400), new ItemStack(Items.lead, 100)); }else{ //base starting items to prevent grinding much - sector.startingItems = Array.with(new ItemStack(Items.copper, 170)); + sector.startingItems = Array.with(new ItemStack(Items.copper, 130)); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index b09de237ba..b90422aa3b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -39,11 +39,11 @@ public class SectorsDialog extends FloatingDialog{ content().label(() -> Bundles.format("text.sector", selected == null ? Bundles.get("text.none") : (selected.x + ", " + selected.y + (!selected.complete && selected.saveID != -1 ? " " + Bundles.get("text.sector.locked") : "")) + (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") : - (selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : "")))); + (selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : "")))); content().row(); content().label(() -> Bundles.format("text.mission", selected == null || selected.completedMissions >= selected.missions.size ? Bundles.get("text.none") : selected.missions.get(selected.completedMissions).displayString()) - + " [WHITE]" + (selected == null ? "" : Bundles.format("text.save.difficulty", "[LIGHT_GRAY]" + selected.getDifficulty().toString()))); + + "[WHITE] " + (selected == null ? "" : Bundles.format("text.save.difficulty", "[LIGHT_GRAY]" + selected.getDifficulty().toString()))); content().row(); content().add(new SectorView()).grow(); content().row(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index f47a4e5f04..38515f4bf2 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -66,7 +66,7 @@ public class Block extends BaseBlock implements Content{ /** base block explosiveness */ public float baseExplosiveness = 0f; /** whether this block can be placed on liquids. */ - public boolean floating = true; + public boolean floating = false; /** stuff that drops when broken */ public ItemStack drops = null; /** multiblock size */ diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 549719cdea..0beab97250 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -165,7 +165,7 @@ public class Build{ Tile other = world.tile(x + dx + offsetx, y + dy + offsety); if(other == null || (other.block() != Blocks.air && !other.block().alwaysReplace) || other.hasCliffs() || !other.floor().placeableOn || - (tile.floor().liquidDrop != null && !type.floating)){ + (other.floor().isLiquid && !type.floating)){ return false; } } @@ -173,7 +173,7 @@ public class Build{ return true; }else{ return (tile.getTeam() == Team.none || tile.getTeam() == team) - && (tile.floor().liquidDrop == null || type.floating) + && (!tile.floor().isLiquid || type.floating) && tile.floor().placeableOn && !tile.hasCliffs() && ((type.canReplace(tile.block()) && !(type == tile.block() && rotation == tile.getRotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air) diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java index 11b1a17498..2fe25dd59a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -16,13 +16,9 @@ public class Pump extends LiquidBlock{ protected final Array drawTiles = new Array<>(); protected final Array updateTiles = new Array<>(); - /** - * Pump amount per tile this block is on. - */ + /**Pump amount per tile this block is on.*/ protected float pumpAmount = 1f; - /** - * Maximum liquid tier this pump can use. - */ + /**Maximum liquid tier this pump can use.*/ protected int tier = 0; public Pump(String name){