X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=f2fd27dd486fa4a3425bd5edce078769350deb19;hb=969518fd0bbde98b81c885c62f973d74ff5f61bb;hp=449c958da450fa3bb68901df527b0ebf473f7221;hpb=121928e90bdfa3a9d9c8bd708b9f8da28d3807c0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 449c958..f2fd27d 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -5,8 +5,11 @@ 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.item.InventoryItem;
+import ru.deadsoftware.cavedroid.game.model.item.Item;
 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;
@@ -23,6 +26,8 @@ public class GameWorld {
     private final Block[][] mForeMap;
     private final Block[][] mBackMap;
 
+    private final WorldGeneratorConfig mWorldConfig =  WorldGeneratorConfig.Companion.getDefault();
+
     @Inject
     public GameWorld(DropController dropController,
                      MobsController mobsController,
@@ -36,10 +41,9 @@ public class GameWorld {
         boolean isNewGame = foreMap == null || backMap == null;
 
         if (isNewGame) {
-            final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault();
-            mWidth = config.getWidth();
-            mHeight = config.getHeight();
-            Pair<Block[][], Block[][]> maps = new GameWorldGenerator(config, mGameItemsHolder).generate();
+            mWidth = mWorldConfig.getWidth();
+            mHeight = mWorldConfig.getHeight();
+            Pair<Block[][], Block[][]> maps = new GameWorldGenerator(mWorldConfig, mGameItemsHolder).generate();
             mForeMap = maps.getFirst();
             mBackMap = maps.getSecond();
             mMobsController.getPlayer().respawn(this, mGameItemsHolder);
@@ -59,12 +63,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() {
@@ -105,6 +117,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();
     }
@@ -133,34 +154,65 @@ public class GameWorld {
         setMap(x, y, 1, block);
     }
 
-    public void placeToForeground(int x, int y, Block value) {
+    public boolean 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) {
+            return true;
+        } else if (value instanceof Block.Slab && isSameSlab(value, getForeMap(x, y))) {
             setForeMap(x, y, mGameItemsHolder.getBlock(((Block.Slab) value).getFullBlockKey()));
+            return true;
         }
+        return false;
     }
 
-    public void placeToBackground(int x, int y, Block value) {
+    public boolean placeToBackground(int x, int y, Block value) {
         if (value == mGameItemsHolder.getFallbackBlock() || (getBackMap(x, y) == mGameItemsHolder.getFallbackBlock() && value.hasCollision()) &&
                 (!value.isTransparent() || value == mGameItemsHolder.getBlock("glass"))) {
             setBackMap(x, y, value);
+            return true;
+        }
+        return false;
+    }
+
+    private void playerDurateTool() {
+        final InventoryItem playerCurrentItem = mMobsController.getPlayer().getCurrentItem();
+        if (mMobsController.getPlayer().getCurrentItem().getItem().isTool()) {
+            mMobsController.getPlayer().decreaseCurrentItemCount(mGameItemsHolder);
         }
     }
 
+    private boolean shouldDrop(Block block) {
+        final Item item = mMobsController.getPlayer().getCurrentItem().getItem();
+        int toolLevel = item.isTool() ? ((Item.Tool)item).getLevel() : 0;
+        if (item.isTool() && block.getParams().getToolType() != item.getClass()) {
+            toolLevel = 0;
+        }
+        return toolLevel >= block.getParams().getToolLevel();
+    }
+
     public void destroyForeMap(int x, int y) {
         Block block = getForeMap(x, y);
-        if (block.hasDrop()) {
-            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
+        if (block.hasDrop() && shouldDrop(block)) {
+            for (int i = 0; i < block.getParams().getDropInfo().getCount(); i++) {
+                mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
+            }
         }
+        playerDurateTool();
         placeToForeground(x, y, mGameItemsHolder.getFallbackBlock());
     }
 
+    public WorldGeneratorConfig getWorldConfig() {
+        return mWorldConfig;
+    }
+
     public void destroyBackMap(int x, int y) {
         Block block = getBackMap(x, y);
-        if (block.hasDrop()) {
-            mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
+        if (block.hasDrop() && shouldDrop(block)) {
+            for (int i = 0; i < block.getParams().getDropInfo().getCount(); i++) {
+                mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
+            }
         }
+        playerDurateTool();
         placeToBackground(x, y, mGameItemsHolder.getFallbackBlock());
     }
 }
\ No newline at end of file