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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
This commit is contained in:
Anuken
2021-09-28 18:45:09 -04:00
parent 8a3d46b4a7 71543f2ab2
commit 5f3cef251b
53 changed files with 450 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package mindustry.entities.abilities;
import arc.*;
import arc.math.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
@@ -12,6 +13,7 @@ public class StatusFieldAbility extends Ability{
public float duration = 60, reload = 100, range = 20;
public Effect applyEffect = Fx.none;
public Effect activeEffect = Fx.overdriveWave;
public float effectX, effectY;
public boolean parentizeEffects;
protected float timer;
@@ -40,7 +42,8 @@ public class StatusFieldAbility extends Ability{
applyEffect.at(other, parentizeEffects);
});
activeEffect.at(unit, parentizeEffects);
float x = unit.x + Angles.trnsx(unit.rotation, effectY, effectX), y = unit.y + Angles.trnsy(unit.rotation, effectY, effectX);
activeEffect.at(x, y, unit.rotation, parentizeEffects ? unit : null);
timer = 0f;
}