1
0

51 Incheckningar 57f1e43b34 ... 3b87f0fd82

Upphovsman SHA1 Meddelande Datum
  FenrirRed 3b87f0fd82 [fixed] Images linked wrong, some indentation, removed extra end and extra if 2 år sedan
  FenrirRed 21fd1e70a2 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  Kevin_Smarts 42cdd258c3 [removed] Default sports wear quick select as there will be 10 options for it and it wasn't working atm anyway 2 år sedan
  Kevin_Smarts d83e417f78 [fixed] Kitchen dynamics not updated in Mansion kitchen 2 år sedan
  Kevin_Smarts 22f3a1f014 [fixed] Default school uniform appearing multiple times in searches and changed starting outfits for CSB and TF starts so they can actually wear them 2 år sedan
  rachels d850e72d55 add lunch fun 2 (Vengeance_11) 2 år sedan
  FenrirRed 246a5188ac Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  rachels 9b56283f70 one more missing "s" 2 år sedan
  Kevin_Smarts b46754a695 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 år sedan
  Kevin_Smarts 5162f464b1 Merge remote-tracking branch 'Anya/master' 2 år sedan
  bgkjdgbizgblzdgbr fbe6fbb1d2 [fixed] Use of killvar deleted the target of the teleport before you did the act. Reporte be Fanzon. 2 år sedan
  rachels f5f1cba776 m -> mcnt (just for sure) 2 år sedan
  rachels 68910c30fd add "s" 2 år sedan
  rachels 0791878516 add new line 2 år sedan
  Anya 56cb52fcd8 [changed] gave the sexshop toys a proper menu to reduce actions and shorten code required 2 år sedan
  Kevin_Smarts 31aed79bb3 [fixed] starting swimwear was still using old variable so didn't get set, second starting uniforms were based on old set and all wrong and anal dildo and strap wasn't causing stretching. All pointed out by pokusny77 2 år sedan
  Kevin_Smarts 92ff86fd98 [fixed] Missing *clr & cla's 2 år sedan
  Kevin_Smarts f805b23458 [fixed] Bad variabe because I still can't copy/paste 2 år sedan
  Kevin_Smarts 865d855582 [fixed] Remember to save the file before posting it Kev 2 år sedan
  Kevin_Smarts 9ab45ad818 [changed] Minimums for food and drink values when using cheats set higher as precaution because the hunger was preventing some exercise actions (those values were changed but I'm future proofing) 2 år sedan
  Kevin_Smarts 14c0203a8d Merge remote-tracking branch 'Anya/master' 2 år sedan
  Anya ce7540ac89 [fixed] 2 missing ends 2 år sedan
  Kevin_Smarts 7c98689456 [changed] Hunger required to block exercises halved and player message changed to use the term hunger 2 år sedan
  Kevin_Smarts 0709090802 [fixed] Exit added by popular demand and fixed the exit when store closed 2 år sedan
  Kevin_Smarts 73347e657f [fixed] Extra if removed 2 år sedan
  Kevin_Smarts cce624d013 [added] New convenience store on the island to make it a bit less hassle when at uni 2 år sedan
  N0X 9d6567da73 [fixed] Succubus relationship with Katja 2 år sedan
  Kevin_Smarts a73f3e34da Merge branch 'master' of https://git.catrenelle.com/Vengeance_11/glife 2 år sedan
  Vengeance11 f6f67e3718 If I broke something, blame Kev. 2 år sedan
  Vengeance11 d703a3ed4c Text edits and fixes 2 år sedan
  Kevin_Smarts 2d7033bdc6 [text edit] Typos and errors spotted by Dybbuk 2 år sedan
  FenrirRed 82cfa1b655 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  Kevin_Smarts cc14247dd3 [fixed] forgot arousal end and had guys finishing in wrong locations 2 år sedan
  Kevin_Smarts b34fe83a16 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 år sedan
  bgkjdgbizgblzdgbr 67998f08ab [fixed] Another mistake noticed by Dadburry. 2 år sedan
  Kevin_Smarts b91be5e93d [added] Subscription info to gym changing room and 'gym' area so the player can plan accordingly 2 år sedan
  bgkjdgbizgblzdgbr fb59757a3b [fixed] Bugs form my commit. 2 år sedan
  Kevin_Smarts 5f3add1b6d [changed] Post stripping event re-written and no longer using the 'paysex' file and 4 new smaller random events for post stripping. All from ILoveNudes 2 år sedan
  Kevin_Smarts 913d6795a5 Merge remote-tracking branch 'Anya/master' 2 år sedan
  Kevin_Smarts 60d7667317 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 år sedan
  Kevin_Smarts 9164878201 Merge remote-tracking branch 'FenrirRed/master' 2 år sedan
  FenrirRed 5a10519b09 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  Anya d7cb495546 [changed] flash file to include new images 2 år sedan
  Anya e14d3ee40f [fixed] image bugs in new therapist stuff 2 år sedan
  Anya d86ae5521b [fixed] family tweak/bugs 2 år sedan
  Anya 63e40c0926 [fixed] missing apostrophe, breaking the footer 2 år sedan
  Kevin_Smarts c574ab6f21 [added] Lilly for uni content 2 år sedan
  bgkjdgbizgblzdgbr 18e64752e6 [changed] Updated the exercise gosub to use the time argument to calculate exp gain, fat burn and so on. Changed all looping of gs 'exercise', 'tier*', 0 to use the total time as argument. Reversed the fat burn of the tiers,and other small fixes. 2 år sedan
  bgkjdgbizgblzdgbr 76f51a9e67 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  bgkjdgbizgblzdgbr 49413b32ac Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 år sedan
  bgkjdgbizgblzdgbr 619e313950 [Changed] YOu can now talk to Anya baout Roma after they have made up. Making spying/threesomes possible. 2 år sedan
60 ändrade filer med 1516 tillägg och 1572 borttagningar
  1. 1 0
      glife.qproj
  2. 2 14
      locations/AlbStars.qsrc
  3. 1 1
      locations/FedorEv4.qsrc
  4. 1 1
      locations/LariskaGo.qsrc
  5. 0 1
      locations/MagEncounterFairy.qsrc
  6. 1 1
      locations/_attributes_scandalicious_swim_two.qsrc
  7. 6 1
      locations/abduction.qsrc
  8. 65 3
      locations/albina_school_sex.qsrc
  9. 10 23
      locations/albinahome.qsrc
  10. 26 26
      locations/alexandriaEv.qsrc
  11. 4 0
      locations/arousal.qsrc
  12. 1 5
      locations/beg.qsrc
  13. 10 25
      locations/beg1.qsrc
  14. 2 2
      locations/brother_voyeur.qsrc
  15. 1 1
      locations/budgetclothes.qsrc
  16. 2 2
      locations/cafe_parco.qsrc
  17. 2 0
      locations/city_island.qsrc
  18. 1 0
      locations/city_mansion_residence_1.qsrc
  19. 51 49
      locations/city_park.qsrc
  20. 5 1
      locations/city_sauna.qsrc
  21. 10 10
      locations/clothing.qsrc
  22. 4 4
      locations/clothing_QV.qsrc
  23. 46 42
      locations/crossfit_north_box.qsrc
  24. 53 46
      locations/danceclass.qsrc
  25. 1 1
      locations/ender.qsrc
  26. 75 59
      locations/exercise.qsrc
  27. 3 3
      locations/family.qsrc
  28. 4 1
      locations/family_schedule.qsrc
  29. 1 1
      locations/fathersex.qsrc
  30. 104 156
      locations/fit.qsrc
  31. 1 1
      locations/flash.qsrc
  32. 2 1
      locations/gadfield.qsrc
  33. 40 70
      locations/gdksport.qsrc
  34. 5 1
      locations/gschool_chats1.qsrc
  35. 16 24
      locations/gschool_cheerleading.qsrc
  36. 0 1
      locations/gschool_grounds.qsrc
  37. 185 137
      locations/gschool_lessons4.qsrc
  38. 219 218
      locations/gschool_post_shower.qsrc
  39. 2 6
      locations/gschool_sex.qsrc
  40. 29 25
      locations/gschool_socialchg1.qsrc
  41. 2 0
      locations/katjaEv.qsrc
  42. 1 1
      locations/lariska_storyline.qsrc
  43. 5 7
      locations/mother.qsrc
  44. 17 0
      locations/npcstatic5.qsrc
  45. 3 3
      locations/nyp_school.qsrc
  46. 9 9
      locations/olu.qsrc
  47. 3 1
      locations/park_walkevents.qsrc
  48. 5 5
      locations/pav_library.qsrc
  49. 40 44
      locations/preCUST.qsrc
  50. 1 1
      locations/rex_party_sister_events.qsrc
  51. 38 490
      locations/sexshop.qsrc
  52. 2 2
      locations/shop_fashionista.qsrc
  53. 4 4
      locations/sister_chat.qsrc
  54. 4 4
      locations/soniadisco.qsrc
  55. 2 2
      locations/stat.qsrc
  56. 251 11
      locations/stwork2.qsrc
  57. 7 8
      locations/tatiana_lab.qsrc
  58. 6 16
      locations/therapist.qsrc
  59. 123 0
      locations/uni_shop.qsrc
  60. 1 1
      locations/wardrobe.qsrc

+ 1 - 0
glife.qproj

@@ -964,6 +964,7 @@
 	</Folder>
 	<Folder name="University">
 		<Location name="city_island"/>
+		<Location name="uni_shop"/>
 		<Location name="shop_dolls"/>
 		<Location name="shop_nerdvana"/>
 		<Location name="vecher"/>

+ 2 - 14
locations/AlbStars.qsrc

@@ -254,13 +254,7 @@ if $ARGS[0] = 'starlets':
 
 	AlbinaQW['startletsday'] = daystart
 	starlets_practice = 0
-	timemult = 8
-	loopcount = 1
-	:starletstimeloop
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'dancero_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'starletstimeloop'
-	loopcount = 0
-	timemult = 0
+	gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
 	pcs_mood -= 5
 	inhib_exp += rand(2,4)
 	if perform_lvl < 35: perform_exp += 1
@@ -299,13 +293,7 @@ if $ARGS[0] = 'starlets':
 
 		act 'Do the show':
 			*clr & cla
-			timemult = 8
-			loopcount = 1
-			:showtimeloop
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'danc_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'showtimeloop'
-			loopcount = 0
-			timemult = 0
+			gs 'exercise', 'tier2', 120, 'agil_exp', 'danc_exp'
 			money += albpayrand * 1000
 			killvar 'albpayrand'
 			noShampoo = 1

+ 1 - 1
locations/FedorEv4.qsrc

@@ -324,7 +324,7 @@ if $ARGS[0] = '3way1':
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/3way/bed4.mp4"></video></center>'
 					'"Cum inside me!" you say before wrapping your lips back around Ivan''s dick as he turns to you. "Don''t worry <<$pcs_nickname>>. We''ll fill you up real good." Ivan and Fedor begin pumping you faster. After a few seconds Fedor groans and you feel his seed filling your womb causing a muffled moan from you which seems to push Ivan over the edge as he begins shooting his load directly down your throat which you do your best to swallow every drop of. When they are finished Fedor slowly pulls out of your causing the cum in your womb to almost gush out of your vagina and onto the bed. You lay back catching your breath as you listen to Fedor and Ivan chatting. "<<$pcs_firstname>> is an amazing girl. You gotta invite me here more often."'
 					*nl
-					'Fedor shrugs. "It''s all up to <<$pcs_firstname>>." Ivan responds, "Whipped huh?" he then looks up your body. "I can''t say I blame you. <<$pcs_nickname>>''s ia quite the fox." Fedor gives Ivan a fist bump before Ivan gets dressed and walks out of the room. Fedor turns to you "So how did you enjoy that?" You reply, "You were both amazing. I had a great time." Fedor responds, "Awesome, now let''s get you cleaned up." Fedor then lifts you up and carries you to the bathroom.'
+					'Fedor shrugs. "It''s all up to <<$pcs_firstname>>." Ivan responds, "Whipped huh?" he then looks up your body. "I can''t say I blame you. <<$pcs_nickname>>''s is quite the fox." Fedor gives Ivan a fist bump before Ivan gets dressed and walks out of the room. Fedor turns to you "So how did you enjoy that?" You reply, "You were both amazing. I had a great time." Fedor responds, "Awesome, now let''s get you cleaned up." Fedor then lifts you up and carries you to the bathroom.'
 					*nl
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4"></video></center>'
 					gs 'boyStat', 'A3'

+ 1 - 1
locations/LariskaGo.qsrc

@@ -21,7 +21,7 @@ act 'Go with Lariska':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_1.jpg"></center>'
 		if LariskaQW['story'] = 5:
 			'Entering the apartment, you see that it is decorated in a Japanese style.'
-			'"You have a nice apartment, Lariska," you say, looking around with interest.'
+			'"You have a nice apartment, Lariska." You say, looking around with interest.'
 			'"Thank you. Mother makes a good living, although she is usually only home on the weekends," she says a bit sadly.'
 			'You follow Lariska to her room.'
 			LariskaQW['story'] = 6

+ 0 - 1
locations/MagEncounterFairy.qsrc

@@ -270,7 +270,6 @@ if $ARGS[0] = 'teleport':
 
 		act 'See where the Fairy teleports you to': gt 'treeCircle', $tpRand[rand(0,2)]
 
-		killvar '$tpRand'
 	end
 end
 

+ 1 - 1
locations/_attributes_scandalicious_swim_two.qsrc

@@ -106,7 +106,7 @@ elseif ARGS[1] = 13:
 	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 25
-	$swimwear_description = 'A very scanty bikini set, it is perfect for attentin seekers!'
+	$swimwear_description = 'A very scanty bikini set, it is perfect for attention seekers!'
 	
 elseif ARGS[1] = 14:
 	CloQuality = 2

+ 6 - 1
locations/abduction.qsrc

@@ -582,7 +582,12 @@ if $ARGS[0] = 'abdFood':
 	'There are some water bottles and dried food beneath your bed.'
 	'A half broken, dirty mirror provides some means to inspect your appearance.'
 	'In the corner is something remotely similar to a shower. It only has cold water though.'
-	'There''s enough space to do some basic <a href="exec:gt ''abduction'', ''abdexercise''">exercise</a>.'
+	if pcs_energy >= 10:
+		'There''s enough space to do some basic <a href="exec:gt ''abduction'', ''abdexercise''">exercise</a>.'
+	else
+		'There''s enough space to do some basic exercise but you are too hungry to do them.'
+	end
+
 	chainChance = rand(1,100)
 	if chainChance <= 20 and (rapeCount > 5 or tortureCount > 5):
 		'You spot a loose link on your chain. You try to manipulate it, and you manage to free yourself from the wall.'

+ 65 - 3
locations/albina_school_sex.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'break_fun_1':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/maekup.jpg"></center>'
 				'You shake your head at her. "Sorry Albina, but I don''t want to do that."'
-				'She looks a little disappointed as she fixes her skirt, but walks over to you and leans in to whisper in your ear. "That''s okay <<$pcs_nickname>>, but just know that I''ll be sitting in class with a <i>very</i> wet pussy thinking about how good you are eating it." she says softly before walking over to the mirror and touching up her makeup before leaving. You find yourself feeling a little aroused.'
+				'She looks a little disappointed as she fixes her skirt, but walks over to you and leans in to whisper in your ear. "That''s okay <<$pcs_nickname>>, but just know that I''ll be sitting in class with a <i>very</i> wet pussy thinking about how good you are at eating it." she says softly before walking over to the mirror and touching up her makeup before leaving. You find yourself feeling a little aroused.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Accept':
@@ -114,11 +114,11 @@ if $ARGS[0] = 'lunch_fun_1':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 		'You silently nod and she discreetly motions for you to follow her to one of the empty classrooms. Once inside, she grabs hold of you and is about to kiss you when she jumps back and squeals in fright. You look round and find Julia blankly staring at the two of you.'
-		act 'Continue': gt 'albina_school_sex', 'lunch_fun_2'
+		act 'Continue': gt 'albina_school_sex', 'lunch_fun_1_2'
 	end
 end
 
-if $ARGS[0] = 'lunch_fun_2':
+if $ARGS[0] = 'lunch_fun_1_2':
 	menu_off = 1
 	gs 'stat'
 	*clr & cla
@@ -189,5 +189,67 @@ if $ARGS[0] = 'lunch_fun_2':
 	end
 end
 
+if $ARGS[0] = 'lunch_fun_2':
+	menu_off = 1
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class1.jpg"></center>'
+	'After a few seconds, she breaks the kiss and smiles at you. "I hope you''re hungry because you''re having my pussy for lunch today." You can sense the lust in her voice as she pushes you onto the floor, hikes up her skirt and pulls her thong off before sitting on your face. She moans loudly in pleasure as you start eating her out. Her moans grow louder and her pussy grows wetter as she starts grinding against you, smearing her wetness across your face. After a few more seconds where she moans even louder and grinds even faster, she suddenly pulls herself off of you, her breath heavy. "I don''t want to cum just yet. I need more of that tongue first."'
+	minut += 3
+	gs 'stat'
+
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class2.jpg"></center>'
+		'She pulls you up to your feet and you practically rip each other''s clothes off and make out before she lies back on a desk and spreads her legs. "Get that magic tongue of yours over here and make me cum <<$pcs_nickname>>!" You smile at her as you climb onto the desk and crawl over to her. You tease her a little by sucking on and licking her nipple before moving down to her now dripping wet pussy. She tightly wraps her legs around your head, pressing your face against her crotch as you lick and suck on her engorged clit. After a few minutes of this, her grip tightens around your head. "Oh fuck, <<$pcs_nickname>>! Don''t stop, I''m gonna...." She isn''t able to finish her sentence before she lets out a muffled cry of pleasure and starts squirting into your mouth and across your face. Once she finishes, you swallow her juices and she relaxes her grip, allowing you to sit up as she lies panting on the desk.'
+		minut += 3
+		gs 'stat'
+
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class3.jpg"></center>'
+			'"Oh...oh. Wow. That was...fucking amazing <<$pcs_nickname>>. I really needed that." she pants as she rides out her orgasm. "I should return the favour." She sits up and smiles as she motions for you to lie down. She climbs off the desk and pulls you over to the edge as you lie back. She licks her lips and immediately buries her head in your crotch, making you moan loudly as she eats you out for all she''s worth. She knows exactly what she''s doing and has you approaching orgasm within minutes. Seeing this, she stops licking your pussy and stands up; you barely have time to ask what''s happening before she jams her fingers deep inside you and starts fingerbanging you. "That''s right <<$pcs_nickname>>, cum for me." she whispers teasingly in your ear before making out with you. You moan loudly into her mouth as she brings you to orgasm. You lie panting on the desk as she pulls her fingers out and sucks on them. "Mhmm. You taste really fucking good, you know that?" she says teasingly with a wink.'
+			gs 'arousal', 'erotic', 6, 'lesbian'
+			gs 'stat'
+
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class4.jpg"></center>'
+				'She climbs back onto the desk and you start making out again. You can taste yourself on her lips and tongue as she reaches down and gives your sensitive clit a few teasing rubs. She then breaks the kiss and leans over the edge of the desk, fumbling around in search of something.' 
+				gs 'arousal', 'erotic_nudity', 8, 'lesbian'
+				gs 'stat'
+
+				act 'Spank her':
+					cla
+					*nl
+					'Her ass is too inviting and she yelps in surprise when you smack it hard. "<<$pcs_nickname>>!! You''re so naughty!" she says while looking back and biting her lip. "You know I''d love it if you continued, but lunch is almost over and we need to get dressed before someone finds us." You nod and start getting dressed, making a show of giving you what you can only describe as a reverse striptease. Once you''re dressed, she gives you a final kiss and surprises you by spanking you back, making you jump a little as she smiles and walks out the door with some sway in her hips. You quickly hurry out behind her as the bell for your next class rings.'
+					minut += 3
+					gs 'stat'
+
+					act 'Finish':
+						gs 'arousal', 'end'
+						gs 'stat'
+						gt 'gschool_lessons', 'short_break'
+					end
+				end
+
+				act 'Finger her':
+					cla
+					*nl
+					'Her legs are slightly spread, so you move in behind her and slide your fingers inside her still wet hole. "Ooohh <<$pcs_nickname>>..." she moans softly. "While I''d love a round two, lunch is almost over and we should get dressed before someone finds us." You nod and start getting dressed, making a show of giving you what you can only describe as a reverse striptease. Once you''re dressed, she gives you a final kiss and gets her own back by pinching your nipple, making you squeal a little as she smiles and walks out the door with some sway in her hips. You quickly hurry out behind her as the bell for your next class rings.'
+					minut += 3
+					gs 'stat'
+
+					act 'Finish':
+						gs 'arousal', 'end'
+						gs 'stat'
+						gt 'gschool_lessons', 'short_break'
+					end
+				end
+			end
+		end
+	end
+end
+
 --- albina_school_sex ---------------------------------
 

+ 10 - 23
locations/albinahome.qsrc

@@ -242,22 +242,19 @@ end
 if $ARGS[0] = 'stripping':
 	*clr & cla
 	AlbinaQW['SportDay'] = daystart
-	minut += 120
-	fat -= 5
-	agil_exp += rand (1, 3)
 	npc_rel['A23'] += 1
-	gs 'sweat', 'add', 30
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stripdance.jpg"></center>'
 	if pcs_inhib < 60:inhib_exp += rand(2,3)
 
 	if pcs_danc >= 40:
-		dancero_exp += rand(2, 10)
+		gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+		gs 'stat'
 		'Albina teaches you how to passionately dance to the music while stripping.'
 
 		if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 	else
-		danc_exp += rand(5, 15)
+		gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+		gs 'stat'
 		'A striptease is too complex for you. You''re not able to dance and strip at the same time.'
 		'Albina recommends that you start with learning to dance.'
 	end
@@ -270,11 +267,7 @@ if $ARGS[0] = 'poledancing':
 	npc_rel['A23'] += 1
 	if pcs_stren >= 40 and pcs_dancero > 50:
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		loopcount = 1
-		:timeloop1
-		gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp', 'dancpol_exp'
-		if loopcount < 8: loopcount += 1 & jump 'timeloop1'
-		killvar 'loopcount'
+		gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp', 'dancpol_exp'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/poledance.jpg"></center>'
 		'Albina leads you down to the home gym, where she teaches you various acrobatic moves on the pole there and the two of you greatly enjoy yourselves.'
@@ -286,11 +279,7 @@ if $ARGS[0] = 'poledancing':
 		'You nod at her and she pulls you to your feet, checking your head. "It might bruise, but otherwise you look fine." she says.'
 		act 'Develop strength (2:00)':
 			*clr & cla
-			loopcount = 1
-			:timeloop2
-			gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp'
-			if loopcount < 8: loopcount += 1 & jump 'timeloop2'
-			killvar 'loopcount'
+			gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
@@ -298,21 +287,19 @@ if $ARGS[0] = 'poledancing':
 			act 'Rest':gt 'albinahome', 'bedroom'
 		end
 	else
-		minut += 120
-		fat -= 5
-		agil_exp += rand (1, 3)
-		gs 'sweat', 'add', 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stripdance.jpg"></center>'
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
 		'Albina grins "You still can''t strip well enough for poledancing. We should practice that first."'
 		if pcs_danc >= 40:
-			dancero_exp += rand(2, 10)
+			gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
 			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 		else
-			danc_exp += rand(5, 15)
+			gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+			gs 'stat'
 			'A striptease is too complex for you. You''re not able to dance and strip at the same time.'
 			'Albina recommends that you start with learning to dance.'
 		end

+ 26 - 26
locations/alexandriaEv.qsrc

@@ -146,22 +146,22 @@ if $ARGS[0] = 'interview2':
 				npc_rel['A241'] +=2
 				'Actually, you think that there are some true on Alexandria''s words, and is a good moment to voice your opinions.'
 				'"I don''t know Tatiana enough, and I am reluctant to judge without hearing an explanation, but... her description of you, seemed to me too forced, more rumor than anything else, and that weird thing about your hair."'
-				'Alexandria raises an eyebrow, and grab a (beautiful and long)lock of hair, smiling slightly, she is paying close attention to your words.'
-				'"Well... basically she tolls me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white."'
-				'Whit that, she burst in a short-lived and dry laugh, before talking again with contempt in her voice.'
-				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turned white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered."'
+				'Alexandria raises an eyebrow, and grabs a (beautiful and long) lock of hair, smiling slightly, she is paying close attention to your words.'
+				'"Well... basically she told me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white."'
+				'With that, she bursts into a short-lived and dry laugh, before talking again with contempt in her voice.'
+				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turn white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered."'
 				'"Curse?"'
-				'Your words burst out, and during a moment, the two of you look each other in baffled surprise'
-				'"<<$pcs_lastname>>, Are you telling me that they didn''t toll you?! I am a man!"'
+				'Your word burst out, and Alexandria looks at you as if studying a document to see if there is a spelling mistake. Finally she sighs having worked out what was wrong.'
+				'"<<$pcs_lastname>>, did they not even tell you?! I am a man!"'
 			else
 				npc_rel['A241'] -=2
 				pcs_mood -= 20
-				'Actually, you think that there are some true on Alexandria''s words, and is a good moment to voice your opinions.'
-				'"Well, if you want my opinion, she is envious, I mean you are a powerful magician, and that weird thing about your hair, don''t help either."'
-				'Alexandria raise an eyebrow, and grab a (beautiful and long)lock of hair, as she pays close attention to your words.'
+				'Actually, you think that there are some truth to Alexandria''s words, and is a good moment to voice your opinions.'
+				'"Well, if you want my opinion, she is envious, I mean you are a powerful magician, and that weird thing about your hair doesn''t help either."'
+				'Alexandria raise an eyebrow, and grabs a (beautiful and long) lock of hair, as she pays close attention to your words.'
 				'"Well... basically she told me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white, but if you ask me, it suits your style, I can''t blame the photographer for thinking that you... were... a model?"'
-				'Is like looking a train wreck, as Alexandria''s face goes darker at your dialogue. Finally, you shut up as she grit her teeth and with words full of contempt.'
-				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turned white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered, because... surprise! that trickster seemed to have forgotten to say you something important... I am a man!'
+				'Alexandria''s face grows darker at your every word, like she is witnessing a train derail and burst into flame. You think its best to stop talking before you upset things further as she grits her teeth.'
+				'Her words filled with contempt, she says, "I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turn white because like I was some simpleton, scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered, because... surprise! that trickster seemed to have forgotten to say you something important... I am a man!'
 			end
 			minut += 2
 			gs 'stat'
@@ -174,13 +174,13 @@ if $ARGS[0] = 'interview2':
 			'<center><b><font color="maroon">Alexandria</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria3.jpg"></center>'
 			'"I don''t think that Tatiana is that bad, after all, she is teaching me magic."'
-			'Alexandria fix her gaze at you and snort in derision.'
-			'"Oh really? When The Veil was lifted from your eyes, and you ended in our side of reality... What did she do? Teach you about your new world? Call Reinhold to inform about The Talisman''s fate? Or just... she shut up and waited to see what happened to you as you fumbled your way in total ignorance, uncaring of yours and others welfare?"'
-			'At those words, you are not sure how to answer, and feeling your indecision, Alexandria gives you a contempt half-smile before continuing.'
-			'"Let''s be generous <<$pcs_lastname>>, she hasn''t passed the pale where her antics begin to be accounted in destroyed lives, but, she isn''t really caring about your situation, only on what she can obtain from helping you, believe me I know her type, I learned this lesson, when Rikudo, probably the most powerful trickster of all times cursed me."'
+			'Alexandria fix her gaze at you and snorts in derision.'
+			'"Oh really? When The Veil was lifted from your eyes, and you ended in our side of reality... What did she do? Teach you about your new world? Call Reinhold to inform him about The Talisman''s fate? Or just... shut up and wait to see what happened to you as you fumbled your way in total ignorance, uncaring of yours and others welfare?"'
+			'At those words, you are not sure how to answer, and feeling your indecision, Alexandria gives you a contemptuous half-smile before continuing.'
+			'"Let''s be generous <<$pcs_lastname>>, she hasn''t passed the pale where her antics begin to be counted in destroyed lives, but, she isn''t really caring about your situation, only on what she can obtain from helping you, believe me I know her type, I learned this lesson, when Rikudo, probably the most powerful trickster of all time cursed me."'
 			'"Cursed?"'
-			'Your words burst out, and during a moment, the two of you look each other in baffled surprise'
-			'"<<$pcs_lastname>>, Are you telling me that they didn''t toll you?! I am a man!"'
+			'Your word bursts out, and for a moment that seems to last a life time, the two of you stare at each other in baffled surprise.'
+			'"<<$pcs_lastname>>, Are you telling me that they didn''t tell you?! I am a man!"'
 			npc_rel['A241'] -=1
 			pcs_mood -= 10
 			minut += 2
@@ -194,10 +194,10 @@ if $ARGS[0] = 'interview2':
 			'<center><b><font color="maroon">Alexandria</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria3.jpg"></center>'
 			'The truth is that you don''t want to be dragged in a discussion about Tatiana, with an obviously very opinionated wizard, so you do the most simple and just shut up, letting Alexandria badmouth your teacher.'
-			'"Let''s be generous <<$pcs_lastname>>, she hasn''t passed the pale where her antics begin to be accounted in destroyed lives, but, she isn''t really caring about your situation, only on what she can obtain from helping you, believe me I know her type, I learned this lesson, when Rikudo, probably the most powerful trickster of all times cursed me."'
+			'"Let''s be generous <<$pcs_lastname>>, she hasn''t passed the pale where her antics begin to be counted in destroyed lives, but, she isn''t really caring about your situation, only on what she can obtain from helping you, believe me I know her type, I learned this lesson, when Rikudo, probably the most powerful trickster of all time cursed me."'
 			'"Cursed?"'
-			'Your words burst out, and during a moment, the two of you look each other in baffled surprise'
-			'"<<$pcs_lastname>>, Are you telling me that they didn''t toll you?! I am a man!"'
+			'You blurt out, and for a moment, the two of you stare at each other in baffled surprise.'
+			'"<<$pcs_lastname>>, Are you telling me that they didn''t tell you?! I am a man!"'
 			minut += 1
 			gs 'stat'
 
@@ -209,7 +209,7 @@ end
 if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'
-	'You finally reach a study where a morose... Alexandria? Sit on a couch, and in an interesting twist, there isn''t another one for you to lie.'
+	'You finally reach a study where a morose... Alexandria? Sits on a couch, and in an interesting twist, there isn''t another one for you.'
 	if $start_type = 'tg':
 		npc_rel['A241'] +=1
 		'"Yes Mr. Kuznetsu... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
@@ -222,16 +222,16 @@ if $ARGS[0] = 'interview3':
 		end
 	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
-	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse it''s better to leave them for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we meet in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'
-	'As he gives you this explanation, the pieces of the puzzle click in your head, and begin to explain his conduct, but there is a thing to explain.'
+	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse is better left for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we met in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'
+	'As he gives you this explanation, the pieces of the puzzle click in your head, and begin to explain his conduct, but there is one thing you need to know.'
 	'"Uh... I think that I begin to understand, but you mean, that you killed... Ehm... <i>her</i>?"'
-	'Aleksei look at you impassively, and in a cold voice that send shivers down your back, answer.'
+	'Aleksei looks at you impassively, and in a cold voice that send shivers down your back, answers.'
 	'"Yes"'
 	minut += 2
 	gs 'stat'
 
 	if bimbolevel > 0:
-		act "But... she was like my friend!":
+		act '"But... she was like my friend!"':
 			*clr & cla
 			'<center><b><font color="maroon">Aleksei</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'interview3':
 		end
 	else
 		if succubusQW = 5:
-			act "You don''t have the right! She was my bitch!":
+			act '"You don''t have the right! She was my bitch!"':
 				*clr & cla
 				'<center><b><font color="maroon">Aleksei</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'

+ 4 - 0
locations/arousal.qsrc

@@ -255,6 +255,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_anal = 1
 		count['anal_dildo'] = 1
 		!! the same as for 'anal'
+		if pcs_ass < temp_dick:pcs_ass += 1
+		if pcs_ass*2 < temp_dick:pcs_ass += 1
 		altdif = temp_dick - pcs_ass
 		agrdif = grange - pcs_ass
 		altdif = altdif / (temp_silavag+1)
@@ -278,6 +280,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_anal = 1
 		count['anal_strap'] = 1
 		!! the same as for 'anal'
+		if pcs_ass < temp_dick:pcs_ass += 1
+		if pcs_ass*2 < temp_dick:pcs_ass += 1
 		altdif = temp_dick - pcs_ass
 		agrdif = grange - pcs_ass
 		altdif = altdif / (temp_silavag+1)

+ 1 - 5
locations/beg.qsrc

@@ -10,13 +10,9 @@ if $ARGS[0] = 'start':
 	act 'Do a couple of practice races':
 		cla
 		*clr
-		minut += 30
 		abonement -= 1
 		pcs_mood += 2
-		fat -= 2
-		gs 'sweat', 'add', 30
-		pcs_stam -= 30
-		run_exp += rand(2, 3)
+		gs 'exercise', 'tier2', 30, 'run_exp'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit5.jpg"></center>'
 		'You spend half an hour practising 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before.'
 

+ 10 - 25
locations/beg1.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'start':
     *clr & cla
     menu_off = 1
     gs 'stat'
-    minut += 60
+    minut += 30
     kolsorev += 1
     razdtumbler = 0
     begmon = month
@@ -49,11 +49,8 @@ end
 
 if $ARGS[0] = 'br':
     cla
-    run_exp += 1
-    fat -= 2
-    gs 'sweat', 'add', 30
-    pcs_stam -= 30
-    
+	gs 'exercise', 'tier2', 30, 'run_exp'
+
     begminus = 0
     if bmi_calc > 25: 
         begminus = ((bmi_calc - 25)*4)
@@ -104,11 +101,8 @@ end
 
 if $ARGS[0] = 'kms':
     cla
-    run_exp += 1
-    fat -= 2
-    gs 'sweat', 'add', 30
-    pcs_stam -= 30
-    
+	gs 'exercise', 'tier2', 30, 'run_exp'
+
     begminus = 0
     if bmi_calc > 25: 
         begminus = ((bmi_calc - 25)*4)
@@ -161,12 +155,9 @@ end
 
 if $ARGS[0] = 'ross':
     cla
-    run_exp += 1
-    fat -= 2
-    gs 'sweat', 'add', 30
-    pcs_stam -= 30
-    
-    begminus = 0
+	gs 'exercise', 'tier2', 30, 'run_exp'
+
+	begminus = 0
     if bmi_calc > 25: 
         begminus = ((bmi_calc - 25)*4)
     elseif bmi_calc < 18:
@@ -219,10 +210,7 @@ end
 
 if $ARGS[0] = 'kval':
     cla
-    run_exp += 1
-    fat -= 2
-    gs 'sweat', 'add', 30
-    pcs_stam -= 30
+	gs 'exercise', 'tier2', 30, 'run_exp'
     razradbeg += 1
     minut += 60
     
@@ -281,10 +269,7 @@ end
 
 if $ARGS[0] = 'evro':
     cla
-    run_exp += 1
-    fat -= 2
-    gs 'sweat', 'add', 30
-    pcs_stam -= 30
+	gs 'exercise', 'tier2', 30, 'run_exp'
     minut += 120
     
     begminus = 0

+ 2 - 2
locations/brother_voyeur.qsrc

@@ -2140,7 +2140,7 @@ if $ARGS[0] = 'shower_facial':
 			end
 		end
 
-		act'I only did this because owed you one':
+		act'I only did this because I owed you one':
 			cla
 			*nl
 			'"I only did this because I owed you one," You say, wiping the cum from your eyes with your hands. Your eyes clear, you see a questioning look on his face. "Did you already forget? I promised I''d let you cum on my face this time."'
@@ -2268,7 +2268,7 @@ if $ARGS[0] = 'shower_facial':
 			end
 		end
 
-		act'I only did this because owed you one':
+		act'I only did this because I owed you one':
 			cla
 			*nl
 			'"I only did this because I owed you one," You say, wiping the cum from your eyes with your hands. Your eyes clear, you see a questioning look on his face. "Did you already forget? I promised I''d let you cum on my face this time."'

+ 1 - 1
locations/budgetclothes.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'gm_server':
 	end
 end
 
-if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'clothing_item', 'gm_server',i, 2000, 'shop'
+if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'gm_server', i, 2000, 'shop'
 
 if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'

+ 2 - 2
locations/cafe_parco.qsrc

@@ -65,13 +65,13 @@ if $args[0]= 'inner':
 			end
 
 		elseif mey_vika['mey_vika_qw'] >= 5:
-			if npc_rel["A15"] < 50:
+			if npc_rel['A15'] < 50:
 				'You approach the couple and greet them, but they don''t pay any attention to you.'
 			else
 				'You approach the couple and greet them, right away Vicky starts gossiping, as always, Vanya, mostly joked about the things you two were talking about. You chatted for a few minutes...'
 			end
 
-			if npc_rel["A15"] >= 60:
+			if npc_rel['A15'] >= 60:
 				if mey_vika['mey_vika_qw'] = 10:
 					cla
 					'Vicky and Vanya invite you to join them.'

+ 2 - 0
locations/city_island.qsrc

@@ -50,8 +50,10 @@ gs 'taxi'
 gs 'camera', 'check_location'
 
 if hour >= 8 and hour <= 22:
+	'The <a href="exec: minut += 3 & gt ''uni_shop'', ''start''">supermarket</a> is not far from here.'
 	'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 else
+	'The local convenience store is closed, they open again at 8:00'
 	'You can see a closed kiosk. It''s open between 08:00 - 23:00.'
 end
 if hour >= 8 and hour < 22:

+ 1 - 0
locations/city_mansion_residence_1.qsrc

@@ -139,6 +139,7 @@ if $ARGS[0] = 'ykitchen':
 
 	menu_off = 0
 	minut += 1
+	gs 'kit_din'
 	gs 'stat'
 
 	*clr & cla

+ 51 - 49
locations/city_park.qsrc

@@ -118,64 +118,66 @@ if $ARGS[0] = 'start':
 	end
 
 	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and parkrunday ! daystart:
-		act 'Go for a run in the park (1:00)':
-			*clr & cla
-			menu_off = 1
-			parkrunday = daystart
-			gs 'exercise', 'tier1', 60, 'run_exp'
-			fat -= rand(0, 4)
-			gs 'sweat', 'add', 5
-			'<center><b><font color="maroon">Park</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
-			'You choose paths randomly, running them up and down, and about an hour later, you are out of breath and heavily sweating.'
-
-			if hour >= 20:
-				parkrand = rand(0, 10)
-
-				if parkrand >= 8:
-					'A man steps out of the shadow of a tree and runs up to you. Before you can react, he grabs you and starts dragging you into the bushes. "Relax and enjoy this", he says.'
-					gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
-					gs 'boyStat', $npclastgenerated
-					act 'Fight':
-						cla
-						gs 'fight','initFight'
+		if pcs_energy >= 5:
+			act 'Go for a run in the park (1:00)':
+				*clr & cla
+				menu_off = 1
+				parkrunday = daystart
+				gs 'exercise', 'tier1', 60, 'run_exp'
+				'<center><b><font color="maroon">Park</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
+				'You choose paths randomly, running them up and down, and about an hour later, you are out of breath and heavily sweating.'
+
+				if hour >= 20:
+					parkrand = rand(0, 10)
+
+					if parkrand >= 8:
+						'A man steps out of the shadow of a tree and runs up to you. Before you can react, he grabs you and starts dragging you into the bushes. "Relax and enjoy this", he says.'
+						gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
+						gs 'boyStat', $npclastgenerated
+						act 'Fight':
+							cla
+							gs 'fight','initFight'
 
-						gs 'fight_npcdata', 'rapist'
+							gs 'fight_npcdata', 'rapist'
 
-						gt 'fight', 'start'
-					end
-					if succubusQW = 5:
-						!!Used if this was a random encounter instead of active hunting
-						Act 'Lure him in and feed (this can take a lot of time)':
-							cla
-							'You wait until he has dragged you almost to the bushes before turning on him.'
-							act 'Continue': gt 'succubus', 'RapistFight'
+							gt 'fight', 'start'
+						end
+						if succubusQW = 5:
+							!!Used if this was a random encounter instead of active hunting
+							Act 'Lure him in and feed (this can take a lot of time)':
+								cla
+								'You wait until he has dragged you almost to the bushes before turning on him.'
+								act 'Continue': gt 'succubus', 'RapistFight'
+							end
 						end
-					end
 
-					exit
+						exit
+					end
 				end
-			end
 
-			act 'Finish your run':
-				cla & *nl
-				'You feel great after your run. You''re a bit sweaty, but you''ve managed to improve your stamina, and you even feel a bit slimmer.'
-				act 'Continue': gt 'city_park', 'start'
-			end
-			
-			if pcs_inhib >= 35  or exhibitionist_lvl > 0:
-				act 'Expose your breasts':
-					*clr & cla
-					if rand(0,1) = 0:
-						'<center><img <<$set_imgh>> src="images/locations/shared/park/flash'+rand(3,4)+'.jpg"></center>'
-					else
-						'<center><video autoplay loop src="images/locations/shared/park/flash'+rand(1,2)+'.mp4"></video></center>'
+				act 'Finish your run':
+					cla & *nl
+					'You feel great after your run. You''re a bit sweaty, but you''ve managed to improve your stamina, and you even feel a bit slimmer.'
+					act 'Continue': gt 'city_park', 'start'
+				end
+				
+				if pcs_inhib >= 35  or exhibitionist_lvl > 0:
+					act 'Expose your breasts':
+						*clr & cla
+						if rand(0,1) = 0:
+							'<center><img <<$set_imgh>> src="images/locations/shared/park/flash'+rand(3,4)+'.jpg"></center>'
+						else
+							'<center><video autoplay loop src="images/locations/shared/park/flash'+rand(1,2)+'.mp4"></video></center>'
+						end
+						'Halfway through your run, you pull up your top and expose your breasts. The cool air against your warm skin causes you to shiver, and almost immediately your nipples start to harden, a mixed reaction from the air hitting them and your growing excitement.'
+						*nl
+						gs 'park_walkevents', 'run_reactions'
 					end
-					'Halfway through your run, you pull up your top and expose your breasts. The cool air against your warm skin causes you to shiver, and almost immediately your nipples start to harden, a mixed reaction from the air hitting them and your growing excitement.'
-					*nl
-					gs 'park_walkevents', 'run_reactions'
 				end
 			end
+		else
+			act 'Go for a run in the park (1:00)': '<br><font color="red">You are so hungry you cannot face going for a run.</font>'
 		end
 	elseif hour > 5 and hour < 23 and parkrunday ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'

+ 5 - 1
locations/city_sauna.qsrc

@@ -105,7 +105,11 @@ if $ARGS[0] = 'saunaroom':
 	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organize your clothing.'
 	*nl
 
-	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines and a selection of sex toys are scattered throughout the room. There''s so much stuff lying around, there''s barely enough space to do some basic <a href="exec:gt ''city_sauna'', ''saunafitness''">exercise</a>.'
+	if pcs_energy >= 10:
+		'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines and a selection of sex toys are scattered throughout the room. There''s so much stuff lying around, there''s barely enough space to do some basic <a href="exec:gt ''city_sauna'', ''saunafitness''">exercise</a>.'
+	else
+		'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines and a selection of sex toys are scattered throughout the room. There''s so much stuff lying around, there''s barely enough space for some basic exercises but you feel to hungry to any.'
+	end
 	*nl
 
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''city_sauna'', ''saunaroom''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''city_sauna'', ''saunaroom''">ON</a>.')

+ 10 - 10
locations/clothing.qsrc

@@ -477,30 +477,30 @@ if $ARGS[0] = 'clothing_list':
 		end
 
 		i = 1
-		:loopcats_dress
-			if cats_dress[i] = 1 and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):
-				gs 'clothing_attributes', 'cats_dress', i
+		:loopcats_outfits
+			if cats_outfits[i] = 1 and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):
+				gs 'clothing_attributes', 'cats_outfits', i
 				gs 'clothing_QV', 'clo_filter'
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_dress', i)
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_outfits', i)
 				end
 			end
 			i += 1
