added LocomotorWorksWhenDisabled

added flags for HeightDieUpdate

Author: Andreas-W

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

@@ -200,6 +200,7 @@ class LocomotorTemplate : public Overridable
 	Real											m_ultraAccurateSlideIntoPlaceFactor;			///< how much we can fudge turning when ultra-accurate
 
 	Bool											m_locomotorWorksWhenDead;	///< should locomotor continue working even when object is "dead"?
+	Bool											m_locomotorWorksWhenDisabled;	///< should locomotor continue working even when object is disabled?
 	Bool											m_allowMotiveForceWhileAirborne;	///< can we apply motive when airborne?
 	Bool											m_apply2DFrictionWhenAirborne;	// apply "2d friction" even when airborne... useful for realistic-looking movement
 	Bool											m_downhillOnly;	// pinewood derby, moves only by gravity pulling downhill
@@ -287,6 +288,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 	Bool getAllowMotiveForceWhileAirborne() const { return m_template->m_allowMotiveForceWhileAirborne; }
 	Int getAirborneTargetingHeight() const { return m_template->m_airborneTargetingHeight; }
 	Bool getLocomotorWorksWhenDead() const { return m_template->m_locomotorWorksWhenDead; }
+	Bool getLocomotorWorksWhenDisabled() const { return m_template->m_locomotorWorksWhenDisabled; }
 	Bool getStickToGround() const { return m_template->m_stickToGround; }
 	Real getCloseEnoughDist() const { return m_closeEnoughDist; }
 	Bool isCloseEnoughDist3D() const { return getFlag(IS_CLOSE_ENOUGH_DIST_3D); }

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

@@ -315,7 +315,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual AIUpdateInterface* getAIUpdateInterface() { return this; }
 
 	// Disabled conditions to process (AI will still process held status)
-	virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); }
+	//virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); }
+
+	// We need to process all disabled types to allow Locomotor working while disabled
+	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
 
 	// Some very specific, complex behaviors are used by more than one AIUpdate.  Here are their interfaces.
 	virtual DozerAIInterface* getDozerAIInterface() { return NULL; }

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

@@ -44,8 +44,10 @@ class HeightDieUpdateModuleData: public UpdateModuleData
 	static void buildFieldParse(MultiIniFieldParse& p);
 
 	Real m_targetHeightAboveTerrain;				///< die at this height above terrain
+	Bool m_dieAboveTargetHeight;						///< inverted case. Die if above the given height
 	Bool m_targetHeightIncludesStructures;	///< target height considers terrain AND structure height underneath us
 	Bool m_onlyWhenMovingDown;							///< don't detonate unless moving in downward z dir
+	Bool m_onlyWhenMovingUp;							///< don't detonate unless moving in upwards z dir
 	Real m_destroyAttachedParticlesAtHeight;  ///< HACK, destroy any attached particle system of object when below this height
 	Bool m_snapToGroundOnDeath;							///< snap to the ground when killed
 	UnsignedInt m_initialDelay;							///< Don't explode before this time

GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp

@@ -159,6 +159,7 @@ static bool getSurfaceInfo(const Coord3D* primary, FXSurfaceInfo* surfaceInfo, B
 		}
 		else { // compute missing water info
 			surfaceInfo->m_waterHeight = TheTerrainLogic->getWaterZ(primary->x, primary->y);
+			surfaceInfo->m_isWater = surfaceInfo->m_waterHeight > surfaceInfo->m_groundHeight;
 			surfaceInfo->m_isWaterChecked = true;
 			return true;
 		}

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

@@ -330,6 +330,7 @@ LocomotorTemplate::LocomotorTemplate()
 	m_downhillOnly = false;
 	m_allowMotiveForceWhileAirborne = false;
 	m_locomotorWorksWhenDead = false;
+	m_locomotorWorksWhenDisabled = false;
 	m_airborneTargetingHeight = INT_MAX;
 	m_stickToGround = false;
 	m_canMoveBackward = false;
@@ -489,6 +490,7 @@ const FieldParse* LocomotorTemplate::getFieldParse() const
 		{ "DownhillOnly", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_downhillOnly) },
 		{ "AllowAirborneMotiveForce", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_allowMotiveForceWhileAirborne) },
 		{ "LocomotorWorksWhenDead", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_locomotorWorksWhenDead) },
+		{ "LocomotorWorksWhenDisabled", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_locomotorWorksWhenDisabled) },
 		{ "AirborneTargetingHeight", INI::parseInt, NULL, offsetof( LocomotorTemplate, m_airborneTargetingHeight ) },
 		{ "StickToGround",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_stickToGround) },
 		{ "CanMoveBackwards",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_canMoveBackward) },
