Skip to content
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

Fix mercenary features #260

Merged
merged 1 commit into from May 3, 2024
Merged

Fix mercenary features #260

merged 1 commit into from May 3, 2024

Conversation

JeodC
Copy link
Member

@JeodC JeodC commented May 1, 2024

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

This pull modifies how the game detects mercenary installation. Only Win32 had been properly implemented, and in many cases the registry values the game checked for do not exist. Mercenary must still be present to use the Black Pyro ship in multiplayer.

The source previously only attempted to load hogfiles extra.hog and merc.hog. On CD installations, this file combination is present. However, in digital installations, the file combination is extra1.hog and extra.hog. This pull also correctly detects both combinations.

Fixes #255

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

Tested in windows only. Needs multiplatform testing. If the Mercenary hogfile is loaded, the player should be able to select the Black Pyro at the pilot config screen, provided they have cleared Mercenary Level 2. Also, when using the Black Pyro, the guidebot should be red.

@JeodC JeodC requested review from jcoby and Lgt2x May 1, 2024 18:58
@JeodC JeodC added the needs testing Needs testing to confirm issue or resolution label May 1, 2024
@Lgt2x
Copy link
Collaborator

Lgt2x commented May 1, 2024

How can I test this fix ?

@JeodC
Copy link
Member Author

JeodC commented May 1, 2024

How can I test this fix ?

See the additional comments. You must have cleared Mercenary Level 2. The Black Pyro should then be selectable at the pilot config screen, and on Merc Level 3 (and any level using the Black Pyro), the guidebot should be red.

image

@JeodC
Copy link
Member Author

JeodC commented May 1, 2024

You could try the Debug build too, I think that lets you pick any level at New Game.

@JeodC
Copy link
Member Author

JeodC commented May 3, 2024

Merging this--it has been tested on windows and should, in theory, work the same way on linux and mac. If it does not, separate issues can be opened.

@JeodC JeodC merged commit f7b19d0 into DescentDevelopers:main May 3, 2024
10 checks passed
@JeodC JeodC deleted the mercfix branch May 3, 2024 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs testing Needs testing to confirm issue or resolution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Runtime Issue]: Mercenary game assets confusion
2 participants