X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=079f4855d88465aebea7b60091b06e773d3ac328;hb=47099181db7f7d785c9c471cbaca474ebcb67d95;hp=64fba5add7c89326fb65c70a63df094cc894eb85;hpb=0f7f8555c9c892f95e291b7324316acc9e7b1b43;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java index 64fba5a..079f485 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java @@ -3,14 +3,17 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.ArrayMap; import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.JsonValue; import ru.deadsoftware.cavedroid.game.objects.Block; import ru.deadsoftware.cavedroid.game.objects.Item; import ru.deadsoftware.cavedroid.misc.Assets; +import ru.deadsoftware.cavedroid.misc.utils.AssetLoader; +import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin; -import java.util.HashMap; +import java.util.*; public class GameItems { @@ -27,11 +30,19 @@ public class GameItems { } public static boolean isWater(int id) { - return getBlock(id).getMeta().equals("water"); + return isWater(getBlock(id)); + } + + public static boolean isWater(Block block) { + return block.getMeta().equals("water"); } public static boolean isLava(int id) { - return getBlock(id).getMeta().equals("lava"); + return isLava(getBlock(id)); + } + + public static boolean isLava(Block block) { + return block.getMeta().equals("lava"); } public static boolean isSlab(int id) { @@ -80,6 +91,10 @@ public class GameItems { return getBlockId(items.getKeyAt(id)); } + public static int getItemIdByBlockId(int id) { + return getItemId(blocks.getKeyAt(id)); + } + public static int getBlocksSize() { return blocks.size; } @@ -96,8 +111,14 @@ public class GameItems { return items.getValueAt(id).getType().equals("block") ? getBlockTex(id) : getItem(id).getTexture(); } - public static void load() { - JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/game_items.json")); + public static void load(AssetLoader assetLoader) { + JsonValue json = Assets.jsonReader.parse(assetLoader.getAssetHandle("json/game_items.json")); + + TreeSet blocksSet = new TreeSet<>(Comparator.comparingInt(Block::getId)); + TreeSet itemsSet = new TreeSet<>(Comparator.comparingInt(Item::getId)); + + + int count = 0; for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) { try { String key = block.name(); @@ -105,25 +126,60 @@ public class GameItems { int right = Assets.getIntFromJson(block, "right", 0); int top = Assets.getIntFromJson(block, "top", 0); int bottom = Assets.getIntFromJson(block, "bottom", 0); + int clipX = Assets.getIntFromJson(block, "sprite_left", 0); + int clipY = Assets.getIntFromJson(block, "sprite_top", 0); + int clipWidth = Assets.getIntFromJson(block, "sprite_right", 0); + int clipHeight = Assets.getIntFromJson(block, "sprite_bottom", 0); int hp = Assets.getIntFromJson(block, "hp", -1); - boolean coll = Assets.getBooleanFromJson(block, "collision", true); - boolean bg = Assets.getBooleanFromJson(block, "background", false); - boolean tp = Assets.getBooleanFromJson(block, "transparent", false); - boolean br = Assets.getBooleanFromJson(block, "block_required", false); + boolean collision = Assets.getBooleanFromJson(block, "collision", true); + boolean background = Assets.getBooleanFromJson(block, "background", false); + boolean transparent = Assets.getBooleanFromJson(block, "transparent", false); + boolean requiresBlock = Assets.getBooleanFromJson(block, "block_required", false); boolean fluid = Assets.getBooleanFromJson(block, "fluid", false); String drop = Assets.getStringFromJson(block, "drop", key); String meta = Assets.getStringFromJson(block, "meta", ""); String tex = Assets.getStringFromJson(block, "texture", key); - Sprite sprite = tex.equals("none") ? null : - new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png"))); - - Block newBlock = new Block(left, top, right, bottom, hp, drop, coll, bg, tp, br, fluid, meta, sprite); - blocksIds.put(key, blocks.size); - blocks.put(key, newBlock); + Texture texture = tex.equals("none") ? null : + new Texture(assetLoader.getAssetHandle("textures/blocks/" + tex + ".png")); + boolean animated = Assets.getBooleanFromJson(block, "animated", false); + int frames = Assets.getIntFromJson(block, "frames", 0); + int id = Assets.getIntFromJson(block, "id", count); + blocksIds.put(key, id); + + if (count >= id) { + count++; + } + + Block newBlock = new Block( + id, + key, + left, + top, + right, + bottom, + hp, + drop, + collision, + background, + transparent, + requiresBlock, + fluid, + meta, + texture, + animated, + frames, + clipX, + clipY, + clipWidth, + clipHeight + ); + blocksSet.add(newBlock); } catch (GdxRuntimeException e) { Gdx.app.error(TAG, e.getMessage()); } } + + count = 0; for (JsonValue item = json.get("items").child(); item != null; item = item.next()) { try { String key = item.name(); @@ -131,13 +187,31 @@ public class GameItems { String type = Assets.getStringFromJson(item, "type", "item"); String texture = Assets.getStringFromJson(item, "texture", key); Sprite sprite = type.equals("block") ? null : - new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png"))); - itemsIds.put(key, items.size); - items.put(key, new Item(name, type, sprite)); + new Sprite(new Texture(assetLoader.getAssetHandle("textures/items/" + texture + ".png"))); + + float originX = Assets.getFloatFromJson(item, "origin_x", 0f); + float originY = Assets.getFloatFromJson(item, "origin_y", 1f); + originX = MathUtils.clamp(originX, 0f, 1f); + originY = MathUtils.clamp(originY, 0f, 1f); + SpriteOrigin origin = new SpriteOrigin(originX, originY); + + int id = Assets.getIntFromJson(item, "id", count); + + String actionKey = Assets.getStringFromJson(item, "action_key", null); + + if (count >= id) { + count++; + } + + itemsIds.put(key, id); + itemsSet.add(new Item(id, key, name, type, sprite, origin, actionKey)); } catch (GdxRuntimeException e) { Gdx.app.error(TAG, e.getMessage()); } } + + blocksSet.forEach((block -> blocks.put(block.getKey(), block))); + itemsSet.forEach((item -> items.put(item.getKey(), item))); } } \ No newline at end of file