diff --git a/QSB/Animation/Player/AnimationSync.cs b/QSB/Animation/Player/AnimationSync.cs index 39b99a02..5be8eb86 100644 --- a/QSB/Animation/Player/AnimationSync.cs +++ b/QSB/Animation/Player/AnimationSync.cs @@ -26,6 +26,14 @@ public class AnimationSync : PlayerSyncObject public Animator InvisibleAnimator { get; private set; } public NetworkAnimator NetworkAnimator { get; private set; } + public const string HOLD_LANTERN_TRIGGER = "HoldLantern"; + public const string HOLD_SHARED_STONE_TRIGGER = "HoldSharedStone"; + public const string HOLD_SCROLL_TRIGGER = "HoldScroll"; + public const string HOLD_WARP_CORE_TRIGGER = "HoldWarpCore"; + public const string HOLD_VESSEL_CORE_TRIGGER = "HoldAdvWarpCore"; + public const string HOLD_CONVERSATION_STONE_TRIGGER = "HoldItem"; + public const string DROP_HELD_ITEM = "DropHeldItem"; + protected void Awake() { InvisibleAnimator = gameObject.GetRequiredComponent(); diff --git a/QSB/CampfireSync/Messages/BurnSlideReelMessage.cs b/QSB/CampfireSync/Messages/BurnSlideReelMessage.cs index 7354ba44..391ca093 100644 --- a/QSB/CampfireSync/Messages/BurnSlideReelMessage.cs +++ b/QSB/CampfireSync/Messages/BurnSlideReelMessage.cs @@ -1,4 +1,5 @@ -using QSB.CampfireSync.WorldObjects; +using QSB.Animation.Player; +using QSB.CampfireSync.WorldObjects; using QSB.ItemSync.WorldObjects.Items; using QSB.Messaging; using QSB.Player; @@ -23,7 +24,7 @@ public class BurnSlideReelMessage : QSBWorldObjectMessage campfire._burnedSlideReelSocket, campfire._sector, null); fromPlayer.HeldItem = null; - fromPlayer.AnimationSync.VisibleAnimator.SetTrigger("DropHeldItem"); + fromPlayer.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.DROP_HELD_ITEM); WorldObject.AttachedObject.Burn(); campfire.SetDropSlideReelMode(false); campfire._hasBurnedSlideReel = true; diff --git a/QSB/ItemSync/Messages/DropItemMessage.cs b/QSB/ItemSync/Messages/DropItemMessage.cs index 6bc88a75..4eeba2ac 100644 --- a/QSB/ItemSync/Messages/DropItemMessage.cs +++ b/QSB/ItemSync/Messages/DropItemMessage.cs @@ -1,4 +1,5 @@ -using QSB.ItemSync.WorldObjects; +using QSB.Animation.Player; +using QSB.ItemSync.WorldObjects; using QSB.ItemSync.WorldObjects.Items; using QSB.Messaging; using QSB.Player; @@ -69,6 +70,6 @@ public class DropItemMessage : QSBWorldObjectMessage switch (itemType) { case ItemType.Scroll: - player.AnimationSync.VisibleAnimator.SetTrigger("HoldScroll"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_SCROLL_TRIGGER); break; case ItemType.WarpCore: if (((QSBWarpCoreItem)WorldObject).IsVesselCoreType()) { - player.AnimationSync.VisibleAnimator.SetTrigger("HoldAdvWarpCore"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_VESSEL_CORE_TRIGGER); } else { - player.AnimationSync.VisibleAnimator.SetTrigger("HoldWarpCore"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_WARP_CORE_TRIGGER); } break; case ItemType.SharedStone: - player.AnimationSync.VisibleAnimator.SetTrigger("HoldSharedStone"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_SHARED_STONE_TRIGGER); break; case ItemType.ConversationStone: - player.AnimationSync.VisibleAnimator.SetTrigger("HoldItem"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_CONVERSATION_STONE_TRIGGER); break; case ItemType.Lantern: - player.AnimationSync.VisibleAnimator.SetTrigger("HoldLantern"); + player.AnimationSync.VisibleAnimator.SetTrigger(AnimationSync.HOLD_LANTERN_TRIGGER); break; case ItemType.SlideReel: case ItemType.DreamLantern: diff --git a/QSB/ItemSync/Messages/SocketItemMessage.cs b/QSB/ItemSync/Messages/SocketItemMessage.cs index 0d5e8753..c2121e4b 100644 --- a/QSB/ItemSync/Messages/SocketItemMessage.cs +++ b/QSB/ItemSync/Messages/SocketItemMessage.cs @@ -1,4 +1,5 @@ -using QSB.ItemSync.WorldObjects.Items; +using QSB.Animation.Player; +using QSB.ItemSync.WorldObjects.Items; using QSB.ItemSync.WorldObjects.Sockets; using QSB.Messaging; using QSB.Player; @@ -29,7 +30,7 @@ public class SocketItemMessage : QSBWorldObjectMessage