Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Я скучаю так очень, забери меня срочно

Browse Source
This commit is contained in:
Remuchi
2024-03-28 00:13:42 +07:00
parent 1076530ad8
commit fa18556a8f
34 changed files with 246 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
View File

@@ -35,8 +35,6 @@ namespace Content.Client.Administration.UI.CustomControls
private readonly Font _fontOverride;
private PlayerInfo? _selectedPlayer;
public PlayerListControl()
{
_entManager = IoCManager.Resolve<IEntityManager>();

2
Content.Client/Clothing/ClientClothingSystem.cs
View File

@@ -186,7 +186,7 @@ public sealed class ClientClothingSystem : ClothingSystem
State = state
};
layers = [layer];
layers = new List<PrototypeLayerData> { layer };
return true;
}

2
Content.Client/Decals/Overlays/DecalOverlay.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Client.Decals.Overlays
{
private readonly Dictionary<string, (Texture Texture, bool SnapCardinals)> _cachedTextures = new(64);
private readonly List<(uint Id, Decal Decal)> _decals = [];
private readonly List<(uint Id, Decal Decal)> _decals = new();
protected override void Draw(in OverlayDrawArgs args)
{

6
Content.Client/Doors/AirlockSystem.cs
View File

@@ -14,14 +14,14 @@ public sealed class AirlockSystem : SharedAirlockSystem
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<AirlockComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
}
protected override void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
// А нужен ли ты блять
private void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
{
base.OnBeforeDoorClosed(uid, airlock, args);
if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights)
{
args.Cancel();

8
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -107,7 +107,7 @@ namespace Content.Client.Preferences.UI
private readonly List<SpeciesPrototype> _speciesList;
private readonly List<AntagPreferenceSelector> _antagPreferences;
private readonly List<TraitPreferenceSelector> _traitPreferences;
private List<BodyTypePrototype> _bodyTypesList = [];
private List<BodyTypePrototype> _bodyTypesList = new();
private SpriteView _previewSpriteView => CSpriteView;
private Button _previewRotateLeftButton => CSpriteRotateLeft;
@@ -439,7 +439,7 @@ namespace Content.Client.Preferences.UI
IsDirty = true;
};
_jobPriorities = [];
_jobPriorities = new List<JobPrioritySelector>();
_jobCategories = new Dictionary<string, BoxContainer>();
_requirements = IoCManager.Resolve<JobRequirementsManager>();
_requirements.Updated += UpdateRoleRequirements;
@@ -451,7 +451,7 @@ namespace Content.Client.Preferences.UI
_tabContainer.SetTabTitle(2, Loc.GetString("humanoid-profile-editor-antags-tab"));
_antagPreferences = [];
_antagPreferences = new List<AntagPreferenceSelector>();
foreach (var antag in prototypeManager.EnumeratePrototypes<AntagPrototype>().OrderBy(a => Loc.GetString(a.Name)))
{
@@ -479,7 +479,7 @@ namespace Content.Client.Preferences.UI
#region Traits
var traits = prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
_traitPreferences = [];
_traitPreferences = new List<TraitPreferenceSelector>();
_tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
if (traits.Count > 0)

3
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -192,7 +192,8 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
UIHelper.DiscordRelayChanged(_discordRelayActive);
UIHelper.SendMessageAction = (userId, textMessage, playSound) => _bwoinkSystem?.Send(userId, textMessage, playSound);
UIHelper.SendMessageAction = (userId, textMessage, playSound) =>
_bwoinkSystem?.Send(userId, textMessage, isAdmin, playSound);
UIHelper.InputTextChanged += (channel, text) => _bwoinkSystem?.SendInputTextUpdated(channel, text.Length > 0);
UIHelper.OnClose += () => { SetAHelpPressed(false); };
UIHelper.OnOpen += () => { SetAHelpPressed(true); };

4
Content.Client/_White/Jukebox/JukeboxMenu.xaml.cs
View File

@@ -17,8 +17,8 @@ public sealed partial class JukeboxMenu : DefaultWindow
private readonly EntityUid _jukeboxEntity;
private readonly JukeboxComponent _component;
private readonly List<JukeboxSongEntry> _defaultSongsEntries = [];
private readonly List<JukeboxSongEntry> _tapeSongsEntries = [];
private readonly List<JukeboxSongEntry> _defaultSongsEntries = new() { };
private readonly List<JukeboxSongEntry> _tapeSongsEntries = new() { };
public JukeboxMenu(EntityUid jukeboxEntity, JukeboxComponent component)
{

377
Content.Client/_White/Radials/RadialSystem.cs
View File

@@ -17,223 +17,226 @@ using Robust.Shared.Utility;
namespace Content.Client._White.Radials;
[UsedImplicitly]
public sealed class RadialSystem : SharedRadialSystem
[UsedImplicitly]
public sealed class RadialSystem : SharedRadialSystem
{
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly ExamineSystem _examineSystem = 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!;
[Dependency] private readonly TransformSystem _transform = 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<RadialsResponseEvent>? OnRadialsResponse;
public override void Initialize()
{
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly ExamineSystem _examineSystem = 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!;
base.Initialize();
/// <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;
SubscribeNetworkEvent<RadialsResponseEvent>(HandleRadialsResponse);
}
[Dependency] private readonly IEyeManager _eyeManager = default!;
/// <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;
/// <summary>
/// These flags determine what entities the user can see on the context menu.
/// </summary>
public MenuVisibility Visibility;
if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase)
return false;
public Action<RadialsResponseEvent>? OnRadialsResponse;
var player = _playerManager.LocalEntity;
if (player == null)
return false;
public override void Initialize()
// 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)
{
base.Initialize();
var entitiesUnderMouse = gameScreenBase.GetClickableEntities(targetPos).ToHashSet();
SubscribeNetworkEvent<RadialsResponseEvent>(HandleRadialsResponse);
bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
// first check the general location.
if (!_examineSystem.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 (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
entities.Add(ent);
}
}
else
{
entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize).ToList();
}
/// <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)
if (entities.Count == 0)
return false;
if (visibility == MenuVisibility.All)
{
result = null;
if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase)
return false;
var player = _playerManager.LocalPlayer?.ControlledEntity;
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 (!_examineSystem.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 (_examineSystem.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 (!ExamineSystemShared.InRangeUnOccluded(
playerPos,
xformQuery.GetComponent(entity).MapPosition,
ExamineSystemShared.ExamineRange,
null))
{
entities.RemoveSwap(i);
}
}
}
if (entities.Count == 0)
return false;
result = entities;
return true;
}
/// <summary>
/// Asks the server to send back a list of server-side verbs, for the given verb type.
/// </summary>
public SortedSet<Radial> GetRadials(EntityUid target, EntityUid user, Type type, bool force = false)
// remove any entities in containers
if ((visibility & MenuVisibility.InContainer) == 0)
{
return GetRadials(target, user, new List<Type>() { type }, force);
}
/// <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<Radial> GetRadials(EntityUid target, EntityUid user, List<Type> verbTypes,
bool force = false)
{
if (!IsClientSide(target))
for (var i = entities.Count - 1; i >= 0; i--)
{
RaiseNetworkEvent(new RequestServerRadialsEvent(GetNetEntity(target), verbTypes, adminRequest: force));
var entity = entities[i];
if (ContainerSystem.IsInSameOrTransparentContainer(player.Value, entity))
continue;
entities.RemoveSwap(i);
}
// Some admin menu interactions will try get verbs for entities that have not yet been sent to the player.
if (!Exists(target))
return new();
return GetLocalRadials(target, user, verbTypes, 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 ExecuteRadial(EntityUid target, Radial radial)
// remove any invisible entities
if ((visibility & MenuVisibility.Invisible) == 0)
{
var user = _playerManager.LocalPlayer?.ControlledEntity;
if (user == null)
return;
var spriteQuery = GetEntityQuery<SpriteComponent>();
var tagQuery = GetEntityQuery<TagComponent>();
// is this verb actually valid?
if (radial.Disabled)
for (var i = entities.Count - 1; i >= 0; i--)
{
// maybe send an informative pop-up message.
if (!string.IsNullOrWhiteSpace(radial.Message))
_popupSystem.PopupEntity(radial.Message, user.Value);
var entity = entities[i];
return;
if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) ||
!spriteComponent.Visible ||
_tagSystem.HasTag(entity, "HideContextMenu", tagQuery))
{
entities.RemoveSwap(i);
}
}
if (radial.ClientExclusive || IsClientSide(target))
ExecuteRadial(radial, user.Value, target);
else
EntityManager.RaisePredictiveEvent(new ExecuteRadialEvent(GetNetEntity(target), radial));
}
private void HandleRadialsResponse(RadialsResponseEvent msg)
// Remove any entities that do not have LOS
if ((visibility & MenuVisibility.NoFov) == 0)
{
OnRadialsResponse?.Invoke(msg);
var playerPos = _transform.GetMapCoordinates(player.Value);
for (var i = entities.Count - 1; i >= 0; i--)
{
var entity = entities[i];
if (!_examineSystem.InRangeUnOccluded(
playerPos,
_transform.GetMapCoordinates(entity),
ExamineSystemShared.ExamineRange,
null))
{
entities.RemoveSwap(i);
}
}
}
if (entities.Count == 0)
return false;
result = entities;
return true;
}
[Flags]
public enum MenuVisibility
/// <summary>
/// Asks the server to send back a list of server-side verbs, for the given verb type.
/// </summary>
public SortedSet<Radial> GetRadials(EntityUid target, EntityUid user, Type type, bool force = false)
{
// 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
return GetRadials(target, user, new List<Type>() { type }, force);
}
/// <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<Radial> GetRadials(
EntityUid target,
EntityUid user,
List<Type> verbTypes,
bool force = false)
{
if (!IsClientSide(target))
{
RaiseNetworkEvent(new RequestServerRadialsEvent(GetNetEntity(target), verbTypes, adminRequest: force));
}
// Some admin menu interactions will try get verbs for entities that have not yet been sent to the player.
if (!Exists(target))
return new();
return GetLocalRadials(target, user, verbTypes, 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 ExecuteRadial(EntityUid target, Radial radial)
{
var user = _playerManager.LocalEntity;
if (user == null)
return;
// is this verb actually valid?
if (radial.Disabled)
{
// maybe send an informative pop-up message.
if (!string.IsNullOrWhiteSpace(radial.Message))
_popupSystem.PopupEntity(radial.Message, user.Value);
return;
}
if (radial.ClientExclusive || IsClientSide(target))
ExecuteRadial(radial, user.Value, target);
else
EntityManager.RaisePredictiveEvent(new ExecuteRadialEvent(GetNetEntity(target), radial));
}
private void HandleRadialsResponse(RadialsResponseEvent msg)
{
OnRadialsResponse?.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
}