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

move wml [endlevel] impl to lua, and split into many lua funcs

Browse source 
the [endlevel] tag does alot of things that could quite comfortably
be split into several parts, like setting the next scenario, the
end level text, message duration, credits. this commit adds
separate lua api for each of these, leaving the rest in end_level,
and the lua tag implementation calls these variously.
This commit is contained in:
Chris Beck 2014-12-24 16:17:24 -05:00
parent 36f57ff03a
commit e73c57ead7
4 changed files with 124 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1367,6 +1367,31 @@ function wml_actions.end_turn(cfg)
wesnoth.end_turn()
end
function wml_actions.endlevel(cfg)
if wesnoth.check_end_level_disabled() then
wesnoth.message("Repeated [endlevel] execution, ignoring")
return
end
local next_scenario = cfg.next_scenario
if next_scenario then
wesnoth.set_next_scenario(next_scenario)
end
local end_text = cfg.end_text
local end_text_duration = cfg.end_text_duration
if end_text or end_text_duration then
wesnoth.set_end_campaign_text(end_text or "", end_text_duration)
end
local end_credits = cfg.end_credits
if end_credits ~= nil then
wesnoth.set_end_campaign_credits(end_credits)
end
wesnoth.end_level(cfg)
end
function wml_actions.event(cfg)
local remove = cfg.remove
if remove then

70
src/game_events/action_wml.cpp
View file

@ -540,76 +540,6 @@ WML_HANDLER_FUNCTION(do_command, /*event_info*/, cfg)
}
}
WML_HANDLER_FUNCTION(endlevel, /*event_info*/, cfg)
{
end_level_data &data = resources::controller->get_end_level_data();
if(data.transient.disabled) {
WRN_NG << "repeated [endlevel] execution, ignoring" << std::endl;
return;
}
data.transient.disabled = true;
game_classification &classification = *resources::classification;
unit_map *units = resources::units;
// Remove 0-hp units from the unit map to avoid the following problem:
// In case a die event triggers an endlevel the dead unit is still as a
// 'ghost' in linger mode. After save loading in linger mode the unit
// is fully visible again.
unit_map::iterator u = units->begin();
while (u != units->end()) {
if (u->hitpoints() <= 0) {
units->erase(u++);
} else {
++u;
}
}
std::string next_scenario = cfg["next_scenario"];
if (!next_scenario.empty()) {
resources::gamedata->set_next_scenario(next_scenario);
}
std::string end_of_campaign_text = cfg["end_text"];
if (!end_of_campaign_text.empty()) {
classification.end_text = end_of_campaign_text;
}
config::attribute_value end_of_campaign_text_delay = cfg["end_text_duration"];
if (!end_of_campaign_text_delay.empty()) {
classification.end_text_duration =
end_of_campaign_text_delay.to_int(classification.end_text_duration);
}
if(cfg.has_attribute("end_credits")) {
classification.end_credits = cfg["end_credits"].to_bool(true);
}
std::string result = cfg["result"];
VALIDATE_WITH_DEV_MESSAGE(
result.empty() || result == "victory" || result == "defeat"
, _("Invalid value in the result key for [end_level]")
, "result = '" + result + "'.");
data.transient.custom_endlevel_music = cfg["music"].str();
data.transient.carryover_report = cfg["carryover_report"].to_bool(true);
data.prescenario_save = cfg["save"].to_bool(true);
data.replay_save = cfg["replay_save"].to_bool(true);
data.transient.linger_mode = cfg["linger_mode"].to_bool(true)
&& !resources::teams->empty();
data.transient.reveal_map = cfg["reveal_map"].to_bool(true);
data.gold_bonus = cfg["bonus"].to_bool(true);
data.carryover_percentage = cfg["carryover_percentage"].to_int(game_config::gold_carryover_percentage);
data.carryover_add = cfg["carryover_add"].to_bool();
if(result == "defeat") {
data.carryover_add = false;
resources::controller->force_end_level(DEFEAT);
} else {
resources::controller->force_end_level(VICTORY);
}
}
/// Experimental data persistence
/// @todo Finish experimenting.
WML_HANDLER_FUNCTION(get_global_variable,/**/,pcfg)

94
src/scripting/game_lua_kernel.cpp
View file

