Merge branch 'main' of https://github.com/Andreas-W/GeneralsGameCode_Modding into anim_blending_fixes

Author: Andreas-W

Core/GameEngine/Include/GameClient/TerrainRoads.h

@@ -97,6 +97,7 @@ class TerrainRoadType : public MemoryPoolObject
 	AsciiString getRepairedToFXString( BodyDamageType state, Int index ) { return m_repairedToFXString[ state ][ index ]; }
 	Real getTransitionEffectsHeight( void ) { return m_transitionEffectsHeight; }
 	Int getNumFXPerType( void ) { return m_numFXPerType; }
+	Real getBridgeHoleAreaPercentage( void ) { return m_bridgeHoleAreaPercentage;	}
 
 	// friend access methods to be used by the road collection only!
 	void friend_setName( AsciiString name ) { m_name = name; }
@@ -188,6 +189,7 @@ class TerrainRoadType : public MemoryPoolObject
 	Real m_transitionEffectsHeight;
 	Int m_numFXPerType; ///< for *each* fx/ocl we will make this many of them on the bridge area
 
+	Real m_bridgeHoleAreaPercentage; ///< if bridge is openable/destroyable, how much % of length becomes open
 };
 
 //-------------------------------------------------------------------------------------------------

Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl

@@ -135,6 +135,7 @@ static PoolSizeRec PoolSizes[] =
 	{ "MissileAIUpdate", 512, 32 },
 	{ "DumbProjectileBehavior", 64, 32 },
 	{ "FreeFallProjectileBehavior", 32, 32 },
+	{ "JumpjetMissileAIUpdate", 16, 16 },
 	{ "DestroyDie", 1024, 32 },
 	{ "UpgradeDie", 128, 32 },
 	{ "KeepObjectDie", 128, 32 },
@@ -278,6 +279,7 @@ static PoolSizeRec PoolSizes[] =
 	{ "TransitionDamageFX", 384, 128 },
 	{ "TransportAIUpdate", 64, 32 },
 	{ "TransportContain", 128, 32 },
+	{ "JumpjetContain", 16, 16 },
 	{ "RiderChangeContain", 128, 32 },
 	{ "InternetHackContain", 16, 16 },
 	{ "TunnelContain", 8, 8 },
@@ -697,5 +699,8 @@ static PoolSizeRec PoolSizes[] =
 	{ "DroneCarrierContain", 8, 8 },
 	{ "W3DDependencyCarrierDraw", 16, 16 },
 	{ "CarrierDroneAIUpdate", 16, 16 },
+	{ "DrawBridgeTowerUpdate", 8, 8 },
+	{ "DrawBridgeUpdate", 4, 4 },
+	{ "CrateApplyUpgrade", 64, 32 },
 	{ 0, 0, 0 }
 };

Core/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp

@@ -84,6 +84,7 @@ const FieldParse TerrainRoadType::m_terrainBridgeFieldParseTable[] =
 	{ "RepairedToSound",							INI::parseAsciiString,				nullptr, offsetof( TerrainRoadType, m_repairedToSoundString[ BODY_DAMAGED ] ) },
 	{ "TransitionToOCL",							parseTransitionToOCL,					nullptr, 0 },
 	{ "TransitionToFX",								parseTransitionToFX,					nullptr, 0 },
+	{ "BridgeHoleAreaPercentage",     INI::parsePercentToReal,      nullptr, offsetof( TerrainRoadType, m_bridgeHoleAreaPercentage) },
 
 
 	{ nullptr,									nullptr,													nullptr, 0 },

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -371,6 +371,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/MaxHealthUpgrade.h
     Include/GameLogic/Module/MinefieldBehavior.h
     Include/GameLogic/Module/MissileAIUpdate.h
+    Include/GameLogic/Module/JumpjetMissileAIUpdate.h
     Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
     Include/GameLogic/Module/MobMemberSlavedUpdate.h
     Include/GameLogic/Module/MobNexusContain.h
@@ -483,6 +484,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/TransportAIUpdate.h
     Include/GameLogic/Module/TransportContain.h
     Include/GameLogic/Module/TunnelContain.h
+    Include/GameLogic/Module/JumpjetContain.h
     Include/GameLogic/Module/UndeadBody.h
     Include/GameLogic/Module/UnitCrateCollide.h
     Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
