diff --git a/core/assets-raw/sprites/units/crawler-leg.png b/core/assets-raw/sprites/units/crawler-leg.png index 68e76d7f8d..af1a7636e9 100644 Binary files a/core/assets-raw/sprites/units/crawler-leg.png and b/core/assets-raw/sprites/units/crawler-leg.png differ diff --git a/core/assets/sounds/fire.ogg b/core/assets/sounds/fire.ogg new file mode 100644 index 0000000000..2626a9fd7e Binary files /dev/null and b/core/assets/sounds/fire.ogg differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 190f1e42a0..b49383e412 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index 19ceadf09c..8ee58d742a 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -1,21 +1,18 @@ package io.anuke.mindustry.entities.effect; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.arc.collection.IntMap; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Geometry; -import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.Structs; -import io.anuke.arc.util.Time; +import io.anuke.annotations.Annotations.*; +import io.anuke.arc.collection.*; +import io.anuke.arc.math.*; +import io.anuke.arc.math.geom.*; +import io.anuke.arc.util.*; import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.impl.TimedEntity; -import io.anuke.mindustry.entities.traits.SaveTrait; -import io.anuke.mindustry.entities.traits.SyncTrait; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.game.TypeID; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.entities.impl.*; +import io.anuke.mindustry.entities.traits.*; +import io.anuke.mindustry.entities.type.*; +import io.anuke.mindustry.game.*; +import io.anuke.mindustry.gen.*; +import io.anuke.mindustry.net.*; import io.anuke.mindustry.world.*; import java.io.*; @@ -102,6 +99,10 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait{ Effects.effect(Fx.fireSmoke, x + Mathf.range(4f), y + Mathf.range(4f)); } + if(Mathf.chance(0.001 * Time.delta())){ + Sounds.fire.at(this); + } + time = Mathf.clamp(time + Time.delta(), 0, lifetime()); map.put(tile.pos(), this); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 71e599459a..1b3908937a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -159,7 +159,8 @@ public class MenuFragment extends Fragment{ new Buttoni("$campaign", "icon-play-2", ui.deploy::show), new Buttoni("$joingame", "icon-add", ui.join::show), new Buttoni("$customgame", "icon-editor", ui.custom::show), - new Buttoni("$loadgame", "icon-load", ui.load::show) + new Buttoni("$loadgame", "icon-load", ui.load::show), + new Buttoni("$tutorial", "icon-info", control::playTutorial) ), new Buttoni("$editor", "icon-editor", ui.maps::show), new Buttoni("$settings", "icon-tools", ui.settings::show),