Skip to content

chore: Add Generals 1.07 and Zero Hour 1.04 retail game data#2

Open
Stubbjax wants to merge 13 commits intoTheSuperHackers:mainfrom
Stubbjax:add-retail-game-data
Open

chore: Add Generals 1.07 and Zero Hour 1.04 retail game data#2
Stubbjax wants to merge 13 commits intoTheSuperHackers:mainfrom
Stubbjax:add-retail-game-data

Conversation

@Stubbjax
Copy link
Copy Markdown
Contributor

@Stubbjax Stubbjax commented Mar 26, 2026

This change adds Generals 1.07 and Zero Hour 1.04 retail game data. This includes all .ini, .str and .wnd files. The .str data is combined from all available languages into the one generals.str file (and autorun.str for some languages) for each game.

Note: Generals 1.07 is the latest official data patch and gameplay is identical with Generals 1.08. See here for more information.

@Stubbjax Stubbjax self-assigned this Mar 26, 2026
@Stubbjax Stubbjax added Gen Relates to Generals ZH Relates to Zero Hour labels Mar 26, 2026
@xezon
Copy link
Copy Markdown

xezon commented Mar 26, 2026

Zero Hour Patch 1.01 diff loooks unexpected. It adds a lot of new INI files which should have existed in 1.00

@Stubbjax
Copy link
Copy Markdown
Contributor Author

Stubbjax commented Mar 26, 2026

Zero Hour Patch 1.01 diff loooks unexpected. It adds a lot of new INI files which should have existed in 1.00

I also wondered about this and triple-checked, but that is indeed what my INIZH.big file contains with a fresh installation. I also deleted INIZH.big + Rank.ini and Zero Hour still works without it, so I imagine it's pulling the data from Generals.

@xezon
Copy link
Copy Markdown

xezon commented Mar 26, 2026

Ok wow. This change needs to be merged with rebase. Will you add pull id to commits or leave as is?

Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
@Stubbjax Stubbjax force-pushed the add-retail-game-data branch from f5f7ce7 to b5ef554 Compare March 26, 2026 08:33
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
Stubbjax added a commit to Stubbjax/GeneralsGamePatch2 that referenced this pull request Mar 26, 2026
@xezon
Copy link
Copy Markdown

xezon commented Mar 26, 2026

The expected final Generals version is 1.08

@Stubbjax
Copy link
Copy Markdown
Contributor Author

The expected final Generals version is 1.08

The final data patch for Generals is 1.07 though. The version number described in each commit directly corresponds to the changes for that particular version. What do you propose?

@xezon
Copy link
Copy Markdown

xezon commented Mar 26, 2026

Ok so I suspect this means in Generals 1.08 there were only changes not related to STR, WND, INI? It would be good to clarify this somehow as one may think the version is not latest.

@Stubbjax
Copy link
Copy Markdown
Contributor Author

Ok so I suspect this means in Generals 1.08 there were only changes not related to STR, WND, INI? It would be good to clarify this somehow as one may think the version is not latest.

That is correct. See here: https://cnc.fandom.com/wiki/Generals_patch_1.08

How should it be clarified? In the PR description or title?

@xezon
Copy link
Copy Markdown

xezon commented Mar 26, 2026

Yes you can add a second sentence clarifying that it matches 1.08

@xezon
Copy link
Copy Markdown

xezon commented Mar 27, 2026

Update was not pushed.

@Stubbjax
Copy link
Copy Markdown
Contributor Author

Update was not pushed.

You mean add a second sentence to the respective commit and not the PR description?

@xezon
Copy link
Copy Markdown

xezon commented Mar 27, 2026

Yes, so that it is noted in the commit history.

@xezon
Copy link
Copy Markdown

xezon commented Mar 27, 2026

Also, instead of writing "retail game data" perhaps be more specific and say which kind of files are added, because "retail game data" includes way more files than just INI, STR, WND

@Stubbjax Stubbjax force-pushed the add-retail-game-data branch from b5ef554 to 95bc6db Compare March 27, 2026 12:31
DIALOGEVENT:Taunts_BossChi030Subtitle
US: "*Suicide is not a tactic, General"
DIALOGEVENT:Taunts_BossGLA083Subtitle
US: "*Selling off your buildings to fund your army? Hardly seems logical, does it, General"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Something is not right with the diff at chore: Add retail INI, STR and WND data for Zero Hour 1.01. Also the commit after that.

Also I suggest to check the final entries order of generals.str matches the one in GeneralsGamePatch' generals.str, for ease of integrations.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

What is not right? And did we not want to split generals.str into separate files?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The diff looks suspicious. Why does it show so many swapped out lines?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I imagine they added entries which causes the diff look like everything is replaced.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It looks like some entries moved position. The diff shows GUI:Retaliation removed on one line and added to another. It is awful for reviewing the changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gen Relates to Generals ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants