X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingGravel.java;h=641ffe554ec84255bbe0b1099b3f67a9aded0464;hb=409a22b3fe7c43b7f686f33cc2f01b6277edec78;hp=b47b600aa517c470d1a7e9a286e76c78627c59b5;hpb=d58d40ec24363550fad10bd6047cee2618912186;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
index b47b600..641ffe5 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
@@ -1,34 +1,67 @@
 package ru.deadsoftware.cavedroid.game.mobs;
 
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
+import javax.annotation.CheckForNull;
+
+/**
+ * Falling gravel 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 gravel again.
+ */
 public class FallingGravel extends Mob {
 
-    ^
+    private static final String TAG = "FallingGravel";
+
+    /**
+     * Creates a FallingGravel mob at coordinates
+     *
+     * @param x X in pixels
+     * @param y Y in pixels
+     */
     public FallingGravel(float x, float y) {
-        super(x, y, 16, 16, 0);
-        mov = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL, Integer.MAX_VALUE);
+        mVelocity = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
+    public float getSpeed() {
+        return 0;
     }
 
     @Override
-    public void changeDir() {
+    public void jump() {
+        // no-op
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(GameItems.getBlock("gravel").getTex(), x, y);
+    public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getUpperMapY(), gameItemsHolder.getBlock("gravel"));
+            kill();
+        }
     }
 
     @Override
-    public int getType() {
-        return 11;
+    public void changeDir() {
+    }
+
+    @Override
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        @CheckForNull final Texture texture = Assets.blockTextures.get("gravel");
+
+        if (texture == null) {
+            Gdx.app.error(TAG, "Couldn't draw: texture not found");
+            kill();
+            return;
+        }
+
+        spriteBatch.draw(texture, x, y);
     }
 
 }