Store edge-activated hats by target

Author: adazem009

src/engine/internal/engine.cpp

@@ -526,21 +526,30 @@ void Engine::step()
                     assert(fieldValueId != -1);
                 }
 
+                Target *target = hatBlock->target();
+                assert(target);
                 auto it = m_edgeActivatedHatValues.find(hatType);
 
                 if (it == m_edgeActivatedHatValues.cend()) {
-                    m_edgeActivatedHatValues[hatType] = {};
+                    m_edgeActivatedHatValues[hatType] = { { target, {} } };
                 } else {
-                    const std::unordered_map<int, bool> &values = it->second;
-                    auto fieldIt = values.find(fieldValueId);
+                    auto &map = it->second;
+                    auto it = map.find(target);
 
-                    if (fieldIt != values.cend())
-                        oldValue = fieldIt->second;
+                    if (it == map.cend())
+                        map[target] = {};
+                    else {
+                        const std::unordered_map<int, bool> &values = it->second;
+                        auto fieldIt = values.find(fieldValueId);
+
+                        if (fieldIt != values.cend())
+                            oldValue = fieldIt->second;
+                    }
                 }
 
                 bool newValue = thread->script()->runHatPredicate(hatBlock->target());
                 bool edgeWasActivated = !oldValue && newValue; // changed from false true
-                m_edgeActivatedHatValues[hatType][fieldValueId] = newValue;
+                m_edgeActivatedHatValues[hatType][target][fieldValueId] = newValue;
 
                 if (!edgeWasActivated)
                     stopThread(thread.get());

src/engine/internal/engine.h

@@ -252,7 +252,8 @@ class Engine : public IEngine
 
         std::unordered_map<Script *, std::unordered_map<HatField, int>> m_scriptHatFields; // HatField, field ID from the block implementation
 
-        std::unordered_map<HatType, std::unordered_map<int, bool>> m_edgeActivatedHatValues; // (field value, last value) edge-activated hats only run after the value changes from false to true
+        std::unordered_map<HatType, std::unordered_map<Target *, std::unordered_map<int, bool>>> m_edgeActivatedHatValues; // (target, field value ID, last value) edge-activated hats only run after
+                                                                                                                           // the value changes from false to true
 
         std::unique_ptr<ITimer> m_defaultTimer;
         ITimer *m_timer = nullptr;