Browse Source

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

Kevin_Smarts 3 years ago
parent
commit
d7d8fcfb37
3 changed files with 70 additions and 39 deletions
  1. 29 14
      locations/bed2.qsrc
  2. 14 14
      locations/gschool_cheerleading.qsrc
  3. 27 11
      locations/sleep.qsrc

+ 29 - 14
locations/bed2.qsrc

@@ -313,18 +313,17 @@ if $ARGS[0] = 'dream':
 	varsleep['time_to_full'] += 150 + rand(0,60)
 
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
-
-
-	if alarm_holiday = 1 and (kanikuli > 0 or week > 5):
-		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-	elseif week > 5:
-		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-	else
-		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
-	end
+	varsleep['alarm_time_end'] = daystart*1440 + timerEnd * 60 + timerEndM
+	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
+	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-
-	if budilnikOn = 1: varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now']) else varsleep['minutes to wakeup'] = varsleep['time_to_full']
+	if budilnikOn = 1: 
+		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
+		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
+	else 
+		varsleep['minutes to wakeup'] = varsleep['time_to_full']
+		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
+	end
 
 	:loopson_bed
 	minut += 1
@@ -378,7 +377,23 @@ if $ARGS[0] = 'dream':
 
 	
 	varsleep['minutes to wakeup'] -= 1
-	if varsleep['minutes to wakeup'] > 0:jump 'loopson_bed'
+	varsleep['minutes to wakeup end'] -= 1
+
+	if alarm_holiday = 1 and kanikuli > 0:
+	!! use weekend time alarm
+		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+	elseif week > 5:
+	!! use weeken time alarm 
+		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+	else 
+		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
+		if varsleep['minutes to wakeup'] > 0:jump 'loopson_bed'
+	end
+
+
+	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 
 	if slept_in = 1:
 		gs 'stat'
@@ -388,11 +403,11 @@ if $ARGS[0] = 'dream':
 		gs 'stat'
 		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, no longer tired and ready to start the day with plenty of sleep.'
 		gs 'bed2', 'wake'
-	elseif pcs_sleep >= 100 and budilnikOn = 1 and alarm_now >= alarm_set:
+	elseif pcs_sleep >= 100 and budilnikOn = 1 and varsleep['time_now'] >= varsleep['alarm_time']:
 		gs 'stat'
 		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, just before your alarm goes off. You''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
-	elseif budilnikOn = 1 and alarm_now = alarm_time:
+	elseif budilnikOn = 1 and varsleep['time_now'] = varsleep['alarm_time']:
 		pcs_mood -= 10
 		gs 'stat'
 		$waketext = 'Your alarm goes off at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''

+ 14 - 14
locations/gschool_cheerleading.qsrc

@@ -557,7 +557,7 @@ if $ARGS[0] = 'shower':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/lina2.jpg"></center>'
 				'She''s putting on a show that''s too good to resist. You continue to watch her but she suddenly arches her back and catches you spying.
-				"<<$pcs_nickname>>!!" she exclaims in surprise as she snaps her legs shut. "I didn''t think anyone else was here." She looks down in embarassment. "Christina asked me eat her out earlier and it left me feeling super horny. I just needed a little relief of my own was all. Can... Can you just pretend that you didn''t see me please?'
+				"<<$pcs_nickname>>!!" she exclaims in surprise as she snaps her legs shut. "I didn''t think anyone else was here." She looks down in embarrassment. "Christina asked me eat her out earlier and it left me feeling super horny. I just needed a little relief of my own was all. Can... Can you just pretend that you didn''t see me please?'
 				minut += 5
 				gs 'stat'
 
@@ -628,21 +628,21 @@ if $ARGS[0] = 'shower':
 				gs 'arousal', 'cuni_give', 5
 				if rand(0,2) < 2:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/christina_force.jpg"></center>'
