now works with visitors

Mehni · Mar 17, 2018 · d93b668 · d93b668 · HarryDicks · Mar 17, 2018
1 parent a3c10cb
commit d93b668
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Assemblies/Dismiss_Trader.dll b/Assemblies/Dismiss_Trader.dll
diff --git a/Source/Dismiss_Trader.cs b/Source/Dismiss_Trader.cs
@@ -34,27 +34,27 @@ 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)
                         {
                             playerForced = true
                         };
                         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
@@ -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;
+                            }
                         }
                     }
                 }