Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adjust some frametiming stuff (#6496)

Browse Source
This commit is contained in:
metalgearsloth
2022-03-01 01:11:25 +11:00
committed by GitHub
parent eeef210ae4
commit ffed5eec81
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Administration/Logs/AdminLogSystem.cs
View File

@@ -182,7 +182,7 @@ public sealed partial class AdminLogSystem : SharedAdminLogSystem
private async Task SaveLogs()
{
_accumulatedFrameTime = 0;
_accumulatedFrameTime = 0f;
// TODO ADMIN LOGS array pool
var copy = new List<QueuedLog>(_logQueue.Count + _preRoundLogQueue.Count);

33
Content.Server/Animals/Systems/UdderSystem.cs
View File

@@ -37,25 +37,28 @@ namespace Content.Server.Animals.Systems
{
udder.AccumulatedFrameTime += frameTime;
if (udder.AccumulatedFrameTime < udder.UpdateRate)
continue;
// Actually there is food digestion so no problem with instant reagent generation "OnFeed"
if (EntityManager.TryGetComponent<HungerComponent?>(udder.Owner, out var hunger))
while (udder.AccumulatedFrameTime > udder.UpdateRate)
{
hunger.HungerThresholds.TryGetValue(HungerThreshold.Peckish, out var targetThreshold);
udder.AccumulatedFrameTime -= udder.UpdateRate;
// Is there enough nutrition to produce reagent?
if (hunger.CurrentHunger < targetThreshold)
// Actually there is food digestion so no problem with instant reagent generation "OnFeed"
if (EntityManager.TryGetComponent<HungerComponent?>(udder.Owner, out var hunger))
{
hunger.HungerThresholds.TryGetValue(HungerThreshold.Peckish, out var targetThreshold);
// Is there enough nutrition to produce reagent?
if (hunger.CurrentHunger < targetThreshold)
continue;
}
if (!_solutionContainerSystem.TryGetSolution(udder.Owner, udder.TargetSolutionName,
out var solution))
continue;
//TODO: toxins from bloodstream !?
_solutionContainerSystem.TryAddReagent(udder.Owner, solution, udder.ReagentId,
udder.QuantityPerUpdate, out var accepted);
}
if (!_solutionContainerSystem.TryGetSolution(udder.Owner, udder.TargetSolutionName, out var solution))
continue;
//TODO: toxins from bloodstream !?
_solutionContainerSystem.TryAddReagent(udder.Owner, solution, udder.ReagentId, udder.QuantityPerUpdate, out var accepted);
udder.AccumulatedFrameTime = 0;
}
}

2
Content.Server/Botany/Systems/BotanySystem.Plant.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Server.Botany.Systems
if (_timer < 3f)
return;
_timer = 0f;
_timer -= 3f;
foreach (var plantHolder in EntityManager.EntityQuery<PlantHolderComponent>())
{

3
Content.Server/Nutrition/EntitySystems/HungerSystem.cs
View File

@@ -19,7 +19,8 @@ namespace Content.Server.Nutrition.EntitySystems
{
comp.OnUpdate(_accumulatedFrameTime);
}
_accumulatedFrameTime = 0;
_accumulatedFrameTime -= 1;
}
}
}