diff --git a/src/game/misc_handlers.cpp b/src/game/misc_handlers.cpp index 0a4da90..d27efd6 100644 --- a/src/game/misc_handlers.cpp +++ b/src/game/misc_handlers.cpp @@ -83,11 +83,11 @@ struct ScheduledActivity { int64_t begin; int64_t end; }; +// Grid Fight (71001, 71005) stays off: its data request goes unanswered, and a scheduled +// Grid Fight makes the red dot check throw inside GridFightActivityData. constexpr ScheduledActivity kSchedule[] = { {5010601, 50106, 1664355600, 4294967295}, {5011101, 50111, 1664355600, 4294967295}, - {7100101, 71001, 1762113600, 1794351599}, - {7100501, 71005, 1783886400, 1794348000}, }; void onGetActivityScheduleConfig(net::Session& session, diff --git a/tests/test_flow.cpp b/tests/test_flow.cpp index 2fef4b1..a98532a 100644 --- a/tests/test_flow.cpp +++ b/tests/test_flow.cpp @@ -538,11 +538,11 @@ void runFlowTests() { check(client.await(cmd::GetActivityScheduleConfigScRsp, packet), "activity schedule answered"); proto::GetActivityScheduleConfigScRsp scheduleRsp; check(parseBody(packet, scheduleRsp), "activity schedule parses"); - bool petChroma = false; + bool gridFight = false; for (const proto::ActivityScheduleData& data : scheduleRsp.schedule_data) { - if (data.activity_id == 7100501 && data.end_time > data.begin_time) petChroma = true; + gridFight |= data.activity_id == 7100101 || data.activity_id == 7100501; } - check(petChroma, "with 7100501 in it"); + check(!scheduleRsp.schedule_data.empty() && !gridFight, "without Grid Fight in it"); } // The CapySR watermark rides on every pause toggle.