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] fix sound vulp + [Port] new customization fox #1054

Merged
merged 1 commit into from
Feb 15, 2025
Merged

Conversation

Gooslik
Copy link
Contributor

@Gooslik Gooslik commented Feb 14, 2025

Описание PR

Испралена невозможность использовать эмоуты рычанья и завыванья. Новые кастомки для лис.

Тип PR

  • Feature
  • Fix
  • Tweak
  • Balance
  • Refactor
  • Port
  • Translate
  • Resprite

Изменения
fix: Исправлена невозможность использовать эмоуты рычанья и завыванья
add: Добавленны новые кастомки для лис

Summary by CodeRabbit

  • Новые возможности
    • Добавлены новые переводы для разнообразных визуальных элементов, таких как стили оформления ушей, живота и лап, что позволяет расширить возможности кастомизации персонажей.
    • Улучшена кастомизация с обновлением анимации хвоста, обеспечивая более динамичное отображение.
    • Разблокированы голосовые эмоции, улучшая взаимодействие в чате.
    • Обновлены визуальные эффекты текстур с расширенным набором анимационных вариантов.

@Gooslik Gooslik requested a review from Rxup as a code owner February 14, 2025 22:19
Copy link
Contributor

coderabbitai bot commented Feb 14, 2025

Walkthrough

В пулл-реквесте внесены изменения в несколько файлов, связанных с настройками визуальных меток и эмотов. В файле локализации добавлены новые записи для описания различных вариантов «Лисьих ушей», «Лисиного живота» и «Лисьих точек» для конечностей. В конфигурации эмотов удалены поля available: false для эмотов "Howl" и "Growl". Конфигурационный файл меток мобов обновлён: изменён идентификатор метки (FoxTailinner → FoxTailinnerAnimated) с корректировкой параметров, а также добавлены новые определения для других меток. Файл meta.json расширен за счёт обновлённой информации об авторских правах и добавления новых состояний спрайтов.

Changes

| Файл | Изменения |

|---------------------------------------------------------------|-----------|
| Resources/Locale/ru-RU/backmen/markings/foxes.ftl | Добавлены новые строки локализации для «Лисьих ушей» (варианты: Койот, Далматин, Фенек, Лиса, Шакал и др.), «Лисиного живота» и «Лисьих точек» для различных частей (руки, ноги, лапы). |
| Resources/Prototypes/Corvax/Voice/speech_emotes.yml | Удалено поле available: false для эмотов "Howl" и "Growl". |
| Resources/Prototypes/_Backmen/…/Customization/Markings/fox_markings.yml | Обновлён идентификатор метки с FoxTailinner на FoxTailinnerAnimated (изменение speciesRestriction и state); добавлены новые определения меток для ушей, живота, лап и ног для HumanoidFoxes. |
| Resources/Textures/Backmen/…/fox_markings.rsi/meta.json | Обновлена информация об авторских правах; добавлены многочисленные новые состояния спрайтов (например, "vulp", "jackal", "wolf", "fennec" и др.) с параметром directions: 4. |

Poem

Я — кролик, прыжком встречаю код,
Где лисьи уши блестят, как звёздный взлёт.
Новые метки в строках весело пестрят,
Эмоты без ограничений прямо заискрят.
В каждой строчке радость, в каждом бите свет —
Пусть обновлённый мир дарит чудесный секрет! 🐇


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@github-actions github-actions bot added S: Untriaged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Feb 14, 2025
Copy link
Contributor

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

Copy link
Contributor

github-actions bot commented Feb 14, 2025

RSI Diff Bot; head commit 6202b97 merging into 19f835a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi

