Merge remote-tracking branch 'hornguy6/master'

locations/korrPar.qsrc

@@ -141,16 +141,16 @@ else
 end
 act 'Go to the living room':gt 'sitrPar'
 if momloc = 5:
-	if vanrPar_suction_dildo > 0:gt'mother','bathroom_dildo_shriek1'
+	if vanrPar_suction_dildo > 0:
+		motherQW['dildo_shower_discovery'] = 1
+		gt'mother','bathroom_dildo_shriek1'
+	end
 	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your mother shouting at the door. "Doesn''t anybody in this family know how to knock?!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end
 
-if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1:
-	motherQW['dildo_shower_discovery'] = 1
-	gt'mother_sextalk','bathroom_dildos1'
-end
+if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
 
 
 act 'Go to the kitchen':gt 'kuhrPar'

locations/mother_sextalk.qsrc

@@ -4,10 +4,12 @@ if $ARGS[0] = 'bathroom_dildo_shriek1':
 	if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildo_shriek4'
 	motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 	if motherQW['dildo_caught'] = 0:
-		motherQW['dildo_caught'] = 1
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 1:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildo_shriek2'
-	elseif motherQS['dildo_caught'] = 2:
+	elseif motherQS['dildo_caught'] >= 2:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildo_shriek3'
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -86,7 +88,7 @@ end
 
 if $ARGS[0] = 'bathroom_dildo_shriek2':
 	if motherQW['dildo_caught'] = 1:
-		motherQW['dildo_caught'] = 2
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 2:
 		gt'mother_sextalk','bathroom_dildo_shriek3'
 	end
@@ -158,6 +160,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek3':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
+	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'You''re walking down the hall when you suddenly hear a shriek come from the bathroom. Oh shit, not again. Right as you get to the door, it opens up to reveal your very mother. She looks more exhasperated than angry this time though.'
@@ -171,6 +174,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek4':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
+	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'You''re walking down the hall when you suddenly hear a shriek come from the bathroom. Oh shit, not again. Right as you get to the door, it flies open to show your very angry mother.'
@@ -186,10 +190,11 @@ end
 if $ARGS[0] = 'bathroom_dildos1':
 	if motherQW['dildo_caught'] = 0:
 		if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildos4'
-		motherQW['dildo_caught'] = 1
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 1:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildos2'
-	elseif motherQW['dildo_caught'] = 2:
+	elseif motherQW['dildo_caught'] >= 2:
 		if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildos5'
 		gt'mother_sextalk','bathroom_dildos3'
 	end
@@ -320,6 +325,7 @@ if $ARGS[0] = 'bathroom_dildos3':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
+	motherQW['dildo_caught'] += 1
 	suction_dildo += motherQW['bathroom_dildos']
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -370,6 +376,8 @@ if $ARGS[0] = 'bathroom_dildos5':
 end
 
 if $ARGS[0] = 'dildo_wakeup1':
+	motherQW['dildo_caught'] += 1
+!!	if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','dildo_wakeup4'
 	if motherQW['dildo_wakeup'] = 0:
 		motherQW['dildo_wakeup'] = 1
 	elseif motherQW['dildo_wakeup'] = 1 and motherKnowDildo = 1:
@@ -439,6 +447,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 end
 
 if $ARGS[0] = 'dildo_wakeup2':
+	motherQW['dildo_caught'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:
 		'You wake up in a shock when your door bangs open and you see your mother standing in the doorway holding a dildo.'
@@ -503,6 +512,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 end
 
 if $ARGS[0] = 'dildo_wakeup3':
+	motherQW['dildo_caught'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:
 		'You wake up in shock to something made of rubber slapping you in the face. Startled, you sit up in bed and look around, seeing a dildo laying on your covers.'