Add eventTransporterEmbarked

Need this for when a unit enters the transporter to update build/command reticules.

data/base/script/rules.js

@@ -410,7 +410,7 @@ function eventObjectTransfer(obj, from)
 	}
 }
 
-//Could be the last remaining trucks are on it.
+//Could be the last remaining trucks/commanders are on it.
 function eventTransporterLanded(transport)
 {
 	if (transport.player === selectedPlayer)
@@ -419,6 +419,15 @@ function eventTransporterLanded(transport)
 	}
 }
 
+//Maybe no more truck/commanders on the map.
+function eventTransporterEmbarked(transport)
+{
+	if (transport.player === selectedPlayer)
+	{
+		reticuleUpdate(transport, TRANSFER_LIKE_EVENT);
+	}
+}
+
 function eventResearched(research, structure, player)
 {
 	// NOTE: Research upgrades are handled by the C++ core game engine since 4.1.0

data/mp/multiplay/script/rules/events/transfer.js

@@ -5,3 +5,11 @@ function eventObjectTransfer(obj, from)
 		reticuleUpdate(obj, TRANSFER_LIKE_EVENT);
 	}
 }
+
+function eventTransporterEmbarked(transport)
+{
+	if (transport.player === selectedPlayer)
+	{
+		reticuleUpdate(transport, TRANSFER_LIKE_EVENT);
+	}
+}

src/order.cpp

@@ -893,6 +893,11 @@ void orderUpdateDroid(DROID *psDroid)
 					psDroid->order.psObj = nullptr;
 					secondarySetState(psDroid, DSO_RETURN_TO_LOC, DSS_NONE);
 
+					// Fire off embark event
+					transporterSetScriptCurrent(transporter);
+					triggerEvent(TRIGGER_TRANSPORTER_EMBARKED, transporter);
+					transporterSetScriptCurrent(nullptr);
+
 					/* We must add the droid to the transporter only *after*
 					* processing changing its orders (see above).
 					*/

src/qtscript.cpp

@@ -1076,6 +1076,9 @@ bool triggerEvent(SCRIPT_TRIGGER_TYPE trigger, BASE_OBJECT *psObj)
 		case TRIGGER_TRANSPORTER_LANDED:
 			instance->handle_eventTransporterLanded(psObj);
 			break;
+		case TRIGGER_TRANSPORTER_EMBARKED:
+			instance->handle_eventTransporterEmbarked(psObj);
+			break;
 		case TRIGGER_MISSION_TIMEOUT:
 			instance->handle_eventMissionTimeout();
 			break;

src/qtscript.h

@@ -43,6 +43,7 @@ enum SCRIPT_TRIGGER_TYPE
 	TRIGGER_GAME_INIT,
 	TRIGGER_START_LEVEL,
 	TRIGGER_TRANSPORTER_ARRIVED,
+	TRIGGER_TRANSPORTER_EMBARKED,
 	TRIGGER_TRANSPORTER_LANDED,
 	TRIGGER_TRANSPORTER_LAUNCH,
 	TRIGGER_TRANSPORTER_EXIT,

src/quickjs_backend.cpp

@@ -339,6 +339,12 @@ class quickjs_scripting_instance : public wzapi::scripting_instance
 	//__
 	virtual bool handle_eventTransporterLanded(const BASE_OBJECT *psTransport) override;
 
+	//__ ## eventTransporterEmbarked(transport)
+	//__
+	//__ An event that is run when a unit embarks into a transporter.
+	//__
+	virtual bool handle_eventTransporterEmbarked(const BASE_OBJECT *psTransport) override;
+
 public:
 	// MARK: UI-related events (intended for the tutorial)
 
@@ -2941,6 +2947,7 @@ IMPL_EVENT_HANDLER(eventTransporterArrived, const BASE_OBJECT *)
 IMPL_EVENT_HANDLER(eventTransporterExit, const BASE_OBJECT *)
 IMPL_EVENT_HANDLER(eventTransporterDone, const BASE_OBJECT *)
 IMPL_EVENT_HANDLER(eventTransporterLanded, const BASE_OBJECT *)
+IMPL_EVENT_HANDLER(eventTransporterEmbarked, const BASE_OBJECT *)
 
 // MARK: UI-related events (intended for the tutorial)
 IMPL_EVENT_HANDLER(eventDeliveryPointMoving, const BASE_OBJECT *)

src/wzapi.h

@@ -230,6 +230,12 @@ namespace wzapi
 		//__
 		virtual bool handle_eventTransporterLanded(const BASE_OBJECT *psTransport) SCRIPTING_EVENT_NON_REQUIRED
 
+		//__ ## eventTransporterEmbarked(transport)
+		//__
+		//__ An event that is run when a unit embarks into a transporter.
+		//__
+		virtual bool handle_eventTransporterEmbarked(const BASE_OBJECT *psTransport) SCRIPTING_EVENT_NON_REQUIRED
+
 	public:
 		// MARK: UI-related events (intended for the tutorial)