move ghost line to separate folder

pehjota · Apr 29, 2022 · 961b8a3 · 961b8a3
1 parent 1ac0564
commit 961b8a3
Show file tree

Hide file tree

Showing 75 changed files with 45 additions and 45 deletions.
diff --git a/data/core/images/units/undead-spirit/UndeadSpirit_ColorMap.png b/data/core/images/units/undead-spirit/UndeadSpirit_ColorMap.png
diff --git a/data/core/images/units/undead/ghost-n-1.png → .../images/units/undead-spirit/ghost-n-1.png b/data/core/images/units/undead/ghost-n-1.png → .../images/units/undead-spirit/ghost-n-1.png
diff --git a/data/core/images/units/undead/ghost-n-2.png → .../images/units/undead-spirit/ghost-n-2.png b/data/core/images/units/undead/ghost-n-2.png → .../images/units/undead-spirit/ghost-n-2.png
diff --git a/data/core/images/units/undead/ghost-n-3.png → .../images/units/undead-spirit/ghost-n-3.png b/data/core/images/units/undead/ghost-n-3.png → .../images/units/undead-spirit/ghost-n-3.png
diff --git a/.../images/units/undead/ghost-n-attack-1.png → .../units/undead-spirit/ghost-n-attack-1.png b/.../images/units/undead/ghost-n-attack-1.png → .../units/undead-spirit/ghost-n-attack-1.png
diff --git a/.../images/units/undead/ghost-n-attack-2.png → .../units/undead-spirit/ghost-n-attack-2.png b/.../images/units/undead/ghost-n-attack-2.png → .../units/undead-spirit/ghost-n-attack-2.png
diff --git a/.../images/units/undead/ghost-n-attack-3.png → .../units/undead-spirit/ghost-n-attack-3.png b/.../images/units/undead/ghost-n-attack-3.png → .../units/undead-spirit/ghost-n-attack-3.png
diff --git a/data/core/images/units/undead/ghost-s-1.png → .../images/units/undead-spirit/ghost-s-1.png b/data/core/images/units/undead/ghost-s-1.png → .../images/units/undead-spirit/ghost-s-1.png
diff --git a/data/core/images/units/undead/ghost-s-2.png → .../images/units/undead-spirit/ghost-s-2.png b/data/core/images/units/undead/ghost-s-2.png → .../images/units/undead-spirit/ghost-s-2.png
diff --git a/data/core/images/units/undead/ghost-s-3.png → .../images/units/undead-spirit/ghost-s-3.png b/data/core/images/units/undead/ghost-s-3.png → .../images/units/undead-spirit/ghost-s-3.png
diff --git a/.../images/units/undead/ghost-s-attack-1.png → .../units/undead-spirit/ghost-s-attack-1.png b/.../images/units/undead/ghost-s-attack-1.png → .../units/undead-spirit/ghost-s-attack-1.png
diff --git a/.../images/units/undead/ghost-s-attack-2.png → .../units/undead-spirit/ghost-s-attack-2.png b/.../images/units/undead/ghost-s-attack-2.png → .../units/undead-spirit/ghost-s-attack-2.png
diff --git a/.../images/units/undead/ghost-s-attack-3.png → .../units/undead-spirit/ghost-s-attack-3.png b/.../images/units/undead/ghost-s-attack-3.png → .../units/undead-spirit/ghost-s-attack-3.png
diff --git a/...images/units/undead/nightgaunt-attack.png → ...units/undead-spirit/nightgaunt-attack.png b/...images/units/undead/nightgaunt-attack.png → ...units/undead-spirit/nightgaunt-attack.png
diff --git a/...mages/units/undead/nightgaunt-attack2.png → ...nits/undead-spirit/nightgaunt-attack2.png b/...mages/units/undead/nightgaunt-attack2.png → ...nits/undead-spirit/nightgaunt-attack2.png
diff --git a/...images/units/undead/nightgaunt-defend.png → ...units/undead-spirit/nightgaunt-defend.png b/...images/units/undead/nightgaunt-defend.png → ...units/undead-spirit/nightgaunt-defend.png
diff --git a/.../images/units/undead/nightgaunt-die-1.png → .../units/undead-spirit/nightgaunt-die-1.png b/.../images/units/undead/nightgaunt-die-1.png → .../units/undead-spirit/nightgaunt-die-1.png
diff --git a/.../images/units/undead/nightgaunt-die-2.png → .../units/undead-spirit/nightgaunt-die-2.png b/.../images/units/undead/nightgaunt-die-2.png → .../units/undead-spirit/nightgaunt-die-2.png
diff --git a/.../images/units/undead/nightgaunt-die-3.png → .../units/undead-spirit/nightgaunt-die-3.png b/.../images/units/undead/nightgaunt-die-3.png → .../units/undead-spirit/nightgaunt-die-3.png
diff --git a/.../images/units/undead/nightgaunt-die-4.png → .../units/undead-spirit/nightgaunt-die-4.png b/.../images/units/undead/nightgaunt-die-4.png → .../units/undead-spirit/nightgaunt-die-4.png
diff --git a/.../images/units/undead/nightgaunt-die-5.png → .../units/undead-spirit/nightgaunt-die-5.png b/.../images/units/undead/nightgaunt-die-5.png → .../units/undead-spirit/nightgaunt-die-5.png
diff --git a/data/core/images/units/undead/nightgaunt.png → ...images/units/undead-spirit/nightgaunt.png b/data/core/images/units/undead/nightgaunt.png → ...images/units/undead-spirit/nightgaunt.png
diff --git a/data/core/images/units/undead/shadow-n-1.png → ...images/units/undead-spirit/shadow-n-1.png b/data/core/images/units/undead/shadow-n-1.png → ...images/units/undead-spirit/shadow-n-1.png
diff --git a/data/core/images/units/undead/shadow-n-2.png → ...images/units/undead-spirit/shadow-n-2.png b/data/core/images/units/undead/shadow-n-2.png → ...images/units/undead-spirit/shadow-n-2.png
diff --git a/data/core/images/units/undead/shadow-n-3.png → ...images/units/undead-spirit/shadow-n-3.png b/data/core/images/units/undead/shadow-n-3.png → ...images/units/undead-spirit/shadow-n-3.png
diff --git a/...images/units/undead/shadow-n-attack-1.png → ...units/undead-spirit/shadow-n-attack-1.png b/...images/units/undead/shadow-n-attack-1.png → ...units/undead-spirit/shadow-n-attack-1.png
diff --git a/...images/units/undead/shadow-n-attack-2.png → ...units/undead-spirit/shadow-n-attack-2.png b/...images/units/undead/shadow-n-attack-2.png → ...units/undead-spirit/shadow-n-attack-2.png
diff --git a/...images/units/undead/shadow-n-attack-3.png → ...units/undead-spirit/shadow-n-attack-3.png b/...images/units/undead/shadow-n-attack-3.png → ...units/undead-spirit/shadow-n-attack-3.png
diff --git a/...images/units/undead/shadow-n-attack-4.png → ...units/undead-spirit/shadow-n-attack-4.png b/...images/units/undead/shadow-n-attack-4.png → ...units/undead-spirit/shadow-n-attack-4.png
diff --git a/...images/units/undead/shadow-n-attack-5.png → ...units/undead-spirit/shadow-n-attack-5.png b/...images/units/undead/shadow-n-attack-5.png → ...units/undead-spirit/shadow-n-attack-5.png
diff --git a/...images/units/undead/shadow-n-attack-6.png → ...units/undead-spirit/shadow-n-attack-6.png b/...images/units/undead/shadow-n-attack-6.png → ...units/undead-spirit/shadow-n-attack-6.png
diff --git a/data/core/images/units/undead/shadow-s-1.png → ...images/units/undead-spirit/shadow-s-1.png b/data/core/images/units/undead/shadow-s-1.png → ...images/units/undead-spirit/shadow-s-1.png
diff --git a/data/core/images/units/undead/shadow-s-2.png → ...images/units/undead-spirit/shadow-s-2.png b/data/core/images/units/undead/shadow-s-2.png → ...images/units/undead-spirit/shadow-s-2.png
diff --git a/data/core/images/units/undead/shadow-s-3.png → ...images/units/undead-spirit/shadow-s-3.png b/data/core/images/units/undead/shadow-s-3.png → ...images/units/undead-spirit/shadow-s-3.png
diff --git a/...images/units/undead/shadow-s-attack-1.png → ...units/undead-spirit/shadow-s-attack-1.png b/...images/units/undead/shadow-s-attack-1.png → ...units/undead-spirit/shadow-s-attack-1.png
diff --git a/...images/units/undead/shadow-s-attack-2.png → ...units/undead-spirit/shadow-s-attack-2.png b/...images/units/undead/shadow-s-attack-2.png → ...units/undead-spirit/shadow-s-attack-2.png
diff --git a/...images/units/undead/shadow-s-attack-3.png → ...units/undead-spirit/shadow-s-attack-3.png b/...images/units/undead/shadow-s-attack-3.png → ...units/undead-spirit/shadow-s-attack-3.png
diff --git a/...images/units/undead/shadow-s-attack-4.png → ...units/undead-spirit/shadow-s-attack-4.png b/...images/units/undead/shadow-s-attack-4.png → ...units/undead-spirit/shadow-s-attack-4.png
diff --git a/...images/units/undead/shadow-s-attack-5.png → ...units/undead-spirit/shadow-s-attack-5.png b/...images/units/undead/shadow-s-attack-5.png → ...units/undead-spirit/shadow-s-attack-5.png
diff --git a/...images/units/undead/shadow-s-attack-6.png → ...units/undead-spirit/shadow-s-attack-6.png b/...images/units/undead/shadow-s-attack-6.png → ...units/undead-spirit/shadow-s-attack-6.png
diff --git a/...ages/units/undead/spectre-se-attack-1.png → ...its/undead-spirit/spectre-se-attack-1.png b/...ages/units/undead/spectre-se-attack-1.png → ...its/undead-spirit/spectre-se-attack-1.png
diff --git a/...ges/units/undead/spectre-se-attack-10.png → ...ts/undead-spirit/spectre-se-attack-10.png b/...ges/units/undead/spectre-se-attack-10.png → ...ts/undead-spirit/spectre-se-attack-10.png
diff --git a/...ges/units/undead/spectre-se-attack-11.png → ...ts/undead-spirit/spectre-se-attack-11.png b/...ges/units/undead/spectre-se-attack-11.png → ...ts/undead-spirit/spectre-se-attack-11.png
diff --git a/...ges/units/undead/spectre-se-attack-12.png → ...ts/undead-spirit/spectre-se-attack-12.png b/...ges/units/undead/spectre-se-attack-12.png → ...ts/undead-spirit/spectre-se-attack-12.png
diff --git a/...ages/units/undead/spectre-se-attack-2.png → ...its/undead-spirit/spectre-se-attack-2.png b/...ages/units/undead/spectre-se-attack-2.png → ...its/undead-spirit/spectre-se-attack-2.png
diff --git a/...ages/units/undead/spectre-se-attack-3.png → ...its/undead-spirit/spectre-se-attack-3.png b/...ages/units/undead/spectre-se-attack-3.png → ...its/undead-spirit/spectre-se-attack-3.png
diff --git a/...ages/units/undead/spectre-se-attack-4.png → ...its/undead-spirit/spectre-se-attack-4.png b/...ages/units/undead/spectre-se-attack-4.png → ...its/undead-spirit/spectre-se-attack-4.png
diff --git a/...ages/units/undead/spectre-se-attack-5.png → ...its/undead-spirit/spectre-se-attack-5.png b/...ages/units/undead/spectre-se-attack-5.png → ...its/undead-spirit/spectre-se-attack-5.png
diff --git a/...ages/units/undead/spectre-se-attack-6.png → ...its/undead-spirit/spectre-se-attack-6.png b/...ages/units/undead/spectre-se-attack-6.png → ...its/undead-spirit/spectre-se-attack-6.png
diff --git a/...ages/units/undead/spectre-se-attack-7.png → ...its/undead-spirit/spectre-se-attack-7.png b/...ages/units/undead/spectre-se-attack-7.png → ...its/undead-spirit/spectre-se-attack-7.png
diff --git a/...ages/units/undead/spectre-se-attack-8.png → ...its/undead-spirit/spectre-se-attack-8.png b/...ages/units/undead/spectre-se-attack-8.png → ...its/undead-spirit/spectre-se-attack-8.png
diff --git a/...ages/units/undead/spectre-se-attack-9.png → ...its/undead-spirit/spectre-se-attack-9.png b/...ages/units/undead/spectre-se-attack-9.png → ...its/undead-spirit/spectre-se-attack-9.png
diff --git a/.../images/units/undead/spectre-se-bob-1.png → .../units/undead-spirit/spectre-se-bob-1.png b/.../images/units/undead/spectre-se-bob-1.png → .../units/undead-spirit/spectre-se-bob-1.png
diff --git a/.../images/units/undead/spectre-se-bob-2.png → .../units/undead-spirit/spectre-se-bob-2.png b/.../images/units/undead/spectre-se-bob-2.png → .../units/undead-spirit/spectre-se-bob-2.png
diff --git a/.../images/units/undead/spectre-se-bob-3.png → .../units/undead-spirit/spectre-se-bob-3.png b/.../images/units/undead/spectre-se-bob-3.png → .../units/undead-spirit/spectre-se-bob-3.png
diff --git a/...ages/units/undead/spectre-se-defend-1.png → ...its/undead-spirit/spectre-se-defend-1.png b/...ages/units/undead/spectre-se-defend-1.png → ...its/undead-spirit/spectre-se-defend-1.png
diff --git a/...ages/units/undead/spectre-se-defend-2.png → ...its/undead-spirit/spectre-se-defend-2.png b/...ages/units/undead/spectre-se-defend-2.png → ...its/undead-spirit/spectre-se-defend-2.png
diff --git a/data/core/images/units/undead/spectre.png → ...re/images/units/undead-spirit/spectre.png b/data/core/images/units/undead/spectre.png → ...re/images/units/undead-spirit/spectre.png
diff --git a/data/core/images/units/undead/wraith-s-1.png → ...images/units/undead-spirit/wraith-s-1.png b/data/core/images/units/undead/wraith-s-1.png → ...images/units/undead-spirit/wraith-s-1.png
diff --git a/data/core/images/units/undead/wraith-s-2.png → ...images/units/undead-spirit/wraith-s-2.png b/data/core/images/units/undead/wraith-s-2.png → ...images/units/undead-spirit/wraith-s-2.png
diff --git a/data/core/images/units/undead/wraith-s-3.png → ...images/units/undead-spirit/wraith-s-3.png b/data/core/images/units/undead/wraith-s-3.png → ...images/units/undead-spirit/wraith-s-3.png
diff --git a/data/core/images/units/undead/wraith-s-4.png → ...images/units/undead-spirit/wraith-s-4.png b/data/core/images/units/undead/wraith-s-4.png → ...images/units/undead-spirit/wraith-s-4.png
diff --git a/...images/units/undead/wraith-s-attack-1.png → ...units/undead-spirit/wraith-s-attack-1.png b/...images/units/undead/wraith-s-attack-1.png → ...units/undead-spirit/wraith-s-attack-1.png
diff --git a/...images/units/undead/wraith-s-attack-2.png → ...units/undead-spirit/wraith-s-attack-2.png b/...images/units/undead/wraith-s-attack-2.png → ...units/undead-spirit/wraith-s-attack-2.png
diff --git a/...images/units/undead/wraith-s-attack-3.png → ...units/undead-spirit/wraith-s-attack-3.png b/...images/units/undead/wraith-s-attack-3.png → ...units/undead-spirit/wraith-s-attack-3.png
diff --git a/...images/units/undead/wraith-s-attack-4.png → ...units/undead-spirit/wraith-s-attack-4.png b/...images/units/undead/wraith-s-attack-4.png → ...units/undead-spirit/wraith-s-attack-4.png
diff --git a/...images/units/undead/wraith-s-attack-5.png → ...units/undead-spirit/wraith-s-attack-5.png b/...images/units/undead/wraith-s-attack-5.png → ...units/undead-spirit/wraith-s-attack-5.png
diff --git a/...images/units/undead/wraith-s-defend-1.png → ...units/undead-spirit/wraith-s-defend-1.png b/...images/units/undead/wraith-s-defend-1.png → ...units/undead-spirit/wraith-s-defend-1.png
diff --git a/...images/units/undead/wraith-s-defend-2.png → ...units/undead-spirit/wraith-s-defend-2.png b/...images/units/undead/wraith-s-defend-2.png → ...units/undead-spirit/wraith-s-defend-2.png
diff --git a/data/core/images/units/undead/wraith-s.png → ...e/images/units/undead-spirit/wraith-s.png b/data/core/images/units/undead/wraith-s.png → ...e/images/units/undead-spirit/wraith-s.png
diff --git a/data/core/units/undead/Spirit_Ghost.cfg b/data/core/units/undead/Spirit_Ghost.cfg
@@ -3,7 +3,7 @@
     id=Ghost
     name= _ "Ghost"
     race=undead
