commit d7cd3cb0
Now use a food items file for the food
Changed files
| A | data/saland/items/food_items.json |
| M | extra/scripts/python/process_food_items.py before |
| M | src/saland/GameItems.cpp before |
diff --git a/data/saland/items/food_items.json b/data/saland/items/food_items.json
new file mode 100644
index 0000000..2d9d671
--- /dev/null
+++ b/data/saland/items/food_items.json
@@ -0,0 +1,130 @@
+{
+ "items": [
+ {
+ "itemid": "food_potato",
+ "sprite": "item_food_potato",
+ "description": "Potato",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_carrot",
+ "sprite": "item_food_carrot",
+ "description": "Carrot",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_onion",
+ "sprite": "item_food_onion",
+ "description": "Onion",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_onion_red",
+ "sprite": "item_food_onion_red",
+ "description": "Red onion",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_pepper_green",
+ "sprite": "item_food_pepper_green",
+ "description": "Green pepper",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_pepper_red",
+ "sprite": "item_food_pepper_red",
+ "description": "Red pepper",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_pepper_orange",
+ "sprite": "item_food_pepper_orange",
+ "description": "Orange pepper",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_pepper_yellow",
+ "sprite": "item_food_pepper_yellow",
+ "description": "Yellow pepper",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_water_mellon",
+ "sprite": "item_food_water_mellon",
+ "description": "Water mellon",
+ "radius": 15.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_mellon",
+ "sprite": "item_food_mellon",
+ "description": "Mellon",
+ "radius": 14.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_pumpkin",
+ "sprite": "item_food_pumpkin",
+ "description": "Pumpkin",
+ "radius": 15.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_apple_green",
+ "sprite": "item_food_apple_green",
+ "description": "Green apple",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_apple_yellow",
+ "sprite": "item_food_apple_yellow",
+ "description": "Yellow apple",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ },
+ {
+ "itemid": "food_apple_red",
+ "sprite": "item_food_apple_red",
+ "description": "Red apple",
+ "radius": 5.0,
+ "isStatic": false,
+ "pickup": true,
+ "isDestructible": false
+ }
+ ]
+}
\ No newline at end of file
diff --git a/extra/scripts/python/process_food_items.py b/extra/scripts/python/process_food_items.py
index cd6553e..5c2ead1 100644
--- a/extra/scripts/python/process_food_items.py
+++ b/extra/scripts/python/process_food_items.py
@@ -3,8 +3,8 @@ import json
FILENAME="../food_items.csv"
FILENAME_SPRITE="../../../data/sprites/food.sprite"
-FILENAME_ITEMS="food_items.json"
-FILENAME_SPELLS="spell_food_items.json"
+FILENAME_ITEMS="../../../data/saland/items/food_items.json"
+FILENAME_SPELLS="../../../data/saland/spells/spell_food_items.json"
def produce_sprite_file():
df = pd.read_csv(FILENAME)
@@ -36,7 +36,7 @@ def produce_item_file():
for index, row in df.iterrows():
name = "item_food_" + row["food_name"]
item = {
- "itemid": row["food_name"],
+ "itemid": "food_"+row["food_name"],
"sprite": name,
"description": row["description"],
"radius": float(row["radius"]),
@@ -64,7 +64,7 @@ def produce_spell_file():
"item_name": row["food_name"]
}
items_arrays.append(item)
- items["items"] = items_arrays
+ items["spells"] = items_arrays
# Save the dictionary as a json file
with open(FILENAME_SPELLS, "w") as f:
json.dump(items, f, indent=4)
diff --git a/src/saland/GameItems.cpp b/src/saland/GameItems.cpp
index 8bf9f2a..5bcbd14 100644
--- a/src/saland/GameItems.cpp
+++ b/src/saland/GameItems.cpp
@@ -107,16 +107,6 @@ static void initItems() {
all_items[barrel.itemid] = barrel;
}
{
- ItemDef potato = itemDef;
- potato.itemid = "food_potato";
- potato.isDestructible = false;
- potato.radius = 9.0f;
- potato.sprite = "item_food_potato";
- potato.isStatic = false;
- potato.pickup = true;
- all_items[potato.itemid] = potato;
- }
- {
ItemDef pine = itemDef;
pine.itemid = "tree_pine";
pine.radius = 20.0f;