Skip to content

Conversation

@Frost-bit-jpg
Copy link
Contributor

@Frost-bit-jpg Frost-bit-jpg commented Apr 2, 2025

1- Condition for demon worlds not demonic incursion which are temporary and not necessarily demon world hence the unintended behaviour.
2- Made disposition increase universal for all loyalist factions, before it was for inquisition and Ecclesiarchy which made no sense.

Purpose

Purge the heretics without headache.

Describe your changes/additions

Literally and (you.p_type[baid]!="Daemon")
obj_controller.disposition[2] += 5;
obj_controller.disposition[3] += 5;

What can/needs to be improved/changed

A lot Feel free to do so.

Testing done

They didn't shoot me in sight so far

Related things and/or additional context

yes #635 contains the fix but i forgot to make it standalone because i'm lazy also accident.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Apr 2, 2025

Important

Review skipped

Auto incremental reviews are disabled on this repository.

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.

📝 Walkthrough

Summary by CodeRabbit

  • Refactor
    • Enhanced gameplay logic to ensure that penalties affecting loyalty and disposition are conditionally applied.
    • Now, players with a unique character type benefit from exclusions that prevent certain negative impacts, fostering a more balanced gaming experience.

Walkthrough

The update modifies the scr_destroy_planet function by introducing enhanced condition checks on the you.p_type[baid] value. The logic now ensures that if the type is "Daemon", certain penalties are bypassed. Specifically, penalties originally applied to obj_controller.disposition[4] and [5] are now redirected to obj_controller.disposition[2] and [3] when the "Daemon" condition is met. Additional if-statements have been fortified with conditions that check for "Daemon" alongside you.p_owner[baid], you.p_first[baid], and enemy9 to prevent unwanted penalty assignments. A similar safeguard has been integrated into the check for you.p_tyranids[baid]. These alterations refine the control flow to ensure that entities of the "Daemon" type experience a different set of penalties, aligning the logic with the intended game design.

Suggested labels

PR: Fix, Size: Small

Suggested reviewers

  • OH296

🪧 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: Tiny Type: Fix This is a fix for a bug labels Apr 2, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🔭 Outside diff range comments (1)
scripts/scr_destroy_planet/scr_destroy_planet.gml (1)

1-244: 🧹 Nitpick (assertive)

Holistic evaluation of the code indicates appropriate modifications

The alterations to the logic matrices successfully implement the requirements specified in the sacred task document. The binary distinction between daemon worlds and temporary demonic incursions has been correctly established.

However, the function remains bloated and requires additional modularization as hinted by the TODO comment on line 96. I recommend refactoring this function in a future iteration to separate the penalty logic from the planet destruction mechanism.

Consider extracting the disposition and faction status changes into separate functions such as:

  • scr_apply_exterminatus_penalties(planet_type, owner, first)
  • scr_update_faction_relations(planet_type, owner)

This would enhance maintainability and readability, allowing future tech-priests to service this code with greater efficiency.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 56de3f8 and 11ba1be.

📒 Files selected for processing (1)
  • scripts/scr_destroy_planet/scr_destroy_planet.gml (4 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
`**/*.gml`: - Macro constants require a space between the constant name and value. Without it, the compiler will throw an error. I.e. `#macro ARR_body_parts["arm"]` will crash the ...

**/*.gml: - Macro constants require a space between the constant name and value. Without it, the compiler will throw an error. I.e. #macro ARR_body_parts["arm"] will crash the game, because there is no space between the array and the name of the macro.

  • Color codes in the code shouldn't have any spaces in their id. I.e., color code # 80 bf40 will crash the game.
  • scripts/scr_destroy_planet/scr_destroy_planet.gml
`**/*.gml`: - Always suggest adding JSDoc to every function and method that doesn't have it.

**/*.gml: - Always suggest adding JSDoc to every function and method that doesn't have it.

  • scripts/scr_destroy_planet/scr_destroy_planet.gml
`**/*.gml`: - Readability and maintainability are always the top priority throughout the code. - DRY principle is also very important.

**/*.gml: - Readability and maintainability are always the top priority throughout the code.

  • DRY principle is also very important.
  • scripts/scr_destroy_planet/scr_destroy_planet.gml
🔇 Additional comments (2)
scripts/scr_destroy_planet/scr_destroy_planet.gml (2)

97-97: Additional condition guards against illogical penalty application!

The addition of (you.p_type[baid]!="Daemon") creates an appropriate exception in the logic engine. This prevents unwarranted diplomatic penalties when purging daemon worlds that have corrupted Mechanicus holdings. The Machine God approves of this logical optimization.


134-134: Logical safeguard implemented successfully!

The machine spirits are pleased with this correction. Adding the daemon world exception prevents inappropriate disposition penalties when exterminating daemonic corruption from worlds associated with the Ecclesiarchy.

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@MCPO-Spartan-117
Copy link
Contributor

0b345ed

@Frost-bit-jpg
Copy link
Contributor Author

@MCPO-Spartan-117 that's alright i will do the modification

@EttyKitty EttyKitty changed the title fix: Demonworld exterminatus fix: Daemonworld exterminatus disposition hit Apr 5, 2025
@EttyKitty EttyKitty added the Type: Code Style Not affecting how code works, only visual changes label Apr 5, 2025
@EttyKitty EttyKitty merged commit 75844ae into Adeptus-Dominus:main Apr 5, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Small Type: Code Style Not affecting how code works, only visual changes Type: Fix This is a fix for a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants