From 02f827f063fc1e950bc4fb23800ae806f762818c Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 14 Nov 2020 00:42:35 +1100 Subject: [PATCH] Minor appearance changes (#2370) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Minor appearance changes * Remove that redundant deleted property * Fixes and remove redundant checks Co-authored-by: Metal Gear Sloth Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> --- .../Conveyor/ConveyorSwitchVisualizer.cs | 6 ----- .../Components/Conveyor/ConveyorVisualizer.cs | 6 ----- .../Disposal/DisposalUnitVisualizer.cs | 6 ----- .../Components/Disposal/DisposalVisualizer.cs | 6 ----- .../Components/Doors/AirlockVisualizer.cs | 3 +-- .../MedicalScannerVisualizer.cs | 5 ---- .../Nutrition/DrinkFoodVisualizer.cs | 6 ++--- .../Components/PDA/PDAVisualizer.cs | 5 +--- .../ParticleAcceleratorPartVisualizer.cs | 6 ++--- .../RadiationCollectorVisualizer.cs | 3 +-- .../VendingMachineVisualizer.cs | 24 ++++++++++--------- .../Visualizers/BarrelBoltVisualizer.cs | 1 + .../Barrels/Visualizers/MagVisualizer.cs | 2 ++ .../Components/Wires/WiresVisualizer.cs | 9 +++---- 14 files changed, 28 insertions(+), 60 deletions(-) diff --git a/Content.Client/GameObjects/Components/Conveyor/ConveyorSwitchVisualizer.cs b/Content.Client/GameObjects/Components/Conveyor/ConveyorSwitchVisualizer.cs index 77db02048b..cec0e8947b 100644 --- a/Content.Client/GameObjects/Components/Conveyor/ConveyorSwitchVisualizer.cs +++ b/Content.Client/GameObjects/Components/Conveyor/ConveyorSwitchVisualizer.cs @@ -60,12 +60,6 @@ namespace Content.Client.GameObjects.Components.Conveyor public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - - if (component.Owner.Deleted) - { - return; - } - ChangeState(component); } } diff --git a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs b/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs index d34a88a12a..35c4b3368f 100644 --- a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs +++ b/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs @@ -60,12 +60,6 @@ namespace Content.Client.GameObjects.Components.Conveyor public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - - if (component.Owner.Deleted) - { - return; - } - ChangeState(component); } } diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs index 69d97e9fc4..a7985d6ef6 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs @@ -150,12 +150,6 @@ namespace Content.Client.GameObjects.Components.Disposal public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - - if (component.Owner.Deleted) - { - return; - } - ChangeState(component); } } diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs b/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs index d433c9dfff..fae26efa81 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs @@ -69,12 +69,6 @@ namespace Content.Client.GameObjects.Components.Disposal public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - - if (component.Owner.Deleted) - { - return; - } - ChangeState(component); } } diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs index 4cc6278333..e5c0023409 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs @@ -103,8 +103,7 @@ namespace Content.Client.GameObjects.Components.Doors public override void OnChangeData(AppearanceComponent component) { - if (component.Owner.Deleted) - return; + base.OnChangeData(component); var sprite = component.Owner.GetComponent(); var animPlayer = component.Owner.GetComponent(); diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs index a7fe2abced..e795f3f395 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs @@ -12,11 +12,6 @@ namespace Content.Client.GameObjects.Components.MedicalScanner { base.OnChangeData(component); - if (component.Owner.Deleted) - { - return; - } - var sprite = component.Owner.GetComponent(); if (!component.TryGetData(MedicalScannerVisuals.Status, out MedicalScannerStatus status)) return; sprite.LayerSetState(MedicalScannerVisualLayers.Machine, StatusToMachineStateId(status)); diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs index 214c8d9cef..11a68a39db 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs @@ -22,10 +22,8 @@ namespace Content.Client.GameObjects.Components.Nutrition public override void OnChangeData(AppearanceComponent component) { - if(!component.Owner.TryGetComponent(out var sprite)) - { - return; - }; + base.OnChangeData(component); + var sprite = component.Owner.GetComponent(); if (!component.TryGetData(SharedFoodComponent.FoodVisuals.MaxUses, out var maxUses)) { diff --git a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs index 5a21251b5a..242e3ca8c6 100644 --- a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs +++ b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs @@ -49,10 +49,7 @@ namespace Content.Client.GameObjects.Components.PDA public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - if (component.Owner.Deleted) - { - return; - } + var sprite = component.Owner.GetComponent(); sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false); if (component.TryGetData(PDAVisuals.FlashlightLit, out bool isScreenLit)) diff --git a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs b/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs index 2e992a516f..6ff0ed061a 100644 --- a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs +++ b/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs @@ -43,7 +43,7 @@ namespace Content.Client.GameObjects.Components public override void InitializeEntity(IEntity entity) { base.InitializeEntity(entity); - if (!entity.TryGetComponent(out var sprite)) + if (!entity.TryGetComponent(out var sprite)) { throw new EntityCreationException("No sprite component found in entity that has ParticleAcceleratorPartVisualizer"); } @@ -56,9 +56,7 @@ namespace Content.Client.GameObjects.Components public override void OnChangeData(AppearanceComponent component) { - if (component.Owner.Deleted) - return; - + base.OnChangeData(component); if (!component.Owner.TryGetComponent(out var sprite)) return; if (!component.TryGetData(ParticleAcceleratorVisuals.VisualState, out ParticleAcceleratorVisualState state)) { diff --git a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs index 07f4738f47..bdaeb507c5 100644 --- a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs +++ b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs @@ -57,8 +57,7 @@ namespace Content.Client.GameObjects.Components public override void OnChangeData(AppearanceComponent component) { - if (component.Owner.Deleted) - return; + base.OnChangeData(component); if (!component.Owner.TryGetComponent(out var sprite)) return; if (!component.Owner.TryGetComponent(out var animPlayer)) return; diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs index 1202401d27..a91136b6c7 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs @@ -16,8 +16,8 @@ namespace Content.Client.GameObjects.Components.VendingMachines public sealed class VendingMachineVisualizer : AppearanceVisualizer { // TODO: Should default to off or broken if damaged - // - + // + // TODO: The length of these animations is supposed to be dictated // by the vending machine's pack prototype's `AnimationDuration` // but we have no good way of passing that data from the server @@ -38,7 +38,7 @@ namespace Content.Client.GameObjects.Components.VendingMachines {"deny-unshaded", VendingMachineVisualLayers.BaseUnshaded}, {"broken", VendingMachineVisualLayers.Unlit}, }; - + private Dictionary _animations = new Dictionary(); public override void LoadData(YamlMappingNode node) @@ -71,7 +71,7 @@ namespace Content.Client.GameObjects.Components.VendingMachines _baseStates[textureState] = false; continue; } - + _baseStates.Add(textureState, yamlNode.AsBool()); } @@ -99,7 +99,7 @@ namespace Content.Client.GameObjects.Components.VendingMachines private void InitializeAnimation(string key, bool unshaded = false) { _animations.Add(key, new Animation {Length = TimeSpan.FromSeconds(1.2f)}); - + var flick = new AnimationTrackSpriteFlick(); _animations[key].AnimationTracks.Add(flick); flick.LayerKey = unshaded ? VendingMachineVisualLayers.BaseUnshaded : VendingMachineVisualLayers.Base; @@ -128,13 +128,15 @@ namespace Content.Client.GameObjects.Components.VendingMachines public override void OnChangeData(AppearanceComponent component) { + base.OnChangeData(component); + var sprite = component.Owner.GetComponent(); var animPlayer = component.Owner.GetComponent(); if (!component.TryGetData(VendingMachineVisuals.VisualState, out VendingMachineVisualState state)) { state = VendingMachineVisualState.Normal; } - + // Hide last state HideLayers(sprite); ActivateState(sprite, "off"); @@ -146,10 +148,10 @@ namespace Content.Client.GameObjects.Components.VendingMachines ActivateState(sprite, "normal-unshaded"); ActivateState(sprite, "normal"); break; - + case VendingMachineVisualState.Off: break; - + case VendingMachineVisualState.Broken: ActivateState(sprite, "broken-unshaded"); ActivateState(sprite, "broken"); @@ -171,7 +173,7 @@ namespace Content.Client.GameObjects.Components.VendingMachines throw new ArgumentOutOfRangeException(); } } - + // Helper methods just to avoid all of that hard-to-read-indented code private void ActivateState(ISpriteComponent spriteComponent, string stateId) { @@ -192,14 +194,14 @@ namespace Content.Client.GameObjects.Components.VendingMachines { return; } - + if (!animationPlayer.HasRunningAnimation(key)) { spriteComponent.LayerSetVisible(LayerMap[key], true); animationPlayer.Play(animation, key); } } - + public enum VendingMachineVisualLayers { // Off / Broken. The other layers will overlay this if the machine is on. diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs index d163427d50..afaae20e35 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs @@ -18,6 +18,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize public override void OnChangeData(AppearanceComponent component) { + base.OnChangeData(component); var sprite = component.Owner.GetComponent(); if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen)) diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs index f370e47681..30b5be0caa 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs @@ -45,6 +45,8 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize public override void OnChangeData(AppearanceComponent component) { + base.OnChangeData(component); + // tl;dr // 1.If no mag then hide it OR // 2. If step 0 isn't visible then hide it (mag or unshaded) diff --git a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs index ad1132652b..e523dae030 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs @@ -9,15 +9,16 @@ namespace Content.Client.GameObjects.Components.Wires public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - - if (component.Owner.Deleted) - return; - var sprite = component.Owner.GetComponent(); if (component.TryGetData(WiresVisuals.MaintenancePanelState, out var state)) { sprite.LayerSetVisible(WiresVisualLayers.MaintenancePanel, state); } + // Mainly for spawn window + else + { + sprite.LayerSetVisible(WiresVisualLayers.MaintenancePanel, false); + } } public enum WiresVisualLayers