-		if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
+		if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
 
 		i = 1
-		:loopcats_outfits
-			if cats_outfits[i] = 1 and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):
-				gs 'clothing_attributes', 'cats_outfits', i
+		:loopcats_dress
+			if cats_dress[i] = 1 and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):
+				gs 'clothing_attributes', 'cats_dress', i
 				gs 'clothing_QV', 'clo_filter'
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_outfits', i)
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_dress', i)
 				end
 			end
 			i += 1
-		if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
+		if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
 
 		if $args[1] ! 'all':
 			clo_i += 1

+ 4 - 4
locations/clothing_QV.qsrc

@@ -265,8 +265,6 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
-
 		i = 1
 		:loopschool
 		if gm_school[i] = 1:
@@ -275,14 +273,16 @@ if $ARGS[0] = 'clothing_list':
 			!!sort by filter
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
-					if CloInhibit <= pcs_inhib:
+					!! Default school uniform
+					if i = 6:
+						if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
+					elseif CloInhibit <= pcs_inhib:
 						if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 					end
 				end
 			end
 		end
 		i += 1
-		if i = 6: i = 7
 		if i <= ARRSIZE('gm_school'):jump 'loopschool'
 
 		if $args[1] ! 'all':

+ 46 - 42
locations/crossfit_north_box.qsrc

@@ -40,53 +40,57 @@ if $ARGS[0] = 'box':
 		end
 	end
 
-	act 'Start the exercise':
-		menu_off = 1
-		if last_crossfit_workout = daystart:
-			msg'<b><font color = red>You already did this workout today. That''s enough for one day.</font></b>'
-		else
-			*clr & cla
-			last_crossfit_workout = daystart
-			crossfit_first = 1
-			abonement -= 1
-			'You start with the workout.'
-			gs 'crossfit_north_wod', $todays_crossfit_wod
-			gs 'exercise', 'tier4', 20, 'stren_exp', 'vital_exp', 'agil_exp'
-			'<center><video autoplay loop src="<<$crossfit_north_image_dir>><<$wod_video[$todays_crossfit_wod]>>.mp4"></video></center>'
-			current_wod_score = max(1,(100 - ((100 * pcs_health * (rand(40,100) + pcs_sleep  + pcs_vital + pcs_agil + pcs_stren))/ (healthmax * 500))))
-			cla
-			act 'Check your score':
+	if pcs_energy >= 20:
+		act 'Start the exercise':
+			menu_off = 1
+			if last_crossfit_workout = daystart:
+				msg'<b><font color = red>You already did this workout today. That''s enough for one day.</font></b>'
+			else
+				*clr & cla
+				last_crossfit_workout = daystart
+				crossfit_first = 1
+				abonement -= 1
+				'You start with the workout.'
+				gs 'crossfit_north_wod', $todays_crossfit_wod
+				gs 'exercise', 'tier4', 20, 'stren_exp', 'vital_exp', 'agil_exp'
+				'<center><video autoplay loop src="<<$crossfit_north_image_dir>><<$wod_video[$todays_crossfit_wod]>>.mp4"></video></center>'
+				current_wod_score = max(1,(100 - ((100 * pcs_health * (rand(40,100) + pcs_sleep  + pcs_vital + pcs_agil + pcs_stren))/ (healthmax * 500))))
 				cla
-				$resultstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod,  current_wod_score)
-				'You successfully finish the workout <<$pcs_nickname>> in <<$resultstring>>'
-				if personal_wod_record[$todays_crossfit_wod] = 0:
-					personal_wod_record[$todays_crossfit_wod] = current_wod_score
-				elseif current_wod_score < personal_wod_record[$todays_crossfit_wod]:
-					'This is a new personal record!'
-					personal_wod_record[$todays_crossfit_wod] = current_wod_score
-				end
-				if box_wod_record[$todays_crossfit_wod] = 0:
-					box_wod_record[$todays_crossfit_wod] = current_wod_score
-					$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
-				elseif current_wod_score < box_wod_record[$todays_crossfit_wod]:
-					'Not only that, it''s also a new best record for the whole box!'
-					$prevrecordstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod, box_wod_record[$todays_crossfit_wod])
-					if $box_wod_record_holder[$todays_crossfit_wod] ! $pcs_nickname:
-						$previous_record_holder = $box_wod_record_holder[$todays_crossfit_wod]
-						'You beat <<$previous_record_holder>>''s record of <<$prevrecordstring>>'
-					else
-						'You beat your own old box record of <<$prevrecordstring>>'
+				act 'Check your score':
+					cla
+					$resultstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod,  current_wod_score)
+					'You successfully finish the workout <<$pcs_nickname>> in <<$resultstring>>'
+					if personal_wod_record[$todays_crossfit_wod] = 0:
+						personal_wod_record[$todays_crossfit_wod] = current_wod_score
+					elseif current_wod_score < personal_wod_record[$todays_crossfit_wod]:
+						'This is a new personal record!'
+						personal_wod_record[$todays_crossfit_wod] = current_wod_score
+					end
+					if box_wod_record[$todays_crossfit_wod] = 0:
+						box_wod_record[$todays_crossfit_wod] = current_wod_score
+						$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
+					elseif current_wod_score < box_wod_record[$todays_crossfit_wod]:
+						'Not only that, it''s also a new best record for the whole box!'
+						$prevrecordstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod, box_wod_record[$todays_crossfit_wod])
+						if $box_wod_record_holder[$todays_crossfit_wod] ! $pcs_nickname:
+							$previous_record_holder = $box_wod_record_holder[$todays_crossfit_wod]
+							'You beat <<$previous_record_holder>>''s record of <<$prevrecordstring>>'
+						else
+							'You beat your own old box record of <<$prevrecordstring>>'
+						end
+						killvar '$prevrecordstring'
+						box_wod_record[$todays_crossfit_wod] = current_wod_score
+						$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
+					end
+					killvar 'current_wod_score'
+					act 'Finish and go to the changing room':
+						gt 'fit', 'dressing room'
 					end
-					killvar '$prevrecordstring'
-					box_wod_record[$todays_crossfit_wod] = current_wod_score
-					$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
-				end
-				killvar 'current_wod_score'
-				act 'Finish and go to the changing room':
-					gt 'fit', 'dressing room'
 				end
 			end
 		end
+	else
+		act 'Start the exercise': '<br><font color="red">You feel too hungry to do this exercise now.</font>'
 	end
 end
 

+ 53 - 46
locations/danceclass.qsrc

@@ -9,68 +9,75 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/danceclass.jpg"></center>'
 'A big, open room with good lighting and huge mirrors, perfect for improving your dance skills.'
 
-act 'Modern dance class (0:30)':
-	*clr & cla
-	timemult = 2
-	loopcount = 1
-	:timeloop
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timeloop'
-	loopcount = 0
-	timemult = 0
-	abonement -= 1
-	if pcs_inhib < 40:inhib_exp += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
-
-	if pcs_danc < 100:'You study modern dance, which is very popular in the clubs.'
-	if pcs_danc >= 100:'The day has finally come, you''ve been working hard, and you realize that you''ve learned everything you can from this class.'
-
-	act 'Leave':gt 'fit', 'dressing room'
-end
-
-act 'Burlesque class (0:30)':
-	*clr & cla
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
-	abonement -= 1
-	if pcs_inhib < 60:inhib_exp += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
+if pcs_energy >= 10:
+	act 'Modern dance class (0:30)':
+		*clr & cla
+		gs 'exercise', 'tier2', 30, 'agil_exp', 'stren_exp', 'danc_exp'
+		abonement -= 1
+		if pcs_inhib < 40:inhib_exp += rand(1,2)
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
 
-	if pcs_danc >= 50:
-		gs 'exercise', 'tier2', 0, 'dancero_exp'
-		'You study the art of burlesque, imaging yourself stripping to the music.'
+		if pcs_danc < 100:'You study modern dance, which is very popular in the clubs.'
+		if pcs_danc >= 100:'The day has finally come, you''ve been working hard, and you realize that you''ve learned everything you can from this class.'
 
-		if pcs_dancero >= 100:'You''ve finally managed to master the art of burlesque, there is no need taking this class anymore.'
-	else
-		gs 'exercise', 'tier2', 0, 'danc_exp'
-		'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
+		act 'Leave':gt 'fit', 'dressing room'
 	end
 
-	act 'Leave':gt 'fit', 'dressing room'
-end
-
-if pcs_stren >=40 or needstrength = 0:
-	act 'Pole dance class (0:30)':
+	act 'Burlesque class (0:30)':
 		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
 		abonement -= 1
 		if pcs_inhib < 60:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
 
-		if pcs_dancero >= 50 and pcs_stren >= 40:
-			gs 'exercise', 'tier2', 0, 'dancpol_exp'
-			'You study various acrobatics on the pole.'
+		if pcs_danc >= 50:
+			gs 'exercise', 'tier2', 0, 'dancero_exp'
+			'You study the art of burlesque, imaging yourself stripping to the music.'
 
-			if pcs_dancpol >= 100:'You''ve already mastered the art of pole dancing, there is nothing more left to teach you.'
+			if pcs_dancero >= 100:'You''ve finally managed to master the art of burlesque, there is no need taking this class anymore.'
 		else
-			'It doesn''t look sensual enough and you bang your head pretty hard on the pole. This is far harder than it looks. It would help if you improved your modern dancing skills or the burlesque one, but you did learn a little.'
-
-			if pcs_stren < 40:'The instructor tries to be patient with you, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
+			gs 'exercise', 'tier2', 0, 'danc_exp'
+			'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
 		end
 
 		act 'Leave':gt 'fit', 'dressing room'
 	end
+
+	if pcs_stren >=40 or needstrength = 0:
+		act 'Pole dance class (0:30)':
+			*clr & cla
+			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+			abonement -= 1
+			if pcs_inhib < 60:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
+
+			if pcs_dancero >= 50 and pcs_stren >= 40:
+				gs 'exercise', 'tier2', 0, 'dancpol_exp'
+				'You study various acrobatics on the pole.'
+
+				if pcs_dancpol >= 100:'You''ve already mastered the art of pole dancing, there is nothing more left to teach you.'
+			else
+				'It doesn''t look sensual enough and you bang your head pretty hard on the pole. This is far harder than it looks. It would help if you improved your modern dancing skills or the burlesque one, but you did learn a little.'
+
+				if pcs_stren < 40:'The instructor tries to be patient with you, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
+			end
+
+			act 'Leave':gt 'fit', 'dressing room'
+		end
+	else
+		act 'Modern dance class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
+		act 'Burlesque class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
+		if pcs_stren >=40 or needstrength = 0:
+			act 'Pole dance class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
+		end
+	end
+else
+	*nl
+	'You are so hungry you can''t even bring yourself to look at the activities available'
 end
 
+act 'Leave':gt 'fit', 'dressing room'
+
 
 --- danceclass ---------------------------------
 

+ 1 - 1
locations/ender.qsrc

@@ -640,7 +640,7 @@ if $ARGS[0] = 'win':
 		'Christina falls to the ground, and you grab her by the hair. "Well bitch, tell the whole school. Did you suck his cock or not?" Christins squeals as she admits to the whole school that she sucked his cock.'
 		'Leaning forward so nobody else can hear, you tell her "From now on, you don''t get to wear panties to school." Shaking her head no, you twist her hair a little more, making her yelp, and say "For that, you will wear a buttplug everyday too. Want to keep pushing it?"'
 		'She looks at you in fear and nods. "I can''t hear you Christina!" you growl, twisting her hair again. "Yes, <<$pcs_nickname>>, no more panties, and wear a buttplug!" she gasps. Letting her go, you look down at her, and realize from now on, she is yours to do with as you please.'
-		'You pull out your phone and take a few pictures of her, and then anonymously send copies of the blowjob pictures to Coach Pavlovich along with a message that read; "Christina is no longer allowed to do school sports, or this ends up in the Principles hands." Satisfied, you walk away.'
+		'You pull out your phone and take a few pictures of her, and then anonymously send copies of the blowjob pictures to Coach Pavlovich along with a message that read; "Christina is no longer allowed to do school sports, or this ends up in the Principal''s hands." Satisfied, you walk away.'
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:
 		fightEnding = 0

+ 75 - 59
locations/exercise.qsrc

@@ -335,11 +335,7 @@ end
 if $ARGS[0] = 'hula':
 	cla
 	*clr
-	loopcount = 1
-	:timeloophula
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'react_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timeloophula'
-	loopcount = 0
+	gs 'exercise', 'tier2', (timemult*15), 'agil_exp', 'react_exp'
 	timemult = 0
 	if $clothingworntype ! 'nude':
 		if $location_type = 'secluded':
@@ -367,13 +363,14 @@ end
 
 if $ARGS[0] = 'yoga':
 	*clr & cla
-	loopcount = 1
-	:timeloopyoga
-	if willday_yoga ! daystart: willday_yoga = daystart & yoga_counter = 0	
-	gs 'exercise', 'tier2', 0, 'sprt_exp', 'agil_exp', iif(yoga_counter < 4, 'pcs_willpwr', '')	
-	yoga_counter += 1
-	if loopcount < timemult: loopcount += 1 & jump 'timeloopyoga'
-	loopcount = 0
+	if willday_yoga ! daystart: 
+		willday_yoga = daystart 
+		yoga_counter = 0	
+		:timeloopyoga
+		pcs_willpwr += rand(1,2)
+		if yoga_counter < min(timemult - 1,4): yoga_counter += 1 & jump 'timeloopyoga'
+	end
+	gs 'exercise', 'tier2', (timemult*15), 'sprt_exp', 'agil_exp'	
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -400,11 +397,7 @@ end
 if $ARGS[0] = 'rope':
 	cla
 	*clr
-	loopcount = 1
-	:timelooprope
-	gs 'exercise', 'tier3', 0, 'agil_exp', 'react_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timelooprope'
-	loopcount = 0
+	gs 'exercise', 'tier3', (15*timemult), 'agil_exp', 'react_exp'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -427,11 +420,7 @@ end
 if $ARGS[0] = 'press':
 	cla
 	*clr
-	loopcount = 1
-	:timelooppress
-	gs 'exercise', 'tier3', 0, 'vital_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timelooppress'
-	loopcount = 0
+	gs 'exercise', 'tier3', (15*timemult), 'vital_exp'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -454,11 +443,7 @@ end
 if $ARGS[0] = 'push':
 	cla
 	*clr
-	loopcount = 1
-	:timelooppush
-	gs 'exercise', 'tier3', 0, 'stren_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timelooppush'
-	loopcount = 0
+	gs 'exercise', 'tier3', (15*timemult), 'stren_exp'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -491,18 +476,22 @@ end
 if $ARGS[0] = 'tier1':
 	if ARGS[1] = 0:
 		minut += 15
+		mult = 1
 	else
 		minut += ARGS[1]
+		mult = (ARGS[1]-1)/15 + 1
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
-	pcs_stam -= (5 * (10 - sport_clothes_exercise_bonus)) / 10
-
-	gs 'sweat', 'add', 3
-	fat -= 1
-	pcs_energy -= 1
-	pcs_hydra -= 2
-	pcs_mood += 3
+	pcs_stam -= (mult * (10 - sport_clothes_exercise_bonus)) / 2
+
+	gs 'sweat', 'add', (3*mult)
+	fat -= (4 + mult/2)
+	pcs_energy -= 1*mult
+	pcs_hydra -= 2*mult
+	pcs_mood += (3 + mult)
+	mcnt = 0
+	:timeexploop1
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += 1'
 		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
@@ -511,36 +500,43 @@ if $ARGS[0] = 'tier1':
 		end
 	else
 		i = 2
-		:exploop
+		:exploop1
 		if $ARGS[i] ! '':
 			dynamic '<<$ARGS[i]>> += rand(0,1)'
 			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
 			i += 1
-			jump 'exploop'
+			jump 'exploop1'
 		else
 			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 			killvar 'steroidcheck'
 			killvar 'i'
-			exit
 		end
 	end
+	mcnt += 1
+	if mcnt < mult: jump 'timeexploop1'
+	killvar 'mcnt'
+	killvar 'mult'
 end
 
 if $ARGS[0] = 'tier2':
 	if ARGS[1] = 0:
 		minut += 15
+		mult = 1
 	else
 		minut += ARGS[1]
+		mult = (ARGS[1]-1)/15 + 1
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
-	pcs_stam -= (10 * (10 - sport_clothes_exercise_bonus)) / 10
-
-	gs 'sweat', 'add', 10
-	fat -= 2
-	pcs_energy -= 2
-	pcs_hydra -= 4
-	pcs_mood += 5
+	pcs_stam -= (mult * (10 - sport_clothes_exercise_bonus))
+
+	gs 'sweat', 'add', (10*mult)
+	fat -= (3 + mult/2)
+	pcs_energy -= 2*mult
+	pcs_hydra -= 4*mult
+	pcs_mood += (5 + mult)
+	mcnt = 0
+	:timeexploop2
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(2,3)'
 		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
