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

WiP movement prediction.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 02:21:20 +02:00
parent 822436bb81
commit da45a52325
48 changed files with 1101 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
View File

@@ -4,6 +4,8 @@ using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Movement;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.Components.Nutrition;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Random;
@@ -15,14 +17,12 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Nutrition
{
[RegisterComponent]
public sealed class HungerComponent : Component, IMoveSpeedModifier
public sealed class HungerComponent : SharedHungerComponent
{
#pragma warning disable 649
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Hunger";
// Base stuff
public float BaseDecayRate => _baseDecayRate;
[ViewVariables] private float _baseDecayRate;
@@ -30,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
[ViewVariables] private float _actualDecayRate;
// Hunger
public HungerThreshold CurrentHungerThreshold => _currentHungerThreshold;
public override HungerThreshold CurrentHungerThreshold => _currentHungerThreshold;
private HungerThreshold _currentHungerThreshold;
private HungerThreshold _lastHungerThreshold;
public float CurrentHunger => _currentHunger;
@@ -127,6 +127,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
_currentHungerThreshold = GetHungerThreshold(_currentHunger);
_lastHungerThreshold = HungerThreshold.Okay; // TODO: Potentially change this -> Used Okay because no effects.
HungerThresholdEffect(true);
Dirty();
}
public HungerThreshold GetHungerThreshold(float food)
@@ -161,6 +162,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
{
_currentHungerThreshold = calculatedHungerThreshold;
HungerThresholdEffect();
Dirty();
}
if (_currentHungerThreshold == HungerThreshold.Dead)
{
@@ -179,36 +181,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
_currentHunger = HungerThresholds[HungerThreshold.Okay];
}
float IMoveSpeedModifier.WalkSpeedModifier
public override ComponentState GetComponentState()
{
get
{
if (_currentHungerThreshold == HungerThreshold.Starving)
{
return 0.5f;
}
return 1.0f;
}
}
float IMoveSpeedModifier.SprintSpeedModifier
{
get
{
if (_currentHungerThreshold == HungerThreshold.Starving)
{
return 0.5f;
}
return 1.0f;
}
return new HungerComponentState(_currentHungerThreshold);
}
}
public enum HungerThreshold
{
Overfed,
Okay,
Peckish,
Starving,
Dead,
}
}

46
Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
View File

@@ -4,6 +4,8 @@ using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Movement;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.Components.Nutrition;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Random;
@@ -15,14 +17,12 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Nutrition
{
[RegisterComponent]
public sealed class ThirstComponent : Component, IMoveSpeedModifier
public sealed class ThirstComponent : SharedThirstComponent, IMoveSpeedModifier
{
#pragma warning disable 649
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Thirst";
// Base stuff
public float BaseDecayRate => _baseDecayRate;
[ViewVariables] private float _baseDecayRate;
@@ -30,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
[ViewVariables] private float _actualDecayRate;
// Thirst
public ThirstThreshold CurrentThirstThreshold => _currentThirstThreshold;
public override ThirstThreshold CurrentThirstThreshold => _currentThirstThreshold;
private ThirstThreshold _currentThirstThreshold;
private ThirstThreshold _lastThirstThreshold;
public float CurrentThirst => _currentThirst;
@@ -126,6 +126,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
_lastThirstThreshold = ThirstThreshold.Okay; // TODO: Potentially change this -> Used Okay because no effects.
// TODO: Check all thresholds make sense and throw if they don't.
ThirstThresholdEffect(true);
Dirty();
}
public ThirstThreshold GetThirstThreshold(float drink)
@@ -160,6 +161,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
{
_currentThirstThreshold = calculatedThirstThreshold;
ThirstThresholdEffect();
Dirty();
}
if (_currentThirstThreshold == ThirstThreshold.Dead)
@@ -174,42 +176,16 @@ namespace Content.Server.GameObjects.Components.Nutrition
}
}
float IMoveSpeedModifier.SprintSpeedModifier
{
get
{
if (_currentThirstThreshold == ThirstThreshold.Parched)
{
return 0.25f;
}
return 1.0f;
}
}
float IMoveSpeedModifier.WalkSpeedModifier
{
get
{
if (_currentThirstThreshold == ThirstThreshold.Parched)
{
return 0.5f;
}
return 1.0f;
}
}
public void ResetThirst()
{
_currentThirst = ThirstThresholds[ThirstThreshold.Okay];
}
public override ComponentState GetComponentState()
{
return new ThirstComponentState(_currentThirstThreshold);
}
}
public enum ThirstThreshold
{
// Hydrohomies
OverHydrated,
Okay,
Thirsty,
Parched,
Dead,
}
}