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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2022-04-28 18:25:39 -04:00
parent 969b70d512
commit 6c42dff884
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,7 +585,7 @@ objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[] objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
objective.destroycore = [accent]Destroy Enemy Core objective.destroycore = [accent]Destroy Enemy Core
objective.command = [accent]Command Units 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 loadout = Loadout
resources = Resources resources = Resources

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

@@ -210,7 +210,7 @@ public class SectorPresets{
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("@objective.nuclearlaunch", 4 * 60 * 60).withMarkers( new TimerObjective("@objective.nuclearlaunch", 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, 30f, 14f, Pal.remove)
).withFlags("nuke1") ).withFlags("nuke1")
); );
}; };

2
core/src/mindustry/core/Logic.java
View File

@@ -362,7 +362,7 @@ public class Logic implements ApplicationListener{
} }
} }
first = state.rules.objectives.first(); first = state.rules.objectives.firstOpt();
completed = true; completed = true;
} }

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

@@ -499,6 +499,14 @@ public class MapObjectives{
this.color = color; 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(){ public MinimapMarker(){
} }