nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Block Syncing Items and Flags when playing Archi (#31)

Browse Source
This commit is contained in:
Patrick12115
2025-11-30 16:38:29 -05:00
committed by GitHub
parent aa119ce8f9
commit 7b1820298d
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
soh/soh/Network/Anchor/Menu.cpp
View File

@@ -126,6 +126,9 @@ void AnchorMainMenu(WidgetInfo& info) {
ImGui::SeparatorText("Current Room"); ImGui::SeparatorText("Current Room");
ImGui::Text("%s Connected", ICON_FA_CHECK); ImGui::Text("%s Connected", ICON_FA_CHECK);
if (IS_ARCHIPELAGO)
ImGui::BeginDisabled();
UIWidgets::PushStyleButton(THEME_COLOR); UIWidgets::PushStyleButton(THEME_COLOR);
if (ImGui::Button("Request Team State")) { if (ImGui::Button("Request Team State")) {
anchor->SendPacket_RequestTeamState(); anchor->SendPacket_RequestTeamState();
@@ -133,6 +136,9 @@ void AnchorMainMenu(WidgetInfo& info) {
UIWidgets::Tooltip("Try this if you are missing items or flags that your team members have collected"); UIWidgets::Tooltip("Try this if you are missing items or flags that your team members have collected");
UIWidgets::PopStyleButton(); UIWidgets::PopStyleButton();
if (IS_ARCHIPELAGO)
ImGui::EndDisabled();
ImGui::SameLine(); ImGui::SameLine();
UIWidgets::WindowButton("Toggle Anchor Room Window", CVAR_WINDOW("AnchorRoom"), SohGui::mAnchorRoomWindow); UIWidgets::WindowButton("Toggle Anchor Room Window", CVAR_WINDOW("AnchorRoom"), SohGui::mAnchorRoomWindow);
@@ -186,10 +192,20 @@ void AnchorAdminMenu(WidgetInfo& info) {
.Color(THEME_COLOR))) { .Color(THEME_COLOR))) {
anchor->SendPacket_UpdateRoomState(); anchor->SendPacket_UpdateRoomState();
} }
if (IS_ARCHIPELAGO) {
CVarSetInteger(CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"), 0);
ImGui::BeginDisabled();
}
if (UIWidgets::CVarCheckbox("Sync Items & Flags", CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"), if (UIWidgets::CVarCheckbox("Sync Items & Flags", CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"),
UIWidgets::CheckboxOptions().DefaultValue(true).Color(THEME_COLOR))) { UIWidgets::CheckboxOptions().DefaultValue(true).Color(THEME_COLOR))) {
anchor->SendPacket_UpdateRoomState(); anchor->SendPacket_UpdateRoomState();
} }
if (IS_ARCHIPELAGO) {
ImGui::EndDisabled();
}
} }
void AnchorInstructionsMenu(WidgetInfo& info) { void AnchorInstructionsMenu(WidgetInfo& info) {

2
soh/soh/Network/Archipelago/Archipelago.cpp
View File

@@ -48,6 +48,8 @@ bool ArchipelagoClient::StartClient() {
apClient.reset(); apClient.reset();
} }
CVarSetInteger(CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"), 0);
disconnecting = false; disconnecting = false;
retries = 0; retries = 0;
uri = CVarGetString(CVAR_REMOTE_ARCHIPELAGO("ServerAddress"), "localhost:38281"); uri = CVarGetString(CVAR_REMOTE_ARCHIPELAGO("ServerAddress"), "localhost:38281");