mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-22 13:31:16 -07:00
Code Issues 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
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 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();

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 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),

6
servers_v6.json
View file

@ -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"]
},

4
servers_v7.json
View file

@ -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"]