pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-16 21:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Spawn2] Spawn condition value should default spawn_conditions value (#3980)

Browse Source 
* [Spawn2] Spawn condition value should default to value in spawn_conditions table

* Formatting changes and {}
This commit is contained in:
Paul Coene 2024-01-14 13:50:05 -05:00 committed by GitHub
parent 135ee6b2b7
commit 883b3b5826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/spawn2.cpp
View File

@ -845,7 +845,7 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, std:
std::string timeAsString;
EQTime::ToString(&event.next, timeAsString);
LogSpawns("(LoadDBEvent) Loaded [{}] spawn event [{}] on condition [{}] with period [{}], action [{}], argument [{}], strict [{}]. Will trigger at [{}]", event.enabled? "enabled": "disabled", event.id, event.condition_id, event.period, event.action, event.argument, event.strict, timeAsString.c_str());
LogSpawns("(LoadDBEvent) Loaded [{}] spawn event [{}] on condition [{}] with period [{}] action [{}] argument [{}] strict [{}]. Will trigger at [{}]", event.enabled? "enabled": "disabled", event.id, event.condition_id, event.period, event.action, event.argument, event.strict, timeAsString.c_str());
return true;
}
@ -931,7 +931,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
spawn_events.push_back(event);
LogSpawns(
"(LoadSpawnConditions) Loaded [{}] spawn event [{}] on condition [{}] with period [{}], action [{}], argument [{}], strict [{}]",
"(LoadSpawnConditions) Loaded [{}] spawn event [{}] on condition [{}] with period [{}] action [{}] argument [{}] strict [{}]",
event.enabled ? "enabled" : "disabled",
event.id,
event.condition_id,
@ -965,9 +965,15 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
cevent.next.year == tod.year)
StrictCheck = true;
//If event is disabled, or we failed the strict check, set initial spawn_condition to 0.
if(!cevent.enabled || !StrictCheck)
SetCondition(zone->GetShortName(), zone->GetInstanceID(),cevent.condition_id,0);
//If event is disabled, or we failed the strict check, set initial spawn_condition to default startup value from spawn_conditions.
if(!cevent.enabled || !StrictCheck) {
SetCondition(
zone->GetShortName(),
zone->GetInstanceID(),
cevent.condition_id,
spawn_conditions[cevent.condition_id].value
);
}
if(!cevent.enabled)
continue;
@ -1053,7 +1059,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
SpawnCondition &cond = condi->second;
if(cond.value == new_value) {
LogSpawns("Condition update received from world for [{}] with value [{}], which is what we already have", condition_id, new_value);
LogSpawns("Condition update received from world for [{}] with value [{}] which is what we already have", condition_id, new_value);
return;
}
@ -1080,7 +1086,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
SpawnCondition &cond = condi->second;
if(cond.value == new_value) {
LogSpawns("Local Condition update requested for [{}] with value [{}], which is what we already have", condition_id, new_value);
LogSpawns("Local Condition update requested for [{}] with value [{}] which is what we already have", condition_id, new_value);
return;
}