kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-09 01:29:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stickers: cleanup

Browse source
This commit is contained in:
NotAKidoS 2024-09-21 01:07:04 -05:00
parent 50804b323d
commit dbc6341f9e
12 changed files with 113 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Stickers/Stickers/StickerSystem.Main.cs
View file

@ -16,9 +16,7 @@ namespace NAK.Stickers;
public partial class StickerSystem
{
#region Singleton
public static bool RestrictedInstance = false;
public static StickerSystem Instance { get; private set; }
public static void Initialize()
@ -45,8 +43,9 @@ public partial class StickerSystem
private void OnPlayerSetupStart()
{
// TODO: this can be spammed by world author toggling CVRWorld.enabled state
CVRGameEventSystem.World.OnLoad.AddListener(_ => OnWorldLoad());
CVRGameEventSystem.World.OnUnload.AddListener(_ => OnWorldUnload());
CVRGameEventSystem.World.OnLoad.AddListener(_ => OnWorldLoad());
CVRGameEventSystem.Instance.OnConnected.AddListener((_) => { if (!Instances.IsReconnecting) OnInitialConnection(); });
CVRGameEventSystem.Player.OnJoinEntity.AddListener(Instance.OnPlayerJoined);
@ -61,30 +60,21 @@ public partial class StickerSystem
private void OnInitialConnection()
{
OnWorldLoad(); //Checks the world again in case the bundle updated.
ClearStickersSelf(); // clear stickers on remotes just in case we rejoined
ModNetwork.Reset(); // reset network buffers and metadata
}
private void OnWorldLoad()
{
GameObject StickerWorldRestriction = GameObject.Find("[DisableStickers]");
if (StickerWorldRestriction != null)
{
RestrictedInstance = true;
MelonLogger.Msg("This is a Restricted Instance");
}
else
{
MelonLogger.Msg("This is NOT a Restricted Instance");
}
BTKUIAddon.UpdateStickerMenu();
IsRestrictedInstance = GameObject.Find("[DisableStickers]") != null;
if (IsRestrictedInstance) StickerMod.Logger.Msg("Stickers are restricted by the world author.");
BTKUIAddon.OnStickerRestrictionUpdated(IsRestrictedInstance);
}
private void OnWorldUnload()
{
RestrictedInstance = false;
CleanupAllButSelf(); // release all stickers except for self
IsRestrictedInstance = false;
CleanupAllButSelf();
}
#endregion Game Events
@ -107,6 +97,8 @@ public partial class StickerSystem
// }
// }
public bool IsRestrictedInstance { get; internal set; }
private string SelectedStickerName => ModSettings.Hidden_SelectedStickerNames.Value[_selectedStickerSlot];
private const float StickerKillTime = 30f;
@ -131,7 +123,7 @@ public partial class StickerSystem
get => _isInStickerMode;
set
{
_isInStickerMode = value;
_isInStickerMode = value && !IsRestrictedInstance; // ensure cannot enter when restricted
if (_isInStickerMode)
{
CohtmlHud.Instance.SelectPropToSpawn(