-    image="units/undead/ghost-s-2.png"
+    image="units/undead-spirit/ghost-s-2.png"
     profile=portraits/undead/ghost.png
     hitpoints=18
     movement_type=undeadspirit
@@ -41,13 +41,13 @@
         [if]
             direction=s,se,sw
             [frame]
-                image=units/undead/ghost-s-2.png:1,units/undead/ghost-s-attack-1.png:250,units/undead/ghost-s-2.png:1
+                image=units/undead-spirit/ghost-s-2.png:1,units/undead-spirit/ghost-s-attack-1.png:250,units/undead-spirit/ghost-s-2.png:1
             [/frame]
         [/if]
         [else]
             direction=n,ne,nw
             [frame]
-                image=units/undead/ghost-n-2.png:1,units/undead/ghost-n-attack-1.png:250,units/undead/ghost-n-2.png:1
+                image=units/undead-spirit/ghost-n-2.png:1,units/undead-spirit/ghost-n-attack-1.png:250,units/undead-spirit/ghost-n-2.png:1
             [/frame]
         [/else]
     [/defend]
@@ -82,22 +82,22 @@
         [if]
             direction=s,se,sw
             [frame]
-                image="units/undead/ghost-s-2.png:25"
+                image="units/undead-spirit/ghost-s-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/ghost-s-attack-[1,2,1].png:[75,150,75]"
+                image="units/undead-spirit/ghost-s-attack-[1,2,1].png:[75,150,75]"
             [/frame]
             [frame]
