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
2023-08-09 13:05:26 -04:00
parent f1172d45eb 87e79913c5
commit 275c3ec163
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/UnitTypes.java
View File

@@ -2153,13 +2153,15 @@ public class UnitTypes{
abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{ abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{
statusDuration = 60f * 6f; statusDuration = 60f * 6f;
maxTargets = 25; maxTargets = 25;
healPercent = 1.5f;
sameTypeHealMult = 0.5f;
}}); }});
for(float mountY : new float[]{-18f, 14}){ for(float mountY : new float[]{-18f, 14}){
weapons.add(new PointDefenseWeapon("point-defense-mount"){{ weapons.add(new PointDefenseWeapon("point-defense-mount"){{
x = 12.5f; x = 12.5f;
y = mountY; y = mountY;
reload = 6f; reload = 4f;
targetInterval = 8f; targetInterval = 8f;
targetSwitchInterval = 8f; targetSwitchInterval = 8f;
@@ -2167,7 +2169,7 @@ public class UnitTypes{
shootEffect = Fx.sparkShoot; shootEffect = Fx.sparkShoot;
hitEffect = Fx.pointHit; hitEffect = Fx.pointHit;
maxRange = 180f; maxRange = 180f;
damage = 25f; damage = 30f;
}}; }};
}}); }});
} }

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

@@ -29,6 +29,8 @@ public class EnergyFieldAbility extends Ability{
public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true; public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true;
public int maxTargets = 25; public int maxTargets = 25;
public float healPercent = 3f; public float healPercent = 3f;
/** Multiplies healing to units of the same type by this amount. */
public float sameTypeHealMult = 1f;
public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f; 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;
@@ -129,7 +131,8 @@ public class EnergyFieldAbility extends Ability{
if(((Teamc)other).team() == unit.team){ if(((Teamc)other).team() == unit.team){
if(other.damaged()){ if(other.damaged()){
anyNearby = true; anyNearby = true;
other.heal(healPercent / 100f * other.maxHealth()); float healMult = (other instanceof Unit u && u.type == unit.type) ? sameTypeHealMult : 1f;
other.heal(healPercent / 100f * other.maxHealth() * healMult);
healEffect.at(other); healEffect.at(other);
damageEffect.at(rx, ry, 0f, color, other); damageEffect.at(rx, ry, 0f, color, other);
hitEffect.at(rx, ry, unit.angleTo(other), color); hitEffect.at(rx, ry, unit.angleTo(other), color);

2
servers_v7.json
View File

@@ -149,7 +149,7 @@
}, },
{ {
"name": "Vndustry", "name": "Vndustry",
"address": ["vndustry.ddns.net", "vndustry.ddns.net:6568", "45.8.22.128:26164"] "address": ["vndustry.ddns.net", "vndustry.ddns.net:6568", "27.50.72.82:25334"]
}, },
{ {
"name": "Anana&ShenYv", "name": "Anana&ShenYv",