From 1e111d29d9423d20d97306bf4890dfa78b7fb2dc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 1 Mar 2019 17:18:08 -0500
Subject: [PATCH] More map balance / Fixed 'oh no' on 5x5+ block destruction

---
 .../assets/maps/nuclearProductionComplex.mmap | Bin 315774 -> 315774 bytes
 .../src/io/anuke/mindustry/content/Zones.java |   4 ++--
 .../entities/effect/RubbleDecal.java          |  19 ++++++++----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap
index 6128b705b8e9489c8ee001f30d10a26172ebcba6..dcffed46ccab6829e686741d1b655eb3ba8dda57 100644
GIT binary patch
delta 4535
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
D)7?m4

delta 3487
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

diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 6a1d3ec0da..f2a2a4015c 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -542,8 +542,8 @@ public class Zones implements ContentList{
         .drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 1000, Items.thorium, 200, Items.titanium, 2000, Items.metaglass, 1000))
         .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{
             loadout = Loadouts.basicNucleus;
-            baseLaunchCost = ItemStack.with(Items.copper, 500, Items.lead, 500, Items.silicon, 200, Items.metaglass, 100);
-            startingItems = ItemStack.list(Items.copper, 2500, Items.lead, 1500, Items.silicon, 800, Items.metaglass, 400);
+            baseLaunchCost = ItemStack.with(Items.copper, 500, Items.silicon, 200, Items.metaglass, 100);
+            startingItems = ItemStack.list(Items.copper, 2500, Items.lead, 3000, Items.silicon, 800, Items.metaglass, 400);
             itemRequirements = ItemStack.with(Items.copper, 10000, Items.titanium, 8000, Items.metaglass, 6000, Items.plastanium, 2000);
             conditionWave = 30;
             launchPeriod = 15;
diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
index 4dcd39a79d..3146027b26 100644
--- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
@@ -11,27 +11,24 @@ public class RubbleDecal extends Decal{
     private static final TextureRegion[][] regions = new TextureRegion[16][0];
     private TextureRegion region;
 
-    /**
-     * Creates a rubble effect at a position. Provide a block size to use.
-     */
+    /**Creates a rubble effect at a position. Provide a block size to use.*/
     public static void create(float x, float y, int size){
         if(headless) return;
 
         if(regions[size].length == 0){
-            int i = 0;
-            for(; i < 2; i++){
-                if(!Core.atlas.has("rubble-" + size + "-" + i)){
-                    break;
-                }
-            }
-            regions[size] = new TextureRegion[i + 1];
-            for(int j = 0; j <= i; j++){
+            regions[size] = new TextureRegion[2];
+            for(int j = 0; j < 2; j++){
                 regions[size][j] = Core.atlas.find("rubble-" + size + "-" + j);
             }
         }
 
         RubbleDecal decal = new RubbleDecal();
         decal.region = regions[size][Mathf.clamp(Mathf.randomSeed(decal.id, 0, 1), 0, regions[size].length - 1)];
+
+        if(!Core.atlas.isFound(decal.region)){
+            return;
+        }
+
         decal.set(x, y);
         decal.add();
     }