-                image="units/undead/ghost-s-2.png:25"
+                image="units/undead-spirit/ghost-s-2.png:25"
             [/frame]
         [/if]
         [else]
             direction=n,ne,nw
             [frame]
-                image="units/undead/ghost-n-2.png:25"
+                image="units/undead-spirit/ghost-n-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/ghost-n-attack-[1,2,1].png:[75,150,75]"
+                image="units/undead-spirit/ghost-n-attack-[1,2,1].png:[75,150,75]"
             [/frame]
         [/else]
         attack_sound_start_time=-100
@@ -117,25 +117,25 @@
         [if]
             direction=s,se,sw
             [frame]
-                image="units/undead/ghost-s-2.png:25"
+                image="units/undead-spirit/ghost-s-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/ghost-s-attack-[1~3,2,1].png:[175*2,100,75*2]"
+                image="units/undead-spirit/ghost-s-attack-[1~3,2,1].png:[175*2,100,75*2]"
             [/frame]
             [frame]
-                image="units/undead/ghost-s-2.png:25"
+                image="units/undead-spirit/ghost-s-2.png:25"
             [/frame]
         [/if]
         [else]
             direction=n,ne,nw
             [frame]
-                image="units/undead/ghost-n-2.png:25"
+                image="units/undead-spirit/ghost-n-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/ghost-n-attack-[1~3,2,1].png:[175*2,100,75*2]"
+                image="units/undead-spirit/ghost-n-attack-[1~3,2,1].png:[175*2,100,75*2]"
             [/frame]
             [frame]
