initial 1.0 update

Mehni · Jun 17, 2018 · 3bd31ad · 3bd31ad
1 parent d93b668
commit 3bd31ad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 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.18.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/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/Dismiss_Trader.dll b/Assemblies/Dismiss_Trader.dll
diff --git a/Source/JobDriver_DismissTrader.cs b/Source/JobDriver_DismissTrader.cs
@@ -27,7 +27,7 @@ public override bool TryMakePreToilReservations()
 
         //approach: find Lord transition that is the regular time-out and add another (very short) Trigger_TicksPassed. That'll then fire, and the traders will leave.
 
-        //other (failed) approaches: 
+        //other (failed) approaches:
         //- inheriting from LordJob_TradeWithColony and overriding the stategraph. Set a bool in the job, which works as a trigger. Still seems like the "correct" and OOP approach, but I suck at C#
         //- adding new LordToil_ExitMapAndEscortCarriers() & telling the lord to jump to it. (lord null, somehow not registered in graph?)
         //- Outright removing the lord. Works, but also removes the traderflag, defending at exit and the group behaviour. Bad.
@@ -41,14 +41,15 @@ protected override IEnumerable<Toil> MakeNewToils()
             {
                 Pawn actor = trade.actor;
                 if (this.Trader.CanTradeNow)
-				{
+                {
                     Lord lord = Trader.GetLord();
                     List<Transition> transitions = lord.Graph.transitions.ToList();
                     for (int i = 0; i < transitions.Count; i++)
                     {
                         foreach(Trigger trigger in transitions[i].triggers)
                         {
-                            if (trigger.GetType() == typeof(Trigger_TicksPassed))
+                            //if (trigger.GetType() == typeof(Trigger_TicksPassed))
+                            if (trigger is Trigger_TicksPassed) // less ugly, more nicer.
                             {
                                 transitions[i].triggers.Add(new Trigger_TicksPassed(20));
                                 break;