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

Merge remote-tracking branch 'origin/erekir' into erekir

Browse Source
This commit is contained in:
Anuken
2022-05-09 15:01:53 -04:00
parent f9be361846 6e23fffe41
commit 03a3e43b01
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/onset.msav
View File

Binary file not shown.

BIN
core/assets/maps/two.msav
View File

Binary file not shown.

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

@@ -184,8 +184,8 @@ public class SectorPresets{
rules = r -> { rules = r -> {
r.objectives.addAll( r.objectives.addAll(
new TimerObjective("[lightgray]Enemy detection:[] [accent]{0}", 5 * 60 * 60).withMarkers( new TimerObjective("[lightgray]Enemy detection:[] [accent]{0}", 7 * 60 * 60).withMarkers(
new TextMarker("The enemy will begin constructing units in 5 minutes.", 276f * 8f, 164f * 8f) new TextMarker("The enemy will begin constructing units in 7 minutes.", 276f * 8f, 164f * 8f)
).withFlags("beginBuilding"), ).withFlags("beginBuilding"),
new ProduceObjective(Items.tungsten).withMarkers( new ProduceObjective(Items.tungsten).withMarkers(
new ShapeTextMarker("Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].", 220f * 8f, 181f * 8f) new ShapeTextMarker("Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].", 220f * 8f, 181f * 8f)