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

Pregmod v1023-10

See merge request pregmodfan/fc-pregmod!2088

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -4,6 +4,9 @@
 
 5/29/2018
 
+	9
+	-minor fixes (wardeness not buyable from JFC, backwards compat error)
+
 	8
 	-induced NCS fixes (you can now actually buy it)
 	-fixes to surname stripping having trouble lowercasing a number and losing its shit

src/SecExp/attackHandler.tw

@@ -346,7 +346,8 @@
 	/* 60% chance of getting combat skill if not already have it */
 	<<if $Bodyguard.combatSkill == 0 && random(1,100) <= 60>>
 		<<set $gainedCombat = 1>>
-		<<set $Bodyguard.combatSkill = 1>>
+		<<set _i = $slaveIndices[$Bodyguard.ID]>>
+		<<set $slaves[_i].combatSkill = 1>>
 	<</if>>
 <<elseif $leadingTroops == "headGirl">>
 	<<if $HeadGirl.devotion < -20>>
@@ -466,7 +467,8 @@
 	/* 60% chance of getting combat skill if not already have it */
 	<<if $HeadGirl.combatSkill == 0 && random(1,100) <= 60>>
 		<<set $gainedCombat = 1>>
-		<<set $HeadGirl.combatSkill = 1>>
+		<<set _i = $slaveIndices[$HeadGirl.ID]>>
+		<<set $slaves[_i].combatSkill = 1>>
 	<</if>>
 <<elseif $leadingTroops == "citizen">>
 	<<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">>

src/init/storyInit.tw

@@ -666,7 +666,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 /* assistant FS appearance variable */
 <<set $assistantFSAppearance = "default">>
 
-<<set $assistantPronouns.pronoun = "she", $assistantPronouns.possessive = "her", $assistantPronouns.object = "her", $assistantPronouns.objectReflexive = "herself">>
+<<set $assistantPronouns.pronoun = "she", $assistantPronouns.possessivePronoun = "her", $assistantPronouns.possessive = "her", $assistantPronouns.object = "her", $assistantPronouns.objectReflexive = "herself", $assistantPronouns.noun = "girl">>
 
 /*onlyintendeddickgirls variables */
 <<set $makeDicks = 0>>

src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw

@@ -16,7 +16,7 @@
 			<<if $Bodyguard == 0>>
 				<br>[[Bodyguard|Main][$JFCOrder = 1, $Role = "Bodyguard"]]
 			<</if>>
-			<<if $Wardeness == 0 && $cellblock == 1>>
+			<<if $Wardeness == 0 && $cellblock > 0>>
 				<br>[[Wardeness|Main][$JFCOrder = 1, $Role = "Wardeness"]]
 			<</if>>
 		<</replace>>

src/uncategorized/BackwardsCompatibility.tw

@@ -669,7 +669,7 @@
 	<<set $assistantBodyDesire = 0>>
 <</if>>
 <<if ndef $assistantPronouns>>
-	<<set $assistantPronouns = {pronoun: "she", possessivePronoun: "her", possessive: "her", object: "her", objectReflexive: "herself"}>>
+	<<set $assistantPronouns = {pronoun: "she", possessivePronoun: "her", possessive: "her", object: "her", objectReflexive: "herself", noun: "girl"}>>
 <</if>>
 <<if ndef $huskSlaveOrdered>>
 	<<set $huskSlaveOrdered = 0>>

src/uncategorized/pRivalryHostage.tw

@@ -32,6 +32,9 @@
 <<set $activeSlave.father = 0>>
 <<set $activeSlave.sisters = 0>>
 <<set $activeSlave.daughters = 0>>
+<<set $activeSlave.customDesc = "">>
+<<set $activeSlave.customTat = "">>
+<<set $activeSlave.customLabel = "">>
 <<if $arcologies[0].FSSupremacistRace != 0>><<set $activeSlave.race = $arcologies[0].FSSupremacistRace>><</if>>
 <<NationalityToName $activeSlave>>
 <<set $activeSlave.inducedNCS = 0, $activeSlave.NCSyouthening = 0>>