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

serv4 + submodule update (#12740)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Paul Ritter
2022-11-27 19:25:55 +01:00
committed by GitHub
parent 7608c24b63
commit 3884c4d3db
46 changed files with 230 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Content.Client/CartridgeLoader/CartridgeUISerializer.cs
View File

@@ -1,44 +0,0 @@
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Serialization.TypeSerializers.Interfaces;
namespace Content.Client.CartridgeLoader;
/// <summary>
/// Boilerplate serializer for defining the ui fragment used for a cartridge in yaml
/// </summary>
/// <example>
/// This is an example from the yaml definition from the notekeeper ui
/// <code>
/// - type: CartridgeUi
/// ui: !type:NotekeeperUi
/// </code>
/// </example>
public sealed class CartridgeUISerializer : ITypeSerializer<CartridgeUI, ValueDataNode>
{
public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
IDependencyCollection dependencies, ISerializationContext? context = null)
{
return serializationManager.ValidateNode<CartridgeUI>(node, context);
}
public CartridgeUI Read(ISerializationManager serializationManager, ValueDataNode node, IDependencyCollection dependencies,
bool skipHook, ISerializationContext? context = null, CartridgeUI? value = default)
{
return serializationManager.Read(node, context, skipHook, value);
}
public CartridgeUI Copy(ISerializationManager serializationManager, CartridgeUI source, CartridgeUI target, bool skipHook,
ISerializationContext? context = null)
{
return serializationManager.Copy(source, context, skipHook);
}
public DataNode Write(ISerializationManager serializationManager, CartridgeUI value, IDependencyCollection dependencies,
bool alwaysWrite = false, ISerializationContext? context = null)
{
return serializationManager.WriteValue(value, alwaysWrite, context);
}
}

2
Content.Client/CartridgeLoader/CartridgeUiComponent.cs
View File

@@ -9,6 +9,6 @@ namespace Content.Client.CartridgeLoader;
[RegisterComponent]
public sealed class CartridgeUiComponent : Component
{
[DataField("ui", true, customTypeSerializer: typeof(CartridgeUISerializer))]
[DataField("ui", true)]
public CartridgeUI? Ui = default;
}

3
Content.Client/Gravity/GravityGeneratorVisualizer.cs
View File

@@ -11,9 +11,10 @@ namespace Content.Client.Gravity
[DataField("spritemap")]
private Dictionary<string, string> _rawSpriteMap
{
get => _spriteMap.ToDictionary(x => x.Value.ToString().ToLower(), x => x.Value);
get => _spriteMap.ToDictionary(x => x.Key.ToString().ToLower(), x => x.Value);
set
{
_spriteMap.Clear();
// Get Sprites for each status
foreach (var status in (GravityGeneratorStatus[]) Enum.GetValues(typeof(GravityGeneratorStatus)))
{

32
Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
View File

@@ -1,37 +1,25 @@
using System.Collections.Generic;
using System.Linq;
using Content.Shared.Singularity.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.ParticleAccelerator
{
[UsedImplicitly]
[DataDefinition]
public sealed class ParticleAcceleratorPartVisualizer : AppearanceVisualizer, ISerializationHooks
public sealed class ParticleAcceleratorPartVisualizer : AppearanceVisualizer
{
[DataField("baseState", required: true)]
private string? _baseState;
private string _baseState = default!;
private Dictionary<ParticleAcceleratorVisualState, string> _states = new();
void ISerializationHooks.AfterDeserialization()
private static readonly Dictionary<ParticleAcceleratorVisualState, string> StatesSuffixes = new()
{
if (_baseState == null)
{
return;
}
_states.Add(ParticleAcceleratorVisualState.Powered, _baseState + "p");
_states.Add(ParticleAcceleratorVisualState.Level0, _baseState + "p0");
_states.Add(ParticleAcceleratorVisualState.Level1, _baseState + "p1");
_states.Add(ParticleAcceleratorVisualState.Level2, _baseState + "p2");
_states.Add(ParticleAcceleratorVisualState.Level3, _baseState + "p3");
}
{ParticleAcceleratorVisualState.Powered, "p"},
{ParticleAcceleratorVisualState.Level0, "p0"},
{ParticleAcceleratorVisualState.Level1, "p1"},
{ParticleAcceleratorVisualState.Level2, "p2"},
{ParticleAcceleratorVisualState.Level3, "p3"},
};
[Obsolete("Subscribe to your component being initialised instead.")]
public override void InitializeEntity(EntityUid entity)
@@ -63,7 +51,7 @@ namespace Content.Client.ParticleAccelerator
if (state != ParticleAcceleratorVisualState.Unpowered)
{
sprite.LayerSetVisible(ParticleAcceleratorVisualLayers.Unlit, true);
sprite.LayerSetState(ParticleAcceleratorVisualLayers.Unlit, _states[state]);
sprite.LayerSetState(ParticleAcceleratorVisualLayers.Unlit, _baseState + StatesSuffixes[state]);
}
else
{

4
Content.Client/Trigger/TimerTriggerVisualizer.cs
View File

@@ -12,8 +12,8 @@ namespace Content.Client.Trigger
{
private const string AnimationKey = "priming_animation";
[DataField("countdown_sound", required: false)]
private SoundSpecifier _countdownSound = default!;
[DataField("countdown_sound")]
private SoundSpecifier? _countdownSound;
private Animation PrimingAnimation = default!;