Updated mod to remove hard Wiki dependency, updated some obsolete code.

Epicguru · Sep 24, 2020 · 5fb2c6c · 5fb2c6c
1 parent d406286
commit 5fb2c6c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -15,9 +15,11 @@ Adds many items, weapons, defences, utility buildings, and a new powerful factio
 This is a mod that is intended to expand the end-game, adding new goals that are challenging but rewarding, and also to increase the difficulty of late game by sending harder raiders.
 This mod also features a fully developed in-game wiki that serves as a guide and also a little extra lore and pretty pictures.
 
-Should be loaded far down as possible, and always after Harmony, In-Game wiki and Core.
+Should be loaded far down as possible, and always after Harmony, In-Game wiki (optional) and Core.
 
-This is a WIP mod. There may be bugs and things may break. Please report bugs on the steam page or on Github, providing as much detail as possible, thanks.
+To access the in-game wiki, you must also install the In-Game Wiki mod from steam. It should be loaded before this mod.
+
+Please report any bugs on the steam page or on Github, providing as much detail as possible, thanks.
 See the store page for all plans, and don't hesitate to suggest new features or changes.
   </description>
   <modDependencies>
@@ -27,12 +29,6 @@ See the store page for all plans, and don't hesitate to suggest new features or
       <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
-    <li>
-      <packageId>co.uk.epicguru.ingamewiki</packageId>
-      <displayName>In-game wiki</displayName>
-      <steamWorkshopUrl>steam://url/CommunityFilePage/2113685739</steamWorkshopUrl>
-      <downloadUrl>https://github.com/Epicguru/InGameWiki/releases/latest</downloadUrl>
-    </li>
   </modDependencies>
   <loadAfter>
     <li>co.uk.epicguru.ingamewiki</li> <!-- Which has to go after Harmony, so that is sorted. -->

diff --git a/Source/AntimatterAnnihilation/AntimatterAnnihilation.csproj b/Source/AntimatterAnnihilation/AntimatterAnnihilation.csproj
@@ -31,17 +31,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.0.1\lib\net472\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lib.Harmony.2.0.2\lib\net472\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Lib.InGameWiki, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.InGameWiki.1.3.0\lib\net472\net472\Lib.InGameWiki.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Lib.InGameWiki.1.5.0\lib\net472\net472\Lib.InGameWiki.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/AntimatterAnnihilation/Buildings/Building_Megumin.cs b/Source/AntimatterAnnihilation/Buildings/Building_Megumin.cs
@@ -191,10 +191,11 @@ public override IEnumerable<Gizmo> GetGizmos()
             {
                 Find.WorldSelector.ClearSelection();
                 CameraJumper.TryJump(CameraJumper.GetWorldTarget(this));
-                Find.WorldTargeter.BeginTargeting(OnChoseWorldTarget, false, Content.AutoAttackIcon, true, delegate
-                {
-                    GenDraw.DrawWorldRadiusRing(this.Map.Tile, WORLD_MAP_RANGE);
-                });
+                Find.WorldTargeter.BeginTargeting_NewTemp(OnChoseWorldTarget, false, Content.AutoAttackIcon, true,
+                    () =>
+                    {
+                        GenDraw.DrawWorldRadiusRing(this.Map.Tile, WORLD_MAP_RANGE);
+                    });
             };
 
             if (IsOnCooldown)
@@ -212,7 +213,7 @@ public override IEnumerable<Gizmo> GetGizmos()
                 cmd.Disable("CannotFire".Translate() + $": {"AA.MegAlreadyCharging".Translate()}");
                 cmd2.Disable("CannotFire".Translate() + $": {"AA.MegAlreadyCharging".Translate()}");
             }
-            else if (FuelComp.FuelPercentOfMax != 1f)
+            else if (FuelComp.FuelPercentOfMax < 0.999f)
             {
                 cmd.Disable("CannotFire".Translate() + $": {"AA.MegMissingCanisters".Translate()}");
                 cmd2.Disable("CannotFire".Translate() + $": {"AA.MegMissingCanisters".Translate()}");

diff --git a/Source/AntimatterAnnihilation/packages.config b/Source/AntimatterAnnihilation/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.0.1" targetFramework="net472" />
-  <package id="Lib.InGameWiki" version="1.3.0" targetFramework="net472" />
+  <package id="Lib.Harmony" version="2.0.2" targetFramework="net472" />
+  <package id="Lib.InGameWiki" version="1.5.0" targetFramework="net472" />
 </packages>
diff --git a/Source/RunRimworld/Program.cs b/Source/RunRimworld/Program.cs
@@ -6,7 +6,7 @@ internal class Program
     {
         private static void Main(string[] args)
         {
-            const string PATH = @"D:\Steam Games\steamapps\common\RimWorld\RimWorldWin64.exe";
+            const string PATH = @"C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64.exe";
 
             ProcessStartInfo info = new ProcessStartInfo(PATH);
             Process.Start(info);

diff --git a/_PublisherPlus.xml b/_PublisherPlus.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Configuration>
   <Excluded>
-    <exclude>D:\Steam Games\steamapps\common\RimWorld\Mods\AntimatterAnnihilation\.git</exclude>
-    <exclude>D:\Steam Games\steamapps\common\RimWorld\Mods\AntimatterAnnihilation\Source</exclude>
+    <exclude>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\AntimatterAnnihilation\.git</exclude>
+    <exclude>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\AntimatterAnnihilation\Assemblies\Lib.InGameWiki.pdb</exclude>
+    <exclude>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\AntimatterAnnihilation\Source</exclude>
   </Excluded>
 </Configuration>