Skip to content

feat: Force Sword sprite by [DARK] Jeffro#909

Merged
OH296 merged 1 commit intoAdeptus-Dominus:mainfrom
CassieCaster:Force-Sword-Update
Jul 11, 2025
Merged

feat: Force Sword sprite by [DARK] Jeffro#909
OH296 merged 1 commit intoAdeptus-Dominus:mainfrom
CassieCaster:Force-Sword-Update

Conversation

@CassieCaster
Copy link
Copy Markdown
Contributor

Purpose and Description

Adds the new force sword sprite by [DARK] Jeffro instead of letting force swords just look like power swords.

Testing done

I did test the sprites, it works. Never used Github Desktop before though. I hope nothing else snuck in.

Related things and/or additional context

None.

I did test the sprites, it works.
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Jul 11, 2025

📝 Walkthrough

Summary by CodeRabbit

  • New Features
    • Introduced a new sprite for the "Force Sword" weapon.
  • Enhancements
    • Updated the visual appearance of the "Force Sword" weapon to use the new sprite.

Walkthrough

By the Omnissiah’s will, the project manifest has been updated to include a new sprite resource: spr_weapon_frcsword. The visual data script now references this sprite for the "Force Sword" weapon variant, and the corresponding sprite definition has been sanctified within the sprites directory.

Changes

Files/Paths Change Summary
ChapterMaster.yyp Updated project version; added resource entry for spr_weapon_frcsword.
scripts/scr_culture_visuals/scr_culture_visuals.gml Changed "Force Sword" variant sprite from spr_weapon_powswo to spr_weapon_frcsword in weapon visual data.
sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy Added new sprite resource: spr_weapon_frcsword with full GameMaker sprite configuration.

Possibly related PRs

Suggested labels

Type: Feature, Area: Sprites, Size: Small


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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @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 Area: Sprites Changes to sprites/images or their under-the-hood functionality Size: Small Type: Feature Adds something new labels Jul 11, 2025
Copy link
Copy Markdown
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

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4e55878 and 16db8e0.

⛔ Files ignored due to path filters (2)
  • sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png is excluded by !**/*.png
  • sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png is excluded by !**/*.png
