diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index 6128b705b8..dcffed46cc 100644 Binary files a/core/assets/maps/nuclearProductionComplex.mmap and b/core/assets/maps/nuclearProductionComplex.mmap differ 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(); }