Remove 2D suffix from visualizers (#1453)

This commit is contained in:
DrSmugleaf
2020-07-23 00:56:53 +02:00
committed by GitHub
parent 46f13da26d
commit c9057d01ae
85 changed files with 269 additions and 269 deletions

View File

@@ -7,7 +7,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components
{
public sealed class ComputerVisualizer2D : AppearanceVisualizer
public sealed class ComputerVisualizer : AppearanceVisualizer
{
private string KeyboardState = "generic_key";
private string ScreenState = "generic";

View File

@@ -12,7 +12,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Doors
{
public class AirlockVisualizer2D : AppearanceVisualizer
public class AirlockVisualizer : AppearanceVisualizer
{
private const string AnimationKey = "airlock_animation";
@@ -42,7 +42,7 @@ namespace Content.Client.GameObjects.Components.Doors
var flickMaintenancePanel = new AnimationTrackSpriteFlick();
CloseAnimation.AnimationTracks.Add(flickMaintenancePanel);
flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel;
flickMaintenancePanel.LayerKey = WiresVisualizer.WiresVisualLayers.MaintenancePanel;
flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_closing", 0f));
var sound = new AnimationTrackPlaySound();
@@ -64,7 +64,7 @@ namespace Content.Client.GameObjects.Components.Doors
var flickMaintenancePanel = new AnimationTrackSpriteFlick();
OpenAnimation.AnimationTracks.Add(flickMaintenancePanel);
flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel;
flickMaintenancePanel.LayerKey = WiresVisualizer.WiresVisualLayers.MaintenancePanel;
flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_opening", 0f));
var sound = new AnimationTrackPlaySound();
@@ -113,7 +113,7 @@ namespace Content.Client.GameObjects.Components.Doors
sprite.LayerSetState(DoorVisualLayers.Base, "closed");
sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit");
sprite.LayerSetState(DoorVisualLayers.BaseBolted, "bolted");
sprite.LayerSetState(WiresVisualizer2D.WiresVisualLayers.MaintenancePanel, "panel_open");
sprite.LayerSetState(WiresVisualizer.WiresVisualLayers.MaintenancePanel, "panel_open");
break;
case DoorVisualState.Closing:
if (!animPlayer.HasRunningAnimation(AnimationKey))

View File

@@ -6,7 +6,7 @@ using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerC
namespace Content.Client.GameObjects.Components.MedicalScanner
{
public class MedicalScannerVisualizer2D : AppearanceVisualizer
public class MedicalScannerVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)
{

View File

@@ -9,7 +9,7 @@ using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components.Mobs
{
public class SpeciesVisualizer2D : AppearanceVisualizer
public class SpeciesVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)
{

View File

@@ -7,7 +7,7 @@ using Robust.Client.Interfaces.GameObjects.Components;
namespace Content.Client.GameObjects.Components.Movement
{
[UsedImplicitly]
public class HandTeleporterVisualizer2D : AppearanceVisualizer
public class HandTeleporterVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)

View File

@@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Movement
{
[UsedImplicitly]
public class PortalVisualizer2D : AppearanceVisualizer
public class PortalVisualizer : AppearanceVisualizer
{
public override void InitializeEntity(IEntity entity)
{

View File

@@ -11,7 +11,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Nutrition
{
[UsedImplicitly]
public sealed class FoodContainerVisualizer2D : AppearanceVisualizer
public sealed class FoodContainerVisualizer : AppearanceVisualizer
{
private string _baseState;
private int _steps;

View File

@@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Nutrition
{
[UsedImplicitly]
public sealed class DrinkFoodVisualizer2D : AppearanceVisualizer
public sealed class DrinkFoodVisualizer : AppearanceVisualizer
{
private int _steps;

View File

@@ -5,7 +5,7 @@ using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Power
{
public class ApcVisualizer2D : AppearanceVisualizer
public class ApcVisualizer : AppearanceVisualizer
{
public override void InitializeEntity(IEntity entity)
{

View File

@@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Power
{
public class AutolatheVisualizer2D : AppearanceVisualizer
public class AutolatheVisualizer : AppearanceVisualizer
{
private const string AnimationKey = "autolathe_animation";

View File

@@ -8,7 +8,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Power
{
public class PowerCellVisualizer2D : AppearanceVisualizer
public class PowerCellVisualizer : AppearanceVisualizer
{
private string _prefix;

View File

@@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Power
{
[UsedImplicitly]
public class PowerChargerVisualizer2D : AppearanceVisualizer
public class PowerChargerVisualizer : AppearanceVisualizer
{
public override void InitializeEntity(IEntity entity)
{

View File

@@ -6,7 +6,7 @@ using Robust.Client.Interfaces.GameObjects.Components;
namespace Content.Client.GameObjects.Components.Power
{
[UsedImplicitly]
public class PowerDeviceVisualizer2D : AppearanceVisualizer
public class PowerDeviceVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)
{

View File

@@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Power
{
public class ProtolatheVisualizer2D : AppearanceVisualizer
public class ProtolatheVisualizer : AppearanceVisualizer
{
private const string AnimationKey = "protolathe_animation";

View File

@@ -5,7 +5,7 @@ using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Power
{
public class SmesVisualizer2D : AppearanceVisualizer
public class SmesVisualizer : AppearanceVisualizer
{
public override void InitializeEntity(IEntity entity)
{

View File

@@ -7,7 +7,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Storage
{
public sealed class StorageVisualizer2D : AppearanceVisualizer
public sealed class StorageVisualizer : AppearanceVisualizer
{
private string _stateBase;
private string _stateOpen;

View File

@@ -10,7 +10,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Doors
{
public class TimerTriggerVisualizer2D : AppearanceVisualizer
public class TimerTriggerVisualizer : AppearanceVisualizer
{
private const string AnimationKey = "priming_animation";

View File

@@ -9,7 +9,7 @@ using static Content.Shared.GameObjects.Components.VendingMachines.SharedVending
namespace Content.Client.GameObjects.Components.VendingMachines
{
public class VendingMachineVisualizer2D : AppearanceVisualizer
public class VendingMachineVisualizer : AppearanceVisualizer
{
// TODO: The length of these animations is supposed to be dictated
// by the vending machine's pack prototype's `AnimationDuration`

View File

@@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
{
[UsedImplicitly]
public sealed class BarrelBoltVisualizer2D : AppearanceVisualizer
public sealed class BarrelBoltVisualizer : AppearanceVisualizer
{
public override void InitializeEntity(IEntity entity)
{
@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
public override void OnChangeData(AppearanceComponent component)
{
var sprite = component.Owner.GetComponent<ISpriteComponent>();
if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen))
{
return;
@@ -35,4 +35,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
}
}
}
}
}

View File

@@ -10,7 +10,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
{
[UsedImplicitly]
public sealed class MagVisualizer2D : AppearanceVisualizer
public sealed class MagVisualizer : AppearanceVisualizer
{
private bool _magLoaded;
private string _magState;
@@ -63,7 +63,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
{
return;
}
var step = ContentHelpers.RoundToLevels(current, capacity, _magSteps);
if (step == 0 && !_zeroVisible)
@@ -72,7 +72,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
{
sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false);
}
if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _))
{
sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false);
@@ -99,7 +99,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
{
sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false);
}
if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _))
{
sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false);
@@ -107,4 +107,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
}
}
}
}
}

View File

@@ -6,7 +6,7 @@ using Robust.Client.Interfaces.GameObjects.Components;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
{
[UsedImplicitly]
public sealed class SpentAmmoVisualizer2D : AppearanceVisualizer
public sealed class SpentAmmoVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)
{
@@ -26,4 +26,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
{
Base,
}
}
}

View File

@@ -4,7 +4,7 @@ using static Content.Shared.GameObjects.Components.SharedWiresComponent;
namespace Content.Client.GameObjects.Components.Wires
{
public class WiresVisualizer2D : AppearanceVisualizer
public class WiresVisualizer : AppearanceVisualizer
{
public override void OnChangeData(AppearanceComponent component)
{