📒 Files selected for processing (3)
  • ChapterMaster.yyp (2 hunks)
  • scripts/scr_culture_visuals/scr_culture_visuals.gml (1 hunks)
  • sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy (1 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.gml

Instructions used from:

Sources:
⚙️ CodeRabbit Configuration File

**/*.*

Instructions used from:

Sources:
⚙️ CodeRabbit Configuration File

**/*.yy

Instructions used from:

Sources:
⚙️ CodeRabbit Configuration File

🧠 Learnings (4)
📓 Common learnings
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#647
File: scripts/scr_en_weapon/scr_en_weapon.gml:24-928
Timestamp: 2025-03-29T10:30:25.598Z
Learning: A data-driven approach for weapon management in `scripts/scr_en_weapon/scr_en_weapon.gml` is planned for a future PR, not within the scope of PR #647.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
Learnt from: OH296
PR: Adeptus-Dominus/ChapterMaster#474
File: sprites/spr_marksmans_honor/spr_marksmans_honor.yy:47-52
Timestamp: 2025-02-27T02:17:54.527Z
Learning: The sprite "spr_marksmans_honor" is not used for animation despite having multiple frames - these frames represent different static states used in different contexts.
scripts/scr_culture_visuals/scr_culture_visuals.gml (4)
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#647
File: scripts/scr_en_weapon/scr_en_weapon.gml:24-928
Timestamp: 2025-03-29T10:30:25.598Z
Learning: A data-driven approach for weapon management in `scripts/scr_en_weapon/scr_en_weapon.gml` is planned for a future PR, not within the scope of PR #647.
Learnt from: OH296
PR: Adeptus-Dominus/ChapterMaster#474
File: sprites/spr_marksmans_honor/spr_marksmans_honor.yy:47-52
Timestamp: 2025-02-27T02:17:54.527Z
Learning: The sprite "spr_marksmans_honor" is not used for animation despite having multiple frames - these frames represent different static states used in different contexts.
sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy (4)
Learnt from: OH296
PR: Adeptus-Dominus/ChapterMaster#474
File: sprites/spr_marksmans_honor/spr_marksmans_honor.yy:47-52
Timestamp: 2025-02-27T02:17:54.527Z
Learning: The sprite "spr_marksmans_honor" is not used for animation despite having multiple frames - these frames represent different static states used in different contexts.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#647
File: scripts/scr_en_weapon/scr_en_weapon.gml:24-928
Timestamp: 2025-03-29T10:30:25.598Z
Learning: A data-driven approach for weapon management in `scripts/scr_en_weapon/scr_en_weapon.gml` is planned for a future PR, not within the scope of PR #647.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
ChapterMaster.yyp (10)

undefined

<retrieved_learning>
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#0
File: :0-0
Timestamp: 2025-03-20T22:22:57.319Z
Learning: In the ChapterMaster game PR #424, the combat log was expanded to display up to 24 messages instead of 8, providing more detailed battle information.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#0
File: :0-0
Timestamp: 2025-03-20T22:22:57.319Z
Learning: In the ChapterMaster game PR #424, the psychic power system was changed to be data-driven, with perils now able to occur on both successful and failed casts but with reduced frequency overall.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: #878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: #878
File: scripts/scr_culture_visuals/scr_culture_visuals.gml:1256-1352
Timestamp: 2025-06-16T17:12:13.045Z
Learning: In scripts/scr_culture_visuals/scr_culture_visuals.gml, the weapon visual data declarations contain known DRY violations that are acknowledged by the development team but deferred to future refactoring efforts rather than addressed in individual feature PRs.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: #647
File: scripts/scr_en_weapon/scr_en_weapon.gml:24-928
Timestamp: 2025-03-29T10:30:25.598Z
Learning: A data-driven approach for weapon management in scripts/scr_en_weapon/scr_en_weapon.gml is planned for a future PR, not within the scope of PR #647.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#0
File: :0-0
Timestamp: 2025-04-05T20:58:21.881Z
Learning: In the ChapterMaster game, there's a need to refactor hardcoded item effects and move them to a "specials" property of items, following the pattern established with the combi_tool special. This improves code maintainability and makes effects more explicit in item definitions.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: Adeptus-Dominus/ChapterMaster#0
File: :0-0
Timestamp: 2025-04-05T20:58:21.881Z
Learning: In the ChapterMaster game, there's a need to refactor hardcoded item effects and move them to a "specials" property of items, following the pattern established with the combi_tool special. This improves code maintainability and makes effects more explicit in item definitions.
</retrieved_learning>

<retrieved_learning>
Learnt from: EttyKitty
PR: #474
File: sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy:52-53
Timestamp: 2025-02-24T17:43:59.846Z
Learning: In the ChapterMaster codebase, sprite files with multiple frames are often used as separate sprites rather than animations, making playback speed settings irrelevant.
</retrieved_learning>

<retrieved_learning>
Learnt from: MCPO-Spartan-117
PR: #514
File: scripts/scr_specialist_training/scr_specialist_training.gml:321-327
Timestamp: 2025-02-25T13:20:39.523Z
Learning: For the ChapterMaster project, the developer prefers to keep magic numbers directly in the code without extracting them to named variables when they're only used once.
</retrieved_learning>

<retrieved_learning>
Learnt from: OH296
PR: #474
File: sprites/spr_marksmans_honor/spr_marksmans_honor.yy:47-52
Timestamp: 2025-02-27T02:17:54.527Z
Learning: The sprite "spr_marksmans_honor" is not used for animation despite having multiple frames - these frames represent different static states used in different contexts.
</retrieved_learning>

🔇 Additional comments (3)
sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy (1)

1-3: Manifest Entry Verified
The data-sigil for spr_weapon_frcsword is present exactly once in ChapterMaster.yyp (line 1689) with no duplicate GUIDs. Asset registration is correct—no further action required.

ChapterMaster.yyp (2)

578-579: Cogitator-note: IDE version bump confirmed.
The jump to 2024.1400.0.841 aligns with the current stable release of GMS 2024. No discrepancies detected.


1688-1690: Force Sword sprite integration scan complete
By the Omnissiah’s grace, no references to spr_weapon_frcsword or spr_weapon_powswo were found in GML scripts or YY resources outside their own sprite definitions.

Next rites to conclude integration:

  • Verify texture-group placement in ChapterMaster.yyp to respect page budgets in memory-critical builds.
  • Ensure no double-mapping in data tables—the legacy spr_weapon_powswo remains defined but unreferenced.

@OH296 OH296 merged commit a98a498 into Adeptus-Dominus:main Jul 11, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: Sprites Changes to sprites/images or their under-the-hood functionality Size: Small Type: Feature Adds something new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants