Add furnace, more craft and items

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / input / handler / keyboard / DropItemKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt
index 4003271fd61301ac713fc65dc6fbb66897998d69..04f5520af367a3123bb331181e265dc20aaf0855 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt
@@ -7,8 +7,8 @@ import ru.deadsoftware.cavedroid.game.input.action.KeyboardInputAction
 import ru.deadsoftware.cavedroid.game.input.action.keys.KeyboardInputActionKey
 import ru.deadsoftware.cavedroid.game.mobs.MobsController
 import ru.deadsoftware.cavedroid.game.model.item.Item
-import ru.deadsoftware.cavedroid.game.objects.Drop
-import ru.deadsoftware.cavedroid.game.objects.DropController
+import ru.deadsoftware.cavedroid.game.objects.drop.Drop
+import ru.deadsoftware.cavedroid.game.objects.drop.DropController
 import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager
 import javax.inject.Inject
 
@@ -25,32 +25,25 @@ class DropItemKeyboardInputHandler @Inject constructor(
                 !mobsController.player.inventory.activeItem.item.isNone()
     }
 
-    private fun createDrop(item: Item, playerX: Float, playerY: Float) {
-        dropController.addDrop(playerX + ((DROP_DISTANCE - Drop.DROP_SIZE / 2) * mobsController.player.direction.basis), playerY, item)
+    private fun createDrop(item: Item, playerX: Float, playerY: Float, amount: Int) {
+        dropController.addDrop(
+            /* x = */ playerX + ((DROP_DISTANCE - Drop.DROP_SIZE / 2) * mobsController.player.direction.basis),
+            /* y = */ playerY,
+            /* item = */ item,
+            /* count = */ amount
+        )
     }
 
     override fun handle(action: KeyboardInputAction) {
         val player = mobsController.player
         val currentItem = player.inventory.activeItem
+        val dropAmount =  if (currentItem.item.isTool()) currentItem.amount else 1
 
-        if (!currentItem.item.isTool()) {
-            createDrop(currentItem.item, player.x, player.y)
-        } else {
-            for (i in 1..currentItem.amount) {
-                createDrop(currentItem.item, player.x, player.y)
-            }
-        }
-
-        player.inventory.decreaseCurrentItemAmount(
-            if (currentItem.item.isTool()) {
-                currentItem.amount
-            } else {
-                1
-            }
-        )
+        createDrop(currentItem.item, player.x, player.y, dropAmount)
+        player.inventory.decreaseCurrentItemAmount(dropAmount)
     }
 
     companion object {
-        private const val DROP_DISTANCE = 20f
+        const val DROP_DISTANCE = 20f
     }
 }
\ No newline at end of file