X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fmapper%2FItemMapper.kt;h=ad79cbd824e01f6b0308f3d04e190f9952f16f29;hb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;hp=311c10c838b3fe33b6d92d3af93cb68b9b12d138;hpb=d555e8c264aa89967f09aecd37f49c69c936bc1c;p=cavedroid.git 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 311c10c..ad79cbd 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt @@ -23,6 +23,7 @@ class ItemMapper @Inject constructor() { "shovel" -> Shovel(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier) "sword" -> Sword(params, requireNotNull(loadSprite(dto)), dto.mobDamageMultiplier, dto.blockDamageMultiplier) "block" -> Placeable(params, requireNotNull(block)) + "none" -> None(params) else -> throw IllegalArgumentException("Unknown item type ${dto.type}") } } @@ -40,7 +41,7 @@ class ItemMapper @Inject constructor() { } private fun loadSprite(dto: ItemDto): Sprite? { - if (dto.type == "block" || dto.texture == GameItemsHolder.FALLBACK_ITEM_KEY) { + if (dto.type == "none" || dto.type == "block" || dto.texture == GameItemsHolder.FALLBACK_ITEM_KEY) { return null }