mail[Wesnoth-commits] r20638 - in /trunk/data: campaigns/Descent_Into_Darkness/scenarios/ campaigns/Son_Of_The_Black_Eye/scenarios/ campaigns/The_...


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

Header


Content

Posted by esr on September 21, 2007 - 10:12:
Author: esr
Date: Fri Sep 21 10:11:33 2007
New Revision: 20638

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20638&view=rev
Log:
Get some use out of previously unreferenced PNGs. Includes actually using the 
campfire-graphic variations and re-enabling the Dwarf Fighter animation.

Modified:
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
    
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
    
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
    trunk/data/campaigns/The_South_Guard/units/Eyestalk.cfg
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg
    trunk/data/core/units/dwarves/Fighter.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg 
Fri Sep 21 10:11:33 2007
@@ -101,8 +101,8 @@
         {PLACE_IMAGE items/flower4.png 12 18}
         {PLACE_IMAGE items/flower4.png 13 19}
         {PLACE_IMAGE scenery/fire1.png 19 23}
-        {PLACE_IMAGE scenery/fire1.png 25 20}
-        {PLACE_IMAGE scenery/fire1.png 11 8}
+        {PLACE_IMAGE scenery/fire2.png 25 20}
+        {PLACE_IMAGE scenery/fire3.png 11 8}
         {PLACE_IMAGE scenery/monolith1.png 11 5}
         {PLACE_IMAGE scenery/monolith1.png 12 4}
         {PLACE_IMAGE scenery/monolith1.png 13 5}

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
 (original)
+++ 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
 Fri Sep 21 10:11:33 2007
@@ -270,7 +270,7 @@
         [item]
             x=15
             y=17
-            image=scenery/fire1.png
+            image=scenery/fire2.png
         [/item]
         [item]
             x=29

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg 
Fri Sep 21 10:11:33 2007
@@ -143,9 +143,9 @@
         {PLACE_IMAGE (scenery/signpost.png) 18 15}
 
         {PLACE_IMAGE (scenery/fire1.png) 38 34}
-        {PLACE_IMAGE (scenery/fire1.png) 8 28}
-        {PLACE_IMAGE (scenery/fire1.png) 12 5}
-        {PLACE_IMAGE (scenery/fire1.png) 5 3}
+        {PLACE_IMAGE (scenery/fire2.png) 8 28}
+        {PLACE_IMAGE (scenery/fire3.png) 12 5}
+        {PLACE_IMAGE (scenery/fire4.png) 5 3}
 
         [recall]
             description=Lady Outlaw

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg 
Fri Sep 21 10:11:33 2007
@@ -155,9 +155,9 @@
 
 
         {PLACE_IMAGE (scenery/fire1.png) 4 24}
-        {PLACE_IMAGE (scenery/fire1.png) 8 25}
-        {PLACE_IMAGE (scenery/fire1.png) 26 9}
-        {PLACE_IMAGE (scenery/fire1.png) 25 17}
+        {PLACE_IMAGE (scenery/fire2.png) 8 25}
+        {PLACE_IMAGE (scenery/fire3.png) 26 9}
+        {PLACE_IMAGE (scenery/fire4.png) 25 17}
 
         {VARIABLE_OP xx1 random 10..18}
         {VARIABLE_OP yy1 random 2..6}

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg 
(original)
+++ 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg 
Fri Sep 21 10:11:33 2007
@@ -163,11 +163,11 @@
         {PLACE_IMAGE (units/transport/pirate-galleon.png) 5 36}
 
         {PLACE_IMAGE (scenery/fire1.png) 8 8}
-        {PLACE_IMAGE (scenery/fire1.png) 10 2}
-        {PLACE_IMAGE (scenery/fire1.png) 17 8}
-        {PLACE_IMAGE (scenery/fire1.png) 39 6}
+        {PLACE_IMAGE (scenery/fire2.png) 10 2}
+        {PLACE_IMAGE (scenery/fire3.png) 17 8}
+        {PLACE_IMAGE (scenery/fire4.png) 39 6}
         {PLACE_IMAGE (scenery/fire1.png) 29 8}
-        {PLACE_IMAGE (scenery/fire1.png) 26 11}
+        {PLACE_IMAGE (scenery/fire2.png) 26 11}
 
         {PLACE_IMAGE (scenery/slab1.png) 18 15}
 

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg 
Fri Sep 21 10:11:33 2007
@@ -230,13 +230,13 @@
         {PLACE_IMAGE (units/transport/pirate-galleon.png) 23 44}
 
         {PLACE_IMAGE (scenery/fire1.png) 7 5}
