Merge pull request #50 from jpw1991/45-pvp-siege-minions-eg-battering…

…-ram-siege-troll implement catapult minion
jpw1991 · Jun 10, 2024 · 7a0254e · 7a0254e
2 parents db0eece + 0d310dd
commit 7a0254e
Show file tree

Hide file tree

Showing 27 changed files with 239 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -376,3 +376,4 @@ Environment.props
 
 /ChebsMercenaries/libs/
 *.backup
+SitInChair.*
diff --git a/ChebsMercenaries/BasePlugin.cs b/ChebsMercenaries/BasePlugin.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections;
 using System.Security.Cryptography;
 using BepInEx;
 using BepInEx.Configuration;
@@ -72,6 +68,8 @@ public class BasePlugin : BaseUnityPlugin
             "ChebGonaz_HumanWarriorTier2Female.prefab",
             "ChebGonaz_HumanWarriorTier3Female.prefab",
             "ChebGonaz_HumanWarriorTier4Female.prefab",
+
+            "ChebGonaz_Catapult.prefab",
         };
 
         #region ConfigStuff
@@ -124,6 +122,8 @@ private void CreateConfigValues()
             HeavyLogging = Config.Bind("General (Client)", "HeavyLogging",
                 false, new ConfigDescription("Turn this on for debugging. Lots of things will get logged."));
 
+            MercenaryMinion.CreateConfigs(this);
+
             HumanMinion.CreateConfigs(this);
             HumanWoodcutterMinion.CreateConfigs(this);
             HumanMinerMinion.CreateConfigs(this);
@@ -135,6 +135,8 @@ private void CreateConfigValues()
             MercenaryWarriorTier2Minion.CreateConfigs(this);
             MercenaryWarriorTier3Minion.CreateConfigs(this);
             MercenaryWarriorTier4Minion.CreateConfigs(this);
+
+            CatapultMinion.CreateConfigs(this);
 
             MercenaryChest.CreateConfigs(this);
 
@@ -296,6 +298,11 @@ private void LoadChebGonazAssetBundle()
                             if (HeavyLogging.Value) Jotunn.Logger.LogInfo($"Adding MercenaryArcherTier3Minion component to {prefabName}.");
                             prefab.AddComponent<MercenaryArcherTier3Minion>();
                             break;
+                        
+                        case "ChebGonaz_Catapult.prefab":
+                            if (HeavyLogging.Value) Jotunn.Logger.LogInfo($"Adding CatapultMinion component to {prefabName}.");
+                            prefab.AddComponent<CatapultMinion>();
+                            break;
 
                         default:
                             if (HeavyLogging.Value) Jotunn.Logger.LogInfo($"Adding HumanMinion component to {prefabName}.");

diff --git a/ChebsMercenaries/Commands/PvP/PvPAddFriend.cs b/ChebsMercenaries/Commands/PvP/PvPAddFriend.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using ChebsValheimLibrary.PvP;
+using ChebsValheimLibrary.PvP;
 using Jotunn.Entities;
 
 namespace ChebsMercenaries.Commands.PvP

diff --git a/ChebsMercenaries/Commands/PvP/PvPListFriends.cs b/ChebsMercenaries/Commands/PvP/PvPListFriends.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using ChebsValheimLibrary.PvP;
+using ChebsValheimLibrary.PvP;
 using Jotunn.Entities;
 
 namespace ChebsMercenaries.Commands.PvP

diff --git a/ChebsMercenaries/Commands/PvP/PvPRemoveFriend.cs b/ChebsMercenaries/Commands/PvP/PvPRemoveFriend.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using ChebsValheimLibrary.PvP;
+using ChebsValheimLibrary.PvP;
 using Jotunn.Entities;
 
 namespace ChebsMercenaries.Commands.PvP

diff --git a/ChebsMercenaries/Items/WeaponOfCommand.cs b/ChebsMercenaries/Items/WeaponOfCommand.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using BepInEx;
+using BepInEx;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Items;
 using ChebsValheimLibrary.Minions;

