Tidied-up image locations

Tweaked death and hit sounds for some undead

data/campaigns/Liberty/units/Bone_Knight.cfg

@@ -4,15 +4,15 @@
     id=Bone Knight
     name= _ "Bone Knight"
     race=undead
-    image=undead-boneknight.png
+    image="units/undead-skeletal/boneknight.png"
     hitpoints=48
     movement_type=mounted
-    {DEFENSE_ANIM "undead-boneknight-defend.png" "undead-boneknight.png" skeleton-hit-1.ogg }
+    {DEFENSE_ANIM "units/undead-skeletal/boneknight-defend.png" "units/undead-skeletal/boneknight.png" {SOUND_LIST:SKELETON_BIG_HIT} }
     [movement_anim]
         [frame]
             begin=0
             end=150
-            image="undead-boneknight-move.png"
+            image="units/undead-skeletal/boneknight-moving.png"
         [/frame]
     [/movement_anim]
     [resistance]
@@ -31,7 +31,7 @@
     cost=35
     usage=scout
     description= _ "Once great warriors across the plains, these mounted riders atop their skeletal horses were raised from the ground by unholy magic to spread fear and destruction."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE}
-    die_sound={SOUND_LIST:SKELETON_DIE}
+    die_sound=skeleton-big-die.ogg
     [attack]
         name=axe
         description=_"axe"
@@ -47,14 +47,14 @@
         [frame]
             begin=-150
             end=-75
-            image=undead-boneknight-attack1.png
+            image="units/undead-skeletal/boneknight-attack-1.png"
         [/frame]
         [if]
             hits=no
             [frame]
                 begin=-75
                 end=75
-                image=undead-boneknight-attack2.png
+                image="units/undead-skeletal/boneknight-attack-2.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/if]
@@ -63,19 +63,19 @@
             [frame]
                 begin=-75
                 end=75
-                image=undead-boneknight-attack2.png
+                image="units/undead-skeletal/boneknight-attack-2.png"
                 sound=axe.ogg
             [/frame]
         [/else]
         [frame]
             begin=75
             end=100
-            image=undead-boneknight-attack2.png
+            image="units/undead-skeletal/boneknight-attack-2.png"
         [/frame]
     [/attack_anim]
     [attack]
         name=trample
-        icon=attacks/blank-attack.png
+        icon="attacks/blank-attack.png"
         description=_"trample"
         type=impact
         range=melee
@@ -92,13 +92,13 @@
         [frame]
             begin=-100
             end=0
-            image=undead-boneknight-defend.png
+            image="units/undead-skeletal/boneknight-defend.png"
             sound=horse-canter.wav
         [/frame]
         [frame]
             begin=0
             end=100
-            image=undead-boneknight-move.png
+            image="units/undead-skeletal/boneknight-moving.png"
         [/frame]
     [/attack_anim]
 [/unit_type]
@@ -111,7 +111,7 @@
         id=Bone Knight
     [/base_unit]
     id=Bone Knight2
-    do_not_list=yes 
+    do_not_list=yes
 [/unit_type]
 
 [unit_type]
@@ -119,5 +119,5 @@
         id=Bone Knight
     [/base_unit]
     id=Bone Knight3
-    do_not_list=yes 
+    do_not_list=yes
 [/unit_type]

data/campaigns/Liberty/units/Dark_Sorcerer2.cfg

@@ -10,5 +10,5 @@
         id=Dark Sorcerer
     [/base_unit]
     id=Dark Sorcerer2
-    do_not_list=yes 
+    do_not_list=yes
 [/unit_type]

data/campaigns/Liberty/units/Death_Squire.cfg

@@ -3,12 +3,12 @@
     id=Death Squire
     name= _ "Death Squire"
     race=undead
-    image=undead-deathsquire.png
+    image="units/undead-skeletal/deathsquire.png"
     [leading_anim]
         [frame]
             begin=-150
             end=150
-            image="undead-deathsquire-leading.png"
+            image="units/undead-skeletal/deathsquire-leading.png"
         [/frame]
     [/leading_anim]
     hitpoints=66
