1.1 Update

jecrell · Feb 27, 2020 · af1455d · af1455d
1 parent 621eabb
commit af1455d
Show file tree

Hide file tree

Showing 26 changed files with 2,584 additions and 67 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,9 @@
 <ModMetaData>
   <name>Star Wars - The Force</name>
   <author>Jecrell and Xen</author>
-  <targetVersion>1.0.2059</targetVersion>
+  <supportedVersons>
+  	<li>1.0</li>
+  </supportedVersions>
   <description>1.20.0.1 (10-22-2018)
 
 	Thanks to Jedi Master Ailan for his direction and inspiration in the creation of this mod. Without his help and support this would have never happened.

diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/0Harmony.xml b/Assemblies/0Harmony.xml
diff --git a/Assemblies/ProjectJedi.dll b/Assemblies/ProjectJedi.dll
diff --git a/Assemblies/_jecsToolsChecker.dll b/Assemblies/_jecsToolsChecker.dll
diff --git a/Languages/English/Keyed/PJ_English.xml b/Languages/English/Keyed/PJ_English.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
+
+<!-- =========== 4/4/19 ========== -->
+<PJ_SettingsForceXPDelay_Num>Force XP Gain Delay ({0}x) (Tip: Lower is faster XP Gain)</PJ_SettingsForceXPDelay_Num>
+
 <!-- =========== 5/13/17 ========== -->
 <PJ_UsingShieldBelt>The shield blocks your power.</PJ_UsingShieldBelt>
 <PJ_DrainedForcePool>{0} needs to recover their force powers.</PJ_DrainedForcePool>

diff --git a/Source/.vs/ProjectJedi/v15/.suo b/Source/.vs/ProjectJedi/v15/.suo
diff --git a/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide b/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide
diff --git a/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide-shm b/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide-shm
diff --git a/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide-wal b/Source/.vs/ProjectJedi/v15/Server/sqlite3/storage.ide-wal
diff --git a/Source/ProjectJedi.csproj b/Source/ProjectJedi.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ProjectJedi</RootNamespace>
     <AssemblyName>ProjectJedi</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -25,6 +25,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>
     </DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=1.0.9.1, Culture=neutral, processorArchitecture=MSIL">
@@ -77,8 +79,21 @@
       <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule">
+      <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ProjectJedi\ModInfo.cs" />
     <Compile Include="ProjectJedi\Buttons.cs" />
     <Compile Include="ProjectJedi\CompForceUser.cs" />
     <Compile Include="ProjectJedi\DamageWorker_ForceChoke.cs" />
@@ -104,6 +119,7 @@
     <Compile Include="ProjectJedi\ITab_Pawn_Force.cs" />
     <Compile Include="ProjectJedi\JobDriver_ForceMeditation.cs" />
     <Compile Include="ProjectJedi\JobGiver_ForceMeditation.cs" />
+    <Compile Include="ProjectJedi\ModMain.cs" />
     <Compile Include="ProjectJedi\Need_ForcePool.cs" />
     <Compile Include="ProjectJedi\PawnGhost.cs" />
     <Compile Include="ProjectJedi\Projectile_ForceStorm.cs" />

diff --git a/Source/ProjectJedi/CompForceUser.cs b/Source/ProjectJedi/CompForceUser.cs
@@ -256,7 +256,7 @@ public void ResetPowers()
 
         public void LevelUpPower(ForcePower power)
         {
-            foreach (AbilityDef def in power.abilityDefs)
+            foreach (AbilityUser.AbilityDef def in power.abilityDefs)
             {
                 this.RemovePawnAbility(def);
             }
@@ -442,7 +442,7 @@ public void LoseTrait(TraitSet traits, Trait trait)
             traits.allTraits.Remove(trait);
             if (this.AbilityUser.workSettings != null)
             {
-                this.AbilityUser.workSettings.Notify_GainedTrait();
+                this.AbilityUser.workSettings.EnableAndInitialize();
             }
 
             // this.AbilityUser.story.Notify_TraitChanged();

diff --git a/Source/ProjectJedi/ForceAbility.cs b/Source/ProjectJedi/ForceAbility.cs
@@ -30,7 +30,7 @@ public ForceAbility(AbilityData abilityData) : base(abilityData)
         }
 
 
