From f56806fc50fcbbfa6ff85f9cc22d9769326b1ab9 Mon Sep 17 00:00:00 2001 From: MaKarastY <71918286+makarasty@users.noreply.github.com> Date: Sat, 26 Oct 2024 01:18:48 +0300 Subject: [PATCH 1/3] Update servers_v7.json (#10273) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 54f5f61172..6b8189939b 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -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", From f12085e6196464c385a6d7f7d757bd3e3b7570fb Mon Sep 17 00:00:00 2001 From: hydrophobis <142858559+hydrophobis@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:30:16 -0500 Subject: [PATCH 2/3] Add colorable shields for shield generators (#10232) * Add colorable shields for shield generators Just added a shieldColor variable which defaults to team.color if it is not set or is set to Null * Added @Nullable to BaseShield -> shieldColor --- core/src/mindustry/world/blocks/defense/BaseShield.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); From 2920f415fb6d9ccf4d1a4f3e1c1fd959db6a4bf1 Mon Sep 17 00:00:00 2001 From: EscoCorp Date: Sun, 27 Oct 2024 05:35:33 +0500 Subject: [PATCH 3/3] Update servers_v7.json (#10294) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6b8189939b..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",