Added "operate as" toggle

src/core/include/datatypes.h

@@ -43,6 +43,7 @@ namespace DataIndex {
 		contacts,
 		activePath,
 		isLeader,
+		operateAs,
 		lastIndex,
 		endOfData = 255
 	};

src/core/include/unit.h

@@ -100,6 +100,7 @@ public:
 	virtual void setContacts(vector<DataTypes::Contact> newValue);
 	virtual void setActivePath(list<Coords> newValue);
 	virtual void setIsLeader(bool newValue) { updateValue(isLeader, newValue, DataIndex::isLeader); }
+	virtual void setOperateAs(unsigned char newValue) { updateValue(operateAs, newValue, DataIndex::operateAs); }
 
 	/********** Getters **********/
 	virtual string getCategory() { return category; };
@@ -140,6 +141,7 @@ public:
 	virtual vector<DataTypes::Contact> getTargets() { return contacts; }
 	virtual list<Coords> getActivePath() { return activePath; }
 	virtual bool getIsLeader() { return isLeader; }
+	virtual unsigned char getOperateAs() { return operateAs;  }
 
 protected:
 	unsigned int ID;
@@ -182,6 +184,7 @@ protected:
 	vector<DataTypes::Contact> contacts;
 	list<Coords> activePath;
 	bool isLeader = false;
+	unsigned char operateAs = 2;
 	Coords activeDestination = Coords(NULL);
 
 	/********** Other **********/

src/core/src/groundunit.cpp

@@ -220,21 +220,28 @@ void GroundUnit::AIloop()
 	case State::SCENIC_AAA: {
 		setTask("Scenic AAA");
 
-		if (!getHasTask() || internalCounter == 0) {
-			double r = 15; /* m */
-			double barrelElevation = r * tan(acos(((double)(rand()) / (double)(RAND_MAX))));
+		if ((!getHasTask() || internalCounter == 0) && getOperateAs() > 0) {
+			double distance = 0;
+			unsigned char targetCoalition = getOperateAs() == 2 ? 1 : 2;
+			Unit* target = unitsManager->getClosestUnit(this, targetCoalition, { "Aircraft", "Helicopter" }, distance);
 
-			double lat = 0;
-			double lng = 0;
-			double randomBearing = ((double)(rand()) / (double)(RAND_MAX)) * 360;
-			Geodesic::WGS84().Direct(position.lat, position.lng, randomBearing, r, lat, lng);
+			/* Only run if an enemy air unit is closer than 20km to avoid useless load */
+			if (distance < 20000 /* m */) {
+				double r = 15; /* m */
+				double barrelElevation = r * tan(acos(((double)(rand()) / (double)(RAND_MAX))));
 
-			std::ostringstream taskSS;
-			taskSS.precision(10);
-			taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << position.alt + barrelElevation << ", radius = 0.001}";
-			Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
-			scheduler->appendCommand(command);
-			setHasTask(true);
+				double lat = 0;
+				double lng = 0;
+				double randomBearing = ((double)(rand()) / (double)(RAND_MAX)) * 360;
+				Geodesic::WGS84().Direct(position.lat, position.lng, randomBearing, r, lat, lng);
+
+				std::ostringstream taskSS;
+				taskSS.precision(10);
+				taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << position.alt + barrelElevation << ", radius = 0.001}";
+				Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+				scheduler->appendCommand(command);
+				setHasTask(true);
+			}
 		}
 
 		if (internalCounter == 0)
@@ -247,9 +254,10 @@ void GroundUnit::AIloop()
 		setTask("Missing on purpose");
 
 		/* Only run this when the internal counter reaches 0 to avoid excessive computations when no nearby target */
-		if (internalCounter == 0) {
+		if (internalCounter == 0 && getOperateAs() > 0) {
 			double distance = 0;
-			Unit* target = unitsManager->getClosestUnit(this, 1, { "Aircraft", "Helicopter" }, distance); /* Red, TODO make assignable */
+			unsigned char targetCoalition = getOperateAs() == 2 ? 1 : 2;
+			Unit* target = unitsManager->getClosestUnit(this, targetCoalition, {"Aircraft", "Helicopter"}, distance);
 
 			/* Only do if we have a valid target close enough for AAA */
 			if (target != nullptr && distance < 10000 /* m */) {

src/core/src/scheduler.cpp

@@ -592,7 +592,16 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		unit->setState(State::MISS_ON_PURPOSE);
 		log(username + " tasked unit " + unit->getName() + " to enter Miss On Purpose state", true);
 	}
-	else if (key.compare("setCommandModeOptions") == 0) {
+	else if (key.compare("setOperateAs") == 0)
+	{
+		unsigned int ID = value[L"ID"].as_integer();
+		unitsManager->acquireControl(ID);
+		unsigned char operateAs = value[L"operateAs"].as_number().to_uint32();
+		Unit* unit = unitsManager->getGroupLeader(ID);
+		unit->setOperateAs(operateAs);
+	}
+	else if (key.compare("setCommandModeOptions") == 0) 
+	{
 		setCommandModeOptions(value);
 		log(username + " updated the Command Mode Options", true);
 	}

src/core/src/unit.cpp

@@ -191,6 +191,7 @@ void Unit::refreshLeaderData(unsigned long long time) {
 					case DataIndex::radio:						updateValue(radio, leader->radio, datumIndex); break;
 					case DataIndex::generalSettings:			updateValue(generalSettings, leader->generalSettings, datumIndex); break;
 					case DataIndex::activePath:					updateValue(activePath, leader->activePath, datumIndex); break;
+					case DataIndex::operateAs:					updateValue(operateAs, leader->operateAs, datumIndex); break;
 					}
 				}
 			}
@@ -270,6 +271,7 @@ void Unit::getData(stringstream& ss, unsigned long long time)
 				case DataIndex::contacts:					appendVector(ss, datumIndex, contacts); break;
 				case DataIndex::activePath:					appendList(ss, datumIndex, activePath); break;
 				case DataIndex::isLeader:					appendNumeric(ss, datumIndex, isLeader); break;
+				case DataIndex::operateAs:					appendNumeric(ss, datumIndex, operateAs); break;
 				}
 			}
 		}