Skip to content

[GEN][ZH] Fix hacking hackers packing and unpacking when told to hack the internet as part of a group #399

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

andrew-2e128
Copy link

@andrew-2e128 andrew-2e128 commented Mar 9, 2025

for Both Generals & Generals ZH

This causes mismatch with anyone who does not have the patch.

@xezon xezon added Bug Something is not working right, typically is user facing China Affects China faction Minor Severity: Minor < Major < Critical < Blocker GameMismatchWith104 Affects game state towards original 1.04 labels Mar 9, 2025
Copy link

@Mauller Mauller left a comment

Choose a reason for hiding this comment

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

So this does what is intended, it could do with being rebased with main

@@ -131,6 +131,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
if (!isAllowedToRespondToAiCommands(parms))
return;

// TheSuperHackers @bugfix andrew-2e128 07/03/2025 Hackers pack and unpack unnecessary when selected in a group fixed. - issue #223
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 #if !RETAIL_COMPATIBLE_CRC block

@@ -131,6 +131,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
if (!isAllowedToRespondToAiCommands(parms))
return;

// TheSuperHackers @bugfix andrew-2e128 07/03/2025 Hackers pack and unpack unnecessary when selected in a group fixed. - issue #223
if (parms->m_cmd == AICMD_HACK_INTERNET)
Copy link

Choose a reason for hiding this comment

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

These could also be condensed into a single if statement

@Mauller Mauller added NoRetail This fix or change is not applicable with Retail game compatibility and removed China Affects China faction GameMismatchWith104 Affects game state towards original 1.04 labels Jul 12, 2025
@Mauller Mauller changed the title Hackers pack and unpack unnecessary when selected in a group fixed. Issue #223 [GEN][ZH] Fix hacking hackers packing and unpacking when told to hack the internet as part of a group Jul 12, 2025
@Mauller Mauller added Gen Relates to Generals ZH Relates to Zero Hour labels Jul 12, 2025
@andrew-2e128 andrew-2e128 force-pushed the the-super-hacker-fixes branch from 514b819 to e665fd7 Compare July 12, 2025 23:46
@@ -126,6 +126,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
if (!isAllowedToRespondToAiCommands(parms))
return;

// TheSuperHackers @bugfix andrew-2e128 07/03/2025 Hackers pack and unpack unnecessary when selected in a group fixed. - issue #223
Copy link

Choose a reason for hiding this comment

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

The wording here also needs fixing up along the lines of

"prevent hacking hackers packing and unpacking when told to hack the internet as part of a group selection"

@Mauller
Copy link

Mauller commented Jul 13, 2025

The other points still need addressing, we have taken measures to allow fixes to be merged that are not retail compatible by wrapping them in a conditional statement. This way fixes can be merged without affecting retail compatibility till we decide to break it.

So the above points still need addressing like bellow

#if !RETAIL_COMPATIBLE_CRC
if (parms->m_cmd == AICMD_HACK_INTERNET && ( getStateMachine()->getCurrentStateID() == HACK_INTERNET || getStateMachine()->getCurrentStateID() == UNPACKING ) )
	{
		return;
	}
#endif

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is not working right, typically is user facing Gen Relates to Generals Minor Severity: Minor < Major < Critical < Blocker NoRetail This fix or change is not applicable with Retail game compatibility ZH Relates to Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

China Hackers pack and unpack unnecessarily when ordered to hack in a group
3 participants