diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 6b54fe5588..bac92856db 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -577,7 +577,7 @@ configure = Configure Loadout objective.research = [accent]Research:\n[]{0}[lightgray]{1} objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1} objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1} -objective.destroyblocks = [accent]Destroy: [lightgray]{0}[]/{1}\n{2}[lightgray]{3} +objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3} objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3} objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3} objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2} diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 3aa74143f6..536fdd7683 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -207,11 +207,11 @@ public class SectorPresets{ rules = r -> { r.objectives.addAll( - new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)), - new TimerObjective("[accent]⚠ Nuclear launch detected:\n[lightgray]{0}", 4 * 60 * 60).withMarkers( - new TextMarker("Evacuate base", 1, 1), - new MinimapMarker(338,378, Pal.remove) - ).withFlags("nuke1") + new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)), + new TimerObjective("[accent]⚠ Nuclear launch detected:\n[lightgray]{0}", 4 * 60 * 60).withMarkers( + new TextMarker("Evacuate base", 1, 1), + new MinimapMarker(338,378, Pal.remove) + ).withFlags("nuke1") ); }; }}; diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index 31261bae63..c153446228 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -308,7 +308,7 @@ public class MapObjectives{ @Override public String text(){ - return Core.bundle.format("objective.destroyblocks", positions, positions.length, block.emoji(), block.localizedName); + return Core.bundle.format("objective.destroyblocks", progress(), positions.length, block.emoji(), block.localizedName); } }