Merge remote-tracking branch 'julzor/master'

locations/katjaEv.qsrc

@@ -152,10 +152,10 @@ if $ARGS[0] = '6':
 		exit
 	elseif katjaDeystRand = 1:
 		if npcSex[14] = 1:
-			if KatjaSlut =< 500:
+			if KatjaSlut <= 150:
 				'Katja invites you to take a walk in the park.'
 
-			elseif KatjaSlut > 500:
+			elseif KatjaSlut > 150:
 				'"<<$pcs_nickname>>, let''s go to the park, and try and find some boys.'
 			end
 

locations/kid.qsrc

@@ -155,30 +155,63 @@ end
 
 if $ARGS[0] = 'kidlist':
 		if kidage[k] < 1:
-			if (month - monthkid[k]) < 1 and (day-daykid[k]) < 7:
-				kiddaycalc[k] = day - daykid[k]
-				if kiddaycalc[k] = 1:
-					$kidagetext[k] = '<<kiddaycalc[k]>> day old'
+			if yearkid[k] = year:
+				if (month - monthkid[k]) < 1 and (day-daykid[k]) < 7:
+					kiddaycalc[k] = day - daykid[k]
+					if kiddaycalc[k] = 1:
+						$kidagetext[k] = '<<kiddaycalc[k]>> day old'
+					else
+						$kidagetext[k] = '<<kiddaycalc[k]>> days old'
+					end
+				elseif (month - monthkid[k]) < 1 :
+					kiddaycalc[k] = (day - daykid[k]) / 7
+					if kiddaycalc[k] = 1:
+						$kidagetext[k] = '<<kiddaycalc[k]>> week old'
+					else
+						$kidagetext[k] = '<<kiddaycalc[k]>> weeks old'
+					end
 				else
-					$kidagetext[k] = '<<kiddaycalc[k]>> days old'
-				end
-			elseif (month - monthkid[k]) < 1 :
-				kiddaycalc[k] = (day - daykid[k]) / 7
-				if kiddaycalc[k] = 1:
-					$kidagetext[k] = '<<kiddaycalc[k]>> week old'
-				else
-					$kidagetext[k] = '<<kiddaycalc[k]>> weeks old'
+					kidmonthcalc[k] = (month - monthkid[k])
+					if kidmonthcalc[k] = 1:
+						$kidagetext[k] = '<<kidmonthcalc[k]>> month old'
+					else
+						$kidagetext[k] = '<<kidmonthcalc[k]>> months old'
+					end
 				end
 			else
-				kidmonthcalc[k] = (month - monthkid[k])
-				if kidmonthcalc[k] = 1:
-					$kidagetext[k] = '<<kidmonthcalc[k]>> month old'
+				if month = 1 and monthkid[k] = 12:
+					if 31 - daykid[k] + day < 7:
+						kiddaycalc[k] = 31 - daykid[k] + day
+						if kiddaycalc[k] = 1:
+							$kidagetext[k] = '<<kiddaycalc[k]>> day old'
+						else
+							$kidagetext[k] = '<<kiddaycalc[k]>> days old'
+						end
+					elseif 31 - daykid[k] + day >= 7 :
+						kiddaycalc[k] = 31 - daykid[k] + day / 7
+						if kiddaycalc[k] = 1:
+							$kidagetext[k] = '<<kiddaycalc[k]>> week old'
+						else
+							$kidagetext[k] = '<<kiddaycalc[k]>> weeks old'
+						end
+					elseif daykid[k] > day:
+						$kidagetext[k] = '<<kidmonthcalc[k]>> month old'
+					end
 				else
-					$kidagetext[k] = '<<kidmonthcalc[k]>> months old'
+					if daykid[k] - day <= 0:
+						kidmonthcalc[k] = (12 - monthkid[k] + month)
+					else
+						kidmonthcalc[k] = (11 - monthkid[k] + month)
+					end
+					if kidmonthcalc[k] = 1:
+						$kidagetext[k] = '<<kidmonthcalc[k]>> month old'
+					else
+						$kidagetext[k] = '<<kidmonthcalc[k]>> months old'
+					end
 				end
 			end
 		else
-			if kidage[k] = 1:
+			if kidage[k] >= 1:
 			$kidagetext[k] = '<<kidage[k]>> year old'
 			else
 			$kidagetext[k] = '<<kidage[k]>> years old'

locations/saunawhore.qsrc

@@ -1059,7 +1059,7 @@ if $ARGS[0] = 'bathroom':
 	if workDolg > 0:
 		*nl
 		'There are a handful of cheap razors you can use, enough for <<stanok>> shaves. At least they don''t make you pay for them, but only because they don''t know who has used which blades. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-		if stanok <= 0: stanok = 5
+		if stanok < 5: stanok = 5
 		dynamic $brit
 	elseif workDolg <= 0 and stanok > 0:
 		*nl