fixes

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -2,6 +2,12 @@
 
 	0.10.7.0/1
 
+12/20/17
+	
+	217
+	-fixed sex count NaN in saRules-schoolroom
+	-tweaked childgen to use current father name
+
 12/19/17
 	
 	216

src/pregmod/generateChild.tw

@@ -298,9 +298,10 @@
 	<</if>>
 	<<set $activeSlave.mother = $mergeMom.ID>>
 	<<if $mom.pregSource > 0>>
+		<<set _currentFather = $slaves.find(function(s) { return s.ID == $mom.pregSource; })>>
 		<<set $activeSlave.father = $mergeDad.ID>>
-		<<set $activeSlave.slaveName = String($mom.slaveName + " and " + $mergeDad.slaveName + "'s child")>>
-		<<if def $mom.slaveSurname && $mom.slaveSurname != "">><<set $activeSlave.slaveSurname = $mom.slaveSurname>><<elseif def $mergeDad.slaveSurname && $mergeDad.slaveSurname != "">><<set $activeSlave.slaveSurname = $mergeDad.slaveSurname>><<else>><<set $activeSlave.slaveSurname = 0>><</if>>
+		<<set $activeSlave.slaveName = String($mom.slaveName + " and " + _currentFather.slaveName + "'s child")>>
+		<<if def $mom.slaveSurname && $mom.slaveSurname != "">><<set $activeSlave.slaveSurname = $mom.slaveSurname>><<elseif def _currentFather.slaveSurname && _currentFather.slaveSurname != "">><<set $activeSlave.slaveSurname = _currentFather.slaveSurname>><<else>><<set $activeSlave.slaveSurname = 0>><</if>>
 	<<elseif $mom.pregSource == -1>>
 		<<set $activeSlave.father = -1>>
 		<<set $activeSlave.slaveName = String($mom.slaveName + " and my child")>>

src/uncategorized/saRules.tw

@@ -2051,8 +2051,8 @@
 				<</switch>>
 			<</if>>
 		<<case "be the Schoolteacher">>
-			<<set $slaves[$i].need -= $schoolRoom*10>>
-			<<set _sexLessons = $schoolRoom*2>>
+			<<set $slaves[$i].need -= $schoolroom*10>>
+			<<set _sexLessons = $schoolroom*2>>
 			<<if canDoVaginal($slaves[$i])>>
 				<<set $slaves[$i].vaginalCount += _sexLessons, $vaginalTotal += _sexLessons>>
 			<</if>>