Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife

locations/MartinTalk.qsrc

@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
 	
-	elseif StoryLine = 1 and ParHomeBlock = 0:
+	elseif StoryLine = 1 and home_owned[2] = 1:
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'

locations/abduction.qsrc

@@ -255,6 +255,13 @@ if $ARGS[0] = 'abdBrokenGiveTools':
 	'"Aren''t you glad, whore? These dildos are here for you to train on, so you can perform better later in a "live" situation."'
 	'"Uhmm... thank you, Master."'
 	'He puts the stuff down next to your bed and leaves without saying another word.'
+	if lactate > 0:
+		if breastpump = 0:breastpump = 1
+		'In the bottom of the box, under the various dildos, you also found a working breast pump.'
+		if lact_engorgement > 3:
+		 'You are relieved, that you can now empty your painfully full breasts'
+		end
+	end
 	act 'Continue':gt 'abduction', 'abdRoom'
 end
 
@@ -568,6 +575,9 @@ if $ARGS[0] = 'abdFood':
 
 	if abdTools = 1:
 		act 'Train with dildos':gt 'abduction', 'abdTrainDildos'
+		if breastpump > 0:
+			act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+		end
 	end
 
 	if vitamin > 0:
@@ -600,11 +610,6 @@ if $ARGS[0] = 'abdFood':
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-	if breastpump > 0:
-		act 'Use breast pump':
-			gt 'lact_lib', 'bp_milking'
-		end
-	end
 	act 'Take a cold shower (0:15)':
 		cumspclnt = 1
 		gs 'cum_cleanup'
@@ -1654,10 +1659,10 @@ if $ARGS[0] = 'abdTrainDildosMouthBigUse':
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorse':
-	if pcs_throat >= dildoHorse:
+	if pcs_throat >= 35:
 		'You feel that your throat can accomodate this dildo easily.'
 		act 'Use it':gt 'abduction', 'abdTrainDildosMouthHorseUse'
-	elseif pcs_throat <= dildoHorse and pcs_throat > dildoBig:
+	elseif pcs_throat <= 35 and pcs_throat > dildoBig:
 		'You feel that this dildo will stretch your throat, making it a bit deeper.'
 		act 'Use it':gt 'abduction', 'abdTrainDildosMouthHorseUse'
 	else
@@ -1668,10 +1673,11 @@ if $ARGS[0] = 'abdTrainDildosMouthHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
-	dick = 40
+	dick = 35
 	if pcs_throat > 35:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorse.mp4"></video></center>'
 		'You start sucking the dildo with ease, your throat swallows it whole without any problem.'
+		gs 'stat'
 		gs 'arousal', 'deepthroat', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorsehurt.mp4"></video></center>'

locations/gschool_grounds.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'main':
 		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock ! 1:
+	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour = 14:
 			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
 		if $clothingworntype = 'school' or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'main':
 
 	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1:
+	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0:
 		act 'Go to detention': gt 'gschool_detention', 'start'
 	end
 

locations/lact_lib.qsrc

@@ -293,7 +293,8 @@ if $ARGS[0] = 'bp_milking':
 	else
 		*clr
 		cla
-		pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
+		pumptime = input ("How long do you plan to pump your breasts? <br>(no input defaults to 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
 		if pumptime <= 0 or pumptime > 60:
 			minut += 2
 			act 'Don''t pump':gt $loc, $metka
@@ -314,7 +315,8 @@ if $ARGS[0] = 'man_milking':
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
+		pumptime = input ("How long would you like to milk your breasts? <br>(no input defaults to 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
 		if pumptime <= 0 or pumptime > 60:
 			minut += 2
 			act 'Don''t milk':gt $loc, $metka

locations/stat_display.qsrc

@@ -666,14 +666,14 @@ if dirtyclothes = 1 and swamp_clothes = 0:
 	end
 end
 
-if lactate = 1 and night_mode = 0:
+if lactate = 1:
 	if lactatemv >= lactatemm-1:
-		if lact_engorgement > 3 and lact_engorgement <= 6:
+		if lact_engorgement > 0 and lact_engorgement < 3:
+			$stat_msg += '<BR><font color = orange>Your breasts are so full they hurt.</font><BR>'
+		elseif lact_engorgement > 3 and lact_engorgement <= 6:
 			$stat_msg += '<BR><font color = red>Your breasts are so full they hurt and you can feel milk seeping out.</font><BR>'
 		elseif lact_engorgement > 6:
 			$stat_msg += '<BR><font color = red>Your breasts are so full they hurt and you can feel your milk spraying out.</font><BR>'
-		else
-			$stat_msg += '<BR><font color = orange>Your breasts are so full they hurt.</font><BR>'
 		end
 		if $clothingworntype = 'nude' and lactatemess > 0:
 			if lactatemess < 3: