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

TryGetData() Generics support content changes (#13053)

Browse Source
This commit is contained in:
AJCM-git
2022-12-20 18:24:55 -04:00
committed by GitHub
parent 38a31db13f
commit c7ec03d2fb
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,8 +219,7 @@ public sealed class ClientClothingSystem : ClothingSystem
if (slot == "jumpsuit" && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var suitLayer)) if (slot == "jumpsuit" && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var suitLayer))
{ {
if (_appearance.TryGetData(equipee, HumanoidVisualizerKey.Key, out object? obj) if (_appearance.TryGetData<HumanoidVisualizerData>(equipee, HumanoidVisualizerKey.Key, out var data)
&& obj is HumanoidVisualizerData data
&& data.Sex == Sex.Female) && data.Sex == Sex.Female)
{ {
sprite.LayerSetState(suitLayer, clothingComponent.FemaleMask switch sprite.LayerSetState(suitLayer, clothingComponent.FemaleMask switch

5
Content.Client/VendingMachines/VendingMachineSystem.cs
View File

@@ -23,8 +23,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
return; return;
if (!TryComp<AppearanceComponent>(uid, out var appearance) || if (!TryComp<AppearanceComponent>(uid, out var appearance) ||
!_appearanceSystem.TryGetData(uid, VendingMachineVisuals.VisualState, out var visualStateObject, appearance) || !_appearanceSystem.TryGetData<VendingMachineVisualState>(uid, VendingMachineVisuals.VisualState, out var visualState, appearance))
visualStateObject is not VendingMachineVisualState visualState)
{ {
visualState = VendingMachineVisualState.Normal; visualState = VendingMachineVisualState.Normal;
} }
@@ -147,7 +146,7 @@ public enum VendingMachineVisualLayers : byte
Base, Base,
/// <summary> /// <summary>
/// Normal / Deny / Eject /// Normal / Deny / Eject
/// </summary> /// </summary>
BaseUnshaded, BaseUnshaded,
/// <summary> /// <summary>
/// Screens that are persistent (where the machine is not off or broken) /// Screens that are persistent (where the machine is not off or broken)

6
Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs
View File

@@ -10,12 +10,10 @@ public sealed class RandomArtifactSpriteSystem : VisualizerSystem<RandomArtifact
if (args.Sprite == null) if (args.Sprite == null)
return; return;
if (!AppearanceSystem.TryGetData(uid, SharedArtifactsVisuals.SpriteIndex, out var ind, args.Component) if (!AppearanceSystem.TryGetData<int>(uid, SharedArtifactsVisuals.SpriteIndex, out var spriteIndex, args.Component))
|| ind is not int spriteIndex)
return; return;
if (!AppearanceSystem.TryGetData(uid, SharedArtifactsVisuals.IsActivated, out var act, args.Component) if (!AppearanceSystem.TryGetData<bool>(uid, SharedArtifactsVisuals.IsActivated, out var isActivated, args.Component))
|| act is not bool isActivated)
isActivated = false; isActivated = false;
var spriteIndexStr = spriteIndex.ToString("D2"); var spriteIndexStr = spriteIndex.ToString("D2");