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

locations/bed2.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = '':
 	$menu_loc = 'bed2'
 	$menu_arg = ''
 	menu_off = 0
+	$alarmloc = 'bed2'
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
@@ -14,22 +15,55 @@ if $ARGS[0] = '':
 	*nl
 
 	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''bed2''">off</a>.'
 	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''bed2''">on</a>.'
 	end
+	*nl
+
+	if bedPanty = 0:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 1 & gs ''stat'' & & gt ''bed2''">as is</a>.'
+	elseif bedPanty = 1:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 2 & gs ''stat'' & gt ''bed2''">yes</a>.'
+	elseif bedPanty = 2:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 0 & gs ''stat'' & gt ''bed2''">no</a>.'
+	end
+	*nl
 
-	if pcs_makeup ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
+	if analplug = 1:
+		if bedAnal = 0:
+			'Should you remove your anal plug before bed? Currently - <a href="exec:bedAnal = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+		elseif bedAnal = 1:
+			'Should you remove your anal plug before bed? Currently - <a href="exec:bedAnal = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+		end
+	end
+
+	if vibrator = 1 and cheatVib = 1:
+		if bedVibrator = 0:
+			'Should you remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+		elseif bedVibrator = 1:
+			'Should you remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+		end
+	end
+
+	if pcs_makeup ! 1:*nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
 
 	if pcs_sleep <= 80:
 		if $clothingworntype = 'nude':
-			$sleep_txt = 'Go to sleep'
+			$sleep_txt = 'Go to bed'
 		else
-			$sleep_txt = 'Undress and go to sleep'
+			$sleep_txt = 'Undress and go to bed'
 		end
 		if succubusQW = 2:
 			act '<<$sleep_txt>>':
 				menu_off = 1
+				if bedPanty = 2:
+					gs 'underwear', 'remove'
+				elseif bedPanty = 1:
+					gs 'underwear', 'wear'
+				end
+				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
+				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if $clothingworntype ! 'nude':
 					strip_here = 1
 					gs 'clothing', 'strip'
@@ -39,6 +73,13 @@ if $ARGS[0] = '':
 		else
 			act '<<$sleep_txt>>':
 				menu_off = 1
+				if bedPanty = 2:
+					gs 'underwear', 'remove'
+				elseif bedPanty = 1:
+					gs 'underwear', 'wear'
+				end
+				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
+				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if disable_autosave = 0:
 					if StoryLine = 0:
 						savegame 'autosave.sav'
@@ -109,12 +150,12 @@ if $ARGS[0] = '':
 				gt 'selfplay', 'start'
 			end
 		end
-	end	
-	act 'Sleep options':gt 'bed2', 'options'
+	end
 end
 
 if $ARGS[0] = 'sleep':
 	cls
+	*clr & cla
 	menu_off = 1
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
@@ -122,6 +163,12 @@ if $ARGS[0] = 'sleep':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	gs 'stat'
+	*nl
+	if budilnikOn = 1:
+		'You run through your regular nightly routine, seting your alarm for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+', you undress, and prepare for sleep:'
+	else
+		'You run through your regular nightly routine, not bothering to setting your alarm, you undress, and prepare for sleep:'
+	end
 	pcs_hairbsh = 0
 	InSleep = 1
 	cloth_vid = 0
@@ -131,7 +178,7 @@ if $ARGS[0] = 'sleep':
 	else
 		notathomesleep = 0
 	end
-	
+
 	if $loc = 'nichBedroomServant':
 		gs 'nichBedroomServant', 'sleepEvents'
 	end
@@ -139,22 +186,75 @@ if $ARGS[0] = 'sleep':
 	if succubusflag = 1 and sucwalkday <= daystart:
 		If succublvl <= rand(1,20) or pcs_willpwr < ((succublvl * willpowermax) / 10) or sucpowzeroed >= 3: gs 'succubus', 'sucwalkinginit'
 	end
