Add CuccoShackCuccoCount

mm/2s2h/BenGui/SearchableMenuItems.h

@@ -1023,6 +1023,11 @@ void AddEnhancements() {
                 "-Rupee: Get the rupee reward",
                 WIDGET_CVAR_COMBOBOX,
                 { .comboBoxOptions = cremiaRewardOptions } },
+              { "Cucco Shack Cucco Count",
+                "gEnhancements.Minigames.CuccoShackCuccoCount",
+                "Choose how many cuccos you need to raise to make Grog happy.",
+                WIDGET_CVAR_SLIDER_INT,
+                { 1, 10, 10 } },
               { "Fast Magic Arrow Equip Animation", "gEnhancements.Equipment.MagicArrowEquipSpeed",
                 "Removes the animation for equipping Magic Arrows.", WIDGET_CVAR_CHECKBOX },
               { "Instant Fin Boomerangs Recall", "gEnhancements.PlayerActions.InstantRecall",

mm/2s2h/Enhancements/Enhancements.cpp

@@ -50,6 +50,7 @@ void InitEnhancements() {
     // Minigames
     RegisterAlwaysWinDoggyRace();
     RegisterCremiaHugs();
+    RegisterCuccoShackCuccoCount();
 
     // Player
     RegisterClimbSpeed();

mm/2s2h/Enhancements/Minigames/CuccoShackCuccoCount.cpp

@@ -0,0 +1,34 @@
+#include <libultraship/bridge.h>
+#include "2s2h/GameInteractor/GameInteractor.h"
+
+extern "C" {
+#include "overlays/actors/ovl_En_Hs/z_en_hs.h"
+#include "overlays/actors/ovl_En_Nwc/z_en_nwc.h"
+
+void func_8095345C(EnHs* enHs, PlayState* play);
+void EnNwc_SpawnDust(EnNwc* enNwc, PlayState* play);
+}
+
+void RegisterCuccoShackCuccoCount() {
+    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::ShouldActorUpdate>(
+        ACTOR_EN_HS, [](Actor* actor, bool* should) {
+            EnHs* enHs = (EnHs*)actor;
+
+            if (enHs->actionFunc != func_8095345C ||
+                CVarGetInteger("gEnhancements.Minigames.CuccoShackCuccoCount", 10) == 10) {
+                return;
+            }
+
+            // As soon as enough have grown up, set the count to the max
+            if (enHs->actor.home.rot.x >= (CVarGetInteger("gEnhancements.Minigames.CuccoShackCuccoCount", 10) * 2) &&
+                enHs->actor.home.rot.x != 20) {
+                enHs->actor.home.rot.x = 20;
+            }
+
+            // As soon as enough are following the player, set the count to the max
+            if (enHs->actor.home.rot.z >= (CVarGetInteger("gEnhancements.Minigames.CuccoShackCuccoCount", 10) * 2) &&
+                enHs->actor.home.rot.z != 20) {
+                enHs->actor.home.rot.z = 20;
+            }
+        });
+}

mm/2s2h/Enhancements/Minigames/Minigames.h

@@ -4,5 +4,6 @@
 void RegisterAlwaysWinDoggyRace();
 
 void RegisterCremiaHugs();
+void RegisterCuccoShackCuccoCount();
 
 #endif // MINIGAMES_H