@@ -506,6 +508,9 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/DroneCarrierContain.h
     Include/GameLogic/Module/CarrierDroneAIUpdate.h
     Include/GameLogic/Module/BridgeTowerBody.h
+    Include/GameLogic/Module/DrawBridgeTowerUpdate.h
+    Include/GameLogic/Module/DrawBridgeUpdate.h
+    Include/GameLogic/Module/CrateApplyUpgrade.h
     Include/GameLogic/Object.h
     Include/GameLogic/ObjectCreationList.h
     Include/GameLogic/BuffSystem.h
@@ -958,6 +963,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Contain/RiderChangeContain.cpp
     Source/GameLogic/Object/Contain/TransportContain.cpp
     Source/GameLogic/Object/Contain/TunnelContain.cpp
+    Source/GameLogic/Object/Contain/JumpjetContain.cpp
     Source/GameLogic/Object/Contain/DroneCarrierContain.cpp
     Source/GameLogic/Object/Create/CreateModule.cpp
     Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
@@ -1024,6 +1030,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
+    Source/GameLogic/Object/Update/AIUpdate/JumpjetMissileAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -1116,6 +1123,8 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Update/KodiakDeploymentUpdate.cpp
     Source/GameLogic/Object/Update/KodiakUpdate.cpp
     Source/GameLogic/Object/Update/DroneCarrierSlavedUpdate.cpp
+    Source/GameLogic/Object/Update/DrawBridgeTowerUpdate.cpp
+    Source/GameLogic/Object/Update/DrawBridgeUpdate.cpp
     Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
     Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
     Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
@@ -1139,6 +1148,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
     Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
     Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
+    Source/GameLogic/Object/Upgrade/CrateApplyUpgrade.cpp
     Source/GameLogic/Object/Weapon.cpp
     Source/GameLogic/Object/WeaponSet.cpp
     Source/GameLogic/ScriptEngine/ScriptActions.cpp

GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h

@@ -220,6 +220,10 @@ enum SpecialPowerType CPP_11(: Int)
 	SUPW_SPECIAL_SPECTRE_GUNSHIP,
 	SUPW_SPECIAL_ORBITAL_STRIKE,
 
+	SPECIAL_TOGGLE_DRAWBRIDGE,
+
+	SPECIAL_JUMPJET,
+
 	SPECIALPOWER_COUNT,
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 // NEW CONSTANTS NEED A BEHAVIORTYPE DEFINED IN THE SPECIALPOWER OR return one in getFallbackBehaviorType in ActionManager.cpp

GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h

@@ -675,6 +675,8 @@ class ThingTemplate : public Overridable
 
 	Int getMaxPathFindingCellRadius(void) const { return static_cast<Int>(m_maxPathfindingCellRadius); };
 
+	Byte getRequiredBridgeHeight(void) const { return m_requiredBridgeHeight; };
+
 protected:
 
 	//
@@ -709,6 +711,8 @@ class ThingTemplate : public Overridable
 
   static void parseMaxSimultaneous(INI *ini, void *instance, void *store, const void *userData);
 
+	static void parseRequiredBridgeHeight(INI* ini, void* instance, void* store, const void* userData);
+
 	Bool removeModuleInfo(const AsciiString& moduleToRemove, AsciiString& clearedModuleNameOut);
 
 private:
@@ -828,6 +832,7 @@ class ThingTemplate : public Overridable
 	UnsignedByte	m_crushableLevel;						///< Specifies the level of crushability (must be hit by a crusher greater than this to crush me).
 	Byte					m_ammoPipsStyle;                ///< How ammo pips are displayed for this thing
 	UnsignedByte  m_maxPathfindingCellRadius;  ///< Limit cells radius for pathfinding, defaults to 2, can be increased for large units
+	Byte					m_requiredBridgeHeight;      ///< simplified height required to fit under bridge, range: -1 to 15, -1 will use Geometry height, other values to override
 };
 
 //-----------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h

@@ -99,6 +99,7 @@ enum CommandOption CPP_11(: Int)
 	USES_MINE_CLEARING_WEAPONSET= 0x00200000,	// uses the special mine-clearing weaponset, even if not current
 	CAN_USE_WAYPOINTS						= 0x00400000, // button has option to use a waypoint path
 	MUST_BE_STOPPED							= 0x00800000, // Unit must be stopped in order to be able to use button.
