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] CaptainDrobe Next #954

Closed
wants to merge 2 commits into from
Closed

Conversation

PvrG
Copy link
Contributor

@PvrG PvrG commented Nov 27, 2024

  • [Port] CaptainDrobe

  • remove delta-v boots

Описание PR

Медиа

Тип PR

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

Изменения

Summary by CodeRabbit

Примечания к выпуску

  • Новые функции

    • Добавлены системы управления картами, включая визуализацию колод, рук и отдельные карты.
    • Введен новый интерфейс RadialMenu для отображения карт в радиальном формате.
    • Реализованы функции для переворота карт, объединения колод и управления взаимодействиями с картами.
  • Исправления ошибок

    • Улучшена обработка событий для синхронизации состояния карт между клиентом и сервером.
  • Документация

    • Обновлены локализационные строки для поддержки русского языка, включая действия с картами и названия карт.

* [Port] CaptainDrobe

* remove delta-v boots
@PvrG PvrG requested a review from Rxup as a code owner November 27, 2024 14:13
Copy link
Contributor

coderabbitai bot commented Nov 27, 2024

Caution

Review failed

The pull request is closed.

Walkthrough

В этом пулл-запросе добавлены новые классы и компоненты для управления картами в игре, включая системы для карт, колод и рук. Реализованы механизмы для инициализации, обновления и визуализации карт, а также взаимодействия с пользовательским интерфейсом. Кроме того, добавлены новые локализации на русском языке и аудиофайлы для различных действий с картами. Изменения также включают обновления метаданных для текстур и конфигураций объектов, что улучшает общее взаимодействие и визуальное представление в игре.

Changes

Файл Изменения
Content.Client/_CorvaxNext/Cards/Card/CardSystem.cs Добавлен класс CardSystem, управляющий инициализацией и обновлением спрайтов карт.
Content.Client/_CorvaxNext/Cards/CardSpriteSystem.cs Добавлен класс CardSpriteSystem, отвечающий за визуализацию стеков карт.
Content.Client/_CorvaxNext/Cards/Deck/CardDeckSystem.cs Добавлен класс CardDeckSystem, управляющий визуализацией колод карт.
Content.Client/_CorvaxNext/Cards/Hand/CardHandSystem.cs Добавлен класс CardHandSystem, управляющий визуализацией руки карт игрока.
Content.Client/_CorvaxNext/Cards/Hand/UI/CardHandMenu.xaml Добавлен новый UI-компонент RadialMenu для отображения руки карт.
Content.Client/_CorvaxNext/Cards/Hand/UI/CardHandMenu.xaml.cs Добавлен класс CardHandMenu, расширяющий RadialMenu для отображения карт.
Content.Client/_CorvaxNext/Cards/Hand/UI/CardHandMenuBoundUserInterface.cs Добавлен класс CardHandMenuBoundUserInterface для управления взаимодействием с UI.
Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs Изменен модификатор доступа метода FillStorage с private на public.
Content.Server/_CorvaxNext/OpenTriggeredStorageFill/OpenTriggeredStorageFillComponent.cs Добавлен компонент OpenTriggeredStorageFillComponent для вставки предметов в контейнер.
Content.Server/_CorvaxNext/OpenTriggeredStorageFill/OpenTriggeredStorageFillSystem.cs Добавлен класс OpenTriggeredStorageFillSystem, управляющий вставкой предметов в хранилище.
Content.Shared/_CorvaxNext/Cards/Card/CardComponent.cs Добавлен класс CardComponent, представляющий карту с функцией переворота.
Content.Shared/_CorvaxNext/Cards/Card/CardSystem.cs Добавлен класс CardSystem для управления картами в игре.
Content.Shared/_CorvaxNext/Cards/Deck/CardDeckComponent.cs Добавлен класс CardDeckComponent, представляющий колоду карт.
Content.Shared/_CorvaxNext/Cards/Deck/CardDeckSystem.cs Добавлен класс CardDeckSystem для управления колодами карт.
Content.Shared/_CorvaxNext/Cards/Hand/CardHandComponent.cs Добавлен класс CardHandComponent, представляющий руку карт.
Content.Shared/_CorvaxNext/Cards/Hand/CardHandSystem.cs Добавлен класс CardHandSystem для управления рукой карт.
Content.Shared/_CorvaxNext/Cards/Stack/CardStackComponent.cs Добавлен класс CardStackComponent для управления стеком карт.
Content.Shared/_CorvaxNext/Cards/Stack/CardStackSystem.cs Добавлен класс CardStackSystem для управления взаимодействиями со стеком карт.
Resources/Audio/_CorvaxNext/Effects/Cards/attributions.yml Добавлен файл конфигурации для аудиоресурсов, связанных с картами.
Resources/Locale/ru-RU/_corvaxnext/cards/cards.ftl Добавлены новые строки локализации для действий с картами на русском языке.
Resources/Prototypes/_CorvaxNext/Entities/Clothing/... Добавлены новые сущности для одежды и аксессуаров.
Resources/Prototypes/_CorvaxNext/Entities/Structures/Machines/vending_machines.yml Добавлен новый автомат CaptainDrobe с инвентарем.
Resources/Textures/... Добавлены новые метаданные для текстур одежды и других объектов.

