Added class and spells icons

data/db/classes.json

@@ -2,7 +2,7 @@
   "farmer": {
     "starter": true,
     "desc": "Farmer description",
-    "icon": "icons/farmer.png",
+    "icon": "icons/classes/farmer.png",
     "assetGraph": "anims/classes/farmer/farmer.data.json",
     "health": 10,
     "speed": 10.1,
@@ -22,7 +22,7 @@
   },
   "soldier": {
     "desc": "Soldier description",
-    "icon": "icons/soldier.png",
+    "icon": "icons/classes/soldier.png",
     "assetGraph": "anims/classes/soldier/soldier.data.json",
     "health": 20,
     "speed": 10.1,
@@ -42,7 +42,7 @@
   },
   "shooter": {
     "desc": "Shooter description",
-    "icon": "icons/shooter.png",
+    "icon": "icons/classes/shooter.png",
     "assetGraph": "anims/classes/shooter/shooter.data.json",
     "health": 10,
     "speed": 10.3,
@@ -61,7 +61,7 @@
   },
   "sorcerer": {
     "desc": "Sorcerer description",
-    "icon": "icons/sorcerer.png",
+    "icon": "icons/classes/sorcerer.png",
     "assetGraph": "anims/classes/sorcerer/sorcerer.data.json",
     "health": 5,
     "speed": 10.2,
@@ -79,7 +79,7 @@
   },
   "assassin": {
     "desc": "Assassin description",
-    "icon": "icons/soldier.png",
+    "icon": "icons/classes/soldier.png",
     "assetGraph": "anims/classes/soldier/soldier.data.json",
     "health": 25,
     "speed": 11,
@@ -93,7 +93,7 @@
   },
   "warrior": {
     "desc": "Warrior description",
-    "icon": "icons/soldier.png",
+    "icon": "icons/classes/soldier.png",
     "assetGraph": "anims/classes/soldier/soldier.data.json",
     "health": 35,
     "speed": 10.2,
@@ -107,7 +107,7 @@
   },
   "tank": {
     "desc": "Tank description",
-    "icon": "icons/soldier.png",
+    "icon": "icons/classes/soldier.png",
     "assetGraph": "anims/classes/soldier/soldier.data.json",
     "health": 50,
     "speed": 10,
@@ -121,7 +121,7 @@
   },
   "archer": {
     "desc": "Archer description",
-    "icon": "icons/shooter.png",
+    "icon": "icons/classes/shooter.png",
     "assetGraph": "anims/classes/shooter/shooter.data.json",
     "health": 22,
     "speed": 10.4,
@@ -135,7 +135,7 @@
   },
   "gunner": {
     "desc": "Gunner description",
-    "icon": "icons/shooter.png",
+    "icon": "icons/classes/shooter.png",
     "assetGraph": "anims/classes/shooter/shooter.data.json",
     "health": 24,
     "speed": 10.4,
@@ -149,7 +149,7 @@
   },
   "mage": {
     "desc": "Mage description",
-    "icon": "icons/sorcerer.png",
+    "icon": "icons/classes/sorcerer.png",
     "assetGraph": "anims/classes/sorcerer/sorcerer.data.json",
     "health": 20,
     "speed": 10.3,

data/db/spells.json

@@ -1,140 +1,146 @@
 {
-    "shovel": {
-        "cooldown": 700,
-        "damage": 1,
-        "scale": {
-            "x": 1.5,
-            "y": 1.5
-        },
-        "hitbox": {
-            "x": 0.2,
-            "y": 0.7
-        },
-        "lifetime": 200,
-        "audio_on_cast": "sounds/spells/stick.wav",
-        "animation": "anims/spells/farmer_attack/farmer_anim.data.json",
-        "speed": 0,
-        "offset_to_source": {
-            "x": 1,
-            "y": 1
-        },
-        "type": [
-            "projectile"
-        ]
-    },
-    "sword": {
-        "cooldown": 500,
-        "damage": 5,
-        "scale": {
-            "x": 0.7,
-            "y": 0.7
-        },
-        "hitbox": {
-            "x": 0.3,
-            "y": 0.7
-        },
-        "lifetime": 200,
-        "audio_on_cast": "sounds/spells/soldier_attack.wav",
-        "animation": "anims/spells/soldier_attack/soldier_attack.data.json",
-        "speed": 0,
-        "offset_to_source": {
-            "x": 1,
-            "y": 1
-        },
-        "type": [
-            "projectile"
-        ]
-    },
-    "fireball": {
-        "cooldown": 1500,
-        "damage": 3,
-        "scale": {
-            "x": 2.0,
-            "y": 2.0
-        },
-        "hitbox": {
-            "x": 0.7,
-            "y": 0.7
-        },
-        "lifetime": 2000,
-        "audio_on_cast": "sounds/fire_cast.wav",
-        "animation": "anims/spells/fireball/fireball.data.json",
-        "speed": 4.0,
-        "offset_to_source": {
-            "x": 2,
-            "y": 2
-        },
-        "type": [
-            "projectile"
-        ]
-    },
-    "firewall": {
-        "cooldown": 3000,
-        "damage": 0.5,
-        "scale": {
-            "x": 6.0,
-            "y": 6.0
-        },
-        "hitbox": {
-            "x": 5.0,
-            "y": 5.0
-        },
-        "lifetime": 7000,
-        "audio_on_cast": "sounds/fire_cast.wav",
-        "animation": "anims/spells/firewall/firewall.data.json",
-        "speed": 0,
-        "offset_to_source": {
-            "x": 5,
-            "y": 5
-        },
-        "type": [
-            "aoe"
-        ]
-    },
-    "fireball_blue": {
-        "cooldown": 2000,
-        "damage": 5,
-        "scale": {
-            "x": 2.5,
-            "y": 2.5
-        },
-        "hitbox": {
-            "x": 1.2,
-            "y": 1.2
-        },
-        "lifetime": 3000,
-        "audio_on_cast": "sounds/fire_cast.wav",
-        "animation": "anims/spells/fireball_blue/fireball_blue.data.json",
-        "speed": 3.0,
-        "offset_to_source": {
-            "x": 2,
-            "y": 2
-        },
-        "type": [
-            "projectile"
-        ]
-    },
-    "arrow": {
-        "cooldown": 1000,
-        "damage": 2,
-        "scale": {
-            "x": 1,
-            "y": 0.2
-        },
-        "hitbox": {
-            "x": 0.7,
-            "y": 0.3
-        },
-        "lifetime": 1000,
-        "audio_on_cast": "sounds/spells/stick.wav",
-        "animation": "anims/spells/arrow/arrow.data.json",
-        "speed": 8.0,
-        "offset_to_source": {
-            "x": 1.5,
-            "y": 1.5
-        },
-        "type": [
-            "projectile"
-        ]
-    }
+  "shovel": {
+    "icon": "icons/spells/shovel.png",
+    "cooldown": 700,
+    "damage": 1,
+    "scale": {
+      "x": 1.5,
+      "y": 1.5
+    },
+    "hitbox": {
+      "x": 0.2,
+      "y": 0.7
+    },
+    "lifetime": 200,
+    "audio_on_cast": "sounds/spells/stick.wav",
+    "animation": "anims/spells/farmer_attack/farmer_anim.data.json",
+    "speed": 0,
+    "offset_to_source": {
+      "x": 1,
+      "y": 1
+    },
+    "type": [
+      "projectile"
+    ]
+  },
+  "sword": {
+    "icon": "icons/spells/sword.png",
+    "cooldown": 500,
+    "damage": 5,
+    "scale": {
+      "x": 0.7,
+      "y": 0.7
+    },
+    "hitbox": {
+      "x": 0.3,
+      "y": 0.7
+    },
+    "lifetime": 200,
+    "audio_on_cast": "sounds/spells/soldier_attack.wav",
+    "animation": "anims/spells/soldier_attack/soldier_attack.data.json",
+    "speed": 0,
+    "offset_to_source": {
+      "x": 1,
+      "y": 1
+    },
+    "type": [
+      "projectile"
+    ]
+  },
+  "fireball": {
+    "icon": "icons/spells/fireball.png",
+    "cooldown": 1500,
+    "damage": 3,
+    "scale": {
+      "x": 2.0,
+      "y": 2.0
+    },
+    "hitbox": {
+      "x": 0.7,
+      "y": 0.7
+    },
+    "lifetime": 2000,
+    "audio_on_cast": "sounds/fire_cast.wav",
+    "animation": "anims/spells/fireball/fireball.data.json",
+    "speed": 4.0,
+    "offset_to_source": {
+      "x": 2,
+      "y": 2
+    },
+    "type": [
+      "projectile"
+    ]
+  },
+  "firewall": {
+    "icon": "icons/spells/firewall.png",
+    "cooldown": 3000,
+    "damage": 0.5,
+    "scale": {
+      "x": 6.0,
+      "y": 6.0
+    },
+    "hitbox": {
+      "x": 5.0,
+      "y": 5.0
+    },
+    "lifetime": 7000,
+    "audio_on_cast": "sounds/fire_cast.wav",
+    "animation": "anims/spells/firewall/firewall.data.json",
+    "speed": 0,
+    "offset_to_source": {
+      "x": 5,
+      "y": 5
+    },
+    "type": [
+      "aoe"
+    ]
+  },
+  "fireball_blue": {
+    "icon": "icons/spells/fireball_blue.png",
+    "cooldown": 2000,
+    "damage": 5,
+    "scale": {
+      "x": 2.5,
+      "y": 2.5
+    },
+    "hitbox": {
+      "x": 1.2,
+      "y": 1.2
+    },
+    "lifetime": 3000,
+    "audio_on_cast": "sounds/fire_cast.wav",
+    "animation": "anims/spells/fireball_blue/fireball_blue.data.json",
+    "speed": 3.0,
+    "offset_to_source": {
+      "x": 2,
+      "y": 2
+    },
+    "type": [
+      "projectile"
+    ]
+  },
+  "arrow": {
+    "icon": "icons/spells/arrow.png",
+    "cooldown": 1000,
+    "damage": 2,
+    "scale": {
+      "x": 1,
+      "y": 0.2
+    },
+    "hitbox": {
+      "x": 0.7,
+      "y": 0.3
+    },
+    "lifetime": 1000,
+    "audio_on_cast": "sounds/spells/stick.wav",
+    "animation": "anims/spells/arrow/arrow.data.json",
+    "speed": 8.0,
+    "offset_to_source": {
+      "x": 1.5,
+      "y": 1.5
+    },
+    "type": [
+      "projectile"
+    ]
+  }
 }

src/Application/include/models/Spell.hpp

@@ -26,6 +26,8 @@ struct /*[[deprecated]]*/ Spell {
 };
 
 struct SpellData {
+    std::string iconPath;
+
     std::chrono::milliseconds cooldown;
 
     float damage;

src/Application/src/models/Spell.cpp

@@ -15,6 +15,7 @@ void game::to_json(nlohmann::json &j, const SpellData &spell)
 {
     // clang-format off
     j = nlohmann::json{{
+            "icon", spell.iconPath,
         "cooldown", spell.cooldown.count(),
         "damage", spell.damage,
         "hitbox", {
@@ -39,6 +40,7 @@ void game::to_json(nlohmann::json &j, const SpellData &spell)
 
 void game::from_json(const nlohmann::json &j, SpellData &spell) try
 {
+    spell.iconPath = j.at("icon");
     spell.cooldown = std::chrono::milliseconds{j.at("cooldown")};
     spell.damage = j.at("damage");
     spell.hitbox.width = j.at("hitbox").at("x");