From 17b24c3389c7c705f92281e8cc57bb4722b19175 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 8 Feb 2019 21:29:32 -0500 Subject: [PATCH] Bugfixes (again) --- core/assets/maps/frozenForest.mmap | Bin 203073 -> 203286 bytes core/src/io/anuke/mindustry/core/Control.java | 12 ++++++++++++ core/src/io/anuke/mindustry/core/World.java | 2 +- .../io/anuke/mindustry/game/GlobalData.java | 1 - tools/src/io/anuke/mindustry/Generators.java | 1 - 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 273ddcea84aa0ecbc1aee5d3c311a69c6d6c8975..590c82cccf6d3e0241679933da72a2bacefbc385 100644 GIT binary patch literal 203286 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 literal 203073 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 X61JDHy@c&0Y%gJZ3EN9p@Dl!i&`(++ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index eb7936d6ac..01d6962af4 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -28,7 +28,9 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.MobileInput; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.dialogs.FloatingDialog; +import io.anuke.mindustry.world.Tile; import java.io.IOException; @@ -301,6 +303,16 @@ public class Control implements ApplicationListener{ input.update(); } + if(world.isZone()){ + for(Tile tile : state.teams.get(players[0].getTeam()).cores){ + for(Item item : content.items()){ + if(tile.entity.items.has(item)){ + data.unlockContent(item); + } + } + } + } + //autosave global data every second if it's modified if(timer.get(1, 60)){ data.checkSave(); diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 1e889c78e9..48572dc653 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -185,7 +185,7 @@ public class World implements ApplicationListener{ addDarkness(tiles); - EntityQuery.resizeTree(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds, tiles[0].length + finalWorldBounds); + EntityQuery.resizeTree(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds, tiles[0].length * tilesize + finalWorldBounds); generating = false; Events.fire(new WorldLoadEvent()); diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index d8cb461884..a17767175b 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -94,7 +94,6 @@ public class GlobalData{ modified = true; content.onUnlock(); Events.fire(new UnlockEvent(content)); - save(); } } diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index e97e4f8b4c..0ec0ff1784 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -63,7 +63,6 @@ public class Generators { out.draw(x, y, outlineColor); } } - } }