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.

Sign up for GitHub

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

Jump to bottom

[Fix] Melee Description Popup #286

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fix] Melee Description Popup #286

wants to merge 1 commit into from
+6 −3

Conversation

Vaaankas
Copy link
Contributor

@Vaaankas Vaaankas commented Mar 6, 2025

Описание PR

А вы знали что POWER ATTACK это ЛКМ ??? хахахахаха

Медиа

изображение

Изменения

🆑

  • fix: Исправлено отображение урона ближнего боя.

@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 6, 2025 •
edited
Loading

Walkthrough

Внесены изменения в логику расчёта урона для ближнего боя. Метод OnMeleeExamineDamage класса MeleeWeaponSystem теперь умножает урон на параметр HeavyDamageBaseModifier при определённых условиях, а также изменяет условие проверки для добавления тяжелого урона. В файле локализации для русского языка добавлены новые записи для обозначения типа урона (размах и бросок) и сообщения о затратах выносливости.

Changes

Файл Изменения
Content/.../MeleeWeaponSystem.cs Модификация метода OnMeleeExamineDamage: расчет урона умножается на HeavyDamageBaseModifier, условие проверки тяжелого урона изменено.
Resources/.../damage-examine.ftl Добавлены новые записи: damage-melee-heavy = размах, damage-throw = бросок, damage-stamina-cost = [color=cyan]{CAPITALIZE($type)}[/color] тратит [color=orange]{$cost}[/color] [color=yellow]выносливости[/color].

Suggested labels

Changes: YML, Status: Needs Review

Suggested reviewers

  • Remuchi
  • Spatison
📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between cad099b and aa2fb86.

📒 Files selected for processing (2)
  • Content.Server/Weapons/Melee/MeleeWeaponSystem.cs (1 hunks)
  • Resources/Locale/ru-RU/damage/damage-examine.ftl (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: YAML Linter
  • GitHub Check: YAML map schema validator
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
🔇 Additional comments (4)
Resources/Locale/ru-RU/damage/damage-examine.ftl (2)

7-8: Добавлены новые типы урона.

Хорошее добавление локализованных строк для новых типов урона. Эти строки корректно описывают типы атак "размах" и "бросок", что соответствует механике игры.

11-11: Добавлено форматированное сообщение о затратах выносливости.

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

Content.Server/Weapons/Melee/MeleeWeaponSystem.cs (2)

61-61: Исправлен расчёт урона для обычной атаки.

Изменение корректно применяет модификатор тяжёлого урона (HeavyDamageBaseModifier) к расчёту базового урона. Комментарий полезен для понимания логики управления: левая кнопка мыши (ЛКМ) для тяжёлых атак, правая (ПКМ) для лёгких.

65-66: Улучшено условие для отображения информации о тяжёлом уроне.

Изменение логики проверки позволяет более точно определить, когда нужно отображать информацию о тяжёлом уроне. Теперь сравнивается общий урон с модификатором и без него, что даёт более точный результат.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
  • @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.

Spatison
Spatison requested changes Mar 6, 2025
View reviewed changes
Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -58,12 +58,12 @@ private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component,
return;

if (!component.DisableClick)
_damageExamine.AddDamageExamine(args.Message, damageSpec, Loc.GetString("damage-melee"));
_damageExamine.AddDamageExamine(args.Message, damageSpec * component.HeavyDamageBaseModifier, Loc.GetString("damage-melee")); // WWDP; "heavy" attacks are actually LMB and "light" are RMB swings, fucking EE man
Copy link
Member

Choose a reason for hiding this comment

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

А смысл тут умножать на HeavyDamageBaseModifier?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

потому что POWER ATTACK это ЛКМ ахахахах
спасибо ЕЕ боёвке

Copy link
Contributor Author

Choose a reason for hiding this comment

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

собственно комент там правее

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Spatison Spatison Spatison requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: C# Changes: Localization Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Vaaankas @Spatison