Merge pull request #5669 from Goober5000/additional_shipstatus_fixes

additional ShipStatus fixes

Author: Goober5000

code/ai/aigoals.cpp

@@ -976,7 +976,7 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_info *aip, ai_goal *aigp, char
 		// this goal needs some extra setup
 		// if this doesn't work, the goal will be immediately removed
 		auto ship_entry = ship_registry_get(aigp->target_name);
-		if (ship_entry->shipp)
+		if (ship_entry && ship_entry->shipp)
 		{
 			auto target_aip = &Ai_info[ship_entry->shipp->ai_index];
 			target_aip->ai_flags.set(AI::AI_Flags::Awaiting_repair);

code/scripting/api/objs/enums.cpp

@@ -141,8 +141,10 @@ const lua_enum_def_list Enumerations[] = {
 	{"SCORE_DEBRIEFING_AVERAGE", LE_SCORE_DEBRIEFING_AVERAGE, true},
 	{"SCORE_DEBRIEFING_FAILURE", LE_SCORE_DEBRIEFING_FAILURE, true},
 	{"SCORE_FICTION_VIEWER", LE_SCORE_FICTION_VIEWER, true},
+	{"INVALID", LE_INVALID, true},
 	{"NOT_YET_PRESENT", LE_NOT_YET_PRESENT, true},
 	{"PRESENT", LE_PRESENT, true},
+	{"DEATH_ROLL", LE_DEATH_ROLL, true},
 	{"EXITED", LE_EXITED, true},
 	{"DC_IS_HULL", LE_DC_IS_HULL, (1 << 0), true},
 	{"DC_VAPORIZE", LE_DC_VAPORIZE, (1 << 1), true},

code/scripting/api/objs/enums.h

@@ -140,8 +140,10 @@ enum lua_enum : int32_t {
 	LE_SCORE_DEBRIEFING_AVERAGE,
 	LE_SCORE_DEBRIEFING_FAILURE,
 	LE_SCORE_FICTION_VIEWER,
-	LE_NOT_YET_PRESENT, // the sequence and offsets of these three #defines should correspond to the ShipStatus enums
+	LE_INVALID, // the sequence and offsets of these five #defines should correspond to the ShipStatus enums
+	LE_NOT_YET_PRESENT,
 	LE_PRESENT,
+	LE_DEATH_ROLL,
 	LE_EXITED,
 	LE_DC_IS_HULL,
 	LE_DC_VAPORIZE,

code/scripting/api/objs/ship_registry_entry.cpp

@@ -41,7 +41,7 @@ ADE_FUNC(isValid, l_ShipRegistryEntry, nullptr, "Detects whether handle is valid
 	return ADE_RETURN_TRUE;
 }
 
-ADE_VIRTVAR(Status, l_ShipRegistryEntry, nullptr, "Status of ship", "enumeration", "NOT_YET_PRESENT, PRESENT, EXITED, or nil if handle is invalid")
+ADE_VIRTVAR(Status, l_ShipRegistryEntry, nullptr, "Status of ship", "enumeration", "INVALID, NOT_YET_PRESENT, PRESENT, DEATH_ROLL, EXITED, or nil if handle is invalid")
 {
 	int idx;
 	if (!ade_get_args(L, "o", l_ShipRegistryEntry.Get(&idx)))
@@ -53,7 +53,7 @@ ADE_VIRTVAR(Status, l_ShipRegistryEntry, nullptr, "Status of ship", "enumeration
 	if (ADE_SETTING_VAR)
 		LuaError(L, "This property is read only.");
 
-	return ade_set_args(L, "o", l_Enum.Set(enum_h(static_cast<lua_enum>(LE_NOT_YET_PRESENT + (int)Ship_registry[idx].status))));
+	return ade_set_args(L, "o", l_Enum.Set(enum_h(static_cast<lua_enum>(LE_INVALID + (int)Ship_registry[idx].status))));
 }
 
 ADE_FUNC(getParsedShip, l_ShipRegistryEntry, nullptr, "Return the parsed ship associated with this ship registry entry", "parse_object", "The parsed ship, or nil if handle is invalid.  If this ship entry is for a ship-create'd ship, the returned handle may be invalid.")