Merge branch 'main' into IamInnocent-dev

Author: IamInnocent3X

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -2427,6 +2427,16 @@ void W3DView::screenToTerrain( const ICoord2D *screen, Coord3D *world )
 		intersection = bridgePt;
 	}
 
+	//Check for water height in this area, create a dummy plane around the point
+	if (TheGlobalData->m_heightAboveTerrainIncludesWater) {
+		Vector3 outPos{ 0,0,0 };
+		if (TheTerrainLogic->pickWaterPlane(rayStart, rayEnd, intersection, outPos)) {
+			if (outPos.Z > intersection.Z) {
+				intersection = outPos;
+			}
+		}
+	}
+
 	world->x = intersection.X;
 	world->y = intersection.Y;
 	world->z = intersection.Z;

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

@@ -101,8 +101,11 @@ enum DamageType CPP_11(: Int)
 	DAMAGE_SEISMIC,
 	DAMAGE_RAD_BEAM,
 	DAMAGE_TESLA,
+	DAMAGE_JET_TORPEDO,
+	DAMAGE_ANTI_SHIP,
 
 	// Specific damage types with special logic attached
+	DAMAGE_TORPEDO, ///< can only attack units over water
 	DAMAGE_CHRONO_GUN,   ///< Disable target and remove them once health threshold is reached
 	DAMAGE_CHRONO_UNRESISTABLE,  ///< Used for recovery from CHRONO_GUN
 	// DAMAGE_ZOMBIE_VIRUS,  // TODO

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

@@ -71,6 +71,8 @@ class MissileAIUpdateModuleData : public AIUpdateModuleData
 
 	Bool m_applyLauncherBonus;     ///< Apply the launcher's weapon bonus flags (for any non-detonate triggered weapon)
 
+	Bool m_isTorpedo; ///< die outside of water, strike objects from below.
+
 	Bool						m_allowSubdual;
 	Bool						m_allowAttract;
 

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

@@ -288,6 +288,9 @@ class TerrainLogic : public Snapshot,
 
 	virtual Drawable *pickBridge(const Vector3 &from, const Vector3 &to, Vector3 *pos);
 
+	// get water around a world point
+	virtual bool pickWaterPlane(const Vector3 &from, const Vector3 &to, const Vector3 &aroundPos, Vector3 &outPos);
+
 	virtual void addBridgeToLogic(BridgeInfo *pInfo, Dict *props, AsciiString bridgeTemplateName); ///< Adds a bridge's logical info.
 	virtual void addLandmarkBridgeToLogic(Object *bridgeObj); ///< Adds a bridge's logical info.
 	virtual void deleteBridge( Bridge *bridge );	///< remove a bridge

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp

@@ -921,6 +921,14 @@ void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupD
 	dest->x = groupDest->x + v.x;
 	dest->y = groupDest->y + v.y;
 	dest->z = TheTerrainLogic->getLayerHeight( dest->x, dest->y, layer );
+
+	if (TheGlobalData->m_heightAboveTerrainIncludesWater) {
+		// Put waypoints on water surface instead of ground
+		if (Real waterZ = 0; TheTerrainLogic->isUnderwater(dest->x, dest->y, &waterZ)) {
+			if (waterZ > dest->z) dest->z = waterZ;
+		}
+	}
+
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
 	if (ai && ai->isDoingGroundMovement()) {
 		if (isFormation) {

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

@@ -9069,6 +9069,13 @@ void Pathfinder::adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coor
 		pos.y = ((Real)cellY+0.05) * PATHFIND_CELL_SIZE_F;
 	}
 	pos.z = TheTerrainLogic->getLayerHeight( pos.x, pos.y, layer );
+
+	if (TheGlobalData->m_heightAboveTerrainIncludesWater) {
+		//Adjust to water surface
+		if (Real waterZ = 0; TheTerrainLogic->isUnderwater(pos.x, pos.y, &waterZ)) {
+			if (waterZ > pos.z) pos.z = waterZ;
+		}
+	}
 }
 
 

GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp

@@ -1975,6 +1975,34 @@ Drawable *TerrainLogic::pickBridge(const Vector3 &from, const Vector3 &to, Vecto
 	return(curDraw);
 }
 
