Merge pull request #99 from aquileia/master

graphics update for the shadow mage line

changelog

@@ -14,6 +14,8 @@ Version 1.11.9+dev:
        31,11 at the end of The Bay of Pearls, causing it to disappear
        forever.
      * S15 (The Lost General): fix bug of sighted events firing too early
+       * Liberty:
+     * Updated sprites for Shadow Mage line. 
    * Son of the Black Eye:
      * Rebalancing of the campaign is now complete
  * Editor:

data/campaigns/Liberty/units/Rogue_Mage.cfg

@@ -49,18 +49,28 @@
         missile_start_time=-200
         sound_start_time=-100
 
-        [missile_frame]
-            duration=200
-            halo=halo/mage-halo[1~5].png
-            halo_x,halo_y=10,-14
-        [/missile_frame]
+        [if]
+            hits=yes
+            [missile_frame]
+                image="projectiles/icemissile-n-[1,2,6,7].png:[50,100,25*2]"
+                image_diagonal="projectiles/icemissile-ne-[1,2,6,7].png:[50,100,25*2]"
+                offset=0.0~1.0
+                sound=magicmissile.wav
+            [/missile_frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                image="projectiles/icemissile-n-[1,2,3,6,7].png:[75,25*4]"
+                image_diagonal="projectiles/icemissile-ne-[1,2,3,6,7].png:[75,25*4]"
+                offset=0.0~0.5
+                alpha=1:75,0.8~0.2:100
+                sound=magicmissile.wav
+            [/missile_frame]
+        [/else]
         [frame]
             image="units/human-outlaws/rogue-mage.png:300"
         [/frame]
-
-        [sound_frame]
-            sound=magicmissile.wav
-        [/sound_frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]

data/campaigns/Liberty/units/Shadow_Lord.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-l
+#textdomain wesnoth-l
 
 [unit_type]
     id=Shadow Lord
@@ -22,6 +22,12 @@
     usage=mixed fighter
     description= _ "Few humans fathom the secrets of light and dark magic and retain their sanity. Those that can master that balance become Shadow Lords, fully existing neither in the world of light nor the world of darkness. No longer needing physical weapons, they are fearsome to both their enemies and those they lord over."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP}
     die_sound={SOUND_LIST:HUMAN_DIE}
+	[standing_anim]
+        start_time=0
+        [frame]
+            image="units/human-outlaws/shadow-lord.png:70,units/human-outlaws/shadow-lord-[1~7].png:70"
+        [/frame]
+    [/standing_anim]
     {DEFENSE_ANIM "units/human-outlaws/shadow-lord.png" "units/human-outlaws/shadow-lord.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     [attack]
         name=astral blade
@@ -67,40 +73,39 @@
         start_time=-250
         missile_start_time=-175
 
-        [missile_frame]
-            duration=200
-            image=projectiles/shadowmissile-n.png
-            image_diagonal=projectiles/shadowmissile-ne.png
-        [/missile_frame]
-
+        [if]
+            hits=yes
+            [missile_frame]
+                # image="projectiles/fireball-impact-[13~11].png~CROP(5,0,90,90):[50*2,100]"
+                image="projectiles/shadow-blast-n-[1~3].png:[50*2,100]"
+                image_diagonal="projectiles/shadow-blast-ne-[1~3].png:[50*2,100]"
+            [/missile_frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                image="projectiles/shadow-blast-n-[1,2,1].png:[50*2,100]"
+                image_diagonal="projectiles/shadow-blast-ne-[1,2,1].png:[50*2,100]"
+                alpha=1.0~0.0:200
+            [/missile_frame]
+        [/else]
+        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -200}
         [frame]
             image="units/human-outlaws/shadow-lord.png:400"
         [/frame]
-
-        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -200}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=shadow bolt
         [/filter_attack]
 
-        start_time=-250
-        missile_start_time=-175
-        sound_start_time=-200
-
-        [missile_frame]
-            duration=200
-            image=projectiles/shadowmissile-n.png
-            image_diagonal=projectiles/shadowmissile-ne.png
-        [/missile_frame]
+        {MISSILE_FRAME_SHADOW_WAVE}
 
+        start_time=-400
         [frame]
             image="units/human-outlaws/shadow-lord.png:400"
         [/frame]
-
-        [sound_frame]
-            sound=magicmissile.wav
-        [/sound_frame]
+        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -200}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
@@ -115,4 +120,4 @@
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75}
     [/attack_anim]
-[/unit_type]
+[/unit_type]

data/campaigns/Liberty/units/Shadow_Mage.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-l
+#textdomain wesnoth-l
 
 [unit_type]
     id=Shadow Mage
@@ -21,6 +21,12 @@
     usage=mixed fighter
     description= _ "Years of violence and brutality to support the study of forbidden magical arts have turned the shadow mages into feared fighters. Now completely enthralled with power, they have been known to command small followings of henchmen. They are outmatched in direct magical combat with their magic-using peers, instead channeling their energies into devastating melee attacks. Despite their offensive power, the corruption in their souls has begun to adversely affect their health."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}
     die_sound={SOUND_LIST:HUMAN_DIE}
+    [standing_anim]
+        start_time=0
+        [frame]
+            image="units/human-outlaws/shadow-mage.png:100,units/human-outlaws/shadow-mage-[1~5].png:[80*2,100,80*2]"
+        [/frame]
+    [/standing_anim]
     {DEFENSE_ANIM "units/human-outlaws/shadow-mage.png" "units/human-outlaws/shadow-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     [attack]
         name=short sword
@@ -59,12 +65,13 @@
             duration=200
             image="projectiles/darkmissile-n.png"
             image_diagonal=projectiles/darkmissile-ne.png
+            directional_x=20~0
         [/missile_frame]
 
         [frame]
             image="units/human-outlaws/shadow-mage.png"
-            halo=halo/shadow-mage-halo[1~10].png:50
-            halo_x,halo_y=12,-5
+            halo=halo/shadow-mage-halo[1~10].png~O(0.6):50
+            halo_x=25
         [/frame]
 
         [sound_frame]
@@ -84,4 +91,4 @@
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75}
     [/attack_anim]
-[/unit_type]
+[/unit_type]