Merge pull request #1995 from ZombieFreak115/mp_player_network_refactor

MP player network refactor, support co-op, and some minor military changes

Author: schombert

assets/alice.gui

@@ -1,4 +1,14 @@
 guiTypes = {
+	guiButtonType = {
+		name = "observer_button"
+		extends = "lobby"
+		position = { x = 17 y = -200 }
+		quadTextureSprite ="GFX_frontend_play_button"	
+		buttonText = "alice_observer_btn_text"
+		buttonFont = "vic_32_black"
+		Orientation = "LOWER_LEFT"
+	}
+			
 	iconType = {
         name = "gfx_storage_unit_types"
         spriteType = "GFX_unit_strip"

assets/localisation/en-US/alice.csv

@@ -1043,6 +1043,7 @@ disband_all;Disband all selected units
 alice_play_checksum_host;Checksum mismatch with host, ensure you have the same mods and savefiles
 alice_play_save_stream;Host is streaming a save to you, wait until it completes
 alice_no_start_game_player_loading;Cannot start the game while players are loading
+alice_no_start_game_invalid_nations;Cannot start the game while players are on non-existant nations
 ai_will_accept_po;They will accept this offer
 ai_will_not_accept_po;They will NOT accept this offer
 close_and_del;Close & Delete Factory
@@ -1564,6 +1565,8 @@ alice_host_has_resync;Host has resynced the lobby
 alice_naval_coordination_penalty;The $x$ are receiving a naval coordination penalty of ?R$y$?W from outnumbering their enemy, which reduces their target selection by ?R$val$?W
 alice_naval_coordination_bonus;The $x$ are receiving a naval coordination bonus of ?G$y$?W from being outnumbered, which increases their target selection by ?G$val$?W
 alice_naval_stacking_penalty;The $x$ are receiving a damage multiplier of ?R$y$?W from stacking penalties.
+alice_observer_btn_text;Play as observer
+alice_observer_already_observer_tooltip;You are already on the observer tag.
 alice_labor_no_education;Unskilled
 alice_labor_basic_education;Skilled
 alice_labor_high_education;Expert

assets/localisation/en-US/mapmodes.csv

@@ -95,6 +95,7 @@ mapmode_tooltip_34;Player: $x$
 mapmode_tooltip_34_you_sp;This is you! 
 mapmode_tooltip_34_you;Player: $x$ (This is you!) 
 mapmode_tooltip_34_ai;AI controlled
+mapmode_tooltip_34_no_ai;Not AI controlled
 mapmode_tooltip_35;Life needs satisfied: $x$
 mapmode_tooltip_36;Everyday needs satisfied: $x$
 mapmode_tooltip_37;Luxury needs satisfied: $x$

src/common_types/container_types.hpp

@@ -302,6 +302,10 @@ struct player_value {
 		return *this;
 	}
 
+	bool is_equal(player_value<_Size> other) {
+		return other.data == data;
+	}
+
 	std::string to_string() noexcept {
 		return std::string(to_string_view());
 	}

src/gamestate/commands.cpp

@@ -34,105 +34,106 @@ enum class command_type : uint8_t {
 	add_to_sphere = 24,
 	remove_from_sphere = 25,
 	upgrade_colony_to_state = 26,
-	invest_in_colony = 27,
-	abandon_colony = 28,
-	finish_colonization = 29,
-	intervene_in_war = 30,
-	suppress_movement = 31,
-	civilize_nation = 32,
-	appoint_ruling_party = 33,
-	change_issue_option = 34,
-	change_reform_option = 35,
-	become_interested_in_crisis = 36,
-	take_sides_in_crisis = 37,
-	begin_land_unit_construction = 38,
-	cancel_land_unit_construction = 39,
-	change_stockpile_settings = 40,
-	take_decision = 41,
-	make_n_event_choice = 42,
-	make_f_n_event_choice = 43,
-	make_p_event_choice = 44,
-	make_f_p_event_choice = 45,
-	fabricate_cb = 46,
-	cancel_cb_fabrication = 47,
-	ask_for_military_access = 48,
-	ask_for_alliance = 49,
-	call_to_arms = 50,
-	respond_to_diplomatic_message = 51,
-	cancel_military_access = 52,
-	cancel_alliance = 53,
-	cancel_given_military_access = 54,
-	declare_war = 55,
-	add_war_goal = 56,
-	start_peace_offer = 58,
-	add_peace_offer_term = 59,
-	send_peace_offer = 60,
-	move_army = 61,
-	move_navy = 62,
-	embark_army = 63,
-	merge_armies = 64,
-	merge_navies = 65,
-	split_army = 66,
-	split_navy = 67,
-	delete_army = 68,
-	delete_navy = 69,
-	designate_split_regiments = 70,
-	designate_split_ships = 71,
-	naval_retreat = 72,
-	land_retreat = 73,
-	start_crisis_peace_offer = 74,
-	invite_to_crisis = 75,
-	add_wargoal_to_crisis_offer = 76,
-	send_crisis_peace_offer = 77,
-	change_admiral = 78,
-	change_general = 79,
-	toggle_mobilization = 80,
-	give_military_access = 81,
-	set_rally_point = 82,
-	save_game = 83,
-	cancel_factory_building_construction = 84,
-	disband_undermanned = 85,
-	even_split_army = 86,
-	even_split_navy = 87,
-	toggle_hunt_rebels = 88,
-	toggle_select_province = 89,
-	toggle_immigrator_province = 90,
-	state_transfer = 91,
-	release_subject = 92,
-	enable_debt = 93,
-	move_capital = 94,
-	toggle_unit_ai_control = 95,
-	toggle_mobilized_is_ai_controlled = 96,
-	toggle_interested_in_alliance = 97,
-	pbutton_script = 98,
-	nbutton_script = 99,
-	set_factory_type_priority = 100,
-	crisis_add_wargoal = 101,
-	change_unit_type = 102,
-	take_province = 103,
-	grant_province = 104,
-	ask_for_free_trade_agreement = 105,
-	switch_embargo_status = 106,
-	revoke_trade_rights = 107,
-	toggle_local_administration = 108,
-
-	// network
-	notify_player_ban = 110,
-	notify_player_kick = 111,
-	notify_player_picks_nation = 112,
-	notify_player_joins = 113,
-	notify_player_leaves = 114,
-	notify_player_oos = 115,
-	notify_save_loaded = 116,
-	notify_start_game = 117, // for synchronized "start game"
-	notify_stop_game = 118, // "go back to lobby"
-	notify_pause_game = 119, // visual aid mostly
-	notify_reload = 120,
-	advance_tick = 121,
-	chat_message = 122,
-	network_inactivity_ping = 123,
-	notify_player_fully_loaded = 124, // client sends this to the host to notify that they are fully loaded in, and host transmits it to all clients
-	notify_player_is_loading = 125, // host sends this to all clients to notify that a specific client has begun loading
+		invest_in_colony = 27,
+		abandon_colony = 28,
+		finish_colonization = 29,
+		intervene_in_war = 30,
+		suppress_movement = 31,
+		civilize_nation = 32,
+		appoint_ruling_party = 33,
+		change_issue_option = 34,
+		change_reform_option = 35,
+		become_interested_in_crisis = 36,
+		take_sides_in_crisis = 37,
+		begin_land_unit_construction = 38,
+		cancel_land_unit_construction = 39,
+		change_stockpile_settings = 40,
+		take_decision = 41,
+		make_n_event_choice = 42,
+		make_f_n_event_choice = 43,
+		make_p_event_choice = 44,
+		make_f_p_event_choice = 45,
+		fabricate_cb = 46,
+		cancel_cb_fabrication = 47,
+		ask_for_military_access = 48,
+		ask_for_alliance = 49,
+		call_to_arms = 50,
+		respond_to_diplomatic_message = 51,
+		cancel_military_access = 52,
+		cancel_alliance = 53,
+		cancel_given_military_access = 54,
+		declare_war = 55,
+		add_war_goal = 56,
+		start_peace_offer = 58,
+		add_peace_offer_term = 59,
+		send_peace_offer = 60,
+		move_army = 61,
+		move_navy = 62,
+		embark_army = 63,
+		merge_armies = 64,
+		merge_navies = 65,
+		split_army = 66,
+		split_navy = 67,
+		delete_army = 68,
+		delete_navy = 69,
+		designate_split_regiments = 70,
+		designate_split_ships = 71,
+		naval_retreat = 72,
+		land_retreat = 73,
+		start_crisis_peace_offer = 74,
+		invite_to_crisis = 75,
+		add_wargoal_to_crisis_offer = 76,
+		send_crisis_peace_offer = 77,
+		change_admiral = 78,
+		change_general = 79,
+		toggle_mobilization = 80,
+		give_military_access = 81,
+		set_rally_point = 82,
+		save_game = 83,
+		cancel_factory_building_construction = 84,
+		disband_undermanned = 85,
+		even_split_army = 86,
+		even_split_navy = 87,
+		toggle_hunt_rebels = 88,
+		toggle_select_province = 89,
+		toggle_immigrator_province = 90,
+		state_transfer = 91,
+		release_subject = 92,
+		enable_debt = 93,
+		move_capital = 94,
+		toggle_unit_ai_control = 95,
+		toggle_mobilized_is_ai_controlled = 96,
+		toggle_interested_in_alliance = 97,
+		pbutton_script = 98,
+		nbutton_script = 99,
+		set_factory_type_priority = 100,
+		crisis_add_wargoal = 101,
+		change_unit_type = 102,
+		take_province = 103,
+		grant_province = 104,
+		ask_for_free_trade_agreement = 105,
+		switch_embargo_status = 106,
+		revoke_trade_rights = 107,
+		toggle_local_administration = 108,
+
+		// network
+		notify_player_ban = 110,
+		notify_player_kick = 111,
+		notify_player_picks_nation = 112,
+		notify_player_joins = 113,
+		notify_player_leaves = 114,
+		notify_player_oos = 115,
+		notify_save_loaded = 116,
+		notify_start_game = 117, // for synchronized "start game"
+		notify_stop_game = 118, // "go back to lobby"
+		notify_pause_game = 119, // visual aid mostly
+		notify_reload = 120,
+		advance_tick = 121,
+		chat_message = 122,
+		network_inactivity_ping = 123,
+		notify_player_fully_loaded = 124, // client sends this to the host to notify that they are fully loaded in, and host transmits it to all clients
+		notify_player_is_loading = 125, // host sends this to all clients to notify that a specific client has begun loading
+		change_ai_nation_state = 126, // host sends this to new clients to inform them of no-ai nations, which arent players. 
 
 	// console cheats
 	network_populate = 254,
@@ -209,6 +210,7 @@ struct factory_data {
 
 struct tag_target_data {
 	dcon::national_identity_id ident;
+	sys::player_name player_name;
 };
 
 struct influence_action_data {
@@ -457,10 +459,12 @@ struct set_factory_priority_data {
 struct chat_message_data {
 	char body[ui::max_chat_message_len];
 	dcon::nation_id target;
+	sys::player_name sender;
 };
 
 struct nation_pick_data {
 	dcon::nation_id target;
+	sys::player_name player_name;
 };
 
 struct advance_tick_data {
@@ -484,13 +488,28 @@ struct notify_reload_data {
 };
 struct notify_leaves_data {
 	bool make_ai;
+	sys::player_name player_name;
 };
 struct notify_player_fully_loaded_data {
 	sys::player_name name;
 };
 struct notify_player_is_loading_data {
 	sys::player_name name;
 };
+struct notify_player_ban_data {
+	bool make_ai;
+	sys::player_name player_name;
+};
+struct notify_player_kick_data {
+	bool make_ai;
+	sys::player_name player_name;
+};
+struct notify_player_oos_data {
+	sys::player_name player_name;
+};
+struct change_ai_nation_state_data {
+	bool no_ai;
+};
 
 struct payload {
 	union dtype {
@@ -559,6 +578,10 @@ struct payload {
 		pbutton_data pbutton;
 		cheat_invention_data_t cheat_invention_data;
 		set_factory_priority_data set_factory_priority;
+		notify_player_ban_data notify_player_ban;
+		notify_player_kick_data notify_player_kick;
+		notify_player_oos_data notify_player_oos;
+		change_ai_nation_state_data change_ai_nation_state;
 
 		dtype() { }
 	} data;
@@ -621,8 +644,8 @@ bool can_change_factory_settings(sys::state& state, dcon::nation_id source, dcon
 void make_vassal(sys::state& state, dcon::nation_id source, dcon::national_identity_id t);
 bool can_make_vassal(sys::state& state, dcon::nation_id source, dcon::national_identity_id t);
 
-void release_and_play_as(sys::state& state, dcon::nation_id source, dcon::national_identity_id t);
-bool can_release_and_play_as(sys::state& state, dcon::nation_id source, dcon::national_identity_id t);
+void release_and_play_as(sys::state& state, dcon::nation_id source, dcon::national_identity_id t, sys::player_name& player_name);
+bool can_release_and_play_as(sys::state& state, dcon::nation_id source, dcon::national_identity_id t, sys::player_name& player_name);
 
 void give_war_subsidies(sys::state& state, dcon::nation_id source, dcon::nation_id target);
 bool can_give_war_subsidies(sys::state& state, dcon::nation_id source, dcon::nation_id target);
@@ -922,8 +945,8 @@ void toggle_immigrator_province(sys::state& state, dcon::nation_id source, dcon:
 bool can_toggle_immigrator_province(sys::state& state, dcon::nation_id source, dcon::province_id prov);
 
 void post_chat_message(sys::state& state, ui::chat_message& m);
-void chat_message(sys::state& state, dcon::nation_id source, std::string_view body, dcon::nation_id target);
-bool can_chat_message(sys::state& state, dcon::nation_id source, std::string_view body, dcon::nation_id target);
+void chat_message(sys::state& state, dcon::nation_id source, std::string_view body, dcon::nation_id target, sys::player_name& sender);
+bool can_chat_message(sys::state& state, dcon::nation_id source, std::string_view body, dcon::nation_id target, sys::player_name& sender);
 
 void release_subject(sys::state& state, dcon::nation_id source, dcon::nation_id target);
 bool can_release_subject(sys::state& state, dcon::nation_id source, dcon::nation_id target);
@@ -932,23 +955,25 @@ void state_transfer(sys::state& state, dcon::nation_id asker, dcon::nation_id ta
 bool can_state_transfer(sys::state& state, dcon::nation_id asker, dcon::nation_id target, dcon::state_definition_id sid);
 
 void advance_tick(sys::state& state, dcon::nation_id source);
-void notify_player_ban(sys::state& state, dcon::nation_id source, dcon::nation_id target);
-bool can_notify_player_ban(sys::state& state, dcon::nation_id source, dcon::nation_id target);
-void notify_player_kick(sys::state& state, dcon::nation_id source, dcon::nation_id target);
-bool can_notify_player_kick(sys::state& state, dcon::nation_id source, dcon::nation_id target);
+void notify_player_ban(sys::state& state, dcon::nation_id source, bool make_ai, sys::player_name& name);
+bool can_notify_player_ban(sys::state& state, dcon::nation_id source, sys::player_name& name);
+void notify_player_kick(sys::state& state, dcon::nation_id source, bool make_ai, sys::player_name& name);
+bool can_notify_player_kick(sys::state& state, dcon::nation_id source, sys::player_name& name);
 void notify_player_joins(sys::state& state, dcon::nation_id source, sys::player_name& name, sys::player_password_raw& password);
 bool can_notify_player_joins(sys::state& state, dcon::nation_id source, sys::player_name& name);
-void notify_player_leaves(sys::state& state, dcon::nation_id source, bool make_ai);
-bool can_notify_player_leaves(sys::state& state, dcon::nation_id source, bool make_ai);
-void notify_player_picks_nation(sys::state& state, dcon::nation_id source, dcon::nation_id target);
-bool can_notify_player_picks_nation(sys::state& state, dcon::nation_id source, dcon::nation_id target);
-void notify_player_oos(sys::state& state, dcon::nation_id source);
+void notify_player_leaves(sys::state& state, dcon::nation_id source, bool make_ai, sys::player_name& player_name);
+bool can_notify_player_leaves(sys::state& state, dcon::nation_id source, bool make_ai, sys::player_name& player_name);
+void notify_player_picks_nation(sys::state& state, dcon::nation_id source, dcon::nation_id target, sys::player_name& name);
+bool can_notify_player_picks_nation(sys::state& state, dcon::nation_id source, dcon::nation_id target, sys::player_name& name);
+void notify_player_oos(sys::state& state, dcon::nation_id source, sys::player_name& name);
 void notify_save_loaded(sys::state& state, dcon::nation_id source);
 void notify_reload(sys::state& state, dcon::nation_id source);
+bool can_notify_start_game(sys::state& state, dcon::nation_id source);
 void notify_start_game(sys::state& state, dcon::nation_id source);
 void notify_player_is_loading(sys::state& state, dcon::nation_id source, sys::player_name& name);
 void execute_notify_player_is_loading(sys::state& state, dcon::nation_id source, sys::player_name& name);
 void notify_player_fully_loaded(sys::state& state, dcon::nation_id source, sys::player_name& name);
+bool can_notify_stop_game(sys::state& state, dcon::nation_id source);
 void notify_stop_game(sys::state& state, dcon::nation_id source);
 void notify_pause_game(sys::state& state, dcon::nation_id source);
 // returns true if the command was performed, false if not

src/gamestate/commands.hpp

@@ -5785,7 +5785,7 @@ relationship{
 	link{
 		object{nation}
 		name{nation}
-		type{unique}
+		type{many}
 	}
 	link{
 		object{mp_player}