Moonbase/jsgr-mmo
1
0
Fork 0
forked from SoDOff-Project/sodoff-mmo
Code Pull Requests Activity

calculate next event time based on the start time

Browse Source 
... of current event (not the end time of current event)
This commit is contained in:
Robert Paciorek 2024-02-27 06:27:09 +00:00
parent 5a8d666a7b
commit 18ff27f8e7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Core/WorldEvent.cs
View File

@ -49,14 +49,14 @@ class WorldEvent {
private string lastResults = ""; private string lastResults = "";
// reset event - set new id, start time, end time, etc // reset event - set new id, start time, end time, etc
private void Reset(float time = 2) { private void Reset(DateTime newStartTime) {
lock (EventLock) { lock (EventLock) {
room = Room.GetOrAdd("HubTrainingDO"); room = Room.GetOrAdd("HubTrainingDO");
uid = Path.GetRandomFileName().Substring(0, 8); // this is used as RandomSeed for random select ship variant uid = Path.GetRandomFileName().Substring(0, 8); // this is used as RandomSeed for random select ship variant
operatorAI = null; operatorAI = null;
state = State.NotActive; state = State.NotActive;
startTime = DateTime.UtcNow.AddMinutes(time); startTime = newStartTime;
startTimeString = startTime.ToString("MM/dd/yyyy HH:mm:ss"); startTimeString = startTime.ToString("MM/dd/yyyy HH:mm:ss");
AITime = startTime.AddMinutes(-1); AITime = startTime.AddMinutes(-1);
UpdateEndTime(600 + 90); UpdateEndTime(600 + 90);
@ -77,15 +77,18 @@ class WorldEvent {
} }
// schedule next event and set timer to call PreInit // schedule next event and set timer to call PreInit
private void ScheduleEvent(float minutes) { private void ScheduleEvent(float minutes = 0) {
nextStartTime = DateTime.UtcNow.AddMinutes(minutes); if (minutes > 2)
nextStartTime = DateTime.UtcNow.AddMinutes(minutes);
else
nextStartTime = startTime.AddMinutes(Configuration.ServerConfiguration.EventTimer);
nextStartTimeString = nextStartTime.ToString("MM/dd/yyyy HH:mm:ss");; nextStartTimeString = nextStartTime.ToString("MM/dd/yyyy HH:mm:ss");;
SetTimer(minutes*60 - 120, PreInit); SetTimer((nextStartTime - DateTime.UtcNow).TotalSeconds - 120, PreInit);
} }
// reset event and set timer to call PreEndEvent, send new WE_ info // reset event and set timer to call PreEndEvent, send new WE_ info
private void PreInit(Object source, ElapsedEventArgs e) { private void PreInit(Object source, ElapsedEventArgs e) {
Reset(); // WE_ == WEN_ Reset(nextStartTime); // WE_ == WEN_
AnnounceEvent(); AnnounceEvent();
} }
@ -195,7 +198,7 @@ class WorldEvent {
// schedule next event, set timer to call PreInit() and send new WEN_ info // schedule next event, set timer to call PreInit() and send new WEN_ info
private void PostEndEvent2(Object source, ElapsedEventArgs e) { private void PostEndEvent2(Object source, ElapsedEventArgs e) {
ScheduleEvent(Configuration.ServerConfiguration.EventTimer); // WE_ != WEN_ ScheduleEvent(); // WE_ != WEN_
AnnounceEvent(false, true); // send only WEN_ (WE_ should stay unchanged ... as WE_..._End) AnnounceEvent(false, true); // send only WEN_ (WE_ should stay unchanged ... as WE_..._End)
} }