X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=07cd8cdd84e3ddf8249be1964681b2a422c09b63;hb=3fdc2291218f6d3903ce923563d1e12051690c37;hp=6194e4e93f1143c6edb108d6662e2f654f7975bf;hpb=0a855ca3c1d0c84de41a928cc99fd8544a933015;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
index 6194e4e..07cd8cd 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -3,17 +3,32 @@ package ru.deadsoftware.cavedroid.game.mobs;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavedroid.game.GameItems;
-import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 
+
+/**
+ * Falling sand is actually a mob, that spawns in place of gravel when there is no block under it,
+ * falls down to the next block and becomes a block of sand again.
+ */
 public class FallingSand extends Mob {
 
+    /**
+     * Creates a FallingSand mob at coordinates
+     *
+     * @param x X in pixels
+     * @param y Y in pixels
+     */
     public FallingSand(float x, float y) {
-        super(x, y, 16, 16, 0);
-        mov = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.SAND);
+        mVelocity = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
+    public void ai(GameWorld gameWorld, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
+            kill();
+        }
     }
 
     @Override
@@ -21,13 +36,8 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(Assets.blockTex[GameItems.getBlock(10).getTex()], x, y);
-    }
-
-    @Override
-    public int getType() {
-        return 10;
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }
 
 }