Have presets support saving the same values as the last used scenario preferences

Resolves wesnoth#10377

Author: Pentarctagon

src/game_initialization/lobby_info.cpp

@@ -20,6 +20,7 @@
 #include "log.hpp"
 #include "mp_ui_alerts.hpp"
 #include "preferences/preferences.hpp"
+#include "serialization/string_utils.hpp"
 
 
 static lg::log_domain log_engine("engine");
@@ -123,9 +124,16 @@ void lobby_info::process_gamelist(const config& data)
 	games_by_id_.clear();
 
 	for(const config& game : prefs::get().get_game_presets()) {
-		optional_const_config scenario = game_config_manager::get()->game_config().find_child("multiplayer", "id", game["scenario"].str());
+		const auto game_config = game_config_manager::get()->game_config();
+
+		optional_const_config scenario = game_config.find_child("multiplayer", "id", game["scenario"].str());
 		if(!scenario) {
-			ERR_LB << "Scenario " << game["scenario"].str() << " not found in game config";
+			ERR_LB << "Scenario " << game["scenario"].str() << " not found in game preset " << game["id"];
+			continue;
+		}
+		optional_const_config era = game_config.find_child("era", "id", game["era"].str());
+		if(!era) {
+			ERR_LB << "Era " << game["era"].str() << " not found in game preset " << game["id"];
 			continue;
 		}
 
@@ -153,6 +161,7 @@ void lobby_info::process_gamelist(const config& data)
 		qgame["mp_shroud"] = game["shroud"];
 		qgame["mp_village_gold"] = game["village_gold"];
 		qgame["experience_modifier"] = game["experience_modifier"];
+		qgame["random_faction_mode"] = game["random_faction_mode"];
 
 		qgame["mp_countdown"] = game["countdown"];
 		if(qgame["mp_countdown"].to_bool()) {
@@ -165,12 +174,30 @@ void lobby_info::process_gamelist(const config& data)
 		qgame["observer"] = game["observer"];
 		qgame["human_sides"] = human_sides;
 
+		std::vector<std::string> mods = utils::split(game["mp_modifications"].str());
+		for(const std::string& mod : mods) {
+			auto cfg = game_config.find_child("modification", "id", mod);
+
+			if(cfg) {
+				config& m = qgame.add_child("modification");
+				m["name"] = cfg["name"];
+				m["id"] = mod;
+			} else {
+				ERR_LB << "Modification " << mod << " not found in game preset " << game["id"];
+				continue;
+			}
+		}
+
+		if(game.has_child("options")) {
+			qgame.add_child("options", game.mandatory_child("options"));
+		}
+
 		if(scenario->has_attribute("map_data")) {
 			qgame["map_data"] = scenario["map_data"];
 		} else {
 			qgame["map_data"] = filesystem::read_map(scenario["map_file"]);
 		}
-		qgame["hash"] = game_config_manager::get()->game_config().mandatory_child("multiplayer_hashes")[game["scenario"].str()];
+		qgame["hash"] = game_config.mandatory_child("multiplayer_hashes")[game["scenario"].str()];
 
 		config& qchild = qgame.add_child("slot_data");
 		qchild["vacant"] = human_sides;

src/gui/dialogs/multiplayer/mp_create_game.cpp

@@ -65,7 +65,7 @@ mp_create_game::mp_create_game(saved_game& state, bool local_mode)
 	, options_manager_()
 	, selected_game_index_(-1)
 	, selected_rfm_index_(-1)
-	, use_map_settings_(register_bool( "use_map_settings", true,
+	, use_map_settings_(register_bool("use_map_settings", true,
 		[]() {return prefs::get().mp_use_map_settings();},
 		[](bool v) {prefs::get().set_mp_use_map_settings(v);},
 		std::bind(&mp_create_game::update_map_settings, this)))
@@ -219,8 +219,17 @@ void mp_create_game::quick_mp_setup(saved_game& state, const config presets)
 	create.get_state().classification().oos_debug = false;
 	params.shuffle_sides = presets["shuffle_sides"].to_bool();
 
-	params.mode = random_faction_mode::type::no_mirror;
+	params.mode = random_faction_mode::get_enum(presets["random_faction_mode"].str()).value_or(random_faction_mode::type::independent);
 	params.name = settings::game_name_default();
+
+	std::vector<std::string> mods = utils::split(presets["mp_modifications"].str());
+	for(const std::string& mod : mods) {
+		create.active_mods().push_back(mod);
+	}
+
+	if(presets.has_child("options")) {
+		params.options = presets.mandatory_child("options");
+	}
 }
 
 void mp_create_game::pre_show()
@@ -903,6 +912,14 @@ void mp_create_game::save_preset()
 	preset["turns"] = turns_->get_widget_value();
 	preset["observer"] = observers_->get_widget_value();
 	preset["use_map_settings"] = use_map_settings_->get_widget_value();
+	
+	// TODO: need to populate the same in the list of presets selectable in the game creation list
+	// TODO: test that addon info is stored in the database correctly
+	// TODO: test with non-mainline modifications/eras/scenarios
+	preset["mp_modifications"] = utils::join(create_engine_.active_mods(), ",");
+	preset.add_child("options", options_manager_->get_options_config());
+	random_faction_mode::type type = random_faction_mode::get_enum(selected_rfm_index_).value_or(random_faction_mode::type::independent);
+	preset["random_faction_mode"] = random_faction_mode::get_string(type);
 
 	prefs::get().add_game_preset(std::move(preset));
 }