mail[Wesnoth-commits] r33799 - in /trunk/data/core: images/units/merfolk/ units/merfolk/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by kettering . richard on March 18, 2009 - 08:01:
Author: jetryl
Date: Wed Mar 18 08:01:05 2009
New Revision: 33799

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33799&view=rev
Log:
New base frames for the mermaid siren and enchantress.

Removed:
    trunk/data/core/images/units/merfolk/enchantress-defend.png
    trunk/data/core/images/units/merfolk/enchantress-staff-attack.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack1.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack2.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack3.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack4.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack5.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack6.png
    trunk/data/core/images/units/merfolk/enchantress-water-attack7.png
    trunk/data/core/images/units/merfolk/siren-defend.png
    trunk/data/core/images/units/merfolk/siren-naia-touch-attack1.png
    trunk/data/core/images/units/merfolk/siren-naia-touch-attack2.png
    trunk/data/core/images/units/merfolk/siren-naia-touch-attack3.png
    trunk/data/core/images/units/merfolk/siren-naia-touch-attack4.png
    trunk/data/core/images/units/merfolk/siren-water-attack1.png
    trunk/data/core/images/units/merfolk/siren-water-attack2.png
    trunk/data/core/images/units/merfolk/siren-water-attack3.png
    trunk/data/core/images/units/merfolk/siren-water-attack4.png
    trunk/data/core/images/units/merfolk/siren-water-attack5.png
    trunk/data/core/images/units/merfolk/siren-water-attack6.png
    trunk/data/core/images/units/merfolk/siren-water-attack7.png
Modified:
    trunk/data/core/units/merfolk/Enchantress.cfg
    trunk/data/core/units/merfolk/Siren.cfg

Removed: trunk/data/core/images/units/merfolk/enchantress-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-defend.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-staff-attack.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-staff-attack.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack1.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack2.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack3.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack4.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack4.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack5.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack5.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack6.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack6.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/enchantress-water-attack7.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/enchantress-water-attack7.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-defend.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-naia-touch-attack1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-naia-touch-attack1.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-naia-touch-attack2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-naia-touch-attack2.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-naia-touch-attack3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-naia-touch-attack3.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-naia-touch-attack4.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-naia-touch-attack4.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack1.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack2.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack3.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack4.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack4.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack5.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack5.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack6.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack6.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/units/merfolk/siren-water-attack7.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/merfolk/siren-water-attack7.png?rev=33798&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/data/core/units/merfolk/Enchantress.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/merfolk/Enchantress.cfg?rev=33799&r1=33798&r2=33799&view=diff
==============================================================================
--- trunk/data/core/units/merfolk/Enchantress.cfg (original)
+++ trunk/data/core/units/merfolk/Enchantress.cfg Wed Mar 18 08:01:05 2009
@@ -6,6 +6,7 @@
     gender=female
     image="units/merfolk/enchantress.png"
     profile=portraits/merfolk/initiate.png
+    {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=38
     movement_type=swimmer
     movement=6
@@ -18,7 +19,7 @@
     usage=mixed fighter
     description= _ "Mermaids, like elves, have a powerful and native ability 
in magic, though theirs is considerably different than that of the elves. 
Those who master this ability are held in high regard, and their skill is 
used in a multitude of crafts, many of which humanity would never dream. The 
obvious use in war is forbidden against their own race - this power is the 
greater part of what protects their people from the monsters that wander out 
of the abyss."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/enchantress-defend.png" 
"units/merfolk/enchantress.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/enchantress.png" 
"units/merfolk/enchantress.png" mermaid-hit.ogg }
     [portrait]
         size=400
         side="left"
@@ -62,73 +63,70 @@
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
         [/missile_frame]
+        start_time=-420
+
+        [missile_frame]
+            begin=-165
+            end=0
+            image="projectiles/water-spray.png"
+            image_diagonal="projectiles/water-spray.png"
+        [/missile_frame]
+        {MERMAID_WATER_BLAST_HALO}
+        {MERMAID_STAFF_FLARE 16 -12}
+
         [frame]
-            begin=-450
-            end=-400
-            image="units/merfolk/enchantress-water-attack1.png"
+            duration=70
+            image="units/merfolk/enchantress.png" ### magic-1
         [/frame]
         [frame]
-            begin=-400
-            end=-350
-            image="units/merfolk/enchantress-water-attack2.png"
+            duration=230
+            image="units/merfolk/enchantress.png" ### magic-2
         [/frame]
         [frame]
-            begin=-350
-            end=-300
-            image="units/merfolk/enchantress-water-attack3.png"
+            duration=50
+            image="units/merfolk/enchantress.png" ### magic-2
+            sound=water-blast.wav
         [/frame]
         [frame]
-            begin=-300
-            end=-225
-            image="units/merfolk/enchantress-water-attack4.png"
-        [/frame]
-        [frame]
-            begin=-225
-            end=-140
-            image="units/merfolk/enchantress-water-attack5.png"
-        [/frame]
-        [frame]
-            begin=-140
-            end=-75
-            image="units/merfolk/enchantress-water-attack6.png"
-        [/frame]
-        [frame]
-            begin=-75
-            end=0
-            image="units/merfolk/enchantress-water-attack7.png"
-            sound=water-blast.wav
+            duration=80
+            image="units/merfolk/enchantress.png" ### magic-1
         [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=staff
         [/filter_attack]
+        start_time=-250
         [frame]
-            begin=-200
-            end=-150
+            duration=50
             image="units/merfolk/enchantress.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/enchantress.png" ### attack-1
         [/frame]
         [if]
             hits=yes
             [frame]
-                begin=-150
-                end=100
-                image="units/merfolk/enchantress-staff-attack.png"
+                duration=200
+                       image="units/merfolk/enchantress.png" ### attack-2
                 sound=staff.wav
             [/frame]
         [/if]
         [else]
             hits=no
             [frame]
-                begin=-150
-                end=100
-                image="units/merfolk/enchantress-staff-attack.png"
+                duration=200
+                       image="units/merfolk/enchantress.png" ### attack-2
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
         [frame]
-            begin=100
-            end=175
+            duration=50
+            image="units/merfolk/enchantress.png" ### magic-1
+        [/frame]
+        [frame]
+            duration=50
             image="units/merfolk/enchantress.png"
         [/frame]
     [/attack_anim]

Modified: trunk/data/core/units/merfolk/Siren.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/merfolk/Siren.cfg?rev=33799&r1=33798&r2=33799&view=diff
==============================================================================
--- trunk/data/core/units/merfolk/Siren.cfg (original)
+++ trunk/data/core/units/merfolk/Siren.cfg Wed Mar 18 08:01:05 2009
@@ -6,6 +6,7 @@
     gender=female
     image="units/merfolk/siren.png"
     profile=portraits/merfolk/initiate.png
+    {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=49
     movement_type=swimmer
     movement=7
@@ -21,7 +22,7 @@
 
 The myriad applications of this rarely occur to land dwellers, who simply 
regard it with wonder."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/siren-defend.png" "units/merfolk/siren.png" 
mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/siren.png" "units/merfolk/siren.png" 
mermaid-hit.ogg }
     [portrait]
         size=400
         side="left"
@@ -64,84 +65,71 @@
         [filter_attack]
             name=water spray
         [/filter_attack]
+        start_time=-420
+
         [missile_frame]
             begin=-165
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
         [/missile_frame]
+        {MERMAID_WATER_BLAST_HALO}
+        {MERMAID_STAFF_FLARE 16 -12}
+
         [frame]
-            begin=-450
-            end=-400
-            image="units/merfolk/siren-water-attack1.png"
+            duration=70
+            image="units/merfolk/siren.png" ### magic-1
         [/frame]
         [frame]
-            begin=-400
-            end=-350
-            image="units/merfolk/siren-water-attack2.png"
+            duration=230
+            image="units/merfolk/siren.png" ### magic-2
         [/frame]
         [frame]
-            begin=-350
-            end=-300
-            image="units/merfolk/siren-water-attack3.png"
-        [/frame]
-        [frame]
-            begin=-300
-            end=-225
-            image="units/merfolk/siren-water-attack4.png"
-        [/frame]
-        [frame]
-            begin=-225
-            end=-140
-            image="units/merfolk/siren-water-attack5.png"
+            duration=50
+            image="units/merfolk/siren.png" ### magic-2
             sound=water-blast.wav
         [/frame]
         [frame]
-            begin=-140
-            end=-75
-            image="units/merfolk/siren-water-attack6.png"
-        [/frame]
-        [frame]
-            begin=-75
-            end=0
-            image="units/merfolk/siren-water-attack7.png"
+            duration=80
+            image="units/merfolk/siren.png" ### magic-1
         [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=naia touch
         [/filter_attack]
+        start_time=-250
         [frame]
-            begin=-200
-            end=-150
-            image="units/merfolk/siren-naia-touch-attack1.png"
+            duration=50
+            image="units/merfolk/siren.png"
         [/frame]
         [frame]
-            begin=-150
-            end=-95
-            image="units/merfolk/siren-naia-touch-attack2.png"
+            duration=100
+            image="units/merfolk/siren.png" ### attack-1
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                duration=200
+                       image="units/merfolk/siren.png" ### attack-2
+                sound=staff.wav
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                duration=200
+                       image="units/merfolk/siren.png" ### attack-2
+                sound={SOUND_LIST:MISS}
+            [/frame]
+        [/else]
+        [frame]
+            duration=50
+            image="units/merfolk/siren.png" ### magic-1
         [/frame]
         [frame]
-            begin=-95
-            end=-30
-            image="units/merfolk/siren-naia-touch-attack3.png"
-            halo=halo/siren-naia-touch-halo.png
-        [/frame]
-        [frame]
-            begin=-30
-            end=65
-            image="units/merfolk/siren-naia-touch-attack4.png"
-            halo=halo/siren-naia-touch-halo.png
-        [/frame]
-        [frame]
-            begin=65
-            end=115
-            image="units/merfolk/siren-naia-touch-attack2.png"
-        [/frame]
-        [frame]
-            begin=115
-            end=150
-            image="units/merfolk/siren-naia-touch-attack1.png"
+            duration=50
+            image="units/merfolk/siren.png"
         [/frame]
     [/attack_anim]
 [/unit_type]




Related Messages


Powered by MHonArc, Updated Wed Mar 18 08:20:20 2009