Fire Wraith and Jinn (#5790)

* initial commit of Fire Wraith

* initial Jinn revision

data/core/units/monsters/Fire_Wraith.cfg

@@ -0,0 +1,88 @@
+#textdomain wesnoth-units
+
+#define IMG_PATH_TEMP
+units/monsters/firewraith#enddef
+
+[unit_type]
+    id=Fire Wraith
+    name= _ "Fire Wraith"
+    race=monster
+    {TRAIT_ELEMENTAL}
+    image="{IMG_PATH_TEMP}/firewraith.png"
+    {DEFENSE_ANIM "{IMG_PATH_TEMP}/firewraith-defend2.png" "{IMG_PATH_TEMP}/firewraith-defend1.png" {SOUND_LIST:DRAKE_HIT} }
+    [standing_anim]
+        start_time=0
+        [frame]
+            image="{IMG_PATH_TEMP}/firewraith-s[1~8].png:100"
+            halo=halo/illuminates-aura.png~O(0.6)~SCALE(70,90)
+        [/frame]
+    [/standing_anim]
+    hitpoints=41
+    movement_type=drakefly
+    [resistance]
+        blade=90
+        pierce=90
+        impact=90
+    [/resistance]
+    movement=6
+    experience=80
+    level=2
+    alignment=neutral
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=25
+    usage=mixed fighter
+    die_sound=drake-die.ogg
+    description= _ "Fire Wraiths are spirits of smoke and flame. No one is exactly sure where they come from, but they are occasionally summoned by powerful mages to do their bidding. The odd armor they wear hints at a former life or creator, but whatever ancient civilization was involved has been lost to history."
+    [attack]
+        name=fire claws
+        description= _ "fire claws"
+        type=fire
+        icon=attacks/claws-fire-elemental.png
+        range=melee
+        damage=6
+        number=3
+    [/attack]
+    [attack]
+        name=fire breath
+        description= _ "fire breath"
+        icon=attacks/fire-blast.png
+        type=fire
+        range=ranged
+        damage=12
+        number=2
+    [/attack]
+    [death]
+        start_time=0
+        [frame]
+            image="{IMG_PATH_TEMP}/firewraith.png:100"
+        [/frame]
+        [frame]
+            image="units/monsters/fireghost-death[3~6].png:100"
+        [/frame]
+    [/death]
+    [attack_anim]
+        [filter_attack]
+            name=fire claws
+        [/filter_attack]
+        offset=0.0~-0.1:100,-0.1~0.0:50,0.0~0.3:50,0.3~0.5:100,0.5~0.6:50,0.6~0.4:100,0.4~0.2:50,0.2~0.0:100
+        start_time=-350
+        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
+        [frame]
+            image="{IMG_PATH_TEMP}/firewraith.png:350"
+        [/frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=fire breath
+        [/filter_attack]
+        {MISSILE_FRAME_FIRE_BREATH 11,-34 11,15 24,-22 26,10}
+        start_time=-500
+        [frame]
+            image="{IMG_PATH_TEMP}/firewraith.png:450"
+        [/frame]
+        {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -400}
+    [/attack_anim]
+[/unit_type]
+
+#undef IMG_PATH_TEMP

data/core/units/monsters/Jinn.cfg

@@ -1,10 +1,14 @@
 #textdomain wesnoth-units
+
+#define IMG_PATH_TEMP
+units/monsters/jinn#enddef
+
 [unit_type]
     id=Jinn
     name= _ "Jinn"
     race=monster
     {TRAIT_ELEMENTAL}
-    image="units/monsters/jinn.png"
+    image="{IMG_PATH_TEMP}/jinn.png"
     hitpoints=58
     movement_type=spirit
     movement=8
@@ -17,17 +21,89 @@
     usage=archer
     description=""
     {NOTE_MAGICAL}
-    die_sound={SOUND_LIST:HUMAN_DIE}
+    die_sound={SOUND_LIST:HUMAN_OLD_DIE}
     undead_variation=null
-    {DEFENSE_ANIM "units/monsters/jinn.png" "units/monsters/jinn.png" {SOUND_LIST:HUMAN_HIT}}
+    [defend]
+        start_time=-126
+        [frame]
+            image={IMG_PATH_TEMP}/jinn-defend[1,2,1].png:[1,250,1]
+        [/frame]
+        [if]
+            hit_sound_start_time=-25
+            hits=hit
+            [hit_sound_frame]
+                sound={SOUND_LIST:HUMAN_OLD_HIT}
+            [/hit_sound_frame]
+            sandhalo_start_time=-70
+            sandhalo_y=-6
+            [sandhalo_frame]
+                halo="{IMG_PATH_TEMP}/sand-halo-[1~6].png~O(0.7):[50,60,70*4]"
+                auto_vflip=no
+            [/sandhalo_frame]
+            [frame]
+                image="{IMG_PATH_TEMP}/jinn-defend1.png:194"
+            [/frame]
+        [/if]
+    [/defend]
+    [death]
+        start_time=0
+        sandhalo_start_time=0
+        sandhalo_y=-6~-22:670
+        sandhalo_offset=0.0~-0.3:670
+        alpha=1.0~0.0:670
+        [frame]
+            image={IMG_PATH_TEMP}/jinn-defend1.png:670,misc/blank-hex.png:1
+        [/frame]
+        [sandhalo_frame]
+            halo="{IMG_PATH_TEMP}/sand-halo-[1~6].png:[70,80,100,120,140,160]"
+            auto_vflip=no
+        [/sandhalo_frame]
+    [/death]
+    [standing_anim]
+        start_time=0
+        top_start_time=0
+        top_y=-2~2:1000,2~-2:1000
+        [frame]
+            image="{IMG_PATH_TEMP}/jinn-bottom[1~3,2,1~6,1,4,3].png:[150*12,200]"
+        [/frame]
+        [top_frame]
+            image="{IMG_PATH_TEMP}/jinn-top.png:400,{IMG_PATH_TEMP}/jinn-top-hi.png:400,{IMG_PATH_TEMP}/jinn-top.png:600,{IMG_PATH_TEMP}/jinn-top-lo.png:600,"
+            auto_vflip=no
+        [/top_frame]
+    [/standing_anim]
+    [movement_anim]
+        start_time=0
+        offset=0.0~1.0:200
+        [frame]
+            image="{IMG_PATH_TEMP}/jinn.png:200"
+        [/frame]
+    [/movement_anim]
     [attack]
-        name=desert fire
-        description= _ "desert fire"
-        icon=attacks/fire-blast.png
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws-undead.png
+        type=blade
+        range=melee
+        damage=6
+        number=2
+    [/attack]
+    [attack]
+        name=desert windblast
+        description= _ "desert windblast"
+        icon=attacks/dark-missile.png~GS()~CS(20,-10,-110)
+        type=impact
+        range=ranged
+        damage=7
+        number=4
+    [/attack]
+    [attack]
+        name=desert lightning
+        description= _ "desert lightning"
+        icon=attacks/lightning.png
         type=fire
         range=ranged
-        damage=8
-        number=4
+        damage=18
+        number=1
         [specials]
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
@@ -35,15 +111,65 @@
 
     [attack_anim]
         [filter_attack]
-            name=desert fire
+            name=desert windblast
+        [/filter_attack]
+
+        # can't get missile offset or alpha to do anything other than default, will worry about it later
+        missile_start_time=-220
+        missile_alpha=0.0~0.6:100,0.6~0.0:220
+        missile_offset=-0.3~1.2:320
+        [if]
+            hits=yes
+            [missile_frame]
+                halo="halo/elven/druid-healing[1~8].png:40"
+                halo_mod="~CS(55,15,-65)"
+                #    offset=-0.5~1.2:320
+            [/missile_frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                halo="halo/elven/druid-healing[1~8].png:40"
+                halo_mod="~CS(55,15,-65)"
+                halo_y=0:50,0~-72:320
+                #   offset=-0.5~0.4:320
+            [/missile_frame]
+        [/else]
+
+        start_time=-220
+        [frame]
+            image="{IMG_PATH_TEMP}/jinn.png:400"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS magic-dark-big.ogg magic-dark-big-miss.ogg -100}
+    [/attack_anim]
+
+    # there is only one strike, if more are added, consider making more lightning bolt directions, like Elder Mage
+    [attack_anim]
+        [filter_attack]
+            name=desert lightning
+        [/filter_attack]
+
+        {LIGHTNING_BOLT 1}
+
+        start_time=-300
+        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -300}
+        [frame]
+            image="{IMG_PATH_TEMP}/jinn.png:550"
+        [/frame]
+    [/attack_anim]
+
+    [attack_anim]
+        [filter_attack]
+            name=claws
         [/filter_attack]
 
         start_time=-200
-
+        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/monsters/jinn.png:300"
+            image="{IMG_PATH_TEMP}/jinn.png:450"
         [/frame]
-
-        {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -100}
     [/attack_anim]
 [/unit_type]
+
+#undef IMG_PATH_TEMP