@@ -24,7 +24,7 @@
     [/abilities]
     usage=fighter
     description= _ "Sometimes the mightiest warriors and generals, cursed with hate and angst, came back to this world as Death Knights. Death Squires serve them whilst accruing enough unholy power to become Death Knights. In the process they pick up a good deal of the Knight's power, including the ability to command underlings."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
-    {DEFENSE_ANIM "undead-deathsquire-defend.png" "undead-deathsquire.png" {SOUND_LIST:SKELETON_HIT} }
+    {DEFENSE_ANIM "units/undead-skeletal/deathsquire-defend.png" "units/undead-skeletal/deathsquire.png" {SOUND_LIST:SKELETON_HIT} }
     die_sound={SOUND_LIST:SKELETON_DIE}
     [attack]
         name=sword
@@ -33,7 +33,7 @@
         range=melee
         damage=8
         number=4
-        icon=attacks/sword-human.png
+        icon="attacks/sword-human.png"
     [/attack]
     [attack_anim]
         [filter_attack]
@@ -44,8 +44,8 @@
             [frame]
                 begin=-250
                 end=-100
-                image=undead-deathsquire.png
-                sound=sword-1.ogg	# Used to be time=-250
+                image="units/undead-skeletal/deathsquire.png"
+                sound=sword-1.ogg
             [/frame]
         [/if]
         [else]
@@ -53,14 +53,14 @@
             [frame]
                 begin=-250
                 end=-100
-                image=undead-deathsquire.png
+                image="units/undead-skeletal/deathsquire.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
         [frame]
             begin=-100
             end=100
-            image=undead-deathsquire-attack.png
+            image="units/undead-skeletal/deathsquire-attack.png"
         [/frame]
     [/attack_anim]
 [/unit_type]

data/campaigns/Liberty/units/Rogue_Mage.cfg

@@ -5,7 +5,7 @@
     name= _ "Rogue Mage"
     race=human
     gender=male
-    image="rogue-mage.png"
+    image="units/human-outlaws/rogue-mage.png"
     hitpoints=30
     movement_type=smallfoot
     movement=6
@@ -16,7 +16,7 @@
     cost=17
     usage=mixed fighter
     description= _ "Some mages are thrown out of the mage's guild for attempting to practice forbidden arts. Now completely outside the law, these rogue mages do whatever necessary to support their study of black magic. Although not as skilled as mages with more formal training, their magic can be quite lethal, while their banditry has resulted in moderate skill with the short sword."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
