Make warp core ejection require two crew members

Signed-off-by: Stephen M. Cameron <[email protected]>

Author: smcameron

snis.h

@@ -41,7 +41,7 @@
 #include "shape_collision.h"
 
 #define DEFAULT_SOLAR_SYSTEM "default"
-#define SNIS_PROTOCOL_VERSION "SNIS063"
+#define SNIS_PROTOCOL_VERSION "SNIS064"
 #define COMMON_MTWIST_SEED 97872
 /* dimensions of the "known" universe */
 #define XKNOWN_DIM 600000.0

snis_client.c

@@ -12493,6 +12493,8 @@ int nav_ui_lights_active(__attribute__((unused)) void *notused)
 	return o->tsd.ship.exterior_lights;
 }
 
+static void eject_warp_core_button_pressed(void *x);
+
 static void init_nav_ui(void)
 {
 	int x, y;
@@ -12577,6 +12579,14 @@ static void init_nav_ui(void)
 	snis_button_set_sound(nav_ui.lights_button, UISND7);
 	snis_button_set_hover_color(nav_ui.lights_button, hover_color);
 	y += button_y_spacing;
+	nav_ui.eject_warp_core_button = snis_button_init(SCREEN_WIDTH - txx(nav_ui.gauge_radius * 2.2 + 10),
+					txy(nav_ui.gauge_radius * 2 + y), -1, -1, "EJECT WARP CORE",
+					button_color,
+					NANO_FONT, eject_warp_core_button_pressed,
+					(void *) (intptr_t) DISPLAYMODE_NAVIGATION);
+	snis_button_set_sound(nav_ui.eject_warp_core_button, UISND7);
+	snis_button_set_hover_color(nav_ui.eject_warp_core_button, hover_color);
+	y += button_y_spacing;
 	nav_ui.custom_button = snis_button_init(SCREEN_WIDTH - txx(nav_ui.gauge_radius * 2.2 + 10),
 					txy(nav_ui.gauge_radius * 2 + y), -1, -1, "CUSTOM BUTTON",
 					button_color,
@@ -12617,6 +12627,10 @@ static void init_nav_ui(void)
 				"SWITCH BETWEEN NAVIGATION\nAND STAR MAP SCREENS");
 	ui_add_button(nav_ui.lights_button, DISPLAYMODE_NAVIGATION,
 				"TOGGLE EXTERIOR LIGHTS ON/OFF");
+	ui_add_button(nav_ui.eject_warp_core_button, DISPLAYMODE_NAVIGATION,
+				"EJECT THE WARP CORE\n"
+				"(WITH CONFIRMATION FROM\n"
+				"ENGINEERING)");
 	ui_add_button(nav_ui.custom_button, DISPLAYMODE_NAVIGATION, "CUSTOM BUTTON");
 	ui_add_button(nav_ui.reverse_button, DISPLAYMODE_NAVIGATION,
 				"TOGGLE REVERSE THRUST");
@@ -14107,9 +14121,11 @@ static void robot_manual_button_pressed(__attribute__((unused)) void *x)
 	queue_to_server(snis_opcode_pkt("bb", OPCODE_ROBOT_AUTO_MANUAL, DAMCON_ROBOT_MANUAL_MODE));
 }
 
-static void eject_warp_core_button_pressed(__attribute__((unused)) void *x)
+static void eject_warp_core_button_pressed(void *x)
 {
-	queue_to_server(snis_opcode_pkt("b", OPCODE_EJECT_WARP_CORE));
+	intptr_t v = (intptr_t) x;
+	unsigned char which = v & 0xff;
+	queue_to_server(snis_opcode_pkt("bb", OPCODE_EJECT_WARP_CORE, which));
 	return;
 }
 
