From 913bb16236733aad85020a0972c8378baefdc4f8 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 6 Dec 2017 11:19:06 -0500 Subject: [PATCH] fixes and vanilla --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 9 ++++++++- src/uncategorized/BackwardsCompatibility.tw | 6 ++++-- src/uncategorized/nonRandomEvent.tw | 4 +--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index aafd0870a98..9c9908458d7 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 9915643472a..007a817eab3 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 da9615cdfed..c9823fe6ea2 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">> -- GitLab