diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..6e9599b --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,355 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ +.idea/ +*.DotSettings diff --git a/src/CactusPie.FastHealing.sln b/src/CactusPie.FastHealing.sln new file mode 100644 index 0000000..f78156e --- /dev/null +++ b/src/CactusPie.FastHealing.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32616.157 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CactusPie.FastHealing", "CactusPie.FastHealing\CactusPie.FastHealing.csproj", "{9C38A2B1-5F09-49FE-AC57-9FBEF7717582}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9C38A2B1-5F09-49FE-AC57-9FBEF7717582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C38A2B1-5F09-49FE-AC57-9FBEF7717582}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C38A2B1-5F09-49FE-AC57-9FBEF7717582}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C38A2B1-5F09-49FE-AC57-9FBEF7717582}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {26F91A8D-3767-457A-821C-F66AFD620885} + EndGlobalSection +EndGlobal diff --git a/src/CactusPie.FastHealing/CactusPie.FastHealing.csproj b/src/CactusPie.FastHealing/CactusPie.FastHealing.csproj new file mode 100644 index 0000000..673fc7d --- /dev/null +++ b/src/CactusPie.FastHealing/CactusPie.FastHealing.csproj @@ -0,0 +1,49 @@ + + + + net472 + 1.0.0 + CactusPie + + + + + runtime + + + + + + ..\References\EFT_Managed\Aki.Reflection.dll + False + + + ..\References\EFT_Managed\Assembly-CSharp.dll + False + + + ..\References\EFT_Managed\Comfort.dll + False + + + ..\References\EFT_Managed\Comfort.Unity.dll + False + + + D:\Games\SPTARKOV\EscapeFromTarkov_Data\Managed\Newtonsoft.Json.dll + False + + + ..\References\EFT_Managed\UnityEngine.dll + False + + + ..\References\EFT_Managed\UnityEngine.CoreModule.dll + False + + + ..\References\EFT_Managed\UnityEngine.InputLegacyModule.dll + False + + + diff --git a/src/CactusPie.FastHealing/Enums/MedsItemType.cs b/src/CactusPie.FastHealing/Enums/MedsItemType.cs new file mode 100644 index 0000000..07b41bb --- /dev/null +++ b/src/CactusPie.FastHealing/Enums/MedsItemType.cs @@ -0,0 +1,9 @@ +namespace CactusPie.FastHealing.Enums +{ + public enum MedsItemType + { + Medkit, + SurgeryKit, + Other, + } +} \ No newline at end of file diff --git a/src/CactusPie.FastHealing/FastHealingPlugin.cs b/src/CactusPie.FastHealing/FastHealingPlugin.cs new file mode 100644 index 0000000..8648958 --- /dev/null +++ b/src/CactusPie.FastHealing/FastHealingPlugin.cs @@ -0,0 +1,120 @@ +using BepInEx; +using BepInEx.Configuration; +using JetBrains.Annotations; + +namespace CactusPie.FastHealing +{ + [BepInPlugin("com.cactuspie.fasthealing", "CactusPie.FastHealing", "1.0.0")] + public class FastHealingPlugin : BaseUnityPlugin + { + internal static ConfigEntry SurgerySpeedMultiplier { get; set; } + internal static ConfigEntry SurgerySpeedMultiplierEnabled { get; set; } + internal static ConfigEntry HealingTimeMultiplier { get; set; } + internal static ConfigEntry HealingSpeedMultiplierEnabled { get; set; } + internal static ConfigEntry DynamicHealTimeEnabled { get; set; } + internal static ConfigEntry DynamicHealTimeThreshold { get; set; } + internal static ConfigEntry DynamicHealTimeMultiplier { get; set; } + + [UsedImplicitly] + internal void Start() + { + // Surgery time section + const string surgeryTimeSection = "Surgery time settings"; + + SurgerySpeedMultiplierEnabled = Config.Bind + ( + surgeryTimeSection, + "Enable surgery time multiplier", + true, + new ConfigDescription + ( + "Whether or not the surgery time multiplier is enabled" + ) + ); + + SurgerySpeedMultiplier = Config.Bind + ( + surgeryTimeSection, + "Surgery time multiplier", + 0.5f, + new ConfigDescription + ( + "Values below 1.0 will make the surgery faster, higher values will make it slower", + new AcceptableValueRange(0.01f, 2.0f) + ) + ); + + // Healing time section + const string healingTimeSection = "Healing time settings"; + + HealingSpeedMultiplierEnabled = Config.Bind + ( + healingTimeSection, + "Enable healing time multiplier", + true, + new ConfigDescription + ( + "Whether or not the healing time multiplier is enabled" + ) + ); + + HealingTimeMultiplier = Config.Bind + ( + healingTimeSection, + "Healing time multiplier", + 0.8f, + new ConfigDescription + ( + "Values below 1.0 will make the healing faster, higher values will make it slower", + new AcceptableValueRange(0.01f, 2.0f) + ) + ); + + // Dynamic healing time section + const string dynamicHealingTimeSection = "Dynamic healing time settings"; + + DynamicHealTimeEnabled = Config.Bind + ( + dynamicHealingTimeSection, + "Dynamic heal time enabled", + true, + new ConfigDescription + ( + "Whether or not the healing time should be quicker for less damaged body parts" + ) + ); + + DynamicHealTimeThreshold = Config.Bind + ( + dynamicHealingTimeSection, + "Dynamic surgery time health threshold", + 50f, + new ConfigDescription + ( + "Below this health percentage the game will not apply the dynamic healing time", + new AcceptableValueRange(1f, 100.0f) + ) + ); + + DynamicHealTimeMultiplier = Config.Bind + ( + dynamicHealingTimeSection, + "Dynamic heal time multiplier", + 1f, + new ConfigDescription + ( + "Decreasing this value below 1 will further speed up healing time for less damaged limbs", + new AcceptableValueRange(0.01f, 5.0f) + ) + ); + + new OverrideHealingTimePatch().Enable(); + } + + [UsedImplicitly] + public void OnDestroy() + { + Destroy(this); + } + } +} diff --git a/src/CactusPie.FastHealing/OverrideHealingTimePatch.cs b/src/CactusPie.FastHealing/OverrideHealingTimePatch.cs new file mode 100644 index 0000000..f803e08 --- /dev/null +++ b/src/CactusPie.FastHealing/OverrideHealingTimePatch.cs @@ -0,0 +1,238 @@ +using System; +using System.Linq; +using System.Reflection; +using Aki.Reflection.Patching; +using CactusPie.FastHealing.Enums; +using Comfort.Common; +using EFT; +using EFT.HealthSystem; +using EFT.InventoryLogic; +using HarmonyLib; + +namespace CactusPie.FastHealing +{ + public class OverrideHealingTimePatch : ModulePatch + { + private static readonly Type LightBleedingType = AccessTools.FirstInner(typeof(ActiveHealthController), x => x.Name == "LightBleeding"); + private static readonly Type HeavyBleedingType = AccessTools.FirstInner(typeof(ActiveHealthController), x => x.Name == "HeavyBleeding"); + private static readonly Type FractureType = AccessTools.FirstInner(typeof(ActiveHealthController), x => x.Name == "Fracture"); + private static readonly Type MedEffectType = AccessTools.FirstInner(typeof(ActiveHealthController), x => x.Name == "MedEffect"); + + private static readonly MethodInfo InitEffectMethod = AccessTools.Method(MedEffectType, "Init", new[] { typeof(Item), typeof(float) }); + private static readonly MethodInfo AddEffectMethod = AccessTools.Method(typeof(ActiveHealthController), "AddEffect").MakeGenericMethod(MedEffectType); + private static readonly MethodInfo TryGetBodyPartToApplyMethod = AccessTools.Method(typeof(ActiveHealthController), "TryGetBodyPartToApply"); + + protected override MethodBase GetTargetMethod() + { + MethodInfo method = typeof(ActiveHealthController).GetMethod("DoMedEffect", BindingFlags.Public | BindingFlags.Instance); + return method; + } + + [PatchPrefix] + public static bool PatchPrefix( + ref IEffect __result, + ActiveHealthController __instance, + Item item, + EBodyPart bodyPart, + float? amount = null) + { + if (!(item is MedsClass medsItem)) + { + return true; + } + + float delay; + + switch (item) + { + case GClass2537 _: + delay = Singleton.Instance.Health.Effects.MedEffect.MedKitStartDelay; + break; + case GClass2540 _: + delay = Singleton.Instance.Health.Effects.MedEffect.MedicalStartDelay; + break; + default: + return true; + } + + Player player = Singleton.Instance.MainPlayer; + + var getBodyPartToApplyArguments = new object[] + { + item, + bodyPart, + null, + }; + + bool tryGetBodyPartToApplyResult = (bool)TryGetBodyPartToApplyMethod + .Invoke(__instance, getBodyPartToApplyArguments); + + if (!tryGetBodyPartToApplyResult) + { + return true; + } + + var damagedBodyPart = (EBodyPart?)getBodyPartToApplyArguments[2]; + + if (!damagedBodyPart.HasValue) + { + return true; + } + + EBodyPart damagedBodyPartValue = damagedBodyPart.Value; + + MedsItemType medsItemType = GetItemType(medsItem); + + delay = GetModifiedDelay(player, delay, medsItemType, damagedBodyPartValue); + + bool isBodyPartDestroyed = player.HealthController.IsBodyPartDestroyed(damagedBodyPartValue); + + float healingTime = medsItem.HealthEffectsComponent.UseTimeFor(damagedBodyPartValue); + if (isBodyPartDestroyed && medsItem.HealthEffectsComponent.AffectsAny(EDamageEffectType.DestroyedPart)) + { + healingTime /= 1f + (float)player.Skills.SurgerySpeed; + } + + healingTime = GetModifiedHealingTime(player, healingTime, medsItemType, damagedBodyPartValue); + + Action addEffectCallback = medEffectObj => + { + InitEffectMethod.Invoke(medEffectObj, new object[] { medsItem, 1f }); + }; + + __result = (IEffect)AddEffectMethod.Invoke( + __instance, + new object[] + { + damagedBodyPart, + delay, //delay time + healingTime, + (float?)null, + (float?)null, + addEffectCallback, + }); + + return false; + } + + private static bool BodyPartHasNegativeEffect(IEffect effect) + { + Type effectType = effect.GetType(); + return effectType == LightBleedingType || effectType == HeavyBleedingType || effectType == FractureType; + } + + private static float GetModifiedHealingTime(Player player, float healingTime, MedsItemType medsItemType, EBodyPart bodyPart) + { + if (medsItemType == MedsItemType.Other) + { + return healingTime; + } + + if (medsItemType == MedsItemType.SurgeryKit) + { + if (FastHealingPlugin.SurgerySpeedMultiplierEnabled.Value) + { + healingTime *= FastHealingPlugin.SurgerySpeedMultiplier.Value; + } + + return healingTime; + } + + if (medsItemType == MedsItemType.Medkit) + { + if (FastHealingPlugin.DynamicHealTimeEnabled.Value) + { + ValueStruct health = player.HealthController.GetBodyPartHealth(bodyPart); + float healthPercentage = health.Current / health.Maximum; + + if (healthPercentage > (FastHealingPlugin.DynamicHealTimeThreshold.Value / 100f)) + { + healingTime *= (1f - healthPercentage) * FastHealingPlugin.DynamicHealTimeMultiplier.Value; + } + } + + if (FastHealingPlugin.HealingSpeedMultiplierEnabled.Value) + { + healingTime *= FastHealingPlugin.HealingTimeMultiplier.Value; + } + } + + return healingTime; + } + + private static float GetModifiedDelay(Player player, float delay, MedsItemType medsItemType, EBodyPart bodyPart) + { + if (player.HealthController.GetAllActiveEffects(bodyPart).Any(BodyPartHasNegativeEffect)) + { + return delay; + } + + if (medsItemType == MedsItemType.Other) + { + return delay; + } + + if (medsItemType == MedsItemType.SurgeryKit) + { + if (FastHealingPlugin.SurgerySpeedMultiplierEnabled.Value) + { + delay *= FastHealingPlugin.SurgerySpeedMultiplier.Value; + } + + return delay; + } + + if (medsItemType == MedsItemType.Medkit) + { + if (FastHealingPlugin.DynamicHealTimeEnabled.Value) + { + ValueStruct health = player.HealthController.GetBodyPartHealth(bodyPart); + float healthPercentage = health.Current / health.Maximum; + + if (healthPercentage > (FastHealingPlugin.DynamicHealTimeThreshold.Value / 100f)) + { + delay *= (1f - healthPercentage) * FastHealingPlugin.DynamicHealTimeMultiplier.Value; + } + } + + if (FastHealingPlugin.HealingSpeedMultiplierEnabled.Value) + { + delay *= FastHealingPlugin.HealingTimeMultiplier.Value; + } + } + + return delay; + } + + public static MedsItemType GetItemType(MedsClass medsItem) + { + const string surv12Id = "survival_first_aid_rollup_kit"; + const string cmsId = "core_medical_surgical_kit"; + const string grizzly = "AMK_Grizzly"; + const string salewa = "salewa"; + const string carMedkit = "item_meds_automedkit"; + const string afak = "item_meds_afak"; + const string yellowMedkit = "medkit"; + + string itemName = medsItem.Template._name; + string itemId = medsItem.Template.Name; + + if (itemId == cmsId || itemId == surv12Id) + { + return MedsItemType.SurgeryKit; + } + + if (itemName == grizzly || + itemName == salewa || + itemName == salewa || + itemName == carMedkit || + itemName == afak || + itemName == yellowMedkit) + { + return MedsItemType.Medkit; + } + + return MedsItemType.Other; + } + } +} \ No newline at end of file diff --git a/src/NuGet.Config b/src/NuGet.Config new file mode 100644 index 0000000..da1fd08 --- /dev/null +++ b/src/NuGet.Config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file