Author: esr
Date: Wed Aug 20 20:20:36 2008
New Revision: 28798
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28798&view=rev
Log:
Replace magic turn number 99 with FOREVER.
Modified:
trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
trunk/data/core/macros/scenario-utils.cfg
Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=28798&r1=28797&r2=28798&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Wed Aug 20 20:20:36 2008
@@ -152,7 +152,7 @@
[/avoid]
[/ai]
[ai]
- turns=7-99
+ turns=7-FOREVER
caution=0.1
aggression=0.9
scout_village_targetting=1
@@ -243,7 +243,7 @@
[/ai]
[ai]
- turns=7-99
+ turns=7-FOREVER
aggression=0.6
caution=0.6
leader_value=0.5
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg?rev=28798&r1=28797&r2=28798&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Wed Aug 20 20:20:36 2008
@@ -49,7 +49,7 @@
[/ai]
[ai]
- turns=4-99
+ turns=4-FOREVER
recruitment_pattern=fighter,archer
aggression=0.5
caution=0.5
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg?rev=28798&r1=28797&r2=28798&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg Wed Aug 20
20:20:36 2008
@@ -57,7 +57,7 @@
[/target]
[/ai]
[ai]
- turns=12-99
+ turns=12-FOREVER
aggression=1.0
caution=0.0
village_value=0.0
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg?rev=28798&r1=28797&r2=28798&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg Wed Aug
20 20:20:36 2008
@@ -70,7 +70,7 @@
user_team_name=_"Rebels"
team_name=rebels
[ai]
- turns=5-99
+ turns=5-FOREVER
aggression=0.25
caution=0.5
village_value=0.25
Modified: trunk/data/core/macros/scenario-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/scenario-utils.cfg?rev=28798&r1=28797&r2=28798&view=diff
==============================================================================
--- trunk/data/core/macros/scenario-utils.cfg (original)
+++ trunk/data/core/macros/scenario-utils.cfg Wed Aug 20 20:20:36 2008
@@ -3,6 +3,11 @@
# These macros don't depend on any others. Please don't change this.
# ! in comments is used in generating HTML documentation, ignore it otherwise.
+
+# Max number of turns in a scenario, mainly for use as a turn upper bound
+# in ai declarations for aggression, etc.
+#define FOREVER
+ 99 #enddef
#define SET_OBJECTIVES SIDE SUMMARY NOTE CONDITION_WML
# Sets the objectives for a given player
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