-                image="units/undead/ghost-n-2.png:25"
+                image="units/undead-spirit/ghost-n-2.png:25"
             [/frame]
         [/else]
 
@@ -153,15 +153,15 @@
         start_time=0
         alpha=0.8~0.4:1400,0.4~0.6:600,0.6~0.4:600,0.4~0.8:1400
         [frame]
-            image="units/undead/ghost-s-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
+            image="units/undead-spirit/ghost-s-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
         [/frame]
     [/standing_anim]
     [standing_anim]
         direction=n,ne,nw
         start_time=0
         alpha=0.8~0.4:1400,0.4~0.6:600,0.6~0.4:600,0.4~0.8:1400
         [frame]
-            image="units/undead/ghost-n-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
+            image="units/undead-spirit/ghost-n-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
         [/frame]
     [/standing_anim]
 [/unit_type]
diff --git a/data/core/units/undead/Spirit_Nightgaunt.cfg b/data/core/units/undead/Spirit_Nightgaunt.cfg
@@ -3,7 +3,7 @@
     id=Nightgaunt
     name= _ "Nightgaunt"
     race=undead
-    image="units/undead/nightgaunt.png"
+    image="units/undead-spirit/nightgaunt.png"
     profile=portraits/undead/nightgaunt.png
     hitpoints=35
     movement_type=undeadspirit
