Skip to content

feat: Helmets adjustments#434

Merged
OH296 merged 2 commits intoAdeptus-Dominus:mainfrom
EttyKitty:feat/mouth-things
Jan 16, 2025
Merged

feat: Helmets adjustments#434
OH296 merged 2 commits intoAdeptus-Dominus:mainfrom
EttyKitty:feat/mouth-things

Conversation

@EttyKitty
Copy link
Copy Markdown
Collaborator

@EttyKitty EttyKitty commented Jan 16, 2025

Description of changes

  • Adjusted MK6 helmet proportions, to fit the reference images better.
    • Minor width decrease, ear size decrease, faceplate size increase, eye shape change.
  • Adjusted MK7 helmet proportions, to fit the reference images better.
    • Top decal perspective adjustment, faceplate border size increase, tube connectors are colored into helmet color.
  • MK6 now uses mouth variants + two new variants.
  • One new MK8 gorget variant.
  • Fixed mouth variant drawing, by moving the mouth below the head in the draw order.
  • Renamed jaw "mouth_variants" to "variant" for consistency?

Screenshots

Preview:

The old and the new MK7 helmet:
image image
Reference:
image

The old (first image) and the new MK6 helmets:
image image image image
Reference:
image

The new MK8 gorget:
image
image

How have you tested your changes?

  • Compile
  • New game
  • Next turn
  • Space Travel
  • Ground Battle

@github-actions github-actions bot added Area: Sprites Changes to sprites/images or their under-the-hood functionality Type: Feature Adds something new labels Jan 16, 2025
@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai bot commented Jan 16, 2025

Reviewer's Guide by Sourcery

This PR refactors the drawing of Chaplain helmets and introduces a new helmet variant. The MK6 and MK7 helmets have been adjusted to better match reference images. The mouth variants for the MK6 helmet are now used, and two new variants have been added. A new MK8 gorget variant has also been added. A bug with the mouth variant drawing has been fixed by changing the draw order. Finally, the "mouth_variants" data field has been renamed to "variant" for consistency.

File-Level Changes

Change Details Files
Added two new MK6 helmet variants and a new MK8 gorget variant.
  • Added two new frames to the spr_mk6_head_variants sprite.
  • Added a new frame to the spr_mk8_gorget sprite.
  • Updated the animation lengths for both sprites to accommodate the new frames.
sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy
sprites/spr_mk8_gorget/spr_mk8_gorget.yy
Fixed mouth variant drawing by moving the mouth below the head in the draw order.
  • Moved the drawing of mouth_variants after the drawing of the head in scr_draw_unit_image.
scripts/scr_draw_unit_image/scr_draw_unit_image.gml
Renamed "mouth_variants" to "variant" for consistency.
  • Renamed the mouth_variants field to variant in the scr_marine_struct and scr_draw_unit_image scripts.
scripts/scr_draw_unit_image/scr_draw_unit_image.gml
scripts/scr_marine_struct/scr_marine_struct.gml
Adjusted MK6 and MK7 helmet proportions to better fit reference images.
  • Modified the bounding boxes and sprite frames for spr_mk6_head_variants and spr_mk7_head_variants to reflect the new proportions.
sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy
sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy
Added a new sprite for MK6 mouth variants.
  • Created a new sprite spr_mk6_mouth_variants.
  • Added the new sprite to the project in ChapterMaster.yyp.
ChapterMaster.yyp
sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @EttyKitty - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟡 Review instructions: 4 issues found
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@EttyKitty EttyKitty changed the title feat: Wolf-Priest helmet; Chaplain helm drawing refactor feat: Helmets adjustments Jan 16, 2025
@OH296 OH296 merged commit 1bd7de7 into Adeptus-Dominus:main Jan 16, 2025
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Mar 5, 2025

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Summary by CodeRabbit

  • New Features

    • Introduced a new visual asset that expands character facial customisation options.
    • Added extra animation frames and extended sequences for head and gorget visuals, enriching the overall appearance.
  • Refactor

    • Refinements were made to the rendering logic and asset alignment to ensure more consistent and accurate display of character features.