-					'She decides to change position, turning around and kneeling on the bench. "I like this position better. Then you can eat my ass as well!" You squirm as she grabs your head and forces your face into her crotch. Unable to move, you reluctantly start running your tongue up and down her labia before drifting down to her clit and flicking your tongue over it. She moans in pleasure. "Oh fuck yeah, just like that bitch!" Confident you''re submissive to her, she lets go of your head and you continue to reluctantly please her for a few minutes before her knees give out to the pleasure and she ends up laying flat on the bench, her legs split wide. "Oh fuck! Yes, yes, yes! Lick my asshole bitch! Taste my fucking ass!" she screams. You gaze up at her puckered rim.
-					Having no other choice, you start licking her anus. She moans in pleasure and reaches round to fondle her wet pussy. "Oh fuck yes, keep going! I''m going to cum!" After a few seconds, she screams out and you are drenched by the flood of pussy juice that gushes from her as her orgasm washes over her. She rides through the waves of pleasure as you stay kneeling on the floor. Once she recovers, she stands and gets dressed before throwing your outfit at you. You quickly stuff it in your bag before getting up and running to wash your face. Thankfully, Christina is gone when you return and you get dressed in peace.'
-					gs 'arousal', 'rimming_give', 5
+					'She decides to change position, turning around and kneeling on the bench. You squirm as she grabs your head and forces your face into her crotch. Unable to move, you reluctantly start running your tongue up and down her labia before drifting down to her clit and flicking your tongue over it. She moans in pleasure. "Oh fuck yeah, just like that bitch!" She maintains a tight grip on your hair as you reluctantly please her for a few minutes before her knees give out to the pleasure and she ends up laying flat on the bench, her legs split wide. "Oh fuck! Yes, yes, yes! Keep going bitch!"
+				    She continues moaning loudly in pleasure and after a few seconds, she screams out and you are drenched by the flood of pussy juice that gushes from her as her orgasm washes over her. She rides through the waves of pleasure as you stay kneeling on the floor. Once she recovers, she stands and smiles. "You look a little dirty there. Here, let me help." She walks over to your crumpled uniform and picks it up before returning to you and shoving it in your face. Her juices soak into the fabric as she roughly rubs it across your face. "There. All cleaned up bitch!" she laughs before tossing your stained and crumpled outfit down at you.  
+					You quickly stuff it in your bag and she laughs as you quickly scramble to your feet and run to clean yourself up. Thankfully, Christina is gone when you return and you get dressed in peace.'
+					gs 'arousal', 'cuni_give', 5
 					gs 'stat'
 
 					act 'Get dressed': gt 'gschool_grounds', 'change_room'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/albina_rescue.jpg"></center>'
 					'You are kneeling between Christina''s legs, desperately looking for a way out. "Nobody is coming to help you bitch, so you might as well just get this over with!" Christina barks when she notices your reluctance. Growing impatient, she grabs you by the hair and is about to force your head into her crotch when the door slams open and Albina storms in.
-					"Just what the FUCK do you think you''re doing!!!?" she screams. "I thought I told you this little game of yours was supposed to stop?" Christina just laughs. "You''re like a chihuahua when you get angry, you know that? Just ''yap yap yap.''" she says while making a mocking motion with her hand. "Am I not allowed to have a little fun? What''s the harm in initiating the new girl?"'
+					"Just what the FUCK do you think you''re doing!!??" she screams. "I thought I told you this little game of yours was supposed to stop?" Christina just laughs. "You''re like a chihuahua when you get angry, you know that? Just ''yap yap yap.''" she says while making a mocking motion with her hand. "Am I not allowed to have a little fun? What''s the harm in initiating the new girl?"'
 
 					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickname>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
-					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you be having your Starlets give the ''star'' treatment?" she says with a wide grin.
-					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips.
-					Christina again just laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
+					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you and that precious dance group of yours be out there giving the ''star'' treatment to your ''fans''?" she says with a wide grin.
+					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips and laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
 
 					"Are you okay <<$pcs_nickname>>? That girl goes way too far in the name of amusing herself. I think she just does it to act tough in front of her obidient little lapdogs."
 					She grabs your outfit off the floor and places it in your bag as you get dressed. Once you''re done, she insists on walking you home, despite you assuring her that you''re fine, and you both leave together.'
@@ -663,9 +663,10 @@ if $ARGS[0] = 'shower':
 				gs 'stat'
 				if rand(0,2) < 2:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/christina_force.jpg"></center>'
-					'She gets on all fours on the bench in front of you. "I like this position. Then you can eat my ass as well!" You squirm as she grabs your head and forces your face into her crotch. Unable to move, you reluctantly start running your tongue up and down her labia before drifting down to her clit and flicking your tongue over it. She moans in pleasure. "Oh fuck yeah, just like that bitch!" Confident you''re submissive to her, she lets go of your head and you continue to reluctantly please her for a few minutes before her knees give out to the pleasure and she ends up laying flat on the bench, her legs split wide. "Oh fuck! Yes, yes, yes! Lick my asshole bitch! Taste my fucking ass!" she screams. You gaze up at her puckered rim.
-					Having no other choice, you start licking her anus. She moans in pleasure and reaches round to fondle her wet pussy. "Oh fuck yes, keep going! I''m going to cum!" After a few seconds, she screams out and you are drenched by the flood of pussy juice that gushes from her as her orgasm washes over her. She rides through the waves of pleasure as you stay kneeling on the floor. Once she recovers, she stands and gets dressed before throwing your outfit at you. You quickly stuff it in your bag before getting up and running to wash your face. Thankfully, Christina is gone when you return and you get dressed in peace.'
-					gs 'arousal', 'rimming_give', 5
+					'She decides to change position, turning around and kneeling on the bench. You squirm as she grabs your head and forces your face into her crotch. Unable to move, you reluctantly start running your tongue up and down her labia before drifting down to her clit and flicking your tongue over it. She moans in pleasure. "Oh fuck yeah, just like that bitch!" She maintains a tight grip on your hair as you reluctantly please her for a few minutes before her knees give out to the pleasure and she ends up laying flat on the bench, her legs split wide. "Oh fuck! Yes, yes, yes! Keep going bitch!"
+				    She continues moaning loudly in pleasure and after a few seconds, she screams out and you are drenched by the flood of pussy juice that gushes from her as her orgasm washes over her. She rides through the waves of pleasure as you stay kneeling on the floor. Once she recovers, she stands and smiles. "You look a little dirty there. Here, let me help." She walks over to your crumpled uniform and picks it up before returning to you and shoving it in your face. Her juices soak into the fabric as she roughly rubs it across your face. "There. All cleaned up bitch!" she laughs before tossing your stained and crumpled outfit down at you.  
+					You quickly stuff it in your bag and she laughs as you quickly scramble to your feet and run to clean yourself up. Thankfully, Christina is gone when you return and you get dressed in peace.'
+					gs 'arousal', 'cuni_give', 5
 					gs 'stat'
 
 					act 'Get dressed': gt 'gschool_grounds', 'change_room'