Poem

В мире карт, где фишки в игре,
Новые правила, как в сказке, везде.
Система рук и колод теперь,
Визуализация — радость для всех, поверь!
Кролик прыгает, с картами в руках,
Играй и веселись, смех — наш успех! 🐇✨

Warning

Rate limit exceeded

@github-actions[bot] has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 5 minutes and 50 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 7d0a9a6 and 64554cf.


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.

@github-actions github-actions bot added size/L S: Untriaged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: No C# and removed S: Untriaged size/L labels Nov 27, 2024
Copy link
Contributor

github-actions bot commented Nov 27, 2024

RSI Diff Bot; head commit 64554cf merging into 7d0a9a6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CorvaxNext/Clothing/Belt/sheriff_sheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/_CorvaxNext/Clothing/Belt/white_sheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/_CorvaxNext/Clothing/Hands/sheriff_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Hands/white_captain_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/sheriff_beret.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/sheriff_capcap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/white_beret.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/white_capcap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/royal_captain.rsi

State Old New Status
equipped-NECK-reptilian Added
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/syndicate_admiral.rsi

State Old New Status
equipped-NECK-reptilian Added
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/white_captain_mantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/wide_captain_cloak.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpskirt/white_captain.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/captain_command.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/captain_white.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/sheriff.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CorvaxNext/Objects/Misc/cards.rsi

