Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add team field to AnchorClient. #94

Open
wants to merge 1 commit into
base: anchor-next-puppets
Choose a base branch
from
Open

Add team field to AnchorClient. #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 65 additions & 3 deletions soh/soh/Enhancements/game-interactor/GameInteractor_Anchor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ void from_json(const json& j, AnchorClient& client) {
j.contains("clientVersion") ? j.at("clientVersion").get_to(client.clientVersion) : client.clientVersion = "???";
j.contains("name") ? j.at("name").get_to(client.name) : client.name = "???";
j.contains("color") ? j.at("color").get_to(client.color) : client.color = {255, 255, 255};
j.contains("team") ? j.at("team").get_to(client.team) : client.team = "???";
j.contains("seed") ? j.at("seed").get_to(client.seed) : client.seed = 0;
j.contains("fileNum") ? j.at("fileNum").get_to(client.fileNum) : client.fileNum = 0xFF;
j.contains("gameComplete") ? j.at("gameComplete").get_to(client.gameComplete) : client.gameComplete = false;
Expand Down Expand Up @@ -293,6 +294,7 @@ void Anchor_SendClientData() {
nlohmann::json payload;
payload["data"]["name"] = CVarGetString("gRemote.AnchorName", "");
payload["data"]["color"] = CVarGetColor24("gRemote.AnchorColor", { 100, 255, 100 });
payload["data"]["team"] = CVarGetString("gRemote.AnchorTeam", "");
payload["data"]["clientVersion"] = GameInteractorAnchor::clientVersion;
payload["type"] = "UPDATE_CLIENT_DATA";

Expand Down Expand Up @@ -386,7 +388,17 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
}
}

AnchorClient anchorClient;
bool from_teammate = true;
if (payload.contains("clientId")) {
anchorClient = GameInteractorAnchor::AnchorClients[payload["clientId"].get<uint32_t>()];
from_teammate = anchorClient.team == CVarGetString("gRemote.AnchorTeam", "");
}

