chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted DefaultVitality into extension method

Browse Source
This commit is contained in:
Chomp
2025-06-28 09:00:23 +01:00
parent 31df269eb8
commit 65d8d7432d
3 changed files with 85 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Extensions/VitalityExtensions.cs
+79
View File
@@ -0,0 +1,79 @@
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Server.Core.Models.Eft.Profile;
namespace SPTarkov.Server.Core.Extensions
{
public static class VitalityExtensions
{
public static void SetDefaults(this Vitality? vitality)
{
vitality ??= new Vitality
{
Health = null,
Energy = 0,
Temperature = 0,
Hydration = 0,
};
vitality.Health = new Dictionary<string, BodyPartHealth>
{
{
"Head",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"Chest",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"Stomach",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"LeftArm",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"RightArm",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"LeftLeg",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"RightLeg",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
};
}
}
}
Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
+3 -74
View File
@@ -1,4 +1,5 @@
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Extensions;
using SPTarkov.Server.Core.Models.Eft.Common;
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Server.Core.Models.Eft.Profile;
@@ -6,7 +7,6 @@ using SPTarkov.Server.Core.Models.Spt.Config;
using SPTarkov.Server.Core.Servers;
using SPTarkov.Server.Core.Utils;
using BodyPartHealth = SPTarkov.Server.Core.Models.Eft.Common.Tables.BodyPartHealth;
using Vitality = SPTarkov.Server.Core.Models.Eft.Profile.Vitality;
namespace SPTarkov.Server.Core.Helpers;
@@ -18,7 +18,7 @@ public class HealthHelper(
ConfigServer _configServer
)
{
protected HealthConfig _healthConfig = _configServer.GetConfig<HealthConfig>();
protected readonly HealthConfig _healthConfig = _configServer.GetConfig<HealthConfig>();
/// <summary>
/// Resets the profiles vitality/health and vitality/effects properties to their defaults
@@ -29,82 +29,11 @@ public class HealthHelper(
{
var profile = _saveServer.GetProfile(sessionID);
DefaultVitality(profile.VitalityData);
profile.VitalityData.SetDefaults();
return profile;
}
public void DefaultVitality(Vitality? vitality)
{
vitality ??= new Vitality
{
Health = null,
Energy = 0,
Temperature = 0,
Hydration = 0,
};
vitality.Health = new Dictionary<string, BodyPartHealth>
{
{
"Head",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"Chest",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"Stomach",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"LeftArm",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"RightArm",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"LeftLeg",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
{
"RightLeg",
new BodyPartHealth
{
Health = new CurrentMinMax { Current = 0 },
Effects = new Dictionary<string, BodyPartEffectProperties>(),
}
},
};
}
/// <summary>
/// Update player profile vitality values with changes from client request object
/// </summary>
Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
+3 -14
View File
@@ -32,22 +32,11 @@
<!-- BuildType options - LOCAL, DEBUG, RELEASE, BLEEDING_EDGE, BLEEDING_EDGE_MODS - *must be all caps*-->
</PropertyGroup>
<Target Name="AfterEverythingDone" AfterTargets="PostBuildEvent">
<Exec
ConsoleToMsBuild="true"
Condition="'$(IsPublish)' == 'true'"
Command="dotnet build -c $(Configuration) $(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/Ceciler.Virtualizer.csproj"
/>
<Exec
ConsoleToMsBuild="true"
Command="dotnet &quot;$(MSBuildProjectDirectory)/../../Ceciler/Ceciler.Launcher.dll&quot; &quot;$(OutDir)SPTarkov.Server.Core.dll&quot; &quot;$(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/bin/$(Configuration)/$(TargetFramework)/Ceciler.Virtualizer.dll&quot;"
/>
<Exec ConsoleToMsBuild="true" Condition="'$(IsPublish)' == 'true'" Command="dotnet build -c $(Configuration) $(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/Ceciler.Virtualizer.csproj" />
<Exec ConsoleToMsBuild="true" Command="dotnet &quot;$(MSBuildProjectDirectory)/../../Ceciler/Ceciler.Launcher.dll&quot; &quot;$(OutDir)SPTarkov.Server.Core.dll&quot; &quot;$(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/bin/$(Configuration)/$(TargetFramework)/Ceciler.Virtualizer.dll&quot;" />
</Target>
<!-- Generates the ProgramStatics class with the build information -->
<Target Name="GenerateProgramStatics" BeforeTargets="BeforeBuild">
<WriteLinesToFile
File="Utils/ProgramStatics.Generated.cs"
Lines="&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static string? _sptVersion = &quot;$(SptVersion)&quot;%3B&#xD;&#xA; private static string? _commit = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double? _buildTime = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType? BuildType = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
Overwrite="true"
/>
<WriteLinesToFile File="Utils/ProgramStatics.Generated.cs" Lines="&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static string? _sptVersion = &quot;$(SptVersion)&quot;%3B&#xD;&#xA; private static string? _commit = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double? _buildTime = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType? BuildType = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;" Overwrite="true" />
</Target>
</Project>