From 153bf9fbd8557952cfcd646de11473e7038e9e02 Mon Sep 17 00:00:00 2001 From: Mehni Date: Fri, 19 Oct 2018 10:12:25 +0200 Subject: [PATCH] update to RW 1.0 --- About/About.xml | 2 +- Assemblies/Dismiss_Trader.dll | Bin 9728 -> 9728 bytes Source/Dismiss_Trader.csproj | 4 ++-- Source/JobDriver_DismissTrader.cs | 2 +- Source/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) 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 09c0a3dbde2f7c079ecb6025dda498ebb0133411..d07d0131843bcad41a3b254e9b8ba0d8cb9686da 100644 GIT binary patch delta 3910 zcmZ8k3vg7`8UD|?&%Fto+?(v?9X61_vf+^s&;lV4lNgbN1R>NYPK+Vq4k0VqM8TNs zuJ}SLWxdjtsk8;PQ<2um#0ONFn$fXPWkwvOQq+-ATXBli7nRC{e&=kc);qc1`CsRM zob#WPyYZ%Y(~kRpQ{ck;>1aG&MV**W(;UdT?k|KZJUi&A!d za1N0btN?g|mB1`jZM9WnTu&#`qjMoC%652gI*2JER(5u@3bfK{400khI1fyp!RXfD zd{B|g0D8m$F8s`WO(}}yF`^2*mY9sEm4#Qx>|H4=w=1gBpTLmwa#` z1UbI!oZuo5p_<9#(M%}I_>c!-LvT|q<*7Lltc2wsXCW%6Q0R5UL2@>9G0c(51uqC; zDnJd4BTE2-O94S-S01?nlvO_DP_PbEnlV_9A<_UyFJFNLxDwRB3M4yosWI3HW*E7u zWwUao4XYr=^$f9I*a@pFE;Kb_oqs>%Cr2kxhy?Zm25Fx^qAk>tOpmb#muS0M29ink_LKJ ze_yzFeH1aMBAY0H4w~Awidua{Xi}Qm*tV=5e7ojFXj)eLt2QQXTq(?}Y z3fvMSCkD3!H&TjK6HAR}ttMo`UQ^#Nbn271Q2CXSLH~k7oo-TI(RBJm;t`4Ms*sdP ztdY1y%2y~O@Gw*2en>1D)X#FAY|nPh8>4S%KexyyMF**sS#(wt>Zc?DRO!As>ZArzqc!6f=xn zrcUd*z}O?G$)WlDyk*hV`Wd)8AdO-`hw9ApmQJPmE1JvtrXqK@}Wk;-%? zQmIT6xPprm-$l|EUB?A}37;1ILMDAc;tVb%-=YAWSWFYyy{HM%wbI2tX>?51_fwB> z(PEzEej1UM4Y2Xk`>4rFhDWSix+m9TQ6Notn3N{MkIA_#O{_sF7dRc&`{@?`GteiP zkQ~PvTlAqG6BFK61vY!+aC|PFfo?=~C9DfoWz(=RpJuRO6j8~< z+y(4wUQf$dk}s!rmd{sH81kDT&(ZoQ!5X+r+gR+Jxr++rhX{YEIJD`0;r`TisQ%K138J%W#TAyO>IrcT3XDhW+ z#CVVATk`M=oHJo#F`Hvm*dCPRXCu@T^UPxl_*|`;&7|M57M75;o}ft#VXy^l>;zrK z+F32%q22&mRF-k#gbPwODt>LF-qNnNiT9}W)zfQAp=0D=IDT~ek3n*QgO;gDi z!%$8$fK?I~NvtCuB+F?IaFvu?FR_c7AlX2-DRmU3tx6Y;)K=v&8U(&9@k5CLCL~KG z5`P(VK;n%O;}U-(G4_%iK9G1fZDcB+$$N3`8M>O|G#u5BW7zFE2|VfffXkZ3|TzoVzIq5Ie$*p!qqt9 zAfUKPQ_o%;JrVrU6Xmm{QotMe#|KjKwc@||51#$*CU4gKZ*Wk>;gxr_w21OU(xFIN zTzLlGt@H$QX`DStOZd~Y&K>dYHCy|-*M++}``wm|yrSxw1sxq#9doI=xpPDJitgK2 zN5VbPnwzB1U7u0PYZkcMGL|XTHC>~}GMd$l)qS14(Qtn_(p%dFbPKb~^~Ubrx=7FH zlI$urI^?^81z^(C*&pefc-R1LwURb+>ePZDU*=%M0>iNA37A zZpYtNbtis8z$r5Tw;zMh0+@4}>t0EGt^~-dlj6lA1?Q2XonT({q}K}q+bC6>73LNN zOy+eG9y>7!2rubACt-6t;p0vs&%nfX2-8S)PZrFaQpRmV@!4CLGvo}(F^+F0<|Jl0 z%S5O|r8}drIcDlUry03zGks3{9zocdjB_C@CMhZ=%@T6eU{0qI;LHiz?Of-mD^Y6( zICnbjM1xq1L^H}U4MQ=VOlQD?pJE&ZJJF`XL8e9A831F)k0NH`2F534viZ^^#R{td z;ngET6`IfAv35<~ybrc1x)a8m>%p{CitZPMRfZm59BH{_Mb8yh&aRmFR(XBmC#yIN ze;0HhS>osKEOwpZrLH$HjL+ap2at{aJkZRvN*vaT(bFaOO_1)u)T)#azj9Z5;26JD P>6^u)cIjD`tT6ryxj4r6 delta 3529 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..\..\..\..\..\..\..\..\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")]