fix(game): take grid fight off the schedule

This commit is contained in:
capyb2222 committed 2026-09-12 19:38:16 -07:00
1 parent a253fd6ee9
commit 43e2e42392
2 files changed
+5 -5

No files matched your search

+2 -2
View File
@@ -83,11 +83,11 @@ struct ScheduledActivity {
int64_t begin; int64_t begin;
int64_t end; 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[] = { constexpr ScheduledActivity kSchedule[] = {
{5010601, 50106, 1664355600, 4294967295}, {5010601, 50106, 1664355600, 4294967295},
{5011101, 50111, 1664355600, 4294967295}, {5011101, 50111, 1664355600, 4294967295},
{7100101, 71001, 1762113600, 1794351599},
{7100501, 71005, 1783886400, 1794348000},
}; };
void onGetActivityScheduleConfig(net::Session& session, void onGetActivityScheduleConfig(net::Session& session,
+3 -3
View File
@@ -538,11 +538,11 @@ void runFlowTests() {
check(client.await(cmd::GetActivityScheduleConfigScRsp, packet), "activity schedule answered"); check(client.await(cmd::GetActivityScheduleConfigScRsp, packet), "activity schedule answered");
proto::GetActivityScheduleConfigScRsp scheduleRsp; proto::GetActivityScheduleConfigScRsp scheduleRsp;
check(parseBody(packet, scheduleRsp), "activity schedule parses"); check(parseBody(packet, scheduleRsp), "activity schedule parses");
bool petChroma = false; bool gridFight = false;
for (const proto::ActivityScheduleData& data : scheduleRsp.schedule_data) { 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. // The CapySR watermark rides on every pause toggle.