X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fdebug%2FDebugInfoStringsProvider.kt;h=51dc335c50b3b302ea8cb7ce7d2ee50efe0fbe52;hb=0d6ab84418440a30f2de555cb30ce21af8dac12e;hp=678a91f7456cabacc8d63ebcf53096b8801c543e;hpb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt b/core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt
index 678a91f..51dc335 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt
@@ -1,19 +1,19 @@
 package ru.deadsoftware.cavedroid.game.debug
 
 import com.badlogic.gdx.Gdx
-import ru.deadsoftware.cavedroid.game.GameInput
 import ru.deadsoftware.cavedroid.game.GameScope
 import ru.deadsoftware.cavedroid.game.mobs.MobsController
-import ru.deadsoftware.cavedroid.game.objects.DropController
+import ru.deadsoftware.cavedroid.game.objects.container.ContainerController
+import ru.deadsoftware.cavedroid.game.objects.drop.DropController
 import ru.deadsoftware.cavedroid.game.world.GameWorld
 import javax.inject.Inject
 
 @GameScope
 class DebugInfoStringsProvider @Inject constructor(
     private val mobsController: MobsController,
-    private val gameInput: GameInput,
     private val dropController: DropController,
-    private val gameWorld: GameWorld
+    private val containerController: ContainerController,
+    private val gameWorld: GameWorld,
 ) {
 
     fun getDebugStrings(): List<String> {
@@ -22,16 +22,18 @@ class DebugInfoStringsProvider @Inject constructor(
         return listOf(
             "FPS: ${Gdx.graphics.framesPerSecond}",
             "X: ${player.mapX}",
-            "Y: ${player.upperMapY}",
-            "CurX: ${gameInput.curX}",
-            "CurY: ${gameInput.curY}",
+            "Y: ${player.upperMapY} (${gameWorld.height - player.upperMapY})",
+            "CurX: ${player.cursorX}",
+            "CurY: ${player.cursorY}",
             "Velocity: ${player.velocity}",
             "Swim: ${player.swim}",
             "Mobs: ${mobsController.mobs.size}",
             "Drops: ${dropController.size}",
-            "Block: ${gameWorld.getForeMap(gameInput.curX, gameInput.curY).params.key}",
-            "Hand: ${player.inventory[player.slot].item.params.key}",
-            "Game mode: ${player.gameMode}"
+            "Containers: ${containerController.size}",
+            "Block: ${gameWorld.getForeMap(player.cursorX, player.cursorY).params.key}",
+            "Hand: ${player.inventory.activeItem.item.params.key}",
+            "Game mode: ${player.gameMode}",
+            "Block damage: ${player.blockDamage}"
         )
     }
 }
\ No newline at end of file