From 8b49fb0147bc565f138e6f434928828115b6ddcd Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 1 Apr 2022 21:34:22 -0700 Subject: [PATCH] rename --- .../Messages/LocallyVisibleMessage.cs | 11 ------- .../Messages/SetVisibleMessage.cs | 11 +++++++ .../Messages/VisibleForMessage.cs | 1 - .../Patches/AlarmTotemPatches.cs | 4 +-- .../WorldObjects/QSBAlarmTotem.cs | 29 ++----------------- 5 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 QSB/EchoesOfTheEye/AlarmTotemSync/Messages/LocallyVisibleMessage.cs create mode 100644 QSB/EchoesOfTheEye/AlarmTotemSync/Messages/SetVisibleMessage.cs diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/LocallyVisibleMessage.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/LocallyVisibleMessage.cs deleted file mode 100644 index abbe4fea..00000000 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/LocallyVisibleMessage.cs +++ /dev/null @@ -1,11 +0,0 @@ -using QSB.EchoesOfTheEye.AlarmTotemSync.WorldObjects; -using QSB.Messaging; - -namespace QSB.EchoesOfTheEye.AlarmTotemSync.Messages; - -public class LocallyVisibleMessage : QSBWorldObjectMessage -{ - public LocallyVisibleMessage(bool visible) : base(visible) { } - public override void OnReceiveLocal() => OnReceiveRemote(); - public override void OnReceiveRemote() => WorldObject.SetLocallyVisible(From, Data); -} diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/SetVisibleMessage.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/SetVisibleMessage.cs new file mode 100644 index 00000000..9f7eff3a --- /dev/null +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/SetVisibleMessage.cs @@ -0,0 +1,11 @@ +using QSB.EchoesOfTheEye.AlarmTotemSync.WorldObjects; +using QSB.Messaging; + +namespace QSB.EchoesOfTheEye.AlarmTotemSync.Messages; + +public class SetVisibleMessage : QSBWorldObjectMessage +{ + public SetVisibleMessage(bool visible) : base(visible) { } + public override void OnReceiveLocal() => OnReceiveRemote(); + public override void OnReceiveRemote() => WorldObject.SetVisible(From, Data); +} diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/VisibleForMessage.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/VisibleForMessage.cs index f619c5a5..3047a1e7 100644 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/VisibleForMessage.cs +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/VisibleForMessage.cs @@ -15,6 +15,5 @@ public class VisibleForMessage : QSBWorldObjectMessage { WorldObject.VisibleFor.Clear(); WorldObject.VisibleFor.AddRange(Data); - WorldObject.UpdateVisible(); } } diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs index 4e3c8d93..cf84fc64 100644 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs @@ -75,7 +75,7 @@ public class AlarmTotemPatches : QSBPatch if (QSBWorldSync.AllObjectsReady) { - __instance.GetWorldObject().SendMessage(new LocallyVisibleMessage(true)); + __instance.GetWorldObject().SendMessage(new SetVisibleMessage(true)); } } else if (isPlayerVisible && !__instance._isPlayerVisible) @@ -88,7 +88,7 @@ public class AlarmTotemPatches : QSBPatch if (QSBWorldSync.AllObjectsReady) { - __instance.GetWorldObject().SendMessage(new LocallyVisibleMessage(false)); + __instance.GetWorldObject().SendMessage(new SetVisibleMessage(false)); } } diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs index 79562320..cf735e55 100644 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs @@ -28,7 +28,7 @@ public class QSBAlarmTotem : WorldObject { if (AttachedObject._isPlayerVisible) { - this.SendMessage(new LocallyVisibleMessage(true)); + this.SendMessage(new SetVisibleMessage(true)); } }); } @@ -39,7 +39,7 @@ public class QSBAlarmTotem : WorldObject private void OnPlayerLeave(PlayerInfo player) => VisibleFor.QuickRemove(player.PlayerId); - public void SetLocallyVisible(uint playerId, bool visible) + public void SetVisible(uint playerId, bool visible) { if (visible) { @@ -49,31 +49,6 @@ public class QSBAlarmTotem : WorldObject { VisibleFor.QuickRemove(playerId); } - - UpdateVisible(); - } - - public void UpdateVisible() - { - if (AttachedObject._isPlayerVisible && VisibleFor.Count < 1) - { - Locator.GetAlarmSequenceController().IncreaseAlarmCounter(); - AttachedObject._simTotemMaterials[0] = AttachedObject._simAlarmMaterial; - AttachedObject._simTotemRenderer.sharedMaterials = AttachedObject._simTotemMaterials; - AttachedObject._simVisionConeRenderer.SetColor(AttachedObject._simAlarmColor); - if (AttachedObject._isTutorialTotem) - { - GlobalMessenger.FireEvent("TutorialAlarmTotemTriggered"); - } - } - else if (!AttachedObject._isPlayerVisible && VisibleFor.Count >= 1) - { - Locator.GetAlarmSequenceController().DecreaseAlarmCounter(); - AttachedObject._simTotemMaterials[0] = AttachedObject._origSimEyeMaterial; - AttachedObject._simTotemRenderer.sharedMaterials = AttachedObject._simTotemMaterials; - AttachedObject._simVisionConeRenderer.SetColor(AttachedObject._simVisionConeRenderer.GetOriginalColor()); - AttachedObject._pulseLightController.FadeTo(0f, 0.5f); - } } public void SetEnabled(bool enabled)