X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInput.java;h=27c4df02e9b4a9ec9e5b05c8850867ef52e6e00f;hb=546c7c80eb7884183a3df1db7bb5627a18396dca;hp=ca603176453f1ac7e219c6d825c11dfeb1f8f528;hpb=5b3244dceab39900a44eeb4d6108715c56735626;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java index ca60317..27c4df0 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java @@ -3,6 +3,8 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.g2d.TextureRegion; +import com.badlogic.gdx.math.Intersector; +import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.TimeUtils; import com.google.common.collect.Range; import ru.deadsoftware.cavedroid.MainConfig; @@ -11,6 +13,7 @@ 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.objects.DropController; +import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.Assets; import ru.deadsoftware.cavedroid.misc.ControlMode; @@ -67,12 +70,12 @@ public class GameInput { if (checkSwim()) { mPlayer.swim = true; } else if (mPlayer.canJump()) { - mPlayer.getMove().add(0, -7); + mPlayer.jump(); } else if (!mPlayer.isFlyMode() && mPlayer.gameMode == 1) { mPlayer.setFlyMode(true); - mPlayer.getMove().y = 0; + mPlayer.getVelocity().y = 0; } else if (mPlayer.isFlyMode()) { - mPlayer.getMove().y = -GamePhysics.PL_SPEED; + mPlayer.getVelocity().y = -mPlayer.getSpeed(); } } @@ -89,14 +92,14 @@ public class GameInput { if (mControlMode == ControlMode.WALK || !mMainConfig.isTouch()) { switch (keycode) { case Input.Keys.A: - mPlayer.getMove().x = -GamePhysics.PL_SPEED; + mPlayer.getVelocity().x = -mPlayer.getSpeed(); mPlayer.setDir(Mob.Direction.LEFT); if (mMainConfig.isTouch() && checkSwim()) { mPlayer.swim = true; } break; case Input.Keys.D: - mPlayer.getMove().x = GamePhysics.PL_SPEED; + mPlayer.getVelocity().x = mPlayer.getSpeed(); mPlayer.setDir(Mob.Direction.RIGHT); if (mMainConfig.isTouch() && checkSwim()) { mPlayer.swim = true; @@ -108,7 +111,7 @@ public class GameInput { break; case Input.Keys.S: case Input.Keys.CONTROL_LEFT: - mPlayer.getMove().y = GamePhysics.PL_SPEED; + mPlayer.getVelocity().y = mPlayer.getSpeed(); break; } } else { @@ -164,14 +167,22 @@ public class GameInput { mCurX += mPlayer.looksLeft() ? 1 : -1; } } else if (!mMainConfig.isTouch()) { - mCurX = (int) (Gdx.input.getX() * (mMainConfig.getWidth() / - Gdx.graphics.getWidth()) + gameRenderer.getCamX()) / 16; + final int tmpX = (int) (Gdx.input.getX() * (mMainConfig.getWidth() / + Gdx.graphics.getWidth()) + gameRenderer.getCamX()); + mCurX = tmpX / 16; - mCurY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() / - Gdx.graphics.getHeight()) + gameRenderer.getCamY()) / 16; - if (mCurX < 0) { + final int tmpY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() / + Gdx.graphics.getHeight()) + gameRenderer.getCamY()); + mCurY = tmpY / 16; + + if (tmpX < 0) { mCurX--; } + + final double a = tmpX - mPlayer.x; + final double b = tmpY - mPlayer.y; + + mPlayer.headRotation = (float) Math.atan(b / a) * MathUtils.radDeg; } if (pastX != mCurX || pastY != mCurY) { @@ -182,6 +193,7 @@ public class GameInput { } private void useItem(int x, int y, int id, boolean bg) { + mPlayer.startHitting(); String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id); if (id > 0) { if (getItem(id).isBlock()) { @@ -205,30 +217,46 @@ public class GameInput { } } + private void hitMobs() { + final Player player = mMobsController.getPlayer(); + mMobsController.getMobs().forEach((mob) -> { + if (Intersector.overlaps(mob, player)) { + mob.damage(5); + mob.jump(); + } + }); + } + private void pressLMB() { - if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE) && - ((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 (mPlayer.gameMode == 0) { - mBlockDamage++; - if (mGameWorld.hasForeAt(mCurX, mCurY)) { - if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) { - mGameWorld.destroyForeMap(mCurX, mCurY); - mBlockDamage = 0; + 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 (mPlayer.gameMode == 0) { + mBlockDamage++; + if (mGameWorld.hasForeAt(mCurX, mCurY)) { + if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) { + mGameWorld.destroyForeMap(mCurX, mCurY); + mBlockDamage = 0; + } + } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { + if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) { + mGameWorld.destroyBackMap(mCurX, mCurY); + mBlockDamage = 0; + } } - } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { - if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) { - mGameWorld.destroyBackMap(mCurX, mCurY); - mBlockDamage = 0; + } else { + if (mGameWorld.hasForeAt(mCurX, mCurY)) { + mGameWorld.placeToForeground(mCurX, mCurY, 0); + } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { + mGameWorld.placeToBackground(mCurX, mCurY, 0); } + mTouchedDown = false; } } else { - if (mGameWorld.hasForeAt(mCurX, mCurY)) { - mGameWorld.placeToForeground(mCurX, mCurY, 0); - } else if (mGameWorld.hasBackAt(mCurX, mCurY)) { - mGameWorld.placeToBackground(mCurX, mCurY, 0); - } + hitMobs(); mTouchedDown = false; } } @@ -288,13 +316,17 @@ public class GameInput { break; case Input.Keys.G: - mMobsController.addMob(Pig.class, mCurX * 16, mCurY * 16); + mMobsController.addMob(new Pig(mCurX * 16, mCurY * 16)); break; case Input.Keys.Q: mGameWorld.placeToForeground(mCurX, mCurY, 8); break; + case Input.Keys.GRAVE: + mMobsController.getPlayer().gameMode = (mMobsController.getPlayer().gameMode + 1) % 2; + break; + case Input.Keys.ESCAPE: case Input.Keys.BACK: GameSaver.save(mMainConfig, mDropController, mMobsController, mGameWorld); @@ -315,7 +347,7 @@ public class GameInput { switch (keycode) { case Input.Keys.A: case Input.Keys.D: - mPlayer.getMove().x = 0; + mPlayer.getVelocity().x = 0; if (mMainConfig.isTouch() && mPlayer.swim) { mPlayer.swim = false; } @@ -326,7 +358,7 @@ public class GameInput { case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT: if (mPlayer.isFlyMode()) { - mPlayer.getMove().y = 0; + mPlayer.getVelocity().y = 0; } if (mPlayer.swim) { mPlayer.swim = false; @@ -384,6 +416,10 @@ public class GameInput { } public void touchDragged(float screenX, float screenY) { + if (Math.abs(screenX - mTouchDownX) < 16 && Math.abs(screenY - mTouchDownY) < 16) { + return; + } + mDragging = true; if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && Math.abs(screenY - mTouchDownY) > 16) { if (insideCreativeInv(screenX, screenY)) { @@ -400,10 +436,10 @@ public class GameInput { } } - public void scrolled(int amount) { + public void scrolled(float amountX, float amountY) { switch (mMainConfig.getGameUiWindow()) { case NONE: - mPlayer.slot += amount; + mPlayer.slot += (int) amountY; if (mPlayer.slot < 0) { mPlayer.slot = 8; } @@ -412,7 +448,7 @@ public class GameInput { } break; case CREATIVE_INVENTORY: - mCreativeScroll += amount; + mCreativeScroll += (int) amountY; if (mCreativeScroll < 0) { mCreativeScroll = 0; } @@ -456,9 +492,15 @@ public class GameInput { } void update() { - if (mTouchedDown && mTouchDownBtn == Input.Buttons.LEFT) { + if (!mTouchedDown) { + mPlayer.stopHitting(); + return; + } + + if (mTouchDownBtn == Input.Buttons.LEFT) { pressLMB(); } + if (mTouchedDown && TimeUtils.timeSinceMillis(mTouchDownTime) > 500) { holdMB(); }