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

Crossbow (#327)

Browse Source 
* Add powered crossbow

* Add spear embedding (#18578)

* Add spear embedding

* fuck this copy-paste

* Juicier

* the river

* Add crossbow embedding

* Fix crossbow construction

* Finish crossbow

* Remove unused

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Aviu00
2023-08-24 21:05:56 +03:00
committed by Aviu00
parent 7b9a36e4b6
commit d0431ee61e
31 changed files with 723 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
View File

@@ -167,6 +167,16 @@ public partial class GunComponent : Component
/// </summary>
[DataField("clumsyProof"), ViewVariables(VVAccess.ReadWrite)]
public bool ClumsyProof = false;
// WD START
[DataField("forceThrowingAngle")]
[ViewVariables(VVAccess.ReadWrite)]
public bool ForceThrowingAngle;
[DataField("angle")]
[ViewVariables(VVAccess.ReadWrite)]
public Angle Angle;
// WD END
}
[Flags]

16
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
View File

@@ -2,6 +2,7 @@ using Content.Shared.DoAfter;
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Stacks;
using Content.Shared.Verbs;
using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Events;
@@ -47,8 +48,17 @@ public abstract partial class SharedGunSystem
if (GetBallisticShots(component) >= component.Capacity)
return;
component.Entities.Add(args.Used);
Containers.Insert(args.Used, component.Container);
var entity = args.Used; // WD EDIT START
var doInsert = true;
if (TryComp(args.Used, out StackComponent? stack) && stack.Count > 1)
{
entity = GetStackEntity(args.Used, stack);
doInsert = false;
}
component.Entities.Add(entity);
if (_netManager.IsServer || doInsert)
Containers.Insert(entity, component.Container); // WD EDIT END
// Not predicted so
Audio.PlayPredicted(component.SoundInsert, uid, args.User);
args.Handled = true;
@@ -56,6 +66,8 @@ public abstract partial class SharedGunSystem
Dirty(uid, component);
}
protected virtual EntityUid GetStackEntity(EntityUid uid, StackComponent stack) { return uid; }
private void OnBallisticAfterInteract(EntityUid uid, BallisticAmmoProviderComponent component, AfterInteractEvent args)
{
if (args.Handled ||