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

Enabled the dust devil to trigger a couple more events and cleaned up some code.

Browse source
This commit is contained in:
Lari Nieminen 2009-01-25 10:40:35 +00:00
parent 0a2744167e
commit dddc90cdd4
2 changed files with 52 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -1607,15 +1607,16 @@
x=27
y=17
side=1
[not]
type=Dust Devil
[/not]
[/filter]
{CHECK_EXPLORER}
[message]
speaker=unit
speaker=$explorer.id
message= _ "The ledge just drops off here. The water might be shallow enough to wade across, but I think I vaguely see something moving underneath the surface. Maybe it's just fish, but I don't like the look of it."
[/message]
{CLEAR_VARIABLE explorer}
[/event]
#define FIND_WATER_LOCATION
@ -2354,9 +2355,19 @@
[option]
message= _ "On second thought, it's better to leave the dead in peace."
[command]
[allow_undo]
[/allow_undo]
[/command]
[/option]
[/message]
[/then]
[else]
[allow_undo]
[/allow_undo]
[/else]
[/if]
[/event]

97
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file

@ -1917,21 +1917,25 @@
[/not]
[/filter]
[store_locations]
x,y=$x1,$y1
[filter]
id=$ally_name
[/filter]
variable=unittest
[/store_locations]
[if]
[variable]
name=unittest.length
numerical_equals=0
[/variable]
[have_unit]
x,y=$x1,$y1
id=$ally_name
[/have_unit]
[then]
[message]
speaker=unit
message= _ "Hmmm, the entrance to the secret tunnel should be right around here somewhere."
[/message]
[message]
speaker=unit
message= _ "Got it!"
[/message]
[/then]
[else]
[message]
speaker=unit
message= _ "I think I see a door-shaped crack in this wall."
@ -1942,18 +1946,6 @@
message= _ "Good, that should be the entrance to the secret tunnel. Now just push hard inwards."
[/message]
[message]
speaker=unit
message= _ "Got it!"
[/message]
[/then]
[else]
[message]
speaker=unit
message= _ "Hmmm, the entrance to the secret tunnel should be right around here somewhere."
[/message]
[message]
speaker=unit
message= _ "Got it!"
@ -1961,8 +1953,6 @@
[/else]
[/if]
{CLEAR_VARIABLE unittest}
[terrain]
x,y=24,50
terrain=Uu
@ -1983,21 +1973,25 @@
[/not]
[/filter]
[store_locations]
x,y=$x1,$y1
[filter]
id=$ally_name
[/filter]
variable=unittest
[/store_locations]
[if]
[variable]
name=unittest.length
numerical_equals=0
[/variable]
[have_unit]
x,y=$x1,$y1
id=$ally_name
[/have_unit]
[then]
[message]
speaker=unit
message= _ "Okay, this is the end of the tunnel. Which means the other secret door should be right here."
[/message]
[message]
speaker=unit
message= _ "Hold on, I think I've found it."
[/message]
[/then]
[else]
[message]
speaker=unit
message= _ "The passage just halts at a dead end."
@ -2012,23 +2006,9 @@
speaker=unit
message= _ "Oh, right. Hold on, I think I've found it."
[/message]
[/then]
[else]
[message]
speaker=unit
message= _ "Okay, this is the end of the tunnel. Which means the other secret door should be right here."
[/message]
[message]
speaker=unit
message= _ "Hold on, I think I've found it."
[/message]
[/else]
[/if]
{CLEAR_VARIABLE unittest}
[terrain]
x,y=13,49
terrain=Uu
@ -2908,9 +2888,6 @@
x=13-19
y=36-40
side=1
[not]
type=Dust Devil
[/not]
[/filter]
[remove_shroud]
@ -2933,11 +2910,15 @@
terrain=Ww
[/terrain]
{CHECK_EXPLORER}
[message]
speaker=unit
speaker=$explorer.id
message= _ "This must have been the barracks. Remains of cots and beds litter the floor. Whatever happened here, it must have been sudden. Several skeletons still lie in their beds, sleeping for eternity."
[/message]
{CLEAR_VARIABLE explorer}
{NAMED_UNIT 3 (Skeleton) 15 40 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
{NAMED_UNIT 3 (Skeleton Archer) 14 36 (Restless Dead) ( _ "Restless Dead") (upkeep=free)}
@ -3161,9 +3142,7 @@
[removeitem]
x,y=$x1,$y1
[/removeitem]
[/command]
[command]
# Kill old unit which couldn't move and
# Just replace with new version of unit
# since new golem is on player's side, it is
@ -3175,9 +3154,7 @@
{NAMED_UNIT 1 (Flesh Golem) 18 29 (Kromph) ( _ "Kromph") (upkeep=free)}
# wmllint: recognize Kromph
[/command]
[command]
[message]
speaker=Kromph
message= _ "Master, what is your command?"