Skip to content

feat: Merge Purge and Attack Bombard #585

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
Draft
MCPO-Spartan-117 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: Merge Purge and Attack Bombard #585

MCPO-Spartan-117 wants to merge 1 commit into from

Conversation

@MCPO-Spartan-117
Copy link
Contributor

@MCPO-Spartan-117 MCPO-Spartan-117 commented Mar 12, 2025

Purpose of changes

Title.

Describe the solution

By merging.

Testing done

Load game, bombard, purge, attack.

Custom player notes entry

Use the PR title.

  • Kills are heavily nerfed, partly due to capital ships losing a point
  • Ships that don't have marines are missing from the list
  • Ships that don't give any points are in the list

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 12, 2025 •
edited
Loading

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added Size: Huge Type: Feature Adds something new labels Mar 12, 2025
@OH296
Copy link
Collaborator

OH296 commented Mar 12, 2025

why though?

@MCPO-Spartan-117
Copy link
Contributor Author

MCPO-Spartan-117 commented Mar 12, 2025

why though?

Because they share 80% of code and having them separate is annoying to deal with more complex scenarios, plus it will fix https://discord.com/channels/714022226810372107/1336762209900171305 and some more unexpected things, https://discord.com/channels/714022226810372107/714023282780799028/1348417288797294644.

@OH296
Copy link
Collaborator

OH296 commented Mar 12, 2025

ok fair enough i'm not gonna pretend i can actually come up with any god reasons against that logic.

  • first observation would be why kill the bombard option from the planet select screen? if anything i would think it remains a better universal left out of the purge screen and we just come up with some way of telling the player they purge by bombarding the ever loving fuck out of the population if they want?

OH296
OH296 reviewed Mar 12, 2025
View reviewed changes
Copy link
Collaborator

@OH296 OH296 left a comment

Choose a reason for hiding this comment

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

ok fair enough kills a shit load of unwanted spaghetti

scripts/scr_purge_world/scr_purge_world.gml


}
txt1 = choose("Your cruiser and larger ship", "The heavens rumble and thunder as your ship");
Copy link
Collaborator

@OH296 OH296 Mar 12, 2025

Choose a reason for hiding this comment

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

also christ all this shit needs to convert to using a PlanetData instance.

@MCPO-Spartan-117
Copy link
Contributor Author

MCPO-Spartan-117 commented Mar 12, 2025

We could do that, though we'd need to think about where to place it, 4th button is taken by torpedoes and the old recruiting thing.

@OH296
Copy link
Collaborator

OH296 commented Mar 12, 2025 •
edited
Loading

Sure sure, i'm just thinking it could be confusing for the player to know that one of the main options to kill ground forces is hidden in the purge options. So it's less about putting it there as opposed to ensuring clarity
(not to say the game exactly oozes user friendliness as is)

@github-actions
Copy link
Contributor

github-actions bot commented Apr 6, 2025

This PR is marked as stale, because it has been open for 7 days with no activity.

@github-actions github-actions bot added the Status: Stale No activity for more than a week label Apr 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@OH296 OH296 OH296 left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

Size: Huge Status: Stale No activity for more than a week Type: Feature Adds something new

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MCPO-Spartan-117 @OH296