Skip to content

Commit

Permalink
Add a new scenario module and move some functions there and to game_c…
Browse files Browse the repository at this point in the history 
…onfig

Addresses #4907
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Feb 21, 2021
1 parent 30019e0 commit c67d2bb
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions src/scripting/game_lua_kernel.cpp
View file
Expand Up @@ -1368,22 +1368,25 @@ int game_lua_kernel::impl_game_config_get(lua_State *L)
char const *m = luaL_checkstring(L, 2);

// Find the corresponding attribute.
return_int_attrib("last_turn", tod_man().number_of_turns());
return_int_attrib_deprecated("last_turn", "wesnoth.game_config", INDEFINITE, "11.7", "Use wesnoth.scenario.turns instead", tod_man().number_of_turns());
return_bool_attrib("do_healing", play_controller_.gamestate().do_healing_);
return_string_attrib("next_scenario", gamedata().next_scenario());
return_string_attrib("theme", gamedata().get_theme());
return_string_attrib("scenario_id", gamedata().get_id());
return_vector_string_attrib("defeat_music", gamedata().get_defeat_music());
return_vector_string_attrib("victory_music", gamedata().get_victory_music());
return_vector_string_attrib("active_resources", utils::split(play_controller_.get_loaded_resources()) );
return_string_attrib_deprecated("next_scenario", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.next instead", gamedata().next_scenario());
return_string_attrib_deprecated("theme", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.interface.current_theme instead", gamedata().get_theme());
return_string_attrib_deprecated("scenario_id", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.id instead", gamedata().get_id());
return_vector_string_attrib_deprecated("defeat_music", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.defeat_music instead",
gamedata().get_defeat_music());
return_vector_string_attrib_deprecated("victory_music", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.victory_music instead",
gamedata().get_victory_music());
return_vector_string_attrib_deprecated("active_resources", "wesnoth.game_config", INDEFINITE, "1.17", "Use vwesnoth.scenario.resources instead",
utils::split(play_controller_.get_loaded_resources()));

const mp_game_settings& mp_settings = play_controller_.get_mp_settings();
const game_classification & classification = play_controller_.get_classification();

return_string_attrib("campaign_type", classification.campaign_type.to_string());
return_string_attrib_deprecated("campaign_type", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.type instead", classification.campaign_type.to_string());
if(classification.campaign_type==game_classification::CAMPAIGN_TYPE::MULTIPLAYER) {
return_cfgref_attrib("mp_settings", mp_settings.to_config());
return_cfgref_attrib("era", game_config_manager::get()->game_config().find_child("era","id",classification.era_id));
return_cfgref_attrib_deprecated("mp_settings", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.mp_settings instead", mp_settings.to_config()); return_cfgref_attrib_deprecated("era", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.era instead",
game_config_manager::get()->game_config().find_child("era","id",classification.era_id));
//^ finds the era with name matching mp_era, and creates a lua reference from the config of that era.

//This code for SigurdFD, not the cleanest implementation but seems to work just fine.
Expand Down Expand Up @@ -1416,16 +1419,16 @@ int game_lua_kernel::impl_game_config_set(lua_State *L)
modify_int_attrib("recall_cost", game_config::recall_cost = value);
modify_int_attrib("kill_experience", game_config::kill_experience = value);
modify_int_attrib("combat_experience", game_config::combat_experience = value);
modify_int_attrib("last_turn", tod_man().set_number_of_turns_by_wml(value));
modify_int_attrib_deprecated("last_turn", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.turns instead", tod_man().set_number_of_turns_by_wml(value));
modify_bool_attrib("do_healing", play_controller_.gamestate().do_healing_ = value);
modify_string_attrib("next_scenario", gamedata().set_next_scenario(value));
modify_string_attrib("theme",
modify_string_attrib_deprecated("next_scenario", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.next instead", gamedata().set_next_scenario(value));
modify_string_attrib_deprecated("theme", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.interface.current_theme instead",
gamedata().set_theme(value);
const game_config_view& game_config = game_config_manager::get()->game_config();
game_display_->set_theme(play_controller_.get_theme(game_config, value));
);
modify_vector_string_attrib("defeat_music", gamedata().set_defeat_music(std::move(value)));
modify_vector_string_attrib("victory_music", gamedata().set_victory_music(std::move(value)));
modify_vector_string_attrib_deprecated("defeat_music", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.defeat_music instead", gamedata().set_defeat_music(std::move(value)));
modify_vector_string_attrib_deprecated("victory_music", "wesnoth.game_config", INDEFINITE, "1.17", "Use wesnoth.scenario.victory_music instead", gamedata().set_victory_music(std::move(value)));
return lua_kernel_base::impl_game_config_set(L);
}

Expand Down

0 comments on commit c67d2bb

Please sign in to comment.