From 5a03083b57f52f720ad569e6517bbfb9b38f095f Mon Sep 17 00:00:00 2001 From: Valeriy Date: Mon, 22 Nov 2021 01:37:58 +1000 Subject: [PATCH 1/4] Removing from v6 (#6356) --- servers_v6.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index c489682235..476300f3ad 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -3,15 +3,11 @@ "name": "RCM", "address": ["185.104.248.61", "easyplay.su"] }, - { - "name": "SkaarjDustry", - "address": ["skaarjproject.duckdns.org"] - }, { "name": "{AA}", "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] }, - { + { "name": "Atanner", "address": ["atannergaming.com:13000"] }, From f81d519c91ed190b7f6724965adc7f61857e9ab4 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Mon, 22 Nov 2021 01:38:06 +1000 Subject: [PATCH 2/4] Add to v7 (#6357) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 7f5b9fef21..1fa352ca86 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"] }, + { + "name": "SkaarjDustry", + "address": ["skaarjproject.duckdns.org"] + }, { "name": "C.A.M.S.", "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"] From f1e9d051630feac9a70cc93db805beef140f9589 Mon Sep 17 00:00:00 2001 From: MrDuck557 <48808663+MrDuck557@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:08:57 -0500 Subject: [PATCH 3/4] blinkSize (#6359) Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com> --- core/src/mindustry/entities/abilities/EnergyFieldAbility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java index 1bd906dfcc..e4b24b15f4 100644 --- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java +++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java @@ -30,7 +30,7 @@ public class EnergyFieldAbility extends Ability{ public int maxTargets = 25; public float healPercent = 2.5f; - public float layer = Layer.bullet - 0.001f, blinkScl = 20f; + public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f; public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f; public int sectors = 5; public Color color = Pal.heal; @@ -60,7 +60,7 @@ public class EnergyFieldAbility extends Ability{ Draw.color(color); Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y); float rx = Tmp.v1.x, ry = Tmp.v1.y; - float orbRadius = effectRadius * (1f + Mathf.absin(blinkScl, 0.1f)); + float orbRadius = effectRadius * (1f + Mathf.absin(blinkScl, blinkSize)); Fill.circle(rx, ry, orbRadius); Draw.color(); From 25f98fdeb0a645d3735d76beba44d2c94a032643 Mon Sep 17 00:00:00 2001 From: MrDuck557 <48808663+MrDuck557@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:11:03 -0500 Subject: [PATCH 4/4] engineColor (#6360) Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com> --- core/src/mindustry/type/UnitType.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index ac576f396d..24d4438be8 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -120,6 +120,8 @@ public class UnitType extends UnlockableContent{ public boolean canDrown = true, naval = false; public float drownTimeMultiplier = 1f; public float engineOffset = 5f, engineSize = 2.5f; + public @Nullable Color engineColor = null; + public Color engineColorInner = Color.white; public float strafePenalty = 0.5f; public float hitSize = 6f; public float itemOffsetY = 3f; @@ -766,13 +768,13 @@ public class UnitType extends UnlockableContent{ trail.draw(unit.team.color, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * scale) * trailScl); } - Draw.color(unit.team.color); + Draw.color(engineColor == null ? unit.team.color : engineColor); Fill.circle( unit.x + Angles.trnsx(unit.rotation + 180, offset), unit.y + Angles.trnsy(unit.rotation + 180, offset), (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) * scale ); - Draw.color(Color.white); + Draw.color(engineColorInner); Fill.circle( unit.x + Angles.trnsx(unit.rotation + 180, offset - 1f), unit.y + Angles.trnsy(unit.rotation + 180, offset - 1f),