From 7005fdcff73793f814733e3012453ca6dade1a5e Mon Sep 17 00:00:00 2001 From: woutkolkman Date: Fri, 17 Mar 2023 22:23:59 +0100 Subject: [PATCH] actually place pearl in front of scar when regurgitating --- SpearmasterPearlStorage/Hooks.cs | 12 ++++++++---- .../plugins/SpearmasterPearlStorage.dll | Bin 13824 -> 14336 bytes 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/SpearmasterPearlStorage/Hooks.cs b/SpearmasterPearlStorage/Hooks.cs index feef621..a2da31f 100644 --- 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 index f92e51e257bcc6c343eebb3f9d3522e313c50422..8c705b877f2dc393bba68bce82302df5ae1923c6 100644 GIT binary patch delta 4950 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