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

[Port] Syndicate Implanter / Имплантер Синдиката #78

Merged
merged 3 commits into from
Oct 11, 2024

Conversation

Spatison
Copy link
Member

@Spatison Spatison commented Oct 8, 2024

Описание PR

Порт имплантера синдиката


Изменения

🆑 Spatison

  • add: Added syndicate implanter / Добавлен имплантер синдиката

@Spatison Spatison requested a review from Remuchi October 8, 2024 17:01
@Spatison Spatison self-assigned this Oct 8, 2024
Copy link
Contributor

coderabbitai bot commented Oct 8, 2024

Walkthrough

The pull request introduces new entries and modifications to localization files for both English and Russian languages, specifically for an "Implanter" item in the uplink catalog. It adds new entries for the Implanter and modifies existing entries for the "betrayal knife," which is renamed to "Experimental syndicate teleporter." Additionally, a new entity definition for "ImplanterSyndi" is introduced, along with updates to the uplink catalog and related YAML files.

Changes

File Path Change Summary
Resources/Locale/en-US/_white/store/uplink-catalog.ftl - Added uplink-implanter-name and uplink-implanter-desc for "Implanter".
- Updated name and description for "betrayal knife" to "Experimental syndicate teleporter".
Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl - Added entry for ent-ImplanterSyndi with a description in Russian.
Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl - Added uplink-implanter-name and uplink-implanter-desc for "Имплантер".
Resources/Prototypes/_White/Catalog/uplink_catalog.yml - Added new product listing for UplinkImplanterSyndi with associated details.
- Minor formatting adjustments to existing listings.
Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml - Added new entity definition for ImplanterSyndi, including components and specifications.

Possibly related PRs


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

🧹 Outside diff range and nitpick comments (7)
Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl (1)

1-2: LGTM! Consider adding a name field for consistency.

The localization entry for ImplanterSyndi looks good. The entity is correctly defined, and the description is appropriate for a Russian localization file.

For consistency with other entity definitions, consider adding a separate name field. This would allow for a distinct name to be displayed in-game, separate from the entity ID. Here's a suggested modification:

 ent-ImplanterSyndi = { ent-BaseImplanter }
+    .name = Имплантер Синдиката
     .desc = Компактный одноразовый шприц, предназначенный исключительно для введения и извлечения подкожных имплантатов.

This change would provide more flexibility in how the item is displayed in-game while maintaining the entity relationship.

Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (2)

12-12: Add a newline at the end of the file.

To comply with YAML best practices and resolve the linter warning, please add a newline character at the end of the file.

Apply this change:

      implantTime: 2
+
🧰 Tools
🪛 yamllint

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)


1-12: Consider adding more context about gameplay implications.

While the entity definition is technically sound, it might be helpful to provide more context about how the ImplanterSyndi differs from the standard Implanter in terms of gameplay. Some questions to consider:

  1. Are there specific implants that can only be used with this syndicate version?
  2. How do the draw and implant times of 2 compare to the standard Implanter? Are they faster or slower?
  3. Are there any restrictions or special conditions for using this item in the game?

Adding comments or documentation addressing these points could help other developers and game designers understand the intended use and balance of this new entity.

🧰 Tools
🪛 yamllint

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)

Resources/Locale/en-US/_white/store/uplink-catalog.ftl (2)

Line range hint 6-7: LGTM! Consider minor wording adjustment.

The changes to the "betrayal knife" entry effectively communicate its new functionality as an experimental teleporter. This aligns well with the PR's objective of introducing syndicate-related features.

Consider adjusting the last sentence of the description for clarity:

-uplink-betrayal-knife-desc = Syndicate teleporter, when used, moves 3-8 meters forward. In case of teleportation into a wall, uses emergency teleportation. Has 4 charge.
+uplink-betrayal-knife-desc = Syndicate teleporter, when used, moves 3-8 meters forward. In case of teleportation into a wall, uses emergency teleportation. Has 4 charges.

This small change from "charge" to "charges" improves grammatical correctness.


13-14: LGTM! Consider minor formatting adjustment.

The addition of the Implanter entries aligns perfectly with the PR's objective of porting the syndicate implanter. The name and description are clear and informative.

For consistency with other entries in the file, consider capitalizing the first letter of the description:

-uplink-implanter-desc = An advanced implant that allows you to quickly insert and remove implants.
+uplink-implanter-desc = An advanced implant that allows you to quickly insert and remove implants.

This small change maintains the capitalization style used in other item descriptions.

Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl (1)

13-14: LGTM! Consider a minor wording improvement.

The new entries for the Implanter are well-formatted and consistent with other items in the uplink catalog. The translation is accurate and appropriate for the game context.

A minor suggestion to improve clarity:

Consider changing the description to:

-uplink-implanter-desc = Продвинутый имплантер, позволяющий быстро вкалывать и вытаскивать импланты.
+uplink-implanter-desc = Продвинутое устройство, позволяющее быстро вживлять и извлекать импланты.

This slight rewording maintains the meaning while using more precise terms in Russian for implanting and removing.

Resources/Prototypes/_White/Catalog/uplink_catalog.yml (1)

63-63: Add a newline character at the end of the file

To adhere to common file formatting practices and resolve the yamllint error, please add a newline character at the end of the file.

You can do this by ensuring there's an empty line at the end of the file in your text editor.

🧰 Tools
🪛 yamllint

