diff --git a/core/src/mindustry/world/blocks/defense/BaseShield.java b/core/src/mindustry/world/blocks/defense/BaseShield.java index 32bc077e8f..bb1f0dd6fe 100644 --- a/core/src/mindustry/world/blocks/defense/BaseShield.java +++ b/core/src/mindustry/world/blocks/defense/BaseShield.java @@ -19,6 +19,8 @@ public class BaseShield extends Block{ //TODO game rule? or field? should vary by base. public float radius = 200f; public int sides = 24; + + public @Nullable Color shieldColor; protected static BaseShieldBuild paramBuild; //protected static Effect paramEffect; @@ -125,7 +127,7 @@ public class BaseShield extends Block{ Draw.z(Layer.shields); - Draw.color(team.color, Color.white, Mathf.clamp(hit)); + Draw.color(shieldColor == null ? team.color : shieldColor, Color.white, Mathf.clamp(hit)); if(renderer.animateShields){ Fill.poly(x, y, sides, radius); diff --git a/servers_v7.json b/servers_v7.json index 54f5f61172..0491416178 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "EscoCorp", - "address": ["81.30.105.171:6567", "81.30.105.171:6568", "202.49.176.213:6567"] + "address": ["202.49.176.213:6567", "202.49.176.213:6568", "202.49.176.213:6569"] }, { "name": "Redundancy Dept", @@ -318,7 +318,7 @@ }, { "name": "ArmyOFUkraine", - "address": ["194.247.42.131:27715", "194.247.42.131:27512","220.141.232.67"] + "address": ["194.247.42.131:27715", "194.247.42.131:27512", "194.247.42.130:27505"] }, { "name": "Erbium",