From d58d40ec24363550fad10bd6047cee2618912186 Mon Sep 17 00:00:00 2001 From: fred-boy Date: Fri, 27 Sep 2019 23:49:44 +0700 Subject: [PATCH] Fix json load --- .../cavedroid/game/GameItems.java | 32 +++++++++---------- .../cavedroid/game/mobs/FallingGravel.java | 1 + .../cavedroid/misc/ControlMode.java | 4 +++ .../cavedroid/misc/{ => states}/AppState.java | 0 .../cavedroid/misc/states/GameState.java | 4 +++ .../cavedroid/misc/states/MenuState.java | 4 +++ 6 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 core/src/ru/deadsoftware/cavedroid/misc/ControlMode.java rename core/src/ru/deadsoftware/cavedroid/misc/{ => states}/AppState.java (100%) create mode 100644 core/src/ru/deadsoftware/cavedroid/misc/states/GameState.java create mode 100644 core/src/ru/deadsoftware/cavedroid/misc/states/MenuState.java diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java index 61b3af7..da43077 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java @@ -100,19 +100,19 @@ public class GameItems { JsonValue item = json.child.next.child; while (block != null) { String key = block.name; - int left = (block.has("left") ? block.getInt("left") : 0); - int right = (block.has("right") ? block.getInt("right") : 0); - int top = (block.has("top") ? block.getInt("top") : 0); - int bottom = (block.has("bottom") ? block.getInt("bottom") : 0); - int hp = (block.has("hp") ? block.getInt("hp") : -1); - String drop = (block.has("drop") ? block.getString("drop") : key); - boolean collision = (!block.has("collision") || block.getBoolean("collision")); - boolean background = (block.has("background") && block.getBoolean("background")); - boolean transparent = !(!block.has("collision") || block.getBoolean("collision")); - boolean blockRequired = (block.has("block_required") && block.getBoolean("block_required")); - boolean fluid = (block.has("fluid") && block.getBoolean("fluid")); - String meta = (block.has("meta") ? block.getString("meta") : ""); - String texture = (block.has("texture") ? block.getString("texture") : key); + int left = block.has("left") ? block.getInt("left") : 0; + int right = block.has("right") ? block.getInt("right") : 0; + int top = block.has("top") ? block.getInt("top") : 0; + int bottom = block.has("bottom") ? block.getInt("bottom") : 0; + int hp = block.has("hp") ? block.getInt("hp") : -1; + String drop = block.has("drop") ? block.getString("drop") : key; + boolean collision = !block.has("collision") || block.getBoolean("collision"); + boolean background = block.has("background") && block.getBoolean("background"); + boolean transparent = block.has("transparent") && block.getBoolean("transparent"); + boolean blockRequired = block.has("block_required") && block.getBoolean("block_required"); + boolean fluid = block.has("fluid") && block.getBoolean("fluid"); + String meta = block.has("meta") ? block.getString("meta") : ""; + String texture = block.has("texture") ? block.getString("texture") : key; Sprite sprite = key.equals("none") ? null : new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + texture + ".png"))); Block newBlock = new Block( @@ -137,9 +137,9 @@ public class GameItems { } while (item != null) { String key = item.name; - String name = (item.has("name") ? item.getString("name") : key); - String type = (item.has("type") ? item.getString("type") : "item"); - String texture = (item.has("texture") ? item.getString("texture") : key); + String name = item.has("name") ? item.getString("name") : key; + String type = item.has("type") ? item.getString("type") : "item"; + String texture = item.has("texture") ? item.getString("texture") : key; Sprite sprite = type.equals("block") ? null : new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png"))); itemsIds.put(key, items.size); diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java index 93d0b6f..b47b600 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -7,6 +7,7 @@ import ru.deadsoftware.cavedroid.misc.Assets; public class FallingGravel extends Mob { + ^ public FallingGravel(float x, float y) { super(x, y, 16, 16, 0); mov = new Vector2(0, 1); diff --git a/core/src/ru/deadsoftware/cavedroid/misc/ControlMode.java b/core/src/ru/deadsoftware/cavedroid/misc/ControlMode.java new file mode 100644 index 0000000..ddb0c1e --- /dev/null +++ b/core/src/ru/deadsoftware/cavedroid/misc/ControlMode.java @@ -0,0 +1,4 @@ +package ru.deadsoftware.cavedroid.game; + +public class ControlMode { +} diff --git a/core/src/ru/deadsoftware/cavedroid/misc/AppState.java b/core/src/ru/deadsoftware/cavedroid/misc/states/AppState.java similarity index 100% rename from core/src/ru/deadsoftware/cavedroid/misc/AppState.java rename to core/src/ru/deadsoftware/cavedroid/misc/states/AppState.java diff --git a/core/src/ru/deadsoftware/cavedroid/misc/states/GameState.java b/core/src/ru/deadsoftware/cavedroid/misc/states/GameState.java new file mode 100644 index 0000000..7ed4115 --- /dev/null +++ b/core/src/ru/deadsoftware/cavedroid/misc/states/GameState.java @@ -0,0 +1,4 @@ +package ru.deadsoftware.cavedroid.misc; + +public enum GameState { +} diff --git a/core/src/ru/deadsoftware/cavedroid/misc/states/MenuState.java b/core/src/ru/deadsoftware/cavedroid/misc/states/MenuState.java new file mode 100644 index 0000000..db3c586 --- /dev/null +++ b/core/src/ru/deadsoftware/cavedroid/misc/states/MenuState.java @@ -0,0 +1,4 @@ +package ru.deadsoftware.cavedroid.misc.states; + +public enum MenuState { +} -- 2.29.2