mail[Wesnoth-commits] r13873 - in /trunk: data/units/ utils/


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

Header


Content

Posted by isaac on October 10, 2006 - 08:30:
Author: isaac
Date: Tue Oct 10 08:29:59 2006
New Revision: 13873

URL: http://svn.gna.org/viewcvs/wesnoth?rev=13873&view=rev
Log:
Merged 13860 into trunk

Modified:
    trunk/data/units/Drake_Flameheart.cfg
    trunk/data/units/Drake_Flare.cfg
    trunk/data/units/Drake_Hurricane.cfg
    trunk/data/units/Drake_Sky.cfg
    trunk/data/units/Goblin_Direwolf_Rider.cfg
    trunk/data/units/Goblin_Knight.cfg
    trunk/data/units/Goblin_Pillager.cfg
    trunk/data/units/Goblin_Wolf_Rider.cfg
    trunk/utils/wesnoth-pngcrush

Modified: trunk/data/units/Drake_Flameheart.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Drake_Flameheart.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Drake_Flameheart.cfg (original)
+++ trunk/data/units/Drake_Flameheart.cfg Tue Oct 10 08:29:59 2006
@@ -84,7 +84,7 @@
                [animation]
                        hits=no
                        [frame]
-                               begin=-225
+                               begin=-200
                                end=-175
                                image="units/drakes/flameheart.png"
                        [/frame]
@@ -95,23 +95,23 @@
                        [/frame]
                        [frame]
                                begin=-100
-                               end=75
+                               end=50
                                
image="units/drakes/flameheart-attack-close2.png"
                                sound={SOUND_LIST:MISS}
                        [/frame]
                        [frame]
-                               begin=75
-                               end=125
+                               begin=50
+                               end=100
                                image="units/drakes/flameheart-lead.png"
                        [/frame]
                        [frame]
-                               begin=125
-                               end=225
+                               begin=100
+                               end=175
                                image="units/drakes/flameheart-flying.png"
                        [/frame]
                        [frame]
-                               begin=225
-                               end=250
+                               begin=175
+                               end=200
                                image="units/drakes/flameheart.png"
                        [/frame]
                [/animation]
@@ -134,18 +134,18 @@
                                sound={SOUND_LIST:SWORD_SWISH}
                        [/frame]
                        [frame]
-                               begin=75
-                               end=125
+                               begin=50
+                               end=100
                                image="units/drakes/flameheart-lead.png"
                        [/frame]
                        [frame]
-                               begin=125
-                               end=225
+                               begin=100
+                               end=175
                                image="units/drakes/flameheart-flying.png"
                        [/frame]
                        [frame]
-                               begin=225
-                               end=250
+                               begin=175
+                               end=200
                                image="units/drakes/flameheart.png"
                        [/frame]
                [/animation]

Modified: trunk/data/units/Drake_Flare.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Drake_Flare.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Drake_Flare.cfg (original)
+++ trunk/data/units/Drake_Flare.cfg Tue Oct 10 08:29:59 2006
@@ -138,18 +138,18 @@
                        [/frame]
                        [frame]
                                begin=-75
-                               end=75
+                               end=100
                                image="units/drakes/flare-attack-close.png"
                                sound={SOUND_LIST:SWORD_SWISH}
                        [/frame]
                        [frame]
-                               begin=75
-                               end=200
+                               begin=100
+                               end=175
                                image="units/drakes/flare-flying.png"
                        [/frame]
                        [frame]
-                               begin=200
-                               end=225
+                               begin=175
+                               end=200
                                image="units/drakes/flare.png"
                        [/frame]
                [/animation]

Modified: trunk/data/units/Drake_Hurricane.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Drake_Hurricane.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Drake_Hurricane.cfg (original)
+++ trunk/data/units/Drake_Hurricane.cfg Tue Oct 10 08:29:59 2006
@@ -97,12 +97,12 @@
                [animation]
                        hits=no
                        [frame]
-                               begin=-225
-                               end=-200
-                               image="units/drakes/hurricane.png"
-                       [/frame]
-                       [frame]
                                begin=-200