diff --git a/ChebsMercenaries/Minions/CatapultMinion.cs b/ChebsMercenaries/Minions/CatapultMinion.cs
@@ -0,0 +1,50 @@
+using BepInEx.Configuration;
+using ChebsValheimLibrary.Common;
+using Jotunn;
+
+namespace ChebsMercenaries.Minions
+{
+    internal class CatapultMinion : MercenaryMinion
+    {
+        public new static ConfigEntry<float> Health;
+        public static MemoryConfigEntry<string, List<string>> ItemsCost;
+
+        public new static void CreateConfigs(BasePlugin plugin)
+        {
+            const string serverSynced = "CatapultMinion (Server Synced)";
+
+            var itemsCost = plugin.ModConfig(serverSynced, "ItemsCost", "Wood:25,RoundLog:5,Bronze:1",
+                "The items that are consumed when creating a minion. Please use a comma-delimited list of prefab names with a : and integer for amount. Alternative items can be specified with a | eg. Wood|Coal:5 to mean wood and/or coal.",
+                null, true);
+            ItemsCost = new MemoryConfigEntry<string, List<string>>(itemsCost, s => s?.Split(',').Select(str => str.Trim()).ToList());
+            Health = plugin.Config.Bind(serverSynced, "Health",
+                250f, new ConfigDescription("How much health the mercenary has.", null,
+                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
+        }
+
+        public sealed override void Awake()
+        {
+            base.Awake();
+
+            AfterAwake();
+        }
+
+        public virtual void AfterAwake()
+        {
+            ConfigureHealth();
+        }
+
+        protected virtual void ConfigureHealth()
+        {
+            if (TryGetComponent(out Humanoid humanoid))
+            {
+                humanoid.SetMaxHealth(Health.Value);
+                humanoid.SetHealth(Health.Value);
+            }
+            else
+            {
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+            }
+        }
+    }
+}
diff --git a/ChebsMercenaries/Minions/HumanMinerMinion.cs b/ChebsMercenaries/Minions/HumanMinerMinion.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsMercenaries.Minions.WorkerAI;
 using ChebsValheimLibrary.Common;

diff --git a/ChebsMercenaries/Minions/HumanMinion.cs b/ChebsMercenaries/Minions/HumanMinion.cs
@@ -1,6 +1,4 @@
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsMercenaries.Structure;
 using ChebsValheimLibrary.Common;
@@ -11,49 +9,17 @@
 
 namespace ChebsMercenaries.Minions
 {
-    public class HumanMinion : ChebGonazMinion
+    public class HumanMinion : MercenaryMinion
     {
-        public static ConfigEntry<DropType> DropOnDeath;
-        public static ConfigEntry<bool> PackDropItemsIntoCargoCrate;
-        public static ConfigEntry<bool> Commandable;
-        public static ConfigEntry<float> FollowDistance, RunDistance, RoamRange;
         public static ConfigEntry<float> ChanceOfFemale;
         public static MemoryConfigEntry<string, List<Vector3>> HairColors, SkinColors;
-
-        public static ConfigEntry<float> Health;
 
         private static List<ItemDrop> _hairs, _beards;
 
-        public static void CreateConfigs(BasePlugin plugin)
+        public new static void CreateConfigs(BasePlugin plugin)
         {
             const string serverSync = "HumanMinion (Server Synced)";
             const string client = "HumanMinion (Client)";
-            DropOnDeath = plugin.Config.Bind(serverSync,
-                "DropOnDeath",
-                DropType.JustResources, new ConfigDescription("Whether a minion refunds anything when it dies.", null,
-                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
-
-            PackDropItemsIntoCargoCrate = plugin.Config.Bind(serverSync,
-                "PackDroppedItemsIntoCargoCrate",
-                true, new ConfigDescription(
-                    "If set to true, dropped items will be packed into a cargo crate. This means they won't sink in water, which is useful for more valuable drops like Surtling Cores and metal ingots.",
-                    null,
-                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
-
-            Commandable = plugin.Config.Bind(client, "Commandable",
-                true,
-                new ConfigDescription(
-                    "If true, minions can be commanded individually with E (or equivalent) keybind."));
-
-            FollowDistance = plugin.Config.Bind(client, "FollowDistance",
-                3f,
-                new ConfigDescription(
-                    "How closely a minion will follow you (0 = standing on top of you, 3 = default)."));
-
-            RunDistance = plugin.Config.Bind(client, "RunDistance",
-                3f,
-                new ConfigDescription(
-                    "How close a following minion needs to be to you before it stops running and starts walking (0 = always running, 10 = default)."));
 
             ChanceOfFemale = plugin.ModConfig(serverSync, "ChanceOfFemale", 0.5f,
                 "Chance of a mercenary spawning being female. 0 = 0%, 1 = 100% (Default = 0.5 = 50%)",
@@ -80,13 +46,6 @@ public static void CreateConfigs(BasePlugin plugin)
                         : Vector3.zero).ToList();
                 return cols;
             });
-
-            RoamRange = plugin.Config.Bind(client, "RoamRange",
-                10f, new ConfigDescription("How far a unit is allowed to roam from its current position."));
-
-            Health = plugin.Config.Bind(serverSync, "Health",
-                50f, new ConfigDescription("How much health the mercenary has (default fallback value).", null,
-                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
         }
 
         public enum MercenaryType

diff --git a/ChebsMercenaries/Minions/HumanWoodcutterMinion.cs b/ChebsMercenaries/Minions/HumanWoodcutterMinion.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsMercenaries.Minions.WorkerAI;
 using ChebsValheimLibrary.Common;

diff --git a/ChebsMercenaries/Minions/MercenaryArcherTier1Minion.cs b/ChebsMercenaries/Minions/MercenaryArcherTier1Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }

diff --git a/ChebsMercenaries/Minions/MercenaryArcherTier2Minion.cs b/ChebsMercenaries/Minions/MercenaryArcherTier2Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }

diff --git a/ChebsMercenaries/Minions/MercenaryArcherTier3Minion.cs b/ChebsMercenaries/Minions/MercenaryArcherTier3Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }

diff --git a/ChebsMercenaries/Minions/MercenaryMinion.cs b/ChebsMercenaries/Minions/MercenaryMinion.cs
@@ -0,0 +1,54 @@
+using BepInEx.Configuration;
+using ChebsValheimLibrary.Minions;
+
+namespace ChebsMercenaries.Minions
+{
+    public class MercenaryMinion : ChebGonazMinion
+    {
+        public static ConfigEntry<DropType> DropOnDeath;
+        public static ConfigEntry<bool> PackDropItemsIntoCargoCrate;
+        public static ConfigEntry<bool> Commandable;
+        public static ConfigEntry<float> FollowDistance, RunDistance, RoamRange;
+
+        public static ConfigEntry<float> Health;
+
+        public static void CreateConfigs(BasePlugin plugin)
+        {
+            const string serverSync = "MercenaryMinion (Server Synced)";
+            const string client = "MercenaryMinion (Client)";
+            DropOnDeath = plugin.Config.Bind(serverSync,
+                "DropOnDeath",
+                DropType.JustResources, new ConfigDescription("Whether a minion refunds anything when it dies.", null,
+                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
+
+            PackDropItemsIntoCargoCrate = plugin.Config.Bind(serverSync,
+                "PackDroppedItemsIntoCargoCrate",
+                true, new ConfigDescription(
+                    "If set to true, dropped items will be packed into a cargo crate. This means they won't sink in water, which is useful for more valuable drops like Surtling Cores and metal ingots.",
+                    null,
+                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
+
+            Commandable = plugin.Config.Bind(client, "Commandable",
+                true,
+                new ConfigDescription(
+                    "If true, minions can be commanded individually with E (or equivalent) keybind."));
+
+            FollowDistance = plugin.Config.Bind(client, "FollowDistance",
+                3f,
+                new ConfigDescription(
+                    "How closely a minion will follow you (0 = standing on top of you, 3 = default)."));
+
+            RunDistance = plugin.Config.Bind(client, "RunDistance",
+                3f,
+                new ConfigDescription(
+                    "How close a following minion needs to be to you before it stops running and starts walking (0 = always running, 10 = default)."));
+
+            RoamRange = plugin.Config.Bind(client, "RoamRange",
+                10f, new ConfigDescription("How far a unit is allowed to roam from its current position."));
+
+            Health = plugin.Config.Bind(serverSync, "Health",
+                50f, new ConfigDescription("How much health the mercenary has (default fallback value).", null,
+                    new ConfigurationManagerAttributes { IsAdminOnly = true }));
+        }
+    }
+}
diff --git a/ChebsMercenaries/Minions/MercenaryWarriorTier1Minion.cs b/ChebsMercenaries/Minions/MercenaryWarriorTier1Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }

diff --git a/ChebsMercenaries/Minions/MercenaryWarriorTier2Minion.cs b/ChebsMercenaries/Minions/MercenaryWarriorTier2Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }

diff --git a/ChebsMercenaries/Minions/MercenaryWarriorTier3Minion.cs b/ChebsMercenaries/Minions/MercenaryWarriorTier3Minion.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using BepInEx.Configuration;
 using ChebsValheimLibrary.Common;
+using Jotunn;
 
 namespace ChebsMercenaries.Minions
 {
@@ -37,7 +36,7 @@ protected override void ConfigureHealth()
             }
             else
             {
-                Jotunn.Logger.LogError("Error: Failed to get Humanoid component to set health value.");
+                Logger.LogError("Error: Failed to get Humanoid component to set health value.");
             }
         }
     }