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

Support for CarpetBombing task #356

Conversation

332fg-raven
Copy link
Contributor

This change allows WWIIBigFormation to use Carpet Bombing task.
Removed duplicate tests for big formation which crept in with PR #351

Copy link
Collaborator

@DanAlbert DanAlbert left a comment

Choose a reason for hiding this comment

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

You've got 3 unrelated PRs in this PR:

  1. Add CarpetBombing
  2. Fix an incorrect Auto value
  3. Delete a duplicate test

I could have merged 2/3 of those if they'd been distinct PRs. It makes things go a lot more smoothly when PRs are split up.

dcs/task.py Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
dcs/task.py Outdated Show resolved Hide resolved
@332fg-raven
Copy link
Contributor Author

@DanAlbert - merge PR #357 first, I'll rebase this and then the tests here will pass.

@332fg-raven 332fg-raven force-pushed the feature/support-for-big-formation-carpet-bombing branch from 69d3199 to d08cd2c Compare January 21, 2024 16:51
@332fg-raven
Copy link
Contributor Author

@DanAlbert - rebased, ready to be merged.

def __eq__(self, other: Any) -> bool:
if isinstance(other, str):
return self.value == other
if isinstance(other, Expend):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Close enough so meh, non-blocking, but for the future just return super().__eq__(other) after doing any custom checks.

# hardcoded parameters are present in .miz file, but not visible in Mission Editor
self.params = {
"altitude": alt_above,
"altitudeEnabled": True if alt_above != CarpetBombing.DEFAULT_ALT else False,
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think this is actually right. I suspect this field is supposed to be "did the caller make a choice, or did they use the default?". This can't distinguish between a chosen altitude of 2000 and a default behavior. For that you need alt_above: int | None = None.

I've also got no idea what the impact of getting this wrong is. Might be just UI behavior in the ME? I won't block on this for now, but for future reference, that's how this thing ought to be written.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Also, fyi, this is just a more verbose way to write "altitudeEnabled": alt_above != CarpetBombing.DEFAULT_ALT

@DanAlbert DanAlbert merged commit 71cb355 into pydcs:master Jan 26, 2024
4 checks passed
@332fg-raven 332fg-raven deleted the feature/support-for-big-formation-carpet-bombing branch January 26, 2024 02:02
Raffson pushed a commit to dcs-retribution/pydcs that referenced this pull request Feb 18, 2024
This change allows WWIIBigFormation to use Carpet Bombing task.
Removed duplicate tests for big formation which crept in with PR pydcs#351
332fg-raven added a commit to 332fg-raven/dcs that referenced this pull request May 20, 2024
This change allows WWIIBigFormation to use Carpet Bombing task.
Removed duplicate tests for big formation which crept in with PR pydcs#351
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants