diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index cddeb4d27158d95eb635e896ecc09ff1db0d14db..c868a8adcb4250bb29c3ccd51127ec6844a3fefb 100644 (file)
import com.badlogic.gdx.Input;
import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.AppState;
-import ru.deadsoftware.cavecraft.Assets;
import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.Items;
+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;
public class GameInput {
this.gameProc = gameProc;
}
+ 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)));
+ }
+
private void wasdPressed(int keycode) {
if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) {
switch (keycode) {
break;
case Input.Keys.SPACE:
- if (gameProc.player.canJump) {
+ if (checkSwim()) {
+ gameProc.swim = true;
+ } else if (gameProc.player.canJump) {
gameProc.player.moveY.add(0, -7);
} else if (!gameProc.player.flyMode) {
gameProc.player.flyMode = true;
else CaveGame.STATE = AppState.GAME_PLAY;
break;
- case Input.Keys.N:
- CaveGame.STATE = AppState.GOTO_NEW_GAME;
+ case Input.Keys.G:
+ gameProc.mobs.add(new Pig(gameProc.cursorX*16, gameProc.cursorY*16));
break;
case Input.Keys.ESCAPE: case Input.Keys.BACK:
- GameSaver.save(gameProc);
CaveGame.STATE = AppState.GOTO_MENU;
break;
+
+ case Input.Keys.F1:
+ GameScreen.SHOW_DEBUG = !GameScreen.SHOW_DEBUG;
+ break;
}
}
switch (keycode) {
case Input.Keys.A: case Input.Keys.D:
gameProc.player.moveX.x = 0;
+ if (gameProc.swim) gameProc.swim = false;
break;
case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT:
if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+ if (gameProc.swim) gameProc.swim = false;
break;
}
}
}
public void touchDown(int screenX, int screenY, int button) {
- if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
- 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) {
- 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 = ix + iy * 8;
- if (item >= 0 && item < Items.BLOCKS.size) {
- for (int i = 8; i > 0; i--) {
- gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
- }
- gameProc.player.inventory[0] = item;
- }
- } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
- CaveGame.STATE = AppState.GAME_PLAY;
- } else {
- gameProc.touchDownX = screenX;
- gameProc.touchDownY = screenY;
- gameProc.touchDownTime = TimeUtils.millis();
- gameProc.isTouchDown = true;
- gameProc.touchDownButton = button;
- }
+ gameProc.touchDownTime = TimeUtils.millis();
+ gameProc.isTouchDown = true;
+ gameProc.touchDownButton = button;
+ gameProc.touchDownX = screenX;
+ gameProc.touchDownY = screenY;
}
public void touchUp(int screenX, int screenY, int button) {
- if (gameProc.isKeyDown) {
+ if (CaveGame.TOUCH && gameProc.isKeyDown) {
keyUp(gameProc.keyDownCode);
gameProc.isKeyDown = false;
}
if (gameProc.isTouchDown) {
- if (button == Input.Buttons.RIGHT){
+ if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
+ 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) {
+ 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) {
+ for (int i = 8; i > 0; i--) {
+ gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
+ }
+ gameProc.player.inventory[0] = item;
+ }
+ } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
+ CaveGame.STATE = AppState.GAME_PLAY;
+ } else if (screenY<Assets.invBar.getRegionHeight() &&
+ 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.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
gameProc.player.inventory[gameProc.invSlot]);
} else if (button == Input.Buttons.LEFT) {
- if (screenY<Assets.invBar.getRegionHeight() &&
- 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 (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+ 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);
}
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 &&
+ 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;
+ if (gameProc.creativeScroll < 0) gameProc.creativeScroll = 0;
+ if (gameProc.creativeScroll > gameProc.maxCreativeScroll)
+ gameProc.creativeScroll = gameProc.maxCreativeScroll;
+ }
+ }
}
public void scrolled(int amount) {
- gameProc.invSlot += amount;
- if (gameProc.invSlot < 0) gameProc.invSlot = 8;
- if (gameProc.invSlot > 8) gameProc.invSlot = 0;
+ switch (CaveGame.STATE) {
+ case GAME_PLAY:
+ gameProc.invSlot += amount;
+ if (gameProc.invSlot < 0) gameProc.invSlot = 8;
+ 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;
+ break;
+ }
}
}