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

Pregmod v1025-5

See merge request pregmodfan/fc-pregmod!2197

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -2,12 +2,19 @@
 
 0.10.7.1-0.4.x
 
+6/27/2018
+
+	5
+	-more fixes to reported RA bugs
+	-minor text corrections
+
 6/26/2018
 
 	4
 	-a whole bunch of fixes, mostly major RA fixes
 	-fixed a bunch of minor things
 	-placed stronger safeguards on rival gen to prevent null races
+	-tweaked spacing in club/brothel ads
 
 6/24/2018
 

src/gui/Encyclopedia/encyclopedia.tw

@@ -814,7 +814,7 @@ Choose a more particular entry below:
 
 
 <<case "Schoolteacher">>
-	A ''schoolteacher'' can be selected once the [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]] facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good Schoolteachers are older than 35, beautiful, @@cyan;intelligent@@, and educated.
+	A ''schoolteacher'' can be selected once the [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]] facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good Schoolteachers are older than 35, beautiful, @@.cyan;intelligent@@, and educated.
 
 
 <<case "Stewardess">>

src/npc/fAbuse.tw

@@ -251,7 +251,7 @@ from your victim.
 <<if ($activeSlave.anus == 0)>>
 	The bitch's still a butthole virgin and you don't mean to take that now, but you torture $him with the threat of raping $his virgin ass for a while before settling for $his gagging throat.
 	<<set $activeSlave.oralCount++, $oralTotal++>>
-<<elseif ($activeSlave.vaginalAccessory == "chastity belt")>>
+<<elseif ($activeSlave.vaginalAccessory == "chastity belt") && canDoAnal($activeSlave)>>
 	The bitch's wearing a chastity belt, so $he isn't surprised when you shove <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>> up $his butt. What surprises $him is when you slide a finger or two in alongside your dick to stretch $him to the point of pain.
 	<<AnalVCheck>>
 	<<set _asspain = 1>>

src/uncategorized/corporationDevelopments.tw

@@ -1609,7 +1609,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
 <</if>>
 <<if $drugUpgradeHormones != "unselected">>
 	<br>
-	<<if $drugUpgradeHormones == "XX">>Slaves are given females hormones.
+	<<if $drugUpgradeHormones == "XX">>Slaves are given female hormones.
 		<<elseif $drugUpgradeHormones == "XY">>Slaves are given male hormones.
 		<<else>>The corporation does not apply any hormones to the slaves.
 	<</if>>

src/uncategorized/rename.tw

@@ -3,7 +3,10 @@
 <<set $nextButton = "Back", $nextLink = "Slave Interact">>
 
 /* First time renaming reaction */
-<<if $activeSlave.fetish == "mindbroken">>
+<<if $activeSlave.slaveName === "" || ndef $activeSlave.slaveName>>
+	$oldName needs to be called something on the records, so $oldName she stays.
+	<<set $activeSlave.slaveName = $oldName>>
+<<elseif $activeSlave.fetish == "mindbroken">>
 	$activeSlave.slaveName doesn't even recognize that she's been renamed. It simply does not register.
 <<elseif $oldName == $activeSlave.birthName || $oldSurname == $activeSlave.birthSurname>>
 	$activeSlave.slaveName

src/uncategorized/surgeryDegradation.tw

@@ -261,7 +261,6 @@ As the remote surgery's long recovery cycle completes,
 	Her gaze is placid and empty. <<if canSee($activeSlave)>>She looks at<<else>>You cough causing her to turn to face<</if>> you, and there is nothing there: no recognition, no fear, no love. Nothing. @@.red;She will forget this in a few hours. She will forget everything in a few hours.@@
 	<<set $activeSlave.sexualFlaw = "none">>
 	<<set $activeSlave.behavioralFlaw = "none">>
-	<<set $nextLink = "Main">>
 
 <<case "unblind">>
 	The eye surgery is @@.red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as she processes her new vision. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
@@ -2056,7 +2055,7 @@ As the remote surgery's long recovery cycle completes,
 	<br><br>As this was a non-invasive procedure $possessive health was not affected.
 
 <<case "retrograde virus injection NCS">>
-	The procedure spans the week, with $object spending every other day in the surgery room for a series of 4 sets of injections. $pronounCap feels worse each time a few hours after the injections.  $pronounCap doesn't quite know what it's about, just that $pronoun feels pretty bad. The process has <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> inject $possessive body everywhere, over every few inches, leaving a small needle marks as the process runs that fade out within minutes.  Despite the marks fading the process is very-invasive work, and leaves $pronoun @@.red;feeling weak and tired.@@<br><br>
+	The procedure spans the week, with $object spending every other day in the surgery room for a series of 4 sets of injections. $pronounCap feels worse each time a few hours after the injections.  $pronounCap doesn't quite know what it's about, just that $pronoun feels pretty bad. The process has <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> inject $possessive body everywhere, over every few inches, leaving a small needle marks as the process runs that fade out within minutes.  Despite the marks fading the process is very invasive work, and leaves $pronoun @@.red;feeling weak and tired.@@<br><br>
 	/*
 		Generate the changes, into variables to set contexts.
 	*/