diff --git a/GodSeekerPlus/GodSeekerPlus.csproj b/GodSeekerPlus/GodSeekerPlus.csproj
index ccf988a..c4d5961 100644
--- a/GodSeekerPlus/GodSeekerPlus.csproj
+++ b/GodSeekerPlus/GodSeekerPlus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<AssemblyTitle>GodSeekerPlus</AssemblyTitle>
-		<Version>0.17.1</Version>
+		<Version>0.18.0</Version>
 		<Description>A Hollow Knight mod to enhance your Godhome experience</Description>
 		<Authors>Clazex</Authors>
 
diff --git a/GodSeekerPlus/Lang/en.json b/GodSeekerPlus/Lang/en.json
index a1129d7..e3d8c44 100644
--- a/GodSeekerPlus/Lang/en.json
+++ b/GodSeekerPlus/Lang/en.json
@@ -28,6 +28,7 @@
 	"Modules/ForceOvercharm": "Force Overcharm",
 	"Modules/GreyPrinceToggle": "Grey Prince Toggle",
 	"Modules/HalveDamage": "Halve Damage",
+	"Modules/InfiniteGrimmPufferfish": "Infinite Grimm Pufferfish",
 	"Modules/InfiniteRadianceClimbing": "Infinite Radiance Climbing",
 	"Modules/MemorizeBindings": "Memorize Bindings",
 	"Modules/NoFuryEffect": "No Fury Effect",
diff --git a/GodSeekerPlus/Lang/zh.json b/GodSeekerPlus/Lang/zh.json
index d81776f..a68b40d 100644
--- a/GodSeekerPlus/Lang/zh.json
+++ b/GodSeekerPlus/Lang/zh.json
@@ -28,6 +28,7 @@
 	"Modules/ForceOvercharm": "强制护符过载",
 	"Modules/GreyPrinceToggle": "灰色王子开关",
 	"Modules/HalveDamage": "伤害减半",
+	"Modules/InfiniteGrimmPufferfish": "无限格林河豚",
 	"Modules/InfiniteRadianceClimbing": "无限辐光爬梯",
 	"Modules/MemorizeBindings": "记住束缚",
 	"Modules/NoFuryEffect": "禁用亡怒效果",
diff --git a/GodSeekerPlus/Modules/BossChallenge/InfiniteGrimmPufferfish.cs b/GodSeekerPlus/Modules/BossChallenge/InfiniteGrimmPufferfish.cs
new file mode 100644
index 0000000..1dc4413
--- /dev/null
+++ b/GodSeekerPlus/Modules/BossChallenge/InfiniteGrimmPufferfish.cs
@@ -0,0 +1,47 @@
+namespace GodSeekerPlus.Modules.BossChallenge;
+
+[Category(nameof(BossChallenge))]
+[ToggleableLevel(ToggleableLevel.ChangeScene)]
+internal sealed class InfiniteGrimmPufferfish : Module {
+	private protected override void Load() =>
+		On.PlayMakerFSM.Start += ModifyFSM;
+
+	private protected override void Unload() =>
+		On.PlayMakerFSM.Start -= ModifyFSM;
+
+	private void ModifyFSM(On.PlayMakerFSM.orig_Start orig, PlayMakerFSM self) {
+		orig(self);
+
+		if (BossSequenceController.IsInSequence) {
+			return;
+		}
+
+		if (self is {
+			gameObject: {
+				scene.name: "GG_Grimm",
+				name: "Grimm Boss"
+			},
+			FsmName: "Control"
+		}) {
+			ModifyGrimmFSM(self);
+
+			Logger.LogDebug("Grimm FSM modified");
+		} else if (self is {
+			gameObject: {
+				scene.name: "GG_Grimm_Nightmare",
+				name: "Nightmare Grimm Boss"
+			},
+			FsmName: "Control"
+		}) {
+			ModifyNKGFSM(self);
+
+			Logger.LogDebug("NKG FSM modified");
+		}
+	}
+
+	private static void ModifyGrimmFSM(PlayMakerFSM fsm) =>
+		fsm.ChangeTransition("Out Pause", FsmEvent.Finished.Name, "Balloon Pos");
+
+	private static void ModifyNKGFSM(PlayMakerFSM fsm) =>
+		fsm.ChangeTransition("Out Pause", FsmEvent.Finished.Name, "Balloon Pos");
+}
diff --git a/README.md b/README.md
index d11cb7c..69c0480 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Compatible with `Hollow Knight` 1.5.
   + **Force Arrive Animation**: Force the arrive animation to be played when fighting Vengefly King, Xero, Hive Knight and Enraged Guardian in Hall of Gods.
   + **Force Grey Prince Enter Type**: Force select enter type that Grey Prince use.
   + **Halve Damage**: Halve all the damage taken.
-  + **Infinite Radiance Climbing**: Start Absolute Radiance boss fight from the end of Phase 2 and reset when starting final phase.
+  + **Infinite Grimm Pufferfish**: When fighting in the Hall of Gods, make Troupe Master Grimm and Nightmare King Grimm only do pufferfish attack.
+  + **Infinite Radiance Climbing**: When fighting in the Hall of Gods, starts Absolute Radiance boss fight from the end of Phase 2 and reset when starting final phase.
   + **P5 Health**: Reduce boss health in Ascended and Radiant difficulty to match with Attuned difficulty.
 
 - **New Save Quickstart**:
diff --git a/README.zh.md b/README.zh.md
index 0cadad8..62f5cc6 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -16,7 +16,8 @@
   + **强制入场动画**：在诸神堂中挑战复仇蝇之王，泽若，蜂巢骑士和暴怒守卫时强制播放入场动画。
   + **强制灰色王子入场类型**：强制选定灰色王子使用的入场类型。
   + **伤害减半**：将受到的所有伤害减半。
-  + **无限辐光爬梯**：从第二阶段末尾开始无上辐光 Boss 战，并在开启最终阶段时重置。
+  + **无限格林河豚**：在诸神堂中挑战时，使剧团团长格林和梦魇之王格林只进行河豚攻击。
+  + **无限辐光爬梯**：在诸神堂中挑战时，从第二阶段末尾开始无上辐光 Boss 战，并在开启最终阶段时重置。
   + **五门血量**：将进升及辐辉难度下的 Boss 血量减少至与调谐难度相同。
 
 - **新存档起步**：