From f66d12be43f0cfa662dc95dd93dde42eb5284766 Mon Sep 17 00:00:00 2001
From: madeline <qwertytrogi@gmail.com>
Date: Sun, 17 May 2026 13:42:58 -0700
Subject: [PATCH] make goats and snowboarding safety check stage

---
 src/dusk/achievements.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/dusk/achievements.cpp b/src/dusk/achievements.cpp
index 0add9357eb..b64b45ffcd 100644
--- a/src/dusk/achievements.cpp
+++ b/src/dusk/achievements.cpp
@@ -35,6 +35,9 @@ static void* s_cucco_play_search(void* i_actor, void*) {
 }
 
 static void checkGoatHerding(Achievement& a, int32_t threshMs) {
+    if (strcmp(dComIfGp_getStartStageName(), "F_SP00") != 0) {
+        return;
+    }
     if (dMeter2Info_getMaxCount() != 20 || dMeter2Info_getNowCount() != 20) {
         return;
     }
@@ -623,6 +626,9 @@ std::vector<AchievementSystem::Entry> AchievementSystem::makeEntries() {
                 false, 0, 0, false
             },
             [](Achievement& a, json&) {
+                if (strcmp(dComIfGp_getStartStageName(), "F_SP114") != 0) {
+                    return;
+                }
                 const int32_t bestMs = dComIfGs_getRaceGameTime();
                 if (dComIfGs_isEventBit(dSv_event_flag_c::F_0481) &&
                     bestMs > 0 && bestMs <= 70000) {