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

SOS2 Patch - GroundDefenseMode compatibility #3282

Merged

Conversation

Rhinous
Copy link
Contributor

@Rhinous Rhinous commented Jul 18, 2024

Additions

  • Patched ship turrets GroundDefenseMode by creating a new building Building_ShipTurretCE and new verb Verb_ShootShipCE that uses CE logic on the ground while keeping the SOS2 logic for space combat
  • Added a patch that will convert convert any already placed turrets in old saves to the new turret type

Changes

  • Changed holdFire, WarmingUp and CanToggleHoldFire from private to protected in Building_GunTurretCE
  • Updated the load order for SOS2 and the VTE SOS2 addon

References

Reasoning

  • Fixes the remaining incompatibilities between CE and SOS2

Alternatives

  • The patch to fix old saves in Harmony_TurretConversion.cs could be made to use a setting to enable it and be disabled by default
  • Could just disable GroundDefenseMode for ship turrets in XML instead of making new classes to make them compatible

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 Rhinous requested review from a team as code owners July 18, 2024 11:17
Copy link

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

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Jul 18, 2024
@Rhinous Rhinous mentioned this pull request Jul 18, 2024
4 tasks
N7Huntsman
N7Huntsman previously approved these changes Jul 22, 2024
Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

Turrets work in my testing.

Copy link

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

Copy link

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

Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

Shields, torpedoes, and turrets on landed ships all work in my testing.

@Airomeda
Copy link
Contributor

playtested it a bit and there seems to be a noticeable performance impact, otherwise works fine 👍

@N7Huntsman N7Huntsman merged commit a536e77 into CombatExtended-Continued:Development Aug 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants