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

WIP objective marker editing + Mobile factory output tap

Browse Source
This commit is contained in:
Anuken
2022-06-26 12:09:58 -04:00
parent 5b48faf13b
commit b25ca6ff33
4 changed files with 131 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,7 @@ public class MapObjectives{
public float radius = 6f, rotation = 0f;
public int sides = 4;
public Color color = Pal.accent;
public Color color = Color.valueOf("ffd37f");
//cached localized text
private transient String fetchedText;
@@ -491,7 +491,7 @@ public class MapObjectives{
public static class MinimapMarker extends ObjectiveMarker{
//in tiles.
public float x, y, radius = 5f, stroke = 11f;
public Color color = Team.crux.color;
public Color color = Color.valueOf("f25555");
public MinimapMarker(float x, float y){
this.x = x;
@@ -533,7 +533,7 @@ public class MapObjectives{
public float x, y, radius = 6f, rotation = 0f, stroke = 1f;
public boolean fill = false, outline = true;
public int sides = 4;
public Color color = Pal.accent;
public Color color = Color.valueOf("ffd37f");
public ShapeMarker(float x, float y){
this.x = x;
@@ -609,6 +609,11 @@ public class MapObjectives{
/** makes sure markers are only added once */
public transient boolean wasAdded;
//TODO localize
public String typeName(){
return getClass().getSimpleName().replace("Objective", "");
}
/** Called in the overlay draw layer.*/
public void draw(){}
/** Called in the small & large map. */