Merge remote-tracking branch 'Lusticon/master'

locations/mother.qsrc

@@ -288,8 +288,9 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if motherKnowRaped = 0 and (rape > 0 or hidden_rape > 0):
+		if rape_count > motherKnowRaped:
 			act 'Tell her about your rape':
+				motherKnowRaped = rape_count
 				gt 'mother_chats', 'rape_talk'
 			end
 		end
@@ -1959,6 +1960,7 @@ if $ARGS[0] = 'dildo_find':
 	killvar 'mom_found_dildo_variable'
 	!! Effectively blocks this from happening again... can be changed if a 'repeat' version of this scene is ever written
 	motherQW['seen_dildos'] = 1
+	motherKnowDildo = 1
 	gs 'stat'
 	!! TEMPORARY PICTURE
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -1973,7 +1975,7 @@ if $ARGS[0] = 'dildo_find':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You look at her with a firm look. "I bought it with my own money."'
 		'She looks at you in confusion. "Why would you ever want to spend your money on something like this?"'
-		if mom_dildo = 1:
+		if selfmomtoyplay = 1:
 			'"I don''t know, I saw that you had one and wanted to have one of my own..." you try to explain.'
 			'Your <<$npc_nickname[''A29'']>> walks up to you and starts brushing your hair. "You''re aware this is for adults only, right? It''s not something that you should be owning. You''re still too young for this..."'
 		else

locations/mother_chats.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'rape_talk':
 	*clr & cla
 	minut += 5
+	if motherKnowSpravka = 0: motherKnowSpravka = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'
 	'"<<$npc_nickname[''A29'']>>..." you say to get her attention. However, before she can respond or even turn to look at you, the emotions and trauma take over. "I''ve been raped!" You barely manage to say it before the flood gates open and you''re sobbing in front of her.'
@@ -100,7 +101,6 @@ if $ARGS[0] = 'rape_talk':
 							pcs_hydra += 60
 						end
 						pcs_willpwr += 5
-						motherKnowSpravka = 1
 						minut += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'

locations/pav_aptcourtev.qsrc

@@ -1630,7 +1630,7 @@ if $ARGS[0] = 'two_boys':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal1.jpg"></center>'
 					'You sit down on the cushion. "Guys, can''t I just suck you off? I''m still a virgin."'
-					'They both scoff at that. "Bullshit!" one of thr+em staes and you give him a serious look and nod.' 
+					'They both scoff at that. "Bullshit!" one of them staes and you give him a serious look and nod.' 
 					'They pause for a second and the other one says "Well good thing you go more holes then. Lay down on your side." He grins as you do it before adding "Don''t worry, we won''t pop your cherry."'
 					*nl
 					'One of them walks over, pushes you over so you''re laying on your side, and sticks his dick back in your mouth, making you unable to see what the other one is doing, but you feel him moving in behind you. A moment later, you feel slick fingers lubing up your asshole before you feel the head of his cock against it.'

locations/saveupdater.qsrc

@@ -2616,6 +2616,10 @@ if temp_current_save_version < 00090202:
 	killvar'BDSMrole'
 	killvar'BDSMpayDay'
 
+	if motherQW['seen_dildos'] > 0 and motherKnowDildo = 0: motherKnowDildo = 1
+	if motherQW['seen_dildos'] = 0 and motherKnowDildo > 0: motherQW['seen_dildos'] = 1
+	if motherKnowRaped > 0: motherKnowSpravka = 1
+
 end
 
 

locations/sex_ev_reactions_creampie.qsrc

@@ -3238,6 +3238,8 @@ if $ARGS[0] = 'creampie_freakout':
 				end
 			end
 		end
+	else
+		gs'sex_ev_sex', 'sex_end'
 	end
 end
 

locations/train_events.qsrc

@@ -302,7 +302,7 @@ if $ARGS[0] = 'breastfeed':
 				end
 				:breastfeedthebaby
 				if temp_var = 2:
-					gs 'train_incidental', 'breastfeedthebaby'
+					gs 'train_events', 'breastfeedthebaby'
 				elseif temp_var <= 1:
 					if pcs_inhib >= 40:
 						act 'Prove it to him':