X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=079f4855d88465aebea7b60091b06e773d3ac328;hb=28d6d78dbd87e28884700bf60d02e554755ae254;hp=1cebf860ac5f0be1f9a03c2763969d31c0b43c1a;hpb=522264a26a60feed15929afd6fd2cb0a334386b2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 1cebf86..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 {
 
@@ -88,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;
     }
@@ -104,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<Block> blocksSet = new TreeSet<>(Comparator.comparingInt(Block::getId));
+        TreeSet<Item> 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();
@@ -127,11 +140,19 @@ public class GameItems {
                 String meta = Assets.getStringFromJson(block, "meta", "");
                 String tex = Assets.getStringFromJson(block, "texture", key);
                 Texture texture = tex.equals("none") ? null :
-                        new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png"));
+                        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,
@@ -152,13 +173,13 @@ public class GameItems {
                         clipWidth,
                         clipHeight
                 );
-
-                blocksIds.put(key, blocks.size);
-                blocks.put(key, newBlock);
+                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();
@@ -166,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