Walkthrough

Salutations, brother. The update provides a suite of modifications to the codebase. A new sprite resource, spr_mk6_mouth_variants, is introduced in the ChapterMaster.yyp file, thereby expanding the available asset list. The drawing logic in scr_draw_unit_image.gml has been adjusted to incorporate this new variant, with a refined method of accessing and rendering the sprite. Additional modifications include a change in the jaw property naming in scr_marine_struct.gml and several updates to sprite files—ranging from bounding box adjustments and layer identifier modifications to new sprite frame additions and sequence length updates. A wholly new file, spr_mk6_mouth_variants.yy, has been provided to define the detailed properties of the new sprite asset. These modifications extend the graphical resource management while maintaining the current operational integrity.

Possibly related PRs

Suggested labels

PR: Fix

Suggested reviewers

  • EttyKitty
  • OH296

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 8fd7bd5 and 8c1adec.

⛔ Files ignored due to path filters (30)
  • sprites/spr_mk6_head_variants/83fc5467-64c1-49f9-8b39-0522440d9284.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/b3f65aab-e87f-4f14-a67d-19dbeac26482.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/layers/83fc5467-64c1-49f9-8b39-0522440d9284/2ed2bff2-7b67-49c4-b839-b015f5737a16.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/layers/b3f65aab-e87f-4f14-a67d-19dbeac26482/2ed2bff2-7b67-49c4-b839-b015f5737a16.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/1936fff1-2221-481b-afee-a2bb2a3607ab.png is excluded by !**/*.png
  • sprites/spr_mk6_head_variants/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/15b22a94-9604-4054-869e-a78662b8ec58.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/79e7c2cf-678c-4a6a-863f-a7530e271840.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/e0baf035-398a-47b0-91c9-fd825a890c94.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/layers/15b22a94-9604-4054-869e-a78662b8ec58/296e51ed-bdec-44f1-8f81-29d86a29184f.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/layers/79e7c2cf-678c-4a6a-863f-a7530e271840/296e51ed-bdec-44f1-8f81-29d86a29184f.png is excluded by !**/*.png
  • sprites/spr_mk6_mouth_variants/layers/e0baf035-398a-47b0-91c9-fd825a890c94/296e51ed-bdec-44f1-8f81-29d86a29184f.png is excluded by !**/*.png
  • sprites/spr_mk7_head_variants/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png is excluded by !**/*.png
  • sprites/spr_mk7_head_variants/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/31eaa179-b017-4aab-891e-b46c3a53257b.png is excluded by !**/*.png
  • sprites/spr_mk7_head_variants/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/f470b20a-870a-42f4-9f20-168ec933590c.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/158ee31a-9f08-4c7d-9e87-fae8d166c376.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/603329e3-8632-4533-b8b4-82b83c307cac.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/d4999c3e-8f41-4b09-ac88-634015b49682.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/158ee31a-9f08-4c7d-9e87-fae8d166c376/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/603329e3-8632-4533-b8b4-82b83c307cac/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
  • sprites/spr_mk8_gorget/layers/d4999c3e-8f41-4b09-ac88-634015b49682/e79fd6c3-148d-41a0-b649-496590b98fdc.png is excluded by !**/*.png
📒 Files selected for processing (7)
  • ChapterMaster.yyp (1 hunks)
  • scripts/scr_draw_unit_image/scr_draw_unit_image.gml (2 hunks)
  • scripts/scr_marine_struct/scr_marine_struct.gml (1 hunks)
  • sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy (4 hunks)
  • sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy (1 hunks)
  • sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy (2 hunks)
  • sprites/spr_mk8_gorget/spr_mk8_gorget.yy (3 hunks)

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

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