State Old New Status
black_box Added
black_box_open Added
black_hand1 Added
black_hand2 Added
black_hand3 Added
black_hand4 Added
black_hand5 Added
black_joker Added
deck_black_empty Added
deck_black_full Added
deck_black_half Added
deck_black_low Added
deck_nanotrasen_empty Added
deck_nanotrasen_full Added
deck_nanotrasen_half Added
deck_nanotrasen_low Added
deck_syndicate_empty Added
deck_syndicate_full Added
deck_syndicate_half Added
deck_syndicate_low Added
nanotrasen_box Added
nanotrasen_box_open Added
nanotrasen_hand1 Added
nanotrasen_hand2 Added
nanotrasen_hand3 Added
nanotrasen_hand4 Added
nanotrasen_hand5 Added
nanotrasen_joker Added
sc_10_of_Clubs_black Added
sc_10_of_Clubs_nanotrasen Added
sc_10_of_Clubs_syndicate Added
sc_10_of_Diamonds_black Added
sc_10_of_Diamonds_nanotrasen Added
sc_10_of_Diamonds_syndicate Added
sc_10_of_Hearts_black Added
sc_10_of_Hearts_nanotrasen Added
sc_10_of_Hearts_syndicate Added
sc_10_of_Spades_black Added
sc_10_of_Spades_nanotrasen Added
sc_10_of_Spades_syndicate Added
sc_2_of_Clubs_black Added
sc_2_of_Clubs_nanotrasen Added
sc_2_of_Clubs_syndicate Added
sc_2_of_Diamonds_black Added
sc_2_of_Diamonds_nanotrasen Added
sc_2_of_Diamonds_syndicate Added
sc_2_of_Hearts_black Added
sc_2_of_Hearts_nanotrasen Added
sc_2_of_Hearts_syndicate Added
sc_2_of_Spades_black Added
sc_2_of_Spades_nanotrasen Added
sc_2_of_Spades_syndicate Added
sc_3_of_Clubs_black Added
sc_3_of_Clubs_nanotrasen Added
sc_3_of_Clubs_syndicate Added
sc_3_of_Diamonds_black Added
sc_3_of_Diamonds_nanotrasen Added
sc_3_of_Diamonds_syndicate Added
sc_3_of_Hearts_black Added
sc_3_of_Hearts_nanotrasen Added
sc_3_of_Hearts_syndicate Added
sc_3_of_Spades_black Added
sc_3_of_Spades_nanotrasen Added
sc_3_of_Spades_syndicate Added
sc_4_of_Clubs_black Added
sc_4_of_Clubs_nanotrasen Added
sc_4_of_Clubs_syndicate Added
sc_4_of_Diamonds_black Added
sc_4_of_Diamonds_nanotrasen Added
sc_4_of_Diamonds_syndicate Added
sc_4_of_Hearts_black Added
sc_4_of_Hearts_nanotrasen Added
sc_4_of_Hearts_syndicate Added
sc_4_of_Spades_black Added
sc_4_of_Spades_nanotrasen Added
sc_4_of_Spades_syndicate Added
sc_5_of_Clubs_black Added
sc_5_of_Clubs_nanotrasen Added
sc_5_of_Clubs_syndicate Added
sc_5_of_Diamonds_black Added
sc_5_of_Diamonds_nanotrasen Added
sc_5_of_Diamonds_syndicate Added
sc_5_of_Hearts_black Added
sc_5_of_Hearts_nanotrasen Added
sc_5_of_Hearts_syndicate Added
sc_5_of_Spades_black Added
sc_5_of_Spades_nanotrasen Added
sc_5_of_Spades_syndicate Added
sc_6_of_Clubs_black Added
sc_6_of_Clubs_nanotrasen Added
sc_6_of_Clubs_syndicate Added
sc_6_of_Diamonds_black Added
sc_6_of_Diamonds_nanotrasen Added
sc_6_of_Diamonds_syndicate Added
sc_6_of_Hearts_black Added
sc_6_of_Hearts_nanotrasen Added
sc_6_of_Hearts_syndicate Added
sc_6_of_Spades_black Added
sc_6_of_Spades_nanotrasen Added
sc_6_of_Spades_syndicate Added
sc_7_of_Clubs_black Added
sc_7_of_Clubs_nanotrasen Added
sc_7_of_Clubs_syndicate Added
sc_7_of_Diamonds_black Added
sc_7_of_Diamonds_nanotrasen Added
sc_7_of_Diamonds_syndicate Added
sc_7_of_Hearts_black Added
sc_7_of_Hearts_nanotrasen Added
sc_7_of_Hearts_syndicate Added
sc_7_of_Spades_black Added
sc_7_of_Spades_nanotrasen Added
sc_7_of_Spades_syndicate Added
sc_8_of_Clubs_black Added
sc_8_of_Clubs_nanotrasen Added
sc_8_of_Clubs_syndicate Added
sc_8_of_Diamonds_black Added
sc_8_of_Diamonds_nanotrasen Added
sc_8_of_Diamonds_syndicate Added
sc_8_of_Hearts_black Added
sc_8_of_Hearts_nanotrasen Added
sc_8_of_Hearts_syndicate Added
sc_8_of_Spades_black Added
sc_8_of_Spades_nanotrasen Added
sc_8_of_Spades_syndicate Added
sc_9_of_Clubs_black Added
sc_9_of_Clubs_nanotrasen Added
sc_9_of_Clubs_syndicate Added
sc_9_of_Diamonds_black Added
sc_9_of_Diamonds_nanotrasen Added
sc_9_of_Diamonds_syndicate Added
sc_9_of_Hearts_black Added
sc_9_of_Hearts_nanotrasen Added
sc_9_of_Hearts_syndicate Added
sc_9_of_Spades_black Added
sc_9_of_Spades_nanotrasen Added
sc_9_of_Spades_syndicate Added
sc_Ace_of_Clubs_black Added
sc_Ace_of_Clubs_nanotrasen Added
sc_Ace_of_Clubs_syndicate Added
sc_Ace_of_Diamonds_black Added
sc_Ace_of_Diamonds_nanotrasen Added
sc_Ace_of_Diamonds_syndicate Added
sc_Ace_of_Hearts_black Added
sc_Ace_of_Hearts_nanotrasen Added
sc_Ace_of_Hearts_syndicate Added
sc_Ace_of_Spades_black Added
sc_Ace_of_Spades_nanotrasen Added
sc_Ace_of_Spades_syndicate Added
sc_Jack_of_Clubs_black Added
sc_Jack_of_Clubs_nanotrasen Added
sc_Jack_of_Clubs_syndicate Added
sc_Jack_of_Diamonds_black Added
sc_Jack_of_Diamonds_nanotrasen Added
sc_Jack_of_Diamonds_syndicate Added
sc_Jack_of_Hearts_black Added
sc_Jack_of_Hearts_nanotrasen Added
sc_Jack_of_Hearts_syndicate Added
sc_Jack_of_Spades_black Added
sc_Jack_of_Spades_nanotrasen Added
sc_Jack_of_Spades_syndicate Added
sc_King_of_Clubs_black Added
sc_King_of_Clubs_nanotrasen Added

Edit: diff updated after 64554cf

* Add playable cards

* SomeFixes

* SomeFixes2

* SomeFixes3

* Apply suggestions from code review

Co-authored-by: FN <[email protected]>

* статик статик хуестатик

* fix some

* meh

---------

Co-authored-by: AwareFoxy <[email protected]>
Co-authored-by: FN <[email protected]>
Co-authored-by: AwareFoxy <[email protected]>
@github-actions github-actions bot added size/XL Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design labels Nov 27, 2024
@PvrG
Copy link
Contributor Author

PvrG commented Nov 27, 2024

они почему-то связались, ну...ладно

@PvrG PvrG closed this Nov 27, 2024
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: No C# Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants