X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=05a7d5f0f6aa14802eb11fc7b05dcd8b96ba95a4;hb=1e285247085ba04351feb486a0be6aa577f43093;hp=0d5a80ae49cf7fccbf9d7c3aff5723e451bf5c84;hpb=c447b95aeb883113ff1d53a3178828929c1eb92f;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 0d5a80a..05a7d5f 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java +++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java @@ -1,16 +1,19 @@ package ru.deadsoftware.cavedroid.game.world; +import com.badlogic.gdx.math.MathUtils; import kotlin.Pair; import ru.deadsoftware.cavedroid.game.GameItemsHolder; import ru.deadsoftware.cavedroid.game.GameScope; import ru.deadsoftware.cavedroid.game.mobs.MobsController; +import ru.deadsoftware.cavedroid.game.mobs.Pig; 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.container.Container; import ru.deadsoftware.cavedroid.game.objects.drop.DropController; -import ru.deadsoftware.cavedroid.game.objects.furnace.Furnace; -import ru.deadsoftware.cavedroid.game.objects.furnace.FurnaceController; +import ru.deadsoftware.cavedroid.game.objects.container.Furnace; +import ru.deadsoftware.cavedroid.game.objects.container.ContainerController; import ru.deadsoftware.cavedroid.misc.utils.MeasureUnitsUtilsKt; import javax.annotation.CheckForNull; @@ -19,10 +22,13 @@ import javax.inject.Inject; @GameScope public class GameWorld { + private static final int FOREGROUND_Z = 0; + private static final int BACKGROUND_Z = 1; + private final DropController mDropController; private final MobsController mMobsController; private final GameItemsHolder mGameItemsHolder; - private final FurnaceController mFurnaceController; + private final ContainerController mContainerController; private final int mWidth; private final int mHeight; @@ -35,13 +41,13 @@ public class GameWorld { public GameWorld(DropController dropController, MobsController mobsController, GameItemsHolder gameItemsHolder, - FurnaceController furnaceController, + ContainerController containerController, @CheckForNull Block[][] foreMap, @CheckForNull Block[][] backMap) { mDropController = dropController; mMobsController = mobsController; mGameItemsHolder = gameItemsHolder; - mFurnaceController = furnaceController; + mContainerController = containerController; boolean isNewGame = foreMap == null || backMap == null; @@ -51,6 +57,7 @@ public class GameWorld { Pair maps = new GameWorldGenerator(mWorldConfig, mGameItemsHolder).generate(); mForeMap = maps.getFirst(); mBackMap = maps.getSecond(); + spawnInitialMobs(); mMobsController.getPlayer().respawn(this, mGameItemsHolder); } else { mForeMap = foreMap; @@ -129,6 +136,12 @@ public class GameWorld { return; } + mContainerController.destroyContainer(x, y, layer, false); + + if (value.isContainer()) { + mContainerController.addContainer(x, y, layer, (Class) value.getClass()); + } + if (layer == 0) { mForeMap[x][y] = value; } else { @@ -146,19 +159,19 @@ public class GameWorld { } public boolean hasForeAt(int x, int y) { - return getMap(x, y, 0) != mGameItemsHolder.getFallbackBlock(); + return getMap(x, y, FOREGROUND_Z) != mGameItemsHolder.getFallbackBlock(); } public boolean hasBackAt(int x, int y) { - return getMap(x, y, 1) != mGameItemsHolder.getFallbackBlock(); + return getMap(x, y, BACKGROUND_Z) != mGameItemsHolder.getFallbackBlock(); } public Block getForeMap(int x, int y) { - return getMap(x, y, 0); + return getMap(x, y, FOREGROUND_Z); } public void setForeMap(int x, int y, Block block) { - setMap(x, y, 0, block); + setMap(x, y, FOREGROUND_Z, block); } public void resetForeMap(int x, int y) { @@ -166,20 +179,19 @@ public class GameWorld { } public Block getBackMap(int x, int y) { - return getMap(x, y, 1); + return getMap(x, y, BACKGROUND_Z); } public void setBackMap(int x, int y, Block block) { - setMap(x, y, 1, block); + setMap(x, y, BACKGROUND_Z, block); } - public boolean placeToForeground(int x, int y, Block value) { - if (!hasForeAt(x, y) || value == mGameItemsHolder.getFallbackBlock() || !getForeMap(x, y).hasCollision()) { - - if (value.isFurnace()) { - mFurnaceController.addFurnace(x, y, 0); - } + public boolean canPlaceToForeground(int x, int y, Block value) { + return !hasForeAt(x, y) || value == mGameItemsHolder.getFallbackBlock() || !getForeMap(x, y).hasCollision(); + } + public boolean placeToForeground(int x, int y, Block value) { + if (canPlaceToForeground(x, y, value)) { setForeMap(x, y, value); return true; } else if (value instanceof Block.Slab && isSameSlab(value, getForeMap(x, y))) { @@ -191,10 +203,7 @@ public class GameWorld { 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"))) { - if (value.isFurnace()) { - mFurnaceController.addFurnace(x, y, 1); - } + (!value.isTransparent() || value == mGameItemsHolder.getBlock("glass") || value.isChest() || value.isSlab())) { setBackMap(x, y, value); return true; } @@ -217,10 +226,25 @@ public class GameWorld { return toolLevel >= block.getParams().getToolLevel(); } + private void spawnInitialMobs() { + for (int x = 0; x < getWidth(); x++) { + int y = 0; + while (y < getWorldConfig().getSeaLevel()) { + if (getForeMap(x, y) == mGameItemsHolder.getBlock("grass")) { + if (MathUtils.randomBoolean(.125f)) { + mMobsController.addMob(new Pig(MeasureUnitsUtilsKt.getPx(x), MeasureUnitsUtilsKt.getPx(y))); + } + break; + } + y++; + } + } + } + public void destroyForeMap(int x, int y) { Block block = getForeMap(x, y); - if (block.isFurnace()) { - mFurnaceController.destroyFurnace(x, y, 0, mDropController); + if (block.isContainer()) { + mContainerController.destroyContainer(x, y, FOREGROUND_Z, true); } if (block.hasDrop() && shouldDrop(block)) { for (int i = 0; i < block.getParams().getDropInfo().getCount(); i++) { @@ -237,8 +261,8 @@ public class GameWorld { public void destroyBackMap(int x, int y) { Block block = getBackMap(x, y); - if (block.isFurnace()) { - mFurnaceController.destroyFurnace(x, y, 0, mDropController); + if (block.isContainer()) { + mContainerController.destroyContainer(x, y, BACKGROUND_Z, true); } if (block.hasDrop() && shouldDrop(block)) { for (int i = 0; i < block.getParams().getDropInfo().getCount(); i++) { @@ -249,13 +273,42 @@ public class GameWorld { placeToBackground(x, y, mGameItemsHolder.getFallbackBlock()); } + @CheckForNull + private Container getContainerAt(int x, int y, int z) { + return mContainerController.getContainer(transformX(x), y, z); + } + + @CheckForNull + public Container getForegroundContainer(int x, int y) { + return getContainerAt(x, y, FOREGROUND_Z); + } + + @CheckForNull + public Container getBackgroundContainer(int x, int y) { + return getContainerAt(x, y, BACKGROUND_Z); + } + @CheckForNull public Furnace getForegroundFurnace(int x, int y) { - return mFurnaceController.getFurnace(x, y, 0); + @CheckForNull + final Container container = getForegroundContainer(x, y); + + if (container instanceof Furnace) { + return (Furnace) container; + } + + return null; } @CheckForNull public Furnace getBackgroundFurnace(int x, int y) { - return mFurnaceController.getFurnace(x, y, 1); + @CheckForNull + final Container container = getBackgroundContainer(x, y); + + if (container instanceof Furnace) { + return (Furnace) container; + } + + return null; } } \ No newline at end of file