0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update mainline campaigns to use the correct [or] syntax

Browse source
This commit is contained in:
Patrick Parker 2007-07-14 15:26:17 +00:00
parent 7c30ac51fc
commit a5172d724a
13 changed files with 107 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Descent_Into_Darkness/units/mirror.cfg
View file

@ -67,8 +67,8 @@
type=Mirror
[/filter_second]
[special_filter]
[or]
weapon=short sword
[or]
weapon=rusty sword
[/or]
[/special_filter]

18
data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
View file

@ -236,12 +236,10 @@
#badguy leader has less chance of appearing early on. (as in 0% chance for first 5 villages. :P)
{RANDOM 4..10}
[if]
[or]
[variable]
name=random
greater_than_equal_to=$trapdiff
[/variable]
[/or]
[variable]
name=random
greater_than_equal_to=$trapdiff
[/variable]
[or]
[variable]
name=shodranoshown
@ -338,11 +336,9 @@
description=Lanar-Skal
[/filter]
[if]
[or]
[have_unit]
description=Shodrano
[/have_unit]
[/or]
[have_unit]
description=Shodrano
[/have_unit]
[or]
[variable]
name=shodranoshown

10
data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
View file

@ -397,12 +397,10 @@
[/if]
[if]
[or]
[variable]
name=moremirmu
numerical_equals=1
[/variable]
[/or]
[variable]
name=moremirmu
numerical_equals=1
[/variable]
[or]
[variable]
name=moremirmu

8
data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
View file

@ -163,9 +163,7 @@
[if]
[have_unit]
[or]
description=Minister Edmond
[/or]
description=Minister Edmond
[or]
description=Burin the Lost
[/or]
@ -238,9 +236,7 @@
[/message]
[if]
[have_unit]
[or]
description=Minister Edmond
[/or]
description=Minister Edmond
[or]
description=Burin the Lost
[/or]

10
data/campaigns/The_South_Guard/utils/sg_utils.cfg
View file

@ -102,12 +102,10 @@
#don't move to the same place!
#it would go one hex away and back
[if]
[or]
[variable]
name=temp_x1
not_equals=$temp_x2
[/variable]
[/or]
[variable]
name=temp_x1
not_equals=$temp_x2
[/variable]
[or]
[variable]
name=temp_y1

56
data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
View file

@ -1079,16 +1079,14 @@
y=24-29
side=1
[/have_unit]
[or]
[variable]
name=turn_temp
greater_than=4
[/variable]
[variable]
name=turn_temp
less_than=8
[/variable]
[/or]
[variable]
name=turn_temp
greater_than=4
[/variable]
[variable]
name=turn_temp
less_than=8
[/variable]
[or]
[variable]
name=turn_temp
@ -1687,16 +1685,14 @@
[if]
#!***Check if k*15 < turn < k*15+6 or k*15+6 < turn < k*15 + 12 -> those bands mean daytime including dawn and dusk***
[or]
[variable]
name=turn_temp
greater_than=6
[/variable]
[variable]
name=turn_temp
less_than=12
[/variable]
[/or]
[variable]
name=turn_temp
greater_than=6
[/variable]
[variable]
name=turn_temp
less_than=12
[/variable]
[or]
[variable]
name=turn_temp
@ -1799,12 +1795,10 @@
#!***Ghost apperance event***
[if]
[or]
[variable]
name=turn_temp
numerical_equals=5
[/variable]
[/or]
[variable]
name=turn_temp
numerical_equals=5
[/variable]
[or]
[variable]
name=turn_temp
@ -1856,12 +1850,10 @@
#!***Ghost disapperance event***
[if]
[or]
[variable]
name=turn_temp
numerical_equals=1
[/variable]
[/or]
[variable]
name=turn_temp
numerical_equals=1
[/variable]
[or]
[variable]
name=turn_temp

21
data/campaigns/Under_the_Burning_Suns/scenarios/04_Orcish_Foothills.cfg
View file

@ -1448,13 +1448,10 @@
# then store and kill it
[if]
[or]
[variable]
name=enemy_in_hex
numerical_equals=1
[/variable]
[/or]
[variable]
name=enemy_in_hex
numerical_equals=1
[/variable]
[or]
[variable]
name=ally_in_hex
@ -2128,12 +2125,10 @@
[/set_variable]
[if]
[or]
[variable]
name=temp
equals=Nym
[/variable]
[/or]
[variable]
name=temp
equals=Nym
[/variable]
[or]
[variable]

