mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-03 13:30:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2024-10-27 21:16:57 -04:00
commit 1668b4c4b5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/defense/BaseShield.java
View File

@ -19,6 +19,8 @@ public class BaseShield extends Block{
//TODO game rule? or field? should vary by base. //TODO game rule? or field? should vary by base.
public float radius = 200f; public float radius = 200f;
public int sides = 24; public int sides = 24;
public @Nullable Color shieldColor;
protected static BaseShieldBuild paramBuild; protected static BaseShieldBuild paramBuild;
//protected static Effect paramEffect; //protected static Effect paramEffect;
@ -125,7 +127,7 @@ public class BaseShield extends Block{
Draw.z(Layer.shields); 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){ if(renderer.animateShields){
Fill.poly(x, y, sides, radius); Fill.poly(x, y, sides, radius);

4
servers_v7.json
View File

@ -1,7 +1,7 @@
[ [
{ {
"name": "EscoCorp", "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", "name": "Redundancy Dept",
@ -318,7 +318,7 @@
}, },
{ {
"name": "ArmyOFUkraine", "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", "name": "Erbium",