@@ -561,23 +557,31 @@ if $ARGS[0] = 'tier2':
 			killvar 'i'
 		end
 	end
+	mcnt += 1
+	if mcnt < mult: jump 'timeexploop2'
+	killvar 'mcnt'
+	killvar 'mult'
 end
 
 if $ARGS[0] = 'tier3':
 	if ARGS[1] = 0:
-		minut += 12
+		minut += 15
+		mult = 1
 	else
 		minut += ARGS[1]
+		mult = (ARGS[1]-1)/15 + 1
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
-	pcs_stam -= (15 * (10 - sport_clothes_exercise_bonus)) / 10
-
-	gs 'sweat', 'add', 15
-	fat -= 3
-	pcs_energy -= 3
-	pcs_hydra -= 6
-	pcs_mood += 5
+	pcs_stam -= (3*mult * (10 - sport_clothes_exercise_bonus)) / 2
+
+	gs 'sweat', 'add', (15*mult)
+	fat -= (2 + mult/2)
+	pcs_energy -= 3*mult
+	pcs_hydra -= 6*mult
+	pcs_mood += (5 + mult)
+	mcnt = 0
+	:timeexploop3
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(3,5)'
 		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
@@ -598,23 +602,31 @@ if $ARGS[0] = 'tier3':
 			killvar 'i'
 		end
 	end
+	mcnt += 1
+	if mcnt < mult: jump 'timeexploop3'
+	killvar 'mcnt'
+	killvar 'mult'
 end
 
 if $ARGS[0] = 'tier4':
 	if ARGS[1] = 0:
 		minut += 15
+		mult = 1
 	else
 		minut += ARGS[1]
+		mult = (ARGS[1]-1)/15 + 1
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
-	pcs_stam -= (25 * (10 - sport_clothes_exercise_bonus)) / 10
-
-	gs 'sweat', 'add', 25
-	fat -= 4
-	pcs_energy -= 4
-	pcs_hydra -= 12
-	pcs_mood += 5
+	pcs_stam -= (5*mult * (10 - sport_clothes_exercise_bonus))/2
+
+	gs 'sweat', 'add', (25*mult)
+	fat -= (1 + mult/2)
+	pcs_energy -= 4*mult
+	pcs_hydra -= 12*mult
+	pcs_mood += (5 + mult)
+	mcnt = 0
+	:timeexploop4
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(7,10)'
 		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
@@ -635,6 +647,10 @@ if $ARGS[0] = 'tier4':
 			killvar 'i'
 		end
 	end
+	mcnt += 1
+	if mcnt < mult: jump 'timeexploop4'
+	killvar 'mcnt'
+	killvar 'mult'
 end
 
 if $ARGS[0] = 'timestring':

+ 3 - 3
locations/family.qsrc

@@ -85,11 +85,11 @@ if StoryLine = 1:
 			elseif kolloc = 11:
 				ocpd_room = 1
 				if momloc = 19 and sdadloc = 10:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
 				elseif momloc = 19:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
 				elseif sdadloc = 10:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
 				else
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
 				end

+ 4 - 1
locations/family_schedule.qsrc

@@ -107,6 +107,9 @@ if sister_indorf = 0:
 				if anyaloc = 15:
 					anyaloc['athome'] = 1
 					anyaloc['inroom'] = 1
+				else
+					anyaloc['athome'] = 0
+					anyaloc['inroom'] = 0
 				end
 			end
 		else
@@ -502,7 +505,7 @@ if indorf = 0:
 			!!Reads paper in kitchen
 			sdadloc = 4
 			sdadloc['athome'] = 1
-		elseif hour < 8:
+		elseif hour = 8 and minut < 20:
 			!! Take shower
 			sdadloc = 11
 			sdadloc['athome'] = 1

+ 1 - 1
locations/fathersex.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] = 'fathersex_act1':
 				sexpartkno = 1
 				spafinloc = 3
 				gs 'cum_manage'
-				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampieA1.mp4" ></video></center>'
+				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampieA<<rand(1,2)>>.mp4" ></video></center>'
 				gs 'arousal', 'anal', 10, 'sub', 'incest'
 				gs 'stat'
 				'From his increasingly intense and erratic thrusts, you can tell your stepfather is about to cum.'

+ 104 - 156
locations/fit.qsrc

@@ -99,7 +99,8 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	*nl
-
+	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
+	*nl
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
@@ -155,8 +156,6 @@ if $ARGS[0] = 'dressing room':
 		act 'Change into swimwear': gt 'changingroom', 'view_swim_list'
 	end
 
-	gs 'wardrobe', 'sports_outfit'
-
 	if abonement > 0:
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to the gym':
@@ -185,11 +184,16 @@ if $ARGS[0] = 'dressing room':
 
 				act 'Leave':gt 'fit', 'dressing room'
 			end
-		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
+		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40 and pcs_energy >= 20:
 			act 'Go to team practice':gt 'beg', 'start'
 			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
 				act '<b>Enter competition race</b>':run_comp_day = daystart & gt 'beg1', 'start'
 			end
+		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
+			act 'Go to team practice': '<br><font color="red">You don''t have enough energy to use this action.</font>'
+			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
+				act '<b>Enter competition race</b>': '<br><font color="red">You don''t have enough energy to use this action.</font>'
+			end
 		end
 	end
 	
@@ -326,6 +330,8 @@ if $ARGS[0] = 'gym':
 	'<center><b><font color="maroon">Fitness Center</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/schedule.jpg"></center>'
 	'In the fitness center there are a lot of different classes and clubs, designed to improve physical development.'
+	*nl
+	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 
 	if StoryLine = 1:
 		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
@@ -334,128 +340,106 @@ if $ARGS[0] = 'gym':
 
 	gs 'fit', 'exercise end'
 
-	act 'Aerobics (Burn fat)':
-		cla
-		*clr
-		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop1
-		gs 'exercise', 'tier3', 0, 'vital_exp', 'react_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop1'
-		loopcount = 0
-		timemult = 0
-		if pcs_inhib < 30:inhib_exp += rand(1,2)
+	if pcs_energy >= 15:
+		act 'Aerobics (Burn fat)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier1', 30, 'vital_exp', 'react_exp'
+			fat -= rand(0,4)
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
 
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit11.jpg"></center>'
-		'You do very vigorous exercises to the music, and burn some fat.'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit11.jpg"></center>'
+			'You do very vigorous exercises to the music, and burn some fat.'
 
-		if pcs_stam < 30:
-			*nl
-			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-			gs 'fit', 'exercise end'
-		else
-			act'Continue': gt 'fit', 'gym'
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
 		end
-	end
-
-	act 'Free weights (Build muscle)':
-		cla
-		*clr
-		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop2
-		gs 'exercise', 'tier3', 0, 'stren_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop2'
-		loopcount = 0
-		timemult = 0
-		if pcs_inhib < 30:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
-		'You pump iron, building strength.'
 
-		if pcs_stam < 30:
-			*nl
-			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-			gs 'fit', 'exercise end'
-		else
-			act'Continue': gt 'fit', 'gym'
+		act 'Free weights (Build muscle)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier3', 30, 'stren_exp'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
+			'You pump iron, building strength.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
 		end
-	end
-
-	act 'Cross trainer (endurance)':
-		cla
-		*clr
-		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop3
-		gs 'exercise', 'tier3', 0, 'vital_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop3'
-		loopcount = 0
-		timemult = 0
-		if pcs_inhib < 30:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit3.jpg"></center>'
-		'You spend a half hour doing reps on the cross trainer developing your endurance.'
 
-		if pcs_stam < 30:
-			*nl
-			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-			gs 'fit', 'exercise end'
-		else
-			act'Continue': gt 'fit', 'gym'
+		act 'Cross trainer (endurance)':
+			cla & *clr
+			abonement -= 1
+			gs 'exercise', 'tier3', 30, 'vital_exp'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit3.jpg"></center>'
+			'You spend a half hour doing reps on the cross trainer developing your endurance.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
 		end
-	end
 
-	act 'Tennis practice (agility)':
-		cla
-		*clr
-		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop4
-		gs 'exercise', 'tier3', 0, 'agil_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop4'
-		loopcount = 0
-		timemult = 0
-		if pcs_inhib < 30:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
-		'You run tennis exercises, concentrating on defensive drills.'
-
-		if pcs_stam < 30:
-			*nl
-			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-			gs 'fit', 'exercise end'
-		else
-			act'Continue': gt 'fit', 'gym'
+		act 'Tennis practice (agility)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier3', 30, 'agil_exp'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
+			'You run tennis exercises, concentrating on defensive drills.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
 		end
-	end
-
-	act 'Tennis practice (reactions)':
-		cla
-		*clr
-		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop5
-		gs 'exercise', 'tier3', 0, 'react_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop5'
-		loopcount = 0
-		timemult = 0
-		if pcs_inhib < 30:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
-		'You run tennis exercises, concentrating on court reactions.'
 
-		if pcs_stam < 30:
-			*nl
-			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-			gs 'fit', 'exercise end'
-		else
-			act'Continue': gt 'fit', 'gym'
+		act 'Tennis practice (reactions)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier3', 30, 'react_exp'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
+			'You run tennis exercises, concentrating on court reactions.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
 		end
+		act 'Go to the kickboxing gym':gt 'fit', 'kickboxing'
+	else
+		act 'Aerobics (Burn fat)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Free weights (Build muscle)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Cross trainer (endurance)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Tennis practice (agility)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Tennis practice (reactions)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Go to the kickboxing gym': '<br><font color="red">You feel too hungry to do this.</font>'
 	end
-
-	act 'Go to the kickboxing gym':gt 'fit', 'kickboxing'
 end
 
 if $ARGS[0] = 'exercise end':
@@ -605,13 +589,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop6
-		gs 'exercise', 'tier3', 0, 'jab_exp', 'react_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop6'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier3', 30, 'jab_exp', 'react_exp'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your jabs on the speed bag and double-end bag, straight punches with a step forward. These strikes are not so powerful, but they are fast.'
@@ -623,13 +601,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop7
-		gs 'exercise', 'tier3', 0, 'stren_exp', 'punch_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop7'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier3', 30, 'stren_exp', 'punch_exp'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your power punches on the heavy bag. These are high impact and powerful, but they are hard to get to their target.'
@@ -641,13 +613,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop8
-		gs 'exercise', 'tier3', 0, 'stren_exp', 'kick_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop8'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier3', 30, 'stren_exp', 'kick_exp'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your powerful kicks on a kickboxing bag. These impacts are very powerful and able to cut down an opponant, but are very difficult to hit with.'
@@ -659,13 +625,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		timemult = 2
-		loopcount = 1
-		:timeloop9
-		gs 'exercise', 'tier3', 0, 'def_exp', 'agil_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop9'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier3', 30, 'def_exp', 'agil_exp'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your defense movements.'
@@ -681,13 +641,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Pick a random partner':
 			abonement -= 1
 			pcs_mood += 2
-			timemult = 2
-			loopcount = 1
-			:timeloop10
-			gs 'exercise', 'tier3', 0, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop10'
-			loopcount = 0
-			timemult = 0
+			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
 			pointKik = 0
 			pointKikV = 0
 			round = 1
@@ -721,13 +675,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Amateur fight':
 			kickbox['amateur_fight_day'] = daystart
 			pcs_mood += 2
-			timemult = 2
-			loopcount = 1
-			:timeloop11
-			gs 'exercise', 'tier3', 0, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop11'
-			loopcount = 0
-			timemult = 0
+			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
 			pointKik = 0
 			pointKikV = 0
 			round = 1

+ 1 - 1
locations/flash.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'flashtotals':
 	pants_out_pussy_hairy = 8
 	pants_out_pantyrear = 10
 	pants_out_butt = 19
-	pants_out_butt_plug = 3
+	pants_out_butt_plug = 6
 	pants_out_full = 9
 	pants_out_full_hairy = 6
 end

+ 2 - 1
locations/gadfield.qsrc

@@ -65,7 +65,8 @@ if $ARGS[0] = 'field':
 				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
 			end
 
-			gs 'exercise', 'tier1', 360, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+			minut += 300
 			if sunWeather = 1:pcs_tan += 1
 			grandpaQW['chore_bale_hay'] = 2
 			hndiwrk_exp += rand(0,8)

+ 40 - 70
locations/gdksport.qsrc