11
data/campaigns/Under_the_Burning_Suns/scenarios/05_Struggle.cfg
View file

@ -3408,13 +3408,10 @@
# then store and kill it
[if]
[or]
[variable]
name=enemy_in_hex
numerical_equals=1
[/variable]
[/or]
[variable]
name=enemy_in_hex
numerical_equals=1
[/variable]
[or]
[variable]
name=ally_in_hex

20
data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg
View file

@ -2219,12 +2219,10 @@
[if]
#time of day is 5 or -5
[or]
[variable]
name=time_of_day
numerical_equals=5
[/variable]
[/or]
[variable]
name=time_of_day
numerical_equals=5
[/variable]
[or]
[variable]
@ -2399,12 +2397,10 @@
[if]
#time of day is 2 or -2
[or]
[variable]
name=time_of_day
numerical_equals=-2
[/variable]
[/or]
[variable]
name=time_of_day
numerical_equals=-2
[/variable]
[or]
[variable]

8
data/campaigns/Under_the_Burning_Suns/scenarios/12_Final.cfg
View file

@ -1863,11 +1863,9 @@
[/if]
[if]
[or]
[have_unit]
description=Nym
[/have_unit]
[/or]
[have_unit]
description=Nym
[/have_unit]
[or]
[have_unit]

16
data/campaigns/tutorial/scenarios/1_Tutorial.cfg
View file

@ -261,24 +261,22 @@ The places she could move to are highlighted." +
[/filter]
[if]
[or]
[variable]
name=x1
numerical_not_equals=$destx
[/variable]
[/or]
[variable]
name=x1
numerical_not_equals=$destx
[/variable]
[or]
[variable]
name=y1
numerical_not_equals=$desty
[/variable]
[/or]
[then]
[if]
[and]
[variable]
name=dest
equals="set"
[/variable]
[/and]
[then]
[redraw][/redraw]
[message]
@ -288,8 +286,6 @@ You moved to the wrong place! After this message, you can press 'u' to Undo, the
*Left click or any key to continue..."
[/message]
[/then]
[/if]
[/then]
[/if]
[/event]

28
data/campaigns/tutorial/scenarios/2_Tutorial.cfg
View file

@ -83,16 +83,14 @@
#define IMPORTANT_UNIT UNIT
[if]
# FIXME: Archer needs 44/35(intelligent), Fighter needs 38/30 (?)
[or]
[variable]
name={UNIT}.type
equals=Elvish Archer
[/variable]
[variable]
name={UNIT}.experience
greater_than=30
[/variable]
[/or]
[variable]
name={UNIT}.type
equals=Elvish Archer
[/variable]
[variable]
name={UNIT}.experience
greater_than=30
[/variable]
[or]
[variable]
name={UNIT}.type
@ -1279,12 +1277,10 @@ When 'n' no longer selects a new unit, you can end your turn.")}
[/store_unit]
[if]
[or]
[variable]
name=deadguy.type
equals=Elvish Fighter
[/variable]
[/or]
[variable]
name=deadguy.type
equals=Elvish Fighter
[/variable]
[or]
[variable]
name=deadguy.type

52
data/multiplayer/scenarios/2p_Wesbowl.cfg
View file

@ -258,20 +258,18 @@ Defeat:
{VARIABLE_OP xloc to_variable locs[$i].x}
{VARIABLE_OP yloc to_variable locs[$i].y}
[if]
[or]
[variable]
name=xloc
not_equals=$x1
[/variable]
[variable]
name=passed
equals=no
[/variable]
[have_unit]
x,y=$xloc,$yloc
side=$unit.side
[/have_unit]
[/or]
[variable]
name=xloc
not_equals=$x1
[/variable]
[variable]
name=passed
equals=no
[/variable]
[have_unit]
x,y=$xloc,$yloc
side=$unit.side
[/have_unit]
[or]
[variable]
name=yloc
@ -504,20 +502,18 @@ Defeat:
{VARIABLE_OP xloc to_variable locs[$i].x}
{VARIABLE_OP yloc to_variable locs[$i].y}
[if]
[or]
[variable]
name=xloc
not_equals=$x1
[/variable]
[variable]
name=passed
equals=no
[/variable]
[have_unit]
x,y=$xloc,$yloc
side=$unit.side
[/have_unit]
[/or]
[variable]
name=xloc
not_equals=$x1
[/variable]
[variable]
name=passed
equals=no
[/variable]
[have_unit]
x,y=$xloc,$yloc
side=$unit.side
[/have_unit]
[or]
[variable]
name=yloc