Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed destroyblocks objective

Browse Source
This commit is contained in:
Anuken
2022-04-28 14:52:51 -04:00
parent fe4b32be1f
commit 293311087d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -577,7 +577,7 @@ configure = Configure Loadout
objective.research = [accent]Research:\n[]{0}[lightgray]{1} objective.research = [accent]Research:\n[]{0}[lightgray]{1}
objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1} objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
objective.destroyblock = [accent]Destroy:\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.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.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2} objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}

10
core/src/mindustry/content/SectorPresets.java
View File

@@ -207,11 +207,11 @@ public class SectorPresets{
rules = r -> { rules = r -> {
r.objectives.addAll( r.objectives.addAll(
new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)), 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 TimerObjective("[accent]⚠ Nuclear launch detected:\n[lightgray]{0}", 4 * 60 * 60).withMarkers(
new TextMarker("Evacuate base", 1, 1), new TextMarker("Evacuate base", 1, 1),
new MinimapMarker(338,378, Pal.remove) new MinimapMarker(338,378, Pal.remove)
).withFlags("nuke1") ).withFlags("nuke1")
); );
}; };
}}; }};

2
core/src/mindustry/game/MapObjectives.java
View File

@@ -308,7 +308,7 @@ public class MapObjectives{
@Override @Override
public String text(){ 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);
} }
} }