From e8e8189a9239bc338420c93e4f35b24be33648be Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <redstonneur1256mc@gmail.com>
Date: Tue, 9 Apr 2024 01:51:50 +0200
Subject: [PATCH] Add ShapeMarker starting and ending angles (#9729)

---
 core/src/mindustry/game/MapObjectives.java   | 14 ++++++++++----
 core/src/mindustry/logic/LMarkerControl.java |  1 +
 gradle.properties                            |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index fe7a3b235d..d1ba8ffbc6 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -851,7 +851,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Displays a shape with an outline and color. */
     public static class ShapeMarker extends PosMarker{
-        public float radius = 8f, rotation = 0f, stroke = 1f;
+        public float radius = 8f, rotation = 0f, stroke = 1f, startAngle = 0f, endAngle = 360f;
         public boolean fill = false, outline = true;
         public int sides = 4;
         public Color color = Color.valueOf("ffd37f");
@@ -877,14 +877,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(!fill){
                 if(outline){
                     Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
-                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
                 }
 
                 Lines.stroke(stroke * scaleFactor, color);
-                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
             }else{
                 Draw.color(color);
-                Fill.poly(pos.x, pos.y, sides, radius * scaleFactor, rotation);
+                if (startAngle < endAngle){
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (endAngle - startAngle) / 360f, rotation + startAngle, sides);
+                }else{
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (startAngle - endAngle) / 360f, rotation + endAngle, sides);
+                }
             }
 
             Draw.reset();
@@ -901,12 +905,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case rotation -> rotation = (float)p1;
                     case color -> color.fromDouble(p1);
                     case shape -> sides = (int)p1;
+                    case arc -> startAngle = (float)p1;
                 }
             }
 
             if(!Double.isNaN(p2)){
                 switch(type){
                     case shape -> fill = !Mathf.equal((float)p2, 0f);
+                    case arc -> endAngle = (float)p2;
                 }
             }
 
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index 16a9aaa9c6..c24775af02 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -13,6 +13,7 @@ public enum LMarkerControl{
     stroke("stroke"),
     rotation("rotation"),
     shape("sides", "fill", "outline"),
+    arc("start", "end"),
     flushText("fetch"),
     fontSize("size"),
     textHeight("height"),
diff --git a/gradle.properties b/gradle.properties
index e3a8642e0a..25be0e37a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=8b6f34c036
+archash=8a2decd656