ソースを参照

merge conflict from upstream

Thavus 2 年 前
コミット
dc3f4b7e24
100 ファイル変更5334 行追加2050 行削除
  1. 5 5
      glife.qproj
  2. 1 1
      locations/Cheatmenu_din.qsrc
  3. 1 1
      locations/FedorEv4.qsrc
  4. 2 2
      locations/FedorMisc.qsrc
  5. 2 2
      locations/HotelHole.qsrc
  6. 4 4
      locations/Komp.qsrc
  7. 1 1
      locations/LariskaGo.qsrc
  8. 0 1
      locations/MagEncounterFairy.qsrc
  9. 1 0
      locations/NatBelGo.qsrc
  10. 3 3
      locations/NikoEv2.qsrc
  11. 1 1
      locations/NikoWhore.qsrc
  12. 1 1
      locations/_attributes_scandalicious_swim_two.qsrc
  13. 6 1
      locations/abduction.qsrc
  14. 68 3
      locations/albina_school_sex.qsrc
  15. 4 16
      locations/albina_starlets.qsrc
  16. 2 2
      locations/albina_starlets_aftermath.qsrc
  17. 10 23
      locations/albinahome.qsrc
  18. 26 26
      locations/alexandriaEv.qsrc
  19. 1 3
      locations/anushapt.qsrc
  20. 4 4
      locations/anushaptbr.qsrc
  21. 236 39
      locations/anushkaev1.qsrc
  22. 54 0
      locations/arousal.qsrc
  23. 2 2
      locations/bass.qsrc
  24. 1 1
      locations/bed2.qsrc
  25. 8 12
      locations/bedrPar.qsrc
  26. 10 8
      locations/bedrPar2.qsrc
  27. 1 5
      locations/beg.qsrc
  28. 10 25
      locations/beg1.qsrc
  29. 2 2
      locations/brother_voyeur.qsrc
  30. 96 55
      locations/budgetclothes.qsrc
  31. 2 2
      locations/cafe_parco.qsrc
  32. 3 3
      locations/camera.qsrc
  33. 2 0
      locations/cikl.qsrc
  34. 1 1
      locations/city_church.qsrc
  35. 1 1
      locations/city_industrial_train.qsrc
  36. 2 0
      locations/city_island.qsrc
  37. 3 1
      locations/city_mansion_residence_1.qsrc
  38. 24 2
      locations/city_market.qsrc
  39. 51 49
      locations/city_park.qsrc
  40. 7 7
      locations/city_redlight.qsrc
  41. 5 1
      locations/city_sauna.qsrc
  42. 1136 474
      locations/clothing.qsrc
  43. 579 151
      locations/clothing_QV.qsrc
  44. 46 42
      locations/crossfit_north_box.qsrc
  45. 2 0
      locations/dachain.qsrc
  46. 53 46
      locations/danceclass.qsrc
  47. 4 4
      locations/ender.qsrc
  48. 3 3
      locations/etoexhib.qsrc
  49. 83 67
      locations/exercise.qsrc
  50. 32 16
      locations/exhibitionistshop.qsrc
  51. 6 17
      locations/family.qsrc
  52. 175 87
      locations/family_schedule.qsrc
  53. 1 1
      locations/fathersex.qsrc
  54. 104 156
      locations/fit.qsrc
  55. 6 0
      locations/flash.qsrc
  56. 4 19
      locations/food.qsrc
  57. 5 0
      locations/gadbana.qsrc
  58. 2 1
      locations/gadfield.qsrc
  59. 1 1
      locations/gdksex.qsrc
  60. 51 79
      locations/gdksport.qsrc
  61. 1 1
      locations/gdktoilet_womens.qsrc
  62. 1 1
      locations/gkafe.qsrc
  63. 5 1
      locations/gschool_chats1.qsrc
  64. 16 24
      locations/gschool_cheerleading.qsrc
  65. 1 1
      locations/gschool_events.qsrc
  66. 1 2
      locations/gschool_grounds.qsrc
  67. 256 165
      locations/gschool_lessons4.qsrc
  68. 4 4
      locations/gschool_lessonsev1.qsrc
  69. 1 1
      locations/gschool_lunch.qsrc
  70. 1701 0
      locations/gschool_post_shower.qsrc
  71. 2 6
      locations/gschool_sex.qsrc
  72. 29 25
      locations/gschool_socialchg1.qsrc
  73. 1 1
      locations/hotel_anna.qsrc
  74. 3 22
      locations/hotel_anna_gear.qsrc
  75. 61 61
      locations/hotel_work.qsrc
  76. 81 0
      locations/kafesvid.qsrc
  77. 2 0
      locations/katjaEv.qsrc
  78. 5 3
      locations/kinosvid.qsrc
  79. 27 53
      locations/korrPar.qsrc
  80. 25 15
      locations/kuhrPar.qsrc
  81. 1 1
      locations/lariska_storyline.qsrc
  82. 0 60
      locations/lezbsex.qsrc
  83. 0 3
      locations/liam.qsrc
  84. 1 1
      locations/love.qsrc
  85. 1 1
      locations/lover_pref.qsrc
  86. 33 16
      locations/moncheri.qsrc
  87. 5 7
      locations/mother.qsrc
  88. 2 2
      locations/music_delparco.qsrc
  89. 6 3
      locations/npcstatic2.qsrc
  90. 22 5
      locations/npcstatic5.qsrc
  91. 38 41
      locations/nyp_school.qsrc
  92. 3 3
      locations/obj_din.qsrc
  93. 9 9
      locations/olu.qsrc
  94. 3 1
      locations/park_walkevents.qsrc
  95. 0 3
      locations/pav_commercial.qsrc
  96. 0 3
      locations/pav_complex.qsrc
  97. 24 16
      locations/pav_disco_coolkids.qsrc
  98. 1 1
      locations/pav_disco_gopniks.qsrc
  99. 0 3
      locations/pav_industrial.qsrc
  100. 5 5
      locations/pav_library.qsrc

+ 5 - 5
glife.qproj

@@ -431,7 +431,6 @@
 	</Folder>
 	<Folder name="Family">
 		<Location name="family_schedule"/>
-		<Location name="seeparentsex"/>
 		<Location name="father"/>
 		<Location name="fathersex"/>
 		<Location name="dinfather"/>
@@ -672,6 +671,7 @@
 		<Location name="gschool_chats1"/>
 		<Location name="gschool_chats2"/>
 		<Location name="gschool_chats3"/>
+		<Location name="gschool_post_shower"/>
 		<Location name="nogorslut"/>
 		<Location name="yesgorslut"/>
 		<Location name="bbgamein"/>
@@ -761,7 +761,7 @@
 		<Location name="NatBelGo"/>
 	</Folder>
 	<Folder name="Albina">
-		<Location name="albinaRide"/>
+		<Location name="albina_starlets_aftermath"/>
 		<Location name="albinahome"/>
 		<Location name="albina_chat"/>
 		<Location name="albina_lazar_sex"/>
@@ -769,7 +769,7 @@
 		<Location name="albina_house_events"/>
 		<Location name="albina_mother_events"/>
 		<Location name="albina_election_events"/>
-		<Location name="AlbStars"/>
+		<Location name="albina_starlets"/>
 	</Folder>
 	<Folder name="Lariska">
 		<Location name="LariskaStart"/>
@@ -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"/>
@@ -1102,7 +1103,7 @@
 		<Location name="HotelHole"/>
 		<Location name="hotel_resep"/>
 		<Location name="HotelAdmin"/>
-		<Location name="HotelWork"/>
+		<Location name="hotel_work"/>
 		<Location name="HotelRoom"/>
 		<Location name="hotel_anna"/>
 		<Location name="hotel_anna_gear"/>
@@ -1148,7 +1149,6 @@
 		<Location name="city_suburbs"/>
 		<Location name="din_pav"/>
 		<Location name="shop_fancy_pancy"/>
