X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=b3b0d3f51a186197c5fb5c1b26185f1388b7984e;hp=8ceb7cf80acaa2f65602d6b71bf8c17b184cbe35;hb=2948fcd9c40ebf588ef7d0e7cd8dd34ecaa1f9b2;hpb=d58d40ec24363550fad10bd6047cee2618912186 diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java index 8ceb7cf..b3b0d3f 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java @@ -9,122 +9,116 @@ import ru.deadsoftware.cavedroid.GameScreen; import ru.deadsoftware.cavedroid.game.mobs.FallingGravel; import ru.deadsoftware.cavedroid.game.mobs.FallingSand; import ru.deadsoftware.cavedroid.game.mobs.Mob; -import ru.deadsoftware.cavedroid.game.mobs.Pig; import ru.deadsoftware.cavedroid.game.objects.Drop; import ru.deadsoftware.cavedroid.game.objects.Player; -import ru.deadsoftware.cavedroid.misc.AppState; +import ru.deadsoftware.cavedroid.misc.ControlMode; import ru.deadsoftware.cavedroid.misc.Assets; +import ru.deadsoftware.cavedroid.misc.states.GameState; import java.io.Serializable; import java.util.ArrayList; +import static ru.deadsoftware.cavedroid.game.GameItems.*; + public class GameProc implements Serializable, Disposable { + + static final int MAX_CREATIVE_SCROLL = getItemsSize() / 8; + + private static final int WORLD_WIDTH = 1024; + private static final int WORLD_HEIGHT = 256; + private static final int UPD_RANGE = 16; + static boolean DO_UPD = false; static int UPD_X = -1, UPD_Y = -1; private transient GameFluidsThread fluidThread; - public transient GameWorld world; public transient GameRenderer renderer; - public transient GamePhysics physics; + transient GamePhysics physics; + public ControlMode controlMode; public Player player; public ArrayList mobs; - public ArrayList drops; + ArrayList drops; public boolean isTouchDown, isKeyDown; - public int ctrlMode, touchDownX, touchDownY, touchDownBtn, keyDownCode; - public long touchDownTime; + public int touchDownX, touchDownY, touchDownBtn, keyDownCode; + long touchDownTime; int curX, curY; - int creativeScroll, maxCreativeScroll; + int creativeScroll; int blockDmg = 0; - public void initGame(int gameMode) { - world = new GameWorld(); - world.generate(1024, 256); + public GameProc(int gameMode) { + world = new GameWorld(WORLD_WIDTH, WORLD_HEIGHT); player = new Player(gameMode); drops = new ArrayList<>(); mobs = new ArrayList<>(); - for (int i = 0; i < 16; i++) { - mobs.add(new Pig(i * 256, 196 * 16)); - } physics = new GamePhysics(); + controlMode = CaveGame.TOUCH ? ControlMode.WALK : ControlMode.CURSOR; + resetRenderer(); + startFluidThread(); + } + public void resetRenderer() { int scale = CaveGame.TOUCH ? 320 : 480; - if (CaveGame.TOUCH) ctrlMode = 1; renderer = new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth()); + } - maxCreativeScroll = GameItems.getItemsSize() / 8; - - createFluidThread(); + private void startFluidThread() { + fluidThread = new GameFluidsThread(); fluidThread.start(); - - GameSaver.save(this); } - private void createFluidThread() { - fluidThread = new GameFluidsThread(); + private boolean isNotAutoselectable(int x, int y) { + return (!world.hasForeAt(x, y) || !world.getForeMapBlock(x, y).hasCollision()); } - public void resetRenderer() { - if (CaveGame.TOUCH) { - renderer = new GameRenderer(320, - 320 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); - } else { - renderer = new GameRenderer(480, - 480 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); + private void checkCursorBounds() { + if (curY < 0) { + curY = 0; + } else if (curY >= world.getHeight()) { + curY = world.getHeight() - 1; } - } - private boolean isAutoselectable(int x, int y) { - return (world.getForeMap(x, y) > 0 && - GameItems.getBlock(world.getForeMap(x, y)).hasCollision()); + if (controlMode == ControlMode.CURSOR) { + if (curX * 16 + 8 < player.pos.x + player.getWidth() / 2) { + player.setDir(0); + } else { + player.setDir(1); + } + } } private void moveCursor() { - int pastX = curX, pastY = curY; - if (ctrlMode == 0 && CaveGame.TOUCH) { + int pastX = curX; + int pastY = curY; + + if (controlMode == ControlMode.WALK && CaveGame.TOUCH) { curX = player.getMapX(); - if (player.getDir() == 0) curX--; - else curX++; - curY = (int) (player.pos.y + player.getWidth()) / 16; - if (!isAutoselectable(curX, curY)) { + curY = (int) (player.pos.y + player.getWidth() / 16); + while (curY - pastY < 2 && isNotAutoselectable(curX, curY)) { curY++; } - if (!isAutoselectable(curX, curY)) { - curY++; - } - if (!isAutoselectable(curX, curY)) { - if (player.getDir() == 0) curX++; - else curX--; + if (!isNotAutoselectable(curX, curY)) { + curX += player.looksLeft() ? 1 : -1; } } else if (!CaveGame.TOUCH) { - curX = (int) (Gdx.input.getX() * - (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) / 16; - curY = (int) (Gdx.input.getY() * - (renderer.getHeight() / GameScreen.getHeight()) + renderer.getCamY()) / 16; - if ((Gdx.input.getX() * - (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) < 0) - curX--; + curX = (int) (Gdx.input.getX() * (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) / 16; + curY = (int) (Gdx.input.getY() * (renderer.getHeight() / GameScreen.getHeight()) + renderer.getCamY()) / 16; + if (curX < 0) curX--; } - if (pastX != curX || pastY != curY) blockDmg = 0; - } - private void checkCursorBounds() { - if (curY < 0) curY = 0; - if (curY >= world.getHeight()) curY = world.getHeight() - 1; - if (ctrlMode == 1) { - if (curX * 16 + 8 < player.pos.x + player.getWidth() / 2) - player.setDir(0); - if (curX * 16 + 8 > player.pos.x + player.getWidth() / 2) - player.setDir(1); + if (pastX != curX || pastY != curY) { + blockDmg = 0; } + + checkCursorBounds(); } private void updateBlock(int x, int y) { if (world.getForeMap(x, y) == 10) { - if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { + if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) { world.setForeMap(x, y, 0); mobs.add(new FallingSand(x * 16, y * 16)); updateBlock(x, y - 1); @@ -132,103 +126,112 @@ public class GameProc implements Serializable, Disposable { } if (world.getForeMap(x, y) == 11) { - if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { + if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) { world.setForeMap(x, y, 0); mobs.add(new FallingGravel(x * 16, y * 16)); updateBlock(x, y - 1); } } - if (world.getForeMap(x, y) > 0 && GameItems.getBlock(world.getForeMap(x, y)).requiresBlock()) { - if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { + if (world.hasForeAt(x, y) && world.getForeMapBlock(x, y).requiresBlock()) { + if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) { world.destroyForeMap(x, y); updateBlock(x, y - 1); } } if (world.getForeMap(x, y) == 2) { - if (world.getForeMap(x, y - 1) > 0 && (GameItems.getBlock(world.getForeMap(x, y - 1)).hasCollision() || - GameItems.isFluid(world.getForeMap(x, y - 1)))) { + if (world.hasForeAt(x, y - 1) && (world.getForeMapBlock(x, y - 1).hasCollision() || + isFluid(world.getForeMap(x, y - 1)))) { world.setForeMap(x, y, 3); } } } + private void blockUpdater() { + if (DO_UPD) { + for (int y = UPD_Y; y < UPD_Y + UPD_RANGE; y++) { + for (int x = UPD_X; x < UPD_X + UPD_RANGE; x++) { + updateBlock(x, y); + } + } + DO_UPD = false; + } + } + void useItem(int x, int y, int id, boolean bg) { + String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id); if (id > 0) { - if (GameItems.getItem(id).isBlock()) { - if (!bg) world.placeToForeground(x, y, GameItems.getBlockIdByItemId(id)); - else world.placeToBackground(x, y, GameItems.getBlockIdByItemId(id)); + if (getItem(id).isBlock()) { + if (!bg) { + world.placeToForeground(x, y, getBlockIdByItemId(id)); + } else { + world.placeToBackground(x, y, getBlockIdByItemId(id)); + } } else { - switch (id) { - case 65: - world.placeToForeground(x, y, 8); - player.inv[player.invSlot] = 64; + switch (key) { + case "bucket_water": + world.placeToForeground(x, y, getBlockId("water")); + player.inventory[player.slot] = getItemId("bucket_empty"); break; - case 66: - world.placeToForeground(x, y, 9); - player.inv[player.invSlot] = 64; + case "bucket_lava": + world.placeToForeground(x, y, getBlockId("lava")); + player.inventory[player.slot] = getItemId("bucket_empty"); break; } } } } - public void update(float delta) { - if (DO_UPD) { - for (int y = UPD_Y; y < UPD_Y + 16; y++) - for (int x = UPD_X; x < UPD_X + 16; x++) { - updateBlock(x, y); - } - DO_UPD = false; - } - - physics.update(delta); - moveCursor(); - checkCursorBounds(); - - if (isTouchDown && touchDownBtn == Input.Buttons.LEFT) { - if ((world.getForeMap(curX, curY) > 0 && GameItems.getBlock(world.getForeMap(curX, curY)).getHp() >= 0) || - (world.getForeMap(curX, curY) == 0 && - world.getBackMap(curX, curY) > 0 && - GameItems.getBlock(world.getBackMap(curX, curY)).getHp() >= 0)) { - if (player.gameMode == 0) { - blockDmg++; - if (world.getForeMap(curX, curY) > 0) { - if (blockDmg >= GameItems.getBlock(world.getForeMap(curX, curY)).getHp()) { - world.destroyForeMap(curX, curY); - blockDmg = 0; - } - } else if (world.getBackMap(curX, curY) > 0) { - if (blockDmg >= GameItems.getBlock(world.getBackMap(curX, curY)).getHp()) { - world.destroyBackMap(curX, curY); - blockDmg = 0; - } + private void pressLMB() { + if ((world.hasForeAt(curX, curY) && world.getForeMapBlock(curX, curY).getHp() >= 0) || + (!world.hasForeAt(curX, curY) && world.hasBackAt(curX, curY) && + world.getBackMapBlock(curX, curY).getHp() >= 0)) { + if (player.gameMode == 0) { + blockDmg++; + if (world.hasForeAt(curX, curY)) { + if (blockDmg >= world.getForeMapBlock(curX, curY).getHp()) { + world.destroyForeMap(curX, curY); + blockDmg = 0; } - } else { - if (world.getForeMap(curX, curY) > 0) world.placeToForeground(curX, curY, 0); - else if (world.getBackMap(curX, curY) > 0) world.placeToBackground(curX, curY, 0); - isTouchDown = false; + } else if (world.hasBackAt(curX, curY)) { + if (blockDmg >= world.getBackMapBlock(curX, curY).getHp()) { + world.destroyBackMap(curX, curY); + blockDmg = 0; + } + } + } else { + if (world.hasForeAt(curX, curY)) { + world.placeToForeground(curX, curY, 0); + } else if (world.hasBackAt(curX, curY)) { + world.placeToBackground(curX, curY, 0); } + isTouchDown = false; } } + } - if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) { - if (touchDownBtn == Input.Buttons.RIGHT) { - useItem(curX, curY, player.inv[player.invSlot], true); - isTouchDown = false; - } else if (touchDownY < Assets.invBar.getRegionHeight() && + private void holdMB() { + if (touchDownBtn == Input.Buttons.RIGHT) { + useItem(curX, curY, player.inventory[player.slot], true); + isTouchDown = false; + } else if (touchDownBtn == Input.Buttons.LEFT) { + if (touchDownY < Assets.invBar.getRegionHeight() && touchDownX > renderer.getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 && touchDownX < renderer.getWidth() / 2 + (float) Assets.invBar.getRegionWidth() / 2) { - CaveGame.STATE = AppState.GAME_CREATIVE_INV; + CaveGame.GAME_STATE= GameState.CREATIVE_INV; isTouchDown = false; } } + } - if (fluidThread == null || !fluidThread.isAlive()) { - createFluidThread(); - fluidThread.start(); - } + public void update() { + physics.update(); + moveCursor(); + + if (isTouchDown && touchDownBtn == Input.Buttons.LEFT) pressLMB(); + if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) holdMB(); + if (fluidThread == null || !fluidThread.isAlive()) startFluidThread(); } @Override