mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-25 01:27:06 +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
241 lines
8.8 KiB
C#
241 lines
8.8 KiB
C#
using System.Linq;
|
|
using System.Numerics;
|
|
using Content.Client.Examine;
|
|
using Content.Client.Strip;
|
|
using Content.Client.Stylesheets;
|
|
using Content.Client.UserInterface.Controls;
|
|
using Content.Client.UserInterface.Systems.Hands.Controls;
|
|
using Content.Client.Verbs.UI;
|
|
using Content.Shared.Cuffs;
|
|
using Content.Shared.Cuffs.Components;
|
|
using Content.Shared.Ensnaring.Components;
|
|
using Content.Shared.Hands.Components;
|
|
using Content.Shared.IdentityManagement;
|
|
using Content.Shared.Input;
|
|
using Content.Shared.Inventory;
|
|
using Content.Shared.Inventory.VirtualItem;
|
|
using Content.Shared.Strip.Components;
|
|
using JetBrains.Annotations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.UserInterface;
|
|
using Robust.Client.UserInterface.Controls;
|
|
using Robust.Client.Player;
|
|
using Robust.Shared.Input;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Prototypes;
|
|
using static Content.Client.Inventory.ClientInventorySystem;
|
|
using static Robust.Client.UserInterface.Control;
|
|
|
|
namespace Content.Client.Inventory
|
|
{
|
|
[UsedImplicitly]
|
|
public sealed class StrippableBoundUserInterface : BoundUserInterface
|
|
{
|
|
[Dependency] private readonly IUserInterfaceManager _ui = default!;
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
private readonly ExamineSystem _examine;
|
|
private readonly InventorySystem _inv;
|
|
private readonly SharedCuffableSystem _cuffable;
|
|
|
|
[ViewVariables]
|
|
private const int ButtonSeparation = 4;
|
|
|
|
[ViewVariables]
|
|
public const string HiddenPocketEntityId = "StrippingHiddenEntity";
|
|
|
|
[ViewVariables]
|
|
private readonly StrippingMenu? _strippingMenu;
|
|
|
|
[ViewVariables]
|
|
private readonly EntityUid _virtualHiddenEntity;
|
|
|
|
public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
|
|
{
|
|
_examine = EntMan.System<ExamineSystem>();
|
|
_inv = EntMan.System<InventorySystem>();
|
|
_cuffable = EntMan.System<SharedCuffableSystem>();
|
|
|
|
var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
|
|
_strippingMenu = new StrippingMenu(title, this);
|
|
_strippingMenu.OnClose += Close;
|
|
_virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
|
|
}
|
|
|
|
protected override void Open()
|
|
{
|
|
base.Open();
|
|
_strippingMenu?.OpenCenteredLeft();
|
|
}
|
|
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
base.Dispose(disposing);
|
|
|
|
EntMan.DeleteEntity(_virtualHiddenEntity);
|
|
|
|
if (!disposing)
|
|
return;
|
|
|
|
_strippingMenu?.Dispose();
|
|
}
|
|
|
|
public void DirtyMenu()
|
|
{
|
|
if (_strippingMenu != null)
|
|
_strippingMenu.Dirty = true;
|
|
}
|
|
|
|
public void UpdateMenu()
|
|
{
|
|
if (_strippingMenu == null)
|
|
return;
|
|
|
|
_strippingMenu.ClearButtons();
|
|
|
|
if (EntMan.TryGetComponent<InventoryComponent>(Owner, out var inv))
|
|
{
|
|
foreach (var slot in inv.Slots)
|
|
{
|
|
AddInventoryButton(Owner, slot.Name, inv);
|
|
}
|
|
}
|
|
|
|
if (EntMan.TryGetComponent<HandsComponent>(Owner, out var handsComp))
|
|
{
|
|
// good ol hands shit code. there is a GuiHands comparer that does the same thing... but these are hands
|
|
// and not gui hands... which are different...
|
|
foreach (var hand in handsComp.Hands.Values)
|
|
{
|
|
if (hand.Location != HandLocation.Right)
|
|
continue;
|
|
|
|
AddHandButton(hand);
|
|
}
|
|
|
|
foreach (var hand in handsComp.Hands.Values)
|
|
{
|
|
if (hand.Location != HandLocation.Middle)
|
|
continue;
|
|
|
|
AddHandButton(hand);
|
|
}
|
|
|
|
foreach (var hand in handsComp.Hands.Values)
|
|
{
|
|
if (hand.Location != HandLocation.Left)
|
|
continue;
|
|
|
|
AddHandButton(hand);
|
|
}
|
|
}
|
|
|
|
// snare-removal button. This is just the old button before the change to item slots. It is pretty out of place.
|
|
if (EntMan.TryGetComponent<EnsnareableComponent>(Owner, out var snare) && snare.IsEnsnared)
|
|
{
|
|
var button = new Button()
|
|
{
|
|
Text = Loc.GetString("strippable-bound-user-interface-stripping-menu-ensnare-button"),
|
|
StyleClasses = { StyleBase.ButtonOpenRight }
|
|
};
|
|
|
|
button.OnPressed += (_) => SendMessage(new StrippingEnsnareButtonPressed());
|
|
|
|
_strippingMenu.SnareContainer.AddChild(button);
|
|
}
|
|
|
|
// TODO fix layout container measuring (its broken atm).
|
|
// _strippingMenu.InvalidateMeasure();
|
|
// _strippingMenu.Contents.Measure(Vector2Helpers.Infinity);
|
|
|
|
// TODO allow windows to resize based on content's desired size
|
|
|
|
// for now: shit-code
|
|
// this breaks for drones (too many hands, lots of empty vertical space), and looks shit for monkeys and the like.
|
|
// but the window is realizable, so eh.
|
|
_strippingMenu.SetSize = new Vector2(220, snare?.IsEnsnared == true ? 550 : 530);
|
|
}
|
|
|
|
private void AddHandButton(Hand hand)
|
|
{
|
|
var button = new HandButton(hand.Name, hand.Location);
|
|
|
|
button.Pressed += SlotPressed;
|
|
|
|
if (EntMan.TryGetComponent<VirtualItemComponent>(hand.HeldEntity, out var virt))
|
|
{
|
|
button.Blocked = true;
|
|
if (EntMan.TryGetComponent<CuffableComponent>(Owner, out var cuff) && _cuffable.GetAllCuffs(cuff).Contains(virt.BlockingEntity))
|
|
button.BlockedRect.MouseFilter = MouseFilterMode.Ignore;
|
|
}
|
|
|
|
UpdateEntityIcon(button, hand.HeldEntity);
|
|
_strippingMenu!.HandsContainer.AddChild(button);
|
|
}
|
|
|
|
private void SlotPressed(GUIBoundKeyEventArgs ev, SlotControl slot)
|
|
{
|
|
// TODO: allow other interactions? Verbs? But they should then generate a pop-up and/or have a delay so the
|
|
// user that is being stripped can prevent the verbs from being exectuted.
|
|
// So for now: only stripping & examining
|
|
if (ev.Function == EngineKeyFunctions.Use)
|
|
{
|
|
SendMessage(new StrippingSlotButtonPressed(slot.SlotName, slot is HandButton));
|
|
return;
|
|
}
|
|
|
|
if (slot.Entity == null)
|
|
return;
|
|
|
|
if (ev.Function == ContentKeyFunctions.ExamineEntity)
|
|
_examine.DoExamine(slot.Entity.Value);
|
|
else if (ev.Function == EngineKeyFunctions.UseSecondary)
|
|
_ui.GetUIController<VerbMenuUIController>().OpenVerbMenu(slot.Entity.Value);
|
|
}
|
|
|
|
private void AddInventoryButton(EntityUid invUid, string slotId, InventoryComponent inv)
|
|
{
|
|
if (!_inv.TryGetSlotContainer(invUid, slotId, out var container, out var slotDef, inv))
|
|
return;
|
|
|
|
var entity = container.ContainedEntity;
|
|
|
|
// If this is a full pocket, obscure the real entity
|
|
if (entity != null && slotDef.StripHidden
|
|
&& !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
|
|
entity = _virtualHiddenEntity;
|
|
|
|
var button = new SlotButton(new SlotData(slotDef, container));
|
|
button.Pressed += SlotPressed;
|
|
|
|
_strippingMenu!.InventoryContainer.AddChild(button);
|
|
|
|
UpdateEntityIcon(button, entity);
|
|
|
|
LayoutContainer.SetPosition(button, slotDef.StrippingWindowPos * (SlotControl.DefaultButtonSize + ButtonSeparation));
|
|
}
|
|
|
|
private void UpdateEntityIcon(SlotControl button, EntityUid? entity)
|
|
{
|
|
// Hovering, highlighting & storage are features of general hands & inv GUIs. This UI just re-uses these because I'm lazy.
|
|
button.ClearHover();
|
|
button.StorageButton.Visible = false;
|
|
|
|
if (entity == null)
|
|
{
|
|
button.SetEntity(null);
|
|
return;
|
|
}
|
|
|
|
EntityUid? viewEnt;
|
|
if (EntMan.TryGetComponent<VirtualItemComponent>(entity, out var virt))
|
|
viewEnt = EntMan.HasComponent<SpriteComponent>(virt.BlockingEntity) ? virt.BlockingEntity : null;
|
|
else if (EntMan.HasComponent<SpriteComponent>(entity))
|
|
viewEnt = entity;
|
|
else
|
|
return;
|
|
|
|
button.SetEntity(viewEnt);
|
|
}
|
|
}
|
|
}
|