diff --git a/core/assets-raw/sprites/items/item-blast-compound.png b/core/assets-raw/sprites/items/item-blast-compound.png index cc45da15db..1b103c7c9d 100644 Binary files a/core/assets-raw/sprites/items/item-blast-compound.png and b/core/assets-raw/sprites/items/item-blast-compound.png differ diff --git a/core/assets-raw/sprites/items/item-coal.png b/core/assets-raw/sprites/items/item-coal.png index 13df71b603..4f67e0a80e 100644 Binary files a/core/assets-raw/sprites/items/item-coal.png and b/core/assets-raw/sprites/items/item-coal.png differ diff --git a/core/assets-raw/sprites/items/item-copper.png b/core/assets-raw/sprites/items/item-copper.png index 74f6bd94ed..e35ef78511 100644 Binary files a/core/assets-raw/sprites/items/item-copper.png and b/core/assets-raw/sprites/items/item-copper.png differ diff --git a/core/assets-raw/sprites/items/item-graphite.png b/core/assets-raw/sprites/items/item-graphite.png index 47bbcb1506..3d802be63f 100644 Binary files a/core/assets-raw/sprites/items/item-graphite.png and b/core/assets-raw/sprites/items/item-graphite.png differ diff --git a/core/assets-raw/sprites/items/item-lead.png b/core/assets-raw/sprites/items/item-lead.png index 35595097ca..f42443997b 100644 Binary files a/core/assets-raw/sprites/items/item-lead.png and b/core/assets-raw/sprites/items/item-lead.png differ diff --git a/core/assets-raw/sprites/items/item-metaglass.png b/core/assets-raw/sprites/items/item-metaglass.png index 6b6d36240f..4707552a2c 100644 Binary files a/core/assets-raw/sprites/items/item-metaglass.png and b/core/assets-raw/sprites/items/item-metaglass.png differ diff --git a/core/assets-raw/sprites/items/item-phase-fabric.png b/core/assets-raw/sprites/items/item-phase-fabric.png index 174215dd86..8dd6efca38 100644 Binary files a/core/assets-raw/sprites/items/item-phase-fabric.png and b/core/assets-raw/sprites/items/item-phase-fabric.png differ diff --git a/core/assets-raw/sprites/items/item-plastanium.png b/core/assets-raw/sprites/items/item-plastanium.png index 3d51e7562e..f6ddf438fc 100644 Binary files a/core/assets-raw/sprites/items/item-plastanium.png and b/core/assets-raw/sprites/items/item-plastanium.png differ diff --git a/core/assets-raw/sprites/items/item-pyratite.png b/core/assets-raw/sprites/items/item-pyratite.png index 77012a522d..987fdca8c0 100644 Binary files a/core/assets-raw/sprites/items/item-pyratite.png and b/core/assets-raw/sprites/items/item-pyratite.png differ diff --git a/core/assets-raw/sprites/items/item-sand.png b/core/assets-raw/sprites/items/item-sand.png index ed025f9931..79ddca5d30 100644 Binary files a/core/assets-raw/sprites/items/item-sand.png and b/core/assets-raw/sprites/items/item-sand.png differ diff --git a/core/assets-raw/sprites/items/item-scrap.png b/core/assets-raw/sprites/items/item-scrap.png index 45df8819fc..242b66db66 100644 Binary files a/core/assets-raw/sprites/items/item-scrap.png and b/core/assets-raw/sprites/items/item-scrap.png differ diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png index 9014611f2c..1c498c2524 100644 Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ diff --git a/core/assets-raw/sprites/items/item-spore-pod.png b/core/assets-raw/sprites/items/item-spore-pod.png index 08fab9d2e8..b627c0da1b 100644 Binary files a/core/assets-raw/sprites/items/item-spore-pod.png and b/core/assets-raw/sprites/items/item-spore-pod.png differ diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png index 789012ef13..4cac00c5e4 100644 Binary files a/core/assets-raw/sprites/items/item-surge-alloy.png and b/core/assets-raw/sprites/items/item-surge-alloy.png differ diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png index b548c5acf7..6da37cfb1e 100644 Binary files a/core/assets-raw/sprites/items/item-thorium.png and b/core/assets-raw/sprites/items/item-thorium.png differ diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png index b1dd24233a..69368ab751 100644 Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png index ada0f5b06d..b438a5ed37 100644 Binary files a/core/assets-raw/sprites/items/liquid-cryofluid.png and b/core/assets-raw/sprites/items/liquid-cryofluid.png differ diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png index 16ea1670b4..51c7a8db47 100644 Binary files a/core/assets-raw/sprites/items/liquid-oil.png and b/core/assets-raw/sprites/items/liquid-oil.png differ diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png index c482af93dd..2d51d55a8c 100644 Binary files a/core/assets-raw/sprites/items/liquid-slag.png and b/core/assets-raw/sprites/items/liquid-slag.png differ diff --git a/core/assets-raw/sprites/items/liquid-water.png b/core/assets-raw/sprites/items/liquid-water.png index a822b86412..602eee79a9 100644 Binary files a/core/assets-raw/sprites/items/liquid-water.png and b/core/assets-raw/sprites/items/liquid-water.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c5ecb6bc71..0118b14469 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -581,7 +581,6 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your paused = [accent]< Paused > clear = Clear banned = [scarlet]Banned -unplaceable.sectorcaptured = [scarlet]Requires captured sector yes = Yes no = No info.title = Info diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 45619c04fa..3bb813c8b3 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 1b8a3ef066..67ac21fc71 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/fallback/sprites8.png b/core/assets/sprites/fallback/sprites8.png index 212d169c38..5afb523ea5 100644 Binary files a/core/assets/sprites/fallback/sprites8.png and b/core/assets/sprites/fallback/sprites8.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 71293fe7a0..1ad6fab50a 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index a088daddcf..f3e397021d 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 2fe5605d60..caf5ce1426 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 25c009ff63..5aee062508 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -342,7 +342,7 @@ public class PlacementFragment extends Fragment{ topTable.row(); topTable.table(b -> { b.image(Icon.cancel).padRight(2).color(Color.scarlet); - b.add(!player.isBuilder() ? "@unit.nobuild" : displayBlock.unplaceableMessage()).width(190f).wrap(); + b.add(!player.isBuilder() ? "@unit.nobuild" : "@banned").width(190f).wrap(); b.left(); }).padTop(2).left(); } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index c1c544a05e..923c6558af 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -191,8 +191,6 @@ public class Block extends UnlockableContent{ public float buildCost; /** Whether this block is visible and can currently be built. */ public BuildVisibility buildVisibility = BuildVisibility.hidden; - /** Defines when this block can be placed. */ - public BuildPlaceability buildPlaceability = BuildPlaceability.always; /** Multiplier for speed of building this block. */ public float buildCostMultiplier = 1f; /** Multiplier for cost of research in tech tree. */ @@ -521,7 +519,7 @@ public class Block extends UnlockableContent{ } public boolean isPlaceable(){ - return isVisible() && buildPlaceability.placeable() && !state.rules.bannedBlocks.contains(this); + return isVisible() && !state.rules.bannedBlocks.contains(this); } /** Called when building of this block begins. */ @@ -534,11 +532,6 @@ public class Block extends UnlockableContent{ } - /** @return a message detailing why this block can't be placed. */ - public String unplaceableMessage(){ - return state.rules.bannedBlocks.contains(this) ? Core.bundle.get("banned") : buildPlaceability.message(); - } - public boolean isFloor(){ return this instanceof Floor; } diff --git a/core/src/mindustry/world/meta/BuildPlaceability.java b/core/src/mindustry/world/meta/BuildPlaceability.java deleted file mode 100644 index 3799c74207..0000000000 --- a/core/src/mindustry/world/meta/BuildPlaceability.java +++ /dev/null @@ -1,32 +0,0 @@ -package mindustry.world.meta; - -import arc.*; -import arc.func.*; -import mindustry.*; - -import java.util.*; - -/** - * Like BuildVisiblity, but defines whether a block can be *placed*, with an extra message. - * This is like defining a conditionally banned block. - * */ -public enum BuildPlaceability{ - always(() -> true), - sectorCaptured(() -> Vars.state.rules.sector != null && Vars.state.rules.sector.isCaptured()); - - private final Boolp placeability; - - BuildPlaceability(Boolp placeability){ - this.placeability = placeability; - } - - public boolean placeable(){ - return placeability.get(); - } - - /** @return why this block is banned. */ - public String message(){ - return Core.bundle.get("unplaceable." + name().toLowerCase(Locale.ROOT)); - } - -} diff --git a/core/src/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java index a25e8ff749..d318c071d3 100644 --- a/core/src/mindustry/world/meta/BuildVisibility.java +++ b/core/src/mindustry/world/meta/BuildVisibility.java @@ -9,7 +9,7 @@ public enum BuildVisibility{ debugOnly(() -> false), sandboxOnly(() -> Vars.state.rules.infiniteResources), campaignOnly(() -> Vars.state.isCampaign()), - lightingOnly(() -> Vars.state.rules.lighting), + lightingOnly(() -> Vars.state.rules.lighting || Vars.state.isCampaign()), ammoOnly(() -> Vars.state.rules.unitAmmo); private final Boolp visible;