From badebca3f11d24316b51510988da3a5387219bb5 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Thu, 7 Dec 2017 22:07:06 +1300 Subject: [PATCH] minor rework. --- src/uncategorized/nonRandomEvent.tw | 4 +--- src/uncategorized/scheduledEvent.tw | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index c9823fe6ea2..124644242f6 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -158,9 +158,7 @@ <<goto "secExpSmilingMan">> <<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>> <<goto "secExpSmilingMan">> -<<elseif (_effectiveWeek > 84) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>> - <<goto "securityForceTradeShow">> -<<elseif (Math.trunc($week/24) == ($week/24)) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>> +<<elseif (_effectiveWeek > 84) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>> <<goto "securityForceTradeShow">> <<else>> <<if random(1,100) > _effectiveWeek+25>> diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw index 9c3e7cb3cd0..7b0974296a2 100644 --- a/src/uncategorized/scheduledEvent.tw +++ b/src/uncategorized/scheduledEvent.tw @@ -194,6 +194,8 @@ <<else>> <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>> <</if>> +<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>> + <<goto "securityForceTradeShow">> <<elseif $plot == 1>> <<goto "Nonrandom Event">> <<else>> -- GitLab