@@ -17,15 +17,15 @@
     usage=scout
     description= _ "The purpose of the masks that these creatures wear is unknown, as is the countenance that they obscure. These terrible forms are rarely seen by the living, and those who live to speak of them had no leisure to study their foe."
     die_sound=wail-long.wav
-    {DEFENSE_ANIM "units/undead/nightgaunt-defend.png" "units/undead/nightgaunt.png" wail.wav }
+    {DEFENSE_ANIM "units/undead-spirit/nightgaunt-defend.png" "units/undead-spirit/nightgaunt.png" wail.wav }
     [abilities]
         {ABILITY_NIGHTSTALK}
         {ABILITY_SKIRMISHER}
     [/abilities]
     [death]
         start_time=0
         [frame]
-            image="units/undead/nightgaunt-die-[1~5].png:200"
+            image="units/undead-spirit/nightgaunt-die-[1~5].png:200"
         [/frame]
     [/death]
     [attack]
@@ -46,11 +46,11 @@
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/undead/nightgaunt-[attack,attack2].png:[100,150]"
+            image="units/undead-spirit/nightgaunt-[attack,attack2].png:[100,150]"
         [/frame]
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/undead/nightgaunt-defend.png:150"
+            image="units/undead-spirit/nightgaunt-defend.png:150"
         [/frame]
     [/attack_anim]
 [/unit_type]