+	FORMATION_LAUNCH						= 0x01000000, // code-only: jumpjet group launch, keep formation offset instead of random scatter.
 };
 
 #ifdef DEFINE_COMMAND_OPTION_NAMES
@@ -132,6 +133,7 @@ static const char *const TheCommandOptionNames[] =
 	"USES_MINE_CLEARING_WEAPONSET",
 	"CAN_USE_WAYPOINTS",
 	"MUST_BE_STOPPED",
+	"FORMATION_LAUNCH",
 
 	nullptr
 };

GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h

@@ -175,6 +175,15 @@ class Path : public MemoryPoolObject, public Snapshot
 	/// Given a location, return closest location on path, and along-path dist to end as function result
 	void markOptimized(void) {m_isOptimized = true;}
 
+	inline Bool needCheckBridges( void ) const { return m_moveUnderBridges != 0U; };
+
+	static inline UnsignedShort layerIndexToBitFlag(UnsignedShort layer_index) {
+		return static_cast<UnsignedShort>(1u << layer_index);
+	};
+
+	inline void setPathBelowBridge(PathfindLayerEnum layer) { BitSet(m_moveUnderBridges, layerIndexToBitFlag(static_cast<UnsignedShort>(layer))); };
+	inline Bool isPathBelowBridge(UnsignedShort layer_index) { return BitIsSet(m_moveUnderBridges, layerIndexToBitFlag(layer_index)); };
+
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer );
@@ -195,6 +204,9 @@ class Path : public MemoryPoolObject, public Snapshot
 	Coord3D									m_cpopIn;
 	ClosestPointOnPathInfo	m_cpopOut;
 	const PathNode*					m_cpopRecentStart;
+
+	// Stores opened/destroyed bridges that this path moves below.
+	UnsignedShort m_moveUnderBridges; // 16bit -> use as bitset for PATHFIND LAYER ENUMS (2-14 for bridges)
 };
 
 //----------------------------------------------------------------------------------------------------------
@@ -372,6 +384,11 @@ class PathfindCell
 	Short getWaterLevel(void) const { return m_waterLevel; }
 	void setWaterLevel(Short level) { m_waterLevel = level; }
 
+	UnsignedByte getBridgeHeight(void) const { return m_bridgeHeight; }
+	void setBridgeHeight(UnsignedByte height) { m_bridgeHeight = height; }
+	PathfindLayerEnum getBridgeLayer(void) const { return (PathfindLayerEnum)m_bridgeLayer; }
+	void setBridgeLayer(PathfindLayerEnum layer) { m_bridgeLayer = (UnsignedByte)layer; }
+
 	Bool allocateInfo(const ICoord2D &pos);
 	void releaseInfo(void);
 	Bool hasInfo(void) const {return m_info!=nullptr;}
@@ -392,6 +409,9 @@ class PathfindCell
 	void setConnectLayer( PathfindLayerEnum layer ) { m_connectsToLayer = layer; }	///< set the cell layer	connect id
 	PathfindLayerEnum getConnectLayer( void ) const { return (PathfindLayerEnum)m_connectsToLayer; }				///< get the cell layer connect id
 
+	/// Get the layer if this cell under a bridge that is currently destroyed or opened or LAYER_INVALID if not
+	PathfindLayerEnum getUnderDestroyedBridgeLayer( void ) const;
+
 private:
 	PathfindCellInfo *m_info;
 	ObjectID m_obstacleID;	                  ///< the object ID who overlaps this cell
@@ -409,6 +429,9 @@ class PathfindCell
 	UnsignedByte m_layer : 4;                 ///< Layer of this cell.
 	//This is added for ship pathing
 	Short m_waterLevel:8; ///< how far away is this cell from land (distance transform), capped at 15
+	//This is added for bridge pathing, determine if unit can go under bridge or not
+	UnsignedByte m_bridgeHeight : 4;  // stored as number 0-15, rounded from 0.0-150.0 float. Space below bridge (to ground or water)
+	UnsignedByte m_bridgeLayer : 4; // Layer number of bridge above this cell
 };
 
 typedef PathfindCell *PathfindCellP;
@@ -660,7 +683,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void xfer( Xfer *xfer );
 	void loadPostProcess( void );
 
