UtBS: Updated Nym and Kaleh images, cleaned up dialogue

changelog

@@ -22,6 +22,7 @@ SVN trunk (1.1.2+svn):
      * Switched to use of profile key in single unit definitions
      * Minor text cleanups
    * Under the Burning Suns
+     * New unit artwork for Kaleh and Nym
      * Removed Skirmish Ability from Desert Rider and Desert Outrider
      * Added Skirmish Ability to Desert Horseman
      * increased melee damage of Desert Horseman from 4-3 to 5-3

data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg

@@ -3237,82 +3237,18 @@ first_time_only=no
 
     [then]
 
-    [store_unit]
-        [filter]
-        role=immune
-        [/filter]
-    variable=unitstats
-    [/store_unit]
+    [set_variable]
+    name=damage_msg
+    format=$desert_damage
+    [/set_variable]
 
-    [store_locations]
-    x=1-40
-    y=1-80
-    #although adding an extra radius shouldn't be necessary, it ensures
-    #that i cover the entire map
-    radius=1000
-    terrain=JIRz
-        [filter]
-        role=immune
-        [/filter]
-    variable=locs
-    [/store_locations]
+    [set_variable]
+    name=damage_msg
+    multiply=-1
+    [/set_variable]
 
-    [if]
-        [variable]
-        name=locs.length
-        numerical_equals=1
-        [/variable]
-
-        [then]
-
-        [set_variable]
-        name=desert_damage
-        multiply=-1
-        [/set_variable]
-
-        [set_variable]
-        name=unitstats.hitpoints
-        add=$desert_damage
-        [/set_variable]
-
-        [set_variable]
-        name=desert_damage
-        multiply=-1
-        [/set_variable]
-
-        [/then]
-    [/if]
-
-    [unstore_unit]
-    variable=unitstats
-    [/unstore_unit]
-
-    {CLEAR_VARIABLE unitstats}
-
-    [/then]
-[/if]
-
-[/event]
-
-#during the daytime (from dawn to dusk)
-#at end of side 1's turn, all units outside of oasis take 4,5,6 damage
-
-[event]
-name=side turn
-first_time_only=no
-
-[if]
-    [variable]
-    name=daytime
-    numerical_equals=1
-    [/variable]
-
-    [variable]
-    name=side_number
-    numerical_equals=2
-    [/variable]
-
-    [then]
+	[redraw]
+	[/redraw]
 
     [store_locations]
     x=1-40
@@ -3323,15 +3259,13 @@ first_time_only=no
     terrain=JIRz
         [filter]
         side=1
+		[not]
+		role=immune
+		[/not]
         [/filter]
-    variable=locs
+	variable=locs
     [/store_locations]
 
-    #[message]
-    #speaker=narrator
-    #message= _ "Desert number of units: $locs"
-    #[/message]
-
     {FOREACH locs i}
 
     [set_variable]
@@ -3344,11 +3278,6 @@ first_time_only=no
         to_variable=locs[$i].y
     [/set_variable]
 
-    #[message]
-    #speaker=Kaleh
-    #message= _ "Desert iteration: $i x: $temp_x y: $temp_y"
-    #[/message]
-
     [store_unit]
         [filter]
         x,y=$temp_x,$temp_y
@@ -3356,21 +3285,17 @@ first_time_only=no
     variable=unitstats
     [/store_unit]
 
-    #[message]
-    #speaker=narrator
-    #message= _ "test Desert unit info = $unitstats.type role = $unitstats.role"
-    #[/message]
 
     [set_variable]
     name=unitstats.hitpoints
-    add=$desert_damage
+	add=$desert_damage
     [/set_variable]
 
     #if unitstats.hitpoints is < 1, kill unit
-    [if]
+	[if]
         [variable]
         name=unitstats.hitpoints
-        less_than=1
+		less_than=1
         [/variable]
 
         [then]
@@ -3401,7 +3326,6 @@ first_time_only=no
 [/event]
 
 
-
 #create undead at dusk function
 
 #at first dusk, Garak comments about the dangers of the night

data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg

