mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
* Fix the sensor monitoring console forcing a GC every 3 seconds (#38146) * Optimize sensor monitoring window graph drawing * Add shared static Vector2 pool for all GraphView instances * Address requested changes * remove lock * Update submodule to 264.0.0 (#38629) * Toy/Plushie Inhands and Wearables (#38514) * Fixed dependency injection and some other issues in a few places. * More issue fixes * patchfor broken NetworkConfiguratorLinkMenu (#38632) fix * Fix solutions flickering when transferring contents (#34838) * Use Solution clones when applying SolutionComponent states * Revert "Use Solution clones when applying SolutionComponent states" This reverts commit 013fd111cf92b22562e00f98a7aaa49bc4b4ed62. * Make Solution implement ICloneable and rename Clone method. * Copy CanReact value when cloning a Solution * Convert to IRobustCloneable * Fix typos in guidebook: Buisness → Business (#38636) * Fix typo in `MinorAntagonists.xml` Buisness → Business * Fix typo in `YourFirstCharacter.xml` Buisness → Business * Various Headphones Fixes and Tweaks (#38479) * sprites, wearables * neck * icon-on sprite * Cleanup prototype instantiation in `DamageTest` (#38639) Cleanup prototype instantiation in DamageTest * Cleanup prototype instantiation in `ExplosionSystem` (#38642) Cleanup prototype instantiation in ExplosionSystem * AddBodyPartCommand localization. (#38612) commit * fix ItemSlotsSystem debug assert (#38655) * Allow the Command & Super door remotes to use the access of their user. (Re-creation of PR due to changes to game balance) (#35536) * Added directional beacons (#38284) * Added directional beacons Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Fixed names Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Power stat and nuke codes commands get some LEC love. (#38585) * commit * requested changes. * Dsay Dirty and Follow commands converted to LEC and localized. (#38666) * commit * whoopwhoopwhoop * Retro laser sprite fix (#38676) * Fixed everything except the icon Signed-off-by: Nox38 <nebulousnox38@gmail.com> * fixed icon Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> * fix water coolers (#38681) * Monochromacy typo fix (#38686) * fixes the typo * Fixed cloning looking for the trait, not the component, RE https://github.com/space-wizards/space-station-14/pull/38686#issuecomment-3025093504 * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Validate `CloningSettingsPrototype`s (#38688) * Validate CloningSettingsPrototypes * Update Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Check EventComponents too --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Add test of objective-related console commands (#36400) * Add test of objective add/list/remove commands * Not sure why we're validating test prototypes, but sure * We don't need a map * Improvements and fixups for New Status Effect API (#38660) * Predict healing and bloodstream (#38690) * initial commit * reapply 38126 * fix rootable * someone missed an important minus sign here * try this * fix * fix * reenable crit hits * cleanup * fix status time dirtying * fix * camelCase * Healing and bloodstream prediction fixes. * Resolving Wizard casting recall on nuke disk making it impossible to disarm (#38661) * Resolving Wizard Recall on Nuke disk making it impossible to disarm - Adding a DisarmBomb case to nuke status update loop - Changing a few methods and parameters to properly follow formatting standards - Updating some names to follow camelCase * Updating missed tag * Reverting DataField change Should prevent this preventative bugfix being a breaking change. * Switch HSV to the default colorspace for character customization (#38434) * Made HSV default for character editor * Adds/fixes comments to HSV defaulting * Added dropbox fix, potentially cursed * Revert "Added dropbox fix, potentially cursed" This reverts commit a709883366fbee813e839742125e70844672af29. --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Fix: Don't deploy foldables when clicking on items inside containers (#38709) * Fix * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Pressure Relief Valve (#36708) * initial system (this math is probably WRONG) * General code cleanup and OnExamined support (holy moly this code sucks) * UICode and related events foundation TODO: - Actually write the XAML UI and the underlying system - Un-shitcode the entire thing - Actually test everything... * Working UI code TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't. * Remove one TODO for unshitcoding the examine code * Add reminder yea * Make predicted (defenitely isn't) (also defenitely isn't a copypaste from pressure pump code) * It's predicted! TODO: - Give it snazzy predicted visuals! - Have a different field for pressure entry, lest it gets bulldozed every UI update. * Improve gas pressure relief valve UI TODO: Reminder to reduce amount of dirties using deltafields * Implement DirtyField prediction * Entity<T> cleanup A lot of Entity<T> conversions and lukewarm cleanup. Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell. * More cleanup and comments * Remove TODO comment on bulldozing window title * """refactoring""" - Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance. - More Entity<T> conversions because I like them. - Move UI creation handling over entirely to the ActivatableUI system. - Fix a hardcoded locale string (why????). * Add visuals * Revert debugging variable replacememt yea * Revert skissue * Remove unused using directives and remove TODO * Localize, cleanup, document * Fix adminlogging discrepancy * Add ability to construct, add guidebook entry * Clear up comment * Add guidebook tooltip to valve * Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor * Adds more input handling and adds autofill on open * Un-deepfry input validator shitcode Genuinely what was I smoking * improve visuals logic * Refactor again - Update math to the correct implementation - Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs * I'm sorry but I hate warnings * Remove unused using directive in AtmosphereSystem.Gases.cs * Review and cleanup * Lukewarm UI glossup * Maintainer for the upstream project btw * Remove redundant state sets and messy logic * Unduplicate valve updater code * Redo UI (im sorry Slarti) * run tests * Test refactored UI messaging * Second round of UI improvements - God please find a way to improve this system. Feels bad. * Update loop implementation * Further predict UI * Clear up SetToCurrentThreshold * cleanup * Update to master + pipe layers and bug fixes want to run tests * fixes * Deploy rename pipebomb * Documentation and requested changes * Rename the method that wiggled away * Undo rounding changes * Fix comment * Rename and cleanup * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fix TextLinkTag (#32203) * Adjust uplink buy button to be under item icon (#38596) * Adjusted uplink buy button to be under item icon * Put the discount subtext under the icon * Indent fixes, added margin --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Scurrets - Audio Improvements (#38482) * Scurret audio tuning * Add new sfx * Update sneezing sfx * YAML support * Rename a folder * make telesci wreck easier (#37569) rel * Validate `ShaderPrototype` IDs (#38728) * Convert all shader prototype string literals to protoids in overlays * Convert more shader prototype literal strings to protoids * Convert ValidatePrototypeId to ProtoId * Later * [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664) * fixed * clean up * orks fix smart * review fix 1 * more requested changes * less cursed * more descriptive description * better wording * Tiny Tiny Cleanup of the EyeClosingSystem. (#38734) Update EyeClosingSystem.cs * Fix human skin tone distribution (#38701) * fix: Use PredictedQueueDel for gib spell (#38729) * fix: don't default to uncharged sprite state for cells (#38730) * Fix Hristov description - remove inaccurate technical specs (#38746) - Removes inaccurate 'armor piercing 14.5mm shells' reference - Replaces it with a more funny description, matching the style of the other snipers and guns - Keeps ammunition type '.60 anti-materiel ammo' specification - Fixes issue #38590 Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br> * feat: allow mopping evaporating puddles (#38743) * Validate remaining `ProtoId` strings (#38747) Validate remaining ProtoId strings * Validate `ProtoId`s in tests (#38745) * Convert string literals to protoids in Content.Tests * Convert string literals to protoids or consts in Content.IntegrationTests * Fix linter failures Tricksy static using misled me * Cleanup warning in StomachSystem (#38748) you did not see this * Vox scars (#38592) * Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl * Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl" This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15. * locale key fix * Changed top surgery scar names to be more generalized * Adjusted face scars * Formatting fixes --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * UnlockNode command to LEC. (#38751) * commit * Update UnlockNodeCommand.cs * commit * move command locale to its own file. * Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Typofixes for figurine dialogue (#38737) * Typofixes for figurine dialogue * Forgot two * Janitor Tool: Wire Brush (#38667) * Wow! It's -brush- * spacing. * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fixed changes --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Minor escape menu UX improvements (#38650) * fix: spellbooks can have infinite charges (#38376) * fix: spellbooks can have infinite charges * refactor: indicate infinite spellbook charges with null Not sure if I like this much better...
309 lines
12 KiB
C#
309 lines
12 KiB
C#
using System.Numerics;
|
|
using Content.Client.Tabletop.UI;
|
|
using Content.Client.Viewport;
|
|
using Content.Shared.Tabletop;
|
|
using Content.Shared.Tabletop.Components;
|
|
using Content.Shared.Tabletop.Events;
|
|
using JetBrains.Annotations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.Input;
|
|
using Robust.Client.Player;
|
|
using Robust.Client.UserInterface;
|
|
using Robust.Client.UserInterface.CustomControls;
|
|
using Robust.Shared.Input;
|
|
using Robust.Shared.Input.Binding;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Timing;
|
|
using static Robust.Shared.Input.Binding.PointerInputCmdHandler;
|
|
|
|
namespace Content.Client.Tabletop
|
|
{
|
|
[UsedImplicitly]
|
|
public sealed class TabletopSystem : SharedTabletopSystem
|
|
{
|
|
[Dependency] private readonly IInputManager _inputManager = default!;
|
|
[Dependency] private readonly IUserInterfaceManager _uiManger = default!;
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
|
[Dependency] private readonly AppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
|
[Dependency] private readonly SpriteSystem _sprite = default!;
|
|
|
|
// Time in seconds to wait until sending the location of a dragged entity to the server again
|
|
private const float Delay = 1f / 10; // 10 Hz
|
|
|
|
private float _timePassed; // Time passed since last update sent to the server.
|
|
private EntityUid? _draggedEntity; // Entity being dragged
|
|
private ScalingViewport? _viewport; // Viewport currently being used
|
|
private DefaultWindow? _window; // Current open tabletop window (only allow one at a time)
|
|
private EntityUid? _table; // The table entity of the currently open game session
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
UpdatesOutsidePrediction = true;
|
|
|
|
CommandBinds.Builder
|
|
.Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false, true))
|
|
.Bind(EngineKeyFunctions.UseSecondary, new PointerInputCmdHandler(OnUseSecondary, true, true))
|
|
.Register<TabletopSystem>();
|
|
|
|
SubscribeNetworkEvent<TabletopPlayEvent>(OnTabletopPlay);
|
|
SubscribeLocalEvent<TabletopDraggableComponent, ComponentRemove>(HandleDraggableRemoved);
|
|
SubscribeLocalEvent<TabletopDraggableComponent, AppearanceChangeEvent>(OnAppearanceChange);
|
|
}
|
|
|
|
private void HandleDraggableRemoved(EntityUid uid, TabletopDraggableComponent component, ComponentRemove args)
|
|
{
|
|
if (_draggedEntity == uid)
|
|
StopDragging(false);
|
|
}
|
|
|
|
public override void FrameUpdate(float frameTime)
|
|
{
|
|
if (_window == null)
|
|
return;
|
|
|
|
// If there is no player entity, return
|
|
if (_playerManager.LocalEntity is not { } playerEntity)
|
|
return;
|
|
|
|
if (!CanSeeTable(playerEntity, _table))
|
|
{
|
|
StopDragging();
|
|
_window?.Close();
|
|
return;
|
|
}
|
|
|
|
// If no entity is being dragged or no viewport is clicked, return
|
|
if (_draggedEntity == null || _viewport == null) return;
|
|
|
|
if (!CanDrag(playerEntity, _draggedEntity.Value, out var draggableComponent))
|
|
{
|
|
StopDragging();
|
|
return;
|
|
}
|
|
|
|
// If the dragged entity has another dragging player, drop the item
|
|
// This should happen if the local player is dragging an item, and another player grabs it out of their hand
|
|
if (draggableComponent.DraggingPlayer != null &&
|
|
draggableComponent.DraggingPlayer != _playerManager.LocalSession!.UserId)
|
|
{
|
|
StopDragging(false);
|
|
return;
|
|
}
|
|
|
|
// Map mouse position to EntityCoordinates
|
|
var coords = _viewport.PixelToMap(_inputManager.MouseScreenPosition.Position);
|
|
|
|
// Clamp coordinates to viewport
|
|
var clampedCoords = ClampPositionToViewport(coords, _viewport);
|
|
if (clampedCoords.Equals(MapCoordinates.Nullspace)) return;
|
|
|
|
// Move the entity locally every update
|
|
_transformSystem.SetWorldPosition(_draggedEntity.Value, clampedCoords.Position);
|
|
|
|
// Increment total time passed
|
|
_timePassed += frameTime;
|
|
|
|
// Only send new position to server when Delay is reached
|
|
if (_timePassed >= Delay && _table != null)
|
|
{
|
|
RaisePredictiveEvent(new TabletopMoveEvent(GetNetEntity(_draggedEntity.Value), clampedCoords, GetNetEntity(_table.Value)));
|
|
_timePassed -= Delay;
|
|
}
|
|
}
|
|
|
|
#region Event handlers
|
|
|
|
/// <summary>
|
|
/// Runs when the player presses the "Play Game" verb on a tabletop game.
|
|
/// Opens a viewport where they can then play the game.
|
|
/// </summary>
|
|
private void OnTabletopPlay(TabletopPlayEvent msg)
|
|
{
|
|
// Close the currently opened window, if it exists
|
|
_window?.Close();
|
|
|
|
_table = GetEntity(msg.TableUid);
|
|
|
|
// Get the camera entity that the server has created for us
|
|
var camera = GetEntity(msg.CameraUid);
|
|
|
|
if (!TryComp<EyeComponent>(camera, out var eyeComponent))
|
|
{
|
|
// If there is no eye, print error and do not open any window
|
|
Log.Error("Camera entity does not have eye component!");
|
|
return;
|
|
}
|
|
|
|
// Create a window to contain the viewport
|
|
_window = new TabletopWindow(eyeComponent.Eye, (msg.Size.X, msg.Size.Y))
|
|
{
|
|
MinWidth = 500,
|
|
MinHeight = 436,
|
|
Title = msg.Title
|
|
};
|
|
|
|
_window.OnClose += OnWindowClose;
|
|
}
|
|
|
|
private void OnWindowClose()
|
|
{
|
|
if (_table != null)
|
|
{
|
|
RaiseNetworkEvent(new TabletopStopPlayingEvent(GetNetEntity(_table.Value)));
|
|
}
|
|
|
|
StopDragging();
|
|
_window = null;
|
|
}
|
|
|
|
private bool OnUse(in PointerInputCmdArgs args)
|
|
{
|
|
if (!_gameTiming.IsFirstTimePredicted)
|
|
return false;
|
|
|
|
return args.State switch
|
|
{
|
|
BoundKeyState.Down => OnMouseDown(args),
|
|
BoundKeyState.Up => OnMouseUp(args),
|
|
_ => false
|
|
};
|
|
}
|
|
private bool OnUseSecondary(in PointerInputCmdArgs args)
|
|
{
|
|
if (_draggedEntity != null && _table != null)
|
|
{
|
|
var ev = new TabletopRequestTakeOut
|
|
{
|
|
Entity = GetNetEntity(_draggedEntity.Value),
|
|
TableUid = GetNetEntity(_table.Value)
|
|
};
|
|
RaiseNetworkEvent(ev);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private bool OnMouseDown(in PointerInputCmdArgs args)
|
|
{
|
|
// Return if no player entity
|
|
if (_playerManager.LocalEntity is not { } playerEntity)
|
|
return false;
|
|
|
|
var entity = args.EntityUid;
|
|
|
|
// Return if can not see table or stunned/no hands
|
|
if (!CanSeeTable(playerEntity, _table) || !CanDrag(playerEntity, entity, out _))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Try to get the viewport under the cursor
|
|
if (_uiManger.MouseGetControl(args.ScreenCoordinates) as ScalingViewport is not { } viewport)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
StartDragging(entity, viewport);
|
|
return true;
|
|
}
|
|
|
|
private bool OnMouseUp(in PointerInputCmdArgs args)
|
|
{
|
|
StopDragging();
|
|
return false;
|
|
}
|
|
|
|
private void OnAppearanceChange(EntityUid uid, TabletopDraggableComponent comp, ref AppearanceChangeEvent args)
|
|
{
|
|
if (args.Sprite == null)
|
|
return;
|
|
|
|
// TODO: maybe this can work more nicely, by maybe only having to set the item to "being dragged", and have
|
|
// the appearance handle the rest
|
|
if (_appearance.TryGetData<Vector2>(uid, TabletopItemVisuals.Scale, out var scale, args.Component))
|
|
{
|
|
_sprite.SetScale((uid, args.Sprite), scale);
|
|
}
|
|
|
|
if (_appearance.TryGetData<int>(uid, TabletopItemVisuals.DrawDepth, out var drawDepth, args.Component))
|
|
{
|
|
_sprite.SetDrawDepth((uid, args.Sprite), drawDepth);
|
|
}
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Utility
|
|
|
|
/// <summary>
|
|
/// Start dragging an entity in a specific viewport.
|
|
/// </summary>
|
|
/// <param name="draggedEntity">The entity that we start dragging.</param>
|
|
/// <param name="viewport">The viewport in which we are dragging.</param>
|
|
private void StartDragging(EntityUid draggedEntity, ScalingViewport viewport)
|
|
{
|
|
RaisePredictiveEvent(new TabletopDraggingPlayerChangedEvent(GetNetEntity(draggedEntity), true));
|
|
|
|
_draggedEntity = draggedEntity;
|
|
_viewport = viewport;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Stop dragging the entity.
|
|
/// </summary>
|
|
/// <param name="broadcast">Whether to tell other clients that we stopped dragging.</param>
|
|
private void StopDragging(bool broadcast = true)
|
|
{
|
|
// Set the dragging player on the component to noone
|
|
if (broadcast && _draggedEntity != null && HasComp<TabletopDraggableComponent>(_draggedEntity.Value))
|
|
{
|
|
RaisePredictiveEvent(new TabletopMoveEvent(GetNetEntity(_draggedEntity.Value), Transforms.GetMapCoordinates(_draggedEntity.Value), GetNetEntity(_table!.Value)));
|
|
RaisePredictiveEvent(new TabletopDraggingPlayerChangedEvent(GetNetEntity(_draggedEntity.Value), false));
|
|
}
|
|
|
|
_draggedEntity = null;
|
|
_viewport = null;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Clamps coordinates within a viewport. ONLY WORKS FOR 90 DEGREE ROTATIONS!
|
|
/// </summary>
|
|
/// <param name="coordinates">The coordinates to be clamped.</param>
|
|
/// <param name="viewport">The viewport to clamp the coordinates to.</param>
|
|
/// <returns>Coordinates clamped to the viewport.</returns>
|
|
private static MapCoordinates ClampPositionToViewport(MapCoordinates coordinates, ScalingViewport viewport)
|
|
{
|
|
if (coordinates == MapCoordinates.Nullspace) return MapCoordinates.Nullspace;
|
|
|
|
var eye = viewport.Eye;
|
|
if (eye == null)
|
|
return MapCoordinates.Nullspace;
|
|
|
|
var size = (Vector2)viewport.ViewportSize / EyeManager.PixelsPerMeter; // Convert to tiles instead of pixels
|
|
var eyePosition = eye.Position.Position;
|
|
var eyeRotation = eye.Rotation;
|
|
var eyeScale = eye.Scale;
|
|
|
|
var min = (eyePosition - size / 2) / eyeScale;
|
|
var max = (eyePosition + size / 2) / eyeScale;
|
|
|
|
// If 90/270 degrees rotated, flip X and Y
|
|
if (MathHelper.CloseToPercent(eyeRotation.Degrees % 180d, 90d) || MathHelper.CloseToPercent(eyeRotation.Degrees % 180d, -90d))
|
|
{
|
|
(min.Y, min.X) = (min.X, min.Y);
|
|
(max.Y, max.X) = (max.X, max.Y);
|
|
}
|
|
|
|
var clampedPosition = Vector2.Clamp(coordinates.Position, min, max);
|
|
|
|
// Use the eye's map ID, we don't want anything moving to a different map!
|
|
return new MapCoordinates(clampedPosition, eye.Position.MapId);
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
}
|