mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-30 08:07:28 +00:00
* Nubody (#42419) * Nubody * fix test fails * gibbing * lung test returns * doc comment * hand organ test * giblet test * yaml formatting * returning * relocate * trimming * re-smite * oops thusd tweak * arachnids have slower metabolism i guess * never mind the old behaviour is bad actually * rider whyyy * style changes and allat * fix collision --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * C# files done * Visual nubody (humanoid appearance refactor) (#42476) * initial visual nubody * oops overlay * im so pheeming rn * conversion... * tests * comeback of the underwear * oops eyes * blabbl * zeds * yaml linted * search and visible count constraints * reordering * preserve previously selected markings colors * fix test * some ui niceties * ordering * make DB changes backwards-compatible/downgrade-friendly * fix things again * fix migration * vulpkanin markings limit increase * wrapping * code cleanup and more code cleanup and more code cleanup and more code cleanup and * fix slop ports * better sampling API * make filter work + use the method i made for its intended purpose * fix test fails real quick * magic mirror cleanup, remove TODO * don't 0-init the organ profile data * remove deltastates --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Let vox eat trash again (#42503) * C# complete port * Getting closer * Harpy Nubody Port * Port Feroxi, Kitsune. Fix some yml typos and remove ipcs stuff * Port Oni * Port Rest, except Motorkind * Port Motorkind * Remove more surgery, restore too much deleted stuff * Fix Typos and change some organ names. Need to split eyes next * Harpy HAve Wings again * Some fixes, More Surgeyr Removal, Copying of eye organs * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Use correct Body imports * Markings Refactoring, Harpy Layering * Motorkind doesn't crash anymore. Some layer remappings. * Allow Organs to have Markings Displacements again. (#43604) * first shtep * readd markings support --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix STalk eyes and several layerings * Fix sexed organs (#42554) * Fix markings for several species, fit them for sexed organs and rename some files to fit them for it * Additional IPC-related removals * Vulpkanin eyes are now correct again * Fix Subtle Cultist Marks on species * Fix Asakim Sprites (sexed) and make CD imports work * Migration, error fixes, and Height * Fix humanoid profile voice being broken (#42550) Fix humanoid appearance voice being broken * Change Kitsune SexChanged Event to with ref * Fix asakim issue, Respirator fix * Simplify hands UI code (#42534) * Simplify hands UI code * i remembered about SortedHands in the component * minor cleanup --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Set size of Analyzer back to 350, Kitsune can't gib themselves no more. Migration * yml linter errors and an rudimentary onAdd Organ Functionality * Fixing it trying to remove nothing * midpoint migration * Why do you put so many organs everywhere * More missing prototypes * Migration of more organs * Forgot lungs * Move character preview handling into a specialized control (#41252) * Move character preview handling into a specialized control Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> * Restore job name that I accidentally removed from character picker buttons * Just resolve dependencies the standard way --------- Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Janet Blackquill <uhhadd@gmail.com> * Drop ICharacterProfile/ICharacterAppearance interfaces (#42661) * Ensure profile loading only returns valid species (#42842) (Stable merge) (#42865) Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * Changes to make it work for us. * No more bald Harpy * OperatingTables instead of null * Adding Delta V Comments, commenting out instead of deleting * Fix broken Height Scale. * Remove HumanoidSilicon Mention * Did an error. Readded, uncommented. * Clean up Marking data structure, add tests for Zombie transformation (#42756) * Clean up Marking data structure, add tests for Zombie transformation * empty * AAAAAAAAAAAAAAAA --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix markings colour setting (#42771) * Fix: Markings Color For Downstream * Comment out A Leg. Remove Todo * Revert to original hidden species code --------- Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Absotively <jen@jenpollock.ca> Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems>
325 lines
12 KiB
C#
325 lines
12 KiB
C#
using System.Linq;
|
|
using Content.Client.Clothing;
|
|
using Content.Client.Examine;
|
|
using Content.Client.Verbs.UI;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Inventory;
|
|
using Content.Shared.Inventory.Events;
|
|
using Content.Shared.Storage;
|
|
using JetBrains.Annotations;
|
|
using Robust.Client.Player;
|
|
using Robust.Client.UserInterface;
|
|
using Robust.Shared.Containers;
|
|
using Robust.Shared.Input.Binding;
|
|
using Robust.Shared.Player;
|
|
|
|
namespace Content.Client.Inventory
|
|
{
|
|
[UsedImplicitly]
|
|
public sealed class ClientInventorySystem : InventorySystem
|
|
{
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
[Dependency] private readonly IUserInterfaceManager _ui = default!;
|
|
[Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!;
|
|
[Dependency] private readonly ExamineSystem _examine = default!;
|
|
|
|
public Action<SlotData>? EntitySlotUpdate = null;
|
|
public Action<SlotData>? OnSlotAdded = null;
|
|
public Action<SlotData>? OnSlotRemoved = null;
|
|
public Action<EntityUid, InventorySlotsComponent>? OnLinkInventorySlots = null;
|
|
public Action? OnUnlinkInventory = null;
|
|
public Action<SlotSpriteUpdate>? OnSpriteUpdate = null;
|
|
|
|
private readonly Queue<(InventorySlotsComponent comp, EntityEventArgs args)> _equipEventsQueue = new();
|
|
|
|
public override void Initialize()
|
|
{
|
|
UpdatesOutsidePrediction = true;
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
|
|
SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
|
|
|
|
SubscribeLocalEvent<InventoryComponent, ComponentShutdown>(OnShutdown);
|
|
|
|
SubscribeLocalEvent<InventorySlotsComponent, DidEquipEvent>((_, comp, args) =>
|
|
_equipEventsQueue.Enqueue((comp, args)));
|
|
SubscribeLocalEvent<InventorySlotsComponent, DidUnequipEvent>((_, comp, args) =>
|
|
_equipEventsQueue.Enqueue((comp, args)));
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
base.Update(frameTime);
|
|
|
|
while (_equipEventsQueue.TryDequeue(out var tuple))
|
|
{
|
|
var (component, args) = tuple;
|
|
|
|
switch (args)
|
|
{
|
|
case DidEquipEvent equipped:
|
|
OnDidEquip(component, equipped);
|
|
break;
|
|
case DidUnequipEvent unequipped:
|
|
OnDidUnequip(component, unequipped);
|
|
break;
|
|
default:
|
|
throw new InvalidOperationException($"Received queued event of unknown type: {args.GetType()}");
|
|
}
|
|
}
|
|
}
|
|
|
|
private void OnDidUnequip(InventorySlotsComponent component, DidUnequipEvent args)
|
|
{
|
|
UpdateSlot(args.Equipee, component, args.Slot);
|
|
if (args.Equipee != _playerManager.LocalEntity)
|
|
return;
|
|
var update = new SlotSpriteUpdate(null, args.SlotGroup, args.Slot, false);
|
|
OnSpriteUpdate?.Invoke(update);
|
|
}
|
|
|
|
private void OnDidEquip(InventorySlotsComponent component, DidEquipEvent args)
|
|
{
|
|
UpdateSlot(args.Equipee, component, args.Slot);
|
|
if (args.Equipee != _playerManager.LocalEntity)
|
|
return;
|
|
var update = new SlotSpriteUpdate(args.Equipment, args.SlotGroup, args.Slot,
|
|
HasComp<StorageComponent>(args.Equipment));
|
|
OnSpriteUpdate?.Invoke(update);
|
|
}
|
|
|
|
private void OnShutdown(EntityUid uid, InventoryComponent component, ComponentShutdown args)
|
|
{
|
|
if (TryComp(uid, out InventorySlotsComponent? inventorySlots))
|
|
{
|
|
foreach (var slot in component.Slots)
|
|
{
|
|
TryRemoveSlotData((uid, inventorySlots), (SlotData)slot);
|
|
}
|
|
}
|
|
|
|
if (uid == _playerManager.LocalEntity)
|
|
OnUnlinkInventory?.Invoke();
|
|
}
|
|
|
|
private void OnPlayerDetached(EntityUid uid, InventorySlotsComponent component, LocalPlayerDetachedEvent args)
|
|
{
|
|
OnUnlinkInventory?.Invoke();
|
|
}
|
|
|
|
private void OnPlayerAttached(EntityUid uid, InventorySlotsComponent component, LocalPlayerAttachedEvent args)
|
|
{
|
|
OnLinkInventorySlots?.Invoke(uid, component);
|
|
}
|
|
|
|
protected override void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
|
|
{
|
|
base.OnInit(ent, ref args);
|
|
|
|
_clothingVisualsSystem.InitClothing(ent.Owner, ent.Comp);
|
|
}
|
|
|
|
public override void Shutdown()
|
|
{
|
|
CommandBinds.Unregister<ClientInventorySystem>();
|
|
base.Shutdown();
|
|
}
|
|
|
|
public void ReloadInventory(InventorySlotsComponent? component = null)
|
|
{
|
|
var player = _playerManager.LocalEntity;
|
|
if (player == null || !Resolve(player.Value, ref component, false))
|
|
{
|
|
return;
|
|
}
|
|
|
|
OnUnlinkInventory?.Invoke();
|
|
OnLinkInventorySlots?.Invoke(player.Value, component);
|
|
}
|
|
|
|
public void SetSlotHighlight(EntityUid owner, InventorySlotsComponent component, string slotName, bool state)
|
|
{
|
|
var oldData = component.SlotData[slotName];
|
|
var newData = component.SlotData[slotName] = new SlotData(oldData, state);
|
|
if (owner == _playerManager.LocalEntity)
|
|
EntitySlotUpdate?.Invoke(newData);
|
|
}
|
|
|
|
public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
|
|
bool? blocked = null, bool? highlight = null)
|
|
{
|
|
// The slot might have been removed when changing templates, which can cause items to be dropped.
|
|
if (!component.SlotData.TryGetValue(slotName, out var oldData))
|
|
return;
|
|
|
|
var newHighlight = oldData.Highlighted;
|
|
var newBlocked = oldData.Blocked;
|
|
|
|
if (blocked != null)
|
|
newBlocked = blocked.Value;
|
|
|
|
if (highlight != null)
|
|
newHighlight = highlight.Value;
|
|
|
|
var newData = component.SlotData[slotName] =
|
|
new SlotData(component.SlotData[slotName], newHighlight, newBlocked);
|
|
if (owner == _playerManager.LocalEntity)
|
|
EntitySlotUpdate?.Invoke(newData);
|
|
}
|
|
|
|
public bool TryAddSlotData(Entity<InventorySlotsComponent> ent, SlotData newSlotData)
|
|
{
|
|
if (!ent.Comp.SlotData.TryAdd(newSlotData.SlotName, newSlotData))
|
|
return false;
|
|
|
|
if (TryGetSlotContainer(ent.Owner, newSlotData.SlotName, out var newContainer, out _))
|
|
ent.Comp.SlotData[newSlotData.SlotName].Container = newContainer;
|
|
|
|
if (ent.Owner == _playerManager.LocalEntity)
|
|
OnSlotAdded?.Invoke(newSlotData);
|
|
|
|
return true;
|
|
}
|
|
|
|
public bool TryRemoveSlotData(Entity<InventorySlotsComponent> ent, SlotData removedSlotData)
|
|
{
|
|
if (!ent.Comp.SlotData.Remove(removedSlotData.SlotName))
|
|
return false;
|
|
|
|
if (ent.Owner == _playerManager.LocalEntity)
|
|
OnSlotRemoved?.Invoke(removedSlotData);
|
|
|
|
return true;
|
|
}
|
|
|
|
public void UIInventoryActivate(string slot)
|
|
{
|
|
RaisePredictiveEvent(new UseSlotNetworkMessage(slot));
|
|
}
|
|
|
|
public void UIInventoryStorageActivate(string slot)
|
|
{
|
|
RaisePredictiveEvent(new OpenSlotStorageNetworkMessage(slot));
|
|
}
|
|
|
|
public void UIInventoryExamine(string slot, EntityUid uid)
|
|
{
|
|
if (!TryGetSlotEntity(uid, slot, out var item))
|
|
return;
|
|
|
|
_examine.DoExamine(item.Value);
|
|
}
|
|
|
|
public void UIInventoryOpenContextMenu(string slot, EntityUid uid)
|
|
{
|
|
if (!TryGetSlotEntity(uid, slot, out var item))
|
|
return;
|
|
|
|
_ui.GetUIController<VerbMenuUIController>().OpenVerbMenu(item.Value);
|
|
}
|
|
|
|
public void UIInventoryActivateItem(string slot, EntityUid uid)
|
|
{
|
|
if (!TryGetSlotEntity(uid, slot, out var item))
|
|
return;
|
|
|
|
RaisePredictiveEvent(
|
|
new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: false));
|
|
}
|
|
|
|
public void UIInventoryAltActivateItem(string slot, EntityUid uid)
|
|
{
|
|
if (!TryGetSlotEntity(uid, slot, out var item))
|
|
return;
|
|
|
|
RaisePredictiveEvent(new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: true));
|
|
}
|
|
|
|
protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
|
|
{
|
|
base.UpdateInventoryTemplate(ent);
|
|
|
|
if (!TryComp<InventorySlotsComponent>(ent, out var inventorySlots))
|
|
return;
|
|
|
|
List<SlotData> slotDataToRemove = new(); // don't modify dict while iterating
|
|
|
|
foreach (var slotData in inventorySlots.SlotData.Values)
|
|
{
|
|
if (!ent.Comp.Slots.Any(s => s.Name == slotData.SlotName))
|
|
slotDataToRemove.Add(slotData);
|
|
}
|
|
|
|
// remove slots that are no longer in the new template
|
|
foreach (var slotData in slotDataToRemove)
|
|
{
|
|
TryRemoveSlotData((ent.Owner, inventorySlots), slotData);
|
|
}
|
|
|
|
// update existing slots or add them if they don't exist yet
|
|
foreach (var slot in ent.Comp.Slots)
|
|
{
|
|
if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
|
|
slotData.SlotDef = slot;
|
|
else
|
|
TryAddSlotData((ent.Owner, inventorySlots), (SlotData)slot);
|
|
}
|
|
|
|
if (ent.Owner == _playerManager.LocalEntity)
|
|
ReloadInventory(inventorySlots);
|
|
}
|
|
|
|
public sealed class SlotData
|
|
{
|
|
[ViewVariables] public SlotDefinition SlotDef;
|
|
[ViewVariables] public EntityUid? HeldEntity => Container?.ContainedEntity;
|
|
[ViewVariables] public bool Blocked;
|
|
[ViewVariables] public bool Highlighted;
|
|
[ViewVariables] public ContainerSlot? Container;
|
|
[ViewVariables] public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
|
|
[ViewVariables] public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
|
|
[ViewVariables] public string SlotName => SlotDef.Name;
|
|
[ViewVariables] public bool ShowInWindow => SlotDef.ShowInWindow;
|
|
[ViewVariables] public string SlotGroup => SlotDef.SlotGroup;
|
|
[ViewVariables] public string SlotDisplayName => SlotDef.DisplayName;
|
|
[ViewVariables] public string TextureName => "Slots/" + SlotDef.TextureName;
|
|
[ViewVariables] public string FullTextureName => SlotDef.FullTextureName;
|
|
|
|
public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
|
|
bool blocked = false)
|
|
{
|
|
SlotDef = slotDef;
|
|
Highlighted = highlighted;
|
|
Blocked = blocked;
|
|
Container = container;
|
|
}
|
|
|
|
public SlotData(SlotData oldData, bool highlighted = false, bool blocked = false)
|
|
{
|
|
SlotDef = oldData.SlotDef;
|
|
Highlighted = highlighted;
|
|
Container = oldData.Container;
|
|
Blocked = blocked;
|
|
}
|
|
|
|
public static implicit operator SlotData(SlotDefinition s)
|
|
{
|
|
return new SlotData(s);
|
|
}
|
|
|
|
public static implicit operator SlotDefinition(SlotData s)
|
|
{
|
|
return s.SlotDef;
|
|
}
|
|
}
|
|
|
|
public readonly record struct SlotSpriteUpdate(
|
|
EntityUid? Entity,
|
|
string Group,
|
|
string Name,
|
|
bool ShowStorage
|
|
);
|
|
}
|
|
}
|