about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* [Client] Stop using a camera for minimapStar Rauchenberger11 days1-60/+118
* [Client] Camera version of minimapStar Rauchenberger12 days5-0/+100
* [Client] Add /tp_map cheat commandStar Rauchenberger12 days1-1/+9
* [Data] Fix The Colorful entrance portStar Rauchenberger12 days1-1/+1
* [Client] Proguseful is now rainbowStar Rauchenberger12 days4-10/+35
* [Tools] Typo in header guardStar Rauchenberger12 days1-1/+1
* [Client] Handle worldport shuffleStar Rauchenberger12 days4-8/+90
* [Apworld] Added worldport shuffleStar Rauchenberger12 days5-6/+115
* [Data] Fixed some stuff for worldport shuffleStar Rauchenberger12 days8-10/+13
* [Data] Annotate shuffleable portsStar Rauchenberger13 days149-145/+459
* Released Apworld v6.6 and Client v6.7Star Rauchenberger2025-09-192-0/+31
* Bump versions data-v6 client-v6.7 apworld-v6.6Star Rauchenberger2025-09-193-3/+3
* [Data] Logic error with Wrath RoomStar Rauchenberger2025-09-191-0/+6
* [Data] Rename SMILE locationsStar Rauchenberger2025-09-191-0/+5
* [Data] Eye Room -> Gallery connectionStar Rauchenberger2025-09-191-0/+16
* [Client] Added compassStar Rauchenberger2025-09-196-0/+134
* [Data] Renamed some doors with compass directionsStar Rauchenberger2025-09-199-72/+72
* [Data] Roof -> Orchestra RoomStar Rauchenberger2025-09-191-0/+6
* [Client] Handle strict purple/cyan ending optionsStar Rauchenberger2025-09-193-0/+115
* Added strict purple/cyan ending optionsStar Rauchenberger2025-09-198-0/+48
* [Client] Released v5.6Star Rauchenberger2025-09-171-0/+12
* [Client] Bump version client-v5.6Star Rauchenberger2025-09-171-1/+1
* [Client] Prevent letters from respawningStar Rauchenberger2025-09-171-0/+14
* Reworded Congruent thing in READMEStar Rauchenberger2025-09-161-3/+3
* Released apworld & client v5.5Star Rauchenberger2025-09-162-0/+23
* Bump versions data-v5 client-v5.5 apworld-v5.5Star Rauchenberger2025-09-163-3/+3
* [Data] Rename TURN check near Shop EntranceStar Rauchenberger2025-09-161-1/+1
* [Data] Daedalus - C Keyholder should be in East AreaStar Rauchenberger2025-09-161-1/+1
* [Apworld] Fix indirect conditions for deep reqsStar Rauchenberger2025-09-162-11/+35
* [Apworld] Fixed reqs simplification mutating common objectsStar Rauchenberger2025-09-161-4/+9
* [Data] the_ancient:THIS was missing a symbolStar Rauchenberger2025-09-151-0/+1
* Released Apworld v4.4Star Rauchenberger2025-09-141-0/+11
* [Apworld] Bump version apworld-v4.4Star Rauchenberger2025-09-141-1/+1
* [Apworld] Fixed panel set location namesStar Rauchenberger2025-09-141-1/+1
* Released Apworld v4.3 and Client v4.4Star Rauchenberger2025-09-132-0/+33
* Bump versions data-v4 client-v4.4 apworld-v4.3Star Rauchenberger2025-09-133-3/+3
* [Client] Prevent breaking roof logic with IcarusStar Rauchenberger2025-09-132-0/+12
* [Client] Clear out messages between connectionsStar Rauchenberger2025-09-132-4/+15
* [Client] Don't show our trapsStar Rauchenberger2025-09-132-1/+8
* [Client] Fixed warnings in galleryStar Rauchenberger2025-09-131-1/+4
* [Client] Fixed ITEM_CYAN letter shuffleStar Rauchenberger2025-09-131-0/+3
* [Client] Handle anti collectable trapsStar Rauchenberger2025-09-133-2/+33
* Added anti collectable trapsStar Rauchenberger2025-09-136-3/+92
* [Data] Added the hidden EYE panel in the anti collectable roomStar Rauchenberger2025-09-133-6/+11
* [Client] Handle anti-collectable locationStar Rauchenberger2025-09-131-0/+3
* Add anti-collectable locationStar Rauchenberger2025-09-136-1/+15
* [Apworld] Added compatability for python 3.11Star Rauchenberger2025-09-132-2/+2
* [Client] Fix Orange Door Hider locationStar Rauchenberger2025-09-121-0/+3
* Mention Anti-Collectable door in READMEStar Rauchenberger2025-09-121-0/+1
* [Data] Fixed Control Center Red Door receiverStar Rauchenberger2025-09-121-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-10-04 18:44:06 +0000
ck") { return LingoColor::kBlack; } else if (str == "red") { return LingoColor::kRed; } else if (str == "blue") { return LingoColor::kBlue; } else if (str == "yellow") { return LingoColor::kYellow; } else if (str == "orange") { return LingoColor::kOrange; } else if (str == "green") { return LingoColor::kGreen; } else if (str == "gray") { return LingoColor::kGray; } else if (str == "brown") { return LingoColor::kBrown; } else if (str == "purple") { return LingoColor::kPurple; } else { std::cout << "Invalid color: " << str << std::endl; return LingoColor::kNone; } } GameData::GameData() { YAML::Node lingo_config = YAML::LoadFile("assets/LL1.yaml"); YAML::Node areas_config = YAML::LoadFile("assets/areas.yaml"); rooms_.reserve(lingo_config.size() * 2); for (const auto &room_it : lingo_config) { int room_id = AddOrGetRoom(room_it.first.as<std::string>()); Room &room_obj = rooms_[room_id]; for (const auto &entrance_it : room_it.second["entrances"]) { int from_room_id = AddOrGetRoom(entrance_it.first.as<std::string>()); Room &from_room_obj = rooms_[from_room_id]; switch (entrance_it.second.Type()) { case YAML::NodeType::Scalar: { // This is just "true". from_room_obj.exits.push_back({.destination_room = room_id}); break; } case YAML::NodeType::Map: { Exit exit_obj; exit_obj.destination_room = room_id; if (entrance_it.second["door"]) { std::string door_room = room_obj.name; if (entrance_it.second["room"]) { door_room = entrance_it.second["room"].as<std::string>(); } exit_obj.door = AddOrGetDoor( door_room, entrance_it.second["door"].as<std::string>()); } if (entrance_it.second["painting"]) { exit_obj.painting = entrance_it.second["painting"].as<bool>(); } from_room_obj.exits.push_back(exit_obj); break; } case YAML::NodeType::Sequence: { for (const auto &option : entrance_it.second) { Exit exit_obj; exit_obj.destination_room = room_id; std::string door_room = room_obj.name; if (option["room"]) { door_room = option["room"].as<std::string>(); } exit_obj.door = AddOrGetDoor(door_room, option["door"].as<std::string>()); if (option["painting"]) { exit_obj.painting = option["painting"].as<bool>(); } from_room_obj.exits.push_back(exit_obj); } break; } default: { // This shouldn't happen. std::cout << "Error reading game data: " << entrance_it << std::endl; break; } } } if (room_it.second["panels"]) { for (const auto &panel_it : room_it.second["panels"]) { int panel_id = AddOrGetPanel(room_obj.name, panel_it.first.as<std::string>()); Panel &panel_obj = panels_[panel_id]; if (panel_it.second["colors"]) { if (panel_it.second["colors"].IsScalar()) { panel_obj.colors.push_back( GetColorForString(panel_it.second["colors"].as<std::string>())); } else { for (const auto &color_node : panel_it.second["colors"]) { panel_obj.colors.push_back( GetColorForString(color_node.as<std::string>())); } } } if (panel_it.second["required_room"]) { if (panel_it.second["required_room"].IsScalar()) { panel_obj.required_rooms.push_back(AddOrGetRoom( panel_it.second["required_room"].as<std::string>())); } else { for (const auto &rr_node : panel_it.second["required_room"]) { panel_obj.required_rooms.push_back( AddOrGetRoom(rr_node.as<std::string>())); } } } if (panel_it.second["required_door"]) { if (panel_it.second["required_door"].IsMap()) { std::string rd_room = room_obj.name; if (panel_it.second["required_door"]["room"]) { rd_room = panel_it.second["required_door"]["room"].as<std::string>(); } panel_obj.required_doors.push_back(AddOrGetDoor( rd_room, panel_it.second["required_door"]["door"].as<std::string>())); } else { for (const auto &rr_node : panel_it.second["required_door"]) { std::string rd_room = room_obj.name; if (rr_node["room"]) { rd_room = rr_node["room"].as<std::string>(); } panel_obj.required_doors.push_back( AddOrGetDoor(rd_room, rr_node["door"].as<std::string>())); } } } if (panel_it.second["check"]) { panel_obj.check = panel_it.second["check"].as<bool>(); } if (panel_it.second["exclude_reduce"]) { panel_obj.exclude_reduce = panel_it.second["exclude_reduce"].as<bool>(); } } } if (room_it.second["doors"]) { for (const auto &door_it : room_it.second["doors"]) { int door_id = AddOrGetDoor(room_obj.name, door_it.first.as<std::string>()); Door &door_obj = doors_[door_id]; bool has_external_panels = false; std::vector<std::string> panel_names; for (const auto &panel_node : door_it.second["panels"]) { if (panel_node.IsScalar()) { panel_names.push_back(panel_node.as<std::string>()); door_obj.panels.push_back( AddOrGetPanel(room_obj.name, panel_node.as<std::string>())); } else { has_external_panels = true; panel_names.push_back(panel_node["panel"].as<std::string>()); door_obj.panels.push_back( AddOrGetPanel(panel_node["room"].as<std::string>(), panel_node["panel"].as<std::string>())); } } if (door_it.second["skip_location"]) { door_obj.skip_location = door_it.second["skip_location"].as<bool>(); } if (door_it.second["skip_item"]) { door_obj.skip_item = door_it.second["skip_item"].as<bool>(); } if (door_it.second["event"]) { door_obj.skip_location = door_it.second["event"].as<bool>(); door_obj.skip_item = door_it.second["event"].as<bool>(); } if (door_it.second["item_name"]) { door_obj.item_name = door_it.second["item_name"].as<std::string>(); } else if (!door_it.second["skip_item"] && !door_it.second["event"]) { door_obj.item_name = room_obj.name + " - " + door_obj.name; } if (door_it.second["group"]) { door_obj.group_name = door_it.second["group"].as<std::string>(); } if (door_it.second["location_name"]) { door_obj.location_name = door_it.second["location_name"].as<std::string>(); } else if (!door_it.second["skip_location"] && !door_it.second["event"]) { if (has_external_panels) { std::cout << room_obj.name << " - " << door_obj.name << " has panels from other rooms but does not have an explicit " "location name and is not marked skip_location or event" << std::endl; } door_obj.location_name = room_obj.name + " - " + hatkirby::implode(panel_names, ", "); } if (door_it.second["include_reduce"]) { door_obj.exclude_reduce = !door_it.second["include_reduce"].as<bool>(); } } } if (room_it.second["paintings"]) { for (const auto &painting : room_it.second["paintings"]) { std::string painting_id = painting["id"].as<std::string>(); room_by_painting_[painting_id] = room_id; if (!painting["exit_only"] || !painting["exit_only"].as<bool>()) { PaintingExit painting_exit; painting_exit.id = painting_id; if (painting["required_door"]) { std::string rd_room = room_obj.name; if (painting["required_door"]["room"]) { rd_room = painting["required_door"]["room"].as<std::string>(); } painting_exit.door = AddOrGetDoor( rd_room, painting["required_door"]["door"].as<std::string>()); } room_obj.paintings.push_back(painting_exit); } } } if (room_it.second["progression"]) { for (const auto &progression_it : room_it.second["progression"]) { std::string progressive_item_name = progression_it.first.as<std::string>(); int index = 1; for (const auto &stage : progression_it.second) { int door_id = -1; if (stage.IsScalar()) { door_id = AddOrGetDoor(room_obj.name, stage.as<std::string>()); } else { door_id = AddOrGetDoor(stage["room"].as<std::string>(), stage["door"].as<std::string>()); } doors_[door_id].progressives.push_back( {.item_name = progressive_item_name, .quantity = index}); index++; } } } } map_areas_.reserve(areas_config.size()); std::map<std::string, int> fold_areas; for (const auto &area_it : areas_config) { if (area_it.second["map"]) { int area_id = AddOrGetArea(area_it.first.as<std::string>()); MapArea &area_obj = map_areas_[area_id]; area_obj.map_x = area_it.second["map"][0].as<int>(); area_obj.map_y = area_it.second["map"][1].as<int>(); } else if (area_it.second["fold_into"]) { fold_areas[area_it.first.as<std::string>()] = AddOrGetArea(area_it.second["fold_into"].as<std::string>()); } } for (const Panel &panel : panels_) { if (panel.check) { int room_id = panel.room; std::string room_name = rooms_[room_id].name; std::string area_name = room_name; if (fold_areas.count(room_name)) { int fold_area_id = fold_areas[room_name]; area_name = map_areas_[fold_area_id].name; } int area_id = AddOrGetArea(area_name); MapArea &map_area = map_areas_[area_id]; // room field should be the original room ID map_area.locations.push_back( {.name = panel.name, .ap_location_name = room_name + " - " + panel.name, .room = panel.room, .panels = {panel.id}}); } } for (const Door &door : doors_) { if (!door.skip_location) { int room_id = door.room; std::string area_name = rooms_[room_id].name; std::string section_name; size_t divider_pos = door.location_name.find(" - "); if (divider_pos == std::string::npos) { section_name = door.location_name; } else { area_name = door.location_name.substr(0, divider_pos); section_name = door.location_name.substr(divider_pos + 3); } if (fold_areas.count(area_name)) { int fold_area_id = fold_areas[area_name]; area_name = map_areas_[fold_area_id].name; } int area_id = AddOrGetArea(area_name); MapArea &map_area = map_areas_[area_id]; // room field should be the original room ID map_area.locations.push_back({.name = section_name, .ap_location_name = door.location_name, .room = door.room, .panels = door.panels}); } } } int GameData::AddOrGetRoom(std::string room) { if (!room_by_id_.count(room)) { room_by_id_[room] = rooms_.size(); rooms_.push_back({.name = room}); } return room_by_id_[room]; } int GameData::AddOrGetDoor(std::string room, std::string door) { std::string full_name = room + " - " + door; if (!door_by_id_.count(full_name)) { door_by_id_[full_name] = doors_.size(); doors_.push_back({.room = AddOrGetRoom(room), .name = door}); } return door_by_id_[full_name]; } int GameData::AddOrGetPanel(std::string room, std::string panel) { std::string full_name = room + " - " + panel; if (!panel_by_id_.count(full_name)) { int panel_id = panels_.size(); panel_by_id_[full_name] = panel_id; panels_.push_back( {.id = panel_id, .room = AddOrGetRoom(room), .name = panel}); } return panel_by_id_[full_name]; } int GameData::AddOrGetArea(std::string area) { if (!area_by_id_.count(area)) { int area_id = map_areas_.size(); area_by_id_[area] = area_id; map_areas_.push_back({.id = area_id, .name = area}); } return area_by_id_[area]; } const GameData &GetGameData() { static GameData *instance = new GameData(); return *instance; }