UtBS - units - Replacing inconsistent Dark Assassin unit/sprite data (#4906)

* UtBS - units - Replacing inconsistent Dark Assassin unit/sprite data

* UtBS units - dark assassin animations

* UtBS - units - some small tweaks to Dark Assassin

* UtBS - Sc8 - wire in new Dark Assassin unit type

data/campaigns/Under_the_Burning_Suns/_main.cfg

@@ -220,7 +220,7 @@
     {UTBS_INCLUDE units/humans}
     {UTBS_INCLUDE units/monsters}
     {UTBS_INCLUDE units/nagas}
-    {UTBS_INCLUDE units/orcs}
+    {UTBS_INCLUDE units/other}
     {UTBS_INCLUDE units/undead}
 
     [hide_help]

data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg

@@ -2472,9 +2472,13 @@
             message= _ "No, you have hounded me with your riddles for too long. I want some answers. Who are you? What’s behind that black mask?"
         [/message]
 
+        [transform_unit]
+            id=Cloaked Figure
+            transform_to=Dark Assassin Uncloaked
+        [/transform_unit]
+
         [message]
             speaker=Cloaked Figure
-            image=portraits/uncloaked.png
             message= _ "Behold, Kaleh, your own worst enemy. Do you now see the irony?"
         [/message]
 
@@ -2504,10 +2508,30 @@
             message= _ "So be it. I care not."
         [/message]
 
-        [kill]
-            id=Cloaked Figure
-            animate,fire_event=no,no
-        [/kill]
+        # storing and modifying so whatever XP, traits, etc. he got are carried over to his final dialog
+
+        [store_unit]
+            [filter]
+                id=Cloaked Figure
+            [/filter]
+            kill=yes
+            variable=cloaked_figure
+        [/store_unit]             
+
+        [set_variable]
+            name=cloaked_figure.name
+            value="Keratur"
+        [/set_variable]
+
+        [set_variable]
+            name=cloaked_figure.hitpoints
+            value=5
+        [/set_variable]
+
+        [set_variable]
+            name=cloaked_figure.side
+            value=1
+        [/set_variable]
 
         # When a unit moves into human outpost cavern, they see the human base
         # and the dead guards. If unit is not Kaleh, Kaleh comes up to see.
@@ -2640,28 +2664,19 @@
                 message= _ "Now, Keratur, I will have my answers. Did you have a hand in this?"
             [/message]
 
-            #create keratur in a blank space near kaleh
+            #unstore keratur in a blank space near kaleh
 
-            [unit]
-                type=Dark Assassin3
-                id=Keratur
-                name= _ "Keratur"
-                profile=portraits/uncloaked.png
-                x=$x1
-                y=$y1
-                side=1
-                hitpoints=5
-                placement=map
-                passable=yes
-                [modifications]
-                    {TRAIT_INTELLIGENT}
-                    {TRAIT_RESILIENT}
-                [/modifications]
-            [/unit]
+            [unstore_unit]
+                variable=cloaked_figure
+                x,y=$x1,$y1
+                find_vacant=yes
+                advance=no
+            [/unstore_unit]
+
+            {CLEAR_VARIABLE cloaked_figure}
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "They heard me and... and they got in the way. But they aren’t even elves, what do they matter?"
             [/message]
 
@@ -2676,8 +2691,7 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "Heh, heh, no you didn’t find me. I awoke trapped under the rubble, and when I finally escaped the village was deserted. Just the stink of death and destruction. And then I saw them, hordes of undead pouring down from across the dunes. A cabal of necromancers... they found me and made me watch, they made me watch it all!"
             [/message]
 
@@ -2687,8 +2701,7 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "They brought some humans, bound up tight. So beautiful... she had flaming red hair... they cut her... I can still hear her screaming. But that was only the beginning. They chanted words of power, and spilled the hot blood onto the sand and then I heard their screams of agony and pain..."
             [/message]
 
@@ -2698,8 +2711,7 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "Faugh. No, I heard the screams of the dead, torn from their rest, their souls rose into the air howling in agony."
             [/message]
 
@@ -2709,14 +2721,12 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "Fool. That did not stop their dark power. Nothing could stop them. I felt the rush of flying spirits, and the unbearable cold, so cold. For a moment I felt their torment. But no, they wouldn’t kill me. They let me go as a witness and laughed as I scrambled over the dunes."
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "I was able to follow your trail, and I slipped among your people. No one noticed me, no I was too sneaky. And you wondered how I managed to follow you through the tunnels? Hah, you escorted me."
             [/message]
 
@@ -2726,8 +2736,7 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "You abandoned them! The pain, the agony, I still see their ghostly faces and hear their wails. And the necromancers kept chanting one name over and over: Yechnagoth, Yechnagoth, it reverberated in my ears. And every time I sleep I hear that name, and laughter, hideous laughter. She kept telling me it was your fault. And I believed her. Kaleh, forgive me, I just wanted to make the pain stop."
             [/message]
 
@@ -2737,15 +2746,14 @@
             [/message]
 
             [message]
-                speaker=Keratur
-                image=portraits/uncloaked.png
+                speaker=Cloaked Figure
                 message= _ "I do not fear death any more."
             [/message]
 
             #kill keratur
 
             [kill]
-                id=Keratur
+                id=Cloaked Figure
                 animate=yes
                 fire_event=no
             [/kill]

data/campaigns/Under_the_Burning_Suns/units/other/Dark_Assassin1.cfg

@@ -2,9 +2,26 @@
 [unit_type]
     id=Dark Assassin1
     name= _ "Dark Assassin"
-    race=orc
-    image=units/orcs/nightblade-se.png
-    {DEFENSE_ANIM "units/orcs/nightblade-defend-se-2-1.png" "units/orcs/nightblade-defend-se-2-2.png" {SOUND_LIST:ORC_SMALL_HIT}}
+    race=elf
+    image=units/other/dark-assassin.png
+    [defend]
+        start_time=-126
+        hits=yes
+        [frame]
+            image=units/other/dark-assassin-defend-1.png:1,units/other/dark-assassin-defend-2.png:250,units/other/dark-assassin-defend-1.png:1
+        [/frame]
+        hit_sound_start_time=-25
+        [hit_sound_frame]
+            sound={SOUND_LIST:ORC_SMALL_HIT}
+        [/hit_sound_frame]
+    [/defend]
+    [defend]
+        start_time=-126
+        hits=no
+        [frame]
+            image=units/other/dark-assassin-defend-1.png:1,units/other/dark-assassin-defend-2-miss.png:250,units/other/dark-assassin-defend-1.png:1
+        [/frame]
+    [/defend]
     profile=portraits/cloaked.png
     hitpoints=52
     movement_type=elusivefoot
@@ -18,32 +35,18 @@
     usage=fighter
     description= _ "The Dark Assassin appears and disappears at a moment’s notice. No one knows where he came from or why he acts the way he does, but the trail of death he leaves in his wake is unmistakeable."
     {NOTE_POISON}
-    [defend]
-        start_time=-150
-        sound_start_time=-25
-        [if]
-            hits=hit
-            [sound_frame]
-                sound={SOUND_LIST:ORC_SMALL_HIT}
-            [/sound_frame]
-        [/if]
-
-        [frame]
-            image="units/orcs/nightblade-defend-se-1-[1~5].png:100"
-        [/frame]
-    [/defend]
     [attack]
-        name=scythe
-        description= _"scythe"
-        icon=attacks/scythe.png
+        name=dagger
+        description= _"dagger"
+        icon=attacks/blade-curved.png
         type=blade
         range=melee
         damage=9
         number=3
     [/attack]
     [attack]
-        name=darts
-        description= _"darts"
+        name=knives
+        description= _"throwing knives"
         icon=attacks/dagger-thrown-poison-human.png
         type=blade
         range=ranged
@@ -55,10 +58,10 @@
     [/attack]
     [attack_anim]
         [filter_attack]
-            name=darts
+            name=knives
         [/filter_attack]
 
-        start_time=-350
+        start_time=-250
         missile_start_time=-100
 
         [missile_frame]
@@ -68,20 +71,23 @@
         [/missile_frame]
 
         [frame]
-            image="units/orcs/nightblade-throw-se-[1~9].png:100"
+            image="units/other/dark-assassin.png:700"
         [/frame]
 
         {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=scythe
+            name=dagger
         [/filter_attack]
 
-        start_time=-550
-
+        start_time=-400
+        offset=0.0:150,0.0~0.6:250,0.6~0.0:350
         [frame]
-            image="units/orcs/nightblade-attack-se-[1~9].png:100"
+            image="units/other/dark-assassin-attack[1~3].png:175"
+        [/frame]
+        [frame]
+            image="units/other/dark-assassin.png:225"
         [/frame]
 
         {SOUND:HIT_AND_MISS dagger-swish.wav {SOUND_LIST:MISS} -100}

data/campaigns/Under_the_Burning_Suns/units/other/Uncloaked.cfg

@@ -0,0 +1,21 @@
+#textdomain wesnoth-utbs
+
+[unit_type]
+    [base_unit]
+        id=Dark Assassin1
+    [/base_unit]
+    id=Dark Assassin Uncloaked
+    image=units/other/dark-assassin-uncloaked.png
+    profile=portraits/uncloaked.png
+    hitpoints=68	# +16 from Dark Assassin1
+    hide_help=yes
+    do_not_list=yes
+    [attack]
+        # Change first attack (melee)
+        damage=10	# +1 from Dark Assassin1
+    [/attack]
+    [attack]
+        # Change second attack (ranged)
+        damage=7	# +1 from Dark Assassin1
+    [/attack]
+[/unit_type]