Skip to content

feat: New Volkite and Bolt weapons HH era#878

Merged
OH296 merged 3 commits intoAdeptus-Dominus:mainfrom
Werwolf-12:Volkite+boltPack
Jun 16, 2025
Merged

feat: New Volkite and Bolt weapons HH era#878
OH296 merged 3 commits intoAdeptus-Dominus:mainfrom
Werwolf-12:Volkite+boltPack

Conversation

@Werwolf-12
Copy link
Copy Markdown
Contributor

Added bolt and volkite weapons from 30k. Main reason for this commit is for me to get used to workflow of the project.

  • Self-descriptive.

Describe your changes/additions

  • Self-descriptive.

What can/needs to be improved/changed

  • Nothing.

Testing done

Tested, sprites, descriptions and stats are all as they should be and work well.

Related things and/or additional context

  • None.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Jun 16, 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

  • New Features

    • Introduced a range of new 30k-era weapons, including Volkite and Bolter variants, each with unique stats and visuals.
    • Added new weapon sprites for Mars pattern Heavy Bolter, Phobos pattern Bolter and Bolt Pistol, Tigris pattern Combi Bolter, and multiple Volkite weapons.
    • Expanded weapon visuals and data to support these new additions.
  • Documentation

    • Added debug notes as comments in the equipment shop item list.

Walkthrough

By the Omnissiah’s will, this update integrates a new arsenal of 30k-era weapons into the system, including Volkite and ancient Bolter variants. Eight new weapon sprites are sanctified, corresponding data entries are inscribed in the project and visual data scripts, and weapon definitions are appended to the global weapon registry. Minimal non-functional comments are added elsewhere.

Changes

Files/Paths Change Summary
ChapterMaster.yyp Added entries for eight new weapon sprite resources.
sprites/spr_weapon_mars_hbolt/...
sprites/spr_weapon_phobos_bolt_pistol/...
sprites/spr_weapon_phobos_bolter/...
sprites/spr_weapon_tigris_combi/...
sprites/spr_weapon_volkite_caliver/...
sprites/spr_weapon_volkite_charger/...
sprites/spr_weapon_volkite_culverin/...
sprites/spr_weapon_volkite_serpenta/...
Added new sprite resource definitions for Mars Heavy Bolter, Phobos Bolter, Phobos Bolt Pistol, Tigris Combi, and four Volkite variants.
scripts/scr_culture_visuals/scr_culture_visuals.gml Appended new weapon visual data entries for the added weapons.
scripts/scr_weapon/scr_weapon.gml Appended new weapon definitions under "30k Weapons" for Volkite and Bolter variants.
objects/obj_shop/Create_0.gml Inserted non-functional debug comments before the Combiflamer item initialisation.

Possibly related PRs

Suggested labels

Size: Huge

Suggested reviewers

  • OH296

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: Warning labels Jun 16, 2025
@OH296 OH296 changed the title @coderabbitai feat: New Volkite and Bolt weapons HH era Jun 16, 2025
@github-actions github-actions bot added the Type: Feature Adds something new label Jun 16, 2025
OH296
OH296 previously approved these changes Jun 16, 2025
@EttyKitty
Copy link
Copy Markdown
Collaborator

I don't really understand why this PR has 700 yy files changed. Hm…

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: 7

♻️ Duplicate comments (1)
sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy (1)

27-30: YYP linkage check

Echoing earlier rites: confirm the culverin sprite is declared inside the project’s .yyp.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 1058fc7 and 1737e03.

