mail[Wesnoth-commits] r20760 - in /trunk/data/core: sounds/ units/dwarves/


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

Header


Content

Posted by lari . nieminen on September 28, 2007 - 13:56:
Author: zookeeper
Date: Fri Sep 28 13:55:37 2007
New Revision: 20760

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20760&view=rev
Log:
Better dwarf laugh sound (now also used on the ulfserker).

Added:
    trunk/data/core/sounds/dwarf-laugh.wav   (with props)
Removed:
    trunk/data/core/sounds/dwarf-laugh.ogg
Modified:
    trunk/data/core/units/dwarves/Berserker.cfg
    trunk/data/core/units/dwarves/Ulfserker.cfg

Removed: trunk/data/core/sounds/dwarf-laugh.ogg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/sounds/dwarf-laugh.ogg?rev=20759&view=auto
==============================================================================
Binary file - no diff available.

Added: trunk/data/core/sounds/dwarf-laugh.wav
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/sounds/dwarf-laugh.wav?rev=20760&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/sounds/dwarf-laugh.wav
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/data/core/units/dwarves/Berserker.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/dwarves/Berserker.cfg?rev=20760&r1=20759&r2=20760&view=diff
==============================================================================
--- trunk/data/core/units/dwarves/Berserker.cfg (original)
+++ trunk/data/core/units/dwarves/Berserker.cfg Fri Sep 28 13:55:37 2007
@@ -148,7 +148,7 @@
                 begin=-225
                 end=-175
                 image="units/dwarves/berserker.png"
-                sound=dwarf-laugh.ogg
+                sound=dwarf-laugh.wav
             [/frame]
         [/else]
         [else]

Modified: trunk/data/core/units/dwarves/Ulfserker.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/dwarves/Ulfserker.cfg?rev=20760&r1=20759&r2=20760&view=diff
==============================================================================
--- trunk/data/core/units/dwarves/Ulfserker.cfg (original)
+++ trunk/data/core/units/dwarves/Ulfserker.cfg Fri Sep 28 13:55:37 2007
@@ -96,8 +96,34 @@
         [attack_filter]
             name=berserker frenzy
         [/attack_filter]
+        [if]
+            [secondary_attack_filter]
+            [/secondary_attack_filter]
+            swing=1
+            [frame]
+                begin=-225
+                end=-150
+                image="units/dwarves/ulfserker.png"
+            [/frame]
+        [/if]
+        [else]
+            swing=1
+            [frame]
+                begin=-225
+                end=-150
+                image="units/dwarves/ulfserker.png"
+                sound=dwarf-laugh.wav
+            [/frame]
+        [/else]
+        [else]
+            [frame]
+                begin=-225
+                end=-150
+                image="units/dwarves/ulfserker.png"
+            [/frame]
+        [/else]
         [frame]
-            begin=-250
+            begin=-150
             end=-100
             image="units/dwarves/ulfserker.png"
         [/frame]
@@ -105,7 +131,7 @@
             hits=yes
             [frame]
                 begin=-100
-                end=50
+                end=100
                 image="units/dwarves/ulfserker-attack.png"
                 sound=axe.ogg
             [/frame]
@@ -114,14 +140,14 @@
             hits=no
             [frame]
                 begin=-100
-                end=50
+                end=100
                 image="units/dwarves/ulfserker-attack.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
         [frame]
-            begin=50
-            end=150
+            begin=100
+            end=175
             image="units/dwarves/ulfserker.png"
         [/frame]
     [/attack_anim]




Related Messages


Powered by MHonArc, Updated Fri Sep 28 15:40:54 2007