From 7b682f1db5071bbd58bb73df37063e2ac9397521 Mon Sep 17 00:00:00 2001 From: Lacyway <20912169+Lacyway@users.noreply.github.com> Date: Sat, 7 Dec 2024 21:37:36 +0100 Subject: [PATCH] Cleanup configs - Removed damage multipliers (will become standalone mod at some point) - Set Force Bind IP to 0.0.0.0 by default to prevent user error --- Fika.Core/Coop/Players/CoopPlayer.cs | 14 -------------- Fika.Core/FikaPlugin.cs | 15 +-------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs index f8b1ece9..fa7e49a6 100644 --- a/Fika.Core/Coop/Players/CoopPlayer.cs +++ b/Fika.Core/Coop/Players/CoopPlayer.cs @@ -212,20 +212,6 @@ public override void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart body return; } } - if (colliderType == EBodyPartColliderType.HeadCommon) - { - damageInfo.Damage *= FikaPlugin.HeadDamageMultiplier.Value; - } - - if (colliderType is EBodyPartColliderType.RightSideChestUp or EBodyPartColliderType.LeftSideChestUp) - { - damageInfo.Damage *= FikaPlugin.ArmpitDamageMultiplier.Value; - } - - if (bodyPartType is EBodyPart.Stomach) - { - damageInfo.Damage *= FikaPlugin.StomachDamageMultiplier.Value; - } } if (damageInfo.Weapon != null) diff --git a/Fika.Core/FikaPlugin.cs b/Fika.Core/FikaPlugin.cs index b99de219..888e5e6a 100644 --- a/Fika.Core/FikaPlugin.cs +++ b/Fika.Core/FikaPlugin.cs @@ -195,9 +195,6 @@ public ManualLogSource FikaLogger public static ConfigEntry SmoothingRate { get; set; } // Gameplay - public static ConfigEntry HeadDamageMultiplier { get; set; } - public static ConfigEntry ArmpitDamageMultiplier { get; set; } - public static ConfigEntry StomachDamageMultiplier { get; set; } public static ConfigEntry DisableBotMetabolism { get; set; } #endregion @@ -644,7 +641,7 @@ private void SetupConfig() ForceIP = Config.Bind("Network", "Force IP", "", new ConfigDescription("Forces the server when hosting to use this IP when broadcasting to the backend instead of automatically trying to fetch it. Leave empty to disable.", tags: new ConfigurationManagerAttributes() { Order = 8 })); - ForceBindIP = Config.Bind("Network", "Force Bind IP", "", + ForceBindIP = Config.Bind("Network", "Force Bind IP", "0.0.0.0", new ConfigDescription("Forces the server when hosting to use this local IP when starting the server. Useful if you are hosting on a VPN.", new AcceptableValueList(GetLocalAddresses()), new ConfigurationManagerAttributes() { Order = 7 })); AutoRefreshRate = Config.Bind("Network", "Auto Server Refresh Rate", 10f, @@ -669,16 +666,6 @@ private void SetupConfig() new ConfigDescription("Local simulation is behind by Send Rate * Smoothing Rate. This guarantees that we always have enough snapshots in the buffer to mitigate lags & jitter during interpolation.\n\nLow = 1.5\nMedium = 2\nHigh = 2.5\n\nSet this to 'High' if movement isn't smooth. Cannot be changed during a raid.", tags: new ConfigurationManagerAttributes() { Order = 0 })); // Gameplay - - HeadDamageMultiplier = Config.Bind("Gameplay", "Head Damage Multiplier", 1f, - new ConfigDescription("X multiplier to damage taken on the head collider. 0.2 = 20%", new AcceptableValueRange(0.05f, 1f), new ConfigurationManagerAttributes() { Order = 4 })); - - ArmpitDamageMultiplier = Config.Bind("Gameplay", "Armpit Damage Multiplier", 1f, - new ConfigDescription("X multiplier to damage taken on the armpits collider. 0.2 = 20%", new AcceptableValueRange(0.05f, 1f), new ConfigurationManagerAttributes() { Order = 3 })); - - StomachDamageMultiplier = Config.Bind("Gameplay", "Stomach Damage Multiplier", 1f, - new ConfigDescription("X multiplier to damage taken on the stomach collider. 0.2 = 20%", new AcceptableValueRange(0.05f, 1f), new ConfigurationManagerAttributes() { Order = 2 })); - DisableBotMetabolism = Config.Bind("Gameplay", "Disable Bot Metabolism", false, new ConfigDescription("Disables metabolism on bots, preventing them from dying from loss of energy/hydration during long raids.", tags: new ConfigurationManagerAttributes() { Order = 1 })); }