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

fix up redo

Browse source
This commit is contained in:
NotAKidoS 2023-04-12 14:39:50 -05:00
parent 92a5991ff9
commit a202f6f987
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
PropUndoButton/Main.cs
View file

@ -32,8 +32,15 @@ public class PropUndoButton : MelonMod
public const string sfx_redo = "PropUndo_sfx_redo"; public const string sfx_redo = "PropUndo_sfx_redo";
public const string sfx_warn = "PropUndo_sfx_warn"; public const string sfx_warn = "PropUndo_sfx_warn";
public const int redoHistoryLimit = 5; // amount that can be in history at once
public const int redoTimeoutLimit = 60; // seconds
public override void OnInitializeMelon() public override void OnInitializeMelon()
{ {
HarmonyInstance.Patch( // delete all props in reverse order for redo
typeof(CVRSyncHelper).GetMethod(nameof(CVRSyncHelper.DeleteMyProps)),
prefix: new HarmonyLib.HarmonyMethod(typeof(PropUndoButton).GetMethod(nameof(OnDeleteMyProps), BindingFlags.NonPublic | BindingFlags.Static))
);
HarmonyInstance.Patch( // prop spawn sfx HarmonyInstance.Patch( // prop spawn sfx
typeof(CVRSyncHelper).GetMethod(nameof(CVRSyncHelper.SpawnProp)), typeof(CVRSyncHelper).GetMethod(nameof(CVRSyncHelper.SpawnProp)),
postfix: new HarmonyLib.HarmonyMethod(typeof(PropUndoButton).GetMethod(nameof(OnSpawnProp), BindingFlags.NonPublic | BindingFlags.Static)) postfix: new HarmonyLib.HarmonyMethod(typeof(PropUndoButton).GetMethod(nameof(OnSpawnProp), BindingFlags.NonPublic | BindingFlags.Static))
@ -109,7 +116,9 @@ public class PropUndoButton : MelonMod
{ {
if (!EntryEnabled.Value) return; if (!EntryEnabled.Value) return;
if (!MetaPort.Instance.worldAllowProps || !MetaPort.Instance.settings.GetSettingsBool("ContentFilterPropsEnabled", false)) if (!MetaPort.Instance.worldAllowProps
|| !MetaPort.Instance.settings.GetSettingsBool("ContentFilterPropsEnabled", false)
|| NetworkManager.Instance.GameNetwork.ConnectionState != ConnectionState.Connected)
{ {
PlayAudioModule(sfx_warn); PlayAudioModule(sfx_warn);
return; return;
@ -133,7 +142,7 @@ public class PropUndoButton : MelonMod
if (propData == null) return; if (propData == null) return;
// Add the spawned prop to the history of deleted props // Add the spawned prop to the history of deleted props
if (deletedProps.Count >= 5) deletedProps.RemoveAt(0); // Remove the oldest item if (deletedProps.Count >= redoHistoryLimit) deletedProps.RemoveAt(0); // Remove the oldest item
DeletedProp deletedProp = new DeletedProp(propData.ObjectId, propData.Spawnable.transform.position, propData.Spawnable.transform.rotation); DeletedProp deletedProp = new DeletedProp(propData.ObjectId, propData.Spawnable.transform.position, propData.Spawnable.transform.rotation);
deletedProps.Add(deletedProp); deletedProps.Add(deletedProp);
@ -145,6 +154,27 @@ public class PropUndoButton : MelonMod
deletedProps.Clear(); deletedProps.Clear();
} }
// delete in reverse order for undo to work as expected
private static bool OnDeleteMyProps()
{
List<CVRSyncHelper.PropData> propsList = GetAllProps();
for (int i = propsList.Count - 1; i >= 0; i--)
{
CVRSyncHelper.PropData propData = propsList[i];
if (propData.Spawnable == null)
{
propData.Recycle();
continue;
}
propData.Spawnable.Delete();
}
return false;
}
private static void UndoProp() private static void UndoProp()
{ {
if (!EntryEnabled.Value) return; if (!EntryEnabled.Value) return;
@ -176,7 +206,7 @@ public class PropUndoButton : MelonMod
} }
DeletedProp deletedProp = deletedProps[index]; DeletedProp deletedProp = deletedProps[index];
if (Time.time - deletedProp.timeDeleted <= 60) // only allow redo of prop spawned in last minute if (Time.time - deletedProp.timeDeleted <= redoTimeoutLimit) // only allow redo of prop spawned in last minute
{ {
if (AttemptRedoProp(deletedProp.propGuid, deletedProp.position, deletedProp.rotation)) if (AttemptRedoProp(deletedProp.propGuid, deletedProp.position, deletedProp.rotation))
{ {