+bool TerrainLogic::pickWaterPlane(const Vector3& from, const Vector3& to, const Vector3& aroundPos, Vector3 &outPos) {
+	Real waterZ{ 0 };
+	if (isUnderwater(aroundPos.X, aroundPos.Y, &waterZ)) {
+		Vector3 normal(0, 0, 1.0f);
+		Vector3 point(aroundPos.X, aroundPos.Y, waterZ);
+
+		PlaneClass plane(normal, point);
+
+		Real t;
+		plane.Compute_Intersection(from, to, &t);
+		Vector3 intersectPos;
+		intersectPos = from + (to - from) * t;
+
+		outPos.X = intersectPos.X;
+		outPos.Y = intersectPos.Y;
+		outPos.Z = intersectPos.Z;
+
+		return true;
+	}
+	else {
+		outPos.X = 0;
+		outPos.Y = 0;
+		outPos.Z = 0;
+		return false;
+	}
+}
+
+
 //-------------------------------------------------------------------------------------------------
 /** Deletes the bridges list. */
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp

@@ -136,13 +136,14 @@ void MissileAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 		{ "KillSelfDelay",     INI::parseDurationUnsignedInt, NULL, offsetof( MissileAIUpdateModuleData, m_killSelfDelay ) },
 		{ "ZCorrectionFactor", INI::parseReal,   NULL, offsetof(MissileAIUpdateModuleData, m_zDirFactor) },
 		{ "ApplyLauncherBonus", INI::parseBool,  NULL, offsetof(MissileAIUpdateModuleData, m_applyLauncherBonus) },
+		{ "IsTorpedo",         INI::parseBool,   NULL, offsetof(MissileAIUpdateModuleData, m_isTorpedo) },
 
 		{ "AllowSubdual", INI::parseBool, NULL, offsetof(MissileAIUpdateModuleData, m_allowSubdual) },
 		{ "AllowAttract", INI::parseBool, NULL, offsetof(MissileAIUpdateModuleData, m_allowAttract) },
 
 		{ "AllowRetargeting", INI::parseBool, NULL, offsetof(MissileAIUpdateModuleData, m_allowRetargeting) },
 		{ "AllowRetargetingThroughFog", INI::parseBool, NULL, offsetof(MissileAIUpdateModuleData, m_allowRetargetingThroughFog) },
-		
+
 		{ 0, 0, 0, 0 }
 	};
 
@@ -703,7 +704,7 @@ void MissileAIUpdate::doAttackState(Bool turnOK, Bool randomPath)
 		}
 	}
 
-	if(curLoco && curLoco->getPreferredHeight() > 0)
+	if(curLoco && (curLoco->getPreferredHeight() > 0 || curLoco->getPreferredHeight() < 0) )
 	{
 		// Am I close enough to the target to ignore my preferred height setting?
 		Real distanceToTargetSquared = ThePartitionManager->getDistanceSquared( getObject(), getGoalPosition(), FROM_CENTER_2D );
@@ -981,6 +982,13 @@ UpdateSleepTime MissileAIUpdate::update()
 		TheGameLogic->destroyObject(getObject());
 		return UPDATE_SLEEP_FOREVER;
 	}
+
+	// If treated as torpedo, explode when not over water
+	const MissileAIUpdateModuleData* d = getMissileAIUpdateModuleData();
+	if (d->m_isTorpedo && !getObject()->isOverWater()) {
+		detonate();
+	}
+
 	switch( m_state )
 	{
 		case PRELAUNCH:

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp

@@ -81,6 +81,12 @@ void DefaultProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorTyp
 		// make sure the point is on the terrain
 		loc.Z = TheTerrainLogic ? TheTerrainLogic->getLayerHeight( loc.X, loc.Y, creationObject->getLayer() ) : 0.0f;
 
+		// If underwater use water height, fixes shipyards spawning ships under water
+		if (Real waterZ = 0;  TheTerrainLogic && TheTerrainLogic->isUnderwater(loc.X, loc.Y, &waterZ)) {
+			if (waterZ > loc.Z) loc.Z = waterZ;
+		}
+
+
 		// we need it in Coord3D form
 		createPoint.x = loc.X;
 		createPoint.y = loc.Y;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp

@@ -901,6 +901,11 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 					continue;
 				}
 
+				// Torpedoes cannot attack units not above water
+				if (weapon->getDamageType() == DAMAGE_TORPEDO && !victim->isOverWater()) {
+					continue;
+				}
+
 				return okResult;
 			}
 		}