-	Bool clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain & buildings check - fast)
+	Bool clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet, Short requiredBridgeHeight, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain & buildings check - fast)
 	Bool clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain onlyk - fast)
 	Bool slowDoesPathExist( Object *obj, const Coord3D *from,
 		const Coord3D *to, ObjectID ignoreObject=INVALID_ID );  ///< Can we build any path at all between the locations	(terrain, buildings & units check - slower)
@@ -709,9 +732,9 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	void setIgnoreObstacleID( ObjectID objID );					///< if non-zero, the pathfinder will ignore the given obstacle
 
-	Bool validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, Int requiredWaterLevel, PathfindCell *toCell, PathfindCell *fromCell = NULL );		///< Return true if given position is a valid movement location
-	Bool validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Int x, Int y );					///< Return true if given position is a valid movement location
-	Bool validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, const Coord3D *pos );		///< Return true if given position is a valid movement location
+	Bool validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, Int requiredWaterLevel, Short requiredBridgeHeight, PathfindCell *toCell, PathfindCell *fromCell = NULL );		///< Return true if given position is a valid movement location
+	Bool validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Short requiredBridgeHeight, Int x, Int y );					///< Return true if given position is a valid movement location
+	Bool validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Short requiredBridgeHeight, const Coord3D *pos );		///< Return true if given position is a valid movement location
 	Bool validMovementTerrain( PathfindLayerEnum layer, const Locomotor* locomotor, const Coord3D *pos );		///< Return true if given position is a valid movement location
 
 	Locomotor* chooseBestLocomotorForPosition(PathfindLayerEnum layer,  LocomotorSet* locomotorSet, const Coord3D* pos );
@@ -760,6 +783,11 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	PathfindLayerEnum addBridge(Bridge *theBridge); // Adds a bridge layer, and returns the layer id.
 
+	// return if the passed layer is currently passable (checks for destroyed bridges)
+	inline Bool isPathfindLayerPassable(PathfindLayerEnum layer) {
+		return !m_layers[layer].isUnused() && !m_layers[layer].isDestroyed();
+	}
+
 	void addWallPiece(Object *wallPiece); // Adds a wall piece.
 	void removeWallPiece(Object *wallPiece);  // Removes a wall piece.
 	Real getWallHeight(void) {return m_wallHeight;}
@@ -919,18 +947,18 @@ inline void Pathfinder::worldToGrid( const Coord3D *pos, ICoord2D *cellIndex )
 	cellIndex->y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE);
 }
 
-inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Int x, Int y )
+inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Short requiredBridgeHeight, Int x, Int y )
 {
-	return validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), locomotorSet.getRequiredWaterLevel(), getCell(layer, x, y));
+	return validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), locomotorSet.getRequiredWaterLevel(), requiredBridgeHeight, getCell(layer, x, y));
 }
 
-inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, const Coord3D *pos )
+inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Short requiredBridgeHeight, const Coord3D *pos )
 {
 
 	Int x = REAL_TO_INT(pos->x/PATHFIND_CELL_SIZE);
 	Int y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE);
 
-	return validMovementPosition( isCrusher, layer, locomotorSet, x, y );
+	return validMovementPosition( isCrusher, layer, locomotorSet, requiredBridgeHeight, x, y );
 }
 
 inline const Coord3D *Pathfinder::getDebugPathPosition( void )

GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h

@@ -264,6 +264,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 
 	AsciiString getTemplateName() const { return m_template->m_name;}
 	Real getMinSpeed() const { return m_template->m_minSpeed;}
+	Real getMinTurnSpeed() const { return m_template->m_minTurnSpeed;}	///< must be going >= this speed to turn (0 = can turn in place)
 	Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
 	Real getDecelPitchLimit() const { return m_template->m_decelPitchLimit;}	///< Maximum amount we will pitch down under deceleration (including recoil.)
 	Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h

@@ -505,6 +505,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool isBlockedAndStuck(void) const {return m_isBlockedAndStuck;}
 	Bool canComputeQuickPath(void); ///< Returns true if we can quickly comput a path.  Usually missiles & the like that just move straight to the destination.
 	Bool computeQuickPath(const Coord3D *destination); ///< Computes a quick path to the destination.
+	Bool arePathLayersStillValid(); ///< Check if the current used layers are still passable
 
 	Bool isMoving() const;
 	Bool isMovingAwayFrom(Object* obj) const;