mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 14:07:53 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
295 lines
11 KiB
C#
295 lines
11 KiB
C#
using Content.Shared.Examine;
|
|
using Content.Shared.Hands;
|
|
using Content.Shared.Hands.Components;
|
|
using Content.Shared.Hands.EntitySystems;
|
|
using Content.Shared.Interaction.Events;
|
|
using Content.Shared.Inventory.VirtualItem;
|
|
using Content.Shared.Item;
|
|
using Content.Shared.Popups;
|
|
using Content.Shared.Timing;
|
|
using Content.Shared.Verbs;
|
|
using Content.Shared.Weapons.Melee;
|
|
using Content.Shared.Weapons.Melee.Components;
|
|
using Content.Shared.Weapons.Melee.Events;
|
|
using Content.Shared.Weapons.Ranged.Components;
|
|
using Content.Shared.Weapons.Ranged.Events;
|
|
using Content.Shared.Weapons.Ranged.Systems;
|
|
using Content.Shared.Wieldable.Components;
|
|
using Robust.Shared.Audio.Systems;
|
|
using Robust.Shared.Player;
|
|
|
|
namespace Content.Shared.Wieldable;
|
|
|
|
public sealed class WieldableSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedVirtualItemSystem _virtualItemSystem = default!;
|
|
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
|
[Dependency] private readonly SharedItemSystem _itemSystem = default!;
|
|
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly UseDelaySystem _delay = default!;
|
|
[Dependency] private readonly SharedGunSystem _gun = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<WieldableComponent, UseInHandEvent>(OnUseInHand, before: [typeof(SharedGunSystem)]);
|
|
SubscribeLocalEvent<WieldableComponent, ItemUnwieldedEvent>(OnItemUnwielded);
|
|
SubscribeLocalEvent<WieldableComponent, GotUnequippedHandEvent>(OnItemLeaveHand);
|
|
SubscribeLocalEvent<WieldableComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
|
|
SubscribeLocalEvent<WieldableComponent, GetVerbsEvent<InteractionVerb>>(AddToggleWieldVerb);
|
|
|
|
SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
|
|
SubscribeLocalEvent<GunRequiresWieldComponent, AttemptShootEvent>(OnShootAttempt);
|
|
SubscribeLocalEvent<GunWieldBonusComponent, ItemWieldedEvent>(OnGunWielded);
|
|
SubscribeLocalEvent<GunWieldBonusComponent, ItemUnwieldedEvent>(OnGunUnwielded);
|
|
SubscribeLocalEvent<GunWieldBonusComponent, GunRefreshModifiersEvent>(OnGunRefreshModifiers);
|
|
SubscribeLocalEvent<GunWieldBonusComponent, ExaminedEvent>(OnExamine);
|
|
|
|
SubscribeLocalEvent<IncreaseDamageOnWieldComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
|
|
}
|
|
|
|
private void OnMeleeAttempt(EntityUid uid, MeleeRequiresWieldComponent component, ref AttemptMeleeEvent args)
|
|
{
|
|
if (TryComp<WieldableComponent>(uid, out var wieldable) &&
|
|
!wieldable.Wielded)
|
|
{
|
|
args.Cancelled = true;
|
|
args.Message = Loc.GetString("wieldable-component-requires", ("item", uid));
|
|
}
|
|
}
|
|
|
|
private void OnShootAttempt(EntityUid uid, GunRequiresWieldComponent component, ref AttemptShootEvent args)
|
|
{
|
|
if (TryComp<WieldableComponent>(uid, out var wieldable) && !wieldable.Wielded)
|
|
{
|
|
args.Cancelled = true;
|
|
args.Message = Loc.GetString("wieldable-component-requires", ("item", uid));
|
|
}
|
|
}
|
|
|
|
private void OnGunUnwielded(EntityUid uid, GunWieldBonusComponent component, ItemUnwieldedEvent args)
|
|
{
|
|
_gun.RefreshModifiers(uid);
|
|
}
|
|
|
|
private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref ItemWieldedEvent args)
|
|
{
|
|
_gun.RefreshModifiers(uid);
|
|
}
|
|
|
|
private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref GunRefreshModifiersEvent args)
|
|
{
|
|
if (TryComp(bonus, out WieldableComponent? wield) &&
|
|
wield.Wielded)
|
|
{
|
|
args.MinAngle += bonus.Comp.MinAngle;
|
|
args.MaxAngle += bonus.Comp.MaxAngle;
|
|
args.AngleDecay += bonus.Comp.AngleDecay;
|
|
args.AngleIncrease += bonus.Comp.AngleIncrease;
|
|
}
|
|
}
|
|
|
|
private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
|
|
{
|
|
if (component.WieldBonusExamineMessage != null)
|
|
args.PushText(Loc.GetString(component.WieldBonusExamineMessage));
|
|
}
|
|
|
|
private void AddToggleWieldVerb(EntityUid uid, WieldableComponent component, GetVerbsEvent<InteractionVerb> args)
|
|
{
|
|
if (args.Hands == null || !args.CanAccess || !args.CanInteract)
|
|
return;
|
|
|
|
if (!_handsSystem.IsHolding(args.User, uid, out _, args.Hands))
|
|
return;
|
|
|
|
// TODO VERB TOOLTIPS Make CanWield or some other function return string, set as verb tooltip and disable
|
|
// verb. Or just don't add it to the list if the action is not executable.
|
|
|
|
// TODO VERBS ICON
|
|
InteractionVerb verb = new()
|
|
{
|
|
Text = component.Wielded ? Loc.GetString("wieldable-verb-text-unwield") : Loc.GetString("wieldable-verb-text-wield"),
|
|
Act = component.Wielded
|
|
? () => TryUnwield(uid, component, args.User)
|
|
: () => TryWield(uid, component, args.User)
|
|
};
|
|
|
|
args.Verbs.Add(verb);
|
|
}
|
|
|
|
private void OnUseInHand(EntityUid uid, WieldableComponent component, UseInHandEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
if (!component.Wielded)
|
|
args.Handled = TryWield(uid, component, args.User);
|
|
else if (component.UnwieldOnUse)
|
|
args.Handled = TryUnwield(uid, component, args.User);
|
|
}
|
|
|
|
public bool CanWield(EntityUid uid, WieldableComponent component, EntityUid user, bool quiet = false)
|
|
{
|
|
// Do they have enough hands free?
|
|
if (!EntityManager.TryGetComponent<HandsComponent>(user, out var hands))
|
|
{
|
|
if (!quiet)
|
|
_popupSystem.PopupClient(Loc.GetString("wieldable-component-no-hands"), user, user);
|
|
return false;
|
|
}
|
|
|
|
// Is it.. actually in one of their hands?
|
|
if (!_handsSystem.IsHolding(user, uid, out _, hands))
|
|
{
|
|
if (!quiet)
|
|
_popupSystem.PopupClient(Loc.GetString("wieldable-component-not-in-hands", ("item", uid)), user, user);
|
|
return false;
|
|
}
|
|
|
|
if (hands.CountFreeHands() < component.FreeHandsRequired)
|
|
{
|
|
if (!quiet)
|
|
{
|
|
var message = Loc.GetString("wieldable-component-not-enough-free-hands",
|
|
("number", component.FreeHandsRequired), ("item", uid));
|
|
_popupSystem.PopupClient(message, user, user);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Seems legit.
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to wield an item, starting a UseDelay after.
|
|
/// </summary>
|
|
/// <returns>True if the attempt wasn't blocked.</returns>
|
|
public bool TryWield(EntityUid used, WieldableComponent component, EntityUid user)
|
|
{
|
|
if (!CanWield(used, component, user))
|
|
return false;
|
|
|
|
var ev = new BeforeWieldEvent();
|
|
RaiseLocalEvent(used, ev);
|
|
|
|
if (ev.Cancelled)
|
|
return false;
|
|
|
|
if (TryComp<ItemComponent>(used, out var item))
|
|
{
|
|
component.OldInhandPrefix = item.HeldPrefix;
|
|
_itemSystem.SetHeldPrefix(used, component.WieldedInhandPrefix, component: item);
|
|
}
|
|
|
|
component.Wielded = true;
|
|
|
|
if (component.WieldSound != null)
|
|
_audioSystem.PlayPredicted(component.WieldSound, used, user);
|
|
|
|
for (var i = 0; i < component.FreeHandsRequired; i++)
|
|
{
|
|
_virtualItemSystem.TrySpawnVirtualItemInHand(used, user);
|
|
}
|
|
|
|
if (TryComp(used, out UseDelayComponent? useDelay)
|
|
&& !_delay.TryResetDelay((used, useDelay), true))
|
|
return false;
|
|
|
|
var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
|
|
var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
|
|
_popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
|
|
|
|
var targEv = new ItemWieldedEvent();
|
|
RaiseLocalEvent(used, ref targEv);
|
|
|
|
Dirty(used, component);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to unwield an item, with no DoAfter.
|
|
/// </summary>
|
|
/// <returns>True if the attempt wasn't blocked.</returns>
|
|
public bool TryUnwield(EntityUid used, WieldableComponent component, EntityUid user)
|
|
{
|
|
// WD EDIT START
|
|
if (!component.Wielded)
|
|
return false;
|
|
|
|
if (TryComp<BallisticAmmoProviderComponent>(used, out var ballisticAmmoProvider)
|
|
&& ballisticAmmoProvider.Entities.Count != 0
|
|
&& TryComp<CartridgeAmmoComponent>(ballisticAmmoProvider.Entities[^1], out var cartridgeAmmo)
|
|
&& cartridgeAmmo.Spent)
|
|
return false;
|
|
// WD EDIT END
|
|
|
|
var ev = new BeforeUnwieldEvent();
|
|
RaiseLocalEvent(used, ev);
|
|
|
|
if (ev.Cancelled)
|
|
return false;
|
|
|
|
component.Wielded = false;
|
|
var targEv = new ItemUnwieldedEvent(user);
|
|
|
|
RaiseLocalEvent(used, targEv);
|
|
return true;
|
|
}
|
|
|
|
private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUnwieldedEvent args)
|
|
{
|
|
if (args.User == null)
|
|
return;
|
|
|
|
if (TryComp<ItemComponent>(uid, out var item))
|
|
{
|
|
_itemSystem.SetHeldPrefix(uid, component.OldInhandPrefix, component: item);
|
|
}
|
|
|
|
if (!args.Force) // don't play sound/popup if this was a forced unwield
|
|
{
|
|
if (component.UnwieldSound != null)
|
|
_audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
|
|
|
|
var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
|
|
var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid));
|
|
_popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
|
|
}
|
|
|
|
_appearance.SetData(uid, WieldableVisuals.Wielded, false);
|
|
|
|
Dirty(uid, component);
|
|
_virtualItemSystem.DeleteInHandsMatching(args.User.Value, uid);
|
|
}
|
|
|
|
private void OnItemLeaveHand(EntityUid uid, WieldableComponent component, GotUnequippedHandEvent args)
|
|
{
|
|
if (!component.Wielded || uid != args.Unequipped)
|
|
return;
|
|
|
|
RaiseLocalEvent(uid, new ItemUnwieldedEvent(args.User, force: true), true);
|
|
}
|
|
|
|
private void OnVirtualItemDeleted(EntityUid uid, WieldableComponent component, VirtualItemDeletedEvent args)
|
|
{
|
|
if (args.BlockingEntity == uid && component.Wielded)
|
|
TryUnwield(args.BlockingEntity, component, args.User);
|
|
}
|
|
|
|
private void OnGetMeleeDamage(EntityUid uid, IncreaseDamageOnWieldComponent component, ref GetMeleeDamageEvent args)
|
|
{
|
|
if (!TryComp<WieldableComponent>(uid, out var wield))
|
|
return;
|
|
|
|
if (!wield.Wielded)
|
|
return;
|
|
|
|
args.Damage += component.BonusDamage;
|
|
}
|
|
}
|