diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index aafd0870a98afe680994bad7be7045bc89836ee8..9c9908458d7bc7836a884056686afc98a1e27af5 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4826,4 +4826,11 @@ Pregmod 0.10.3.0 187 -fixes - -SFanon's fixes \ No newline at end of file + -SFanon's fixes + + 12/06/17 + + 188 + -fixes + -SFanon's fixes + -secEx tweaks \ No newline at end of file diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 9915643472ac942e40642c725a5f9050491b7aa7..007a817eab3b4f7f63b53d25a9881a399c024c0c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2388,8 +2388,10 @@ Setting missing slave variables: <<set _Slave.health = 205>> <</if>> - <<set _Slave.devotion = (_Slave.devotion*5)>> - <<set _Slave.trust = (_Slave.trust*5)>> + <<set _Slave.devotion = (_Slave.devotion*5)>> + <<set _Slave.oldDevotion = (_Slave.oldDevotion*5)>> + <<set _Slave.trust = (_Slave.trust*5)>> + <<set _Slave.oldTrust = (_Slave.oldTrust*5)>> <<if _Slave.fetishStrength == 0>> <<set _Slave.fetishStrength = random(0, 60)>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index da9615cdfed77671a1bb35df58bfe4ea454500c2..c9823fe6ea2cd16440bb7c0560904e7639c4490b 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -160,10 +160,8 @@ <<goto "secExpSmilingMan">> <<elseif (_effectiveWeek > 84) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>> <<goto "securityForceTradeShow">> - <<set _TradeShowWeek = _effectiveWeek>> -<<elseif _TradeShowWeek = 24 && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>> +<<elseif (Math.trunc($week/24) == ($week/24)) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>> <<goto "securityForceTradeShow">> - <<set _TradeShowWeek = 0>> <<else>> <<if random(1,100) > _effectiveWeek+25>> <<goto "RIE Eligibility Check">>