From 511d5a0c9c415981f38e00bdd42a7c19f041569a Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 6 Dec 2017 18:11:29 -0500 Subject: [PATCH] SFanon's fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++- src/pregmod/securityForceTradeShow.tw | 2 +- src/uncategorized/nonRandomEvent.tw | 4 +--- src/uncategorized/scheduledEvent.tw | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9c9908458d7..63c6056c029 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4833,4 +4833,7 @@ Pregmod 0.10.3.0 188 -fixes -SFanon's fixes - -secEx tweaks \ No newline at end of file + -secEx tweaks + + 189 + -fixes and tweaks \ No newline at end of file diff --git a/src/pregmod/securityForceTradeShow.tw b/src/pregmod/securityForceTradeShow.tw index 8bd05db0f5d..f2c1c5b8276 100644 --- a/src/pregmod/securityForceTradeShow.tw +++ b/src/pregmod/securityForceTradeShow.tw @@ -24,7 +24,7 @@ <<set _LaunchBayO = $securityForceSatalitePower>> <<set _FacilitySupport = $FacilitySupport>> -<<if $terrain != "oceanic" || $terrain != "marine">> +<<if $terrain != "oceanic" && $terrain != "marine">> <<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>> <</if>> <<if $terrain == "oceanic" || $terrain == "marine">> 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