-    {DEFENSE_ANIM "rogue-mage-defend.png" "rogue-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
+    {DEFENSE_ANIM "units/human-outlaws/rogue-mage-defend.png" "units/human-outlaws/rogue-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     die_sound={SOUND_LIST:HUMAN_DIE}
     [attack]
         name=short sword
@@ -45,18 +45,18 @@
         [frame]
             begin=-200
             end=-100
-            image="rogue-mage-missile1.png"
+            image="units/human-outlaws/rogue-mage-missile1.png"
         [/frame]
         [frame]
             begin=-100
             end=0
-            image="rogue-mage-missile2.png"
+            image="units/human-outlaws/rogue-mage-missile2.png"
             sound=magicmissile.wav
         [/frame]
         [frame]
             begin=0
             end=100
-            image="rogue-mage-missile3.png"
+            image="units/human-outlaws/rogue-mage-missile3.png"
         [/frame]
         [missile_frame]
             begin=-200
@@ -73,22 +73,22 @@
         [frame]
             begin=-325
             end=-225
-            image="rogue-mage-attack1.png"
+            image="units/human-outlaws/rogue-mage-attack1.png"
         [/frame]
         [frame]
             begin=-225
             end=-125
-            image="rogue-mage-attack2.png"
+            image="units/human-outlaws/rogue-mage-attack2.png"
         [/frame]
         [frame]
             begin=-125
             end=-50
-            image="rogue-mage-attack3.png"
+            image="units/human-outlaws/rogue-mage-attack3.png"
         [/frame]
         [frame]
             begin=-50
             end=100
-            image="rogue-mage-attack4.png"
+            image="units/human-outlaws/rogue-mage-attack4.png"
             sound={SOUND_LIST:SWORD_SWISH}
         [/frame]
     [/attack_anim]
@@ -100,22 +100,22 @@
         [frame]
             begin=-325
             end=-225
-            image="rogue-mage-attack1.png"
+            image="units/human-outlaws/rogue-mage-attack1.png"
         [/frame]
         [frame]
             begin=-225
             end=-125
-            image="rogue-mage-attack2.png"
+            image="units/human-outlaws/rogue-mage-attack2.png"
         [/frame]
         [frame]
             begin=-125
             end=-50
-            image="rogue-mage-attack3.png"
+            image="units/human-outlaws/rogue-mage-attack3.png"
         [/frame]
         [frame]
             begin=-50
             end=100
-            image="rogue-mage-attack4.png"
+            image="units/human-outlaws/rogue-mage-attack4.png"
             sound={SOUND_LIST:MISS}
         [/frame]
     [/attack_anim]

data/campaigns/Liberty/units/Shadow_Lord.cfg

@@ -5,7 +5,7 @@
     name= _ "Shadow Lord"
     race=human
     gender=male
-    image="shadow-lord.png"
+    image="units/human-outlaws/shadow-lord.png"
     hitpoints=49
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_3}
@@ -26,28 +26,28 @@
         [frame]
             begin=-250
             end=-150
-            image="shadow-lord-defend-hit1.png"
+            image="units/human-outlaws/shadow-lord-defend-hit1.png"
         [/frame]
         [frame]
             begin=-150
             end=-50
-            image="shadow-lord-defend-hit2.png"
+            image="units/human-outlaws/shadow-lord-defend-hit2.png"
         [/frame]
         [frame]
             begin=-50
             end=50
-            image="shadow-lord-defend-hit3.png"
+            image="units/human-outlaws/shadow-lord-defend-hit3.png"
             sound={SOUND_LIST:HUMAN_OLD_HIT}
         [/frame]
         [frame]
             begin=50
             end=150
-            image="shadow-lord-defend-hit4.png"
+            image="units/human-outlaws/shadow-lord-defend-hit4.png"
         [/frame]
         [frame]
             begin=150
             end=250
-            image="shadow-lord-defend-hit5.png"
+            image="units/human-outlaws/shadow-lord-defend-hit5.png"
         [/frame]
     [/defend]
     [defend]
@@ -55,22 +55,22 @@
         [frame]
             begin=-300
             end=-175
-            image="shadow-lord-defend-miss1.png"
+            image="units/human-outlaws/shadow-lord-defend-miss1.png"
         [/frame]
         [frame]
             begin=-175
             end=0
-            image="shadow-lord-defend-miss2.png"
+            image="units/human-outlaws/shadow-lord-defend-miss2.png"
         [/frame]
         [frame]
             begin=0
             end=150
-            image="shadow-lord-defend-miss3.png"
+            image="units/human-outlaws/shadow-lord-defend-miss3.png"
         [/frame]
     [/defend]
     [attack]
         name=astral blade
-        icon=attacks/sword-astral.png
+        icon="attacks/sword-astral.png"
         description= _ "astral blade"
         type=blade
         range=melee
@@ -83,7 +83,7 @@
     [attack]
         name=shadow bolt
         description= _ "shadow bolt"
-        icon=attacks/dark-missile.png
+        icon="attacks/dark-missile.png"
         type=cold
         range=ranged
         [specials]
@@ -95,7 +95,7 @@
     [attack]
         name=shadow blast
         description= _ "shadow blast"
-        icon=attacks/dark-missile.png
+        icon="attacks/dark-missile.png"
         type=impact
         range=ranged
         [specials]
@@ -111,23 +111,23 @@
         [frame]
             begin=-700
             end=-300
-            image="shadow-lord-ranged1.png"
+            image="units/human-outlaws/shadow-lord-ranged1.png"
         [/frame]
         [frame]
             begin=-300
             end=-150
-            image="shadow-lord-ranged2.png"
+            image="units/human-outlaws/shadow-lord-ranged2.png"
         [/frame]
         [frame]
             begin=-150
             end=0
-            image="shadow-lord-ranged3.png"
+            image="units/human-outlaws/shadow-lord-ranged3.png"
             sound=lightning.ogg
         [/frame]
         [frame]
             begin=0
             end=150
-            image="shadow-lord-ranged4.png"
+            image="units/human-outlaws/shadow-lord-ranged4.png"
         [/frame]
         [missile_frame]
             begin=-175
@@ -143,23 +143,23 @@
         [frame]
             begin=-700
             end=-300
-            image="shadow-lord-ranged1.png"
+            image="units/human-outlaws/shadow-lord-ranged1.png"
         [/frame]
         [frame]
             begin=-300
             end=-150
-            image="shadow-lord-ranged2.png"
+            image="units/human-outlaws/shadow-lord-ranged2.png"
         [/frame]
         [frame]
             begin=-150
             end=0
-            image="shadow-lord-ranged3.png"
+            image="units/human-outlaws/shadow-lord-ranged3.png"
             sound=magicmissile.wav
         [/frame]
         [frame]
             begin=0
             end=150
-            image="shadow-lord-ranged4.png"
+            image="units/human-outlaws/shadow-lord-ranged4.png"
         [/frame]
         [missile_frame]
             begin=-175
@@ -176,22 +176,22 @@
         [frame]
             begin=-400
             end=-250
-            image="shadow-lord-attack1.png"
+            image="units/human-outlaws/shadow-lord-attack1.png"
         [/frame]
         [frame]
             begin=-250
             end=-150
-            image="shadow-lord-attack2.png"
+            image="units/human-outlaws/shadow-lord-attack2.png"
         [/frame]
         [frame]
             begin=-150
             end=-50
-            image="shadow-lord-attack3.png"
+            image="units/human-outlaws/shadow-lord-attack3.png"
         [/frame]
         [frame]
             begin=-50
             end=50
-            image="shadow-lord-attack4.png"
+            image="units/human-outlaws/shadow-lord-attack4.png"
             sound={SOUND_LIST:SWORD_SWISH}
         [/frame]
     [/attack_anim]
@@ -203,22 +203,22 @@
         [frame]
             begin=-400
             end=-250
-            image="shadow-lord-attack1.png"
+            image="units/human-outlaws/shadow-lord-attack1.png"
         [/frame]
         [frame]
             begin=-250
             end=-150
-            image="shadow-lord-attack2.png"
+            image="units/human-outlaws/shadow-lord-attack2.png"
         [/frame]
         [frame]
             begin=-150
             end=-50
-            image="shadow-lord-attack3.png"
+            image="units/human-outlaws/shadow-lord-attack3.png"
         [/frame]
         [frame]
             begin=-50
             end=50
-            image="shadow-lord-attack4.png"
+            image="units/human-outlaws/shadow-lord-attack4.png"
             sound={SOUND_LIST:MISS}
         [/frame]
     [/attack_anim]

data/campaigns/Liberty/units/Shadow_Mage.cfg

@@ -5,7 +5,7 @@
     name= _ "Shadow Mage"
     race=human
     gender=male
-    image="shadow-mage.png"
+    image="units/human-outlaws/shadow-mage.png"
     hitpoints=38
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_2}
@@ -20,7 +20,7 @@
     usage=mixed fighter
     description= _ "Years of violence and brutality to support the study of forbidden magical arts have turned the shadow mages into feared fighters. Now completely enthralled with power, they have been known to command small followings of henchmen. They are outmatched in direct magical combat with their magic-using peers, instead channeling their energies into devestating melee attacks. Despite their offensive power, the corruption in their souls has begun to adversely affect their health."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "shadow-mage-defend.png" "shadow-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
