diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 7364e5967c767fcb3cc9be56d27400080c95a7a5..d018b3e35b6817955f6f0e529c65e349643be323 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
+import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavedroid.CaveGame;
import ru.deadsoftware.cavedroid.GameScreen;
import java.io.Serializable;
import java.util.ArrayList;
-public class GameProc implements Serializable {
-
+public class GameProc implements Serializable, Disposable {
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;
public ArrayList<Mob> mobs;
public ArrayList<Drop> drops;
-
public boolean isTouchDown, isKeyDown;
public int ctrlMode, touchDownX, touchDownY, touchDownBtn, keyDownCode;
public long touchDownTime;
world = new GameWorld();
world.generate(1024, 256);
player = new Player(gameMode);
- drops = new ArrayList<Drop>();
- mobs = new ArrayList<Mob>();
+ drops = new ArrayList<>();
+ mobs = new ArrayList<>();
for (int i = 0; i < 16; i++) {
mobs.add(new Pig(i * 256, 196 * 16));
}
480 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
}
maxCreativeScroll = GameItems.getItemsSize() / 8;
+
+ createFluidThread();
+ fluidThread.start();
+
GameSaver.save(this);
}
+ private void createFluidThread() {
+ fluidThread = new GameFluidsThread();
+ }
+
public void resetRenderer() {
if (CaveGame.TOUCH) {
renderer = new GameRenderer(320,
}
}
- private void updateFluids(int x, int y) {
- if (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x, y) != 8) {
- if (world.getForeMap(x, y) == 60) {
- if (!GameItems.isWater(world.getForeMap(x, y - 1)))
- world.setForeMap(x, y, world.getForeMap(x, y) + 1);
- } 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);
- }
-
- 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) ||
- (!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 (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 (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (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 ||
- (!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 (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);
- }
- return;
- }
- 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) ||
- (!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 (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 (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (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 ||
- (!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 (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);
- }
- }
- return;
- }
- 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) ||
- (!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 (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 (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (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 ||
- (!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 (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);
- }
- }
- return;
- }
- 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) ||
- (!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 (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 (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x, y) != 9) {
- if (world.getForeMap(x, y) == 64) {
- if (!GameItems.isLava(world.getForeMap(x, y - 1)))
- world.setForeMap(x, y, world.getForeMap(x, y) + 1);
- } 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);
- }
-
- 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) ||
- (!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 (GameItems.isWater(world.getForeMap(x, y + 1))) {
- world.setForeMap(x, y + 1, 1);
- } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x + 1, y))) {
- world.setForeMap(x + 1, y, 1);
- }
-
- if (world.getForeMap(x - 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x - 1, y))) {
- world.setForeMap(x - 1, y, 1);
- }
- }
- return;
- }
- 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) ||
- (!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 (GameItems.isWater(world.getForeMap(x, y + 1))) {
- world.setForeMap(x, y + 1, 1);
- } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x + 1, y))) {
- world.setForeMap(x + 1, y, 1);
- }
-
- if (world.getForeMap(x - 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x - 1, y))) {
- world.setForeMap(x - 1, y, 1);
- }
- }
- return;
- }
- 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) ||
- (!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 (GameItems.isWater(world.getForeMap(x, y + 1))) {
- world.setForeMap(x, y + 1, 1);
- } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).hasCollision()) {
- if (world.getForeMap(x + 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x + 1, y))) {
- world.setForeMap(x + 1, y, 1);
- }
-
- if (world.getForeMap(x - 1, y) == 0 ||
- (!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 (GameItems.isWater(world.getForeMap(x - 1, y))) {
- world.setForeMap(x - 1, y, 1);
- }
- }
- return;
- }
- 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) ||
- (!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 (GameItems.isWater(world.getForeMap(x, y + 1))) {
- world.setForeMap(x, y + 1, 1);
- }
- return;
- }
- }
-
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.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);
+ world.destroyForeMap(x, y);
updateBlock(x, y - 1);
}
}
}
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());
+ 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));
+ } else {
+ switch (id) {
+ case 65:
+ world.placeToForeground(x, y, 8);
+ player.inv[player.invSlot] = 64;
+ break;
+ case 66:
+ world.placeToForeground(x, y, 9);
+ player.inv[player.invSlot] = 64;
+ break;
+ }
+ }
}
}
DO_UPD = false;
}
- for (int y = 0; y < world.getHeight(); y++) {
- for (int x = (int) renderer.getCamX() / 16 - 1; x < (int) (renderer.getCamX() + renderer.getWidth()) / 16 + 1; x++) {
- updateFluids(x, y);
- }
- }
-
physics.update(delta);
moveCursor();
checkCursorBounds();
blockDmg++;
if (world.getForeMap(curX, curY) > 0) {
if (blockDmg >= GameItems.getBlock(world.getForeMap(curX, curY)).getHp()) {
- world.destroyForeMap(curX, curY, this);
+ 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, this);
+ world.destroyBackMap(curX, curY);
blockDmg = 0;
}
}
useItem(curX, curY, player.inv[player.invSlot], true);
isTouchDown = false;
} else if (touchDownY < Assets.invBar.getRegionHeight() &&
- touchDownX > renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 &&
- touchDownX < renderer.getWidth() / 2 + Assets.invBar.getRegionWidth() / 2) {
+ touchDownX > renderer.getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 &&
+ touchDownX < renderer.getWidth() / 2 + (float) Assets.invBar.getRegionWidth() / 2) {
CaveGame.STATE = AppState.GAME_CREATIVE_INV;
isTouchDown = false;
}
}
+
+ if (fluidThread == null || !fluidThread.isAlive()) {
+ createFluidThread();
+ fluidThread.start();
+ }
}
+ @Override
+ public void dispose() {
+ fluidThread.interrupt();
+ }
}