Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Wieldable/two-handed weapons (#4554)

Browse Source 
* wielding kinda works

* rough out all the edges, wielding works nicely

* popups + loc

* increase damage & extra damage against whitelist

* small fixes

* forgot to actually do that

* reviews

* reviews + thing

* use resistances and not extradamageagainstwhitelist

* slashy

* make increasedamageonwield and melee hit events work with modifiersets

* Silly individual
This commit is contained in:
mirrorcult
2021-09-17 07:16:11 -07:00
committed by GitHub
parent 078a62762f
commit 62f6c8dd8e
36 changed files with 719 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Hands/HandVirtualPullItemStatus.xaml → Content.Client/Hands/HandVirtualItemStatus.xaml
View File

@@ -1,3 +1,3 @@
<Control xmlns="https://spacestation14.io">
<Label StyleClasses="ItemStatus" Text="Pulling" />
<Label StyleClasses="ItemStatus" Text="Blocked by" />
</Control>

4
Content.Client/Hands/HandVirtualPullItemStatus.xaml.cs → Content.Client/Hands/HandVirtualItemStatus.xaml.cs
View File

@@ -3,9 +3,9 @@ using Robust.Client.UserInterface.XAML;
namespace Content.Client.Hands
{
public sealed class HandVirtualPullItemStatus : Control
public sealed class HandVirtualItemStatus : Control
{
public HandVirtualPullItemStatus()
public HandVirtualItemStatus()
{
RobustXamlLoader.Load(this);
}

4
Content.Client/Hands/HandsGui.xaml.cs
View File

@@ -98,9 +98,9 @@ namespace Content.Client.Hands
_itemSlotManager.SetItemSlot(newButton, hand.HeldItem);
// Show blocked overlay if hand is pulling.
// Show blocked overlay if hand is blocked.
newButton.Blocked.Visible =
hand.HeldItem != null && hand.HeldItem.HasComponent<HandVirtualPullComponent>();
hand.HeldItem != null && hand.HeldItem.HasComponent<HandVirtualItemComponent>();
}
if (TryGetActiveHand(out var activeHand))

6
Content.Client/Hands/Systems/HandVirtualPullSystem.cs → Content.Client/Hands/Systems/HandVirtualItemSystem.cs
View File

@@ -3,16 +3,16 @@ using Content.Shared.Hands.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
namespace Content.Client.Hands
namespace Content.Client.Hands.Systems
{
[UsedImplicitly]
public sealed class HandVirtualPullSystem : EntitySystem
public sealed class HandVirtualItemSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
Subs.ItemStatus<HandVirtualPullComponent>(_ => new HandVirtualPullItemStatus());
Subs.ItemStatus<HandVirtualItemComponent>(_ => new HandVirtualItemStatus());
}
}
}