+                               end=-175
+                               image="units/drakes/hurricane.png"
+                       [/frame]
+                       [frame]
+                               begin=-175
                                end=-150
                                
image="units/drakes/hurricane-attack-ranged-fire1.png"
                        [/frame]
@@ -113,35 +113,35 @@
                        [/frame]
                        [frame]
                                begin=-75
-                               end=75
+                               end=50
                                
image="units/drakes/hurricane-attack-melee2.png"
                                sound={SOUND_LIST:MISS}
                        [/frame]
                        [frame]
-                               begin=75
-                               end=150
+                               begin=50
+                               end=125
                                image="units/drakes/hurricane-flying.png"
                        [/frame]
                        [frame]
-                               begin=150
+                               begin=125
+                               end=175
+                               
image="units/drakes/hurricane-attack-melee1.png"
+                       [/frame]
+                       [frame]
+                               begin=175
                                end=200
-                               
image="units/drakes/hurricane-attack-melee1.png"
-                       [/frame]
-                       [frame]
-                               begin=200
-                               end=225
                                image="units/drakes/hurricane.png"
                        [/frame]
                [/animation]
                [animation]
                        hits=yes
                        [frame]
-                               begin=-225
-                               end=-200
-                               image="units/drakes/hurricane.png"
-                       [/frame]
-                       [frame]
                                begin=-200
+                               end=-175
+                               image="units/drakes/hurricane.png"
+                       [/frame]
+                       [frame]
+                               begin=-175
                                end=-150
                                
image="units/drakes/hurricane-attack-ranged-fire1.png"
                        [/frame]
@@ -152,23 +152,23 @@
                        [/frame]
                        [frame]
                                begin=-75
-                               end=75
+                               end=50
                                
image="units/drakes/hurricane-attack-melee2.png"
                                sound=club.ogg
                        [/frame]
                        [frame]
-                               begin=75
-                               end=150
+                               begin=50
+                               end=125
                                image="units/drakes/hurricane-flying.png"
                        [/frame]
                        [frame]
-                               begin=150
+                               begin=125
+                               end=175
+                               
image="units/drakes/hurricane-attack-melee1.png"
+                       [/frame]
+                       [frame]
+                               begin=175
                                end=200
-                               
image="units/drakes/hurricane-attack-melee1.png"
-                       [/frame]
-                       [frame]
-                               begin=200
-                               end=225
                                image="units/drakes/hurricane.png"
                        [/frame]
                [/animation]

Modified: trunk/data/units/Drake_Sky.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Drake_Sky.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Drake_Sky.cfg (original)
+++ trunk/data/units/Drake_Sky.cfg Tue Oct 10 08:29:59 2006
@@ -96,6 +96,45 @@
                [animation]
                        hits=no
                        [frame]
+                               begin=-200
+                               end=-175
+                               image="units/drakes/sky.png"
+                       [/frame]
+                       [frame]
+                               begin=-175
+                               end=-150
+                               image="units/drakes/sky-ranged-impact.png"
+                       [/frame]
+                       [frame]
+                               begin=-150
+                               end=-75
+                               image="units/drakes/sky-attack-melee1.png"
+                       [/frame]
+                       [frame]
+                               begin=-75
+                               end=50
+                               image="units/drakes/sky-attack-melee2.png"
+                               sound={SOUND_LIST:MISS}
+                       [/frame]
+                       [frame]
+                               begin=50
+                               end=125
+                               image="units/drakes/sky-defend.png"
+                       [/frame]
+                       [frame]
+                               begin=125
+                               end=175
+                               image="units/drakes/sky-attack-melee1.png"
+                       [/frame]
+                       [frame]
+                               begin=275
+                               end=200
+                               image="units/drakes/sky.png"
+                       [/frame]
+               [/animation]
+               [animation]
+                       hits=yes
+                       [frame]
                                begin=-225
                                end=-200
                                image="units/drakes/sky.png"
@@ -112,62 +151,23 @@
                        [/frame]
                        [frame]
                                begin=-75
