X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fobjects%2FItem.kt;h=a4c41b0424d62342a42ff00838f2bada8e594623;hb=076b501cc25dc05c9fd26e3f71d850c7277120cb;hp=9eea9767e3967ed2e9783e65d20c84207bcecd24;hpb=2b0cd1ba5dbf194bd5ed35964c0cb2ea16293be4;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Item.kt b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.kt
index 9eea976..a4c41b0 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/Item.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.kt
@@ -5,11 +5,13 @@ import ru.deadsoftware.cavedroid.game.GameItems
 import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin
 
 data class Item(
-        val id: Int,
-        val name: String,
-        val type: String,
-        val sprite: Sprite?,
-        val defaultOrigin: SpriteOrigin,
+    val id: Int,
+    val key: String,
+    val name: String,
+    val type: String,
+    val sprite: Sprite?,
+    val defaultOrigin: SpriteOrigin,
+    val actionKey: String?,
 ) {
 
     init {
@@ -33,6 +35,14 @@ data class Item(
         return GameItems.getBlock(GameItems.getBlockIdByItemId(id))
     }
 
+    fun getItemOrBlockSprite(): Sprite {
+        return requireNotNull(sprite ?: toBlock()?.requireSprite()) { "wtf: sprite is null" }
+    }
+
+    fun isNone(): Boolean {
+        return id == 0;
+    }
+
     @Deprecated("Was renamed to Sprite to comply with variable type.", ReplaceWith("requireSprite()"))
     fun getTexture() = sprite
 }
\ No newline at end of file