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

Deprecate [event]remove=

Browse source 
[ci skip]
This commit is contained in:
Celtic Minstrel 2016-11-13 12:29:39 -05:00
parent 0a325797b4
commit 35a581c9e7
15 changed files with 101 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -387,10 +387,9 @@
message=_"Do you want us to fight? We can still avoid them, but they are between us and the next oasis."
[/message]
[event]
[remove_event]
id=scorpion_ambush
remove=true
[/event]
[/remove_event]
[/event]
[event]
@ -419,10 +418,9 @@
{SCORPION_PLACEMENT}
[event]
[remove_event]
id=scorpions_spotted
remove=true
[/event]
[/remove_event]
[/event]
[event]
@ -513,10 +511,9 @@
y=$y1
[/role]
[event]
[remove_event]
id=take_traveler_ring
remove=true
[/event]
[/remove_event]
{CLEAR_VARIABLE ring_loc}
[/command]
@ -584,10 +581,9 @@
[/filter_wml]
[/filter]
[event]
[remove_event]
id=ogre_ambush
remove=true
[/event]
[/remove_event]
{OGRE_PLACEMENT}
@ -650,10 +646,9 @@
[/not]
[/filter]
[event]
[remove_event]
id=ogres_spotted
remove=true
[/event]
[/remove_event]
{OGRE_PLACEMENT}
@ -1652,10 +1647,9 @@
y=$y1
[/remove_item]
[event]
[remove_event]
id=take_holy_water
remove=true
[/event]
[/remove_event]
[/command]
[/option]

10
data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
View file

@ -663,10 +663,9 @@
y=$y1
[/remove_item]
[event]
[remove_event]
id=take_ring
remove=true
[/event]
[/remove_event]
[/command]
[/option]
@ -858,10 +857,9 @@
message= _ "The voices say I have no choice, I must attack!"
[/message]
[event]
[remove_event]
id=find_dagger
remove=true
[/event]
[/remove_event]
[/command]
[/option]

5
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -1905,10 +1905,9 @@ _ "These undead trolls fight again in death as they did in life, except this tim
[option]
label= _ "It might be useful, I’ll take it."
[command]
[event]
[remove_event]
id=take_wand
remove=true
[/event]
[/remove_event]
[message]
speaker=unit

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

@ -1009,10 +1009,9 @@
{BACKUP_CHARGES}
[event]
[remove_event]
id=move_blows_charges
remove=true
[/event]
[/remove_event]
[/event]
# if player crosses bridge before killing Jorgi, then blow charges
@ -1035,10 +1034,9 @@
{BACKUP_CHARGES}
[event]
[remove_event]
id=death_blows_charges
remove=true
[/event]
[/remove_event]
[/event]
# Event 5: Vampire Bats
@ -1525,10 +1523,9 @@
message= _ "Whoa. That was pretty impressive. The amulet stopped glowing and the rune is gone, but what have they revealed?"
[/message]
[event]
[remove_event]
id=door_message
remove=true
[/event]
[/remove_event]
[/event]
[/event]
@ -1669,10 +1666,9 @@
[option]
label= _ "I fear no ghosts, I’ll take it."
[command]
[event]
[remove_event]
id=take_belt
remove=true
[/event]
[/remove_event]
[message]
speaker=unit

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

@ -1971,10 +1971,9 @@
[option]
label= _ "Break the circle"
[command]
[event]
[remove_event]
id=break_circle
remove=true
[/event]
[/remove_event]
[remove_item]
x,y=$x1,$y1
@ -2191,10 +2190,9 @@
[option]
label= _ "Pull the lever."
[command]
[event]
[remove_event]
id=pull_lever
remove=true
[/event]
[/remove_event]
{UTBS_SHAKE_SCREEN}
@ -4202,10 +4200,9 @@
[/have_location]
[/filter_condition]
[event]
[remove_event]
id=do_flooding
remove=true
[/event]
[/remove_event]
# flood rest of side passage with deep water
[terrain]

40
data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
View file

@ -1277,26 +1277,21 @@
[/filter_condition]
# Remove any remaining rescue events
[event]
[remove_event]
id=rescue_urruga
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_nuvassa
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_yantili
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_iltian
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_wejial
remove=true
[/event]
[/remove_event]
# To do: add dialogue when merfolk die
@ -2458,18 +2453,15 @@
# bring back Alastra, Darius and Zelgant if they haven't died
# Get rid of events for approaching their old keeps
[event]
[remove_event]
id=approach_darius
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=approach_alastra
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=approach_zelgant
remove=true
[/event]
[/remove_event]
[if]
[variable]

5
data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
View file

@ -748,10 +748,9 @@
side=1
[/allow_recruit]
[event]
[remove_event]
id=jungle_warning
remove=true
[/event]
[/remove_event]
[objectives]
summary= _ "New Objectives:"

30
data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg
View file

