Merge remote-tracking branch 'Lusticon/master'

locations/mother.qsrc

@@ -112,22 +112,17 @@ if $ARGS[0] = '':
 
 	$mother_clothes[2] = {
 		if motherKnowWhore = 0 and motherKnowSpravka = 0 and npc_QW['A29'] = 0:
-			if momslut < 2:
-				'Your <<$npc_nickname[''A29'']>> looks at you, her eyes open wide in shock.'
-				'"<<$pcs_nickname>>, people live here! Aren''t you ashamed, walking around naked like that? Get dressed right now!"'
-			else
-				'Your <<$npc_nickname[''A29'']>> shakes her head.'
-				'"You could at least dress while at home, <<$pcs_nickname>>! Do you want the whole family to know that you''re a whore?"'
-			end
-		elseif (motherKnowWhore > 0 or motherKnowSpravka > 0) and npc_QW['A29'] = 1:
-			if momslut < 2:
+			'Your <<$npc_nickname[''A29'']>> looks at you, her eyes open wide in shock.'
+			'"<<$pcs_nickname>>, people live here! Aren''t you ashamed, walking around naked like that? Get dressed right now!"'
+		elseif (motherKnowWhore > 0 or (motherKnowSpravka > 0 and rape_day = 0)) and npc_QW['A29'] = 1:
+			if motherKnowWhore > 0:
 				'Your <<$npc_nickname[''A29'']>> looks angrily at you.'
 				'"Even at home, my whore of a daughter doesn''t have the decency to get dressed when people are around! You better get dressed right <i>now</i>! I never want to see this again!"'
 			else
 				'Your <<$npc_nickname[''A29'']>> shakes her head.'
-				'"You could at least dress at home, <<$pcs_nickname>>! Do you want the whole family to know that you''re a whore?"'
+				'"You could at least dress while at home, <<$pcs_nickname>>! Do you want the whole family to know that you''re a whore?"'
 			end
-		elseif npc_QW['A29'] >= 2:
+		else
 			'Your <<$npc_nickname[''A29'']>> looks at you sternly.'
 			'"<<$pcs_nickname>>, could you at least put some clothes on while you''re at home? If you want to impress some fancy man, go do it at his place."'
 		end
@@ -1155,7 +1150,7 @@ if $ARGS[0] = 'pregreact1':
 					act 'Continue': gt 'mother'
 				end
 			end
-			if rape[2] > daystart - 30:
+			if rape_day+30 > daystart:
 				act'I was raped':
 					cla & *nl
 					'"I... I don''t actually know. I was..." you stammer as you struggle to get the next word out. "I was raped..."'

locations/pav_pharmacy.qsrc

@@ -629,7 +629,7 @@ if $ARGS[0] = 'buy_preg_test':
 			'"<<$pcs_nickname>>! What happened??"'
 			'"I know, Aunt," you say, deeply embarrassed. "I just... made a mistake..."'
 			'"I guess we all make those," she sighs, taking a small box off the shelf. "Goodness knows, your sister''s living proof of that. Literally."'
-	!!		if rape[2] > (daystart - 3):
+	!!		if rape_day+3 > daystart:
 	!!			act'I was raped':gt 'pav_pharmacy', 'buy_morning_after_raped'
 	!!		end
 		end
@@ -762,7 +762,7 @@ if $ARGS[0] = 'buy_morning_after':
 		if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_meek'
 		end
-!!		if rape[2] > (daystart - 3):
+!!		if rape_day+3 > daystart:
 !!			act'I was raped':gt 'pav_pharmacy', 'buy_morning_after_raped'
 !!		end
 	end