+	if analplug = 1 and vibrator = 1:
+		if bedAnal = 1 and bedVibrator = 1:
+			*nl
+			'You remove your butt plug and your vibrator.'
+		elseif bedAnal = 0 and bedVibrator = 0:
+			*nl
+			'You decide to leave your butt plug and vibrator in.'
+		end
+	elseif analplug = 1 or vibrator = 1:
+		if analplug = 1:
+			if bedAnal = 1:
+				*nl
+				'You remove your butt plug.'
+			elseif bedAnal = 0:
+				*nl
+				'You decide to leave your butt plug in.'
+			end
+		end
+		if vibrator = 1:
+			if bedVibrator = 1:
+				*nl
+				'You remove your vibrator.'
+			elseif bedVibrator = 0:
+				*nl
+				'You decide to leave your vibrator in.'
+			end
+		end
+	end
+	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
+		*nl
+		'You put on your bra and panties.'
+	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype = 'none':
+		*nl
+		'You put on your bra.'
+	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype ! 'none':
+		*nl
+		'You put on your panties.'
+	elseif bedPanty = 1:
+		*nl
+		'You change your bra and panties.'
+	elseif bedPanty = 2:
+		*nl
+		'You remove your bra and panties.'
+	else
+		*nl
+		'You were too tired to worry about your underwear, so for tonight you left it as is.'
+	end
+	if pcs_makeup > 1:
+		pcs_makeup = 0
+		vidageday -= 1
+		*nl
+		'You went to bed wearing your makeup, which will smear your face as you sleep; your skin will age faster from this!'
+	end
+	if fat > 5 and stringimplant = 1: silicone += 1 & fat -= 5
+	act 'Sleep...': gt 'bed2', 'dream'
+end
 
-	if analplugIN = 1 and bedanal = 0:analplugIN = 0 & 'Before going to bed you remove your butt plug.'
-	if vibratorIN = 1 and bedvibrator = 0:vibratorIN = 0 & 'Before going to bed you remove your vibrator'
-	if pcs_makeup > 1:pcs_makeup = 0 & vidageday -= 1 & 'Makeup smears your face, you think that it looks bad sleeping in makeup, and your skin will age faster from this.'
-	if fat > 5 and stringimplant = 1:silicone += 1 & fat -= 5
-
-	wait 450
-	*clr
+if $ARGS[0] = 'dream':
+	*clr & cla
 	gs 'dreams', 'start'
+	*nl
+	'<<$waketext>>'
 
 	:loopson
 	minut += 1
 	stime += 1
 	if recuperation = 0:pcs_health += 5
 
-	if vibratorIn = 1:
+	if vibratorIN = 1:
 		vtime += 1
 		if vtime >= 5:
 			pcs_horny +=1
@@ -171,9 +271,8 @@ if $ARGS[0] = 'sleep':
 			'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>.'
 
 			act 'Go back to sleep':
-				*clr
-				cla
-				gt 'bed2', 'sleep'
+				*clr & cla
+				gt 'bed2', 'dream'
 			end
 
 			act 'Give up trying to sleep':
@@ -248,7 +347,7 @@ if $ARGS[0] = 'wake_horny':
 	act 'Try and go back to sleep':
 		pcs_mood -= 10
 		pcs_sleep -= 5
-		gt 'bed2', 'sleep'
+		gt 'bed2', 'dream'
 	end
 
 	act 'Masturbate': InSleep = 0 & gt 'selfplay', 'start'
@@ -278,7 +377,6 @@ end
 
 if $ARGS[0] = 'wake':
 	menu_off = 1
-	'<<$waketext>>'
 	InSleep = 1
 	gs 'stat'
 
@@ -364,7 +462,7 @@ if $ARGS[0] = 'extra':
 		minut = (100-pcs_sleep)*6
 		pcs_sleep += 100
 		gs 'stat'
-		gt 'bed2', 'sleep'
+		gt 'bed2', 'dream'
 	end
 end
 
@@ -373,13 +471,6 @@ if $ARGS[0] = 'end':
 	InSleep = 0
 	slept_in = 0
 	strip_here = 0
-	if $braworntype ! 'none': gs 'bras', 'remove'
-	if $pantyworntype ! 'none':gs 'panties', 'remove'
-	if bedpanty = 1:
-		gs 'underwear', 'remove'
-	else
-		gs 'underwear', 'wear'
-	end
 	if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
@@ -547,35 +638,7 @@ if $ARGS[0] = 'magbstchoice':
 		killvar 'mgf2bnocnt'
 		gt 'bed2', 'sleep'
 	end
