mail[Wesnoth-commits] r29075 - in /trunk/data/campaigns/The_Rise_Of_Wesnoth: scenarios/ utils/


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

Header


Content

Posted by lari . nieminen on August 29, 2008 - 12:07:
Author: zookeeper
Date: Fri Aug 29 12:07:13 2008
New Revision: 29075

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29075&view=rev
Log:
Removed some more duplicate single unit id's.

Modified:
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg 
Fri Aug 29 12:07:13 2008
@@ -117,21 +117,21 @@
         {PLACE_IMAGE (scenery/temple1.png) 1 26}
         {PLACE_IMAGE (scenery/temple1.png) 5 12}
 
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 26 4}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 27}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 17 35}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 26 4}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 27}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 17 35}
 #ifdef NORMAL
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 13 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 31}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 9 34}
 #endif
 #ifdef HARD
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 15 3}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 33 36}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 20 32}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 13 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 15 3}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 31}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 33 36}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 9 34}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 20 32}
 #endif
         [recall]
             id=Lady Outlaw

Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg Fri Aug 
29 12:07:13 2008
@@ -96,25 +96,25 @@
             id=Minister Edmond
         [/recall]
 
-        {GUARD_UNIT (Giant Spider) (Spider) ( _ "Spider") 2 2 6}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 5}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 24 18}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 20 15}
+        {GUARD_UNIT (Giant Spider) () ( _ "Spider") 2 2 6}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 3 5}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 24 18}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 20 15}
 #ifdef NORMAL
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 12 7}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 16 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 29 20}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 14 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 2 5}
 #endif
 
 #ifdef HARD
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
-        {GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 7}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 12 7}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 16 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 29 20}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 14 8}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 2 5}
+        {GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 3 7}
 #endif
 
         [objectives]

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg Fri 
Aug 29 12:07:13 2008
@@ -181,11 +181,11 @@
                 [kill]
                     id=Erart
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3 5 5}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 3 5 5}
                 [kill]
                     id=Raol
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2 25 5}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 2 25 5}
             [/then]
         [/if]
         [if]
@@ -197,11 +197,11 @@
                 [kill]
                     id=Raol
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2 25 5}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 2 25 5}
                 [kill]
                     id=Rilg
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5 5 25}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 5 5 25}
             [/then]
         [/if]
         [if]
@@ -213,11 +213,11 @@
                 [kill]
                     id=Rilg
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5 5 25}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 5 5 25}
                 [kill]
                     id=Gulg
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4 25 25}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 4 25 25}
             [/then]
         [/if]
         [if]
@@ -229,11 +229,11 @@
                 [kill]
                     id=Gulg
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4 25 25}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 4 25 25}
                 [kill]
                     id=Erart
                 [/kill]
-                {GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3 5 5}
+                {GUARD_UNIT (Giant Spider) () ( _ "Fang") 3 5 5}
             [/then]
         [/if]
 

Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg Fri Aug 29 
12:07:13 2008
@@ -103,7 +103,6 @@
 
 #ifdef EASY
     [unit]
-        id=A Former Friend
         name= _ "A Former Friend"
         type=Walking Corpse
         side=2
@@ -118,7 +117,6 @@
 #endif
 #ifdef NORMAL
     [unit]
-        id=A Former Friend
         name= _ "A Former Friend"
         type=Soulless
         side=2
@@ -133,7 +131,6 @@
 #endif
 #ifdef HARD
     [unit]
-        id=A Former Friend
         name= _ "A Former Friend"
         type=Ghoul
         side=2




Related Messages


Powered by MHonArc, Updated Fri Aug 29 12:41:11 2008