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

Мехи снова с нами! #609

Open
wants to merge 36 commits into
base: master
Choose a base branch
from

Conversation

FaDeOkno
Copy link
Collaborator

@FaDeOkno FaDeOkno commented Oct 5, 2024

Описание PR

Перенёс и исправил часть щиткода мехов со старой сборки

Почему / Баланс

Ну а чёб и нет

Ссылка на публикацию в Discord

Техническая информация

Добавлена проверка на оружие меха в GunSystem и SharedGunSystem
Добавлены новые ивенты в MechSystem, отвечающие за ЭМИ, модификаторы урона, уничтожение оборудования меха и два новых акшон ивента туда же
Добавлен ивент SetupMechUserEvent, он вызывается на меха для работы с пилотом в момент выдачи базовых акшонов (см. добавление действий фазона и гайгэкса)

Медиа

Только видео с фазоном есть: https://youtu.be/T5vs1YsggtY

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Критические изменения

Критического нет, всё либо мелкое и самобытное, либо в отдельных файлах

Чейнджлог

🆑 Котя & Крыса

  • add: Перенесены мехи со старой сборки. еееееееееееееееее
  • add: Оружие мехов теперь использует отдельные магазины. Они помещаются в хранилище меха, и используются нажатием на кнопку перезарядки в меню ИНФО.
  • add: Снаряжение мехов теперь выбирается в радиальном меню.
  • add: Теперь из клешней меха можно выбраться.
  • tweak: Спрайт фазона теперь меняется во время фазирования.
  • tweak: Цены на мехов и их снаряжение в РНД стали адекватными (в сравнении со старой сборкой, особенно).
  • fix: Теперь при разрушении гидравлических переносчиков, содержимое выпадает на землю.
  • fix: UI мехов теперь обновляется при извлечении снаряжения.

Copy link
Contributor

github-actions bot commented Oct 5, 2024

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

@github-actions github-actions bot added Merge Conflict Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Oct 5, 2024
Copy link
Contributor

github-actions bot commented Oct 5, 2024

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

Resources/Textures/ADT/Objects/Specific/Mech/clarke_construction.rsi

State Old New Status
clarke0 Added
clarke1 Added
clarke10 Added
clarke11 Added
clarke12 Added
clarke13 Added
clarke14 Added
clarke15 Added
clarke16 Added
clarke17 Added
clarke18 Added
clarke19 Added
clarke2 Added
clarke20 Added
clarke21 Added
clarke22 Added
clarke23 Added
clarke3 Added
clarke4 Added
clarke5 Added
clarke6 Added
clarke7 Added
clarke8 Added
clarke9 Added
clarke_chassis Added
clarke_harness+o Added
clarke_harness Added
clarke_head+o Added
clarke_head Added
clarke_l_arm+o Added
clarke_l_arm Added
clarke_l_tread+o Added
clarke_l_tread Added
clarke_r_arm+o Added
clarke_r_arm Added
clarke_r_tread+o Added
clarke_r_tread Added

Resources/Textures/ADT/Objects/Specific/Mech/durand_construction.rsi

State Old New Status
durand0 Added
durand1 Added
durand10 Added
durand11 Added
durand12 Added
durand13 Added
durand14 Added
durand15 Added
durand16 Added
durand17 Added
durand18 Added
durand19 Added
durand2 Added
durand20 Added
durand21 Added
durand22 Added
durand23 Added
durand24 Added
durand3 Added
durand4 Added
durand5 Added
durand6 Added
durand7 Added
durand8 Added
durand9 Added
durand_armor Added
durand_harness+o Added
durand_harness Added
durand_head+o Added
durand_head Added
durand_l_arm+o Added
durand_l_arm Added
durand_l_leg+o Added
durand_l_leg Added
durand_r_arm+o Added
durand_r_arm Added
durand_r_leg+o Added
durand_r_leg Added

Resources/Textures/ADT/Objects/Specific/Mech/gygax_construction.rsi