-		<Location name="shop_skuas"/>
 		<Location name="shop_tsar_bomba"/>
 	</Folder>
 	<Folder name="OldTownHome">

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -1517,7 +1517,7 @@ $cheatmenu['documents'] = {
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
 	if storyline = 1 and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
-	if func('uniutil', 'diploma', 'obtained'):
+	if university['diploma'] > 0:
 		'You already have a Diploma'
 	else
 		'<a href="exec:gs ''uniutil'', ''diploma'', ''set_obtained'' & dynamic $cheatmenu[''documents'']">Get Diploma</a>'

+ 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'

+ 2 - 2
locations/FedorMisc.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'Fedor Chat':
 	end
 
 	if pcs_hairbsh = 0:
-		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
+		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb'', <<ARGS[1]>>">comb</a>.'
 	end
 
 	if npc_grupTipe['A5'] = 5:'Fedor is an outcast in school, and doesn''t have anyone to sit with during lunch.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'Comb':
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 
-	act 'Move away':gt $loc, $loc_arg
+	act 'Move away':gt $loc, $loc_arg, ARGS[1]
 end
 
 if $ARGS[0] = 'Locker Room':

+ 2 - 2
locations/HotelHole.qsrc

@@ -159,7 +159,7 @@ if maidqw >= 1 and hour >= 16 and hour < 17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth'+rand(0,5)+'.jpg"></center>'
 			'You sit down in the locker room and look at the maid uniform. You run your hands over the delicate fabric while you think: "Hmm, it''s a bit skimpy. I bet that''s why the hotel manager thinks this is important, the guests probably love seeing the maids like this!"'
 			'You quickly take off your own clothes, and put the maid uniform on as instructed. After a few quick poses in the mirror you''re convinced: the manager is a pervert! Then again, it does look cute on you. All you have to is clean and prepare rooms for guests... why not look good while you do?'
-			act'Get to work':workmaid += 1 & gt'hotelwork','maid'
+			act'Get to work':workmaid += 1 & gt'hotel_work','maid'
 		end
 	end
 end
@@ -176,7 +176,7 @@ end
 
 if maidtime > 0: act'Collect your salary': hotelcollect = 1 & gt'hotel_resep'
 
-if hotelcouple = 2 and week=4 and hour >=20 and hour <23 and hcday ! daystart: act 'Go visit the couple in room 207': gt 'HotelWork','hotcouple'
+if hotelcouple = 2 and week=4 and hour >=20 and hour <23 and hcday ! daystart: act 'Go visit the couple in room 207': gt 'hotel_work','hotcouple'
 
 if hour = 20 and IgorevnaBDSM >= 5 and IgorevnaBDSM < 9 and week < 3 and AnnaQW['daystart'] ! daystart:
 	act 'Look for Anna':AnnaQW['daystart'] = daystart & gt 'hotel_anna', 'meeting'

+ 4 - 4
locations/Komp.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'porno':
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
 
 		act '<B>Close the browser</B>':gt 'komp','start'
-	elseif sisterHere > 0 and sisboytrio = 0 and $loc = 'bedrPar':
+	elseif anyaloc['inroom'] = 1 and sisboytrio = 0 and $loc = 'bedrPar':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
 
@@ -594,7 +594,7 @@ if $ARGS[0] = 'mfc':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
 		'It''s that time of the month! You feel sick to your stomach and the cramps hurt pretty badly from time to time... you''re in no condition to earn money showing off your body.'
 		act 'Leave this website':gt 'komp','brows'
-	elseif sisterHere = 0 or $loc ! 'bedrPar':
+	elseif anyaloc['inroom'] = 0 or $loc ! 'bedrPar':
 		act 'Go to your MFC homepage':
 			*clr & cla
 			minut += 2
@@ -614,7 +614,7 @@ if $ARGS[0] = 'mfc':
 			gs 'stat'
 			gt 'komp','brows'
 		end
-	elseif sisterHere > 0 and $loc = 'bedrPar':
+	elseif anyaloc['inroom'] = 1 and $loc = 'bedrPar':
 		*clr & cla
 		minut += 2
 		topmfc = 1
@@ -1731,7 +1731,7 @@ if $ARGS[0] = 'waitclients':
 			act'Continue':gt'komp','waitclients'
 		end
 	end
-	if sisterHere > 0 and $loc = 'bedrPar':
+	if anyaloc['inroom'] = 1 and $loc = 'bedrPar':
 		*clr & cla
 		topmfc = 1
 		backmfc = 1

+ 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 - 0
locations/NatBelGo.qsrc

@@ -11,6 +11,7 @@ act 'Go with Natasha':
 	*clr & cla
 	minut += 15
 	NatbelQW['VisitedHome'] = 1
+	NatashaLoc = 2
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'

+ 3 - 3
locations/NikoEv2.qsrc

@@ -653,7 +653,7 @@ if $ARGS[0] =  'Diner 1':
 								
 								act 'Listen to them':	
 									*clr & cla
-									exhibition_exp += 2
+									inhib_exp += 2
 									minut += 5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
@@ -672,14 +672,14 @@ if $ARGS[0] =  'Diner 1':
 									act 'Suck their dicks':	
 										*clr & cla
 										gs 'clothing', 'strip'
-										exhibition_exp += 1
+										inhib_exp += 1
 										gs'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/1.jpg"></center>'
 										'You begin obediently sucking the man''s dick, knowing that it is too late to go back now. You close your eyes and try to focus on how warm the man''s dick is in your mouth when the man suddenly groans and pulls out of your mouth then covers your face in his cum. Another man quickly takes his place as the man behind you grabs your head then pulls it toward his dick which you immediately wrap your lips around, sucking eagerly, knowing the sooner they cum, the sooner you can leave. The men begin talking to each other.'
 
 										act 'Listen to what they say':	
 											*clr & cla
-											exhibition_exp += 1
+											inhib_exp += 1
 											minut -= 10
 											gs'stat'									
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/2.jpg"></center>'

+ 1 - 1
locations/NikoWhore.qsrc

@@ -446,7 +446,7 @@ if $ARGS[0] = 'Exposed':
 									
 									act 'Ride Radomir Popov''s cock':
 										*clr & cla
-										inhib_exp = 5
+										inhib_exp += 5
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock1.mp4"></video></center>'
 										'You can feel Radomir''s penis enter your vagina causing a jolt of pressure as your weight pushes his cock completely inside of you. Knowing that it is too late to go back, you begin riding Radomir. You can hear the boys cheering as they enjoy the show. You can still see Pauline recording you and the other girls cheering with malicious smirks on their faces.'

+ 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.'

+ 68 - 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,70 @@ 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 ---------------------------------
 

+ 4 - 16
locations/AlbStars.qsrc → locations/albina_starlets.qsrc

@@ -1,4 +1,4 @@
-# AlbStars
+# albina_starlets
 !2021/05/06
 
 !! If Sveta is not a cool kid or jock
@@ -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
@@ -1513,4 +1501,4 @@ if $ARGS[0] = 'Quit':
 	act 'Leave':AlbinaQW['StarletsJoined'] = -2 & gt 'pav_commcenter'
 end
 
---- AlbStars ---------------------------------
+--- albina_starlets ---------------------------------

+ 2 - 2
locations/albinaRide.qsrc → locations/albina_starlets_aftermath.qsrc

@@ -1,4 +1,4 @@
-# albinaRide
+# albina_starlets_aftermath
 !!Sveta encounters Albina a few days after speaking with Chernov, with different dialogue depending on whether Sveta gave a statement or not.
 
 frost = 0
@@ -37,4 +37,4 @@ act 'Get in':
 	act 'Go with Albina':gt 'albina_house_events', 'start'
 end
 
---- albinaRide ---------------------------------
+--- albina_starlets_aftermath ---------------------------------

+ 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>'

+ 1 - 3
locations/anushapt.qsrc

@@ -1978,9 +1978,7 @@ if $ARGS[0] = 'nushlivroom':
 				'You give her a grin. "I was thinking about fucking you with it, or maybe having you fuck me with it? With nobody home, it would be a crime to waste the freedom it gives us."'
 				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I will fuck your tight little asshole until you scream for me."'
 				act 'Fuck her': gt 'anushkaev1', 'couch_strapon_give'
-				if pcs_vag ! 0:
-					act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get'
-				end
+				act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get'
 			else
 				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice." she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
 				act 'Watch the show with her':

+ 4 - 4
locations/anushaptbr.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'brotherroom':
 			act 'Sit down and play':
 				*clr & cla
 				minut += 15
-				gaming_exp =+ rand(1,3)
+				gaming_exp += rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
 				'The brothers turn away from you and start whispering amongst themselves. They must be planning something.'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'brotherroom':
 					act 'Deal':
 						*clr & cla
 						minut += 20
-						gaming_exp =+ rand(1,3)
+						gaming_exp += rand(1,3)
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimplay.jpg"></center>'
 						if pcs_gaming <= 40:
@@ -339,7 +339,7 @@ if $ARGS[0] = 'rematch':
 		act 'Sit down and play':
 			*clr & cla
 			minut += 15
-			gaming_exp =+ rand(1, 3)
+			gaming_exp += rand(1, 3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
 			'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
@@ -400,7 +400,7 @@ if $ARGS[0] = 'rematch':
 		'Maksim looks mad at that. "Just shut up and play!" Anushka just laughs again and mimics what he said in a mutter that taunts him.'
 		act 'Play':
 			*clr & cla
-			gaming_exp =+ rand(1,3)
+			gaming_exp += rand(1,3)
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'

+ 236 - 39
locations/anushkaev1.qsrc

@@ -20,7 +20,6 @@ if $ARGS[0] = 'strapon1':
 			'You pull out the strap-on harness and hold it up. "Yeah, I like this..."'
 			'Her eyes widen ever so slightly. You can tell that just turned her on. "Just what do you plan to do with that?"'
 		end
-!!double check code and delete this note afterwards this should block the following if Sveta is a virgin
 		if domnush >= -50 and pcs_vag ! 0:
 			act 'Take turns':
 				*clr & cla
@@ -32,16 +31,24 @@ if $ARGS[0] = 'strapon1':
 				act 'Strapon fun': gt 'anushkaev1', 'bedstrapongive'
 			end
 		end
-!!double check code and delete this note afterwards this should block the following if Sveta is a virgin
-		if domnush <= 50 and pcs_vag ! 0:
+		if pcs_vag ! 0:
 			act 'Fuck me':
 				*clr & cla
 				nushstrapon = 1
 				domnush -= 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/fuckme.jpg"></center>'
-				'You feel slightly aroused as you hand the strap-on over to Anushka. "Maybe you could wear it and show me what you can do with it?"'
-				'She takes it and points at it as she looks at you. "So you want me to wear this and fuck you silly with it, huh?"'
-				'You nod your head, thinking you already made that clear, and she grins.'
+				if domnush >= 100:
+					'As you walk up behind her, she wiggles her butt suggestively at you. Smiling your reach over a slap her ass hard enough to make her yelp a little. "Not today, today I want you to give me a good fucking."'
+					'She spins around and flops down sitting on the bed, with a arched brow, obviously a little surprised. But you see her smile devious, as you hand over the strap on. "Ok one hard fucking coming up."'
+				elseif domnush <= -50:
+					'You bite your lower lip, walk over, and hand the strapon to her. "Yes... I want you to fuck me again."'
+					'Her grin widens a bit more. "Beg me to fuck you like the little slut you are." She says in a somewhat commanding tone of voice.'
+					'You look down unable to meet her eyes. "Please fuck me, fuck me like the little slut I am."'
+				else
+					'You feel slightly aroused as you hand the strap-on over to Anushka. "Maybe you could wear it and show me what you can do with it?"'
+					'She takes it and points at it as she looks at you. "So you want me to wear this and fuck you silly with it, huh?"'
+					'You nod your head, thinking you already made that clear, and she grins.'
+				end
 				act 'You asked for it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme1.jpg"></center>'
@@ -70,7 +77,7 @@ if $ARGS[0] = 'strapon1':
 								gs 'stat'
 								act 'Face sitting':
 									*clr & cla
-									domnush = -1
+									domnush -= 1
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme5.jpg"></center>'
 									'Once she has you soaking wet, she crawls up on the bed, straddling your face, and eases down until her pussy is against your face. You start licking her in return, hearing her soft moans of pleasure just turns you on even more.'
 									gs 'arousal', 'cuni_give', 5, 'lesbian'
@@ -119,7 +126,7 @@ if $ARGS[0] = 'strapon1':
 												end
 												act 'Let her':
 													*clr & cla
-													domnush -1
+													domnush -= 1
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
 													if analplugin = 1:
 														analplugin = 0
@@ -163,7 +170,7 @@ if $ARGS[0] = 'strapon1':
 													end
 													act 'Let her pound you':
 														*clr & cla
-														domnush -1
+														domnush -= 1
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme10.jpg"></center>'
 														'She starts really hammering your ass and you grip the bed sheets tightly in your hands, unsure if the pleasure or pain is winning out at this point. Your moans of pleasure are turning more and more into groans of pain.'
 														*nl
@@ -204,11 +211,155 @@ if $ARGS[0] = 'strapon1':
 				end
 			end
 		end
-		if domnush >= -50 or pcs_vag = 0:
+		act 'Fuck my ass':
+			*clr & cla
+			nushstrapon = 1
+			domnush -= 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/fuckme.jpg"></center>'
+			if domnush >= 100:
+				'As you walk up behind her, she wiggles her butt suggestively at you. Smiling your reach over a slap her ass hard enough to make her yelp a little. "Not today, today I want you to fuck my butt."'
+				'She spins around and flops down sitting on the bed, with a arched brow, obviously a little surprised. But you see her smile devious, as you hand over the strap on. "Ok one hard butt fucking coming up."'
+			elseif domnush <= -50:
+				'You bite your lower lip, walk over, and hand the strapon to her. "Yes... I want you to butt fuck me."'
+				'Her grin widens a bit more. "You are such a dirty little whore, a complete butt slut, tell me how much of a butt slut you are." She says in a somewhat commanding tone of voice.'
+				'You look down unable to meet her eyes. "I''m a dirty little butt slut, I loved getting my ass ploughed."'
+			else
+				'You feel slightly aroused as you hand the strap-on over to Anushka. "Maybe you could wear it and show me what you can do with it?"'
+				'She takes it and points at it as she looks at you. "So you want me to wear this and fuck you silly with it, huh?"'
+				'You nod your head, thinking you already made that clear, and she grins.'
+			end
+			act 'You asked for it':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme1.jpg"></center>'
+				'She then suddenly grabs you and shoves you back on the bed, nearly shoving the dildo in your face. "Careful what you ask for because I am going to turn you into my little bitch!"'
+				gs 'arousal', 'foreplay', 3, 'lesbian'
+				gs 'stat'
+				act 'Kiss':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme2.jpg"></center>'
+					'Before you can even respond, she sits the harness to the side, leans forward and starts kissing you. Surprised for a moment, you quickly give into the kiss and return the passion.'
+					gs 'arousal', 'foreplay', 3, 'lesbian'
+					gs 'stat'
+					act 'Get naked':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme3.jpg"></center>'
+						'As the kiss continues, she starts undressing you. She pulls your top off, revealing your breasts, then pulls your bottoms off. Once she''s done, you help her strip down as well, though she stops once she''s in her underwear.'
+						gs 'arousal', 'foreplay', 3, 'lesbian'
+						gs 'stat'
+						act 'Lie back':
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme4.jpg"></center>'
+							'She pushes you back on the bed and you spread your legs, giving her easy access to your pussy. She leans over and starts to lick your clit almost at once. She licks, sucks, kisses and nips at your clit, slowly working her tongue inside of your pussy where she tongue fucks you. As she does, she finishes pulling her own clothes off.'
+							gs 'arousal', 'cuni', -10, 'lesbian'
+							gs 'stat'
+							act 'Face sitting':
+								*clr & cla
+								domnush -= 1
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme5.jpg"></center>'
+								'Once she has you soaking wet, she crawls up on the bed, straddling your face, and eases down until her pussy is against your face. You start licking her in return, hearing her soft moans of pleasure just turns you on even more.'
+								gs 'arousal', 'cuni_give', 5, 'lesbian'
+								gs 'stat'
+								act 'Suck this':
+									*clr & cla
+									gs 'boyStat', 'D3'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme6.jpg"></center>'
+									'Several minutes go by before she climbs off your face and grabs the harness, quickly sliding it on. After making sure it is securely in the place, she grabs you by the hair and pulls your face over the dildo. "Suck my dick slut."'
+									'You obediently open your mouth and take the <<dick>>cm <<$dick_girth>> dildo in your mouth. She mostly lets you control how deep you take it, although she pushes it a bit deeper a few times, making you gag a little.'
+									gs 'arousal', 'bj', 5, 'lesbian'
+									gs 'stat'
+									act 'Get fucked':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
+										'Once she gets bored of you sucking the dildo, she flips your ass towards her.'
+										domnush -= 1
+										if analplugin = 1:
+											analplugin = 0
+											'She straddles your thighs to get a better position, then starts pulling on your butt plug. As you glance back, you see a huge grin on her face. "You won''t be needing this for a while..." she says as she pulls it free and shows it to you.'
+										else
+											'She straddles your thighs to get a better position and uses her hands to spread your asscheeks. As you glance back, you see a huge grin on her face. She obviously loves the idea of fucking you in the ass.'
+										end
+										'Her hips slam against your ass, slowly pushing you forward until you are on your stomach. After a few more strokes, she pulls out and you feel the tip of the dildo press against your asshole...'
+										*nl
+										'You feel the tip of the wet dildo press against your asshole. The pressure builds up until the head pops inside of you and she slowly slides the whole <<dick>>cm <<$dick_girth>> dildo balls deep in your ass, causing you to wince and moan in a mixture of pleasure and pain. She slowly starts fucking your ass, building up a little speed with each stroke before she really starts to pound your ass hard and it is starting to hurt.'
+										gs 'arousal', 'anal_strap', 5, 'lesbian'
+										gs 'stat'
+										act 'Not so rough':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme10.jpg"></center>'
+											'She starts really hammering your ass and you grip the bed sheets tightly in your hands, unsure if the pleasure or pain is winning out. "Not so rough!" you moan between grunts of pain.'
+											*nl
+											'Her response is to slam the full length of the dildo into your ass. She leans forward and puts her lips to your ear. "Shut your fucking mouth slut!" She doesn''t relent with the pounding, but despite the roughness, you feel your pleasure building.'
+											*nl
+											temporgasm = orgasm
+											$orgasm_txt = 'You are overwhelmed by the wild excitement of Anushka pounding your tight little asshole. Despite the pain, the pleasure begins to overwhelm you, and unable to take it anymore, you cry out in pleasure as waves of pleasure come crashing over you. You wither in ecstasy underneath her as she keeps pounding your ass until your shuddering stops.'
+											gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
+											if temporgasm = orgasm: 'You are so close but you just can''t cum, you don''t know why you can''t cum but you can''t. You wither around faking a orgasm and then pull away from her. She gives you a look and you think she knows you just faked it, but she doesn''t say anything.'
+											killvar 'temporgasm'
+											gs 'arousal','end'
+											gs 'stat'
+											act 'Afterglow':
+												*clr & cla
+												minut += 3
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme11.jpg"></center>'
+												'Finally, sweating and panting, she pulls out of you and collapses against you and you feel the wet and sticky dildo pressing against your asscheeks. She kisses and nibbles your ear a little as she whispers "You okay? You sounded like you were really enjoying it."'
+												*nl
+												'You laugh and nod. "Yeah, but my ass fucking hurts."'
+												'She giggles. "Well, I guess you need more practice at being an anal whore than. Don''t worry. By the time I am done with you, you''ll barely notice when a guy sticks his dick in there."'
+												*nl
+												'You roll your eyes. "Thanks, I think I would rather you left my asshole intact if you don''t mind." The two of you laugh and you lie against each other for a few minutes before she finally gets up and starts to get cleaned up and dressed, and you do the same.'
+												gs 'arousal', 'foreplay', 3, 'lesbian'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Get dressed':gt 'anushapt','anushroom'
+											end
+										end
+										act 'Let her pound you':
+											*clr & cla
+											domnush -= 1
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme10.jpg"></center>'
+											'She starts really hammering your ass and you grip the bed sheets tightly in your hands, unsure if the pleasure or pain is winning out at this point. Your moans of pleasure are turning more and more into groans of pain.'
+											*nl
+											'She takes note of your change and her response is to pull nearly completely our of your ass, before slamming the full length of the dildo balls deep into your ass. She leans forward and puts her lips to your ear. "Tell me that I own you, tell me your asshole is mine to as do with as I please!"'
+											*nl
+											'You grunt out. "I''m yours, my asshole belong to you, to do with as you please." She doesn''t relent with the pounding, if anything she starts fucking you even harder and faster, if that is possible. Despite the roughness, you feel your pleasure building, something about her treating you like a piece of meat just there for her pleasure arouses you.'
+											*nl
+											temporgasm = orgasm
+											$orgasm_txt = 'You are overwhelmed by the wild excitement of Anushka pounding your tight little asshole. Despite the pain, the pleasure begins to overwhelm you, and unable to take it anymore, you cry out in pleasure as waves of pleasure come crashing over you. You wither in ecstasy underneath her as she keeps pounding your ass until your shuddering stops.'
+											gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
+											if temporgasm = orgasm: 'You are so close but you just can''t cum, you don''t know why you can''t cum but you can''t. You wither around faking a orgasm and then pull away from her. She gives you a look and you think she knows you just faked it, but she doesn''t say anything.'
+											killvar 'temporgasm'
+											gs 'arousal','end'
+											act 'Afterglow':
+												*clr & cla
+												minut += 3
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme11.jpg"></center>'
+												'She keeps it up, finally, sweating and panting, you hear her breathing quickening and her thrusts become more urgent. "Oh fuck, oh fuck... I''m about to cum." Then she suddenly cries out and collapses on top you, you feel her body shaking as she has a orgasm from fucking you with a strapon. Several moments ass before she pulls out of you and collapses on the bed next to you. "Oh my god that was amazing, I didn''t know I could orgasm so hard from wearing one of these."'
+												*nl
+												'You laugh a bit. "Well good for you, but my ass fucking hurts now."'
+												'She giggles. "Well, I guess you need more practice at being an anal whore than. Don''t worry. By the time I am done with you, you''ll barely notice when a guy sticks his dick in there."'
+												*nl
+												'You roll your eyes. "Thanks, I think I would rather you left my asshole intact if you don''t mind." The two of you laugh and you lie against each other for a few minutes before she finally gets up and starts to get cleaned up and dressed, and you do the same.'
+												gs 'arousal', 'foreplay', 3, 'lesbian'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Get dressed':gt 'anushapt','anushroom'
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+		if domnush > -50:
 			act 'I''m going to fuck you with it':
 				*clr & cla
 				nushstrapon = 1
-				domnush +1
+				domnush += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/fucknush.jpg"></center>'
 				'You hold up the harness, letting the dildo hang between your face and hers. "Well, I was thinking of strapping this thing on and fucking you silly with it."'
 				'You can tell by her expression that she got a little turned on by that. "Is that so?"'
@@ -242,7 +393,7 @@ if $ARGS[0] = 'strapon1':
 									gs 'stat'
 									act 'Let her finish':
 										*clr & cla
-										domnush = -1
+										domnush -= 1
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush5.jpg"></center>'
 										'Not wanting to interrupt her fun, you let her keep riding you. With the dildo buried balls deep in her twat, she keeps riding it and starts crying out. "Yes, yes, fuck yes!" Then she finally collapses onto of you, as she cries out, you feel her wetness from her orgasm on your skin and her muscles spasm and quiver as she lays onto of you. Once the orgasm passes she slowly raises up with a huge grin on her face. "Fuck I needed that."'
 										gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
@@ -258,7 +409,7 @@ if $ARGS[0] = 'strapon1':
 										end
 										act 'Make her eat you out':
 											*clr & cla
-											domnush = +1
+											domnush += 1
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush9.jpg"></center>'
 											'She rolls off you, you see the wet dildo slide out of her. She lays next to you with a blissful sigh of contentment. But you havn''t got yours yet and you are going to. You pull off the harness and toss it aside before looking at her, legs spread. "Eat me, bitch!"'
 											'She giggles and crawls over, placing her face between your legs. She starts eating you out, her tongue darting around perfectly. The girl really knows how to eat pussy.'
@@ -301,7 +452,7 @@ if $ARGS[0] = 'strapon1':
 											gs 'stat'
 											act 'Make her eat you out':
 												*clr & cla
-												domnush = +1
+												domnush += 1
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush9.jpg"></center>'
 												'Once she is finished, you pull the dildo out of her. She falls forward on the bed and then rolls over onto her back as you take off the harness and toss it aside. But you havn''t got yours yet, so you lay back and spread you legs wide. "Come over here and eat my pussy bitch."'
 												'She giggles and crawls over, placing her face between your legs. She starts eating you out, her tongue darting around perfectly. The girl really knows how to eat pussy.'
@@ -345,7 +496,7 @@ if $ARGS[0] = 'strapon1':
 											if will_cost <= pcs_willpwr:
 												act 'Punish that ass (<<will_cost>> Willpower)':
 													*clr & cla
-													domnush = +1
+													domnush += 1
 													gs 'willpower', 'pay', 'force'
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush8.jpg"></center>'
 													'You push her hand away as you pull back until the dildo slides out of her ass. She drops her hand back down on the bed, but once she does, you push the tip against her gaping asshole and then shove it in balls deep, which causes her to cry out a little.'
@@ -381,7 +532,7 @@ if $ARGS[0] = 'strapon1':
 													end
 													act 'Make her eat you out':
 														*clr & cla
-														domnush = +1
+														domnush += 1
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush9.jpg"></center>'
 														'But you havn''t got yours yet, you look at her, as you lay back and spread your legs. "Eat me, bitch!"'
 														'She giggles and crawls over, placing her face between your legs. She starts eating you out, her tongue darting around perfectly. The girl really knows how to eat pussy.'
@@ -423,7 +574,7 @@ if $ARGS[0] = 'strapon1':
 											end
 											act 'Ease up':
 												*clr & cla
-												domnush = -1
+												domnush -= 1
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush7.jpg"></center>'
 												'You take the hint and back off. After you slow down a little, she starts moaning louder. "Oh god yes, fuck yes! Fuck my ass, fuck it!" Shortly after, she has a massive orgasm that leaves her withering on the bed.'
 												temporgasm = orgasm
@@ -454,7 +605,7 @@ if $ARGS[0] = 'strapon1':
 												end
 												act 'Make her eat you out':
 													*clr & cla
-													domnush = +1
+													domnush += 1
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapnush9.jpg"></center>'
 													'But you havn''t got yours yet, you look at her, as you lay back and spread your legs. "Eat me, bitch!"'
 													'She giggles and crawls over, placing her face between your legs. She starts eating you out, her tongue darting around perfectly. The girl really knows how to eat pussy.'
@@ -508,7 +659,7 @@ if $ARGS[0] = 'strapon1':
 			act 'You''re my bitch':
 				*clr & cla
 				nushstrapon = 1
-				domnush = +1
+				domnush += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush1.jpg"></center>'
 				if domnush >= 100:
 					'You reach over and strip off her top as you say. "I going to strap this in place and fuck you like the slut you are."'
@@ -593,7 +744,7 @@ if $ARGS[0] = 'domnush_fuckpussy':
 		gs 'stat'
 		act 'Let her finish':
 			*clr & cla
-			domnush = -1
+			domnush -= 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 			'You keep it up, until finally, with both of you sweating and panting, you hear her breathing quickening and your thrusts become more urgent. "Oh fuck, oh fuck... I''m about to cum." She says, just before she suddenly cries out and collapses face first on the bed. You follow her down and keep fucking her, you feel her body shaking underneath you, as she has a orgasm from fucking you just gave her with a strapon.'
 			temporgasm = orgasm
@@ -640,7 +791,7 @@ if $ARGS[0] = 'domnush_fuckass1':
 		gs 'stat'
 		act 'Pound that ass':
 			*clr & cla
-			domnush = +1
+			domnush += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush8.jpg"></center>'
 			'You tighten your grip on her hips with your hands and keep pounding her butt hard and fast. After a bit you hear her sucking in breath sharply. "Ok... fuck can you stop... it is really starting to hurt..."'
 			'You are trying to focus on your own building orgasm and her talking is distracting you from it. "Shut up slut, I''m almost there, just a couple of more minutes." You tell her as you adjust your strokes trying to get the harness to rub your clit as much as possible.'
@@ -695,7 +846,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 	*clr & cla
 	menu_off = 1
 	AnushkaLoc = 2
-	domnush = +1
+	domnush += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
 	'You decide it will be more fun for both of you, if you use plenty of lube. You squirt a generous amount on the dildo and stroke it several times, working the lube the length of the shaft. She looks back over her shoulder at you and notices what you are doing. "What straight to the butt? You''re not going to at least get me going and fuck my pussy? Or at least lick me or finger bang me first?"'
 	*nl
@@ -715,10 +866,9 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 		'Now that she has had hers, you could give her ass a rest, but this has you very aroused. The harness rubbing against your clit with each stroke, the heady power of being the one doing the fucking and in complete control, not to mention just listening to her get off. Maybe you can just keep fucking her a little more and get off yourself, it''s not like she will mind and if she does to bad. You grin at your own thoughts as you watch her coming down from her orgasm.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom', 'rough'
 		gs 'stat'
-
 		act 'Pound that ass':
 			*clr & cla
-			domnush = +1
+			domnush += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush8.jpg"></center>'
 			'As the two of you keep going you, fuck her harder and faster. You start pulling the dick nearly out of her ass before roughly slamming it back balls deep into her. A few times you pull back a bit to far and it completely slides out of her ass, you can hear her sigh in relief with a mixture of disappointment. It only takes you a moment to quickly slide the big fake cock back into her gapping butthole, which always causes her to white knuckle the sheets and gasp loudly.'
 			*nl
@@ -732,7 +882,6 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 			killvar 'temporgasm'
 			gs 'arousal','end'
 			gs 'stat'
-
 			act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
 		end
 
@@ -745,7 +894,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube':
 	*clr & cla
 	menu_off = 1
 	AnushkaLoc = 2
-	domnush = +2
+	domnush += 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
 	'You decide it will be more fun to completely dominate her and make this just about you. You squirt just a little onto the tip of the large fuck dick, just enough to get the head nice and slick. She looks back over her shoulder at you and notices what you are doing. "What straight to the butt? You''re not going to at least get me going and fuck my pussy? Or at least lick me or finger bang me first?"'
 	*nl
@@ -772,7 +921,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube':
 		gs 'stat'
 		act 'Pound that ass':
 			*clr & cla
-			domnush = +1
+			domnush += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush8.jpg"></center>'
 			'As you keep going, fucking her harder and faster. After a bit you hear her sucking in breath sharply. "Please, please stop." You tighten your grip on her hips with your hands and keep pounding her butt hard and fast.'
 			'You are trying to focus on your own building orgasm and her talking is distracting you from it. "Shut up slut, I''m almost there, the more you talk, the longer this will take." You tell her as you adjust your strokes trying to get the harness to rub your clit as much as possible.'
@@ -839,7 +988,7 @@ if $ARGS[0] = 'couch_strapon_give':
 		if will_cost <= pcs_willpwr:
 			act 'Sit on her face (<<will_cost>> Willpower)':
 				*clr & cla
-				domnush = +1
+				domnush += 1
 				gs 'willpower', 'pay', 'force'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap4.jpg"></center>'
 				'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you trail your tongue up her stomach and across her breasts to her face before you raise back up. You scoot forward and straddle her face, lowering your pussy down against her face. She starts darting her tongue into your wet pussy while you ride and rub your clit against her face.'
@@ -911,7 +1060,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 	if will_cost <= pcs_willpwr:
 		act 'Fuck her ass hard (<<will_cost>> Willpower)':
 			*clr & cla
-			domnush = +1
+			domnush += 1
 			gs 'willpower', 'pay', 'self'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap9.jpg"></center>'
 			'"Oh you want me to <i>FUCK</i> your ass? I''ll fuck your ass like the dirty anal slut you are!" you tell her as you take a really hard grip on her hips, slam the strapon balls deep into her ass and start really pounding her hole as hard and fast as you can. You can feel her try to pull away as she grips the back of the couch hard. You pull her back, not letting her escape the anal pounding you''re giving her.'
@@ -920,7 +1069,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 			gs 'stat'
 			act 'Make her ass hurt':
 				*clr & cla
-				domnush = +1
+				domnush += 1
 				nushstrapanalpain = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap10.jpg"></center>'
 				'"Shut your mouth slut! I''ll fuck you however I want!" You grab her by the throat while you hammer her ass without mercy. She pulls away as much as she can until she runs out of room. Now pinned against the back of the couch, you nearly pull the full length of the dildo out of her ass, barely leaving the tip inside her before slamming it back down balls deep as fast as you can.'
@@ -943,7 +1092,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 			end
 			act 'Catch my spit with your tongue':
 				*clr & cla
-				domnush = +1
+				domnush += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap11.jpg"></center>'
 				'You decide to show her a little mercy and ease up just a little with the ass fucking you''re giving her. You wrap your hand around her throat and tilt her head back. "Open your mouth and stick your tongue out, you dirty little slut."'
 				'She does as you tell her and you spit into her mouth. "Eat my cum slut." you demand and she closes her mouth and swallows your spit as you keep fucking her ass.'
@@ -994,7 +1143,7 @@ if $ARGS[0] = 'couch_strapon_get':
 	gs 'stat'
 	act 'Help her put on the harness':
 		*clr & cla
-		domnush = -1
+		domnush -= 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/cstrapget1.jpg"></center>'
 		'She finally breaks the kiss and steps into the harness, pulling it into place. You help her get the harness in place and pull the straps tight so it doesn''t move around.'
 		gs 'arousal', 'foreplay', 2, 'lesbian'
@@ -1023,7 +1172,7 @@ if $ARGS[0] = 'couch_strapon_get':
 					gs 'stat'
 					act 'Your ass is hers':
 						*clr & cla
-						domnush = -1
+						domnush -= 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/cstrapget5.jpg"></center>'
 						'She slaps your ass several times while she fucks it. "Yeah that''s right, this is my little ass to fuck anytime I want." she says before she shoves it balls deep in your ass and starts really hammering away. You start to pull away, but she grabs you by the hair and pulls you back. Unable to escape, she hammers your ass balls deep. "Yeah, that''s right! Scream for me bitch. Tell me who''s ass this is!"'
 						*nl
@@ -1140,7 +1289,7 @@ end
 if $ARGS[0] = 'buttplug1':
 	*clr & cla
 	nushstrapon = 1
-	domnush = +1
+	domnush += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug1.jpg"></center>'
 	'"Turn around and bend over." you demand and she does as you ask. You squirt some lube on her asshole and work it around until it is nice and lubed up, then squirt some lube onto the butt plug and coat it nicely until it is nice and slick. You kneel next to her and spread her ass while you hold up the butt plug, checking to make sure it''s lubed properly. When you notice her looking back over her shoulder at you, you tell her. "That''s right I''m going to shove this thing right up your ass and work it until you''re nice and loose like the butt slut you are."'
 	gs 'arousal', 'foreplay', 3, 'lesbian'
@@ -1193,7 +1342,7 @@ if $ARGS[0] = 'buttplug1':
 
 						act 'Get her strapon out of the night stand':
 							*clr & cla
-							domnush = +1
+							domnush += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/getstrapon.jpg"></center>'
 							'You slap her on the ass and then place the butt plug on her night stand. As she gets back up on her knees and faces you, you reach inside and pull out her strap-on, holding it up. Her eyes grow a little wide and she bites her lower lip. "Now I''m going to fuck you with this." you tell her.'
@@ -1231,6 +1380,7 @@ if $ARGS[0] = 'bedstrapongive':
 			gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 			gs 'stat'
 			if pcs_vag > 0: act 'Have her fuck you now': gt 'anushkaev1','bedstraponget'
+			act 'Have her fuck your ass now': gt 'anushkaev1','bedstrapongetanal'
 			act 'Fuck her ass now': gt 'anushkaev1','bedstrapongiveanal'
 			act 'Finish':
 				*clr & cla
@@ -1294,17 +1444,16 @@ if $ARGS[0] = 'bedstraponget':
 				act 'Get dressed':gt 'anushapt','anushroom'
 			end
 		end
-
 		act 'Roll over':
 			*clr & cla
-			domnush = -1
+			domnush -= 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
 			'You roll over onto your hands and knees and wiggle your ass at her. You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole until it is nice and slick as well. "That''s right slut, give me that ass." she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass. You groan slightly in pain and she stops to let you get adjust to it before she slowly starts ass fucking you. The more you moan, the deeper and faster she starts to fuck you.'
 			gs 'arousal', 'anal_strap', 5, 'lesbian'
 			gs 'stat'
 			act 'Get butt fucked':
 				*clr & cla
-				domnush = -1
+				domnush -= 1
 				gs 'boyStat', 'D3'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme10.jpg"></center>'
 				'"Listen to you moan like a whore! You love my cock in your ass, don''t you whore?" she teases and slaps your ass.'
@@ -1336,6 +1485,53 @@ if $ARGS[0] = 'bedstraponget':
 	end
 end
 
+if $ARGS[0] = 'bedstrapongetanal':
+	*clr & cla
+	menu_off = 1
+	gs 'boyStat', 'D3'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
+	'You take the harness off and hand it over to her. "Okay, my turn."'
+	'She smiles at you as she replies. "I''m going to fuck you like a whore."'
+	'You laugh and help her get into the harness. "Can you just fuck my butt." You ask her with out really asking, she nods ever so slightly and grins at the request.'
+	'Once she has the harness is firmly in place, she pushes you down on your belly. "Spread your asscheeks." she commands and you do as she says'
+	'You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole until it is nice and slick as well. "That''s right slut, give me that ass." she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass. You groan slightly in pain and she stops to let you get adjust to it before she slowly starts ass fucking you. The more you moan, the deeper and faster she starts to fuck you.'
+	gs 'arousal', 'anal_strap', 5, 'lesbian', 'lube'
+	gs 'stat'
+	domnush -= 1
+	gs 'arousal', 'anal_strap', 5, 'lesbian'
+	gs 'stat'
+	act 'Get butt fucked':
+		*clr & cla
+		domnush -= 1
+		gs 'boyStat', 'D3'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme10.jpg"></center>'
+		'"Listen to you moan like a whore! You love my cock in your ass, don''t you whore?" she teases and slaps your ass.'
+		'"Yes, I love it! Fuck my ass harder!" you moan in reply.'
+		'In response, she slams the dildo balls deep into your ass and starts hammering away. You feel your arousal slowly growing.'
+		gs 'arousal', 'anal_strap', 5, 'lesbian', 'rough', 'sub'
+		$orgasm_or = 'custom'
+		$orgasm_txt = 'You are overwhelmed by the wild excitement of Anushka pounding your asshole and you can''t take any more. Waves of pleasure come crashing over you as you wither in ecstasy underneath her. She keeps fucking you until your shuddering stops.'
+		gs 'arousal', 'end'
+		gs 'stat'
+		killvar '$orgasm_txt'
+		act 'Finish':
+			*clr & cla
+			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_kiss.jpg"></center>'
+			'She pulls out of you and starts taking the harness off before setting it aside and grinning. "Well, I take it you enjoyed that?"'
+			'You nod breathlessly. "Yeah, it was amazing. You would''ve made a great guy." you tell her and you both laugh at your comment. As you turn back to face her, she reaches over, pulls you in close to her and looks deeply into your eyes.'
+			*nl
+			'The shared look is only broken by occasional quick but soft kisses from her before she gives you one more long and soft kiss with a hint of passion that leaves you breathless before she pulls away.'
+			'On that high note, she gets out of bed and starts getting dressed. You soon do the same and you are both soon fully dressed again.'
+			gs 'arousal', 'foreplay', 2, 'lesbian'
+			minut += 8
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Get dressed':gt 'anushapt','anushroom'
+		end
+	end
+end
+
 if $ARGS[0] = 'bedstrapongiveanal':
 	*clr & cla
 	menu_off = 1
@@ -1347,7 +1543,7 @@ if $ARGS[0] = 'bedstrapongiveanal':
 	gs 'stat'
 	act 'Rip her ass up':
 		*clr & cla
-		domnush = +1
+		domnush += 1
 		gs 'boyStat', 'D3'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
 		'You grab onto her hips with both hands and slam the <<dick>>cm <<$dick_girth>> dildo balls deep into her ass. She cries out in a mixture of pain and pleasure, her moans rapidly start getting louder and louder. "Yes, yes! Harder!" You pull the the dildo almost all the way out of her before slamming the full length back in, giving her the hardest, deepest and fastest anal pounding you can.'
@@ -1356,6 +1552,7 @@ if $ARGS[0] = 'bedstrapongiveanal':
 		gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'rough', 'dom'
 		gs 'stat'
 		if pcs_vag > 0: act 'Have her fuck you now': gt 'anushkaev1','bedstraponget'
+		act 'Have her fuck your ass now': gt 'anushkaev1','bedstrapongetanal'
 		act 'Finish':
 			*clr & cla
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'

+ 54 - 0
locations/arousal.qsrc

@@ -168,8 +168,16 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 80
 	elseif $ARGS[0] = 'rimming':
 		orgasm_flag = 1
+		temp_anal = 1
 		count['rimming'] = 1
 		stim['act'] = 30
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 2
+			stim['act'] = 50
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 4
+			stim['act'] = 80
+		end
 	elseif $ARGS[0] = 'trib':
 		orgasm_flag = 1
 		count['trib'] = 1
@@ -184,6 +192,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 3
+		end
 		if pcs_ass < temp_dick:pcs_ass += 1
 		if pcs_ass*2 < temp_dick:pcs_ass += 1
 		!! length and girth abilities of anus are not also separated , but I suppose that they are related although it is not propable
@@ -215,11 +228,23 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_anal = 1
 		count['anal_finger'] = 1
 		stim['act'] = 40
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+			stim['act'] = 60
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+			stim['act'] = 80
+		end
 	elseif $ARGS[0] = 'anal_fist':
 		orgasm_flag = 1
 		temp_anal = 1
 		count['anal_fist'] = 1
 		stim['act'] = 30
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] = 50
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['act'] = 70
+		end
 		if pcs_ass + anal_slip < 30:
 			pcs_ass = 30
 			gs 'pain', 4-agape, 'asshole', 'stretch'
@@ -230,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)
@@ -238,6 +265,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] += 10
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+		end
 		if agrdif < 0: agrdif = 0
 		if altdif < 0: altdif = 0
 		agape = iif((agrdif + altdif) > 10*agape,(agrdif + altdif)/10,agape)
@@ -248,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)
@@ -256,6 +290,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] += 10
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+		end
 		if agrdif < 0: agrdif = 0
 		if altdif < 0: altdif = 0
 		agape = iif((agrdif + altdif) > 10*agape,(agrdif + altdif)/10,agape)
@@ -267,6 +306,13 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['anal_vibe'] = 1
 		stim['mag'] += 1
 		stim['act'] = 60
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+			stim['act'] = 70
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 2
+			stim['act'] = 90
+		end
 	elseif $ARGS[0] = 'vaginal':
 		orgasm_flag = 1
 
@@ -469,6 +515,14 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 10
 	end
 
+	!! anal acts
+	if (mid($ARGS[0],1,4) = 'anal' and mid($ARGS[0],len($ARGS[0])-3,len($ARGS[0])) ! 'give') or $ARGS[0] = 'rimming':
+		if traits['buttslut_lvl'] = 3:
+			stim['act'] += 20
+		end
+	end
+
+
 	if stim['mag'] > 9: stim['mag'] = 9
 
 	if ARGS[1] > 0: minut += ARGS[1]

+ 2 - 2
locations/bass.qsrc

@@ -136,9 +136,9 @@ if $ARGS[0] = 'a':
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
 		if func('body_din','pregnancyVisibility') = 0:
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/pool/swim.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_<<rand(1,8)>>.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/pool/swimpreg.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
 		end
 		'You take a swim in the pool, which invigorates you, making you feel refreshed.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'

+ 1 - 1
locations/bed2.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = '':
 	end
 	gs 'events', 'read'
 
-	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
+	if anyaloc['inroom'] = 0 or anyaloc = 1 or anyaloc = 26:
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0

+ 8 - 12
locations/bedrPar.qsrc

@@ -49,13 +49,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'stat'
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and anyaloc['inroom'] = 0:
 		gt 'tobiQW', 'start'
 		
 	elseif anyaloc = 11: 
 		gt 'sisterQW', 'sisboyQW_expel'
 		
