Playcampaign: formatting cleanup
This commit is contained in:
Charles Dang
parent
0552175693
commit
a971af89d7
1 changed files with 117 additions and 107 deletions
|
|
@ -21,30 +21,30 @@
|
|||
#include "game_initialization/playcampaign.hpp"
|
||||
|
||||
#include "carryover.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "game_config.hpp"
|
||||
#include "game_errors.hpp"
|
||||
#include "preferences/game.hpp"
|
||||
#include "game_initialization/connect_engine.hpp"
|
||||
#include "game_initialization/mp_game_utils.hpp"
|
||||
#include "game_initialization/multiplayer.hpp"
|
||||
#include "generators/map_create.hpp"
|
||||
#include "generators/map_generator.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "gui/dialogs/message.hpp"
|
||||
#include "gui/dialogs/transient_message.hpp"
|
||||
#include "gui/widgets/retval.hpp"
|
||||
#include "log.hpp"
|
||||
#include "map/exception.hpp"
|
||||
#include "map/map.hpp"
|
||||
#include "persist_manager.hpp"
|
||||
#include "playmp_controller.hpp"
|
||||
#include "log.hpp"
|
||||
#include "map/map.hpp"
|
||||
#include "map/exception.hpp"
|
||||
#include "game_initialization/mp_game_utils.hpp"
|
||||
#include "game_initialization/multiplayer.hpp"
|
||||
#include "game_initialization/connect_engine.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "preferences/game.hpp"
|
||||
#include "resources.hpp"
|
||||
#include "savegame.hpp"
|
||||
#include "saved_game.hpp"
|
||||
#include "savegame.hpp"
|
||||
#include "sound.hpp"
|
||||
#include "terrain/type_data.hpp"
|
||||
#include "wml_exception.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
|
||||
#define LOG_G LOG_STREAM(info, lg::general)
|
||||
|
||||
|
|
@ -56,26 +56,30 @@ static lg::log_domain log_enginerefac("enginerefac");
|
|||
#define LOG_RG LOG_STREAM(info, log_enginerefac)
|
||||
|
||||
void campaign_controller::report_victory(
|
||||
std::ostringstream &report, team& t,
|
||||
int finishing_bonus_per_turn, int turns_left, int finishing_bonus)
|
||||
std::ostringstream& report, team& t, int finishing_bonus_per_turn, int turns_left, int finishing_bonus)
|
||||
{
|
||||
report << "<small>\n" << _("Remaining gold: ") << utils::half_signed_value(t.gold()) << "</small>";
|
||||
|
||||
if(t.carryover_bonus() != 0) {
|
||||
if (turns_left > -1) {
|
||||
if(turns_left > -1) {
|
||||
report << "\n\n<b>" << _("Turns finished early: ") << turns_left << "</b>\n"
|
||||
<< "<small>" << _("Early finish bonus: ") << finishing_bonus_per_turn << _(" per turn") << "</small>\n"
|
||||
<< "<small>" << _("Early finish bonus: ") << finishing_bonus_per_turn << _(" per turn")
|
||||
<< "</small>\n"
|
||||
<< "<small>" << _("Total bonus: ") << finishing_bonus << "</small>\n";
|
||||
}
|
||||
|
||||
report << "<small>" << _("Total gold: ") << utils::half_signed_value(t.gold() + finishing_bonus) << "</small>";
|
||||
}
|
||||
if (t.gold() > 0) {
|
||||
|
||||
if(t.gold() > 0) {
|
||||
report << "\n<small>" << _("Carryover percentage: ") << t.carryover_percentage() << "</small>";
|
||||
}
|
||||
|
||||
if(t.carryover_add()) {
|
||||
report << "\n\n<big><b>" << _("Bonus gold: ") << utils::half_signed_value(t.carryover_gold()) << "</b></big>";
|
||||
} else {
|
||||
report << "\n\n<big><b>" << _("Retained gold: ") << utils::half_signed_value(t.carryover_gold()) << "</b></big>";
|
||||
report << "\n\n<big><b>" << _("Retained gold: ") << utils::half_signed_value(t.carryover_gold())
|
||||
<< "</b></big>";
|
||||
}
|
||||
|
||||
std::string goldmsg;
|
||||
|
|
@ -88,43 +92,39 @@ void campaign_controller::report_victory(
|
|||
if(t.carryover_add()) {
|
||||
if(t.carryover_gold() > 0) {
|
||||
goldmsg = VNGETTEXT(
|
||||
"You will start the next scenario with $gold "
|
||||
"on top of the defined minimum starting gold.",
|
||||
"You will start the next scenario with $gold "
|
||||
"on top of the defined minimum starting gold.",
|
||||
t.carryover_gold(), symbols);
|
||||
|
||||
"You will start the next scenario with $gold on top of the defined minimum starting gold.",
|
||||
"You will start the next scenario with $gold on top of the defined minimum starting gold.",
|
||||
t.carryover_gold(), symbols
|
||||
);
|
||||
} else {
|
||||
goldmsg = VNGETTEXT(
|
||||
"You will start the next scenario with "
|
||||
"the defined minimum starting gold.",
|
||||
"You will start the next scenario with "
|
||||
"the defined minimum starting gold.",
|
||||
t.carryover_gold(), symbols);
|
||||
"You will start the next scenario with the defined minimum starting gold.",
|
||||
"You will start the next scenario with the defined minimum starting gold.",
|
||||
t.carryover_gold(), symbols
|
||||
);
|
||||
}
|
||||
} else {
|
||||
goldmsg = VNGETTEXT(
|
||||
"You will start the next scenario with $gold "
|
||||
"or its defined minimum starting gold, "
|
||||
"whichever is higher.",
|
||||
"You will start the next scenario with $gold "
|
||||
"or its defined minimum starting gold, "
|
||||
"whichever is higher.",
|
||||
t.carryover_gold(), symbols);
|
||||
"You will start the next scenario with $gold or its defined minimum starting gold, whichever is higher.",
|
||||
"You will start the next scenario with $gold or its defined minimum starting gold, whichever is higher.",
|
||||
t.carryover_gold(), symbols
|
||||
);
|
||||
}
|
||||
|
||||
// xgettext:no-c-format
|
||||
report << "\n" << goldmsg;
|
||||
}
|
||||
|
||||
void campaign_controller::show_carryover_message(playsingle_controller& playcontroller, const end_level_data& end_level, const LEVEL_RESULT res)
|
||||
void campaign_controller::show_carryover_message(
|
||||
playsingle_controller& playcontroller, const end_level_data& end_level, const LEVEL_RESULT res)
|
||||
{
|
||||
assert(resources::gameboard);
|
||||
|
||||
bool has_next_scenario = !resources::gamedata->next_scenario().empty() &&
|
||||
resources::gamedata->next_scenario() != "null";
|
||||
//maybe this can be the case for scenario that only contain a story and end during the prestart event ?
|
||||
if(resources::gameboard->teams().size() < 1){
|
||||
bool has_next_scenario =
|
||||
!resources::gamedata->next_scenario().empty() && resources::gamedata->next_scenario() != "null";
|
||||
|
||||
// maybe this can be the case for scenario that only contain a story and end during the prestart event ?
|
||||
if(resources::gameboard->teams().size() < 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -133,45 +133,49 @@ void campaign_controller::show_carryover_message(playsingle_controller& playcont
|
|||
|
||||
bool obs = playcontroller.is_observer();
|
||||
|
||||
if (obs) {
|
||||
if(obs) {
|
||||
title = _("Scenario Report");
|
||||
} else if (res == LEVEL_RESULT::VICTORY) {
|
||||
} else if(res == LEVEL_RESULT::VICTORY) {
|
||||
title = _("Victory");
|
||||
report << "<b>" << _("You have emerged victorious!") << "</b>";
|
||||
} else {
|
||||
title = _("Defeat");
|
||||
report << _("You have been defeated!");
|
||||
report << _("You have been defeated!");
|
||||
}
|
||||
|
||||
//We need to write the carryover amount to the team that's why we need non const
|
||||
// We need to write the carryover amount to the team that's why we need non const
|
||||
std::vector<team>& teams = resources::gameboard->teams();
|
||||
|
||||
int persistent_teams = 0;
|
||||
for (const team &t : teams) {
|
||||
if (t.persistent()){
|
||||
for(const team& t : teams) {
|
||||
if(t.persistent()) {
|
||||
++persistent_teams;
|
||||
}
|
||||
}
|
||||
|
||||
if (persistent_teams > 0 && ((has_next_scenario && end_level.proceed_to_next_level)||
|
||||
state_.classification().campaign_type == game_classification::CAMPAIGN_TYPE::TEST))
|
||||
{
|
||||
if(persistent_teams > 0 && (
|
||||
(has_next_scenario && end_level.proceed_to_next_level) ||
|
||||
state_.classification().campaign_type == game_classification::CAMPAIGN_TYPE::TEST
|
||||
)) {
|
||||
const gamemap& map = playcontroller.get_map_const();
|
||||
const tod_manager& tod = playcontroller.get_tod_manager_const();
|
||||
int turns_left = std::max<int>(0, tod.number_of_turns() - tod.turn());
|
||||
for (team &t : teams)
|
||||
{
|
||||
if (!t.persistent() || t.lost())
|
||||
{
|
||||
|
||||
for(team& t : teams) {
|
||||
if(!t.persistent() || t.lost()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
int finishing_bonus_per_turn = map.villages().size() * t.village_gold() + t.base_income();
|
||||
int finishing_bonus = t.carryover_bonus() * finishing_bonus_per_turn * turns_left;
|
||||
|
||||
t.set_carryover_gold(div100rounded((t.gold() + finishing_bonus) * t.carryover_percentage()));
|
||||
if(!t.is_local_human())
|
||||
{
|
||||
|
||||
if(!t.is_local_human()) {
|
||||
continue;
|
||||
}
|
||||
if (persistent_teams > 1) {
|
||||
|
||||
if(persistent_teams > 1) {
|
||||
report << "\n\n<b>" << t.side_name() << "</b>";
|
||||
}
|
||||
|
||||
|
|
@ -179,71 +183,74 @@ void campaign_controller::show_carryover_message(playsingle_controller& playcont
|
|||
}
|
||||
}
|
||||
|
||||
if (end_level.transient.carryover_report) {
|
||||
if(end_level.transient.carryover_report) {
|
||||
gui2::show_transient_message(title, report.str(), "", true);
|
||||
}
|
||||
}
|
||||
|
||||
LEVEL_RESULT campaign_controller::playsingle_scenario(end_level_data &end_level)
|
||||
LEVEL_RESULT campaign_controller::playsingle_scenario(end_level_data& end_level)
|
||||
{
|
||||
playsingle_controller playcontroller(is_replay_ ? state_.get_replay_starting_pos() : state_.get_starting_pos(), state_, game_config_, tdata_, false);
|
||||
playsingle_controller playcontroller(is_replay_ ? state_.get_replay_starting_pos() : state_.get_starting_pos(),
|
||||
state_, game_config_, tdata_, false);
|
||||
|
||||
LOG_NG << "created objects... " << (SDL_GetTicks() - playcontroller.get_ticks()) << "\n";
|
||||
|
||||
if(is_replay_) {
|
||||
playcontroller.enable_replay(is_unit_test_);
|
||||
}
|
||||
LEVEL_RESULT res = playcontroller.play_scenario(is_replay_ ? state_.get_replay_starting_pos() : state_.get_starting_pos());
|
||||
|
||||
if (res == LEVEL_RESULT::QUIT)
|
||||
{
|
||||
LEVEL_RESULT res =
|
||||
playcontroller.play_scenario(is_replay_ ? state_.get_replay_starting_pos() : state_.get_starting_pos());
|
||||
|
||||
if(res == LEVEL_RESULT::QUIT) {
|
||||
return LEVEL_RESULT::QUIT;
|
||||
}
|
||||
if(!is_unit_test_)
|
||||
{
|
||||
|
||||
if(!is_unit_test_) {
|
||||
is_replay_ = false;
|
||||
}
|
||||
if(is_replay_)
|
||||
{
|
||||
|
||||
if(is_replay_) {
|
||||
return res;
|
||||
}
|
||||
end_level = playcontroller.get_end_level_data_const();
|
||||
|
||||
end_level = playcontroller.get_end_level_data_const();
|
||||
show_carryover_message(playcontroller, end_level, res);
|
||||
if(!CVideo::get_singleton().faked())
|
||||
{
|
||||
|
||||
if(!CVideo::get_singleton().faked()) {
|
||||
playcontroller.maybe_linger();
|
||||
}
|
||||
|
||||
state_.set_snapshot(playcontroller.to_config());
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
LEVEL_RESULT campaign_controller::playmp_scenario(end_level_data &end_level)
|
||||
LEVEL_RESULT campaign_controller::playmp_scenario(end_level_data& end_level)
|
||||
{
|
||||
|
||||
playmp_controller playcontroller(state_.get_starting_pos(), state_,
|
||||
game_config_, tdata_, mp_info_);
|
||||
playmp_controller playcontroller(state_.get_starting_pos(), state_, game_config_, tdata_, mp_info_);
|
||||
LEVEL_RESULT res = playcontroller.play_scenario(state_.get_starting_pos());
|
||||
|
||||
//Check if the player started as mp client and changed to host
|
||||
// Check if the player started as mp client and changed to host
|
||||
|
||||
if (res == LEVEL_RESULT::QUIT)
|
||||
{
|
||||
if(res == LEVEL_RESULT::QUIT) {
|
||||
return LEVEL_RESULT::QUIT;
|
||||
}
|
||||
|
||||
end_level = playcontroller.get_end_level_data_const();
|
||||
|
||||
if(res != LEVEL_RESULT::OBSERVER_END)
|
||||
{
|
||||
//We need to call this before linger because it prints the defeated/victory message.
|
||||
if(res != LEVEL_RESULT::OBSERVER_END) {
|
||||
// We need to call this before linger because it prints the defeated/victory message.
|
||||
//(we want to see that message before entering the linger mode)
|
||||
show_carryover_message(playcontroller, end_level, res);
|
||||
}
|
||||
|
||||
playcontroller.maybe_linger();
|
||||
playcontroller.update_savegame_snapshot();
|
||||
|
||||
if(mp_info_) {
|
||||
mp_info_->connected_players = playcontroller.all_players();
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
@ -251,8 +258,7 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
{
|
||||
if(is_replay_) {
|
||||
state_.get_replay().set_pos(0);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
state_.get_replay().set_to_end();
|
||||
}
|
||||
|
||||
|
|
@ -260,25 +266,28 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
|
||||
game_classification::CAMPAIGN_TYPE game_type = state_.classification().campaign_type;
|
||||
|
||||
while(state_.valid())
|
||||
{
|
||||
while(state_.valid()) {
|
||||
LEVEL_RESULT res = LEVEL_RESULT::VICTORY;
|
||||
end_level_data end_level;
|
||||
try {
|
||||
|
||||
try {
|
||||
state_.expand_random_scenario();
|
||||
//In case this an mp scenario reloaded by sp this was not already done yet.
|
||||
|
||||
// In case this an mp scenario reloaded by sp this was not already done yet.
|
||||
state_.expand_mp_events();
|
||||
|
||||
sound::empty_playlist();
|
||||
|
||||
state_.expand_carryover();
|
||||
//expand_mp_options must be called after expand_carryover because expand_carryover will to set previous variables if there are already variables in the [scenario]
|
||||
|
||||
// expand_mp_options must be called after expand_carryover because expand_carryover will to set previous
|
||||
// variables if there are already variables in the [scenario]
|
||||
state_.expand_mp_options();
|
||||
|
||||
#if !defined(ALWAYS_USE_MP_CONTROLLER)
|
||||
if (game_type != game_classification::CAMPAIGN_TYPE::MULTIPLAYER || is_replay_) {
|
||||
if(game_type != game_classification::CAMPAIGN_TYPE::MULTIPLAYER || is_replay_) {
|
||||
res = playsingle_scenario(end_level);
|
||||
|
||||
if(is_replay_) {
|
||||
return res;
|
||||
}
|
||||
|
|
@ -299,7 +308,7 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
} catch(incorrect_map_format_error& e) {
|
||||
gui2::show_error_message(_("The game map could not be loaded: ") + e.message);
|
||||
return LEVEL_RESULT::QUIT;
|
||||
} catch (mapgen_exception& e) {
|
||||
} catch(mapgen_exception& e) {
|
||||
gui2::show_error_message(_("Map generator error: ") + e.message);
|
||||
} catch(config::error& e) {
|
||||
gui2::show_error_message(_("Error while reading the WML: ") + e.message);
|
||||
|
|
@ -309,12 +318,14 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
return LEVEL_RESULT::QUIT;
|
||||
}
|
||||
|
||||
if (is_unit_test_) {
|
||||
if(is_unit_test_) {
|
||||
return res;
|
||||
}
|
||||
|
||||
if(res == LEVEL_RESULT::QUIT) {
|
||||
return res;
|
||||
}
|
||||
|
||||
// proceed_to_next_level <=> 'any human side received victory'
|
||||
// If 'any human side received victory' we do the Save-management options
|
||||
// Otherwise we are done now
|
||||
|
|
@ -322,23 +333,21 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
return res;
|
||||
}
|
||||
|
||||
if (preferences::delete_saves()) {
|
||||
if(preferences::delete_saves()) {
|
||||
savegame::clean_saves(state_.classification().label);
|
||||
}
|
||||
if (preferences::save_replays() && end_level.replay_save) {
|
||||
|
||||
if(preferences::save_replays() && end_level.replay_save) {
|
||||
savegame::replay_savegame save(state_, preferences::save_compression_format());
|
||||
save.save_game_automatic(true);
|
||||
}
|
||||
|
||||
state_.convert_to_start_save();
|
||||
|
||||
//If there is no next scenario we're done now.
|
||||
if(state_.get_scenario_id().empty())
|
||||
{
|
||||
// If there is no next scenario we're done now.
|
||||
if(state_.get_scenario_id().empty()) {
|
||||
return res;
|
||||
}
|
||||
else if(res == LEVEL_RESULT::OBSERVER_END && mp_info_ && !mp_info_->is_host)
|
||||
{
|
||||
} else if(res == LEVEL_RESULT::OBSERVER_END && mp_info_ && !mp_info_->is_host) {
|
||||
const int dlg_res = gui2::show_message(_("Game Over"),
|
||||
_("This scenario has ended. Do you want to continue the campaign?"),
|
||||
gui2::dialogs::message::yes_no_buttons);
|
||||
|
|
@ -348,19 +357,19 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
}
|
||||
}
|
||||
|
||||
if (mp_info_ && !mp_info_->is_host) {
|
||||
if(mp_info_ && !mp_info_->is_host) {
|
||||
// Opens join game dialog to get a new gamestate.
|
||||
if(!mp::goto_mp_wait(state_, game_config_, &mp_info_->connection, res == LEVEL_RESULT::OBSERVER_END)) {
|
||||
return LEVEL_RESULT::QUIT;
|
||||
}
|
||||
|
||||
//The host should send the complete savegame now that also contains the carryvoer sides start.
|
||||
// The host should send the complete savegame now that also contains the carryvoer sides start.
|
||||
} else {
|
||||
// Retrieve next scenario data.
|
||||
state_.expand_scenario();
|
||||
|
||||
if (state_.valid()) {
|
||||
//note that although starting_pos is const it might be changed by gamestate.some_non_const_operation() .
|
||||
if(state_.valid()) {
|
||||
// note that although starting_pos is const it might be changed by gamestate.some_non_const_operation().
|
||||
const config& starting_pos = state_.get_starting_pos();
|
||||
|
||||
const bool is_mp = state_.classification().is_normal_mp_game();
|
||||
|
|
@ -370,7 +379,9 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
|
||||
ng::connect_engine_ptr connect_engine(new ng::connect_engine(state_, false, mp_info_));
|
||||
|
||||
if (!connect_engine->can_start_game() || (game_config::debug && game_type == game_classification::CAMPAIGN_TYPE::MULTIPLAYER)) {
|
||||
if(!connect_engine->can_start_game() ||
|
||||
(game_config::debug && game_type == game_classification::CAMPAIGN_TYPE::MULTIPLAYER)
|
||||
) {
|
||||
// Opens staging dialog to allow users to make an adjustments for scenario.
|
||||
if(!mp::goto_mp_connect(*connect_engine, game_config_, mp_info_ ? &mp_info_->connection : nullptr)) {
|
||||
return LEVEL_RESULT::QUIT;
|
||||
|
|
@ -388,7 +399,6 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
|
||||
// If this isn't the last scenario, then save the game
|
||||
if(end_level.prescenario_save) {
|
||||
|
||||
// For multiplayer, we want the save
|
||||
// to contain the starting position.
|
||||
// For campaigns however, this is the
|
||||
|
|
@ -400,11 +410,10 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
|
||||
save.save_game_automatic();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (!state_.get_scenario_id().empty()) {
|
||||
if(!state_.get_scenario_id().empty()) {
|
||||
std::string message = _("Unknown scenario: '$scenario|'");
|
||||
utils::string_map symbols;
|
||||
symbols["scenario"] = state_.get_scenario_id();
|
||||
|
|
@ -413,10 +422,11 @@ LEVEL_RESULT campaign_controller::play_game()
|
|||
return LEVEL_RESULT::QUIT;
|
||||
}
|
||||
|
||||
if (game_type == game_classification::CAMPAIGN_TYPE::SCENARIO){
|
||||
if (preferences::delete_saves()) {
|
||||
if(game_type == game_classification::CAMPAIGN_TYPE::SCENARIO) {
|
||||
if(preferences::delete_saves()) {
|
||||
savegame::clean_saves(state_.classification().label);
|
||||
}
|
||||
}
|
||||
|
||||
return LEVEL_RESULT::VICTORY;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue