X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fblock%2FBlock.kt;h=76c6ac580c0df1a6604c447e3f1c0e930496f456;hb=387ad284ceb79b07cba3726fa7350b7e83916815;hp=2411a6352d963823bb921f1a8a741172150fddfb;hpb=121928e90bdfa3a9d9c8bd708b9f8da28d3807c0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
index 2411a63..76c6ac5 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.math.Rectangle
 import com.badlogic.gdx.utils.TimeUtils
 import ru.deadsoftware.cavedroid.game.model.item.Item
+import ru.deadsoftware.cavedroid.misc.utils.colorFromHexString
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
@@ -16,8 +17,8 @@ sealed class Block {
     val width: Float get() = 16f - params.collisionMargins.left - params.collisionMargins.right
     val height: Float get() = 16f - params.collisionMargins.top - params.collisionMargins.bottom
 
-    private val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right
-    private val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom
+    val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right
+    val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom
 
     private var animation: Array<Sprite>? = null
 
@@ -56,7 +57,10 @@ sealed class Block {
                 val width = 16 - params.spriteMargins.left - params.spriteMargins.right
                 val height = 16 - params.spriteMargins.top - params.spriteMargins.bottom
                 Sprite(params.texture, params.spriteMargins.left, 16 * y + params.spriteMargins.top, width, height)
-                    .apply { flip(false, true) }
+                    .apply {
+                        flip(false, true)
+                        params.tint?.let { tint -> color = colorFromHexString(tint) }
+                    }
             }
         }
     }
@@ -66,7 +70,10 @@ sealed class Block {
             val width = 16 - params.spriteMargins.left - params.spriteMargins.right
             val height = 16 - params.spriteMargins.top - params.spriteMargins.bottom
             Sprite(tex, params.spriteMargins.left, params.spriteMargins.top, width, height)
-                .apply { flip(false, true) }
+                .apply {
+                    flip(false, true)
+                    params.tint?.let { tint -> color = colorFromHexString(tint) }
+                }
         }
     }
 
@@ -104,6 +111,11 @@ sealed class Block {
         return this is Slab
     }
 
+    fun isNone(): Boolean {
+        contract { returns(true) implies (this@Block is None) }
+        return this is None
+    }
+
     fun getRectangle(x: Int, y: Int): Rectangle {
         return Rectangle(
             /* x = */ x * 16f + params.collisionMargins.left,
@@ -113,7 +125,9 @@ sealed class Block {
         )
     }
 
-
+    data class None(
+        override val params: CommonBlockParams
+    ) : Block()
 
     data class Normal(
         override val params: CommonBlockParams,
@@ -122,6 +136,7 @@ sealed class Block {
     data class Slab(
         override val params: CommonBlockParams,
         val fullBlockKey: String,
+        val otherPartBlockKey: String,
     ): Block()
 
     sealed class Fluid: Block() {
@@ -158,7 +173,6 @@ sealed class Block {
     @Deprecated(LEGACY_ACCESSOR_DEPRECATION) fun isTransparent() = params.isTransparent
     @Deprecated(LEGACY_ACCESSOR_DEPRECATION) fun getTexture() = sprite
 
-
     companion object {
         private const val LEGACY_ACCESSOR_DEPRECATION = "legacy accessors will be removed"
         private const val ANIMATION_FRAME_DURATION_MS = 100L