Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-11-22 10:31:10 -05:00
parent c8397c9d10 25f98fdeb0
commit ef1084302f
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -30,7 +30,7 @@ public class EnergyFieldAbility extends Ability{
public int maxTargets = 25; public int maxTargets = 25;
public float healPercent = 2.5f; 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 float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f;
public int sectors = 5; public int sectors = 5;
public Color color = Pal.heal; public Color color = Pal.heal;
@@ -60,7 +60,7 @@ public class EnergyFieldAbility extends Ability{
Draw.color(color); Draw.color(color);
Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y); Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y);
float rx = Tmp.v1.x, ry = Tmp.v1.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); Fill.circle(rx, ry, orbRadius);
Draw.color(); Draw.color();

6
core/src/mindustry/type/UnitType.java
View File

@@ -120,6 +120,8 @@ public class UnitType extends UnlockableContent{
public boolean canDrown = true, naval = false; public boolean canDrown = true, naval = false;
public float drownTimeMultiplier = 1f; public float drownTimeMultiplier = 1f;
public float engineOffset = 5f, engineSize = 2.5f; public float engineOffset = 5f, engineSize = 2.5f;
public @Nullable Color engineColor = null;
public Color engineColorInner = Color.white;
public float strafePenalty = 0.5f; public float strafePenalty = 0.5f;
public float hitSize = 6f; public float hitSize = 6f;
public float itemOffsetY = 3f; 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); 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( Fill.circle(
unit.x + Angles.trnsx(unit.rotation + 180, offset), unit.x + Angles.trnsx(unit.rotation + 180, offset),
unit.y + Angles.trnsy(unit.rotation + 180, offset), unit.y + Angles.trnsy(unit.rotation + 180, offset),
(engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) * scale (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) * scale
); );
Draw.color(Color.white); Draw.color(engineColorInner);
Fill.circle( Fill.circle(
unit.x + Angles.trnsx(unit.rotation + 180, offset - 1f), unit.x + Angles.trnsx(unit.rotation + 180, offset - 1f),
unit.y + Angles.trnsy(unit.rotation + 180, offset - 1f), unit.y + Angles.trnsy(unit.rotation + 180, offset - 1f),

4
servers_v6.json
View File

@@ -3,10 +3,6 @@
"name": "RCM", "name": "RCM",
"address": ["185.104.248.61", "easyplay.su"] "address": ["185.104.248.61", "easyplay.su"]
}, },
{
"name": "SkaarjDustry",
"address": ["skaarjproject.duckdns.org"]
},
{ {
"name": "{AA}", "name": "{AA}",
"address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"]

4
servers_v7.json
View File

@@ -3,6 +3,10 @@
"name": "mindustry.pl", "name": "mindustry.pl",
"address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"] "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.", "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"] "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"]