Favor contains over count

- Use contains(key) for maps instead of count(key)
- Also streamline a tingle statue patch

Will work on the other uses of count at a later time, might do it alongside some other changes

Author: SuperDude88

command/RandoSession.cpp

@@ -470,7 +470,7 @@ std::shared_ptr<RandoSession::CacheEntry> RandoSession::getEntry(const std::vect
             resultKey = cacheKey + element;
         }
         // if we've already cached this
-        if (parentEntry->children.count(resultKey) > 0)
+        if (parentEntry->children.contains(resultKey))
         {
             cacheKey = resultKey;
             parentEntry = parentEntry->children.at(cacheKey);

logic/World.cpp

@@ -24,9 +24,9 @@ static std::stringstream lastError;
 #define YAML_FIELD_CHECK(ref, key, err) if(!ref[key]) {lastError << "Unable to find key: \"" << key << '"'; return err;}
 #define VALID_CHECK(e, invalid, msg, err) if(e == invalid) {lastError << msg; LOG_ERR_AND_RETURN(err);}
 #define ITEM_VALID_CHECK(item, msg) VALID_CHECK(item, GameItem::INVALID, msg, WorldLoadingError::GAME_ITEM_DOES_NOT_EXIST)
-#define AREA_VALID_CHECK(area, msg) VALID_CHECK(0, areaTable.count(area), msg, WorldLoadingError::AREA_DOES_NOT_EXIST)
-#define REGION_VALID_CHECK(region, msg) VALID_CHECK(0, hintRegions.count(region), msg, WorldLoadingError::AREA_DOES_NOT_EXIST)
-#define LOCATION_VALID_CHECK(loc, msg) VALID_CHECK(0, locationTable.count(loc), msg, WorldLoadingError::LOCATION_DOES_NOT_EXIST)
+#define AREA_VALID_CHECK(area, msg) VALID_CHECK(areaTable.contains(area), false, msg, WorldLoadingError::AREA_DOES_NOT_EXIST)
+#define REGION_VALID_CHECK(region, msg) VALID_CHECK(hintRegions.contains(region), false, msg, WorldLoadingError::AREA_DOES_NOT_EXIST)
+#define LOCATION_VALID_CHECK(loc, msg) VALID_CHECK(locationTable.contains(loc), false, msg, WorldLoadingError::LOCATION_DOES_NOT_EXIST)
 #define VALID_DUNGEON_CHECK(dungeon) if (!isValidDungeon(dungeon)) {ErrorLog::getInstance().log("Unrecognized dungeon name: \"" + dungeon + "\""); LOG_ERR_AND_RETURN(WorldLoadingError::INVALID_DUNGEON_NAME)};
 
 int World::eventCounter = 0;

tweaks.cpp

@@ -1098,7 +1098,7 @@ TweakError fix_shop_item_y_offsets() {
             CAST_ENTRY_TO_FILETYPE(elf, FileTypes::ELF, data)
             const float y_offset = elfUtil::read_float(elf, elfUtil::AddressToOffset(elf, display_data_addr + 0x10));
 
-            if (y_offset == 0.0f && ArrowID.count(id) == 0) {
+            if (y_offset == 0.0f && !ArrowID.contains(id)) {
                 // If the item didn't originally have a Y offset we need to give it one so it's not sunken into the pedestal.
                 // Only exception are for items 10 11 and 12 - arrow refill pickups. Those have no Y offset but look fine already.
                 static constexpr float new_y_offset = 20.0f;
@@ -2655,15 +2655,15 @@ TweakError add_barren_dungeon_hint_triggers(World& world) {
 
 TweakError update_tingle_statue_item_get_funcs() {
     const uint32_t item_get_func_ptr = 0x0001DA54; // First relevant relocation entry in .rela.data (overwrites .data section when loaded)
-    const std::unordered_map<int, std::string> symbol_name_by_item_id = { {0xA3, "dragon_tingle_statue_item_get_func"}, {0xA4, "forbidden_tingle_statue_item_get_func"}, {0xA5, "goddess_tingle_statue_item_get_func"}, {0xA6, "earth_tingle_statue_item_get_func"}, {0xA7, "wind_tingle_statue_item_get_func"} };
+    const std::unordered_map<uint8_t, std::string> symbol_name_by_item_id = { {0xA3, "dragon_tingle_statue_item_get_func"}, {0xA4, "forbidden_tingle_statue_item_get_func"}, {0xA5, "goddess_tingle_statue_item_get_func"}, {0xA6, "earth_tingle_statue_item_get_func"}, {0xA7, "wind_tingle_statue_item_get_func"} };
     RandoSession::CacheEntry& rpx = g_session.openGameFile("code/cking.rpx@RPX@ELF");
 
-    for (const uint8_t statue_id : {0xA3, 0xA4, 0xA5, 0xA6, 0xA7}) {
-        if(custom_symbols.count(symbol_name_by_item_id.at(statue_id)) == 0) LOG_ERR_AND_RETURN(TweakError::MISSING_SYMBOL);
+    for (const auto& [statue_id, symbol] : symbol_name_by_item_id) {
+        if(!custom_symbols.contains(symbol)) LOG_ERR_AND_RETURN(TweakError::MISSING_SYMBOL);
 
         const uint32_t item_func_addr = item_get_func_ptr + (statue_id * 0xC) + 8;
-        const uint32_t item_func_ptr = custom_symbols.at(symbol_name_by_item_id.at(statue_id));
-        
+        const uint32_t item_func_ptr = custom_symbols.at(symbol);
+
         rpx.addAction([=](RandoSession* session, FileType* data) -> int {
             CAST_ENTRY_TO_FILETYPE(elf, FileTypes::ELF, data)