Merge remote-tracking branch 'hornguy6/master'

locations/mother_sextalk.qsrc

@@ -232,17 +232,16 @@ if $ARGS[0] = 'bathroom_dildos1':
 	end
 	
 	act'Well I need some kind of outlet!':
-		vanrPar_bathtub_dildo = 0
-		vanrPar_bath_shower_dildo = 0
-		vanrPar_suction_dildo = 0
-		motherQW['bathroom_dildos'] = 0
-		motherKnowDildo = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'"Well I need some kind of outlet!" you say, throwing your arms up in exhasperation.'
 		'Your mother steps back, apparently surprised at your change of tactics.'
 		'"You''re always telling me to stay away from men and not to act like a slut. Well, I gotta tell you <<$npc_nickname[''A29'']>>, <i>I get horny sometimes.</i> And if you don''t want me fucking boys, getting pregnant, or worse, then this is what it takes!" She blinks at your outburst but recomposes herself, taking a dignified stance.'
-		'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		if motherQW['bathroom_dildos'] = 2:
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		else
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage." You roll your eyes in response.'
+		end
 		'"Regardless, you shouldn''t be leaving stuff like this around the house. I''m taking these as punishment," she says.'
 		'"But <<$npc_nickname[''A29'']>>!"'
 		'"No buts young lady! Other people live in this household too! You need to learn to control yourself. If you can''t do that much then you don''t deserve to have these either."'
@@ -255,6 +254,13 @@ if $ARGS[0] = 'bathroom_dildos1':
 		end
 		*nl
 		'<i>Ugh. Great. Now I need new ones.</i>'
+		
+		vanrPar_bathtub_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
+		motherQW['bathroom_dildos'] = 0
+		motherKnowDildo = 1
+		
 		act'Continue':gt $loc, $loc_arg
 	end
 end
@@ -433,11 +439,6 @@ if $ARGS[0] = 'dildo_wakeup1':
 	end
 	
 	act'Well I need some kind of outlet!':
-		vanrPar_bathtub_dildo = 0
-		vanrPar_bath_shower_dildo = 0
-		vanrPar_suction_dildo = 0
-		motherQW['bathroom_dildos'] = 0
-		motherKnowDildo = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'"Well I need some kind of outlet!" you say, sitting up in bed and throwing your arms up in exhasperation.'
@@ -445,7 +446,11 @@ if $ARGS[0] = 'dildo_wakeup1':
 		'"You''re always telling me to stay away from men and not to act like a slut. Well, I gotta tell you <<$npc_nickname[''A29'']>>, <i>I get horny sometimes.</i> And if you don''t want me fucking boys, getting pregnant, or worse, then this is what it takes!"'
 		'"Mmmm. She''s right mom. Horny girls need satisfaction," your sister mumbles before rolling over to her other side and going back to sleep.'
 		'She blinks at your outburst but recomposes herself, taking a dignified stance.'
-		'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		if motherQW['bathroom_dildos'] = 2:
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		else
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage." You roll your eyes in response.'
+		end
 		'"Regardless, you shouldn''t be leaving stuff like this around the house. I''m taking these as punishment," she says.'
 		'"But <<$npc_nickname[''A29'']>>!"'
 		'"No buts young lady! Other people live in this household too! You need to learn to control yourself. If you can''t do that much then you don''t deserve to have these either."'
@@ -458,6 +463,12 @@ if $ARGS[0] = 'dildo_wakeup1':
 		end
 		*nl
 		'<i>Ugh. Great. Now I need new ones.</i>'
+		
+		vanrPar_bathtub_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
+		motherQW['bathroom_dildos'] = 0
+		motherKnowDildo = 1
 		act'Continue':gt 'bed2', 'wake'
 	end
 end
@@ -783,17 +794,16 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 	
 	
 	act'Well I need some kind of outlet!':
-		vanrPar_bathtub_dildo = 0
-		vanrPar_bath_shower_dildo = 0
-		vanrPar_suction_dildo = 0
-		motherQW['bathroom_dildos'] = 0
-		motherKnowDildo = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'"Well I need some kind of outlet!" you say, throwing your arms up in exhasperation.'
 		'Your mother steps back, apparently surprised at your change of tactics.'
 		'"You''re always telling me to stay away from men and not to act like a slut. Well, I gotta tell you <<$npc_nickname[''A29'']>>, <i>I get horny sometimes.</i> And if you don''t want me fucking boys, getting pregnant, or worse, then this is what it takes!" She blinks at your outburst but recomposes herself, taking a dignified stance.'
-		'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		if motherQW['bathroom_dildos'] = 2:
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage. You certainly don''t need <i>two</i> of these." You roll your eyes in response.'
+		else
+			'"Well, there are other ways you can deal with that," she sniffs. "You didn''t have to ruin yourself for marriage." You roll your eyes in response.'
+		end
 		'"Regardless, you shouldn''t be leaving stuff like this around the house. I''m taking these as punishment," she says.'
 		'"But <<$npc_nickname[''A29'']>>!"'
 		'"No buts young lady! Other people live in this household too! You need to learn to control yourself. If you can''t do that much then you don''t deserve to have these either."'
@@ -801,6 +811,13 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		gs'mother_sextalk','dildo_ending1'
 		*nl
 		'<i>Ugh. Great. Now I need new ones.</i>'
+		
+		vanrPar_bathtub_dildo = 0
+		vanrPar_bath_shower_dildo = 0
+		vanrPar_suction_dildo = 0
+		motherQW['bathroom_dildos'] = 0
+		motherKnowDildo = 1
+		
 		if motherQW['dildo_wakeup'] = 1:
 			act'Continue':gt 'bed2', 'wake'
 		else

locations/pav_park.qsrc

@@ -217,7 +217,7 @@ if $ARGS[0] = 'start':
 		if hour >= 8 and hour <= 12:
 			act 'Work as Tour Guide (6:00)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 9 and month <= 5 and TourGuide = 1 and work = 1
+	elseif month >= 9 and month <= 5 and TourGuide = 1 and work = 1:
 		TourGuide = 0
 		work = 0
 	end

locations/vanrPar.qsrc

@@ -18,15 +18,18 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	'The bathroom is very small and unimpressive. Nevertheless, it has everything you need.'
 	*nl
-	'A shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
-
 	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 
 	gs'selfplay','suction_dildo'
-	if motherQW['bathroom_dildos'] > 0 and motherknowsdildo = 1:
+	
+	if motherQW['bathroom_dildos'] > 1 and motherknowsdildo = 1:
 		'<i>Huh? Where''d my dildos go? I thought I- oh shit! <<$npc_nickname[''A29'']>> probably took them again...</i>'
-	elseif motherQW['bathroom_dildos'] > 0 and vanrPar_suction_dildo = 0:
+	elseif motherQW['bathroom_dildos'] = 1 and motherknowsdildo = 1:
+		'<i>Huh? Where''d my dildo go? I thought I- oh shit! <<$npc_nickname[''A29'']>> probably took it again...</i>'
+	elseif motherQW['bathroom_dildos'] > 1 and vanrPar_suction_dildo = 0:
 		'<i>Huh? Where''d my dildos go? I thought I left them right here...</i>'
+	elseif motherQW['bathroom_dildos'] = 1 and vanrPar_suction_dildo = 0:
+		'<i>Huh? Where''d my dildo go? I thought I left it right here...</i>'
 	end
 
 	*nl