@@ -1375,35 +1375,92 @@ x=36-41
 y=50-54
 [/remove_shroud]
 
-[message]
-speaker=unit
-message= _ "Hey look, more ants!"
-[/message]
+# check to see if Nym is the unit that triggered this event
+# to keep her from talking to herself during the dialogue
 
-[message]
-description=Nym
-message= _ "Are you sure there aren't any spiders?"
-[/message]
+[store_locations]
+x,y=$x1,$y1
+[filter]
+	description=Nym
+[/filter]
+variable=unittest
+[/store_locations]
 
-[message]
-speaker=unit
-message= _ "No, but the water is rising to the southeast as well. The river must have lead to more tunnels than we first thought."
-[/message]
+[if]
+	[variable]
+	name=unittest.length
+	numerical_equals=0
+	[/variable]
 
-[message]
-description=Zhul
-message= _ "The ants must be fleeing from the flood too."
-[/message]
+	[then]
+	# unit that triggered event is not Nym
+	
+	[message]
+	speaker=unit
+	message= _ "Hey look, more ants!"
+	[/message]
 
-[message]
-speaker=unit
-message= _ "They seem confused, leaderless. I guess it's every ant for itself. Uh, oh. Some of them seem to have noticed us."
-[/message]
+	[message]
+	description=Nym
+	message= _ "Are you sure there aren't any spiders?"
+	[/message]
 
-[message]
-description=Kaleh
-message= _ "Well we have get out of here too. Looks like we don't have any choice but to fight out way through the chaos."
-[/message]
+	[message]
+	speaker=unit
+	message= _ "No, but the water is rising to the southeast as well. The river must have lead to more tunnels than we first thought."
+	[/message]
+	
+	[message]
+	description=Zhul
+	message= _ "The ants must be fleeing from the flood too."
+	[/message]
+	
+	[message]
+	speaker=unit
+	message= _ "They seem confused, leaderless. I guess it's every ant for itself. Uh, oh. Some of them seem to have noticed us."
+	[/message]
+	
+	[message]
+	description=Kaleh
+	message= _ "Well we have get out of here too. Looks like we don't have any choice but to fight out way through the chaos."
+	[/message]
+	
+	[/then]
+	
+	[else]
+	
+	# Nym triggered event, change dialogue
+	
+	[message]
+	speaker=unit
+	message= _ "Hey look, more ants!"
+	[/message]
+
+	[message]
+	speaker=unit
+	message= _ "I don't see any spiders, but the water is rising to the southeast as well. The river must have lead to more tunnels than we first thought."
+	[/message]
+	
+	[message]
+	description=Zhul
+	message= _ "The ants must be fleeing from the flood too."
+	[/message]
+	
+	[message]
+	speaker=unit
+	message= _ "They seem confused, leaderless. I guess it's every ant for itself. Uh, oh. Some of them seem to have noticed us."
+	[/message]
+	
+	[message]
+	description=Kaleh
+	message= _ "Well we have get out of here too. Looks like we don't have any choice but to fight out way through the chaos."
+	[/message]
+	
+	[/else]
+	
+[/if]
+
+{CLEAR_VARIABLE unittest}
 
 [/event]
 
@@ -1666,8 +1723,7 @@ message= _ "They're definitely of the 'attack first, ask questions later' variet
 
 [/event]
 
-
-#when all humans are dead, show victor messages
+# when all humans are dead, play victory conversation
 
 [event]
 name=die
@@ -3852,9 +3908,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -3928,9 +3984,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4003,9 +4059,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4078,9 +4134,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4158,9 +4214,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4238,9 +4294,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4318,9 +4374,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4398,9 +4454,9 @@ value={Y_LOC}
 			[else]
 
 			[teleport]
-				[filter]
+			[filter]
 				description=Kaleh
-				[/filter]
+			[/filter]
 			x,y=$temp_x,$temp_y
 			[/teleport]
 
@@ -4857,7 +4913,7 @@ immediate=yes
 [event]
 name=moveto
 
-#event should only fire when elves step several hexes out into the dunes
+#event should only fire when unit steps several hexes out into the dunes
 
 [filter]
 x=25-50