-        {PLACE_IMAGE (scenery/fire1.png) 15 21}
-        {PLACE_IMAGE (scenery/fire1.png) 21 17}
-        {PLACE_IMAGE (scenery/fire1.png) 24 29}
-        {PLACE_IMAGE (scenery/fire1.png) 32 34}
+        {PLACE_IMAGE (scenery/fire2.png) 15 21}
+        {PLACE_IMAGE (scenery/fire3.png) 21 17}
+        {PLACE_IMAGE (scenery/fire4.png) 24 29}
+        {PLACE_IMAGE (scenery/fire3.png) 32 34}
         {PLACE_IMAGE (scenery/fire1.png) 41 24}
-        {PLACE_IMAGE (scenery/fire1.png) 46 23}
-        {PLACE_IMAGE (scenery/fire1.png) 45 29}
+        {PLACE_IMAGE (scenery/fire2.png) 46 23}
+        {PLACE_IMAGE (scenery/fire4.png) 45 29}
 
         [recall]
             description=Lady Jessica

Modified: trunk/data/campaigns/The_South_Guard/units/Eyestalk.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/units/Eyestalk.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/units/Eyestalk.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/units/Eyestalk.cfg Fri Sep 21 
10:11:33 2007
@@ -84,6 +84,7 @@
     [/attack_anim]
     [attack]
         name=gaze
+        icon=attacks/gaze.png
         description= _ "gaze"
         type=arcane
         range=ranged

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg Fri 
Sep 21 10:11:33 2007
@@ -528,7 +528,7 @@
 
         #fires lighting central cavern
         {PLACE_IMAGE scenery/fire1.png 31 32}
-        {PLACE_IMAGE scenery/fire1.png 33 21}
+        {PLACE_IMAGE scenery/fire2.png 33 21}
 
         #central cavern furnishings
 

Modified: trunk/data/core/units/dwarves/Fighter.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/dwarves/Fighter.cfg?rev=20638&r1=20637&r2=20638&view=diff
==============================================================================
--- trunk/data/core/units/dwarves/Fighter.cfg (original)
+++ trunk/data/core/units/dwarves/Fighter.cfg Fri Sep 21 10:11:33 2007
@@ -46,68 +46,68 @@
         damage=8
         number=2
     [/attack]
-    #  [idle_anim]
-    #          {STANDARD_IDLE_FILTER}
-    #          start_time=0
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-1.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-2.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-3.png"
-    #          [/frame]
-    #          [frame]
-    #                  image="units/dwarves/fighter-idle-4.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-5.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-6.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=200
-    #                  image="units/dwarves/fighter-idle-7.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-8.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=200
-    #                  image="units/dwarves/fighter-idle-4.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-5.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-6.png"
-    #          [/frame]
-    #          [frame]
-    #                  image="units/dwarves/fighter-idle-7.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-8.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=300
-    #                  image="units/dwarves/fighter-idle-4.png"
-    #          [/frame]
-    #          [frame]
-    #                  duration=100
-    #                  image="units/dwarves/fighter-idle-1.png"
-    #          [/frame]
-    #  [/idle_anim]
+    [idle_anim]
+           {STANDARD_IDLE_FILTER}
+           start_time=0
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-1.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-2.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-3.png"
+           [/frame]
+           [frame]
+                   image="units/dwarves/fighter-idle-4.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-5.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-6.png"
+           [/frame]
+           [frame]
+                   duration=200
+                   image="units/dwarves/fighter-idle-7.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-8.png"
+           [/frame]
+           [frame]
+                   duration=200
+                   image="units/dwarves/fighter-idle-4.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-5.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-6.png"
+           [/frame]
+           [frame]
+                   image="units/dwarves/fighter-idle-7.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-8.png"
+           [/frame]
+           [frame]
+                   duration=300
+                   image="units/dwarves/fighter-idle-4.png"
+           [/frame]
+           [frame]
+                   duration=100
+                   image="units/dwarves/fighter-idle-1.png"
+           [/frame]
+    [/idle_anim]
     [attack_anim]
         [attack_filter]
             name=hammer




Related Messages


Powered by MHonArc, Updated Fri Sep 21 12:20:52 2007