diff --git a/data/core/units/undead/Spirit_Shadow.cfg b/data/core/units/undead/Spirit_Shadow.cfg
@@ -3,7 +3,7 @@
     id=Shadow
     name= _ "Shadow"
     race=undead
-    image="units/undead/shadow-s-2.png"
+    image="units/undead-spirit/shadow-s-2.png"
     profile=portraits/undead/shadow.png
     hitpoints=24
     movement_type=undeadspirit
@@ -46,13 +46,13 @@ That is a question which is easily answered by a necromancer."
         [if]
             direction=s,se,sw
             [frame]
-                image=units/undead/shadow-s-2.png:1,units/undead/shadow-s-attack-1.png:250,units/undead/shadow-s-2.png:1
+                image=units/undead-spirit/shadow-s-2.png:1,units/undead-spirit/shadow-s-attack-1.png:250,units/undead-spirit/shadow-s-2.png:1
             [/frame]
         [/if]
         [else]
             direction=n,ne,nw
             [frame]
-                image=units/undead/shadow-n-2.png:1,units/undead/shadow-n-attack-1.png:250,units/undead/shadow-n-2.png:1
+                image=units/undead-spirit/shadow-n-2.png:1,units/undead-spirit/shadow-n-attack-1.png:250,units/undead-spirit/shadow-n-2.png:1
             [/frame]
         [/else]
     [/defend]
