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

[Fix] Melee Description Popup #286

Merged
merged 1 commit into from
Mar 8, 2025
+6 −3
Merged

[Fix] Melee Description Popup #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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


if (!component.DisableHeavy)
{
if (damageSpec * component.HeavyDamageBaseModifier != damageSpec)
_damageExamine.AddDamageExamine(args.Message, damageSpec * component.HeavyDamageBaseModifier, Loc.GetString("damage-melee-heavy"));
if (damageSpec.GetTotal() * component.HeavyDamageBaseModifier != damageSpec.GetTotal()) // WWDP
_damageExamine.AddDamageExamine(args.Message, damageSpec, Loc.GetString("damage-melee-heavy")); // WWDP

if (component.HeavyStaminaCost != 0)
{
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/damage/damage-examine.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ damage-examinable-verb-message = Изучить показатели урона.
damage-hitscan = хитскан
damage-projectile = снаряд
damage-melee = ближний бой
damage-melee-heavy = размах
damage-throw = бросок
damage-examine = Наносит следующие повреждения:
damage-examine-type = Наносит следующие повреждения ({ $type }):
damage-stamina-cost = [color=cyan]{CAPITALIZE($type)}[/color] тратит [color=orange]{$cost}[/color] [color=yellow]выносливости[/color].
damage-value =
- [color=red]{ $amount }[/color] единиц [color=yellow]{ $type ->
*[other] неизвестного
Expand Down
Loading