mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-26 01:57:51 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
244 lines
8.7 KiB
C#
244 lines
8.7 KiB
C#
using System.Diagnostics.CodeAnalysis;
|
|
using System.Linq;
|
|
using Content.Client.Examine;
|
|
using Content.Client.Gameplay;
|
|
using Content.Client.Popups;
|
|
using Content.Shared.Examine;
|
|
using Content.Shared.Tag;
|
|
using Content.Shared.Verbs;
|
|
using JetBrains.Annotations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.Player;
|
|
using Robust.Client.State;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Client.Verbs
|
|
{
|
|
[UsedImplicitly]
|
|
public sealed class VerbSystem : SharedVerbSystem
|
|
{
|
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
|
[Dependency] private readonly ExamineSystem _examine = default!;
|
|
[Dependency] private readonly TagSystem _tagSystem = default!;
|
|
[Dependency] private readonly IStateManager _stateManager = default!;
|
|
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
|
|
/// <summary>
|
|
/// When a user right clicks somewhere, how large is the box we use to get entities for the context menu?
|
|
/// </summary>
|
|
public const float EntityMenuLookupSize = 0.25f;
|
|
|
|
[Dependency] private readonly IEyeManager _eyeManager = default!;
|
|
|
|
/// <summary>
|
|
/// These flags determine what entities the user can see on the context menu.
|
|
/// </summary>
|
|
public MenuVisibility Visibility;
|
|
|
|
public Action<VerbsResponseEvent>? OnVerbsResponse;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeNetworkEvent<VerbsResponseEvent>(HandleVerbResponse);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Get all of the entities in an area for displaying on the context menu.
|
|
/// </summary>
|
|
public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true)] out List<EntityUid>? result)
|
|
{
|
|
result = null;
|
|
|
|
if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase)
|
|
return false;
|
|
|
|
var player = _playerManager.LocalEntity;
|
|
if (player == null)
|
|
return false;
|
|
|
|
// If FOV drawing is disabled, we will modify the visibility option to ignore visiblity checks.
|
|
var visibility = _eyeManager.CurrentEye.DrawFov
|
|
? Visibility
|
|
: Visibility | MenuVisibility.NoFov;
|
|
|
|
|
|
// Get entities
|
|
List<EntityUid> entities;
|
|
|
|
// Do we have to do FoV checks?
|
|
if ((visibility & MenuVisibility.NoFov) == 0)
|
|
{
|
|
var entitiesUnderMouse = gameScreenBase.GetClickableEntities(targetPos).ToHashSet();
|
|
bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
|
|
|
|
// first check the general location.
|
|
if (!_examine.CanExamine(player.Value, targetPos, Predicate))
|
|
return false;
|
|
|
|
TryComp(player.Value, out ExaminerComponent? examiner);
|
|
|
|
// Then check every entity
|
|
entities = new();
|
|
foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize))
|
|
{
|
|
if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
|
|
entities.Add(ent);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize).ToList();
|
|
}
|
|
|
|
if (entities.Count == 0)
|
|
return false;
|
|
|
|
if (visibility == MenuVisibility.All)
|
|
{
|
|
result = entities;
|
|
return true;
|
|
}
|
|
|
|
// remove any entities in containers
|
|
if ((visibility & MenuVisibility.InContainer) == 0)
|
|
{
|
|
for (var i = entities.Count - 1; i >= 0; i--)
|
|
{
|
|
var entity = entities[i];
|
|
|
|
if (ContainerSystem.IsInSameOrTransparentContainer(player.Value, entity))
|
|
continue;
|
|
|
|
entities.RemoveSwap(i);
|
|
}
|
|
}
|
|
|
|
// remove any invisible entities
|
|
if ((visibility & MenuVisibility.Invisible) == 0)
|
|
{
|
|
var spriteQuery = GetEntityQuery<SpriteComponent>();
|
|
var tagQuery = GetEntityQuery<TagComponent>();
|
|
|
|
for (var i = entities.Count - 1; i >= 0; i--)
|
|
{
|
|
var entity = entities[i];
|
|
|
|
if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) ||
|
|
!spriteComponent.Visible ||
|
|
_tagSystem.HasTag(entity, "HideContextMenu", tagQuery))
|
|
{
|
|
entities.RemoveSwap(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Remove any entities that do not have LOS
|
|
if ((visibility & MenuVisibility.NoFov) == 0)
|
|
{
|
|
var xformQuery = GetEntityQuery<TransformComponent>();
|
|
var playerPos = xformQuery.GetComponent(player.Value).MapPosition;
|
|
|
|
for (var i = entities.Count - 1; i >= 0; i--)
|
|
{
|
|
var entity = entities[i];
|
|
|
|
if (!_examine.InRangeUnOccluded(
|
|
playerPos,
|
|
xformQuery.GetComponent(entity).MapPosition,
|
|
ExamineSystemShared.ExamineRange,
|
|
null))
|
|
{
|
|
entities.RemoveSwap(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (entities.Count == 0)
|
|
return false;
|
|
|
|
result = entities;
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Ask the server to send back a list of server-side verbs, and for now return an incomplete list of verbs
|
|
/// (only those defined locally).
|
|
/// </summary>
|
|
public SortedSet<Verb> GetVerbs(NetEntity target, EntityUid user, List<Type> verbTypes, out List<VerbCategory> extraCategories, bool force = false)
|
|
{
|
|
if (!target.IsClientSide())
|
|
RaiseNetworkEvent(new RequestServerVerbsEvent(target, verbTypes, adminRequest: force));
|
|
|
|
// Some admin menu interactions will try get verbs for entities that have not yet been sent to the player.
|
|
if (!TryGetEntity(target, out var local))
|
|
{
|
|
extraCategories = new();
|
|
return new();
|
|
}
|
|
|
|
return GetLocalVerbs(local.Value, user, verbTypes, out extraCategories, force);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Execute actions associated with the given verb.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Unless this is a client-exclusive verb, this will also tell the server to run the same verb.
|
|
/// </remarks>
|
|
public void ExecuteVerb(EntityUid target, Verb verb)
|
|
{
|
|
ExecuteVerb(GetNetEntity(target), verb);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Execute actions associated with the given verb.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Unless this is a client-exclusive verb, this will also tell the server to run the same verb.
|
|
/// </remarks>
|
|
public void ExecuteVerb(NetEntity target, Verb verb)
|
|
{
|
|
if ( _playerManager.LocalEntity is not {} user)
|
|
return;
|
|
|
|
// is this verb actually valid?
|
|
if (verb.Disabled)
|
|
{
|
|
// maybe send an informative pop-up message.
|
|
if (!string.IsNullOrWhiteSpace(verb.Message))
|
|
_popupSystem.PopupEntity(verb.Message, user);
|
|
|
|
return;
|
|
}
|
|
|
|
if (verb.ClientExclusive || target.IsClientSide())
|
|
// is this a client exclusive (gui) verb?
|
|
ExecuteVerb(verb, user, GetEntity(target));
|
|
else
|
|
EntityManager.RaisePredictiveEvent(new ExecuteVerbEvent(target, verb));
|
|
}
|
|
|
|
private void HandleVerbResponse(VerbsResponseEvent msg)
|
|
{
|
|
OnVerbsResponse?.Invoke(msg);
|
|
}
|
|
}
|
|
|
|
[Flags]
|
|
public enum MenuVisibility
|
|
{
|
|
// What entities can a user see on the entity menu?
|
|
Default = 0, // They can only see entities in FoV.
|
|
NoFov = 1 << 0, // They ignore FoV restrictions
|
|
InContainer = 1 << 1, // They can see through containers.
|
|
Invisible = 1 << 2, // They can see entities without sprites and the "HideContextMenu" tag is ignored.
|
|
All = NoFov | InContainer | Invisible
|
|
}
|
|
}
|