[warning] 63-63: wrong indentation: expected 4 but found 2

(indentation)


[error] 63-63: no new line character at the end of file

(new-line-at-end-of-file)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 4c2f775 and f142dd1.

📒 Files selected for processing (6)
  • Resources/Locale/en-US/_white/store/uplink-catalog.ftl (1 hunks)
  • Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl (1 hunks)
  • Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl (1 hunks)
  • Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl (0 hunks)
  • Resources/Prototypes/_White/Catalog/uplink_catalog.yml (1 hunks)
  • Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1 hunks)
💤 Files with no reviewable changes (1)
  • Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl
🧰 Additional context used
🪛 yamllint
Resources/Prototypes/_White/Catalog/uplink_catalog.yml

[warning] 63-63: wrong indentation: expected 4 but found 2

(indentation)


[error] 63-63: no new line character at the end of file

(new-line-at-end-of-file)

Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)

🔇 Additional comments (3)
Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1)

1-12: LGTM! The ImplanterSyndi entity is well-defined.

The entity definition for ImplanterSyndi looks good. It properly inherits from the Implanter parent, has a clear description, and includes appropriate components (Item, Sprite, and Implanter) with relevant properties. The use of the same sprite file for both Item and Sprite components ensures visual consistency.

🧰 Tools
🪛 yamllint

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)

Resources/Prototypes/_White/Catalog/uplink_catalog.yml (2)

53-53: LGTM: Improved indentation for saleLimit

The indentation adjustment for the saleLimit field improves code formatting and consistency, aligning with YAML best practices.


Line range hint 1-63: Overall assessment: Good addition with minor formatting improvements needed

The addition of the UplinkImplanterSyndi listing aligns well with the PR objectives. The changes are generally good, introducing the new syndicate implanter to the uplink catalog. A few minor formatting adjustments have been suggested to maintain consistency with the rest of the file.

To summarize the review:

  1. The indentation of the saleLimit field for UplinkBetrayalKnife has been improved.
  2. The new UplinkImplanterSyndi listing has been added successfully.
  3. Minor indentation adjustment is needed for the categories field in the new listing.
  4. Consider adding an icon field to the new listing if applicable.
  5. A newline character should be added at the end of the file.

Once these minor issues are addressed, the changes will be fully consistent with the existing structure and ready for merge.

🧰 Tools
🪛 yamllint

[warning] 52-52: wrong indentation: expected 8 but found 6

(indentation)


[warning] 63-63: wrong indentation: expected 4 but found 2

(indentation)


[error] 63-63: no new line character at the end of file

(new-line-at-end-of-file)

Resources/Prototypes/_White/Catalog/uplink_catalog.yml Outdated Show resolved Hide resolved
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

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

🧹 Outside diff range and nitpick comments (1)
Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1)

12-12: Add a newline at the end of the file.

To adhere to YAML best practices and resolve the static analysis warning, please add a newline at the end of the file.

🧰 Tools
🪛 yamllint

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between f142dd1 and f833893.

📒 Files selected for processing (1)
  • Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1 hunks)
🧰 Additional context used
🪛 yamllint
Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml

[error] 12-12: no new line character at the end of file

(new-line-at-end-of-file)

🔇 Additional comments (1)
Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1)

1-4: Consider updating the description as per previous review.

The entity definition looks good. However, there's a previous suggestion to modify the description slightly. Consider updating it to:

description: A compact disposable syringe exclusively designed for the quick injection and extraction of subdermal implants.

This change adds more specificity to the description, which could be beneficial for players.

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

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between f833893 and fc9248a.

📒 Files selected for processing (5)
  • Resources/Locale/en-US/_white/store/uplink-catalog.ftl (1 hunks)
  • Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl (1 hunks)
  • Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl (1 hunks)
  • Resources/Prototypes/_White/Catalog/uplink_catalog.yml (2 hunks)
  • Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (4)
  • Resources/Locale/en-US/_white/store/uplink-catalog.ftl
  • Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
  • Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
  • Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
🧰 Additional context used
🪛 yamllint
Resources/Prototypes/_White/Catalog/uplink_catalog.yml

[error] 62-62: trailing spaces

(trailing-spaces)


[warning] 63-63: wrong indentation: expected 4 but found 2

(indentation)


[warning] 74-74: wrong indentation: expected 4 but found 2

(indentation)

🔇 Additional comments (1)
Resources/Prototypes/_White/Catalog/uplink_catalog.yml (1)

Line range hint 55-74: Overall assessment: Changes look good with minor improvements suggested

The addition of the UplinkImplanterSyndi listing and the updates to existing entries align well with the PR objectives. The changes maintain the overall structure and consistency of the uplink catalog.

To further improve the code:

  1. Address the indentation issues for the categories fields.
  2. Remove trailing spaces.
  3. Consider adding an icon field for the new listing if applicable.

Once these minor adjustments are made, the changes will be ready for merging.

🧰 Tools
🪛 yamllint

[warning] 52-52: wrong indentation: expected 8 but found 6

(indentation)


[error] 62-62: trailing spaces

(trailing-spaces)


[warning] 63-63: wrong indentation: expected 4 but found 2

(indentation)

@Remuchi Remuchi merged commit c209391 into master Oct 11, 2024
9 of 10 checks passed
@Remuchi Remuchi deleted the syndi-implanter branch October 11, 2024 04:26
riddleridou added a commit that referenced this pull request Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants