Fix a few paths (1/2)

data/core/units/elves/Elvish_High_Lord.cfg

@@ -3,7 +3,7 @@
     id=Elvish High Lord
     name= _ "Elvish High Lord"
     race=elf
-    image="elves-wood/elvish-high-lord.png"
+    image="elves-wood/high-lord.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=63
     movement_type=woodland
@@ -24,17 +24,17 @@
         [/attack_filter]
         [frame]
             duration=1
-            image="elvish-high-lord.png"
+            image="elves-wood/high-lord.png"
         [/frame]
         [frame]
             duration=100
-            image="elvish-high-lord-defend-1.png"
+            image="elves-wood/high-lord-defend-1.png"
         [/frame]
         [if]
             hits=hit
             [frame]
                 duration=100
-                image="elvish-high-lord-defend-2.png"
+                image="elves-wood/high-lord-defend-2.png"
                 sound={SOUND_LIST:ELF_HIT}
             [/frame]
         [/if]
@@ -42,19 +42,19 @@
             hits=miss,kill
             [frame]
                 duration=100
-                image="elvish-high-lord-defend-2.png"
+                image="elves-wood/high-lord-defend-2.png"
             [/frame]
         [/else]
         [frame]
             duration=100
-            image="elvish-high-lord-defend-1.png"
+            image="elves-wood/high-lord-defend-1.png"
         [/frame]
         [frame]
             duration=1
-            image="elvish-high-lord.png"
+            image="elves-wood/high-lord.png"
         [/frame]
     [/defend]
-    {DEFENSE_ANIM_RANGE "elvish-high-lord-magic-defend.png" "elvish-high-lord-magic.png" {SOUND_LIST:ELF_HIT} ranged}
+    {DEFENSE_ANIM_RANGE "elves-wood/high-lord-magic-defend.png" "elves-wood/high-lord-magic.png" {SOUND_LIST:ELF_HIT} ranged}
     [attack]
         name=sword
         description= _"sword"
@@ -86,7 +86,7 @@
         [frame]
             begin=-450
             end=-375
-            image="elvish-high-lord-magic.png"
+            image="elves-wood/high-lord-magic.png"
             sound=magic-faeriefire.ogg
 
             halo=halo/elven/faerie-fire-halo1.png
@@ -95,42 +95,42 @@
         [frame]
             begin=-375
             end=-300
-            image="elvish-high-lord-magic.png"
+            image="elves-wood/high-lord-magic.png"
             halo=halo/elven/faerie-fire-halo2.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-300
             end=-225
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo3.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-225
             end=-150
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo4.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-150
             end=-75
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo5.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-75
             end=0
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo6.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-0
             end=75
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo7.png
             halo_x,halo_y=-19,-14
         [/frame]
@@ -145,7 +145,7 @@
         [frame]
             begin=-450
             end=-375
-            image="elvish-high-lord-magic.png"
+            image="elves-wood/high-lord-magic.png"
             sound=magic-faeriefire-miss.ogg
 
             halo=halo/elven/faerie-fire-halo1.png
@@ -154,42 +154,42 @@
         [frame]
             begin=-375
             end=-300
-            image="elvish-high-lord-magic.png"
+            image="elves-wood/high-lord-magic.png"
             halo=halo/elven/faerie-fire-halo2.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-300
             end=-225
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo3.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-225
             end=-150
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo4.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-150
             end=-75
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo5.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-75
             end=0
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo6.png
             halo_x,halo_y=-19,-14
         [/frame]
         [frame]
             begin=-0
             end=75
-            image="elvish-high-lord-magic-1.png"
+            image="elves-wood/high-lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo7.png
             halo_x,halo_y=-19,-14
         [/frame]
@@ -201,14 +201,14 @@
         [frame]
             begin=-200
             end=-175
-            image="elvish-high-lord.png"
+            image="elves-wood/high-lord.png"
         [/frame]
         [if]
             hits=no
             [frame]
                 begin=-175
                 end=-75
-                image="elvish-high-lord-attack-sword-1.png"
+                image="elves-wood/high-lord-attack-sword-1.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/if]
@@ -217,19 +217,19 @@
             [frame]
                 begin=-175
                 end=-75
-                image="elvish-high-lord-attack-sword-1.png"
+                image="elves-wood/high-lord-attack-sword-1.png"
                 sound={SOUND_LIST:SWORD_SWISH}
             [/frame]
         [/else]
         [frame]
             begin=-75
             end=100
