From cf98101200a25e42f3ef65346a98e9ead031c0c1 Mon Sep 17 00:00:00 2001 From: Joshua Paul Woods Date: Wed, 23 Aug 2023 09:13:13 +1000 Subject: [PATCH] 2.1.0: update for new valheim version --- ChebsMercenaries/BasePlugin.cs | 2 +- ChebsMercenaries/Package/README.md | 1 + ChebsMercenaries/Package/manifest.json | 2 +- ChebsMercenaries/Patches/VisEquipmentPatches.cs | 4 ++-- ChebsMercenaries/Properties/AssemblyInfo.cs | 4 ++-- README.md | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChebsMercenaries/BasePlugin.cs b/ChebsMercenaries/BasePlugin.cs index 4b3dde4..4a04afd 100644 --- a/ChebsMercenaries/BasePlugin.cs +++ b/ChebsMercenaries/BasePlugin.cs @@ -24,7 +24,7 @@ public class BasePlugin : BaseUnityPlugin { public const string PluginGuid = "com.chebgonaz.chebsmercenaries"; public const string PluginName = "ChebsMercenaries"; - public const string PluginVersion = "2.0.0"; + public const string PluginVersion = "2.1.0"; private const string ConfigFileName = PluginGuid + ".cfg"; private static readonly string ConfigFileFullPath = Path.Combine(Paths.ConfigPath, ConfigFileName); diff --git a/ChebsMercenaries/Package/README.md b/ChebsMercenaries/Package/README.md index 536cd30..d757c30 100644 --- a/ChebsMercenaries/Package/README.md +++ b/ChebsMercenaries/Package/README.md @@ -138,6 +138,7 @@ You can find the github [here](https://github.com/jpw1991/chebs-mercenaries). Date | Version | Notes --- | --- | --- +23/08/2023 | 2.1.0 | update for new valheim patch 28/07/2023 | 2.0.0 | Workers should behave more realistically with gradual destruction of rocks, trees, etc. 23/07/2023 | 1.7.0 | Add Russian translation & open untranslated parts of the mod up to future translation; update CVL to 2.1.2; permit tweaks of mercenary health in configs; fix diverse bugs eg. female workers not spawning with their AI attached 13/07/2023 | 1.6.0 | Try to make workers behave better; update CVL to 2.1.0 to prepare for upcoming changes diff --git a/ChebsMercenaries/Package/manifest.json b/ChebsMercenaries/Package/manifest.json index bd7d102..6c58e1d 100644 --- 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": "2.0.0", + "version_number": "2.1.0", "website_url": "https://github.com/jpw1991/chebs-mercenaries", "dependencies": [ "ValheimModding-Jotunn-2.11.0" diff --git a/ChebsMercenaries/Patches/VisEquipmentPatches.cs b/ChebsMercenaries/Patches/VisEquipmentPatches.cs index 4bd9202..65f9542 100644 --- a/ChebsMercenaries/Patches/VisEquipmentPatches.cs +++ b/ChebsMercenaries/Patches/VisEquipmentPatches.cs @@ -107,11 +107,11 @@ static void Postfix(VisEquipment __instance) var flag6 = __instance.SetHelmetEquipped(hash5, num) | flag5; var flag7 = __instance.SetShoulderEquipped(hash7, shoulderItemVariant) | flag6; var flag8 = __instance.SetUtilityEquipped(hash8) | flag7; - if (__instance.m_helmetHideBeard) + if (__instance.m_helmetHideBeard != ItemDrop.ItemData.HelmetHairType.Default) hash6 = 0; var flag9 = __instance.SetBeardEquipped(hash6) | flag8; var flag10 = __instance.SetBackEquipped(leftItem, rightItem, leftBackItemVariant) | flag9; - if (__instance.m_helmetHideHair) + if (__instance.m_helmetHideHair != ItemDrop.ItemData.HelmetHairType.Default) num = 0; flag8 = __instance.SetHairEquipped(num) | flag10; diff --git a/ChebsMercenaries/Properties/AssemblyInfo.cs b/ChebsMercenaries/Properties/AssemblyInfo.cs index 4c5e661..6b2d65c 100644 --- 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("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] \ No newline at end of file diff --git a/README.md b/README.md index 536cd30..d757c30 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ You can find the github [here](https://github.com/jpw1991/chebs-mercenaries). Date | Version | Notes --- | --- | --- +23/08/2023 | 2.1.0 | update for new valheim patch 28/07/2023 | 2.0.0 | Workers should behave more realistically with gradual destruction of rocks, trees, etc. 23/07/2023 | 1.7.0 | Add Russian translation & open untranslated parts of the mod up to future translation; update CVL to 2.1.2; permit tweaks of mercenary health in configs; fix diverse bugs eg. female workers not spawning with their AI attached 13/07/2023 | 1.6.0 | Try to make workers behave better; update CVL to 2.1.0 to prepare for upcoming changes