git repos / saland

commit eb2e0f64

Poul Sander · 2023-01-29 23:10
eb2e0f64699a415a366a3c88167e7ca43fccf782 patch · browse files
parent 81e106d61a83c24793a91333199d7f7fc7a86c6c

Rename spells file

Changed files

A data/saland/spells/base_spells.json
M src/saland/model/spells.cpp before
diff --git a/data/saland/spells/base_spells.json b/data/saland/spells/base_spells.json new file mode 100644 index 0000000..002212f --- /dev/null +++ b/data/saland/spells/base_spells.json
@@ -0,0 +1,58 @@
+{
+ "items": [
+ {
+ "name": "spell_fireball",
+ "icon": "effect_fireball",
+ "item_name": "",
+ "tile": 0,
+ "_comment_tile": "Number reference to a tile, we might also need a tileset at some point",
+ "type": "dot"
+ }
+ ,{
+ "icon": "item_weapon_long_knife",
+ "name": "weapon_slash_long_knife"
+ }
+ ,{
+ "name": "spell_create_block",
+ "tile": 607,
+ "type": "tile"
+ }
+ ,{
+ "icon": "",
+ "name" : "spell_create_block",
+ "tile" : 28,
+ "type" : "tile"
+ }
+ ,{
+ "icon" : "",
+ "name" : "spell_create_block",
+ "tile" : 16,
+ "type" : "tile"
+ }
+ ,{
+ "icon" : "item_food_potato",
+ "name" : "spell_spawn_item",
+ "item_name" : "food_potato"
+ }
+ ,{
+ "icon" : "item_barrel",
+ "name" : "spell_spawn_item",
+ "item_name" : "barrel"
+ }
+ ,{
+ "icon" : "tree_palm_icon",
+ "name" : "spell_spawn_item",
+ "item_name" : "tree_palm"
+ }
+ ,{
+ "icon" : "cactus_one",
+ "name" : "spell_spawn_item",
+ "item_name" : "cactus_full"
+ }
+ ,{
+ "icon" : "tree_pine_icon",
+ "name" : "spell_spawn_item",
+ "item_name" : "tree_pine"
+ }
+ ]
+}
diff --git a/src/saland/model/spells.cpp b/src/saland/model/spells.cpp index 8a4e0cd..2341914 100644 --- a/src/saland/model/spells.cpp +++ b/src/saland/model/spells.cpp
@@ -100,7 +100,7 @@ void SpellHolder::init() {
clearTileSpell.icon = "icon_trash_can";
clearTileSpell.name = "spell_clear_block";
clearTileSpell.type = SpellCursorType::tile;
- ReadSpellFile("saland/items/base_items.json");
+ ReadSpellFile("saland/spells/base_spells.json");
}
size_t SpellHolder::get_spell_count() const {