diff --git a/About/About.xml b/About/About.xml index 0e6d888..7a910e9 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,7 +2,7 @@ Dismiss Trader Mehni - 0.19.0 + 1.0.0 Dismiss traders with the click of a button. https://ludeon.com/forums/index.php?topic=35832.0 \ No newline at end of file diff --git a/Assemblies/Dismiss_Trader.dll b/Assemblies/Dismiss_Trader.dll index 09c0a3d..d07d013 100644 Binary files a/Assemblies/Dismiss_Trader.dll and b/Assemblies/Dismiss_Trader.dll differ diff --git a/Source/Dismiss_Trader.csproj b/Source/Dismiss_Trader.csproj index 90139d9..b46cbb2 100644 --- a/Source/Dismiss_Trader.csproj +++ b/Source/Dismiss_Trader.csproj @@ -36,7 +36,7 @@ ..\..\..\..\..\..\..\..\Users\Maniak\Documents\RimWorld Mods\0Harmony.dll - ..\..\..\RimWorldWin_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False @@ -46,7 +46,7 @@ - ..\..\..\RimWorldWin_Data\Managed\UnityEngine.dll + ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll False diff --git a/Source/JobDriver_DismissTrader.cs b/Source/JobDriver_DismissTrader.cs index b50d410..dd38fd3 100644 --- a/Source/JobDriver_DismissTrader.cs +++ b/Source/JobDriver_DismissTrader.cs @@ -38,7 +38,7 @@ protected override IEnumerable 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 index 6ef0c0d..9b25970 100644 --- 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")]