@@ -78,8 +78,6 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
-	gs 'wardrobe', 'sports_outfit'
-
 	if shampoo > 0 or (StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
@@ -90,20 +88,36 @@ if $ARGS[0] = 'start':
 
 	if pcs_stam > 20 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour < 18:
 		if gsAboBeg > 0 and npc_pregtalk['A131'] = 0:
-			act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': gt 'gdksport', 'racing2'
+			if pcs_energy >= 20:
+				act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': gt 'gdksport', 'racing2'
+			else
+				act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': '<br><font color="red">You feel too hungry to do this.</font>'
+			end
 		end
 		if gsAboVolley > 0 and volleysostav = 0 and npc_pregtalk['A69'] = 0:
-			if week ! 5:
-				act 'Take a volleyball lesson. You have <<gsAboVolley>> lessons remaining': gt 'gdksport', 'vball2'
+			if pcs_energy >= 20:
+				if week ! 5:
+					act 'Take a volleyball lesson. You have <<gsAboVolley>> lessons remaining': gt 'gdksport', 'vball2'
+				else
+					act 'Take a volleyball lesson. You have <<gsAboVolley>> lessons remaining': gt 'gdksport', 'vball3'
+				end
 			else
-				act 'Take a volleyball lesson. You have <<gsAboVolley>> lessons remaining': gt 'gdksport', 'vball3'
+				act 'Take a volleyball lesson. You have <<gsAboVolley>> lessons remaining': '<br><font color="red">You feel too hungry to do this.</font>'
 			end
 		end
 		if volleysostav > 0:
 			if week ! 6 and volkomday ! daystart:
-				act 'Play with the team': gt 'gdksport', 'vball4'
+				if pcs_energy >= 20:
+					act 'Play with the team': gt 'gdksport', 'vball4'
+				else
+					act 'Play with the team': '<br><font color="red">You feel too hungry to do this.</font>'
+				end
 			elseif week = 6 and sorevday ! daystart and hour <= 18:
-				act 'Play in Tournament': gt 'gdksport', 'vball5'
+				if pcs_energy >= 20:
+					act 'Play in Tournament': gt 'gdksport', 'vball5'
+				else
+					act 'Play in Tournament': '<br><font color="red">You feel too hungry to do this.</font>'
+				end
 			elseif week = 6 and sorevday ! daystart and hour > 18:
 				'As you look around, you don''t see anyone from the team. You suddenly realize that there was a tournament game today and you were supposed to be here at 18:00! You missed the bus and the coach is going to be furious!'
 				gs 'npc_relationship', 'modify', 'A69', -20
@@ -114,12 +128,16 @@ if $ARGS[0] = 'start':
 			end
 		end
 		if gsAboDance > 0 and AlbinaQW['StarletsJoined'] = 0 and npc_pregtalk['A23'] = 0:
-			act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining':
-				if rand(0, 5) = 0:
-					gt 'danceGev'
-				else
-					gt 'gdksport', 'dance2'
+			if pcs_energy >= 20:
+				act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining':
+					if rand(0, 5) = 0:
+						gt 'danceGev'
+					else
+						gt 'gdksport', 'dance2'
+					end
 				end
+			else
+				act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining': '<br><font color="red">You feel too hungry to do this.</font>'
 			end
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
 			if hour = 15 and starlets_on = 1:
@@ -227,13 +245,7 @@ if $ARGS[0] = 'dance2':
 
 	if pcs_danc < 50:
 		gsAboDance -= 1
-		timemult = 8
-		loopcount = 1
-		:dancetimeloop
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'danc_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'dancetimeloop'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier2', 120, 'agil_exp', 'danc_exp'
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 
 		'You take a lesson in modern dance, which is very popular with people your age.'
@@ -248,13 +260,7 @@ if $ARGS[0] = 'dance2':
 		act 'Leave': gt 'gdksport', 'start'
 	else
 		gsAboDance -= 1
-		timemult = 8
-		loopcount = 1
-		:dancetimeloop2
-		gs 'exercise', 'tier2', 0, 'agil_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'dancetimeloop2'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier2', 120, 'agil_exp'
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		gs 'stat'
 
@@ -283,13 +289,7 @@ if $ARGS[0] = 'racing2':
 	*clr & cla
 	menu_off = 1
 	gsAboBeg -= 1
-	timemult = 8
-	loopcount = 1
-	:runtimeloop
-	gs 'exercise', 'tier2', 0, 'run_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'runtimeloop'
-	loopcount = 0
-	timemult = 0
+	gs 'exercise', 'tier2', 120, 'run_exp'
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
@@ -304,21 +304,9 @@ if $ARGS[0] = 'vball2':
 	gsAboVolley -= 1
 	if alko < 2:
 		npc_rel['A69'] += rand(0,2)
-		timemult = 8
-		loopcount = 1
-		:vballtimeloop1
-		gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop1'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 	else
-		timemult = 8
-		loopcount = 1
-		:vballtimeloop2
-		gs 'exercise', 'tier1', 0, 'run_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop2'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier1', 120, 'run_exp'
 		if pcs_inhib < 40:inhib_exp += rand(0,1)
 	end
 	gs 'stat'
@@ -343,13 +331,7 @@ if $ARGS[0] = 'vball3':
 	'On Fridays they hold intramural competitions. Scouts for professional teams sometime come to see who the stronger and more talented players are.'
 
 	if alko < 2:
-		timemult = 8
-		loopcount = 1
-		:vballtimeloop3
-		gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
-		loopcount = 0
-		timemult = 0
+		gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 		if pcs_vball < 25:
 			'You were an absolutely lousy player and made constant mistakes. Eventually, the coach had enough and he removed you from the court.'
 		elseif pcs_vball < 50:
@@ -377,13 +359,7 @@ if $ARGS[0] = 'vball4':
 	*clr & cla
 	menu_off = 1
 	volkomday = daystart
-	timemult = 8
-	loopcount = 1
-	:vballtimeloop4
-	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop4'
-	loopcount = 0
-	timemult = 0
+	gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 	npc_rel['A69'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(0,1)
 	gs 'stat'
@@ -418,12 +394,7 @@ end
 if $ARGS[0] = 'vball5':
 	*clr & cla
 	menu_off = 1
-	timemult = 8
-!	loopcount = 1
-!	:vballtimeloop5
-!	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-!	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop5'
-!	loopcount = 0
+!	gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
 	'The tournament starts at 19:00. Your bus departs at 18:00. You gather your things together with the rest of the team and get on a bus that takes you to the out of town match.'
@@ -441,8 +412,7 @@ end
 
 if $ARGS[0] = 'volley':
 	menu_off = 1
-	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-	gs 'exercise', 'tier2', 0, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+	gs 'exercise', 'tier2', 30, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 !	minut += 30
 	gs 'stat'
 

+ 5 - 1
locations/gschool_chats1.qsrc

@@ -543,7 +543,11 @@ if $ARGS[0] = 'albina':
 		if school_period = 3:
 			gt 'albina_school_sex', 'break_fun_1'
 		else
-			gt 'albina_school_sex', 'lunch_fun_1'
+			if rand(1,4) = 1:
+				gt 'albina_school_sex', 'lunch_fun_1'
+			else
+				gt 'albina_school_sex', 'lunch_fun_2'
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'

+ 16 - 24
locations/gschool_cheerleading.qsrc

@@ -141,8 +141,7 @@ if $ARGS[0] = 'tryouts':
 		act 'Try to follow Albina''s example':
 			*clr & cla
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+			gs 'exercise', 'tier2', 30, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
 			!! Success calculation - Contributing factors: social group, cool kids standing, Albina friendship, agility, endurance, dance skill, natural cheerleading talent
 			!!  New game character comparison:
 			!!  Cool kids would just about pass								~250 (100 cool + 55 friendship + 30 agi + 30 end + 20 dance + 15 talent)
@@ -323,16 +322,9 @@ if $ARGS[0] = 'practice':
 
 		act 'Follow the others into the hall':
 			*clr & cla
-			temp_time = 6
-			temp_count = 1
-			:cheerleading_practice_loop
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
-			if temp_count < temp_time: temp_count += 1 & jump 'cheerleading_practice_loop'
-			killvar 'temp_count'
-			killvar 'temp_time'
-
-			gs 'stat'
+			gs 'exercise', 'tier2', 90, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+            gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/practice.mp4"></video></center>'
 
 			!! First time scene
@@ -696,7 +688,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 		end
-	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 :
+	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 and npc_sex['A23'] => 1:
 		if First_time_3some_with_Lazar = 0:
 			First_time_3some_with_Lazar = 1
 			'You stay in the shower a little longer than usual and it''s quiet when you enter the empty locker room. As you are getting your clothes ready, the door opens and Albina peeks in. "Oh fuck." she mumbles before walking in. "I was hoping it would be empty in here. I''m so fucking wet right now and was going to spend a little time here before I went home..."
@@ -747,7 +739,7 @@ if $ARGS[0] = 'shower':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome3.mp4"></video></center>'
 							'Without hesistation, you plunge your tongue straight into her stretched asshole and start to vigorously tongue fuck her back door. Albina moans and giggles in delight while Lazar just watches the show while jerking himself. After a few seconds, you withdraw and Lazar penetrates her again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans as Lazar starts fucking her even harder this time. You obidiently slide under Albina and start pleasuring her by licking her clit and fingering her now soaking wet pussy that''s dripping her juices.' 
-							'She eventually orgasms from the pleasure, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass! Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits right on your face and starts grinding against you, so you obediently lick and tongue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
+							'She eventually reaches orgasm, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass! Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits right on your face and starts grinding against you, so you obediently lick and tongue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
 							gs 'arousal', 'rimming_give', 5
 							minut += 5
 							gs 'cum_call', 'mouth', $boy
@@ -764,12 +756,12 @@ if $ARGS[0] = 'shower':
 							end
 						end
 
-						act 'Reluctantly eat her ass':
+						act 'Eat her pussy instead':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome3.mp4"></video></center>'
-							'You don''t really want to do this, but Albina looks back at you expectantly while spreading her cheeks and Lazar is waiting in anticipation, so you reluctantly give her asshole a few half hearted licks. "Come on <<$pcs_nickname>>, you can do better than that!" Albina quips before forcing your head between her cheeks and making you eat her ass. After a few seconds, you withdraw and Lazar penetrates her again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans as Lazar fucks her hard. You obidiently slide under Albina and start pleasuring her by licking her clit and fingering her pussy.' 
-							'She eventually orgasms from the pleasure, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you, so you again reluctantly lick her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
-							gs 'arousal', 'rimming_give', 5
+							'You don''t really want to do this and Albina looks back and sees this. She lets out a disappointed sigh. "Okay then, you can eat my pussy instead..." You slide underneath her and start licking her dripping wet pussy as Lazar penetrates her ass again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans and you pleasuring her by licking her clit and fingering her pussy.' 
+							'She eventually reaches orgasm, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes! Cum in my ass! Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you as cum continues to trickle into your mouth. She keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
+							gs 'arousal', 'cuni_give', 5
 							minut += 5
 							gs 'cum_call', 'mouth', $boy
 							gs 'arousal', 'end'
@@ -777,7 +769,7 @@ if $ARGS[0] = 'shower':
 							act 'Finish':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg"></center>'
-								'Albina then climbs off of you and fingers her ass before pulling her digits out, a look of admiration on her face. "Fuck <<$pcs_nickname>>, you really cleaned me out. Come here." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and swallows the cum she has in her mouth, encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "You two were amazing! We need to do this again sometime, no?" he asks.
+								'Albina then climbs off of you and fingers her ass before pulling her digits out. "I think I got it all out. Come here <<$pcs_nickname>>." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and swallows the cum she has in her mouth, encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "You two were amazing! We need to do this again sometime, no?" he asks.
 								Albina just gives out a playful giggle. "Maybe we will, maybe we won''t." she teases him and you all laugh before getting dressed. You then all leave the room and go your seperate ways.'
 								minut += 5
 
@@ -837,7 +829,7 @@ if $ARGS[0] = 'shower':
 								*clr & cla
 								'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome3.mp4"></video></center>'
 								'Without hesistation, you plunge your tongue straight into her stretched asshole and start to vigorously tongue fuck her back door. Albina moans and giggles in delight while Lazar just watches the show while jerking himself. After a few seconds, you withdraw and Lazar penetrates her again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans as Lazar fucks her hard. You obidiently slide under Albina and start pleasuring her by licking her clit and fingering her now soaking wet pussy.' 
-								'She eventually orgasms from the pleasure, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you, so you obediently lick and tobgue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
+								'She eventually reaches orgasm, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you, so you obediently lick and tobgue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
 								gs 'arousal', 'rimming_give', 5
 								minut += 5
 								gs 'cum_call', 'mouth', $boy
@@ -854,12 +846,12 @@ if $ARGS[0] = 'shower':
 								end
 							end
 
-							act 'Reluctantly eat her ass':
+							act 'Eat her pussy instead':
 								*clr & cla
 								'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome3.mp4"></video></center>'
-								'You don''t really want to do this, but Albina looks back at you expectantly while spreading her cheeks and Lazar is waiting in anticipation, so you reluctantly give her asshole a few half hearted licks. "Come on <<$pcs_nickname>>, you can do better than that!" Albina quips before forcing your head between her cheeks and making you eat her ass. After a few seconds, you withdraw and Lazar penetrates her again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans as Lazar fucks her hard. You obidiently slide under Albina and start pleasuring her by licking her clit and fingering her pussy.' 
-								'She eventually orgasms from the pleasure, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes. Cum in my ass! Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you, so you again reluctantly lick her asshole as cum continues to trickle into your mouth. "Yeah, that''s right <<$pcs_nickname>>. Lick my asshole clean." Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
-								gs 'arousal', 'rimming_give', 5
+								'You don''t really want to do this and Albina looks back and sees this. She lets out a disappointed sigh. "Okay then, you can eat my pussy instead..." You slide underneath her and start licking her dripping wet pussy as Lazar penetrates her ass again. "Uuuuhhh, <<$pcs_nickname>>... Eat... my... pussy! Oh fuck yes!" Albina blurts out between moans and you pleasuring her by licking her clit and fingering her pussy.' 
+								'She eventually reaches orgasm, her twitching pussy expelling your fingers and spraying juices everywhere as she screams in pleasure. Lazar is also close and Albina senses this through his ragged thrusts. "Yes, yes! Cum in my ass! Give it to me!" she moans in encouragment. Lazar picks up the pace and soon lets out a loud grunt as you see his balls twitching above you. Once he''s finished unloading into her, he pulls out. "Stay right fucking there and open wide <<$pcs_nickname>>!" Albina orders. You open your mouth as Albina turns around and squats above you, her ass letting out a loud squelch as she squeezes the load of cum from her ravaged hole into your mouth. She then sits on your face and starts grinding against you as cum continues to trickle into your mouth. She keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.'
+								gs 'arousal', 'cuni_give', 5
 								minut += 5
 								gs 'cum_call', 'mouth', $boy
 								gs 'arousal', 'end'
@@ -867,7 +859,7 @@ if $ARGS[0] = 'shower':
 								act 'Finish':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg"></center>'
-									'Albina then climbs off of you and fingers her ass before pulling her digits out, a look of admiration on her face. "Fuck <<$pcs_nickname>>, you really cleaned me out. Come here." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and swallows the cum she has in her mouth, encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "Until next time girls." he says.
+									'Albina then climbs off of you and fingers her ass before pulling her digits out. "I think I got it all out. Come here <<$pcs_nickname>>." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and swallows the cum she has in her mouth, encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "Until next time girls." he says.
 									Albina teases him by bending over and wiggling her naked ass at him, showing off her still slightly gaping anus. You all laugh and get dressed before leaving the room and going your seperate ways.'
 									minut += 5
 

+ 0 - 1
locations/gschool_grounds.qsrc

@@ -764,7 +764,6 @@ if $ARGS[0] = 'change_room':
 		exit
 	end
 
-	gs 'wardrobe', 'sports_outfit'
 	act 'Change your outfit':
 		cla
 		gt 'wardrobe', 'start'

+ 185 - 137
locations/gschool_lessons4.qsrc

@@ -34,35 +34,35 @@ if $ARGS[0] = 'math':
 			else
 				$mathNikoimg = 'images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'
 			end
-			'Mr. Tsarev pauses, then turns to the door as Niko is casually entering. Mr. Tsarev crosses his arms then says "Late again I see. What is the reason for it this time?" Niko takes a second to collect his thoughts then says'
+			'Mr. Tsarev pauses, then turns to the door as Niko casually strolls in. Mr. Tsarev crosses his arms then says "Late again I see. What is the reason for it this time?" Niko takes a second to collect his thoughts then says'
 			killvar '$mathNikoimg'
 			*nl
 			if VK = 1:
 				'"I was on my way to class when this crazy old lady began shouting at me, so I asked her what is wrong. She told me that I stepped on her dress when I was nowhere near her. She created a big scene and I had to deal with that, which is why I arrived late." Mr. Tsarev sighs then shakes his head. "So an old woman screamed at you and created a big scene because you stepped on her dress which you didn''t actually step on? Do I have that right?"'
 				'Niko shrugs then continues walking toward his seat while Mr. Tsarev says "Fine, try not to anger any more old ladies, will you?" Niko uses his thumb to point to Christina as he jokingly replies "I can''t control when Christina gets angry at me." Christina recoils, obviously caught off guard and offended by his comment. She lifts up her fist then punches Niko several times in the arm before Mr. Tsarev breaks it up with a stern voice. "Hey, knock it off you two! Niko, sit down before I send you to the principal''s office!"'
-				'Niko casually sits down while rubbing his arm, then opens his mouth to speak, only to get cut off by Mr. Tsarev. "Not another word! Alright, let''s get back to the lesson, unless someone would like to visit the principal''s office instead?" He looks to Niko, who shakes his head. The class remains silent as Mr. Tsarev begins handing out work sheets. He is obviously not in a good mood.'
+				'Niko casually sits down while rubbing his arm, then opens his mouth to speak, only to get cut off by Mr. Tsarev. "Not another word! Alright, let''s get back to the lesson, unless someone would like to visit the principal''s office instead?" He looks to Niko, who shakes his head. The class remains silent as Mr. Tsarev begins handing out worksheets. He''s obviously not in a good mood.'
 			elseif VK = 2:
-				'"While I was on my way to class, some braindead bimbo spilled her coffee on my uniform so I was forced to head back home to clean up. You wouldn''t want me to arrive covered in coffee right?" Mr. Tsarev sighs before responding. "So you couldn''t run home and change your shirt before the start of class?" Niko replies. "Well I had to clean out the coffee from my hair as well as restyle it and that takes time."'
-				'Christina chimes in. "Why even bother washing the coffee off? You always look like a greasy punk anyway." Niko leans toward Christina and says "You don''t have to play hard to get. If you want my attention, then you need only ask." Christina whispers back in a seductive voice. "I should tell you that I have been looking for a handsome, strong and sexy man in my life..." "Ohh yeah?" Niko whispers in reply. '
-				'Christina then replies. "That is why I have no interest in dating losers like you." Christina then laughs in Niko''s face as he clenches his fist before walking to his seat. Mr. Tsarev interrupts. "Are you two love birds done? Can we begin the lesson now?" Christina continues laughing as Niko remains silent, obviously upset. Mr. Tsarev begins handing out some work sheets to the class. As he hands Niko a sheet, he quips "Try to leave earlier so that you can arrive her on time. It''s not hard."'
+				'"While I was on my way to class, some braindead bimbo spilled her coffee on my uniform so I was forced to head back home to clean up. You wouldn''t want me to arrive covered in coffee right?" Mr. Tsarev sighs before responding. "So you couldn''t run home and change your shirt before the start of class?" Niko replies. "Well I had to clean the coffee from my hair as well as restyle it and that takes time."'
+				'Christina chimes in. "Why even bother washing the coffee off? You always look like a greasy punk anyway." Niko leans toward Christina and says "You don''t have to play hard to get. If you want my attention, then you need only ask." Christina whispers back in a seductive voice. "I should tell you that I''ve been looking for a handsome, strong and sexy man in my life..." "Ohh yeah?" Niko whispers in reply. '
+				'Christina then replies. "That''s why I have no interest in dating losers like you." She then laughs in Niko''s face as he clenches his fist before walking to his seat. Mr. Tsarev interrupts. "Are you two love birds done? Can we begin the lesson now?" Christina continues laughing as Niko remains silent, obviously upset. Mr. Tsarev begins handing out some worksheets to the class. As he hands Niko a sheet, he quips "Try to leave earlier so that you can arrive here on time. It''s not hard."'
 			else
-				'"There must have been a power outage in my house this morning because my alarm was not working at all." Mr. Tsarev looks at him with an intrigued look. "Strange, I haven''t heard about any power outages this morning." Niko shrugs as he responds. "It might be a faulty wire in my house or something." Mr. Tsarev crosses his arms. "Why do all these things seem to happen to you before my class?" Niko shrugs again before saying "I guess that I''m just unlucky." Igor scoffs before adding "Don''t you ever get tired of lying? You are really bad at it."'
+				'"There must have been a power outage in my house this morning because my alarm wasn''t working." Mr. Tsarev looks at him with an intrigued look. "Strange, I haven''t heard about any power outages this morning." Niko shrugs as he responds. "It might be a faulty wire in my house or something." Mr. Tsarev crosses his arms. "Why do all these things seem to happen to you before my class?" Niko shrugs again before saying "I guess that I''m just unlucky." Igor scoffs before adding "Don''t you ever get tired of lying? You''re really bad at it."'
 				'Niko turns to Igor and quickly approaches him before grabbing onto his collar. "You have something to say to me faggot? I''ll knock your teeth out." Igor leans back with a frightful look on his face as he replies "No, no I didn''t... I''m sorry, I''m sorry." Mr. Tsarev slams a textbook on his desk before shouting "Nikolai! Knock it off and either get in your seat or go to the principal''s office!" Niko slightly lunges forward to trick Igor into thinking that he will punch him, which ends up working.'
-				'Igor pulls back and covers his face with his arms. Niko then chuckles before walking to his seat. "Enough interruptions, let us begin today''s lesson. I hope you have all been studying because today''s lesson will have many tough questions for you all to answer." Mr. Tsarev says as he begins handing out some worksheets to the class.'
+				'Igor pulls back and covers his face with his arms. Niko then chuckles before walking to his seat. "Enough interruptions, let us begin today''s lesson. I hope you''ve all been studying because today''s lesson will have many tough questions for you to answer." Mr. Tsarev says as he begins handing out some worksheets to the class.'
 			end
 		else
 			'Dimka scoffs as he says "Why would they do that? That sounds stupid to me." Mr. Tsarev responds "Ahh Dmitri, it was nice of you to raise your hand and volunteer to answer my next question." Dimka facepalms as Mr. Tsarev continues. "If the current time is 4am and you have a dentist appointment at 2pm, then how long do you have to wait until your dentist appointment begins? Remember that you need to calculate the numbers while keeping the 12 hour timezones in mind."'
 			*nl
 			'<a href="exec:gs ''shortgs'',''img msg'',''images/characters/shared/headshots_main/big1.jpg''">Dimka</a> responds "If it is really 4am, then I would probably go to sleep and figure it out in the morning." Many of the students, along with Mr. Tsarev, begin laughing. "That wasn''t exactly the answer I was looking for, but I can forgive it. The answer for that question was ten hours." He grabs a piece of chalk then begins writing on the chalkboard; "A simple way of figuring it out is by looking at the arrival time. The time for arriving is 2pm, which means that it is two hours after twelve.'
 			*nl
-			'Those added together equals fourteen. Lastly, we need to subtract the current time from this to eliminate the time already passed. Fourteen minus four equals ten, giving us our answer." "Yeah that''s... real simple." Dimka sarcastically replies. Igor laughs as Mr. Tsarev responds with a smirk on his face. "With practice it will be. Speaking of which, I will begin handing out some simple problems for you to solve." He reaches for some papers on his desk then begins handing them out.'
+			'Those added together equals fourteen. Lastly, we need to subtract the current time from this to eliminate the time already passed. Fourteen minus four equals ten, giving us our answer." "Yeah that''s... real simple." Dimka sarcastically replies. Igor laughs as Mr. Tsarev responds with a smirk on his face. "With practice it will be. Speaking of which, I will begin handing out some simple problems for you to solve." He reaches for some papers on his desk and begins handing them out.'
 		end
 	elseif VK = 3:
 		VKrand = rand(1,3)
 		'You walk into the classroom and sit down at your desk just as Mr. Tsarev gets up to begin today''s lesson. "Alright, I would like to know how much you all know of numbers. Can anyone tell me what is the smallest number in existence?"'
 		*nl
 		if VKrand = 1:
-			'Christina raises her hand and Mr. Tsarev points to her. "Miss Zvereva." Christina answers. "Isn''t the smallest number the size of Igor''s penis?" Igor recoils in shock as Mr. Tsarev, with a stern look on his face, responds "No that is not the answer and I would appreciate it if you would take this question seriously.'
+			'Christina raises her hand and Mr. Tsarev points to her. "Miss Zvereva." Christina answers. "Isn''t the smallest number the size of Igor''s dick?" Igor recoils in shock as Mr. Tsarev, with a stern look on his face, responds "No that is not the answer and I would appreciate it if you would take this question seriously.'
 		elseif VKrand = 2:
 			'Natasha raises her hand and says "Isn''t that a trick question? Numbers have no ending point, so finding the lowest number shouldn''t be possible." Mr. Tsarev nods his head approvingly before responding. "That is correct. Numbers are without end, so finding a lowest point is impossible."'
 		else
@@ -210,22 +210,22 @@ if $ARGS[0] = 'math':
 			VK = rand(1,5)
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
-			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the time to pass and the class to be over. You decide to play on your phone to pass the time.'
+			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the class to finally be over. You decide to play on your phone to pass the time.'
 		    if VK = 1 and npc_rel['A18'] <= 60 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
 				if npc_rel['A18'] > 30:npc_rel['A18'] = 30
-				'As you are browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face growing flushed in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
+				'As you are browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face flushing in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif (VK = 1 and npc_rel['A18'] >= 80 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)) or (VK = 1 and grupTipe = 2 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)):
 				VKrand = rand(1,3)
 				if salocatnow >= 5:
-					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, I can''t help but notice that you have been putting on some weight. Would you like to run with Lina and I after school to maybe burn some of those calories?" Feeling embarrassed, you reply "Um maybe another time." Christina replies immediately. "<<$pcs_nickname>>, the other girls are starting to talk about you. You don''t want to be known as the fat girl of the school, do you?" You look toward Christina and see a mildly concerned look on her face before she texts one last message; "A few workouts a day and a proper diet can do wonders for your future. Think about it <<$pcs_firstname>>." She gives you an assuring nod before turning back towards the teacher.'
+					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, I can''t help but notice that you''ve been putting some weight on. Would you like to run with Lina and I after school to maybe burn some of those calories?" Feeling embarrassed, you reply "Um maybe another time." Christina replies immediately. "<<$pcs_nickname>>, the other girls are starting to talk about you. You don''t want to be known as the fat girl of the school, do you?" You look toward Christina and see a mildly concerned look on her face before she texts one last message; "A few workouts a day and a proper diet can do wonders for your future. Think about it <<$pcs_firstname>>." She gives you an assuring nod before turning back towards the teacher.'
 				elseif VKrand = 1:
 					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, when are you getting those track shoes that I told you about? I still see you wearing those raggedy ones at PE." You giggle then reply "I keep forgetting to check them out when I stop by the shop." Christina immediately replies. "I know what you mean. I always get distracted by the other clothes then forget why I went in there in the first place."'
 					*nl
-					'You both look to each other with a smile when you hear Mr. Tsarev say "Hey, eyes up here you two." You both look back toward the teacher until he turns around to write on the board. You and Christina continue chatting via text message as Mr. Tsarev continues his lesson.'
+					'You both look at each other with a smile when you hear Mr. Tsarev say "Hey, eyes up here you two." You both look back toward the teacher until he turns around to write on the board. You and Christina continue chatting via text message as Mr. Tsarev continues his lesson.'
 				elseif VKrand = 2:
-					'As you are browsing the web, you receive a text message from Christina reading; "Have you heard what that bitch Bella said the other day? I am so sick of her lording over everyone as if she is too good to have a simple conversation with someone without rudely scoffing at them. She has nothing going for her. She isn''t good at anything except making enemies. That brainless uptight bitch!" You reply. "What did she say exactly?"'
-					'Christina replies. "Lizaveta told me about how Bella said that running track is only for fat girls wanting to lose weight. If she ever says that to my face, then I will show her how inferior to me she truly is." You try to calm Christina. "Maybe she didn''t say that. It could just be a rumor."'
+					'As you are browsing the web, you receive a text message from Christina reading; "Have you heard what that bitch Bella said the other day? I''m so sick of her lording over everyone as if she''s too good to have a simple conversation with someone without rudely scoffing at them. She has nothing going for her. She isn''t good at anything except making enemies. That brainless uptight bitch!" You reply. "What did she say exactly?"'
+					'Christina replies. "Lizaveta told me about how Bella said that running track is only for fat girls wanting to lose weight. If she ever says that to my face, then I''ll show her just how inferior she truly is." You try to calm Christina. "Maybe she didn''t say that. It could just be a rumor."'
 					'Christina replies back. "Bella better hope that you are right. I will find out one way or another." Christina quickly turns off her phone then slams her hand on the table, causing Mr. Tsarev to jump up in surprise before quickly looking around the room for the source of the noise before shrugging and continuing with his lesson.'
 				else
 					'As you are browsing the web, you receive a text message from Christina reading; "Have you seen what Zinaida was wearing this morning? Another hessian sack. Doesn''t she realize how bad she looks? Would it kill her to comb her hair? She looks like a fucking scarecrow." You reply. "Yeah she doesn''t really seem to care about her appearance at all." Christina replies. "Exactly! She is such an eyesore. Anyway have you been watching my races? I have been undefeated since I have started." You text back. "I have seen a few and I am always impressed at how fast you can move." Christina gives you a wink before replying. "Keep training and maybe you and I will keep the first two spots reserved for us. You can be the one in second of course."'
@@ -634,7 +634,7 @@ if $ARGS[0] = 'english':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
 								'You deftly shove the phone in your bra, and smile fiendishly as you see the momentary hesitation from your teacher as they stop at your desk. "You think this is a joke, Miss <<$pcs_lastname>>?" Ms. Braakman asks, her eyes narrowing.'
-							    '"If you want my phone, go ahead and take it." you reply in a mockingly sweet voice as you thrust your chest out. Your teacher''s eyes darken dangerously, and you start to think you''ve won this fight, but your bluff is called as one of Ms. Braakman''s hands plunges into your shirt. "Ms. Braakman, I didn''t know today''s lesson would be so hands on!" you tease as you feel her hand slip inside your bra. Your smile widens as you hear the class erupt with cheering and laughter.'
+							    '"If you want my phone, go ahead and take it." you reply in a mockingly sweet voice as you thrust your chest out. Her eyes darken dangerously as you think you''ve won, but your bluff is called as one of Ms. Braakman''s hands plunges into your shirt. "Ms. Braakman, I didn''t know today''s lesson would be so hands on!" you tease as you feel her hand slip inside your bra. Your smile widens as you hear the class erupt with cheering and laughter.'
 							    '"You think you''re clever, don''t you?" she whispers, her voice low so only you can hear. You try to respond, but your words get caught in your throat as she starts to tease one of your nipples between her fingertips. Suddenly, she''s no longer searching but groping, her skillful fingers carefully moving between each breast until both of your sensitive buds are hard and straining almost uncomfortably against your bra. You can''t help but shift slightly in your seat as you feel a tightening sensation in your lower belly and an aching throb between your legs.'
 							    *nl
 							    '"Don''t make me remind you of your place, little girl." Ms. Braakman''s warning is punctuated painfully as she gives a sharp pinch and tug to one of your nipples, eliciting a soft whimper from you. Having gotten her point across, she removes her hand and with it your phone. "You can get this back after class."'
@@ -663,7 +663,7 @@ if $ARGS[0] = 'pe':
 	gs 'grades', 'attend_class', 'school', 'pe'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
-	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is here, this is the only class you have where all the students from your grade is present.'
+	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is present.'
 	if week = 5 and LocalRun = 0:
 		if SchoolSorev = 0:SchoolSorev = 1
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
@@ -684,10 +684,9 @@ if $ARGS[0] = 'pe':
 			gs 'sweat', 'add', 30
 			run_exp += rand(1, 2)
 			gs 'grades', 'class_activity_skill', 'school', 'pe', pcs_run
-			gs 'exercise', 'tier2', 1, 'vital_exp'
-			gs 'exercise', 'tier2', 1, 'agil_exp'
+			gs 'exercise', 'tier2', 1, 'vital_exp', 'agil_exp'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
-			'After the roll call, Coach Pavlovich announces that you will be running.'
+			'After the roll call, Coach Pavlovich announces that you will be running today.'
 			act 'Run':
 				*clr & cla
 				if temper >= 10 and sunWeather = 1:
@@ -695,7 +694,7 @@ if $ARGS[0] = 'pe':
 					if runoutside = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
 						'"Since the weather is so nice, we will be running outside today. Let''s go!" He leads the class outside to the forest trail on the school grounds, near the old school building. He gives everyone time to do a little stretching before the run. He then pulls out his stop watch and says "Go!" Everyone then takes off, some faster than others.'
-						'As you run through the forest, you feel a hand on your ass - it''s Ivan. He''s much faster than you and sprints past you to show you how fast he can be when he wants. He then pauses and lets you catch up, and you run together for a while.'
+						'As you run through the forest, you feel a hand on your ass - it''s Ivan. He''s much faster than you and sprints past to show you how fast he can be when he wants. He then pauses and lets you catch up, and you run together for a while.'
 						act 'Show him your tits':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra3.jpg"></center>'
@@ -703,16 +702,16 @@ if $ARGS[0] = 'pe':
 								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. You almost immediately notice the erection growing in his tight shorts, and he awkwardly tries to hide it. As you pull your shirt back down, you give him a sweet smile and say "Try hiding that while you''re running past everyone!"'
 								'He grimaces as he sprints away from you, carefully checking to make sure no one is near him. You have a knowing smile on your face when, at the end of the class, his friends ask him why his lap time was so much slower than usual.'
 							elseif hotcat >= 4:
-								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He smiles and shakes his head, as he sprints away from you, you slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
+								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He smiles and shakes his head as he sprints away and you slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
 							else
-								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He makes a slightly disgusted look and shakes his head, as he sprints away from you, you slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
+								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He makes a slightly disgusted look and shakes his head as he sprints away. You slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
 							end
-							act 'Finish run':gt 'gschool_lessons4', 'postphys'
+							act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 						end
-						act 'Laugh it off and let him go':
+						act 'Laugh it off':
 							cla
 							'"Very funny Ivan." you tell him as you give him a wink. He playfully salutes you as he sprints off again, finishing the run well before anyone else.'
-							act 'Finish run':gt 'gschool_lessons4', 'postphys'
+							act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 						end
 					elseif runoutside = 2:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
@@ -722,7 +721,7 @@ if $ARGS[0] = 'pe':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
 							'You remain focused on your running and keep your eyes straight ahead. Running as quickly as you can, you hear whoever it was starting to fall behind.'
-							act 'Finish run':gt 'gschool_lessons4', 'postphys'
+							act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 						end
 						act 'Look':
 							*clr & cla
@@ -731,18 +730,18 @@ if $ARGS[0] = 'pe':
 							gs'arousal','erotic_nudity', 5
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish run':gt 'gschool_lessons4', 'postphys'
+							act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 						end
 					elseif runoutside = 3:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nopanstretch.jpg"></center>'
 						'"Since the weather is so nice, we will be running outside today. Let''s go!" He leads the class outside to the forest trail on the school grounds, near the old school building. He gives everyone time to do a little stretching before the run. As Lina does some stretching, it becomes apparent she forgot her panties. As she stretches, her shorts pull to one side, showing her pussy off to everyone. Before anyone can say anything, she stops and stands up, oblivious to the little show she just gave. Coach Pavlovich then pulls out his stop watch and says "Go!" Everyone then takes off, some faster than others.'
 						'The rest of the run is very uneventful and peaceful. You enjoyed the quiet time to yourself a great deal.'
-						act 'Finish run':gt 'gschool_lessons4', 'postphys'
+						act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
 						'"Since the weather is so nice, we will be running outside today. Let''s go!" He leads the class outside to the forest trail on the school grounds, near the old school building. He gives everyone time to do a little stretching before the run, before he pulls out his stop watch and says "Go!" Everyone then takes off, some faster than others.'
 						'Your run ends up being very uneventful and peaceful. You enjoyed the quiet time to yourself a great deal.'
-						act 'Finish run':gt 'gschool_lessons4', 'postphys'
+						act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 					end
 				else
 					runinside = rand(1,5)
@@ -759,7 +758,7 @@ if $ARGS[0] = 'pe':
 						'You join the class in running laps around the gym. Half-way into your fourteenth lap, you wonder if there''s any way gym class could be any more boring than this.'
 					end
 					gs 'gschool_lessonsev1', 'fiz_rand'
-					act 'Finish the run':gt 'gschool_lessons4', 'postphys'
+					act 'Finish your run':gt 'gschool_lessons4', 'postphys'
 				end
 			end
 		elseif fizrarand = 2:
@@ -787,13 +786,13 @@ if $ARGS[0] = 'pe':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
 				if hotcat >= 6:
 					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
-					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. The top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
 				elseif hotcat >= 4:
 					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
-					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: most of the class that are watching start laughing, with a few pointing, while some of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. The top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: most of the class that are watching start laughing, with a few pointing, while some of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
 				else
 					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
-					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with negative responses: most give you looks of disgust or disapproval, while Vasily comments. "OH GOD! I think, I''m blind." You quickly let go of the bar and pull your shorts back up, which gets everyone laughing, it takes a bit for Coach Nikolaevich to get the class back focused on class. You are deeply embarrassed by the whole ordeal.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. The top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with negative responses: most give you looks of disgust or disapproval while Vasily loudly comments. "OH GOD! I think I''m blind!" You quickly let go of the bar and pull your shorts back up, which gets everyone laughing. It takes a while for Coach Nikolaevich to get the class focused. You are deeply embarrassed by the whole ordeal.'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra6.jpg"></center>'
@@ -801,17 +800,17 @@ if $ARGS[0] = 'pe':
 				if hotcat >= 6:'Some of the boys stop what they''re doing when it''s your turn, coming over to shout some words of support.'
 				if pcs_stren <= 20:
 					grupvalue[2] -= 1
-					'Unfortunately, pull-ups aren''t your strong point, and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
+					'Unfortunately, pull-ups aren''t your strong point and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 				elseif pcs_stren <= 30:
-					'Unfortunately, pull-ups aren''t your strong point, and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
+					'Unfortunately, pull-ups aren''t your strong point and you''re unable to do as many as most of the other girls, other than the nerds and a few of the popular girls.'
 				elseif pcs_stren <= 50:
-					'In the end, you wind up doing a perfectly respectable amount of pull-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
+					'In the end, you wind up doing a perfectly respectable amount of pull-ups. You do better than most of the girls, other than a few of the jocks.'
 				elseif pcs_stren <= 70:
 					grupvalue[2] += 1
-					'In the end, you wind up doing great. You do more pull-ups than some of the boys and better than all the girls except Christina.'
+					'In the end, you wind up doing great. You do more pull-ups than some of the boys and better than all of the girls except Christina.'
 				else
 					grupvalue[2] += 2
-					'You''ve done plenty of pull-ups in the past, so this isn''t too much of a challenge. When you finally stop, you have done more than all the other girls and about half the boys as well.'
+					'You''ve done plenty of pull-ups in the past, so this isn''t too much of a challenge for you. When you finally stop, you''ve done more than all the other girls and about half the boys as well.'
 				end
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
@@ -827,22 +826,22 @@ if $ARGS[0] = 'pe':
 				grupvalue[2] -= 1
 				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 			elseif pcs_stren <= 30:
-				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
+				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as most of the other girls, other than the nerds and a few of the popular girls.'
 			elseif pcs_stren <= 50:
-				'In the end, you wind up doing a perfectly respectable amount of sit-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
+				'In the end, you wind up doing a perfectly respectable amount of sit-ups. You do better than most of the girls, other than a few of the jocks.'
 			elseif pcs_stren <= 70:
 				grupvalue[2] += 1
 				'In the end, you wind up doing great. You do more sit-ups than some of the boys and better than all the girls except Christina.'
 			else
 				grupvalue[2] += 2
-				'You''ve done plenty of sit-ups in the past, so this isn''t too much of a challenge. When you finally stop, you have done more than all the other girls and about half the boys as well.'
+				'You''ve done plenty of sit-ups in the past, so this isn''t too much of a challenge for you. When you finally stop, you''ve done more than all the other girls and about half the boys as well.'
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 5:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_vital
 			gs 'exercise', 'tier2', 1, 'vital_exp'
-			'The Coach Nikolaevich breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
+			'Coach Nikolaevich breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
 			if pcs_cupsize <= 20:
 				if pcs_vital <= 30:
 					grupvalue[2] -= 1
@@ -855,13 +854,13 @@ if $ARGS[0] = 'pe':
 					'Jumping rope is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done.'
 				else
 					grupvalue[2] += 2
-					'The other girls are surprised at just how long you can jump rope without messing up. You manage to go the longest in a couple of rounds of the competition.'
+					'The other girls are surprised at just how long you can jump rope without messing up. You manage to go the longest in a a few of the rounds.'
 				end
 			elseif pcs_cupsize <= 60:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumprb.mp4"></video></center>'
 				if pcs_vital <= 30:
 					grupvalue[2] -= 1
-					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few tries. A number of the boys grumble each time you fail to go for more than a couple of seconds.'
+					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few tries. A number of the boys grumble each time you fail to go for more than a few seconds.'
 				elseif pcs_vital <= 40:
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
 					'You do about average among the girls before you get tripped up on the rope. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. A number of the boys grumble each time you fail to go for more than a couple of seconds.'
@@ -870,22 +869,22 @@ if $ARGS[0] = 'pe':
 					'Jumping rope is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done. You have no doubt why the boys are watching - you can feel your breasts bouncing with every jump, despite the help of the sports bra.'
 				else
 					grupvalue[2] += 2
-					'The other girls in your group are surprised at just how long you can jump rope without messing up. You manage to go the longest in a couple of rounds of the competition. You could actually jump rope for quite a bit longer, but notice that the longer the class goes on, the more boys have found their way over to watch you. Some of the girls you were competing with make snide remarks about just which particular parts of you they are so keen on watching.'
+					'The other girls in your group are surprised at just how long you can jump rope without messing up. You manage to go the longest in a few of the rounds and could actually jump rope for quite a bit longer, but notice that the longer the class goes on, the more boys have found their way over to watch you. Some of the girls you were competing with make snide remarks about just which particular parts of you they are so keen on watching.'
 				end
 			else
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumph.mp4"></video></center>'
 				if pcs_vital <= 30:
 					grupvalue[2] -= 1
-					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. Vasily shouts: "C''mon, already! We want to see them bounce!"'
+					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. "Come on already! We want to see them bounce!" Vasily shouts.'
 				elseif pcs_vital <= 40:
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
-					'You do about average among the girls before you get tripped up on the rope. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. Dan shouts: "C''mon, get them titties bouncing!"'
+					'You do about average among the girls before you get tripped up on the rope. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. "Come on, get those titties bouncing!" Dan shouts.'
 				elseif pcs_vital <= 60:
 					grupvalue[2] += 1
-					'Jumping rope is a complete misery. You can''t manage it for very long; although your coordination and endurance are there, the pain from your breasts slapping around builds up fast, despite the help of the sports bra. The girls you''re competing with are sympathetic at first, but that slowly changes as some of the boys wander over to cheer you on. It''s completely apparent what their eyes are focused on each time a round begins.'
+					'Jumping rope is a complete misery. You can''t manage it for very long; although your coordination and endurance are there, the pain from your breasts slapping around builds up fast, despite the help of the sports bra. The girls you''re competing with are sympathetic at first, but that slowly changes as some of the boys wander over to cheer you on. It''s entirely apparent what their eyes are focused on each time a round begins.'
 				else
 					grupvalue[2] += 2
-					'You''re easily in good enough shape that this should be a snap, but each time you jump, your breasts slap up and down pretty hard, and in no time they''ve gotten really sore. Fitness means enduring a little pain sometimes though, so you try to press on for as long as you can bear it, despite the help of the sports bra. What ultimately stops you is the hooting and hollering from the boys. By the end of the class, almost all of them have come over to gawk at your boobs.'
+					'You''re easily in good enough shape that this should be a snap, but each time you jump, your breasts slap up and down pretty hard despite the help of your sports bra and they''re painfully sore in no time. Fitness means enduring a little pain though, so you try to press on for as long as you can bear it. What ultimately stops you is the hooting and hollering from the boys. By the end of the class, almost all of them have come over to gawk at you.'
 				end
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
@@ -956,7 +955,7 @@ if $ARGS[0] = 'pe':
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bouncebhand.jpg"></center>'
-				'Irina is doing jumping jacks and her breasts are really bouncing - she obviously isn''t wearing a sports bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as Stasya friend walks up behind her, reaches round and grabs her breasts. The Irina lets out a startled squeak, followed by a blush when Stasya whispers in her ear and she sees all the boys staring.'
+				'Irina is doing jumping jacks and her breasts are really bouncing - she obviously isn''t wearing a sports bra. The bouncing of her breasts starts to draw the attention of a lot of the boys as Stasya walks up behind her, reaches round and grabs her breasts. Irina lets out a startled squeak, followed by a blush when Stasya whispers in her ear and she sees all the boys staring.'
 				gs'arousal','erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1000,7 +999,7 @@ if $ARGS[0] = 'jumping_jacks':
 			'Jumping jacks is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done.'
 		else
 			grupvalue[2] += 2
-			'The other girls in your group are surprised at just how many jumping jacks you can do. You manage to go the longest in a couple of rounds of the competition.'
+			'The other girls in your group are surprised at just how many jumping jacks you can do. You manage to go the longest in a few of the rounds.'
 		end
 		gs 'gschool_lessonsev1', 'fiz_rand'
 		act 'End of lesson':gt 'gschool_lessons4', 'postphys'
@@ -1008,16 +1007,16 @@ if $ARGS[0] = 'jumping_jacks':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumprb.mp4"></video></center>'
 		if pcs_vital <= 30:
 			grupvalue[2] -= 1
-			'You''re barely able to do more than a few before you are just too tired. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few tries. A number of the boys grumble each time you fail to go for more than a couple of seconds.'
+			'You''re barely able to do more than a few before you''re too tired to continue. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few tries. A number of the boys grumble each time you fail to go for more than a few seconds.'
 		elseif pcs_vital <= 40:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
 			'You do about average among the girls before you stop. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. A number of the boys grumble each time you fail to go for more than a few seconds.'
 		elseif pcs_vital <= 60:
 			grupvalue[2] += 1
-			'Jumping jacks is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done. You have no doubt why the boys are watching - you can feel your boobs bouncing with every jump, despite the help of the sports bra.'
+			'Jumping jacks is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done. You have no doubt why the boys are watching - you can feel your breasts bouncing with every jump, despite the help of the sports bra.'
 		else
 			grupvalue[2] += 2
-			'The other girls in your group are surprised at just how many jumping jacks you can do. You manage to go the longest in a couple of rounds of the competition. You could actually go for quite a bit longer, but notice that the longer the class goes on, the more boys have found their way over to watch you. Some of the girls you were competing with make snide remarks about just which particular parts of you they are so keen on watching.'
+			'The other girls in your group are surprised at just how many jumping jacks you can do. You manage to go the longest in a few of the rounds and could actually go for quite a bit longer, but notice that the longer the class goes on, the more boys have found their way over to watch you. Some of the girls you were competing with make snide remarks about just which particular parts of you they are so keen on watching.'
 		end
 		gs 'gschool_lessonsev1', 'fiz_rand'
 		act 'End of lesson':gt 'gschool_lessons4', 'postphys'
@@ -1025,16 +1024,16 @@ if $ARGS[0] = 'jumping_jacks':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumph.mp4"></video></center>'
 		if pcs_vital <= 30:
 			grupvalue[2] -= 1
-			'You''re barely able to do more than a few before you are just too tired. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. One of them shouts: "C''mon, already! We want to see them bounce!"'
+			'You''re barely able to do more than a few before you''re too tired to continue. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. "Come on already! We want to see them bounce!" Vasily shouts.'
 		elseif pcs_vital <= 40:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
-			'You do about average among the girls before you stopping. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. Vasily shouts: "C''mon, already! We want to see them bounce!"'
+			'You do about average among the girls before you stopping. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. Vasily shouts: "Come on, get those titties bouncing!" Dan shouts.'
 		elseif pcs_vital <= 60:
 			grupvalue[2] += 1
 			'Jumping jacks is a complete misery. You can''t manage it for very long; although your coordination and endurance are there, the pain from your breasts slapping around builds up fast, despite the help of the sports bra. The girls you''re competing with are sympathetic at first, but that slowly changes as some of the boys wander over to cheer you on. It''s completely apparent what their eyes are focused on each time a round begins.'
 		else
 			grupvalue[2] += 2
-			'You''re easily in good enough shape that this should be a snap, but each time you jump, your breasts slap up and down pretty hard, and in no time they''ve gotten really sore. Fitness means enduring a little pain sometimes though, so you try to press on for as long as you can bear it, despite the help of the sports bra. What ultimately stops you is the hooting and hollering from the boys. By the end of the class, almost all of them have come over to gawk at your breasts.'
+			'You''re easily in good enough shape that this should be a snap, but each time you jump, your breasts slap up and down pretty hard despite the help of the sports bra and they''re painfully sore in no time. Fitness means enduring a little pain though, so you try to press on for as long as you can bear it. What ultimately stops you is the hooting and hollering from the boys. By the end of the class, almost all of them have come over to gawk at you.'
 		end
 	end
 	gs 'gschool_lessonsev1', 'fiz_rand'
@@ -1050,15 +1049,15 @@ if $ARGS[0] = 'pushups':
 		grupvalue[2] -= 1
 		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 	elseif pcs_stren <= 30:
-		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
+		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as most of the other girls, other than the nerds and a few of the popular girls.'
 	elseif pcs_stren <= 50:
-		'In the end, you wind up doing a perfectly respectable amount of push-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
+		'In the end, you wind up doing a perfectly respectable amount of push-ups. You did better than most of the other girls, other than a few of the jocks.'
 	elseif pcs_stren <= 70:
 		grupvalue[2] += 1
 		'In the end, you wind up doing great. You do more push-ups than some of the boys and better than all the girls except Christina.'
 	else
 		grupvalue[2] += 2
-		'You''ve done enough push-ups in the past that this isn''t too much of a challenge. When you finally stop, you have done more than all the other girls and about half the boys as well.'
+		'You''ve done enough push-ups in the past that this isn''t too much of a challenge for you. When you finally stop, you''ve done more than all the other girls and about half the boys as well.'
 	end
 	gs 'gschool_lessonsev1', 'fiz_rand'
 	act 'End of lesson':gt 'gschool_lessons4', 'postphys'
@@ -1071,7 +1070,7 @@ if $ARGS[0] = 'postphys':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big69.jpg"></center>'
 	if christinaQW['dompath'] = 1:
 		postphys_event = daystart
-		'After class, Coach Pavlovich returns to his office. For some reason, Christina is following him while all other students go to the locker rooms as usual.'
+		'After class, Coach Pavlovich returns to his office. For some reason, Christina is following him while all other students go to the locker rooms.'
 		act 'Ignore it and go to the locker room': gt 'gschool_lessons4', 'postphys2'
 		act 'Listen in on Christina and Coach Pavlovich':
 			*clr & cla
@@ -1080,7 +1079,7 @@ if $ARGS[0] = 'postphys':
 			'The coach doesn''t answer her in words, but in gasps. Deciding you need to take the risk and look, you crack the door open and peek in.'
 			'What you see is like a dream come true; Christina, naked and on her knees in front of Pavlovich, sucking his cock for all she''s worth.'
 			+$OpenInnerThought+'"This is exactly what I was looking for!"'+$CloseInnerThought 
-			'Pulling out your phone, you make sure the flash is turned off, and start taking pictures.'
+			'Pulling out your phone, you make sure the flash is turned off and start taking pictures.'
 			christinaQW['dompath'] = 2
 			pcs_horny += 10
 			gs 'stat'
@@ -1128,7 +1127,7 @@ if $ARGS[0] = 'shower':
 	shower_shave = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/showers.jpg"></center>'
-	'After taking off all of your clothes, you gather up your towel, washcloth and soap, and head to the showers; you are greeted by wafts of steam and several girls who are giggling and gossiping among themselves, apparently oblivious to your existence.'
+	'After stripping from your clothes, you gather up your towel, washcloth and soap, and head to the showers; you are greeted by wafts of steam and several girls giggling and gossiping among themselves, oblivious to your existence.'
 	act 'Continue': gt 'gschool_lessons4', 'shower2'
 end
 
@@ -1143,16 +1142,16 @@ if $ARGS[0] = 'shower2':
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/shower/showerspank.mp4"></video></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella talking to Albina.'
-	    'As you wash off the soap, you turn just in time to see Bella start spanking Albina; most of the girls in the shower room stop what they''re doing to watch. After several fairly hard smacks, they stop and laugh about it, Albina rubbing her ass with strange glee as Bella smiles and nods her head, seemingly in approval. Everyone then returns to showering.'
+	    'As you wash off the soap, you turn in time to see Bella start spanking Albina; most of the girls stop what they''re doing to watch. After several fairly hard smacks that echo into the room, they stop and laugh about it as Albina rubs her ass with strange glee and Bella smiles and nods her head, seemingly in approval. You turn back and finish your shower as Bella and Albina giggle at each other.'
 	elseif gymshower = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/picture.jpg"></center>'
-		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few moments basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
+		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
 	    if christinaQW['dompath'] >= 7:
-			'As you wash off the soap, you turn just in time to see one of the girls pointing at Christina. She says something to a couple of girls near her and they all burst out laughing. Christina''s face turns bright red and she takes a step forward, before stopping and looking in your direction. Seeing you looking she cringes and tries to pretend like nothing was happening. Not falling for it, you walk over to her and ask what they were laughing at. "My buttplug." she replies, embarrassed and afraid.'
-			'Looking at her sternly you tell her to bend over and show it to them. When she hesitates you grab her arm and pull her down, turn her ass in their direction, and say loud enough for everybody nearby to hear, "This is for trying to hide it." Smack! You spank her hard, causing her to squeal out in suprise. The girls watching start laughing so hard one of them snorts, prompting them to laugh even louder. Christina''s face turns even redder, if that was possible, but she stays put, knowing better than to cross you again.'
-			'You spank her one more time for good measure, and remind her in a low tone. "This is your life now, bitch." You walk back to your shower head and finish rinsing yourself off. Seeing that the fun was everybody went back to their showers.'
+			'As you wash off the soap, you turn just in time to see one of the girls pointing at Christina. She says something to a few girls near her and they all burst out laughing. Christina''s face turns bright red and she takes a step forward before stopping and looking in your direction. Seeing you looking, she cringes and tries to pretend like nothing was happening. Not falling for it, you walk over to her and ask what they were laughing at. "My buttplug." she replies, embarrassed and afraid.'
+			'Looking at her sternly, you tell her to bend over and show it to them. When she hesitates you grab her arm and pull her down, turn her ass in their direction and speak loud enough for everybody to hear. "This is for trying to hide it." You spank her hard, causing her to squeal out in suprise. The girls watching start laughing so hard one of them snorts, prompting them to laugh even louder. Christina''s face turns even redder, if that was possible, but she stays put, knowing better than to cross you again.'
+			'You spank her one more time for good measure. "This is your life now, bitch." you remind her in a low tone before walking back to your shower head and finish rinsing yourself off. Seeing that the fun is over, everyone go back to their own business.'
 		else
-			'As you wash off the soap, you turn just in time to see Christina holding up her phone and taking pictures. All the girls quickly notice. Some laugh and others quickly finish and leave but everyone, well everyone except Anushka, covers up. After a few laughs and some yelling seeming to all be in good natured fun, Christina stops and everyone goes back to showering.'
+			'As you wash off the soap, you turn just in time to see Christina holding up her phone and taking pictures. All the girls quickly notice. Some laugh and others quickly finish and leave as everyone except Anushka covers up. After a few laughs and some good-natured yelling, Christina stops and everyone goes back to showering.'
 		end
 	elseif gymshower = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/aylnushkiss.jpg"></center>'
@@ -1161,7 +1160,7 @@ if $ARGS[0] = 'shower2':
 		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing. Katyusha even says "Stop that you fucking dykes! That''s so disgusting." Anushka looks to Katyusha, makes a V with her fingers and sticks her tongue between them wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to just showering.'
 	elseif gymshower = 4 and npc_grupTipe['A25'] = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_1.jpg"></center>'
-		'As you shower, you catch of a glimpse of Lena and Lera up to their usual tricks. Lera is on her knees with her face buried in Lena''s crotch, who is clearly enjoying herself. Several of the other girls give disgusted looks at what is going on. Still most are use to it, as it''s something you''ve seen dozens of times before, you ignore them and go back to cleaning yourself, but are interrupted by Lena calling someone out. You turn to see her getting up in Sonia''s face, who has her fingers buried deep inside her pussy. "What a horny little slut you are! You suck my brother''s dick every fucking day, so why don''t you let me have a turn?" Lena says before forcefully dragging Sonia out into the middle of the room and pushing her onto her knees.'
+		'As you shower, you catch of a glimpse of Lena and Lera up to their usual tricks. Lera is on her knees with her face buried in Lena''s crotch, who is clearly enjoying herself. Several of the other girls give disgusted looks at what they''re seeing. As it''s something you''ve seen dozens of times before, you ignore them and go back to cleaning yourself, but are interrupted by Lena calling someone out. You turn to see her getting up in Sonia''s face, who has her fingers buried deep inside her pussy. "What a horny little slut you are! You suck my brother''s dick every fucking day, so why don''t you let me have a turn?" Lena says before forcefully dragging Sonia out into the middle of the room and pushing her onto her knees.'
 		'Sonia doesn''t resist or even hesitate and immediately buries her face right into Lena''s crotch and starts eating her out. Albina, Bella and Vicky are among the group of girls who look in disgust before walking out to get dressed.'
 		gs 'arousal', 'erotic_nudity', -3
 		gs 'stat'
@@ -1169,9 +1168,9 @@ if $ARGS[0] = 'shower2':
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
-				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. "Look girls, now we''ve got TWO sluts to have fun with!" the Lera who grabbed you says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue as you stare up at her.'
+				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. "Look girls, now we''ve got TWO sluts to have fun with!" Lera says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue as you stare up at her.'
 				*nl
-				'"What? You''ll suck the boys off, but won''t eat us out? Aren''t dick and pussy the same thing to you? Get to it you fucking whore!" Lera says and delivers a stinging smack to your face. With no way to escape, you resign yourself to the humiliation and start licking the Lera''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as Lera orgasms hard. When she''s done, she pulls your head up by your chin and slaps you. "Good slut." is all she says before another Paulina takes her place.'
+				'"What? You''ll suck the boys off, but won''t eat us out? Aren''t dick and pussy the same thing to you? Get to it you fucking whore!" Lera says and delivers a stinging smack to your face. With no way to escape, you resign yourself to the humiliation and start licking Lera''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as Lera orgasms hard. When she''s done, she pulls your head up by your chin and slaps you. "Good slut." is all she says before Pauline takes her place.'
 				*nl
 				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
@@ -1251,7 +1250,7 @@ if $ARGS[0] = 'shower2':
 			act 'Stay':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_2.jpg"></center>'
-				'You choose to stay and watch to see what happens. Lera, Paulina, Christina and Lina are among the large group of girls surrounding Lena and Sonia, either watching in interest or filming it. Lariska is quietly standing off to the side, clearly not wanting to get involved but not wanting to leave Christina''s side either. Lena is enjoying having Sonia go down on her and really makes her eat her out before she pulls Sonia off of her and orgasms, squirting across Sonia''s face. When she is finished, she gives Sonia a firm slap and moves to the side, inviting someone else to have a go. Lera, who has been masturbating as she watches, walks up to Sonia and also squirts on her before sitting on her face and making her eat her pussy as she rides through her orgasm Once her orgasm has passed, she climbs off of Sonia and gives her a stinging slap on the face. "Good for nothing whore!" she snarls before stepping aside to let Christina take her place.'
+				'You choose to stay and watch to see what happens. Lera, Pauline, Christina and Lina are among the large group of girls surrounding Lena and Sonia, either watching in interest or filming it. Lariska is quietly standing off to the side, clearly not wanting to get involved but not wanting to leave Christina''s side either. Lena is enjoying having Sonia go down on her and really makes her eat her out before she pulls Sonia off of her and orgasms, squirting across Sonia''s face. When she is finished, she gives Sonia a firm slap and moves to the side, inviting someone else to have a go. Lera, who has been masturbating as she watches, walks up to Sonia and also squirts on her before sitting on her face and making her eat her pussy as she rides through her orgasm Once her orgasm has passed, she climbs off of Sonia and gives her a stinging slap on the face. "Good for nothing whore!" she snarls before stepping aside to let Christina take her place.'
 				gs 'arousal', 'erotic_nudity', -3
 				gs 'stat'
 				act 'Stop watching':
@@ -1265,7 +1264,7 @@ if $ARGS[0] = 'shower2':
 				act 'Wait your turn':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_3.jpg"></center>'
-					'You''re getting incredibly aroused watching this show and know where it''s going. You follow the other girls in masturbating as you watch and wait your turn. Christina soon reaches her explosive orgasm and drenches Sonia in a shower of pussy juice as she moans loudly. The other girls express their amazement while Sonia looks to be greatly enjoying herself. Paulina, Lina and a few other girls take their turns squirting over Sonia as you continue to rub your clit and finger yourself. Eventually, you feel your orgasm building and step up to Sonia as another girl finishes. You are surprised when Sonia suddenly starts licking your pussy as you stand above her. She is <i>really</i> good at this and you quickly feel yourself about to cum, so you pull her face out of your crotch and rub your engorged clit to bring yourself to orgasm.'
+					'You''re getting incredibly aroused watching this show and know where it''s going. You follow the other girls in masturbating as you watch and wait your turn. Christina soon reaches her explosive orgasm and drenches Sonia in a shower of pussy juice as she moans loudly. The other girls express their amazement while Sonia looks to be greatly enjoying herself. Pauline, Lina and a few other girls take their turns squirting over Sonia as you continue to rub your clit and finger yourself. Eventually, you feel your orgasm building and step up to Sonia as another girl finishes. You are surprised when Sonia suddenly starts licking your pussy as you stand above her. She is <i>really</i> good at this and you quickly feel yourself about to cum, so you pull her face out of your crotch and rub your engorged clit to bring yourself to orgasm.'
 					*nl
 					$orgasm_txt = 'You moan loudly as your pussy explodes and you squirt your juice all over Sonia''s already drenched face and into her mouth, Sonia happily taking it all and swallowing it.'
 					$orgasm_or = 'custom'
@@ -1318,11 +1317,11 @@ if $ARGS[0] = 'shower2':
 				'"She probably has a little guide in there telling you where to find her pussy under all that!" Bella says.'
 				*nl
 				'"A machete to hack your way through too!" Stasya says.'
-				'You stop and take a few steps closer to them, with your hands balled up into fists, they stop their cackling when you get close. "I said fuck off!"'
-				'They collective take a step back and then Bella says. "What can''t take a joke, fine fine, don''t get your panties in a wad." They leave you in peace for the rest of the shower and instead spend the time gossiping about a variety of stuff..'
+				'You stop and take a few steps closer to them, with your hands balled up into fists. They stop their cackling when you get close. "I said fuck off!"'
+				'They all take a step back before Bella smirks. "What, can''t take a joke? Fine fine, don''t get your panties in a twist." They leave you in peace for the rest of the shower and instead spend the time gossiping about a variety of stuff..'
 			else
 				'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now that they know they''re getting under your skin.'
-				'"What can''t take a joke? Well then you shouldn''t come to school looking like that, it''s shameful. The only kind of fuck you can get with a <i>jungle</i> like that down there, is if you let Lesco or Petia have a go!" Irina says.'
+				'"What can''t take a joke? Well then you shouldn''t come to school looking like that, it''s shameful! The only kind of fuck you can get with a <i>jungle</i> like that down there, is if you let Lesco or Petia have a go!" Irina says.'
 				*nl
 				'"She probably has a little guide in there telling the boys where to find her pussy under all that!" Bella says.'
 				'"And a machete to hack their way through too!" Stasya says.'
@@ -1356,7 +1355,7 @@ if $ARGS[0] = 'long_shower':
 	shower_shave = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
-	'You are just enjoying the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before you realize it, you find yourself alone in the shower.'
+	'You enjoy the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna-like feel and completely relaxes you. Before you realize it, you find yourself alone in the shower.'
 	act 'Keep taking a shower':
 		*clr & cla
 		gs 'stat'
@@ -1366,15 +1365,15 @@ if $ARGS[0] = 'long_shower':
 			pcs_mood += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar1.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before long, the only sounds you hear is someone walking. It looks like most of the girls have already left.'
-			act 'Continue':
+			'You continue showering before you suddenly hear the sound of someone walking into the room.'
+			act 'Look back':
 				*clr & cla
 				minut += 5
 				pcs_mood += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar2.jpg"></center>'
-				'As you are showering, you turn and see Lazar standing there with his hard cock in his hand, stroking it while he watches you shower with a big grin on his face. "Hey <<$pcs_nickname>>! Looking good."'
-				'You are shocked, but before you can react, he keeps talking. "Why don''t you suck my dick?" he says as he starts walking towards you, still stroking his hard cock. You can''t help but stare at his dick. It is as long and nearly as thick as your forearm.'
+				'You look back and see Lazar standing there with his hard cock in his hand, stroking it while he watches you shower with a big grin on his face. "Hey <<$pcs_nickname>>! Looking good."'
+				'Before you can react, he continues talking. "Why don''t you suck my dick?" he says as he starts walking towards you while still stroking his cock. You can''t help but stare. It''s as long and nearly as thick as your forearm.'
 				gs'arousal','erotic_nudity', 2
 				gs 'stat'
 				act 'Suck his dick': gt 'gschool_sex', 'lazar_lockerroom'
@@ -1386,7 +1385,7 @@ if $ARGS[0] = 'long_shower':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazarno.jpg"></center>'
 						'"What the fuck are you doing? This is the girls shower, get out!" you yell at him while covering up.'
-						'He stops stroking his dick when you yell and he puts his hands up with his dick still hanging out. "OK OK, no need to yell. I''ll go." He puts his dick away and then very slowly walks out of the shower, watching your naked body the whole time. Once he is gone, you wait a couple of minutes until you hear the door close. You rush to your locker and quickly dry off and get dressed before he comes back.'
+						'He stops stroking his dick and puts his hands up with his dick still hanging out. "Okay, okay, no need to yell. I''ll go." He puts his dick away and then very slowly walks out of the room, looking at your naked body the whole time. Once he''s gone, you wait for a few minutes before you rush to your locker and quickly dry off and get dressed before he comes back.'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1400,14 +1399,14 @@ if $ARGS[0] = 'long_shower':
 			pcs_mood += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/vd1.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before long, the only sounds you hear is someone walking. It sounds like most of the girls have already left.'
-			act 'Continue':
+			'You enjoy the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna-like feel and completely relaxes you. You continue showering before you suddenly hear the sound of someone walking into the room.'
+			act 'Look back':
 				*clr & cla
 				minut +=3
 				pcs_mood += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/vd2.jpg"></center>'
-				'As you are showering, you turn and see Vitek and Dan standing there watching you shower with huge smiles on their face. Both of them are only wearing towels, as if they had walked over here after getting out of the boys shower. They both let their towels drop, showing off their dangling dicks. "Get on your knees so you can suck our dicks." Dan orders.'
+				'You look back and see Vitek and Dan watching you shower with huge smiles on their face. Both of them are wearing only towels, and they both let their towels drop, showing off their dicks. "Get on your knees so you can suck our dicks." Dan orders.'
 				gs'arousal','erotic_nudity', 2
 				gs 'stat'
 				act 'Get on your knees': gt 'gschool_sex', 'vd_lockerroom'
@@ -1429,12 +1428,12 @@ if $ARGS[0] = 'long_shower':
 							'"What the fuck are you doing? This is the girls shower, get out!" you yell at them.'
 							'They both just laugh. "So what? What are you going to do about it?"'
 							'You give them a hard look. "I mean it, get the fuck out now!"'
-							'Dan starts to say something but Vitek sighs. "OK fine, we''re going. Why do you have to be such a bitch anyways?" Without waiting for a response, Vitek walks out while Dan lingers just a moment longer, checking you out before he leaves as well. You wait until you hear the door close, then you walk to your locker to dry off and get dressed before they come back.'
+							'Dan starts to say something but Vitek sighs. "Okay fine, we''re going. Why do you have to be such a bitch anyways?" Without waiting for a response, Vitek walks out while Dan lingers just a moment longer, checking you out before he leaves as well. You wait until you hear the door close, then you walk to your locker to dry off and get dressed before they come back.'
 						else
 							'"What are you doing? This is the girls shower, get out!" you yell at them.'
 							'The both just laugh. "So what? What are you going to do about it?"'
-							'You feel yourself start to panic. "I''ll scream! The coach is still in his office." He is most days anyways and you hope he is today.'
-							'Vitek gives you a hard look and takes a step towards you. You inhale like you are about to scream and he stops dead. "You''re going to regret this bitch." He then storms out while Dan lingers just a moment longer, checking you out before he leaves as well. You wait until you hear the door close, then you rush to your locker to quickly dry off and get dressed before they come back.'
+							'You feel yourself start to panic. "I''ll scream! The coach is still in his office." You hope he is in case they call your bluff.'
+							'Vitek gives you a hard look and takes a step towards you. You inhale like you''re about to scream and he stops. "You''re going to regret this bitch." He then storms out while Dan lingers just a moment longer, checking you out before he leaves as well. You wait until you hear the door close before you rush to your locker to quickly dry off and get dressed before they come back.'
 						end
 						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
@@ -1446,12 +1445,12 @@ if $ARGS[0] = 'long_shower':
 			minut += 10
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it, with the steam filling the room giving it an almost sauna feel, completely relaxes you. Before long, you no longer hear any noise at all other than the shower, at first you think all the other girls have left but then you hear a locker open and close, maybe someone is still in there. After a few minutes, you notice your fingers starting to prune up and decide it is time to get out of the shower.'
+			'You enjoy the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna-like feel and completely relaxes you. Before long, all you can hear is the shower and you think all the other girls have left, but then you hear a locker open and close. After a few minutes, you notice your fingers starting to prune up and decide that it''s been long enough.'
 			act 'Go to your locker':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka1.jpg"></center>'
-				'You go to your locker and you don''t see or hear anyone. Just as you are finishing drying your hair, you hear something, so you turn off the dryer and listen. You can''t hear anything now, but you could have sworn there was a sound coming from inside one of the lockers.'
+				'You go to your locker and don''t see or hear anyone. Just as you finish drying your hair, you think you hear something, so you turn off the dryer and listen. You can''t hear anything now, but you could have sworn there was a sound coming from inside one of the lockers.'
 				act 'Get dressed':
 					*clr & cla
 					gs 'stat'
@@ -1463,37 +1462,86 @@ if $ARGS[0] = 'long_shower':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka2.jpg"></center>'
-					'You walk over to the lockers where you think you heard the noise come from. You get closer, look through the vents in the lockers and listen closely. As you get to one it sounds like... someone breathing. Could someone be inside one of the lockers? "Is anyone there?" you ask and hear no response. The breathing sound, if it ever existed, has stopped.'
+					'You walk over to the lockers where you think you heard the noise come from. You get closer, look through the vents in the lockers and listen closely. As you get close to one it sounds like... someone breathing. Could someone be inside one of the lockers? "Is anyone there?" you ask, but hear no response. The breathing sound, if it ever existed, has stopped.'
 					act 'Open the locker': gt 'gschool_sex', 'petka_lockerroom'
 					act 'Ignore it':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaleave.jpg"></center>'
-						'You shake your head. Your imagination must be going crazy. You go back to getting dressed and you don''t hear any more noise. It must have been your imagination.'
+						'You shake your head. Your imagination must be going crazy. You go back to getting dressed and don''t hear any more noises.'
 						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				end
 			end
-		elseif longshower = 4 and hotcat => 6 and npc_rel['A23'] => 50:
+		elseif longshower = 4 and hotcat => 6 and npc_rel['A23'] => 70:
 			minut += 10
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before long, you no longer hear any noise at all other than the shower. At first, you think all the other girls have left, but then you hear a phone ring and then someone talking. You can''t tell who it is from here.'
+			'You enjoy the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna-like feel and completely relaxes you. Before long, all you can hear is the shower and you think all the other girls have left, but then you hear a phone ring and then someone talking. You can''t tell who it is from here.'
 			act 'Go to your locker':
 				*clr & cla
 				gs 'stat'
-				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
+				if checkoutalbina = 1:
+				    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
+					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She is happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
+					gs'arousal','erotic_nudity', 2
+					gs 'stat'
+					act 'Yes':
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
+						'There''s no point lying to her, so you decide to be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find it hard to resist looking."'
+						'She walks up and turns you around so you''re facing the lockers before giving your ass a hard slap. "What a dirty girl you are! I''m going to have to punish you!" You''re barely able to react before she delivers a stinging smack to your ass, causing you to whimper. She continues spanking you until your ass is red and numb. You look back and see a devious smile on her face as she licks her lips. "Have you learned your lesson?"'
+						'You nod and rub your ass as she starts getting dressed. Once she finishes, she gives you a wink and a smile. "Until next time, <<$pcs_nickname>>." She then walks out the door, leaving you alone to finish getting dressed. You can''t help but think that she was more than a little aroused.'
+						gs 'arousal', 'foreplay', 2
+						gs 'pain', 'asscheeks', 'spank', 2
+						gs 'stat'
+						act 'Finish getting dressed': gt 'gschool_lessons4', 'post_dress'
+					end
+					act 'No':
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
+						'You shake your head. "You''re very pretty, but no."'
+						'She arches a shapely brow. "No? Then why do you check me out when I''m naked?"'
+						'You blush slightly. You didn''t think anyone noticed you checking out the other girls.'
+						gs'arousal','erotic_nudity', 2
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Deny it':
+							*clr & cla
+							npc_rel['A23'] -= 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
+							'"Sorry, I was just admiring what great shape you''re in. I didn''t mean anything by it." you say while shaking your head.'
+							'She just shrugs. "Whatever." she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+							gs'arousal','erotic_nudity', 2
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
+						end
+						act 'Confess your attraction to her':
+							*clr & cla
+							npc_rel['A23'] += 3
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
+							'You decide to just confess your feelings. "Yeah, sorry. You''re beautiful and it''s hard to resist looking at your amazing body."'
+							'She walks up and turns you around so you''re facing the lockers before giving your ass a hard slap. "What a dirty girl you are! I''m going to have to punish you!" You''re barely able to react before she delivers a stinging smack to your ass, causing you to whimper. She continues spanking you until your ass is red and numb. You look back and see a devious smile on her face as she licks her lips. "Have you learned your lesson?"'
+							'You nod and rub your ass as she starts getting dressed. Once she finishes, she gives you a wink and a smile. "Until next time, <<$pcs_nickname>>." She then walks out the door, leaving you alone to finish getting dressed. You can''t help but think that she was more than a little aroused.'
+							gs 'arousal', 'foreplay', 2
+							gs 'pain', 'asscheeks', 'spank', 2
+							gs 'stat'
+							act 'Finish getting dressed': gt 'gschool_lessons4', 'post_dress'
+						end
+					end
+				elseif checkoutalbina = 1 and npc_sex['A23'] => 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-					'As you walk into the locker room, you can tell it is Albina on the phone. She''s on the phone with her father, but doesn''t sound very happy about it. Once you start drying your hair, you can''t hear what she is saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
+					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She is happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
 					gs'arousal','erotic_nudity', 2
 					gs 'stat'
 					act 'Yes':
 						*clr & cla
-						npc_rel['A23'] += 1
+						npc_rel['A23'] += 3
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
-						'You decide to be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find it hard to resist looking."'
-						'She walks up, turns you around so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
+						'There''s no point lying to her, so you decide to be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find it hard to resist looking."'
+						'She walks up and turns you around so you''re facing the lockers before giving your ass a hard slap and then a firm squeeze. "What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding between your legs.'
 						gs 'arousal', 'foreplay', 2
 						gs 'stat'
 						act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1505,8 +1553,8 @@ if $ARGS[0] = 'long_shower':
 								npc_rel['A23'] -= 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-								'You pull away from her and step away. "What are you doing?"'
-								'She looks confused. "I thought... never mind." she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+								'You pull away from her and step back. "What are you doing?"'
+								'She gives you a confused stare. "I thought... never mind." she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
 								gs'arousal','erotic_nudity', 2
 								gs 'arousal', 'end'
 								gs 'stat'
@@ -1520,7 +1568,7 @@ if $ARGS[0] = 'long_shower':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-						'You shake your head. "You''re pretty, but no."'
+						'You shake your head. "You''re very pretty, but no."'
 						'She arches a shapely brow. "No? Then why do you check me out when I''m naked?"'
 						'You blush slightly. You didn''t think anyone noticed you checking out the other girls.'
 						gs'arousal','erotic_nudity', 2
@@ -1528,11 +1576,11 @@ if $ARGS[0] = 'long_shower':
 						gs 'stat'
 						act 'Deny it':
 							*clr & cla
-							npc_rel['A23'] -= 1
+							npc_rel['A23'] -= 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-							'"Sorry, I was just admiring what great shape you are in. I didn''t mean anything by it." you say while shaking your head.'
-							'She just shrugs. "Whatever." she grumbles before she starts getting dressed and you do the same. Soon you are both dressed and she walks out, leaving you alone in the locker room.'
+							'"Sorry, I was just admiring what great shape you''re in. I didn''t mean anything by it." you say while shaking your head.'
+							'She just shrugs. "Whatever." she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
 							gs'arousal','erotic_nudity', 2
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -1540,11 +1588,11 @@ if $ARGS[0] = 'long_shower':
 						end
 						act 'Confess your attraction to her':
 							*clr & cla
-							npc_rel['A23'] += 1
+							npc_rel['A23'] += 3
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
-							'You decide to just confess your feelings. "Yeah, sorry, you''re beautiful and not looking is hard to resist."'
-							'She walks up to you, turns you so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question, as you feel her hand sliding down between your legs.'
+							'You decide to just confess your feelings. "Yeah, sorry. You''re beautiful and it''s hard to resist looking at your amazing body."'
+							'She walks up and turns you around so you''re facing the lockers before giving your ass a hard slap and then a firm squeeze. "I know, that''s why I always teased you and gave you a little show... What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding between your legs.'
 							gs 'arousal', 'foreplay', 2
 							gs 'stat'
 							act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1556,8 +1604,8 @@ if $ARGS[0] = 'long_shower':
 									npc_rel['A23'] -= 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-									'You pull away from her and step away. "What are you doing?"'
-									'She looks confused. "I thought... never mind." she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+									'You pull away from her and step back. "What are you doing?"'
+									'She gives you a confused stare. "I thought... never mind." she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
 									gs'arousal','erotic_nudity', 2
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -1570,7 +1618,7 @@ if $ARGS[0] = 'long_shower':
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/getdressed.jpg"></center>'
-					'You take your clothes out of your locker and start putting them on. While you get dressed, you can still hear someone talking in the other row of lockers, most likely on the phone. At this point you can tell it is Albina. She sounds frustrated and like she is arguing with someone about a show, but you''re not sure. Just as you finish dressing, she stops talking and comes back around to where you are, wearing only a towel. She gives you a brief look for a moment, perhaps wondering what you heard before she starts getting dressed.'
+					'You take your clothes out of your locker and start putting them on. While you get dressed, you can still hear someone talking in the other row of lockers, most likely on the phone. At this point you can tell it is Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She sounds very frustrated as she loudly argues with someone.','She is happily speaking on the phone with someone.')+' Just as you finish dressing, she stops talking and walks round to where you are, wearing only a towel. She jumps when she notices you and briefly stares at you, perhaps wondering what you heard before she drops her towel and starts getting dressed while ignoring you.'
 					'You can choose another outfit while you''re here.'
 					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
@@ -1579,14 +1627,14 @@ if $ARGS[0] = 'long_shower':
 			minut += 10
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/latecoach.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel, which completely relaxes you. Before long, you no longer hear any noise at all other than the shower. At first, you think all the other girls have left, but then you hear some lockers opening and closing. You turn off the shower and go to your locker. Coach Pavlovich is standing in the girls locker room, he turns to look at you as you walk in naked, you quickly cover yourself up as best you can. He looks surprised, but you are not sure if it is genuine or if he is faking it.'
+			'You enjoy the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna-like feel and completely relaxes you. Before long, all you can hear is the shower and you think all the other girls have left, but then you hear some lockers opening and closing. You turn off the shower and go to your locker. You find Coach Pavlovich, who turns to look at you as you walk in naked and you quickly cover yourself up as best you can. He looks surprised, but you''re not sure if it''s genuine or not.'
 			act 'What are you doing':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker1.jpg"></center>'
-				'"What are you doing in the girls locker room?" You ask him.'
-				'"Oh I didn''t know anyone was left. I thought the locker room was empty. I was just making sure all the lockers were closed." He says.'
-				'You can''t help but notice the hardon causing his shorts to bulge. His eyes follow your eyes and he smiles when he notices you looking at the bulge in his shorts. "A girl with your reputation just can''t help herself, can you? Go ahead and touch it." he says.'
+				'"What are you doing in the girls locker room?" you ask.'
+				'"Oh I didn''t know anyone was left. I thought the locker room was empty. I was just making sure all the lockers were closed." he says.'
+				'You can''t help but notice his erection causing his shorts to bulge. His eyes follow your gaze and he smiles when he notices you staring. "A girl with your reputation just can''t help herself, can you? Go ahead and touch it." he says.'
 				act 'Feel his cock': gt 'gschool_sex', 'victor_lockerroom'
 				gs 'willpower', 'sex', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
@@ -1596,7 +1644,7 @@ if $ARGS[0] = 'long_shower':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker1.jpg"></center>'
 						'"Do you mind? This is the girls locker room, you''re not supposed to be in here. Please leave." you tell him.'
-						'He pauses a moment and then throws his hands up. "Fine!" He then turns and leaves.'
+						'He pauses before throwing his hands up. "Fine!" He then turns and leaves.'
 						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				else
@@ -1607,7 +1655,7 @@ if $ARGS[0] = 'long_shower':
 			minut += 10
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it, with the steam filling the room giving it an almost sauna feel, completely relaxes you. Before long, you no longer hear any noise at all other than the shower. All the other girls must have already left. After a few minutes, you notice your fingers starting to prune up and decide it is time to get out of the shower. You go to your locker, dry off, and get dressed. By the time you get to the locker room, it is empty, all the other girls have already left.'
+			'The sensation of the hot water hitting your body and running down it, with the steam filling the room giving it an almost sauna-like feel, completely relaxes you. Before long, all you can hear is the shower and you think all the other girls have left. After a few minutes, you notice your fingers starting to prune up and decide that it''s been long enough. You go to your locker, dry off, and get dressed.'
 			act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 		end
 	end
@@ -1628,7 +1676,7 @@ end
 
 if $ARGS[0] = 'shower_watch_end':
 	*nl
-	'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
+	'After watching for a few more seconds, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 	gs'arousal','erotic_nudity', 3
 	gs 'stat'
 	act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
@@ -1647,7 +1695,7 @@ if $ARGS[0] = 'dress':
 		pcs_mood += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerflash.jpg"></center>'
-		'Several other girls come in from the showers together, wearing their towels. A girl picks up her phone and holds it up to take their picture. When Anushka sees this, she stops, with a lewd smile, and pulls her towel wide open, showing off her naked body as the girl takes the picture. Several girls giggle at Anushka''s antics while others whistle or cat call. All in all, everyone has a good laugh at the moment.'
+		'Several other girls come in from the showers together, wearing their towels. A girl picks up her phone and holds it up to take their picture. When Anushka sees this, she stops, with a lewd smile, and pulls her towel wide open, showing off her naked body as the girl takes the picture. Several girls giggle at Anushka''s antics while others whistle or cat call.'
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you''re finished, most of the other girls have already left.'
 		'You can choose another outfit while you''re here.'
@@ -1657,7 +1705,7 @@ if $ARGS[0] = 'dress':
 		pcs_mood += 10
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/locker/locselfiedan.mp4"></video></center>'
-		'A girl is at the mirror, taking a selfie of herself trying to look sexy. As she does, Albina walks up beside her and then starts to dance next to her, bending over and grinding her ass against her. She can''t help but laugh and grind back, and soon both of them are teasing each other and laughing, along with many of the other girls in the locker room that saw the whole thing.'
+		'Bella is at the mirror, taking a selfie of herself trying to look sexy. As she does, Albina walks up beside her and then starts to dance next to her, bending over and grinding her ass against her. She can''t help but laugh and grind back, and soon both of them are teasing each other and laughing, along with many of the other girls in the locker room that saw the whole thing.'
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
 		'You can choose another outfit while you''re here.'
@@ -1666,12 +1714,12 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
-		'You are running extra late today, by the time you finally finish dressing, nobody seems to be left in the room or showers. You take a few steps towards the door, convinced that you are the last person here, when you hear a soft moan. At first you think you misheard but... there it is again.'
+		'You are running extra late today and by the time you finally finish dressing, nobody seems to be left in the room or showers. You take a few steps towards the door, convinced that you are the last person here, when you hear a soft moan. At first you think you misheard but... there it is again.'
 		act 'Ignore it': gt 'gschool_lessons4', 'post_dress'
 		act 'Take a peek':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/les<<rand(1,3)>>.jpg"></center>'
-			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across a couple of girls making out... and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
+			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across some girls making out and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
 			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
@@ -1684,7 +1732,7 @@ if $ARGS[0] = 'dress':
 				gs 'arousal', 'voyeur_sex', 10
 				minut -= 10
 				gs 'arousal', 'masturbate', 10
-				'As you do, you hear their joined moans of pleasure grow to a crescendo that fills the room and your ears. Then, all goes quiet. You peek around the corner again and watch them talk softly for a moment, exchanging final kisses before they get up to get dressed. You quickly straighten out your clothes as well and head for the exit as quietly as you can - you don''t want them to know you were spying on them.'
+				'As you do, you hear their joined moans of pleasure grow to a crescendo that fills the room. Then, all goes quiet. You peek around the corner again and watch them talk softly for a moment, exchanging final kisses before they get up to get dressed. You quickly straighten out your clothes as well and head for the exit as quietly as you can - you don''t want them to know you were spying on them.'
 				$orgasm_txt = ''
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1695,8 +1743,8 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nudepic<<rand(1,2)>>.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'Still naked, you hear a couple of girls giggling, so you turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina trying to work her buttplug into a comfortable position. Smirking, you go over to her, slap her hand away, and yank the plug out, making her yelp in suprise. "Open." you say in a menacing tone. She cringes before closing her eyes and opening her mouth.'
-			'Shoving the plug into her mouth you spin it around a few times, letting her slobber on it a bit. Despite the taste, she does lube it up as best she can, mindful of where it is going. "Bend over." you bark at her. She sighs, but bends over and spreads her buttcheeks, trying to ignore the laughing of the other girls. Without being gentle in the slightest, you jam it back in, getting another gasp out of her.'
+			'Still naked, you hear a few girls giggling, so you turn to look at them, but they''re not looking at you. Confused, you follow their collective gaze and see Christina trying to work her buttplug into a comfortable position. Smirking, you go over to her, slap her hand away, and yank the plug out, making her yelp in suprise. "Open." you say in a menacing tone. She cringes before closing her eyes and opening her mouth.'
+			'Shoving the plug into her mouth, you spin it around a few times, letting her slobber on it. Despite the taste, she does lube it up as best she can, mindful of where it is going. "Bend over." you bark at her. She sighs, but bends over and spreads her buttcheeks, trying to ignore the laughing of the other girls. Without being gentle in the slightest, you jam it back in, getting another gasp out of her.'
 		else
 			'Still naked, you hear a couple of girls giggling, so you turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		end
@@ -1705,7 +1753,7 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 5:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/boysraid.jpg"></center>'
-		'You start to get dressed, most of the girls around you still in their underwear or naked, when the locker room door bursts open. You and everyone else turn to see Vitek and Dan standing in the doorway and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching bright pink g-string thong, walks up to them and blocks the doorway. "Get the fuck out of here." she says in a low, menacing tone.'
+		'You start to get dressed, most of the girls around you still in their underwear or naked when the locker room door bursts open. You and everyone else turn to see Vitek and Dan standing in the doorway and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching bright pink g-string thong, walks up to them and blocks the doorway. "Get the fuck out of here." she says in a low, menacing tone.'
 		'Dan snorts. "Or what?"'
 		'Albina, not backing down, says "Do you really want to find out?" Everyone can hear the implied threat and considering her fearsome temper and willingness to get violently physical, Dan backs off.'
 		'Vitek, however, just laughs. "Don''t get your panties in a twist. We just wanted to know if any of you girls wanted to take part in a ''private workout.''" he says lewdly and reaches out to her exposed breast.'
@@ -1716,12 +1764,12 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/christinaselfie<<rand(1,3)>>.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'As you get dressed you overhear one of the girls say to another, "Come take a picture with me. I want to send something to my boyfriend." Giggling, two of her friends came over and posed with her.'
+			'As you get dressed you overhear some girls talking to each other. "Come and take a picture with me. I want to send something to my boyfriend." Giggling, two of her friends walk over and pose with her.'
 		else
 			'As you get dressed you overhear Christina say "Damn we look good, I look really amazing." You turn and see her checking out her naked body in the mirror, along with Lariska and Lina.'
 			'"You look amazing as always Christina!" Lina says.'
 			'Christina grabs her phone and says "Let''s take a selfie."'
-			'The three of them pose several times as Christina takes several selfies of the three of them naked. Lariska even takes a couple herself, which Christina doesn''t seem to mind. They go on for several minutes about how great they look, although it is mostly Lina and Lariska stroking Christina''s ego.'
+			'The three of them pose several times as Christina takes several selfies of the three of them naked. Lariska even takes a few herself, which Christina doesn''t seem to mind. They go on for several minutes about how great they look, although it''s mostly just Lina and Lariska stroking Christina''s ego.'
 		end
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
@@ -1740,9 +1788,9 @@ if $ARGS[0] = 'dress':
 			'As you get dressed you decide to have some fun with Christina, who is trying to hide in a corner so she isn''t noticed. Calling her to the center of the room, you tell her to raise her skirt and bend over. When she hesitates, you warn her if she has panties on and no buttplug inserted, you are going to spank her ass so hard she won''t be able to sit for a week. Grimacing, she bends over and flips up her skirt. Seeing she is following your rules, you tell her to turn and give everybody a good look, before letting her continue to get dressed. Several girls laugh at her while she hurries to finish dressing and flees the locker room before you mess with her some more.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/applegirl.jpg"></center>'
-			'You don''t know why but Christina says something to Lina, which causes Lina to lie down on her stomach on one of the benches. Christina then sticks an apple in her mouth and proceeds to ignore her. A few minutes pass and once Christina is fully clothed, she walks back over and then uses her belt to smack Lina hard on the ass, making her wince in pain. "Have you learned your lesson?" Chrisina asks Lina, who enthusiastically nods her head.'
-			'Lariska just stands there watching, from a safe distance, as Christina yanks hard on Lina''s hair. "Are you sure?" Lina nods even more enthusiastically.'
-			'Christina gives her a final look and then puts her belt on. "OK fine, but don''t do it again."'
+			'You don''t know why but Christina says something to Lina which causes Lina to lie down on her stomach on one of the benches. Christina then sticks an apple in her mouth and proceeds to ignore her. A few minutes pass and once Christina is fully clothed, she walks back over and then uses her belt to smack Lina hard on the ass, making her wince in pain. "Have you learned your lesson?" Chrisina asks Lina, who enthusiastically nods her head.'
+			'Lariska stands watching from a safe distance as Christina yanks hard on Lina''s hair. "Are you sure?" Lina nods even more enthusiastically.'
+			'Christina gives her a final look and then puts her belt on. "Okay fine, but don''t do it again."'
 			'Lina gets up and takes the apple out of her mouth while taking a bite. "I won''t Christina." The three of them walk out together, with Lina and Lariska sharing the apple.'
 		end
 		'You can choose another outfit while you''re here.'
@@ -1751,7 +1799,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/chrislarwedgie.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'You see a couple of the girls teasing each other while getting dressed. One manages to get behind the other, grabs her panties, and pulls up. They both start laughing, obviously just messing around with each other. Things settle back down as the girl who got wedgied adjusts her panties and they leave the room, still teasing each other.'
+			'You see some girls teasing each other while getting dressed. One manages to get behind the other, grabs her panties and pulls them up. They both start laughing, obviously just messing around with each other. Things settle back down as the girl who got wedgied adjusts her panties and they leave the room, still teasing each other.'
 		else
 			'As Lariska finishes getting dressed, Christina walks up behind her, grabs the back of her panties and yanks up on them hard, making Lariska squeal as she stands on her toes to try and relieve the pressure. Most of the other girls laugh at this. "Oh please, we all know you like things up your ass, so don''t act like you''re not enjoying this." Christina tells her.'
 			'"Ow! Let go Christina, it hurts! Please!" Lariska pleads in a slightly whiny, submissive tone.'
@@ -1769,19 +1817,19 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 11:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/younggirls.jpg"></center>'
-		'A Christina, Lariska, and Lina are horsing around, while Lizaveta starts to take pictures of them with her phone. Lina grabs Christina, reaching around to grab her by the ass as she puts her hair into a ponytail as Lariska moons the one taking the picture. They get most of the other girls laughing, but it quickly breaks up as everyone finishes dressing and start to leave.'
+		'Christina, Lariska and Lina are horsing around, while Lizaveta starts to take pictures of them with her phone. Lina grabs Christina, reaching around to grab her by the ass as she puts her hair into a ponytail as Lariska moons the one taking the picture. They get most of the other girls laughing, but it quickly breaks up as everyone finishes dressing and starts to leave.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress <= 15:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nerdoutcast.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'As you are getting dressed you Natasha glaring at Christina, who is trying to get dressed quietly in a corner. Deciding to punish Christina for wearing panties, and maybe cheer the girl up, you sneak up behind Christina, grab her panties and yank them up hard. Christina screams and looks over her shoulder angrily, but turns white when she sees you, too scared to fight back as you pull even harder. Just when you think you might actually lift her off the ground, you hear the loud rip of her panties tearing, making her stumble into the lockers. Her panties hang off of her, wedged so tightly into her ass and pussy that they don''t fall off. Turning and smiling at Natasha, who smiles back, you go back to getting dressed while Christina holds back tears as she struggles to dig her ruined panties out.'
+			'As you are getting dressed, you see Natasha glaring at Christina, who is trying to get dressed quietly in a corner. Deciding to punish Christina for wearing panties, and maybe cheer Natasha up, you sneak up behind Christina, grab her panties and yank them up hard. Christina screams and looks over her shoulder angrily, but turns white when she sees you, too scared to fight back as you pull even harder. Just when you think you might actually lift her off the ground, you hear the loud rip of her panties tearing, making her stumble into the lockers. Her panties hang off of her, wedged so tightly into her ass and pussy that they don''t fall off. Turning and smiling at Natasha, who smiles back, you go back to getting dressed while Christina holds back tears as she struggles to dig her ruined panties out.'
 		elseif (grupTipe = 3 or grupTipe = 5) and $pantyworntype ! 'none':
 			'Just as you finish dressing, you feel someone grabs the back of your panties. Before you can say or do anything, you feel your panties get yanked up hard, painfully digging into your ass crack and against your clit. You hear the other girls all laugh as you struggle to free yourself. As you try and get up, you almost lose your balance as the person keeps pulling your panties up higher. You are finally able to pull yourself free and turn to see Christina laughing at you. "Fucking loser, likely the closest anything has been to rubbing your clit." She laughs and then heads out with Lariska and Lina in tow. You spend a few minutes pulling your panties out of your ass crack and getting them back in place.'
 			gs 'pain', 1, 'asscheeks', 'ache'
 		else
-			'As you finish dressing, you turn around in time to see Christina stand up on one of the benches, reach down, and grab Natasha''s panties from behind. She yanks up on them hard, making the Natasha yelp and stand up. This doesn''t stop Christina though, who keeps lifting until she manages to lift Natasha off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh while others look away in disgust. Natasha starts to beg Christina to let her go, which seems to only encourage Christina, who now starts bouncing her by her panties until there is a loud rip and the Natasha''s panties end up under her arms. She looks to be on the verge of tears and runs out once Christina finally lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'
+			'As you finish dressing, you turn around in time to see Christina stand up on one of the benches, reach down, and grab Natasha''s panties from behind. She yanks up on them hard, making Natasha yelp and stand up. This doesn''t stop Christina though, who keeps lifting until she manages to lift Natasha off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh while others look away in disgust. Natasha starts to beg Christina to let her go, which seems to only encourage Christina, who now starts bouncing her by her panties until there is a loud rip and Natasha''s panties end up under her arms. She looks to be on the verge of tears and runs out once Christina finally lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'
 			'You can choose another outfit while you''re here.'
 		end
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 219 - 218
locations/gschool_post_shower.qsrc


+ 2 - 6
locations/gschool_sex.qsrc

@@ -1539,12 +1539,8 @@ if $ARGS[0] = 'albina_lockerroom69':
 		'As you both get dressed she comments "It''s nice being with another girl. Men can be such assholes sometimes." with a look of slight frustration on her face.'
 		'You nod slightly in agreement with her. "Yeah..."'
 		'She giggles a little. "Don''t get me wrong, it''s nice to just get fucked hard and put away wet, but sometimes it''s nice feeling another girl''s touch. It''s so much softer and gentler than a guy''s, especially some of the guys I know."'
-		'You don''t know about that. You are sure some guys can be gentle and some girls really rough, but you guess it''s true. "Yeah, most times..."'
-		if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
-			'As she finishes dressing, she turns to you. "I''ll see you at practice yeah?"'
-			'You nod. "Yeah, see you at practice."'
-		end
-		'Once you are both dressed, she heads out of the locker room. "See you later <<$pcs_nickname>>."'
+		'"Yeah, I guess..." you softly reply.'
+		'Once you''re both dressed, she heads out of the locker room. "See you later <<$pcs_nickname>>."'
 		act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 	end
 end

+ 29 - 25
locations/gschool_socialchg1.qsrc

@@ -772,13 +772,11 @@ if $ARGS[0] = 'chris_dom':
 		'Lina''s eyebrows shoot up when she sees you''re naked, but she answers anyway. "I did horrible in the last race, so I... uh... asked Christina for help." Christina just nods, staring at her feet, too afraid to even look at you.'
 		'"Training is good, Lina. A much better plan than trying to suck the coach off, if you ask me." Christina''s cheeks flush a little, but she keeps looking down. Lina just smiles, but still seems too afraid of Christina to say anything against her.'
 		act 'Let them train in peace': gt 'pav_lake'
-		if swinbeg = 3 or swinbeggor = 3:
+		if swinbeg = 3 or swinbeggor = 3 and pcs_energy >= 5:
 			act 'Train Lina yourself':
 				cla & *clr
 				npc_rel['A19'] += rand(2,4)
 				gs 'exercise', 'tier1', 30, 'run_exp'
-				fat -= rand(0,2)
-				gs 'sweat', 'add', 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/run_naked1.jpg"></center>'
 				'"Well, since I''m the better runner, I had better pitch in too. Strip, both of you." Lina immediately turns red and tries to stammer out a protest, but Christina doesn''t even hesitate. She just starts taking her clothes off and tossing them into a pile.'
@@ -787,6 +785,8 @@ if $ARGS[0] = 'chris_dom':
 				'Christina, on the other hand, looks like she''s going to die of embarrassment. You doubt her being naked in public is the problem. Your guess is that she doesn''t want people to see you taking charge of her. It''s too late though since her reputation is already in ruins.'
 				act 'Let them rest': gt 'pav_lake'
 			end
+		elseif swinbeg = 3 or swinbeggor = 3:
+			act 'Train Lina yourself': '<br><font color="red">You feel too hungry to do this.</font>'
 		end
 	end
 end
@@ -805,17 +805,19 @@ if $ARGS[0] = 'Chris_Lina_park':
 		'You give them a friendly wave as they get closer and Christina calls out "Hey, girl! Come join us for a run."'
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 			if daybegskver ! daystart:
-				act 'Okay':
-					*clr & cla
-					menu_off = 1
-					gs 'exercise', 'tier1', 60, 'run_exp'
-					fat -= rand(0,4)
-					gs 'sweat', 'add', 5
-					daybegskver = daystart
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
-					'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
-					act 'Continue':gt 'pav_park', 'start'
+				if pcs_energy >= 10:
+					act 'Okay':
+						*clr & cla
+						menu_off = 1
+						gs 'exercise', 'tier1', 60, 'run_exp'
+						daybegskver = daystart
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
+						'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
+						act 'Continue':gt 'pav_park', 'start'
+					end
+				else
+					act 'Okay': '<br><font color="red">You feel too hungry to do this.</font>'
 				end
 				act 'No thanks':
 					'"Sorry, I have a few things I still need to do. Next time though."'
@@ -839,17 +841,19 @@ if $ARGS[0] = 'Chris_Lina_park':
 		'Lina giggles, but doesn''t say anything.'
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 			if daybegskver ! daystart:
-				act 'Okay':
-					*clr & cla
-					menu_off = 1
-					gs 'exercise', 'tier1', 60, 'run_exp'
-					fat -= rand(0,4)
-					gs 'sweat', 'add', 5
-					daybegskver = daystart
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
-					'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
-					act 'Continue':gt 'pav_park', 'start'
+				if pcs_energy >= 10:
+					act 'Okay':
+						*clr & cla
+						menu_off = 1
+						gs 'exercise', 'tier1', 60, 'run_exp'
+						daybegskver = daystart
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
+						'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
+						act 'Continue':gt 'pav_park', 'start'
+					end
+				else
+					act 'Okay': '<br><font color="red">You feel too hungry to do this.</font>'
 				end
 				act 'No thanks':
 					'"Sorry, I have a few things I still need to do. Next time though."'

+ 2 - 0
locations/katjaEv.qsrc

@@ -3238,6 +3238,8 @@ if $ARGS[0] = 'TamVal':
 								if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] = 1
 								KatjaOTN = 1
 								npcbrokehymen = 1
