Skip to content

Commit 3695310

Browse files
# Implemented fix for part drop/throw while PlayerInMenu FsmBool is true.
1 parent 7898b62 commit 3695310

3 files changed

Lines changed: 30 additions & 12 deletions

File tree

ModAPI/Attachable/Part/PartManager.cs

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class PartManager
2626
private SaveManager _partSaveManager;
2727
private Action _partLeaveAction;
2828
private FsmGameObject _pickedUpObject;
29+
private PlayMakerFSM _handPickup;
2930

3031
#endregion
3132

@@ -104,12 +105,18 @@ internal void load()
104105

105106
_partSaveManager = new SaveManager();
106107
_pickedUpObject = ModClient.getPickedUpGameObject;
107-
PlayMakerFSM handPickup = ModClient.getHandPickUpFsm;
108+
_handPickup = ModClient.getHandPickUpFsm;
108109

109110
// injecting part picked, drop and throw functions.
110-
handPickup.GetState("Part picked").insertNewAction(onPickedUp, 5);
111-
handPickup.GetState("Drop part").prependNewAction(onPartDropped);
112-
handPickup.GetState("Throw part").prependNewAction(onPartThrown);
111+
_handPickup.GetState("Part picked").insertNewAction(onPickedUp, 5);
112+
113+
FsmState dropState = _handPickup.GetState("Drop part");
114+
dropState.prependNewAction(onPartDropped);
115+
dropState.addNewTransitionToState("LOOP", "Part picked");
116+
117+
FsmState throwState = _handPickup.GetState("Throw part");
118+
throwState.prependNewAction(onPartThrown);
119+
throwState.addNewTransitionToState("LOOP", "Part picked");
113120

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

196+
if (ModClient.playerInMenu)
197+
{
198+
_handPickup.SendEvent("LOOP");
199+
return;
200+
}
189201
if (_pickedPart)
190202
_partLeaveAction = _pickedPart.invokeDroppedEvent;
191203
else
@@ -196,6 +208,12 @@ private void onPartThrown()
196208
{
197209
// Written, 11.06.2022
198210

211+
if (ModClient.playerInMenu)
212+
{
213+
_handPickup.SendEvent("LOOP");
214+
return;
215+
}
216+
199217
if (_pickedPart)
200218
_partLeaveAction = _pickedPart.invokeThrownEvent;
201219
else

ModAPI/Properties/AssemblyInfo.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// General Information
66
[assembly: AssemblyTitle("ModApi")]
7-
[assembly: AssemblyDescription("ModApi v0.2.0 BUILD 2")]
7+
[assembly: AssemblyDescription("ModApi v0.2.0 BUILD 7")]
88
[assembly: AssemblyConfiguration("")]
99
[assembly: AssemblyCompany("Tommo J. Productions")]
1010
[assembly: AssemblyProduct("ModApi")]
@@ -13,7 +13,7 @@
1313

1414
// Version information
1515
[assembly: AssemblyVersion("1.0.0.0")]
16-
[assembly: AssemblyFileVersion("0.2.0.2")]
16+
[assembly: AssemblyFileVersion("0.2.0.7")]
1717

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

3131
/// <summary>
3232
/// Represents current version. (Excluding build number)
@@ -40,20 +40,20 @@ public class VersionInfo
4040
/// <summary>
4141
/// Represents current full version . (including build number)
4242
/// </summary>
43-
public static readonly string fullVersion = "0.2.0.2";
43+
public static readonly string fullVersion = "0.2.0.7";
4444
/// <summary>
4545
/// Represents current (constant) full version . (including build number)
4646
/// </summary>
47-
public const string FULL_VERSION = "0.2.0.2";
47+
public const string FULL_VERSION = "0.2.0.7";
4848

4949
/// <summary>
5050
/// Represents current build number. (excludes major, minor and revision numbers)
5151
/// </summary>
52-
public static readonly string build = "2";
52+
public static readonly string build = "7";
5353
/// <summary>
5454
/// Represents current (const) build number. (excludes major, minor and revision numbers)
5555
/// </summary>
56-
public const string BUILD = "2";
56+
public const string BUILD = "7";
5757

5858
/// <summary>
5959
/// Represents if the mod has been complied for x64

ModAPI/Properties/FileHistory.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.0 BUILD 2
1+
0.2.0 BUILD 7

0 commit comments

Comments
 (0)