Add charge-up mechanic for more powerful spells

- Implements spell charge-up in ItemWand
- Assigns chargeup values in json files for spells that should have one
- Adds a charge meter to the crosshair in first-person
- Updates some javadoc comments appropriately

src/main/resources/assets/ebwizardry/spells/arcane_jammer.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "alteration",
   "cost": 30,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 50,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/arrow_rain.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "attack",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 300,
   "base_properties": {
     "range": 20,

src/main/resources/assets/ebwizardry/spells/black_hole.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "construct",
   "cost": 150,
-  "chargeup": 0,
+  "chargeup": 25,
   "cooldown": 400,
   "base_properties": {
     "duration": 400,

src/main/resources/assets/ebwizardry/spells/blizzard.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "construct",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 100,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/chain_lightning.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "attack",
   "cost": 25,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 50,
   "base_properties": {
     "primary_damage": 10,

src/main/resources/assets/ebwizardry/spells/clairvoyance.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "utility",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 100,
   "base_properties": {
     "range": 256,

src/main/resources/assets/ebwizardry/spells/conjure_armour.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "defence",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 50,
   "base_properties": {
     "item_lifetime": 1800

src/main/resources/assets/ebwizardry/spells/containment.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "alteration",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 60,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/cure_effects.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 25,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 40,
   "base_properties": {}
 }

src/main/resources/assets/ebwizardry/spells/curse_of_enfeeblement.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "alteration",
   "cost": 60,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 150,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/curse_of_soulbinding.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "alteration",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 100,
   "base_properties": {
     "range": 10

src/main/resources/assets/ebwizardry/spells/curse_of_undeath.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "alteration",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 100,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/decay.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "attack",
   "cost": 50,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "range": 12,

src/main/resources/assets/ebwizardry/spells/decoy.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "utility",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "decoy_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/diamondflesh.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 25,
   "cooldown": 300,
   "base_properties": {
     "resistance_duration": 600,

src/main/resources/assets/ebwizardry/spells/earthquake.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "attack",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 25,
   "cooldown": 250,
   "base_properties": {
     "effect_radius": 8,

src/main/resources/assets/ebwizardry/spells/entrapment.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "attack",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 75,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/fire_breath.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "attack",
   "cost": 15,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 0,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/fire_resistance.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "defence",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 80,
   "base_properties": {
     "fire_resistance_duration": 600,

src/main/resources/assets/ebwizardry/spells/flaming_axe.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "utility",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 50,
   "base_properties": {
     "item_lifetime": 1200,

src/main/resources/assets/ebwizardry/spells/font_of_mana.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "utility",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 250,
   "base_properties": {
     "effect_radius": 5,

src/main/resources/assets/ebwizardry/spells/font_of_vitality.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 300,
   "base_properties": {
     "absorption_duration": 1200,

src/main/resources/assets/ebwizardry/spells/forcefield.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 200,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/forest_of_thorns.json

@@ -14,7 +14,7 @@
 	"element": "earth",
 	"type": "construct",
 	"cost": 100,
-	"chargeup": 0,
+	"chargeup": 20,
 	"cooldown": 250,
 	"base_properties": {
 		"effect_radius": 3,

src/main/resources/assets/ebwizardry/spells/forests_curse.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "attack",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 200,
   "base_properties": {
     "effect_radius": 5,

src/main/resources/assets/ebwizardry/spells/frost_axe.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "utility",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 50,
   "base_properties": {
     "item_lifetime": 1200,

src/main/resources/assets/ebwizardry/spells/greater_fireball.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "projectile",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 30,
   "base_properties": {
     "range": 20,

src/main/resources/assets/ebwizardry/spells/greater_heal.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 15,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 40,
   "base_properties": {
     "health": 8

src/main/resources/assets/ebwizardry/spells/greater_ward.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "buff",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 65,
   "base_properties": {
     "ward_duration": 600,

src/main/resources/assets/ebwizardry/spells/group_heal.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 150,
   "base_properties": {
     "effect_radius": 5,

src/main/resources/assets/ebwizardry/spells/hailstorm.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "attack",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 300,
   "base_properties": {
     "range": 20,

src/main/resources/assets/ebwizardry/spells/healing_aura.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "construct",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 150,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/ice_age.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "attack",
   "cost": 70,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 250,
   "base_properties": {
     "effect_radius": 7,

src/main/resources/assets/ebwizardry/spells/ice_lance.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "projectile",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 20,
   "base_properties": {
     "range": 15,

src/main/resources/assets/ebwizardry/spells/invisibility.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "buff",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 200,
   "base_properties": {
     "invisibility_duration": 600,

src/main/resources/assets/ebwizardry/spells/invoke_weather.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "utility",
   "cost": 30,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 100,
   "base_properties": {
     "thunderstorm_chance": 0.2

src/main/resources/assets/ebwizardry/spells/ironflesh.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "defence",
   "cost": 30,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 100,
   "base_properties": {
     "resistance_duration": 600,

src/main/resources/assets/ebwizardry/spells/lightning_bolt.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "attack",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 80,
   "base_properties": {
     "range": 80

src/main/resources/assets/ebwizardry/spells/lightning_disc.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "projectile",
   "cost": 25,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 60,
   "base_properties": {
     "range": 30,

src/main/resources/assets/ebwizardry/spells/lightning_hammer.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "attack",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 25,
   "cooldown": 300,
   "base_properties": {
     "range": 40,

src/main/resources/assets/ebwizardry/spells/lightning_web.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "attack",
   "cost": 15,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 0,
   "base_properties": {
     "primary_damage": 5,

src/main/resources/assets/ebwizardry/spells/meteor.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "attack",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 200,
   "base_properties": {
     "range": 40,

src/main/resources/assets/ebwizardry/spells/mind_control.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "attack",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 150,
   "base_properties": {
     "range": 8,

src/main/resources/assets/ebwizardry/spells/paralysis.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "alteration",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 60,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/petrify.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "attack",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 100,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/plague_of_darkness.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "attack",
   "cost": 75,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 200,
   "base_properties": {
     "effect_radius": 5,

src/main/resources/assets/ebwizardry/spells/possession.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "alteration",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 300,
   "base_properties": {
     "range": 8,

src/main/resources/assets/ebwizardry/spells/ray_of_purification.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "attack",
   "cost": 10,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 0,
   "base_properties": {
     "range": 10,

src/main/resources/assets/ebwizardry/spells/remove_curse.json

@@ -14,7 +14,7 @@
 	"element": "healing",
 	"type": "defence",
 	"cost": 50,
-	"chargeup": 0,
+	"chargeup": 20,
 	"cooldown": 80,
 	"base_properties": {}
 }

src/main/resources/assets/ebwizardry/spells/resurrection.json

@@ -14,7 +14,7 @@
 	"element": "healing",
 	"type": "alteration",
 	"cost": 150,
-	"chargeup": 0,
+	"chargeup": 25,
 	"cooldown": 400,
 	"base_properties": {
 		"effect_radius": 8,

src/main/resources/assets/ebwizardry/spells/ring_of_fire.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "construct",
   "cost": 30,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 100,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/satiety.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "buff",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 50,
   "base_properties": {
     "hunger_points": 16,

src/main/resources/assets/ebwizardry/spells/shockwave.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "attack",
   "cost": 65,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 150,
   "base_properties": {
     "blast_radius": 5,

src/main/resources/assets/ebwizardry/spells/silverfish_swarm.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "minion",
   "cost": 80,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 300,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/slow_time.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "alteration",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 200,
   "base_properties": {
     "slow_time_duration": 300,

src/main/resources/assets/ebwizardry/spells/spectral_pathway.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "utility",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 300,
   "base_properties": {
     "length": 25,

src/main/resources/assets/ebwizardry/spells/spider_swarm.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "minion",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/stormcloud.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "construct",
   "cost": 60,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 150,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/summon_blaze.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "minion",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_ice_giant.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "minion",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_ice_wraith.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "minion",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_iron_golem.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "minion",
   "cost": 175,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "summon_radius": 2

src/main/resources/assets/ebwizardry/spells/summon_lightning_wraith.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "minion",
   "cost": 40,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_phoenix.json

@@ -14,7 +14,7 @@
   "element": "fire",
   "type": "minion",
   "cost": 150,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_shadow_wraith.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "minion",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_skeleton_legion.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "minion",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "minion_lifetime": 1200,

src/main/resources/assets/ebwizardry/spells/summon_spirit_horse.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "minion",
   "cost": 50,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 150,
   "base_properties": {
     "summon_radius": 2

src/main/resources/assets/ebwizardry/spells/summon_storm_elemental.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "minion",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 400,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/summon_wither_skeleton.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "minion",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 150,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/thunderstorm.json

@@ -14,7 +14,7 @@
   "element": "lightning",
   "type": "attack",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 250,
   "base_properties": {
     "effect_radius": 10,

src/main/resources/assets/ebwizardry/spells/tornado.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "attack",
   "cost": 35,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 80,
   "base_properties": {
     "duration": 200,

src/main/resources/assets/ebwizardry/spells/transience.json

@@ -14,7 +14,7 @@
   "element": "healing",
   "type": "buff",
   "cost": 50,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 100,
   "base_properties": {
     "effect_duration": 400

src/main/resources/assets/ebwizardry/spells/transportation.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "utility",
   "cost": 100,
-  "chargeup": 0,
+  "chargeup": 20,
   "cooldown": 100,
   "base_properties": {
     "teleport_countdown": 75

src/main/resources/assets/ebwizardry/spells/vanishing_box.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "utility",
   "cost": 45,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 70,
   "base_properties": {}
 }

src/main/resources/assets/ebwizardry/spells/vex_swarm.json

@@ -14,7 +14,7 @@
   "element": "sorcery",
   "type": "minion",
   "cost": 50,
-  "chargeup": 0,
+  "chargeup": 10,
   "cooldown": 200,
   "base_properties": {
     "minion_lifetime": 600,

src/main/resources/assets/ebwizardry/spells/wall_of_frost.json

@@ -14,7 +14,7 @@
   "element": "ice",
   "type": "utility",
   "cost": 15,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 0,
   "base_properties": {
     "duration": 600,

src/main/resources/assets/ebwizardry/spells/water_breathing.json

@@ -14,7 +14,7 @@
   "element": "earth",
   "type": "buff",
   "cost": 30,
-  "chargeup": 0,
+  "chargeup": 15,
   "cooldown": 250,
   "base_properties": {
     "water_breathing_duration": 1200,

src/main/resources/assets/ebwizardry/spells/wither_skull.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "attack",
   "cost": 20,
-  "chargeup": 0,
+  "chargeup": 5,
   "cooldown": 30,
   "base_properties": {
     "acceleration": 0.1

src/main/resources/assets/ebwizardry/spells/zombie_apocalypse.json

@@ -14,7 +14,7 @@
   "element": "necromancy",
   "type": "construct",
   "cost": 150,
-  "chargeup": 0,
+  "chargeup": 25,
   "cooldown": 300,
   "base_properties": {
     "duration": 500,