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

Translation and signs #90

Conversation

Gersoon458
Copy link
Contributor

@Gersoon458 Gersoon458 commented Oct 16, 2024

Описание PR

Переводы тайлов и обновление текстур знаков


Изменения

🆑 Gersoon

  • add: translation of tiles/перевод тайлов
  • tweak: sign textures changed/изменены текстуры знаков

Copy link
Contributor

coderabbitai bot commented Oct 16, 2024

Walkthrough

This pull request includes extensive updates to localization files for Russian signs and tiles, introducing new entities, modifying existing descriptions and suffixes, and removing obsolete entities. Additionally, the YAML configuration for random potted plants has been enhanced with specific suffixes, and the metadata for wall mounts has been updated to reflect new states and copyright information.

Changes

File Path Change Summary
Resources/Locale/ru-RU/prototypes/entities/structures/wallmounts/signs/signs.ftl Updated descriptions, suffixes, added new entities, renamed and removed entities, and applied consistent suffixes.
Resources/Locale/ru-RU/tiles/tiles.ftl Added new tile types and modified existing entries, including various colors and diagonal plating.
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml Added new sign entities, updated sprite references, modified state attributes, and streamlined redundant entities.
Resources/Prototypes/_White/Entities/Structures/Furniture/random_potted_plants.yml Updated suffixes for potted plants and adjusted sprite layers for broader state specifications.
Resources/Textures/_White/Structures/Wallmounts/signs.rsi/meta.json Updated copyright information, renamed state, and introduced new directional states with properties.

Possibly related PRs

  • [Fix] Screen / Экран #61: This PR enhances the ability to display Cyrillic characters, which is directly related to the localization changes made in the main PR for Russian signs.

Suggested labels

Changes: YML, Changes: Sprite, Status: Needs Review

Suggested reviewers

  • Remuchi

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

github-actions bot commented Oct 16, 2024

RSI Diff Bot; head commit cb5fdff merging into 8141e99
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
direction_bridge Modified

Resources/Textures/_White/Structures/Wallmounts/signs.rsi

State Old New Status
direction_bar Added
direction_bridge Added
direction_brig Added
direction_chapel Added
direction_chemistry Added
direction_cryo Added
direction_dorms Added
direction_eng Added
direction_evac Added
direction_exam Added
direction_food Added
direction_gravity Added
direction_hop Added
direction_hydro Added
direction_icu Added
direction_janitor Added
direction_library Added
direction_med Added
direction_salvage Added
direction_sci Added
direction_sec Added
direction_solar Added
direction_supply Added
direction_wash Added

Edit: diff updated after cb5fdff

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

🧹 Outside diff range and nitpick comments (5)
Resources/Locale/ru-RU/prototypes/entities/structures/wallmounts/signs/signs.ftl (3)

1-3: Description update for ent-PaintingMonkey

The description has been changed from "Отвергни эволюцию, стань манки." to "Отвергни эволюцию, стань бибизянкой." This change appears to use a more colloquial or playful term "бибизянкой" instead of "манки".

Consider whether this change in terminology aligns with the overall tone and style guide for the game's Russian localization.


Line range hint 80-399: Consistent suffix application

A consistent suffix of "Знак ВД" has been applied to many entities, indicating a standardized labeling for various signs. This change improves overall consistency in the localization.

Consider adding a comment in the file explaining what "ВД" stands for, as it might not be immediately clear to all translators or developers working on the localization.


Line range hint 1-399: Overall consistency in translations and terminology

The changes maintain good consistency in translations and terminology throughout the file. However, there are a few instances where further improvements could be made:

  1. Some entities use "знак" in lowercase (e.g., "знак "бар"") while others use it in uppercase (e.g., "Знак, указывающий на..."). Consider standardizing the capitalization.

  2. The usage of quotation marks is inconsistent. Some entities use them (e.g., знак "бар"), while others don't (e.g., знак вирусология). Consider standardizing the use of quotation marks.

  3. Some descriptions end with a period, while others don't. Consider adding periods to all descriptions for consistency.