-                               end=75
-                               image="units/drakes/sky-attack-melee2.png"
-                               sound={SOUND_LIST:MISS}
-                       [/frame]
-                       [frame]
-                               begin=75
-                               end=150
-                               image="units/drakes/sky-defend.png"
-                       [/frame]
-                       [frame]
-                               begin=150
-                               end=200
-                               image="units/drakes/sky-attack-melee1.png"
-                       [/frame]
-                       [frame]
-                               begin=200
-                               end=225
-                               image="units/drakes/sky.png"
-                       [/frame]
-               [/animation]
-               [animation]
-                       hits=yes
-                       [frame]
-                               begin=-225
-                               end=-200
-                               image="units/drakes/sky.png"
-                       [/frame]
-                       [frame]
-                               begin=-200
-                               end=-150
-                               image="units/drakes/sky-ranged-impact.png"
-                       [/frame]
-                       [frame]
-                               begin=-150
-                               end=-75
-                               image="units/drakes/sky-attack-melee1.png"
-                       [/frame]
-                       [frame]
-                               begin=-75
-                               end=75
+                               end=50
                                image="units/drakes/sky-attack-melee2.png"
                                sound=club.ogg
                        [/frame]
                        [frame]
-                               begin=75
-                               end=150
+                               begin=50
+                               end=125
                                image="units/drakes/sky-defend.png"
                        [/frame]
                        [frame]
-                               begin=150
+                               begin=125
+                               end=175
+                               image="units/drakes/sky-attack-melee1.png"
+                       [/frame]
+                       [frame]
+                               begin=275
                                end=200
-                               image="units/drakes/sky-attack-melee1.png"
-                       [/frame]
-                       [frame]
-                               begin=200
-                               end=225
                                image="units/drakes/sky.png"
                        [/frame]
                [/animation]

Modified: trunk/data/units/Goblin_Direwolf_Rider.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Goblin_Direwolf_Rider.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Goblin_Direwolf_Rider.cfg (original)
+++ trunk/data/units/Goblin_Direwolf_Rider.cfg Tue Oct 10 08:29:59 2006
@@ -39,39 +39,59 @@
                [animation]
                        hits=yes
                        [frame]
-                               begin=-400
-                               end=-200
-                               image="units/goblins/direwolver-moving.png"
+                               begin=-250
+                               end=-200
+                               image="units/goblins/direwolver.png"
                                sound=wolf-big-bite.ogg
                        [/frame]
                        [frame]
                                begin=-200
-                               end=0
-                               image="units/goblins/direwolver-attack.png"
-                       [/frame]
-                       [frame]
-                               begin=0
-                               end=200
-                               image="units/goblins/direwolver-moving.png"
+                               end=-100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
+                               image="units/goblins/direwolver-attack.png"
+                       [/frame]
+                       [frame]
+                               begin=50
+                               end=100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/direwolver.png"
                        [/frame]
                [/animation]
                [animation]
                        hits=no
                        [frame]
-                               begin=-400
-                               end=-200
-                               image="units/goblins/direwolver-moving.png"
+                               begin=-250
+                               end=-200
+                               image="units/goblins/direwolver.png"
                                sound=wolf-big-bite-miss.ogg
                        [/frame]
                        [frame]
                                begin=-200
-                               end=0
-                               image="units/goblins/direwolver-attack.png"
-                       [/frame]
-                       [frame]
-                               begin=0
-                               end=200
-                               image="units/goblins/direwolver-moving.png"
+                               end=-100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
+                               image="units/goblins/direwolver-attack.png"
+                       [/frame]
+                       [frame]
+                               begin=50
+                               end=100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/direwolver.png"
                        [/frame]
                [/animation]
        [/attack]
@@ -86,41 +106,62 @@
                        {WEAPON_SPECIAL_POISON}
                [/specials]
                [animation]
+                       hits=yes
+                       [frame]
+                               begin=-250
+                               end=-200
+                               image="units/goblins/direwolver.png"
+                               sound=wolf-big-bite.ogg
+                       [/frame]
+                       [frame]
+                               begin=-200
+                               end=-100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
+                               image="units/goblins/direwolver-attack.png"
+                               sound=claws.ogg
+                       [/frame]
+                       [frame]
+                               begin=50
+                               end=100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/direwolver.png"
+                       [/frame]
+               [/animation]
+               [animation]
                        hits=no
                        [frame]
                                begin=-250
