Various changes

Fix crashing when items don't make sense
Fix trials not giving you items
Fix tasks taking extra time for no reason

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.17.3 FATAL_ERROR)
 project(temp)
 
 set(CMAKE_SUPPRESS_REGENERATION true)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

projects/Core/events/task.cpp

@@ -30,7 +30,7 @@ namespace core::events {
                 ++it;
             }
 
-            tasks.insert(it.base(), Task{ timer + seconds, task });
+            tasks.insert(it.base(), Task{ seconds, task });
         }
     }
 

projects/Randomizer/game/event_handlers/on_trial.cpp

@@ -1,14 +1,15 @@
 #include <randomizer.h>
 
-#include <Modloader/app/methods/RaceHandler.h>
-#include <Modloader/interception_macros.h>
+#include <Modloader/app/methods/RaceBaseState.h>
+#include <Modloader/app/methods/RaceSystem.h>
+#include <Modloader/app/types/RaceSystem.h>
 
 bool is_in_trial = false;
 
 namespace {
-    IL2CPP_INTERCEPT(RaceHandler, void, SetRaceInProgressState, (app::RaceHandler * this_ptr, bool in_progress)) {
-        is_in_trial = in_progress;
-        randomizer::game_seed().prevent_grants(is_in_trial);
-        next::RaceHandler::SetRaceInProgressState(this_ptr, in_progress);
-    }
+    auto on_ready = modloader::event_bus().register_handler(ModloaderEvent::GameReady, [](auto) {
+        randomizer::game_seed().prevent_grants([]() {
+            return RaceSystem::get_IsRunningRace(types::RaceSystem::get_class()->static_fields->_Instance_k__BackingField);
+        });
+    });
 } // namespace

projects/Randomizer/seed/legacy_parser/parser.cpp

@@ -1967,7 +1967,7 @@ namespace randomizer::seed::legacy_parser {
         return true;
     }
 
-    ItemData parse_action(const std::string_view action) {
+    std::optional<ItemData> parse_action(const std::string_view action) {
         Seed::Data data;
         const location_type location{
             { },
@@ -1991,7 +1991,6 @@ namespace randomizer::seed::legacy_parser {
             .should_add_default_messages = parts.back() != "mute"
         };
 
-        parse_action(location, parts, parser_data);
-        return location_data;
+        return parse_action(location, parts, parser_data) ? std::optional(location_data) : std::nullopt;
     }
 } // namespace randomizer::seed::legacy_parser

projects/Randomizer/seed/legacy_parser/parser.h

@@ -4,5 +4,5 @@
 
 namespace randomizer::seed::legacy_parser {
     bool parse(std::string_view path, location_data::LocationCollection const& location_data, Seed::Data& data);
-    ItemData parse_action(std::string_view action);
+    std::optional<ItemData> parse_action(std::string_view action);
 } // namespace randomizer::seed::legacy_parser

projects/Randomizer/seed/seed.cpp

@@ -134,10 +134,16 @@ namespace randomizer::seed {
     }
 
     void Seed::grant(const location_entry location, const double previous_value) {
-        if (m_should_prevent_grants || !core::api::game::in_game()) {
+        if (!core::api::game::in_game()) {
             return;
         }
 
+        for (auto callback : m_prevent_grant_callbacks) {
+            if (callback()) {
+                return;
+            }
+        }
+
         if (m_skip.contains(location)) {
             m_skip.erase(location);
             return;

projects/Randomizer/seed/seed.h

@@ -62,17 +62,18 @@ namespace randomizer::seed {
         SeedInfo const& info() const { return m_data.info; }
         int total_pickups() const { return m_data.info.total_pickups; }
 
-        void prevent_grants(bool value) { m_should_prevent_grants = value; }
         std::string path() const { return m_last_path; }
 
         Relics const& relics() const { return m_data.relics; }
 
+        void prevent_grants(const std::function<bool()>& callback) { m_prevent_grant_callbacks.push_back(callback); }
+
     private:
         location_data::LocationCollection const& m_location_data;
         seed_parser m_last_parser = nullptr;
         std::string m_last_path;
         Data m_data;
         std::unordered_set<location_entry> m_skip;
-        bool m_should_prevent_grants = false;
+        std::vector<std::function<bool()>> m_prevent_grant_callbacks;
     };
 } // namespace randomizer::seed

projects/Randomizer/text_processors/helpers.cpp

@@ -16,7 +16,7 @@ namespace randomizer::text_processors {
             auto value = func(base_processor, contents);
             if (value.has_value()) {
                 text.replace(start, next - start, value.value());
-                next = start + value.value().size();
+                next = std::max(start + value.value().size(), 1ull) - 1;
             }
 
             start = text.find(pattern, next);

projects/Randomizer/text_processors/legacy.cpp

@@ -34,7 +34,11 @@ namespace randomizer::text_processors {
         std::optional<std::string> action(core::text::ITextProcessor const& base_processor, std::string_view content) {
             std::string text;
             auto item_data = seed::legacy_parser::parse_action(content);
-            for (auto const& name : item_data.names) {
+            if (!item_data.has_value()) {
+                return std::nullopt;
+            }
+
+            for (auto const& name : item_data->names) {
                 if (!text.empty()) {
                     text += "\n";
                 }