mail[Wesnoth-commits] r24174 - in /trunk/data: campaigns/Descent_Into_Darkness/scenarios/ campaigns/Eastern_Invasion/scenarios/ campaigns/Sceptre_...


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

Header


Content

Posted by esr on March 01, 2008 - 11:40:
Author: esr
Date: Sat Mar  1 11:40:21 2008
New Revision: 24174

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24174&view=rev
Log:
Clean up some canrecruit macros.

Modified:
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
    trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
    
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
    trunk/data/core/macros/utils.cfg
    trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 Sat Mar  1 11:40:21 2008
@@ -198,7 +198,7 @@
                     {MODIFY_ONE_UNIT type=Ghost side 4}
                     {MODIFY_ONE_UNIT side=4 description (Tortured Soul)}
                     {MODIFY_ONE_UNIT side=4 user_description (_ "Tortured 
Soul")}
-                    {MODIFY_ONE_UNIT side=4 canrecruit 1}
+                    {MODIFY_ONE_UNIT side=4 canrecruit yes}
                     {VARIABLE ghost_was_freed yes}
                     {DIALOGUE_AHIW_GHOSTFREE}
                 [/event]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg 
Sat Mar  1 11:40:21 2008
@@ -168,7 +168,7 @@
         {GEN_UNIT (Banebow) 3 5 18}
         {GEN_UNIT (Nightgaunt) 3 5 18}
 
-        {MODIFY_UNIT (description=Darken Volk) canrecruit 1}
+        {MODIFY_UNIT (description=Darken Volk) canrecruit yes}
         #Go for the book
         {MODIFY_UNIT (description=Darken Volk) goto_x 5}
         {MODIFY_UNIT (description=Darken Volk) goto_y 5}

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
Sat Mar  1 11:40:21 2008
@@ -158,7 +158,7 @@
         [/unit_overlay]
         {MOVE_UNIT (description=Darken Volk) 19 19}
         {MODIFY_UNIT (description=Darken Volk) side 2}
-        {MODIFY_UNIT (description=Darken Volk) canrecruit 1}
+        {MODIFY_UNIT (description=Darken Volk) canrecruit yes}
         {DELAY 500}
         {MOVE_UNIT (description=Malin Keshar) 7 21}
         {DELAY 500}

Modified: 
trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg 
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg 
Sat Mar  1 11:40:21 2008
@@ -321,7 +321,7 @@
                     message= _ "Good job! Now, we should move onward, north. 
Tell the villagers to pack their belongings and follow us."
                 [/message]
 
-                {MODIFY_UNIT description=Owaec canrecruit 0}
+                {MODIFY_UNIT description=Owaec canrecruit no}
                 {MODIFY_UNIT side=2 side 1}
                 [store_unit]
                     [filter]
@@ -380,7 +380,7 @@
                     message= _ "Good work! Now, we should move onward, 
north. Tell the villagers to pack their belongings and follow us."
                 [/message]
 
-                {MODIFY_UNIT description=Owaec canrecruit 0}
+                {MODIFY_UNIT description=Owaec canrecruit no}
                 {MODIFY_UNIT side=2 side 1}
                 [store_unit]
                     [filter]

Modified: 
trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg 
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg 
Sat Mar  1 11:40:21 2008
@@ -437,7 +437,7 @@
                     description=Thursagan
                     message= _ "Tell him to send forces north to aid us and 
fight the elves, but that we are probably going to die. We are going into the 
caves."
                 [/message]
-                {MODIFY_UNIT description=Alanin canrecruit 1}
+                {MODIFY_UNIT description=Alanin canrecruit yes}
                 [store_unit]
                     [filter]
                         side=1

Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg Sat 
Mar  1 11:40:21 2008
@@ -315,7 +315,7 @@
 
                     {VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
                     {VARIABLE wesfolk_leader_store.user_description ( _ 
"Lady Outlaw")}
-                    {VARIABLE wesfolk_leader_store.canrecruit 0}
+                    {VARIABLE wesfolk_leader_store.canrecruit no}
                     {VARIABLE wesfolk_leader_store.side 1}
 
                     [unstore_unit]
@@ -352,7 +352,7 @@
 
                     {VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
                     {VARIABLE wesfolk_leader_store.user_description ( _ 
"Lady Outlaw")}
-                    {VARIABLE wesfolk_leader_store.canrecruit 0}
+                    {VARIABLE wesfolk_leader_store.canrecruit no}
                     {VARIABLE wesfolk_leader_store.side 1}
 
                     [unstore_unit]

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
Sat Mar  1 11:40:21 2008
@@ -180,7 +180,7 @@
             x,y=16,23
         [/recall]
 
-        {MODIFY_UNIT (description=Sir Gerrick) canrecruit 1}
+        {MODIFY_UNIT (description=Sir Gerrick) canrecruit yes}
 
         [set_recruit]
             side=1
@@ -473,7 +473,7 @@
                     variable=stored_Sir_Gerrick
                 [/store_unit]
 
-                {VARIABLE stored_Sir_Gerrick.canrecruit 0}
+                {VARIABLE stored_Sir_Gerrick.canrecruit no}
 
                 [store_unit]
                     variable=stored_Sir_Gerrick_army

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
Sat Mar  1 11:40:21 2008
@@ -200,7 +200,7 @@
             variable=stored_Deoran
         [/store_unit]
 
-        {MODIFY_UNIT (description=Sir Gerrick) canrecruit 1}
+        {MODIFY_UNIT (description=Sir Gerrick) canrecruit yes}
 
         [message]
             speaker=Lt. Illan

Modified: trunk/data/core/macros/utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/utils.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/core/macros/utils.cfg (original)
+++ trunk/data/core/macros/utils.cfg Sat Mar  1 11:40:21 2008
@@ -273,7 +273,7 @@
                 {MODIFY_UNIT (
                 side={SIDE}
                 canrecruit=yes
-                ) canrecruit 0}
+                ) canrecruit no}
             [/then]
         [/if]
     [/event]

Modified: trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg?rev=24174&r1=24173&r2=24174&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg (original)
+++ trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg Sat Mar  1 
11:40:21 2008
@@ -121,7 +121,7 @@
                     side=5
                     type=""
                 [/set_recruit]
-                {MODIFY_UNIT x,y=38,36 canrecruit 1}
+                {MODIFY_UNIT x,y=38,36 canrecruit yes}
             [/then]
         [/if]
     [/event]
@@ -147,7 +147,7 @@
                 greater_than=0
             [/variable]
             [then]
-                {VARIABLE newleader.canrecruit 1}
+                {VARIABLE newleader.canrecruit yes}
                 [unstore_unit]
                     variable=newleader
                 [/unstore_unit]




Related Messages


Powered by MHonArc, Updated Sat Mar 01 16:01:11 2008