@@ -14162,7 +14178,7 @@ static void init_damcon_ui(void)
 	snis_button_set_sound(damcon_ui.robot_manual_button, UISND25);
 	damcon_ui.eject_warp_core_button = snis_button_init(txx(300), txy(30), txx(90), txy(25),
 						"EJECT WARP CORE", UI_COLOR(damcon_button), NANO_FONT,
-						eject_warp_core_button_pressed, (void *) 0);
+						eject_warp_core_button_pressed, (void *) (intptr_t) DISPLAYMODE_DAMCON);
 	snis_button_set_hover_color(damcon_ui.eject_warp_core_button, hover_color);
 	snis_button_set_sound(damcon_ui.eject_warp_core_button, UISND12); /* FIXME: custom sound here */
 
@@ -14176,7 +14192,10 @@ static void init_damcon_ui(void)
 	ui_add_button(damcon_ui.robot_auto_button, DISPLAYMODE_DAMCON, "SELECT AUTONOMOUS ROBOT OPERATION");
 	ui_add_button(damcon_ui.robot_manual_button, DISPLAYMODE_DAMCON, "SELECT MANUAL ROBOT CONTROL");
 	ui_add_label(damcon_ui.robot_controls, DISPLAYMODE_DAMCON);
-	ui_add_button(damcon_ui.eject_warp_core_button, DISPLAYMODE_DAMCON, "EJECT THE WARP CORE");
+	ui_add_button(damcon_ui.eject_warp_core_button, DISPLAYMODE_DAMCON,
+					"EJECT THE WARP CORE\n"
+					"(WITH CONFIRMATION\n"
+					"FROM NAVIGATION)");
 }
 
 static int process_custom_button(void)

snis_opcode_def.c

@@ -110,7 +110,7 @@ int snis_opcode_def_init(void)
 	rc |= init_opcode_def(OPCODE_ECON_UPDATE_SHIP, "bwwSSSQbbb");
 	/* rc |= init_opcode_def(OPCODE_SHIP_SDATA, "bwbbbbbbbbr"); */
 	rc |= init_opcode_def(OPCODE_LOAD_TORPEDO, "b");
-	rc |= init_opcode_def(OPCODE_EJECT_WARP_CORE, "b");
+	rc |= init_opcode_def(OPCODE_EJECT_WARP_CORE, "bb");
 	rc |= init_opcode_def(OPCODE_ENGAGE_WARP, "bwb");
 	rc |= init_opcode_def(OPCODE_ROLE_ONSCREEN, "bb");
 	rc |= init_opcode_def(OPCODE_SCI_SELECT_TARGET, "bbw");

snis_server.c

@@ -648,6 +648,8 @@ static struct bridge_data {
 	uint32_t last_missile_fail_time; /* universe timestamp of last missile failure */
 	int enforce_solarsystem;
 	char resident_solarsystem[SSGL_LOCATIONSIZE];
+	int warp_core_ejection_armed;
+	int warp_core_ejection_confirm_countdown;
 } bridgelist[MAXCLIENTS];
 static int nbridges = 0;		/* Number of elements present in bridgelist[] */
 static int announce_players = 0; /* Announce new players via TTS? */
@@ -10102,6 +10104,24 @@ static void maybe_reboot_terminals(struct snis_entity *player_ship)
 	reboot_random_terminals(player_ship);
 }
 
+static void update_warp_ejection_countdown(struct snis_entity *o)
+{
+	int bn = lookup_bridge_by_shipid(o->id);
+	if (bn < 0)
+		return;
+	/* If armed, decrement count down, if countdown hits zero before confirmation, disarm. */
+	if (bridgelist[bn].warp_core_ejection_armed == -1)
+		return;
+
+	if (bridgelist[bn].warp_core_ejection_confirm_countdown > 0)
+		bridgelist[bn].warp_core_ejection_confirm_countdown--;
+	if (bridgelist[bn].warp_core_ejection_confirm_countdown == 0) {
+		bridgelist[bn].warp_core_ejection_armed = -1;
+		snis_queue_add_text_to_speech("Warp core ejection sequence aborted.",
+						ROLE_TEXT_TO_SPEECH, o->id);
+	}
+}
+
 static void aim_high_gain_antenna(struct snis_entity *o)
 {
 	union vec3 straight_ahead = { { 1.0, 0.0, 0.0 } };
@@ -10365,6 +10385,7 @@ static void player_move(struct snis_entity *o)
 	}
 	check_science_selection(o);
 	maybe_reboot_terminals(o);
