[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / model / mapper / ItemMapper.kt
diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt b/core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt
index 4d6d5512276af372e5be34f0acacfd98e92dd708..a0949a05d2c082c427cb6ccec26524c6a87a047c 100644 (file)
import ru.deadsoftware.cavedroid.misc.Assets
import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin
import ru.deadsoftware.cavedroid.misc.Assets
import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin
+import ru.deadsoftware.cavedroid.misc.utils.colorFromHexString
import javax.inject.Inject
@Reusable
import javax.inject.Inject
@Reusable
val params = mapCommonParams(key, dto)
return when (dto.type) {
val params = mapCommonParams(key, dto)
return when (dto.type) {
- "bucket" -> Bucket(params, requireNotNull(loadSprite(dto)), requireNotNull(dto.actionKey))
+ "normal" -> Normal(params, requireNotNull(loadSprite(dto)))
+ "usable" -> Usable(params, requireNotNull(loadSprite(dto)), requireNotNull(dto.actionKey))
"shovel" -> Shovel(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
"sword" -> Sword(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
"pickaxe" -> Pickaxe(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
"shovel" -> Shovel(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
"sword" -> Sword(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
"pickaxe" -> Pickaxe(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier, requireNotNull(dto.toolLevel))
private fun mapCommonParams(key: String, dto: ItemDto): CommonItemParams {
return CommonItemParams(
private fun mapCommonParams(key: String, dto: ItemDto): CommonItemParams {
return CommonItemParams(
- id = dto.id,
key = key,
name = dto.name,
inHandSpriteOrigin = SpriteOrigin(
key = key,
name = dto.name,
inHandSpriteOrigin = SpriteOrigin(
y = dto.origin_y,
),
maxStack = dto.maxStack,
y = dto.origin_y,
),
maxStack = dto.maxStack,
+ burningTimeMs = dto.burningTime,
+ smeltProductKey = dto.smeltProduct,
)
}
)
}
val texture = Assets.resolveItemTexture(assetLoader, dto.texture)
return Sprite(texture)
val texture = Assets.resolveItemTexture(assetLoader, dto.texture)
return Sprite(texture)
- .apply { flip(false, true) }
+ .apply {
+ flip(false, true)
+ dto.tint?.let {
+ color = colorFromHexString(it)
+ }
+ }
}
}
\ No newline at end of file
}
}
\ No newline at end of file