+    {DEFENSE_ANIM "units/human-outlaws/shadow-mage-defend.png" "units/human-outlaws/shadow-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     [attack]
         name=short sword
         description= _ "short sword"
@@ -52,15 +52,15 @@
         [frame]
             begin=-500
             end=50
-            image="shadow-mage-defend.png"
-            halo=halo/shadow-mage-halo1.png,halo/shadow-mage-halo2.png,halo/shadow-mage-halo3.png,halo/shadow-mage-halo4.png,halo/shadow-mage-halo5.png,halo/shadow-mage-halo6.png,halo/shadow-mage-halo7.png,halo/shadow-mage-halo8.png,halo/shadow-mage-halo9.png,halo/shadow-mage-halo10.png
+            image="units/human-outlaws/shadow-mage-defend.png"
+            halo=halo/units/human-outlaws/shadow-mage-halo1.png,halo/units/human-outlaws/shadow-mage-halo2.png,halo/units/human-outlaws/shadow-mage-halo3.png,halo/units/human-outlaws/shadow-mage-halo4.png,halo/units/human-outlaws/shadow-mage-halo5.png,halo/units/human-outlaws/shadow-mage-halo6.png,halo/units/human-outlaws/shadow-mage-halo7.png,halo/units/human-outlaws/shadow-mage-halo8.png,halo/units/human-outlaws/shadow-mage-halo9.png,halo/units/human-outlaws/shadow-mage-halo10.png
             halo_x,halo_y=12,-5
             sound=magicmissile.wav
         [/frame]
         [frame]
             begin=50
             end=100
-            image="shadow-mage-defend.png"
+            image="units/human-outlaws/shadow-mage-defend.png"
         [/frame]
         [missile_frame]
             begin=-200
@@ -77,12 +77,12 @@
         [frame]
             begin=-150
             end=-50
-            image="shadow-mage-attack1.png"
+            image="units/human-outlaws/shadow-mage-attack1.png"
         [/frame]
         [frame]
             begin=-50
             end=100
-            image="shadow-mage-attack2.png"
+            image="units/human-outlaws/shadow-mage-attack2.png"
             sound={SOUND_LIST:SWORD_SWISH}
         [/frame]
     [/attack_anim]
@@ -94,12 +94,12 @@
         [frame]
             begin=-150
             end=-50
-            image="shadow-mage-attack1.png"
+            image="units/human-outlaws/shadow-mage-attack1.png"
         [/frame]
         [frame]
             begin=-50
             end=100
-            image="shadow-mage-attack2.png"
+            image="units/human-outlaws/shadow-mage-attack2.png"
             sound={SOUND_LIST:MISS}
         [/frame]
     [/attack_anim]

data/campaigns/Liberty/units/Skeleton_Rider.cfg

@@ -4,13 +4,13 @@
     id=Skeleton Rider
     name= _ "Skeleton Rider"
     race=undead
-    image=undead-skeletonrider.png
-    {DEFENSE_ANIM "undead-skeletonrider-defend.png" "undead-skeletonrider.png" skeleton-hit-1.ogg }
+    image="units/undead-skeletal/rider.png"
+    {DEFENSE_ANIM "units/undead-skeletal/rider-defend.png" "units/undead-skeletal/rider.png" {SOUND_LIST:SKELETON_HIT} }
     [movement_anim]
         [frame]
             begin=0
             end=150
-            image="undead-skeletonrider-move.png"
+            image="units/undead-skeletal/rider-moving.png"
         [/frame]
     [/movement_anim]
     hitpoints=36
@@ -47,14 +47,14 @@
         [frame]
             begin=-150
             end=-75
-            image=undead-skeletonrider-attack1.png
+            image="units/undead-skeletal/rider-attack-1.png"
         [/frame]
         [if]
             hits=no
             [frame]
                 begin=-75
                 end=75
-                image=undead-skeletonrider-attack2.png
+                image="units/undead-skeletal/rider-attack-2.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/if]
@@ -63,14 +63,14 @@
             [frame]
                 begin=-75
                 end=75
-                image=undead-skeletonrider-attack2.png
+                image="units/undead-skeletal/rider-attack-2.png"
                 sound=axe.ogg
             [/frame]
         [/else]
         [frame]
             begin=75
             end=100
-            image=undead-skeletonrider-attack2.png
+            image="units/undead-skeletal/rider-attack-2.png"
         [/frame]
     [/attack_anim]
 [/unit_type]