From d93b6682400cabe5fc73e073063b24f330e35f03 Mon Sep 17 00:00:00 2001
From: Mehni <Mehni@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:57:06 +0100
Subject: [PATCH] now works with visitors

---
 Assemblies/Dismiss_Trader.dll     | Bin 9728 -> 9728 bytes
 Source/Dismiss_Trader.cs          |  10 +++++-----
 Source/JobDriver_DismissTrader.cs |   8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Assemblies/Dismiss_Trader.dll b/Assemblies/Dismiss_Trader.dll
index 5510cd760dae599a8a7367f991843c1dd6a33fe3..b05f71fae665dd68ac96e01a1844fad175484173 100644
GIT binary patch
delta 2902
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
WA&Yw=(VK=iH?_yF{DQj1*#7~2jTpQD

delta 2786
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
IG|*uG7Z7IwVgLXD

diff --git a/Source/Dismiss_Trader.cs b/Source/Dismiss_Trader.cs
index b5580c5..b5c716d 100644
--- a/Source/Dismiss_Trader.cs
+++ b/Source/Dismiss_Trader.cs
@@ -34,7 +34,7 @@ private static void FloatMenuMakerMap_AddHumanlikeOrdersToDismissTraders_PostFix
                 else
                 {
                     Pawn pTarg = (Pawn)dest.Thing;
-                    Action action4 = delegate
+                    Action action = delegate
                     {
                         Job job = new Job(TraderDismissalJobDefs.DismissTrader, pTarg)
                         {
@@ -42,19 +42,19 @@ private static void FloatMenuMakerMap_AddHumanlikeOrdersToDismissTraders_PostFix
                         };
                         localpawn.jobs.TryTakeOrderedJob(job, JobTag.Misc);
                     };
+
                     string str = string.Empty;
                     if (pTarg.Faction != null)
                     {
                         str = " (" + pTarg.Faction.Name + ")";
                     }
+
                     string label = "GETOUT".Translate(new object[]
                     {
                         pTarg.LabelShort + ", " + pTarg.TraderKind.label
                     }) + str;
-                    Action action = action4;
-                    MenuOptionPriority priority2 = MenuOptionPriority.InitiateSocial;
-                    Thing thing = dest.Thing;
-                    opts.Add(FloatMenuUtility.DecoratePrioritizedTask(new FloatMenuOption(label, action, priority2, null, thing, 0f, null, null), pawn, pTarg, "ReservedBy"));
+
+                    opts.Add(FloatMenuUtility.DecoratePrioritizedTask(new FloatMenuOption(label, action, MenuOptionPriority.InitiateSocial, null, dest.Thing, 0f, null, null), pawn, pTarg, "ReservedBy"));
                 }
             }
             return;
diff --git a/Source/JobDriver_DismissTrader.cs b/Source/JobDriver_DismissTrader.cs
index 37fda8e..e16aa94 100644
--- a/Source/JobDriver_DismissTrader.cs
+++ b/Source/JobDriver_DismissTrader.cs
@@ -46,9 +46,13 @@ protected override IEnumerable<Toil> MakeNewToils()
                     List<Transition> transitions = lord.Graph.transitions.ToList();
                     for (int i = 0; i < transitions.Count; i++)
                     {
-                        if (i == 7)
+                        foreach(Trigger trigger in transitions[i].triggers)
                         {
-                            transitions[i].triggers.Add(new Trigger_TicksPassed(20));
+                            if (trigger.GetType() == typeof(Trigger_TicksPassed))
+                            {
+                                transitions[i].triggers.Add(new Trigger_TicksPassed(20));
+                                break;
+                            }
                         }
                     }
                 }