From f5ced46608198a1d8d5ba58ca7901bcf755cc1b9 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Fri, 18 Jun 2021 15:06:14 -0700 Subject: [PATCH] Refactors EventManager - handler freq now works on an individual handler basis (set to 0 to fire as frequently as possible) - tick events no longer need to be re-registered after every eventful tick --- library/include/modules/EventManager.h | 1 + library/modules/EventManager.cpp | 782 +++++++++++++------------ 2 files changed, 417 insertions(+), 366 deletions(-) diff --git a/library/include/modules/EventManager.h b/library/include/modules/EventManager.h index d22fa2310..185497025 100644 --- a/library/include/modules/EventManager.h +++ b/library/include/modules/EventManager.h @@ -40,6 +40,7 @@ namespace DFHack { typedef void (*callback_t)(color_ostream&, void*); //called when the event happens callback_t eventHandler; int32_t freq; + int32_t when; EventHandler(callback_t eventHandlerIn, int32_t freqIn): eventHandler(eventHandlerIn), freq(freqIn) { } diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp index 7d8b7e6d5..e7b2a0d02 100644 --- a/library/modules/EventManager.cpp +++ b/library/modules/EventManager.cpp @@ -57,11 +57,24 @@ static multimap tickQueue; //TODO: consider unordered_map of pairs, or unordered_map of unordered_set, or whatever static multimap handlers[EventType::EVENT_MAX]; -static int32_t eventLastTick[EventType::EVENT_MAX]; +static map eventLastTick; static const int32_t ticksPerYear = 403200; void DFHack::EventManager::registerListener(EventType::EventType e, EventHandler handler, Plugin* plugin) { + if(e == EventType::TICK){ + int32_t when = 0; + df::world* world = df::global::world; + if ( world ) { + when = world->frame_counter + handler.freq; + } else { + if ( Once::doOnce("EventManager registerListener unhonored absolute=false") ) + Core::getInstance().getConsole().print("EventManager::registerTick: warning! absolute flag=false not honored.\n"); + } + handler.when = when; + tickQueue.insert(pair(handler.when, handler)); + } + eventLastTick[handler.eventHandler] = -1; handlers[e].insert(pair(plugin, handler)); } @@ -75,8 +88,9 @@ int32_t DFHack::EventManager::registerTick(EventHandler handler, int32_t when, P Core::getInstance().getConsole().print("EventManager::registerTick: warning! absolute flag=false not honored.\n"); } } - handler.freq = when; - tickQueue.insert(pair(handler.freq, handler)); + handler.when = when; + tickQueue.insert(pair(handler.when, handler)); + eventLastTick[handler.eventHandler] = -1; handlers[EventType::TICK].insert(pair(plugin,handler)); return when; } @@ -103,22 +117,29 @@ void DFHack::EventManager::unregister(EventType::EventType e, EventHandler handl continue; } i = handlers[e].erase(i); + eventLastTick.erase(handler.eventHandler); if ( e == EventType::TICK ) removeFromTickQueue(handler); } } void DFHack::EventManager::unregisterAll(Plugin* plugin) { - for ( auto i = handlers[EventType::TICK].find(plugin); i != handlers[EventType::TICK].end(); i++ ) { + for ( auto i = handlers[EventType::TICK].find(plugin); i != handlers[EventType::TICK].end(); ++i ) { if ( (*i).first != plugin ) break; + eventLastTick.erase(i->second.eventHandler); removeFromTickQueue((*i).second); } - for ( size_t a = 0; a < (size_t)EventType::EVENT_MAX; a++ ) { - handlers[a].erase(plugin); + for (auto &event_type : handlers) { + for (auto i = event_type.find(plugin); i != event_type.end(); ++i ) { + if ( (*i).first != plugin ) + break; + + eventLastTick.erase(i->second.eventHandler); + } + event_type.erase(plugin); } - return; } static void manageTickEvent(color_ostream& out); @@ -294,9 +315,9 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event lastReportInteraction = -1; reportToRelevantUnitsTime = -1; reportToRelevantUnits.clear(); - for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) { - eventLastTick[a] = -1;//-1000000; - } +// for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) { +// eventLastTick[a] = -1;//-1000000; +// } for ( size_t a = 0; a < df::global::world->history.figures.size(); a++ ) { df::historical_figure* unit = df::global::world->history.figures[a]; if ( unit->id < 0 && unit->name.language < 0 ) @@ -318,23 +339,21 @@ void DFHack::EventManager::manageEvents(color_ostream& out) { int32_t tick = df::global::world->frame_counter; - for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) { - if ( handlers[a].empty() ) + for (size_t type = 0; type < EventType::EVENT_MAX; type++ ) { + if (handlers[type].empty()) continue; - int32_t eventFrequency = -100; - if ( a != EventType::TICK ) - for ( auto b = handlers[a].begin(); b != handlers[a].end(); b++ ) { - EventHandler bob = (*b).second; - if ( bob.freq < eventFrequency || eventFrequency == -100 ) - eventFrequency = bob.freq; + bool call_events = false; + for (auto &iter : handlers[type]) { + EventHandler handler = iter.second; + int32_t last_tick = eventLastTick[handler.eventHandler]; + if (tick - last_tick >= handler.freq){ + //todo: integrate into every sub-function + //eventLastTick[handler.eventHandler] = tick; + call_events = true; } - else eventFrequency = 1; - - if ( tick >= eventLastTick[a] && tick - eventLastTick[a] < eventFrequency ) - continue; - - eventManager[a](out); - eventLastTick[a] = tick; + } + if(call_events) + eventManager[type](out); } } @@ -353,14 +372,15 @@ static void manageTickEvent(color_ostream& out) { } if ( toRemove.empty() ) return; - for ( auto a = handlers[EventType::TICK].begin(); a != handlers[EventType::TICK].end(); ) { - EventHandler handle = (*a).second; + for (auto iter = handlers[EventType::TICK].begin(); iter != handlers[EventType::TICK].end(); ) { + EventHandler &handle = iter->second; if ( toRemove.find(handle) == toRemove.end() ) { - a++; + ++iter; continue; } - a = handlers[EventType::TICK].erase(a); + iter = handlers[EventType::TICK].erase(iter); toRemove.erase(handle); + registerTick(handle, handle.freq, iter->first); if ( toRemove.empty() ) break; } @@ -380,14 +400,20 @@ static void manageJobInitiatedEvent(color_ostream& out) { return; //no new jobs } multimap copy(handlers[EventType::JOB_INITIATED].begin(), handlers[EventType::JOB_INITIATED].end()); + int32_t tick = df::global::world->frame_counter; - for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { - if ( link->item == NULL ) - continue; - if ( link->item->id <= lastJobId ) - continue; - for ( auto i = copy.begin(); i != copy.end(); i++ ) { - (*i).second.eventHandler(out, (void*)link->item); + for(auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { + if ( link->item == NULL ) + continue; + if ( link->item->id <= lastJobId ) + continue; + + handler.eventHandler(out, (void*)link->item); + } } } @@ -406,8 +432,11 @@ TODO: consider checking item creation / experience gain just in case static void manageJobCompletedEvent(color_ostream& out) { if (!df::global::world) return; - int32_t tick0 = eventLastTick[EventType::JOB_COMPLETED]; - int32_t tick1 = df::global::world->frame_counter; + static int32_t last_tick = -1; + int32_t tick = df::global::world->frame_counter; + if(tick < last_tick){ + last_tick = tick; + } multimap copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end()); map nowJobs; @@ -433,7 +462,7 @@ static void manageJobCompletedEvent(color_ostream& out) { " completion_timer : %d\n" " workerID : %d\n" " time : %d -> %d\n" - "\n", job1.list_link->item, job1.id, job1.job_type, ENUM_ATTR(job_type, caption, job1.job_type), job1.flags.bits.working, job1.completion_timer, getWorkerID(&job1), tick0, tick1); + "\n", job1.list_link->item, job1.id, job1.job_type, ENUM_ATTR(job_type, caption, job1.job_type), job1.flags.bits.working, job1.completion_timer, getWorkerID(&job1), last_tick, tick); } for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { df::job& job0 = *(*i).second; @@ -447,7 +476,7 @@ static void manageJobCompletedEvent(color_ostream& out) { " completion_timer : %d\n" " workerID : %d\n" " time : %d -> %d\n" - ,job0.list_link == NULL ? 0 : job0.list_link->item, job0.id, job0.job_type, ENUM_ATTR(job_type, caption, job0.job_type), job0.flags.bits.working, job0.completion_timer, getWorkerID(&job0), tick0, tick1); + ,job0.list_link == NULL ? 0 : job0.list_link->item, job0.id, job0.job_type, ENUM_ATTR(job_type, caption, job0.job_type), job0.flags.bits.working, job0.completion_timer, getWorkerID(&job0), last_tick, tick); continue; } df::job& job1 = *(*j).second; @@ -474,41 +503,43 @@ static void manageJobCompletedEvent(color_ostream& out) { job0.flags.bits.working, job1.flags.bits.working, job0.completion_timer, job1.completion_timer, getWorkerID(&job0), getWorkerID(&job1), - tick0, tick1 + last_tick, tick ); } #endif - for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { - //if it happened within a tick, must have been cancelled by the user or a plugin: not completed - if ( tick1 <= tick0 ) - continue; - - if ( nowJobs.find((*i).first) != nowJobs.end() ) { - //could have just finished if it's a repeat job - df::job& job0 = *(*i).second; - if ( !job0.flags.bits.repeat ) - continue; - df::job& job1 = *nowJobs[(*i).first]; - if ( job0.completion_timer != 0 ) - continue; - if ( job1.completion_timer != -1 ) - continue; + for(auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { + //if it happened within a tick, must have been cancelled by the user or a plugin: not completed + if (tick <= last_tick ) + continue; - //still false positive if cancelled at EXACTLY the right time, but experiments show this doesn't happen - for ( auto j = copy.begin(); j != copy.end(); j++ ) { - (*j).second.eventHandler(out, (void*)&job0); - } - continue; - } + if ( nowJobs.find((*i).first) != nowJobs.end() ) { + //could have just finished if it's a repeat job + df::job& job0 = *(*i).second; + if ( !job0.flags.bits.repeat ) + continue; + df::job& job1 = *nowJobs[(*i).first]; + if ( job0.completion_timer != 0 ) + continue; + if ( job1.completion_timer != -1 ) + continue; + + //still false positive if cancelled at EXACTLY the right time, but experiments show this doesn't happen + handler.eventHandler(out, (void*) &job0); + continue; + } - //recently finished or cancelled job - df::job& job0 = *(*i).second; - if ( job0.flags.bits.repeat || job0.completion_timer != 0 ) - continue; + //recently finished or cancelled job + df::job& job0 = *(*i).second; + if ( job0.flags.bits.repeat || job0.completion_timer != 0 ) + continue; - for ( auto j = copy.begin(); j != copy.end(); j++ ) { - (*j).second.eventHandler(out, (void*)&job0); + handler.eventHandler(out, (void*) &job0); + } } } @@ -528,27 +559,33 @@ static void manageJobCompletedEvent(color_ostream& out) { df::job* newJob = Job::cloneJobStruct((*j).second, true); prevJobs[newJob->id] = newJob; } + last_tick = tick; } static void manageUnitDeathEvent(color_ostream& out) { if (!df::global::world) return; multimap copy(handlers[EventType::UNIT_DEATH].begin(), handlers[EventType::UNIT_DEATH].end()); - for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { - df::unit* unit = df::global::world->units.all[a]; - //if ( unit->counters.death_id == -1 ) { - if ( Units::isActive(unit) ) { - livingUnits.insert(unit->id); - continue; - } - //dead: if dead since last check, trigger events - if ( livingUnits.find(unit->id) == livingUnits.end() ) - continue; + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if(tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { + df::unit* unit = df::global::world->units.all[a]; + //if ( unit->counters.death_id == -1 ) { + if ( Units::isActive(unit) ) { + livingUnits.insert(unit->id); + continue; + } + //dead: if dead since last check, trigger events + if ( livingUnits.find(unit->id) == livingUnits.end() ) + continue; - for ( auto i = copy.begin(); i != copy.end(); i++ ) { - (*i).second.eventHandler(out, (void*)intptr_t(unit->id)); + handler.eventHandler(out, (void*) intptr_t(unit->id)); + livingUnits.erase(unit->id); + } } - livingUnits.erase(unit->id); } } @@ -562,27 +599,32 @@ static void manageItemCreationEvent(color_ostream& out) { } multimap copy(handlers[EventType::ITEM_CREATED].begin(), handlers[EventType::ITEM_CREATED].end()); + int32_t tick = df::global::world->frame_counter; size_t index = df::item::binsearch_index(df::global::world->items.all, nextItem, false); if ( index != 0 ) index--; - for ( size_t a = index; a < df::global::world->items.all.size(); a++ ) { - df::item* item = df::global::world->items.all[a]; - //already processed - if ( item->id < nextItem ) - continue; - //invaders - if ( item->flags.bits.foreign ) - continue; - //traders who bring back your items? - if ( item->flags.bits.trader ) - continue; - //migrants - if ( item->flags.bits.owned ) - continue; - //spider webs don't count - if ( item->flags.bits.spider_web ) - continue; - for ( auto i = copy.begin(); i != copy.end(); i++ ) { - (*i).second.eventHandler(out, (void*)intptr_t(item->id)); + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for (size_t a = index; a < df::global::world->items.all.size(); a++) { + df::item* item = df::global::world->items.all[a]; + //already processed + if (item->id < nextItem) + continue; + //invaders + if (item->flags.bits.foreign) + continue; + //traders who bring back your items? + if (item->flags.bits.trader) + continue; + //migrants + if (item->flags.bits.owned) + continue; + //spider webs don't count + if (item->flags.bits.spider_web) + continue; + handler.eventHandler(out, (void*) intptr_t(item->id)); + } } } nextItem = *df::global::item_next_id; @@ -598,36 +640,37 @@ static void manageBuildingEvent(color_ostream& out) { * consider looking at jobs: building creation / destruction **/ multimap copy(handlers[EventType::BUILDING].begin(), handlers[EventType::BUILDING].end()); - //first alert people about new buildings - for ( int32_t a = nextBuilding; a < *df::global::building_next_id; a++ ) { - int32_t index = df::building::binsearch_index(df::global::world->buildings.all, a); - if ( index == -1 ) { - //out.print("%s, line %d: Couldn't find new building with id %d.\n", __FILE__, __LINE__, a); - //the tricky thing is that when the game first starts, it's ok to skip buildings, but otherwise, if you skip buildings, something is probably wrong. TODO: make this smarter - continue; - } - buildings.insert(a); - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler bob = (*b).second; - bob.eventHandler(out, (void*)intptr_t(a)); - } - } - nextBuilding = *df::global::building_next_id; - - //now alert people about destroyed buildings - for ( auto a = buildings.begin(); a != buildings.end(); ) { - int32_t id = *a; - int32_t index = df::building::binsearch_index(df::global::world->buildings.all,id); - if ( index != -1 ) { - a++; - continue; - } + int32_t tick = df::global::world->frame_counter; + //no more separation between new and destroyed events + for (auto &iter : copy) { + auto &handler = iter.second; + if(tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( int32_t a = nextBuilding; a < *df::global::building_next_id; a++ ) { + int32_t index = df::building::binsearch_index(df::global::world->buildings.all, a); + if ( index == -1 ) { + //out.print("%s, line %d: Couldn't find new building with id %d.\n", __FILE__, __LINE__, a); + //the tricky thing is that when the game first starts, it's ok to skip buildings, but otherwise, if you skip buildings, something is probably wrong. TODO: make this smarter + continue; + } + buildings.insert(a); + handler.eventHandler(out, (void*)intptr_t(a)); - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler bob = (*b).second; - bob.eventHandler(out, (void*)intptr_t(id)); + } + nextBuilding = *df::global::building_next_id; + + //now alert people about destroyed buildings + for ( auto a = buildings.begin(); a != buildings.end(); ) { + int32_t id = *a; + int32_t index = df::building::binsearch_index(df::global::world->buildings.all,id); + if ( index != -1 ) { + a++; + continue; + } + handler.eventHandler(out, (void*)intptr_t(id)); + a = buildings.erase(a); + } } - a = buildings.erase(a); } } @@ -637,33 +680,33 @@ static void manageConstructionEvent(color_ostream& out) { //unordered_set constructionsNow(df::global::world->constructions.begin(), df::global::world->constructions.end()); multimap copy(handlers[EventType::CONSTRUCTION].begin(), handlers[EventType::CONSTRUCTION].end()); - for ( auto a = constructions.begin(); a != constructions.end(); ) { - df::construction& construction = (*a).second; - if ( df::construction::find(construction.pos) != NULL ) { - a++; - continue; - } - //construction removed - //out.print("Removed construction (%d,%d,%d)\n", construction.pos.x,construction.pos.y,construction.pos.z); - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&construction); - } - a = constructions.erase(a); - } - - //for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); a++ ) { - for ( auto a = df::global::world->constructions.begin(); a != df::global::world->constructions.end(); a++ ) { - df::construction* construction = *a; - bool b = constructions.find(construction->pos) != constructions.end(); - constructions[construction->pos] = *construction; - if ( b ) - continue; - //construction created - //out.print("Created construction (%d,%d,%d)\n", construction->pos.x,construction->pos.y,construction->pos.z); - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)construction); + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( auto a = constructions.begin(); a != constructions.end(); ) { + df::construction& construction = (*a).second; + if ( df::construction::find(construction.pos) != NULL ) { + a++; + continue; + } + //construction removed + //out.print("Removed construction (%d,%d,%d)\n", construction.pos.x,construction.pos.y,construction.pos.z); + handler.eventHandler(out, (void*)&construction); + a = constructions.erase(a); + } + //for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); a++ ) { + for ( auto a = df::global::world->constructions.begin(); a != df::global::world->constructions.end(); a++ ) { + df::construction* construction = *a; + bool b = constructions.find(construction->pos) != constructions.end(); + constructions[construction->pos] = *construction; + if ( b ) + continue; + //construction created + //out.print("Created construction (%d,%d,%d)\n", construction->pos.x,construction->pos.y,construction->pos.z); + handler.eventHandler(out, (void*)construction); + } } } } @@ -673,24 +716,28 @@ static void manageSyndromeEvent(color_ostream& out) { return; multimap copy(handlers[EventType::SYNDROME].begin(), handlers[EventType::SYNDROME].end()); int32_t highestTime = -1; - for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) { - df::unit* unit = *a; + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) { + df::unit* unit = *a; /* if ( unit->flags1.bits.inactive ) continue; */ - for ( size_t b = 0; b < unit->syndromes.active.size(); b++ ) { - df::unit_syndrome* syndrome = unit->syndromes.active[b]; - int32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time; - if ( startTime > highestTime ) - highestTime = startTime; - if ( startTime <= lastSyndromeTime ) - continue; - - SyndromeData data(unit->id, b); - for ( auto c = copy.begin(); c != copy.end(); c++ ) { - EventHandler handle = (*c).second; - handle.eventHandler(out, (void*)&data); + for ( size_t b = 0; b < unit->syndromes.active.size(); b++ ) { + df::unit_syndrome* syndrome = unit->syndromes.active[b]; + int32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time; + if ( startTime > highestTime ) + highestTime = startTime; + if ( startTime <= lastSyndromeTime ) + continue; + + SyndromeData data(unit->id, b); + handler.eventHandler(out, (void*)&data); + } } } } @@ -706,9 +753,13 @@ static void manageInvasionEvent(color_ostream& out) { return; nextInvasion = df::global::ui->invasions.next_id; - for ( auto a = copy.begin(); a != copy.end(); a++ ) { - EventHandler handle = (*a).second; - handle.eventHandler(out, (void*)intptr_t(nextInvasion-1)); + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + handler.eventHandler(out, (void*) intptr_t(nextInvasion - 1)); + } } } @@ -719,79 +770,76 @@ static void manageEquipmentEvent(color_ostream& out) { unordered_map itemIdToInventoryItem; unordered_set currentlyEquipped; - for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) { - itemIdToInventoryItem.clear(); - currentlyEquipped.clear(); - df::unit* unit = *a; - /*if ( unit->flags1.bits.inactive ) - continue; - */ - - auto oldEquipment = equipmentLog.find(unit->id); - bool hadEquipment = oldEquipment != equipmentLog.end(); - vector* temp; - if ( hadEquipment ) { - temp = &((*oldEquipment).second); - } else { - temp = new vector; - } - //vector& v = (*oldEquipment).second; - vector& v = *temp; - for ( auto b = v.begin(); b != v.end(); b++ ) { - InventoryItem& i = *b; - itemIdToInventoryItem[i.itemId] = i; - } - for ( size_t b = 0; b < unit->inventory.size(); b++ ) { - df::unit_inventory_item* dfitem_new = unit->inventory[b]; - currentlyEquipped.insert(dfitem_new->item->id); - InventoryItem item_new(dfitem_new->item->id, *dfitem_new); - auto c = itemIdToInventoryItem.find(dfitem_new->item->id); - if ( c == itemIdToInventoryItem.end() ) { - //new item equipped (probably just picked up) - InventoryChangeData data(unit->id, NULL, &item_new); - for ( auto h = copy.begin(); h != copy.end(); h++ ) { - EventHandler handle = (*h).second; - handle.eventHandler(out, (void*)&data); + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for (auto unit : df::global::world->units.all) { + itemIdToInventoryItem.clear(); + currentlyEquipped.clear(); + /*if ( unit->flags1.bits.inactive ) + continue; + */ + + auto oldEquipment = equipmentLog.find(unit->id); + bool hadEquipment = oldEquipment != equipmentLog.end(); + vector* temp; + if (hadEquipment) { + temp = &((*oldEquipment).second); + } else { + temp = new vector; + } + //vector& v = (*oldEquipment).second; + vector &v = *temp; + for (auto &item : v) { + itemIdToInventoryItem[item.itemId] = item; + } + for (size_t b = 0; b < unit->inventory.size(); b++) { + df::unit_inventory_item* dfitem_new = unit->inventory[b]; + currentlyEquipped.insert(dfitem_new->item->id); + InventoryItem item_new(dfitem_new->item->id, *dfitem_new); + auto c = itemIdToInventoryItem.find(dfitem_new->item->id); + if (c == itemIdToInventoryItem.end()) { + //new item equipped (probably just picked up) + InventoryChangeData data(unit->id, NULL, &item_new); + handler.eventHandler(out, (void*) &data); + continue; + } + InventoryItem item_old = (*c).second; + + df::unit_inventory_item &item0 = item_old.item; + df::unit_inventory_item &item1 = item_new.item; + if (item0.mode == item1.mode && item0.body_part_id == item1.body_part_id && + item0.wound_id == item1.wound_id) + continue; + //some sort of change in how it's equipped + + InventoryChangeData data(unit->id, &item_old, &item_new); + handler.eventHandler(out, (void*) &data); + } + //check for dropped items + for (auto b = v.begin(); b != v.end(); b++) { + InventoryItem i = *b; + if (currentlyEquipped.find(i.itemId) != currentlyEquipped.end()) + continue; + //TODO: delete ptr if invalid + InventoryChangeData data(unit->id, &i, NULL); + handler.eventHandler(out, (void*) &data); + } + if (!hadEquipment) + delete temp; + + //update equipment + vector &equipment = equipmentLog[unit->id]; + equipment.clear(); + for (size_t b = 0; b < unit->inventory.size(); b++) { + df::unit_inventory_item* dfitem = unit->inventory[b]; + InventoryItem item(dfitem->item->id, *dfitem); + equipment.push_back(item); } - continue; - } - InventoryItem item_old = (*c).second; - - df::unit_inventory_item& item0 = item_old.item; - df::unit_inventory_item& item1 = item_new.item; - if ( item0.mode == item1.mode && item0.body_part_id == item1.body_part_id && item0.wound_id == item1.wound_id ) - continue; - //some sort of change in how it's equipped - - InventoryChangeData data(unit->id, &item_old, &item_new); - for ( auto h = copy.begin(); h != copy.end(); h++ ) { - EventHandler handle = (*h).second; - handle.eventHandler(out, (void*)&data); - } - } - //check for dropped items - for ( auto b = v.begin(); b != v.end(); b++ ) { - InventoryItem i = *b; - if ( currentlyEquipped.find(i.itemId) != currentlyEquipped.end() ) - continue; - //TODO: delete ptr if invalid - InventoryChangeData data(unit->id, &i, NULL); - for ( auto h = copy.begin(); h != copy.end(); h++ ) { - EventHandler handle = (*h).second; - handle.eventHandler(out, (void*)&data); } } - if ( !hadEquipment ) - delete temp; - - //update equipment - vector& equipment = equipmentLog[unit->id]; - equipment.clear(); - for ( size_t b = 0; b < unit->inventory.size(); b++ ) { - df::unit_inventory_item* dfitem = unit->inventory[b]; - InventoryItem item(dfitem->item->id, *dfitem); - equipment.push_back(item); - } } } @@ -827,13 +875,17 @@ static void manageReportEvent(color_ostream& out) { while (a < reports.size() && reports[a]->id <= lastReport) { a++; } - for ( ; a < reports.size(); a++ ) { - df::report* report = reports[a]; - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)intptr_t(report->id)); + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for (; a < reports.size(); a++) { + df::report* report = reports[a]; + handler.eventHandler(out, (void*) intptr_t(report->id)); + lastReport = report->id; + } } - lastReport = report->id; } } @@ -873,91 +925,85 @@ static void manageUnitAttackEvent(color_ostream& out) { return; updateReportToRelevantUnits(); map > alreadyDone; - for ( auto a = strikeReports.begin(); a != strikeReports.end(); a++ ) { - int32_t reportId = *a; - df::report* report = df::report::find(reportId); - if ( !report ) - continue; //TODO: error - std::string reportStr = report->text; - for ( int32_t b = reportId+1; ; b++ ) { - df::report* report2 = df::report::find(b); - if ( !report2 ) - break; - if ( report2->type != df::announcement_type::COMBAT_STRIKE_DETAILS ) - break; - if ( !report2->flags.bits.continuation ) - break; - reportStr = reportStr + report2->text; - } + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for (int reportId : strikeReports) { + df::report* report = df::report::find(reportId); + if ( !report ) + continue; //TODO: error + std::string reportStr = report->text; + for ( int32_t b = reportId+1; ; b++ ) { + df::report* report2 = df::report::find(b); + if ( !report2 ) + break; + if ( report2->type != df::announcement_type::COMBAT_STRIKE_DETAILS ) + break; + if ( !report2->flags.bits.continuation ) + break; + reportStr = reportStr + report2->text; + } - std::vector& relevantUnits = reportToRelevantUnits[report->id]; - if ( relevantUnits.size() != 2 ) { - continue; - } + std::vector& relevantUnits = reportToRelevantUnits[report->id]; + if ( relevantUnits.size() != 2 ) { + continue; + } - df::unit* unit1 = df::unit::find(relevantUnits[0]); - df::unit* unit2 = df::unit::find(relevantUnits[1]); + df::unit* unit1 = df::unit::find(relevantUnits[0]); + df::unit* unit2 = df::unit::find(relevantUnits[1]); - df::unit_wound* wound1 = getWound(unit1,unit2); - df::unit_wound* wound2 = getWound(unit2,unit1); + df::unit_wound* wound1 = getWound(unit1,unit2); + df::unit_wound* wound2 = getWound(unit2,unit1); - if ( wound1 && !alreadyDone[unit1->id][unit2->id] ) { - UnitAttackData data; - data.attacker = unit1->id; - data.defender = unit2->id; - data.wound = wound1->id; + if ( wound1 && !alreadyDone[unit1->id][unit2->id] ) { + UnitAttackData data; + data.attacker = unit1->id; + data.defender = unit2->id; + data.wound = wound1->id; - alreadyDone[data.attacker][data.defender] = 1; - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&data); - } - } + alreadyDone[data.attacker][data.defender] = 1; + handler.eventHandler(out, (void*)&data); + } - if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) { - UnitAttackData data; - data.attacker = unit2->id; - data.defender = unit1->id; - data.wound = wound2->id; + if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) { + UnitAttackData data; + data.attacker = unit2->id; + data.defender = unit1->id; + data.wound = wound2->id; - alreadyDone[data.attacker][data.defender] = 1; - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&data); - } - } + alreadyDone[data.attacker][data.defender] = 1; + handler.eventHandler(out, (void*)&data); + } - if ( Units::isKilled(unit1) ) { - UnitAttackData data; - data.attacker = unit2->id; - data.defender = unit1->id; - data.wound = -1; - alreadyDone[data.attacker][data.defender] = 1; - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&data); - } - } + if ( Units::isKilled(unit1) ) { + UnitAttackData data; + data.attacker = unit2->id; + data.defender = unit1->id; + data.wound = -1; + alreadyDone[data.attacker][data.defender] = 1; + handler.eventHandler(out, (void*)&data); + } - if ( Units::isKilled(unit2) ) { - UnitAttackData data; - data.attacker = unit1->id; - data.defender = unit2->id; - data.wound = -1; - alreadyDone[data.attacker][data.defender] = 1; - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&data); - } - } + if ( Units::isKilled(unit2) ) { + UnitAttackData data; + data.attacker = unit1->id; + data.defender = unit2->id; + data.wound = -1; + alreadyDone[data.attacker][data.defender] = 1; + handler.eventHandler(out, (void*)&data); + } - if ( !wound1 && !wound2 ) { - //if ( unit1->flags1.bits.inactive || unit2->flags1.bits.inactive ) - // continue; - if ( reportStr.find("severed part") ) - continue; - if ( Once::doOnce("EventManager neither wound") ) { - out.print("%s, %d: neither wound: %s\n", __FILE__, __LINE__, reportStr.c_str()); + if ( !wound1 && !wound2 ) { + //if ( unit1->flags1.bits.inactive || unit2->flags1.bits.inactive ) + // continue; + if ( reportStr.find("severed part") ) + continue; + if ( Once::doOnce("EventManager neither wound") ) { + out.print("%s, %d: neither wound: %s\n", __FILE__, __LINE__, reportStr.c_str()); + } + } } } } @@ -1152,62 +1198,66 @@ static void manageInteractionEvent(color_ostream& out) { df::unit* lastAttacker = NULL; //df::unit* lastDefender = NULL; unordered_map > history; - for ( ; a < reports.size(); a++ ) { - df::report* report = reports[a]; - lastReportInteraction = report->id; - df::announcement_type type = report->type; - if ( type != df::announcement_type::INTERACTION_ACTOR && type != df::announcement_type::INTERACTION_TARGET ) - continue; - if ( report->flags.bits.continuation ) - continue; - bool attack = type == df::announcement_type::INTERACTION_ACTOR; - if ( attack ) { - lastAttackEvent = report; - lastAttacker = NULL; - //lastDefender = NULL; - } - vector relevantUnits = gatherRelevantUnits(out, lastAttackEvent, report); - InteractionData data = getAttacker(out, lastAttackEvent, lastAttacker, attack ? NULL : report, relevantUnits); - if ( data.attacker < 0 ) - continue; + int32_t tick = df::global::world->frame_counter; + for (auto &iter : copy) { + auto &handler = iter.second; + if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { + eventLastTick[handler.eventHandler] = tick; + for ( ; a < reports.size(); a++ ) { + df::report* report = reports[a]; + lastReportInteraction = report->id; + df::announcement_type type = report->type; + if ( type != df::announcement_type::INTERACTION_ACTOR && type != df::announcement_type::INTERACTION_TARGET ) + continue; + if ( report->flags.bits.continuation ) + continue; + bool attack = type == df::announcement_type::INTERACTION_ACTOR; + if ( attack ) { + lastAttackEvent = report; + lastAttacker = NULL; + //lastDefender = NULL; + } + vector relevantUnits = gatherRelevantUnits(out, lastAttackEvent, report); + InteractionData data = getAttacker(out, lastAttackEvent, lastAttacker, attack ? NULL : report, relevantUnits); + if ( data.attacker < 0 ) + continue; //out.print("%s,%d\n",__FILE__,__LINE__); - //if ( !attack && lastAttacker && data.attacker == lastAttacker->id && lastDefender && data.defender == lastDefender->id ) - // continue; //lazy way of preventing duplicates - if ( attack && a+1 < reports.size() && reports[a+1]->type == df::announcement_type::INTERACTION_TARGET ) { + //if ( !attack && lastAttacker && data.attacker == lastAttacker->id && lastDefender && data.defender == lastDefender->id ) + // continue; //lazy way of preventing duplicates + if ( attack && a+1 < reports.size() && reports[a+1]->type == df::announcement_type::INTERACTION_TARGET ) { //out.print("%s,%d\n",__FILE__,__LINE__); - vector relevants = gatherRelevantUnits(out, lastAttackEvent, reports[a+1]); - InteractionData data2 = getAttacker(out, lastAttackEvent, lastAttacker, reports[a+1], relevants); - if ( data.attacker == data2.attacker && (data.defender == -1 || data.defender == data2.defender) ) { + vector relevants = gatherRelevantUnits(out, lastAttackEvent, reports[a+1]); + InteractionData data2 = getAttacker(out, lastAttackEvent, lastAttacker, reports[a+1], relevants); + if ( data.attacker == data2.attacker && (data.defender == -1 || data.defender == data2.defender) ) { //out.print("%s,%d\n",__FILE__,__LINE__); - data = data2; - a++; - } - } - { + data = data2; + a++; + } + } + { #define HISTORY_ITEM 1 #if HISTORY_ITEM - unordered_set& b = history[data.attacker]; - if ( b.find(data.defender) != b.end() ) - continue; - history[data.attacker].insert(data.defender); - //b.insert(data.defender); + unordered_set& b = history[data.attacker]; + if ( b.find(data.defender) != b.end() ) + continue; + history[data.attacker].insert(data.defender); + //b.insert(data.defender); #else - unordered_set& b = history[data.attackReport]; + unordered_set& b = history[data.attackReport]; if ( b.find(data.defendReport) != b.end() ) continue; history[data.attackReport].insert(data.defendReport); //b.insert(data.defendReport); #endif - } + } //out.print("%s,%d\n",__FILE__,__LINE__); - lastAttacker = df::unit::find(data.attacker); - //lastDefender = df::unit::find(data.defender); - //fire event - for ( auto b = copy.begin(); b != copy.end(); b++ ) { - EventHandler handle = (*b).second; - handle.eventHandler(out, (void*)&data); + lastAttacker = df::unit::find(data.attacker); + //lastDefender = df::unit::find(data.defender); + //fire event + handler.eventHandler(out, (void*)&data); + //TODO: deduce attacker from latest defend event first + } } - //TODO: deduce attacker from latest defend event first } }