-        public ForceAbility(Pawn user, AbilityDef pdef) : base(user, pdef)
+        public ForceAbility(Pawn user, AbilityUser.AbilityDef pdef) : base(user, pdef)
         {
 
         }

diff --git a/Source/ProjectJedi/ForceCardUtility.cs b/Source/ProjectJedi/ForceCardUtility.cs
@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -444,7 +444,7 @@ public static void PowersGUIHandler(Rect inRect, CompForceUser compForce, List<F
                         }), MessageTypeDefOf.RejectInput);
                         return;
                     }
-                    if (compForce.AbilityUser.story != null && (compForce.AbilityUser.story.WorkTagIsDisabled(WorkTags.Violent) && power.abilityDef.MainVerb.isViolent))
+                    if (compForce.AbilityUser.story != null && (compForce.AbilityUser.WorkTagIsDisabled(WorkTags.Violent) && power.abilityDef.MainVerb.isViolent))
                     {
                         Messages.Message("IsIncapableOfViolenceLower".Translate(new object[]
                         {

diff --git a/Source/ProjectJedi/ForceData.cs b/Source/ProjectJedi/ForceData.cs
@@ -74,11 +74,11 @@ public List<ForcePower> PowersDark
                 {
                     powersDark = new List<ForcePower>
                     {
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceRage_Apprentice, ProjectJediDefOf.PJ_ForceRage_Adept, ProjectJediDefOf.PJ_ForceRage_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceChoke_Apprentice, ProjectJediDefOf.PJ_ForceChoke_Adept, ProjectJediDefOf.PJ_ForceChoke_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceDrain_Apprentice, ProjectJediDefOf.PJ_ForceDrain_Adept, ProjectJediDefOf.PJ_ForceDrain_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceLightning_Apprentice, ProjectJediDefOf.PJ_ForceLightning_Adept, ProjectJediDefOf.PJ_ForceLightning_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceStorm_Apprentice, ProjectJediDefOf.PJ_ForceStorm_Adept, ProjectJediDefOf.PJ_ForceStorm_Master })
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceRage_Apprentice, ProjectJediDefOf.PJ_ForceRage_Adept, ProjectJediDefOf.PJ_ForceRage_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceChoke_Apprentice, ProjectJediDefOf.PJ_ForceChoke_Adept, ProjectJediDefOf.PJ_ForceChoke_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceDrain_Apprentice, ProjectJediDefOf.PJ_ForceDrain_Adept, ProjectJediDefOf.PJ_ForceDrain_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceLightning_Apprentice, ProjectJediDefOf.PJ_ForceLightning_Adept, ProjectJediDefOf.PJ_ForceLightning_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceStorm_Apprentice, ProjectJediDefOf.PJ_ForceStorm_Adept, ProjectJediDefOf.PJ_ForceStorm_Master })
                     };
                 }
                 return powersDark;
@@ -92,9 +92,9 @@ public List<ForcePower> PowersGray
                 {
                     powersGray = new List<ForcePower>
                     {
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForcePush_Apprentice, ProjectJediDefOf.PJ_ForcePush_Adept, ProjectJediDefOf.PJ_ForcePush_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForcePull_Apprentice, ProjectJediDefOf.PJ_ForcePull_Adept, ProjectJediDefOf.PJ_ForcePull_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceSpeed_Apprentice, ProjectJediDefOf.PJ_ForceSpeed_Adept, ProjectJediDefOf.PJ_ForceSpeed_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForcePush_Apprentice, ProjectJediDefOf.PJ_ForcePush_Adept, ProjectJediDefOf.PJ_ForcePush_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForcePull_Apprentice, ProjectJediDefOf.PJ_ForcePull_Adept, ProjectJediDefOf.PJ_ForcePull_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceSpeed_Apprentice, ProjectJediDefOf.PJ_ForceSpeed_Adept, ProjectJediDefOf.PJ_ForceSpeed_Master }),
                     };
                 }
                 return powersGray;
