Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Source/Client/AsyncTime/AsyncTimeComp.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
using HarmonyLib;
using Multiplayer.Client.Factions;
using Multiplayer.Client.Patches;
using Multiplayer.Client.Quests;
using Multiplayer.Client.Saving;
using Multiplayer.Client.Util;
using Multiplayer.Common;
using RimWorld;
using RimWorld.Planet;
using System;
using System.Collections.Generic;
using Verse;
using Multiplayer.Client.Comp;
using Multiplayer.Client.Factions;
using Multiplayer.Client.Patches;
using Multiplayer.Client.Saving;
using Multiplayer.Client.Util;

namespace Multiplayer.Client
{
public class AsyncTimeComp : IExposable, ITickable
public class AsyncTimeComp : IExposable, ITickable, IAsyncQuestContext
{
public static Map tickingMap;
public static Map executingCmdMap;
Expand Down Expand Up @@ -429,7 +429,12 @@ public void QuestManagerTickAsyncTime()
{
if (!Multiplayer.GameComp.asyncTime || Paused) return;

MultiplayerAsyncQuest.TickMapQuests(this);
Multiplayer.QuestManagerAsync.TickQuestsAsync(this);
}

public string GetQuestContextInfo()
{
return $"AsyncTimeComp for Map: {map.Index}; faction {map.ParentFaction}";
}
}

Expand All @@ -439,5 +444,4 @@ public enum DesignatorMode : byte
MultiCell,
Thing
}

}
15 changes: 12 additions & 3 deletions Source/Client/AsyncTime/AsyncWorldTimeComp.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using HarmonyLib;
using Multiplayer.Client.Comp;
using Multiplayer.Client.Desyncs;
Expand All @@ -10,6 +7,9 @@
using Multiplayer.Common;
using RimWorld;
using RimWorld.Planet;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Verse;

Expand Down Expand Up @@ -102,6 +102,7 @@ public void Tick()
try
{
Find.TickManager.DoSingleTick();
TickAsyncWorldQuests();
worldTicks++;
Multiplayer.WorldComp.TickWorldSessions();

Expand Down Expand Up @@ -135,6 +136,14 @@ public void Tick()
}
}

private void TickAsyncWorldQuests()
{
if(Multiplayer.GameComp.asyncTime)
{
Multiplayer.QuestManagerAsync.TickWorldQuests();
}
}

public void PreContext()
{
Find.TickManager.CurTimeSpeed = DesiredTimeSpeed;
Expand Down
299 changes: 0 additions & 299 deletions Source/Client/AsyncTime/MultiplayerAsyncQuest.cs

This file was deleted.

Loading
Loading