+								katjaFirstKiss = 1
+								KatjaDom += 5
 								KatjaLust += 20
 								sexnutrition += 25 * scfeed
 								suclezsex = lesbian

+ 1 - 1
locations/lariska_storyline.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'Boyfriend_1':
 	act 'Agree':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
-		'"Yeah, that''s ok with me. You should be able to have some fun, enjoy your life." You give her a smile, trying to let her know it wont bother you.'
+		'"Yeah, that''s ok with me. You should be able to have some fun, enjoy your life." You give her a smile, trying to let her know it won''t bother you.'
 		'"Thanks, <<$pcs_nickname>>. I was worried you would be mad at me for wanting that." She leans in and gives you a kiss on the cheek.'
 		LariskaQW['boyfriend'] = 1
 		lariskalove += 2

+ 5 - 7
locations/mother.qsrc

@@ -697,12 +697,14 @@ if $ARGS[0] = 'check_workout':
 		act 'Ask <<$npc_nickname[''A29'']>> to workout sometime': gt 'mother', 'ask_mother_workout'
 	end
 
-	if (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart:
+	if (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart and pcs_energy >= 10:
 		if $loc = 'kuhrPar' or $loc = 'sitrPar':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_pav'
 		elseif $loc = 'gadhouse':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_gad'
 		end
+	elseif (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart:
+		act 'Ask <<$npc_nickname[''A29'']>> to workout': '<br><font color="red">You feel too hungry to do this.</font>'
 	end
 end
 
@@ -1926,8 +1928,6 @@ if $ARGS[0] = 'mother_jog_pav':
 	act 'Go Jogging': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
-		fat -= rand(2,6)
-		gs 'sweat', 'add', 5
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/pavrun1.jpg"></center>'
 		'You and your <<$npc_nickname[''A29'']>> start jogging down one of the park paths. It''s not particularly taxing but you are glad to spend time with her. As you run you notice some men leering, but neither of you make a big deal out of it. Running through the park is quite refreshing overall, especially with company.'
@@ -1959,7 +1959,7 @@ if $ARGS[0] = 'mother_yoga_pav':
 		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing, and you head off towards the park - chatting as you go. It is not long before you arrive, so you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
-			minut += rand(20,30)
+			gs 'exercise', 'tier2', 30, 'sprt_exp', 'agil_exp'	
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/pavyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for awhile, seeming to enjoy the free show.'
@@ -1987,8 +1987,6 @@ if $ARGS[0] = 'mother_jog_gad':
 	act 'Let her take the lead': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
-		fat -= rand(2,6)
-		gs 'sweat', 'add', 5
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadrun1.jpg"></center>'
 		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead since she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending time with her, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
@@ -2020,7 +2018,7 @@ if $ARGS[0] = 'mother_yoga_gad':
 		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It''s not long before you arrive and you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
-			minut += rand(20,30)
+			gs 'exercise', 'tier2', 30, 'sprt_exp', 'agil_exp'	
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself but you enjoy being able to spend time with her. The area is quite secluded and private, and you and your <<$npc_nickname[''A29'']>> are left to run your routine in peace and quiet. It is a nice experience and gives you plenty of time to talk whilst going through your poses and stretches.'

+ 17 - 0
locations/npcstatic5.qsrc

@@ -718,6 +718,23 @@ npc_dick['A<<npctemp>>'] = 19
 npc_sexskill['A<<npctemp>>'] = 2
 npc_intel['A<<npctemp>>'] = 66
 
+npctemp = 247
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Liliya'
+$npc_nickname['A<<npctemp>>'] = 'Lilly'
+$npc_lastname['A<<npctemp>>'] = 'Lyubimova'
+$npc_usedname['A<<npctemp>>'] = 'Lilly'
+npc_dob['A<<npctemp>>'] = 19990414
+$npc_notes['A<<npctemp>>'] = 'Liliya is a very attractive and rather tall girl. Nobody knows really too much about her other than that she is a true tease. She finds amusement and fun teasing the boys with flashing her privates -usually naked- or just looking seductively. She refuses any advances made by the boys and she doesn''t let anybody to touch her or even try to flirt her. Usually those attempts end with a slap or some emasculating comeback lines.'
+npc_gender['A<<npctemp>>'] = 1
+gs 'npcstaticdefaults', 'defaults'
+npc_bust['A<<npctemp>>'] = 20
+hotcat_rating['A<<npctemp>>'] = 7
+npc_intel['A<<npctemp>>'] = 77
+!!$npc_body['A<<npctemp>>'] = 's3'
+!!hair = long red hair reaching just past her shoulders.
+!!pubic hair = shaved
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp
 

+ 3 - 3
locations/nyp_school.qsrc

@@ -73,11 +73,11 @@ if $ARGS[0] = 'start':
 						if fame['pav_sex'] > 10: gs 'fame', 'pav', 'sex', -10
 						'You hear the clattering of heels and turn to see Albina storming over, her furious gaze directed towards Vasily. "I distinctly remember telling you and the other tiny dick morons to fuck off and leave <<$pcs_nickname>> alone, or has your tiny dick brain forgotten that conversation?"'
 						'Vasily has already let go of you and bravely - or stupidly - lunged for Albina. "What did you call me, you buttslut whore? You want me to fuck you instead?"'
-						'Albina gives him her most charming smile and then, with lightning-fast reflexes, launches her knee right into his crotch, causing the howling Vasily to fall to the floor. Albina then squats down beside him as he rolls back and forth in pain and sweetly says "If you approach <<$pcs_nickname>> or attack, insult or even look at me again, I''ll bury you alive where nobody will ever find you..."'
+						'Albina gives him her most charming smile and then, with lightning-fast reflexes, delivers a swift yet brutal kick to his crotch, causing the howling Vasily to fall to the floor. Albina then squats down beside him as he rolls back and forth in pain and sweetly says "If you approach <<$pcs_nickname>> or attack, insult or even look at me again, I''ll bury you alive where nobody will ever find you..."'
 						*nl
-						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t listen to her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Fuck you, you dirty anal-loving whore!" Albina rises to her feet and smiles. Then, without warning, she viciously stomps on his crotch and then painfully twists her heel into him. "You''re testing my fucking patience! Do you want me to burst your little balls in front of everyone?"'
+						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t hear her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Fuck you, you dirty anal-loving whore!" Albina rises to her feet and smiles. Then, without warning, she viciously stomps on his crotch and then painfully twists her heel into him. "You''re testing my fucking patience! Do you want me to burst your little balls in front of everyone?"'
 						*nl
-						'Vasily squeals pathetically in pain. "No!! I''m sorry! I''m sorry! Just please, stop!" A strangely satisified, almost erotic grin creeps onto Albina''s face and she squats down next to him again, patting his head like a dog while mocking him. "Who''s a good boy? You are! Yes you!" She then stands and looks at you. "<<$pcs_nickname>>, you better leave before somebody sees you here. With what people already think of you, you really don''t want them to think you did this."'
+						'Vasily squeals pathetically in pain. "No!! I''m sorry! I''m sorry! Just please, stop!" A strangely satisified, almost erotic grin creeps onto Albina''s face and she squats down next to him again, patting his head like a dog while mocking him. "Who''s a good boy? You are! Yes you!" She then stands and looks at you. "You better leave before somebody sees you here, <<$pcs_nickname>>. With what people already think of you, you really don''t want them to think you did this."'
 						*nl
 						'Several of the other students are howling in laughter at Vasily''s humiliating misfortune, but more than a few take another look at you and seem to see you a little differently thanks to Albina coming to your aid. Seeing that you are not going to be left alone, you safely slip out while everyone is distracted by Vasily and Albina.'
 						gs 'stat'

+ 9 - 9
locations/olu.qsrc

@@ -689,17 +689,17 @@ if $ARGS[0] = 'olunush':
 								act 'Grab her ass':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/anushka/assgrab.jpg"></center>'
-									'You follow her out of the apartment, with her just in front of you. As the apartment door closes you reach out and grab her ass. "Hows your ass feel?" You ask her in a teasing tone.'
-									'"Owe! Fuck." She says as she pulls away from you and pushes your hands away. "My ass hurts what do you thinks, bitch." She says to you. Despite her words you know she is just fucking around with you.'
-									'"You really are a anal slut you know that, you just love having your ass fucked hard and rough." You tease her."'
-									'She laughs slightly. "Fuck you, at least I am not fucking my aunts boyfriend, your future uncle. Now that is a real slut, fucking any and everything"'
+									'You follow just behind her as she leaves the apartment. As the apartment door closes, you reach out and grab her ass. "How''s your ass feel?" You ask her in a teasing tone.'
+									'"Ow! Fuck." She says as she pulls away from you and pushes your hands away. "What do you think? My ass hurts, bitch." She says to you. Despite her words you know she is just fucking around with you.'
+									'"You really are an anal slut, you know that? You just love having your ass fucked hard and rough." You saying teasingly.'
+									'She laughs slightly. "Fuck you. At least I''m not fucking my aunt''s boyfriend, your future uncle. Now that is a real slut, fucking any and everything"'
 									if radspy = 1:
-										'You smirk at her responce. "You know I think Rad is right at least about you, you just like being fucked hard and rough and love it."'
-										'She just gives you a fuck off look and then flips you off with both fingers, till she gets to the stairs, then she walks down them but raises her hands up over her head and double flips you off again. You can''t help but laugh at that reaction.'
+										'You smirk at her response. "You know I think Rad is right about you, you just like being fucked hard and rough. You fucking love it."'
+										'She just gives you a fuck off look and then flips you off with both fingers till she gets to the stairs, then she walks down them but raises her hands up over her head and double flips you off again. You can''t help but laugh at that reaction.'
 									else
-										'You smirk to her. "I learned from the best."'
-										'She rolls her eyes at you. "Whatever slut." Then she turns and walks down the stairs. "Talk to you later." She says as she walks away.'
-										'"Later." You reply as she disappears down the next flight of stairs.'
+										'You smirk at her. "I learned from the best."'
+										'She rolls her eyes at you. "Whatever, slut." Then she turns and walks down the stairs. "Talk to you later."'
+										'"Later!" You call after her as she disappears down the next flight of stairs.'
 									end
 									act 'Leave': gt 'pod_ezd', 'etaj_4'
 								end

+ 3 - 1
locations/park_walkevents.qsrc

@@ -831,7 +831,7 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'run':
-	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart:
+	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart and pcs_energy >= 10:
 		act 'Jog through the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -866,6 +866,8 @@ if $ARGS[0] = 'run':
 				end
 			end
 		end
+	elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart:
+		act 'Jog through the park (1:00)': '<br><font color="red">You feel too hungry to do this.</font>'
 	elseif ($clothingworntype ! 'danilovich_outfits' or $shoeworntype ! 'danilovich') and hour > 5 and hour < 23 and daybegskver ! daystart:
 		'You could jog around the park if you were wearing sports clothes and shoes.'
 	end

+ 5 - 5
locations/pav_library.qsrc

@@ -11,14 +11,14 @@ gs 'stat'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Community center library</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
-'For such a small town, this library is surprisingly large - containing many interesting books on a wide variety of subjects.'
+'For such a small town, the library is surprisingly large - containing many interesting books on a wide variety of subjects.'
 *nl
 'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gt ''Komp'',''start''">computers</a> for public use.'
 if lernHome > 0:
-'You could do your homework with the help of one of the computers'
+'You could do your homework with the help of one of the computers.'
 end
 if 	storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
-	'The nerd''s are siting at a table studying together.'
+	'The nerds are sitting at a table studying together.'
 end
 
 act 'Leave': gt 'pav_commcenter'
@@ -141,7 +141,7 @@ if hour >= 8 and hour < 18:
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			gs 'grades', 'homework', 'school', 'yes', 1, 0, 0
-			'You sit down at one of the tables with a a computer and use it to help you do your homework'
+			'You sit down at one of the tables with a a computer and use it to help you do your homework.'
 			'After an hour you have '+iif(lernHome = 0, 'completed', 'done a part of')+' your homework.'
 			act 'Get up form the table': gt 'pav_library'
 		end
@@ -149,7 +149,7 @@ if hour >= 8 and hour < 18:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
-		act 'Join the nerd''s study goup': gt 'pav_library_nerdstudy', 'nerd_study_night'
+		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else
 	'The library is closed.'

+ 40 - 44
locations/preCUST.qsrc

@@ -393,9 +393,9 @@ if $ARGS[0] = 'Done':
 		gm_dress[11] = 1
 		gm_dress_h[11] = 100
 		gm_dress_b[11] = pcs_hips
-		swimwear[3] = 1
-		swimwear_h[3] = 60
-		swimwear_b[3] = pcs_hips
+		danilovich_swimsuit[3] = 1
+		danilovich_swimsuit_h[3] = 60
+		danilovich_swimsuit_b[3] = pcs_hips
 		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'gm_dress', 370
 	elseif goth_clothing = 1:
@@ -426,30 +426,30 @@ if $ARGS[0] = 'Done':
 		pantywornnumber = 12
 		$braworntype = 'cheap'
 		brawornnumber = 12
-		danilovich_outfits[78] = 1
-		danilovich_outfits_h[78] = 100
+		danilovich_outfits[81] = 1
+		danilovich_outfits_h[81] = 100
 		danilovich_shoe[21] = 1
 		gm_shoe[9] = 1
 		shoewornnumber = 9
 		$shoeworntype = 'gm'
-		gm_outfits[7] = 1
-		gm_outfits_h[7] = 100
-		gm_outfits_b[7] = pcs_hips
+		gm_outfits[30] = 1
+		gm_outfits_h[30] = 100
+		gm_outfits_b[30] = pcs_hips
 		cats_dress[1] = 1
 		cats_dress_h[1] = 100
 		cats_dress_b[1] = pcs_hips
-		sportsclothingnumber = 78
+		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'cats_dress', 1
 	elseif pcs_inhib < 5:
-		gm_outfits[7] = 1
-		gm_outfits_h[7] = 100
-		gm_outfits_b[7] = pcs_hips
-		danilovich_outfits[86] = 1
-		danilovich_outfits_h[86] = 100
+		gm_outfits[30] = 1
+		gm_outfits_h[30] = 100
+		gm_outfits_b[30] = pcs_hips
+		danilovich_outfits[81] = 1
+		danilovich_outfits_h[81] = 100
 		cats_dress[1] = 1
 		cats_dress_h[1] = 100
 		cats_dress_b[1] = pcs_hips
-		sportsclothingnumber = 86
+		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'cats_dress', 1
 	elseif pcs_inhib < 10:
 		gm_outfits[15] = 1
@@ -559,24 +559,20 @@ if $ARGS[0] = 'Done':
 		gm_dress[149] = 1
 		gm_dress_h[149] = 100
 		gm_dress_b[149] = pcs_hips
-		swimwear[24] = 1
-		swimwear_h[24] = 60
-		swimwear_b[24] = pcs_hips
+		scandalicious_bikinis[55] = 1
+		scandalicious_bikinis_h[55] = 60
+		scandalicious_bikinis_b[55] = pcs_hips
 		sportsclothingnumber = 15
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
-	if swim_start = 58:
-		swimwear[58] = 1
-		swimwear_h[58] = 60
-		swimwear_b[58] = pcs_hips
-	elseif swim_start = 98:
-		swimwear[98] = 1
-		swimwear_h[98] = 60
-		swimwear_b[98] = pcs_hips
+	if swim_start = 98:
+		danilovich_swimsuit[98] = 1
+		danilovich_swimsuit_h[98] = 60
+		danilovich_swimsuit_b[98] = pcs_hips
 	elseif swim_start = 69:
-		swimwear[69] = 1
-		swimwear_h[69] = 60
-		swimwear_b[69] = pcs_hips
+		danilovich_swimsuit[69] = 1
+		danilovich_swimsuit_h[69] = 60
+		danilovich_swimsuit_b[69] = pcs_hips
 	end
 	
 !!setting default danilovich outfit and setting coats
@@ -615,29 +611,29 @@ if $ARGS[0] = 'Done':
 		$sportspantytype = 'sport'
 		sportspantynumber = 1
 		if school_clothing = 2:
-			gm_school[10] = 1
-			gm_school_h[10] = 120
-			gm_school_b[10] = pcs_hips
+			gm_school[49] = 1
+			gm_school_h[49] = 120
+			gm_school_b[49] = pcs_hips
 		elseif school_clothing = 3:
-			gm_school[63] = 1
-			gm_school_h[63] = 120
-			gm_school_b[63] = pcs_hips
+			gm_school[25] = 1
+			gm_school_h[25] = 120
+			gm_school_b[25] = pcs_hips
 		elseif school_clothing = 4:
 			dolls_dress[40] = 1
 			dolls_dress_h[40] = 120
 			dolls_dress_b[40] = pcs_hips
 		elseif school_clothing = 5:
-			gm_school[25] = 1
-			gm_school_h[25] = 120
-			gm_school_b[25] = pcs_hips
+			gm_school[37] = 1
+			gm_school_h[37] = 120
+			gm_school_b[37] = pcs_hips
 		elseif school_clothing = 6:
-			gm_school[26] = 1
-			gm_school_h[26] = 120
-			gm_school_b[26] = pcs_hips
+			gm_school[4] = 1
+			gm_school_h[4] = 120
+			gm_school_b[4] = pcs_hips
 		elseif school_clothing = 7:
-			gm_school[26] = 1
-			gm_school_h[26] = 120
-			gm_school_b[26] = pcs_hips
+			gm_school[17] = 1
+			gm_school_h[17] = 120
+			gm_school_b[17] = pcs_hips
 			danilovich_outfits[4] = 1
 			danilovich_outfits_h[4] = 100			
 			sportsclothingnumber = 4

+ 1 - 1
locations/rex_party_sister_events.qsrc

@@ -23,12 +23,12 @@ end
 if $ARGS[0] = 'talk':
 	*clr & cla
 	minut += 5
-	sisterQW['partytalk'] += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anya</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_1.jpg"></center>'
 	! These chat options will happen when Anya and Roma had their fight.
 	if sisterQW['AnyaRomaQW'] = 1:
+		sisterQW['partytalk'] += 1
 		if sisterQW['partytalk'] = 1:
 			'"It is strange seeing you back together with Roma."'
 			'"We talked things out and decided to give it another chance.'

+ 38 - 490
locations/sexshop.qsrc

@@ -23,14 +23,16 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
 	'The main counter displays various sex toys:'
 	'Lubricant - 145 <b>₽</b>'
-	'Dildo - starting at 800 <b>₽</b>'
 	'Vibrator - 800 <b>₽</b>'
-	'Strap-on harness - starting at 1,200 <b>₽</b>'
-	'Butt plug - 1,200 <b>₽</b>'
+	'Butt plug - 800 <b>₽</b>'
+	'Strap-on harness - 500 <b>₽</b>'
+	'Dildo - starting at 800 <b>₽</b>'
 	*nl
 	'Private booths are available in the basement for viewing porn. (50 <b>₽</b> for 15 minutes)'
 
 	act 'Leave': minut += 5 & gt 'city_redlight', 'start'
+	act 'Check the main counter': gt 'sexshop', 'sexshop_menu'
+	
 
 	if analplug = 1 and dildo = 1 and hotcat >= 5 and Peter = 0:
 		if rand(0,1) = 1:
@@ -142,498 +144,44 @@ if $ARGS[0] = 'start':
 	act 'Look through the panties':	minut += 1 & gt 'sexshop', 'panties'
 	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
 	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
-	
-	if money < 145 and karta + bankDebtLimit < 145:
-		'You can''t afford lubricant.'
-	else
-		if money >= 145:
-			act 'Buy lubricant 145 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				lubri += 20
-				money -= 145
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy some lubricant and pay the cashier.'
-				gs 'stat'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 145:
-			act 'Buy lubricant 145 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				lubri += 20
-				karta -= 145
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy some lubricant and pay the cashier.'
-				gs 'stat'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-	end
-	
-	if pornMagazine <= 1 and (money < 400 and karta + bankDebtLimit < 400):
-		'You can''t afford the porn magazine.'
-	else
-		if pornMagazine <= 1 and money >= 400:
-			act 'Buy a porn magazine 400 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				money -= 400
-				pornMagazine = 50
-				gs 'stat'
-				'You buy a porn magazine and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if pornMagazine <= 1 and karta + bankDebtLimit >= 400:
-			act 'Buy a porn magazine 400 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				karta -= 400
-				pornMagazine = 50
-				gs 'stat'
-				'You buy a porn magazine and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-
-	if dildo = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the 10cm dildo.'
-	else
-		if money >= 800 and dildo = 0:
-			act 'Buy 10cm dildo 800 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				dildo = 1
-				money -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 800 and dildo = 0:
-			act 'Buy 10cm dildo 800 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				dildo = 1
-				karta -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-	end
-
-	if middildo = 0 and (money < 850 and karta + bankDebtLimit < 850):
-		'You can''t afford the 15cm dildo.'
-	else
-		if money >= 850 and middildo = 0:
-			act 'Buy 15cm long dildo 850 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				middildo = 1
-				money -= 850
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 15cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 850 and middildo = 0:
-			act 'Buy 15cm long dildo 850 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				middildo = 1
-				karta -= 850
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 15cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-
-	if largedildo = 0 and (money < 900 and karta + bankDebtLimit < 900):
-		'You can''t afford the 20cm dildo.'
-	else
-		if money >= 900 and largedildo = 0:
-			act 'Buy 20cm long dildo 900 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				largedildo = 1
-				money -= 900
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 20cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 900 and largedildo = 0:
-			act 'Buy 20cm long dildo 900 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				largedildo = 1
-				karta -= 900
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 20cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-	
-	if suction_dildo = 0 and money >= 1000:
-		act 'Buy a 15cm suction dildo 1000 <b>₽</b> (cash)':
-			cla
-			minut += 5
-			suction_dildo += 1
-			money -= 1000
-			pcs_horny += 10
-			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
-			if  pcs_inhib < 35:
-				'You buy the dildo and hastily hide it as your face blushes with embarrassment.'
-			else
-				'You buy the dildo and calmly hide it.'
-			end
-			act 'Move away from the counter':gt'sexshop','start'
-		end
-	elseif suction_dildo > 0 and money >= 1000:
-		act 'Buy another 15cm suction dildo 1000 <b>₽</b> (cash)':
-			cla
-			minut += 5
-			suction_dildo += 1
-			money -= 1000
-			pcs_horny += 10
-			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
-			if  pcs_inhib < 35:
-				'You buy the dildo and hastily hide it as your face blushes with embarrassment.'
-			else
-				'You buy the dildo and calmly hide it.'
-			end
-			act 'Move away from the counter':gt'sexshop','start'
-		end
-	end
-
-	if suction_dildo > 0 and (karta + bankDebtLimit >= 950):
-		act 'Buy another 15cm suction dildo 1000 <b>₽</b> (card)':
-			cla
-			minut += 5
-			suction_dildo += 1
-			karta -= 1000
-			pcs_horny += 10
-			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
-			if  pcs_inhib < 35:
-				'You buy the dildo and hastily hide it as your face blushes with embarrassment.'
-			else
-				'You buy the dildo and calmly hide it.'
-			end
-			act 'Move away from the counter':gt'sexshop','start'
-		end
-	elseif (karta + bankDebtLimit >= 950):
-		act 'Buy 15cm suction dildo 1000 <b>₽</b> (card)':
-			cla
-			minut += 5
-			suction_dildo += 1
-			karta -= 1000
-			pcs_horny += 10
-			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
-			if  pcs_inhib < 35:
-				'You buy the dildo and hastily hide it as your face blushes with embarrassment.'
-			else
-				'You buy the dildo and calmly hide it.'
-			end
-			act 'Move away from the counter':gt 'sexshop','start'
-		end	
-	end
-
-	if bigdildo = 0 and (money < 950 and karta + bankDebtLimit < 950):
-		'You can''t afford the 25cm dildo.'
-	else
-		if money >= 950 and bigdildo = 0:
-			act 'Buy 25cm long dildo 950 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				bigdildo = 1
-				money -= 950
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 25cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 950 and bigdildo = 0:
-			act 'Buy 25cm long dildo 950 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				bigdildo = 1
-				karta -= 950
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 25cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-
-	if extradildo = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the 30cm dildo.'
-	else
-		if money >= 1000 and extradildo = 0:
-			act 'Buy 30cm long dildo (1,000 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				extradildo = 1
-				money -= 1000
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 30cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 1000 and extradildo = 0:
-			act 'Buy 30cm long dildo (1,000 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				extradildo = 1
-				karta -= 1000
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 30cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-
-	if superdildo = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the 35cm dildo.'
-	else
-		if money >= 1100 and superdildo = 0:
-			act 'Buy 35cm long dildo (1,100 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				superdildo = 1
-				money -= 1100
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 35cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 1100 and superdildo = 0:
-			act 'Buy 35cm long dildo (1,100 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				superdildo = 1
-				karta -= 1100
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 35cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
-
-	if maddildo = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the 40cm dildo.'
-	else
-		if money >= 1200 and maddildo = 0:
-			act 'Buy 40cm long dildo (1,200 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				maddildo = 1
-				money -= 1200
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 40cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-		if karta + bankDebtLimit >= 1200 and maddildo = 0:
-			act 'Buy 40cm long dildo (1,200 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				maddildo = 1
-				karta -= 1200
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a 40cm long dildo and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop','start'
-			end
-		end
-	end
 
-	if vibrator = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the vibrator.'
-	else
-		if money >= 800 and vibrator = 0:
-			act 'Buy vibrator (800 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				vibrator = 1
-				money -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a vibrator and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 800 and vibrator = 0:
-			act 'Buy vibrator (800 <b>₽</b>)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				vibrator = 1
-				karta -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a vibrator and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-	end
-
-	if strapon = 0:
-		if (money > 1200 and karta + bankDebtLimit > 1200) and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo = 0):
-			'You can''t afford the strap-on.'
-			if money >= 1200:
-				act 'Buy a strap-on with a 15cm dildo 1,200 <b>₽</b> (cash)':
-					*clr & cla
-					menu_off = 1
-					minut += 5
-					strapon = 1
-					middildo = 1
-					strapnumber = 2
-					money -= 1200
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-					'You buy a strap-on and pay the cashier.'
-
-					act 'Move away from the counter':gt 'sexshop', 'start'
-				end
-			end
-			if karta + bankDebtLimit >= 1200:
-				act 'Buy a strap-on with a 15cm dildo 1,200 <b>₽</b> (card)':
-					*clr & cla
-					menu_off = 1
-					minut += 5
-					strapon = 1
-					middildo = 1
-					strapnumber = 2
-					karta -= 1200
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-					'You buy a strap-on and pay the cashier.'
-
-					act 'Move away from the counter':gt 'sexshop', 'start'
-				end
-			end
-		elseif (money > 500 or karta + bankDebtLimit > 500) and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0):
-			if money >= 500:
-				act 'Buy a strap-on harness 500 <b>₽</b> (cash)':
-					*clr & cla
-					menu_off = 1
-					minut += 5
-					strapon = 1
-					money -= 500
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-					'You buy a strap-on and pay the cashier. You have to attach one of your dildos to it.'
+end
 
-					act 'Move away from the counter':gt 'sexshop', 'start'
-				end
-			end
-			if karta + bankDebtLimit >= 500:
-				act 'Buy a strap-on harness 500 <b>₽</b> (card)':
-					*clr & cla
-					menu_off = 1
-					minut += 5
-					strapon = 1
-					karta -= 500
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-					'You buy a strap-on and pay the cashier. You have to attach one of your dildos to it.'
+if $ARGS[0] = 'sexshop_menu' or $ARGS[0] = '':
+	$loc_arg = 'sexshop_menu'
+	$loc = 'sexshop'
+	$menu_loc = 'sexshop'
+	$menu_arg = 'sexshop_menu'
+	menu_off = 0
+	*clr & cla
+	gs 'stat'
 
-					act 'Move away from the counter':gt 'sexshop', 'start'
-				end
-			end
-		end
-	end
+	'<center><b><font color="maroon">Main Counter</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
 
-	if analplug = 0 and (money < 800 and karta + bankDebtLimit < 800):
-		'You can''t afford the butt plug.'
+	if $message ! '':
+		'<center>'+$message+'</center>'
+		killvar '$message'
 	else
-		if money >= 800 and analplug = 0:
-			act 'Buy butt plug 800 <b>₽</b> (cash)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				analplug = 1
-				money -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a butt plug and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 800 and analplug = 0:
-			act 'Buy butt plug 800 <b>₽</b> (card)':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				analplug = 1
-				karta -= 800
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sexshop.jpg"></center>'
-				'You buy a butt plug and pay the cashier.'
-
-				act 'Move away from the counter':gt 'sexshop', 'start'
-			end
-		end
-	end
+		''
+	end	
+	*pl '<center><table align="center" width=80%>'
+	*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 50, 'Porn magazine', 400, 'pornMagazine', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, 'Vibrator', 800, 'vibrator', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, 'Butt plug', 800, 'analplug', 'sexshop', 'sexshop_menu')
+	*p func ('$stock_item', 1, '15cm suction dildo', 1000, 'suction_dildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, 'Strap-on harness', 500, 'strapon', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '10cm dildo', 800, 'dildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '15cm dildo', 850, 'middildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '20cm dildo', 900, 'largedildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '25cm dildo', 950, 'bigdildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '30cm dildo', 1000, 'extradildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '35cm dildo', 1100, 'superdildo', 'sexshop', 'sexshop_menu')
+	*p func ('$single_stock_item', 1, '40cm dildo', 1200, 'maddildo', 'sexshop', 'sexshop_menu')
+	*p '</table></center>'
+
+	act 'Step away from the main counter': gt 'sexshop', 'start'
 end
 
 if $ARGS[0] = 'dress':

