1. Improved research sync, the other player now gets the same research popup, and research projects update instantly without needing to reload a save.

2. Added base facility sync, when one player builds or removes a facility, the change updates instantly for the other player when viewing that base. No need to go to the Geoscape and back to see the changes.
3. Alien base markers are now synced on the Geoscape.
4. Fixed mission sites on the Geoscape, they should no longer disappear for the other player.
5. If a player shoots down a UFO over water, it is now destroyed on impact and will not crash and create a mission.
6. Fixed a Battlescape sync issue where throwing an item could sometimes end up on the wrong tile.
7. Improved tile damage sync so tiles like walls and doors now get destroyed in exactly the same way on both players. Before, if you fired a rocket and it hit a wall, the damage could be different for the other player, would not sync, and could break pathfinding.
8. Fixed an issue where a soldier sometimes would not shoot while berserk.
9. Fixed soldiers disappearing in the new battle menu after ending a mission.
10. If you lose a base defense mission, it no longer counts the other player’s base, so the game will not continue if you lose your last base.
11. Units that are on fire should now sync in Battlescape, tested with The X-Com Files.
12. Fixed Battlescape sync issues when a unit was turning or opening a door.
13. Other small fixes and improvements.

Author: xcomcoopdev

src/Basescape/BaseView.cpp

@@ -150,6 +150,11 @@ void BaseView::resetSelectedFacility()
 	_selFacility = 0;
 }
 
