actually place pearl in front of scar when regurgitating

woutkolkman · Mar 17, 2023 · 7005fdc · 7005fdc
1 parent 6a76aae
commit 7005fdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/SpearmasterPearlStorage/Hooks.cs b/SpearmasterPearlStorage/Hooks.cs
@@ -51,15 +51,19 @@ static void PlayerRegurgitateHook(On.Player.orig_Regurgitate orig, Player self)
 
             orig(self);
 
-            //TODO offset pearl downwards
+            if (!isSpearmaster)
+                return;
+
+            //place pearl in front of scar
+            if (!self.Stunned && temp.realizedObject?.firstChunk != null && self.bodyChunks?.Length >= 2)
+                temp.realizedObject.firstChunk.HardSetPosition(Vector2.Lerp(self.bodyChunks[0].pos, self.bodyChunks[1].pos, 0.5f));
 
             //restore objectInStomach if pearl is extracted by Pebbles
-            if (isSpearmaster && self.Stunned)
+            if (self.Stunned)
                 self.objectInStomach = temp;
 
             //reset to Spearmaster
-            if (isSpearmaster)
-                self.SlugCatClass = MoreSlugcats.MoreSlugcatsEnums.SlugcatStatsName.Spear;
+            self.SlugCatClass = MoreSlugcats.MoreSlugcatsEnums.SlugcatStatsName.Spear;
         }
 
 

diff --git a/SpearmasterPearlStorage/bin/spearmasterpearlstorage/plugins/SpearmasterPearlStorage.dll b/SpearmasterPearlStorage/bin/spearmasterpearlstorage/plugins/SpearmasterPearlStorage.dll