[[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

@@ -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

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

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

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

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

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

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

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

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]

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]

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

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

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

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

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

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

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

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

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

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]
+[/unit]

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

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

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

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

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

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

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

src/unit_types.cpp

@@ -36,7 +36,7 @@ attack_type::attack_type(const config& cfg)
 	backstab_ = special_ == "backstab";
 	icon_ = cfg["icon"];
 	if(icon_.empty())
-		icon_ = "misc/" + name_ + ".png";
+		icon_ = "attacks/" + name_ + ".png";
 
 	range_ = cfg["range"] == "long" ? LONG_RANGE : SHORT_RANGE;
 	hexes_ = maximum<int>(1,atoi(cfg["hexes"].c_str()));