Updated for release

Vek17 · Sep 2, 2021 · d97b78b · d97b78b
1 parent 73f970c
commit d97b78b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/Repository.json b/Repository.json
@@ -2,7 +2,7 @@
     "Releases": [
         {
             "Id": "TabletopTweaks",
-            "Version": "0.5.0"
+            "Version": "1.0.0"
         }
     ]
 }
diff --git a/TabletopTweaks/Bugfixes/UI/OvertipFixes.cs b/TabletopTweaks/Bugfixes/UI/OvertipFixes.cs
@@ -41,7 +41,7 @@ private static int FindInsertionTarget(List<CodeInstruction> codes) {
             }
         }
 
-        [HarmonyPatch(typeof(OvertipsVM), "HandleDamageDealt", new[] { typeof(RuleDealDamage) })]
+        //[HarmonyPatch(typeof(OvertipsVM), "HandleDamageDealt", new[] { typeof(RuleDealDamage) })]
         static class DisplayFix_OvertipsVM_AttackRollHit_Patch {
             static readonly MethodInfo RuleAttackRoll_Roll = AccessTools.PropertyGetter(typeof(RuleAttackRoll), "Roll");
             static readonly MethodInfo RuleAttackRoll_D20 = AccessTools.PropertyGetter(typeof(RuleAttackRoll), "D20");
@@ -69,7 +69,7 @@ private static int FindInsertionTarget(List<CodeInstruction> codes) {
             }
         }
 
-        [HarmonyPatch(typeof(OvertipsVM), "HandleAttackHitRoll", new[] { typeof(RuleAttackRoll) })]
+        //[HarmonyPatch(typeof(OvertipsVM), "HandleAttackHitRoll", new[] { typeof(RuleAttackRoll) })]
         static class DisplayFix_OvertipsVM_AttackRollMiss_Patch {
             static readonly MethodInfo RuleAttackRoll_Roll = AccessTools.PropertyGetter(typeof(RuleAttackRoll), "Roll");
             static readonly MethodInfo RuleAttackRoll_D20 = AccessTools.PropertyGetter(typeof(RuleAttackRoll), "D20");

diff --git a/TabletopTweaks/Info.json b/TabletopTweaks/Info.json
@@ -3,11 +3,11 @@
     "Author": "Sean Petrie",
     "DisplayName": "Tabletop Tweaks",
     "EntryMethod": "TabletopTweaks.Main.Load",
-    "GameVersion": "0.8.0",
+    "GameVersion": "1.0.0",
     "HomePage": "https://github.com/Vek17/WrathMods-TabletopTweaks/releases",
     "Id": "TabletopTweaks",
     "ManagerVersion": "0.23.0",
     "Repository": "https://raw.githubusercontent.com/Vek17/WrathMods-TabletopTweaks/master/Repository.json",
     "Requirements": [],
-    "Version": "0.5.0"
+    "Version": "1.0.0"
 }
diff --git a/TabletopTweaks/MechanicsChanges/MetamagicDamage.cs b/TabletopTweaks/MechanicsChanges/MetamagicDamage.cs
@@ -71,7 +71,7 @@ static void Postfix(RuleCalculateDamage __instance, ref DamageValue __result, Ba
                 }
                 num3 = Math.Max(1f, num3);
                 float num6 = num3 * (1f + (float)damage.BonusPercent / 100f) * damage.Vulnerability * damage.Durability * __instance.TacticalCombatFactor;
-                float num7 = __instance.ParentRule.Modifier ?? 1f;
+                float num7 = __instance.ParentRule.ModifierBonus ?? 1f;
                 int num8 = Math.Max(1, (int)Math.Floor((double)(num6 * num7)));
                 num8 = __instance.TryApplyShadowDamageFactor(__instance.Target, num8);
                 num8 = (damage.Immune ? 0 : num8);

diff --git a/TabletopTweaks/NewComponents/OutcomingAdditionalDamageAndHealingModifier.cs b/TabletopTweaks/NewComponents/OutcomingAdditionalDamageAndHealingModifier.cs
@@ -19,7 +19,7 @@ public void OnEventAboutToTrigger(RuleDealDamage evt) {
             if (Type == OutcomingAdditionalDamageAndHealingModifier.ModifyingType.OnlyHeal) {
                 return;
             }
-            evt.Modifier = new float?((ModifierPercents.Calculate(base.Fact.MaybeContext) / 100f) + (evt.Modifier ?? 1));
+            evt.ModifierBonus = new float?((ModifierPercents.Calculate(base.Fact.MaybeContext) / 100f) + (evt.ModifierBonus ?? 1));
         }
 
         public void OnEventDidTrigger(RuleDealDamage evt) {
@@ -29,7 +29,7 @@ public void OnEventAboutToTrigger(RuleHealDamage evt) {
             if (Type == OutcomingAdditionalDamageAndHealingModifier.ModifyingType.OnlyDamage) {
                 return;
             }
-            evt.Modifier = new float?((ModifierPercents.Calculate(base.Fact.MaybeContext) / 100f) + (evt.Modifier ?? 1));
+            evt.ModifierBonus = new float?((ModifierPercents.Calculate(base.Fact.MaybeContext) / 100f) + (evt.ModifierBonus ?? 1));
         }
 
         public void OnEventDidTrigger(RuleHealDamage evt) {

diff --git a/TabletopTweaks/TabletopTweaks.csproj b/TabletopTweaks/TabletopTweaks.csproj
@@ -39,7 +39,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
-    <WrathInstallDir Condition=" '$(WrathInstallDir)' == '' ">C:\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo</WrathInstallDir>
+    <WrathInstallDir Condition=" '$(WrathInstallDir)' == '' ">C:\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure</WrathInstallDir>
   </PropertyGroup>
   <Target Name="RemoveLib" BeforeTargets="Clean" Condition="Exists('$(SolutionDir)lib')">
     <RemoveDir Directories="$(SolutionDir)lib" />
@@ -57,15 +57,15 @@
   </Target>
   <ItemGroup>
     <Reference Include="0Harmony">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityModManager\0Harmony.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityModManager\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>$(SolutionDir)lib\Assembly-CSharp_public.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
@@ -75,11 +75,11 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Owlcat.Runtime.Core">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\Owlcat.Runtime.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\Owlcat.Runtime.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Owlcat.Runtime.UI">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\Owlcat.Runtime.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\Owlcat.Runtime.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -95,32 +95,32 @@
     </Reference>
     <Reference Include="UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.ImageConversionModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityEngine.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityModManager">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Wrath_Data\Managed\UnityModManager\UnityModManager.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Wrath_Data\Managed\UnityModManager\UnityModManager.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -340,6 +340,6 @@
     <Error Condition="!Exists('..\packages\Aze.Publicise.MSBuild.Task.1.0.0\build\Aze.Publicise.MSBuild.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Aze.Publicise.MSBuild.Task.1.0.0\build\Aze.Publicise.MSBuild.Task.props'))" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>(robocopy "$(TargetDir) " "C:\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure Demo\Mods\TabletopTweaks\ " /s /e )^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
+    <PostBuildEvent>(robocopy "$(TargetDir) " "C:\Program Files (x86)\Steam\steamapps\common\Pathfinder Second Adventure\Mods\TabletopTweaks\ " /s /e )^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
   </PropertyGroup>
 </Project>