Consider addressing these minor inconsistencies to further improve the overall quality and uniformity of the localization.

Resources/Textures/_White/Structures/Wallmounts/signs.rsi/meta.json (1)

633-1064: LGTM: New directional sign states added.

The addition of multiple new directional sign states enhances the variety of signs available in the game. The consistent structure (4 directions, same delay values) for each new state suggests a standardized approach, which is good for maintainability.

However, given the large number of new states (24) and their identical structure, consider the following optimization suggestions:

  1. If possible, implement a more dynamic system for generating these states programmatically to reduce file size and improve maintainability.
  2. If the delay values are always the same (1), consider defining a default value and only specifying delays when they differ from the default.

Here's a conceptual example of how the structure could be optimized:

{
  "directional_signs": [
    "bar", "exam", "icu", "janitor", "food", "hop", "library", "chemistry",
    "eng", "evac", "supply", "bridge", "med", "sci", "sec", "brig",
    "chapel", "hydro", "dorms", "cryo", "gravity", "salvage", "solar", "wash"
  ],
  "directional_sign_template": {
    "directions": 4,
    "delays": [[1], [1], [1], [1]]
  }
}

This approach would require changes in how the game processes this metadata, but it could significantly reduce file size and improve maintainability.

Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml (1)

271-279: New sign entities look good, consider adding documentation for specialized signs.

The newly added sign entities (SignAME, SignArrivals, SignBoxing, etc.) are consistent with the existing structure and align with the PR objectives. They enhance the game's signage system and potentially support new areas or mechanics.

Consider adding comments or documentation for specialized signs like SignAME or SignCryo to explain their specific use cases or the areas they're intended for. This would help other developers understand the purpose of these signs in the game context.

Also applies to: 281-289, 380-388, 390-398, 438-446, 536-544, 566-574, 596-604, 636-644, 684-692, 694-702, 741-749, 751-759, 781-789, 791-799, 881-889, 910-918, 920-928, 1048-1056, 1058-1066, 1078-1086, 1088-1096

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 8141e99 and 0127c2e.

⛔ Files ignored due to path filters (25)
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/check.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_bar.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_bridge.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_brig.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_chapel.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_chemistry.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_cryo.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_dorms.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_eng.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_evac.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_exam.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_food.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_gravity.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_hop.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_hydro.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_icu.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_janitor.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_library.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_med.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_salvage.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_sci.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_sec.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_solar.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_supply.png is excluded by !**/*.png
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/direction_wash.png is excluded by !**/*.png
📒 Files selected for processing (5)
  • Resources/Locale/ru-RU/prototypes/entities/structures/wallmounts/signs/signs.ftl (10 hunks)
  • Resources/Locale/ru-RU/tiles/tiles.ftl (1 hunks)
  • Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml (70 hunks)
  • Resources/Prototypes/_White/Entities/Structures/Furniture/random_potted_plants.yml (1 hunks)
  • Resources/Textures/_White/Structures/Wallmounts/signs.rsi/meta.json (3 hunks)
🧰 Additional context used
🔇 Additional comments (17)
Resources/Locale/ru-RU/tiles/tiles.ftl (1)

129-155: LGTM! New tile translations are consistent and comprehensive.

The new entries for various tile types have been added successfully. The translations maintain consistency with the existing entries in terms of style and grammar. The additions expand the range of available tile types, which aligns with the PR objectives of implementing translations for tiles.

Some notable additions include:

  • Various colored plastic and steel floor tiles
  • Diagonal plating for different orientations
  • New types of linoleum floors
  • Specialized tiles like "bedrock floor" and "asteroid gravel"

These new translations will enhance the localization of the game for Russian-speaking players.

Resources/Prototypes/_White/Entities/Structures/Furniture/random_potted_plants.yml (4)

Line range hint 46-86: LGTM! Improved visual variety for tiny potted plants.

