2022-05-22 12:31:46 +10:00
|
|
|
using Content.Client.CombatMode;
|
2022-01-15 10:23:52 +11:00
|
|
|
using Content.Client.Outline;
|
2021-06-09 22:19:39 +02:00
|
|
|
using Content.Client.Viewport;
|
2021-11-07 01:05:51 +01:00
|
|
|
using Content.Shared.ActionBlocker;
|
2022-04-09 09:17:52 +12:00
|
|
|
using Content.Shared.CCVar;
|
2022-05-22 12:31:46 +10:00
|
|
|
using Content.Shared.CombatMode;
|
2021-06-09 22:19:39 +02:00
|
|
|
using Content.Shared.DragDrop;
|
|
|
|
|
using Content.Shared.Interaction;
|
2022-02-15 17:06:52 +13:00
|
|
|
using Content.Shared.Interaction.Events;
|
2021-09-26 15:18:45 +02:00
|
|
|
using Content.Shared.Popups;
|
2020-07-06 14:27:03 -07:00
|
|
|
using JetBrains.Annotations;
|
|
|
|
|
using Robust.Client.GameObjects;
|
2021-02-11 01:13:03 -08:00
|
|
|
using Robust.Client.Graphics;
|
|
|
|
|
using Robust.Client.Input;
|
2021-01-11 22:14:01 +11:00
|
|
|
using Robust.Client.Player;
|
2021-02-11 01:13:03 -08:00
|
|
|
using Robust.Client.State;
|
2022-04-09 09:17:52 +12:00
|
|
|
using Robust.Shared.Configuration;
|
2020-07-06 14:27:03 -07:00
|
|
|
using Robust.Shared.Input;
|
|
|
|
|
using Robust.Shared.Input.Binding;
|
|
|
|
|
using Robust.Shared.Prototypes;
|
2021-03-15 21:55:49 +01:00
|
|
|
using Robust.Shared.Utility;
|
2021-06-09 22:19:39 +02:00
|
|
|
using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
|
2020-07-06 14:27:03 -07:00
|
|
|
|
2021-06-09 22:19:39 +02:00
|
|
|
namespace Content.Client.DragDrop
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Handles clientside drag and drop logic
|
|
|
|
|
/// </summary>
|
|
|
|
|
[UsedImplicitly]
|
2022-02-16 00:23:23 -07:00
|
|
|
public sealed class DragDropSystem : SharedDragDropSystem
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
2020-08-24 14:10:28 +02:00
|
|
|
[Dependency] private readonly IStateManager _stateManager = default!;
|
2021-01-11 22:14:01 +11:00
|
|
|
[Dependency] private readonly IInputManager _inputManager = default!;
|
2020-08-24 14:10:28 +02:00
|
|
|
[Dependency] private readonly IEyeManager _eyeManager = default!;
|
2021-01-11 22:14:01 +11:00
|
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
2020-08-24 14:10:28 +02:00
|
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
2022-04-09 09:17:52 +12:00
|
|
|
[Dependency] private readonly IConfigurationManager _cfgMan = default!;
|
2022-01-15 10:23:52 +11:00
|
|
|
[Dependency] private readonly InteractionOutlineSystem _outline = default!;
|
2021-07-26 12:58:17 +02:00
|
|
|
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
2022-05-22 12:31:46 +10:00
|
|
|
[Dependency] private readonly CombatModeSystem _combatMode = default!;
|
2021-07-26 12:58:17 +02:00
|
|
|
[Dependency] private readonly InputSystem _inputSystem = default!;
|
2021-11-07 01:05:51 +01:00
|
|
|
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
2020-08-24 14:10:28 +02:00
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
// how often to recheck possible targets (prevents calling expensive
|
|
|
|
|
// check logic each update)
|
|
|
|
|
private const float TargetRecheckInterval = 0.25f;
|
|
|
|
|
|
|
|
|
|
// if a drag ends up being cancelled and it has been under this
|
|
|
|
|
// amount of time since the mousedown, we will "replay" the original
|
|
|
|
|
// mousedown event so it can be treated like a regular click
|
|
|
|
|
private const float MaxMouseDownTimeForReplayingClick = 0.85f;
|
|
|
|
|
|
|
|
|
|
private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
|
|
|
|
|
private const string ShaderDropTargetOutOfRange = "SelectionOutline";
|
|
|
|
|
|
|
|
|
|
// entity performing the drag action
|
2021-01-11 22:14:01 +11:00
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
private EntityUid _dragger;
|
2020-11-27 11:00:49 +01:00
|
|
|
private readonly List<IDraggable> _draggables = new();
|
2021-12-05 18:09:01 +01:00
|
|
|
private EntityUid _dragShadow;
|
2021-01-11 22:14:01 +11:00
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
// time since mouse down over the dragged entity
|
|
|
|
|
private float _mouseDownTime;
|
|
|
|
|
// how much time since last recheck of all possible targets
|
|
|
|
|
private float _targetRecheckTime;
|
|
|
|
|
// reserved initial mousedown event so we can replay it if no drag ends up being performed
|
|
|
|
|
private PointerInputCmdHandler.PointerInputCmdArgs? _savedMouseDown;
|
|
|
|
|
// whether we are currently replaying the original mouse down, so we
|
|
|
|
|
// can ignore any events sent to this system
|
|
|
|
|
private bool _isReplaying;
|
|
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
private DragDropHelper<EntityUid> _dragDropHelper = default!;
|
2020-12-13 14:28:20 -08:00
|
|
|
|
2021-01-11 22:14:01 +11:00
|
|
|
private ShaderInstance? _dropTargetInRangeShader;
|
|
|
|
|
private ShaderInstance? _dropTargetOutOfRangeShader;
|
2020-07-06 14:27:03 -07:00
|
|
|
|
2021-01-11 22:14:01 +11:00
|
|
|
private readonly List<ISpriteComponent> _highlightedSprites = new();
|
2020-07-06 14:27:03 -07:00
|
|
|
|
|
|
|
|
public override void Initialize()
|
|
|
|
|
{
|
2021-12-30 03:12:04 +01:00
|
|
|
UpdatesOutsidePrediction = true;
|
|
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
_dragDropHelper = new DragDropHelper<EntityUid>(OnBeginDrag, OnContinueDrag, OnEndDrag);
|
2022-04-09 09:17:52 +12:00
|
|
|
_cfgMan.OnValueChanged(CCVars.DragDropDeadZone, SetDeadZone, true);
|
2020-07-06 14:27:03 -07:00
|
|
|
|
|
|
|
|
_dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
|
|
|
|
|
_dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
|
|
|
|
|
// needs to fire on mouseup and mousedown so we can detect a drag / drop
|
|
|
|
|
CommandBinds.Builder
|
2022-03-09 20:12:17 +13:00
|
|
|
.BindBefore(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false), new[] { typeof(SharedInteractionSystem) })
|
2020-07-06 14:27:03 -07:00
|
|
|
.Register<DragDropSystem>();
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-09 09:17:52 +12:00
|
|
|
private void SetDeadZone(float deadZone)
|
|
|
|
|
{
|
|
|
|
|
_dragDropHelper.Deadzone = deadZone;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
public override void Shutdown()
|
|
|
|
|
{
|
2022-04-09 09:17:52 +12:00
|
|
|
_cfgMan.UnsubValueChanged(CCVars.DragDropDeadZone, SetDeadZone);
|
2020-12-13 14:28:20 -08:00
|
|
|
_dragDropHelper.EndDrag();
|
2020-07-06 14:27:03 -07:00
|
|
|
CommandBinds.Unregister<DragDropSystem>();
|
|
|
|
|
base.Shutdown();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private bool OnUse(in PointerInputCmdHandler.PointerInputCmdArgs args)
|
|
|
|
|
{
|
|
|
|
|
// not currently predicted
|
|
|
|
|
if (_inputSystem.Predicted) return false;
|
|
|
|
|
|
|
|
|
|
// currently replaying a saved click, don't handle this because
|
|
|
|
|
// we already decided this click doesn't represent an actual drag attempt
|
|
|
|
|
if (_isReplaying) return false;
|
|
|
|
|
|
|
|
|
|
if (args.State == BoundKeyState.Down)
|
|
|
|
|
{
|
|
|
|
|
return OnUseMouseDown(args);
|
|
|
|
|
}
|
|
|
|
|
else if (args.State == BoundKeyState.Up)
|
|
|
|
|
{
|
|
|
|
|
return OnUseMouseUp(args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private bool OnUseMouseDown(in PointerInputCmdHandler.PointerInputCmdArgs args)
|
|
|
|
|
{
|
2022-05-22 12:31:46 +10:00
|
|
|
if (args.Session?.AttachedEntity is not {Valid: true} dragger ||
|
|
|
|
|
_combatMode.IsInCombatMode())
|
2021-02-27 04:12:09 +01:00
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
// cancel any current dragging if there is one (shouldn't be because they would've had to have lifted
|
|
|
|
|
// the mouse, canceling the drag, but just being cautious)
|
2020-12-13 14:28:20 -08:00
|
|
|
_dragDropHelper.EndDrag();
|
2020-07-06 14:27:03 -07:00
|
|
|
|
|
|
|
|
// possibly initiating a drag
|
|
|
|
|
// check if the clicked entity is draggable
|
2021-12-05 18:09:01 +01:00
|
|
|
if (!EntityManager.EntityExists(args.EntityUid))
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
2021-02-27 04:12:09 +01:00
|
|
|
return false;
|
|
|
|
|
}
|
Add the trash man (#1367)
* Add disposal.rsi
* Rename disposal resource to disposal.rsi and create basic components
* Add disposal nets
* Add pushing entities along the disposal network
* Add disposal unit
* Unregister disposable component
* Add flush and selfinsert verbs to disposal unit
* Add gradual disposals movement
* Fix being able to walk through space for a while after exiting disposals
* Multiply disposals speed by 10
And fix early returns when moving an entity
* Rename Disposable component to InDisposals
* Remove DisposalNet and add on anchor events
* Remove anchored events, moved to interfaces
* Code cleanup
* Fix adjacent tubes' connections when a tube connects
* Fix jittery movement in disposals
* Remove Logger.Debug call
* Move disposals updates to InDisposalsComponent
* Fix adjacent connection valid directions check
* Disposal tubes now throw you out where they are facing
* Add disposal unit exit cooldown
* Set different disposal pipe sprite state depending on anchored value
* Add recycler
* Add recycler animation
* Add bloody texture to the recycler when grinding a living being
* Add PowerDevice component to the disposal unit
* Made the Recycler center on the grid
* Add disposal junction
* Add picking a random direction if junction is entered from the output side
* Add disposal flush and clang sounds
Taken from VGStation
* Move disposal flush and clang sound file names to exposedata
* Add disposalsmap.yml to test with
* Add summaries to DisposalUnit fields
* Add sideDegrees yaml property to disposal junctions
* Fix outdated usings
* Add conveyor resources
* Update RobustToolbox
* More merge fixes
Add conveyor collision masks
* Add ConveyorComponent
* Fix crash when reentering a body
* Merge branch 'master' into disposals-1147
* Reduce recycler bounds, set hard to false, add summary and expose "safe" to yaml
* Move IAnchored and IUnAnchored to AnchorableComponent
* Update power components and remove old disposals map
* Remove redundant sprite layers
* Add tile pry command
* Fix tilepry command
* Fix DisposalJunctionComponent missing a component reference
* Add anchor by radius command
* Add Y-Junctions
* Add disposal bend
* Add unanchor command
* Change DisposalJunction prototypes to specify their angles
* Fix disposal units being hidden below the floor
* Removed IAnhored and IUnAnchored interfaces
* Replace CanBeNull annotation with nullable reference types
* Update showwires command
* Add recycler recycling items
* Added angle and speed properties to ConveyorComponent
* Fix conveyort textures
* Add animation to the disposal unit
* Fix anchor and unanchor commands sometimes not finding any entities
* Fix not reading flush_time from disposal unit prototype
* Fix merge conflict wrong using
* Fix disposal, recycling and conveyor texture paths
Delete diverters
* Update visualizer names
* Add DisposableComponent, change drag and drop to work with multiple components
Ignoreinsideblocker client side for drag and drops, like on the server
Add more comments
* Add conveyor belts properly moving entities on top
* Anchorr wires
* Change conveyor bounds to 0.49
* Anchor catwalks, airlocks, gravity generators, low walls, wires and windows
* Add starting/stopping conveyors
* Add reversed conveyors
* Add conveyor switches
* Move InDisposalsComponent code to DisposableComponent
* Add ExitVector method to tubes
* Fix not updating tube references when disconnecting one
* Replace IoCManager call with dependency
* Add tubes disconnecting if they move too far apart from one another
* Move disposals action blocking to shared
* Add rotating and flipping pipes
* Make conveyor intersection calculations approximate
* Fix 1% chance of the server crashing when initializing the map
Happens when emergency lockers remove themselves
* Add disposal unit interface
* Make disposal units refuse items if not powered
* Make disposal tubes hide only when anchored
* Make disposal junction arrows visible to mere mortals
* Add disposal tubes breaking
* Add tubeconnections command
* Add missing verb attribute
* Add flipped disposal junction
* Add ids and linking to conveyors and switches
* Add conveyor switch prying and placing
* Add anchoring conveyor switches and refactor placing them
* Add missing serializable attributes from DisposableComponentState
* Make conveyor speed VV ReadWrite
* Change drawdepth of conveyors to FloorObjects
* Make conveyor anchored check consistent
* Remove anchoring interaction from switches
* Add conveyor switch id syncing and move switches slightly when pried
* Make entities in containers not able to be moved by conveyors
* Add conveyor and switches loose textures
* Merge conflict fixes
* Add disposal unit test
* Add flushing test to disposal unit test
* Add disposal unit flush fail test
* Add disposals to the saltern map
* Fix saltern disposal junctions
* Add power checks to the recycler
* Fix disposal unit placement in maintenance closet
* Remove disposal junctions from saltern
* Readd junctions to saltern
* Add the chemmaster to saltern at the request of Ike
* Move the chemistry disposal unit
* Fix casing of disposal flush sound
* More merge conflict fixes
* Fix a compiler warning.
* Remove popup invocation from buckle
* Remove showPopup parameter from InteractionChecks
* Remove unnecessary physics components
Fixes the physics system dying
* Replace PhysicsComponent usages with CollidableComponent
* Update existing code for the new controller system
* Change conveyors to use a VirtualController instead of teleporting the entity
* Remove visualizer 2d suffix and update physics code
* Transition code to new controller system
* Fix shuttles not moving
* Fix throwing
* Fix guns
* Change hands to use physics.Stop() and remove item fumble method
* Add syncing conveyor switches states
* Fix the recycler wanting to be a conveyor too hard
* Fix showwires > showsubfloor rename in mapping command
* Fix wifi air conveyors
* Fix test error
* Add showsubfloorforever command
Changes drawdepth of the relevant entities
* Disable opening the disposal unit interface while inside
* Add closing the disposal unit interface when getting inside
* Add closing the interface when the disposal unit component is removed
* Add removing entities on disposal unit component removal
* Delay disposal unit flush and fix serialization
* Implement pressure in disposal units
* Fix chain engaging a disposal unit
* Implement states to the disposal unit
* Fix missing imports from merge conflict
* Update Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address some reviews
* Fix za buildo
* Use container helper to detach disposables
* Make conveyors use the construction system
* Make conveyor groups and syncing sane
* Make flip flip
brave
* Add activate interface to conveyor switches
* Fix not removing the switch from its group when it's deleted
* Fix not registering conveyors and switches on initialize
* Stop using 0 as null
* Disconnect conveyors and switches when disposing of a group
* Make disposal units not able to be exited when flushing
* Make disposal units flush after a configurable 30 seconds
* Add handle and light layers to the disposal unit
* Merge engaging and flushing
* Update saltern.yml
* I love using 0 as null
* Make disposal unit visual layers make sense
* Remove duplicate remove method in disposal units and update light
* Replace DisposableComponent with disposal holders
* Fix disposal holders deleting their contents on deletion
* Account for disposal unit pressure in tests and make a failed flush autoengage
* Rename disposable to holder
* Fix junction connections
* Disable self insert and flush verbs when inside a disposal unit
* Fix spamming the engage button making the animation reset
* Make the recycler take materials into account properly
Fix cablestack1 not existing
* Merge conflict fixes
* Fix pipes not being saved anchored
* Change conveyors and groups to not use an id
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-07-30 23:45:28 +02:00
|
|
|
|
2021-02-27 04:12:09 +01:00
|
|
|
// check if the entity is reachable
|
2021-12-05 18:09:01 +01:00
|
|
|
if (!_interactionSystem.InRangeUnobstructed(dragger, args.EntityUid))
|
2021-02-27 04:12:09 +01:00
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var canDrag = false;
|
2021-12-05 18:09:01 +01:00
|
|
|
foreach (var draggable in EntityManager.GetComponents<IDraggable>(args.EntityUid))
|
2021-02-27 04:12:09 +01:00
|
|
|
{
|
2021-12-05 18:09:01 +01:00
|
|
|
var dragEventArgs = new StartDragDropEvent(dragger, args.EntityUid);
|
Add the trash man (#1367)
* Add disposal.rsi
* Rename disposal resource to disposal.rsi and create basic components
* Add disposal nets
* Add pushing entities along the disposal network
* Add disposal unit
* Unregister disposable component
* Add flush and selfinsert verbs to disposal unit
* Add gradual disposals movement
* Fix being able to walk through space for a while after exiting disposals
* Multiply disposals speed by 10
And fix early returns when moving an entity
* Rename Disposable component to InDisposals
* Remove DisposalNet and add on anchor events
* Remove anchored events, moved to interfaces
* Code cleanup
* Fix adjacent tubes' connections when a tube connects
* Fix jittery movement in disposals
* Remove Logger.Debug call
* Move disposals updates to InDisposalsComponent
* Fix adjacent connection valid directions check
* Disposal tubes now throw you out where they are facing
* Add disposal unit exit cooldown
* Set different disposal pipe sprite state depending on anchored value
* Add recycler
* Add recycler animation
* Add bloody texture to the recycler when grinding a living being
* Add PowerDevice component to the disposal unit
* Made the Recycler center on the grid
* Add disposal junction
* Add picking a random direction if junction is entered from the output side
* Add disposal flush and clang sounds
Taken from VGStation
* Move disposal flush and clang sound file names to exposedata
* Add disposalsmap.yml to test with
* Add summaries to DisposalUnit fields
* Add sideDegrees yaml property to disposal junctions
* Fix outdated usings
* Add conveyor resources
* Update RobustToolbox
* More merge fixes
Add conveyor collision masks
* Add ConveyorComponent
* Fix crash when reentering a body
* Merge branch 'master' into disposals-1147
* Reduce recycler bounds, set hard to false, add summary and expose "safe" to yaml
* Move IAnchored and IUnAnchored to AnchorableComponent
* Update power components and remove old disposals map
* Remove redundant sprite layers
* Add tile pry command
* Fix tilepry command
* Fix DisposalJunctionComponent missing a component reference
* Add anchor by radius command
* Add Y-Junctions
* Add disposal bend
* Add unanchor command
* Change DisposalJunction prototypes to specify their angles
* Fix disposal units being hidden below the floor
* Removed IAnhored and IUnAnchored interfaces
* Replace CanBeNull annotation with nullable reference types
* Update showwires command
* Add recycler recycling items
* Added angle and speed properties to ConveyorComponent
* Fix conveyort textures
* Add animation to the disposal unit
* Fix anchor and unanchor commands sometimes not finding any entities
* Fix not reading flush_time from disposal unit prototype
* Fix merge conflict wrong using
* Fix disposal, recycling and conveyor texture paths
Delete diverters
* Update visualizer names
* Add DisposableComponent, change drag and drop to work with multiple components
Ignoreinsideblocker client side for drag and drops, like on the server
Add more comments
* Add conveyor belts properly moving entities on top
* Anchorr wires
* Change conveyor bounds to 0.49
* Anchor catwalks, airlocks, gravity generators, low walls, wires and windows
* Add starting/stopping conveyors
* Add reversed conveyors
* Add conveyor switches
* Move InDisposalsComponent code to DisposableComponent
* Add ExitVector method to tubes
* Fix not updating tube references when disconnecting one
* Replace IoCManager call with dependency
* Add tubes disconnecting if they move too far apart from one another
* Move disposals action blocking to shared
* Add rotating and flipping pipes
* Make conveyor intersection calculations approximate
* Fix 1% chance of the server crashing when initializing the map
Happens when emergency lockers remove themselves
* Add disposal unit interface
* Make disposal units refuse items if not powered
* Make disposal tubes hide only when anchored
* Make disposal junction arrows visible to mere mortals
* Add disposal tubes breaking
* Add tubeconnections command
* Add missing verb attribute
* Add flipped disposal junction
* Add ids and linking to conveyors and switches
* Add conveyor switch prying and placing
* Add anchoring conveyor switches and refactor placing them
* Add missing serializable attributes from DisposableComponentState
* Make conveyor speed VV ReadWrite
* Change drawdepth of conveyors to FloorObjects
* Make conveyor anchored check consistent
* Remove anchoring interaction from switches
* Add conveyor switch id syncing and move switches slightly when pried
* Make entities in containers not able to be moved by conveyors
* Add conveyor and switches loose textures
* Merge conflict fixes
* Add disposal unit test
* Add flushing test to disposal unit test
* Add disposal unit flush fail test
* Add disposals to the saltern map
* Fix saltern disposal junctions
* Add power checks to the recycler
* Fix disposal unit placement in maintenance closet
* Remove disposal junctions from saltern
* Readd junctions to saltern
* Add the chemmaster to saltern at the request of Ike
* Move the chemistry disposal unit
* Fix casing of disposal flush sound
* More merge conflict fixes
* Fix a compiler warning.
* Remove popup invocation from buckle
* Remove showPopup parameter from InteractionChecks
* Remove unnecessary physics components
Fixes the physics system dying
* Replace PhysicsComponent usages with CollidableComponent
* Update existing code for the new controller system
* Change conveyors to use a VirtualController instead of teleporting the entity
* Remove visualizer 2d suffix and update physics code
* Transition code to new controller system
* Fix shuttles not moving
* Fix throwing
* Fix guns
* Change hands to use physics.Stop() and remove item fumble method
* Add syncing conveyor switches states
* Fix the recycler wanting to be a conveyor too hard
* Fix showwires > showsubfloor rename in mapping command
* Fix wifi air conveyors
* Fix test error
* Add showsubfloorforever command
Changes drawdepth of the relevant entities
* Disable opening the disposal unit interface while inside
* Add closing the disposal unit interface when getting inside
* Add closing the interface when the disposal unit component is removed
* Add removing entities on disposal unit component removal
* Delay disposal unit flush and fix serialization
* Implement pressure in disposal units
* Fix chain engaging a disposal unit
* Implement states to the disposal unit
* Fix missing imports from merge conflict
* Update Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address some reviews
* Fix za buildo
* Use container helper to detach disposables
* Make conveyors use the construction system
* Make conveyor groups and syncing sane
* Make flip flip
brave
* Add activate interface to conveyor switches
* Fix not removing the switch from its group when it's deleted
* Fix not registering conveyors and switches on initialize
* Stop using 0 as null
* Disconnect conveyors and switches when disposing of a group
* Make disposal units not able to be exited when flushing
* Make disposal units flush after a configurable 30 seconds
* Add handle and light layers to the disposal unit
* Merge engaging and flushing
* Update saltern.yml
* I love using 0 as null
* Make disposal unit visual layers make sense
* Remove duplicate remove method in disposal units and update light
* Replace DisposableComponent with disposal holders
* Fix disposal holders deleting their contents on deletion
* Account for disposal unit pressure in tests and make a failed flush autoengage
* Rename disposable to holder
* Fix junction connections
* Disable self insert and flush verbs when inside a disposal unit
* Fix spamming the engage button making the animation reset
* Make the recycler take materials into account properly
Fix cablestack1 not existing
* Merge conflict fixes
* Fix pipes not being saved anchored
* Change conveyors and groups to not use an id
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-07-30 23:45:28 +02:00
|
|
|
|
2021-02-27 04:12:09 +01:00
|
|
|
if (!draggable.CanStartDrag(dragEventArgs))
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
2021-02-27 04:12:09 +01:00
|
|
|
continue;
|
2020-12-13 14:28:20 -08:00
|
|
|
}
|
|
|
|
|
|
2021-02-27 04:12:09 +01:00
|
|
|
_draggables.Add(draggable);
|
|
|
|
|
canDrag = true;
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
|
|
|
|
|
2021-02-27 04:12:09 +01:00
|
|
|
if (!canDrag)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// wait to initiate a drag
|
2021-12-05 18:09:01 +01:00
|
|
|
_dragDropHelper.MouseDown(args.EntityUid);
|
2021-02-27 04:12:09 +01:00
|
|
|
_dragger = dragger;
|
|
|
|
|
_mouseDownTime = 0;
|
|
|
|
|
|
|
|
|
|
// don't want anything else to process the click,
|
|
|
|
|
// but we will save the event so we can "re-play" it if this drag does
|
|
|
|
|
// not turn into an actual drag so the click can be handled normally
|
|
|
|
|
_savedMouseDown = args;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
private bool OnBeginDrag()
|
|
|
|
|
{
|
2021-12-09 12:29:27 +01:00
|
|
|
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged))
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
|
|
|
|
// something happened to the clicked entity or we moved the mouse off the target so
|
|
|
|
|
// we shouldn't replay the original click
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
if (EntityManager.TryGetComponent<SpriteComponent?>(_dragDropHelper.Dragged, out var draggedSprite))
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
|
|
|
|
// pop up drag shadow under mouse
|
|
|
|
|
var mousePos = _eyeManager.ScreenToMap(_dragDropHelper.MouseScreenPosition);
|
|
|
|
|
_dragShadow = EntityManager.SpawnEntity("dragshadow", mousePos);
|
2021-12-05 18:09:01 +01:00
|
|
|
var dragSprite = EntityManager.GetComponent<SpriteComponent>(_dragShadow);
|
2020-12-13 14:28:20 -08:00
|
|
|
dragSprite.CopyFrom(draggedSprite);
|
|
|
|
|
dragSprite.RenderOrder = EntityManager.CurrentTick.Value;
|
|
|
|
|
dragSprite.Color = dragSprite.Color.WithAlpha(0.7f);
|
|
|
|
|
// keep it on top of everything
|
|
|
|
|
dragSprite.DrawDepth = (int) DrawDepth.Overlays;
|
2021-10-28 13:19:38 +02:00
|
|
|
if (!dragSprite.NoRotation)
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
2021-12-05 18:09:01 +01:00
|
|
|
EntityManager.GetComponent<TransformComponent>(_dragShadow).WorldRotation = EntityManager.GetComponent<TransformComponent>(_dragDropHelper.Dragged).WorldRotation;
|
2020-12-13 14:28:20 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
HighlightTargets();
|
2022-02-26 18:24:08 +13:00
|
|
|
_outline.SetEnabled(false);
|
2020-12-13 14:28:20 -08:00
|
|
|
|
|
|
|
|
// drag initiated
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Logger.Warning("Unable to display drag shadow for {0} because it" +
|
2021-12-05 18:09:01 +01:00
|
|
|
" has no sprite component.", EntityManager.GetComponent<MetaDataComponent>(_dragDropHelper.Dragged).EntityName);
|
2020-12-13 14:28:20 -08:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private bool OnContinueDrag(float frameTime)
|
|
|
|
|
{
|
2022-05-22 12:31:46 +10:00
|
|
|
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged) ||
|
|
|
|
|
_combatMode.IsInCombatMode())
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2021-03-15 21:55:49 +01:00
|
|
|
|
|
|
|
|
DebugTools.AssertNotNull(_dragger);
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
// still in range of the thing we are dragging?
|
2021-12-05 18:09:01 +01:00
|
|
|
if (!_interactionSystem.InRangeUnobstructed(_dragger, _dragDropHelper.Dragged))
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: would use MapPosition instead if it had a setter, but it has no setter.
|
|
|
|
|
// is that intentional, or should we add a setter for Transform.MapPosition?
|
2021-12-05 18:09:01 +01:00
|
|
|
if (_dragShadow == default)
|
2021-01-11 22:14:01 +11:00
|
|
|
return false;
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
_targetRecheckTime += frameTime;
|
|
|
|
|
if (_targetRecheckTime > TargetRecheckInterval)
|
|
|
|
|
{
|
|
|
|
|
HighlightTargets();
|
2022-03-01 01:11:25 +11:00
|
|
|
_targetRecheckTime -= TargetRecheckInterval;
|
2020-12-13 14:28:20 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void OnEndDrag()
|
|
|
|
|
{
|
|
|
|
|
RemoveHighlights();
|
2021-12-05 18:09:01 +01:00
|
|
|
if (_dragShadow != default)
|
2020-12-13 14:28:20 -08:00
|
|
|
{
|
|
|
|
|
EntityManager.DeleteEntity(_dragShadow);
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-26 18:24:08 +13:00
|
|
|
_outline.SetEnabled(true);
|
2021-12-05 18:09:01 +01:00
|
|
|
_dragShadow = default;
|
2020-12-13 14:28:20 -08:00
|
|
|
_draggables.Clear();
|
2021-12-05 18:09:01 +01:00
|
|
|
_dragger = default;
|
2020-12-13 14:28:20 -08:00
|
|
|
_mouseDownTime = 0;
|
|
|
|
|
_savedMouseDown = null;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
private bool OnUseMouseUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
|
|
|
|
|
{
|
2021-12-05 18:09:01 +01:00
|
|
|
if (_dragDropHelper.IsDragging == false || _dragDropHelper.Dragged == default)
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
2020-12-13 14:28:20 -08:00
|
|
|
// haven't started the drag yet, quick mouseup, definitely treat it as a normal click by
|
|
|
|
|
// replaying the original cmd
|
|
|
|
|
if (_savedMouseDown.HasValue && _mouseDownTime < MaxMouseDownTimeForReplayingClick)
|
|
|
|
|
{
|
|
|
|
|
var savedValue = _savedMouseDown.Value;
|
|
|
|
|
_isReplaying = true;
|
|
|
|
|
// adjust the timing info based on the current tick so it appears as if it happened now
|
|
|
|
|
var replayMsg = savedValue.OriginalMessage;
|
|
|
|
|
var adjustedInputMsg = new FullInputCmdMessage(args.OriginalMessage.Tick, args.OriginalMessage.SubTick,
|
|
|
|
|
replayMsg.InputFunctionId, replayMsg.State, replayMsg.Coordinates, replayMsg.ScreenCoordinates, replayMsg.Uid);
|
|
|
|
|
|
2021-01-11 22:14:01 +11:00
|
|
|
if (savedValue.Session != null)
|
|
|
|
|
{
|
|
|
|
|
_inputSystem.HandleInputCommand(savedValue.Session, EngineKeyFunctions.Use, adjustedInputMsg, true);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
_isReplaying = false;
|
|
|
|
|
}
|
|
|
|
|
_dragDropHelper.EndDrag();
|
2020-07-06 14:27:03 -07:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
if (_dragger == default)
|
2021-01-11 22:14:01 +11:00
|
|
|
{
|
|
|
|
|
_dragDropHelper.EndDrag();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2020-07-06 14:27:03 -07:00
|
|
|
|
2022-01-15 10:23:52 +11:00
|
|
|
IList<EntityUid> entities;
|
|
|
|
|
|
|
|
|
|
if (_stateManager.CurrentState is GameScreen screen)
|
|
|
|
|
{
|
|
|
|
|
entities = screen.GetEntitiesUnderPosition(args.Coordinates);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
entities = Array.Empty<EntityUid>();
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-11 22:14:01 +11:00
|
|
|
var outOfRange = false;
|
Add the trash man (#1367)
* Add disposal.rsi
* Rename disposal resource to disposal.rsi and create basic components
* Add disposal nets
* Add pushing entities along the disposal network
* Add disposal unit
* Unregister disposable component
* Add flush and selfinsert verbs to disposal unit
* Add gradual disposals movement
* Fix being able to walk through space for a while after exiting disposals
* Multiply disposals speed by 10
And fix early returns when moving an entity
* Rename Disposable component to InDisposals
* Remove DisposalNet and add on anchor events
* Remove anchored events, moved to interfaces
* Code cleanup
* Fix adjacent tubes' connections when a tube connects
* Fix jittery movement in disposals
* Remove Logger.Debug call
* Move disposals updates to InDisposalsComponent
* Fix adjacent connection valid directions check
* Disposal tubes now throw you out where they are facing
* Add disposal unit exit cooldown
* Set different disposal pipe sprite state depending on anchored value
* Add recycler
* Add recycler animation
* Add bloody texture to the recycler when grinding a living being
* Add PowerDevice component to the disposal unit
* Made the Recycler center on the grid
* Add disposal junction
* Add picking a random direction if junction is entered from the output side
* Add disposal flush and clang sounds
Taken from VGStation
* Move disposal flush and clang sound file names to exposedata
* Add disposalsmap.yml to test with
* Add summaries to DisposalUnit fields
* Add sideDegrees yaml property to disposal junctions
* Fix outdated usings
* Add conveyor resources
* Update RobustToolbox
* More merge fixes
Add conveyor collision masks
* Add ConveyorComponent
* Fix crash when reentering a body
* Merge branch 'master' into disposals-1147
* Reduce recycler bounds, set hard to false, add summary and expose "safe" to yaml
* Move IAnchored and IUnAnchored to AnchorableComponent
* Update power components and remove old disposals map
* Remove redundant sprite layers
* Add tile pry command
* Fix tilepry command
* Fix DisposalJunctionComponent missing a component reference
* Add anchor by radius command
* Add Y-Junctions
* Add disposal bend
* Add unanchor command
* Change DisposalJunction prototypes to specify their angles
* Fix disposal units being hidden below the floor
* Removed IAnhored and IUnAnchored interfaces
* Replace CanBeNull annotation with nullable reference types
* Update showwires command
* Add recycler recycling items
* Added angle and speed properties to ConveyorComponent
* Fix conveyort textures
* Add animation to the disposal unit
* Fix anchor and unanchor commands sometimes not finding any entities
* Fix not reading flush_time from disposal unit prototype
* Fix merge conflict wrong using
* Fix disposal, recycling and conveyor texture paths
Delete diverters
* Update visualizer names
* Add DisposableComponent, change drag and drop to work with multiple components
Ignoreinsideblocker client side for drag and drops, like on the server
Add more comments
* Add conveyor belts properly moving entities on top
* Anchorr wires
* Change conveyor bounds to 0.49
* Anchor catwalks, airlocks, gravity generators, low walls, wires and windows
* Add starting/stopping conveyors
* Add reversed conveyors
* Add conveyor switches
* Move InDisposalsComponent code to DisposableComponent
* Add ExitVector method to tubes
* Fix not updating tube references when disconnecting one
* Replace IoCManager call with dependency
* Add tubes disconnecting if they move too far apart from one another
* Move disposals action blocking to shared
* Add rotating and flipping pipes
* Make conveyor intersection calculations approximate
* Fix 1% chance of the server crashing when initializing the map
Happens when emergency lockers remove themselves
* Add disposal unit interface
* Make disposal units refuse items if not powered
* Make disposal tubes hide only when anchored
* Make disposal junction arrows visible to mere mortals
* Add disposal tubes breaking
* Add tubeconnections command
* Add missing verb attribute
* Add flipped disposal junction
* Add ids and linking to conveyors and switches
* Add conveyor switch prying and placing
* Add anchoring conveyor switches and refactor placing them
* Add missing serializable attributes from DisposableComponentState
* Make conveyor speed VV ReadWrite
* Change drawdepth of conveyors to FloorObjects
* Make conveyor anchored check consistent
* Remove anchoring interaction from switches
* Add conveyor switch id syncing and move switches slightly when pried
* Make entities in containers not able to be moved by conveyors
* Add conveyor and switches loose textures
* Merge conflict fixes
* Add disposal unit test
* Add flushing test to disposal unit test
* Add disposal unit flush fail test
* Add disposals to the saltern map
* Fix saltern disposal junctions
* Add power checks to the recycler
* Fix disposal unit placement in maintenance closet
* Remove disposal junctions from saltern
* Readd junctions to saltern
* Add the chemmaster to saltern at the request of Ike
* Move the chemistry disposal unit
* Fix casing of disposal flush sound
* More merge conflict fixes
* Fix a compiler warning.
* Remove popup invocation from buckle
* Remove showPopup parameter from InteractionChecks
* Remove unnecessary physics components
Fixes the physics system dying
* Replace PhysicsComponent usages with CollidableComponent
* Update existing code for the new controller system
* Change conveyors to use a VirtualController instead of teleporting the entity
* Remove visualizer 2d suffix and update physics code
* Transition code to new controller system
* Fix shuttles not moving
* Fix throwing
* Fix guns
* Change hands to use physics.Stop() and remove item fumble method
* Add syncing conveyor switches states
* Fix the recycler wanting to be a conveyor too hard
* Fix showwires > showsubfloor rename in mapping command
* Fix wifi air conveyors
* Fix test error
* Add showsubfloorforever command
Changes drawdepth of the relevant entities
* Disable opening the disposal unit interface while inside
* Add closing the disposal unit interface when getting inside
* Add closing the interface when the disposal unit component is removed
* Add removing entities on disposal unit component removal
* Delay disposal unit flush and fix serialization
* Implement pressure in disposal units
* Fix chain engaging a disposal unit
* Implement states to the disposal unit
* Fix missing imports from merge conflict
* Update Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address some reviews
* Fix za buildo
* Use container helper to detach disposables
* Make conveyors use the construction system
* Make conveyor groups and syncing sane
* Make flip flip
brave
* Add activate interface to conveyor switches
* Fix not removing the switch from its group when it's deleted
* Fix not registering conveyors and switches on initialize
* Stop using 0 as null
* Disconnect conveyors and switches when disposing of a group
* Make disposal units not able to be exited when flushing
* Make disposal units flush after a configurable 30 seconds
* Add handle and light layers to the disposal unit
* Merge engaging and flushing
* Update saltern.yml
* I love using 0 as null
* Make disposal unit visual layers make sense
* Remove duplicate remove method in disposal units and update light
* Replace DisposableComponent with disposal holders
* Fix disposal holders deleting their contents on deletion
* Account for disposal unit pressure in tests and make a failed flush autoengage
* Rename disposable to holder
* Fix junction connections
* Disable self insert and flush verbs when inside a disposal unit
* Fix spamming the engage button making the animation reset
* Make the recycler take materials into account properly
Fix cablestack1 not existing
* Merge conflict fixes
* Fix pipes not being saved anchored
* Change conveyors and groups to not use an id
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-07-30 23:45:28 +02:00
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
foreach (var entity in entities)
|
|
|
|
|
{
|
2021-01-24 19:00:58 +11:00
|
|
|
if (entity == _dragDropHelper.Dragged) continue;
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
// check if it's able to be dropped on by current dragged entity
|
2021-05-22 21:06:40 -07:00
|
|
|
var dropArgs = new DragDropEvent(_dragger, args.Coordinates, _dragDropHelper.Dragged, entity);
|
Add the trash man (#1367)
* Add disposal.rsi
* Rename disposal resource to disposal.rsi and create basic components
* Add disposal nets
* Add pushing entities along the disposal network
* Add disposal unit
* Unregister disposable component
* Add flush and selfinsert verbs to disposal unit
* Add gradual disposals movement
* Fix being able to walk through space for a while after exiting disposals
* Multiply disposals speed by 10
And fix early returns when moving an entity
* Rename Disposable component to InDisposals
* Remove DisposalNet and add on anchor events
* Remove anchored events, moved to interfaces
* Code cleanup
* Fix adjacent tubes' connections when a tube connects
* Fix jittery movement in disposals
* Remove Logger.Debug call
* Move disposals updates to InDisposalsComponent
* Fix adjacent connection valid directions check
* Disposal tubes now throw you out where they are facing
* Add disposal unit exit cooldown
* Set different disposal pipe sprite state depending on anchored value
* Add recycler
* Add recycler animation
* Add bloody texture to the recycler when grinding a living being
* Add PowerDevice component to the disposal unit
* Made the Recycler center on the grid
* Add disposal junction
* Add picking a random direction if junction is entered from the output side
* Add disposal flush and clang sounds
Taken from VGStation
* Move disposal flush and clang sound file names to exposedata
* Add disposalsmap.yml to test with
* Add summaries to DisposalUnit fields
* Add sideDegrees yaml property to disposal junctions
* Fix outdated usings
* Add conveyor resources
* Update RobustToolbox
* More merge fixes
Add conveyor collision masks
* Add ConveyorComponent
* Fix crash when reentering a body
* Merge branch 'master' into disposals-1147
* Reduce recycler bounds, set hard to false, add summary and expose "safe" to yaml
* Move IAnchored and IUnAnchored to AnchorableComponent
* Update power components and remove old disposals map
* Remove redundant sprite layers
* Add tile pry command
* Fix tilepry command
* Fix DisposalJunctionComponent missing a component reference
* Add anchor by radius command
* Add Y-Junctions
* Add disposal bend
* Add unanchor command
* Change DisposalJunction prototypes to specify their angles
* Fix disposal units being hidden below the floor
* Removed IAnhored and IUnAnchored interfaces
* Replace CanBeNull annotation with nullable reference types
* Update showwires command
* Add recycler recycling items
* Added angle and speed properties to ConveyorComponent
* Fix conveyort textures
* Add animation to the disposal unit
* Fix anchor and unanchor commands sometimes not finding any entities
* Fix not reading flush_time from disposal unit prototype
* Fix merge conflict wrong using
* Fix disposal, recycling and conveyor texture paths
Delete diverters
* Update visualizer names
* Add DisposableComponent, change drag and drop to work with multiple components
Ignoreinsideblocker client side for drag and drops, like on the server
Add more comments
* Add conveyor belts properly moving entities on top
* Anchorr wires
* Change conveyor bounds to 0.49
* Anchor catwalks, airlocks, gravity generators, low walls, wires and windows
* Add starting/stopping conveyors
* Add reversed conveyors
* Add conveyor switches
* Move InDisposalsComponent code to DisposableComponent
* Add ExitVector method to tubes
* Fix not updating tube references when disconnecting one
* Replace IoCManager call with dependency
* Add tubes disconnecting if they move too far apart from one another
* Move disposals action blocking to shared
* Add rotating and flipping pipes
* Make conveyor intersection calculations approximate
* Fix 1% chance of the server crashing when initializing the map
Happens when emergency lockers remove themselves
* Add disposal unit interface
* Make disposal units refuse items if not powered
* Make disposal tubes hide only when anchored
* Make disposal junction arrows visible to mere mortals
* Add disposal tubes breaking
* Add tubeconnections command
* Add missing verb attribute
* Add flipped disposal junction
* Add ids and linking to conveyors and switches
* Add conveyor switch prying and placing
* Add anchoring conveyor switches and refactor placing them
* Add missing serializable attributes from DisposableComponentState
* Make conveyor speed VV ReadWrite
* Change drawdepth of conveyors to FloorObjects
* Make conveyor anchored check consistent
* Remove anchoring interaction from switches
* Add conveyor switch id syncing and move switches slightly when pried
* Make entities in containers not able to be moved by conveyors
* Add conveyor and switches loose textures
* Merge conflict fixes
* Add disposal unit test
* Add flushing test to disposal unit test
* Add disposal unit flush fail test
* Add disposals to the saltern map
* Fix saltern disposal junctions
* Add power checks to the recycler
* Fix disposal unit placement in maintenance closet
* Remove disposal junctions from saltern
* Readd junctions to saltern
* Add the chemmaster to saltern at the request of Ike
* Move the chemistry disposal unit
* Fix casing of disposal flush sound
* More merge conflict fixes
* Fix a compiler warning.
* Remove popup invocation from buckle
* Remove showPopup parameter from InteractionChecks
* Remove unnecessary physics components
Fixes the physics system dying
* Replace PhysicsComponent usages with CollidableComponent
* Update existing code for the new controller system
* Change conveyors to use a VirtualController instead of teleporting the entity
* Remove visualizer 2d suffix and update physics code
* Transition code to new controller system
* Fix shuttles not moving
* Fix throwing
* Fix guns
* Change hands to use physics.Stop() and remove item fumble method
* Add syncing conveyor switches states
* Fix the recycler wanting to be a conveyor too hard
* Fix showwires > showsubfloor rename in mapping command
* Fix wifi air conveyors
* Fix test error
* Add showsubfloorforever command
Changes drawdepth of the relevant entities
* Disable opening the disposal unit interface while inside
* Add closing the disposal unit interface when getting inside
* Add closing the interface when the disposal unit component is removed
* Add removing entities on disposal unit component removal
* Delay disposal unit flush and fix serialization
* Implement pressure in disposal units
* Fix chain engaging a disposal unit
* Implement states to the disposal unit
* Fix missing imports from merge conflict
* Update Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address some reviews
* Fix za buildo
* Use container helper to detach disposables
* Make conveyors use the construction system
* Make conveyor groups and syncing sane
* Make flip flip
brave
* Add activate interface to conveyor switches
* Fix not removing the switch from its group when it's deleted
* Fix not registering conveyors and switches on initialize
* Stop using 0 as null
* Disconnect conveyors and switches when disposing of a group
* Make disposal units not able to be exited when flushing
* Make disposal units flush after a configurable 30 seconds
* Add handle and light layers to the disposal unit
* Merge engaging and flushing
* Update saltern.yml
* I love using 0 as null
* Make disposal unit visual layers make sense
* Remove duplicate remove method in disposal units and update light
* Replace DisposableComponent with disposal holders
* Fix disposal holders deleting their contents on deletion
* Account for disposal unit pressure in tests and make a failed flush autoengage
* Rename disposable to holder
* Fix junction connections
* Disable self insert and flush verbs when inside a disposal unit
* Fix spamming the engage button making the animation reset
* Make the recycler take materials into account properly
Fix cablestack1 not existing
* Merge conflict fixes
* Fix pipes not being saved anchored
* Change conveyors and groups to not use an id
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-07-30 23:45:28 +02:00
|
|
|
|
2021-03-08 21:24:34 +11:00
|
|
|
// TODO: Cache valid CanDragDrops
|
|
|
|
|
if (ValidDragDrop(dropArgs) != true) continue;
|
2021-01-11 22:14:01 +11:00
|
|
|
|
2022-02-17 15:40:03 +13:00
|
|
|
if (!_interactionSystem.InRangeUnobstructed(dropArgs.User, dropArgs.Target)
|
|
|
|
|
|| !_interactionSystem.InRangeUnobstructed(dropArgs.User, dropArgs.Dragged))
|
2021-01-11 22:14:01 +11:00
|
|
|
{
|
|
|
|
|
outOfRange = true;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
foreach (var draggable in _draggables)
|
|
|
|
|
{
|
|
|
|
|
if (!draggable.CanDrop(dropArgs)) continue;
|
2020-10-14 15:24:07 +02:00
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
// tell the server about the drop attempt
|
2021-12-05 18:09:01 +01:00
|
|
|
RaiseNetworkEvent(new DragDropRequestEvent(args.Coordinates, _dragDropHelper.Dragged,
|
2021-12-03 15:53:09 +01:00
|
|
|
entity));
|
2020-07-06 14:27:03 -07:00
|
|
|
|
2020-10-14 15:24:07 +02:00
|
|
|
draggable.Drop(dropArgs);
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
_dragDropHelper.EndDrag();
|
2020-07-06 14:27:03 -07:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-10-14 15:24:07 +02:00
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
if (outOfRange &&
|
|
|
|
|
_playerManager.LocalPlayer?.ControlledEntity is { } player &&
|
|
|
|
|
player.IsValid())
|
2021-01-11 22:14:01 +11:00
|
|
|
{
|
2021-12-05 18:09:01 +01:00
|
|
|
player.PopupMessage(Loc.GetString("drag-drop-system-out-of-range-text"));
|
2021-01-11 22:14:01 +11:00
|
|
|
}
|
|
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
_dragDropHelper.EndDrag();
|
2020-07-06 14:27:03 -07:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-26 18:24:08 +13:00
|
|
|
// TODO make this just use TargetOutlineSystem
|
2020-07-06 14:27:03 -07:00
|
|
|
private void HighlightTargets()
|
|
|
|
|
{
|
2021-12-09 12:29:27 +01:00
|
|
|
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged) ||
|
|
|
|
|
_dragShadow == default || Deleted(_dragShadow))
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
|
|
|
|
Logger.Warning("Programming error. Can't highlight drag and drop targets, not currently " +
|
|
|
|
|
"dragging anything or dragged entity / shadow was deleted.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// highlights the possible targets which are visible
|
|
|
|
|
// and able to be dropped on by the current dragged entity
|
|
|
|
|
|
|
|
|
|
// remove current highlights
|
|
|
|
|
RemoveHighlights();
|
|
|
|
|
|
|
|
|
|
// find possible targets on screen even if not reachable
|
2022-02-26 18:24:08 +13:00
|
|
|
// TODO: Duplicated in SpriteSystem and TargetOutlineSystem. Should probably be cached somewhere for a frame?
|
2021-01-11 22:14:01 +11:00
|
|
|
var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition).Position;
|
|
|
|
|
var bounds = new Box2(mousePos - 1.5f, mousePos + 1.5f);
|
2022-04-06 19:35:18 +10:00
|
|
|
var pvsEntities = EntitySystem.Get<EntityLookupSystem>().GetEntitiesIntersecting(_eyeManager.CurrentMap, bounds, LookupFlags.Approximate | LookupFlags.Anchored);
|
2020-07-06 14:27:03 -07:00
|
|
|
foreach (var pvsEntity in pvsEntities)
|
|
|
|
|
{
|
2021-12-05 18:09:01 +01:00
|
|
|
if (!EntityManager.TryGetComponent(pvsEntity, out ISpriteComponent? inRangeSprite) ||
|
2021-01-24 19:00:58 +11:00
|
|
|
!inRangeSprite.Visible ||
|
|
|
|
|
pvsEntity == _dragDropHelper.Dragged) continue;
|
2021-01-11 22:14:01 +11:00
|
|
|
|
|
|
|
|
// check if it's able to be dropped on by current dragged entity
|
2021-12-05 18:09:01 +01:00
|
|
|
var dropArgs = new DragDropEvent(_dragger, EntityManager.GetComponent<TransformComponent>(pvsEntity).Coordinates, _dragDropHelper.Dragged, pvsEntity);
|
2021-01-11 22:14:01 +11:00
|
|
|
|
2021-03-08 21:24:34 +11:00
|
|
|
var valid = ValidDragDrop(dropArgs);
|
|
|
|
|
if (valid == null) continue;
|
2021-01-11 22:14:01 +11:00
|
|
|
|
|
|
|
|
// We'll do a final check given server-side does this before any dragdrop can take place.
|
|
|
|
|
if (valid.Value)
|
|
|
|
|
{
|
2022-02-17 15:40:03 +13:00
|
|
|
valid = _interactionSystem.InRangeUnobstructed(dropArgs.Target, dropArgs.Dragged)
|
|
|
|
|
&& _interactionSystem.InRangeUnobstructed(dropArgs.Target, dropArgs.Target);
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
2021-01-11 22:14:01 +11:00
|
|
|
|
|
|
|
|
// highlight depending on whether its in or out of range
|
|
|
|
|
inRangeSprite.PostShader = valid.Value ? _dropTargetInRangeShader : _dropTargetOutOfRangeShader;
|
|
|
|
|
inRangeSprite.RenderOrder = EntityManager.CurrentTick.Value;
|
|
|
|
|
_highlightedSprites.Add(inRangeSprite);
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void RemoveHighlights()
|
|
|
|
|
{
|
2020-11-21 14:02:00 +01:00
|
|
|
foreach (var highlightedSprite in _highlightedSprites)
|
2020-07-06 14:27:03 -07:00
|
|
|
{
|
|
|
|
|
highlightedSprite.PostShader = null;
|
|
|
|
|
highlightedSprite.RenderOrder = 0;
|
|
|
|
|
}
|
2021-01-11 22:14:01 +11:00
|
|
|
|
2020-11-21 14:02:00 +01:00
|
|
|
_highlightedSprites.Clear();
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
|
|
|
|
|
2021-03-08 21:24:34 +11:00
|
|
|
/// <summary>
|
|
|
|
|
/// Are these args valid for drag-drop?
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="eventArgs"></param>
|
|
|
|
|
/// <returns>null if the target doesn't support IDragDropOn</returns>
|
2021-05-22 21:06:40 -07:00
|
|
|
private bool? ValidDragDrop(DragDropEvent eventArgs)
|
2021-03-08 21:24:34 +11:00
|
|
|
{
|
2022-02-15 17:06:52 +13:00
|
|
|
if (!_actionBlockerSystem.CanInteract(eventArgs.User, eventArgs.Target))
|
2021-11-07 01:05:51 +01:00
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-15 17:06:52 +13:00
|
|
|
// CanInteract() doesn't support checking a second "target" entity.
|
|
|
|
|
// Doing so manually:
|
|
|
|
|
var ev = new GettingInteractedWithAttemptEvent(eventArgs.User, eventArgs.Dragged);
|
2022-06-22 09:53:41 +10:00
|
|
|
RaiseLocalEvent(eventArgs.Dragged, ev, true);
|
2022-02-15 17:06:52 +13:00
|
|
|
if (ev.Cancelled)
|
|
|
|
|
return false;
|
|
|
|
|
|
2022-01-30 17:53:22 +01:00
|
|
|
var valid = CheckDragDropOn(eventArgs);
|
2021-03-08 21:24:34 +11:00
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
foreach (var comp in EntityManager.GetComponents<IDragDropOn>(eventArgs.Target))
|
2021-03-08 21:24:34 +11:00
|
|
|
{
|
|
|
|
|
if (!comp.CanDragDropOn(eventArgs))
|
|
|
|
|
{
|
|
|
|
|
valid = false;
|
|
|
|
|
// dragDropOn.Add(comp);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
valid = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (valid != true) return valid;
|
|
|
|
|
|
|
|
|
|
// Need at least one IDraggable to return true or else we can't do shit
|
|
|
|
|
valid = false;
|
|
|
|
|
|
2021-12-05 18:09:01 +01:00
|
|
|
foreach (var comp in EntityManager.GetComponents<IDraggable>(eventArgs.User))
|
2021-03-08 21:24:34 +11:00
|
|
|
{
|
|
|
|
|
if (!comp.CanDrop(eventArgs)) continue;
|
|
|
|
|
valid = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return valid;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-06 14:27:03 -07:00
|
|
|
public override void Update(float frameTime)
|
|
|
|
|
{
|
|
|
|
|
base.Update(frameTime);
|
2022-03-01 11:45:44 +11:00
|
|
|
|
2020-12-13 14:28:20 -08:00
|
|
|
_dragDropHelper.Update(frameTime);
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
2022-03-01 11:45:44 +11:00
|
|
|
|
|
|
|
|
public override void FrameUpdate(float frameTime)
|
|
|
|
|
{
|
|
|
|
|
base.FrameUpdate(frameTime);
|
|
|
|
|
|
|
|
|
|
// Update position every frame to make it smooth.
|
|
|
|
|
if (_dragDropHelper.IsDragging)
|
|
|
|
|
{
|
|
|
|
|
var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition);
|
|
|
|
|
Transform(_dragShadow).WorldPosition = mousePos.Position;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-06 14:27:03 -07:00
|
|
|
}
|
|
|
|
|
}
|