From 04b0ac1546f98fd33369ebebeb701270df6e26d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Duval?= Date: Sun, 30 May 2004 00:36:35 +0000 Subject: [PATCH] [[Icon reorganization]] * Moved weapon icons to their own hierarchy: images/attacks/ * Changed code and unit files accordingly * Fixed some erroneous/missing entries --- data/units/Ancient_Lich.cfg | 2 +- data/units/Bone_Shooter.cfg | 2 +- data/units/Cuttle_Fish.cfg | 2 +- data/units/Dark_Adept.cfg | 2 +- data/units/Death_Knight.cfg | 2 +- data/units/Deathmaster.cfg | 1 + data/units/Demilich.cfg | 1 + data/units/Dwarvish_Berserker.cfg | 2 +- data/units/Dwarvish_Lord.cfg | 2 +- data/units/Dwarvish_Runemaster.cfg | 3 +++ data/units/Dwarvish_Steelclad.cfg | 2 +- data/units/Elder_Mage.cfg | 2 +- data/units/Elvish_Druid.cfg | 4 ++-- data/units/Elvish_Shaman.cfg | 2 +- data/units/Elvish_Shyde.cfg | 4 ++-- data/units/Goblin_Pillager.cfg | 1 + data/units/Grand_Knight.cfg | 2 +- data/units/Halbardier.cfg | 4 ++-- data/units/Initiate.cfg | 1 + data/units/Lich.cfg | 4 ++-- data/units/Necromancer.cfg | 2 +- data/units/Orcish_Crossbow.cfg | 1 + data/units/Orcish_Crossbowman.cfg | 1 + data/units/Paladin.cfg | 2 +- data/units/Sea_Hag.cfg | 2 +- data/units/Vampire_Lady.cfg | 2 +- data/units/Youth.cfg | 2 +- images/{misc => attacks}/axe.png | Bin images/{misc => attacks}/baneblade.png | Bin images/{misc => attacks}/battleaxe.png | Bin images/{misc => attacks}/bow.png | Bin images/{misc => attacks}/claws.png | Bin images/{misc => attacks}/club.png | Bin images/{misc => attacks}/curse.png | Bin images/{misc => attacks}/dagger.png | Bin images/{misc => attacks}/dark-missile.png | Bin images/{misc => attacks}/darkstaff.png | Bin images/{misc => attacks}/darts.png | Bin images/{misc => attacks}/druidstaff.png | Bin images/{misc => attacks}/entangle.png | Bin images/{ => attacks}/faerie_touch.png | Bin images/{misc => attacks}/fangs.png | Bin images/{misc => attacks}/fireball.png | Bin images/{misc => attacks}/fist.png | Bin images/{misc => attacks}/frenzy.png | Bin images/{misc => attacks}/gaze.png | Bin images/{misc => attacks}/halberd.png | Bin images/{misc => attacks}/hammer.png | Bin images/{misc => attacks}/hatchet.png | Bin images/{misc => attacks}/knife.png | Bin images/{misc => attacks}/lance.png | Bin images/{misc => attacks}/lightingbolt.png | Bin images/{misc => attacks}/longbow.png | Bin images/{misc => attacks}/mace.png | Bin images/{misc => attacks}/missile.png | Bin images/{misc => attacks}/paladinsword.png | Bin images/{misc => attacks}/pike.png | Bin images/{misc => attacks}/rapier.png | Bin images/{misc => attacks}/short-sword.png | Bin images/{misc => attacks}/sling.png | Bin images/{misc => attacks}/spear.png | Bin images/{misc => attacks}/staff.png | Bin images/{misc => attacks}/sword.png | Bin images/{misc => attacks}/tentacle.png | Bin images/{misc => attacks}/thorns.png | Bin images/{misc => attacks}/torch.png | Bin images/{misc => attacks}/trident.png | Bin images/{misc => attacks}/waterspray.png | Bin images/attacks/web.png | Bin 0 -> 1050 bytes images/attacks/woodensword.png | Bin 0 -> 356 bytes src/unit_types.cpp | 2 +- 71 files changed, 34 insertions(+), 25 deletions(-) rename images/{misc => attacks}/axe.png (100%) rename images/{misc => attacks}/baneblade.png (100%) rename images/{misc => attacks}/battleaxe.png (100%) rename images/{misc => attacks}/bow.png (100%) rename images/{misc => attacks}/claws.png (100%) rename images/{misc => attacks}/club.png (100%) rename images/{misc => attacks}/curse.png (100%) rename images/{misc => attacks}/dagger.png (100%) rename images/{misc => attacks}/dark-missile.png (100%) rename images/{misc => attacks}/darkstaff.png (100%) rename images/{misc => attacks}/darts.png (100%) rename images/{misc => attacks}/druidstaff.png (100%) rename images/{misc => attacks}/entangle.png (100%) rename images/{ => attacks}/faerie_touch.png (100%) rename images/{misc => attacks}/fangs.png (100%) rename images/{misc => attacks}/fireball.png (100%) rename images/{misc => attacks}/fist.png (100%) rename images/{misc => attacks}/frenzy.png (100%) rename images/{misc => attacks}/gaze.png (100%) rename images/{misc => attacks}/halberd.png (100%) rename images/{misc => attacks}/hammer.png (100%) rename images/{misc => attacks}/hatchet.png (100%) rename images/{misc => attacks}/knife.png (100%) rename images/{misc => attacks}/lance.png (100%) rename images/{misc => attacks}/lightingbolt.png (100%) rename images/{misc => attacks}/longbow.png (100%) rename images/{misc => attacks}/mace.png (100%) rename images/{misc => attacks}/missile.png (100%) rename images/{misc => attacks}/paladinsword.png (100%) rename images/{misc => attacks}/pike.png (100%) rename images/{misc => attacks}/rapier.png (100%) rename images/{misc => attacks}/short-sword.png (100%) rename images/{misc => attacks}/sling.png (100%) rename images/{misc => attacks}/spear.png (100%) rename images/{misc => attacks}/staff.png (100%) rename images/{misc => attacks}/sword.png (100%) rename images/{misc => attacks}/tentacle.png (100%) rename images/{misc => attacks}/thorns.png (100%) rename images/{misc => attacks}/torch.png (100%) rename images/{misc => attacks}/trident.png (100%) rename images/{misc => attacks}/waterspray.png (100%) create mode 100644 images/attacks/web.png create mode 100644 images/attacks/woodensword.png diff --git a/data/units/Ancient_Lich.cfg b/data/units/Ancient_Lich.cfg index 4952a44bc7e..155dad5a469 100644 --- a/data/units/Ancient_Lich.cfg +++ b/data/units/Ancient_Lich.cfg @@ -34,7 +34,7 @@ get_hit_sound=groan.wav range=long damage=15 number=5 - icon=misc/dark-missile.png + icon=attacks/dark-missile.png [frame] begin=-250 end=0 diff --git a/data/units/Bone_Shooter.cfg b/data/units/Bone_Shooter.cfg index 0abebfc2d68..131bedbbf22 100644 --- a/data/units/Bone_Shooter.cfg +++ b/data/units/Bone_Shooter.cfg @@ -20,7 +20,7 @@ get_hit_sound=skeleton-hit.wav impact=120 [/resistance] [attack] - name=fists + name=fist type=impact range=short damage=5 diff --git a/data/units/Cuttle_Fish.cfg b/data/units/Cuttle_Fish.cfg index fea0fb4687d..637d0e24305 100644 --- a/data/units/Cuttle_Fish.cfg +++ b/data/units/Cuttle_Fish.cfg @@ -14,7 +14,7 @@ usage=fighter unit_description="Cuttle Fish are giantic creatures of the seas. They can grab their opponents with strong tentacles, or spit a poisonous black ink from a distance. The best way to survive an encounter with these monsters is to remain ashore." get_hit_sound=groan.wav [attack] - name=tentacles + name=tentacle type=impact range=short damage=3 diff --git a/data/units/Dark_Adept.cfg b/data/units/Dark_Adept.cfg index 0b91d66b7c2..231f3e43d35 100644 --- a/data/units/Dark_Adept.cfg +++ b/data/units/Dark_Adept.cfg @@ -24,7 +24,7 @@ get_hit_sound=groan.wav range=long damage=8 number=2 - icon=misc/dark-missile.png + icon=attacks/dark-missile.png [frame] begin=-300 end=-200 diff --git a/data/units/Death_Knight.cfg b/data/units/Death_Knight.cfg index 5d91a1cf933..9081eb91971 100644 --- a/data/units/Death_Knight.cfg +++ b/data/units/Death_Knight.cfg @@ -20,7 +20,7 @@ get_hit_sound=skeleton-hit.wav range=short damage=15 number=4 - icon=misc/battleaxe.png + icon=attacks/battleaxe.png [sound] time=-250 sound=sword-swish.wav diff --git a/data/units/Deathmaster.cfg b/data/units/Deathmaster.cfg index e04a61890f3..d7bb0cd1789 100644 --- a/data/units/Deathmaster.cfg +++ b/data/units/Deathmaster.cfg @@ -37,6 +37,7 @@ get_hit_sound=groan.wav range=long damage=13 number=3 + icon=attacks/dark-missile.png [frame] begin=-300 end=-200 diff --git a/data/units/Demilich.cfg b/data/units/Demilich.cfg index a1e8bea2479..b2b0051dc7b 100644 --- a/data/units/Demilich.cfg +++ b/data/units/Demilich.cfg @@ -28,6 +28,7 @@ get_hit_sound=groan.wav range=long damage=14 number=4 + icon=attacks/dark-missile.png [missile_frame] begin=-200 end=0 diff --git a/data/units/Dwarvish_Berserker.cfg b/data/units/Dwarvish_Berserker.cfg index 28ab4d3dd2a..318ba9142ad 100644 --- a/data/units/Dwarvish_Berserker.cfg +++ b/data/units/Dwarvish_Berserker.cfg @@ -30,7 +30,7 @@ get_hit_sound=groan.wav [/defense] [attack] name=berserker frenzy - icon=misc/frenzy.png + icon=attacks/frenzy.png type=blade special=berserk range=short diff --git a/data/units/Dwarvish_Lord.cfg b/data/units/Dwarvish_Lord.cfg index 10f1b5e9ee1..1d5bfa23041 100644 --- a/data/units/Dwarvish_Lord.cfg +++ b/data/units/Dwarvish_Lord.cfg @@ -25,7 +25,7 @@ get_hit_sound=groan.wav name=battle axe type=blade range=short - icon=misc/battleaxe.png + icon=attacks/battleaxe.png damage=17 number=3 [frame] diff --git a/data/units/Dwarvish_Runemaster.cfg b/data/units/Dwarvish_Runemaster.cfg index ee8301b8c19..695410b865c 100644 --- a/data/units/Dwarvish_Runemaster.cfg +++ b/data/units/Dwarvish_Runemaster.cfg @@ -21,6 +21,8 @@ get_hit_sound=groan.wav range=short damage=15 number=3 + # XXX we're currently lacing a runic hammer icon + icon=attacks/hammer.png [frame] begin=-100 @@ -36,6 +38,7 @@ get_hit_sound=groan.wav range=long damage=15 number=2 + icon=attacks/lightingbolt.png special=magical [sound] diff --git a/data/units/Dwarvish_Steelclad.cfg b/data/units/Dwarvish_Steelclad.cfg index 7801ae6420c..e74aec0cce3 100644 --- a/data/units/Dwarvish_Steelclad.cfg +++ b/data/units/Dwarvish_Steelclad.cfg @@ -23,7 +23,7 @@ unit_description="The more experienced Dwarvish Steelclad fighters wear heavy ch get_hit_sound=groan.wav [attack] name=battle axe - icon=misc/battleaxe.png + icon=attacks/battleaxe.png type=blade range=short damage=11 diff --git a/data/units/Elder_Mage.cfg b/data/units/Elder_Mage.cfg index 2dc7eb49d5e..e77cc5ee9c6 100644 --- a/data/units/Elder_Mage.cfg +++ b/data/units/Elder_Mage.cfg @@ -35,7 +35,7 @@ unit_description="Once great, Elder Mages have seen their power a little diminis special=magical damage=14 number=4 - icon=misc/lightingbolt.png + icon=attacks/lightingbolt.png [frame] begin=-300 end=0 diff --git a/data/units/Elvish_Druid.cfg b/data/units/Elvish_Druid.cfg index bc33e661cc4..82f705a3b27 100644 --- a/data/units/Elvish_Druid.cfg +++ b/data/units/Elvish_Druid.cfg @@ -24,7 +24,7 @@ get_hit_sound=female-hit.wav damage=4 number=2 range=short - icon=misc/druidstaff.png + icon=attacks/druidstaff.png [frame] begin=-100 end=100 @@ -43,7 +43,7 @@ get_hit_sound=female-hit.wav damage=6 number=2 range=long - icon=misc/entangle.png + icon=attacks/entangle.png [frame] begin=-250 end=0 diff --git a/data/units/Elvish_Shaman.cfg b/data/units/Elvish_Shaman.cfg index d0967a5c1af..8af2dba0034 100644 --- a/data/units/Elvish_Shaman.cfg +++ b/data/units/Elvish_Shaman.cfg @@ -25,7 +25,7 @@ get_hit_sound=female-hit.wav damage=3 number=2 range=short - icon=misc/druidstaff.png + icon=attacks/druidstaff.png [frame] begin=-100 end=100 diff --git a/data/units/Elvish_Shyde.cfg b/data/units/Elvish_Shyde.cfg index 24df80d52b7..c52cc93c194 100644 --- a/data/units/Elvish_Shyde.cfg +++ b/data/units/Elvish_Shyde.cfg @@ -25,7 +25,7 @@ get_hit_sound=female-hit.wav damage=4 number=2 range=short - icon=misc/faerie_touch.png + icon=attacks/faerie_touch.png [frame] begin=-200 end=-100 @@ -45,7 +45,7 @@ get_hit_sound=female-hit.wav damage=7 number=2 range=long - icon=misc/entangle.png + icon=attacks/entangle.png [missile_frame] begin=-150 end=0 diff --git a/data/units/Goblin_Pillager.cfg b/data/units/Goblin_Pillager.cfg index 6ba1c7c4b9b..47733a8198b 100644 --- a/data/units/Goblin_Pillager.cfg +++ b/data/units/Goblin_Pillager.cfg @@ -37,6 +37,7 @@ get_hit_sound=wolf-cry.wav damage=6 number=2 range=long + icon=attacks/web.png [frame] begin=-200 end=100 diff --git a/data/units/Grand_Knight.cfg b/data/units/Grand_Knight.cfg index 5db43649347..c1fc8bc45a9 100644 --- a/data/units/Grand_Knight.cfg +++ b/data/units/Grand_Knight.cfg @@ -15,7 +15,7 @@ unit_description="The most powerful mounted warriors of any race, Grand Knights get_hit_sound=groan.wav [attack] name=sword - icon=misc/sword.png + icon=attacks/sword.png type=blade range=short damage=12 diff --git a/data/units/Halbardier.cfg b/data/units/Halbardier.cfg index bf162847dcb..e7755a3561c 100644 --- a/data/units/Halbardier.cfg +++ b/data/units/Halbardier.cfg @@ -14,14 +14,14 @@ usage=fighter unit_description="The best of the soldiers are choosen to become Halberdiers. Their weapon, though a little slower than the sword, can strike with deadly force." get_hit_sound=groan.wav [attack] - name=halbard + name=halberd type=pierce range=short damage=14 number=4 [/attack] [attack] - name=halbard + name=halberd type=blade range=short damage=11 diff --git a/data/units/Initiate.cfg b/data/units/Initiate.cfg index 2709e939410..2c5b0878dd9 100644 --- a/data/units/Initiate.cfg +++ b/data/units/Initiate.cfg @@ -21,6 +21,7 @@ get_hit_sound=groan.wav range=long damage=6 number=3 + icon=attacks/dark-missile.png [frame] begin=-350 end=-250 diff --git a/data/units/Lich.cfg b/data/units/Lich.cfg index 9009a43fc22..cb5ff26059a 100644 --- a/data/units/Lich.cfg +++ b/data/units/Lich.cfg @@ -34,7 +34,7 @@ get_hit_sound=skeleton-hit.wav range=long damage=12 number=3 - icon=misc/dark-missile.png + icon=attacks/dark-missile.png [frame] begin=-300 end=-200 @@ -56,4 +56,4 @@ get_hit_sound=skeleton-hit.wav sound=magic.wav [/sound] [/attack] -[/unit] \ No newline at end of file +[/unit] diff --git a/data/units/Necromancer.cfg b/data/units/Necromancer.cfg index 1534896ad01..b62b9e264a2 100644 --- a/data/units/Necromancer.cfg +++ b/data/units/Necromancer.cfg @@ -37,7 +37,7 @@ get_hit_sound=groan.wav range=long damage=12 number=2 - icon=misc/dark-missile.png + icon=attacks/dark-missile.png [frame] begin=-300 end=-200 diff --git a/data/units/Orcish_Crossbow.cfg b/data/units/Orcish_Crossbow.cfg index bcf0fa78938..d2e644a164a 100644 --- a/data/units/Orcish_Crossbow.cfg +++ b/data/units/Orcish_Crossbow.cfg @@ -20,6 +20,7 @@ get_hit_sound=orc-hit.wav range=short damage=4 number=3 + icon=attacks/short-sword.png [frame] begin=-100 end=100 diff --git a/data/units/Orcish_Crossbowman.cfg b/data/units/Orcish_Crossbowman.cfg index 61750464357..591b751ee49 100644 --- a/data/units/Orcish_Crossbowman.cfg +++ b/data/units/Orcish_Crossbowman.cfg @@ -19,6 +19,7 @@ get_hit_sound=orc-hit.wav range=short damage=4 number=3 + icon=attacks/short-sword.png [frame] begin=-100 end=100 diff --git a/data/units/Paladin.cfg b/data/units/Paladin.cfg index 0b612a29692..afdd62cf1f5 100644 --- a/data/units/Paladin.cfg +++ b/data/units/Paladin.cfg @@ -20,7 +20,7 @@ unit_description="Knights of the highest virtue, Paladins have all the skills of get_hit_sound=groan.wav [attack] name=sword - icon=misc/paladinsword.png + icon=attacks/paladinsword.png type=holy range=short damage=8 diff --git a/data/units/Sea_Hag.cfg b/data/units/Sea_Hag.cfg index f714f64c0e7..b3e6f641051 100644 --- a/data/units/Sea_Hag.cfg +++ b/data/units/Sea_Hag.cfg @@ -23,7 +23,7 @@ get_hit_sound=mermen-hit.wav [/attack] [attack] name=water spray - icon=misc/waterspray.png + icon=attacks/waterspray.png type=impact range=long special=magical diff --git a/data/units/Vampire_Lady.cfg b/data/units/Vampire_Lady.cfg index 9e8e14b338d..ababf8d7b7c 100644 --- a/data/units/Vampire_Lady.cfg +++ b/data/units/Vampire_Lady.cfg @@ -20,7 +20,7 @@ get_hit_sound=female-groan.wav range=short damage=10 number=3 - icon=misc/fangs.png + icon=attacks/fangs.png special=drain [frame] begin=-100 diff --git a/data/units/Youth.cfg b/data/units/Youth.cfg index 219f0bdeaf5..4db5dd81623 100644 --- a/data/units/Youth.cfg +++ b/data/units/Youth.cfg @@ -17,7 +17,7 @@ unit_description="Today almost a boy, by his devotion to the crown he is seeking get_hit_sound=groan.wav [attack] name=training sword - icon=misc/woodensword.png + icon=attacks/woodensword.png type=impact range=short damage=3 diff --git a/images/misc/axe.png b/images/attacks/axe.png similarity index 100% rename from images/misc/axe.png rename to images/attacks/axe.png diff --git a/images/misc/baneblade.png b/images/attacks/baneblade.png similarity index 100% rename from images/misc/baneblade.png rename to images/attacks/baneblade.png diff --git a/images/misc/battleaxe.png b/images/attacks/battleaxe.png similarity index 100% rename from images/misc/battleaxe.png rename to images/attacks/battleaxe.png diff --git a/images/misc/bow.png b/images/attacks/bow.png similarity index 100% rename from images/misc/bow.png rename to images/attacks/bow.png diff --git a/images/misc/claws.png b/images/attacks/claws.png similarity index 100% rename from images/misc/claws.png rename to images/attacks/claws.png diff --git a/images/misc/club.png b/images/attacks/club.png similarity index 100% rename from images/misc/club.png rename to images/attacks/club.png diff --git a/images/misc/curse.png b/images/attacks/curse.png similarity index 100% rename from images/misc/curse.png rename to images/attacks/curse.png diff --git a/images/misc/dagger.png b/images/attacks/dagger.png similarity index 100% rename from images/misc/dagger.png rename to images/attacks/dagger.png diff --git a/images/misc/dark-missile.png b/images/attacks/dark-missile.png similarity index 100% rename from images/misc/dark-missile.png rename to images/attacks/dark-missile.png diff --git a/images/misc/darkstaff.png b/images/attacks/darkstaff.png similarity index 100% rename from images/misc/darkstaff.png rename to images/attacks/darkstaff.png diff --git a/images/misc/darts.png b/images/attacks/darts.png similarity index 100% rename from images/misc/darts.png rename to images/attacks/darts.png diff --git a/images/misc/druidstaff.png b/images/attacks/druidstaff.png similarity index 100% rename from images/misc/druidstaff.png rename to images/attacks/druidstaff.png diff --git a/images/misc/entangle.png b/images/attacks/entangle.png similarity index 100% rename from images/misc/entangle.png rename to images/attacks/entangle.png diff --git a/images/faerie_touch.png b/images/attacks/faerie_touch.png similarity index 100% rename from images/faerie_touch.png rename to images/attacks/faerie_touch.png diff --git a/images/misc/fangs.png b/images/attacks/fangs.png similarity index 100% rename from images/misc/fangs.png rename to images/attacks/fangs.png diff --git a/images/misc/fireball.png b/images/attacks/fireball.png similarity index 100% rename from images/misc/fireball.png rename to images/attacks/fireball.png diff --git a/images/misc/fist.png b/images/attacks/fist.png similarity index 100% rename from images/misc/fist.png rename to images/attacks/fist.png diff --git a/images/misc/frenzy.png b/images/attacks/frenzy.png similarity index 100% rename from images/misc/frenzy.png rename to images/attacks/frenzy.png diff --git a/images/misc/gaze.png b/images/attacks/gaze.png similarity index 100% rename from images/misc/gaze.png rename to images/attacks/gaze.png diff --git a/images/misc/halberd.png b/images/attacks/halberd.png similarity index 100% rename from images/misc/halberd.png rename to images/attacks/halberd.png diff --git a/images/misc/hammer.png b/images/attacks/hammer.png similarity index 100% rename from images/misc/hammer.png rename to images/attacks/hammer.png diff --git a/images/misc/hatchet.png b/images/attacks/hatchet.png similarity index 100% rename from images/misc/hatchet.png rename to images/attacks/hatchet.png diff --git a/images/misc/knife.png b/images/attacks/knife.png similarity index 100% rename from images/misc/knife.png rename to images/attacks/knife.png diff --git a/images/misc/lance.png b/images/attacks/lance.png similarity index 100% rename from images/misc/lance.png rename to images/attacks/lance.png diff --git a/images/misc/lightingbolt.png b/images/attacks/lightingbolt.png similarity index 100% rename from images/misc/lightingbolt.png rename to images/attacks/lightingbolt.png diff --git a/images/misc/longbow.png b/images/attacks/longbow.png similarity index 100% rename from images/misc/longbow.png rename to images/attacks/longbow.png diff --git a/images/misc/mace.png b/images/attacks/mace.png similarity index 100% rename from images/misc/mace.png rename to images/attacks/mace.png diff --git a/images/misc/missile.png b/images/attacks/missile.png similarity index 100% rename from images/misc/missile.png rename to images/attacks/missile.png diff --git a/images/misc/paladinsword.png b/images/attacks/paladinsword.png similarity index 100% rename from images/misc/paladinsword.png rename to images/attacks/paladinsword.png diff --git a/images/misc/pike.png b/images/attacks/pike.png similarity index 100% rename from images/misc/pike.png rename to images/attacks/pike.png diff --git a/images/misc/rapier.png b/images/attacks/rapier.png similarity index 100% rename from images/misc/rapier.png rename to images/attacks/rapier.png diff --git a/images/misc/short-sword.png b/images/attacks/short-sword.png similarity index 100% rename from images/misc/short-sword.png rename to images/attacks/short-sword.png diff --git a/images/misc/sling.png b/images/attacks/sling.png similarity index 100% rename from images/misc/sling.png rename to images/attacks/sling.png diff --git a/images/misc/spear.png b/images/attacks/spear.png similarity index 100% rename from images/misc/spear.png rename to images/attacks/spear.png diff --git a/images/misc/staff.png b/images/attacks/staff.png similarity index 100% rename from images/misc/staff.png rename to images/attacks/staff.png diff --git a/images/misc/sword.png b/images/attacks/sword.png similarity index 100% rename from images/misc/sword.png rename to images/attacks/sword.png diff --git a/images/misc/tentacle.png b/images/attacks/tentacle.png similarity index 100% rename from images/misc/tentacle.png rename to images/attacks/tentacle.png diff --git a/images/misc/thorns.png b/images/attacks/thorns.png similarity index 100% rename from images/misc/thorns.png rename to images/attacks/thorns.png diff --git a/images/misc/torch.png b/images/attacks/torch.png similarity index 100% rename from images/misc/torch.png rename to images/attacks/torch.png diff --git a/images/misc/trident.png b/images/attacks/trident.png similarity index 100% rename from images/misc/trident.png rename to images/attacks/trident.png diff --git a/images/misc/waterspray.png b/images/attacks/waterspray.png similarity index 100% rename from images/misc/waterspray.png rename to images/attacks/waterspray.png diff --git a/images/attacks/web.png b/images/attacks/web.png new file mode 100644 index 0000000000000000000000000000000000000000..78c7368b03bf1dd1d0321ddb9b8775e0cb5578ee GIT binary patch literal 1050 zcmV+#1m*jQP)_Q9ek6so2_YVlPRa>&P zvNW&mdHBtnYhCMF*SgmKxb}U|;~G!9qRbFF4nevqeF(LwFwf6U-a8EO;yw5F#1OvGLt{G&iZVmMv6~2A@L2IX=AC)7 zvigxDl)4Dk&9lQx!)rq!-haOC;^lE3G$M?!6khMfNBB|*k+hr$vWazn8)E;p3QFlW z5~15y75P5F!?1RPb>jqQ8Y;s8%|t=YNa9vSekijD(9;Orm0^Yl48|HgGzsZE!|SW4 z_i2AJF`I@$H#sk{Y5^ZbMiYhF5pK$iIWx+?D)IhlKj7XM(j^EXNCp$CrSNKmfT2<% z;AW3J5EDlDU6qp$cM-M&L!F*Qs1b{`ijPoGBdd1}7kDL4LaYJM^lZm9=%t&pyM}<= z-<2-a8wjZ~)LVu?ly-!Tsvqv;E{mhkGJNKFz(I?ZsH`|5}QINOByIS&L39G zlztL=4%lIGN*UY)a!oS>4lVoRR*!7x!&%`bLM@Q-o#2XrFz1OW&5Oot#T#XM3e6p) z-2Bs^EZODvhHxndei$mvEUS?y?v>#K0v85o%;wE7Sf7;j z!LiYd=2w(x3@vj%kSx=%Qo1Awh9m>Vzf3G&gOM=Pj&6o;A*GAU%xs*3y*xV3lzX+( z>V7qXH=P5sG^YjCl1j5?s24KdN_eQRcw>VHwv%2vOo*v>5%Je5X)ZlcbR!aEB28TdD@lZ_?V#nx}(-&1nf8K9Zr2MVzz zdAqwX{0G4WdzViJif|TqL>4nJa2)|*#BIL)>wMe6DQOV37bM#nU z`)^DOk9@ZB&iaJ`%BObKC|0B$mQj-1?!ap4oU+H5N$GDEhl>=eV5@)=hhhte_{Skt z9A7lCO!b0_RNVc~e2eb*Wr%QO%lIyqNLPw}yiKbuQTk1a#I>n6{54G8FkY2sn<@0r z-*DRdx6UlHj^&#w*Ko|1w23aQ&YrIjbyfb*vj(1,atoi(cfg["hexes"].c_str()));