diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index cbc0d71d41..213a9ce6e4 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -585,7 +585,7 @@ objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[] objective.destroycore = [accent]Destroy Enemy Core objective.command = [accent]Command Units -objective.nuclearlaunch = [accent]\u26a0 Nuclear launch detected:\n[lightgray]{0} +objective.nuclearlaunch = [accent]\u26a0 Nuclear launch detected: [lightgray]{0} loadout = Loadout resources = Resources diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index b309b2fae0..e910ef5d35 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -210,7 +210,7 @@ public class SectorPresets{ new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)), new TimerObjective("@objective.nuclearlaunch", 4 * 60 * 60).withMarkers( new TextMarker("Evacuate base", 1, 1), - new MinimapMarker(338,378, Pal.remove) + new MinimapMarker(338, 378, 30f, 14f, Pal.remove) ).withFlags("nuke1") ); }; diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 33f839e05f..5a415c6b3a 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -362,7 +362,7 @@ public class Logic implements ApplicationListener{ } } - first = state.rules.objectives.first(); + first = state.rules.objectives.firstOpt(); completed = true; } diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index c153446228..d9b0ea7e26 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -499,6 +499,14 @@ public class MapObjectives{ this.color = color; } + public MinimapMarker(float x, float y, float radius, float stroke, Color color){ + this.x = x; + this.y = y; + this.stroke = stroke; + this.radius = radius; + this.color = color; + } + public MinimapMarker(){ }