Added advanced unit controls

Radio, ECM, countermeasures and prohibits

src/core/include/commands.h

@@ -2,6 +2,7 @@
 #include "framework.h"
 #include "luatools.h"
 #include "utils.h"
+#include "logger.h"
 
 namespace CommandPriority {
 	enum CommandPriorities { LOW, MEDIUM, HIGH };
@@ -24,6 +25,7 @@ namespace SetCommandType {
 		PROHIBIT_AG = 17,
 		MISSILE_ATTACK = 18,
 		PROHIBIT_WP_PASS_REPORT = 19,
+		ENGAGE_AIR_WEAPONS = 20,
 		OPTION_RADIO_USAGE_CONTACT = 21,
 		OPTION_RADIO_USAGE_ENGAGE = 22,
 		OPTION_RADIO_USAGE_KILL = 23,
@@ -43,7 +45,7 @@ namespace ROE {
 }
 
 namespace ReactionToThreat {
-	enum ReactionToThreats {
+	enum ReactionsToThreat {
 		NO_REACTION = 0,
 		PASSIVE_DEFENCE = 1,
 		EVADE_FIRE = 2,
@@ -52,6 +54,35 @@ namespace ReactionToThreat {
 	};
 }
 
+namespace RadarUse {
+	enum RadarUses {
+		NEVER = 0,
+		FOR_ATTACK_ONLY = 1,
+		FOR_SEARCH_IF_REQUIRED = 2,
+		FOR_CONTINUOUS_SEARCH = 3
+	};
+}
+
+namespace FlareUse {
+	enum FlareUses {
+		NEVER = 0,
+		AGAINST_FIRED_MISSILE = 1,
+		WHEN_FLYING_IN_SAM_WEZ = 2,
+		WHEN_FLYING_NEAR_ENEMIES = 3
+	};
+}
+
+namespace ECMUse {
+	enum ECMUses {
+		NEVER_USE = 0,
+		USE_IF_ONLY_LOCK_BY_RADAR = 1,
+		USE_IF_DETECTED_LOCK_BY_RADAR = 2,
+		ALWAYS_USE = 3
+	};
+}
+
+
+
 /* Base command class */
 class Command
 {
@@ -243,7 +274,19 @@ public:
 	SetOption(int ID, int optionID, int optionValue) :
 		ID(ID),
 		optionID(optionID),
-		optionValue(optionValue)
+		optionValue(optionValue),
+		optionBool(false),
+		isBoolean(false)
+	{
+		priority = CommandPriority::HIGH;
+	};
+
+	SetOption(int ID, int optionID, bool optionBool) :
+		ID(ID),
+		optionID(optionID),
+		optionValue(0),
+		optionBool(optionBool),
+		isBoolean(true)
 	{
 		priority = CommandPriority::HIGH;
 	};
@@ -254,4 +297,6 @@ private:
 	const int ID;
 	const int optionID;
 	const int optionValue;
+	const bool optionBool;
+	const bool isBoolean;
 };

src/core/include/unit.h

@@ -9,20 +9,44 @@ namespace State
 {
 	enum States
 	{
+		NONE = 0,
 		IDLE,
 		REACH_DESTINATION,
 		ATTACK,
-		WINGMAN,
 		FOLLOW,
 		LAND,
 		REFUEL,
 		AWACS,
-		EWR,
-		TANKER,
-		RUN_AWAY
+		TANKER
 	};
 };
 
+namespace Options {
+	struct TACAN
+	{
+		bool isOn = false;
+		int channel = 40;
+		wstring XY = L"X";
+		wstring callsign = L"TKR";
+	};
+
+	struct Radio
+	{
+		int frequency = 124000000;	// MHz
+		int callsign = 1;
+		int callsignNumber = 1;
+	};
+
+	struct GeneralSettings
+	{
+		bool prohibitJettison = false;
+		bool prohibitAA = false;
+		bool prohibitAG = false;
+		bool prohibitAfterburner = false;
+		bool prohibitAirWpn = false;
+	};
+}
+
 class Unit
 {
 public:
@@ -30,6 +54,7 @@ public:
 	~Unit();
 
 	/********** Public methods **********/
+	void initialize(json::value json);
 	int getID() { return ID; }
 	void updateExportData(json::value json);
 	void updateMissionData(json::value json);
@@ -98,15 +123,7 @@ public:
 	void setTargetID(int newTargetID) { targetID = newTargetID; addMeasure(L"targetID", json::value(newTargetID));}
 	void setIsTanker(bool newIsTanker);
 	void setIsAWACS(bool newIsAWACS);
-	void setTACANChannel(int newTACANChannel);
-	void setTACANXY(wstring newTACANXY);
-	void setTACANCallsign(wstring newTACANCallsign);
-	void setTACAN();
-	void setEPLRS(bool state);
-	void setRadioFrequency(int newRadioFrequency);
-	void setRadioCallsign(int newRadioCallsign);
-	void setRadioCallsignNumber(int newRadioCallsignNumber);
-	void setRadio();
+	
 	wstring getCurrentTask() { return currentTask; }
 	virtual double getTargetSpeed() { return targetSpeed; };
 	virtual double getTargetAltitude() { return targetAltitude; };
@@ -115,18 +132,22 @@ public:
 	int getTargetID() { return targetID; }
 	bool getIsTanker() { return isTanker; }
 	bool getIsAWACS() { return isAWACS; }
-	int getTACANChannel() { return TACANChannel; }
-	wstring getTACANXY() { return TACANXY; }
-	wstring getTACANCallsign() { return TACANCallsign; }
-	int getRadioFrequency() { return radioFrequency; }
-	int getRadioCallsign() { return radioCallsign; }
-	int getRadioCallsignNumber() { return radioCallsignNumber; }
 
 	/********** Options data **********/
 	void setROE(wstring newROE);
 	void setReactionToThreat(wstring newReactionToThreat);
+	void setEmissionsCountermeasures(wstring newEmissionsCountermeasures);
+	void setTACAN(Options::TACAN newTACAN);
+	void setRadio(Options::Radio newradio);
+	void setGeneralSettings(Options::GeneralSettings newGeneralSettings);
+	void setEPLRS(bool newEPLRS);
 	wstring getROE() { return ROE; }
-	wstring getReactionToThreat() {return reactionToThreat;}
+	wstring getReactionToThreat() { return reactionToThreat; }
+	wstring getEmissionsCountermeasures() { return emissionsCountermeasures; };
+	Options::TACAN getTACAN() { return TACAN; }
+	Options::Radio getRadio() { return radio; }
+	Options::GeneralSettings getGeneralSettings() { return generalSettings; }
+	bool getEPLRS() { return EPLRS; }
 
 	/********** Control functions **********/
 	void landAt(Coords loc);
@@ -179,19 +200,18 @@ protected:
 	int targetID = NULL;
 	bool isTanker = false;
 	bool isAWACS = false;
-	int TACANChannel = 40;
-	wstring TACANXY = L"X";
-	wstring TACANCallsign = L"TKR";
-	int radioFrequency = 260000000;	// MHz
-	int radioCallsign = 1;
-	int radioCallsignNumber = 1;
-
+	
 	/********** Options data **********/
-	wstring ROE = L"";
-	wstring reactionToThreat = L"";
+	wstring ROE = L"Designated";
+	wstring reactionToThreat = L"Evade";
+	wstring emissionsCountermeasures = L"Defend";
+	Options::TACAN TACAN;
+	Options::Radio radio;
+	Options::GeneralSettings generalSettings;
+	bool EPLRS = false;
 
 	/********** State machine **********/
-	int state = State::IDLE;
+	int state = State::NONE;
 
 	/********** Other **********/
 	Coords oldPosition = Coords(0); // Used to approximate speed