Switched from using Harmony to inturrupt getting the data, to modifying the item stats directly.

SHould now work with Terror from the Void

Author: Duodecimus

FreeAmmoAndGrenades/FreeAmmoAndGrenades.csproj

@@ -53,11 +53,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FreeAmmoandGrenadesGeoscape.cs" />
     <Compile Include="FreeAmmoandGrenadesConfig.cs" />
     <Compile Include="FreeAmmoandGrenadesMain.cs" />
+    <Compile Include="FreeAmmoAndGrenadesDefs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Patches\ItemDef.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="meta.json">
@@ -67,6 +66,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Patches\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>RMDIR /S /Q "%25USERPROFILE%25\AppData\LocalLow\Snapshot Games Inc\Phoenix Point\Steam\WorkshopTool\TestMod"

FreeAmmoAndGrenades/FreeAmmoAndGrenadesDefs.cs

@@ -0,0 +1,52 @@
+using Base.Core;
+using Base.Defs;
+using PhoenixPoint.Common.Core;
+using PhoenixPoint.Common.Entities.GameTags;
+using PhoenixPoint.Common.Entities.Items;
+
+using FreeAmmoAndGrenades;
+public class FreeAmmoAndGrenadesDefs
+{
+    internal static readonly DefRepository Repo = GameUtl.GameComponent<DefRepository>();
+    public static void Change_AmmoAndGrenades(ModMain Main)
+    {
+        // defining variables
+        SharedData shared = GameUtl.GameComponent<SharedData>();
+        GameTagDef GrenadeTag = (GameTagDef)Repo.GetDef("318dd3ff-28f0-1bb4-98bc-39164b7292b6"); // GrenadeItem_TagDef
+        GameTagDef AmmoTag = shared.SharedGameTags.AmmoTag;
+        // loop over all item defs in the repo
+        int Count = 0;
+        Main.Logger.LogInfo($"Free Ammo and Grenades: Beginning updating items");
+        foreach (ItemDef ItemDef in Repo.GetAllDefs<ItemDef>())
+        {
+            // All hand thrown grenades (only these weapon defs ends with "Grenade_WeaponDef" <- checked by tag)
+            if (ItemDef.Tags.Contains(GrenadeTag) && Main.Config.GrenadesAreFree) 
+            {
+                //Main.Logger.LogInfo(System.String.Concat($"Applying Grenade Discount to: ", ItemDef.name));
+                Count++;
+                ItemDef.ManufactureMaterials = 0;
+                ItemDef.ManufactureTech = 0;
+                ItemDef.ManufactureMutagen = 0;
+                ItemDef.ManufactureLivingCrystals = 0;
+                ItemDef.ManufactureOricalcum = 0;
+                ItemDef.ManufactureProteanMutane = 0;
+            }
+            else if (ItemDef.Tags.Contains(AmmoTag) && Main.Config.AmmoIsFree)
+            {
+                //Main.Logger.LogInfo(System.String.Concat($"Applying Ammo Discount to: ", ItemDef.name));
+                Count++;
+                ItemDef.ManufactureMaterials = 0;
+                ItemDef.ManufactureTech = 0;
+                ItemDef.ManufactureMutagen = 0;
+                ItemDef.ManufactureLivingCrystals = 0;
+                ItemDef.ManufactureOricalcum = 0;
+                ItemDef.ManufactureProteanMutane = 0;
+            }
+            //else
+            //{
+            //Main.Logger.LogInfo(System.String.Concat($"Skipping item: ", ItemDef.name));
+            //}
+        }
+        Main.Logger.LogInfo(System.String.Format("Free Ammo and Grenades: Finished updating {0} items", Count));
+    }
+}

FreeAmmoAndGrenades/FreeAmmoandGrenadesConfig.cs

@@ -4,10 +4,10 @@ namespace FreeAmmoAndGrenades
 {
     public class Configuration : ModConfig
     {
-        [ConfigField(description: "Ammo is free to manufacture, and provides no scrap.")]
-		public bool AmmoIsFree = false;
+		[ConfigField(text: "Ammo is free to manufacture, and provides no scrap", description: "Please be sure to restart the game after changing these settings, to reload the mod")]
+		public bool AmmoIsFree = true;
 
-		[ConfigField(description: "Grenades are free to manufacture and provide no scrap.")]
-		public bool GrenadesAreFree = false;
+		[ConfigField(text: "Grenades are free to manufacture and provide no scrap", description: "Please be sure to restart the game after changing these settings, to reload the mod")]
+		public bool GrenadesAreFree = true;
 	}
-}
+}

FreeAmmoAndGrenades/FreeAmmoandGrenadesGeoscape.cs

@@ -1,6 +1,6 @@
 using HarmonyLib;
-using PhoenixPoint.Modding;
 
+using System;
 namespace FreeAmmoAndGrenades
 {
 	/// <summary>
@@ -9,25 +9,34 @@ namespace FreeAmmoAndGrenades
 	/// </summary>
 	public class ModMain : PhoenixPoint.Modding.ModMain
     {
-		public override bool CanSafelyDisable => true;
-
+		public override bool CanSafelyDisable => false;
+		
 		public static ModMain Main { get; private set; }
 
 		public new Configuration Config => (Configuration)base.Config;
 
 		public new Harmony HarmonyInstance => (Harmony)base.HarmonyInstance;
 
-		public new Geoscape GeoscapeMod => (Geoscape)base.GeoscapeMod;
-
-		public override void OnModEnabled() {
-
-			Main = this;
-			HarmonyInstance.PatchAll(GetType().Assembly);
+		//public new Geoscape GeoscapeMod => (Geoscape)base.GeoscapeMod;
+
+		public override void OnModEnabled()
+		{
+			try
+			{
+				Main = this;
+				FreeAmmoAndGrenadesDefs.Change_AmmoAndGrenades(Main);
+				HarmonyInstance.PatchAll();
+			}
+			catch (Exception e)
+			{
+				Main.Logger.LogInfo(e.Message);
+			}
 		}
 
-		public override void OnModDisabled() {
-			HarmonyInstance.UnpatchAll(HarmonyInstance.Id);
+		public override void OnModDisabled()
+		{
+			HarmonyInstance.UnpatchAll();
 			Main = null;
 		}
-	}
-}
+    }
+}