update to RW 1.0

Mehni · Oct 19, 2018 · 153bf9f · 153bf9f
1 parent 6626bb1
commit 153bf9f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,7 @@
 <ModMetaData>
 	<name>Dismiss Trader</name>
 	<author>Mehni</author>
-	<targetVersion>0.19.0</targetVersion>
+	<targetVersion>1.0.0</targetVersion>
 	<description>Dismiss traders with the click of a button.</description>
 	<url>https://ludeon.com/forums/index.php?topic=35832.0</url>
 </ModMetaData>
diff --git a/Assemblies/Dismiss_Trader.dll b/Assemblies/Dismiss_Trader.dll
diff --git a/Source/Dismiss_Trader.csproj b/Source/Dismiss_Trader.csproj
@@ -36,7 +36,7 @@
       <HintPath>..\..\..\..\..\..\..\..\Users\Maniak\Documents\RimWorld Mods\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\RimWorldWin_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -46,7 +46,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">
-      <HintPath>..\..\..\RimWorldWin_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <None Include="..\About\About.xml">

diff --git a/Source/JobDriver_DismissTrader.cs b/Source/JobDriver_DismissTrader.cs
@@ -38,7 +38,7 @@ protected override IEnumerable<Toil> MakeNewToils()
                     {
                         foreach (Trigger trigger in transition.triggers)
                         {
-                            if (trigger is Trigger_TicksPassed)
+                            if (trigger is Trigger_TicksPassed && !transition.preActions.Any(x => x is TransitionAction_CheckGiveGift))
                             {
                                 transition.triggers.Add(new Trigger_TicksPassed(20));
                                 break;

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("0.1.0.1")]
-[assembly: AssemblyFileVersion("0.1.0.1")]
+[assembly: AssemblyVersion("0.1.1.0")]
+[assembly: AssemblyFileVersion("0.1.1.0")]