-                               end=-100
-                               image="units/goblins/direwolver-moving.png"
-                       [/frame]
-                       [frame]
-                               begin=-100
-                               end=100
+                               end=-200
+                               image="units/goblins/direwolver.png"
+                       [/frame]
+                       [frame]
+                               begin=-200
+                               end=-100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
                                image="units/goblins/direwolver-attack.png"
                                sound={SOUND_LIST:MISS}
                        [/frame]
                        [frame]
-                               begin=100
-                               end=200
-                               image="units/goblins/direwolver-moving.png"
-                       [/frame]
-               [/animation]
-               [animation]
-                       hits=yes
-                       [frame]
-                               begin=-250
-                               end=-100
-                               image="units/goblins/direwolver-moving.png"
-                       [/frame]
-                       [frame]
-                               begin=-100
-                               end=100
-                               image="units/goblins/direwolver-attack.png"
-                               sound=claws.ogg
-                       [/frame]
-                       [frame]
-                               begin=100
-                               end=200
-                               image="units/goblins/direwolver-moving.png"
+                               begin=50
+                               end=100
+                               image="units/goblins/direwolver-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/direwolver.png"
                        [/frame]
                [/animation]
        [/attack]

Modified: trunk/data/units/Goblin_Knight.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Goblin_Knight.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Goblin_Knight.cfg (original)
+++ trunk/data/units/Goblin_Knight.cfg Tue Oct 10 08:29:59 2006
@@ -39,39 +39,59 @@
                [animation]
                        hits=yes
                        [frame]
-                               begin=-400
+                               begin=-250
                                end=-200
-                               image="units/goblins/knight-moving.png"
+                               image="units/goblins/knight.png"
                                sound=wolf-big-bite.ogg
                        [/frame]
                        [frame]
                                begin=-200
+                               end=-100
+                               image="units/goblins/knight-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
                                end=50
                                image="units/goblins/knight-attack.png"
                        [/frame]
                        [frame]
                                begin=50
-                               end=150
-                               image="units/goblins/knight-defend.png"
+                               end=100
+                               image="units/goblins/knight-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/knight.png"
                        [/frame]
                [/animation]
                [animation]
                        hits=no
                        [frame]
-                               begin=-400
+                               begin=-250
                                end=-200
-                               image="units/goblins/knight-moving.png"
+                               image="units/goblins/knight.png"
                                sound=wolf-big-bite-miss.ogg
                        [/frame]
                        [frame]
                                begin=-200
+                               end=-100
+                               image="units/goblins/knight-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
                                end=50
                                image="units/goblins/knight-attack.png"
                        [/frame]
                        [frame]
                                begin=50
-                               end=150
-                               image="units/goblins/knight-defend.png"
+                               end=100
+                               image="units/goblins/knight-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
+                               end=200
+                               image="units/goblins/knight.png"
                        [/frame]
                [/animation]
        [/attack]

Modified: trunk/data/units/Goblin_Pillager.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Goblin_Pillager.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Goblin_Pillager.cfg (original)
+++ trunk/data/units/Goblin_Pillager.cfg Tue Oct 10 08:29:59 2006
@@ -40,13 +40,13 @@
                [animation]
                        hits=no
                        [frame]
-                               begin=-300
-                               end=-200
+                               begin=-200
+                               end=-100
                                image="units/goblins/pillager-moving.png"
                                sound=torch-miss.ogg
                        [/frame]
                        [frame]
-                               begin=-200
+                               begin=-100
                                end=50
                                image="units/goblins/pillager-attack.png"
                        [/frame]
@@ -59,13 +59,13 @@
                [animation]
                        hits=yes
                        [frame]
-                               begin=-300
-                               end=-200
+                               begin=-200
+                               end=-100
                                image="units/goblins/pillager-moving.png"
                                sound=torch.ogg
                        [/frame]
                        [frame]
-                               begin=-200
+                               begin=-100
                                end=50
                                image="units/goblins/pillager-attack.png"
                        [/frame]