-	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'sleep'
-end
-
-if $ARGS[0] = 'options':
-	cla
-	menu_off = 1
-	
-	act 'Return':gt 'bed2'
-	act 'Set Alarm Clock':gt 'budilnik', 'start'
-	if bedPanty = 0:
-		act 'Wear underwear in the morning: Currently (ON)':bedpanty = 1 & gt 'bed2', 'options'
-	else
-		act 'Wear underwear in the morning: Currently (OFF)':bedpanty = 0 & gt 'bed2', 'options'
-	end
-	if analplug = 1:
-		if bedanal = 0:
-			act 'Remove your analplug at night: Currently (ON)':bedanal = 1 & gt 'bed2', 'options'
-		else
-			act 'Remove your analplug at night: Currently (OFF)':bedanal = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	if vibrator = 1 and cheatVib = 1:
-		if bedvibrator = 0:
-			act 'Remove your vibrator at night: Currently (ON)':bedvibrator = 1 & gt 'bed2', 'options'
-		else
-			act 'Remove your vibrator at night: Currently (OFF)':bedvibrator = 0 & gt 'bed2', 'options'
-		end
-	end
+	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'dream'
 end
 
 --- bed2 ---------------------------------

locations/gschool_chats2.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'artem':
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 
-	if artemLernQW = 0 and npc_rel['A2'] >= 60:
+	if artemLernQW = 0 and npc_rel['A2'] > 20:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 			artemLernQW = 1

locations/mirror.qsrc

@@ -401,7 +401,7 @@ if $ARGS[0] = 'steam':
 		act 'Look in the mirror':gt 'mirror','start'
 	end
 	act '<b>Move away from the mirror</b>':gt 'mirror','fin'
-end &! --- steam ----
+end
 
 if $ARGS[0] = 'brush':
 	menu_off = 1
@@ -414,13 +414,12 @@ if $ARGS[0] = 'brush':
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
 	'You brush your hair.'
-	wait 1000
 	if $mirrorloc = 'mirror':
-		gt 'mirror', 'start'
+		act 'Continue': gt 'mirror', 'start'
 	else
-		gt 'mirror', 'fin'
+		act 'Continue': gt 'mirror', 'fin'
 	end
-end &! --- brush ----
+end
 
 if $routine1 ! '' and pcs_makeup < 2:
 	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:

locations/succubus.qsrc

@@ -458,14 +458,14 @@ if $args[0] = 'sucwalkinginit':
 	if succublvl <= 2:
 		if $pantyworntype ! 'none': gs 'underwear', 'remove'
 	else
-		if bedpanty = 1: 
-			gs 'underwear', 'remove'
-		else
+		if bedPanty = 1: 
 			gs 'underwear', 'wear'
+		elseif bedPanty = 2:
+			gs 'underwear', 'remove'
 		end
 	end
-	if analplugIN = 1: analplugIN = 0
-	if vibratorIN = 1: vibratorIN = 0
+	if analplugIN = 1 and bedAnal = 1: analplugIN = 0
+	if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 
 !!This is the simple method for the base level succubus
 	if succublvl = 1 and $lastwornclothingtype ! 'nude':

locations/therapist.qsrc

@@ -286,11 +286,11 @@ if $ARGS[0] = 'hypnoSuck':
 		'"Get dressed, <i>Cunt</i>, but forget the underwear. You didn''t wear one when you come, and you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catch a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
 		gs 'underwear', 'remove'
-		bedpanty = 1
+		bedPanty = 2
 	else
 		'"Get dressed, <i>Cunt</i>. I see you didn''t wear underwear. Very good, you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catch a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
-		bedpanty = 1
+		bedPanty = 2
 	end
 	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
 	gs 'arousal', 'end'
@@ -357,11 +357,11 @@ if $ARGS[0] = 'hypnoFuck':
 		'"Get dressed, <i>Cunt</i>, but forget the underwear. You didn''t wear any when you arrived, and you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catching a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
 		gs 'underwear', 'remove'
-		bedpanty = 1
+		bedPanty = 2
 	else
 		'"Get dressed, <i>Cunt</i>. I see you didn''t wear underwear. Very good, you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catching a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
-		bedpanty = 1
+		bedPanty = 2
 	end
 	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
 	$orgasm_or = 'yes'
@@ -417,11 +417,11 @@ if $ARGS[0] = 'hypnoAnal':
 		'"Get dressed, <i>Cunt</i>, but forget the underwear. You didn''t wear one when you come, and you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catch a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
 		gs 'underwear', 'remove'
-		bedpanty = 1
+		bedpanty = 2
 	else
 		'"Get dressed, <i>Cunt</i>. I see you didn''t wear underwear. Very good, you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catch a glimpse of your naked pussy or ass."'
 		'He watches you getting dressed with a small smile in his face, especially enjoying the sight of you completely ignoring your underwear.</font>'
-		bedpanty = 1
+		bedpanty = 2
 	end
 	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
 	$orgasm_or = 'yes'