X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameProc.java;h=d946942fdfa53bfaa1a787288e0c98a3f965c0e9;hb=22eccb137bf9642700f762dd39cf02ea144bdca3;hp=e4d12b285c025e31233b09217875c32567f1a09e;hpb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java index e4d12b2..d946942 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java @@ -19,117 +19,112 @@ import java.util.ArrayList; public class GameProc implements Serializable { - public static double RUN_TIME = 0; + static boolean DO_UPD = false; + static int UPD_X = -1, UPD_Y = -1; - public static boolean DO_UPD = false; - public static int UPD_X = -1, UPD_Y = -1; + public transient GameWorld world; + public transient GameRenderer renderer; + public transient GamePhysics physics; public Player player; - public ArrayList mobs; public ArrayList drops; - public transient GameWorld world; - public transient GameRenderer renderer; - public transient GamePhysics physics; - - public int cursorX, cursorY; - public int invSlot; - public int ctrlMode; - public int creativeScroll, maxCreativeScroll; - public int blockDmg = 0; - public boolean isTouchDown, isKeyDown, swim; - public int touchDownX, touchDownY, keyDownCode; - public int touchDownButton; + public boolean isTouchDown, isKeyDown; + public int ctrlMode, touchDownX, touchDownY, touchDownBtn, keyDownCode; public long touchDownTime; - public GameProc() { + int curX, curY; + int creativeScroll, maxCreativeScroll; + int blockDmg = 0; + + public void initGame(int gameMode) { world = new GameWorld(); world.generate(1024, 256); - player = new Player(world.getSpawnPoint()); + 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(this); + physics = new GamePhysics(); if (CaveGame.TOUCH) { - renderer = new GameRenderer(this, 320, + renderer = new GameRenderer(320, 320 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); } else { ctrlMode = 1; - renderer = new GameRenderer(this, 480, + renderer = new GameRenderer(480, 480 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); } - maxCreativeScroll = Items.ITEMS.size() / 8; + maxCreativeScroll = GameItems.getItemsSize() / 8; GameSaver.save(this); } public void resetRenderer() { if (CaveGame.TOUCH) { - renderer = new GameRenderer(this, 320, + renderer = new GameRenderer(320, 320 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); } else { - renderer = new GameRenderer(this, 480, + renderer = new GameRenderer(480, 480 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); } } private boolean isAutoselectable(int x, int y) { return (world.getForeMap(x, y) > 0 && - Items.BLOCKS.getValueAt(world.getForeMap(x, y)).collision); + GameItems.getBlock(world.getForeMap(x, y)).hasCollision()); } private void moveCursor() { - int pastX = cursorX, pastY = cursorY; + int pastX = curX, pastY = curY; if (ctrlMode == 0 && CaveGame.TOUCH) { - cursorX = (int) (player.position.x + player.texWidth / 2) / 16; - if (player.dir == 0) cursorX--; - else cursorX++; - cursorY = (int) (player.position.y + player.texWidth) / 16; - if (!isAutoselectable(cursorX, cursorY)) { - cursorY++; + curX = player.getMapX(); + if (player.getDir() == 0) curX--; + else curX++; + curY = (int) (player.pos.y + player.getWidth()) / 16; + if (!isAutoselectable(curX, curY)) { + curY++; } - if (!isAutoselectable(cursorX, cursorY)) { - cursorY++; + if (!isAutoselectable(curX, curY)) { + curY++; } - if (!isAutoselectable(cursorX, cursorY)) { - if (player.dir == 0) cursorX++; - else cursorX--; + if (!isAutoselectable(curX, curY)) { + if (player.getDir() == 0) curX++; + else curX--; } } else if (!CaveGame.TOUCH) { - cursorX = (int) (Gdx.input.getX() * - (renderer.camera.viewportWidth / GameScreen.getWidth()) + renderer.camera.position.x) / 16; - cursorY = (int) (Gdx.input.getY() * - (renderer.camera.viewportHeight / GameScreen.getHeight()) + renderer.camera.position.y) / 16; + 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.camera.viewportWidth / GameScreen.getWidth()) + renderer.camera.position.x) < 0) - cursorX--; + (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) < 0) + curX--; } - if (pastX != cursorX || pastY != cursorY) blockDmg = 0; + if (pastX != curX || pastY != curY) blockDmg = 0; } private void checkCursorBounds() { - if (cursorY < 0) cursorY = 0; - if (cursorY >= world.getHeight()) cursorY = world.getHeight() - 1; + if (curY < 0) curY = 0; + if (curY >= world.getHeight()) curY = world.getHeight() - 1; if (ctrlMode == 1) { - if (cursorX * 16 + 8 < player.position.x + player.texWidth / 2) - player.dir = 0; - if (cursorX * 16 + 8 > player.position.x + player.texWidth / 2) - player.dir = 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); } } private void updateFluids(int x, int y) { - if (Items.isWater(world.getForeMap(x, y)) && world.getForeMap(x, y) != 8) { + if (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x, y) != 8) { if (world.getForeMap(x, y) == 60) { - if (!Items.isWater(world.getForeMap(x, y - 1))) + if (!GameItems.isWater(world.getForeMap(x, y - 1))) world.setForeMap(x, y, world.getForeMap(x, y) + 1); - } else if ((!Items.isWater(world.getForeMap(x - 1, y)) || - (Items.isWater(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) && - (!Items.isWater(world.getForeMap(x + 1, y)) || - (Items.isWater(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) { + } else if ((!GameItems.isWater(world.getForeMap(x - 1, y)) || + (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) && + (!GameItems.isWater(world.getForeMap(x + 1, y)) || + (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) { world.setForeMap(x, y, world.getForeMap(x, y) + 1); } if (world.getForeMap(x, y) > 63) world.setForeMap(x, y, 0); @@ -137,30 +132,30 @@ public class GameProc implements Serializable { if (world.getForeMap(x, y) == 8 || world.getForeMap(x, y) == 60) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 60); updateBlock(x, y + 2); - } else if (Items.isLava(world.getForeMap(x, y + 1))) { + } else if (GameItems.isLava(world.getForeMap(x, y + 1))) { if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4); else world.setForeMap(x, y + 1, 68); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y))) || - (Items.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 61)) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y))) || + (GameItems.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 61)) { world.setForeMap(x + 1, y, 61); updateBlock(x + 1, y + 1); - } else if (Items.isLava(world.getForeMap(x + 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x + 1, y))) { if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4); else world.setForeMap(x + 1, y, 68); } else if (world.getForeMap(x + 1, y) == 61 && (world.getForeMap(x + 2, y) == 8 || world.getForeMap(x + 2, y) == 60)) world.setForeMap(x + 1, y, 8); if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y))) || - (Items.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 61)) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y))) || + (GameItems.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 61)) { world.setForeMap(x - 1, y, 61); updateBlock(x - 1, y + 1); - } else if (Items.isLava(world.getForeMap(x - 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x - 1, y))) { if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4); else world.setForeMap(x - 1, y, 68); } else if (world.getForeMap(x - 1, y) == 61 && (world.getForeMap(x - 2, y) == 8 || world.getForeMap(x - 2, y) == 60)) @@ -170,29 +165,29 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 61) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 60); updateBlock(x, y + 2); - } else if (Items.isLava(world.getForeMap(x, y + 1))) { + } else if (GameItems.isLava(world.getForeMap(x, y + 1))) { if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4); else world.setForeMap(x, y + 1, 68); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y))) || - (Items.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 62)) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y))) || + (GameItems.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 62)) { world.setForeMap(x + 1, y, 62); updateBlock(x + 1, y + 1); - } else if (Items.isLava(world.getForeMap(x + 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x + 1, y))) { if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4); else world.setForeMap(x + 1, y, 68); } if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y))) || - (Items.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 62)) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y))) || + (GameItems.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 62)) { world.setForeMap(x - 1, y, 62); updateBlock(x - 1, y + 1); - } else if (Items.isLava(world.getForeMap(x - 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x - 1, y))) { if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4); else world.setForeMap(x - 1, y, 68); } @@ -201,27 +196,27 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 62) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 60); updateBlock(x, y + 2); - } else if (Items.isLava(world.getForeMap(x, y + 1))) { + } else if (GameItems.isLava(world.getForeMap(x, y + 1))) { if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4); else world.setForeMap(x, y + 1, 68); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y)))) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y)))) { world.setForeMap(x + 1, y, 63); updateBlock(x + 1, y + 1); - } else if (Items.isLava(world.getForeMap(x + 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x + 1, y))) { if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4); else world.setForeMap(x + 1, y, 68); } if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y)))) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y)))) { world.setForeMap(x - 1, y, 63); updateBlock(x - 1, y + 1); - } else if (Items.isLava(world.getForeMap(x - 1, y))) { + } else if (GameItems.isLava(world.getForeMap(x - 1, y))) { if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4); else world.setForeMap(x - 1, y, 68); } @@ -230,25 +225,25 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 63) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 60); updateBlock(x, y + 2); - } else if (Items.isLava(world.getForeMap(x, y + 1))) { + } else if (GameItems.isLava(world.getForeMap(x, y + 1))) { if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4); else world.setForeMap(x, y + 1, 68); } return; } - if (Items.isLava(world.getForeMap(x, y)) && world.getForeMap(x, y) != 9) { + if (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x, y) != 9) { if (world.getForeMap(x, y) == 64) { - if (!Items.isLava(world.getForeMap(x, y - 1))) + if (!GameItems.isLava(world.getForeMap(x, y - 1))) world.setForeMap(x, y, world.getForeMap(x, y) + 1); - } else if ((!Items.isLava(world.getForeMap(x, y - 1))) && - (!Items.isLava(world.getForeMap(x - 1, y)) || - (Items.isLava(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) && - (!Items.isLava(world.getForeMap(x + 1, y)) || - (Items.isLava(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) { + } else if ((!GameItems.isLava(world.getForeMap(x, y - 1))) && + (!GameItems.isLava(world.getForeMap(x - 1, y)) || + (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) && + (!GameItems.isLava(world.getForeMap(x + 1, y)) || + (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) { world.setForeMap(x, y, world.getForeMap(x, y) + 1); } if (world.getForeMap(x, y) > 67) world.setForeMap(x, y, 0); @@ -256,27 +251,27 @@ public class GameProc implements Serializable { if (world.getForeMap(x, y) == 9 || world.getForeMap(x, y) == 64) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 64); updateBlock(x, y + 2); - } else if (Items.isWater(world.getForeMap(x, y + 1))) { + } else if (GameItems.isWater(world.getForeMap(x, y + 1))) { world.setForeMap(x, y + 1, 1); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y))) || - (Items.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 65)) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y))) || + (GameItems.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 65)) { world.setForeMap(x + 1, y, 65); updateBlock(x + 1, y + 1); - } else if (Items.isWater(world.getForeMap(x + 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x + 1, y))) { world.setForeMap(x + 1, y, 1); } if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y))) || - (Items.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 65)) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y))) || + (GameItems.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 65)) { world.setForeMap(x - 1, y, 65); updateBlock(x - 1, y + 1); - } else if (Items.isWater(world.getForeMap(x - 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x - 1, y))) { world.setForeMap(x - 1, y, 1); } } @@ -284,27 +279,27 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 65) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 64); updateBlock(x, y + 2); - } else if (Items.isWater(world.getForeMap(x, y + 1))) { + } else if (GameItems.isWater(world.getForeMap(x, y + 1))) { world.setForeMap(x, y + 1, 1); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y))) || - (Items.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 66)) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y))) || + (GameItems.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 66)) { world.setForeMap(x + 1, y, 66); updateBlock(x + 1, y + 1); - } else if (Items.isWater(world.getForeMap(x + 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x + 1, y))) { world.setForeMap(x + 1, y, 1); } if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y))) || - (Items.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 66)) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y))) || + (GameItems.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 66)) { world.setForeMap(x - 1, y, 66); updateBlock(x - 1, y + 1); - } else if (Items.isWater(world.getForeMap(x - 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x - 1, y))) { world.setForeMap(x - 1, y, 1); } } @@ -312,25 +307,25 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 66) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 64); updateBlock(x, y + 2); - } else if (Items.isWater(world.getForeMap(x, y + 1))) { + } else if (GameItems.isWater(world.getForeMap(x, y + 1))) { world.setForeMap(x, y + 1, 1); - } else if (Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { if (world.getForeMap(x + 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x + 1, y)).collision && !Items.isFluid(world.getForeMap(x + 1, y)))) { + (!GameItems.getBlock(world.getForeMap(x + 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x + 1, y)))) { world.setForeMap(x + 1, y, 67); updateBlock(x + 1, y + 1); - } else if (Items.isWater(world.getForeMap(x + 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x + 1, y))) { world.setForeMap(x + 1, y, 1); } if (world.getForeMap(x - 1, y) == 0 || - (!Items.BLOCKS.getValueAt(world.getForeMap(x - 1, y)).collision && !Items.isFluid(world.getForeMap(x - 1, y)))) { + (!GameItems.getBlock(world.getForeMap(x - 1, y)).hasCollision() && !GameItems.isFluid(world.getForeMap(x - 1, y)))) { world.setForeMap(x - 1, y, 67); updateBlock(x - 1, y + 1); - } else if (Items.isWater(world.getForeMap(x - 1, y))) { + } else if (GameItems.isWater(world.getForeMap(x - 1, y))) { world.setForeMap(x - 1, y, 1); } } @@ -338,10 +333,10 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 67) { if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) || - (!Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision && !Items.isFluid(world.getForeMap(x, y + 1)))) { + (!GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision() && !GameItems.isFluid(world.getForeMap(x, y + 1)))) { world.setForeMap(x, y + 1, 64); updateBlock(x, y + 2); - } else if (Items.isWater(world.getForeMap(x, y + 1))) { + } else if (GameItems.isWater(world.getForeMap(x, y + 1))) { world.setForeMap(x, y + 1, 1); } return; @@ -350,7 +345,7 @@ public class GameProc implements Serializable { private void updateBlock(int x, int y) { if (world.getForeMap(x, y) == 10) { - if (world.getForeMap(x, y + 1) == 0 || !Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) { world.setForeMap(x, y, 0); mobs.add(new FallingSand(x * 16, y * 16)); updateBlock(x, y - 1); @@ -358,38 +353,36 @@ public class GameProc implements Serializable { } if (world.getForeMap(x, y) == 11) { - if (world.getForeMap(x, y + 1) == 0 || !Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { + if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(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) == 59) { - if (world.getForeMap(x, y + 1) == 0 || !Items.BLOCKS.getValueAt(world.getForeMap(x, y + 1)).collision) { - world.setForeMap(x, y, 0); + 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()) { + world.destroyForeMap(x, y, this); updateBlock(x, y - 1); } } if (world.getForeMap(x, y) == 2) { - if (world.getForeMap(x, y - 1) > 0 && (Items.BLOCKS.getValueAt(world.getForeMap(x, y - 1)).collision || - Items.isFluid(world.getForeMap(x, y - 1)))) { + if (world.getForeMap(x, y - 1) > 0 && (GameItems.getBlock(world.getForeMap(x, y - 1)).hasCollision() || + GameItems.isFluid(world.getForeMap(x, y - 1)))) { world.setForeMap(x, y, 3); } } } - public void useItem(int x, int y, int id, boolean bg) { - if (id > 0 && Items.ITEMS.get(id).getType() == 0) { - if (!bg) world.placeToForeground(x, y, Items.ITEMS.get(id).getBlock()); - else world.placeToBackground(x, y, Items.ITEMS.get(id).getBlock()); + void useItem(int x, int y, int id, boolean bg) { + if (id > 0 && GameItems.getItem(id).getType() == 0) { + if (!bg) world.placeToForeground(x, y, GameItems.getItem(id).getBlock()); + else world.placeToBackground(x, y, GameItems.getItem(id).getBlock()); } } public void update(float delta) { - RUN_TIME += delta; - if (DO_UPD) { for (int y = UPD_Y; y < UPD_Y + 16; y++) for (int x = UPD_X; x < UPD_X + 16; x++) { @@ -399,7 +392,7 @@ public class GameProc implements Serializable { } for (int y = 0; y < world.getHeight(); y++) { - for (int x = (int) renderer.camera.position.x / 16 - 1; x < (int) (renderer.camera.position.x + renderer.camera.viewportWidth) / 16 + 1; x++) { + for (int x = (int) renderer.getCamX() / 16 - 1; x < (int) (renderer.getCamX() + renderer.getWidth()) / 16 + 1; x++) { updateFluids(x, y); } } @@ -408,26 +401,39 @@ public class GameProc implements Serializable { moveCursor(); checkCursorBounds(); - if (isTouchDown && touchDownButton == Input.Buttons.LEFT) { - if (world.getForeMap(cursorX, cursorY) > 0 && - Items.BLOCKS.getValueAt(world.getForeMap(cursorX, cursorY)).getHp() >= 0) {// || world.getBackMap(cursorX, cursorY) > 0) { - blockDmg++; - if (blockDmg >= Items.BLOCKS.getValueAt(world.getForeMap(cursorX, cursorY)).getHp()) { - if (Items.BLOCKS.getValueAt(world.getForeMap(cursorX, cursorY)).getDrop() > 0) - drops.add(new Drop(cursorX * 16 + 4, cursorY * 16 + 4, Items.BLOCKS.getValueAt(world.getForeMap(cursorX, cursorY)).getDrop())); - world.placeToForeground(cursorX, cursorY, 0); - blockDmg = 0; + 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, this); + blockDmg = 0; + } + } else if (world.getBackMap(curX, curY) > 0) { + if (blockDmg >= GameItems.getBlock(world.getBackMap(curX, curY)).getHp()) { + world.destroyBackMap(curX, curY, this); + 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; } } } if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) { - if (touchDownButton == Input.Buttons.RIGHT) { - useItem(cursorX, cursorY, player.inventory[invSlot], true); + if (touchDownBtn == Input.Buttons.RIGHT) { + useItem(curX, curY, player.inv[player.invSlot], true); isTouchDown = false; } else if (touchDownY < Assets.invBar.getRegionHeight() && - touchDownX > renderer.camera.viewportWidth / 2 - Assets.invBar.getRegionWidth() / 2 && - touchDownX < renderer.camera.viewportWidth / 2 + Assets.invBar.getRegionWidth() / 2) { + touchDownX > renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 && + touchDownX < renderer.getWidth() / 2 + Assets.invBar.getRegionWidth() / 2) { CaveGame.STATE = AppState.GAME_CREATIVE_INV; isTouchDown = false; }