-
Notifications
You must be signed in to change notification settings - Fork 84
[GEN][ZH] Fix nationalism and patriotism/fanaticism being applied when not in a horde #1300
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.
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
base: main
Are you sure you want to change the base?
Conversation
There were some formatting issues with this code which i cleaned up to make it easier to understand. I also removed the superfluous comments and code blocks to condense it a bit. |
{ | ||
#else | ||
//TheSuperHackers @bugfix GeneralCamo/Mauller nationalism and fanaticism should only be applied when within a horde | ||
if( horde && nationalism ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This clearly was the original intent/design, BUT we need to make this corrected behavior opt-in in GameData.ini because it is a Controversial change that makes China weaker.
GameData.ini:
WeaponBonus = HORDE RATE_OF_FIRE 150% ;Horded troops fire their weapons 25% faster
WeaponBonus = NATIONALISM RATE_OF_FIRE 125% ;Horded troops with nationalism fire their weapon an additional 25% faster
WeaponBonus = FANATICISM RATE_OF_FIRE 125% ;Horded troops with nationalism fire their weapon an additional 25% faster
So we need to have something like:
HordeWeaponBonus = NATIONALISM RATE_OF_FIRE 125%
HordeWeaponBonus = FANATICISM RATE_OF_FIRE 125%
with
WeaponBonus = HORDE RATE_OF_FIRE 150%
being a HordeWeaponBonus implictly.
That way the code also does not need using RETAIL_COMPATIBLE_CRC.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no evidence that this was "clearly" a design decision or intention. This is contradicted by both the original manual and the in-game description, which states that the bonus applies to horde bonus specifically.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you misread my comment. I am claiming that the intention was that Nationalism was meant to apply to Hordes.
The ini comment is pretty clear on this with
;Horded troops with nationalism fire their weapon an additional 25% faster
Also as you said the tooltip is clear on this:
CONTROLBAR:TooltipChinaUpgradeNationalism
"+25% to Horde bonus for Red Guard, Tank Hunter and Battlemaster"
And the terrain decal of the Nationalism Horde is also clear on this:

Still, this change is controversial, because it significantly affects gameplay and therefore needs to be treated with care.
This PR is an alternate / updated implementation of an earlier orphaned PR
This PR cleans up some of the code and prevents unlocked horde bonuses being applied when affected units are not within a horde.
Currently when nationalism is unlocked it gets blanket applied to all units regardless of horde status, this affects generals and zero hour.
For zero hour as an extension of nationalism being applied, the patriotism/fanaticism upgrade also gets blanket applied regardless of horde status.