mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-03-10 04:40:10 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
373d004752
@ -43,7 +43,7 @@ public class StatusEffect extends UnlockableContent{
|
|||||||
public Color color = Color.white.cpy();
|
public Color color = Color.white.cpy();
|
||||||
/** Effect that happens randomly on top of the affected unit. */
|
/** Effect that happens randomly on top of the affected unit. */
|
||||||
public Effect effect = Fx.none;
|
public Effect effect = Fx.none;
|
||||||
/** Affinity & opposite values for stat displaysdo. */
|
/** Affinity & opposite values for stat displays. */
|
||||||
public ObjectSet<StatusEffect> affinities = new ObjectSet<>(), opposites = new ObjectSet<>();
|
public ObjectSet<StatusEffect> affinities = new ObjectSet<>(), opposites = new ObjectSet<>();
|
||||||
/** Transition handler map. */
|
/** Transition handler map. */
|
||||||
protected ObjectMap<StatusEffect, TransitionHandler> transitions = new ObjectMap<>();
|
protected ObjectMap<StatusEffect, TransitionHandler> transitions = new ObjectMap<>();
|
||||||
|
Loading…
Reference in New Issue
Block a user