@@ -4865,14 +4921,129 @@ y=19-31
 side=1
 [/filter]
 
-#change the description based on the time of day (night vs day)
+[store_locations]
+x,y=$x1,$y1
+[filter]
+	race=elf
+[/filter]
+variable=unittest
+[/store_locations]
 
-[message]
-speaker=unit
-message= _ "Praise Eloh, it is so good to be outside again.  To see the sky stretching out above me, to feel the wind in my face. ..."
-[/message]
+[if]
+	[variable]
+	name=unittest.length
+	numerical_equals=1
+	[/variable]
 
-#from a unit still in the cave
+	[then]
+	
+	[message]
+	speaker=unit
+	message= _ "Praise Eloh, it is so good to be outside again.  To see the sky stretching out above me, to feel the wind in my face..."
+	[/message]
+	
+	[/then]
+[/if]
+
+{CLEAR_VARIABLE unittest}
+
+[store_locations]
+x,y=$x1,$y1
+[filter]
+	description=$ally_name
+[/filter]
+variable=unittest
+[/store_locations]
+
+[if]
+	[variable]
+	name=unittest.length
+	numerical_equals=1
+	[/variable]
+
+	[then]
+	
+	[if]
+		[variable]
+		name=ally_race
+		equals=Dwarf
+		[/variable]
+	
+		[then]
+		# dwarf ally version
+		
+		[message]
+	speaker=unit
+	message= _ "I think we finally made it outside. I'd forgotten how big the sky is and windy it can be."
+		[/message]
+	
+		[/then]
+	
+		[else]
+		# troll ally version
+		
+		[message]
+	speaker=unit
+	message= _ "We made it. Outside look strange to $ally_name, $ally_name not used to big open spaces."
+		[/message]
+	
+		[/else]
+	[/if]
+	
+	[/then]
+[/if]
+
+{CLEAR_VARIABLE unittest}
+
+[store_locations]
+x,y=$x1,$y1
+[filter]
+	description=Kromph
+[/filter]
+variable=unittest
+[/store_locations]
+
+[if]
+	[variable]
+	name=unittest.length
+	numerical_equals=1
+	[/variable]
+
+	[then]
+	
+	[message]
+	speaker=unit
+	message= _ "Kromph is outside, but everything looks strange. What does mistress want Kromph to do?"
+	[/message]
+	
+	[message]
+	description=Nym
+	message= _ "Just stay where you are, I'll come up there myself"
+	[/message]
+	
+	# teleport nym next to kromph to see for herself
+
+	[teleport]
+	[filter]
+		description=Nym
+	[/filter]
+	x,y=$temp_x,$temp_y
+	[/teleport]
+	
+	[redraw]
+	[/redraw]
+	
+	[message]
+	description=Nym
+	message= _ "Praise Eloh, it is so good to be outside again.  To see the sky stretching out above me, to feel the wind in my face..."
+	[/message]
+	
+	[/then]
+[/if]
+
+{CLEAR_VARIABLE unittest}
+
+#from an elf still in the cave
 [message]
 x,y=12-23,15-20
 side=1
@@ -5016,10 +5187,10 @@ side=1
 	[/message]
 
 	[teleport]
-		[filter]
+	[filter]
 		description=Kaleh
-		[/filter]
-		x,y=25,23
+	[/filter]
+	x,y=25,23
 	[/teleport]
 
 	[/then]
@@ -5105,10 +5276,10 @@ side=1
 #troll/dwarf ally teleports to just outside of cave
 
 [teleport]
-	[filter]
+[filter]
 	description=$ally_name
-	[/filter]
-	x,y=21,23
+[/filter]
+x,y=21,23
 [/teleport]
 
 [message]
@@ -5377,10 +5548,10 @@ fire_event=no
 [/message]
 
 [teleport]
-	[filter]
+[filter]
 	description=Kaleh
-	[/filter]
-	x,y=18,19
+[/filter]
+x,y=18,19
 [/teleport]
 
 [if]
@@ -6988,24 +7159,24 @@ side=1
 [/remove_shroud]
 
 [teleport]
-	[filter]
+[filter]
 	description=Kaleh
