diff --git a/data/core/units/humans/Outlaw_Fugitive.cfg b/data/core/units/humans/Outlaw_Fugitive.cfg
index 704deea6fcb..a7c6b8f23c7 100644
--- a/data/core/units/humans/Outlaw_Fugitive.cfg
+++ b/data/core/units/humans/Outlaw_Fugitive.cfg
@@ -45,42 +45,30 @@
         [attack_filter]
             name=sling
         [/attack_filter]
-        hits=yes
         [missile_frame]
             begin=-150
             end=0
             image="projectiles/stone.png"
             image_diagonal="projectiles/stone.png"
         [/missile_frame]
-        [frame]
-            begin=-400
-            end=-100
-            image="units/human-outlaws/fugitive-ranged-1.png"
-            sound=sling.ogg
-        [/frame]
-        [frame]
-            begin=-100
-            end=50
-            image="units/human-outlaws/fugitive-ranged-2.png"
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [attack_filter]
-            name=sling
-        [/attack_filter]
-        hits=no
-        [missile_frame]
-            begin=-150
-            end=0
-            image="projectiles/stone.png"
-            image_diagonal="projectiles/stone.png"
-        [/missile_frame]
-        [frame]
-            begin=-400
-            end=-100
-            image="units/human-outlaws/fugitive-ranged-1.png"
-            sound=sling-miss.ogg
-        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-400
+                end=-100
+                image="units/human-outlaws/fugitive-ranged-1.png"
+                sound=sling.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-400
+                end=-100
+                image="units/human-outlaws/fugitive-ranged-1.png"
+                sound=sling-miss.ogg
+            [/frame]
+        [/else]
         [frame]
             begin=-100
             end=50
@@ -91,40 +79,28 @@
         [attack_filter]
             name=mace
         [/attack_filter]
-        hits=yes
         [frame]
             begin=-200
             end=-100
             image="units/human-outlaws/fugitive.png"
         [/frame]
-        [frame]
-            begin=-100
-            end=50
-            image="units/human-outlaws/fugitive-melee-1.png"
-            sound=mace.wav
-        [/frame]
-        [frame]
-            begin=50
-            end=150
-            image="units/human-outlaws/fugitive.png"
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [attack_filter]
-            name=mace
-        [/attack_filter]
-        hits=no
-        [frame]
-            begin=-200
-            end=-100
-            image="units/human-outlaws/fugitive.png"
-        [/frame]
-        [frame]
-            begin=-100
-            end=50
-            image="units/human-outlaws/fugitive-melee-1.png"
-            sound={SOUND_LIST:MISS}
-        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-100
+                end=50
+                image="units/human-outlaws/fugitive-melee-1.png"
+                sound=mace.wav
+            [/frame]
+        [/if]
+        [else]
+            [frame]
+                begin=-100
+                end=50
+                image="units/human-outlaws/fugitive-melee-1.png"
+                sound={SOUND_LIST:MISS}
+            [/frame]
+        [/else]
         [frame]
             begin=50
             end=150
@@ -140,11 +116,18 @@
         {DEFENSE_ANIM "units/human-outlaws/fugitive+female-defend.png" "units/human-outlaws/fugitive+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
         [attack_anim]
             [attack_filter]
-                name=mace
+                name=sling
             [/attack_filter]
-            [frame]
-                image="units/human-outlaws/fugitive+female-ranged-1.png"
-            [/frame]
+            [if]
+                [frame]
+                    image="units/human-outlaws/fugitive+female-ranged-1.png"
+                [/frame]
+            [/if]
+            [else]
+                [frame]
+                    image="units/human-outlaws/fugitive+female-ranged-1.png"
+                [/frame]
+            [/else]
             [frame]
                 image="units/human-outlaws/fugitive+female-ranged-2.png"
             [/frame]
@@ -156,9 +139,16 @@
             [frame]
                 image="units/human-outlaws/fugitive+female.png"
             [/frame]
-            [frame]
-                image="units/human-outlaws/fugitive+female-melee-1.png"
-            [/frame]
+            [if]
+                [frame]
+                    image="units/human-outlaws/fugitive+female-melee-1.png"
+                [/frame]
+            [/if]
+            [else]
+                [frame]
+                    image="units/human-outlaws/fugitive+female-melee-1.png"
+                [/frame]
+            [/else]
             [frame]
                 image="units/human-outlaws/fugitive+female.png"
             [/frame]