Merge remote-tracking branch 'spectre1viper/master'

locations/din_bad.qsrc

@@ -369,8 +369,8 @@ $d_tabletkied = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	tabloc = 0
-	if tabletkiday < daystart: '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
-	if tabletkicheck = 0:
+	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
+	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
 		'<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
 	elseif tabletkicheck = 1:
 		'<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</a>'
@@ -387,8 +387,8 @@ $d_tabletkiedt = {
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
 	*nl
 	tabloc = 1
-	if tabletkiday < daystart: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
-	if tabletkicheck = 0:
+	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
+	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
 		'<a href="exec:*clr & dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
 	elseif tabletkicheck = 1:
 		'<a href="exec:*clr & dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</a>'

locations/stat.qsrc

@@ -918,8 +918,9 @@ elseif  rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 	rape_count = rape
 end
 
+!!Health, Willpower, Auto Birth Control pregnancy check
 gs 'body'
-!!!!!!!!!!!!!
+
 if pcs_health >= healthmax:
 	$pcs_health = '<font color="green">You are very healthy.</font>'
 elseif pcs_health >= healthmax * 75 / 100:
@@ -944,6 +945,9 @@ else
 	$pcs_willpwr = '<font color="red">You are on the verge of madness.</font>'
 end
 
+!!stop auto birth control pill taking if the player believes they are pregnant or are pregnant
+if (thinkpreg = 1 or knowpreg = 1) and tabletkicheck = 1: tabletkicheck = 0
+
 !!Mood
 if cheatNoMood = 0:
 	maxmood = 100 - moodmodifier