diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index b554b9e277..3371998af8 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -822,13 +822,8 @@ public class MapObjectives implements Iterable, Eachable fontSize = (float)p1; case textHeight -> textHeight = (float)p1; - case labelFlags -> { - if(!Mathf.equal((float)p1, 0f)){ - flags |= WorldLabel.flagBackground; - }else{ - flags &= ~WorldLabel.flagBackground; - } - } + case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f)); + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f)); case radius -> radius = (float)p1; case rotation -> rotation = (float)p1; case color -> color.fromDouble(p1); @@ -838,13 +833,7 @@ public class MapObjectives implements Iterable, Eachable { - if(!Mathf.equal((float)p2, 0f)){ - flags |= WorldLabel.flagOutline; - }else{ - flags &= ~WorldLabel.flagOutline; - } - } + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f)); } } } @@ -962,6 +951,7 @@ public class MapObjectives implements Iterable, Eachable radius = (float)p1; case stroke -> stroke = (float)p1; + case outline -> outline = !Mathf.equal((float)p1, 0f); case rotation -> rotation = (float)p1; case color -> color.fromDouble(p1); case shape -> sides = (int)p1; @@ -1025,25 +1015,14 @@ public class MapObjectives implements Iterable, Eachable fontSize = (float)p1; - case labelFlags -> { - if(!Mathf.equal((float)p1, 0f)){ - flags |= WorldLabel.flagBackground; - }else{ - flags &= ~WorldLabel.flagBackground; - } - } + case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f)); + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f)); } } if(!Double.isNaN(p2)){ switch(type){ - case labelFlags -> { - if(!Mathf.equal((float)p2, 0f)){ - flags |= WorldLabel.flagOutline; - }else{ - flags &= ~WorldLabel.flagOutline; - } - } + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f)); } } } @@ -1101,6 +1080,7 @@ public class MapObjectives implements Iterable, Eachable endPos.x = (float)p1 * tilesize; case stroke -> stroke = (float)p1; case color -> color1.set(color2.fromDouble(p1)); + case outline -> outline = !Mathf.equal((float)p1, 0f); } } diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java index c24775af02..57780d8187 100644 --- a/core/src/mindustry/logic/LMarkerControl.java +++ b/core/src/mindustry/logic/LMarkerControl.java @@ -11,6 +11,7 @@ public enum LMarkerControl{ color("color"), radius("radius"), stroke("stroke"), + outline("outline"), rotation("rotation"), shape("sides", "fill", "outline"), arc("start", "end"), diff --git a/servers_v7.json b/servers_v7.json index a503cd1491..6d33eca3db 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,16 @@ [ + { + "name": "EscoCorp", + "address": [ + "95.215.56.128", + "95.215.56.128:6568", + "95.215.56.128:6569", + "95.215.56.128:6570", + "95.215.56.128:6571", + "95.215.56.128:6572", + "95.215.56.128:6573" + ] + }, { "name": "EchoDustry", "address": [ @@ -278,11 +290,11 @@ "194.164.245.218:6569", "194.164.245.218:6570", "194.164.245.218:6571", + "194.164.245.218:6572", + "194.164.245.218:6573", + "194.164.245.218:6574", "194.164.245.218:6597", - "194.164.245.218:6598", - "194.164.245.218:6599", - "194.164.245.218:6600", - "194.164.245.218:6601" + "194.164.245.218:6598" ] }, {