The changes to RandomPottedTinyPlant enhance the entity's visual representation by:

  1. Adding a clear "Tiny Base" suffix for better identification.
  2. Updating the sprite configuration with new states for pot, dirt, and plant.
  3. Expanding the RandomSprite component with more available states, increasing visual variety.

These modifications align well with the PR objective of updating textures and should improve the game's visual diversity.


Line range hint 210-270: LGTM! Consistent improvements for small potted plants.

The changes to RandomPottedSmallPlant mirror the enhancements made to the tiny potted plant:

  1. Addition of a "Small Base" suffix for clear identification.
  2. Updated sprite configuration with new states for pot, dirt, and plant.
  3. Expanded RandomSprite component with more available states, increasing visual variety.

These consistent modifications across different plant sizes demonstrate a systematic approach to improving the game's visual diversity.


Line range hint 88-208: LGTM! Consistent improvements across all pot variants.

The changes to the pot variant entities (tiny, small, and medium) demonstrate a systematic approach to improving the game's visual representation:

  1. Addition of clear suffixes (e.g., "Tiny Pot 1", "Small Pot 2") for all variants, enhancing organization and identification.
  2. Consistent updates to sprite configurations across all pot types and sizes.

These modifications ensure visual consistency and improved clarity throughout the potted plant system. The systematic approach taken here is commendable and aligns well with the PR objectives.

Also applies to: 272-496


Line range hint 1-496: Overall assessment: Excellent improvements to potted plant entities.

This update successfully enhances the visual representation of potted plants in the game:

  1. Consistent addition of suffixes across all entities improves clarity and organization.
  2. Expanded sprite configurations and RandomSprite components increase visual variety.
  3. Systematic approach ensures consistency across different plant sizes and pot types.

These changes align perfectly with the PR objectives of updating textures and should significantly improve the game's visual diversity. Great work on maintaining consistency throughout the file!

Resources/Locale/ru-RU/prototypes/entities/structures/wallmounts/signs/signs.ftl (6)

4-12: Suffix updates for directional signs

The suffixes for several directional sign entities (e.g., ent-BaseSignDirectional, ent-SignDirectionalBar, ent-SignDirectionalSec) have been changed from an empty string to "Указатель". This change improves consistency and provides more context for these signs.


31-33: New directional sign entities added

New entities ent-SignDirectionalExam and ent-SignDirectionalIcu have been added with appropriate descriptions and suffixes. These additions expand the variety of directional signs available in the game.

Also applies to: 64-66


133-135: New entity ent-SignCaptain added

A new entity for the Captain's sign has been added with an appropriate description and suffix.


301-303: Entity rename and description update

The entity ent-SignCanisters has been renamed from "газовые баллоны" to "газовые канистры" with an updated description. This change improves consistency in terminology.


244-246: New entity ent-SignSecurity added

A new entity for the Security sign has been added with an appropriate description and suffix. This addition complements the existing set of department signs.


Line range hint 1-399: Overall assessment of changes

The changes in this file significantly improve the Russian localization for various sign entities. Key improvements include:

  1. Consistent suffix application ("Знак ВД" or "Указатель") for many entities.
  2. Addition of new sign entities to expand variety.
  3. Renaming and description updates to improve clarity and consistency.

These changes will enhance the player experience for Russian-speaking users by providing more consistent and comprehensive translations for in-game signs.

While the changes are generally positive, consider addressing the minor consistency issues mentioned in previous comments to further polish the localization.

Resources/Textures/_White/Structures/Wallmounts/signs.rsi/meta.json (2)

8-8: LGTM: Copyright update is appropriate.

The copyright information has been updated to include attribution for directional signs taken from ss13. This change aligns with good practices for acknowledging sources while maintaining the existing attribution.


371-371: Verify usage of renamed state "check".

The state previously named "kpp" has been renamed to "check". This change appears to be a clarification or standardization of terminology. Please ensure that this change is reflected in any code that references this state to prevent potential bugs.

To verify the usage of the renamed state, run the following script:

✅ Verification successful

Renaming of "kpp" to "check" verified.