@ -821,6 +821,38 @@ int game_lua_kernel::intf_clear_menu_item(lua_State *L)
return 0;
}
int game_lua_kernel::intf_set_end_campaign_credits(lua_State *L)
{
game_classification &classification = const_cast<game_classification &> (play_controller_.get_classification());
classification.end_credits = lua_toboolean(L, 1);
return 0;
}
int game_lua_kernel::intf_set_end_campaign_text(lua_State *L)
{
game_classification &classification = const_cast<game_classification &> (play_controller_.get_classification());
const char *m = luaL_checkstring(L, 1);
if (m && *m != '\0') {
classification.end_text = m;
}
if (lua_isnumber(L, 2)) {
classification.end_text_duration = static_cast<int> (lua_tonumber(L, 2));
}
return 0;
}
int game_lua_kernel::intf_set_next_scenario(lua_State *L)
{
const char *m = luaL_checkstring(L, 1);
if (m && *m != '\0') {
gamedata().set_next_scenario(m);
}
return 0;
}
int game_lua_kernel::intf_shroud_op(lua_State *L, bool place_shroud)
{
vconfig cfg = luaW_checkvconfig(L, 1);
@ -1475,6 +1507,12 @@ static int intf_debug(lua_State* L)
return 1;
}
int game_lua_kernel::intf_check_end_level_disabled(lua_State * L)
{
lua_pushboolean(L, play_controller_.get_end_level_data().transient.disabled);
return 1;
}
/**
* Removes all messages from the chat window.
*/
@ -1486,6 +1524,57 @@ int game_lua_kernel::intf_clear_messages(lua_State*)
return 0;
}
int game_lua_kernel::intf_end_level(lua_State *L)
{
vconfig cfg(luaW_checkvconfig(L, 1));
end_level_data &data = play_controller_.get_end_level_data();
if (data.transient.disabled) {
return 0;
}
data.transient.disabled = true;
// Remove 0-hp units from the unit map to avoid the following problem:
// In case a die event triggers an endlevel the dead unit is still as a
// 'ghost' in linger mode. After save loading in linger mode the unit
// is fully visible again.
unit_map & um = units();
unit_map::iterator u = um.begin();
while (u) {
if (u->hitpoints() <= 0) {
um.erase(u++);
} else {
++u;
}
}
std::string result = cfg["result"];
VALIDATE_WITH_DEV_MESSAGE(
result.empty() || result == "victory" || result == "defeat"
, _("Invalid value in the result key for [end_level]")
, "result = '" + result + "'.");
data.transient.custom_endlevel_music = cfg["music"].str();
data.transient.carryover_report = cfg["carryover_report"].to_bool(true);
data.prescenario_save = cfg["save"].to_bool(true);
data.replay_save = cfg["replay_save"].to_bool(true);
data.transient.linger_mode = cfg["linger_mode"].to_bool(true)
&& !teams().empty();
data.transient.reveal_map = cfg["reveal_map"].to_bool(true);
data.gold_bonus = cfg["bonus"].to_bool(true);
data.carryover_percentage = cfg["carryover_percentage"].to_int(game_config::gold_carryover_percentage);
data.carryover_add = cfg["carryover_add"].to_bool();
if(result == "defeat") {
data.carryover_add = false;
play_controller_.force_end_level(DEFEAT);
} else {
play_controller_.force_end_level(VICTORY);
}
return 0;
}
int game_lua_kernel::intf_end_turn(lua_State*)
{
play_controller_.force_end_turn();
@ -3610,11 +3699,13 @@ game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state &
{ "add_tile_overlay", boost::bind(&game_lua_kernel::intf_add_tile_overlay, this, _1) },
{ "allow_end_turn", boost::bind(&game_lua_kernel::intf_allow_end_turn, this, _1) },
{ "allow_undo", boost::bind(&game_lua_kernel::intf_allow_undo, this, _1) },
{ "check_end_level_disabled", boost::bind(&game_lua_kernel::intf_check_end_level_disabled, this, _1) },
{ "clear_menu_item", boost::bind(&game_lua_kernel::intf_clear_menu_item, this, _1) },
{ "clear_messages", boost::bind(&game_lua_kernel::intf_clear_messages, this, _1) },
{ "color_adjust", boost::bind(&game_lua_kernel::intf_color_adjust, this, _1) },
{ "delay", boost::bind(&game_lua_kernel::intf_delay, this, _1) },
{ "end_turn", boost::bind(&game_lua_kernel::intf_end_turn, this, _1) },
{ "end_level", boost::bind(&game_lua_kernel::intf_end_level, this, _1) },
{ "extract_unit", boost::bind(&game_lua_kernel::intf_extract_unit, this, _1) },
{ "find_cost_map", boost::bind(&game_lua_kernel::intf_find_cost_map, this, _1) },
{ "find_path", boost::bind(&game_lua_kernel::intf_find_path, this, _1) },
@ -3662,7 +3753,10 @@ game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state &
{ "scroll", boost::bind(&game_lua_kernel::intf_scroll, this, _1) },
{ "scroll_to_tile", boost::bind(&game_lua_kernel::intf_scroll_to_tile, this, _1) },
{ "select_hex", boost::bind(&game_lua_kernel::intf_select_hex, this, _1) },
{ "set_end_campaign_credits", boost::bind(&game_lua_kernel::intf_set_end_campaign_credits, this, _1) },
{ "set_end_campaign_text", boost::bind(&game_lua_kernel::intf_set_end_campaign_text, this, _1) },
{ "set_menu_item", boost::bind(&game_lua_kernel::intf_set_menu_item, this, _1) },
{ "set_next_scenario", boost::bind(&game_lua_kernel::intf_set_next_scenario, this, _1) },
{ "set_terrain", boost::bind(&game_lua_kernel::intf_set_terrain, this, _1) },
{ "set_variable", boost::bind(&game_lua_kernel::intf_set_variable, this, _1) },
{ "set_village_owner", boost::bind(&game_lua_kernel::intf_set_village_owner, this, _1) },

5
src/scripting/game_lua_kernel.hpp
View file

@ -102,7 +102,9 @@ class game_lua_kernel : public lua_kernel_base
int impl_game_config_get(lua_State *L);
int impl_game_config_set(lua_State *L);
int impl_current_get(lua_State *L);
int intf_check_end_level_disabled(lua_State *L);
int intf_clear_messages(lua_State*);
int intf_end_level(lua_State*);
int intf_end_turn(lua_State*);
int intf_find_path(lua_State *L);
int intf_find_reach(lua_State *L);
@ -115,8 +117,11 @@ class game_lua_kernel : public lua_kernel_base
int intf_extract_unit(lua_State *L);
int intf_find_vacant_tile(lua_State *L);
int intf_float_label(lua_State *L);
int intf_set_end_campaign_credits(lua_State *L);
int intf_set_end_campaign_text(lua_State *L);
int intf_clear_menu_item(lua_State *L);
int intf_set_menu_item(lua_State *L);
int intf_set_next_scenario(lua_State *L);
int intf_shroud_op(lua_State *L, bool place_shroud);
int intf_simulate_combat(lua_State *L);
int intf_scroll_to_tile(lua_State *L);