@@ -675,9 +676,8 @@ if $ARGS[0] = 'shower':
 					"Just what the FUCK do you think you''re doing!!!?" she screams. "I thought I told you this little game of yours was supposed to stop?" Christina just laughs. "You''re like a chihuahua when you get angry, you know that? Just ''yap yap yap.''" she says while making a mocking motion with her hand. "Am I not allowed to have a little fun? What''s the harm in initiating the new girl?"'
 
 					'Albina scoffs. "A LITTLE FUN?! I was late to practice when Karine joined and you convinced her she needed to tit fuck the coach to be allowed on the squad! Now you''re wanting <<$pcs_nickname>> to go down on you?!" She kneels down next to you and stares straight at Christina. "I know why you volunteered to go with Karine. You wouldn''t want to lose your chance at the championships if the principal were to find out now would you?"
-					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you be having your Starlets give the ''star'' treatment?" she says with a wide grin.
-					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips.
-					Christina again just laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
+					Christina laughs back in Albina''s face. "Nobody would believe you. Why are you even here anyway? Shouldn''t you and that precious dance group of yours be out there giving the ''star'' treatment to your ''fans''?" she says with a wide grin.
+					Albina clenches her fists hard. "GET THE FUCK OUT OF MY FACE!!" Christina smirks and stands. "I''ve got better things to do anyways." she quips and laughs as she gets up and starts getting dressed. Albina sits on the bench between the two of you, staring daggers at Christina to the point you think things might actually get violent between them. Thankfully, Christina finishes dressing, but mocks you before she leaves. "Welcome to the squad <<$pcs_firstname>>. Watch out for this little chihuahua though. She bites." she says with more than a hint of contempt in her voice. Once she''s gone, Albina turns to you.
 
 					"Are you okay <<$pcs_nickname>>? That girl goes way too far in the name of amusing herself. I think she just does it to act tough in front of her obidient little lapdogs."
 					She grabs your outfit off the floor and places it in your bag as you get dressed. Once you''re done, she insists on walking you home, despite you assuring her that you''re fine, and you both leave together.'

+ 27 - 11
locations/sleep.qsrc

@@ -13,16 +13,18 @@ if $ARGS[0] = 'simple':
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 
 
-	if alarm_holiday = 1 and (kanikuli > 0 or week > 5):
-		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-	elseif week > 5:
-		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-	else
-		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
-	end
+	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
+	varsleep['alarm_time_end'] = daystart*1440 + timerEnd * 60 + timerEndM
+	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
+	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-
-	if budilnikOn = 1: varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now']) else varsleep['minutes to wakeup'] = varsleep['time_to_full']
+	if budilnikOn = 1: 
+		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
+		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
+	else 
+		varsleep['minutes to wakeup'] = varsleep['time_to_full']
+		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
+	end
 
 	InSleep = 1
 	:loopson_sleep
@@ -37,9 +39,23 @@ if $ARGS[0] = 'simple':
 	end
 	
 	varsleep['minutes to wakeup'] -= 1
-	if varsleep['minutes to wakeup'] > 0:jump 'loopson_sleep'
+	varsleep['minutes to wakeup end'] -= 1
+
+	if alarm_holiday = 1 and kanikuli > 0:
+	!! use weekend time alarm
+		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+	elseif week > 5:
+	!! use weeken time alarm 
+		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+	else 
+		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
+		if varsleep['minutes to wakeup'] > 0:jump 'loopson_bed'
+	end
+	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 	InSleep = 0
 	gs'stat'
 end
 
---- sleep ---------------------------------
+--- sleep ---------------------------------