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

Improvements of status effects in database

Browse Source
This commit is contained in:
Anuken
2021-03-10 16:22:07 -05:00
parent d4e6817232
commit bd36ca821d
21 changed files with 98 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/content/StatusEffects.java
View File

@@ -12,7 +12,7 @@ import mindustry.graphics.*;
import static mindustry.Vars.*;
public class StatusEffects implements ContentList{
public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed, disarmed;
public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, boss, sporeSlowed, disarmed;
@Override
public void load(){
@@ -20,14 +20,15 @@ public class StatusEffects implements ContentList{
none = new StatusEffect("none");
burning = new StatusEffect("burning"){{
color = Pal.lightFlame;
color = Color.valueOf("ffc455");
damage = 0.12f; //over 8 seconds, this would be ~60 damage
effect = Fx.burning;
transitionDamage = 8f;
init(() -> {
opposite(wet, freezing);
affinity(tarred, ((unit, time, newTime, result) -> {
unit.damagePierce(8f);
unit.damagePierce(transitionDamage);
Fx.burning.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f));
result.set(burning, Math.min(time + newTime, 300f));
}));
@@ -39,12 +40,13 @@ public class StatusEffects implements ContentList{
speedMultiplier = 0.6f;
healthMultiplier = 0.8f;
effect = Fx.freezing;
transitionDamage = 18f;
init(() -> {
opposite(melting, burning);
affinity(blasted, ((unit, time, newTime, result) -> {
unit.damagePierce(18f);
unit.damagePierce(transitionDamage);
result.set(freezing, time);
}));
});
@@ -65,10 +67,11 @@ public class StatusEffects implements ContentList{
speedMultiplier = 0.94f;
effect = Fx.wet;
effectChance = 0.09f;
transitionDamage = 14;
init(() -> {
affinity(shocked, ((unit, time, newTime, result) -> {
unit.damagePierce(14f);
unit.damagePierce(transitionDamage);
if(unit.team == state.rules.waveTeam){
Events.fire(Trigger.shock);
}
@@ -169,11 +172,6 @@ public class StatusEffects implements ContentList{
reactive = true;
}};
corroded = new StatusEffect("corroded"){{
color = Pal.plastanium;
damage = 0.1f;
}};
disarmed = new StatusEffect("disarmed"){{
color = Color.valueOf("e9ead3");
disarm = true;