From 9606fce8cc7c9b264abd7cb38583faaebb610540 Mon Sep 17 00:00:00 2001 From: fredboy Date: Fri, 10 May 2024 19:35:11 +0700 Subject: [PATCH] Fix furnace bugs --- .../ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt | 2 +- .../cavedroid/game/ui/windows/GameWindowsConfigs.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt b/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt index a6915ef..0265cb0 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt @@ -94,7 +94,7 @@ class Furnace : Serializable { } - if (currentFuel != null && burnProgress >= 1f) { + if (currentFuel?.isNone() == false && burnProgress >= 1f) { if (canSmelt()) { startBurning() } else { diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt index faef993..0a8ddf8 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt @@ -67,7 +67,7 @@ object GameWindowsConfigs { const val craftOffsetX = 30f const val craftOffsetY = 18f - const val craftResultOffsetX = 128f + const val craftResultOffsetX = 124f const val craftResultOffsetY = 36f } @@ -90,7 +90,7 @@ object GameWindowsConfigs { const val smeltFuelMarginLeft = 56f const val smeltFuelMarginTop = 54f - const val smeltResultOffsetX = 128f + const val smeltResultOffsetX = 116f const val smeltResultOffsetY = 36f const val fuelBurnMarginLeft = 56f -- 2.29.2