Add top slabs

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / world / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 39ae5d39e070c4ec8d24312c21300bd5361214a4..32fef769bed2b89c4e1d71e55d68c2eb37cd04eb 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -1,13 +1,13 @@
 package ru.deadsoftware.cavedroid.game.world;
 
 import kotlin.Pair;
-import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.GameItemsHolder;
 import ru.deadsoftware.cavedroid.game.GameScope;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.model.block.Block;
 import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.misc.utils.MeasureUnitsUtilsKt;
 
 import javax.annotation.CheckForNull;
 import javax.inject.Inject;
@@ -60,12 +60,20 @@ public class GameWorld {
         return mHeight;
     }
 
+    /**
+     * @deprecated for kotlin use {@link MeasureUnitsUtilsKt#getPx } extension val
+     */
+    @Deprecated
     public float getWidthPx() {
-        return mWidth * 16f;
+        return MeasureUnitsUtilsKt.getPx(mWidth);
     }
 
+    /**
+     * @deprecated for kotlin use {@link MeasureUnitsUtilsKt#getPx } extension val
+     */
+    @Deprecated
     public float getHeightPx() {
-        return mHeight * 16f;
+        return MeasureUnitsUtilsKt.getPx(mHeight);
     }
 
     public Block[][] getFullForeMap() {
@@ -106,6 +114,15 @@ public class GameWorld {
         }
     }
 
+    private boolean isSameSlab(Block slab1, Block slab2) {
+        if (!(slab1 instanceof Block.Slab) || !(slab2 instanceof Block.Slab)) {
+            return false;
+        }
+
+        return slab1.getParams().getKey().equals(((Block.Slab) slab2).getOtherPartBlockKey())
+                || slab1.getParams().getKey().equals(slab2.getParams().getKey());
+    }
+
     public boolean hasForeAt(int x, int y) {
         return getMap(x, y, 0) != mGameItemsHolder.getFallbackBlock();
     }
@@ -137,7 +154,7 @@ public class GameWorld {
     public void placeToForeground(int x, int y, Block value) {
         if (!hasForeAt(x, y) || value == mGameItemsHolder.getFallbackBlock() || !getForeMap(x, y).hasCollision()) {
             setForeMap(x, y, value);
-        } else if (value instanceof Block.Slab && getForeMap(x, y) == value) {
+        } else if (value instanceof Block.Slab && isSameSlab(value, getForeMap(x, y))) {
             setForeMap(x, y, mGameItemsHolder.getBlock(((Block.Slab) value).getFullBlockKey()));
         }
     }
@@ -152,7 +169,7 @@ public class GameWorld {
     public void destroyForeMap(int x, int y) {
         Block block = getForeMap(x, y);
         if (block.hasDrop()) {
-            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getItemId(block.getDrop()));
+            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
         }
         placeToForeground(x, y, mGameItemsHolder.getFallbackBlock());
     }
@@ -160,7 +177,7 @@ public class GameWorld {
     public void destroyBackMap(int x, int y) {
         Block block = getBackMap(x, y);
         if (block.hasDrop()) {
-            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getItemId(block.getDrop()));
+            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
         }
         placeToBackground(x, y, mGameItemsHolder.getFallbackBlock());
     }