From a9b9dc0a109a347e17fda3561c5ef5eff3de25f5 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sat, 21 Jan 2023 17:58:16 +1300 Subject: [PATCH] Fix dice sprite error (#13628) Fix https://github.com/space-wizards/space-station-14/issues/13627 --- Content.Shared/Dice/DiceComponent.cs | 6 +++--- Content.Shared/Dice/SharedDiceSystem.cs | 2 +- Resources/Prototypes/Entities/Objects/Fun/dice.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Shared/Dice/DiceComponent.cs b/Content.Shared/Dice/DiceComponent.cs index 357a9714dd..53b640effb 100644 --- a/Content.Shared/Dice/DiceComponent.cs +++ b/Content.Shared/Dice/DiceComponent.cs @@ -35,10 +35,10 @@ public sealed class DiceComponent : Component [Serializable, NetSerializable] public sealed class DiceState : ComponentState { - public int CurrentSide { get; set; } = 20; - public DiceState(int side) + public readonly int CurrentValue; + public DiceState(int value) { - CurrentSide = side; + CurrentValue = value; } } } diff --git a/Content.Shared/Dice/SharedDiceSystem.cs b/Content.Shared/Dice/SharedDiceSystem.cs index 611fcfa8cf..7572ad7391 100644 --- a/Content.Shared/Dice/SharedDiceSystem.cs +++ b/Content.Shared/Dice/SharedDiceSystem.cs @@ -21,7 +21,7 @@ public abstract class SharedDiceSystem : EntitySystem private void OnHandleState(EntityUid uid, DiceComponent component, ref ComponentHandleState args) { if (args.Current is DiceComponent.DiceState state) - component.CurrentValue = state.CurrentSide; + component.CurrentValue = state.CurrentValue; UpdateVisuals(uid, component); } diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml index 4d6d9e7667..af1bc8847b 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml @@ -26,7 +26,7 @@ sides: 10 multiplier: 10 offset: 1 # first side is a 0 - currentValue: 1 + currentValue: 0 - type: Sprite state: percentile_0