Modified: trunk/data/units/Goblin_Wolf_Rider.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Goblin_Wolf_Rider.cfg?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/data/units/Goblin_Wolf_Rider.cfg (original)
+++ trunk/data/units/Goblin_Wolf_Rider.cfg Tue Oct 10 08:29:59 2006
@@ -40,39 +40,59 @@
                [animation]
                        hits=yes
                        [frame]
-                               begin=-400
+                               begin=-250
                                end=-200
-                               image="units/goblins/wolf-rider-moving.png"
+                               image="units/goblins/wolf-rider.png"
                                sound=wolf-bite.ogg
                        [/frame]
                        [frame]
                                begin=-200
-                               end=0
+                               end=-100
+                               image="units/goblins/wolf-rider-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
                                image="units/goblins/wolf-rider-attack.png"
                        [/frame]
                        [frame]
-                               begin=0
+                               begin=50
+                               end=100
+                               image="units/goblins/wolf-rider-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
                                end=200
-                               image="units/goblins/wolf-rider-moving.png"
+                               image="units/goblins/wolf-rider.png"
                        [/frame]
                [/animation]
                [animation]
                        hits=no
                        [frame]
-                               begin=-400
+                               begin=-250
                                end=-200
-                               image="units/goblins/wolf-rider-moving.png"
+                               image="units/goblins/wolf-rider.png"
                                sound=wolf-bite-miss.ogg
                        [/frame]
                        [frame]
                                begin=-200
-                               end=0
+                               end=-100
+                               image="units/goblins/wolf-rider-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=-100
+                               end=50
                                image="units/goblins/wolf-rider-attack.png"
                        [/frame]
                        [frame]
-                               begin=0
+                               begin=50
+                               end=100
+                               image="units/goblins/wolf-rider-moving.png"
+                       [/frame]
+                       [frame]
+                               begin=100
                                end=200
-                               image="units/goblins/wolf-rider-moving.png"
+                               image="units/goblins/wolf-rider.png"
                        [/frame]
                [/animation]
        [/attack]

Modified: trunk/utils/wesnoth-pngcrush
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/wesnoth-pngcrush?rev=13873&r1=13872&r2=13873&view=diff
==============================================================================
--- trunk/utils/wesnoth-pngcrush (original)
+++ trunk/utils/wesnoth-pngcrush Tue Oct 10 08:29:59 2006
@@ -29,23 +29,25 @@
        file = file[2,file.length]
        puts "\n* processing #{file}\n"
 
-       old = "/home/isaac/devel/wesnoth/last/#{file}";
-       if checkOld and File.exists?(old) and sha1sum(file) == sha1sum(old)
-               puts "  * no change since last release\n";
-               next;
-       end
-       output = `nice -n 19 pngrewrite "#{file}" "#{file}.new"`;
-       File.exists?("#{file}.new") or next;
+#      old = "/home/isaac/devel/wesnoth/last/#{file}";
+#      if checkOld and File.exists?(old) and sha1sum(file) == sha1sum(old)
+#              puts "  * no change since last release\n";
+#              next;
+#      end
+       output = `nice -n 19 convert -strip "#{file}" "#{file}.stripped.png"`;
+       output = `nice -n 19 pngcrush -brute -q "#{file}.stripped.png" 
"#{file}.new.png"`;
+       output = `rm "#{file}.stripped.png"`
+       File.exists?("#{file}.new.png") or next;
        oldSize = File.size(file)
-       newSize = File.size("#{file}.new")
+       newSize = File.size("#{file}.new.png")
        if newSize < oldSize
                savedBytes = oldSize - newSize;
                totalSavedBytes = totalSavedBytes + savedBytes
                totalSavedFiles = totalSavedFiles.succ
-               output = `mv "#{file}.new" -v "#{file}"`
-               puts ", $output,\nsaved: #{savedBytes} bytes, total saved: 
#{totalSavedBytes/1024} KB"
+               output = `mv "#{file}.new.png" -v "#{file}"`
+               puts ",\nsaved: #{savedBytes} bytes, total saved: 
#{totalSavedBytes/1024} KB"
        else
-               File.unlink("#{file}.new");
+               File.unlink("#{file}.new.png");
        end
 }
 




Related Messages


Powered by MHonArc, Updated Tue Oct 10 08:40:15 2006