@@ -81,25 +81,25 @@ That is a question which is easily answered by a necromancer."
         [if]
             direction=s,se,sw
             [frame]
-                image="units/undead/shadow-s-2.png:25"
+                image="units/undead-spirit/shadow-s-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/shadow-s-attack-[1~6,2,1].png:[75*2,50*2,75,200,100*2]"
+                image="units/undead-spirit/shadow-s-attack-[1~6,2,1].png:[75*2,50*2,75,200,100*2]"
             [/frame]
             [frame]
-                image="units/undead/shadow-s-2.png:25"
+                image="units/undead-spirit/shadow-s-2.png:25"
             [/frame]
         [/if]
         [else]
             direction=n,ne,nw
             [frame]
-                image="units/undead/shadow-s-2.png:25"
+                image="units/undead-spirit/shadow-s-2.png:25"
             [/frame]
             [frame]
-                image="units/undead/shadow-s-attack-[1~6,2,1].png:[75*2,50*2,75,200,100*2]"
+                image="units/undead-spirit/shadow-s-attack-[1~6,2,1].png:[75*2,50*2,75,200,100*2]"
             [/frame]
             [frame]
-                image="units/undead/shadow-s-2.png:25"
+                image="units/undead-spirit/shadow-s-2.png:25"
             [/frame]
         [/else]
         attack_sound_start_time=-325
@@ -126,15 +126,15 @@ That is a question which is easily answered by a necromancer."
         start_time=0
         alpha=0.4~0.8:1400,0.8~0.6:600,0.6~0.8:600,0.8~0.4:1400
         [frame]
-            image="units/undead/shadow-s-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
+            image="units/undead-spirit/shadow-s-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
         [/frame]
     [/standing_anim]
     [standing_anim]
         direction=n,ne,nw
         start_time=0
         alpha=0.4~0.8:1400,0.8~0.6:600,0.6~0.8:600,0.8~0.4:1400
         [frame]
-            image="units/undead/shadow-n-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
+            image="units/undead-spirit/shadow-n-[2,1~3,2,1~3,2,1~3,2,1~3].png:250"
         [/frame]
     [/standing_anim]
 [/unit_type]
diff --git a/data/core/units/undead/Spirit_Spectre.cfg b/data/core/units/undead/Spirit_Spectre.cfg
@@ -3,7 +3,7 @@
     id=Spectre
     name= _ "Spectre"
     race=undead
-    image="units/undead/spectre.png"
+    image="units/undead-spirit/spectre.png"
     small_profile=portraits/undead/spectre.png~CROP(0,0,390,390)
     profile=portraits/undead/spectre.png
     hitpoints=33
@@ -24,7 +24,7 @@ The creation of these is itself no mean feat, but the real danger in encounterin
         start_time=0
         alpha=0.8~0.4:1100,0.4~0.6:450,0.6~0.4:450,0.4~0.8:1100
         [frame]