@@ -108,11 +108,11 @@ public List<ForcePower> PowersLight
                 {
                     powersLight = new List<ForcePower>
                     {
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceHealingSelf_Apprentice, ProjectJediDefOf.PJ_ForceHealingSelf_Adept, ProjectJediDefOf.PJ_ForceHealingSelf_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceHealingOther_Apprentice, ProjectJediDefOf.PJ_ForceHealingOther_Adept, ProjectJediDefOf.PJ_ForceHealingOther_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceDefense_Apprentice, ProjectJediDefOf.PJ_ForceDefense_Adept, ProjectJediDefOf.PJ_ForceDefense_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_MindTrick_Apprentice, ProjectJediDefOf.PJ_MindTrick_Adept, ProjectJediDefOf.PJ_MindTrick_Master }),
-                        new ForcePower(new List<AbilityDef> { ProjectJediDefOf.PJ_ForceGhost_Apprentice, ProjectJediDefOf.PJ_ForceGhost_Adept, ProjectJediDefOf.PJ_ForceGhost_Master })
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceHealingSelf_Apprentice, ProjectJediDefOf.PJ_ForceHealingSelf_Adept, ProjectJediDefOf.PJ_ForceHealingSelf_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceHealingOther_Apprentice, ProjectJediDefOf.PJ_ForceHealingOther_Adept, ProjectJediDefOf.PJ_ForceHealingOther_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceDefense_Apprentice, ProjectJediDefOf.PJ_ForceDefense_Adept, ProjectJediDefOf.PJ_ForceDefense_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_MindTrick_Apprentice, ProjectJediDefOf.PJ_MindTrick_Adept, ProjectJediDefOf.PJ_MindTrick_Master }),
+                        new ForcePower(new List<AbilityUser.AbilityDef> { ProjectJediDefOf.PJ_ForceGhost_Apprentice, ProjectJediDefOf.PJ_ForceGhost_Adept, ProjectJediDefOf.PJ_ForceGhost_Master })
                     };
                 }
                 return powersLight;

