PufferBowls now interact with vanilla Puffers.

CommunalHelper · Dec 21, 2020 · 31d028d · 31d028d
1 parent 328a281
commit 31d028d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/VortexHelper.dll b/VortexHelper.dll
diff --git a/VortexHelper/Entities/BowlPuffer.cs b/VortexHelper/Entities/BowlPuffer.cs
@@ -507,6 +507,15 @@ private void DoEntityCustomInteraction()
 				}
 			}
 
+			foreach(Actor e in CollideAll<Actor>())
+            {
+				if(e is Puffer)
+				{
+					VortexHelperModule.Puffer_Explode.Invoke(e, new object[] { });
+					VortexHelperModule.Puffer_GotoGone.Invoke(e, new object[] { });
+				}
+            }
+
 			foreach (Solid e in CollideAll<Solid>())
 			{
 				// Temple Cracked Blocks

diff --git a/VortexHelper/VortexHelper.csproj b/VortexHelper/VortexHelper.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\Desktop\Celeste\Mods\VortexHelper\</OutputPath>
+    <OutputPath>..\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,20 +43,20 @@
       <HintPath>..\..\..\MMHOOK_Celeste.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Mono.Cecil, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil">
+      <HintPath>..\..\..\Mono.Cecil.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb">
+      <HintPath>..\..\..\Mono.Cecil.Mdb.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb">
+      <HintPath>..\..\..\Mono.Cecil.Pdb.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks">
+      <HintPath>..\..\..\Mono.Cecil.Rocks.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MonoMod.Utils">

diff --git a/VortexHelper/VortexHelperModule.cs b/VortexHelper/VortexHelperModule.cs
@@ -25,6 +25,8 @@ class VortexHelperModule : EverestModule
         public static MethodInfo Spring_BounceAnimate = typeof(Spring).GetMethod("BounceAnimate", BindingFlags.Instance | BindingFlags.NonPublic);
         public static MethodInfo CrushBlock_OnDashed = typeof(CrushBlock).GetMethod("OnDashed", BindingFlags.Instance | BindingFlags.NonPublic);
         public static MethodInfo CoreModeToggle_OnPlayer = typeof(CoreModeToggle).GetMethod("OnPlayer", BindingFlags.Instance | BindingFlags.NonPublic);
+        public static MethodInfo Puffer_Explode = typeof(Puffer).GetMethod("Explode", BindingFlags.Instance | BindingFlags.NonPublic);
+        public static MethodInfo Puffer_GotoGone = typeof(Puffer).GetMethod("GotoGone", BindingFlags.Instance | BindingFlags.NonPublic);
 
         public static bool AllowPlayerDashRefills = true;
 
@@ -91,11 +93,6 @@ private void Spring_OnBowlPuffer(BowlPuffer puffer, Spring self)
             Spring_BounceAnimate.Invoke(self, new object[] { });
         }
 
-
-
-
-
-
         private void LevelLoader_LoadingThread(On.Celeste.LevelLoader.orig_LoadingThread orig, LevelLoader self)
         {
             orig(self);