-	elseif sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
+	elseif anyaloc['inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
@@ -139,8 +139,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
 
 		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
-		!!Default is Anya not being here or being asleep, can be overwritten in next block
-		sisterHere = 0
 
 		if sister_indorf = 0:
 			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
@@ -159,11 +157,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					'<a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 				elseif anyaloc = 4:
 					sisterdialog = 3
-					sisterHere = 1
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
 				elseif anyaloc = 15:
 					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
-					sisterHere = 1
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 				elseif anyaloc = 26:
 					if sisboypartyQW = 1: sisboypartyQW = 2
@@ -186,7 +182,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 		sis_watch = 0
 
-		if sisterHere = 0 or sisboytrio > 0:
+		if anyaloc['inroom'] = 0 or sisboytrio > 0:
 			if pornMagazine > 0:gs 'events', 'read_porn'
 			if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
 				act 'Send Rex a text message': gt 'rex_events','sms'
@@ -203,7 +199,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-		if sisterHere = 0: dynamic $palelady
+		if anyaloc['inroom'] = 0: dynamic $palelady
 
 		gs 'exercise', 'start'
 
@@ -314,7 +310,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-				if sisterHere = 1 and pcs_inhib < 30:
+				if anyaloc['inroom'] = 1 and pcs_inhib < 30:
 					if pcs_inhib < 10:
 						$diff = 'hard'
 					elseif pcs_inhib < 20:
@@ -340,7 +336,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Streaming music
-			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+			if ml_guitar['hasguitar'] = 1 and anyaloc['inroom'] = 0 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 				if pcs_inhib < 30:
@@ -409,11 +405,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		 !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
-		if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
+		if anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
 		elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-		elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
+		elseif anyaloc['inroom'] = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
 		elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
 			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'

+ 10 - 8
locations/bedrPar2.qsrc

@@ -45,8 +45,6 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-
-	if hour = 21 and parsexrand = 5 and parentsexday ! daystart:gt 'seeparentsex'
 end
 
 ! book
@@ -83,8 +81,8 @@ end
 
 if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
-	if (hour >= 21 or hour < 6) and indorf = 0:
-		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!'
+	if indorf = 0 and (momloc = 1 or momloc = 3 or sdadloc = 1 or sdadloc = 2):
+		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
 		exit
 	end
@@ -122,17 +120,19 @@ end
 
 if $ARGS[0] = 'peek':
 	cla & *clr
+	parentsexday = daystart
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'
-	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
+	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body.'
+	'He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
 	act 'Leave':gt 'korrPar'
 
 	act 'Keep peeking':
 		cla & *clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
-		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
+		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparently knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
 		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 
@@ -142,7 +142,8 @@ if $ARGS[0] = 'peek':
 			cla & *clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
-			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while contnuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
+			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while continuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style.'
+			'Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
@@ -161,7 +162,8 @@ if $ARGS[0] = 'peek':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
-					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha." She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
+					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha."'
+					'She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
 					gs 'arousal', 'voyeur_sex', 3
 					gs 'stat'
 					act 'Leave':gt 'korrPar'

+ 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."'

+ 96 - 55
locations/budgetclothes.qsrc

@@ -1,6 +1,7 @@
 # budgetclothes
 !2021/04/29
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
@@ -100,7 +101,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing G&M outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -108,8 +109,9 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_outfits_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -124,16 +126,22 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'gm_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 
 			if i = 414:i = 415
 		if i <= 150:jump 'loopgm_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_outfits':
@@ -144,7 +152,7 @@ if $ARGS[0] = 'gm_outfits':
 		gt 'budgetclothes', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_outfits',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -158,7 +166,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing G&M dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -166,8 +174,9 @@ if $ARGS[0] = 'dresses':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_dress_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -182,14 +191,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'gm_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 150:jump 'loopgm_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_dress':
@@ -200,7 +215,7 @@ if $ARGS[0] = 'gm_dress':
 		gt 'budgetclothes', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_dress',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_dress',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'office':
@@ -214,7 +229,7 @@ if $ARGS[0] = 'office':
 	'<center><b><font color="maroon">Viewing G&M office clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -222,29 +237,31 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-!!		if Clothingstock > 15:
-!!			i = 3
-!!		elseif Clothingstock > 7:
-!!			i = 2
-!!		else
-			i = 1
-!!		end
+	!!To filter just this set
+	clo_i = 0
+	:loopoffice_filter
+
+		i = 1
 
 		:loopoffice
 			if gm_office[i] = 0:
 				gs 'clothing_attributes', 'gm_office', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 40:jump 'loopoffice'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopoffice_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopoffice_filter'
+	end
 end
 
 if $ARGS[0] = 'officeclo':
@@ -255,7 +272,7 @@ if $ARGS[0] = 'officeclo':
 		gt 'budgetclothes', 'office'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
+	gt 'clothing', 'view_clothing_item', 'gm_office',i, 2000, 'shop'
 end
 
 if $ARGS[0] = 'gm_maid':
@@ -269,7 +286,7 @@ if $ARGS[0] = 'gm_maid':
 	'<center><b><font color="maroon">Viewing G&M maid outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -277,8 +294,10 @@ if $ARGS[0] = 'gm_maid':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_maid
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_maid_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -290,17 +309,23 @@ if $ARGS[0] = 'gm_maid':
 				gs 'clothing_attributes', 'gm_maid', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopgm_maid'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_maid'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_maid_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_maid_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_maid',i, 2000
+if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'gm_maid',i, 2000, 'shop'
 
 if $ARGS[0] = 'gm_server':
 	$menu_loc = 'budgetclothes'
@@ -313,7 +338,7 @@ if $ARGS[0] = 'gm_server':
 	'<center><b><font color="maroon">Viewing G&M server uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -321,8 +346,10 @@ if $ARGS[0] = 'gm_server':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_server
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_server_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -334,17 +361,23 @@ if $ARGS[0] = 'gm_server':
 				gs 'clothing_attributes', 'gm_server', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 30:jump 'loopgm_server'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_server'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_server_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_server_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_server',i, 2000
+if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'gm_server', i, 2000, 'shop'
 
 if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'
@@ -357,7 +390,7 @@ if $ARGS[0] = 'school':
 	'<center><b><font color="maroon">Viewing G&M school uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -365,8 +398,10 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality4
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_school_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -380,15 +415,21 @@ if $ARGS[0] = 'school':
 				gs 'clothing_attributes', 'gm_school', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 			if i = 6:i = 9
 		if i <= 60:jump 'loopschool'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality4'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_school_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_school_filter'
+	end
 end
 
 if $ARGS[0] = 'schoolclo':
@@ -399,7 +440,7 @@ if $ARGS[0] = 'schoolclo':
 		gt 'budgetclothes', 'school'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_school',i, 1500
+	gt 'clothing', 'view_clothing_item', 'gm_school',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':

+ 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.'

+ 3 - 3
locations/camera.qsrc

@@ -42,11 +42,11 @@ $camera_locations['pav_complex'] = {
 	$camera_return_loc_arg = 'start'
 }
 
-$camera_locations['pav_train_hall'] = {
+$camera_locations['pav_market'] = {
 	$camera_description = 'Pavlovsk Train Station'
 	$camera_event = 'pav_train_hall'
-	$camera_return_loc = 'pav_train_hall'
-	$camera_return_loc_arg = 'start'
+	$camera_return_loc = 'pav_market'
+	$camera_return_loc_arg = ''
 }
 
 $camera_locations['gschool_grounds'] = {

+ 2 - 0
locations/cikl.qsrc

@@ -997,6 +997,8 @@ if storyline = 1 and week = 7 and soniaPS = 0 and month > 9 and daystart >= soni
 	else	
 		soniaPS = 1
 		soniaPSdays = daystart
+		npc_grupTipe['A25'] = 5
+		$npc_notes['A25'] = 'Ever since Sonia inadvertently got way too drunk and gave five guys including Vitek and his friends a simultaneous blowjob near the disco, her reputation in Pavlovsk has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile, the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'
 	end
 end
 

+ 1 - 1
locations/city_church.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
 	'Vigil is held on Saturdays at 19:00.'
 	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
-	act 'Return to the city':minut += 5 & gt 'city_residential'
+	act 'Return to the city':minut += 5 & gt 'city_center'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'city_church', 'vigil'
 	elseif week = 7 and hour >= 9 and hour < 12 and churchday ! daystart:

+ 1 - 1
locations/city_industrial_train.qsrc

@@ -187,7 +187,7 @@ end
 
 if $ARGS[0] = 'centre':
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	menu_off = 1
 	*clr & cla
 	minut += 5

+ 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:

+ 3 - 1
locations/city_mansion_residence_1.qsrc

@@ -1,6 +1,7 @@
 # city_mansion_residence_1
 
 if $ARGS[0] = 'yfoyer':
+	CLOSE ALL
 	$loc = 'city_mansion_residence_1'
 	$loc_arg = 'yfoyer'
 	$menu_loc = 'city_mansion_residence_1'
@@ -101,7 +102,7 @@ if $ARGS[0] = 'ybathroom':
 	$menu_loc = 'city_mansion_residence_1'
 	$menu_arg = 'ybathroom'
 	$location_type = 'bathroom'
-	$bathtype = 'bathtub shower'
+	$bathtype = 'glass shower and tub'
 	
 	menu_off = 0
 	minut += 1
@@ -138,6 +139,7 @@ if $ARGS[0] = 'ykitchen':
 
 	menu_off = 0
 	minut += 1
+	gs 'kit_din'
 	gs 'stat'
 
 	*clr & cla

+ 24 - 2
locations/city_market.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start' or $loc_arg = 'start':
+	killvar 'clothingfilter'
 	CLOSE ALL
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -187,17 +188,38 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Clothes.</font></b></center>'
 	'You inspect the cheap clothing the stall has to offer.'
 
+	gs 'clothing_QV', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 5
 		gt 'city_market', 'start'
 	end
 
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+
 	i = 1
 	:loopmarket_outfits
-	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+		if loopmarket_outfits[i] = 0:
+			gs 'clothing_attributes', 'market_outfits', i
+			gs 'clothing_QV', 'shop_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:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
 	i += 1
 	if i <= 20:jump 'loopmarket_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmarket_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmarket_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'marketclo':
@@ -208,7 +230,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'city_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

+ 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.'

+ 7 - 7
locations/city_redlight.qsrc

@@ -82,16 +82,16 @@ if $ARGS[0] = 'city_copy_shop':
 	menu_off = 1
 	minut += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
 	'You enter the run-down looking copy shop and look around. Scattered across the room are small tables with various dusty looking copy machines that don''t strike you as being very reliable. Watching you from behind a counter is a bored looking man with greasy hair and a sleazy look.'
 	if fakepassport = 2:
 		!!only notify player 1 time after events triggered
 		fakepassport = 0
 		'He looks at you hard before saying in a quiet voice, "A passport with a fake age will cost you 30,000 <b>₽</b>"'
 	end
-	if func('uniutil', 'fake_diploma', 'aware_needed'):
+	if university['fakediplom'] = 2:
 		!!only notify player 1 time after events triggered
-		gs 'uniutil', 'fake_diploma', 'reset'
+		university['fakediplom'] = 0
 		'He tells you "A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>"'
 	end
 	act 'Leave': gt 'city_redlight', 'start'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'city_copy_shop':
 				minut += 60
 				money -= 30000
 				fakepassport = 1
-				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
 				'He tells you to come in the back and takes a quick photo of your face, then tells you to wait out out front until he''s done. About an hour goes by before he steps back out and hands you the passport, which shows your face but has an older age printed out on it.'
 				act 'Leave': gt 'city_redlight', 'start'
 			end
@@ -110,14 +110,14 @@ if $ARGS[0] = 'city_copy_shop':
 			act 'Buy fake passport (<font color="red">30,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake passport.</font>'
 		end
 	end
-	if func('uniutil', 'appear_to_have_graduated') = 0:
+	if university['diploma'] = 0 and university['fakediplom'] = 0:
 		if money => 100000:
 			act 'Buy fake diploma (100,000 <b>₽</b>)':
 				*clr & cla
 				minut += 60
 				money -= 100000
-				gs 'uniutil', 'fake_diploma', 'set_obtained'
-				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
+				university['fakediplom'] = 1
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
 				'You bought a fake diploma.'
 				act 'Leave': gt 'city_redlight', 'start'
 			end

+ 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>.')

ファイルの差分が大きいため隠しています
+ 1136 - 474
locations/clothing.qsrc


ファイルの差分が大きいため隠しています
+ 579 - 151
locations/clothing_QV.qsrc


+ 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
 

+ 2 - 0
locations/dachain.qsrc

@@ -252,6 +252,7 @@ if $args[0] = 'dachavann':
 	$menu_arg = 'dachavann'
 	menu_off = 0
 	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
 	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
@@ -261,6 +262,7 @@ if $args[0] = 'dachavann':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachavan1.jpg"></center>'
 	end
+	gs'selfplay','suction_dildo'
 	gs 'din_van', 'private'
 	act 'Go into the main room': gt 'dachain', ''
 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 ---------------------------------
 

+ 4 - 4
locations/ender.qsrc

@@ -352,7 +352,7 @@ if $ARGS[0] = 'loss':
 		'After what feels like an eternity, they finally stop hitting you. "That''s what you get, you stupid bitch." Then the girl spits on you, with the rest of the gang following suit and spitting on you as well. Finally they get bored of tormenting you further and leave, laughing about how they beat the ugly girls ass.'
 		*nl
 		'With tears rolling down your face, you slowly get up and do your best to pull your clothes into place to cover up before you gingerly walk away.'
-		act 'Leave':streetrand=-1 & gt $loc
+		act 'Leave':streetrand-=1 & gt $loc
 	elseif fightEnding = 15:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
@@ -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
@@ -655,7 +655,7 @@ if $ARGS[0] = 'win':
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 
-		act 'Leave':streetrand=-1 & gt $loc
+		act 'Leave':streetrand-=1 & gt $loc
 	elseif fightEnding = 15:
 		fightEnding = 0
 		Win += 1
@@ -1048,7 +1048,7 @@ if $ARGS[0] = 'surrender':
 		'With tears welling up you compose yourself as best as you can and gingerly walk away.'
 
 		if pcs_health < 100: pcs_health = 100
-		act 'Leave':streetrand=-1 & gt $loc
+		act 'Leave':streetrand-=1 & gt $loc
 	elseif fightEnding = 15:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'

+ 3 - 3
locations/etoexhib.qsrc

@@ -767,7 +767,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_cadr.jpg"></center>'
 				'"Hello!" Welcomes the Human Relations employee. She tells you that they need a certified teacher. Working days are Monday to Saturday from 14:00 to 16:00. The pay is 300 <b>₽</b> per day, plus a room in a hostel. The terms of the contract say that, because they pay a full salary, at the moment there are no free meals. There is a strict dress code: business attire is required. Also, it is not recommended for women to have bright makeup or strong perfume.'
 
-				if func('uniutil', 'appear_to_have_graduated'):
+				if university['diploma'] = 1 or university['fakediplom'] = 1:
 					act 'Pass an interview for a job':
 						cla
 						*clr
@@ -775,7 +775,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 						gs 'stat'
 						'<center><b><font color="maroon">Human Resource Department</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_cadr.jpg"></center>'
-						'After passing the oral interview, you leave a copy of your '+iif(func('uniutil', 'diploma', 'obtained'), '', 'forged ')+'diploma and other documents with the personnel department, who tell you that you can start working.'
+						'After passing the oral interview, you leave a copy of your '+iif(university['diploma'] > 0, '', 'forged ')+'diploma and other documents with the personnel department, who tell you that you can start working.'
 
 						act 'Become a teacher':
 							cla
@@ -788,7 +788,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 					end
 				else
 					'You are told that you cannot take the job without a diploma from an institute of higher education.'
-					gs 'uniutil', 'fake_diploma', 'set_aware_needed'
+					university['fakediplom'] = 2
 				end
 
 				act 'Exit to Hall':gt 'etoexhib', 'pos19'

+ 83 - 67
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':
@@ -648,20 +664,20 @@ end
 if $ARGS[0] = 'get_sport_clothes_exercise_bonus':
 	sport_clothes_exercise_bonus = 0
 	if $braworntype = 'sport':
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
-	elseif PCloBra = 1:
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
+		sport_clothes_exercise_bonus += 1
+	elseif PCloBra = 1 and $clothingworntype = 'danilovich_outfits':
+		sport_clothes_exercise_bonus += 1
 	end
 	if $pantyworntype = 'sport':
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
-	elseif PCLoPanties = 1:
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
+		sport_clothes_exercise_bonus += 1
+	elseif PCLoPanties = 1 and $clothingworntype = 'danilovich_outfits':
+		sport_clothes_exercise_bonus += 1
 	end
 	if $clothingworntype = 'danilovich_outfits':
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
+		sport_clothes_exercise_bonus += 1
 	end
 	if $shoeworntype = 'danilovich':
-		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
+		sport_clothes_exercise_bonus += 1
 	end
 end
 --- exercise ---------------------------------

+ 32 - 16
locations/exhibitionistshop.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Salacious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -65,8 +65,10 @@ if $ARGS[0] = 'outfits':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_outfits_filter
+
 		i = 1
 
 		:loopsalacious_outfits
@@ -74,17 +76,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'salacious_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 20:jump 'loopsalacious_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_outfits',i, 1000
+if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'salacious_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -94,7 +102,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Salacious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -102,8 +110,10 @@ if $ARGS[0] = 'dresses':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_dress_filter
+
 		if Clothingstock >= 18:
 			i = 1
 		elseif Clothingstock >= 12:
@@ -119,17 +129,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'salacious_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 4
 		if i <= 150:jump 'loopsalacious_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_dress',i, 1000
+if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'salacious_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

+ 6 - 17
locations/family.qsrc

@@ -38,7 +38,6 @@ if indorf = 0:
 	sister_indorf = 0
 end
 if sisboyparty_day + 1 = daystart:sister_indorf = 0
-if sister_indorf = 1:sisterHere = 0
 *nl
 
 if StoryLine = 1:
@@ -52,24 +51,14 @@ if StoryLine = 1:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_7.jpg"></center>'
 			'You forgot to go to Rexs'' birthday party.'
-			'You brush it off thinking, <i>Oh well, hopefully he won''t be offended.</i>'
+			'You brush it off thinking, '+$OpenInnerThought+'Oh well, hopefully he won''t be offended.'+$CloseInnerThought
 			act 'Move away':gt $loc, $loc_arg
 			exit
 		end
 	end
 
-	if sister_indorf = 0:
-		if $loc = 'pav_commcenter':
-			if week < 6:
-				if hour >= 16 and hour < 18:
-					'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
-				end
-			elseif week >= 6:
-				if hour >= 11 and hour < 18:
-					'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
-				end
-			end
-		end
+	if sister_indorf = 0 and $loc = 'pav_commcenter' and anyaloc = 10:
+		'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 	end
 
 	if indorf = 0:
@@ -96,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

+ 175 - 87
locations/family_schedule.qsrc

@@ -10,141 +10,211 @@ kolloc = 0
 !!---ANYA---------------------------------------
 !! sister_indorf = 1 means Anya is in the village
 !! anyaloc['athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
+!! anyaloc['inroom'] = 1 means Anya is actually in the room, so masturbating while she is in the shower is possible
+!! unused - 6, 18, 19, 20, 22, 25, 27+
 if sister_indorf = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
 			anyaloc = 1
-		elseif hour = 7 and minut < 15:
+			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!Family breakfast
 			anyaloc = 2
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour = 7 and minut < 30:
 			!!Helping mom clean up
 			anyaloc = 3
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour < 8:
 			!!In Bedroom getting ready
 			anyaloc = 4
-			sisterHere = 1
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 1
 		elseif hour = 8 and minut < 20:
 			!!Shower*
 			anyaloc = 5
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':anyaQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour = 8 and minut < 30:
-			!!Walk to work
-			anyaloc = 6
+			!!traveling to work
+			anyaloc = 8
 			anyaloc['athome'] = 0
-		elseif hour < 16:
+			anyaloc['inroom'] = 0
+		elseif hour < 15 or (hour = 15 and minut < 50):
 			!!Work
 			anyaloc = 7
 			anyaloc['athome'] = 0
-		elseif hour = 16 and minut < 10:
-			!!Walk home from work
-			anyaloc = 8
+			anyaloc['inroom'] = 0
+		elseif hour < 16:
+			!!traveling from work
+			anyaloc = 9
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 0
 		elseif hour < 18:
-			if sisboyday + 1 = daystart:
-				!! Roma will be visiting so relaxing in bedroom
-				anyaloc = 9
+			if week = 5:
+				!!At the community center
+				anyaloc = 10
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			elseif sisboyday + 1 = daystart:
+				!!in bedroom with Roma
+				anyaloc = 11
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			else
-				!!Personal activities: Relaxing in bedroom 9, working out at the community center 10
-				anyaloc = func('shortgs', 'rand_pick', '', 9, 10)
-				if anyaloc = 9:
+				!!Personal activities: Relaxing in bedroom 15, at the community center 10
+				if anyaloc['rand1'] ! daystart:
+					anyaloc = func('shortgs', 'rand_pick', '', 10, 15)
+					anyaloc['rand1'] = daystart
+				end
+				if anyaloc = 15:
 					anyaloc['athome'] = 1
+					anyaloc['inroom'] = 1
 				else
 					anyaloc['athome'] = 0
+					anyaloc['inroom'] = 0
 				end
 			end
-		elseif sisboyday + 1 = daystart and hour = 18:
-			!!in bedroom with Roma
-			anyaloc = 11
-		elseif hour = 18 and minut < 30:
-			!!Family dinner
-			anyaloc = 12
-			anyaloc['athome'] = 1
+		elseif hour = 18 and minut <= 30:
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Family dinner
+				anyaloc = 12
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 0
+			end
 		elseif hour < 22:
-			!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
-			anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
-			if anyaloc = 15:anyaloc['athome'] = 1
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
+				if anyaloc['rand2'] ! daystart:
+					anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
+					anyaloc['rand2'] = daystart
+				end
+				if anyaloc = 15:
+					anyaloc['athome'] = 1
+					anyaloc['inroom'] = 1
+				else
+					anyaloc['athome'] = 0
+					anyaloc['inroom'] = 0
+				end
+			end
 		else
-			!!In her room
-			anyaloc = 15
-			anyaloc['athome'] = 1
-			sisterHere = 1
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!In her room
+				anyaloc = 15
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
+			end
 		end
 	else
-		if week = 7 and hour < 2:
+		if hour < 2:
 			!!Goes to a party
 			anyaloc = 24
 			anyaloc['athome'] = 0
-		elseif week = 7 and hour = 2 and minut < 20:
+			anyaloc['inroom'] = 0
+		elseif hour = 2 and minut < 20:
 			!!In her room drunk after party
 			anyaloc = 26
 			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
 		elseif hour < 9:
 			!!Asleep
 			anyaloc = 1
-		elseif hour = 9 and minut < 20:
+			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 1
+		elseif hour = 9 and minut <= 20:
 			!!Eat something in kitchen
 			anyaloc = 16
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour = 9 and minut < 40:
 			!!Shower*
 			anyaloc = 5
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 0
 		elseif hour < 10:
 			!!In Bedroom
 			anyaloc = 4
 			anyaloc['athome'] = 1
+			anyaloc['inroom'] = 1
 		elseif hour < 16:
 			if temp > 15 and sunWeather = 1:
 				!!On nice days goes to the beach
 				anyaloc = 17
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			else
 				!!Stays at home
-				anyaloc = 19
+				anyaloc = 15
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			end
-		elseif hour = 16 and minut < 15:
-			!!Walk to community center
-			anyaloc = 20
-			anyaloc['athome'] = 0
-		elseif hour = 17 and minut < 45:
-			!!Works out at the community center
-			anyaloc = 21
-			anyaloc['athome'] = 0
 		elseif hour < 18:
-			!!Walk home
-			anyaloc = 22
-			anyaloc['athome'] = 0
-		elseif hour = 18 and minut < 30:
-			!!Family dinner
-			anyaloc = 12
-			anyaloc['athome'] = 1
+			if week = 6:
+				!!At the community center
+				anyaloc = 10
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Works out at the community center
+				anyaloc = 21
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			end
+		elseif hour = 18 and minut <= 30:
+			if week = 6:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
+			else
+				!!Family dinner
+				anyaloc = 12
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 0
+			end
 		elseif hour < 19:
 			if week = 7:
 				!!helps mom clean up after dinner
 				anyaloc = 23
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 0
 			else
 				!!Goes to a party
 				anyaloc = 24
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			end
 		else
 			if week = 7:
 				!!in her room
 				anyaloc = 15
 				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			else
 				!!Goes to a party
 				anyaloc = 24
 				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			end
 		end
 	end
@@ -158,27 +228,28 @@ end
 if indorf = 0:
 	if week <= 5:
 		if hour < 5 or (hour = 5 and minut < 30):
-			!!Asleep, if Sveta knocks she''ll ask to wake Kolka
+			!!Asleep
 			momloc = 1
-		elseif hour = 5 and minut < 50:
+			momloc['athome'] = 0
+		elseif hour = 5 and minut < 45:
 			!!shower
 			momloc = 2
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
-		elseif hour < 6 or (hour = 6 and minut < 10):
-			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+		elseif hour < 6:
+			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka
 			momloc = 3
 			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
 			momloc['athome'] = 1
-			if hour = 6 and minut < 40:
+			if hour = 6 and minut <= 40:
 				!! Make Breakfast
 				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
 				momloc['kitchen_action'] = 2
-			elseif hour = 6 or (hour = 7 and minut < 15):
+			elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 				!! Family breakfast
 				momloc['kitchen_action'] = 3
 			else
@@ -194,7 +265,7 @@ if indorf = 0:
 			!!Working in the cafe. On Friday she stays until 17:50
 			momloc = 9
 			momloc['athome'] = 0
-		elseif hour = 16 and minut < 40 and week < 5:
+		elseif hour = 16 and minut < 50 and week < 5:
 			!!Buying groceries for dinner and other stuff needed for home at the supermarket
 			momloc = 7
 			momloc['athome'] = 0
@@ -210,6 +281,10 @@ if indorf = 0:
 			!!Making dinner (On Friday she brings home leftovers from the cafe)
 			momloc = 11
 			momloc['athome'] = 1
+		elseif hour = 18 and minut <= 30:
+			!!Family dinner
+			momloc = 12
+			momloc['athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
 			momloc = 13
@@ -230,39 +305,43 @@ if indorf = 0:
 				!! Visiting Luda on mondays for 3 hours
 				momloc = 20
 				momloc['athome'] = 0
-			else
+			elseif week < 5:
 				!! Watches TV with Vladimir
 				momloc = 19
 				momloc['athome'] = 1
+			else
+				!! Watches TV alone
+				momloc = 19
+				momloc['athome'] = 1
 			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep)
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			momloc = 1
 			momloc['athome'] = 0
 		end
 	else
 		if hour < 5 or (hour = 5 and minut < 30):
-			!! Sleep
+			!! Asleep
 			momloc = 1
-		elseif hour = 5 and minut < 50:
-			!! Shower, if Sveta knocks she''ll ask to wake Kolka
+		elseif hour = 5 and minut < 45:
+			!! Shower
 			momloc = 2
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
-		elseif hour < 6 or (hour = 6 and minut < 10):
-			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+		elseif hour < 6:
+			!! Getting dressed in her room, if Sveta knocks she''ll ask you to wake Kolka 
 			momloc = 3
 			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
 			momloc['athome'] = 1
-			if hour = 6 and minut < 40:
+			if hour = 6 and minut <= 40:
 				!! Make Breakfast
 				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
 				momloc['kitchen_action'] = 2
-			elseif hour = 6 or (hour = 7 and minut < 15):
+			elseif hour = 6 or (hour = 7 and minut <= 15):
 				!! Family breakfast
 				momloc['kitchen_action'] = 3
 			else
@@ -274,13 +353,14 @@ if indorf = 0:
 			momloc = momclean1
 			momloc['athome'] = 1
 		elseif hour = 11 and minut < 30:
-			!! Takes the car to town/walks to church
+			!!Traveling - takes the car to town/walks to church
 			momloc = 14
 			momloc['athome'] = 0
 		elseif hour < 12 or (hour = 12 and minut < 30):
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
 			momloc['athome'] = 0
 			if week = 6:
+				!! Salon
 				momloc = 15
 			else
 				!!Church
@@ -301,8 +381,8 @@ if indorf = 0:
 			!! Making dinner
 			momloc = 11
 			momloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
-			!!Family dinner (same as the family breakfast, Sveta doesn''t have to join it but we can have some family interactions like mom and step dad asking about how school was etc)
+		elseif hour = 18 and minut <= 30:
+			!!Family dinner
 			momloc = 12
 			momloc['athome'] = 1
 		elseif hour < 19:
@@ -310,19 +390,27 @@ if indorf = 0:
 			momloc = 13
 			momloc['athome'] = 1
 		elseif hour < 21:
-			!!Says she goes to see her sister, in reality sometimes see''s her sister of fucks around with different people. - Sunday goes to evening mass
+			!!Says she goes to see her sister, in reality sometimes sees her sister or fucks around with different people. - Sunday goes to evening mass
 			momloc['athome'] = 0
-			if week = 5:
+			if week = 6:
+				!!Slutting around?
 				momloc = 17
 			else
+				!!Church - Mass
 				momloc = 18
 			end
 		elseif hour < 22:
-			!! Watches TV with Vladimir
-			momloc = 19
-			momloc['athome'] = 1
+			if week = 7:
+				!! Watches TV with Vladimir
+				momloc = 19
+				momloc['athome'] = 1
+			else
+				!! Watches TV alone
+				momloc = 19
+				momloc['athome'] = 1
+			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep)
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			momloc = 1
 			momloc['athome'] = 0
 		end
@@ -334,14 +422,14 @@ end
 if indorf = 0:
 	if week <= 5:
 		if hour < 6 or (hour = 6 and minut < 10):
-			!! Sleep
+			!! Asleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
-		elseif hour < 7:
-			!!Getting ready, sometimes has quicky
+		elseif hour < hour = 6 and minut < 45:
+			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif hour = 7 and minut < 30:
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -365,7 +453,7 @@ if indorf = 0:
 			!! Sets the table for dinner
 			sdadloc = 7
 			sdadloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family dinner
 			sdadloc = 8
 			sdadloc['athome'] = 1
@@ -396,20 +484,20 @@ if indorf = 0:
 			sdadloc = 11
 			sdadloc['athome'] = 1
 		else
-			!! Sleep - (small chance mom and step dad have sex before actually going to sleep)
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		end
 	else
 		if hour < 6 or (hour = 6 and minut < 10):
-			!! Sleep
+			!! Asleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
-		elseif hour < 7:
+		elseif hour < hour = 6 and minut < 45:
 			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
-		elseif hour = 7 and minut < 30:
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!!family breakfast
 			sdadloc = 3
 			sdadloc['athome'] = 1
@@ -417,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
@@ -439,7 +527,7 @@ if indorf = 0:
 			!!In the garage
 			sdadloc = 9
 			sdadloc['athome'] = 1
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family dinner
 			sdadloc = 8
 			sdadloc['athome'] = 1
@@ -455,7 +543,7 @@ if indorf = 0:
 				sdadloc['athome'] = 1
 			end
 		else
-			!! Sleep
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		end
@@ -476,7 +564,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif hour = 7 and minut < 15:
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1
@@ -540,7 +628,7 @@ if indorf = 0:
 				kolloc = 2
 				kolloc['athome'] = 1
 			end
-		elseif hour = 7 and minut < 15:
+		elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15):
 			!! Family Breakfast
 			kolloc = 3
 			kolloc['athome'] = 1
@@ -562,7 +650,7 @@ if indorf = 0:
 			!! Leaves apartment
 			kolloc = 9
 			kolloc['athome'] = 0
-		elseif hour = 18 and minut < 30:
+		elseif hour = 18 and minut <= 30:
 			!! Family Dinner
 			kolloc = 8
 			kolloc['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

+ 6 - 0
locations/flash.qsrc

@@ -32,6 +32,7 @@ if $ARGS[0] = 'flashtotals':
 	dress_out_pussy_hairy = 9
 	dress_out_pantyrear = 8
 	dress_out_butt = 9
+	dress_out_butt_plug = 8
 	dress_out_full = 13
 	dress_out_full_hairy = 11
 	
@@ -52,6 +53,7 @@ if $ARGS[0] = 'flashtotals':
 	pants_out_pussy_hairy = 8
 	pants_out_pantyrear = 10
 	pants_out_butt = 19
+	pants_out_butt_plug = 6
 	pants_out_full = 9
 	pants_out_full_hairy = 6
 end
@@ -396,6 +398,8 @@ if $ARGS[0] = 'butt':
 			else
 				if $flash_image ! '':
 					'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+				elseif analplugin = 1:
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/butt_plug/' + rand(1,dress_out_butt_plug) + '.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/butt/' + rand(1,dress_out_butt) + '.jpg"></center>'
 				end
@@ -412,6 +416,8 @@ if $ARGS[0] = 'butt':
 			else
 				if $flash_image ! '':
 					'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+				elseif analplugin = 1:
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/outside/butt_plug/' + rand(1,pants_out_butt_plug) + '.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/outside/butt/' + rand(1,pants_out_butt) + '.jpg"></center>'
 				end

+ 4 - 19
locations/food.qsrc

@@ -522,7 +522,7 @@ end
 if $ARGS[0] = 'snack':
 	*clr & cla
 	gs 'stat'
-	minut += 15
+	minut += 5
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
@@ -546,7 +546,7 @@ end
 if $ARGS[0] = 'f_food':
 	*clr & cla
 	frost = 0
-	minut += 20
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 14
@@ -575,7 +575,7 @@ end
 if $ARGS[0] = 's_meal':
 	*clr & cla
 	frost = 0
-	minut += 25
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 4
@@ -604,7 +604,7 @@ end
 if $ARGS[0] = 'm_meal':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 8
@@ -871,21 +871,6 @@ if $ARGS[0] = 'family_meals':
 	pcs_breath = 0
 end
 
-if $ARGS[0] = 'breakfast':
-	frost = 0
-	pcs_health += 10
-	pcs_mood += 10
-	pcs_energy += 60
-	if pcs_hydra >= 100:
-		pcs_hydra += 30
-	else
-		pcs_hydra += 60
-	end
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-end
-
 if $ARGS[0] = 'aftermeal':
 
 	if pcs_energy > 100:

+ 5 - 0
locations/gadbana.qsrc

@@ -219,10 +219,15 @@ if mira_guest = 0:
 
 	dynamic $brit
 
+	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_bp', 'bp_milking'
 		end
+	elseif breastpump > 0 and bp_unbox <= 0:
+		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+	elseif breastpump <= 0:
+		gs 'lact_bp', 'massage'
 	end
 
 	dynamic $toymanage

+ 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)

+ 1 - 1
locations/gdksex.qsrc

@@ -1409,7 +1409,7 @@ if $ARGS[0] = 'creampie_surprise1':
 			act 'It felt so good':
 				cla & *nl
 				'"That felt so good," you smile tiredly. <<$npc_firstname[$boy]>> blinks at you, a look of surprise on his face, as if he expected you to be mad about it.'
-				
+				gs'gdksex','disco_sex_end'
 			end
 			
 			act 'Premature ejaculation is hot':

+ 51 - 79
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,29 +128,33 @@ 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:
 				if pregtime >= 90 or grupTipe = 5 or starlets_missed = 1:
-					if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'
-					if grupTipe = 5: act 'Train with Starlets': gt 'AlbStars', 'StarletsEnd'
+					if pregtime >= 90: act 'Train with Starlets': gt 'albina_starlets', 'Starletsreact'
+					if grupTipe = 5: act 'Train with Starlets': gt 'albina_starlets', 'StarletsEnd'
 					if starlets_missed = 1:
 						act 'Train with Starlets': 
 							starlets_missed = 0
 							starlet_practice_skipped += 1
-							gt 'AlbStars', 'StarletsPracticeMissed'
+							gt 'albina_starlets', 'StarletsPracticeMissed'
 						end
 					end
 				else
-					act 'Train with Starlets': gt 'AlbStars', 'starlets'
+					act 'Train with Starlets': gt 'albina_starlets', 'starlets'
 				end
-				'Tell Albina you want to <a href="exec:gt ''AlbStars'',''Quit''">quit</a> the Starlets.'
+				'Tell Albina you want to <a href="exec:gt ''albina_starlets'',''Quit''">quit</a> the Starlets.'
 			end
 		end
 	elseif pcs_stam <= 20:
@@ -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'
 
@@ -262,15 +268,17 @@ if $ARGS[0] = 'dance2':
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further, it is still good exercise.'
 
 		act 'Leave':
-			if rand (0,4):
+			if rand (0,4) = 0:
 				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
 					if alterstrtimg = 13:
-						gt 'AlbStars', 'albina3'
+						gt 'albina_starlets', 'albina3'
 					elseif grupTipe = 1 or grupTipe = 2:
-						gt 'AlbStars', 'albina2'
+						gt 'albina_starlets', 'albina2'
 					else
-						gt 'AlbStars', 'albina1'
+						gt 'albina_starlets', 'albina1'
 					end
+				else
+					gt 'gdksport', 'start'
 				end
 			else
 				gt 'gdksport', 'start'
@@ -283,13 +291,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 +306,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 +333,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 +361,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 +396,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 +414,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'
 

+ 1 - 1
locations/gdktoilet_womens.qsrc

@@ -609,7 +609,7 @@ if $ARGS[0] = 'rape':
 				end
 			end
 		end
-	elseif hour >= 20 and hour <= 23:
+	elseif (day >= 5 and week < 7) and (hour >= 20 and hour <= 23):
 		if music_on = 1:
 			$track_loop = 'sound/komb.mp3'
 			volume = 50

+ 1 - 1
locations/gkafe.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':gt 'pav_market'
 
-	if momloc = 9 and hour = 16 and indorf = 0 and mother_go = 1:
+	if (momloc = 7 or momloc = 9) and hour = 16 and indorf = 0 and mother_go = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 		*nl

+ 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
 

+ 1 - 1
locations/gschool_events.qsrc

@@ -1713,7 +1713,7 @@ if $ARGS[0] = 'afterschool_events':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				grupvalue[4] += 2
-				exhibition_exp += 5
+				inhib_exp += 5
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'
 				'You snort at him and look at his friends before looking back at him. You wiggle your middle finger at him, flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh, flashing your ass at them as you do, teasing them on what they are missing out on.'
 				act 'Walk away': gt 'gschool_grounds', 'main'

+ 1 - 2
locations/gschool_grounds.qsrc

@@ -299,7 +299,7 @@ if $ARGS[0] = 'main':
 			end
 		end
 		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['Chernov'] > 0 and cheerleaders_on = 0: 
-			'<a href="exec:minut += 15 & gt ''albinaRide''">Albina</a> is waiting behind the wheel of an SUV parked near the school.'
+			'<a href="exec:minut += 15 & gt ''albina_starlets_aftermath''">Albina</a> is waiting behind the wheel of an SUV parked near the school.'
 		end
 
 		! meynold`s events
@@ -764,7 +764,6 @@ if $ARGS[0] = 'change_room':
 		exit
 	end
 
-	gs 'wardrobe', 'sports_outfit'
 	act 'Change your outfit':
 		cla
 		gt 'wardrobe', 'start'

ファイルの差分が大きいため隠しています
+ 256 - 165
locations/gschool_lessons4.qsrc


+ 4 - 4
locations/gschool_lessonsev1.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs 'arousal', 'end'
 	elseif fizperand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/gymfight.jpg"></center>'
-		'During gym class, you hear a commotion from one side and you look over to see two boys shoving each other. They are from your brother''s grade and the first one shoves the second one again and it quickly starts escalating. A few punches are thrown and soon the two of them are down on the ground fighting. The coach rushes over and quickly pulls them apart, before sending them straight to the principal.'
+		'During gym class, you hear a commotion from one side and you look over to see Dan and Roman shoving each other. Roman shoves the Dan again and it quickly starts escalating. A few punches are thrown and soon the two of them are down on the ground fighting. The coach rushes over and quickly pulls them apart, before sending them straight to the principal.'
 	elseif fizperand = 7:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/tinydick.jpg"></center>'
 		'During a break in gym class, you and several other girls are talking when Igor wanders over and tries to chat you all up. You find his efforts amusing at best and you can tell they aren''t working on the other girls either, yet he seems to think he is just oozing cool and keeps chatting up the lot of you. Suddenly, Vitek rushes up behind him, grabs his shorts and yanks them down to his ankles.'
@@ -144,16 +144,16 @@ if $ARGS[0] = 'fiz_rand':
 		'During class, Lina and Lariska are whispering and giggling about something. After some time, they pull down the back of their shorts to flash their panty clad asses at several of the more popular jock boys.'
 	elseif fizperand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/dry3some.jpg"></center>'
-		'Near the end of class, three of the underclass girls are talking and giggling. When they notice some of the more popular boys looking their way, they start horsing around. One buries her face in her friend''s breasts and the third one behind her pretends to hump her. After a few moments, once several guys are watching, they stop, laughing as they move away.'
+		'Near the end of class, Stasya, Bella and Irina are talking and giggling. When they notice some of the cuter boys looking their way, they start horsing around. One buries her face in her friend''s breasts and the third one behind her pretends to hump her. After a few moments, once several guys are watching, they stop, laughing as they move away.'
 	elseif fizperand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hardon.jpg"></center>'
-		'At the end of class, everyone is allowed to do their own thing so long as long as they are doing something physical. You notice one of the boys using the bench press and see that there seems to be a tentpost in his pants. He is sporting one hell of a hardon, with several of the other girls having noticed as well and giggling about it.'
+		'At the end of class, everyone is allowed to do their own thing so long as long as they are doing something physical. You notice Fedor using the bench press and see that there seems to be a tentpost in his pants. He is sporting one hell of a hardon, with several of the other girls having noticed as well and giggling about it.'
 	elseif fizperand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/stretchhump.jpg"></center>'
 		'Lina is on the floor doing the splits leaning all the way forward, stretching. Lariska comes up behind her and lays on top of her, pretending to hump her. Lina laughs about it and ignores her at first. After a couple of minutes, they break it up.'
 	elseif fizperand = 16:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/teaseboys' + rand(1,2) + '.jpg"></center>'
-		'Two of the underclass girls notice several of the boys watching them and they start teasing them by pretending to make out in front of them for a bit.'
+		'Lena and Lera notice several of the boys watching them and they start teasing them by pretending to make out in front of them for a bit or knowing them, maybe they are just making out.'
 	else
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand7.jpg"></center>'

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'events':
 				end
 			end
 		end
-	elseif npc_rel['A144'] >= 50 and anush_sex >= 10 and hotcat >= 6 and rand(0,5) = 0:
+	elseif npc_rel['A144'] >= 50 and anush_sex >= 10 and hotcat >= 6 and pcs_vag ! 0 and rand(0,5) = 0:
 		pcs_horny += 20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
 		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately while one of her hands slides up your skirt and starts rubbing your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me." she whispers as her fingers slide up into your pussy.'

+ 1701 - 0
locations/gschool_post_shower.qsrc

@@ -0,0 +1,1701 @@
+# gschool_post_shower
+!2021/05/08
+
+!! post shower content
+
+if $ARGS[0] = 'post_shower':
+	*clr & cla
+	$menu_loc = 'gschool_post_shower'
+	$menu_arg = 'post_shower'
+	menu_off = 0
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nudepic2.jpg"></center>'
+	'You walk back to your locker, throwing your towel in a bin along the way, and start rifling through your locker, gathering your things and grabbing your clothes.'
+	act 'Get dressed': gt 'gschool_lessons4', 'dress'
+	act 'Check out the other girls':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/peekdress' + rand(1,2) + '.jpg"></center>'
+		'You let your eyes wander around the room, checking out the other girls in your class. Some are almost finished getting dressed, a few are in their underwear and a few are still naked. It''s a nice view, one thing you''ll always appreciate about gym class.'
+		gs'arousal','erotic_nudity', 2
+		gs 'stat'
+		act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+		act 'Check out Albina':
+			*clr & cla
+			checkoutalbina = 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/albpeek.jpg"></center>'
+			'You glance at Albina while she pulls her clothes out of her locker. She is petite and slender, but has well toned muscles, a very shapely set of thighs and a firm bubble butt that''s the envy of many girls in school. Her long dark brown hair reaches half way down her back and her pussy is clean shaven - in fact, you can''t see a single hair on her smooth skin. She has a great body and you can see why so many boys consider her one of the most attractive girls in your class.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts have a nice firm shape to them and are bigger than your own, but are average sized compared to the rest of the class.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. They are average sized compared to the other girls.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them, but are smaller than your own and most of your classmates.' 
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A23'] >= 70:
+						'You continue to watch Albina dressing. She makes a point of wiggling her shapely ass as she slowly pulls her thong on. It''s difficult to ignore her, but you manage to pull your gaze away and return your attention to getting dressed yourself. She gives you a friendly smile when she finishes dressing and walks out.'
+					elseif npc_rel['A23'] <= 20:
+						sveta_dyke_rumor += 1
+						'You continue to watch Albina dressing before she suddenly whips around and catches you staring. "What the fuck do you think you''re doing, you fucking pervert?!" she screams and the rest of the girls turn to see what the commotion is about. Embarrassed at being caught, you stutter at Albina as the girls figure out what you were doing and start pointing at you and whispering among each other. Unable to answer her, Albina coldly glares at you before turning back to finish getting dressed. You silently and awkwardly look at the floor as you finish getting dressed yourself.'
+					else
+						'You continue to watch Albina dressing, darting your eyes away when she looks in your direction. She eventually calls your bluff and catches you bringing your gaze back to her when you think she isn''t looking. She glares at you and you panic at the thought of what she''ll do, but she doesn''t say anything and returns her attention to getting dressed. You breathe a sigh of relief and finish dressing yourself.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Alyona':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/alypeek.jpg"></center>'
+			'You take a peek at Aylona while she finishes drying herself off. Her body is incredibly thin, almost anorexic and is covered in tattoos. However, she has a flat stomach and small but perky breasts. Between her legs is a neatly trimmed landing strip that matches the black hair that hangs just past her shoulders. She has that cute girl next door level of looks.'
+			if tits < 1:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 1:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A143'] <= 20:
+						sveta_dyke_rumor += 1
+						'After watching her for a little longer, she eventually turns and looks at you. "What the fuck are you looking at? Keep your eyes to yourself you fucking pervert." Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. You blush and turn back to your own locker to finish getting dressed. Luckily, no one else says anything.'
+					else
+						'After watching her a little longer, she turns and looks at you. She stares at you for a few seconds while you glance down. When you look back up, she''s gone back to getting dressed like nothing happened. You turn back to your own locker, blushing a little as you finish getting dressed.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Anushka':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nushpeek.jpg"></center>'
+			'You peek at Anushka, who is walking in from the shower and still drying herself off. She has a petite build and has a variety of tattoos large and small covering her body. She is rather slender, with small perky breasts and a firm butt. Her pussy is completely smooth and her black hair reaches just past her chin, leaving her with the shortest hair of any girl in school. She is one of the most beautiful girls in school, with a model''s face and body.'
+			if tits < 2:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 2:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit small.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nushwatch2.jpg"></center>'
+				if rand (1,4) = 1:
+					if npc_rel['A144'] >= 60:
+						'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes growing wide and your mouth going slack as you try to think of some kind of excuse. Before you can say anything, she puts her fingers up to her mouth in a V shape and sticks her tongue between them, the universal sign for eating pussy. She then goes back to pretending like nothing happened, so you turn back to your own locker, blushing a little as you finish getting dressed.'
+					elseif npc_rel['A144'] <= 20:
+						'Perhaps sensing your gaze, Anushka suddenly turns towards you. You freeze, realizing you''ve been caught. You panic, trying to think of some kind of excuse, but she smirks and shakes her head at you and goes back to pretending like nothing happened. You turn back to your own locker, blushing a little as you finish getting dressed.'
+					else
+						'Anushka suddenly turns towards you. She follows your gaze and realizes you''re looking at her body, your eyes flicking up to make contact with hers. You freeze, realizing you''ve been caught. You panic, trying to think of some kind of excuse, but she just winks at you and goes back to pretending like nothing happened. You turn back to your own locker, blushing a little as you finish getting dressed.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Bella':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/belpeek.jpg"></center>'
+			'You peek at Bella, who is standing by her locker still drying herself off. She has a slim build and her pussy is shaved smooth while her long brown hair reaches half way down her back. Bella isn''t just beautiful, she rivals the looks of models and actresses - she is the prettiest girl you have ever seen.'
+			if tits < 4:
+				'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+			elseif tits = 4:
+				'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.'
+			else
+				'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A22'] >= 80:
+						'"If you like what you see, then you should really join me at the city gym sometime. The equipment there is worth the extra money. And no, I don''t mean that ''equipment''." You both giggle at her comment.'
+					elseif npc_rel['A22'] <= 20:
+						sveta_dyke_rumor += 1
+						'What the fuck, were you watching me!? Get the fuck away from me, you fucking lesbian!" You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					else
+						sveta_dyke_rumor += 1
+						'I don''t blame you for staring at me, I would do the same if I were you. So, thanks I guess." Several girls look up to see who she is talking to. You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Christina':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/chrispeek.jpg"></center>'
+			'You glance at Christina walking across the room after tossing her towel in a bin. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs. In combination with her firm breasts and neat landing strip between her legs, her figure is surprisingly pleasing, with a very pretty face boarding on beautiful, she is very attractive even if not in the conventionally way. You could easily imagine her on the cover of a sports magazine.'
+			if tits < 2:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them and are bigger than your own.'
+			elseif tits = 2:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+				'Upon inspection, you notice her breasts are a little small when compared to you and your classmates, but have a nice firm shape to them.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if christinaQW['dompath'] >= 7:
+						'You''ve been keeping an eye on her since your little tussle, making sure she doesn''t cause any trouble. After a few minutes, she feels your gaze on her and turns to face you. You give her a look and she reluctantly turns back to her locker, not saying anything.'
+					elseif fame['pav_slut'] >= 225:
+						sveta_dyke_rumor += 1
+						'She catches you looking at her and angrily glares at you. "No, bitch! I won''t fuck you."'
+						'The girls around you look up to figure out what''s happening and start laughing at you. You decide it''s time to get dressed and leave.'
+					elseif grupTipe = 5:
+						sveta_dyke_rumor += 1
+						'She catches you looking at her body, sneers and says "Get lost, loser."'
+						'Girls around you look up, not sure what they missed. You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					else
+						sveta_dyke_rumor += 1
+						'You look a bit too long and she seems to realize that she''s being watched. When she sees it''s you, she just says "What, bitch?"'
+						'The girls around you look up, not sure what they missed. You respond with "Sorry, I just spaced out a bit there." You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you let your gaze slide away, not wanting to get caught looking at her.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Irina':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/iripeek.jpg"></center>'
+			'You peek at Irina, who is standing by her locker as she starts to get dressed. She has a petite build that makes her large and perky breasts seem even larger on her frame. Her pussy has a neatly trimmed landing strip above it, while her long blond hair reaches just past her shoulders. Irina is one of the prettiest girls in school and would likely be considered the prettiest if not for her friend Bella.'
+			if tits < 4:
+				'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+			elseif tits = 4:
+				'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.'
+			else
+				'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A17'] >= 80:
+						'"I''m really pretty aren''t I?" Irina aks you with a grin and starts dancing while getting dressed. You turn away and finish dressing.'
+					elseif npc_rel['A17'] <= 20:
+						sveta_dyke_rumor += 1
+						'"Oh it''s you... Ellen Degenerate." She sneers at you. "Can you believe <<$pcs_nickname>> is checking me out like some pervy ten year old boy?" she says loud enough to get the attention of the room. You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					else
+						sveta_dyke_rumor += 1
+						'"Can I help you? You lost something? Lockers are that way." she says while pointing with her finger. "And stop staring at my tits." she says loud enough to get the attention of the room. You decide it''s time to get dressed and leave, embarrassed that you were caught checking her out.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Julia':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/julpeek.jpg"></center>'
+			'You peek at Julia, who is standing by her locker, still drying herself off. She has a curvy build, with fairly large and perky breasts and a jiggly bubble butt. Her pussy has a neatly trimmed landing strip above it, while her long brown hair reaches just past her shoulders. She is the prettiest of the nerds, being comparable to most of the jocks and cool girls.'
+			if tits < 4:
+				'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+			elseif tits = 4:
+				'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.'
+			else
+				'Upon inspection, you notice her breasts are firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A12'] >= 60:
+						'After watching her for a few minutes, she turns and looks at you. She blushes and smiles at you for a few seconds before she turns back and finishes getting dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					elseif npc_rel['A12'] <= 20:
+						'After watching her for a few minutes, she turns and looks at you. She blushes and looks fearful, quickly turning away from you and getting dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					else
+						'After watching her for a few minutes, she turns and looks at you. She blushes and quickly turns away from you and gets dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Katja':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/katpeek.jpg"></center>'
+			'Your attention is drawn towards Katja carefully gathering her clothes from her locker and neatly placing them down. She is petite and very slender with a clean shaven pussy and very long red hair reaching half way down her back. You can see why many boys and even some girls consider her to be very cute and attractive.'
+			if tits < 3:
+				'Her teardrop shaped breasts are average sized, but bigger than your own.'
+			elseif tits = 3:
+				'Her teardrop shaped breasts are average sized and around the same size as your own.'
+			else
+				'Her teardrop shaped breasts are average sized, but smaller than your own.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A14'] >= 50 and KatjaHorny >= 20:
+						'You''re unable to pull your gaze away from her and keep watching her getting dressed until she turns and catches you staring at her. She parts her legs slightly, discreetly showing her pussy to you with a small smile before turning and giving you a barely noticeable wiggle of her ass. You smile back at her and you both finish dressing.'
+					else
+						'You''re unable to pull your gaze away from her and keep watching her getting dressed until she turns and catches you staring at her. She blushes bright red and looks a little flustered as she covers herself and turns back to her locker. She very quickly finishes dressing before grabbing her belongings and dashing out of the room. Feeling a little embarrassed, you finish getting dressed yourself.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Katyusha':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/katypeek.jpg"></center>'
+			'You take a peek at Katyusha while she finishes drying herself off. She has a few small tattoos and is incredibly toned and muscled for a girl, giving her body an almost manish quality to it. Between her legs is an unsightly bush that matches the brown hair that hangs just past her shoulders. She is not a very attractive looking girl.'
+			if tits = 0:
+				'Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. The two of you have the smallest breasts in the entire class.'
+			else
+				'Upon inspection, you notice her breasts are very small, barely more than puffy nipples. She has the smallest breasts in the entire class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				sveta_dyke_rumor += 1
+				if rand (1,4) = 1:
+					if npc_rel['A145'] <= 20:
+						'After watching her for a few minutes, she turns and looks at you. She storms across the locker room and gets right in your face. "Keep your eyes to yourself you fucking dyke!" Her comment causes other girls to look over to see what''s going on and a few seem like they might have guessed. Once you look away from her, she walks back to her locker and you turn back to your own locker, blushing as you finish getting dressed. Luckily, no one else says anything.'
+					else
+						'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at dyke?" Her comment causes other girls to look over to see what''s going on and a few seem like they might have guessed. You turn back to your locker, blushing as you finish getting dressed. Luckily, no one else says anything.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Lariska':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/larpeek.jpg"></center>'
+			'You glance at Lariska as she finishes drying herself off, wrapping her hair in a towel before bundling it around her head. She is tall and lanky with narrow hips and small perky breasts. You also can''t help but notice that she keeps her bush trimmed and tidy, all told she is has that cute girl next door level of looks.'
+			if tits < 1:
+				'Upon inspection, you notice her breasts have a nice firm shape to them. Her bust is bigger than yours, but smaller than almost all of your classmates.'
+			elseif tits = 1:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.'
+			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if LariskaQW['story'] >= 8:
+						'Feeling you watching her, she looks in your direction. Seeing you, she gives you a sweet smile and a wink before turning a little red. You wink back with your own smile.'
+						'You think it''s probably time to get dressed before somebody else notices the two of you silently flirting with each other.'
+					elseif fame['pav_slut'] >= 225 or grupTipe = 5:
+						'Feeling somebody watching her, she looks around until she sees you. Turning red, she gives you a strange look before going back to getting dressed.'
+						'You should get dressed before somebody else notices you staring at her.'
+					elseif npc_rel['A13'] >= 50:
+						'Feeling somebody watching her, she looks around until she sees you. She gives you a friendly smile and a wave before going back to getting dressed.'
+						'You should get dressed before somebody else notices you staring at her.'
+					elseif npc_rel['A13'] <= 20:
+						'Feeling somebody watching her, she looks around until she sees you. Looking annoyed, she ignores you as she goes back to getting dressed.'
+						'You should get dressed before somebody else notices you staring at her.'
+					else
+						'Feeling somebody watching her, she looks around until she sees you. She gives you a friendly smile before going back to getting dressed.'
+						'You should get dressed before somebody else notices you staring at her.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'Letting your gaze wander past her, you turn back to your locker before anybody catches you staring and reach for your clothes.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Lena':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lenpeek.jpg"></center>'
+			'You take a peek at Lena while she finishes drying herself off. Her body is curvy with large breasts and a fairly large butt, with a few small tattoos dotted around. Between her legs is a neatly trimmed landing strip of brown hair while her red dyed hair hangs just past her shoulders. She has that cute girl next door level of looks.'
+			if tits < 4:
+				'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+			elseif tits = 4:
+				'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average sized compared to other girls.'
+			else
+				'Upon inspection, you notice her breasts are firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A20'] >= 60:
+						'After watching her for a few minutes, she turns and looks at you. She gives you a knowing smirk, but it seems like she doesn''t really care as she just turns back to her locker and keeps getting dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					elseif npc_rel['A20'] <= 20:
+						sveta_dyke_rumor += 1
+						'After watching her for a few minutes, she turns and looks at you. "What the fuck? Are you checking me out? Keep your eyes to yourself, you fucking pervert!" Her comments cause other girls to look over to see what''s going on. Once you look away, she goes back to getting dressed while muttering and you turn back to your own locker, blushing as you finish getting dressed.'
+					else
+						sveta_dyke_rumor += 1
+						'After watching her for a few minutes, she turns and looks at you. "Are you checking me out? Fucking pervert." Her comments cause other girls to look over to see what''s going on. You turn back to your locker, blushing as you finish getting dressed. Luckily, no one else says anything.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'Letting your gaze wander past her, you turn back to your own locker before anybody catches you staring and reach for your clothes.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Lera':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lerpeek.jpg"></center>'
+			'You take a peek at Lera while she finishes drying herself off. Her body is fairly normal looking with a few small tattoos dotted around. Between her legs is a neatly trimmed V of brown hair, while her long brown highlighted hair hangs part way down her back. She has that cute girl next door level of looks.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, her breasts are about average sized compared to the other girls.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, they''re smaller than your own and some of your classmates.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A21'] >= 60:
+						'After watching her for a few minutes, she turns and looks at you. She gives you a knowing smile before spreading her legs slightly and indicating down with her eyes, inviting you to come over and eat her out. You quickly turn back to your locker, blushing as you finish getting dressed. No one else seemed to have noticed.'
+					elseif npc_rel['A21'] <= 20:
+						sveta_dyke_rumor += 1
+						'After watching her for a few minutes, she turns and looks at you. "What the fuck? You checking me out? I know you want my pussy, but I''ve got standards loser, so fuck off!" Her comments cause other girls to look over to see what''s going on. Once you look away, she goes back to getting dressed while muttering the whole time and you turn back to your locker, blushing as you finish getting dressed.'
+					else
+						sveta_dyke_rumor += 1
+						'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at? You like staring at my pussy? Well why don''t you crawl over here and give her a lick!?" Her comments cause other girls to look over to see what''s going on and a few give disgusted looks, but most just laugh. You turn back to your locker, blushing as you finish getting dressed.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'Letting your gaze wander past her, you turn back to your own locker before anybody catches you staring and reach for your clothes.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Lina':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/linpeek.jpg"></center>'
+			'You take a peek at Lina as she starts to pull her thigh highs on. She is slightly more athletic looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact, most of the boys think she''s rather pretty and you''re inclined to agree.'
+			if tits < 2:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 2:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if avelinaQW['encourage'] >= 1:
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she gives you a warm smile before going back to getting dressed.'
+						'You should get back to getting dressed before others notice you staring.'
+					elseif fame['pav_slut'] >= 225:
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she covers her breasts with her arm and makes a rude gesture at you.'
+						'Taking the hint, you get back to getting dressed before she starts a scene.'
+					elseif grupTipe = 5:
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she gives you a disgusted look, but otherwise ignores you.'
+						'You should get back to getting dressed before others notice you staring.'
+					elseif npc_rel['A19'] >= 50:
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she gives you a friendly smile before continuing to get dressed.'
+						'You should get back to getting dressed before others notice you staring.'
+					elseif npc_rel['A19'] <= 20:
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she glares at you until you look away, but otherwise doesn''t say anything.'
+						'You should get back to getting dressed before others notice you staring.'
+					else
+						'Feeling your eyes on her, she looks in your direction. Seeing you staring, she gives you an uncertain smile, not quite sure what to think about what you''re doing.'
+						'You should get back to getting ready, before others notice you staring.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Lizaveta':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lizpeek.jpg"></center>'
+			'Lizaveta has reddish-brown hair that goes just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair.'
+			if tits < 2:
+				'Looking further, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 2:
+				'Looking further, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+				'Looking further, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					gs 'fame', 'pav', 'sex', 10
+					sveta_dyke_rumor += 1
+					'She is constantly chatting with other girls walking past. Her mouth never seems to stop moving.'
+					if fame['pav_slut'] >= 200:
+						'Noticing you checking her out, she covers her breasts. "Oh my god, slut! Quit staring at me!"'
+						'The other girls look up to see what''s happening. When they see who she''s talking to, they start covering themselves and bitching at you or giving you dirty looks.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					elseif grupTipe = 5:
+						'Noticing you checking her out, she covers her breasts. "Oh my god, freak! Quit staring at me!"'
+						'The other girls look up to see what''s happening. When they see who she''s talking to, they start covering themselves and bitching at you or giving you dirty looks.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					elseif npc_rel['A140'] >= 60:
+						'Noticing you checking her out, she says "Hey <<$pcs_nickname>>, I see you."'
+						'Startled, you try to quickly look away, but it''s too late. "What was that about?" one of the other girls asks.'
+						'"She was totally checking me out! I didn''t know she swung that way." A few of the girls unconsciously cover themselves and give you dirty looks.'
+						'Now would probably be a good time to get dreesed and get out of here, before this gets even more awkward.'
+					elseif npc_rel['A140'] <= 20:
+						'Noticing you checking her out, she covers her breasts. "Quit staring at me! It''s creeping me out."'
+						'Startled, you try to quickly look away, but it''s too late. Before long, she''s telling everyone about how you were checking her out as she was getting dressed.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					else
+						'She snaps her fingers when she notices you checking her out. "Can I help you with something, <<$pcs_nickname>>?"'
+						'Startled, you try to quickly look away, but it''s too late. "What was that about?" one of the other girls asks.'
+						'"She was totally checking me out! I didn''t know she swung that way." A few of the girls unconsciously cover themselves and give you dirty looks.'
+						'Now would be a good time to get dressed and out of here, before this gets even more awkward.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Natasha':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/natpeek.jpg"></center>'
+			'Natasha has very long light brown hair reaching half way down her back. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.'
+			if tits < 5:
+				'Looking closer, you notice her breasts are large, but have a nice firm shape to them. She has the biggest breasts in the entire class, although the popular girls would never admit their jealousy.'
+			elseif tits = 5:
+				'Looking closer, you notice her breasts are the same size as your own and are large and firm. They are the largest among your classmates, although the popular girls would never admit their jealousy.'
+			else
+				'Looking closer, you notice her breasts are firm but not as large as yours. However, her breasts are larger than any of the other girls, although the popular girls would never admit their jealousy.'
+			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if NatbelQW['QWstage'] > 5:
+						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she smiles mischievously before pulling her socks out of her locker and proceeding to bend over and put them on. She is facing away from you, with her legs slightly spread and without any panties on, giving you a perfect view of her pussy.'
+						'Straightening back up, she smiles at you again and continues to dress, her face bright red, but looking pleased.'
+						'You should probably get dressed and leave before somebody notices her giving you such a good view.'
+					elseif npc_rel['A16'] >= 50:
+						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she covers herself as best she can and turns away, her face red.'
+						'You should probably get dressed and leave before this gets more awkward.'
+					elseif npc_rel['A16'] <= 20 or grupTipe = 5 or fame['pav_slut'] >= 200:
+						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she covers herself as best she can and turns away, her face red with anger.'
+						'You should probably get dressed and leave before this gets more awkward.'
+					else
+						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she covers herself as best she can and turns away, her face red with embarrassment.'
+						'You should probably get dressed and leave before this gets more awkward.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Pauline':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/palpeek.jpg"></center>'
+			'You take a peek at Pauline as she starts to get dressed. She is slightly more muscular looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs, that matches her long black hair that hangs just past her shoulders. She doesn''t stand out in any particular way, but you''d never call her ugly.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				sveta_dyke_rumor += 1
+				if rand (1,4) = 1:
+					if npc_rel['A24'] <= 20:
+						'After watching her for a few minutes, she turns and looks at you. "I don''t like pussy dyke, so keep your eyes to your fucking self." Her comment causes other girls to look over to see what''s going on and a few seem like they might have guessed. Once you look away, she goes back to getting dressed and you turn back to your locker, blushing as you finish getting dressed. Luckily, no one else says anything.'
+					else
+						'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at? Are you another carpet muncher? Can''t a girl get dressed in peace?!" Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. You quickly turn back to your locker, blushing as you finish getting dressed. Luckily, no one else says anything.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Sonia':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/sonpeek.jpg"></center>'
+			'Your attention homes in on Sonia as she pulls her clothes out of her locker. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.'
+			if tits < 2:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 2:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A25'] >= 60:
+						if soniaPS = 0:
+							'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a smile and turns her body, giving you a better look.'
+							'You should probably get dressed and leave before this goes any further.'
+						else
+							'You''re unable to pull your gaze away from her and keep watching her getting dressed until she turns and catches you staring at her. She parts her legs slightly, discreetly showing her pussy to you with a small smile before turning and giving you a barely noticeable wiggle of her ass. You smile back at her and you both finish dressing.'
+						end
+					elseif npc_rel['A25'] <= 20:
+						'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a dirty look and turns around, hiding her body as she quickly gets dressed and leaves.'
+						'You should probably get dressed and leave, before it gets more awkward.'
+					else
+						if soniaPS = 0:
+							'She is focused on getting dressed when she suddenly stops and looks at you. Seeing you staring, she gives you a hesitant smile before continuing to get dressed.'
+							'You should probably get back to getting dressed yourself before others notice you staring.'
+						else
+							'You''re unable to pull your gaze away from her as she gets dressed until she turns and catches you staring. She parts her legs slightly and discreetly shows you her pussy with a small smile. You smile back at her and you both finish showering.'
+						end
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Stasya':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/stapeek.jpg"></center>'
+			'Your attention homes in on Stasya as she starts to get dressed. She has long black hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a completely smooth pussy. She has that cute girl next door level of looks.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but is average sized compared to the rest of your classmates.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					sveta_dyke_rumor += 1
+					if npc_rel['A139'] >= 60:
+						'Noticing you checking her out, she asks you to stop.'
+						'Startled, you try to quickly look away, but it''s too late. "What was that about?" Bella asks.'
+						'"She was totally checking me out! I didn''t know she swung that way." Stasya replies and Bella and a few other girls cover themselves and give you dirty looks.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					elseif npc_rel['A139'] <= 20:
+						'Noticing you checking her out, she covers her herself up and says loudly "Quit staring at me pervert!"'
+						'Startled, you try to quickly look away, but it''s too late. Several girls ask her what happened and she starts telling them how you were checking her out as she was getting dressed.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					else
+						'"Oh my god, what is your problem?" she asks when she catches you staring.'
+						'Startled, you try to quickly look away, but it''s too late. "What was that about?" Bella asks.'
+						'"She was totally checking me out! <<$pcs_nickname>> here is a total dyke!" Bella and a few other the girls cover themselves and give you dirty looks.'
+						'Now would be a good time to get dressed and get out of here, before this gets even more awkward.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Veronika':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/verpeek.jpg"></center>'
+			'Your attention is drawn to Veronika getting dressed. She is slightly taller than most girls and is slim and slightly muscular with a neatly trimmed triangle of pubic hair atop her pussy. That matches the long blond hair that reaches half way down her back.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are about average sized.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A141'] <= 20:
+						'You continue to watch Veronika dressing before she suddenly turns around and catches you staring. She silently glares at you while covering herself and you quickly turn back to your locker and finish getting dressed. When you glance back, you see Veronika staring at you as she finishes dressing before leaving.'
+					else
+						'You continue to watch Veronika dressing before she suddenly turns around and catches you staring. She gives you a blank stare in return and you both stand in awkward silence before you decide to just turn around and finish getting dressed. Veronika casually goes back to what she was doing as if nothing happened.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After watching her a little longer, you let your gaze slip away and turn back to your own locker to finish getting dressed.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Vicky':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/vicpeek.jpg"></center>'
+			'You see Vicky standing in front of her locker, with her long red hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. You can see why many boys and even some girls consider her to be very cute and attractive.'
+			if tits < 3:
+				'Looking closer, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.'
+			elseif tits = 3:
+				'Looking closer, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.'
+			else
+				'Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average sized with a nice firm shape to them.'
+			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A15'] <= 20 or grupTipe = 5:
+						'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a dirty look and turns around, hiding her body.'
+						'You should get dressed and leave before it gets more awkward.'
+					else
+						'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a smirk and turns her body, giving you a better look.'
+						'You should get dressed and leave before this gets more awkward.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+		act 'Check out Zinaida':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/zinpeek.jpg"></center>'
+			'Your attention homes in on Zinaida as she pulls her clothes out of her locker. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a bush of pubic hair. She doesn''t stand out in any particular way, but you''d never call her ugly.'
+			if tits < 2:
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+			elseif tits = 2:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+			else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+			end
+			*nl
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
+			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+			act 'Keep checking her out':
+				cla
+				if rand (1,4) = 1:
+					if npc_rel['A142'] >= 60:
+						'After watching her for a few minutes, she turns and looks at you. She blushes and quickly turns away from you to finish getting dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					elseif npc_rel['A142'] <= 20:
+						'After watching her for a few minutes, she turns and looks at you. She blushes and looks fearful, quickly turning away from you and getting dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					else
+						'After watching her for a few minutes, she turns and looks at you. She blushes and quickly turns away from you and gets dressed. You turn back to your own locker, blushing as you finish getting dressed.'
+					end
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				else
+					'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+					gs'arousal','erotic_nudity', 3
+					gs 'stat'
+					act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'post_shower2':
+	*clr & cla
+	$menu_loc = 'gschool_post_shower'
+	$menu_arg = 'post_shower2'
+	menu_off = 0
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/postphyssho' + rand(1,7) + '.jpg"></center>'
+	'You let your eyes wander around the room, checking out the other girls in your class. They are chatting as they shower, some are getting close to done showering while a couple of others wander in to begin showering. It''s a nice view, one thing you''ll always appreciate about gym class.'
+	act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+	act 'Check out Albina':
+		*clr & cla
+		checkoutalbina = 1
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchalb.jpg"></center>'
+		if tits < 3:
+			'Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from her face to her toes and she has a firm bubble butt that''s the most girls in the school. It''s clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they have a nice firm shape to them and are bigger than your own.'
+		elseif tits = 3:
+			'Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from her face to her toes and she has a firm bubble butt that''s the envy of every girl in the school. It''s clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they are the same size as your own, with a nice firm shape to them.'
+		else
+			'Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from her face to her toes and she has a firm bubble butt that''s the envy of every girl in the school. It''s clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they have a nice firm shape to them, but are smaller than your own.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A23'] >= 70:
+					'You continue watching Albina thoroughly washing her body, paying particular attention to her tits and ass. You can''t help but watch the soapy water running down her curvy body. You gulp when she drops her shampoo bottle and bends over to pick it up, giving you a good view of both her holes. Flustered, you quickly turn around and finish your shower before she notices you staring.'
+				elseif npc_rel['A23'] <= 20:
+					sveta_dyke_rumor += 1
+					'You continue to watch Albina showering. You can''t help but watch the soapy water running down her curvy body. You''re snapped out of your mindless gaze when Albina finishes showering and turns around to catch you staring. "What the fuck do you think you''re doing, you fucking pervert?!" she screams while covering up and the rest of the girls turn to see what the commotion is about. Embarrassed at being caught, you stutter at Albina as the girls figure out what you were doing and start pointing at you and whispering among each other. Unable to answer her, Albina coldly glares at you before wrapping herself in her towel and storming out. You silently and awkwardly look at the floor as you finish showering.'
+				else
+					'You continue watching the soapy water running down Albina''s curvy body, darting your eyes away when she looks in your direction. She eventually calls your bluff and catches you bringing your gaze back to her when you think she isn''t looking. She glares at you and you panic at the thought of what she''ll do, but she doesn''t say anything and turns her shower off before wrapping herself in her towel and leaving. You breathe a sigh of relief and finish your shower.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'You look away after watching her a little longer, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Alyona':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchaly.jpg"></center>'
+		'Your attention homes in on Aylona as she soaps herself up. Her body is incredibly thin, almost anorexic and is covered in tattoos. Your attention is drawn to her small but perky breasts as she soaps them up. By the way they jiggle under her hands, they must be very soft. Between her legs is a neatly trimmed landing strip of carpet that matches the black hair that hangs just past her shoulders. She has that cute girl next door level of looks.'
+		if tits < 1:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 1:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A143'] <= 20:
+					sveta_dyke_rumor += 1
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at?" The other girls look over to see what''s going on and a few seem like they might have guessed. You turn around, blushing as you finish showering. Luckily, no one else says anything.'
+				else
+					'After watching her for a few minutes, she turns and looks at you. She stares at you for a few seconds while you glance down. When you look back up, she''s turned back around and continued showering like nothing happened. You turn back to your own shower, blushing as you finish showering.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Anushka':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchnush1.jpg"></center>'
+		'You glance at Anushka, who is standing directly under the shower letting it run down her body, plastering her short black chin length hair to her head and face. She has a petite build and has a variety of tattoos large and small covering her body. She is rather slender, her breasts are small and perky, her ass is firm and her pussy is completely smooth. She is one of the most beautiful girls in school, with a model''s face and a body.'
+		if tits < 2:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 2:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchnush2.jpg"></center>'
+			if rand (1,4) = 1:
+				if npc_rel['A144'] >= 60:
+					'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes grow wide and your mouth goes slack as you try to think of some kind of excuse. Before you can say anything, she puts her fingers up to her mouth in a V shape and sticks her tongue between them, the universal sign for eating pussy. She then turns the shower off and strides out of the room towards the lockers as if nothing happened. Letting out a breath you didn''t know you were holding, you shake your head and turn off the faucet before heading back to your locker so you can get dressed.'
+				elseif npc_rel['A144'] <= 20:
+					'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes grow wide and your mouth goes slack as you try to think of some kind of excuse. Before you can say anything, she smirks and shakes her head before she turns the shower off and strides out of the room towards the lockers as if nothing happened. Letting out a breath you didn''t know you were holding, you shake your head and turn off the faucet before heading back to your locker so you can get dressed.'
+				else
+					'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes grow wide and your mouth goes slack as you try to think of some kind of excuse. Before you can say anything, she winks and turns the shower off before striding out of the room towards the lockers as if nothing happened. Letting out a breath you didn''t know you were holding, you shake your head and turn off the faucet before heading back to your locker so you can get dressed.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Bella':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchbel.jpg"></center>'
+		'You peek at Bella, who is standing under the shower soaping herself up. She has a slim build and her pussy is shaved smooth while her long brown hair reaches half way down her back. Bella isn''t just beautiful, she rivals the looks of models and actresses - she is the prettiest girl you have ever seen.'
+		if tits < 4:
+			'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+		elseif tits = 4:
+			'Upon inspection, you notice her breasts are the same size as yours and are fairly large and firm. Her breasts are above average when compared to other girls.'
+		else
+			'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average when compared to the rest of the class.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A22'] >= 80:
+					'She turns and catches you looking at her. "<<$pcs_nickname>>, I''m thinking of growing a bush. What do you think?" She then shows you her shaved pussy. "Geez, you don''t have to stare that much." she says as she turns off the shower and walks towards the locker room.'
+				elseif npc_rel['A22'] <= 20:
+					sveta_dyke_rumor += 1
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her.  "What are you looking at, bitch? This isn''t a free show. This school is overrun with dykes."'
+					'Startled, you look away, but the damage is already done. You can hear her telling others that you were checking her out while she showered.'
+					'It would be best to finish your shower and get out of there before things get worse.'
+				else
+					sveta_dyke_rumor += 1
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What are you looking at pervert?"'
+					'Surprised, you mumble something and quickly look away, but the damage is done. You can hear her telling others you were checking her out while she showered.'
+					'It would be best to finish your shower and get out of there before things get even more awkward.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Christina':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchchr.jpg"></center>'
+		if christinaQW['dompath'] >= 7:
+			'Your attention homes in on Christina as someone calls her name and she turns to look at them. You''ve been keeping an eye on her since your little tussle, making sure she doesn''t cause any trouble. While she''s distracted by conversation, you take the opportunity to survey her from head to toe. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs. In combination with her firm breasts and neat landing strip between her legs, her figure is surprisingly pleasing, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine.'
+			*nl
+			'"Yeah, just leave it in my locker," she replies to the girl talking to her. When she turns back she looks directly at you and realizes you''ve been watching her. You give her a look and she reluctantly turns back to her shower, closing her eyes and drowning her face in the water. Nodding in satisfaction, you turn off your own faucet and grab a towel, drying yourself off on the way back to your locker.'
+		else
+			'Your attention homes in on Christina as someone calls her name and she turns to look at them. While she''s distracted by conversation, you take the opportunity to survey her from head to toe. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs. In combination with her firm breasts and neat landing strip between her legs, her figure is surprisingly pleasing, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine.'
+			*nl
+			'"Yeah, just leave it in my locker," she replies to the girl talking to her and begins to turn towards you. Not wanting to get caught peeping, you quickly turn around and shut off the faucet. Grabbing a towel, you walk back to your locker, wiping yourself dry on the way.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if christinaQW['dompath'] >= 7:
+					'After a few minutes, she feels your gaze on her and turns to face you. You give her a look and she meekly goes back to her shower, occasionally stealing looks your way to see if you''re still watching her.'
+				elseif fame['pav_slut'] >= 225:
+					sveta_dyke_rumor += 1
+					'She catches you looking at her and angrily glares at you. "No, bitch! I won''t fuck you!"'
+					'The girls around you look up, figure out what''s happening, and start laughing at you. You think now might be a good time to end your shower.'
+				elseif grupTipe = 5:
+					sveta_dyke_rumor += 1
+					'She catches you looking at her body, sneers, and says "Get lost, loser."'
+					'The girls around you look up, not sure what they missed. You think now might be a good time to end your shower, embarrassed that you were caught checking her out.'
+				else
+					sveta_dyke_rumor += 1
+					'You look a bit too long and she seems to realize that she''s being watched. When she sees it''s you, she just says "What, bitch?"'
+					'The girls around you look up, not sure what they missed. You respond with "Sorry, I just spaced out a bit there." You decide to end your shower, embarrassed that you were caught checking her out.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Irina':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchira.jpg"></center>'
+		'You peek at Irina letting the water run over her body. She has a petite build that makes her large and perky breasts seem even larger on her frame, her pussy has a neatly trimmed landing strip above it and her long blond hair reaches just past her shoulders. Irina is very pretty and would likely be considered the prettiest if not for her friend Bella.'
+		if tits < 4:
+			'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+		elseif tits = 4:
+			'Upon inspection, you notice her breasts are fairly large and firm, the same size as yours. However, compared to the other girls, her breasts are above average.'
+		else
+			'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, compared to you and your classmates, her breasts are above average.'
+		end
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A17'] >= 80:
+					'She turns and catches you staring, but just smiles. "Oh great, you''re here. I''ll need your input. We girls plan to put some money together and get Igor some penis enlargment pills."'
+					'Stasya giggles next to her and says. "Sure, Irina, that might help him."'
+					'"What''s the worse that could happen?" Irina replies.'
+					'Bella chimes in. "What if it swelled up and burst?" They all start laughing, Irina apparently having failed to notice you checking her out or simply not caring.'
+				elseif npc_rel['A17'] <= 20:
+					sveta_dyke_rumor += 1
+					'"This is a pussy." Irina says while pointing to her crotch. "You want to crawl over here and lick it, dyke?" Several girls look over, likely to see if you''re going to do it. You quickly turn back to your shower and try to ignore the comments.'
+				else
+					sveta_dyke_rumor += 1
+					'As you continue watching her, she suddenly turns around and catches you. "What the hell?! Can''t even shower in peace without some fucking muff diver drolling all over you! What''s happening to this world?" Several girls look over and follow her gaze to you. You turn around and quickly finish your shower.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Julia':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchjul.jpg"></center>'
+		'You peek at Julia soaping herself up. She has a curvy build, with large and perky breasts and a jiggly bubble butt, her pussy has a neatly trimmed landing strip above it and her long brown hair reaches just past her shoulders. She is the pretties of the nerds, being comparable to most of the jocks and cool girls.'
+		if tits < 4:
+			'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+		elseif tits = 4:
+			'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. Compared to the other girls, her breasts are above average.'
+		else
+			'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. Compared to your classmates, her breasts are above average.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A12'] >= 60:
+					'After watching her for a few minutes, she turns and looks at you. She blushes and smiles at you before she turns back to finish showering. You turn back around, blushing as you finish your own shower.'
+				elseif npc_rel['A12'] <= 20:
+					'After watching her for a few minutes, she turns and looks at you. She blushes and looks fearful before she quickly turns away, turns off the shower and leaves. You turn back, blushing as you finish your own shower.'
+				else
+					'After watching her for a few minutes, she turns and looks at you. She blushes and turns away from you before quickly turning off the shower and leaving. You turn back, blushing as you finish your own shower.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Katja':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchkat.jpg"></center>'
+		'Your attention is drawn towards Katja thoroughly washing her very long red hair that reaches half way down her back. She is petite and very slender with a clean shaven pussy. You can see why many boys and even some girls consider her to be very cute and attractive.'
+		if tits < 3:
+			'Her teardrop shaped breasts are average sized, but bigger than your own.'
+		elseif tits = 3:
+			'Her teardrop shaped breasts are average sized and around the same size as your own.'
+		else
+			'Her teardrop shaped breasts are average sized, but smaller than your own.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A14'] >= 50 and KatjaHorny >= 20:
+					'You''re unable to pull your gaze away from her and keep watching her showering until she turns and catches you staring at her. She parts her legs slightly and discreetly shows you her pussy while soaping up her breasts with a small smile. You smile back at her and you both finish showering.'
+				else
+					'You''re unable to pull your gaze away from her and keep watching her getting showering until she turns and catches you staring at her. She blushes bright red and looks a little flustered as she covers herself and quickly finishes showering before grabbing her towel, wrapping herself in it and dashing out of the room. Feeling a little embarrassed, you return your attention to your shower.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'You look away after watching her a little longer, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Katyusha':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchkaty.jpg"></center>'
+		'You take a peek at Katyusha while she stands silently under the shower. She has a few small tattoos and is incredibly toned and muscled for a girl, giving her body an almost manish quality to it. Between her legs is an unsightly bush that matches the brown hair that hangs just past her shoulders. She is not a very attractive looking girl.'
+		if tits = 0:
+			'Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. The two of you have the smallest breasts in the entire class.'
+			else
+			'Upon inspection, you notice her breasts are very small, barely more than puffy nipples. She has the smallest breasts in the entire class.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			sveta_dyke_rumor += 1
+			if rand (1,4) = 1:
+				if npc_rel['A145'] <= 20:
+					'After watching her for a few minutes, she turns and looks at you. She storms across and gets right in your face. "Keep your eyes to yourself, you fucking dyke!" Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. Once you look away, she walks back to her shower and you turn back to your own shower blushing as you finish showering. Luckily, no one else says anything.'
+				else
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at, dyke?" Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. You quickly turn back to your shower, blushing as you finish showering. Luckily, no one else says anything.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Lariska':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchlar.jpg"></center>'
+		'Your attention homes in on Lariska, who is letting the water from the shower pour over her head, rinsing the suds from her body. She is tall and lanky with narrow hips and small perky breasts. The stream of water running down her stomach draws your eyes between her legs, soap collecting and washing through the natural filter of her neatly trimmed bush. All told she is has that cute girl next door level of looks.'
+		if tits < 1:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than almost all of your classmates.'
+		elseif tits = 1:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if LariskaQW['story'] >= 8:
+					'Almost as if she knew you were looking, she turns her naked body towards you. Her eyes are closed, but a flush starts creeping up her neck. She starts to cup her perky little breasts but stops, seemingly remembering she is in a public place.'
+					'Smiling to yourself, you think you should probably finish your shower before somebody notices you oggling her naked body.'
+				elseif fame['pav_slut'] >= 225 or grupTipe = 5:
+					'Feeling somebody watching her, she looks around until she sees you. Turning red, she gives you a strange look before going back to showering.'
+					'You should finish your shower before somebody else notices you staring at her.'
+				elseif npc_rel['A13'] >= 50:
+					'Feeling somebody watching her, she looks around until she sees you. She gives you a friendly smile and a wave before going back to showering.'
+					'You should finish your shower before somebody else notices you staring at her.'
+				elseif npc_rel['A13'] <= 20:
+					'Feeling somebody watching her, she looks around until she sees you. Looking annoyed, she ignores you as she goes back to showering.'
+					'You should finish your shower before somebody else notices you staring at her.'
+				else
+					'Feeling somebody watching her, she looks around until she sees you. She gives you a friendly smile before going back to showering.'
+					'You should finish your shower before somebody else notices you staring at her.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Lena':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchlen.jpg"></center>'
+		'Your attention homes in on Lena, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is curvy with large breasts and a fairly large butt, with a few small tattoos dotted around. Between her legs is a neatly trimmed landing strip of brown hair while her red dyed hair hangs just past her shoulders. She has that cute girl next door level of looks.'
+		if tits < 4:
+			'Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.'
+		elseif tits = 4:
+			'Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. Compared to the other girls, her breasts are above average.'
+		else
+			'Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. Compared to your classmates, her breasts are above average.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A20'] >= 60:
+					'After watching her for a few minutes, she turns and looks at you. She gives you a knowing smirk, but it seems like she doesn''t really care as she just turns back and keeps showering. You turn back to your own shower, blushing as you finish showering. Luckily, no one else seems to have noticed.'
+				elseif npc_rel['A20'] <= 20:
+					sveta_dyke_rumor += 1
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck? Are you checking me out? Keep your eyes to your fucking self, pervert!" Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. Once you look away, she goes back to showering while muttering and you turn back to your own shower, blushing as you finish showering.'
+				else
+					sveta_dyke_rumor += 1
+					'After watching her for a few minutes, she turns and looks at you. "Are you checking me out? Fucking pervert." Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. You quickly turn back to your own shower, blushing as you finish showering.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Lera':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchler.jpg"></center>'
+		'Your attention homes in on Lera, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is fairly normal looking with a few small tattoos dotted around. Between her legs is a neatly trimmed V of brown hair, while her long brown highlighted hair hangs part way down her back. She has that cute girl next door level of looks. '
+		if tits < 3:
+			'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but are average sized compared to the rest of your classmates.'
+		elseif tits = 3:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are about average sized.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A21'] >= 60:
+					'After watching her for a few minutes, she turns and looks at you. She gives you a knowing smile and spreads her legs slightly before indicating down with her eyes, inviting you to come over and eat her out. You quickly turn back to your shower, blushing as you finish showering. Luckily, no one else seems to have noticed.'
+				elseif npc_rel['A21'] <= 20:
+					sveta_dyke_rumor += 1
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck? You checking me out? I know you want my pussy, but I''ve got standards loser, so fuck off!" Her comments cause other girls to look over to see what''s going on. Once you look away, she goes back to showering while muttering the whole time and you turn back to your own shower, blushing as you finish showering. Luckily, no one else says anything.'
+				else
+					sveta_dyke_rumor += 1
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at? You like staring at my pussy? Well why don''t you crawl over here and give her a lick?" Her comment causes other girls to look over to see what''s going on and a few give disgusted looks, but most just laugh. You quickly turn back to your shower, blushing as you finish showering.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Lina':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchlin.jpg"></center>'
+		'Your attention homes in on Lina as she soaps herself up. She is slightly more athletic looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs, highlighted by the soap suds collecting in it. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact most of the boys think she''s rather pretty and you''re inclined to agree.'
+		if tits < 2:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 2:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+		end
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if avelinaQW['encourage'] >= 1:
+					'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she gives you a warm smile before continuing her shower.'
+					'You should get back to your own shower before others notice you staring.'
+				elseif fame['pav_slut'] >= 225:
+					'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she sneers and mutters "lesbo slut" loud enough for you to hear. She then goes back to her shower and ignores you.'
+					'You should get back to your own shower before others notice you staring.'
+				elseif grupTipe = 5:
+					'She seems into her shower, when she suddenly stops and looks at you. Seeing you staring, she gives you a disgusted look before going back to her shower and ignoring you.'
+					'You should get back to your own shower before others notice you staring.'
+				elseif npc_rel['A19'] >= 50:
+					'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she gives you a friendly smile and a wave before continuing her shower.'
+					'You should get back to your own shower before others notice you staring.'
+				elseif npc_rel['A19'] <= 20:
+					'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she gives you a cold look before continuing her shower.'
+					'You should get back to your own shower before others notice you staring.'
+				else
+					'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she gives you a hesitant smile before continuing her shower.'
+					'You should get back to your own shower before others notice you staring.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few minutes, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Lizaveta':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchliz.jpg"></center>'
+		'Your attention homes in on Lizaveta as she soaps herself up. She has reddish-brown hair that goes just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.'
+		if tits < 2:
+			'Looking further, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 2:
+			'Looking further, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are a little small.'
+		else
+			'Looking further, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are a little small.'
+		end
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				gs 'fame', 'pav', 'sex', 10
+				sveta_dyke_rumor += 1
+				if fame['pav_slut'] >= 200:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What do you want, slut? Can''t get enough cock to satisfy you?"'
+					'Startled, you look away, but the damage is already done. You can hear her telling the others that you were staring at her while she showered.'
+					'It would be best for you to finish your shower and leave before things get worse.'
+				elseif grupTipe = 5:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "Oh my god, freak! Quit staring at me!"'
+					'Startled, you look away, but the damage is already done. You can hear her telling the others that you were staring at her while she showered.'
+					'It would be best for you to finish your shower and leave before things get worse.'
+				elseif npc_rel['A140'] >= 60:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What''s the matter, <<$pcs_nickname>>?"'
+					'Surprised, you mumble something and quickly look away, but the damage is done. You can hear her telling the others that you were staring at her while she showered.'
+					'It would be best for you to finish your shower and leave before things get even more awkward.'
+				elseif npc_rel['A140'] <= 20:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What do you want, bitch? This isn''t a free show."'
+					'Startled, you look away, but the damage is already done. You can hear her telling the others that you were staring at her while she showered.'
+					'It would be best for you to finish your shower and leave before things get worse.'
+				else
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What do you want, <<$pcs_nickname>>?"'
+					'Surprised, you mumble something and quickly look away, but the damage is done. You can hear her telling the others that you were staring at her while she showered.'
+					'It would be best for you to finish your shower and leave before things get even more awkward.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Natasha':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchnat.jpg"></center>'
+		'Your attention homes in on Natasha as she soaps herself up. She has very long light brown hair reaching half way down her back and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.'
+		if tits < 5:
+			'Looking closer, you notice her breasts are large, but have a nice firm shape to them. She has the biggest breasts in the entire class, although the popular girls would never admit their jealousy.'
+		elseif tits = 5:
+			'Looking closer, you notice her breasts are the same size as your own and are large and firm. They are the largest among your classmates, although the popular girls would never admit their jealousy.'
+		else
+			'Looking closer, you notice her breasts are large and firm, but still not as large as yours. However, her breasts are larger than any of the other girls, although the popular girls would never admit their jealousy.'
+		end
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if NatbelQW['QWstage'] > 5:
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she smiles mischievously and lathers her hands in soap before bending over and washing her slightly spread legs, giving you a perfect view of her pussy.'
+					'Straightening back up, she smiles at you again and starts to rinse off, her face bright red, but looking pleased.'
+					'You should finish your shower and leave before somebody notices her giving you such a good view.'
+				elseif npc_rel['A16'] >= 50:
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she covers herself as best she can and turns away, her face red.'
+					'You should finish your shower and leave before this gets more awkward.'
+				elseif npc_rel['A16'] <= 20 or grupTipe = 5 or fame['pav_slut'] >= 200:
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she covers herself as best she can and turns away, her face red with anger.'
+					'You should finish your shower and leave before this gets more awkward.'
+				else
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she covers herself as best she can and turns away, her face red with embarrassment.'
+					'You should finish your shower and leave before this gets more awkward.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Pauline':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchpau.jpg"></center>'
+		'Your attention homes in on Pauline as she soaps herself up. She is slightly more muscular looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs that matches her long black hair that hangs just past her shoulders. She doesn''t stand out in any particular way, but you''d never call her ugly.'
+		if tits < 3:
+			'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but are average sized compared to the rest of your classmates.'
+		elseif tits = 3:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are about average sized.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			sveta_dyke_rumor += 1
+			if rand (1,4) = 1:
+				if npc_rel['A24'] <= 20:
+					'After watching her for a few minutes, she turns and looks at you. "I don''t like pussy dyke, so keep your eyes to your fucking self." Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. Once you look away, she goes back to showering while muttering and you turn back to your own shower, blushing as you finish showering. Luckily, no one else says anything.'
+				else
+					'After watching her for a few minutes, she turns and looks at you. "What the fuck are you looking at? Are you another carpet muncher? Can''t a girl shower in peace?!" Her comments cause other girls to look over to see what''s going on and a few seem like they might have guessed. You quickly turn back to your shower, blushing as you finish showering. Luckily, no one else says anything.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Sonia':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
+		'Your attention homes in on Sonia as she soaps herself up. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.'
+		if tits < 2:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 2:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are a little small.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			*clr & cla
+			if rand (1,4) = 1:
+				if npc_rel['A25'] >= 60:
+					if soniaPS = 0:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
+						'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a smile and turns, giving you a better look.'
+						'You should finish showering and leave before this gets more awkward.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson2.jpg"></center>'
+						'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she smiles mischievously before dropping the soap. She slowly bends over with her legs slightly spread and picks it up, giving you a perfect view of her pussy.'
+						'Straightening back up, she smiles at you again and starts to rinse off. You should finish your shower and leave before somebody notices her giving you such a good view.'
+					end
+				elseif npc_rel['A25'] <= 20:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
+					'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a dirty look and turns around, hiding her body.'
+					'You should finish showering and leave before it gets more awkward.'
+				else
+					if soniaPS = 0:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
+						'She seems to be enjoying her shower when she suddenly stops and looks at you. Seeing you staring, she gives you a hesitant smile before continuing her shower.'
+						'You should get back to your own shower before others notice you staring.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson2.jpg"></center>'
+						'You''re unable to pull your gaze away from her and keep watching her showering until she turns and catches you staring. She parts her legs slightly and discreetly shows you her pussy while soaping up her breasts with a small smile. You smile back at her and you both finish showering.'
+					end
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
+				'After watching for a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Stasya':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch' + rand(1,4) + '.jpg"></center>'
+		'Your attention homes in on Stasya as she soaps herself up. She has long black hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a completely smooth pussy. She has that cute girl next door level of looks.'
+		if tits < 3:
+			'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average compared to the rest of your classmates.'
+		elseif tits = 3:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				sveta_dyke_rumor += 1
+				if npc_rel['A139'] >= 60:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What are you looking at <<$pcs_nickname>>?"'
+					'Surprised, you mumble something and quickly look away, but the damage is done. You can hear her telling the others that you were checking her out while she showered.'
+					'It would be best for you to finish your shower and leave before things get even more awkward.'
+				elseif npc_rel['A139'] <= 20:
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her.  "What do you want, bitch? This isn''t a free show pervert! Fuck, you can''t even take a shower in peace without some fucking dyke staring at you."'
+					'Startled, you look away, but the damage is already done. You can hear her telling the others that you were checking her out while she showered.'
+					'It would be best for you to finish your shower and leave before things get worse.'
+				else
+					'She seems to be enjoying her shower when she looks in your direction and notices you staring at her. "What are you looking at pervert?"'
+					'Surprised, you mumble something and quickly look away, but the damage is done. You can hear her telling the others that you were checking her out while she showered.'
+					'It would be best for you to finish your shower and leave before things get even more awkward.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Veronika':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchver.jpg"></center>'
+		'Your attention is drawn to Veronika silently and stiffly standing under the shower as the water rains down over her head. She is slightly taller than most girls and is slim and slightly muscular with a neatly trimmed triangle of pubic hair atop her pussy that matches the long blond hair that reaches half way down her back.'
+		if tits < 3:
+			'Upon inspection, you notice her breasts have a nice firm shape to them. They are bigger than yours, but about average compared to the rest of your classmates.'
+		elseif tits = 3:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are about average sized.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A141'] <= 20:
+					'You continue to watch Veronika showering before she suddenly turns around and catches you staring. She silently glares at you while covering herself and you quickly turn around and return your focus to showering. When you glance back, you see Veronika staring at you as she wraps herself in her towel before leaving.'
+				else
+					'You continue to watch Veronika showering before she suddenly turns around and catches you staring. She gives you a blank stare in return and you both stand in awkward silence before you decide to just turn around and finish showering. Veronika casually goes back to what she was doing as if nothing happened.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'You look away after watching her a little longer, not wanting to get caught staring and sucked into an awkward conversation.'
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Vicky':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchvic.jpg"></center>'
+		'You see Vicky taking her shower, with her long red hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. You can see why many boys and even some girls consider her to be very cute and attractive.'
+		if tits < 3:
+			'Looking closer, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but is about average sized compared to the rest of your classmates.'
+		elseif tits = 3:
+			'Looking closer, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.'
+		else
+			'Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average sized with a nice firm shape to them.'
+		end
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A15'] <= 20 or grupTipe = 5:
+					'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a dirty look and turns around, hiding her body.'
+					'You should finish showering and leave before this gets more awkward.'
+				else
+					'Letting your gaze linger, you are surprised when she suddenly looks in your direction. Seeing you staring, she gives you a smirk and turns her body, giving you a better look.'
+					'You should finish showering and leave before this gets more awkward.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+	act 'Check out Zinaida':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchzin.jpg"></center>'
+		'Your attention homes in on Zinaida as she soaps herself up in the shower. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a bush of pubic hair. She doesn''t stand out in any particular way, but you''d never call her ugly.'
+		if tits < 2:
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.'
+		elseif tits = 2:
+			'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.'
+		else
+			'Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.'
+		end
+		*nl
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Keep checking her out':
+			cla
+			if rand (1,4) = 1:
+				if npc_rel['A142'] >= 60:
+					'After watching her for a few minutes, she turns and looks at you. She blushes and quickly turns away from you before rinsing off, turning off the shower and leaving. You turn back to your own shower, blushing as you finish showering.'
+				elseif npc_rel['A142'] <= 20:
+					'After watching her for a few minutes, she turns and looks at you. She blushes and looks fearful as she quickly turns away from you and turns off the shower before leaving. You turn back to your own shower, blushing as you finish showering.'
+				else
+					'After watching her for a few minutes, she turns and looks at you. She blushes as she quickly turns away from you and turns off the shower before leaving. You turn back to your own shower, blushing as you finish showering.'
+				end
+				gs'arousal','erotic_nudity', 3
+				gs 'stat'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After watching her a little longer, 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','shower_watch_end'
+			end
+		end
+	end
+end
+
+--- gschool_post_shower ---------------------------------
+

+ 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."'

+ 1 - 1
locations/hotel_anna.qsrc

@@ -199,7 +199,7 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy1b.jpg"></center>'
 		'<font color = blue>"Crap even the reduction surgery wasn''t enough then, it''s always the same."'
 		'You are surprised by such candid talk about cosmetic surgery'
-		'"Don''t not mind me <<$pcs_nickname>>, the main thing is that you listen"'
+		'"Don''t mind me <<$pcs_nickname>>, the main thing is that you listen"'
 		'"In BDSM we use a lot of furniture, some are fixed, some not and some are semi-fixed. I cannot bring fixed furniture for obvious reasons, so we only have furniture that is not fixed and toys. Today we''ll look at some toys, next time furniture and restraining. The toys i''m showing you today can be used alone or with other toys. Some toys are for pain and pleasure in general, but others can be used to increase the sensations experienced during sexual acts. I can demonstrate one with you but wait until the end before you decide if you want a demonstration, first I''ll show you the items then you can make an informed choice, shall we start?" You nod.'
 		'Oh! About drugs, they are strictly forbidden due to the nature of BDSM itself, we cannot trust our judgement or that of someone else if they are pissed or stoned it could be dangerous and it can damage the relationship, which would undermine everything. That''s not to say those in a BDSM relationship cannot drink or do drugs, only that they should not be whipping each other when they do."'
 		gs 'hotel_anna', '3a'

+ 3 - 22
locations/hotel_anna_gear.qsrc

@@ -118,8 +118,7 @@ if $ARGS[0] = 'toys_vacuum':
 		gs 'stat'
 		$anna_toys_image5
 		'"Absolutely. Nothing will go wrong I can promise you that. I have to stay here and monitor as is edgeplay after all, and I cannot allow you to do that alone. Hope you can understand. If you want you could try the manual cups; they are more difficult to use but they are safer and easier to control for inexperienced people. I''ll put one on you and you''ll follow my example with another one. Ready?"'
-		act'OK...':
-		end
+		act'OK...': AnnaQW['sub'] += 1 & gt 'hotel_anna_gear', 'toys_vacuum3'
 		act'I''m sorry Anna, maybe another time...':
 			*clr & cla
 			gs 'stat'
@@ -133,7 +132,7 @@ if $ARGS[0] = 'toys_vacuum':
 		gs 'stat'
 		$anna_toys_image5
 		'"Ok, i''ll give you a demonstration, pay attention because without trying this on yourself you won''t understand what''s the correct pressure and adjustments you have to mak1e to have a secure grip can be compromised."'
-		act'OK': gt 'hotel_anna_gear', 'toys_vacuum2'
+		act'OK': AnnaQW['dom'] += 1 & gt 'hotel_anna_gear', 'toys_vacuum2'
 		act'Perhaps some other time.':
 			*clr & cla
 			gs 'stat'
@@ -146,26 +145,10 @@ if $ARGS[0] = 'toys_vacuum':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['switch'] += 1
-		BDSM_Knowledge += 1
 		$anna_toys_image5
 		'"Well if you are willing of course, but not without me being there. Nothing will go wrong I can promise you that, but this is edgeplay and I cannot allow you to this alone. I hope you can understand.'
 		'I can make a practical demonstration on myself if you prefer but it''s up to you. If you want to try by yourself you have to try with the manual cups, they are more difficult to use but they are safer and easier to control for inexperienced people. I''ll put one on you and you''ll follow my example with another one. Ready?"'
-		act'Ok...I''ll try by myself...':
-			*clr & cla
-			gs 'stat'
-			'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/vacuums.mp4"></video></center>'
-			'You remove your shirt and Anna puts a vacuum cup on one of your nipples. "Ok. Now you do the other one..." You try to put the cup following Anna instruction; the cup stays in place for few second.'
-			'"It won''t stay in place!"'
-			'"Exactly...they are more difficult to use. It''s a matter of experience, but with the manual cups you can avoid easily some bad mistakes with the pump unit. Some lube or your own spit can help; the skin isn''t like a mirror, so the grip isn''t secure, especially at the beginning. Ok...i think that''s enough for today."'
-			act'Stop':
-				*clr & cla
-				gs 'stat'
-				$anna_toys_image5
-				'"Thank you Anna. It was an interesting experience."'
-				'"Yes, you''ll feel more sensitive for a little while as the suction draws more blood to the area making the nerves more active. Next time we''ll be looking at restraints if you wish to learn more."'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
-			end
-		end
+		act'Ok...I''ll try by myself...': gt 'hotel_anna_gear', 'toys_vacuum3'
 		act'I prefer to watch you, Anna, if you don''t mind...': gt 'hotel_anna_gear', 'toys_vacuum2'
 	end
 	act'Leave':
@@ -180,7 +163,6 @@ end
 if $ARGS[0] = 'toys_vacuum2':
 	*clr & cla
 	gs 'stat'
-	AnnaQW['dom'] += 1
 	BDSM_Knowledge += 1
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/vacuuma.mp4"></video></center>'
 	'Anna puts the pump on and adjusts the settings to create a vacuum. "Hope you don''t mind...I enjoy a bit more pressure than you can get with the manual ones." The cup stays firmly in place and you can see clearly that her nipple is dragged forward by the pressure; immediately Anna starts to move the cup.'
@@ -200,7 +182,6 @@ end
 if $ARGS[0] = 'toys_vacuum3':
 	*clr & cla
 	gs 'stat'
-	AnnaQW['sub'] += 1
 	BDSM_Knowledge += 1
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/vacuums.mp4"></video></center>'
 	'You remove your top and Anna puts a vacuum cup on one of your nipples. "Ok. Now you do the other one." You try to attach the cup following Anna instruction but the cup only stays in place for few seconds.'

+ 61 - 61
locations/HotelWork.qsrc → locations/hotel_work.qsrc

@@ -1,4 +1,4 @@
-# HotelWork
+# hotel_work
 !!2021/05/02
 
 if $ARGS[0] = 'hotcouple':
@@ -67,7 +67,7 @@ if $ARGS[0] = 'hotcouple':
 						'"Do you want him to come all over your face?"'
 						'"Yeah sure, that is fine."'
 						'You lay down on your back.'
-						act 'Finish': gt 'HotelWork', 'hotcoupfin'
+						act 'Finish': gt 'hotel_work', 'hotcoupfin'
 					end
 				else
 					act 'No, I want to save myself (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -84,11 +84,11 @@ if $ARGS[0] = 'hotcouple':
 					'You could feel every inch of his <<dick>> cm dick inside you now. He gave you a little wink and then started moving again.'
 					'While he was fucking you Uliana gently rubbed against your clit while kissing her husband.'
 					'After a few minutes you all changed positions.'
-					act 'Continue': gt 'HotelWork', 'hotcoupledoggy'
+					act 'Continue': gt 'hotel_work', 'hotcoupledoggy'
 				end
 			else
 				'"Well darling I have bad news and good news. The bad news is that you won''t be able to fuck a virgin this time. The good news is that she is definitely ready to accept your beautiful dick" Uliana said while she put her fingers, soaked with your juices, in Motya''s mouth.'
-				act 'Continue': gt 'HotelWork', 'hotcoupledoggy'
+				act 'Continue': gt 'hotel_work', 'hotcoupledoggy'
 			end
 		end
 	end
@@ -102,7 +102,7 @@ if $ARGS[0] = 'hotcoupledoggy':
 	gs 'arousal', 'vaginal', 10
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	act 'Continue': gt 'HotelWork', 'hotcoupfin'
+	act 'Continue': gt 'hotel_work', 'hotcoupfin'
 end
 if $ARGS[0] = 'hotcoupfin':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotcouple8.jpg"></center>'
@@ -239,8 +239,8 @@ end
 
 if $ARGS[0] = 'maid':
 	$loc_arg = 'maid'
-	$loc = 'HotelWork'
-	$menu_loc = 'HotelWork'
+	$loc = 'hotel_work'
+	$menu_loc = 'hotel_work'
 	$menu_arg = 'maid'
 	menu_off = 0
 	$location_type = 'event'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'maid':
 							'"Ok then, girl, have it your way. Come on in"'
 							prosmoneyhot = 0
 
-							act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
+							act 'Enter the room': gt 'hotel_work', 'firsthotelprosevent'
 						end
 					else
 						act 'Yes, but I want double my money back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -321,7 +321,7 @@ if $ARGS[0] = 'maid':
 							'"Just bring that tight ass in here and have some fun with us. I promise you''ll get what you''re after." The devious look on his face gives you second thoughts, but you enter the room anyways, feeling completely out of options.'
 							prosmoneyhot = 1
 
-							act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
+							act 'Enter the room': gt 'hotel_work', 'firsthotelprosevent'
 						end
 					else
 						act 'Yes, but I want all my money back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -333,7 +333,7 @@ if $ARGS[0] = 'maid':
 						'"Just bring that tight ass in here and have some fun with us. I promise you''ll get what you''re after." The devious look on his face gives you second thoughts, but you enter the room anyways, feeling completely out of options.'
 						prosmoneyhot = 2
 
-						act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
+						act 'Enter the room': gt 'hotel_work', 'firsthotelprosevent'
 					end
 				end
 			end
@@ -538,7 +538,7 @@ if $ARGS[0] = 'maid':
 
 				if chai > 0:money += chai & 'While you''re cleaning the room, you find some money underneath a pillow. Looks like someone left you a <<chai>> <b>₽</b> tip!' & chai=0
 
-				act 'Continue': gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotel_work', 'maid'
 			elseif maidrand <= 15:
 				if maidcheck_1 = daystart: jump 'new_maid_event'
 				maidcheck_1 = daystart
@@ -561,7 +561,7 @@ if $ARGS[0] = 'maid':
 					act 'No, this is none of my business':
 						cla
 						if maidstat < 100:maidstat+=1
-						act 'Continue': gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotel_work', 'maid'
 					end
 					act 'Yeah, let''s see what'' s on these pictures':
 						*clr & cla
@@ -573,10 +573,10 @@ if $ARGS[0] = 'maid':
 						'You wonder what would happen if you went to the lobby around midnight?'
 						resepseen = 1
 						observ_exp += rand(0,3)
-						act 'Place the pictures back and continue your maid work ': gt 'hotelwork', 'maid'
+						act 'Place the pictures back and continue your maid work ': gt 'hotel_work', 'maid'
 					end
 				else
-					act 'Continue': gt 'hotelwork', 'maid'
+					act 'Continue': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 20:
 				if maidcheck_2 = daystart: jump 'new_maid_event'
@@ -596,7 +596,7 @@ if $ARGS[0] = 'maid':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/children.jpg"></center>'
 							'You let the children play around for an hour while you relax on a bench.'
 							'You take the children back to the parent''s room and continue your work.'
-							act 'Continue': gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotel_work', 'maid'
 						end
 						if childrenplayground = 1:
 							pcs_mood += 10
@@ -606,7 +606,7 @@ if $ARGS[0] = 'maid':
 							'When it is time to leave you call out to the children but they are nowhere to be found. Then you notice them next to an ice cream truck happily eating some ice cream. You had to use half the money you received from their father to pay for it.'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/children3.jpg"></center>'
 							'You take the children back to the parent''s room and continue your work'
-							act 'Continue': gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotel_work', 'maid'
 						end
 					end
 				else
@@ -617,7 +617,7 @@ if $ARGS[0] = 'maid':
 						'You take the children back to the parent''s room and continue your work'
 						gs 'pain', 2,'head', 'ache'
 						pcs_mood -= 5
-						act 'Continue': gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotel_work', 'maid'
 					end
 				end
 			elseif maidrand <= 35:
@@ -628,7 +628,7 @@ if $ARGS[0] = 'maid':
 
 				if chai > 0:money += chai &'While you move to pick up a tray, you find some money tucked under a plate. Looks like someone left you a <<chai>> <b>₽</b> tip!'&chai=0
 
-				act 'Continue': gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotel_work', 'maid'
 			elseif maidrand <= 40:
 				if maidcheck_3 = daystart: jump 'new_maid_event'
 				maidcheck_3 = daystart
@@ -643,7 +643,7 @@ if $ARGS[0] = 'maid':
 				'You felt sorry for the man but there was not much more you could do for him'
 				'Just when you were about to leave the room you notice that the man is sitting on the edge of the bed and is on the verge of tears. He doesn''t know what to do now.'
 
-				act 'Leave the room': gt 'hotelwork', 'maid'
+				act 'Leave the room': gt 'hotel_work', 'maid'
 				
 				gs 'willpower', 'hj', 'self'
 				if will_cost <= pcs_willpwr:
@@ -673,7 +673,7 @@ if $ARGS[0] = 'maid':
 							'You give him a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up, go wash your hands in the bathroom and leave the room to continue your work.'							
 						end
 
-						act 'Continue': gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Try to cheer up the man with your hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'maid':
 							pcs_mood -= 5
 							gs 'stat'
 
-							act 'Continue': gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotel_work', 'maid'
 						elseif stat['bj'] => 5:
 							'You move to the bed and crawled on it. You grab the man by the hip and turn him towards you. Then you moved your head down to his crotch and take his flacid penis in your hand. You place your mouth over the man''s penis and slowly start sucking on it. The man groans a little bit and you feel his dick becoming harder in your mouth.'
 							'The man watches you but doesn''t say anything'
@@ -721,7 +721,7 @@ if $ARGS[0] = 'maid':
 										'You swallow the man''s sperm diligently.'
 										'You give him a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up to leave the room and continue your work.'
 										
-										act 'Continue': gt 'hotelwork', 'maid'
+										act 'Continue': gt 'hotel_work', 'maid'
 									end
 								else
 									act 'Swallow his load (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -734,7 +734,7 @@ if $ARGS[0] = 'maid':
 
 									'After the man spent his load in your mouth you stand up, go to the bathroom and spit out the load in the toilet. You move back in to the room and you give him a little smile, he smiles back at you. You are happy you were able to cheer him up. Then you leave the room to continue your work.'
 
-									act 'Continue': gt 'hotelwork', 'maid'
+									act 'Continue': gt 'hotel_work', 'maid'
 								end
 							end
 							gs 'willpower', 'cum_outside', 'self'
@@ -751,7 +751,7 @@ if $ARGS[0] = 'maid':
 									'You quickly move your head back and suddenly the cock starts spurting jets of sperm on to your face.'
 									'You give the man a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up to leave the room and continue your work.'
 
-									act 'Continue': gt 'hotelwork', 'maid'
+									act 'Continue': gt 'hotel_work', 'maid'
 								end
 							else
 								act 'Take his cock out of your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -768,7 +768,7 @@ if $ARGS[0] = 'maid':
 				'You thoroughly clean the room, making sure you wipe all the dust off the furniture.'
 				if chai > 0: money += chai & 'You find <<chai>> <b>₽</b> in a jar on the table. Looks like someone left you a tip!' & chai = 0
 
-				act 'Continue': gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotel_work', 'maid'
 			elseif maidrand <= 70:
 				minut+=45
 				gs 'stat'
@@ -776,7 +776,7 @@ if $ARGS[0] = 'maid':
 				'You spend most of the next 45 minutes on your knees, thoroughly washing the floors of the room after you cleaned the rest quickly.'
 				if chai > 0: money += chai & 'You find <<chai>> <b>₽</b> in a jar on the table. Looks like someone left you a tip!' & chai = 0
 
-				act 'Continue': gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotel_work', 'maid'
 			elseif maidrand <= 75:
 				minut += 10
 				gs 'stat'
@@ -795,10 +795,10 @@ if $ARGS[0] = 'maid':
 						chai=0
 						cla
 
-						act 'Continue': gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotel_work', 'maid'
 					end
 				else
-					act 'Keep walking': gt 'hotelwork', 'maid'
+					act 'Keep walking': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 85:
 				'<center><video autoplay loop src="images/locations/pavlovsk/hotel/sex/1,'+rand(0,7)+'.mp4"></video></center>'
@@ -812,7 +812,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -825,7 +825,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 95:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event3,'+rand(0,7)+'.jpg"></center>'
@@ -839,7 +839,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -853,7 +853,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 100:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event4,'+rand(0,6)+'.jpg"></center>'
@@ -868,7 +868,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -882,7 +882,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 110:	
 				if maidcheck_4 = daystart: jump 'new_maid_event'
@@ -895,7 +895,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -951,7 +951,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act'Get back to work':gt'hotelwork','maid'
+								act'Get back to work':gt'hotel_work','maid'
 							end
 						end
 					end
@@ -991,7 +991,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Get back to work': gt 'hotelwork', 'maid'
+								act 'Get back to work': gt 'hotel_work', 'maid'
 							end
 						end
 					end
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act'Get back to work':gt'hotelwork','maid'
+								act'Get back to work':gt'hotel_work','maid'
 							end
 						end
 					end
@@ -1090,7 +1090,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Get back to work': gt 'hotelwork', 'maid'
+								act 'Get back to work': gt 'hotel_work', 'maid'
 							end
 						end
 					end
@@ -1155,7 +1155,7 @@ if $ARGS[0] = 'maid':
 									'You are not sure what to make of all this, you want to find out what it is all about but worry she might have any ulterior motives.'
 									gs 'stat'
 
-									act 'Get back to work': gt 'hotelwork', 'maid'
+									act 'Get back to work': gt 'hotel_work', 'maid'
 								end
 							end
 						end
@@ -1168,10 +1168,10 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				end
 			elseif maidrand <= 120:
-				if maidrand[1] = daystart: gt 'hotelwork', 'maid'
+				if maidrand[1] = daystart: gt 'hotel_work', 'maid'
 				maidrand[1] = daystart
 				if rand(0,5) < 2:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/bed'+rand(1,2)+'.jpg"></center>'
@@ -1179,11 +1179,11 @@ if $ARGS[0] = 'maid':
 					'"Hi, I work evenings and was just relaxing before my shift. Can you come back later?" She asks"'
 					'You have more rooms to do so it is easy enough to come back after cleaning them, so you agree.'
 
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				elseif rand(0,5) < 3:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/tipsy1.jpg"></center>'
 					'As you are cleaning the guest walks in. She looks like she has had a few drinks and just waves you out of her way.'
-					'She is wear just a bra, mini skirt and heels all in black. You would guess she''d been clubbing but at this time?'
+					'She is wearing just a bra, mini skirt and heels all in black. You would guess she''d been clubbing but at this time?'
 					'It''s either too early or far too late.'
 					
 					act 'Move aside and let her pass':
@@ -1203,7 +1203,7 @@ if $ARGS[0] = 'maid':
 							'Promptly your free show ends as she rolls over and passes out'
 							'You had mostly finished her room and this situation might look bad if you boss saw you so you gather your things and leave feeling a little more aroused then when you started.'
 							
-							act 'Get back to work': gt 'hotelwork', 'maid'
+							act 'Get back to work': gt 'hotel_work', 'maid'
 						end
 					end
 				elseif rand(0,5) < 4:
@@ -1215,13 +1215,13 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				elseif rand(0,5) < 5:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/underwear.jpg"></center>'
 					'You walk in to the room to find a regular guess standing in her room in just her underwear.'
 					'She is not looking in your direction so you just back out and close the door.'
 					
-					act 'Get back to work': gt 'hotelwork', 'maid'
+					act 'Get back to work': gt 'hotel_work', 'maid'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate1.jpg"></center>'
 					'You walk in to the room and see a regular guest on her bed naked and clearly masturbating.'
@@ -1237,7 +1237,7 @@ if $ARGS[0] = 'maid':
 							gs 'willpower', 'voyeur', 'resist'
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'hotelwork', 'maid'
+							gt 'hotel_work', 'maid'
 						end
 					else
 						act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1259,7 +1259,7 @@ if $ARGS[0] = 'maid':
 								gs 'willpower', 'voyeur', 'resist'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'hotelwork', 'maid'
+								gt 'hotel_work', 'maid'
 							end
 						else
 							act 'Maybe you should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1281,7 +1281,7 @@ if $ARGS[0] = 'maid':
 									gs 'willpower', 'voyeur', 'resist'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'hotelwork', 'maid'
+									gt 'hotel_work', 'maid'
 								end
 							else
 								act 'You really should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1304,7 +1304,7 @@ if $ARGS[0] = 'maid':
 									'She is lying back recovering, the occasional twitch the only sign that she is still concious.'
 									'You go to pass her a towel so she can stop her juice dripping on to the sheets before you catch yourself and sneak out of the room.'
 									
-									act 'Get back to work': gt 'hotelwork', 'maid'
+									act 'Get back to work': gt 'hotel_work', 'maid'
 								end
 							end
 						end
@@ -1317,7 +1317,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 
-				act 'Get back to work': gt 'hotelwork', 'maid'
+				act 'Get back to work': gt 'hotel_work', 'maid'
 
 				if hotel_rand1 <= 60:
 					act 'Keep watching':
@@ -1328,7 +1328,7 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Get back to work': gt 'hotelwork', 'maid'
+						act 'Get back to work': gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Keep watching':
@@ -1346,7 +1346,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Get back to work': gt 'hotelwork', 'maid'
+							act 'Get back to work': gt 'hotel_work', 'maid'
 						end
 					end
 				end
@@ -1364,7 +1364,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Get back to work': gt 'hotelwork', 'maid'
+						act 'Get back to work': gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Keep watching':
@@ -1397,7 +1397,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Get back to work': gt 'hotelwork', 'maid'
+							act 'Get back to work': gt 'hotel_work', 'maid'
 						end
 					end
 				end
@@ -1414,7 +1414,7 @@ if $ARGS[0] = 'maid':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'hotelwork', 'maid'
+						gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Get back to work': gt 'hotelwork', 'maid'
+						act 'Get back to work': gt 'hotel_work', 'maid'
 					end
 				else
 					act 'Keep watching':
@@ -1447,7 +1447,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Get back to work': gt 'hotelwork', 'maid'
+							act 'Get back to work': gt 'hotel_work', 'maid'
 						end
 					end
 				end
@@ -1456,5 +1456,5 @@ if $ARGS[0] = 'maid':
 	end
 end
 
---- HotelWork ---------------------------------
+--- hotel_work ---------------------------------
 

+ 81 - 0
locations/kafesvid.qsrc

@@ -408,6 +408,87 @@ if $ARGS[0] = '2':
 					end
 				end
 			end
+			act 'Anal instead':
+				*clr & cla
+				spafinloc = 3
+				gs 'cum_manage'
+				analorgasm += 1
+				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/19.jpg"></center>'
+				'You bend over the table and spread your asscheeks instead. <<$telsob>> smiles and agrees, spitting a couple of times on your asshole. As she works her saliva into your hole with her hand, she orders the man, "You will be gentle. I will not have my <<$pcs_nickname>> damaged." She then guides his cock through the process of stretching you out.'
+				'When he is finally all the way in, he starts moving with gentle thrusts. It''s almost overwhelming. Gentle or not this man has you stretched almost to the breaking point. The thought of what he is doing to your backside sends you over the edge, and you cum with a loud cry. Moments later you feel his wet warmth fill your ass.'
+				'"You little slut, I can''t believe you came from getting fucked in the ass," <<$telsob>> says, smiling at you with approval. "Now lick him clean," she finishes.'
+
+				$orgasm_or = 'yes'
+				gs 'arousal', 'anal', 5, 'sub'
+				gs 'stat'
+				gs 'willpower', 'misc', 'resist', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'No, that''s enough (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'kafesvid', '3'
+					end
+				else
+					act 'No, that''s enough(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
+
+				act 'Continue to obey':
+					*clr & cla
+					spafinloc = 12
+					gs 'cum_manage'
+					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/20.jpg"></center>'
+					'To please <<$telsob>>, you jump off the table, and eagerly suck his wet cock.'
+
+					if klismaday ! daystart:'You quickly realize that you didn''t have an enema today. Almost gagging at the taste, you move to remove his cock from your mouth. <<$telsob>>''s hand comes to rest firmly on the back of your head, before you can. "That my dear is why it is important to keep your ass clean," she says. With little choice in the matter you continue to suck.'
+					
+					if klismaday = daystart:'You dutifully suck his dick, a little surprised that it tastes good. You lose yourself in the rhythm. Your only thoughts are of the taste of his cum, and the feeling of it dripping down between your thighs.'
+					
+					'Before you realize it, his cock is rock hard and throbbing again. <<$telsob>> notices too: "Oh, look what you did, <<$pcs_nickname>>. You''re such a naughty little girl. Well, I guess your ass is nice and lubed up, so this time he won''t have to hold back."'
+
+					gs 'arousal', 'bj', 5, 'sub'
+					gs 'stat'
+	
+					act '<<$telsob>> knows best':
+						*clr & cla
+						analorgasm += 5
+						orgasm += 5
+						pcs_ass += 1
+						'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/21.jpg"></center>'
+						'The man lies back on the table, as <<$telsob>> helps you on top of him. When you are in position she guides his cock back into your already dripping hole. Once you are settled, the guy begins to fuck you with jackhammer thrusts. <<$telsob>> helps by forcing your hips down, sinking him in even deeper.' 
+						'"Faster boy, I want you to fuck her so she can''t sit for a week," she orders him. To you she says, "My <<$pcs_nickname>> fucking loves it." Her words send you over the edge again. Your body shakes from head to toe, as you ride another orgasm. When you have regained your senses she whispers to you again, "That''s twice you little slut."'
+						'When the waiter is getting close <<$telsob>> stops him with a command, "In her mouth this time, boy."'
+
+						$orgasm_or = 'yes'
+						gs 'arousal', 'anal', 5, 'sub'
+						gs 'stat'
+				
+						act 'In your mouth':
+							*clr & cla
+							spafinloc = 11
+							gs 'cum_manage'
+							spafinloc = 12
+							gs 'cum_manage'
+							swallow += 1
+							'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/22.jpg"></center>'
+							'As soon you drop to your knees, <<$telsob>> furiously jerks his cock, aiming it at your mouth. The man groans loudly, and erupts all over the place. A lot of his cum finds your mouth, but it also runs down your chin and chest. Looking up, you see <<$telsob>> looking at you like a proud parent.'
+
+							act 'Kiss <<$telsob>>':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/23.jpg"></center>'
+								'<<$telsob>> leans down, and kisses you deeply. You push a little of the mans cum into her mouth with your tongue. She swallows it down, with a wicked grin. Not satisfied she moves further down licking the cum from your breasts and stomach. Just when you think she is finished cleaning you, she rocks your hips back exposing your backside. She passionately licks and kisses your little hole, as she works to collect every drop. When she is finished, she gives you one last deep kiss. It tastes wonderful.'
+								
+								gs 'arousal', 'kiss', 5, 'lesbian', 'sub'
+								gs 'arousal', 'cuni', 5, 'lesbian', 'sub'
+								minut -= 5
+								gs 'stat'
+				
+								act 'Finish':gt 'kafesvid', '3'
+							end
+						end
+					end
+				end
+			end
 		end
 	end
 end

+ 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

+ 5 - 3
locations/kinosvid.qsrc

@@ -71,7 +71,8 @@ if $ARGS[0] = '1':
 	
 		gs 'arousal', 'foreplay', 10, 'lesbian'
 		gs 'stat'
-		
+
+		act 'Show her your backside':gt 'kinosvid', '110'
 		act 'Enjoy it':gt 'kinosvid', '10'
 		act 'Pleasure her':gt 'kinosvid', '11'
 	end
@@ -102,7 +103,8 @@ if $ARGS[0] = '10':
 		act 'It''s her turn':gt 'kinosvid', '13'
 		act 'Finish':gt 'kinosvid', '3'
 	end
-
+	
+	act 'Show her your backside':gt 'kinosvid', '110'
 	act 'It''s her turn':gt 'kinosvid', '12'
 end
 
@@ -224,7 +226,7 @@ if $ARGS[0] = '110':
 	'You get up on the chair and wiggle you butt at <<$telsob>>. Needing no further encouragement, <<$telsob>> spreads your cheeks, and buries her tongue deep in your ass. Your gasp of surprise is quickly replaced with moans of pleasure, as she continues to aggressively tongue your bottom. After a few minutes of this your knees buckle, and you collapse on the chair spent.'
 
 	$orgasm_or = 'yes'
-	gs 'arousal', 'cuni', 10, 'lesbian'
+	gs 'arousal', 'rimming', 10, 'lesbian'
 	gs 'stat'
 	
 	act 'Finish':gt 'kinosvid', '3'

+ 27 - 53
locations/korrPar.qsrc

@@ -42,12 +42,12 @@ if indorf = 1:'With your parents away visiting your grandparents, the apartment
 
 if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
 
-if hour ! 18 and blockBedrPar = 1:blockBedrPar = 0
+if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
 
 !!Her room isn''t on the cleaning list yet
 !!if (momloc = <number for cleaning her room> ) and motherQW['con_steal_hear'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'hear'
-if momloc = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,3) = 1: gt 'mother', 'condom_steal', 'talk'
+if momloc = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
@@ -84,64 +84,37 @@ if blockBedrPar = 0:
 		act 'Go to your room':gt 'bedrPar'
 	end
 end
-if momloc = 1:
-	if (hour = 5 and minut > 30) or (hour = 6 and minut < 10):
-		'The door is closed. You know your <<$npc_nickname[''A29'']>> is likely waking up your stepfather and getting dressed.'
-		act 'Knock on your parents'' door':
-			if hour = 6 and minut < 10 and rand(0,2) ! 0:
-				cla & *clr
-				minut += 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
-				'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door looking like she just woke up. "I don''t have time right now. Go wake up your brother." She then closes the door in your face.'
-				act 'Leave':gt 'korrPar'
-				act 'Go wake up Kolka':
-					cla & *clr
-					minut += 5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/sleeping.jpg"></center>'
-					'You walk down the hall and into the living room where you find Kolka still sound asleep on the couch.'
-
-					!!act 'Shake him':gt '', ''
-					!!I am leaving the rest of this for Sicaa so he can tie in any events he has for kolka
-					act 'Leave':gt 'korrPar'
-				end
-			else
-				cla & *clr
-				minut += 2
-				momvladroom = rand(1,10)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
-				if momvladroom = 1:
-					'You knock on the door and you hear your <<$npc_nickname[''A29'']>> say "<<$pcs_nickname>>? Is that you? Go set the table."'
-					*nl
-					'After a few minutes of silence, you faintly hear hushed voices and what you <i>think</i> is the sound of your mother giggling.'
-
-					act 'Leave':gt 'korrPar'
-					gs 'willpower', 'voyeur', 'self', 'medium'
-					if will_cost <= pcs_willpwr:
-						act 'Peek (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'self'
-							gs 'stat'
-							gt 'bedrPar2', 'peek'
-						end
-					else
-						act 'Peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-				else
-					'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door fully dressed while your stepfather gets out of bed. "I don''t have time right now. Go set the table for breakfast." She then closes the door in your face.'
-					act 'Leave':gt 'korrPar'
-				end
-			end
+
+if momloc = 3:
+	act 'Knock on your parents'' door':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
+		'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door looking like she just got out of the shower. "I don''t have time right now. Go wake up your brother." She then closes the door in your face.'
+		act 'Leave':gt 'korrPar'
+		act 'Go wake up Kolka':
+			cla & *clr
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/sleeping.jpg"></center>'
+			'You walk down the hall and into the living room where you find Kolka still sound asleep on the couch.'
+
+			act 'Leave': gt 'sitrPar'
 		end
+	end
+elseif momloc = 1:
+	if hour = 22 and parsexrand = 5 and parentsexday ! daystart:
+		act 'Go to your parents'' room': gt 'bedrPar2', 'peek'
 	else
 		act 'Go to your parents'' room': msg'Your parents are probably asleep, you shouldn''t go in right now.'
 	end
 else
 	act 'Go to your parents'' room':gt 'bedrPar2'
 end
+
 act 'Go to the living room':gt 'sitrPar'
+
 if momloc = 2:
 	if vanrPar_suction_dildo > 0:
 		motherQW['dildo_shower_discovery'] = 1
@@ -156,13 +129,14 @@ elseif sdadloc = 5 and sdadloc = 11:
 	end
 elseif kolloc = 10:
 	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your brother shout "I''m in the shower!"'
+elseif anyaloc = 5:
+	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your sister yell "I''ll be done in a few minutes!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end
 
 if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
 
-
 act 'Go to the kitchen':gt 'kuhrPar'
 
 !to add a counter if you avoid Dimka

+ 25 - 15
locations/kuhrPar.qsrc

@@ -50,11 +50,11 @@ if momloc = 4:
 	end
 end
 
-if hour = 7 and week < 6 and indorf = 0:
+if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 7 and week > 5 and indorf = 0:
+elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
+elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc = 12:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
@@ -62,7 +62,11 @@ else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, your <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
 end
 if momloc = 11: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here making diner.'
-if momloc = 13: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
+if momloc = 13 and anyaloc = 23: 
+	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner with <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> helping her. '
+elseif momloc = 13:
+	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
+end
 if momloc = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
 if sdadloc = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
@@ -70,7 +74,7 @@ if sdadloc = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting
 
 if week = 6 and dostupindorf = 1 and grandaQW['block'] = 0 and hour > 9 and hour < 12:'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 
-if hour = 7 and breakfast_day ! daystart and indorf = 0: 
+if (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and breakfast_day ! daystart and indorf = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat breakfast with your family (0:20)': 
 			*clr & cla
@@ -89,7 +93,7 @@ if hour = 7 and breakfast_day ! daystart and indorf = 0:
 					'The rest of breakfast is taken up talking about how Kolka is doing in school. He seems to be doing better than you and is showered with praise from your mother and stepfather. The food is good, even if the conversation wasn''t the best. You quickly finish your meal.'
 				end
 			else
-				if kanikuli <> 0:
+				if kanikuli ! 0:
 					'You smile at him. "I''m enjoying some time away from school hanging out with my friends. It''s nice to just relax for a change."'
 					'Your mother speaks up. "It wouldn''t hurt to study your school books and get ahead of your courses to get better grades." You roll your eyes, but before you can respond, your stepfather lays his hand on your mother''s. "Let her enjoy herself. This is her last year before she goes to university after all." he says with a little emphasis. You just sigh and nod as you both know that is what your mother wants.'
 				else 
@@ -115,7 +119,7 @@ if hour = 7 and breakfast_day ! daystart and indorf = 0:
 	end
 elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
-		act 'Eat dinner with your family': 
+		act 'Eat dinner with your family (0:20)': 
 			*clr & cla
 			gs 'food', 'family_meals', 'dinner'
 			npc_rel['A29'] += 1
@@ -127,13 +131,21 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 				'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!"' 
-				'Anya smirks as Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
+				if anyaloc = 12:
+					'Anya smirks as Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
+				else
+					'Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
+				end
 				'Your stepfather clears his throat and quickly changes the subject, talking about how his work went. After that, you have a fairly enjoyable dinner.'
 			elseif fame['pav_slut'] > 150:
 				'You''re about to respond when your mother interrupts you. "She''s too young to worry about that and... we talked about it." She gives you a meaningful glance and you shut your mouth.'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny!" She then glances at you. "She might have made some mistakes, but she''s trying to be a better girl now. Now apologize to your sister right now!"' 
-				'Anya just smirks as Kolka freezes in place and apologizes to you.'
+				if anyaloc = 12:
+					'Anya just smirks as Kolka freezes in place and then apologizes to you.'
+				else
+					'Startled, Kolka freezes in place and then apologizes to you.'
+				end
 				'Your stepfather clears his throat and quickly changes the subject, talking about how his work went. After that, you have a fairly enjoyable dinner.'
 			else
 				'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
@@ -159,13 +171,11 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 	end
 else
 	if (hour = 8 or (hour = 7 and indorf = 1)) and breakfast_day ! daystart:
-		act 'Eat breakfast alone':
+		act 'Eat breakfast alone (0:20)':
 			*clr & cla
 			menu_off = 1
 			breakfast_day = daystart
 			gs 'food', 'family_meals', 'breakfast'
-			!!the line above adds 20mins so correction for it below
-			minut -= 5
 			gs 'stat'			
 			'<center><img <<$set_imgh>> src="images/shared/food/breakfast_'+rand(0,1)+'.jpg"></center>'
 			'You enjoy a quiet breakfast by yourself. The portions were moderate and <<$mtxt>>. You accompany it with a mug of tea.'
@@ -173,9 +183,9 @@ else
 			act 'Get up from the table': gt $loc, $loc_arg
 		end
 	end
-	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
-	act 'Eat a light meal (0:25)':gs 'food', 's_meal'
-	act 'Have a snack (0:15)':gs 'food', 'snack'
+	act 'Eat a full meal (0:20)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
+	act 'Have a snack (0:05)':gs 'food', 'snack'
 end
 
 dynamic $sandwich

+ 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

+ 0 - 60
locations/lezbsex.qsrc

@@ -61,11 +61,6 @@ if $ARGS[0] = 'ukuni':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/ukuni<<picrand>>.jpg"></center>'
 	'You begin by kissing her breasts, moving gradually down her body, lower and lower until you are facing her pussy. You start by gently caressing her swollen lips with up and down tongue lapping, up and down the swollen mound and moist slit, and getting ready to focus the tip of your tongue directly on her clitoris.  You part her outer lips with your fingers, spreading her pouty inner lips giving you full access to her puffy pink clitoris.'
 
@@ -82,11 +77,6 @@ if $ARGS[0] = 'kuni':
 	cla
 	*clr
 	
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/kuni<<picrand>>.jpg"></center>'
 	'She begins by dragging her tongue up your thighs to your crotch and plants light kisses from the top of your slit down to the opening of your vagina.  Her tongue pushes into your slickened hole a few times, then slides back up your cunny to caress your tingling clitoris again.'
 
@@ -101,11 +91,6 @@ if $ARGS[0] = 'anuli':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/anuli<<picrand>>.jpg"></center>'
 	'She kisses your buttocks in ever decreasing circles, eventually getting to the center where your puckered anus is waiting.  Reaching her goal, she licks all around the tender star to get it plenty moist, then firmly pushes her tongue forward, penetrating your ass with just the tip.  She retracts it, again licking all around your anus, and repeats her tongue invasion into that most private entrance.'
 
@@ -120,11 +105,6 @@ if $ARGS[0] = 'uanuli':
 	cla
 	*clr
 	
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli<<picrand>>.jpg"></center>'
 	'You kiss her buttocks in ever decreasing circles, eventually getting to the center where her puckered anus is waiting.  Reaching your goal, you lick all around the tender star to get it plenty moist, then firmly push your tongue forward, penetrating her ass with just the tip.  You retract it, again licking all around her anus, and repeating your tongue invasion into that most private entrance.'
 
@@ -139,11 +119,6 @@ if $ARGS[0] = 'svag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/svag<<picrand>>.jpg"></center>'
 	'You put on the strap-on, adjusting it to your hips and centering it, and then insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
 
@@ -158,11 +133,6 @@ if $ARGS[0] = 'sanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/sanal<<picrand>>.jpg"></center>'
 	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first, and as she adjusts to the backdoor invasion you push in and out, faster and faster.'
 
@@ -177,11 +147,6 @@ if $ARGS[0] = 'usvag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usvag<<picrand>>.jpg"></center>'
 	'You watch as she puts on the strap-on, adjusting it to her hips and centering the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
 
@@ -196,11 +161,6 @@ if $ARGS[0] = 'usanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usanal<<picrand>>.jpg"></center>'
 	'She spits on the crack of your ass, collecting some saliva to moisten the tip of the strap-on and slowly presses it against your pucker, firmly pushing it into you as you adjust to the invasion.  You feel the fullness of it as it moves in and out of your ass with every thrust, pumping faster and deeper.'
 
@@ -215,11 +175,6 @@ if $ARGS[0] = 'dvag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/dvag<<picrand>>.jpg"></center>'
 	'You take a dildo and poke her wet pussy with it.  She pulls your face to hers and kisses you while you are driving one shaft into her cunny with one hand and caressing her breasts with a second dildo.'
 
@@ -234,11 +189,6 @@ if $ARGS[0] = 'danal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/danal<<picrand>>.jpg"></center>'
 	'You take a dildo, making sure she''s watching you as you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
 
@@ -255,11 +205,6 @@ if $ARGS[0] = 'udvag':
 	minut += 5
 	pcs_horny += 10
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udvag<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible with it.'
 
@@ -272,11 +217,6 @@ if $ARGS[0] = 'udanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udanal<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> spits in the crack of your ass, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole at it pushes farther and farther inside, bringing you that unique back-door pleasure.'
 

+ 0 - 3
locations/liam.qsrc

@@ -67,9 +67,6 @@ act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-if Trainpass_day > daystart:
-	act 'Board train (0:20)':minut += 20 & gt 'pav_train_hall', 'platform'
-end
 act 'Walk to the Market (0:20)':minut += 20 & gt 'pav_market'
 act 'Walk to the Commercial area (0:25)':minut += 25 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:30)':minut += 30 & gt 'pav_residential'

+ 1 - 1
locations/love.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'mother':
 
 	if (work = 1 or cheatWork = 1) and workKafe = 1:'"I am a waitress in a cafe."'
 	if func('uniutil', 'student', 'enrolled'):'"I study at the university."'
-	if func('uniutil', 'diploma', 'obtained'):'"I graduated from university."'
+	if university['diploma'] > 0:'"I graduated from university."'
 	if work = 0 and cheatWork = 0 and workKafe ! 1:'"I''m unemployed."'
 
 	if modelfoto_nude > 30:

+ 1 - 1
locations/lover_pref.qsrc

@@ -18,7 +18,7 @@ $boyClo = $loverClo[lover_number]
 !!0 - 0 to 2, 1 - 3 to 5, 2, 5 to 6
 
 !! These variables will be compared to the player value 'salocatnow'.
-figurBoy = figurelover[lover_number]
+figurBoy = figurlover[lover_number]
 
 	
 if figurBoy = 0:

+ 33 - 16
locations/moncheri.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'moncheri'
     $location_type = 'public_indoors'
@@ -69,12 +70,14 @@ if $ARGS[0] = 'gowns':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_gown_filter
+
 		if Clothingstock > 7:
 			i = 1
 		elseif Clothingstock > 15:
@@ -88,17 +91,23 @@ if $ARGS[0] = 'gowns':
 				gs 'clothing_attributes', 'moncheri_gown', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopmoncheri_gown'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_gown_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_gown_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_gown',i, 20000
+if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'moncheri_gown',i, 20000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -111,12 +120,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -128,17 +139,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'moncheri_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!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: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 80:jump 'loopmoncheri_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_dress',i, 20000
+if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'moncheri_dress',i, 20000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = $ARGS[0]

+ 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.'

+ 2 - 2
locations/music_delparco.qsrc

@@ -93,8 +93,8 @@ if $ARGS[0] = 'eveningshow':
 	minut += 60
 	ml_correction_chance = ml_performance['set_quality'] + ((hotcat - 5)*3) + (pcs_perform/10)
 	ml_success = rand(0,100)
-	instrmusic_exp = rand(1,2)
-	vokal_exp = rand(1,2)
+	instrmusic_exp += rand(1,2)
+	vokal_exp += rand(1,2)
 	ml_performance['performed_minutes'] += 30
 	ml_performance['total_time_performed'] += 30
 

+ 6 - 3
locations/npcstatic2.qsrc

@@ -343,7 +343,7 @@ $npc_dna['A<<npctemp>>'] = '1971687970 1162271469 1942122372 1675574199 19267207
 $npc_firstname['A<<npctemp>>'] = 'Tryndin'
 $npc_lastname['A<<npctemp>>'] = 'Maximovich'
 $npc_usedname['A<<npctemp>>'] = 'Tryndin'
-$npc_notes['A<<npctemp>>'] = 'Lives in apartment 37 in the Residential area of the City'
+$npc_notes['A<<npctemp>>'] = 'Lives in apartment 37 in the Residential area of the City and attends the city University.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
@@ -406,8 +406,9 @@ npc_dick['A<<npctemp>>'] = 24
 npctemp = 83
 $npc_dna['A<<npctemp>>'] = '1473539500 1300272748 1849153490 1148245338 1587757384 1435094984 1944660918'
 $npc_firstname['A<<npctemp>>'] = 'Goshi'
+$npc_lastname['A<<npctemp>>'] = 'Sidorov'
 $npc_usedname['A<<npctemp>>'] = 'Goshi'
-$npc_notes['A<<npctemp>>'] = 'A student in the University'
+$npc_notes['A<<npctemp>>'] = 'Goshi has live in Saint Petersburg his whole life, he comes from a well off family, not rich but not wanting for things. He is use to always getting his way. His mother is a stay at home mom and his dad is a business man. He is going to the University to follow in his fathers footsteps.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'
@@ -418,7 +419,9 @@ npc_dick['A<<npctemp>>'] = 14
 npctemp = 84
 $npc_dna['A<<npctemp>>'] = '2106927598 1295208699 1791495642 1377661124 2006483992 1113518034 1579903219'
 $npc_firstname['A<<npctemp>>'] = 'Kendra'
-$npc_notes['A<<npctemp>>'] = 'A female student in the University'
+$npc_lastname['A<<npctemp>>'] = ' Abiodun'
+$npc_usedname['A<<npctemp>>'] = 'Kendra'
+$npc_notes['A<<npctemp>>'] = 'Kendra is from South Africa and attends the University in Saint Petersburg now. She is well known to have a dominate personality, she often tries to dominate those around her. Some believe she is a racist as she seems to especially love dominate white students that attend the university.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_intel['A<<npctemp>>'] = 63

+ 22 - 5
locations/npcstatic5.qsrc

@@ -705,11 +705,11 @@ npc_intel['A<<npctemp>>'] = 57
 
 npctemp = 246
 $npc_dna['A<<npctemp>>'] = '0'
-$npc_firstname['A<<npctemp>>'] = 'Idowu'
-$npc_nickname['A<<npctemp>>'] = 'Idowu'
-$npc_lastname['A<<npctemp>>'] = 'Arendse'
-$npc_usedname['A<<npctemp>>'] = 'Idowu'
-$npc_notes['A<<npctemp>>'] = 'Idowu is Haruna''s roommate and friend. They live in the same dorm room and both attend the University. He is also from Africa.'
+$npc_firstname['A<<npctemp>>'] = 'Arendse'
+$npc_nickname['A<<npctemp>>'] = 'Arendse'
+$npc_lastname['A<<npctemp>>'] = 'Idowu'
+$npc_usedname['A<<npctemp>>'] = 'Arendse'
+$npc_notes['A<<npctemp>>'] = 'Arendse is Haruna''s roommate and friend. They live in the same dorm room and both attend the University. He is also from Africa.'
 npc_dob['A<<npctemp>>'] = 0
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -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
 

+ 38 - 41
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'
@@ -169,10 +169,41 @@ if $ARGS[0] = 'cool jocks':
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'
 	'The next half hour passes by very slowly and is uneventful. The boys gather in a group together and talk about whatever it is boys talk about, most likely the girls. The girls mill around in a group and discuss the problems with makeup and skin care. Everyone grabs a drink just to feel a little buzz, with no one wanting to get too drunk. Andrey and Stasya spend the whole time dancing together. They look very happy and cute together. Some of the other girls occasionally agree to dance with one of the boys or often dance in a group.'
-	if IgorLove > 0:
-		!!If dating Igor this happens
-		'While you are hanging out with the girls and chatting, Igor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
+	if fedorKozlovQW >= 10:
+		'While you are hanging out with the girls chatting, Fedor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
 
+		act 'Don''t dance with Fedor':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
+			'You slightly lower your head as you say "I would love to, but I''m really tired and just want to chat with my friends for a bit. Maybe next time." You can see Fedor look noticeably sad as he responds "Alright, I didn''t mean to interrupt your chat. I''ll just go..." Not wanting Fedor to be sad, you give him a smile as you approach him then lean forward, planting a soft kiss on his cheek before saying "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
+			*nl
+			'Fedor chuckles before nodding and giving you a passionate kiss before saying "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave to Fedor as he walks away.'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
+		end
+
+		act 'Dance with Fedor':
+			cla & *clr 
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></center>'
+			'You place your hand on top of Fedor''s as you reply "I would love to dance with you." Fedor gives your hand a light kiss as he wraps his arm around your waist, pulling you toward him. You give Fedor a smile as you both begin swaying to the music, feeling Fedor''s strong arm around your waist, keeping your sway in sync with his, as you both stare into each other''s eyes.'
+			*nl
+			'As you are both gazing longingly into each other''s eyes, you lean forward and give Fedor a gentle, loving kiss, enjoying the warmth of his lips pressed against yours and his embrace, as he firmly holds you close to him. The kiss lasts for what feels like a minute before you slowly break it off and continue dancing slowly to the music while staring directly into Fedor''s eyes.'
+			act 'Dance until the party ends':
+				cla & *clr 
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
+				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops before you hear one of the teachers say "Okay everyone, it is time to go home. I hope that you have had a great time and I wish you all a happy and safe holiday. We will see everyone back at school once the winter break is over."'
+				*nl
+				'The students begin to pick up their stuff and head for the door, while you and Fedor walk together hand in hand. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia. You may come. I''m sure you''ll show your gratitude in one way or another."'
+				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my behavior and I hope you will still come to my party."'
+				InvitationToDimkaNYparty = 1
+				'Everyone then slowly makes their way out of the school.'
+
+				act 'Leave':gt 'gschool_grounds', 'main'
+			end
+		end
+	elseif IgorLove > 0:
+		'While you are hanging out with the girls and chatting, Igor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
 		act 'Don''t dance with Igor':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -214,7 +245,7 @@ if $ARGS[0] = 'cool jocks':
 		act 'Dance with Marcus':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/marcusdance.jpg"></center>'
-			'Smiling, you answer. "Of course, I would love to dance with you Marcus." He takes you by the hand and leads you out onto the dance floor. The songs vary a lot. Some are fast and get you both really moving around, while others are slow, in which case you slow dance together. You are really enjoying dancing in front of everyone with your boyfriend.'
+			'Smiling, you answer. "Of course, I would love to dance with you Marcus." He takes you by the hand and leads you out onto the dance floor. The songs vary a lot. Some are fast and get you both really moving around, while others are slow, in which case you slow dance together. You are really enjoying dancing in front of everyone with Marcus.'
 
 			act 'Dance until the party ends':
 				*clr & cla
@@ -227,40 +258,6 @@ if $ARGS[0] = 'cool jocks':
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
 
-				act 'Leave':gt 'gschool_grounds', 'main'
-			end
-		end
-	elseif fedorKozlovQW >= 10:
-		!!If dating Fedor this happens
-		'While you are hanging out with the girls chatting, Fedor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
-
-		act 'Don''t dance with Fedor':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
-			'You slightly lower your head as you say "I would love to, but I''m really tired and just want to chat with my friends for a bit. Maybe next time." You can see Fedor look noticeably sad as he responds "Alright, I didn''t mean to interrupt your chat. I''ll just go..." Not wanting Fedor to be sad, you give him a smile as you approach him then lean forward, planting a soft kiss on his cheek before saying "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
-			*nl
-			'Fedor chuckles before nodding and giving you a passionate kiss before saying "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave to Fedor as he walks away.'
-			act 'Hang out until the party ends':gt 'nyp_school', 'end'
-		end
-
-		act 'Dance with Fedor':
-			cla & *clr 
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></center>'
-			'You place your hand on top of Fedor''s as you reply "I would love to dance with you." Fedor gives your hand a light kiss as he wraps his arm around your waist, pulling you toward him. You give Fedor a smile as you both begin swaying to the music, feeling Fedor''s strong arm around your waist, keeping your sway in sync with his, as you both stare into each other''s eyes.'
-			*nl
-			'As you are both gazing longingly into each other''s eyes, you lean forward and give Fedor a gentle, loving kiss, enjoying the warmth of his lips pressed against yours and his embrace, as he firmly holds you close to him. The kiss lasts for what feels like a minute before you slowly break it off and continue dancing slowly to the music while staring directly into Fedor''s eyes.'
-			act 'Dance until the party ends':
-				cla & *clr 
-				minut += 30
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
-				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops before you hear one of the teachers say "Okay everyone, it is time to go home. I hope that you have had a great time and I wish you all a happy and safe holiday. We will see everyone back at school once the winter break is over."'
-				*nl
-				'The students begin to pick up their stuff and head for the door, while you and Fedor walk together hand in hand. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia. You may come. I''m sure you''ll show your gratitude in one way or another."'
-				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my behavior and I hope you will still come to my party."'
-				InvitationToDimkaNYparty = 1
-				'Everyone then slowly makes their way out of the school.'
-
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end

+ 3 - 3
locations/obj_din.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'skills':
 	if pcs_photoskl > 0: 'Photography - <<pcs_photoskl>>'
 	if pcs_artskls > 0: 'Artistic Skills - <<pcs_artskls>>'
 	if pcs_perform > 0: 'Performance - <<pcs_perform>>'
-	if pcs_musicprod > 0: 'Music Production - <<pcs_pcs_musicprodperform>>'
+	if pcs_musicprod > 0: 'Music Production - <<pcs_musicprod>>'
 
 	'</td><td width="25%" cellspacing="0" cellpadding="10" valign="top">'
 	'<b>Job Skills</b>'
@@ -667,10 +667,10 @@ if $ARGS[0] = 'stats':
 	end
 	if profiDanceTime > 0: 'You danced <<profiDanceTime>> times professionally.'
 	if SchoolAtestat = 1: 'You have finished school.'
-	if func('uniutil', 'diploma', 'obtained'): 'You graduated.'
+	if university['diploma'] > 0: 'You graduated.'
 	if teachlevel > 0: 'Your credibility as a teacher is <<teachlevel>>'
 	!WD:FORMATING
-	if maxdamage > 0 or stripdancesum > 0 or profiDanceTime > 0 or SchoolAtestat > 0 or func('uniutil', 'diploma', 'obtained') or teachlevel > 0:*nl
+	if maxdamage > 0 or stripdancesum > 0 or profiDanceTime > 0 or SchoolAtestat > 0 or university['diploma'] > 0 or teachlevel > 0:*nl
 
 	'</td><td width="35%" cellspacing="0" cellpadding="0" valign="top">'
 	'<center><b>Sex Statistics</b></center>'

+ 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

+ 0 - 3
locations/pav_commercial.qsrc

@@ -143,9 +143,6 @@ act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
 act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
-if Trainpass_day > daystart:
-	act 'Board train (0:15)':minut += 15 & gt 'pav_train_hall', 'platform'
-end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
 

+ 0 - 3
locations/pav_complex.qsrc

@@ -148,9 +148,6 @@ if $ARGS[0] = 'start':
 	act 'Walk to the industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
 	act 'Walk to the train station (0:20)':minut += 20 & gt 'pav_train_hall'
-	if Trainpass_day > daystart:
-		act 'Board train (0:25)':minut += 25 & gt 'pav_train_hall', 'platform'
-	end
 	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'

+ 24 - 16
locations/pav_disco_coolkids.qsrc

@@ -28,25 +28,32 @@ if $ARGS[0] = 'classmates':
 	end
 
 	'<center><b><font color="maroon">Disco</font></b></center>'
-	'<table><TR><TD>Most of the cool kids and jocks are gathered around some tables and couches near the dance floor while the others dance. Some of the other students are hanging around near them or are out dancing.</TD></table>'
+	'<center><table><TR><TD>Most of the cool kids and jocks are gathered around some tables and couches near the dance floor while the others dance. Some of the other students are hanging around near them or are out dancing.</TD></table></center>'
 
-	'<table border=0 cellspacing=0 cellpadding=5><TR>'
+	'<center><table border=0 cellspacing=0 cellpadding=5><TR>'
 	i = 1
 	:discopop_loop
-		if (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or $npc_nickname['A<<i>>'] = 'Natasha') and discoenable['A<<i>>'] = 1:
-			if npc_grupTipe['A<<i>>'] = 2:
-				*p '<TD><a href="exec: i = <<i>> & gt ''pav_disco_coolkids'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></br><<$npc_firstname[''A<<i>>'']>></TD>'
-			else
-				*p '<TD><a href="exec: i = <<i>> & gt ''pav_disco_coolkids'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></br><<$npc_firstname[''A<<i>>'']>></TD>'
-			end
+		if (npc_grupTipe['A<<i>>'] = 1 or $npc_nickname['A<<i>>'] = 'Natasha') and discoenable['A<<i>>'] = 1:
+			*p '<TD><a href="exec: i = <<i>> & gt ''pav_disco_coolkids'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></br><<$npc_firstname[''A<<i>>'']>></TD>'
 		end
 		i += 1
 	if i <= aarraynumber:jump 'discopop_loop'
-	'</table>'
 
-	'<table><TR><TD>The gopniks are lounging in the darkest corner of the hall. They''re mostly keeping to themselves, but a few of them are out dancing.</TD></table>'
+	'<TR>'
+
+	i = 1
+	:discojock_loop
+		if npc_grupTipe['A<<i>>'] = 2 and discoenable['A<<i>>'] = 1:
+			*p '<TD><a href="exec: i = <<i>> & gt ''pav_disco_coolkids'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></br><<$npc_firstname[''A<<i>>'']>></TD>'
+		end
+		i += 1
+	if i <= aarraynumber:jump 'discojock_loop'
+	
+	'</table></center>'
+
+	'<center><table><TR><TD>The gopniks are lounging in the darkest corner of the hall. They''re mostly keeping to themselves, but a few of them are out dancing.</TD></table></center>'
 	
-	'<table border=0 cellspacing=0 cellpadding=5><TR>'
+	'<center><table border=0 cellspacing=0 cellpadding=5><TR>'
 	i = 1
 	:discogop_loop
 		if npc_grupTipe['A<<i>>'] = 4 and discoenable['A<<i>>'] = 1:
@@ -54,11 +61,12 @@ if $ARGS[0] = 'classmates':
 			$loopname = $lcase($loopname)
 			*p '<TD><a href="exec: i = <<i>> & gt ''pav_disco_coolkids'', ''gop_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></br><<$npc_firstname[''A<<i>>'']>></TD>'
 		end
+		if i = 144: '<TR>'
 		i += 1
 	if i <= aarraynumber:jump 'discogop_loop'
 	
 	if soniaPS > 0 and discoenable['A25'] = 1: *p '<a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast''"><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a><br>'
-	'</table>'
+	'</table></center>'
 	*nl
 	
 	!!display of their headshots in a table like the above $args has.
@@ -121,7 +129,7 @@ if $ARGS[0] = 'atdisco':
 !!Lizaveta
 	gs 'pav_disco_coolkids', 'atdisco10', 140
 !!Stasya
-	gs 'pav_disco_coolkids', 'atdisco10', 139
+	if discoenable['A147'] = 1: discoenable['A139'] = 1
 !!Sonia
 	if soniaPS > 0:
 		gs 'pav_disco_coolkids', 'atdisco4i', 25
@@ -189,9 +197,9 @@ if $ARGS[0] = 'atdisco':
 !!Vitek
 	gs 'pav_disco_coolkids', 'atdisco10', 9
 !!Dan
-	gs 'pav_disco_coolkids', 'atdisco10', 10
+	if discoenable['A9'] = 1: discoenable['A10'] = 1
 !!Vasily
-	gs 'pav_disco_coolkids', 'atdisco10', 11
+	if discoenable['A9'] = 1: discoenable['A11'] = 1
 !!Roman
 	gs 'pav_disco_coolkids', 'atdisco4', 157
 !!Radomir
@@ -207,7 +215,7 @@ if $ARGS[0] = 'atdisco':
 !!Lena
 	gs 'pav_disco_coolkids', 'atdisco4', 20
 !!Lera
-	gs 'pav_disco_coolkids', 'atdisco4', 21
+	if discoenable['A20'] = 1: discoenable['A21'] = 1
 !!Pauline
 	gs 'pav_disco_coolkids', 'atdisco4', 24
 !!Anushka

+ 1 - 1
locations/pav_disco_gopniks.qsrc

@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'alyona':
 				'You nod at her as the two of you just cut loose to the song and dance.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Dance with her': gt 'pav_disco_gopniks', 'alyona_dance'
-			elseif grupTipe = 5
+			elseif grupTipe = 5:
 				'When she sees you coming, she flips you off before turning her attention to the guy and dancing with him. You get the message and move away.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			elseif npc_rel['A146'] <= 20 or fame['pav_slut'] >= 300:

+ 0 - 3
locations/pav_industrial.qsrc

@@ -78,9 +78,6 @@ act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-if Trainpass_day > daystart:
-	act 'Board train (0:20)':minut += 20 & gt 'pav_train_hall', 'platform'
-end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 

+ 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 togheter'
+	'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.'

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません