Skip to content
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.

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

fix: masterable check for modular parts and Pets #663

Merged
merged 4 commits into from
Dec 4, 2024

Conversation

SlayerOrnstein
Copy link
Member

@SlayerOrnstein SlayerOrnstein commented Dec 3, 2024

What did you fix?

Checks masterablity for more complicated parts

For pets there are a lot of items that belong to the Pets category and are also Pet Resources so the regex matches based on the uniquename containing PetPowerSuit, this way we can target certain items in the category without breaking the previous implementation if we were to add Pets to masterableCategories

For Modular parts only certain pieces contribute to mastery

  • Zaws, the grip
  • MOA & Hound, the model
  • Amps, the prism
  • Kit Guns, the chamber
  • K-Drives, the board

Here is a break down of the regex with the unique names I tested against https://regex101.com/r/H7LXrd/1


Reproduction steps


Evidence/screenshot/link to line

Considerations

  • Does this contain a new dependency? No
  • Does this introduce opinionated data formatting or manual data entry? Yes
  • Does this pr include updated data files in a separate commit that can be reverted for a clean code-only pr? Yes
  • Have I run the linter? Yes
  • Is is a bug fix, feature request, or enhancement? Enhancement

Summary by CodeRabbit

  • New Features

    • Enhanced item processing to include more items as masterable based on type or category, particularly components and pets.
    • Improved data structure for masterable categories, allowing for more nuanced evaluations through regex matching.
  • Bug Fixes

    • Adjusted handling of warnings for missing data to improve tracking.
  • Tests

    • Expanded test suite to ensure accurate categorization and integrity of items, enhancing validation logic for masterability.

@SlayerOrnstein SlayerOrnstein requested a review from a team as a code owner December 3, 2024 23:02
Copy link

coderabbitai bot commented Dec 3, 2024

Caution

Review failed

The pull request is closed.

Walkthrough

The changes in this pull request enhance the Parser class in build/parser.mjs, specifically improving item processing and data handling. The applyMasterable method now includes a condition to evaluate items classified as components or pets against a regex pattern for masterable status. Additionally, the structure of the masterableCategories.json file has been modified from an array to an object format, introducing a regex property for enhanced categorization. These updates refine the logic for item categorization and processing while maintaining the overall control flow and structure of existing methods.

Changes

File Change Summary
build/parser.mjs - Updated applyMasterable(item) to include regex checks for components and pets.
config/masterableCategories.json - Changed structure from an array to an object with regex and categories properties.
test/index.spec.mjs - Updated masterable logic to evaluate based on category, type, and unique name using regex.

Possibly related PRs

  • fix: masterable check for modular parts and Pets #663: This PR directly modifies the applyMasterable method in the Parser class in build/parser.mjs, which is the same method updated in the main PR, enhancing the logic for determining item masterability.
  • fix(items): new items #665: Although this PR focuses on adding new items, it is related as it updates the JSON data structure, which may interact with the changes made in the main PR regarding item categorization and masterability.

Suggested labels

Scope: Data

Suggested reviewers

  • Soundofdarkness
  • TobiTenno

Poem

🐰 In the land of code where bunnies play,
The Parser hops with a brand new way.
Masterable items, now clearer to see,
With regex magic and logic refined,
A joyful leap for all items aligned! ✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 770e2d0 and 7c5a834.

📒 Files selected for processing (1)
  • test/index.spec.mjs (1 hunks)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

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

Copy link

@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 and nitpick comments (1)
build/parser.mjs (1)

1076-1078: Consider splitting the complex regex pattern for better maintainability

The current regex pattern combines multiple conditions which may be hard to maintain. Consider splitting it into separate patterns or using constants for better readability.

-      const regex =
-        /^((?=.*Amp)|(?=.*Modular))(?=.*Barrel).*$|^(?=.*Pet)(?=.*Head).*$|PetPowerSuit|PvPVariantTip|^(?=.*Hoverboard)(?=.*Deck).*$/;
+      const MASTERABLE_PATTERNS = {
+        MODULAR_BARREL: /^((?=.*Amp)|(?=.*Modular))(?=.*Barrel).*$/,
+        PET_HEAD: /^(?=.*Pet)(?=.*Head).*$/,
+        PET_POWER_SUIT: /PetPowerSuit/,
+        PVP_VARIANT: /PvPVariantTip/,
+        HOVERBOARD_DECK: /^(?=.*Hoverboard)(?=.*Deck).*$/
+      };
+      
+      item.masterable = Object.values(MASTERABLE_PATTERNS).some(pattern => 
+        pattern.test(item.uniqueName)
+      );
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 36b397e and 3ed775b.

📒 Files selected for processing (1)
  • build/parser.mjs (1 hunks)
🧰 Additional context used
🪛 eslint
build/parser.mjs

[error] 1075-1075: Expected '===' and instead saw '=='.

(eqeqeq)

🪛 GitHub Check: Lint
build/parser.mjs

[failure] 1075-1075:
Expected '===' and instead saw '=='

build/parser.mjs Outdated Show resolved Hide resolved
build/parser.mjs Outdated Show resolved Hide resolved
Copy link
Member

@TobiTenno TobiTenno left a comment

Choose a reason for hiding this comment

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

coderabbit covered my only concern, if you could fix the lint thing, probably good to go

@SlayerOrnstein
Copy link
Member Author

Whoops my bad, was switching between languages

Copy link

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

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 080795f and 770e2d0.

📒 Files selected for processing (2)
  • build/parser.mjs (1 hunks)
  • config/masterableCategories.json (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • build/parser.mjs
🔇 Additional comments (1)
config/masterableCategories.json (1)

3-12: Verify if categories array needs updates for new masterable items

The categories array should be reviewed to ensure it includes all relevant item types mentioned in the PR objectives.

Let's verify if we need categories for the new masterable items:

config/masterableCategories.json Show resolved Hide resolved
@TobiTenno TobiTenno merged commit 51ef3d5 into WFCD:master Dec 4, 2024
10 checks passed
@SlayerOrnstein SlayerOrnstein deleted the fix-masterable branch December 4, 2024 02:41
@coderabbitai coderabbitai bot mentioned this pull request Dec 6, 2024
@wfcd-bot-boi
Copy link
Collaborator

🎉 This PR is included in version 1.1265.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants