From e6a24b8ba1328829c1f5cb5d9ea679984aad9a52 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 28 Mar 2019 14:38:00 -0400 Subject: [PATCH] Balancing / Bugfixes / Decreased build duration slightly --- .../blocks/environment/pine.png | Bin 6279 -> 6278 bytes core/assets/shaders/fog.fragment | 5 ++--- .../io/anuke/mindustry/content/Blocks.java | 2 +- .../src/io/anuke/mindustry/content/Items.java | 18 +++++++++--------- .../src/io/anuke/mindustry/core/Renderer.java | 2 +- .../mindustry/graphics/BlockRenderer.java | 2 +- .../io/anuke/mindustry/input/MobileInput.java | 2 +- .../mindustry/ui/dialogs/DeployDialog.java | 3 +-- .../mindustry/world/blocks/BuildBlock.java | 6 +++--- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/core/assets-raw/sprites_replacement/blocks/environment/pine.png b/core/assets-raw/sprites_replacement/blocks/environment/pine.png index fcdc3e71fca2d6b840099e2c65fec59e0944dae1..1642bbbfd0fa0d07d62d38f5d9429fd46967880e 100644 GIT binary patch delta 5563 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 delta 5564 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 diff --git a/core/assets/shaders/fog.fragment b/core/assets/shaders/fog.fragment index 7ac266711a..5c07ae1e02 100644 --- a/core/assets/shaders/fog.fragment +++ b/core/assets/shaders/fog.fragment @@ -8,8 +8,7 @@ uniform sampler2D u_texture; varying vec4 v_color; varying vec2 v_texCoord; -void main() { +void main(){ vec4 color = texture2D(u_texture, v_texCoord.xy); - color = vec4(0.0, 0.0, 0.0, 1.0 - color.r); - gl_FragColor = color; + gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0 - color.r); } diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index f5b1c11039..ca406f594d 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -599,7 +599,7 @@ public class Blocks implements ContentList{ //endregion //region defense - int wallHealthMultiplier = 3; + int wallHealthMultiplier = 4; scrapWall = new Wall("scrap-wall"){{ health = 60 * wallHealthMultiplier; diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java index ad5f0ba779..e1500f5706 100644 --- a/core/src/io/anuke/mindustry/content/Items.java +++ b/core/src/io/anuke/mindustry/content/Items.java @@ -14,24 +14,24 @@ public class Items implements ContentList{ copper = new Item("copper", Color.valueOf("d99d73")){{ type = ItemType.material; hardness = 1; - cost = 0.6f; + cost = 0.5f; alwaysUnlocked = true; }}; lead = new Item("lead", Color.valueOf("8c7fa9")){{ type = ItemType.material; hardness = 1; - cost = 0.9f; + cost = 0.7f; }}; metaglass = new Item("metaglass", Color.valueOf("ebeef5")){{ type = ItemType.material; - cost = 2f; + cost = 1.5f; }}; graphite = new Item("graphite", Color.valueOf("b2c6d2")){{ type = ItemType.material; - cost = 1.3f; + cost = 1f; }}; coal = new Item("coal", Color.valueOf("272727")){{ @@ -43,7 +43,7 @@ public class Items implements ContentList{ titanium = new Item("titanium", Color.valueOf("8da1e3")){{ type = ItemType.material; hardness = 3; - cost = 1.1f; + cost = 1f; }}; thorium = new Item("thorium", Color.valueOf("f9a3c7")){{ @@ -51,7 +51,7 @@ public class Items implements ContentList{ explosiveness = 0.2f; hardness = 4; radioactivity = 1f; - cost = 1.4f; + cost = 1.1f; }}; scrap = new Item("scrap", Color.valueOf("777777")){{ @@ -60,19 +60,19 @@ public class Items implements ContentList{ silicon = new Item("silicon", Color.valueOf("53565c")){{ type = ItemType.material; - cost = 0.9f; + cost = 0.8f; }}; plastanium = new Item("plastanium", Color.valueOf("cbd97f")){{ type = ItemType.material; flammability = 0.2f; explosiveness = 0.2f; - cost = 1.6f; + cost = 1.3f; }}; phasefabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{ type = ItemType.material; - cost = 1.5f; + cost = 1.3f; radioactivity = 0.6f; }}; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 91048fc75f..baab923078 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -307,7 +307,7 @@ public class Renderer implements ApplicationListener{ public void clampScale(){ float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f); - targetscale = Mathf.clamp(targetscale, s * 1.5f, Math.round(s * 5)); + targetscale = Mathf.clamp(targetscale, s * 1.5f, Math.round(s * 6)); } } diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index d4297e1880..e23a45ad26 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -23,7 +23,7 @@ import static io.anuke.mindustry.Vars.*; public class BlockRenderer{ private final static int initialRequests = 32 * 32; private final static int expandr = 9; - private final static Color shadowColor = new Color(0, 0, 0, 0.7f); + private final static Color shadowColor = new Color(0, 0, 0, 0.71f); public final FloorRenderer floor = new FloorRenderer(); diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index d3a65ac531..bba017a950 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -727,7 +727,7 @@ public class MobileInput extends InputHandler implements GestureListener{ public boolean zoom(float initialDistance, float distance){ if(lastDistance == -1) lastDistance = initialDistance; - float amount = (Mathf.sign(distance > lastDistance) * 0.07f) * Time.delta(); + float amount = (Mathf.sign(distance > lastDistance) * 0.04f) * Time.delta(); renderer.scaleCamera(io.anuke.arc.scene.ui.layout.Unit.dp.scl(amount)); lastDistance = distance; return true; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 68f143bec5..ac275e3d80 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -10,7 +10,6 @@ import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Align; -import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.Zones; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Saves.SaveSlot; @@ -178,7 +177,7 @@ public class DeployDialog extends FloatingDialog{ this.height /= 2f; nodes.add(this); - arr.selectFrom(content.zones(), other -> Structs.find(other.zoneRequirements, f -> f.zone == zone) != null); + arr.selectFrom(content.zones(), other -> other.zoneRequirements.length > 0 && other.zoneRequirements[0].zone == zone); children = new ZoneNode[arr.size]; for(int i = 0; i < children.length; i++){ diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index b4de5b5c2d..07a93fc6c1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -287,7 +287,7 @@ public class BuildBlock extends Block{ this.previous = previous; this.accumulator = new float[block.buildRequirements.length]; this.totalAccumulator = new float[block.buildRequirements.length]; - this.buildCost = block.buildCost; + this.buildCost = block.buildCost * state.rules.buildCostMultiplier; } public void setDeconstruct(Block previous){ @@ -297,7 +297,7 @@ public class BuildBlock extends Block{ this.block = previous; this.accumulator = new float[previous.buildRequirements.length]; this.totalAccumulator = new float[previous.buildRequirements.length]; - this.buildCost = previous.buildCost; + this.buildCost = previous.buildCost * state.rules.buildCostMultiplier; }else{ this.buildCost = 20f; //default no-requirement build cost is 20 } @@ -340,7 +340,7 @@ public class BuildBlock extends Block{ if(rid != -1) block = content.block(rid); if(block != null){ - buildCost = block.buildCost; + buildCost = block.buildCost * state.rules.buildCostMultiplier; }else{ buildCost = 20f; }