if (payload["type"] == "GIVE_ITEM") {
if (!from_teammate) {
return;
}
auto effect = new GameInteractionEffect::GiveItem();
effect->parameters[0] = payload["modId"].get<uint16_t>();
effect->parameters[1] = payload["getItemId"].get<int16_t>();
Expand All @@ -395,7 +407,6 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
if (effect->Apply() == Possible) {
GetItemEntry getItemEntry = ItemTableManager::Instance->RetrieveItemEntry(effect->parameters[0], effect->parameters[1]);

AnchorClient anchorClient = GameInteractorAnchor::AnchorClients[payload["clientId"].get<uint32_t>()];
if (getItemEntry.getItemCategory != ITEM_CATEGORY_JUNK) {
if (getItemEntry.modIndex == MOD_NONE) {
Anchor_DisplayMessage({
Expand All @@ -417,13 +428,19 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
CVarClear("gFromGI");
}
if (payload["type"] == "SET_SCENE_FLAG") {
if (!from_teammate) {
return;
}
auto effect = new GameInteractionEffect::SetSceneFlag();
effect->parameters[0] = payload["sceneNum"].get<int16_t>();
effect->parameters[1] = payload["flagType"].get<int16_t>();
effect->parameters[2] = payload["flag"].get<int16_t>();
effect->Apply();
}
if (payload["type"] == "SET_FLAG") {
if (!from_teammate) {
return;
}
auto effect = new GameInteractionEffect::SetFlag();
effect->parameters[0] = payload["flagType"].get<int16_t>();
effect->parameters[1] = payload["flag"].get<int16_t>();
Expand All @@ -439,13 +456,19 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
}
}
if (payload["type"] == "UNSET_SCENE_FLAG") {
if (!from_teammate) {
return;
}
auto effect = new GameInteractionEffect::UnsetSceneFlag();
effect->parameters[0] = payload["sceneNum"].get<int16_t>();
effect->parameters[1] = payload["flagType"].get<int16_t>();
effect->parameters[2] = payload["flag"].get<int16_t>();
effect->Apply();
}
if (payload["type"] == "UNSET_FLAG") {
if (!from_teammate) {
return;
}
auto effect = new GameInteractionEffect::UnsetFlag();
effect->parameters[0] = payload["flagType"].get<int16_t>();
effect->parameters[1] = payload["flag"].get<int16_t>();
Expand Down Expand Up @@ -507,9 +530,15 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
}
}
if (payload["type"] == "PUSH_SAVE_STATE" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
Anchor_ParseSaveStateFromRemote(payload);
}
if (payload["type"] == "REQUEST_SAVE_STATE" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
Anchor_PushSaveStateToRemote();
}
if (payload["type"] == "ALL_CLIENT_DATA") {
Expand All @@ -523,6 +552,7 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
client.clientVersion,
client.name,
client.color,
client.team,
client.seed,
client.fileNum,
client.gameComplete,
Expand Down Expand Up @@ -566,6 +596,7 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
GameInteractorAnchor::AnchorClients[clientId].clientVersion = client.clientVersion;
GameInteractorAnchor::AnchorClients[clientId].name = client.name;
GameInteractorAnchor::AnchorClients[clientId].color = client.color;
GameInteractorAnchor::AnchorClients[clientId].team = client.team;
GameInteractorAnchor::AnchorClients[clientId].seed = client.seed;
GameInteractorAnchor::AnchorClients[clientId].fileNum = client.fileNum;
GameInteractorAnchor::AnchorClients[clientId].gameComplete = client.gameComplete;
Expand All @@ -574,30 +605,51 @@ void GameInteractorAnchor::HandleRemoteJson(nlohmann::json payload) {
}
}
if (payload["type"] == "UPDATE_CHECK_DATA" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
auto check = payload["locationIndex"].get<uint32_t>();
auto data = payload["checkData"].get<RandomizerCheckTrackerData>();
CheckTracker::UpdateCheck(check, data);
}
if (payload["type"] == "ENTRANCE_DISCOVERED") {
if (!from_teammate) {
return;
}
auto entranceIndex = payload["entranceIndex"].get<uint16_t>();
discoveredEntrances.push_back(entranceIndex);
Entrance_SetEntranceDiscovered(entranceIndex, 1);
}
if (payload["type"] == "UPDATE_BEANS_BOUGHT" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
BEANS_BOUGHT = payload["amount"].get<uint8_t>();
}
if (payload["type"] == "UPDATE_BEANS_COUNT" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
AMMO(ITEM_BEAN) = payload["amount"].get<uint8_t>();
}
if (payload["type"] == "CONSUME_ADULT_TRADE_ITEM" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
uint8_t itemId = payload["itemId"].get<uint8_t>();
gSaveContext.adultTradeItems &= ~ADULT_TRADE_FLAG(itemId);
Inventory_ReplaceItem(gPlayState, itemId, Randomizer_GetNextAdultTradeItem());
}
if (payload["type"] == "UPDATE_KEY_COUNT" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
gSaveContext.inventory.dungeonKeys[payload["sceneNum"].get<int16_t>()] = payload["amount"].get<int8_t>();
}
if (payload["type"] == "GIVE_DUNGEON_ITEM" && GameInteractor::IsSaveLoaded()) {
if (!from_teammate) {
return;
}
gSaveContext.inventory.dungeonItems[payload["sceneNum"].get<int16_t>()] |= gBitFlags[payload["itemId"].get<uint16_t>() - ITEM_KEY_BOSS];
}
if (payload["type"] == "GAME_COMPLETE") {
Expand Down Expand Up @@ -1174,6 +1226,15 @@ const char* heartTextureNames[16] = {
"Heart_Three_Fourths", "Heart_Three_Fourths", "Heart_Three_Fourths", "Heart_Three_Fourths",
};

void DisplayNameAndTeam(const char* name, const char* team, bool gameComplete) {
if (team && !team[0]) {
// team is empty.
ImGui::TextColored(gameComplete ? GREEN : WHITE, "%s", name);
} else {
ImGui::TextColored(gSaveContext.sohStats.gameComplete ? GREEN : WHITE, "%s (%s)", name, team);
}
}

void DisplayLifeMeter(AnchorClient& client) {
int currentHealth = client.playerData.playerHealth;
int maxHealth = client.playerData.playerHealthCapacity;
Expand Down Expand Up @@ -1293,14 +1354,15 @@ void AnchorPlayerLocationWindow::DrawElement() {
ImGuiWindowFlags_NoScrollbar
);

ImGui::TextColored(gSaveContext.sohStats.gameComplete ? GREEN : WHITE, "%s", CVarGetString("gRemote.AnchorName", ""));
DisplayNameAndTeam(CVarGetString("gRemote.AnchorName", ""), CVarGetString("gRemote.AnchorTeam", ""),
gSaveContext.sohStats.gameComplete);
if (GameInteractor::Instance->IsSaveLoaded()) {
ImGui::SameLine();
ImGui::TextColored(ImVec4(0.5, 0.5, 0.5, 1), "%s", SohUtils::GetSceneName(gPlayState->sceneNum).c_str());
}
for (auto& [clientId, client] : GameInteractorAnchor::AnchorClients) {
ImGui::PushID(clientId);
ImGui::TextColored(client.gameComplete ? GREEN : WHITE, "%s", client.name.c_str());
DisplayNameAndTeam(client.name.c_str(), client.team.c_str(), client.gameComplete);
if (client.clientVersion != GameInteractorAnchor::clientVersion) {
ImGui::SameLine();
ImGui::TextColored(ImVec4(1, 0, 0, 1), ICON_FA_EXCLAMATION_TRIANGLE);
Expand Down
1 change: 1 addition & 0 deletions soh/soh/Enhancements/game-interactor/GameInteractor_Anchor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ typedef struct {
std::string clientVersion;
std::string name;
Color_RGB8 color;
std::string team;
uint32_t seed;
uint8_t fileNum;
bool gameComplete;
Expand Down
17 changes: 17 additions & 0 deletions soh/soh/SohMenuBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,6 +1538,7 @@ void DrawRemoteControlMenu() {
static uint16_t port = CVarGetInteger("gRemote.Port", 43384);
static std::string AnchorName = CVarGetString("gRemote.AnchorName", "");
static std::string anchorRoomId = CVarGetString("gRemote.AnchorRoomId", "");
static std::string AnchorTeam = CVarGetString("gRemote.AnchorTeam", "");
bool isFormValid = !isStringEmpty(CVarGetString("gRemote.IP", "127.0.0.1")) && port > 1024 && port < 65535 && (
CVarGetInteger("gRemote.Scheme", GI_SCHEME_SAIL) != GI_SCHEME_ANCHOR ||
(
Expand Down Expand Up @@ -1653,13 +1654,29 @@ void DrawRemoteControlMenu() {
LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
}
ImGui::Text("Room ID");
UIWidgets::InsertHelpHoverText(
"Identifier for your room that must match across all players. "
"Use something unique, this is basically your password."
);
int flags = 0;
if (GameInteractor::Instance->isRemoteInteractorEnabled) flags = ImGuiInputTextFlags_Password;
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::InputText("##gRemote.AnchorRoomId", (char*)anchorRoomId.c_str(), anchorRoomId.capacity() + 1, flags)) {
CVarSetString("gRemote.AnchorRoomId", anchorRoomId.c_str());
LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
}
ImGui::Text("Team ID");
UIWidgets::InsertHelpHoverText(
"Identifier for your team. Players with matching Team IDs will share inventory and game state. "
"Items picked up by members of one team will not be shared with other teams.\n"
"\n"
"When joining an existing room, your inventory will be synced with anyone with a matching Team ID."
);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::InputText("##gRemote.AnchorTeam", (char*)AnchorTeam.c_str(), AnchorTeam.capacity() + 1, ImGuiInputTextFlags_None)) {
CVarSetString("gRemote.AnchorTeam", AnchorTeam.c_str());
LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
}
}
ImGui::EndDisabled();

Expand Down
Loading