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

Pregmod v1021-238

See merge request pregmodfan/fc-pregmod!1223

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

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 */
 

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")