-	[/filter]
-	x,y=61,6
+[/filter]
+x,y=61,6
 [/teleport]
 
 [teleport]
-	[filter]
+[filter]
 	description=Zhul
-	[/filter]
-	x,y=63,5
+[/filter]
+x,y=63,5
 [/teleport]
 
 [teleport]
-	[filter]
+[filter]
 	description=$ally_name
-	[/filter]
-	x,y=60,6
+[/filter]
+x,y=60,6
 [/teleport]
 
 [store_unit]
@@ -7054,10 +7225,10 @@ variable=Nymstats
 {CLEAR_VARIABLE Nymstats}
 
 [teleport]
-	[filter]
+[filter]
 	description=Nym
-	[/filter]
-	x,y=60,3
+[/filter]
+x,y=60,3
 [/teleport]
 
 [message]

data/campaigns/Under_the_Burning_Suns/units/Kaleh_Captain.cfg

@@ -86,40 +86,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelveskaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-miss.wav
 			[/frame]
 		[/animation]
@@ -132,40 +137,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]	
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-hit.wav
 			[/frame]
 		[/animation]

data/campaigns/Under_the_Burning_Suns/units/Kaleh_Champion.cfg

@@ -84,40 +84,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelveskaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-miss.wav
 			[/frame]
 		[/animation]
@@ -130,40 +135,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]	
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-hit.wav
 			[/frame]
 		[/animation]

data/campaigns/Under_the_Burning_Suns/units/Kaleh_Fighter.cfg

@@ -83,40 +83,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelveskaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-miss.wav
 			[/frame]
 		[/animation]
@@ -129,40 +134,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]	
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-hit.wav
 			[/frame]
 		[/animation]

data/campaigns/Under_the_Burning_Suns/units/Kaleh_Hero.cfg

@@ -82,40 +82,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelveskaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-miss.wav
 			[/frame]
 		[/animation]
@@ -128,40 +133,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]	
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-hit.wav
 			[/frame]
 		[/animation]

data/campaigns/Under_the_Burning_Suns/units/Kaleh_Marshal.cfg

@@ -87,40 +87,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelveskaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-miss.wav
 			[/frame]
 		[/animation]
@@ -133,40 +138,45 @@
 				image_diagonal=projectiles/missile-ne.png
 			[/missile_frame]
 			[frame]
-				begin=-600
-				end=-450
-				image=newelves/kaleh-ranged.png
+				begin=-445
+				end=-380
+				image="newelves/kaleh-ranged.png"
 			[/frame]
 			[frame]
-				begin=-450
-				end=-300
-				image=newelves/kaleh-ranged-1.png
+				begin=-380
+				end=-305
+				image="newelves/kaleh-ranged-1.png"
 			[/frame]
 			[frame]
-				begin=-300
-				end=-200
-				image=newelves/kaleh-ranged-2.png
+				begin=-305
+				end=-230
+				image="newelves/kaleh-ranged-2.png"
 			[/frame]
 			[frame]
-				begin=-200
+				begin=-230
+				end=-130
+				image="newelves/kaleh-ranged-3.png"
+			[/frame]	
+			[frame]
+				begin=-130
 				end=-100
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/kaleh-ranged-3.png
+				image="newelves/kaleh-ranged-4.png"
 			[/frame]
 			[frame]
 				begin=0
-				end=100
-				image=newelves/kaleh-ranged.png
+				end=65
+				image="newelves/kaleh-ranged.png"
 				sound=arrow-hit.wav
 			[/frame]
 		[/animation]

data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg

@@ -4,13 +4,13 @@
 	name= _ "Desert Hunter"
 	race=elf
 	gender=male
-	image=newelves/desert-hunter-nym.png
+	image=newelves/nym.png
 	profile=portraits/nym.png
 	[defend]
 		[frame]
 			begin=-150
 			end=150
-			image="newelves/desert-hunter-nym-defend.png"
+			image="newelves/nym-defend.png"
 		[/frame]
 	[/defend]
 	hitpoints=30
@@ -48,12 +48,12 @@
 			[frame]
 				begin=-350
 				end=-100
