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.

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

Jump to bottom

SOS2 Patch - Torpedo reloading and Shields #3278

Merged
merged 2 commits into from
Jul 17, 2024
Merged

SOS2 Patch - Torpedo reloading and Shields #3278

merged 2 commits into from
Jul 17, 2024

Conversation

Rhinous
Copy link
Contributor

@Rhinous Rhinous commented Jul 17, 2024

Additions

  • Added support for SOS2 shields to intercept ProjectileCE
  • Created a new project in the solution that can hold all SOS2 patching (Like VF and SRTS patches)

Changes

  • Updated VF and SOS2 Reference assemblies
  • Fixed broken harmony patch allowing pawns to reload torpedo tubes again
  • Moved torpedo patch into the new SOS2 project

References

Links to the associated issues or other related pull requests, e.g.

Reasoning

  • Moving SOS2 patching to its own project keeps things organised
  • SOS2 Shields should block projectiles
  • Old torpedo patch was broken

Alternatives

  • Could keep the patching inside main CE project but then adding more files for patching ground turrets will make that messy

Testing

Check tests you have performed:

  • Compiles without warnings
  • Game runs without errors
  • (For compatibility patches) ...with and without patched mod loaded
  • Playtested a colony (specify how long)

@Rhinous
Move SOS2 patching to its own project
6fdb302 
Add patch for shields to intercept ProjectileCE
@Rhinous Rhinous requested review from a team as code owners July 17, 2024 07:36
@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-9970101416.zip

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Jul 17, 2024
@Rhinous Rhinous mentioned this pull request Jul 17, 2024
Closed
4 tasks
MaxDorob
MaxDorob approved these changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@MaxDorob MaxDorob left a comment

Choose a reason for hiding this comment

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

Looks good

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-9982249802.zip

@N7Huntsman N7Huntsman merged commit 848eec2 into CombatExtended-Continued:Development Jul 17, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxDorob MaxDorob MaxDorob approved these changes

@N7Huntsman N7Huntsman N7Huntsman approved these changes

Assignees
No one assigned
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Error loading SOS2 torpedoes [Patch Request]:SOS2 Ship Shield Do not Intercept CE Projectiles
3 participants
@Rhinous @N7Huntsman @MaxDorob