prop sexps

Author: MjnMixael

code/parse/sexp.cpp

@@ -38,6 +38,7 @@ enum sexp_opf_t : int {
 	OPF_BOOL,
 	OPF_NUMBER,
 	OPF_SHIP,
+	OPF_PROP,
 	OPF_WING,
 	OPF_SUBSYSTEM,
 	OPF_POINT,						// either a 3d point in space, or a waypoint name
@@ -66,6 +67,7 @@ enum sexp_opf_t : int {
 	OPF_MEDAL_NAME,					// name of medals
 	OPF_WEAPON_NAME,				// name of a weapon
 	OPF_SHIP_CLASS_NAME,			// name of a ship class
+	OPF_PROP_CLASS_NAME,            // name of a prop class
 	OPF_CUSTOM_HUD_GAUGE,			// name of custom HUD gauge
 	OPF_HUGE_WEAPON,				// name of a secondary bomb type weapon
 	OPF_SHIP_NOT_PLAYER,			// a ship, but not a player ship
@@ -594,6 +596,7 @@ enum : int {
 	OP_CARGO_NO_DEPLETE,
 	OP_SET_SPECIAL_WARPOUT_NAME,
 	OP_SHIP_VANISH,
+	OP_PROP_VANISH, // MjnMixael
 	OP_SHIELDS_ON,	//-Sesquipedalian
 	OP_SHIELDS_OFF,	//-Sesquipedalian
 
@@ -692,6 +695,7 @@ enum : int {
 	OP_SHIP_SUBSYS_GUARDIAN_THRESHOLD,	// Goober5000
 	OP_SET_SKYBOX_MODEL, // taylor
 	OP_SHIP_CREATE,
+	OP_PROP_CREATE,     // MjnMixael
 	OP_WEAPON_CREATE,	// Goober5000
 	OP_SET_OBJECT_SPEED_X, // Deprecated by wookieejedi
 	OP_SET_OBJECT_SPEED_Y, // Deprecated by wookieejedi
@@ -817,6 +821,7 @@ enum : int {
 	OP_ADD_TO_COLGROUP, // The E
 	OP_REMOVE_FROM_COLGROUP, // The E
 	OP_GET_COLGROUP_ID, // The E
+	OP_GET_COLGROUP_ID_PROP, // MjnMixael
 	OP_SHIP_EFFECT, // Valathil
 	OP_CLEAR_SUBTITLES, // The E
 	OP_BEAM_FIRE_COORDS,	// Goober5000
@@ -873,6 +878,8 @@ enum : int {
 	OP_SET_TRAITOR_OVERRIDE,	//MjnMixael
 	OP_ADD_TO_COLGROUP_NEW,	// Goober5000
 	OP_REMOVE_FROM_COLGROUP_NEW,	// Goober5000
+	OP_ADD_TO_COLGROUP_PROP,         // MjnMixael
+	OP_REMOVE_FROM_COLGROUP_PROP,    // MjnMixael
 	OP_GET_POWER_OUTPUT,	// The E
 	OP_TURRET_SET_FORCED_TARGET,	// Asteroth
 	OP_TURRET_SET_FORCED_SUBSYS_TARGET,	// Asteroth
@@ -1183,6 +1190,7 @@ enum sexp_error_check
 
 	SEXP_CHECK_INVALID_NUM = 101,       // number is not valid
 	SEXP_CHECK_INVALID_SHIP,            // invalid ship name
+	SEXP_CHECK_INVALID_PROP,            // invalid prop name
 	SEXP_CHECK_INVALID_WING,            // invalid wing name
 	SEXP_CHECK_INVALID_SUBSYS,          // invalid subsystem
 	SEXP_CHECK_INVALID_IFF,             // invalid iff string

code/parse/sexp.h

@@ -17,9 +17,9 @@ static SCP_vector<SCP_string> Removed_props;
 /**
  * Return the index of Prop_info[].name that is *token.
  */
-static int prop_info_lookup_sub(const char* token)
+int prop_info_lookup(const char* token)
 {
-	Assertion(token != nullptr, "NULL token passed to prop_info_lookup_sub");
+	Assertion(token != nullptr, "NULL token passed to prop_info_lookup");
 
 	for (auto it = Prop_info.cbegin(); it != Prop_info.cend(); ++it)
 		if (!stricmp(token, it->name))
@@ -88,7 +88,7 @@ void parse_prop_table(const char* filename)
 		}
 
 		// Check if prop exists already
-		int prop_id = prop_info_lookup_sub(fname);
+		int prop_id = prop_info_lookup(fname);
 
 		// maybe remove it
 		if (remove_prop) {
@@ -416,7 +416,7 @@ void prop_render(object* obj, model_draw_list* scene)
 
 void spawn_test_prop()
 {
-	int prop_idx = prop_info_lookup_sub("TestProp"); // whatever’s in your props.tbl
+	int prop_idx = prop_info_lookup("TestProp"); // whatever’s in your props.tbl
 	if (prop_idx < 0) {
 		mprintf(("TEST: Prop not found!\n"));
 		return;

code/prop/prop.cpp

@@ -56,4 +56,7 @@ void prop_render(object* obj, model_draw_list* scene);
 
 void props_level_close();
 
+int prop_info_lookup(const char* token);
+int prop_name_lookup(const char* name);
+
 void spawn_test_prop();

code/prop/prop.h

@@ -24,7 +24,7 @@ FLAG_LIST(Prop_Flags){
 FLAG_LIST(Info_Flags){
 	No_collide = 0,      // No collisions
 	No_fred,             // not available in fred
-	No_impact_debris,    // wookieejedi - Don't spawn the small debris on impact
+	//No_impact_debris,
 	No_lighting,
 
 	NUM_VALUES};

code/prop/prop_flags.h

@@ -494,7 +494,11 @@ void color_combo_box_prop::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
 		if (pip != nullptr) {
 			strText = _T(pip->name);
 		} else {
-			strText = _T("Invalid index!");
+			if (prop_type_combo_box_size == 0) {
+				strText = _T("No props available");
+			} else {
+				strText = _T("Invalid index!");
+			}
 		}
 
 		pDC->ExtTextOut(lpDrawItemStruct->rcItem.left,

fred2/mainfrm.cpp

@@ -16,14 +16,14 @@
 class color_combo_box_prop : public CComboBox {
   public:
 	/**
-	 * Gets the ship class corresponding to the item index
+	 * Gets the prop class corresponding to the item index
 	 */
 	int GetPropClass(int item_index);
 
 	/**
-	 * Gets the item index corresponding to the ship class
+	 * Gets the item index corresponding to the prop class
 	 */
-	int GetItemIndex(int ship_class);
+	int GetItemIndex(int prop_class);
 
   private:
 	/**

fred2/mainfrm.h

@@ -36,6 +36,7 @@
 #include "nebula/neb.h"
 #include "nebula/neblightning.h"
 #include "jumpnode/jumpnode.h"
+#include "prop/prop.h"
 #include "AddVariableDlg.h"
 #include "ModifyVariableDlg.h"
 #include "gamesnd/eventmusic.h"	// for change-soundtrack
@@ -3318,6 +3319,10 @@ int sexp_tree::get_default_value(sexp_list_item *item, char *text_buf, int op, i
 			str = "<name of ship here>";
 			break;
 
+		case OPF_PROP:
+			str = "<name of prop here>";
+			break;
+
 		case OPF_ORDER_RECIPIENT:
 			str = "<all fighters>";
 			break;
@@ -3494,6 +3499,7 @@ int sexp_tree::query_default_argument_available(int op, int i)
 		case OPF_WEAPON_NAME:
 		case OPF_INTEL_NAME:
 		case OPF_SHIP_CLASS_NAME:
+		case OPF_PROP_CLASS_NAME:
 		case OPF_HUGE_WEAPON:
 		case OPF_JUMP_NODE_NAME:
 		case OPF_AMBIGUOUS:
@@ -3570,6 +3576,16 @@ int sexp_tree::query_default_argument_available(int op, int i)
 
 			return 0;
 
+		case OPF_PROP:
+			ptr = GET_FIRST(&obj_used_list);
+			while (ptr != END_OF_LIST(&obj_used_list)) {
+				if (ptr->type == OBJ_PROP)
+					return 1;
+
+				ptr = GET_NEXT(ptr);
+			}
+			return 0;
+
 		case OPF_SHIP_NOT_PLAYER:
 		case OPF_ORDER_RECIPIENT:
 			ptr = GET_FIRST(&obj_used_list);
@@ -5396,6 +5412,10 @@ sexp_list_item *sexp_tree::get_listing_opf(int opf, int parent_node, int arg_ind
 			list = get_listing_opf_ship(parent_node);
 			break;
 
+		case OPF_PROP:
+			list = get_listing_opf_prop(parent_node);
+			break;
+
 		case OPF_WING:
 			list = get_listing_opf_wing();
 			break;
@@ -5567,6 +5587,10 @@ sexp_list_item *sexp_tree::get_listing_opf(int opf, int parent_node, int arg_ind
 			list = get_listing_opf_ship_class_name();
 			break;
 
+		case OPF_PROP_CLASS_NAME:
+			list = get_listing_opf_prop_class_name();
+			break;
+
 		case OPF_HUGE_WEAPON:
 			list = get_listing_opf_huge_weapon();
 			break;
@@ -6129,6 +6153,23 @@ sexp_list_item *sexp_tree::get_listing_opf_ship(int parent_node)
 	return head.next;
 }
 
+sexp_list_item *sexp_tree::get_listing_opf_prop(int parent_node)
+{
+	object *ptr;
+	sexp_list_item head;
+
+	ptr = GET_FIRST(&obj_used_list);
+	while (ptr != END_OF_LIST(&obj_used_list)) {
+		if (ptr->type == OBJ_PROP) {
+			head.add_data(Props[ptr->instance].prop_name);
+		}
+
+		ptr = GET_NEXT(ptr);
+	}
+
+	return head.next;
+}
+
 sexp_list_item *sexp_tree::get_listing_opf_wing()
 {
 	int i;
@@ -7225,6 +7266,16 @@ sexp_list_item *sexp_tree::get_listing_opf_ship_class_name()
 	return head.next;
 }
 
+sexp_list_item* sexp_tree::get_listing_opf_prop_class_name()
+{
+	sexp_list_item head;
+
+	for (auto& pi : Prop_info)
+		head.add_data(pi.name);
+
+	return head.next;
+}
+
 sexp_list_item *sexp_tree::get_listing_opf_huge_weapon()
 {
 	sexp_list_item head;

fred2/sexp_tree.cpp

@@ -220,6 +220,7 @@ class sexp_tree : public CTreeCtrl
 	sexp_list_item *get_listing_opf_positive();
 	sexp_list_item *get_listing_opf_number();
 	sexp_list_item *get_listing_opf_ship(int parent_node = -1);
+	sexp_list_item *get_listing_opf_prop(int parent_node = -1);
 	sexp_list_item *get_listing_opf_wing();
 	sexp_list_item *get_listing_opf_subsystem(int parent_node, int arg_index);
 	sexp_list_item *get_listing_opf_subsystem_type(int parent_node);
@@ -249,6 +250,7 @@ class sexp_tree : public CTreeCtrl
 	sexp_list_item *get_listing_opf_medal_name();
 	sexp_list_item *get_listing_opf_weapon_name();
 	sexp_list_item *get_listing_opf_ship_class_name();
+	sexp_list_item *get_listing_opf_prop_class_name();
 	sexp_list_item *get_listing_opf_huge_weapon();
 	sexp_list_item *get_listing_opf_ship_not_player();
 	sexp_list_item *get_listing_opf_jump_nodes();

fred2/sexp_tree.h

@@ -39,6 +39,7 @@
 #include <starfield/nebula.h>
 #include <starfield/starfield.h>
 #include <weapon/weapon.h>
+#include <prop/prop.h>
 
 #include "missionsave.h"
 #include "util.h"
@@ -3146,6 +3147,8 @@ void CFred_mission_save::save_mission_internal(const char* pathname)
 		err = -7;
 	} else if (save_wings()) {
 		err = -8;
+	} else if (save_props()) {
+		err = -18;
 	} else if (save_events()) {
 		err = -9;
 	} else if (save_goals()) {
@@ -5131,7 +5134,7 @@ int CFred_mission_save::save_wings()
 		}
 
 		count++;
-		required_string_either_fred("$Name:", "#Events");
+		required_string_one_of_fred(3, "$Name:", "#Events", "#Props");
 		required_string_fred("$Name:");
 		parse_comments(2);
 		fout(" %s", Wings[i].name);
@@ -5407,5 +5410,50 @@ int CFred_mission_save::save_wings()
 	return err;
 }
 
+int CFred_mission_save::save_props()
+{
+	if (save_format != MissionFormat::RETAIL) {
+		fred_parse_flag = 0;
+		required_string_fred("#Props");
+		parse_comments(2);
+		fout("\t\t;! %d total", static_cast<int>(Props.size()));
+
+		for (int i = 0; i < static_cast<int>(Props.size()); i++) {
+			required_string_either_fred("$Name:", "#Events");
+			required_string_fred("$Name:");
+			parse_comments(2);
+			fout(" %s", Props[i].prop_name);
+
+			required_string_fred("$Class:");
+			parse_comments(2);
+			fout(" %d", Props[i].prop_info_index);
+
+			required_string_fred("$Location:");
+			parse_comments();
+			save_vector(Objects[Props[i].objnum].pos);
+
+			required_string_fred("$Orientation:");
+			parse_comments();
+			save_matrix(Objects[Props[i].objnum].orient);
+
+			if (optional_string_fred("+Flags:", "$Name:")) {
+				parse_comments();
+				fout(" (");
+			} else
+				fout("\n+Flags: (");
+
+			if (!(Objects[Props[i].objnum].flags[Object::Object_Flags::Collides]))
+				fout(" \"no_collide\"");
+			fout(" )");
+
+			fso_comment_pop();
+		}
+	}
+
+	fso_comment_pop(true);
+	// Assert(count == Num_props);
+	return err;
+}
+
 }
 }