2.0.0: Use both hands toggle

Author: xamionex

PlayerHooks.cs

@@ -40,6 +40,9 @@ private void PlayerHooks()
 
         // In movement if it's true we can keep walking into walls, which shouldn't happen
         IL.Player.MovementUpdate += Player_AppendToIsSlugpupCheck;
+        
+        // False in SlugcatGrab if we have using both arms enabled
+        IL.Player.SlugcatGrab += Player_SlugcatGrabAppendToIsSlugpupCheck;
 
         // Add so we get correct hand positions
         IL.SlugcatHand.Update += Player_AppendPupCheck;
@@ -252,9 +255,9 @@ private void Player_AppendToIsSlugpupCheck(ILContext il)
 
             // Match the IL sequence for `call instance bool Player::get_isSlugpup()`
             while (c.TryGotoNext(MoveType.AfterLabel,
-                i => i.MatchLdarg(0), // Match ldarg.0 instruction
-                i => i.MatchCall(typeof(Player).GetMethod("get_isSlugpup")) // Match call to get_isSlugpup()
-            )) // Match the branch instruction after get_isSlugpup
+                       i => i.MatchLdarg(0), // Match ldarg.0 instruction
+                       i => i.MatchCall(typeof(Player).GetMethod("get_isSlugpup")) // Match call to get_isSlugpup()
+                   )) // Match the branch instruction after get_isSlugpup
             {
                 c.Index += 2;
                 // Insert the condition directly after get_isSlugpup
@@ -269,6 +272,34 @@ private void Player_AppendToIsSlugpupCheck(ILContext il)
         }
     }
 
+    private void Player_SlugcatGrabAppendToIsSlugpupCheck(ILContext il)
+    {
+        // 136	017F	ldarg.0
+        // 137	0180	call	instance bool Player::get_isSlugpup()
+        // 138	0185	brfalse.s	164 (01BF) ldc.i4.1 
+        try
+        {
+            var c = new ILCursor(il);
+
+            // Match the IL sequence for `call instance bool Player::get_isSlugpup()`
+            while (c.TryGotoNext(MoveType.AfterLabel,
+                       i => i.MatchLdarg(0), // Match ldarg.0 instruction
+                       i => i.MatchCall(typeof(Player).GetMethod("get_isSlugpup")) // Match call to get_isSlugpup()
+                   )) // Match the branch instruction after get_isSlugpup
+            {
+                c.Index += 2;
+                // Insert the condition directly after get_isSlugpup
+                c.Emit(OpCodes.Ldarg_0);
+                c.EmitDelegate((Player player) => !Options.UseBothHands.Value);
+                c.Emit(OpCodes.And);
+            }
+        }
+        catch (Exception ex)
+        {
+            LogError(ex, "Error in Player_AppendToIsSlugpupCheck");
+        }
+    }
+
     private void Player_AppendPupCheck(ILContext il)
     {
         //351	0328	isinst	Player

PluginInfo.cs

@@ -1,5 +1,5 @@
 internal static class PluginInfo {
 public const string PluginGUID = "amione.Pupifier";
 public const string PluginName = "Pupifier";
-public const string PluginVersion = "0.1.9";
+public const string PluginVersion = "2.0.0";
 }

Pupifier.csproj

@@ -4,7 +4,7 @@
     <AssemblyName>amione.Pupifier</AssemblyName>
     <Product>Pupifier</Product>
     <ProductDescription>Pupifier is a mod that allows you to become a slugpup in Rain World! This mod enhances your gameplay experience by enabling you to transform into a slugpup, offering a unique perspective and new challenges. Additionally, this mod was made for Rain Meadow but works normally as well!</ProductDescription>
-    <ModVersion>0.1.9</ModVersion>
+    <ModVersion>2.0.0</ModVersion>
     <Version>2.0.8</Version>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>

PupifierOptions.cs

@@ -27,6 +27,7 @@ public partial class PupifierOptions : OptionInterface
             public readonly Configurable<float> WallJumpPowerFac;
             public readonly Configurable<float> ActionJumpPowerFac;
             public readonly Configurable<bool> DisableBeingGrabbed;
+            public readonly Configurable<bool> UseBothHands;
 
             public PupifierOptions()
             {
@@ -52,6 +53,7 @@ public PupifierOptions()
 
                 // Toggles tab
                 DisableBeingGrabbed = config.Bind(nameof(DisableBeingGrabbed), false, new ConfigurableInfo("If enabled, you can't be grabbed", null, "", "Disable being Grabbed"));
+                UseBothHands = config.Bind(nameof(UseBothHands), false, new ConfigurableInfo("If enabled, you can use both hands as a pup", null, "", "Enable using both hands"));
 
                 // Experimental tab
                 ModAutoDisabledToggle = config.Bind(nameof(ModAutoDisabledToggle), false, new ConfigurableInfo("If true, Pupifier will not disable itself when other mods are found. This requires a restart", null, "", "Allow Incompatible Mods (Requires Restart)"));
@@ -122,6 +124,7 @@ public override void Initialize()
                     y = 540f;
                     sepr = 30f;
                     AddCheckbox(DisableBeingGrabbed, new Vector2(x, y -= sepr), softYellow, softYellow, softYellow);
+                    AddCheckbox(UseBothHands, new Vector2(x, y -= sepr), softYellow, softYellow, softYellow);
 
                     /**************** Experimental ****************/
                     curTab++;

pupifier/modinfo.json

@@ -1,7 +1,7 @@
 {
     "id": "amione.Pupifier",
     "name": "Pupifier",
-    "version": "0.1.9",
+    "version": "2.0.0",
     "target_game_version": "v1.9.15",
     "authors": "amione - Creator, youbitchoc - For helping in development, henpemaz - For Rain Meadow, Maxi Mol - For Mouse Drag code, LDani, simichan1227 - For testing the s**t out of my mod (It was kinda encouraging)",
     "description": "Pupifier is a mod that allows you to become a slugpup in Rain World! This mod enhances your gameplay experience by enabling you to transform into a slugpup, offering a unique perspective and new challenges. Additionally, this mod was made for Rain Meadow but works normally as well!",