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

NyanoCombat 2, Part 1: Simple Melee Refactor #605

Merged
merged 11 commits into from
Aug 10, 2024
Merged

NyanoCombat 2, Part 1: Simple Melee Refactor #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
305d585
Melee Light Refactoring
VMSolidus Jul 28, 2024
fe3e9e8
Cleaning up deprecated VV usage and datafield names
VMSolidus Jul 28, 2024
c6cd32b
More factoring
VMSolidus Jul 28, 2024
5a9259f
Update MeleeWeaponSystem.cs
VMSolidus Jul 28, 2024
2160377
Fix linter
VMSolidus Jul 28, 2024
f149b25
replace cvar with component variable
VMSolidus Jul 29, 2024
d0cebd4
Update MeleeWeaponSystem.cs
VMSolidus Jul 29, 2024
4ea187e
Update MeleeWeaponComponent.cs
VMSolidus Jul 29, 2024
b8856d0
Update MeleeWeaponSystem.cs
VMSolidus Aug 7, 2024
341b641
Update MeleeWeaponComponent.cs
VMSolidus Aug 8, 2024
5b76ac2
Merge branch 'master' into Additional-Contests-Implementations
DangerRevolution Aug 10, 2024
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
2 changes: 1 addition & 1 deletion Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En

var userPos = TransformSystem.GetWorldPosition(userXform);
var direction = targetMap.Position - userPos;
var distance = MathF.Min(component.Range, direction.Length());
var distance = MathF.Min(component.Range * component.HeavyRangeModifier, direction.Length());

// This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
// Server will validate it with InRangeUnobstructed.
Expand Down
1 change: 0 additions & 1 deletion Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ public sealed partial class MeleeWeaponComponent : Component
[DataField, AutoNetworkedField]
public int MaxTargets = 5;


// Sounds

/// <summary>
Expand Down
Loading