⛔ Files ignored due to path filters (16)
  • sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png is excluded by !**/*.png
  • sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png is excluded by !**/*.png
  • sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png is excluded by !**/*.png
  • sprites/spr_weapon_phobos_bolt_pistol/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png is excluded by !**/*.png
  • sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png is excluded by !**/*.png
  • sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png is excluded by !**/*.png
  • sprites/spr_weapon_tigris_combi/7078d58a-3619-44c5-bbe0-4449064aeaa4.png is excluded by !**/*.png
  • sprites/spr_weapon_tigris_combi/layers/7078d58a-3619-44c5-bbe0-4449064aeaa4/c71b0c2f-0e0d-4b9e-aa10-73d13c7796a6.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_caliver/746312be-a5f0-47ac-a783-e19dcde061a8.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_caliver/layers/746312be-a5f0-47ac-a783-e19dcde061a8/7661b2ed-1571-406e-8395-989f5935e303.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_culverin/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_culverin/layers/27b95a4c-b7c0-4f2e-aa03-ece8e4e50432/7e7d708c-6c89-45d1-b800-7d518f4ba3cd.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png is excluded by !**/*.png
  • sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png is excluded by !**/*.png
📒 Files selected for processing (12)
  • ChapterMaster.yyp (2 hunks)
  • objects/obj_shop/Create_0.gml (1 hunks)
  • scripts/scr_culture_visuals/scr_culture_visuals.gml (1 hunks)
  • scripts/scr_weapon/scr_weapon.gml (1 hunks)
  • sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy (1 hunks)
  • sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy (1 hunks)
  • sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy (1 hunks)
  • sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy (1 hunks)
  • sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy (1 hunks)
  • sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy (1 hunks)
  • sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy (1 hunks)
  • sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy (1 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.

  • objects/obj_shop/Create_0.gml
  • scripts/scr_weapon/scr_weapon.gml
  • scripts/scr_culture_visuals/scr_culture_visuals.gml
`**/*.*`: - Having humanly understandable and maintainable code is always the top most priority. - DRY (Don't repeat yourself) principle is also very important. - Ensure that the c...

**/*.*: - Having humanly understandable and maintainable code is always the top most priority.

  • objects/obj_shop/Create_0.gml
  • sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy
  • sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy
  • sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy
  • sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy
  • sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy
  • sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy
  • sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy
  • sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy
  • scripts/scr_weapon/scr_weapon.gml
  • scripts/scr_culture_visuals/scr_culture_visuals.gml
  • ChapterMaster.yyp
`**/*.yy`: - When any script or sprite .yy files are deleted, their paths should also be deleted from the .yyp file, otherwise the game will crash. - When any script or sprite .yy ...

**/*.yy: - When any script or sprite .yy files are deleted, their paths should also be deleted from the .yyp file, otherwise the game will crash.

  • When any script or sprite .yy files are created, their paths should be added to the .yyp file, otherwise they'll fail.
  • sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy
  • sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy
  • sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy
  • sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy
  • sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy
  • sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy
  • sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy
  • sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy
🔇 Additional comments (12)
ChapterMaster.yyp (3)

1663-1663: Asset sanctified: spr_weapon_mars_hbolt
The new sprite entry adheres to naming conventions and correct path placement.


1667-1668: Assets sanctified: spr_weapon_phobos_bolt_pistol & spr_weapon_phobos_bolter
Both entries follow the established sprite naming and are alphabetically positioned.


1699-1703: Assets sanctified: spr_weapon_tigris_combi and Volkite variants
All new Volkite sprite entries are correctly named and ordered within the resource list.

sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy (1)

27-30: Verify YYP registration of the new sprite

The machine-spirits grow angry when a freshly-forged sprite is not referenced in ChapterMaster.yyp. Please confirm that the path

sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy

has been appended to the project file; otherwise the game will refuse to compile.

#!/bin/bash
# Confirm the sprite is declared in the project file
rg -n '"spr_weapon_volkite_caliver"' ChapterMaster.yyp
sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy (1)

27-30: Confirm sprite entry in .yyp

As with the previous resource, ensure this heavy bolter sprite is present in ChapterMaster.yyp; omission leads to a fatal crash at run-time.

sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy (1)

45-49: By the Omnissiah’s decree, we shall audit all weapon‐sprite origin settings for alignment consistency.

#!/bin/bash
echo "— Scanning all weapon sprite .yy files for 'origin' values —"
files=$(find sprites -type f -name "spr_weapon_*.yy")
for f in $files; do
  echo ""
  echo "File: $f"
  rg -n -C1 '"origin"' "$f" || echo "  (no origin field)"
done
scripts/scr_weapon/scr_weapon.gml (1)

4-19: Tag capitalisation & key spelling

The tag "Volkite" is capitalised, whilst existing tags are lower-case ("plasma", "bolt", etc.). If downstream look-ups are case-sensitive this will orphan the new data. Additionally, the key spli is used throughout; ensure that this matches the field expected by combat logic (some legacy code uses spl). Verify both before deployment.

sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy (1)

1-111: Register the sprite path in ChapterMaster.yyp
The Adeptus Mechanicus reminds you that every newly forged .yy asset must be referenced in the project’s .yyp; omission will result in a fatal asset-load failure at runtime. Please verify the path has been appended under resources:.

Additionally, confirm that origin : 0 (top-left) matches the weapon-draw code; most ranged weapons in this repo use a centred origin (9).

sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy (1)

1-111: Path registration + origin check
Repeat the cogitation cycles: ensure the sprite entry is present in ChapterMaster.yyp, else the Omnissiah will not bless the build.
Also verify that origin : 0 is intentional for this weapon class.

sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy (1)

1-111: Same ritual applies: link the sprite and review origin
Confirm the .yy path is recorded in the .yyp, and that origin : 0 aligns with drawing offsets.

sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy (2)

45-50: Mixed origin settings—double-check consistency
Unlike the other new sprites, this resource uses origin : 9 (centre). Validate that the code handling Phobos Bolters expects this pivot, else weapon alignment may drift.


1-111: Ensure .yyp registration
As with the other sprites, add the resource path to ChapterMaster.yyp to avoid loading failures.

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: Huge Type: Feature Adds something new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants