unify(module): Merge HordeUpdate and related code

Author: xezon

Generals/Code/GameEngine/Include/GameClient/Drawable.h

@@ -261,7 +261,16 @@ enum TerrainDecalType CPP_11(: Int)
 	TERRAIN_DECAL_HORDE_VEHICLE,
 	TERRAIN_DECAL_HORDE_WITH_NATIONALISM_UPGRADE_VEHICLE,
 	TERRAIN_DECAL_CRATE,
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
 	TERRAIN_DECAL_NONE,
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+#else
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+	TERRAIN_DECAL_NONE,
+#endif
+	TERRAIN_DECAL_SHADOW_TEXTURE,	//use the shadow texture as the terrain decal.
 
 	TERRAIN_DECAL_MAX
 };

Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h

@@ -69,6 +69,7 @@ class HordeUpdateModuleData : public ModuleData
 	Bool											m_exactMatch;		///< if true, only exact same type of units count towards hordeness
 	Real											m_rubOffRadius;///< If I am this close to another guy who is a true hordesman, it'll rub off on me
 	HordeActionType						m_action;				///< what to do if we get horde-ness
+	Bool											m_allowedNationalism; ///< Nationalism is hard ocded.  Yeah!  Add to the goodness with this flag instead of rewriting after Alpha.
 	std::vector<AsciiString>	m_flagSubObjNames;		///< name(s) of the flag subobj
 
 	HordeUpdateModuleData();
@@ -85,6 +86,7 @@ class HordeUpdateInterface
 	virtual Bool isInHorde() const = 0;
 	virtual Bool hasFlag() const = 0;
 	virtual Bool isTrueHordeMember() const = 0;
+	virtual Bool isAllowedNationalism() const = 0;
 
 };
 
@@ -104,6 +106,7 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface
 	virtual void onDrawableBoundToObject();
 	virtual Bool isInHorde() const { return m_inHorde; }
 	virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; }
+	virtual Bool isAllowedNationalism() const;
 	virtual Bool hasFlag() const { return m_hasFlag; }
 	virtual UpdateSleepTime update();	///< update this object's AI
 

Generals/Code/GameEngine/Include/GameLogic/Weapon.h

@@ -201,6 +201,11 @@ enum WeaponBonusConditionType CPP_11(: Int)
 	WEAPONBONUSCONDITION_SOLO_AI_EASY,
 	WEAPONBONUSCONDITION_SOLO_AI_NORMAL,
 	WEAPONBONUSCONDITION_SOLO_AI_HARD,
+	WEAPONBONUSCONDITION_TARGET_FAERIE_FIRE,
+  WEAPONBONUSCONDITION_FANATICISM, // FOR THE NEW GC INFANTRY GENERAL... adds to nationalism
+	WEAPONBONUSCONDITION_FRENZY_ONE,
+	WEAPONBONUSCONDITION_FRENZY_TWO,
+	WEAPONBONUSCONDITION_FRENZY_THREE,
 
 	WEAPONBONUSCONDITION_COUNT
 };
@@ -234,6 +239,12 @@ static const char *const TheWeaponBonusNames[] =
 	"SOLO_AI_EASY",
 	"SOLO_AI_NORMAL",
 	"SOLO_AI_HARD",
+	"TARGET_FAERIE_FIRE",
+  "FANATICISM", // FOR THE NEW GC INFANTRY GENERAL... adds to nationalism
+	"FRENZY_ONE",
+	"FRENZY_TWO",
+	"FRENZY_THREE",
+
 	NULL
 };
 static_assert(ARRAY_SIZE(TheWeaponBonusNames) == WEAPONBONUSCONDITION_COUNT + 1, "Incorrect array size");

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

@@ -4434,6 +4434,27 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 #endif
 	Bool horde = FALSE;
 	Bool nationalism = FALSE;
+	Bool fanaticism = FALSE;
+
+	Player *player = us->getControllingPlayer();
+
+	// do we have nationalism
+	///@todo Find a better way to represent nationalism without hardcoding here (CBD)
+	static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
+	if (nationalismTemplate != NULL)
+	{
+		if( player && player->hasUpgradeComplete( nationalismTemplate ) )
+			nationalism = TRUE;
+	}
+
+	// do we have fanaticism
+	///@todo Find a better way to represent fanaticism without hardcoding here (MAL)
+	static const UpgradeTemplate *fanaticismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Fanaticism" );
+	if (fanaticismTemplate != NULL)
+	{
+		if( player && player->hasUpgradeComplete( fanaticismTemplate ) )
+			fanaticism = TRUE;
+	}
 
 	// are we in a horde
 	HordeUpdateInterface *hui;
@@ -4442,17 +4463,18 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 
 		hui = (*u)->getHordeUpdateInterface();
 		if( hui && hui->isInHorde() )
+		{
 			horde = TRUE;
 
-	}
+			if( !hui->isAllowedNationalism() )
+			{
+				// Sorry CBD and MAL, but the cancer has spread to the lymph nodes.  After Alpha, just pump full of painkillers.
+				nationalism = FALSE;
+				fanaticism = FALSE;
+			}
+		}
 
-	// do we have nationalism
-	///@todo Find a better way to represent nationalism without hardcoding here (CBD)
-	static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
-	DEBUG_ASSERTCRASH( nationalismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Nationalism upgrade not found") );
-	Player *player = us->getControllingPlayer();
-	if( player && player->hasUpgradeComplete( nationalismTemplate ) )
-		nationalism = TRUE;
+	}
 
 #ifdef ALLOW_DEMORALIZE
 	// if we are are not demoralized we can have horde and nationalism effects