-            image="elvish-high-lord-attack-sword-2.png"
+            image="elves-wood/high-lord-attack-sword-2.png"
         [/frame]
         [frame]
             begin=100
             end=200
-            image="elvish-high-lord.png"
+            image="elves-wood/high-lord.png"
         [/frame]
     [/attack_anim]
 [/unit]

data/core/units/elves/Elvish_Lady.cfg

@@ -5,7 +5,7 @@
     name= _ "female^Elvish Lady"
     gender=female
     race=elf
-    image="elves-wood/elvish-lady.png"
+    image="elves-wood/lady.png"
     profile=portraits/Other/elvish-noble-lady.png
     hitpoints=30
     movement_type=fly

data/core/units/elves/Elvish_Lord.cfg

@@ -3,7 +3,7 @@
     id=Elvish Lord
     name= _ "Elvish Lord"
     race=elf
-    image="elves-wood/elvish-lord.png"
+    image="elves-wood/lord.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=51
     movement_type=woodland
@@ -16,8 +16,8 @@
     usage=fighter
     unit_description= _ "The nobility of the elves are possessed of merit to match their standing in society. Elvish Lords are the wisest and strongest of their people, and are fearsome in their command of magic."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM_RANGE "elvish-lord-defend.png" "elvish-lord.png" {SOUND_LIST:ELF_HIT} melee}
-    {DEFENSE_ANIM_RANGE "elvish-lord-magic-defend.png" "elvish-lord-magic.png" {SOUND_LIST:ELF_HIT} ranged}
+    {DEFENSE_ANIM_RANGE "elves-wood/lord-defend.png" "elves-wood/lord.png" {SOUND_LIST:ELF_HIT} melee}
+    {DEFENSE_ANIM_RANGE "elves-wood/lord-magic-defend.png" "elves-wood/lord-magic.png" {SOUND_LIST:ELF_HIT} ranged}
     [attack]
         name=sword
         description= _"sword"
@@ -49,7 +49,7 @@
         [frame]
             begin=-450
             end=-375
-            image="elvish-lord-magic.png"
+            image="elves-wood/lord-magic.png"
             sound=magic-faeriefire.ogg
 
             halo=halo/elven/faerie-fire-halo1.png
@@ -58,42 +58,42 @@
         [frame]
             begin=-375
             end=-300
-            image="elvish-lord-magic.png"
+            image="elves-wood/lord-magic.png"
             halo=halo/elven/faerie-fire-halo2.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-300
             end=-225
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo3.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-225
             end=-150
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo4.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-150
             end=-75
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo5.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-75
             end=0
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo6.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-0
             end=75
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo7.png
             halo_x,halo_y=-19,-13
         [/frame]
@@ -108,7 +108,7 @@
         [frame]
             begin=-450
             end=-375
-            image="elvish-lord-magic.png"
+            image="elves-wood/lord-magic.png"
             sound=magic-faeriefire-miss.ogg
 
             halo=halo/elven/faerie-fire-halo1.png
@@ -117,42 +117,42 @@
         [frame]
             begin=-375
             end=-300
-            image="elvish-lord-magic.png"
+            image="elves-wood/lord-magic.png"
             halo=halo/elven/faerie-fire-halo2.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-300
             end=-225
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo3.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-225
             end=-150
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo4.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-150
             end=-75
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo5.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-75
             end=0
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo6.png
             halo_x,halo_y=-19,-13
         [/frame]
         [frame]
             begin=-0
             end=75
-            image="elvish-lord-magic-1.png"
+            image="elves-wood/lord-magic-1.png"
             halo=halo/elven/faerie-fire-halo7.png
             halo_x,halo_y=-19,-13
         [/frame]
@@ -164,14 +164,14 @@
         [frame]
             begin=-200
             end=-100
-            image="elvish-lord.png"
+            image="elves-wood/lord.png"
         [/frame]
         [if]
             hits=no
             [frame]
                 begin=-100
                 end=125
-                image="elvish-lord-melee.png"
+                image="elves-wood/lord-melee.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/if]
@@ -180,14 +180,14 @@
             [frame]
                 begin=-100
                 end=125
-                image="elvish-lord-melee.png"
+                image="elves-wood/lord-melee.png"
                 sound={SOUND_LIST:SWORD_SWISH}
             [/frame]
         [/else]
         [frame]
             begin=125
             end=200
-            image="elvish-lord.png"
+            image="elves-wood/lord.png"
         [/frame]
     [/attack_anim]
 [/unit]