Skip to content

[GEN][ZH] Fix nationalism and fanaticism bonuses being applied independent of horde status #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[GEN][ZH] Fix nationalism and fanaticism bonuses being applied independent of horde status #385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5062161
Fix Nationalism and Fanaticism (Patriotism) bonuses being applied reg…
Generalcamo Mar 6, 2025
77f1f81
Apply suggestions from code review
Generalcamo Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4466,20 +4466,24 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
// draw->setTerrainDecal(TERRAIN_DECAL_NONE);

// TheSuperHackers @bugfix @GeneralCamo 06/03/2025 Corrected nationalism being applied regardless of horde status - issue #173
// horde
if( horde )
{
if ( horde ) {
us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );

} // end if
else
// nationalism
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs wrapping in a conditional block so we can merge the fix into the codebase while maintaining compatibility for now, in the future we can remove the compatibility and the fix will be in the code.

#if !RETAIL_COMPATIBLE_CRC
fixed nationalism code here
#endif

block

if (nationalism) {
us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
}
else {
us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
}
}
else {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original nationalism code block needs putting back and wrapping in a

#if RETAIL_COMPATIBLE_CRC
original nationalism code
#endif

block

us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );

// nationalism
if( nationalism )
us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
else
us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
}
// end @bugfix

} // end if
#ifdef ALLOW_DEMORALIZE
Expand Down
44 changes: 24 additions & 20 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4735,27 +4735,31 @@ void AIUpdateInterface::evaluateMoraleBonus( void )
//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
// draw->setTerrainDecal(TERRAIN_DECAL_NONE);

// TheSuperHackers @bugfix @GeneralCamo 06/03/2025 Corrected nationalism being applied regardless of horde status - issue #173
// horde
if( horde )
{
us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );

} // end if
else
us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );

// 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 );
if (horde) {
us->setWeaponBonusCondition(WEAPONBONUSCONDITION_HORDE);

// nationalism
if (nationalism) {
us->setWeaponBonusCondition(WEAPONBONUSCONDITION_NATIONALISM);
} else {
us->clearWeaponBonusCondition(WEAPONBONUSCONDITION_NATIONALISM);
}

// fanaticism
if (fanaticism) {
us->setWeaponBonusCondition(WEAPONBONUSCONDITION_FANATICISM);// FOR THE NEW GC INFANTRY GENERAL
} else {
us->clearWeaponBonusCondition(WEAPONBONUSCONDITION_FANATICISM);
}

} else {
us->clearWeaponBonusCondition(WEAPONBONUSCONDITION_HORDE);
us->clearWeaponBonusCondition(WEAPONBONUSCONDITION_NATIONALISM);
us->clearWeaponBonusCondition(WEAPONBONUSCONDITION_FANATICISM);
}
// end @bugfix



Expand Down