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

Replace many Aircraft booleans with FlightDynamics #16685

Merged
merged 4 commits into from Jul 4, 2019

Conversation

@reaperrr
Copy link
Contributor

commented Jun 11, 2019

This PR gets rid of a lot of booleans and two traits in favor of one list of flags that controls aircraft movement behavior, and one enum that controls behavior on becoming idle.

Note 1: Not providing an update rule yet, as I expect at least some flag names to change during review process, also inheritance makes it impossible to set the correct flags on all aircraft so the update rule will be mostly about pointing modders to places that need manual changes.

Note 2: I decided against trying to stuff the idle behavior into FlightDynamics as well, because that would only cause headaches if someone set multiple idle flags.

@reaperrr reaperrr added this to the Next Release milestone Jun 11, 2019

@tovl

This comment has been minimized.

Copy link
Contributor

commented Jun 11, 2019

There are still some references to Aircraft.VTOL in some D2K missions. Specifically, the map-specific rules define VTOL: true for frigates.

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch from 3b4c037 to 82b14ba Jun 11, 2019

@reaperrr reaperrr referenced this pull request Jun 12, 2019

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch from 82b14ba to 2079f7b Jun 14, 2019

@reaperrr reaperrr changed the title Replace many Aircraft booleans/traits with FlightDynamics and IdleBehavior Replace many Aircraft booleans/traits with FlightDynamics Jun 14, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jun 14, 2019

Fixed typo and missing descriptions.

Split IdleBehavior to #16695 for easier and hopefully faster reviewing and merging of this part.

@reaperrr reaperrr changed the title Replace many Aircraft booleans/traits with FlightDynamics Replace many Aircraft booleans with FlightDynamics Jun 14, 2019

None = 0,
MoveIntoShroud = 1,
Slide = 2,
Hover = 4,

This comment has been minimized.

Copy link
@tovl

tovl Jun 15, 2019

Contributor

I thought the plan was to replace this with an IdleSpeed setting?

This comment has been minimized.

Copy link
@reaperrr

reaperrr Jun 16, 2019

Author Contributor

Maybe, but @pchote basically said we shouldn't open the can of worms called idle speed before next release, so if we want FlightDynamics before that, this is needed at least as stop-gap solution.

mods/ts/rules/defaults.yaml Outdated Show resolved Hide resolved

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch from 2079f7b to bc3b024 Jun 29, 2019

@teinarss
Copy link
Contributor

left a comment

LGTM

@abcdefg30

This comment has been minimized.

Copy link
Member

commented Jun 29, 2019

@tovl, @pchote any further comments on the flag names? If that is not the case, I think you are good to go with the update rule @reaperrr.

@tovl

This comment has been minimized.

Copy link
Contributor

commented Jun 29, 2019

no objections from me 👍

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch from bc3b024 to 69f615c Jun 29, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jun 29, 2019

Added (and yes, tested, too) update rule.

@abcdefg30
Copy link
Member

left a comment

This appears to break frigates in D2k.

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch 2 times, most recently from 3d2ff3c to b9bfe16 Jun 30, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jun 30, 2019

Rebased and updated.

@teinarss

This comment has been minimized.

Copy link
Contributor

commented Jul 2, 2019

Frigate works fine now

@pchote

This comment has been minimized.

Copy link
Member

commented Jul 3, 2019

Needs a rebase now.

reaperrr added 4 commits Jun 14, 2019
Replace various Aircraft fields with FlightDynamics
Replaces various booleans with a FlightDynamics flag list.
FlightDynamics yaml changes
Rules updates for official mods.
Remove redundant code from ProductionAirdrop
With the updated Land code, this is now obsolete.

@reaperrr reaperrr force-pushed the reaperrr:FlightDynamics branch from b9bfe16 to 4f0ffd5 Jul 4, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jul 4, 2019

Rebased.

@reaperrr reaperrr removed the PR: Rebase me! label Jul 4, 2019

@abcdefg30 abcdefg30 merged commit da8a353 into OpenRA:bleed Jul 4, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

commented Jul 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.