diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
index d193dcfa52d5c4569d21d4816ea35c2d5d72bfe0..7186b3a1ff13ee0af1375eb65fd6b2aba9cc202d 100644 (file)
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Vector2;
-import org.jetbrains.annotations.NotNull;
-import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.game.GameItems;
+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,
/**
* 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, 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 ai(GameWorld gameWorld, float delta) {
+ if (mVelocity.isZero()) {
+ gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
+ kill();
+ }
}
@Override
- public void draw(@NotNull SpriteBatch spriteBatch, float x, float y) {
- spriteBatch.draw(Assets.sandSprite, x, y);
+ public void changeDir() {
}
@Override
- public int getType() {
- return 10;
+ public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+ spriteBatch.draw(GameItems.getBlockTex(10), x, y);
}
}