X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=63cf93debf25046cb21e4345f1a75a532b43e325;hp=c868a8adcb4250bb29c3ccd51127ec6844a3fefb;hb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;hpb=35747c23579243d40294f923b35b23046329f1cd diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java index c868a8a..63cf93d 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.Input; import com.badlogic.gdx.utils.TimeUtils; import ru.deadsoftware.cavecraft.CaveGame; import ru.deadsoftware.cavecraft.GameScreen; -import ru.deadsoftware.cavecraft.game.mobs.FallingSand; import ru.deadsoftware.cavecraft.game.mobs.Pig; import ru.deadsoftware.cavecraft.misc.AppState; import ru.deadsoftware.cavecraft.misc.Assets; @@ -18,23 +17,25 @@ public class GameInput { } private boolean checkSwim() { - return (CaveGame.TOUCH && Items.isFluid(gameProc.world.getForeMap((int)(gameProc.player.position.x+gameProc.player.width/2)/16, - (int)(gameProc.player.position.y+gameProc.player.height/4*3)/16))); + return (Items.isFluid(gameProc.world.getForeMap((int) (gameProc.player.position.x + gameProc.player.width / 2) / 16, + (int) (gameProc.player.position.y + gameProc.player.height / 4 * 3) / 16))); } private void wasdPressed(int keycode) { - if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) { + if (gameProc.ctrlMode == 0 || !CaveGame.TOUCH) { switch (keycode) { case Input.Keys.A: gameProc.player.moveX.x = -GamePhysics.PL_SPEED; gameProc.player.dir = 0; + if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true; break; case Input.Keys.D: gameProc.player.moveX.x = GamePhysics.PL_SPEED; gameProc.player.dir = 1; + if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true; break; } - } else if (CaveGame.TOUCH){ + } else if (CaveGame.TOUCH) { switch (keycode) { case Input.Keys.A: gameProc.cursorX--; @@ -49,10 +50,11 @@ public class GameInput { gameProc.cursorY++; break; } + gameProc.blockDmg = 0; } } - public void keyDown(int keycode) { + public void keyDown(int keycode) { gameProc.isKeyDown = true; gameProc.keyDownCode = keycode; if (keycode == Input.Keys.W || keycode == Input.Keys.A || @@ -85,14 +87,15 @@ public class GameInput { case Input.Keys.E: if (CaveGame.STATE == AppState.GAME_PLAY) CaveGame.STATE = AppState.GAME_CREATIVE_INV; - else CaveGame.STATE = AppState.GAME_PLAY; + else CaveGame.STATE = AppState.GAME_PLAY; break; case Input.Keys.G: - gameProc.mobs.add(new Pig(gameProc.cursorX*16, gameProc.cursorY*16)); + gameProc.mobs.add(new Pig(gameProc.cursorX * 16, gameProc.cursorY * 16)); break; - case Input.Keys.ESCAPE: case Input.Keys.BACK: + case Input.Keys.ESCAPE: + case Input.Keys.BACK: CaveGame.STATE = AppState.GOTO_MENU; break; @@ -104,12 +107,14 @@ public class GameInput { public void keyUp(int keycode) { switch (keycode) { - case Input.Keys.A: case Input.Keys.D: + case Input.Keys.A: + case Input.Keys.D: gameProc.player.moveX.x = 0; - if (gameProc.swim) gameProc.swim = false; + if (CaveGame.TOUCH && gameProc.swim) gameProc.swim = false; break; - case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT: + case Input.Keys.SPACE: + case Input.Keys.CONTROL_LEFT: if (gameProc.player.flyMode) gameProc.player.moveY.setZero(); if (gameProc.swim) gameProc.swim = false; break; @@ -134,15 +139,15 @@ public class GameInput { } if (gameProc.isTouchDown) { if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && - screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 && - screenXgameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 && - screenY gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 && + screenX < gameProc.renderer.camera.viewportWidth / 2 + Assets.creativeInv.getRegionWidth() / 2 && + screenY > gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 && + screenY < gameProc.renderer.camera.viewportHeight / 2 + Assets.creativeInv.getRegionHeight() / 2) { int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18; int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18; - int item = gameProc.creativeScroll*8+(ix + iy * 8); - if (ix>=8 || ix<0 || iy<0 || iy>=5) item=-1; - if (item >= 0 && item < Items.BLOCKS.size) { + int item = gameProc.creativeScroll * 8 + (ix + iy * 8); + if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) item = -1; + if (item >= 0 && item < Items.ITEMS.size()) { for (int i = 8; i > 0; i--) { gameProc.player.inventory[i] = gameProc.player.inventory[i - 1]; } @@ -150,31 +155,26 @@ public class GameInput { } } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) { CaveGame.STATE = AppState.GAME_PLAY; - } else if (screenYgameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 && - screenX gameProc.renderer.camera.viewportWidth / 2 - Assets.invBar.getRegionWidth() / 2 && + screenX < gameProc.renderer.camera.viewportWidth / 2 + Assets.invBar.getRegionWidth() / 2) { + gameProc.invSlot = (int) ((screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.invBar.getRegionWidth() / 2)) / 20); + } else if (button == Input.Buttons.RIGHT) { + gameProc.useItem(gameProc.cursorX, gameProc.cursorY, + gameProc.player.inventory[gameProc.invSlot], false); } else if (button == Input.Buttons.LEFT) { - if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) { - gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0); - } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) { - gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0); - } - + gameProc.blockDmg = 0; } } gameProc.isTouchDown = false; } public void touchDragged(int screenX, int screenY) { - if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY-gameProc.touchDownY)>16) { - if (screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 && - screenXgameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 && - screenY 16) { + if (screenX > gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 && + screenX < gameProc.renderer.camera.viewportWidth / 2 + Assets.creativeInv.getRegionWidth() / 2 && + screenY > gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 && + screenY < gameProc.renderer.camera.viewportHeight / 2 + Assets.creativeInv.getRegionHeight() / 2) { gameProc.creativeScroll -= (screenY - gameProc.touchDownY) / 16; gameProc.touchDownX = screenX; gameProc.touchDownY = screenY; @@ -193,10 +193,10 @@ public class GameInput { if (gameProc.invSlot > 8) gameProc.invSlot = 0; break; case GAME_CREATIVE_INV: - gameProc.creativeScroll+=amount; - if (gameProc.creativeScroll<0) gameProc.creativeScroll=0; - if (gameProc.creativeScroll>gameProc.maxCreativeScroll) - gameProc.creativeScroll=gameProc.maxCreativeScroll; + gameProc.creativeScroll += amount; + if (gameProc.creativeScroll < 0) gameProc.creativeScroll = 0; + if (gameProc.creativeScroll > gameProc.maxCreativeScroll) + gameProc.creativeScroll = gameProc.maxCreativeScroll; break; } }