Skip to content

Commit

Permalink
# Implemented fix for part drop/throw while PlayerInMenu FsmBool is t…
Browse files Browse the repository at this point in the history
…rue.
  • Loading branch information
tommojphillips committed Sep 30, 2023
1 parent 7898b62 commit 3695310
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 12 deletions.
26 changes: 22 additions & 4 deletions ModAPI/Attachable/Part/PartManager.cs
Expand Up @@ -26,6 +26,7 @@ public class PartManager
private SaveManager _partSaveManager;
private Action _partLeaveAction;
private FsmGameObject _pickedUpObject;
private PlayMakerFSM _handPickup;

#endregion

Expand Down Expand Up @@ -104,12 +105,18 @@ internal void load()

_partSaveManager = new SaveManager();
_pickedUpObject = ModClient.getPickedUpGameObject;
PlayMakerFSM handPickup = ModClient.getHandPickUpFsm;
_handPickup = ModClient.getHandPickUpFsm;

// injecting part picked, drop and throw functions.
handPickup.GetState("Part picked").insertNewAction(onPickedUp, 5);
handPickup.GetState("Drop part").prependNewAction(onPartDropped);
handPickup.GetState("Throw part").prependNewAction(onPartThrown);
_handPickup.GetState("Part picked").insertNewAction(onPickedUp, 5);

FsmState dropState = _handPickup.GetState("Drop part");
dropState.prependNewAction(onPartDropped);
dropState.addNewTransitionToState("LOOP", "Part picked");

FsmState throwState = _handPickup.GetState("Throw part");
throwState.prependNewAction(onPartThrown);
throwState.addNewTransitionToState("LOOP", "Part picked");

// inject save function (For Auto Save)
GameObject.Find("ITEMS").GetPlayMaker("SaveItems").GetState("Save game").prependNewAction(onSave);
Expand Down Expand Up @@ -186,6 +193,11 @@ private void onPartDropped()
{
// Written, 11.06.2022

if (ModClient.playerInMenu)
{
_handPickup.SendEvent("LOOP");
return;
}
if (_pickedPart)
_partLeaveAction = _pickedPart.invokeDroppedEvent;
else
Expand All @@ -196,6 +208,12 @@ private void onPartThrown()
{
// Written, 11.06.2022

if (ModClient.playerInMenu)
{
_handPickup.SendEvent("LOOP");
return;
}

if (_pickedPart)
_partLeaveAction = _pickedPart.invokeThrownEvent;
else
Expand Down
14 changes: 7 additions & 7 deletions ModAPI/Properties/AssemblyInfo.cs
Expand Up @@ -4,7 +4,7 @@

// General Information
[assembly: AssemblyTitle("ModApi")]
[assembly: AssemblyDescription("ModApi v0.2.0 BUILD 2")]
[assembly: AssemblyDescription("ModApi v0.2.0 BUILD 7")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Tommo J. Productions")]
[assembly: AssemblyProduct("ModApi")]
Expand All @@ -13,7 +13,7 @@

// Version information
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("0.2.0.2")]
[assembly: AssemblyFileVersion("0.2.0.7")]

namespace TommoJProductions.ModApi
{
Expand All @@ -26,7 +26,7 @@ public class VersionInfo
/// <summary>
/// Represents latest release version date. Format: dd:MM:yyyy hh:mm tt
/// </summary>
public static readonly string lastestRelease = "30.09.2023 10:51 AM";
public static readonly string lastestRelease = "30.09.2023 01:29 PM";

/// <summary>
/// Represents current version. (Excluding build number)
Expand All @@ -40,20 +40,20 @@ public class VersionInfo
/// <summary>
/// Represents current full version . (including build number)
/// </summary>
public static readonly string fullVersion = "0.2.0.2";
public static readonly string fullVersion = "0.2.0.7";
/// <summary>
/// Represents current (constant) full version . (including build number)
/// </summary>
public const string FULL_VERSION = "0.2.0.2";
public const string FULL_VERSION = "0.2.0.7";

/// <summary>
/// Represents current build number. (excludes major, minor and revision numbers)
/// </summary>
public static readonly string build = "2";
public static readonly string build = "7";
/// <summary>
/// Represents current (const) build number. (excludes major, minor and revision numbers)
/// </summary>
public const string BUILD = "2";
public const string BUILD = "7";

/// <summary>
/// Represents if the mod has been complied for x64
Expand Down
2 changes: 1 addition & 1 deletion ModAPI/Properties/FileHistory.txt
@@ -1 +1 @@
0.2.0 BUILD 2
0.2.0 BUILD 7

0 comments on commit 3695310

Please sign in to comment.