-            image="units/undead/spectre-se-bob-[1~3,2,1~3,2,1~3,2,1~3,2].png:200"
+            image="units/undead-spirit/spectre-se-bob-[1~3,2,1~3,2,1~3,2,1~3,2].png:200"
         [/frame]
     [/standing_anim]
     [attack]
@@ -46,19 +46,19 @@ The creation of these is itself no mean feat, but the real danger in encounterin
         damage=6
         number=3
     [/attack]
-    {DEFENSE_ANIM "units/undead/spectre-se-defend-2.png" "units/undead/spectre-se-defend-1.png" wail.wav }
+    {DEFENSE_ANIM "units/undead-spirit/spectre-se-defend-2.png" "units/undead-spirit/spectre-se-defend-1.png" wail.wav }
     [attack_anim]
         [filter_attack]
             name=wail
         [/filter_attack]
         {MISSILE_FRAME_WAIL}
         start_time=-250
         [frame]
-            image="units/undead/spectre.png:50"
+            image="units/undead-spirit/spectre.png:50"
         [/frame]
         [frame]
             sound=wail.wav
-            image="units/undead/spectre-se-attack-1.png:250"
+            image="units/undead-spirit/spectre-se-attack-1.png:250"
         [/frame]
     [/attack_anim]
     [attack_anim]
@@ -68,7 +68,7 @@ The creation of these is itself no mean feat, but the real danger in encounterin
         offset=0.0~0.1,0.1~0.0
         start_time=-400
         [frame]
-            image="units/undead/spectre-se-attack-[1~12].png:60"
+            image="units/undead-spirit/spectre-se-attack-[1~12].png:60"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
     [/attack_anim]

diff --git a/data/core/units/undead/Spirit_Wraith.cfg b/data/core/units/undead/Spirit_Wraith.cfg
@@ -3,7 +3,7 @@
     id=Wraith
     name= _ "Wraith"
     race=undead
-    image="units/undead/wraith-s.png"
+    image="units/undead-spirit/wraith-s.png"
     profile=portraits/undead/wraith.png
     hitpoints=25
     movement_type=undeadspirit
@@ -39,7 +39,7 @@
         start_time=0
         alpha=0.8~0.4:1100,0.4~0.6:450,0.6~0.4:450,0.4~0.8:1100
         [frame]
-            image="units/undead/wraith-s-[1~4,1~4,1~4,1~4].png:200"
+            image="units/undead-spirit/wraith-s-[1~4,1~4,1~4,1~4].png:200"
         [/frame]
     [/standing_anim]
     [defend]
@@ -65,7 +65,7 @@
             alpha=0.8~0.25:126,0.25~0.8:126
         [/else]
         [frame]
-            image=units/undead/wraith-s-2.png:1,units/undead/wraith-s-attack-1.png:250,units/undead/wraith-s-2.png:1
+            image=units/undead-spirit/wraith-s-2.png:1,units/undead-spirit/wraith-s-attack-1.png:250,units/undead-spirit/wraith-s-2.png:1
         [/frame]
     [/defend]
 
@@ -76,10 +76,10 @@
         {MISSILE_FRAME_WAIL}
         start_time=-250
         [frame]
-            image="units/undead/wraith-s.png:50"
+            image="units/undead-spirit/wraith-s.png:50"
         [/frame]
         [frame]
-            image="units/undead/wraith-s-defend-1.png:250"
+            image="units/undead-spirit/wraith-s-defend-1.png:250"
             sound=wail-sml.wav
         [/frame]
     [/attack_anim]
@@ -91,11 +91,11 @@
         offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
         start_time=-250
         [frame]
-            image="units/undead/wraith-s-attack-[1~5].png:[150,100*2,90,80]"
+            image="units/undead-spirit/wraith-s-attack-[1~5].png:[150,100*2,90,80]"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/undead/wraith-s-defend-1.png:50"
+            image="units/undead-spirit/wraith-s-defend-1.png:50"
         [/frame]
     [/attack_anim]
 [/unit_type]