+void BaseView::resetSelectedFacilityCoop(int fac_x, int fac_y)
+{
+	_facilities[fac_x][fac_y] = 0;
+	_selFacility = 0;
+}
 
 /**
  * Returns the X position of the grid square

src/Basescape/BaseView.h

@@ -72,6 +72,8 @@ class BaseView : public InteractiveSurface
 	BaseFacility *getSelectedFacility() const;
 	/// Prevents any mouseover bugs on dismantling base facilities before setBase has had time to update the base.
 	void resetSelectedFacility();
+	// coop
+	void resetSelectedFacilityCoop(int fac_x, int fac_y);
 	/// Gets the X position of the currently selected square.
 	int getGridX() const;
 	/// Gets the Y position of the currently selected square.

src/Basescape/BasescapeState.cpp

@@ -62,6 +62,7 @@
 #include "../Menu/LoadGameState.h"
 #include "CraftSoldiersState.h"
 #include "../Savegame/Vehicle.h"
+#include "../Engine/Sound.h"
 
 namespace OpenXcom
 {
@@ -353,6 +354,130 @@ void BasescapeState::init()
 
 
 
+}
+
+void BasescapeState::think()
+{
+
+	//  coop
+	if (_game->getCoopMod()->getCoopStatic() == true)
+	{
+
+		Json::Value& arr = _game->getCoopMod()->_coopFacility;
+		if (!arr.empty())
+		{
+			Json::Value str_fac = arr[0];
+
+			double base_lat = str_fac["base_lat"].asDouble();
+			double base_lon = str_fac["base_lon"].asDouble();
+
+			if (_base->getLatitude() == base_lat && _base->getLongitude() == base_lon)
+			{
+
+				std::string rule = str_fac["rule"].asString();
+				int fac_x = str_fac["fac_x"].asInt();
+				int fac_y = str_fac["fac_y"].asInt();
+				int build_time = str_fac["build_time"].asInt();
+				bool buildingOver = str_fac["buildingOver"].asBool();
+				int build_cost = str_fac["build_cost"].asInt();
+
+				RuleBaseFacility* facilityRule = _game->getMod()->getBaseFacility(rule);
+
+				if (facilityRule)
+				{
+
+					BaseFacility* fac = new BaseFacility(facilityRule, _base);
+					fac->setX(fac_x);
+					fac->setY(fac_y);
+					fac->setBuildTime(build_time);
+					if (buildingOver)
+					{
+						fac->setIfHadPreviousFacility(true);
+					}
+					_base->getFacilities()->push_back(fac);
+					if (fac->getRules()->getPlaceSound() != Mod::NO_SOUND)
+					{
+						_game->getMod()->getSound("GEO.CAT", fac->getRules()->getPlaceSound())->play();
+					}
+					if (Options::allowBuildingQueue)
+					{
+						if (_view->isQueuedBuilding(facilityRule))
+							fac->setBuildTime(INT_MAX);
+						_view->reCalcQueuedBuildings();
+					}
+					_view->setBase(_base);
+					_game->getSavedGame()->setFunds(_game->getSavedGame()->getFunds() - build_cost);
+				}
+
+				arr.removeIndex(0, nullptr);
+
+			}
+			else if (_game->getCoopMod()->playerInsideCoopBase == false)
+			{
+				arr.removeIndex(0, nullptr);
+			}
+
+		}
+
+	}
+
+	// COOP
+	if (_game->getCoopMod()->getCoopStatic() == true)
+	{
+
+		Json::Value& arr = _game->getCoopMod()->_deleteCoopFacility;
+
+		// Make sure all facilities are built before removing anything
+		Json::Value& arr2 = _game->getCoopMod()->_coopFacility;
+
+		if (!arr.empty() && arr2.empty())
+		{
+
+			Json::Value str_fac = arr[0];
+
+			double base_lat = str_fac["base_lat"].asDouble();
+			double base_lon = str_fac["base_lon"].asDouble();
+
+			if (_base->getLatitude() == base_lat && _base->getLongitude() == base_lon)
+			{
+
+				int fac_x = str_fac["fac_x"].asInt();
+				int fac_y = str_fac["fac_y"].asInt();
+
+				auto* facilities = _base->getFacilities();
+
+				for (auto it = facilities->begin(); it != facilities->end();)
+				{
+					auto* fac = *it;
+
+					if (fac->getX() == fac_x && fac->getY() == fac_y)
+					{
+						it = facilities->erase(it);
+						_view->resetSelectedFacilityCoop(fac_x, fac_y);
+						delete fac;
+						_view->setBase(_base);
+						if (Options::allowBuildingQueue)
+							_view->reCalcQueuedBuildings();
+						break;
+					}
+					else
+					{
+						++it;
+					}
+				}
+
+				arr.removeIndex(0, nullptr);
+			}
+			else if (_game->getCoopMod()->playerInsideCoopBase == false)
+			{
+				arr.removeIndex(0, nullptr);
+			}
+
+		}
+
+
+	}
+
 }
 
 /**

src/Basescape/BasescapeState.h

@@ -51,6 +51,8 @@ class BasescapeState : public State
 	~BasescapeState();
 	/// Updates the base stats.
 	void init() override;
+	/// Runs the timers and handles popups.
+	void think() override;
 	/// Sets a new base to display.
 	void setBase(Base *base);
 	/// Handler for clicking the Build New Base button.

src/Basescape/DismantleFacilityState.cpp

@@ -160,6 +160,22 @@ void DismantleFacilityState::btnOkClick(Action *)
 		{
 			if (*facIt == _fac)
 			{
+
+				// COOP
+				if (_game->getCoopMod()->getCoopStatic() == true && _base->_coopBase == false && _game->getCoopMod()->playerInsideCoopBase == false)
+				{
+
+					Json::Value root;
+					root["state"] = "dismantle_facility";
+
+					root["base_lat"] = _base->getLatitude();
+					root["base_lon"] = _base->getLongitude();
+					root["fac_x"] = _fac->getX();
+					root["fac_y"] = _fac->getY();
+
+					_game->getCoopMod()->sendTCPPacketData(root.toStyledString());
+				}
+
 				_base->getFacilities()->erase(facIt);
 				// Determine if we leave behind any facilities when this one is removed
 				if (_fac->getBuildTime() == 0 && _fac->getRules()->getLeavesBehindOnSell().size() != 0)

src/Basescape/PlaceFacilityState.cpp

@@ -387,6 +387,27 @@ void PlaceFacilityState::viewClick(Action *)
 			{
 				_game->popState();
 			}
+
+			// COOP
+			if (_game->getCoopMod()->getCoopStatic() == true && _base->_coopBase == false && _game->getCoopMod()->playerInsideCoopBase == false)
+			{
+
+				Json::Value root;
+				root["state"] = "place_facility";
+
+				root["base_lat"] = _base->getLatitude();
+				root["base_lon"] = _base->getLongitude();
+				root["rule"] = _rule->getType();
+				root["fac_x"] = fac->getX();
+				root["fac_y"] = fac->getY();
+				root["build_time"] = fac->getBuildTime();
+				root["buildingOver"] = buildingOver;
+				root["build_cost"] = _rule->getBuildCost();
+
+				_game->getCoopMod()->sendTCPPacketData(root.toStyledString());
+
+			}
+
 		}
 	}
 }

src/Battlescape/BattlescapeGame.cpp

@@ -300,11 +300,6 @@ void BattlescapeGame::movePlayerTarget(std::string obj_str)
 		if (_save->getBattleGame()->getCoopMod()->getCoopGamemode() == 2 || _save->getBattleGame()->getCoopMod()->getCoopGamemode() == 3)
 		{
 
-			if (_currentAction.run == false)
-			{
-				sound = false;
-			}
-
 			if (_currentAction.sneak == true)
 			{
 				sound = false;
@@ -345,9 +340,7 @@ void BattlescapeGame::turnPlayerTarget(std::string obj_str)
 		int endy = obj["coords"]["end"]["y"].asInt();
 		int endz = obj["coords"]["end"]["z"].asInt();
 
-		
-		int setDirection = obj["setDirection"].asInt();
-		int setFaceDirection = obj["setFaceDirection"].asInt();
+		bool isActionTypeNone = obj["isActionTypeNone"].asBool();
 
 		Position *startpos = new Position(startx, starty, startz);
 		Position *endpos = new Position(endx, endy, endz);
@@ -374,9 +367,6 @@ void BattlescapeGame::turnPlayerTarget(std::string obj_str)
 
 		unit->setPosition(*startpos);
 
-		unit->setDirection(setDirection);
-		unit->setFaceDirection(setFaceDirection);
-
 		if (getCoopMod()->_isActiveAISync == false && getCoopMod()->getCoopGamemode() != 2 && getCoopMod()->getCoopGamemode() != 3)
 		{
 			for (auto& unit : *_save->getUnits())
@@ -407,7 +397,13 @@ void BattlescapeGame::turnPlayerTarget(std::string obj_str)
 		// other
 		_save->setSelectedUnit(unit);
 		_currentAction.actor = unit;
-		_currentAction.type = BA_WALK;
+		_currentAction.type = BA_TURN;
+
+		if (isActionTypeNone == true)
+		{
+			_currentAction.type = BA_NONE;
+		}
+
 		_currentAction.targeting = false;
 
 		bool isUnitAlreadyTurn = false;
@@ -423,6 +419,66 @@ void BattlescapeGame::turnPlayerTarget(std::string obj_str)
 		{
 			statePushFront(new UnitTurnBState(this, _currentAction));
 		}
+		// door fix
+		else
+		{
+
+			if (_currentAction.type == BA_NONE)
+			{
+				// try to open a door
+				int door = _save->getTileEngine()->unitOpensDoor(unit, true);
+				if (door == 0)
+				{
+					_save->getMod()->getSoundByDepth(_save->getDepth(), Mod::DOOR_OPEN)->play(-1, getMap()->getSoundAngle(unit->getPosition())); // normal door
+				}
+				if (door == 1)
+				{
+					_save->getMod()->getSoundByDepth(_save->getDepth(), Mod::SLIDING_DOOR_OPEN)->play(-1, getMap()->getSoundAngle(unit->getPosition())); // ufo door
+				}
+				if (door == 4)
+				{
+					_currentAction.result = "STR_NOT_ENOUGH_TIME_UNITS";
+				}
+			}
+
+		}
+
+}
+
+void BattlescapeGame::turnPlayerTargetAfter(std::string obj_str)
+{
+
+	Json::Reader reader;
+	Json::Value obj;
+
+	reader.parse(obj_str, obj);
+
+	int unit_id = obj["unit_id"].asInt();
+	int setDirection = obj["setDirection"].asInt();
+	int setFaceDirection = obj["setFaceDirection"].asInt();
+
+	BattleUnit* unit = 0;
+
+	bool found_unit = false;
+
+	// unit
+	for (auto u : *_save->getUnits())
+	{
+
+		if (u->getId() == unit_id)
+		{
+			found_unit = true;
+			unit = u;
+			break;
+		}
+	}
+
+	if (found_unit == false)
+		return;
+
+	unit->abortTurn();
+	unit->setFaceDirection(setFaceDirection);
+	unit->setDirection(setDirection);
 
 }
 
@@ -478,6 +534,9 @@ void BattlescapeGame::psi_attack(std::string obj_str)
 		}
 	}
 
+	if (found_unit == false)
+		return;
+
 	unit->setPosition(*startpos);
 
 	// stats

src/Battlescape/BattlescapeGame.h

@@ -175,6 +175,7 @@ class BattlescapeGame
 	std::string getCoopWeaponHand();
 	void movePlayerTarget(std::string obj);
 	void turnPlayerTarget(std::string str_obj);
+	void turnPlayerTargetAfter(std::string str_obj);
 	void psi_attack(std::string str_obj);
 	void melee_attack(std::string str_obj);
 	bool getHost();