Merge branch 'pregmod-master' into 'pregmod-master'

Re enable SmilingMan event chain

See merge request pregmodfan/fc-pregmod!7517

src/uncategorized/nonRandomEvent.tw

@@ -171,7 +171,7 @@
 	<<goto "P slave medic">>
 <<elseif ($eventResults.pit == 1) && ($BodyguardID != 0)>>
 	<<goto "PE pit fight">>
-<<elseif $rivalOwner == 0 && $secExpEnabled > 0 && between($SecExp.smilingMan.progress, 0, 3)>>
+<<elseif $rivalOwner == 0 && $secExpEnabled > 0 && $SecExp.smilingMan.progress <= 3>>
 	<<goto "secExpSmilingMan">>
 <<elseif ($rivalOwner == 0) && ($seeFCNN == 1) && ($FCNNstation == 0) && ($week > 95) && ($cash > 200000) && ($rep > 7500)>>
 	<<goto "SE FCNN Station">>