X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingGravel.java;h=e80f91b5e70987b2697fe9005a2d10d6e1841248;hb=1c004c0ce7e183e773b5b486295c25e39732e899;hp=f4c62f95a0e97bb861f698f1e5a257e6f8320cbc;hpb=834fd02f670fddc6857f2b5afabc3ae044143b32;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 f4c62f9..e80f91b 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -3,7 +3,8 @@ 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.game.GameWorld; +import ru.deadsoftware.cavedroid.game.GameItemsHolder; +import ru.deadsoftware.cavedroid.game.world.GameWorld; /** * Falling gravel is actually a mob, that spawns in place of gravel when there is no block under it, @@ -18,14 +19,24 @@ public class FallingGravel extends Mob { * @param y Y in pixels */ public FallingGravel(float x, float y) { - super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL); + super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL, Integer.MAX_VALUE); mVelocity = new Vector2(0, 1); } @Override - public void ai(GameWorld gameWorld, float delta) { + public float getSpeed() { + return 0; + } + + @Override + public void jump() { + // no-op + } + + @Override + public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) { if (mVelocity.isZero()) { - gameWorld.setForeMap(getMapX(), getMiddleMapY(), 11); + gameWorld.setForeMap(getMapX(), getMiddleMapY(), gameItemsHolder.getBlock("gravel")); kill(); } }