+ 2 - 2
locations/shop_fashionista.qsrc

@@ -235,12 +235,12 @@ end
 if $ARGS[0] = 'dressingoutfit2':
 	cla
 	
-	if fashionista_outfit[i] ! 0:
+	if fashionista_outfits[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'shop_fashionista', 'dressingclothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'fashionista_outfit',i, 8000, 'shop'
+	gt 'clothing', 'view_clothing_item', 'fashionista_outfits',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingbra':

+ 4 - 4
locations/sister_chat.qsrc

@@ -834,13 +834,13 @@ if $ARGS[0] = 'sister_chat':
 						'"We hang out in the evenings at the community center. Meet me there, and I''ll introduce you to him."'
 						act 'Finish': gt 'sister_chat', 'sister_chat'
 					end
-				elseif npc_QW['A33'] >= 2 and npc_rel['A33'] >= 40 and sisboytrioQW > -1 and sisboytrioDayOtkaz <= daystart and sisboypartyQW < 2:
+				elseif npc_QW['A33'] >= 2 and npc_rel['A33'] >= 40 and sisboytrioQW > -1 and sisboytrioDayOtkaz <= daystart and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
 					act 'Talk about Roma':
 						*clr & cla
 						minut += 5
 						temp = rand(1,14)
 						gs 'stat'
-						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart and (week < 5 or week = 7):
+						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart and (week < 4 or week = 7):
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
 							if rand(0,3) = 1:
@@ -907,7 +907,7 @@ if $ARGS[0] = 'sister_chat':
 									act 'Finish': gt 'sister_chat', 'sister_chat'
 								end
 							end
-						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0 and (week < 5 or week = 7):
+						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0 and (week < 4 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
@@ -960,7 +960,7 @@ if $ARGS[0] = 'sister_chat':
 								'You hug and kiss your sister.'
 								act 'Finish': gt 'sister_chat', 'sister_chat'
 							end
-						elseif temp <= 3 and sisboyday ! daystart and (week < 5 or week = 7):
+						elseif temp <= 3 and sisboyday ! daystart and (week < 4 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							if sisterQW['romatime'] = 0:
 								sisterQW['romatime'] = 1

+ 4 - 4
locations/soniadisco.qsrc

@@ -750,7 +750,7 @@ if $ARGS[0] = 'followsonia':
 		if soniahelp > soniaencourage:
 			'You walk up to her. "Are you ok?"'
 			'She gives you a look of disbelief. "NO, I''m not ok. You saw what happened, everyone is going to think I''m a slut now, hell I am a slut," she says between sobs.'
-			'You nod a bit. "I know, but I tried to help you and I wish I could have done more," you tell her.'
+			'You nod a bit. "I know, but I tried to help you and I wish I could have done more." you tell her.'
 			'She nods a bit. "I know, god I was so stupid," she says before she start sobbing harder.'
 		elseif soniaencourage > 0 and npc_rel['A25'] >= 50:
 			npc_rel['A25'] -= 10
@@ -770,12 +770,12 @@ if $ARGS[0] = 'followsonia':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/soniasad.jpg"></center>'
 				if soniahelp > 0:
-					'You put your arm around her shoulder and hug her. "I am so sorry this happened to you, I tired to help. I should have done more."'
-					'She shakes her head. "No you tried to warn me, this is my fault. God I am so stupid, my life is over," she cries as she starts sobbing even harder. You start wiping the cum off her face and out of her hair as best you can as you hold her as she sobs into your shoulder.'
+					'You put your arm around her shoulder and hug her. "I am so sorry this happened to you, I tried to help. I should have done more."'
+					'She shakes her head. "No, you tried to warn me, this is my fault. God I am so stupid, my life is over." she cries as she starts sobbing even harder. You start wiping the cum off her face and out of her hair as best you can while you hold her, sobbing against your shoulder.'
 					'Once you have her face and hair mostly cleaned up and she seems to be slowing down on her sobs, she says, "I should go home."'
 				else
 					'You put your arm around her shoulder and hug her. "I am so sorry this happened to you, I wish I had said or done something to help you."'
-					'She shakes her head. "No you couldn''t have said anything to change my mind, this is my fault. God I am so stupid, my life is over," she cries as she starts sobbing even harder. You start wiping the cum off her face and out of her hair as best you can as you hold her as she sobs into your shoulder.'
+					'She shakes her head. "No you couldn''t have said anything to change my mind, this is my fault. God I am so stupid, my life is over," she cries as she starts sobbing even harder. You start wiping the cum off her face and out of her hair as best you can, holding her while she sobs into your shoulder.'
 					'Once you have her face and hair mostly cleaned up and she seems to be slowing down on her sobs, she says, "I should go home."'
 				end
 				act 'Leave': gt 'pav_residential'

+ 2 - 2
locations/stat.qsrc

@@ -77,10 +77,10 @@ if cheatNomakeup = 1 and cosmetic_tattoo = 0:
 end
 if cheatNoSweat = 1 and pcs_sweat > 0: pcs_sweat = 0
 if cheatNoEat = 1:
-	if pcs_energy < 35: pcs_energy = 35
+	if pcs_energy < 60: pcs_energy = 60
 end
 if cheatNoDrink = 1:
-	if pcs_hydra < 35: pcs_hydra = 35
+	if pcs_hydra < 60: pcs_hydra = 60
 end
 if cheatNoSleep = 1:
 	if pcs_sleep < 35: pcs_sleep = 35

+ 251 - 11
locations/stwork2.qsrc

@@ -433,45 +433,186 @@ if $ARGS[0] = 'privatdance':
 	stripdancesum += 1
 
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/privatstrip.jpg"></center>'
-	'You walk over to a smaller private room where you put on some music before the customer walks in. As the customer walks in, you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him, you can feel his rock hard cock.'
 
-	stprrand = rand(0,15)
+	stprrand = rand(0,25)
 	if stprrand = 0:
 		gt 'stwork2', 'pr1'
 	elseif stprrand = 1:
 		gt 'stwork2', 'pr2'
 	elseif stprrand = 2:
 		gt 'stwork2', 'pr3'
+	elseif stprrand = 3:
+		gt 'stwork2', 'pr4'
+	elseif stprrand = 4:
+		gt 'stwork2', 'pr5'
+	elseif stprrand = 5:
+		gt 'stwork2', 'pr6'
+	elseif stprrand = 6:
+		gt 'stwork2', 'pr7'
 	end
 
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/privatstrip.jpg"></center>'
+	'You walk over to a smaller private room where you put on some music before the customer walks in. As the customer walks in, you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him, you can feel his rock hard cock.'
+
 	act 'Return to the locker room':gt 'stwork', 'start'
 end
 
 if $ARGS[0] = 'pr1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1.jpg"></center>'
-	'Just as you start to dance, you hear a knock on the door. His friends are waiting outside wanting to join in on the dance. Feeling trapped, you agree and start dancing. After a while, they tell you to stop and ask if you''re willing to go all the way for 4000 <b>₽</b>.'
+		'Just as you start to dance, you hear a knock at the door. Your client''s very drunk friends are all waiting outside and are asking if they can join in on the private show.'
+		'Feeling a bit backed into a corner, you reluctantly agree, letting them inside. You do your best to focus on your original paying client, while still incorporating his lecherous friends into the show the best you can. Suddenly, one of them approaches, grabs your arm and says: "Listen, it''s my buddy''s bachelor party tonight. How about we pay you 4000 ₽ and you give us a real show?"'
+		'The predatory look in the mens'' eyes tell you exactly what they want to do to you.'
 
-	act 'Reject them':gt 'stwork', 'start'
+	act 'Reject them and return to the locker room':gt 'stwork', 'start'
 
 	act 'Agree':
+		*clr & cla
 		gang += 1
 		guy += 4
 		killvar '$boy'
 		i=rand(18,40)
 		gs 'npcgeneratec', 0, 'Private dance client', i
 		gs 'boyStat', $npclastgenerated
-		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'npcgeneratec', 0, '1st Friend of client', i
 		gs 'boyStat', $npclastgenerated, '1'
-		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'npcgeneratec', 0, '2nd Friend of client', i
 		gs 'boyStat', $npclastgenerated, '2'
-		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'npcgeneratec', 0, '3rd Friend of client', i
 		gs 'boyStat', $npclastgenerated, '3'
-		picrand = 12
 		money += 4000
-		$sexloc = 'stwork'
-		gt 'paysex', 'var'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1a.jpg"></center>'
+		'You agree to the deal and almost instantly the men have tugged their cocks out of their pants. You''re pushed back onto the stage, and 2 cocks are pushed towards your mouth, one straight inside and one waiting for its turn.'
+        'As your mouth begins doing it''s job, the third man guides your right hand to his swelling member and as you begin to stroke it, the final guy starts pulling down your pants, exposing your slit to the entire group.'
+        'Fortunately you are already pretty aroused from your earlier performance and your pussy easily accepts his cock as he slowly penetrates you. You gasp around the cock in your mouth as a wave of pleasure shoots up your thighs. Maybe this was a good idea after all!'
+        '"God damn, this bitch is nice!" one of the men proclaims with a grunt as he presses further into your pussy.'
+		'"Yeah, she''s so much hotter than your fiance, too! I mean, no offense, man..." the man getting a handjob stammers to the client fucking your mouth.'
+		'"Nah, you''re right bro, this whore almost makes me want to cancel the wedding!" he laughs, slapping his cock against your tongue before pushing back inside.'
+		gs 'boystat', $boy1
+		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+		gs 'boystat', $boy2
+		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+		gs 'boystat', $boy3
+		gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+		gs 'boystat', $boy4
+		gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
+			'Now warned up you remove your top as the men take turns fucking you senseless, switching positions fluidly, but seemingly at random. As you take the barrage of cocks using your body in tandem, you can''t help but wonder how many other girls they''ve done this to over the years. You are only able to hang on
+			for the ride at this point, as you are being completely manhandled.'
+			'"I''m so glad I let you guys talk me into coming to the city tonight! This is the perfect last night of freedom!" your original client says, gliding his cock in and out of your glistening slit.'
+			'"Fuck yeah man, it was the least we could do! Gotta remind you of what you''ll be giving up with that ''ol ball and chain around your leg!" his friend cackles, shoving his cock into your mouth.'
+			gs 'boystat', $boy1
+			gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
+			gs 'boystat', $boy2
+			gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
+			gs 'boystat', $boy3
+			gs 'arousal', 'bj', -5, 'gangbang', 'sub'
+			gs 'boystat', $boy4
+			gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+			gs 'stat'
+			act 'Endure':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1b.jpg"></center>'
+				'Finally stripping you naked the guys lift you up before you are pushed onto your back on top of one of the guys. Cocks surround you in a flurry as you land on top of him. Laying there on top of one of the strangers, you feel wet, lubricated fingers probing around your asshole, followed by a quick pressure as the man''s cock enters your behind with a quiet pop. His still partially dressed friend straddles your cunt, shoving himself inside of your pussy at almost the same time your ass is being filled down below. Your mouth is also quickly filled by your original client, and your empty hand is filled with another throbbing cock. You are unable to do anything but take cock in your holes, focusing on catching as many gasps of oxygen as you are allowed.'
+				'"I think we''re already wearing this bitch out," the guy who''s cock you''re holding proclaims in a frustrated huff. "Come on, fucking stroke it!" he barks, thrusting his hips into your hand. His 
+				friends all laugh at you as you struggle to find a rhythm stroking him while your throat, pussy, and ass are all being drilled by the other 3 men.'
+				'"Relax bud, we''ve got time. We''ll get our money''s worth out of this whore. Hell, we probably already did. This bitch is way underpriced!" '
+				'The men continue to banter crudely about your body and degrade your worth as if you weren''t even there, occasionally taking swigs out of a bottle they''re passing around amongst themselves.'
+				'Their insults and thrusts get much more aggressive as they continue to drink, using you as nothing more than a vessel to please their cocks. '
+				'The man fucking your ass underneath you just groans, reaching up and grabbing at your tits with rough, calloused fingers.'
+				gs 'boystat', $boy1
+				gs 'arousal', 'hj', 5, 'gangbang', 'sub'
+				gs 'boystat', $boy2
+				gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+				gs 'boystat', $boy3
+				gs 'arousal', 'anal', -5, 'gangbang', 'sub'
+				gs 'boystat', $boy4
+				gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+				gs 'stat'
+				act 'Hang on in there':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
+					'You continue to do your best to please your customers, but more and more you are feeling like this was a job you should have turned down. The conversation between the men, when not hurling
+					insults down at you, is disgusting, and if you weren''t entirely stuffed with cocks, you would definitely not hang around.'
+					'"Man, I can''t believe you''re finally getting hitched, Sergi! You can''t say we didn''t try to warn you though, being married fucking sucks!" the guy underneath you says, pushing his cock back
+					up into your ass without a moment for you to re-adjust.'
+					'"Yeah man, all that matters in life is a good buzz and some young pussy like this. I wish I would have never gotten married, either. That god damn, nagging bitch..." his friend grumbles,
+					watching his cock spread your pussy wide to accommodate his girth. It''s then that you notice the wedding band on his finger as he reaches up and squeezes your tits.'
+					'"Fuck yeah, and this is some good pussy we got here tonight boys, so let''s enjoy it!"'
+					'Your original client stands in front of you with an expectant look, as if he was getting annoyed at waiting. You open your mouth obediently and he nods, shoving his cock back inside.
+					He continues to glare at you until you begin sucking it, but once you do, he breaks eye contact and joins in the conversation with his friends.'
+					'"Well, what can I say? I knocked my old lady up, the least I can do is marry the slut, right?" he explains, casually rocking his hips back and forth, fucking your mouth as he chats on with his friends. "But don''t worry, we can still get our nights out together!'
+					'Hey, you guys remember that one bitch we fucked after the championship game? The one who''s ass we all fucked in Igor''s old pick-up truck behind the school?"'
+					'The men all laugh and pass the bottle around, reminiscing about old conquests as they continue violating your body, comparing it to other women who they''ve worked over together.'
+					'"Yeah, her tits were bigger than this slut''s, but I think this one''s got a better ass for sure."'
+					'"Nice ass, but her pussy could be a bit tighter, honestly. What can you expect out of a stripper, though? She can suck pretty good cock though, I''m sure she makes her family real proud!"'
+					'You decide right then and there that you definitely need to start charging more for this kind of treatment moving forward...'
+					gs 'boystat', $boy1
+					gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
+					gs 'boystat', $boy2
+					gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+					gs 'boystat', $boy3
+					gs 'arousal', 'anal', -5, 'gangbang', 'sub'
+					gs 'boystat', $boy4
+					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+					gs 'stat'
+					act 'They have to be close by now':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/shared/sex/dp12.jpg"></center>'
+						'You''re spun back around and again double penetrated, your mouth once more stuffed with dick. You are now riding your original client, hoping that they are starting to get close to finishing
+						so you can get out of there. Your entire body aches and tears run down your cheek, the result of a combination of being forced to gag on cocks for the last 40 minutes as well as being verbally
+						and physically humiliated.'
+						'"This bitch is going to be fuckin'' loose as hell in a few years, glad we nabbed her now!" your client says, looking up at you. But not really "at" you, more like "through" you, like one would
+						look at an object. He leans forward and takes your left nipple into his mouth, sucking and biting hard at it, causing you to squirm. "She''s a sensitive one too, god damn. I should bring her home and teach my old lady some tricks!"'
+						'The other men laugh and continue to slap, grope, and fuck your body, but you can tell they''re getting close to climax and are talking less and grunting more. Their thrusts are almost violent
+						as they hammer into you, over and over and over again.'
+						'"I think it''s time to send this one home, boys..." the man who''s cock you were stroking says, looking down at you with a wicked grin. He stands over you, stroking his red-tipped glans
+						furiously at your face as you prepare for the finale of this seriously underpaid endeavor.'
+						gs 'boystat', $boy1
+						gs 'arousal', 'anal', 5, 'gangbang', 'sub'
+						gs 'boystat', $boy2
+						gs 'arousal', 'hj', 5, 'gangbang', 'sub'
+						gs 'boystat', $boy3
+						gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+						gs 'boystat', $boy4
+						gs 'arousal', 'bj', -5, 'gangbang', 'sub'
+						gs 'stat'
+						act 'Finally':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/shared/sex/cum12.jpg"></center>'
+							'Suddenly, a massive torrent of hot, thick cum erupts from your client''s cock, spraying straight into your mouth and onto your chin. He grunts and smears his load all over your face as you feel another hot rope of jizz land on the side of your cheek and into your mouth, as well.'
+							'"Fuckin'' take those loads, you stupid bitch! Swallow it down, don''t you dare waste it, make your daddy proud!" the client''s inebriated friend blathers down at you, still laughing.
+							He leans forward, squeezing the remaining cum up from the root of his cock to the tip and cleans it on your tongue. You instinctively swallow it all, "There you go, not a drop wasted! Good girl.".'
+							'The other two men continue to piston in and out of your holes down below, tearing your pussy and ass open wildly as they buck up into you. Your tunnels are numb from the friction, but you can still feel the heat of the cocks buried inside of you as they both begin to tense and seize.'
+							'"Ahhh, fuck! I hope you''re on birth control, baby!" the man inside of your pussy groans, grabbing your hips as he unloads inside of you.'
+							'The man inside of your ass doesn''t say anything as he cums, but moans and collapses on top of you, his weight pressing the cock inside of your pussy even deeper up against your cervix. 
+							Cum pours from your pussy and ass as the men finish milking their cocks with your holes until they pull out one after another, leaving you in a semen-covered heap on the couch.'
+							'A while later, you collect the few meager rubles sitting on the table, along with your clothing, and stumble back to the break room to clean yourself up.'
+							gs 'boystat', $boy1
+							gs 'arousal', 'anal', 5, 'gangbang', 'sub'
+							gs 'boystat', $boy2
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub'
+							gs 'boystat', $boy3
+							gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+							gs 'boystat', $boy4
+							gs 'arousal', 'bj', -5, 'gangbang', 'sub'
+							gs 'cum_call', 'anus', 'Private dance client', 0, 0, 10000, 40
+							gs 'cum_call', 'face', '1st Friend of client', 0, 0, 10000, 40
+							gs 'cum_call', 'face', '2nd Friend of client', 0, 0, 5000, 40
+							gs 'cum_call', 'vagina', '3rd Friend of client', 0, 0, 5000, 40
+							gs 'cum_call', 'mouth_swallow', '2nd Friend of client', 0, 0, 5000, 40
+							gs 'cum_call', 'mouth_swallow', '3rd Friend of client', 0, 0, 5000, 40
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Return to the locker room':gt 'stwork', 'start'
+						end
+					end
+				end
+			end
+		end
 	end
 end
 
@@ -527,5 +668,104 @@ if $ARGS[0] = 'pr3':
 	end
 end
 
+if $ARGS[0] = 'pr4':
+	*clr & cla
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie1.mp4"></video></center>'
+
+	'You enter one of the private back rooms where your customer is waiting. He looks extremely nervous, fidgeting in his chair. You give him a little smile and approach him, asking him in your most seductive voice:
+	"Any special requests, hon?"'
+	'The man looks at you as you start to strip, struggling to get his words out. "N-no, please. P-please keep your clothes o-on..." he stammers.'
+	'You''re taken aback for a moment, but he continues, his courage seemingly building as he presents a handful of rubles in his clenched fist.'
+	'"C-could you just...g-grind on me? With your clothes on?" he inquires, a bead of sweat rolling down his forehead.'
+	'"Not a problem, sweetie. Sit back and try to relax", you understandingly reply. It''s a simple enough request, albeit keeping your clothes on is a bit strange for a ''strip'' club. But ultimately it just means less work for you, right?'
+	'The next 15 minutes go by rather quickly for your customer, as your simple grinding seemingly make your him climax in his pants at least 2 or 3 times. He groans and vibrates under you, but he obeys the club rules and never lays a
+	hand on your body as you rock your hips and grind your pelvis against his bulge the best you can. As the dance ends, you place a soft kiss on his cheek and stand before him, noticing the huge wet spot on the front of his pants.
+	He gives you every last bill from his wallet and thanks your profusely, telling you multiple times that he''ll never forget you.'
+
+	act 'Return to the locker room':gt 'stwork', 'start'
+end
+
+
+if $ARGS[0] = 'pr5':
+	*clr & cla
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie2.mp4"></video></center>'
+
+	'You enter the backroom where your client is supposedly waiting and hear two voices already talking from behind the door. As you enter, a fellow dancer named Katia greets you at the door with a forced smile. '
+	'"We''ve got our hands full with with this one..." she whispers to you as you step inside. Behind her, a greasy looking, overweight patron claps and wrings his hands excitedly, proclaiming, "Ah! She''s here! Now we can really
+	get the party started!"'
+	'Katia rolls her eyes subtlety to you before turning back to the man, pushing her large, fake breasts in his face. "You think you can handle both of us?" she asks, trying to remain professional around a guy she clearly
+	finds unattractive.'
+	'"Oh, I can, and so can my wallet! I am very rich, you know!" he bellows, tucking a few bills into your g-string with a hearty laugh.'
+	'The next few songs go by as you try to look sexy and alluring for the paying customer, all while touching him as little as possible. He smells like body odor and booze, and makes continuous lewd comments about your bodies.
+	A security guard steps in multiple times during the dance to remind him that he''s not allowed to touch the dancers without permission. Sometimes this job feels really gross...'
+
+	act 'Return to the locker room':gt 'stwork', 'start'
+end
+
+if $ARGS[0] = 'pr6':
+	*clr & cla
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie3.mp4"></video></center>'
+
+	'Your client is sitting alone in the largest of the private rooms, a room where private group parties are normally held. Instead, it''s just you and him in a big empty space tonight, an echo chamber full of nothing but loud music,
+	club lighting, and a bit of shared loneliness between two strangers.'
+	'The patron doesn''t say much as you grind your nude body against him, but he watches you intently. With no special requests given, you run through a typical dance routine, slinking and sliding your body over his as alluringly as 
+	possible. Once your time is up he gives you a big smile, politely thanks you for your time, and stands up, leaving the room. After he closes the door behind him and you gather your things, a security guard cracks open the door
+	and hands you a wad of cash. "This is from your client, you must have made a good impression. He wouldn''t shut up about you.  Nice work."'
+	'espite working in such a dark and sometimes depraved place, you walk back to the dressing room with your head up a little higher than before, feeling good about a job well done.'
+
+	act 'Return to the locker room':gt 'stwork', 'start'
+end
+
+if $ARGS[0] = 'pr7':
+	*clr & cla
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4.mp4"></video></center>'
+
+	'You meet your patron in one of the back rooms with a more lush setting than many of the others. Crushed red velvet curtains and mirrors line the walls, and multiple poles surround the outskirts of the room, allowing for many girls
+	to serve many customers at once. But tonight, it''s just you and one other man. You feel relatively safe knowing there a security guard right outside the door, but even still, the way the man''s eyes pierce your own makes your heart race a bit. There''s definitely more than meets the eye with this guy.'
+	'Still, you are there to do a job, and you begin to dance for him as seductively as possible. After a few minutes, he tosses a handful of bills at you and exclaims, "Let''s see some skin, girl."'
+
+	act 'Show him some skin':
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
+
+		'You peel open your shirt at the customer''s request, exposing your breasts in his direction. You sway and rock seductively around the pole, occasionally giving him a small smile and leaning in his direction. You arch your back,
+		giving him a full view of your ass.'
+		'"You like what you see, honey?" you coo in his direction. His bulge is clearly visible now, even more so as he lewdly rubs it while watching you.'
+		'"I do, and I want more. How much to get you over here to take care of this with that pretty little mouth of yours?"'
+		
+		act 'Decline':
+			*clr & cla
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
+
+			'"Sorry, no touching, hon. House rules, you know how it goes..."
+			Your customer huffs and nods, tossing a few more bills at your feet and downs the remainder of his drink.
+			"Yeah yeah, I get it. Time to get out of here and find me a whore. See ya, girl."
+			You fix your outfit and collect your earnings from the floor, watching from the corner of your eye as the man stumbles out of the door. A few minutes later, the security guard peeks in,  gives you the "all clear" 
+			sign, and you head back to the dressing room.'
+			act 'Return to the locker room':gt 'stwork', 'start'
+		end
+
+		act 'Accept':
+			*clr & cla
+			money += 200
+			killvar '$boy'
+			gs 'npcgeneratec', 0, 'Private dance client', rand(18,40)
+			gs 'boyStat', $npclastgenerated
+			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
+			gs 'cum_call', 'mouth_swallow', '$boy'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4b.mp4"></video></center>'
+
+			'You look at the customer, deciding if the risk is worth it. He''s a bit older, but seems decent enough. And he smells washed, unlike some of the guys who roll through the club.'
+			'"For you hon, 200₽. But only a quick blowjob, we don''t have a ton of time."'
+			'"Fine by me, get to work!" he says, tossing the money at you. He quickly stands, tugging his massively thick cock from his pants and dropping them to the floor. He''s already rock hard from your striptease, and per your agreement, it''s inside of your mouth within seconds. His fat cock fills every inch of space between your lips, and just taking it inside causes the swollen tip to press into the entrance of your windpipe.'
+			'After just a few minutes, the man''s entire body tenses and without warning, he unloads his cum down your throat, not even giving you a chance to spit or dodge out of the way. The man grunts as he holds your head in place, unloading every single drop of his hot, viscous cum into your mouth. When he finally releases you, you sputter and choke his thick load down your esophagus the best you can, gasping for breath. But before you can even yell at him for not giving you warning, he''s re-dressed himself and ducked out of the door.
+			"Could have warned me, asshole..." you whisper to yourself, gathering your things and heading back to the dressing room.'
+			act 'Return to the locker room':gt 'stwork', 'start'
+		end
+	end
+end
+
+
 --- stwork2 ---------------------------------
 

+ 7 - 8
locations/tatiana_lab.qsrc

@@ -94,23 +94,22 @@ if $ARGS[0] = 'Gustav':
 
 	act 'Leave':gt 'tatiana_lab', 'start'
 
-	if gustavday ! daystart:
+	if gustavday ! daystart and pcs_energy >= 20:
 		act 'Develop strength (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'stren_exp'
 		act 'Develop agility (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'agil_exp'
 		act 'Develop reactions (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'react_exp'
 		act 'Develop endurance (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'vital_exp'
+	elseif gustavday ! daystart:
+		act 'Develop strength (1:00)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Develop agility (1:00)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Develop reactions (1:00)': '<br><font color="red">You feel too hungry to do this.</font>'
+		act 'Develop endurance (1:00)': '<br><font color="red">You feel too hungry to do this.</font>'
 	end
 end
 
 if $ARGS[0] = 'GustavDevelop':
 	cla
-	timemult = 4
-	loopcount = 1
-	:timeloop
-	gs 'exercise', 'tier2', 0, $ARGS[1]
-	if loopcount < timemult: loopcount += 1 & jump 'timeloop'
-	loopcount = 0
-	timemult = 0
+	gs 'exercise', 'tier2', 60, $ARGS[1]
 	gustavday = daystart
 	'You do exercises under the guidance of Gustav.'
 

+ 6 - 16
locations/therapist.qsrc

@@ -781,9 +781,9 @@ if $ARGS[0] = 'hypnoSuck':
 	if sound = 0:PLAY 'sound/rainstorm.mp3',10 & PLAY 'sound/clock.mp3',20 & PLAY 'sound/sucking.mp3',200
 	cls
 	if PCloStyle2 = 4:
-		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolBlow<<rand(1,4)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolBlow<<rand(1,5)>>.mp4"></video></center>'
 	else
-		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoBlow<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoBlow<<rand(1,3)>>.mp4"></video></center>'
 	end
 	gs 'cum_call', 'mouth', 'A186', 2, 0, 15000, 60
 	'<font color=brown>'
@@ -838,7 +838,7 @@ if $ARGS[0] = 'hypnoFuck':
 			$hypnofuck2 = 'You cry out from the pain as he starts to fuck you, fast, deep and hard, without any regard for the fact that his girth is massive and you need some adjustment time.'
 		else
 		!ride
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolRide<<rand(1,2)>>.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolRide<<rand(1,5)>>.mp4"></video></center>'
 			$hypnofuck = '"Yes, sit on my lap, I want you to do the work for now."<br>He masturbates a little, then takes his hands away from his massive dick. "I want you to take it into your hands and lower yourself onto it. Take it deep into your pussy."<br>You do as he says. Stepping above him with spread legs then taking his massive pole into your hands, you fit his tool into the entrance of your body. You feel yourself getting wet according to <i>Master</i>''s instruction, then take a deep breath and push your body onto his pole.'
 			$hypnofuck2 = 'He grabs your hips, moving your body to the rhythm he wants you to ride him, and it is fast. Fast, deep and hard, without any regard for you or that he actually bumps into your cervix in this position. You just ride him obediently like a cowgirl.'
 		end
@@ -915,13 +915,7 @@ if $ARGS[0] = 'hypnoFuck':
 	end
 	act 'Continue':
 		cls
-		if rand(0,2) = 1:
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie1.mp4"></video></center>'
-		elseif rand(0,1) = 1:
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie3.mp4"></video></center>'
-		else
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie2.mp4"></video></center>'
-		end
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
 		'"Oh yes, my little <i>Cunt</i>, I am so close! I will blow a huge wad of sperm in your tight pussy! And you won''t even know about it!"<br><<$therapistDoneFuckingDesc0>> <<$therapistDoneFuckingDesc1>> <<$therapistDoneCumDesc1>>'
 		'Finally he is done, and he pulls out of you. <<$therapistDoneFuckingDesc3>>'
 		therapistFuckedPussyStage += 1
@@ -957,7 +951,7 @@ if $ARGS[0] = 'hypnoAnal':
 		$hypnofuck2 = 'He pounds you deep into the couch, his balls rhythmically slapping your ass as he labors above you. You feel his sweat dripping down on your tits as you spread your leg as wide as possible to give him as much access as possible.'
 	elseif randpos = 2:
 	!kneel, couch
-		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoanalcouchkneel<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoanalcouchkneel<<rand(1,3)>>.mp4"></video></center>'
 		$hypnofuck = '"Stop, just kneel on the couch. I want to fuck you from behind."<br>You turn back, kneeling on the couch and placing your hands on the backrest, and wait for <i>Master</i> to take your body. You soon feel his hands touching your breasts, your neck, your back and your legs, playing a little with your pussy.<br>"Good girl, stay like this."<br>He pushes his fingers into your ass, trying to make you more accessible, causing you to get aroused.'
 		$hypnofuck2 = 'You cry out from the pain as he starts to fuck you, fast, deep and hard, without any regard for the fact that his girth is massive and you need some adjustment time.'
 	end
@@ -970,11 +964,7 @@ if $ARGS[0] = 'hypnoAnal':
 
 	act 'Continue':
 		cls
-		if rand(0,1) = 1:
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/CreampieA1.mp4"></video></center>'
-		else
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/CreampieA3.mp4"></video></center>'
-		end
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/CreampieA<<rand(1,2)>>.mp4"></video></center>'
 		'"Oh yes, my little <i>Cunt</i>, I am so close! I will blow a huge wad of sperm in your beautiful ass! And you won''t even know about it!"<br>He finally groans, jabbing his hips deep, jetting all of his sperm as deep in your colon as he possibly can.<br>"Cum, little <i>Cunt</i>, suck all of my seed deep into your body!"'
 		'He groans, and you feel his cock contracting inside of you. "Cum, <i>Cunt</i>, cum now!" Holding your hips, he forces himself as deep into your body as possible, pushing everything he has into you, while you obey his order and orgasm on his tool. And he certainly has quite a lot to let out.'
 		'Finally, he is done, and he pulls out of you. "That was amazing, <i>Cunt</i>."'

+ 123 - 0
locations/uni_shop.qsrc

@@ -0,0 +1,123 @@
+# uni_shop
+!2021/10/27
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	*clr & cla
+	$loc = 'uni_shop'
+	$loc_arg = 'start'
+	$menu_loc = 'uni_shop'
+	$menu_arg = 'start'
+	$location_type = 'public_indoors'
+	killvar '$locclass'
+	killvar '$shoplocation'
+	menu_off = 0
+	gs 'themes', 'indoors'
+	if sound = 0:PLAY 'sound/shop.mp3',30
+	gs 'stat'
+	*clr & cla
+	'<center><b><font color="maroon">Convenience Store</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/unimarket.jpg"></center>'
+
+	if hour < 8 or hour >= 23:
+		'The store is currently closed.'
+		act 'Leave the store':minut += 2 & gt 'city_island'
+		exit
+	end
+
+	'In the store there is an <a href="exec: gt ''uni_shop'', ''atm''">ATM</a>, from which you can withdraw money from and deposit money to your bank account.'
+
+	!! output from purchase
+	if $message ! '':
+		'<center>'+$message+'</center>'
+		killvar '$message'
+	else
+		''
+	end
+	*pl '<center><table align="center" width=80%>'
+	*p func ('$stock_item', 1, 'Regular food', 80, 'eda', $curloc)
+	*p func ('$stock_item', 10, 'Regular food', 800, 'eda', $curloc)
+	*p func ('$stock_item', 10, 'Tea biscuits', 400, 'pranik', $curloc)
+	*p func ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $curloc, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*p func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc)
+	*p func ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $curloc)
+	*p func ('$stock_item', 30, 'Shampoo', 250, 'shampoo', $curloc)
+	*p '</table></center>'
+
+	act 'Leave the store':minut += 2 & gt 'city_island'
+end
+
+if $ARGS[0] = 'atm':
+	'<center><b><font color="maroon">ATM</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/store/atm.jpg"></center>'
+
+	if bankAccount = 1:
+		if karta >= 0:
+			'You have <<karta>> <b>₽</b> in your account.'
+			'You have an overdraft limit of <font color="blue"><<bankDebtLimit>></font>!'
+		else
+			'You are overdrawn by <font color="red"><<-1 * karta>> <b>₽</b></font>.'
+			'You have a remaining credit limit of <font color="blue"><<bankDebtLimit + karta>></font>!'
+		end
+
+		'<br>ATM Deposit Fee: 100 <b>₽</b>'
+
+		if atmDeposit = 0:
+			act 'Deposit money':
+				cla
+				minut += 5
+
+				kartaINATM = input ("How much money do you want to deposit into the account? Note: A service charge of 100 <b>₽</b> will be deducted from the amount deposited.")
+				if kartaINATM < 100 or kartaINATM > money:
+					'This is not a valid input.'
+				else
+					atmDeposit += kartaINATM - 100
+					atmDepositDate = daystart + 2
+					money -= kartaINATM
+					'<br>You deposit <<kartaINATM>> <b>₽</b> into your account.'
+					'It will take 2 days for funds to be available. Your new balance will be <<karta+atmDeposit>> <b>₽</b>.'
+				end
+
+				gs 'stat'
+				act 'Move away': gt 'uni_shop', 'start'
+			end
+		else
+			'<br>★ Processing deposit of <<atmDeposit>> <b>₽</b> in <<atmDepositDate - daystart>> days.'
+		end
+
+		if karta + bankDebtLimit > 0:
+			act 'Withdraw money from the ATM':
+				cla
+				minut += 5
+
+				kartaOUT = input ("How much money do you want to withdraw?")
+				if kartaOUT <= 0 or kartaOUT > karta + bankDebtLimit:
+					'<br>Invalid operation.'
+				else
+					karta -= kartaOUT
+					money += kartaOUT
+					if karta > 0:
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta>> <b>₽</b> left in your bank account.'
+					elseif karta = 0:
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have no money left in your bank account.'
+					else
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<karta>> ₽</b>.</font>'
+					end
+				end
+
+				gs 'stat'
+				act 'Move away': gt 'uni_shop', 'start'
+			end
+		else
+			'You have maxed out your overdraft.'
+		end
+	else
+		'You don''t have a bank account yet!'
+	end
+
+	act 'Move away':gt 'uni_shop', 'start'
+end
+
+--- uni_shop ---------------------------------
+

+ 1 - 1
locations/wardrobe.qsrc

@@ -339,7 +339,7 @@ if $ARGS[0] = 'default_entry_wear':
 		dynamic 'RESULT = <<$defclothingtype[default_entry]>>_b[<<defclothingnumber[default_entry]>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
 			cls
-			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping1.mp4"></video></center>')
+			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,4)>>.mp4"></video></center>')
 			'As you put on your <<$def_clothing_name[default_entry]>> outfit you notice it doesn''t fit correctly anymore. It''s ' + iif(RESULT < pcs_hips - 8,'unbearably tight and uncomfortable to wear.','extremely loose and won''t stay in place no matter how hard you try.') + ' You must have ' + iif(RESULT < pcs_hips - 8,'gained','lost') + ' some weight since this was purchased or last tailored. You will have to get this clothing resized before you can wear it again.'
 			act 'Strip out of ill-fitting clothing':
 				gs 'clothing', 'strip'

Vissa filer visades inte eftersom för många filer har ändrats