2.0.1: spearmaster 2 handed, mod description

Author: xamionex

PlayerHooks.cs

@@ -41,7 +41,7 @@ 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
+        // False in SlugcatGrab if we have using both arms enabled or if were spearmaster and we want to pick up a spear
         IL.Player.SlugcatGrab += Player_SlugcatGrabAppendToIsSlugpupCheck;
 
         // Add so we get correct hand positions
@@ -290,7 +290,8 @@ private void Player_SlugcatGrabAppendToIsSlugpupCheck(ILContext il)
                 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.Ldarg_1);
+                c.EmitDelegate(GetHandsCanGrabAnyway);
                 c.Emit(OpCodes.And);
             }
         }
@@ -300,6 +301,19 @@ private void Player_SlugcatGrabAppendToIsSlugpupCheck(ILContext il)
         }
     }
 
+    // Inverted ifs because we need to not pass the slugpup if check, not go inside it
+    private bool GetHandsCanGrabAnyway(Player player, PhysicalObject obj)
+    {
+        if (Options.SpearmasterTwoHanded.Value && player.SlugCatClass == MoreSlugcatsEnums.SlugcatStatsName.Spear &&
+            obj is Spear && IsHoldingSpear(player)) return false;
+        return !Options.UseBothHands.Value;
+    }
+
+    private bool IsHoldingSpear(Player player)
+    {
+        return player.grasps[0]?.grabbed is Spear || player.grasps[1]?.grabbed is Spear;
+    }
+
     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 = "2.0.0";
+public const string PluginVersion = "2.0.1";
 }

Pupifier.csproj

@@ -3,8 +3,33 @@
     <TargetFramework>net48</TargetFramework>
     <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>2.0.0</ModVersion>
+    <ProductDescription>
+Lets you become a slugpup in Rain World with a push of a button (dynamic in-game transform), with meadow support. This mod was made specifically for meadow but works for non-meadow as well
+
+Known issues
+
+- Meadow issues are not related to my mod (grabbing players and breaking if you go thru a pipe, piggybacking desync)
+- Report any issues please!
+
+Features
+
+- Transform into a slugpup (Works in Rain Meadow)
+- Change your stats based on slugpup relativity
+- Works with modded slugcats as wellCredits
+      
+Credits
+      
+- 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)
+      
+Report Issues on github please! https://github.com/xamionex/Pupifier/issues/new
+Steam doesn't give me notifications for comments on my own mods for some reason,
+so I might not see your comment because I need to literally go to the mod page to see it, and I'm not doing that every day.
+    </ProductDescription>
+    <ModVersion>2.0.1</ModVersion>
     <Version>2.0.8</Version>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>

PupifierOptions.cs

@@ -28,6 +28,7 @@ public partial class PupifierOptions : OptionInterface
             public readonly Configurable<float> ActionJumpPowerFac;
             public readonly Configurable<bool> DisableBeingGrabbed;
             public readonly Configurable<bool> UseBothHands;
+            public readonly Configurable<bool> SpearmasterTwoHanded;
 
             public PupifierOptions()
             {
@@ -54,6 +55,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"));
+                SpearmasterTwoHanded = config.Bind(nameof(SpearmasterTwoHanded), true, new ConfigurableInfo("If enabled, you can use both hands for spears as spearmaster", null, "", "Spearmaster can hold 2 spears"));
 
                 // 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)"));
@@ -125,6 +127,7 @@ public override void Initialize()
                     sepr = 30f;
                     AddCheckbox(DisableBeingGrabbed, new Vector2(x, y -= sepr), softYellow, softYellow, softYellow);
                     AddCheckbox(UseBothHands, new Vector2(x, y -= sepr), softYellow, softYellow, softYellow);
+                    AddCheckbox(SpearmasterTwoHanded, new Vector2(x, y -= sepr), softYellow, softYellow, softYellow);
 
                     /**************** Experimental ****************/
                     curTab++;

pupifier/modinfo.json

@@ -1,10 +1,35 @@
 {
     "id": "amione.Pupifier",
     "name": "Pupifier",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "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!",
+    "description": "
+Lets you become a slugpup in Rain World with a push of a button (dynamic in-game transform), with meadow support. This mod was made specifically for meadow but works for non-meadow as well
+
+Known issues
+
+- Meadow issues are not related to my mod (grabbing players and breaking if you go thru a pipe, piggybacking desync)
+- Report any issues please!
+
+Features
+
+- Transform into a slugpup (Works in Rain Meadow)
+- Change your stats based on slugpup relativity
+- Works with modded slugcats as wellCredits
+      
+Credits
+      
+- 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)
+      
+Report Issues on github please! https://github.com/xamionex/Pupifier/issues/new
+Steam doesn't give me notifications for comments on my own mods for some reason,
+so I might not see your comment because I need to literally go to the mod page to see it, and I'm not doing that every day.
+    ",
     "requirements": ["moreslugcats"],
     "requirements_names": [],
     "checksum_override_version": true

readme.md

@@ -1,16 +1,17 @@
 # Pupifier
 
-Pupifier is a mod that allows you to become a slugpup in Rain Meadow! This mod enhances your gameplay experience by enabling you to transform into a slugpup, offering a unique perspective and new challenges.
+Lets you become a slugpup in Rain World with a push of a button (dynamic in-game transform), with meadow support. This mod was made specifically for meadow but works for non-meadow as well
 
 ## Known issues
 
-- Meadow issues are not related to my mod (grabbing players and breaking if you go thru a pipe...)
+- Meadow issues are not related to my mod (grabbing players and breaking if you go thru a pipe, piggybacking desync)
 - Report any issues please!
 
 ## Features
 
-- Transform into a slugpup in Rain Meadow.
+- Transform into a slugpup (Works in Rain Meadow)
 - Change your stats based on slugpup relativity
+- Works with modded slugcats as well
 
 ## Installation
 
@@ -22,9 +23,7 @@ Pupifier is a mod that allows you to become a slugpup in Rain Meadow! This mod e
 ## Requirements
 
 - Game version: v1.9.15
-- Required Mods:
-  - henpemaz_rainmeadow
-  - moreslugcats
+- Required Mods: moreslugcats
 
 ## Credits
 
@@ -40,6 +39,5 @@ This mod is provided as-is, without any express or implied warranties. Use at yo
 
 ## Support
 
-If you encounter any issues or have questions, feel free to reach out to the community or contribute to the development of the mod.
-
+If you encounter any issues or have questions, feel free to reach out or contribute to the development of the mod.
 Enjoy your time as a slugpup in Rain Meadow!