@@ -1157,7 +1159,8 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 					moveTowardsPositionTreads(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
 					break;
 			case LOCO_SHIP:
-				  moveTowardsPositionTreads(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
+					moveTowardsPositionHover(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
+				  //moveTowardsPositionTreads(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
 				  break;
 			case LOCO_HOVER:
 					moveTowardsPositionHover(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);

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

@@ -1226,11 +1226,12 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	Object *obj = getObject();
 
 	if (! obj->isEffectivelyDead() &&
-			! obj->isDisabledByType( DISABLED_PARALYZED ) &&
-			! obj->isDisabledByType( DISABLED_UNMANNED ) &&
-			! obj->isDisabledByType( DISABLED_EMP ) &&
-			! obj->isDisabledByType( DISABLED_SUBDUED ) &&
-			! obj->isDisabledByType( DISABLED_HACKED ) )
+			//! obj->isDisabledByType( DISABLED_PARALYZED ) &&
+			//! obj->isDisabledByType( DISABLED_UNMANNED ) &&
+			//! obj->isDisabledByType( DISABLED_EMP ) &&
+			//! obj->isDisabledByType( DISABLED_SUBDUED ) &&
+			//! obj->isDisabledByType( DISABLED_HACKED ) )
+			! (obj->isDisabled() && !obj->isDisabledByType(DISABLED_HELD )))
 	{
 		// If we are dead, don't let the turrets do anything anymore, or else they will keep attacking
 		for (int i = 0; i < MAX_TURRETS; ++i)
@@ -2275,6 +2276,18 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 
 	chooseGoodLocomotorFromCurrentSet();
 
+	// Disabled check
+	Bool disabled = getObject()->isDisabled() && !getObject()->isDisabledByType(DISABLED_HELD);
+	if (disabled && m_curLocomotor != NULL)
+	{
+		if (!m_curLocomotor->getLocomotorWorksWhenDisabled()) {
+			return UPDATE_SLEEP_FOREVER;
+		}
+		if (m_curLocomotor->locoUpdate_maintainCurrentPosition(getObject()))
+			return UPDATE_SLEEP_NONE;
+		return UPDATE_SLEEP_FOREVER;
+	}
+
 	if (m_isBlocked)
 	{
 		++m_blockedFrames;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp

@@ -49,8 +49,10 @@ HeightDieUpdateModuleData::HeightDieUpdateModuleData( void )
 {
 
 	m_targetHeightAboveTerrain = 0.0f;
+	m_dieAboveTargetHeight = FALSE;
 	m_targetHeightIncludesStructures = FALSE;
 	m_onlyWhenMovingDown = FALSE;
+	m_onlyWhenMovingUp = FALSE;
 	m_destroyAttachedParticlesAtHeight = -1.0f;
 	m_snapToGroundOnDeath = FALSE;
 	m_initialDelay = 0;
@@ -68,7 +70,9 @@ void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 	{
 		{ "TargetHeight", INI::parseReal, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightAboveTerrain ) },
 		{ "TargetHeightIncludesStructures", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightIncludesStructures ) },
+		{ "DieAboveTargetHeight", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_dieAboveTargetHeight) },
 		{ "OnlyWhenMovingDown", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_onlyWhenMovingDown ) },
+		{ "OnlyWhenMovingUp", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_onlyWhenMovingUp ) },
 		{ "DestroyAttachedParticlesAtHeight", INI::parseReal, NULL, offsetof( HeightDieUpdateModuleData, m_destroyAttachedParticlesAtHeight ) },
 		{ "SnapToGroundOnDeath", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_snapToGroundOnDeath ) },
 		{ "InitialDelay", INI::parseDurationUnsignedInt, NULL, offsetof( HeightDieUpdateModuleData, m_initialDelay ) },
@@ -148,6 +152,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
 
 		}
 
+		if (modData->m_onlyWhenMovingUp)
+		{
+
+			if (pos->z <= m_lastPosition.z)
+				directionOK = FALSE;
+
+		}
+
 		// get the terrain height
 		Real terrainHeightAtPos = TheTerrainLogic->getGroundHeight( pos->x, pos->y );
 
@@ -215,8 +227,15 @@ UpdateSleepTime HeightDieUpdate::update( void )
 
 		}
 
+		bool doTheKill = false;
+
+		if (modData->m_dieAboveTargetHeight)
+			doTheKill = pos->z > targetHeight && directionOK;
+		else
+			doTheKill = pos->z < targetHeight && directionOK;
+
 		// if we are below the target height ... DIE!
-		if( pos->z < targetHeight && directionOK )
+		if(doTheKill)
 		{
 
 			// if we're supposed to snap us to the ground on death do so