@ -387,10 +387,9 @@
message=_"Do you want us to fight? We can still avoid them, but they are between us and the next oasis."
[/message]
[event]
[remove_event]
id=scorpion_ambush
remove=true
[/event]
[/remove_event]
[/event]
[event]
@ -419,10 +418,9 @@
{SCORPION_PLACEMENT}
[event]
[remove_event]
id=scorpions_spotted
remove=true
[/event]
[/remove_event]
[/event]
[event]
@ -513,10 +511,9 @@
y=$y1
[/role]
[event]
[remove_event]
id=take_traveler_ring
remove=true
[/event]
[/remove_event]
{CLEAR_VARIABLE ring_loc}
[/command]
@ -584,10 +581,9 @@
[/filter_wml]
[/filter]
[event]
[remove_event]
id=ogre_ambush
remove=true
[/event]
[/remove_event]
{OGRE_PLACEMENT}
@ -650,10 +646,9 @@
[/not]
[/filter]
[event]
[remove_event]
id=ogres_spotted
remove=true
[/event]
[/remove_event]
{OGRE_PLACEMENT}
@ -1652,10 +1647,9 @@
y=$y1
[/remove_item]
[event]
[remove_event]
id=take_holy_water
remove=true
[/event]
[/remove_event]
[/command]
[/option]

10
data/campaigns/Under_the_Burning_Suns/scenarios_old/04_Descending_into_Darkness.cfg
View file

@ -663,10 +663,9 @@
y=$y1
[/remove_item]
[event]
[remove_event]
id=take_ring
remove=true
[/event]
[/remove_event]
[/command]
[/option]
@ -858,10 +857,9 @@
message= _ "The voices say I have no choice, I must attack!"
[/message]
[event]
[remove_event]
id=find_dagger
remove=true
[/event]
[/remove_event]
[/command]
[/option]

5
data/campaigns/Under_the_Burning_Suns/scenarios_old/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -1904,10 +1904,9 @@ _ "These undead trolls fight again in death as they did in life, except this tim
[option]
label= _ "It might be useful, I’ll take it."
[command]
[event]
[remove_event]
id=take_wand
remove=true
[/event]
[/remove_event]
[message]
speaker=unit

20
data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -1009,10 +1009,9 @@
{BACKUP_CHARGES}
[event]
[remove_event]
id=move_blows_charges
remove=true
[/event]
[/remove_event]
[/event]
# if player crosses bridge before killing Jorgi, then blow charges
@ -1035,10 +1034,9 @@
{BACKUP_CHARGES}
[event]
[remove_event]
id=death_blows_charges
remove=true
[/event]
[/remove_event]
[/event]
# Event 5: Vampire Bats
@ -1525,10 +1523,9 @@
message= _ "Whoa. That was pretty impressive. The amulet stopped glowing and the rune is gone, but what have they revealed?"
[/message]
[event]
[remove_event]
id=door_message
remove=true
[/event]
[/remove_event]
[/event]
[/event]
@ -1669,10 +1666,9 @@
[option]
label= _ "I fear no ghosts, I’ll take it."
[command]
[event]
[remove_event]
id=take_belt
remove=true
[/event]
[/remove_event]
[message]
speaker=unit

15
data/campaigns/Under_the_Burning_Suns/scenarios_old/08_Out_of_the_Frying_Pan.cfg
View file

@ -1971,10 +1971,9 @@
[option]
label= _ "Break the circle"
[command]
[event]
[remove_event]
id=break_circle
remove=true
[/event]
[/remove_event]
[remove_item]
x,y=$x1,$y1
@ -2191,10 +2190,9 @@
[option]
label= _ "Pull the lever."
[command]
[event]
[remove_event]
id=pull_lever
remove=true
[/event]
[/remove_event]
{UTBS_SHAKE_SCREEN}
@ -4202,10 +4200,9 @@
[/have_location]
[/filter_condition]
[event]
[remove_event]
id=do_flooding
remove=true
[/event]
[/remove_event]
# flood rest of side passage with deep water
[terrain]

40
data/campaigns/Under_the_Burning_Suns/scenarios_old/09_Blood_is_Thicker_Than_Water.cfg
View file

@ -1277,26 +1277,21 @@
[/filter_condition]
# Remove any remaining rescue events
[event]
[remove_event]
id=rescue_urruga
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_nuvassa
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_yantili
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_iltian
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=rescue_wejial
remove=true
[/event]
[/remove_event]
# To do: add dialogue when merfolk die
@ -2451,18 +2446,15 @@
# bring back Alastra, Darius and Zelgant if they haven't died
# Get rid of events for approaching their old keeps
[event]
[remove_event]
id=approach_darius
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=approach_alastra
remove=true
[/event]
[event]
[/remove_event]
[remove_event]
id=approach_zelgant
remove=true
[/event]
[/remove_event]
[if]
[variable]

5
data/campaigns/Under_the_Burning_Suns/scenarios_old/11_Battle_for_Zocthanol_Isle.cfg
View file

@ -748,10 +748,9 @@
side=1
[/allow_recruit]
[event]
[remove_event]
id=jungle_warning
remove=true
[/event]
[/remove_event]
[objectives]
summary= _ "New Objectives:"

1
data/lua/wml-tags.lua
View file

@ -845,6 +845,7 @@ end
function wml_actions.event(cfg)
if cfg.remove then
wesnoth.log('debug', '[event]remove= is deprecated; use [remove_event] instead')
wml_actions.remove_event(cfg)
else
wesnoth.add_event_handler(cfg)