State Old New Status
belly_full Added
coyote Added
dalmatian Added
fennec-inner Added
fennec Added
fox Added
jackal-inner Added
jackal Added
jackal_alt-inner Added
jackal_alt Added
msai-inner Added
msai Added
otie-inner Added
otie Added
points_crest-arms Added
points_crest-legs Added
points_crest Added
points_fade-arms Added
points_fade-legs Added
points_fade Added
points_feet Added
points_hands Added
points_sharp-arms Added
points_sharp-legs Added
points_sharp Added
shock Added
terrier-inner Added
terrier Added
vulp-fade Added
vulp-inner Added
vulp-sharp Added
vulp Added
wolf-inner Added
wolf Added

Edit: diff updated after 6202b97

@Gooslik Gooslik changed the title [Fix] fix sound vulp + [Port] new customization fox + foxpurrs02 [Fix] fix sound vulp + [Port] new customization fox Feb 15, 2025
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

🧹 Nitpick comments (1)
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/fox_markings.yml (1)

216-296: Рассмотрите реорганизацию категорий маркировок.

Для улучшения организации кода предлагаю:

  • Сгруппировать все маркировки по категориям (HeadTop, Chest, Arms, Legs)
  • Добавить комментарии для разделения секций

Пример структуры:

+# Head Markings
- type: marking
  id: FoxesEarFade
  ...

+# Chest Markings
- type: marking
  id: FoxesBellyFull
  ...

+# Limb Markings
- type: marking
  id: FoxesPointsHands
  ...
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 19f835a and 6202b97.

⛔ Files ignored due to path filters (34)
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/belly_full.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/coyote.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/dalmatian.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/fennec-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/fennec.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/fox.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/jackal-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/jackal.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/jackal_alt-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/jackal_alt.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/msai-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/msai.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/otie-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/otie.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_crest-arms.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_crest-legs.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_crest.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_fade-arms.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_fade-legs.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_fade.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_feet.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_hands.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_sharp-arms.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_sharp-legs.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/points_sharp.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/shock.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/terrier-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/terrier.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/vulp-fade.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/vulp-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/vulp-sharp.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/vulp.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/wolf-inner.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/wolf.png is excluded by !**/*.png
📒 Files selected for processing (4)
  • Resources/Locale/ru-RU/backmen/markings/foxes.ftl (1 hunks)
  • Resources/Prototypes/Corvax/Voice/speech_emotes.yml (0 hunks)
  • Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/fox_markings.yml (2 hunks)
  • Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/meta.json (2 hunks)
💤 Files with no reviewable changes (1)
  • Resources/Prototypes/Corvax/Voice/speech_emotes.yml
⏰ Context from checks skipped due to timeout of 300000ms (3)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
🔇 Additional comments (5)
Resources/Locale/ru-RU/backmen/markings/foxes.ftl (1)

2-24: Локализация выполнена корректно!

Все новые записи следуют единому стилю именования и содержат грамматически правильные переводы.

Resources/Textures/Backmen/Mobs/Customization/fox_markings.rsi/meta.json (2)

4-4: Обновлена информация об авторских правах.

Добавлен новый источник контента (ParadiseSS13) с указанием редактора (Floofers).


17-152: Новые состояния спрайтов добавлены корректно.

Все новые состояния:

  • Имеют консистентное количество направлений (4)
  • Соответствуют определениям меток в fox_markings.yml
  • Имеют корректные названия, соответствующие локализации
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/fox_markings.yml (2)

70-79: Проверьте изменения в анимированном хвосте.

Маркировка FoxTailinner заменена на FoxTailinnerAnimated со следующими изменениями:

  • Убрано ограничение по виду (speciesRestriction: [])
  • Обновлены состояния спрайтов для поддержки анимации

Убедитесь, что:

  1. Отсутствие ограничения по виду является намеренным
  2. Новые состояния анимации tail_fox_waggin и tail_fox_inner_waggin присутствуют в ресурсах

81-215: Новые определения ушей добавлены корректно.

Все новые определения для ушей:

  • Имеют корректные идентификаторы
  • Правильно ограничены видом HumanoidFoxes
  • Используют существующие спрайты

@Rxup Rxup merged commit 8cba46c into Rxup:master Feb 15, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. S: Untriaged size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants