Merge remote-tracking branch 'Lusticon/master'

locations/femcyc.qsrc

@@ -628,7 +628,7 @@ if $ARGS[0] = 'cyc2':
 		cfw_idx = 0
 		cfw_sz = arrsize('wombAmount')
 		:FathLottoLoop
-		if cfw_idx < cfw_sz:
+		if cfw_idx < cfw_sz and cum_total > 0:
 			cfl_ct = (wombAmount[cfw_idx] * 100) / cum_total
 			if cfl_ct < 1: cfl_ct = 1
 			cfl_idx = arrsize('$cumfathlotto')

locations/mother.qsrc

@@ -283,7 +283,7 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if rape_count > 0 and rape_day+7 > daystart:
+		if rape_count > 0 and rape_day+7 > daystart and rape_talk_mom ! rape_count:
 			act 'Tell her about your rape':
 				gt 'mother_chats', 'rape_talk'
 			end
@@ -1150,9 +1150,10 @@ if $ARGS[0] = 'pregreact1':
 					act 'Continue': gt 'mother'
 				end
 			end
-			if rape_day+30 > daystart:
+			if rape_day+30 > daystart and rape_talk_mom ! rape_count:
 				act'I was raped':
 					cla & *nl
+					rape_talk_mom = rape_count
 					'"I... I don''t actually know. I was..." you stammer as you struggle to get the next word out. "I was raped..."'
 					'"What?! Are you okay?! Why did''t you tell me sooner?!"'
 					'"I was scared and ashamed and I didn''t know how you would react..." Your lip quivers as tears begin to flow down your face. "I''m sorry. I should have said something."'

locations/mother_chats.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'rape_talk':
 	*clr & cla
 	minut += 5
+	rape_talk_mom = rape_count
 	if motherKnowSpravka = 0: motherKnowSpravka = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'

locations/pav_pool.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'mirror':
 	end
 
 	act 'Go back to the changing room': gt 'pav_pool', 'lockerfemale'
-	if cumloc[11] = 1 or cumloc[12] or cumloc[16] = 1:
+	if cumloc[11]+cumloc[12]+cumloc[16] > 0:
 		act 'Clean the cum from your face':
 			*clr & cla
 			menu_off = 1
@@ -283,7 +283,7 @@ if $ARGS[0] = 'mirror':
 			act 'Finish': gt 'pav_pool', 'mirror'
 		end
 	end
-	if pcs_makeup >= 2:
+	if pcs_makeup <> 1 and cosmetic_tattoo = 0:
 		act 'Wash your make-up off':
 			*clr & cla
 			minut += 5