Game action modules generation

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / actions / updateblock / UpdateSandAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSandAction.kt b/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSandAction.kt
index 26fb97827c6ed30898977232e0496828bbd201a4..f2ef25ed941c6897237d2cb8fbc15701efebbad1 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSandAction.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSandAction.kt
@@ -7,17 +7,19 @@ import ru.deadsoftware.cavedroid.game.world.GameWorld
 import javax.inject.Inject
 
 @GameScope
+@UpdateBlockAction(stringKey = UpdateSandAction.BLOCK_KEY)
 class UpdateSandAction @Inject constructor(
     private val gameWorld: GameWorld,
     private val mobsController: MobsController,
 ) : IUpdateBlockAction {
 
     override fun update(x: Int, y: Int) {
-        val shouldFall = gameWorld.getForeMapBlock(x, y + 1).collision.not()
+        val shouldFall = gameWorld.getForeMap(x, y + 1).params.hasCollision.not()
 
         if (shouldFall) {
-            gameWorld.setForeMap(x, y, 0)
-            mobsController.addMob(FallingSand(x * 16f, y * 16f))
+            gameWorld.resetForeMap(x, y)
+            FallingSand(x * 16f, y * 16f)
+                .apply { attachToController(mobsController) }
         }
     }