diff --git a/core/assets-raw/sprites/blocks/defense/force-projector.png b/core/assets-raw/sprites/blocks/defense/force-projector.png index c96afb4bf0..9c54cfe032 100644 Binary files a/core/assets-raw/sprites/blocks/defense/force-projector.png and b/core/assets-raw/sprites/blocks/defense/force-projector.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7f15ab9c5c..447bdb7cf3 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -398,7 +398,7 @@ mode.waves.name=waves mode.waves.description=the normal mode. limited resources and automatic incoming waves. mode.sandbox.name=sandbox mode.sandbox.description=infinite resources and no timer for waves. -mode.sandbox.warning=Note that blocks cannot be used in sandbox mode until they are unlocked in other modes.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear. +mode.custom.warning=Note that blocks cannot be used in custom games until they are unlocked in sectors.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear. mode.freebuild.name=freebuild mode.freebuild.description=limited resources and no timer for waves. diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 348450d73e..b7842152d3 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index cebfe70bf9..11207f1193 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -13,7 +13,6 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.ContentDatabase; import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.Saves; import io.anuke.mindustry.input.DefaultKeybinds; import io.anuke.mindustry.input.DesktopInput; @@ -110,9 +109,9 @@ public class Control extends Module{ state.set(State.playing); - if(state.mode == GameMode.sandbox && !Settings.getBool("sandbox-warning", false)){ - threads.runGraphics(() -> ui.showInfo("$mode.sandbox.warning")); - Settings.putBool("sandbox-warning", true); + if(world.getSector() == null && !Settings.getBool("custom-warning", false)){ + threads.runGraphics(() -> ui.showInfo("$mode.custom.warning")); + Settings.putBool("custom-warning", true); Settings.save(); } }); @@ -388,7 +387,7 @@ public class Control extends Module{ } //check unlocks every 2 seconds - if(!state.mode.infiniteResources && Timers.get("timerCheckUnlock", 120)){ + if(world.getSector() != null && Timers.get("timerCheckUnlock", 120)){ checkUnlockableBlocks(); //save if the db changed