-				image=newelves/desert-hunter-nym-melee-1.png
+				image=newelves/nym-melee-1.png
 			[/frame]
 			[frame]
 				begin=-100
 				end=50
-				image=newelves/desert-hunter-nym-melee-2.png
+				image=newelves/nym-melee-2.png
 				sound=sword-swish.wav
 			[/frame]
 		[/animation]
@@ -76,34 +76,34 @@
 			[frame]
 				begin=-400
 				end=-250
-				image=newelves/desert-hunter-nym-ranged-1.png
+				image=newelves/nym-ranged-1.png
 			[/frame]
 			[frame]
 				begin=-250
 				end=-150
-				image=newelves/desert-hunter-nym-ranged-2.png
+				image=newelves/nym-ranged-2.png
 			[/frame]
 			[frame]
 				begin=-150
 				end=-100
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				sound=arrow-hit.wav
 				begin=0
 				end=1
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg

@@ -4,13 +4,13 @@
 	name= _ "Desert Prowler"
 	race=elf
 	gender=male
-	image=newelves/desert-hunter-nym.png
+	image=newelves/nym.png
 	profile=portraits/nym.png
 	[defend]
 		[frame]
 			begin=-150
 			end=150
-			image="newelves/desert-hunter-nym-defend.png"
+			image="newelves/nym-defend.png"
 		[/frame]
 	[/defend]
 	hitpoints=66
@@ -52,12 +52,12 @@
 			[frame]
 				begin=-350
 				end=-100
-				image=newelves/desert-hunter-nym-melee-1.png
+				image=newelves/nym-melee-1.png
 			[/frame]
 			[frame]
 				begin=-100
 				end=50
-				image=newelves/desert-hunter-nym-melee-2.png
+				image=newelves/nym-melee-2.png
 				sound=sword-swish.wav
 			[/frame]
 		[/animation]
@@ -80,34 +80,34 @@
 			[frame]
 				begin=-400
 				end=-250
-				image=newelves/desert-hunter-nym-ranged-1.png
+				image=newelves/nym-ranged-1.png
 			[/frame]
 			[frame]
 				begin=-250
 				end=-150
-				image=newelves/desert-hunter-nym-ranged-2.png
+				image=newelves/nym-ranged-2.png
 			[/frame]
 			[frame]
 				begin=-150
 				end=-100
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				begin=-99
 				end=0
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				sound=arrow-hit.wav
 				begin=0
 				end=1
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg

@@ -4,13 +4,13 @@
 	name= _ "Desert Sentinel"
 	race=elf
 	gender=male
-	image=newelves/desert-hunter-nym.png
+	image=newelves/nym.png
 	profile=portraits/nym.png
 	[defend]
 		[frame]
 			begin=-150
 			end=150
-			image="newelves/desert-hunter-nym-defend.png"
+			image="newelves/nym-defend.png"
 		[/frame]
 	[/defend]
 	hitpoints=44
@@ -51,12 +51,12 @@
 			[frame]
 				begin=-350
 				end=-100
-				image=newelves/desert-hunter-nym-melee-1.png
+				image=newelves/nym-melee-1.png
 			[/frame]
 			[frame]
 				begin=-100
 				end=50
-				image=newelves/desert-hunter-nym-melee-2.png
+				image=newelves/nym-melee-2.png
 				sound=sword-swish.wav
 			[/frame]
 		[/animation]
@@ -79,23 +79,23 @@
 			[frame]
 				begin=-400
 				end=-250
-				image=newelves/desert-hunter-nym-ranged-1.png
+				image=newelves/nym-ranged-1.png
 			[/frame]
 			[frame]
 				begin=-250
 				end=-150
-				image=newelves/desert-hunter-nym-ranged-2.png
+				image=newelves/nym-ranged-2.png
 			[/frame]
 			[frame]
 				begin=-150
 				end=-100
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				sound=firearrow.wav
 				begin=-100
 				end=-99
-				image=newelves/desert-hunter-nym-ranged-3.png
+				image=newelves/nym-ranged-3.png
 			[/frame]
 			[frame]
 				begin=-99