feat: rename grey prince enter short to force grey prince enter type

refactor to allow forcing both enter types

GodSeekerPlus/Lang/en.json

@@ -24,8 +24,8 @@
 	"Modules/FastDreamWarp": "Fast Dream Warp",
 	"Modules/FastSuperDash": "Fast Super Dash",
 	"Modules/ForceArriveAnimation": "Force Arrive Animation",
+	"Modules/ForceGreyPrinceEnterType": "Force Grey Prince Enter Type",
 	"Modules/ForceOvercharm": "Force Overcharm",
-	"Modules/GreyPrinceEnterShort": "Grey Prince Enter Short",
 	"Modules/GreyPrinceToggle": "Grey Prince Toggle",
 	"Modules/HalveDamage": "Halve Damage",
 	"Modules/InfiniteRadianceClimbing": "Infinite Radiance Climbing",

GodSeekerPlus/Lang/zh.json

@@ -24,8 +24,8 @@
 	"Modules/FastDreamWarp": "快速梦门传送",
 	"Modules/FastSuperDash": "快速超级冲刺",
 	"Modules/ForceArriveAnimation": "强制入场动画",
+	"Modules/ForceGreyPrinceEnterType": "强制灰色王子入场类型",
 	"Modules/ForceOvercharm": "强制护符过载",
-	"Modules/GreyPrinceEnterShort": "灰色王子短入场",
 	"Modules/GreyPrinceToggle": "灰色王子开关",
 	"Modules/HalveDamage": "伤害减半",
 	"Modules/InfiniteRadianceClimbing": "无限辐光爬梯",

GodSeekerPlus/Modules/QoL/GreyPrinceEnterShort.cs → GodSeekerPlus/Modules/BossChallenge/ForceGreyPrinceEnterType.cs

@@ -1,9 +1,9 @@
-namespace GodSeekerPlus.Modules.QoL;
+namespace GodSeekerPlus.Modules.BossChallenge;
 
-[Category(nameof(QoL))]
+[Category(nameof(BossChallenge))]
 [ToggleableLevel(ToggleableLevel.ChangeScene)]
 [DefaultEnabled]
-internal sealed class GreyPrinceEnterShort : Module {
+internal sealed class ForceGreyPrinceEnterType : Module {
 	private protected override void Load() =>
 		On.PlayMakerFSM.Start += ModifyGPFSM;
 
@@ -24,5 +24,7 @@ private void ModifyGPFSM(On.PlayMakerFSM.orig_Start orig, PlayMakerFSM self) {
 	}
 
 	private static void ModifyGPFSM(PlayMakerFSM fsm) =>
-		fsm.ChangeTransition("Enter 1", FsmEvent.Finished.Name, "Enter Short");
+		fsm.AddCustomAction("Enter 1", () => {
+			fsm.FsmVariables.FindFsmBool("Faced Zote").Value = GodSeekerPlus.GlobalSettings.gpzEnterType;
+		});
 }

GodSeekerPlus/Settings/GlobalSettings.cs

@@ -17,6 +17,7 @@ public sealed class GlobalSettings {
 	[JsonIgnore]
 	public int soulAmount = 99;
 
+	public bool gpzEnterType = false;
 
 	[JsonProperty(PropertyName = "features")]
 	public Dictionary<string, bool> Modules {

README.md

@@ -30,7 +30,7 @@ Compatible with `Hollow Knight` 1.5.
   + **Door Default Begin**: Default selecting the Begin button when opening Pantheon Door UI.
   + **Fast Dream Warping**: Remove dream warping charge time when in boss scenes. This decrease the total warping time from 2.25s to 0.25s.
   + **Fast Super Dash**: Buff Super Dash speed in Hall of Gods.
-  + **Grey Prince Enter Short**: Force Grey Prince to use short enter, as when defeated last time.
+  + **Force Grey Prince Enter Type**: Force select enter type that Grey Prince use.
   + **Grey Prince Toggle**: Add a Dream Nail toggle beside Grey Prince statue to show and control whether Grey Prince will appear in the Pantheons or not when in Godseeker mode.
   + **Memorize Bindings**: Memorize the Bindings selected last time, like difficulties in the Hall of Gods. Recommend using with Door Default Begin.
   + **P5 Teleport**: Allow using the Dream Nail towards the lever which is used to unlock Godhome Atrium Roof to teleport to beside the Pantheon of Hallownest.
@@ -57,6 +57,7 @@ All features can be toggled in-game.
 
 - `features` (`Object`): Whether to enable specified features.
 - `fastSuperDashSpeedMultiplier` (`Float`): Fast Super Dash speed multiplier. Ranges from `1` to `2`, defaults to `1.5`.
+- `gpzEnterType` (`Bool`): Name the enter type Grey Prince use. `false` for long enter, `true` for short enter.
 - `lagTime` (`Integer`): Lag time span in millisecond. Note that setting this to `0` does not mean zero lag. Ranges from `0` to `1000`, defaults to `50`.
 - `lifebloodAmount` (`Integer`): The amount of lifeblood to be added. Ranges from `0` to `35`, defaults to `5`.
 - `soulAmount` (`Integer`): The amount of soul to be added. Ranges from `0` to `198`, defaults to `99`.

README.zh.md

@@ -30,7 +30,7 @@
   + **门默认开始**：打开万神殿门界面时默认选中开始按钮。
   + **快速梦门传送**：当在 Boss 场景中时，移除梦之门传送充能时间。这将总传送时间从 2.25 秒减少到 0.25 秒。
   + **快速超级冲刺**：提升在诸神堂中的超级冲刺速度。
-  + **灰色王子短入场**：强制灰色王子使用短入场，如同上一次击败之的效果。
+  + **强制灰色王子入场类型**：强制选定灰色王子使用的入场类型。
   + **灰色王子开关**：在寻神者模式中，在灰色王子雕像旁添加一个梦之钉开关以显示并控制灰色王子是否出现在万神殿中。
   + **记住束缚**：记住上次选择的束缚，效果与诸神堂中的难度选择一样。建议与门默认开始一起使用。
   + **五门传送**：允许对着用于解锁神居中庭屋顶的拉杆使用梦之钉来传送到圣巢万神殿旁边。
@@ -57,6 +57,7 @@
 
 - `features` (`Object`): 是否启用指定的功能。
 - `fastSuperDashSpeedMultiplier` (`Float`)：快速超冲速度倍率。范围从 `1` 到 `2`，默认为 `1.5`。
+- `gpzEnterType` (`Bool`)：指定灰色王子入场类型。`false` 为长入场，`true` 为短入场。
 - `lagTime` (`Integer`)：卡顿时长，以毫秒计。注意将其设置为 `0` 并不意味着零卡顿。范围从 `0` 到 `1000`，默认为 `50`。
 - `lifebloodAmount` (`Integer`)：要添加的生命血数量。范围从 `0` 到 `35`，默认为 `5`。
 - `soulAmount` (`Integer`)：要添加的灵魂数量。范围从 `0` 到 `198`，默认为 `99`。