bugfix(module): Fix missing horde condition of Nationalism and Fanaticism weapon bonuses (#1582)

This fix is opt-in by setting Action=HORDE_FIXED in HordeUpdate behavior modules

Author: xezon

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

@@ -565,6 +565,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool hasFanaticism() const;
 	void evaluateMoraleBonus( Bool inHorde, Bool allowNationalism, HordeActionType type );
 	void evaluateNationalismBonusClassic( Bool inHorde, Bool allowNationalism );
+	void evaluateNationalismBonus( Bool inHorde, Bool allowNationalism );
 
 #ifdef ALLOW_DEMORALIZE
 	// demoralization ... what a nifty word to write.

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

@@ -41,17 +41,38 @@ class UpgradeTemplate;
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
+// TheSuperHackers @bugfix xezon 15/09/2025 Adds a new horde action to select a fixed implementation.
+//
+// TheSuperHackers @todo If we want more control over the horde setup, then we need to implement
+// filters for separate weapon bonuses and required upgrades. But adding more behavior modules will
+// be a performance concern. Example INI setup:
+//
+// Behavior = HordeUpdate ModuleTag
+//   Action = NATIONALISM
+//   ;ApplyWeaponBonus = NATIONALISM
+//   UpgradeRequired = Upgrade_Nationalism
+// End
+//
 enum HordeActionType CPP_11(: Int)
 {
-	HORDEACTION_HORDE = 0,
+	HORDEACTION_HORDE, ///< Classic action, applies the Horde bonus correctly, but Nationalism and Fanaticism bonuses are not removed after leaving horde.
+	HORDEACTION_HORDE_FIXED, ///< Applies the Horde, Nationalism and Fanaticism bonuses correctly.
 
-	HORDEACTION_COUNT
+	HORDEACTION_COUNT,
+
+#if RETAIL_COMPATIBLE_CRC
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE,
+#else
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE_FIXED, ///< Does not change unmodified retail game behavior, because all its horde update modules explicitly set Action = HORDE.
+#endif
 };
 
 #ifdef DEFINE_HORDEACTION_NAMES
 static const char *const TheHordeActionTypeNames[] =
 {
 	"HORDE",
+	"HORDE_FIXED",
+
 	NULL
 };
 static_assert(ARRAY_SIZE(TheHordeActionTypeNames) == HORDEACTION_COUNT + 1, "Incorrect array size");

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

@@ -4749,6 +4749,12 @@ void AIUpdateInterface::evaluateMoraleBonus( Bool inHorde, Bool allowNationalism
 	case HORDEACTION_HORDE:
 		evaluateNationalismBonusClassic(inHorde, allowNationalism);
 		break;
+
+#if !RETAIL_COMPATIBLE_CRC
+	case HORDEACTION_HORDE_FIXED:
+		evaluateNationalismBonus(inHorde, allowNationalism);
+		break;
+#endif
 	}
 }
 
@@ -4788,6 +4794,37 @@ void AIUpdateInterface::evaluateNationalismBonusClassic( Bool inHorde, Bool allo
 	}
 }
 
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @bugfix The fixed Nationalism Bonus implementation.
+// Nationalism and Fanaticism are now tied to the horde status.
+// And Fanaticism is no longer dependent on Nationalism.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateNationalismBonus( Bool inHorde, Bool allowNationalism )
+{
+	Object *us = getObject();
+
+	if( inHorde )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+
+		if( allowNationalism && hasNationalism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		}
+
+		if( allowNationalism && hasFanaticism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+	}
+	else
+	{
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+	}
+}
+
 #ifdef ALLOW_DEMORALIZE
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------

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

@@ -121,7 +121,7 @@ HordeUpdateModuleData::HordeUpdateModuleData()
 	, m_alliesOnly(true)
 	, m_exactMatch(false)
 	, m_allowedNationalism(TRUE)
-	, m_action(HORDEACTION_HORDE)
+	, m_action(HORDEACTION_DEFAULT)
 {
 }