1.6.0: Try to make workers behave better; update CVL to 2.1.0 to prep…

…are for upcoming changes
jpw1991 · Jul 14, 2023 · f8216ca · f8216ca
1 parent 15953bc
commit f8216ca
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 12 deletions.
diff --git a/ChebsMercenaries/BasePlugin.cs b/ChebsMercenaries/BasePlugin.cs
@@ -24,11 +24,11 @@ public class BasePlugin : BaseUnityPlugin
     {
         public const string PluginGuid = "com.chebgonaz.chebsmercenaries";
         public const string PluginName = "ChebsMercenaries";
-        public const string PluginVersion = "1.5.1";
+        public const string PluginVersion = "1.6.0";
         private const string ConfigFileName = PluginGuid + ".cfg";
         private static readonly string ConfigFileFullPath = Path.Combine(Paths.ConfigPath, ConfigFileName);
 
-        public readonly System.Version ChebsValheimLibraryVersion = new("2.0.0");
+        public readonly System.Version ChebsValheimLibraryVersion = new("2.1.0");
 
         private readonly Harmony harmony = new(PluginGuid);
 

diff --git a/ChebsMercenaries/Minions/HumanMinerMinion.cs b/ChebsMercenaries/Minions/HumanMinerMinion.cs
@@ -50,8 +50,10 @@ public static void SyncInternalsWithConfigs()
             MinerAI.RockInternalIDsList = RockInternalIDsList.Value;
         }
 
-        public void Awake()
+        public override void Awake()
         {
+            base.Awake();
+
             canBeCommanded = false;
 
             if (!TryGetComponent(out MinerAI _)) gameObject.AddComponent<MinerAI>();

diff --git a/ChebsMercenaries/Minions/HumanMinion.cs b/ChebsMercenaries/Minions/HumanMinion.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Permissions;
 using BepInEx.Configuration;
 using ChebsMercenaries.Structure;
 using ChebsValheimLibrary.Common;
@@ -121,12 +122,14 @@ public enum MercenaryType
             { MercenaryType.Miner, "ChebGonaz_HumanMinerFemale" },
             { MercenaryType.Woodcutter, "ChebGonaz_HumanWoodcutterFemale" },
         };
-
-        private void Awake()
+        
+        public override void Awake()
         {
+            base.Awake();
+
             _hairs ??= ObjectDB.instance.GetAllItems(ItemDrop.ItemData.ItemType.Customization, "Hair");
             _beards ??= ObjectDB.instance.GetAllItems(ItemDrop.ItemData.ItemType.Customization, "Beard");
-
+        
             StartCoroutine(WaitForZNet());
         }
 

diff --git a/ChebsMercenaries/Minions/HumanWoodcutterMinion.cs b/ChebsMercenaries/Minions/HumanWoodcutterMinion.cs
@@ -41,8 +41,9 @@ public static void SyncInternalsWithConfigs()
             WoodcutterAI.RoamRange = RoamRange.Value;
         }
 
-        public void Awake()
+        public override void Awake()
         {
+            base.Awake();
             canBeCommanded = false;
 
             if (!TryGetComponent(out WoodcutterAI _)) gameObject.AddComponent<WoodcutterAI>();

diff --git a/ChebsMercenaries/Package/README.md b/ChebsMercenaries/Package/README.md
@@ -137,6 +137,7 @@ You can find the github [here](https://github.com/jpw1991/chebs-mercenaries).
 
  Date | Version | Notes 
 --- | --- | ---
+13/07/2023 | 1.6.0 | Try to make workers behave better; update CVL to 2.1.0 to prepare for upcoming changes
 17/06/2023 | 1.5.1 | Fix roam distance not working; fix missing localizations
 12/06/2023 | 1.5.0 | Update for new Valheim version; mercs should now swim
 31/05/2023 | 1.3.3 | Add weapons of command

diff --git a/ChebsMercenaries/Package/manifest.json b/ChebsMercenaries/Package/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "ChebsMercenaries",
   "description": "Cheb's Mercenaries adds mercenaries to Valheim that you can purchase with gold and upgrade with materials to fight (warriors, archers) or perform work (lumberjacks, miners).",
-  "version_number": "1.5.1",
+  "version_number": "1.6.0",
   "website_url": "https://github.com/jpw1991/chebs-mercenaries",
   "dependencies": [
     "ValheimModding-Jotunn-2.11.0"

diff --git a/ChebsMercenaries/Properties/AssemblyInfo.cs b/ChebsMercenaries/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/README.md b/README.md
@@ -137,6 +137,7 @@ You can find the github [here](https://github.com/jpw1991/chebs-mercenaries).
 
  Date | Version | Notes 
 --- | --- | ---
+13/07/2023 | 1.6.0 | Try to make workers behave better; update CVL to 2.1.0 to prepare for upcoming changes
 17/06/2023 | 1.5.1 | Fix roam distance not working; fix missing localizations
 12/06/2023 | 1.5.0 | Update for new Valheim version; mercs should now swim
 31/05/2023 | 1.3.3 | Add weapons of command

diff --git a/publish_debug.sh b/publish_debug.sh
@@ -2,7 +2,7 @@
 
 DEBUGDIR=ChebsMercenaries/bin/Debug
 DLL=$DEBUGDIR/ChebsMercenaries.dll
-LIB=$DEBUGDIR/ChebsValheimLibrary.dll
+LIB=../chebs-valheim-library/ChebsValheimLibrary/bin/Release/ChebsValheimLibrary.dll
 BUN=../chebs-necromancy/ChebsNecromancyUnity/Assets/AssetBundles/chebgonaz
 PLUGINS=/home/joshua/.local/share/Steam/steamapps/common/Valheim/BepInEx/plugins
 BEPINEX=ChebsMercenaries/libs/BepInEx.dll

diff --git a/publish_release.sh b/publish_release.sh
@@ -2,7 +2,7 @@
 
 RELEASEDIR=ChebsMercenaries/bin/Release
 DLL=$RELEASEDIR/ChebsMercenaries.dll
-LIB=$RELEASEDIR/ChebsValheimLibrary.dll
+LIB=../chebs-valheim-library/ChebsValheimLibrary/bin/Release/ChebsValheimLibrary.dll
 BUN=../chebs-necromancy/ChebsNecromancyUnity/Assets/AssetBundles/chebgonaz
 PLUGINS=ChebsMercenaries/Package/plugins
 README=README.md