All references to the old "kpp" state have been successfully updated to "check" across the codebase, ensuring consistency and preventing potential bugs.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Search for references to the old "kpp" state and the new "check" state

echo "Searching for references to the old 'kpp' state:"
rg --type-add 'code:*.{rs,toml}' --type code '"kpp"' -C 2

echo "Searching for references to the new 'check' state:"
rg --type-add 'code:*.{rs,toml}' --type code '"check"' -C 2

Length of output: 351


Script:

#!/bin/bash
# Description: Search for references to the old "kpp" state and the new "check" state in JSON files

echo "Searching for references to the old 'kpp' state in JSON files:"
rg --type json '"kpp"' -C 2

echo "Searching for references to the new 'check' state in JSON files:"
rg --type json '"check"' -C 2

Length of output: 779


Script:

#!/bin/bash
# Description: Comprehensive search for references to the old "kpp" state and the new "check" state across all file types

echo "Searching for references to the old 'kpp' state across all files:"
rg '"kpp"'

echo "Searching for references to the new 'check' state across all files:"
rg '"check"'

Length of output: 422

Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml (4)

451-452: Updates to existing entities, including SignCargo, look good.

The minor modifications to existing entities, including updated descriptions and state changes, are consistent with the overall update. The change to SignCargo's name and description improves clarity.

These updates align well with the PR objectives of improving translations and updating signs.


Line range hint 271-1096: Excellent consistency in new entity additions.

The newly added sign entities maintain excellent consistency with the existing codebase. They follow the same structure, use identical components, and adhere to established naming conventions. This consistency will facilitate easier maintenance and understanding of the code in the future.

Great job on maintaining code consistency while adding new features!


Line range hint 1-1529: Overall, excellent improvements to the sign system.

The changes in this file significantly enhance the sign system in the game. Key improvements include:

  1. Standardization of sprite references for existing signs.
  2. Addition of numerous new sign entities to expand variety.
  3. Minor updates to existing entities for improved clarity.
  4. Consistent structure and naming conventions maintained throughout.

These modifications align perfectly with the PR objectives of implementing translations for tiles and updating sign textures. The expanded sign variety will likely improve the game's environmental storytelling and navigation.

Great work on this comprehensive update to the sign system!


26-26: Sprite reference standardization looks good.

The update of sprite references to "_White/Structures/Wallmounts/signs.rsi" across multiple entities is consistent and aligns with the PR objectives of updating sign textures. This standardization should improve maintainability.

To ensure all relevant entities have been updated, you can run the following command:

Also applies to: 36-36, 46-46, 56-56, 66-66, 76-76, 86-86, 96-96, 106-106, 116-116, 126-126, 136-136, 146-146, 156-156, 166-166, 176-176, 186-186, 196-196, 206-206, 216-216, 226-226, 236-236, 246-246, 256-256, 268-268, 298-298, 308-308, 318-318, 328-328, 338-338, 348-348, 367-367, 377-377, 425-425, 435-435, 455-455, 465-465, 475-475, 485-485, 513-513, 523-523, 533-533, 553-553, 563-563, 583-583, 593-593, 613-613, 623-623, 633-633, 662-662, 681-681, 711-711, 768-768, 778-778, 808-808, 818-818, 828-828, 838-838, 848-848, 858-858, 868-868, 878-878, 907-907, 937-937, 947-947, 957-957, 967-967, 977-977, 987-987, 1015-1015, 1025-1025, 1035-1035, 1045-1045, 1075-1075, 1105-1105, 1115-1115, 1125-1125, 1280-1280, 1290-1290, 1529-1529

Copy link
Member

@Spatison Spatison left a comment

Choose a reason for hiding this comment

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

Чисто 👍

@DVOniksWyvern DVOniksWyvern merged commit 166532e into WWhiteDreamProject:master Oct 21, 2024
12 checks passed
Spatison pushed a commit that referenced this pull request Oct 21, 2024
This was referenced Oct 23, 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.

3 participants