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

replace some victory with scenario_end events.

Browse source 
victory is an unsynced event to its potentially unsafe to change the
gamestate in it, this mostly effects LoW (which can be played as a mp
campaign) where i replaced most victory events.

But it also effects sp becasue it can casue bugs to create units in
unsynced events which are used later (here: in later scenarios), so i
replaced also all sp victory events that do that.

Note that the 'scenario_end event'+'proceed_to_next_scenario filter' has
a slightly different meaning than 'victory event': the second gets fired
when there is a local human side who won the scneario while the first
gets fired if there is any human side who on the scenario. In sp this
is the same since there are no remote human sides, but in mp this is the
reason why the first is synced and the second is not.

We could add a seperate event for this case ("before next scenario" or
similar) for easier use, but i didn't find a good name for
that yet.
This commit is contained in:
gfgtdf 2016-07-14 22:14:59 +02:00
parent 9648d9c989
commit ceea75cf0a
31 changed files with 143 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
View file

@ -406,7 +406,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
{MODIFY_UNIT id=Dacyn variables.casting_the_spell no}

6
data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
View file

@ -329,7 +329,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[unstore_unit]
variable=stored_Dacyn

6
data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
View file

@ -1273,7 +1273,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
{MODIFY_UNIT (
side=1

6
data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg
View file

@ -445,7 +445,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[message]
speaker=Dacyn

6
data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
View file

@ -650,7 +650,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[message]
speaker=narrator

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
View file

@ -401,7 +401,7 @@
# end dwarven ai code
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE offended_by_elves}
[/event]
### /Olurf's Code ###
@ -577,7 +577,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE killed_by_elves}
[/event]

12
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
View file

@ -1049,7 +1049,11 @@
[/message]
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[fire_event]
name=kalenz_arrives
@ -1116,7 +1120,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
{CLEAR_VARIABLE orc_reserve_used}
{CLEAR_VARIABLE orc_battlefield_strategy}

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
View file

@ -356,7 +356,11 @@ Chapter Two"
[/event]
#undef OBJECTIVES
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[if]
[not]

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
View file

@ -437,7 +437,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[remove_unit_overlay]
role=gold_carrier
image=items/gold-coins-small.png

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
View file

@ -288,7 +288,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[message]
id=Olurf
message= _ "The orcs ha’ been defeated. My lord, we are in your debt."

12
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
View file

@ -512,7 +512,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
{VARIABLE olurf_entry.x 40}
{VARIABLE olurf_entry.y 5}
[fire_event]
@ -522,7 +526,11 @@
### /OLURF ###
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[message]
id=Galtrid
message= _ "At last! The orcs are defeated."

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
View file

@ -137,7 +137,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[persistent_carryover_store]
scenario_id = LoW_Chapter_Two

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
View file

@ -127,7 +127,11 @@
# wmllint: recognize Uradredia
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
{MODIFY_UNIT (side=2
[not]
id=Uradredia

6
data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
View file

@ -354,7 +354,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[message]
speaker=Tallin

6
data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
View file

@ -776,7 +776,11 @@
# If we won and Camerin wasn't found add him to the players army
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[if]
[variable]

2
data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
View file

@ -2696,7 +2696,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE malifor_respawn_point,malifor_died_by}
{CLEAR_VARIABLE back_door_opened,main_door_opened,spider_door_opened,got_rod_of_justice}

2
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
View file

@ -622,7 +622,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE incominggold,havestone}
[/event]

2
data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
View file

@ -708,7 +708,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE glyphs,glyph_i,locations_outside,gate_closed}
[/event]

6
data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
View file

@ -761,7 +761,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[unstore_unit]
variable=alanin

6
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
View file

@ -624,7 +624,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
# This [if] is used only in the case the player happened to defeat all
# the enemy leaders and didn't move Alanin to the signpost

6
data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
View file

@ -677,7 +677,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
# TODO: Make Lanbec'h appear and speak

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View file

@ -360,7 +360,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[store_villages]
variable=villages

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
View file

@ -382,7 +382,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE aiglondur_passed,angarthing_passed}
[/event]

6
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -461,7 +461,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
[kill]
id=King Eldaric IV
[/kill]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
View file

@ -606,7 +606,7 @@
[/event]
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE have_book}
{CLEAR_VARIABLE lich_free}

6
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View file

@ -1280,7 +1280,11 @@
[/event]
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
# Elvish hunting party arrives if the necromancer died before turn 16.
[fire_event]

2
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -2129,7 +2129,7 @@
# victory
# clear all variables potentially not cleared
[event]
name=victory
name=scenario_end
{CLEAR_VARIABLE defiant_death}
{CLEAR_VARIABLE zur_defeated}
{CLEAR_VARIABLE grak_defeated}

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

@ -4288,7 +4288,11 @@
#victory event
[event]
name=victory
name=scenario_end
[filter_condition]
[proceed_to_next_scenario]
[/proceed_to_next_scenario]
[/filter_condition]
# reveal map in-between starting valley and location elves move to
[remove_shroud]

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

@ -1221,3 +1221,12 @@ function wml_actions.set_variable(cfg)
wesnoth.set_variable(name, table.concat(string_to_join, separator))
end
end
function wesnoth.wml_conditionals.proceed_to_next_scenario(cfg)
local endlevel_data = wesnoth.get_end_level_data()
if not endlevel_data then
return false
else
return endlevel_data.proceed_to_next_level
end
end

10
src/scripting/game_lua_kernel.cpp
View file

@ -1803,6 +1803,15 @@ int game_lua_kernel::intf_clear_messages(lua_State*)
return 0;
}
int game_lua_kernel::intf_get_end_level_data(lua_State* L)
{
if (!play_controller_.is_regular_game_end()) {
return 0;
}
luaW_pushconfig(L, play_controller_.get_end_level_data_const().to_config());
return 1;
}
int game_lua_kernel::intf_end_level(lua_State *L)
{
vconfig cfg(luaW_checkvconfig(L, 1));
@ -4566,6 +4575,7 @@ game_lua_kernel::game_lua_kernel(CVideo * video, game_state & gs, play_controlle
{ "float_label", &dispatch<&game_lua_kernel::intf_float_label > },
{ "gamestate_inspector", &dispatch<&game_lua_kernel::intf_gamestate_inspector > },
{ "get_all_vars", &dispatch<&game_lua_kernel::intf_get_all_vars > },
{ "get_end_level_data", &dispatch<&game_lua_kernel::intf_get_end_level_data > },
{ "get_locations", &dispatch<&game_lua_kernel::intf_get_locations > },
{ "get_map_size", &dispatch<&game_lua_kernel::intf_get_map_size > },
{ "get_mouseover_tile", &dispatch<&game_lua_kernel::intf_get_mouseover_tile > },

1
src/scripting/game_lua_kernel.hpp
View file

@ -107,6 +107,7 @@ class game_lua_kernel : public lua_kernel_base
int intf_check_end_level_disabled(lua_State *L);
int intf_clear_messages(lua_State*);
int intf_end_level(lua_State*);
int intf_get_end_level_data(lua_State*);
int intf_end_turn(lua_State*);
int intf_find_path(lua_State *L);
int intf_find_reach(lua_State *L);