diff --git a/Source/ProjectJedi/HarmonyPatches.cs b/Source/ProjectJedi/HarmonyPatches.cs
@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ static class HarmonyPatches
     {
         static HarmonyPatches()
         {
-            HarmonyInstance harmony = HarmonyInstance.Create("rimworld.jecrell.jedi");
+            var harmony = new Harmony("rimworld.jecrell.jedi");
             harmony.Patch(AccessTools.Method(typeof(Thing), nameof(Thing.TakeDamage)),
                 new HarmonyMethod(typeof(HarmonyPatches), nameof(TakeDamage_PreFix)), null);
             harmony.Patch(AccessTools.Method(typeof(Verb_MeleeAttack), "GetNonMissChance"), null,
@@ -66,8 +66,8 @@ public static void Learn_PostFix(SkillRecord __instance, float xp, bool direct =
             if (xp > 0 && pawn?.TryGetComp<CompForceUser>() is CompForceUser compForce &&
                 Find.TickManager.TicksGame > compForce?.ForceData?.TicksUntilXPGain)
             {
-                int delay = 130;
-                if (__instance.def == SkillDefOf.Intellectual || __instance.def == SkillDefOf.Plants) delay += 50;
+                int delay = (int)(130 * ModInfo.forceXPDelayFactor);
+                if (__instance.def == SkillDefOf.Intellectual || __instance.def == SkillDefOf.Plants) delay += (int)(50 * ModInfo.forceXPDelayFactor);
                 compForce.ForceData.TicksUntilXPGain = Find.TickManager.TicksGame + delay;
                 compForce.ForceUserXP++;
             }

diff --git a/Source/ProjectJedi/HediffComp_Shield.cs b/Source/ProjectJedi/HediffComp_Shield.cs
@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using System;
 using System.Collections.Generic;

diff --git a/Source/ProjectJedi/ModInfo.cs b/Source/ProjectJedi/ModInfo.cs
@@ -0,0 +1,10 @@
+using Verse;
+
+namespace ProjectJedi
+{
+    [StaticConstructorOnStartup]
+    public static class ModInfo
+    {
+        public static float forceXPDelayFactor = 1;
+    }
+}
diff --git a/Source/ProjectJedi/ModMain.cs b/Source/ProjectJedi/ModMain.cs
@@ -0,0 +1,46 @@
+using UnityEngine;
+using Verse;
+
+namespace ProjectJedi
+{
+    public class ModMain : Mod
+    {
+        Settings settings;
+
+        public ModMain(ModContentPack content) : base(content)
+        {
+            this.settings = GetSettings<Settings>();
+            ModInfo.forceXPDelayFactor = this.settings.forceXPDelayFactor;
+        }
+
+        public override string SettingsCategory() => "Star Wars - The Force";
+
+        public override void DoSettingsWindowContents(Rect inRect)
+        {
+            var label = "PJ_SettingsForceXPDelay_Num".Translate(this.settings.forceXPDelayFactor);
+            this.settings.forceXPDelayFactor = Widgets.HorizontalSlider(inRect.TopHalf().TopHalf().TopHalf(), this.settings.forceXPDelayFactor, 0.1f, 10f, false, label, null, null, 0.1f);
+
+            this.WriteSettings();
+
+        }
+
+        public override void WriteSettings()
+        {
+            base.WriteSettings();
+            ModInfo.forceXPDelayFactor = this.settings.forceXPDelayFactor;
+        }
+
+    }
+
+    public class Settings : ModSettings
+    {
+        public float forceXPDelayFactor = 1;
+        public string forceXPDelayStringBuffer;
+
+        public override void ExposeData()
+        {
+            base.ExposeData();
+            Scribe_Values.Look(ref this.forceXPDelayFactor, "forceXPDelayFactor", 0);
+        }
+    }
+}
diff --git a/Source/ProjectJedi/PawnGhost.cs b/Source/ProjectJedi/PawnGhost.cs
@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using System;
 using System.Collections.Generic;

diff --git a/Source/ProjectJedi/ProjectJediDefOf.cs b/Source/ProjectJedi/ProjectJediDefOf.cs
@@ -21,60 +21,60 @@ public static class ProjectJediDefOf
         public static HediffDef PJ_ForceWielderHD;
 
         //Light Side
-        public static AbilityDef PJ_ForceDefense_Apprentice;
-        public static AbilityDef PJ_ForceDefense_Adept;
-        public static AbilityDef PJ_ForceDefense_Master;
+        public static AbilityUser.AbilityDef PJ_ForceDefense_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceDefense_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceDefense_Master;
 
-        public static AbilityDef PJ_MindTrick_Apprentice;
-        public static AbilityDef PJ_MindTrick_Adept;
-        public static AbilityDef PJ_MindTrick_Master;
+        public static AbilityUser.AbilityDef PJ_MindTrick_Apprentice;
+        public static AbilityUser.AbilityDef PJ_MindTrick_Adept;
+        public static AbilityUser.AbilityDef PJ_MindTrick_Master;
 
-        public static AbilityDef PJ_ForceHealingSelf_Apprentice;
-        public static AbilityDef PJ_ForceHealingSelf_Adept;
-        public static AbilityDef PJ_ForceHealingSelf_Master;
+        public static AbilityUser.AbilityDef PJ_ForceHealingSelf_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceHealingSelf_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceHealingSelf_Master;
 
-        public static AbilityDef PJ_ForceHealingOther_Apprentice;
-        public static AbilityDef PJ_ForceHealingOther_Adept;
-        public static AbilityDef PJ_ForceHealingOther_Master;
+        public static AbilityUser.AbilityDef PJ_ForceHealingOther_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceHealingOther_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceHealingOther_Master;
 
-        public static AbilityDef PJ_ForceGhost_Apprentice;
-        public static AbilityDef PJ_ForceGhost_Adept;
-        public static AbilityDef PJ_ForceGhost_Master;
+        public static AbilityUser.AbilityDef PJ_ForceGhost_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceGhost_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceGhost_Master;
 
         //Gray Powers
-        public static AbilityDef PJ_ForcePush_Apprentice;
-        public static AbilityDef PJ_ForcePush_Adept;
-        public static AbilityDef PJ_ForcePush_Master;
+        public static AbilityUser.AbilityDef PJ_ForcePush_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForcePush_Adept;
+        public static AbilityUser.AbilityDef PJ_ForcePush_Master;
 
 
-        public static AbilityDef PJ_ForcePull_Apprentice;
-        public static AbilityDef PJ_ForcePull_Adept;
-        public static AbilityDef PJ_ForcePull_Master;
+        public static AbilityUser.AbilityDef PJ_ForcePull_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForcePull_Adept;
+        public static AbilityUser.AbilityDef PJ_ForcePull_Master;
 
-        public static AbilityDef PJ_ForceSpeed_Apprentice;
-        public static AbilityDef PJ_ForceSpeed_Adept;
-        public static AbilityDef PJ_ForceSpeed_Master;
+        public static AbilityUser.AbilityDef PJ_ForceSpeed_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceSpeed_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceSpeed_Master;
 
 
         //Dark Side
-        public static AbilityDef PJ_ForceRage_Apprentice;
-        public static AbilityDef PJ_ForceRage_Adept;
-        public static AbilityDef PJ_ForceRage_Master;
+        public static AbilityUser.AbilityDef PJ_ForceRage_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceRage_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceRage_Master;
 
-        public static AbilityDef PJ_ForceDrain_Apprentice;
-        public static AbilityDef PJ_ForceDrain_Adept;
-        public static AbilityDef PJ_ForceDrain_Master;
+        public static AbilityUser.AbilityDef PJ_ForceDrain_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceDrain_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceDrain_Master;
 
-        public static AbilityDef PJ_ForceChoke_Apprentice;
-        public static AbilityDef PJ_ForceChoke_Adept;
-        public static AbilityDef PJ_ForceChoke_Master;
+        public static AbilityUser.AbilityDef PJ_ForceChoke_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceChoke_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceChoke_Master;
 
-        public static AbilityDef PJ_ForceLightning_Apprentice;
-        public static AbilityDef PJ_ForceLightning_Adept;
-        public static AbilityDef PJ_ForceLightning_Master;
+        public static AbilityUser.AbilityDef PJ_ForceLightning_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceLightning_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceLightning_Master;
 
-        public static AbilityDef PJ_ForceStorm_Apprentice;
-        public static AbilityDef PJ_ForceStorm_Adept;
-        public static AbilityDef PJ_ForceStorm_Master;
+        public static AbilityUser.AbilityDef PJ_ForceStorm_Apprentice;
+        public static AbilityUser.AbilityDef PJ_ForceStorm_Adept;
+        public static AbilityUser.AbilityDef PJ_ForceStorm_Master;
     }
 }
diff --git a/Source/ProjectJedi/Projectile_ForceStorm.cs b/Source/ProjectJedi/Projectile_ForceStorm.cs
@@ -1,5 +1,5 @@
 using AbilityUser;
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using System;
 using System.Collections.Generic;

diff --git a/Source/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Source/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Source/obj/Release/ProjectJedi.csproj.CoreCompileInputs.cache b/Source/obj/Release/ProjectJedi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0629ab30de7cae7d3713cd6f177fd9963cfd9585
+84a40590f64070b2b210d5794651a6b887c44675
diff --git a/Source/obj/Release/ProjectJedi.csprojAssemblyReference.cache b/Source/obj/Release/ProjectJedi.csprojAssemblyReference.cache
diff --git a/Source/obj/Release/ProjectJedi.dll b/Source/obj/Release/ProjectJedi.dll
-Original file line number
+Diff line change
@@ Expand Up @@
             }
-            public ForceAbility(Pawn user, AbilityDef pdef) : base(user, pdef)
+            public ForceAbility(Pawn user, AbilityUser.AbilityDef pdef) : base(user, pdef)
             {
             }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0629ab30de7cae7d3713cd6f177fd9963cfd9585
		84a40590f64070b2b210d5794651a6b887c44675