+	update_warp_ejection_countdown(o);
 
 	update_flare_cooldown_timer(o);
 
@@ -11566,6 +11587,8 @@ static void init_player(struct snis_entity *o)
 		memset(bridgelist[b].guessed_key, '_', sizeof(bridgelist[b].guessed_key));
 		memset(bridgelist[b].enciphered_message, 0, sizeof(bridgelist[b].enciphered_message));
 		bridgelist[b].flare_cooldown = 0;
+		bridgelist[b].warp_core_ejection_confirm_countdown = 0; /* not counting */
+		bridgelist[b].warp_core_ejection_armed = -1; /* not armed */
 	}
 	quat_init_axis(&o->tsd.ship.computer_desired_orientation, 0, 1, 0, 0);
 	o->tsd.ship.computer_steering_time_left = 0;
@@ -23614,12 +23637,33 @@ static int process_eject_warp_core(struct game_client *c)
 	struct snis_entity *ship = &go[c->ship_index];
 	union vec3 relvel = { { 1.0, 0.0, 0.0, }, };
 	int b = c->bridge;
+	unsigned char which;
+	unsigned char buffer[10];
+	int rc;
+
+	rc = read_and_unpack_buffer(c, buffer, "b", &which);
+	if (rc != 0)
+		return -1;
 
 	if (ship->tsd.ship.warp_core_status == WARP_CORE_STATUS_EJECTED) {
 		snis_queue_add_text_to_speech("The warp core has already been ejected.",
 						ROLE_TEXT_TO_SPEECH, ship->id);
 		return 0; /* Warp core is already ejected */
 	}
+
+	if (bridgelist[b].warp_core_ejection_armed == -1) { /* not armed */
+		bridgelist[b].warp_core_ejection_armed = which; /* which person pressed eject 1st time. */
+		bridgelist[b].warp_core_ejection_confirm_countdown = 10 * 10; /* 10 seconds */
+		snis_queue_add_text_to_speech("Warp core ejection sequence armed.",
+						ROLE_TEXT_TO_SPEECH, ship->id);
+		return 0;
+	} else if (bridgelist[b].warp_core_ejection_armed == which) { /* the same person pressed eject again */
+		/* Do nothing. */
+		return 0;
+	}
+	bridgelist[b].warp_core_ejection_armed = -1; /* reset for next time */
+	bridgelist[b].warp_core_ejection_confirm_countdown = 0;
+
 	snis_queue_add_text_to_speech("Ejecting the warp core.", ROLE_TEXT_TO_SPEECH, ship->id);
 	quat_rot_vec_self(&relvel, &ship->orientation);
 	add_warp_core(ship->x, ship->y, ship->z,
@@ -26003,6 +26047,8 @@ static int add_new_player(struct game_client *c, int enforce_solarsystem)
 		bridgelist[nbridges].active_custom_buttons = 0;
 		bridgelist[nbridges].last_missile_fail_time = 0;
 		bridgelist[nbridges].enforce_solarsystem = enforce_solarsystem;
+		bridgelist[nbridges].warp_core_ejection_armed = -1;
+		bridgelist[nbridges].warp_core_ejection_confirm_countdown = 0;
 		memset(bridgelist[nbridges].custom_button_text, 0, sizeof(bridgelist[nbridges].custom_button_text));
 		memset(bridgelist[nbridges].cipher_key, '_', sizeof(bridgelist[nbridges].cipher_key));
 		memset(bridgelist[nbridges].guessed_key, '_', sizeof(bridgelist[nbridges].guessed_key));

snis_ui.h

@@ -38,6 +38,7 @@ struct navigation_ui {
 	struct button *starmap_button;
 	struct button *lights_button;
 	struct button *camera_pos_button;
+	struct button *eject_warp_core_button;
 	struct button *custom_button;
 	int gauge_radius;
 	struct snis_text_input_box *computer_input;