State Old New Status
gygax+o Added
gygax0 Added
gygax1 Added
gygax10 Added
gygax11 Added
gygax12 Added
gygax13 Added
gygax14 Added
gygax15 Added
gygax16 Added
gygax17 Added
gygax18 Added
gygax19 Added
gygax2 Added
gygax20 Added
gygax21 Added
gygax22 Added
gygax23 Added
gygax24 Added
gygax3 Added
gygax4 Added
gygax5 Added
gygax6 Added
gygax7 Added
gygax8 Added
gygax9 Added
gygax_armor Added
gygax_chassis Added
gygax_harness+o Added
gygax_harness Added
gygax_head+o Added
gygax_head Added
gygax_l_arm+o Added
gygax_l_arm Added
gygax_l_leg+o Added
gygax_l_leg Added
gygax_r_arm+o Added
gygax_r_arm Added
gygax_r_leg+o Added
gygax_r_leg Added

Resources/Textures/ADT/Objects/Specific/Mech/modification_kits.rsi

State Old New Status
ripley_mkii Added

Resources/Textures/ADT/Objects/Specific/Mech/odysseus_construction.rsi

State Old New Status
odysseus0 Added
odysseus1 Added
odysseus10 Added
odysseus11 Added
odysseus12 Added
odysseus13 Added
odysseus14 Added
odysseus15 Added
odysseus16 Added
odysseus17 Added
odysseus18 Added
odysseus19 Added
odysseus2 Added
odysseus20 Added
odysseus21 Added
odysseus22 Added
odysseus3 Added
odysseus4 Added
odysseus5 Added
odysseus6 Added
odysseus7 Added
odysseus8 Added
odysseus9 Added
odysseus_armor Added
odysseus_head+o Added
odysseus_head Added
odysseus_l_arm+o Added
odysseus_l_arm Added
odysseus_l_leg+o Added
odysseus_l_leg Added
odysseus_r_arm+o Added
odysseus_r_arm Added
odysseus_r_leg+o Added
odysseus_r_leg Added
odysseus_torso+o Added
odysseus_torso Added

Resources/Textures/ADT/Objects/Specific/Mech/phazon_construction.rsi

State Old New Status
phazon0 Added
phazon1 Added
phazon10 Added
phazon11 Added
phazon12 Added
phazon13 Added
phazon14 Added
phazon15 Added
phazon16 Added
phazon17 Added
phazon18 Added
phazon19 Added
phazon2 Added
phazon20 Added
phazon21 Added
phazon22 Added

Edit: diff updated after c7c6628

@FaDeOkno FaDeOkno marked this pull request as draft October 6, 2024 17:12
@github-actions github-actions bot added the Changes: UI Изменение интерфейса label Oct 7, 2024
Copy link
Contributor

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

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Только начал с клиента

Content.Client/ADT/Mech/Systems/MedMechSystem.cs Outdated Show resolved Hide resolved
Content.Client/ADT/Mech/Systems/MedMechSystem.cs Outdated Show resolved Hide resolved
Content.Client/ADT/Mech/Systems/MedMechSystem.cs Outdated Show resolved Hide resolved
Content.Client/ADT/Mech/UI/MechGunUiFragment.xaml.cs Outdated Show resolved Hide resolved
Content.Client/Mech/MechSystem.cs Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Nov 4, 2024

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

@Schrodinger71 Schrodinger71 added Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест labels Nov 6, 2024
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Правим

Content.Server/ADT/Mech/Systems/MechSystem.cs Show resolved Hide resolved
Content.Server/ADT/Mech/Systems/MechSystem.cs Show resolved Hide resolved
Content.Server/Mech/Systems/MechSystem.cs Outdated Show resolved Hide resolved
Content.Server/Mech/Systems/MechSystem.cs Outdated Show resolved Hide resolved
Content.Server/Weapons/Ranged/Systems/GunSystem.cs Outdated Show resolved Hide resolved
Content.Server/Weapons/Ranged/Systems/GunSystem.cs Outdated Show resolved Hide resolved
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

ЕЩЁ ОДНА ПАЧКА В ЛИЦО.
Тут Шейрад

Content.Shared/Mech/Components/MechComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/Components/MechComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/Components/MechComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Mech/MechUI.cs Outdated Show resolved Hide resolved
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

В ПРОТОТИПАХ НАСРАЛИ

@FaDeOkno FaDeOkno removed the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Nov 7, 2024
@FaDeOkno FaDeOkno dismissed Schrodinger71’s stale review November 8, 2024 14:39

всё (почти) сделано, даже комменты компонентам добавил

Copy link
Contributor

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

Copy link

coderabbitai bot commented Nov 14, 2024

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants