diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index dab3a6a2b0..acad9eeafa 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -23,6 +23,7 @@ import io.anuke.ucore.entities.trait.DrawTrait; import io.anuke.ucore.entities.impl.EffectEntity; import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.OS; +import io.anuke.ucore.util.Translator; import java.util.Locale; @@ -96,6 +97,8 @@ public class Vars{ public static final int tilesize = 8; + public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()}; + public static final Locale[] locales = {new Locale("en"), new Locale("fr"), new Locale("ru"), new Locale("uk", "UA"), new Locale("pl"), new Locale("de"), new Locale("pt", "BR"), new Locale("ko"), new Locale("in", "ID"), new Locale("ita"), new Locale("es")}; diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 340073caa4..2eba1b7511 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -130,4 +130,9 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ public EntityGroup targetGroup() { return effectGroup; } + + @Override + public float fin(){ + return time() / lifetime(); + } } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 8b8d2cd19b..5026eefe52 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -30,12 +30,12 @@ import io.anuke.ucore.util.*; import java.util.Arrays; import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.tmptr; import static io.anuke.mindustry.Vars.world; /**Interface for units that build, break or mine things.*/ public interface BuilderTrait { //these are not instance variables! - Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()}; float placeDistance = 140f; float mineDistance = 70f;