@@ -4481,10 +4503,19 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 
 		// nationalism
 		if( nationalism )
+    {
 			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+      // fanaticism
+      if ( fanaticism )
+        us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );// FOR THE NEW GC INFANTRY GENERAL
+      else
+        us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+    }
 		else
 			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
 
+
+
 	}
 #ifdef ALLOW_DEMORALIZE
 	else
@@ -4503,6 +4534,7 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 
 		// we cannot have nationalism bonus condition
 		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+    us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
 
 	}
 #endif

Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp

@@ -120,6 +120,7 @@ HordeUpdateModuleData::HordeUpdateModuleData() :
 	m_rubOffRadius(20.0f),
 	m_alliesOnly(true),
 	m_exactMatch(false),
+	m_allowedNationalism(TRUE),
 	m_action(HORDEACTION_HORDE)
 {
 }
@@ -140,6 +141,7 @@ HordeUpdateModuleData::HordeUpdateModuleData() :
 		{ "ExactMatch", INI::parseBool, NULL, offsetof(HordeUpdateModuleData, m_exactMatch) },
 		{ "Action", INI::parseIndexList, TheHordeActionTypeNames, offsetof(HordeUpdateModuleData, m_action) },
 		{ "FlagSubObjectNames", INI::parseAsciiStringVector, NULL, offsetof(HordeUpdateModuleData, m_flagSubObjNames) },
+		{ "AllowedNationalism", INI::parseBool, NULL, offsetof(HordeUpdateModuleData, m_allowedNationalism) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
@@ -170,6 +172,13 @@ HordeUpdate::~HordeUpdate()
 
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool HordeUpdate::isAllowedNationalism() const
+{
+	const HordeUpdateModuleData *data = getHordeUpdateModuleData();
+	return data->m_allowedNationalism;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** @todo I think we should model the horde list ... so we can do all this without doing
   * all this scanning, plus we can give exactly 1 flag to the right person in the

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -266,7 +266,7 @@ inline Bool isCommonMaintainFrameFlagSet(Int a, Int b)
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX-1]=
+static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
 {
 #ifdef ALLOW_DEMORALIZE
 	"DM_RING",//demoralized
@@ -278,6 +278,16 @@ static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX-1]=
 	"EXHordeB",//enthusiastic vehicle
 	"EXHordeB_UP", //enthusiastic vehicle with nationalism
 	"EXJunkCrate",//Marks a crate as special
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	"", //dummy entry for TERRAIN_DECAL_NONE
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+#else
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+	"", //dummy entry for TERRAIN_DECAL_NONE
+#endif
+	"" //dummy entry for TERRAIN_DECAL_SHADOW_TEXTURE
 };
 
 const UnsignedInt NO_NEXT_DURATION = 0xffffffff;

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

@@ -266,9 +266,15 @@ enum TerrainDecalType CPP_11(: Int)
 	TERRAIN_DECAL_HORDE_VEHICLE,
 	TERRAIN_DECAL_HORDE_WITH_NATIONALISM_UPGRADE_VEHICLE,
 	TERRAIN_DECAL_CRATE,
-    TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	TERRAIN_DECAL_NONE,
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+#else
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
 	TERRAIN_DECAL_CHEMSUIT,
 	TERRAIN_DECAL_NONE,
+#endif
 	TERRAIN_DECAL_SHADOW_TEXTURE,	//use the shadow texture as the terrain decal.
 
 	TERRAIN_DECAL_MAX

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

@@ -4688,20 +4688,25 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
 	Bool nationalism = FALSE;
 	Bool fanaticism = FALSE;
 
+	Player *player = us->getControllingPlayer();
+
 	// do we have nationalism
 	///@todo Find a better way to represent nationalism without hardcoding here (CBD)
 	static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
-	DEBUG_ASSERTCRASH( nationalismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Nationalism upgrade not found") );
-	Player *player = us->getControllingPlayer();
-	if( player && player->hasUpgradeComplete( nationalismTemplate ) )
-		nationalism = TRUE;
+	if (nationalismTemplate != NULL)
+	{
+		if( player && player->hasUpgradeComplete( nationalismTemplate ) )
+			nationalism = TRUE;
+	}
 
 	// do we have fanaticism
 	///@todo Find a better way to represent fanaticism without hardcoding here (MAL)
 	static const UpgradeTemplate *fanaticismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Fanaticism" );
-	DEBUG_ASSERTCRASH( fanaticismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Fanaticism upgrade not found") );
-	if( player && player->hasUpgradeComplete( fanaticismTemplate ) )
-		fanaticism = TRUE;
+	if (fanaticismTemplate != NULL)
+	{
+		if( player && player->hasUpgradeComplete( fanaticismTemplate ) )
+			fanaticism = TRUE;
+	}
 
 	// are we in a horde
 	HordeUpdateInterface *hui;

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -278,9 +278,15 @@ static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
 	"EXHordeB",//enthusiastic vehicle
 	"EXHordeB_UP", //enthusiastic vehicle with nationalism
 	"EXJunkCrate",//Marks a crate as special
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	"", //dummy entry for TERRAIN_DECAL_NONE
 	"EXHordeC_UP", //enthusiastic with fanaticism
 	"EXChemSuit", //Marks a unit as having chemical suit on
-	"",	//dummy entry for TERRAIN_DECAL_NONE
+#else
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+	"", //dummy entry for TERRAIN_DECAL_NONE
+#endif
 	"" //dummy entry for TERRAIN_DECAL_SHADOW_TEXTURE
 };