X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInput.java;h=a45e7045446eb51feef1afb024dc211a54b3da5a;hb=409a22b3fe7c43b7f686f33cc2f01b6277edec78;hp=a0c5f664cdcef8d05081b11dee9488e502eb263e;hpb=9f899928ab57fc6c2c6151023190ef8d7c3eac03;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java index a0c5f66..a45e704 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java @@ -8,26 +8,37 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.TimeUtils; import com.google.common.collect.Range; import ru.deadsoftware.cavedroid.MainConfig; +import ru.deadsoftware.cavedroid.game.actions.CommonBlockActionUtilsKt; +import ru.deadsoftware.cavedroid.game.actions.placeblock.IPlaceBlockAction; +import ru.deadsoftware.cavedroid.game.actions.useitem.IUseItemAction; import ru.deadsoftware.cavedroid.game.mobs.Mob; import ru.deadsoftware.cavedroid.game.mobs.MobsController; import ru.deadsoftware.cavedroid.game.mobs.Pig; import ru.deadsoftware.cavedroid.game.mobs.Player; +import ru.deadsoftware.cavedroid.game.model.item.Item; import ru.deadsoftware.cavedroid.game.objects.DropController; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.Assets; import ru.deadsoftware.cavedroid.misc.ControlMode; +import javax.annotation.CheckForNull; import javax.inject.Inject; -import static ru.deadsoftware.cavedroid.game.GameItems.*; +import java.util.Map; @GameScope public class GameInput { + private static final String TAG = "GameInput"; + private final MainConfig mMainConfig; private final GameWorld mGameWorld; private final DropController mDropController; private final MobsController mMobsController; + private final GameItemsHolder mGameItemsHolder; + private final Map mUseItemActionMap; + private final Map mPlaceBlockActionMap; + private final Player mPlayer; private ControlMode mControlMode; @@ -41,21 +52,24 @@ public class GameInput { private float mTouchDownX; private float mTouchDownY; private long mTouchDownTime; - - private int mCurX; - private int mCurY; + private int mCreativeScroll; - private int mBlockDamage; @Inject public GameInput(MainConfig mainConfig, GameWorld gameWorld, DropController dropController, - MobsController mobsController) { + MobsController mobsController, + GameItemsHolder gameItemsHolder, + Map useItemActionMap, + Map placeBlockActionMap) { mMainConfig = mainConfig; mGameWorld = gameWorld; mDropController = dropController; mMobsController = mobsController; + mGameItemsHolder = gameItemsHolder; + mUseItemActionMap = useItemActionMap; + mPlaceBlockActionMap = placeBlockActionMap; mPlayer = mMobsController.getPlayer(); @@ -63,7 +77,7 @@ public class GameInput { } private boolean checkSwim() { - return GameItems.isFluid(mGameWorld.getForeMap(mPlayer.getMapX(), mPlayer.getLowerMapY())); + return mGameWorld.getForeMap(mPlayer.getMapX(), mPlayer.getLowerMapY()).isFluid(); } private void goUpwards() { @@ -117,35 +131,35 @@ public class GameInput { } else { switch (keycode) { case Input.Keys.A: - mCurX--; + mPlayer.cursorX--; break; case Input.Keys.D: - mCurX++; + mPlayer.cursorX++; break; case Input.Keys.W: - mCurY--; + mPlayer.cursorY--; break; case Input.Keys.S: - mCurY++; + mPlayer.cursorY++; break; } - mBlockDamage = 0; + mPlayer.blockDamage = 0; } } private boolean isNotAutoselectable(int x, int y) { - return (!mGameWorld.hasForeAt(x, y) || !mGameWorld.getForeMapBlock(x, y).hasCollision()); + return (!mGameWorld.hasForeAt(x, y) || !mGameWorld.getForeMap(x, y).hasCollision()); } private void checkCursorBounds() { - if (mCurY < 0) { - mCurY = 0; - } else if (mCurY >= mGameWorld.getHeight()) { - mCurY = mGameWorld.getHeight() - 1; + if (mPlayer.cursorY < 0) { + mPlayer.cursorY = 0; + } else if (mPlayer.cursorY >= mGameWorld.getHeight()) { + mPlayer.cursorY = mGameWorld.getHeight() - 1; } if (mControlMode == ControlMode.CURSOR) { - if (mCurX * 16 + 8 < mPlayer.getX() + mPlayer.getWidth() / 2) { + if (mPlayer.cursorX * 16 + 8 < mPlayer.getX() + mPlayer.getWidth() / 2) { mPlayer.setDir(Mob.Direction.LEFT); } else { mPlayer.setDir(Mob.Direction.RIGHT); @@ -154,29 +168,29 @@ public class GameInput { } public void moveCursor(GameRenderer gameRenderer) { - int pastX = mCurX; - int pastY = mCurY; + int pastX = mPlayer.cursorX; + int pastY = mPlayer.cursorY; if (mControlMode == ControlMode.WALK && mMainConfig.isTouch()) { - mCurX = mPlayer.getMapX() + (mPlayer.looksLeft() ? -1 : 1); - mCurY = mPlayer.getUpperMapY(); - for (int i = 0; i < 2 && isNotAutoselectable(mCurX, mCurY); i++) { - mCurY++; + mPlayer.cursorX = mPlayer.getMapX() + (mPlayer.looksLeft() ? -1 : 1); + mPlayer.cursorY = mPlayer.getUpperMapY(); + for (int i = 0; i < 2 && isNotAutoselectable(mPlayer.cursorX, mPlayer.cursorY); i++) { + mPlayer.cursorY++; } - if (isNotAutoselectable(mCurX, mCurY)) { - mCurX += mPlayer.looksLeft() ? 1 : -1; + if (isNotAutoselectable(mPlayer.cursorX, mPlayer.cursorY)) { + mPlayer.cursorX += mPlayer.looksLeft() ? 1 : -1; } } else if (!mMainConfig.isTouch()) { final int tmpX = (int) (Gdx.input.getX() * (mMainConfig.getWidth() / Gdx.graphics.getWidth()) + gameRenderer.getCamX()); - mCurX = tmpX / 16; + mPlayer.cursorX = tmpX / 16; final int tmpY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() / Gdx.graphics.getHeight()) + gameRenderer.getCamY()); - mCurY = tmpY / 16; + mPlayer.cursorY = tmpY / 16; if (tmpX < 0) { - mCurX--; + mPlayer.cursorX--; } final double a = tmpX - mPlayer.x; @@ -185,40 +199,41 @@ public class GameInput { mPlayer.headRotation = (float) Math.atan(b / a) * MathUtils.radDeg; } - if (pastX != mCurX || pastY != mCurY) { - mBlockDamage = 0; + if (pastX != mPlayer.cursorX || pastY != mPlayer.cursorY) { + mPlayer.blockDamage = 0; } checkCursorBounds(); } - private void useItem(int x, int y, int id, boolean bg) { - String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id); - if (id > 0) { - if (getItem(id).isBlock()) { - if (!bg) { - mGameWorld.placeToForeground(x, y, getBlockIdByItemId(id)); - } else { - mGameWorld.placeToBackground(x, y, getBlockIdByItemId(id)); - } + private void useItem(int x, int y, @CheckForNull Item item, boolean bg) { + mPlayer.startHitting(); + + if (item == null) { + return; + } + + if (item instanceof Item.Placeable) { + if (!bg) { + CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y); } else { - switch (key) { - case "bucket_water": - mGameWorld.placeToForeground(x, y, getBlockId("water")); - mPlayer.inventory[mPlayer.slot] = getItemId("bucket_empty"); - break; - case "bucket_lava": - mGameWorld.placeToForeground(x, y, getBlockId("lava")); - mPlayer.inventory[mPlayer.slot] = getItemId("bucket_empty"); - break; - } + CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y); + } + } else if (item instanceof Item.Usable) { + final String actionKey = ((Item.Usable) item).getUseActionKey(); + final IUseItemAction useItemAction = mUseItemActionMap.get(actionKey); + + if (useItemAction != null) { + useItemAction.perform((Item.Usable) item, x, y); + } else { + Gdx.app.error(TAG, "use item action " + actionKey + " not found"); } } } private void hitMobs() { final Player player = mMobsController.getPlayer(); - mMobsController.forEach((mob) -> { + mMobsController.getMobs().forEach((mob) -> { if (Intersector.overlaps(mob, player)) { mob.damage(5); mob.jump(); @@ -230,27 +245,26 @@ public class GameInput { if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE)) { mPlayer.startHitting(); - if ((mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.getForeMapBlock(mCurX, mCurY).getHp() >= 0) || - (!mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.hasBackAt(mCurX, mCurY) && - mGameWorld.getBackMapBlock(mCurX, mCurY).getHp() >= 0)) { + if ((mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY) && mGameWorld.getForeMap(mPlayer.cursorX, mPlayer.cursorY).getHp() >= 0) || + (!mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY) && mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY) && + mGameWorld.getBackMap(mPlayer.cursorX, mPlayer.cursorY).getHp() >= 0)) { if (mPlayer.gameMode == 0) { - mBlockDamage++; - if (mGameWorld.hasForeAt(mCurX, mCurY)) { - if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) { - mGameWorld.destroyForeMap(mCurX, mCurY); - mBlockDamage = 0; + if (mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY)) { + if (mPlayer.blockDamage >= mGameWorld.getForeMap(mPlayer.cursorX, mPlayer.cursorY).getHp()) { + mGameWorld.destroyForeMap(mPlayer.cursorX, mPlayer.cursorY); + mPlayer.blockDamage = 0; } - } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { - if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) { - mGameWorld.destroyBackMap(mCurX, mCurY); - mBlockDamage = 0; + } else if (mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY)) { + if (mPlayer.blockDamage >= mGameWorld.getBackMap(mPlayer.cursorX, mPlayer.cursorY).getHp()) { + mGameWorld.destroyBackMap(mPlayer.cursorX, mPlayer.cursorY); + mPlayer.blockDamage = 0; } } } else { - if (mGameWorld.hasForeAt(mCurX, mCurY)) { - mGameWorld.placeToForeground(mCurX, mCurY, 0); - } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { - mGameWorld.placeToBackground(mCurX, mCurY, 0); + if (mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY)) { + mGameWorld.placeToForeground(mPlayer.cursorX, mPlayer.cursorY, mGameItemsHolder.getFallbackBlock()); + } else if (mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY)) { + mGameWorld.placeToBackground(mPlayer.cursorX, mPlayer.cursorY, mGameItemsHolder.getFallbackBlock()); } mTouchedDown = false; } @@ -270,7 +284,7 @@ public class GameInput { private void holdMB() { if (mTouchDownBtn == Input.Buttons.RIGHT) { - useItem(mCurX, mCurY, mPlayer.inventory[mPlayer.slot], true); + useItem(mPlayer.cursorX, mPlayer.cursorY, mPlayer.inventory[mPlayer.slot].getItem(), true); mTouchedDown = false; } else { if (insideHotbar(mTouchDownX, mTouchDownY)) { @@ -315,11 +329,12 @@ public class GameInput { break; case Input.Keys.G: - mMobsController.addMob(Pig.class, mCurX * 16, mCurY * 16); + final Mob pig = new Pig(mPlayer.cursorX * 16, mPlayer.cursorY * 16); + pig.attachToController(mMobsController); break; - case Input.Keys.Q: - mGameWorld.placeToForeground(mCurX, mCurY, 8); + case Input.Keys.GRAVE: + mMobsController.getPlayer().gameMode = (mMobsController.getPlayer().gameMode + 1) % 2; break; case Input.Keys.ESCAPE: @@ -386,14 +401,14 @@ public class GameInput { if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && insideCreativeInv(screenX, screenY)) { int ix = (int) (screenX - (mMainConfig.getWidth() / 2 - creative.getRegionWidth() / 2 + 8)) / 18; int iy = (int) (screenY - (mMainConfig.getHeight() / 2 - creative.getRegionHeight() / 2 + 18)) / 18; - int item = mCreativeScroll * 8 + (ix + iy * 8); + int itemPos = mCreativeScroll * 8 + (ix + iy * 8); if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) { - item = -1; - } - if (item >= 0 && item < GameItems.getItemsSize()) { - System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8); - mPlayer.inventory[0] = item; + itemPos = -1; } + + System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8); + final Item newItem = mGameItemsHolder.getItemFromCreativeInventory(itemPos); + mPlayer.inventory[0] = newItem.toInventoryItem(newItem.getParams().getMaxStack()); } else if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY)) { mMainConfig.setGameUiWindow(GameUiWindow.NONE); } else if (screenY < hotbar.getRegionHeight() && @@ -401,10 +416,11 @@ public class GameInput { screenX < mMainConfig.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2) { mPlayer.slot = (int) ((screenX - (mMainConfig.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20); } else if (button == Input.Buttons.RIGHT) { - useItem(mCurX, mCurY, - mPlayer.inventory[mPlayer.slot], false); + useItem(mPlayer.cursorX, mPlayer.cursorY, + mPlayer.inventory[mPlayer.slot].getItem(), false); } else if (button == Input.Buttons.LEFT) { - mBlockDamage = 0; + mPlayer.stopHitting(); + mPlayer.blockDamage = 0; } } mTouchedDown = false; @@ -424,8 +440,10 @@ public class GameInput { if (mCreativeScroll < 0) { mCreativeScroll = 0; } - if (mCreativeScroll > GameProc.MAX_CREATIVE_SCROLL) { - mCreativeScroll = GameProc.MAX_CREATIVE_SCROLL; + + final int maxScroll = mGameItemsHolder.getCreativeScrollAmount(); + if (mCreativeScroll > maxScroll) { + mCreativeScroll = maxScroll; } } } @@ -447,8 +465,10 @@ public class GameInput { if (mCreativeScroll < 0) { mCreativeScroll = 0; } - if (mCreativeScroll > GameProc.MAX_CREATIVE_SCROLL) { - mCreativeScroll = GameProc.MAX_CREATIVE_SCROLL; + + final int maxScroll = mGameItemsHolder.getCreativeScrollAmount(); + if (mCreativeScroll > maxScroll) { + mCreativeScroll = maxScroll; } break; } @@ -462,19 +482,7 @@ public class GameInput { return mKeyDown; } - int getBlockDamage() { - return mBlockDamage; - } - - int getCurX() { - return mCurX; - } - - int getCurY() { - return mCurY; - } - - int getCreativeScroll() { + public int getCreativeScroll() { return mCreativeScroll; } @@ -487,11 +495,15 @@ public class GameInput { } void update() { - if (mTouchedDown && mTouchDownBtn == Input.Buttons.LEFT) { - pressLMB(); - } else { + if (!mTouchedDown) { mPlayer.stopHitting(); + return; } + + if (mTouchDownBtn == Input.Buttons.LEFT) { + pressLMB(); + } + if (mTouchedDown && TimeUtils.timeSinceMillis(mTouchDownTime) > 500) { holdMB(); }