From 9f2f23ffffa303989e33cddc02c5a19cc0267d2e Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 28 Dec 2017 17:53:04 -0500 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++ src/uncategorized/saServeYourOtherSlaves.tw | 6 +++--- src/uncategorized/slaveSummary.tw | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index f925cf211e7..575a15d1a40 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,9 @@ 12/28/17 + 238 + -fixed slave summary bug + 237 -fixes to eugenics bad end -SFanons tweaks fixes and content diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw index 9150f5833a7..b02f45edec7 100644 --- a/src/uncategorized/saServeYourOtherSlaves.tw +++ b/src/uncategorized/saServeYourOtherSlaves.tw @@ -34,9 +34,6 @@ <<set $slaves[$i].devotion += 1>> <</if>> <</if>> - <<set _fuckCount = (($dormitoryPopulation+$roomsPopulation)+random((($dormitoryPopulation+$roomsPopulation)*1),($dormitoryPopulation+$roomsPopulation)*7))>> - <<SimpleSlaveFucking $slaves[$i] _fuckCount>> - <<set $slaves[$i].need -= 2*_fuckCount>> <<else>> obediently serves your other slaves' sexual needs. Being used as a sexual outlet for everyone @@.hotpink;keeps her in a good frame of mind.@@ <<set $slaves[$i].trust += 2>> @@ -53,6 +50,9 @@ <<if $slaves[$i].amp != 1 && !canWalk($slaves[$i])>> Since she's forced to crawl around, she's especially vulnerable. <</if>> +<<set _fuckCount = (($dormitoryPopulation+$roomsPopulation)+random((($dormitoryPopulation+$roomsPopulation)*1),($dormitoryPopulation+$roomsPopulation)*7))>> +<<SimpleSlaveFucking $slaves[$i] _fuckCount>> +<<set $slaves[$i].need -= 2*_fuckCount>> <<else>> /* serving a slave */ diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 38fba1bf267..13ac8e0a441 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -10,7 +10,7 @@ "Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && ( ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && s.breedingMark != 1) || ($Flag != 0 && s.assignment == "live with your Head Girl"))), - "Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1), + "Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)), "Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && ( ($Flag == 0 && s.assignment != "rest in the spa") || ($Flag == 1 && s.assignment == "rest in the spa") -- GitLab