New base frames for the elven cavalry units.

data/core/units/elves/Outrider.cfg

@@ -3,7 +3,7 @@
     id=Elvish Outrider
     name= _ "Elvish Outrider"
     race=elf
-    image="units/elves-wood/outrider.png"
+    image="units/elves-wood/outrider/outrider.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     profile="portraits/elves/scout.png"
     hitpoints=57
@@ -59,11 +59,11 @@ The speed of these soldiers allows the elves to strike when and where they choos
         damage=8
         number=3
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/outrider-defend.png" "units/elves-wood/outrider.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/outrider/outrider.png" "units/elves-wood/outrider/outrider.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]
-            image="units/elves-wood/outrider-moving.png:150"
+            image="units/elves-wood/outrider/outrider.png:150"
         [/frame]
     [/movement_anim]
     [attack_anim]
@@ -79,10 +79,10 @@ The speed of these soldiers allows the elves to strike when and where they choos
         start_time=-500
         {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -500}
         [frame]
-            image="units/elves-wood/outrider-attack[1,2,1].png:[100,250,100]"
+            image="units/elves-wood/outrider/outrider.png:[100,250,100]"
         [/frame]
         [frame]
-            image="units/elves-wood/outrider-moving.png:100"
+            image="units/elves-wood/outrider/outrider-moving.png:100"
         [/frame]
     [/attack_anim]
     [attack_anim]
@@ -91,18 +91,18 @@ The speed of these soldiers allows the elves to strike when and where they choos
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/elves-wood/outrider.png:25"
+            image="units/elves-wood/outrider/outrider.png:25"
             sound=horse-elf-canter.wav
         [/frame]
         [frame]
-            image="units/elves-wood/outrider-melee-[2,1].png:[75,200]"
+            image="units/elves-wood/outrider/outrider.png:[75,200]"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/elves-wood/outrider-moving.png:75"
+            image="units/elves-wood/outrider/outrider.png:75"
         [/frame]
         [frame]
-            image="units/elves-wood/outrider.png:25"
+            image="units/elves-wood/outrider/outrider.png:25"
         [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/elves/Rider.cfg

@@ -3,7 +3,7 @@
     id=Elvish Rider
     name= _ "Elvish Rider"
     race=elf
-    image="units/elves-wood/rider.png"
+    image="units/elves-wood/rider/rider.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     profile="portraits/elves/scout.png"
     hitpoints=46
@@ -61,11 +61,11 @@ This combination of incredible mobility and potent combat strength is one of the
         damage=9
         number=2
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/rider-defend.png" "units/elves-wood/rider.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/rider/rider.png" "units/elves-wood/rider/rider.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]
-            image="units/elves-wood/rider-moving.png:150"
+            image="units/elves-wood/rider/rider.png:150"
         [/frame]
     [/movement_anim]
     [attack_anim]
@@ -82,22 +82,22 @@ This combination of incredible mobility and potent combat strength is one of the
         [if]
             hits=yes
             [frame]
-                image="units/elves-wood/rider-attack1.png:100"
+                image="units/elves-wood/rider/rider.png:100"
                 sound=bow.ogg
             [/frame]
         [/if]
         [else]
             hits=no
             [frame]
-                image="units/elves-wood/rider-attack1.png:100"
+                image="units/elves-wood/rider/rider.png:100"
                 sound=bow-miss.ogg
             [/frame]
         [/else]
         [frame]
-            image="units/elves-wood/rider-attack[2,1].png:[250,100]"
+            image="units/elves-wood/rider/rider.png:[250,100]"
         [/frame]
         [frame]
-            image="units/elves-wood/rider-moving.png:150"
+            image="units/elves-wood/rider/rider.png:150"
         [/frame]
     [/attack_anim]
     [attack_anim]
@@ -106,31 +106,31 @@ This combination of incredible mobility and potent combat strength is one of the
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/elves-wood/rider.png:25"
+            image="units/elves-wood/rider/rider.png:25"
             sound=horse-elf-canter.wav
         [/frame]
         [frame]
-            image="units/elves-wood/rider-melee-2.png:75"
+            image="units/elves-wood/rider/rider.png:75"
         [/frame]
         [if]
             hits=no
             [frame]
-                image="units/elves-wood/rider-melee-1.png:200"
+                image="units/elves-wood/rider/rider.png:200"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/if]
         [else]
             hits=yes
             [frame]
-                image="units/elves-wood/rider-melee-1.png:200"
+                image="units/elves-wood/rider/rider.png:200"
                 sound={SOUND_LIST:SWORD_SWISH}
             [/frame]
         [/else]
         [frame]
-            image="units/elves-wood/rider-moving.png:75"
+            image="units/elves-wood/rider/rider.png:75"
         [/frame]
         [frame]
-            image="units/elves-wood/rider.png:25"
+            image="units/elves-wood/rider/rider.png:25"
         [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/elves/Scout.cfg

@@ -2,7 +2,7 @@
 [unit_type]
     id=Elvish Scout
     name= _ "Elvish Scout"
-    image="units/elves-wood/scout.png"
+    image="units/elves-wood/scout/scout.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     profile="portraits/elves/scout.png"
     ellipse="misc/ellipse"
@@ -60,18 +60,18 @@
         damage=6
         number=2
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/scout-defend.png" "units/elves-wood/scout.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/scout/scout.png" "units/elves-wood/scout/scout.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]
-            image="units/elves-wood/scout-moving.png:150"
+            image="units/elves-wood/scout/scout.png:150"
         [/frame]
     [/movement_anim]
     [idle_anim]
         {STANDARD_IDLE_FILTER}
         start_time=0
         [frame]
-            image="units/elves-wood/scout-idle-[1~8,7,8,7~16].png:[125*9,150,175,150,175*8]"
+            image="units/elves-wood/scout/scout.png:[125*9,150,175,150,175*8]"
         [/frame]
     [/idle_anim]
     [attack_anim]
@@ -87,10 +87,10 @@
         start_time=-400
         {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -400}
         [frame]
-            image="units/elves-wood/scout-attack[1~2].png:[100,250]"
+            image="units/elves-wood/scout/scout.png:[100,250]"
         [/frame]
         [frame]
-            image="units/elves-wood/scout-moving.png:100"
+            image="units/elves-wood/scout/scout.png:100"
         [/frame]
     [/attack_anim]
     [attack_anim]
@@ -99,21 +99,21 @@
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/elves-wood/scout.png:25"
+            image="units/elves-wood/scout/scout.png:25"
             sound=horse-elf-canter.wav
         [/frame]
         [frame]
-            image="units/elves-wood/scout-moving.png:75"
+            image="units/elves-wood/scout/scout.png:75"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/elves-wood/scout-attack.png:200"
+            image="units/elves-wood/scout/scout.png:200"
         [/frame]
         [frame]
-            image="units/elves-wood/scout-moving.png:100"
+            image="units/elves-wood/scout/scout.png:100"
         [/frame]
         [frame]
-            image="units/elves-wood/scout.png:50"
+            image="units/elves-wood/scout/scout.png:50"
         [/frame]
     [/attack_anim]
 [/unit_type]