87 Commits 203bd7807a ... f5ab525c32

Author SHA1 Message Date
  Kevin_Smarts f5ab525c32 Merge remote-tracking branch 'Anya/master' 2 years ago
  Kevin_Smarts 08efe9e58b [fixed]City church exit wasn't in same location as entrance 2 years ago
  Anya 9603bd028e [fixed] missing bathtub type 2 years ago
  Kevin_Smarts afb44c2bce [Text edit] Some npc details adjusted by nutluck 2 years ago
  Kevin_Smarts bc5da0e3e7 [changed] Removed direct links to train platforms, added the one from the market back in, added links to Pav locations to the train station, made train drop you in station and not platform and relabelled a couple of links to make it clearer. 2 years ago
  Anya b100a1d89d [changed] some schedule stuff 2 years ago
  Anya 026ba4a34f [added] ability to use suction dildo to apartment and cottage (hopefully) 2 years ago
  Kevin_Smarts d9ef97edac [removed] Old train link in pav_market file, spotted by R. 2 years ago
  Kevin_Smarts fdb1f1f455 [fixed] Filter headers missing causing repitition of clothing to be displayed 2 years ago
  Kevin_Smarts 9e0f016726 [fixed] extra ends in scandalicious and wrong variable breaking market clothing lists, plus filter reset for markets 2 years ago
  Kevin_Smarts 3ebf2a8327 [fixed] New filter not applied to swimwear causing them to not appear in shops 2 years ago
  Kevin_Smarts 080f9837af [changed] Limited swimwear on view due to high number of items 2 years ago
  Kevin_Smarts a0ba48e52c [fixed] Missed a shop last commit 2 years ago
  Kevin_Smarts 92000e40bc [fixed] Clearing clothing filters in all the shops to stop things being unavailable 2 years ago
  Kevin_Smarts fc2026445f [changed] Split up the cool kids and jocks and split gopniks from after Anushka so they'll fit on lower res screens, plus centred everything so it looks a bit neater 2 years ago
  Kevin_Smarts 0ed641f113 [changed] Resized buttons for wardrobe main screen 2 years ago
  Kevin_Smarts 3e5e56d03e Merge remote-tracking branch 'Anya/master' 2 years ago
  Anya 8434ba1fd2 [fixed] a couple image bugs for pussycats job reported in pm on tfgs, still needs work 2 years ago
  bgkjdgbizgblzdgbr 528571ff48 [fixed] Missing : when trying to dance with Alyona at the disco. 2 years ago
  Kevin_Smarts c19076c858 Merge remote-tracking branch 'Anya/master' 2 years ago
  rachels de83f5c236 fix the exercise shoes bud reported by Honey 2 years ago
  Anya adb5f5f6e3 [Fixed] missing Mom event from salon file that got 'disappeared' 2 years ago
  rachels 03dcef9f1a fix grupTipe check 2 years ago
  Kevin_Smarts 89f141acf2 Merge remote-tracking branch 'Anya/master' 2 years ago
  rachels b64a2301ce fix that routine so it was up to date 2 years ago
  rachels be340749b1 Other mistakes which can be found by using analyser 2 years ago
  Anya eeb9ed9ed3 [fixed] dinner should include anya when she is around 2 years ago
  Anya ada383022d [fixed] issues with Anya's schedule, Roma moved to be 16-18 2 years ago
  Kevin_Smarts e8136c15f4 Merge remote-tracking branch 'Anya/master' 2 years ago
  Kevin_Smarts fce53878b5 [fixed] Mistakes found by analyser 2 years ago
  Kevin_Smarts 275e0795e1 [text edits] Changes to some gym scenes now that whole year is involved from Nutluck 2 years ago
  Anya 556134b47e [Added] peeking in shower and gym room for ALL classmates by nutluck 2 years ago
  Kevin_Smarts 06f0b4358d Merge remote-tracking branch 'FenrirRed/master' 2 years ago
  Kevin_Smarts 0d79326b7e Merge remote-tracking branch 'Anya/master' 2 years ago
  FenrirRed ba46bb6137 [fized] Changed $loc_arg = 'inside' to $loc_arg = 'start' as the ARGS[0] 'inside' has been removed from the city_train file 2 years ago
  Anya 6d528fae42 [Changed] image links updated to new stuff or location 2 years ago
  Anya 2b6836c274 [changed] Family schedule tweaks and edits, mostly for Anya 2 years ago
  Kevin_Smarts cc154949c6 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 years ago
  Kevin_Smarts d666fd42f3 Merge remote-tracking branch 'R/master' 2 years ago
  Kevin_Smarts e892d3b04b [changed] Updated clothing UI for for shops, wardrobe and clothing list to make everything that much easier to use with new filter system that lets you filter out and sort clothing like never before. You will need the image pack that is due out 2 years ago
  Kevin_Smarts 8f7e94dfb5 [removed] The .qproj for unused shop 2 years ago
  Kevin_Smarts 5356cfec64 [removed] This shop was never used 2 years ago
  Kevin_Smarts c0596b473b [fixed] Copy/paste error spotted by shockspacer 2 years ago
  bgkjdgbizgblzdgbr e22ade2e23 [changed/test edit] Changes to the text of Marcus dance at new year party by Nutluck, and change of the order to put jealous guy Fedor in front. 2 years ago
  R c5718606a5 [Fix] Deleted qqsp.ini 2 years ago
  Kevin_Smarts fb34a7c7b2 [changed] Made all .ini files ignores for git 2 years ago
  Kevin_Smarts dd5f9019ab Merge remote-tracking branch 'Anya/master' 2 years ago
  Kevin_Smarts 176c204e5b [fixed] Corrected wardrobe access and fixed the dresses and panties in Fashionista 2 years ago
  Anya bad53ef881 [Fixed] joining Starlets after new year starts. 2 years ago
  rachels 253e58d00c fix typos 2 years ago
  bgkjdgbizgblzdgbr ae4a5a5c65 [changed] Changes to meeting Kendra while on a date with another girl. 2 years ago
  FenrirRed be8857c78a [fixed] 'pav_market_hall' instead of 'pav_train_hall' 2 years ago
  Kevin_Smarts 1b80f619b6 [fixed] Replaced remaining pav_train gotos with market or train_hall as required 2 years ago
  Kevin_Smarts 85297149f0 Merge remote-tracking branch 'Anya/master' 2 years ago
  Anya a723ff1474 [fixed] even more location errors 2 years ago
  Anya 478b9635ac [fixed] another location error 2 years ago
  Anya 4125337577 [fixed] a few location bugs for new market hub 2 years ago
  bgkjdgbizgblzdgbr 9160f61018 [fixed] Missing relationship change by nutluck. 2 years ago
  bgkjdgbizgblzdgbr 0f837cfac2 [text edit] Fixed the documentation for Sonia's automatical fall. 2 years ago
  bgkjdgbizgblzdgbr 1fca60b39e [changed] The fame addtion will now be gradual over the difference price increase step. This will make it such that adding 100 fame to 400 will not be higher than adding 100 ro 401. 2 years ago
  Kevin_Smarts 3731bcf084 [removed] The outside of the city centre train station was just an extra and pointless click 2 years ago
  FenrirRed 1a859e0b98 [fixed] agape and vgape not working correctly 2 years ago
  Kevin_Smarts 72ac929d99 Merge remote-tracking branch 'Anya/master' 2 years ago
  Kevin_Smarts 225f7221c8 Merge remote-tracking branch 'NOX/master' 2 years ago
  Kevin_Smarts a42cd22fe4 [fixed] Missing comma 2 years ago
  Alaratt e64b86171c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 years ago
  Kevin_Smarts 757c26ec51 Merge remote-tracking branch 'NOX/master' 2 years ago
  Kevin_Smarts 934aa81720 Merge remote-tracking branch 'Anya/master' 2 years ago
  Alaratt 789e67fe4f [Fixed] a few bugs in the mansion 2 years ago
  N0X 243a121b56 [fixes] missing check causing everyone to want to read 2 years ago
  Alaratt 08a7570a2a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 years ago
  Kevin_Smarts b81ab04a34 [fixed] Setting for save updater not set in all school starts 2 years ago
  Alaratt be785e2b30 [Added] Mansion library now has books 2 years ago
  Kevin_Smarts 6bd13e3204 [changed Fashionista only allows viewing of clothing via dressing room with new shortgs for clothing state as all changing rooms will use it in time 2 years ago
  N0X 5d3c22569e [changed] everyone except coolkids will still hate former ugly duckling Sveta even if she became beautiful...just because... cruel writers :( 2 years ago
  Kevin_Smarts 427228d6e3 [fixed] Ugly duckling was only meant to get cool kids penalty back not a bonus to the other groups too 2 years ago
  N0X 204d8fa71c [fixes] preventing a deadend reported on the forum 2 years ago
  N0X 737e075d48 [fixes] reported on the forum - speaking with Zinaida was giving relationship points to Natasha with old system 2 years ago
  N0X b0ae4d4440 [fixes] Sveta will recognize Anushka's father in the garage after she met him in his apartment 2 years ago
  Kevin_Smarts 3d81b8b21e Merge remote-tracking branch 'NOX/master' 2 years ago
  Kevin_Smarts 859ed40df8 Merge remote-tracking branch 'FenrirRed/master' 2 years ago
  N0X e3b3b97e84 [changed] As I was told it is too cheat-like, Sveta won't be able to stream music with Anya in the room 2 years ago
  FenrirRed ca76b8c023 [fixed] black screen when temp < 5 2 years ago
  FenrirRed 507d43344f Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 years ago
  Alaratt 14d9e22181 [fixed] bug in mansion stuff 2 years ago
  Alaratt f1b01ee5ee [Changed] image links in pav market 2 years ago
  FenrirRed 206b243959 [added] anal only option to fathersex 2 years ago
100 changed files with 5559 additions and 2008 deletions
  1. 1 1
      .gitignore
  2. 1 1
      glife.qproj
  3. 1 1
      locations/FedorEv4.qsrc
  4. 2 2
      locations/HotelHole.qsrc
  5. 3 3
      locations/HotelRoom.qsrc
  6. 4 4
      locations/Komp.qsrc
  7. 1 1
      locations/LariskaHome.qsrc
  8. 1 1
      locations/MDressing.qsrc
  9. 1 0
      locations/anushapt.qsrc
  10. 2 2
      locations/bass.qsrc
  11. 1 1
      locations/bed2.qsrc
  12. 2 2
      locations/bedr.qsrc
  13. 1 1
      locations/bedr2x.qsrc
  14. 9 13
      locations/bedrPar.qsrc
  15. 4 0
      locations/begin.qsrc
  16. 1 1
      locations/brothel.qsrc
  17. 96 55
      locations/budgetclothes.qsrc
  18. 4 4
      locations/camera.qsrc
  19. 1 7
      locations/cikl.qsrc
  20. 1 1
      locations/city_church.qsrc
  21. 2 2
      locations/city_industrial_train.qsrc
  22. 1 0
      locations/city_mansion_entrance.qsrc
  23. 7 7
      locations/city_mansion_residence_1.qsrc
  24. 90 4
      locations/city_mansion_residence_2.qsrc
  25. 3 3
      locations/city_mansion_residence_3.qsrc
  26. 24 2
      locations/city_market.qsrc
  27. 3 3
      locations/city_redlight.qsrc
  28. 1 1
      locations/city_sauna.qsrc
  29. 8 29
      locations/city_train.qsrc
  30. 1129 464
      locations/clothing.qsrc
  31. 576 148
      locations/clothing_QV.qsrc
  32. 1 1
      locations/club.qsrc
  33. 3 1
      locations/dachain.qsrc
  34. 1 1
      locations/dimaRevenge.qsrc
  35. 1 1
      locations/dom_gor.qsrc
  36. 20 15
      locations/dorm.qsrc
  37. 32 16
      locations/exhibitionistshop.qsrc
  38. 63 9
      locations/fame.qsrc
  39. 3 14
      locations/family.qsrc
  40. 144 66
      locations/family_schedule.qsrc
  41. 321 87
      locations/fathersex.qsrc
  42. 1 1
      locations/fit.qsrc
  43. 4 19
      locations/food.qsrc
  44. 8 8
      locations/gdksex.qsrc
  45. 2 2
      locations/gdksport.qsrc
  46. 7 7
      locations/gkafe.qsrc
  47. 1 1
      locations/gschool_grounds.qsrc
  48. 164 278
      locations/gschool_lessons4.qsrc
  49. 6 6
      locations/gschool_lessonsev1.qsrc
  50. 2 2
      locations/gschool_lessonsev3.qsrc
  51. 1699 0
      locations/gschool_post_shower.qsrc
  52. 1 1
      locations/hotel_resep.qsrc
  53. 191 64
      locations/kinosvid.qsrc
  54. 2 0
      locations/korrPar.qsrc
  55. 24 14
      locations/kuhrPar.qsrc
  56. 1 1
      locations/leonid.qsrc
  57. 0 3
      locations/liam.qsrc
  58. 1 1
      locations/mey_home.qsrc
  59. 33 16
      locations/moncheri.qsrc
  60. 1 1
      locations/nichBedroomServant.qsrc
  61. 6 3
      locations/npcstatic2.qsrc
  62. 5 5
      locations/npcstatic5.qsrc
  63. 35 38
      locations/nyp_school.qsrc
  64. 1 1
      locations/obj_din.qsrc
  65. 10 10
      locations/olutaxi.qsrc
  66. 2 5
      locations/pav_commercial.qsrc
  67. 0 3
      locations/pav_complex.qsrc
  68. 20 12
      locations/pav_disco_coolkids.qsrc
  69. 1 1
      locations/pav_disco_gopniks.qsrc
  70. 8 8
      locations/pav_disco_sex.qsrc
  71. 0 3
      locations/pav_industrial.qsrc
  72. 94 23
      locations/pav_market.qsrc
  73. 0 3
      locations/pav_residential.qsrc
  74. 1 1
      locations/pav_shared_apt.qsrc
  75. 9 3
      locations/pav_train_hall.qsrc
  76. 26 4
      locations/pav_train_market.qsrc
  77. 2 2
      locations/police_station.qsrc
  78. 46 0
      locations/salon.qsrc
  79. 63 34
      locations/scandalicious.qsrc
  80. 4 4
      locations/selfplay.qsrc
  81. 2 2
      locations/set_home.qsrc
  82. 47 24
      locations/sexshop.qsrc
  83. 2 1
      locations/shop.qsrc
  84. 49 20
      locations/shop_allure.qsrc
  85. 33 16
      locations/shop_coco_carmen.qsrc
  86. 33 16
      locations/shop_dolls.qsrc
  87. 17 8
      locations/shop_fancy_pancy.qsrc
  88. 64 150
      locations/shop_fashionista.qsrc
  89. 33 16
      locations/shop_flamingos.qsrc
  90. 17 8
      locations/shop_materinstvo.qsrc
  91. 51 26
      locations/shop_nerdvana.qsrc
  92. 39 22
      locations/shop_pussycats.qsrc
  93. 0 76
      locations/shop_skuas.qsrc
  94. 33 16
      locations/shop_tsar_bomba.qsrc
  95. 22 0
      locations/shortgs.qsrc
  96. 1 1
      locations/shulgahall.qsrc
  97. 17 18
      locations/sister_chat.qsrc
  98. 1 2
      locations/sitr.qsrc
  99. 42 18
      locations/sportShop.qsrc
  100. 5 5
      locations/stat.qsrc

+ 1 - 1
.gitignore

@@ -5,7 +5,7 @@ mod/
 .*
 *.qsp
 *.sav
-qqsp.ini
+*.ini
 glife.txt
 qgen.cfg
 qspgui.cfg

+ 1 - 1
glife.qproj

@@ -672,6 +672,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"/>
@@ -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/FedorEv4.qsrc

@@ -2567,7 +2567,7 @@ if $ARGS[0] = 'Bedroom':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/bedroom.jpg"></center>'
-	'Fedor''s bedroom is very neat, it has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>, where you can choose outfits and organize your clothing.'
+	'Fedor''s bedroom is very neat, it has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>, where you can choose outfits and organize your clothing.'
 	if FedorLove = 1:
 		'Fedor has a <a href="exec:gt ''FedorEv4'', ''Picture''">framed picture</a> by his bed.'
 	end

+ 2 - 2
locations/HotelHole.qsrc

@@ -19,7 +19,7 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
-		act 'Go back to the High Street':minut += 3 & gt'pav_train'
+		act 'Go back to the High Street':minut += 3 & gt'pav_market'
 		
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'
@@ -139,7 +139,7 @@ if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and wa
 act 'Leave the hotel':
 	minut += 3
 	killvar 'prevloc'
-	gt'pav_train'
+	gt'pav_market'
 end
 
 if maidqw >= 1 and hour >= 16 and hour < 17:

+ 3 - 3
locations/HotelRoom.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'normal':
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	*nl
 	act'Go to the hotel lobby':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'better':
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'best':
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':

+ 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/LariskaHome.qsrc

@@ -510,7 +510,7 @@ if $ARGS[0] = 'lariska_bedroom':
 	*clr & cla
 	'<center><b><font color="DeepSkyBlue">Lariska''s Bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_bedroom.jpg"></center>'
-	'The bedroom has hints of japanese style, although not as overwhelming as the rest of the apartment. Against the wall is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organise your clothing.'
+	'The bedroom has hints of japanese style, although not as overwhelming as the rest of the apartment. Against the wall is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 	if lariskalove >= 12:
 		'Her <a href="exec:gt ''bed2''">bed</a> sits directly on the floor, without space underneath.'
 	else

+ 1 - 1
locations/MDressing.qsrc

@@ -13,7 +13,7 @@ cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/dressingroom.jpg"></center>'
 'A huge dressing room. Mostly used by submissives to dress as staff and because of this, it is a safe space and games are not allowed.'
-'It contains several <a href="exec:gt ''wardrobe'', ''main''">wardrobes</a> (where you can choose outfits and organize your clothing).'
+'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
 'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:gt ''mirror'',''start''">mirrors</a> you can use.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'

+ 1 - 0
locations/anushapt.qsrc

@@ -1374,6 +1374,7 @@ if $ARGS[0] = 'livingroom':
 				'"Can''t really say that about the rest of them. That Arkadi kid reminds me of a friend I used to know when I was younger. He had some temper problems and would often get in fights. Don''t get me started on Radomir, that good for nothing lout. I''m glad you''re standing up to him though, Nush." The last bit he says to his daughter before turning his attention back to you.'
 				'He looks you over for a moment, but not in a lustful way. He''s looking to see what kind of person you are. "You go to school with my daughter." he asks.'
 			end
+			seenEd = 1
 			act 'Yes':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'

+ 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

+ 2 - 2
locations/bedr.qsrc

@@ -31,7 +31,7 @@ if rembedr = 0:
 	
 	'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 $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 	*nl
-	'An old wooden <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
+	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 	*nl
@@ -43,7 +43,7 @@ else
 		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
-	'A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
 *nl
 act 'The corridor':gt 'korr'

+ 1 - 1
locations/bedr2x.qsrc

@@ -27,7 +27,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
 	'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 $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 *nl
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl

+ 9 - 13
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>'
@@ -79,7 +79,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		*nl
-		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organise your clothing.'
+		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 		*nl
 		'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 		*nl
@@ -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 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'

+ 4 - 0
locations/begin.qsrc

@@ -56,6 +56,8 @@ if $ARGS[0] = 'start':
 		settingmode = 0
 		showstat 0
 		altQS = 1
+		!!blocks the save update for group standings
+		gruptipe[9000] = 1
 		gt 'preSYS', 'SGStart'
 	end
 	
@@ -65,6 +67,8 @@ if $ARGS[0] = 'start':
 		showstat 0
 		altQS = 1
 		csb_start = 1
+		!!blocks the save update for group standings
+		gruptipe[9000] = 1
 		gt 'preSYS', 'CSBStart'
 	end
 

+ 1 - 1
locations/brothel.qsrc

@@ -548,7 +548,7 @@ if $ARGS[0] = 'section1_dressingroom':
 	*nl
 	act 'Have a snack (0:15)': gs 'food', 'snack'
 	act 'Have a glass of water (0:05)':gs 'beverage', 'bev_wat'
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if shampoo > 0:
 		act 'Have a shower':

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

+ 4 - 4
locations/camera.qsrc

@@ -42,10 +42,10 @@ $camera_locations['pav_complex'] = {
 	$camera_return_loc_arg = 'start'
 }
 
-$camera_locations['pav_train'] = {
+$camera_locations['pav_train_hall'] = {
 	$camera_description = 'Pavlovsk Train Station'
-	$camera_event = 'pav_train'
-	$camera_return_loc = 'pav_train'
+	$camera_event = 'pav_train_hall'
+	$camera_return_loc = 'pav_train_hall'
 	$camera_return_loc_arg = 'start'
 }
 
@@ -337,7 +337,7 @@ if $ARGS[0] = 'pav_church':
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
-if $ARGS[0] = 'pav_train':
+if $ARGS[0] = 'pav_train_hall':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)

+ 1 - 7
locations/cikl.qsrc

@@ -989,7 +989,7 @@ if katja_disco_end > 0: katja_disco_end = 0
 
 if npc_rel['A69'] > 60 and rand(0,3) = 0:npc_rel['A69'] -= 1
 
-!!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunfay her fall have not advanced for two weekends it will automatically advance.
+!!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunday her fall have not advanced this weekend it will automatically advance.
 if storyline = 1 and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
 	if soniafall < 7:
 		soniafallDay = daystart -1
@@ -1076,13 +1076,7 @@ if uglyduck_flag = 1 and hotcat >= 5:
 	killvar 'uglyduck_flag'
 	gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 0, 0
 	grupvalue[1] += 100
-	grupvalue[2] += 100
-	grupvalue[3] += 100
-	grupvalue[4] += 100
 	old_grupvalue[1] += 100
-	old_grupvalue[2] += 100
-	old_grupvalue[3] += 100
-	old_grupvalue[4] += 100
 end
 
 !! Resetting relationships that go over the max

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

+ 2 - 2
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
@@ -198,7 +198,7 @@ if $ARGS[0] = 'centre':
 
 	act 'Get off the train at this station':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 

+ 1 - 0
locations/city_mansion_entrance.qsrc

@@ -371,6 +371,7 @@ if $ARGS[0] = '':
 				cls
 				karta -= 250000
 				ymanrem[12] = 2
+				if komp < 1: komp = 1
 				minut += 5
 				menu_off = 1
 				gs 'stat'

+ 7 - 7
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'
@@ -43,7 +44,6 @@ if $ARGS[0] = 'yfoyer':
 		'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
 		if umbrella > 0:'There''s an umbrella hanging on a hook by the door.'
 		act 'Go to your bedroom': gt 'city_mansion_residence_1', 'ybedroom'
-		act 'Go to your nursery': gt 'city_mansion_residence_2', 'ynursery'
 		act 'Go to your bathroom': gt 'city_mansion_residence_1', 'ybathroom'
 		act 'Go to your kitchen': gt 'city_mansion_residence_1', 'ykitchen'
 		act 'Go to your living room': gt 'city_mansion_residence_2', 'yliving'
@@ -51,10 +51,10 @@ if $ARGS[0] = 'yfoyer':
 		act 'Go to your library': gt 'city_mansion_residence_2', 'ylibrary'
 		act 'Go to your office': & gt 'city_mansion_residence_2', 'yoffice'
 		act 'Go to your nursery': gt 'city_mansion_residence_2', 'ynursery'
-		act 'Go to your gym': gt 'city_mansion_residence_3', 'ygym'
+		act 'Go to your gym': minut += 1 & gt 'city_mansion_residence_3', 'ygym'
 	end
-	if bassMansion = 1:act 'Go to your pool': gt 'city_mansion_residence_3', 'ypool'
-	if banaMansion >= 1:act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
+	if bassMansion = 1:act 'Go to your pool': minut += 1 & gt 'city_mansion_residence_3', 'ypool'
+	if banaMansion >= 1:act 'Go to your sauna': minut += 1 & gt 'city_mansion_residence_3', 'ysauna'
 end
 
 if $ARGS[0] = 'ybedroom':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'ybedroom':
 		*nl
 		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 		*nl
-		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	end
 end
 
@@ -99,9 +99,9 @@ if $ARGS[0] = 'ybathroom':
 	$loc = 'city_mansion_residence_1'
 	$locM_arg = 'ybathroom'
 	$locM = 'city_mansion_residence_1'
-	$location_type = 'ybathroom'
 	$menu_loc = 'city_mansion_residence_1'
 	$menu_arg = 'ybathroom'
+	$location_type = 'bathroom'
 	$bathtype = 'bathtub shower'
 	
 	menu_off = 0
@@ -123,7 +123,7 @@ if $ARGS[0] = 'ybathroom':
 	if ymanrem[5] = 2:
 		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 		
-		gs' selfplay', 'suction_dildo'
+		gs 'selfplay', 'suction_dildo'
 		*nl
 		gs 'din_van', 'private'
 		gs 'din_van', 'misery_2'

+ 90 - 4
locations/city_mansion_residence_2.qsrc

@@ -133,7 +133,93 @@ if $ARGS[0] = 'ylibrary':
 
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 	
-	if ymanrem[10] = 2: 'A huge collection of books are neatly placed on the bookshelves.'
+	if ymanrem[10] = 2:
+		'A huge collection of books are neatly placed on the bookshelves.'
+		act 'Read a book on science (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+			blizoruk += 1
+			grupvalue[3] +=1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'
+			'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+		act 'Read an adventure novel (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			pcs_mood = 100
+			blizoruk += 1
+			grupvalue[3] +=1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
+			'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+		act 'Read a fantasy novel (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			pcs_mood = 100
+			blizoruk += 1
+			grupvalue[3] +=1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
+			'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+		act 'Read a science fiction novel (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			pcs_mood = 100
+			blizoruk += 1
+			grupvalue[3] +=1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
+			'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+		act 'Read a romance novel (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			pcs_mood = 100
+			blizoruk += 1
+			pcs_horny += 20
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
+			'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey... several of the scenes are very steamy and you find yourself getting quite aroused.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+		act 'Read from the collected works of Leo Tolstoy (1:00)':
+			*clr & cla
+			menu_off = 1
+			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+			minut += 60
+			sprt_exp += rand(3,6)
+			blizoruk += 1
+			grupvalue[3] +=2
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/tolstoy.jpg"></center>'
+			'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
+			act 'Put the book back': gt 'city_mansion_residence_2', 'ylibrary'
+		end
+	end
 end
 
 if $ARGS[0] = 'yoffice':
@@ -221,7 +307,7 @@ if $ARGS[0] = 'yoffice':
 			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 pcs_inhib < 30:
 					if pcs_inhib < 10:
 						$diff = 'hard'
 					elseif pcs_inhib < 20:
@@ -247,7 +333,7 @@ if $ARGS[0] = 'yoffice':
 			end
 
 			!! Streaming music
-			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 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 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:
 					if pcs_inhib < 10:
@@ -276,7 +362,7 @@ if $ARGS[0] = 'yoffice':
 			end
 
 			!! Recording music
-			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+			if ml_guitar['hasguitar'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 				if pcs_inhib < 20:
 					if pcs_inhib < 10:
 						$diff = 'medium'

+ 3 - 3
locations/city_mansion_residence_3.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'ygym':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
 
-	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+	act 'Leave the room': minut += 1 & gt 'city_mansion_residence_1', 'yfoyer'
 	if bassMansion = 1: act 'Go to your pool area': gt 'city_mansion_residence_3', 'ypool'
 	if banaMansion >= 1: act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
 
@@ -45,7 +45,7 @@ if $ARGS[0] = 'ypool':
 	'<center><b><font color="maroon">Swimming Pool</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_pool.jpg"></center>'
 
-	act 'Go back inside': gt 'city_mansion_residence_1', 'yfoyer'
+	act 'Go back inside': minut += 1 & gt 'city_mansion_residence_1', 'yfoyer'
 	act 'Go into your gym': gt 'city_mansion_residence_3', 'ygym'
 	act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
 	act 'Swim (1:00)':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'ysauna':
 	'<center><b><font color="maroon">Sauna</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_sauna.jpg"></center>'
 
-	act 'Go back inside': gt 'city_mansion_residence_1', 'yfoyer'
+	act 'Go back inside': minut += 1 & gt 'city_mansion_residence_1', 'yfoyer'
 	act 'Go into your gym': gt 'city_mansion_residence_3', 'ygym'
 	act 'Go to your pool': gt 'city_mansion_residence_3', 'ypool'
 	act 'Use the sauna (1:00)':

+ 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
 

+ 3 - 3
locations/city_redlight.qsrc

@@ -82,7 +82,7 @@ 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
@@ -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
@@ -117,7 +117,7 @@ if $ARGS[0] = 'city_copy_shop':
 				minut += 60
 				money -= 100000
 				gs 'uniutil', 'fake_diploma', 'set_obtained'
-				'<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 bought a fake diploma.'
 				act 'Leave': gt 'city_redlight', 'start'
 			end

+ 1 - 1
locations/city_sauna.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'saunaroom':
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
 	*nl
-	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organize your clothing.'
+	'<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>.'

+ 8 - 29
locations/city_train.qsrc

@@ -10,35 +10,14 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	gs'stat'
 	'<center><B>City center railway station</B></center>'
-	if hour < 9 or hour > 19:
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_night.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_day.jpg"></center>'
-	end
-	'The main station for the city, it is always busy offering services to many destinations and the best place to park your car or hire a taxi.'
-
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
+	'The grand old station in the city centre is an impressive building. It is busy and has a number of shops and bars as well as all the platforms and trains. '
+	*nl
 	if car > 0 and cardrive = 2:
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
 	act 'Go to the city center':minut += 5 & gt 'city_center'
-	act 'Enter the station building': minut += 1 & gt 'city_train', 'inside'
-end
-
-if $ARGS[0] = 'inside':
-	$loc_arg = 'inside'
-	$loc = 'city_train'
-	$location_type = 'public_indoors'
-	$menu_loc = 'city_train'
-	$menu_arg = 'inside'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><B>City center railway station</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
-	'The grand old station is even more impressive on the inside and has a number of shops and bars as well as all the platforms and trains. '
-	*nl
-	act 'Leave the train station': minut += 1 & gt 'city_train', 'start'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
 		act 'Go to the platforms': gt 'city_train', 'platform'
@@ -56,7 +35,7 @@ if $ARGS[0] = 'tickets':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg" ></center>'
 
-	act 'Leave the ticket office':minut += 1 & gt 'city_train', 'inside'
+	act 'Leave the ticket office':minut += 1 & gt 'city_train', 'start'
 	
 	act 'Buy a ticket':
 		cla
@@ -69,7 +48,7 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'city_train', 'inside'
+			act 'Return': gt 'city_train', 'start'
 		end
 	end
 
@@ -79,7 +58,7 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'city_train', 'inside'
+			act 'Return': gt 'city_train', 'start'
 		end
 	end	
 end
@@ -89,7 +68,7 @@ if $ARGS[0] = 'buy_ticket':
 	$menu_arg = 'buy_ticket'
 	menu_off = 0
 	
-	act 'Leave the ticket office': minut += 1 & gt 'city_train', 'inside'
+	act 'Leave the ticket office': minut += 1 & gt 'city_train', 'start'
 	
 	act 'Buy a ticket to the city industrial area (50 <b>₽</b>)':
 		if money >= 50:
@@ -137,7 +116,7 @@ if $ARGS[0] = 'platform':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying shopping bags. It feels like it is always busy here, no matter at what time of the day it is.'
 
-	act 'Return to the station hall':gt 'city_train', 'inside'
+	act 'Return to the station hall':gt 'city_train', 'start'
 	
 	act 'Take a train to the city industrial area': gt 'city_train', 'ind'
 

File diff suppressed because it is too large
+ 1129 - 464
locations/clothing.qsrc


File diff suppressed because it is too large
+ 576 - 148
locations/clothing_QV.qsrc


+ 1 - 1
locations/club.qsrc

@@ -443,7 +443,7 @@ if $ARGS[0] = 'bar':
 		menu_off = 1
 		temp = rand(0, 100)
 
-		if temp = 5:
+		if temp <= 5:
 			pcs_horny += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club1.jpg"></center>'

+ 3 - 1
locations/dachain.qsrc

@@ -26,7 +26,7 @@ if $args[0] = '':
 	end
 	'Your favorite summer residence.'
 	*nl
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 	*nl
 	'There is a sofa in front of the fireplace, a kitchen alcove opposite the bed and the door to the bathroom next to that.'
 	*nl
@@ -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

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -1019,7 +1019,7 @@ if dimaRevChoice = 5:
 								'You wonder how he got this video in the first place and about the other videos. You check them and find several with names of girls you know. Then you see one with your name. You open it and find a video with clips of you in the locker room and shower.'
 								'"You fucking pig!!" you scream as you punch and kick Petia until he can''t take anymore and passes out. You check his pockets and find a wallet with 1000 roubles.
 								You pocket the money and throw his phone and wallet into a nearby pond, then head to the train station and finally home. You don''t know how Petia is going to get back, and you don''t care. Today was an ordeal and you just want to rest.'
-								act 'Continue': minut += 45 & gt 'pav_train'
+								act 'Continue': minut += 45 & gt 'pav_market'
 							end
 						end
 					end

+ 1 - 1
locations/dom_gor.qsrc

@@ -12,7 +12,7 @@ gs 'stat'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Your room</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
-'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
+'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
 *nl
 
 if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:

+ 20 - 15
locations/dorm.qsrc

@@ -157,21 +157,26 @@ if $ARGS[0] = 'eighth_floor':
 							kendra_busy = daystart
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
-							'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
-							*nl
-							'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
-							gs 'arousal', 'erotic_nudity', 3
-							gs 'stat'
-							act 'Enter': gt 'dormev1', 'kendra_male_slave'
-							act 'Decline':
-								*clr & cla
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
-								'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
-								'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
-								gs 'arousal', 'end'
-								gs 'stat'
+							if npc_rel['A84'] < 40:
+								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. When she see''s you she frowns. "I told you last time, I don''t have time for games and I am tired of yours. Now get lost, I''m busy." She closes the door in your face.'
 								act 'Leave':gt 'dorm', 'elevator'
+							else
+								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
+								*nl
+								'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
+								gs 'arousal', 'erotic_nudity', 3
+								gs 'stat'
+								act 'Enter': gt 'dormev1', 'kendra_male_slave'
+								act 'Decline':
+									*clr & cla
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
+									'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
+									'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Leave':gt 'dorm', 'elevator'
+								end
 							end
 						end
 						act 'Leave':gt 'dorm', 'elevator'
@@ -626,7 +631,7 @@ if $ARGS[0] = 'dorm_room':
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
 	'This is your room which you share with another girl named Vika Kirilova.'
-	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
 	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'

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

+ 63 - 9
locations/fame.qsrc

@@ -186,7 +186,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(25,60)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/6'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/6') < 1000:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/6'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/6 -1000)*3)/5'
+				end
 			end
 		elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']') > 400:
 			if $ARGS[2] = 'tiny':
@@ -206,7 +210,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(50,100)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/3'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/3') < 700:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/3'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/3') < 1300:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/3 -700)/2'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+				end
 			end
 		else
 			if $ARGS[2] = 'tiny':
@@ -226,7 +236,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(150,250)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += <<ARGS[2]>>'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 400:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 1300:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']+<<ARGS[2]>> - 400)/3'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 3100:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+				end
 			end
 		end
 		if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 0'
@@ -274,7 +292,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(25,60)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/6'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/6') < 1000:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/6'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/6 -1000)*3)/5'
+					end
 				end
 			elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local'']') > 400:
 				if $ARGS[2] = 'tiny':
@@ -294,7 +316,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(50,100)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/3'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/3') < 700:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/3') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/3 -700)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+					end
 				end
 			else
 				if $ARGS[2] = 'tiny':
@@ -314,7 +342,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(150,250)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += <<ARGS[2]>>'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 400:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local'']+<<ARGS[2]>> - 400)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 3100:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+					end
 				end
 			end
 		else
@@ -356,7 +392,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(25,60)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/6'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/6') < 1000:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/6'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/6 -1000)*3)/5'
+					end
 				end
 			elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core'']') > 400:
 				if $ARGS[2] = 'tiny':
@@ -376,7 +416,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(50,100)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/3'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/3') < 700:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/3') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/3 -700)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+					end
 				end
 			else
 				if $ARGS[2] = 'tiny':
@@ -396,7 +442,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(150,250)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += <<ARGS[2]>>'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 400:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core'']+<<ARGS[2]>> - 400)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 3100:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+					end
 				end
 			end
 		end

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

+ 144 - 66
locations/family_schedule.qsrc

@@ -10,141 +10,202 @@ 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
+				anyaloc = func('shortgs', 'rand_pick', '', 10, 15)
+				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
+			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)
+				anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
+				if anyaloc = 15:
+					anyaloc['athome'] = 1
+					anyaloc['inroom'] = 1
+				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
+			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
+			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:
-			!!Family dinner
-			anyaloc = 12
-			anyaloc['athome'] = 1
+			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
@@ -160,12 +221,13 @@ if indorf = 0:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!!Asleep, if Sveta knocks she''ll ask to wake Kolka
 			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):
+		elseif hour < 6:
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
 			momloc['athome'] = 1
@@ -178,7 +240,7 @@ if indorf = 0:
 			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 +256,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 +272,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,13 +296,17 @@ 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)
+			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
 			momloc = 1
 			momloc['athome'] = 0
 		end
@@ -244,12 +314,12 @@ if indorf = 0:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!! Sleep
 			momloc = 1
-		elseif hour = 5 and minut < 50:
+		elseif hour = 5 and minut < 45:
 			!! Shower, if Sveta knocks she''ll ask to wake Kolka
 			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):
+		elseif hour < 6:
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
 			momloc['athome'] = 1
@@ -274,7 +344,7 @@ 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):
@@ -302,7 +372,7 @@ if indorf = 0:
 			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)
+			!!Family dinner
 			momloc = 12
 			momloc['athome'] = 1
 		elseif hour < 19:
@@ -310,19 +380,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)
+			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
 			momloc = 1
 			momloc['athome'] = 0
 		end
@@ -337,11 +415,11 @@ if indorf = 0:
 			!! Sleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
-		elseif hour < 7:
+		elseif hour < hour = 6 and minut < 45:
 			!!Getting ready, sometimes has quicky
 			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
@@ -405,11 +483,11 @@ if indorf = 0:
 			!! Sleep
 			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
@@ -476,7 +554,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 +618,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

+ 321 - 87
locations/fathersex.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'fathersex_act1':
 				*clr & cla
 				gs 'boyStat', 'A28'
 				sexpartkno = 1
-				spafinloc = 0
+				spafinloc = 3
 				gs 'cum_manage'
 				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampieA1.mp4" ></video></center>'
 				gs 'arousal', 'anal', 10, 'sub', 'incest'
@@ -190,131 +190,279 @@ if $ARGS[0] = 'fathersex_act1':
 				act 'Dad wants your front door...':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cowgirl/cowgirl_rub.mp4"></video></center>'
-					'Pound me daddy, all my holes are yours...'
-					act 'Hard pounding vag':
-						*clr & cla
-						'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog2.mp4"></video></center>'
-						'Your stepfather slams his cock in to you hard and deep, his unrelenting pounding making your tits bounce. Your moans coming out as half screams of pure pleasure. '
-						act 'Cum...':
+					
+					if pcs_vag = 0:
+						'But daddy, I''m still a virgin...'
+					else
+						'Pound me daddy, all my holes are yours...'
+					end
+
+					if pcs_vag > 0:
+						act 'Hard pounding vag':
 							*clr & cla
-							gs 'boyStat', 'A28'
-							sexpartkno = 1
-							spafinloc = 0
-							gs 'cum_manage'
-							'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/Cum_cowgirl.mp4"></video></center>'
-							$orgasm_or = 'yes'
-							gs 'cuminsidereact'
-							gs 'arousal', 'vaginal', 5, 'sub', 'rough'
-							gs 'arousal', 'end'
-							gs 'stat'
-							act 'More... Cum together':
+							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog2.mp4"></video></center>'
+							'Your stepfather slams his cock in to you hard and deep, his unrelenting pounding making your tits bounce. Your moans coming out as half screams of pure pleasure. '
+							act 'Cum...':
 								*clr & cla
 								gs 'boyStat', 'A28'
 								sexpartkno = 1
 								spafinloc = 0
 								gs 'cum_manage'
-								if pcs_horny >= 100:
+								'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/Cum_cowgirl.mp4"></video></center>'
+								$orgasm_or = 'yes'
+								gs 'cuminsidereact'
+								gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'More... Cum together':
+									*clr & cla
+									gs 'boyStat', 'A28'
+									sexpartkno = 1
+									spafinloc = 0
 									gs 'cum_manage'
-									'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
-									'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
-									$orgasm_or = 'yes'
-									gs 'cuminsidereact'
-									gs 'arousal', 'vaginal', 5, 'sub', 'rough'
-									gs 'arousal', 'end'
-									gs 'stat'
-									act 'Stand up':gt $loc, $loc_arg
-									act 'Clean him up with your lips':
-										*clr & cla
+									if pcs_horny >= 100:
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
+										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'cuminsidereact'
+										gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+										gs 'arousal', 'end'
 										gs 'stat'
-										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
-										'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
-										gs 'arousal', 'bj', 2, 'sub'
+										act 'Stand up':gt $loc, $loc_arg
+										act 'Clean him up with your lips':
+											*clr & cla
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
+											gs 'arousal', 'bj', 2, 'sub'
+											gs 'stat'
+											act 'Use your mouth':
+												*clr & cla
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Stand up':gt $loc, $loc_arg
+											end
+										end
+									else
+										gs 'boyStat', 'A28'
+										sexpartkno = 1
+										spafinloc = 0
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
+										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'cuminsidereact'
+										gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 										gs 'stat'
-										act 'Use your mouth':
+										act 'Clean him up with your lips':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
-											'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
 											gs 'arousal', 'bj', 2, 'sub'
-											gs 'arousal', 'end'
 											gs 'stat'
-											act 'Stand up':gt $loc, $loc_arg
+											act 'Use your mouth':
+												*clr & cla
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
+												gs 'stat'
+												act 'daddy wants more':
+													*clr & cla
+													gs 'boyStat', 'A28'
+													sexpartkno = 1
+													spafinloc = 0
+													gs 'cum_manage'
+													'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
+													'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
+													gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+													gs 'stat'
+													act 'Continue':
+														*clr & cla
+														'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex7.mp4"></video></center>'
+														'For several minutes he pounds your pussy, your pleasure mounting as you feel yourself close to climax...'
+														gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+														gs 'stat'
+														act 'fuck me dad...':
+															*clr & cla
+															'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex9.mp4"></video></center>'
+															'"Tell me i fuck better than mom..." you moan as you feel your pleasure building, you wrap your legs around him to pull him deeper inside. Suddenly he moans thrusting his cock deep inside you, holding it there as he begins filling you with his seed. '
+															gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+															gs 'stat'
+															act 'Climax':
+																*clr & cla
+																gs 'boyStat', 'A28'
+																sexpartkno = 1
+																spafinloc = 0
+																gs 'cum_manage'
+																'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
+																'With his cock deep inside you and between his moans and cum pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>>."'
+																$orgasm_or = 'yes'
+																gs 'cuminsidereact'
+																gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+																gs 'arousal', 'end'
+																gs 'stat'
+																act 'Stand up':gt $loc, $loc_arg
+																act 'Clean him up with your mouth':
+																	*clr & cla
+																	gs 'stat'
+																	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral8.mp4"></video></center>'
+																	'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
+																	gs 'arousal', 'bj', 2, 'sub'
+																	gs 'stat'
+																	act 'Use your mouth':
+																		*clr & cla
+																		'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,10.mp4"></video></center>'
+																		'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+																		gs 'arousal', 'bj', 2, 'sub'
+																		gs 'arousal', 'end'
+																		gs 'stat'
+																		act 'Stand up':gt $loc, $loc_arg
+																	end
+																end
+															end
+														end
+													end
+												end
+											end
 										end
 									end
-								else
+								end
+							end
+						end
+					end
+
+					if pcs_vag = 0:
+
+						act 'Hard pounding vag (virgin)':
+							*clr & cla
+							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog2.mp4"></video></center>'
+							'Your stepfather slams his cock in to you hard and deep, his unrelenting pounding making your tits bounce. Your moans coming out as half screams of pure pleasure. '
+							act 'Cum...':
+								*clr & cla
+								gs 'boyStat', 'A28'
+								sexpartkno = 1
+								spafinloc = 0
+								gs 'cum_manage'
+								'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/Cum_cowgirl.mp4"></video></center>'
+								$orgasm_or = 'yes'
+								gs 'cuminsidereact'
+								gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'More... Cum together':
+									*clr & cla
 									gs 'boyStat', 'A28'
 									sexpartkno = 1
 									spafinloc = 0
 									gs 'cum_manage'
-									'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
-									'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
-									$orgasm_or = 'yes'
-									gs 'cuminsidereact'
-									gs 'arousal', 'vaginal', 5, 'sub', 'rough'
-									gs 'stat'
-									act 'Clean him up with your lips':
-										*clr & cla
+									if pcs_horny >= 100:
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
+										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'cuminsidereact'
+										gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+										gs 'arousal', 'end'
 										gs 'stat'
-										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
-										'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
-										gs 'arousal', 'bj', 2, 'sub'
+										act 'Stand up':gt $loc, $loc_arg
+										act 'Clean him up with your lips':
+											*clr & cla
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
+											gs 'arousal', 'bj', 2, 'sub'
+											gs 'stat'
+											act 'Use your mouth':
+												*clr & cla
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Stand up':gt $loc, $loc_arg
+											end
+										end
+									else
+										gs 'boyStat', 'A28'
+										sexpartkno = 1
+										spafinloc = 0
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
+										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'cuminsidereact'
+										gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 										gs 'stat'
-										act 'Use your mouth':
+										act 'Clean him up with your lips':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
-											'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
 											gs 'arousal', 'bj', 2, 'sub'
 											gs 'stat'
-											act 'daddy wants more':
+											act 'Use your mouth':
 												*clr & cla
-												gs 'boyStat', 'A28'
-												sexpartkno = 1
-												spafinloc = 0
-												gs 'cum_manage'
-												'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
-												'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
-												gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
 												gs 'stat'
-												act 'Continue':
+												act 'daddy wants more':
 													*clr & cla
-													'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex7.mp4"></video></center>'
-													'For several minutes he pounds your pussy, your pleasure mounting as you feel yourself close to climax...'
+													gs 'boyStat', 'A28'
+													sexpartkno = 1
+													spafinloc = 0
+													gs 'cum_manage'
+													'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
+													'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
 													gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 													gs 'stat'
-													act 'fuck me dad...':
+													act 'Continue':
 														*clr & cla
-														'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex9.mp4"></video></center>'
-														'"Tell me i fuck better than mom..." you moan as you feel your pleasure building, you wrap your legs around him to pull him deeper inside. Suddenly he moans thrusting his cock deep inside you, holding it there as he begins filling you with his seed. '
+														'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex7.mp4"></video></center>'
+														'For several minutes he pounds your pussy, your pleasure mounting as you feel yourself close to climax...'
 														gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 														gs 'stat'
-														act 'Climax':
+														act 'fuck me dad...':
 															*clr & cla
-															gs 'boyStat', 'A28'
-															sexpartkno = 1
-															spafinloc = 0
-															gs 'cum_manage'
-															'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
-															'With his cock deep inside you and between his moans and cum pumping deep inside you. Your dad looks at you and says... "i love you <<$pcs_nickname>>."'
-															$orgasm_or = 'yes'
-															gs 'cuminsidereact'
+															'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex9.mp4"></video></center>'
+															'"Tell me i fuck better than mom..." you moan as you feel your pleasure building, you wrap your legs around him to pull him deeper inside. Suddenly he moans thrusting his cock deep inside you, holding it there as he begins filling you with his seed. '
 															gs 'arousal', 'vaginal', 5, 'sub', 'rough'
-															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Stand up':gt $loc, $loc_arg
-															act 'Clean him up with your mouth':
+															act 'Climax':
 																*clr & cla
+																gs 'boyStat', 'A28'
+																sexpartkno = 1
+																spafinloc = 0
+																gs 'cum_manage'
+																'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
+																'With his cock deep inside you and between his moans and cum pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>>."'
+																$orgasm_or = 'yes'
+																gs 'cuminsidereact'
+																gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+																gs 'arousal', 'end'
 																gs 'stat'
-																'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral8.mp4"></video></center>'
-																'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
-																gs 'arousal', 'bj', 2, 'sub'
-																gs 'stat'
-																act 'Use your mouth':
+																act 'Stand up':gt $loc, $loc_arg
+																act 'Clean him up with your mouth':
 																	*clr & cla
-																	'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,10.mp4"></video></center>'
-																	'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+																	gs 'stat'
+																	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral8.mp4"></video></center>'
+																	'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
 																	gs 'arousal', 'bj', 2, 'sub'
-																	gs 'arousal', 'end'
 																	gs 'stat'
-																	act 'Stand up':gt $loc, $loc_arg
+																	act 'Use your mouth':
+																		*clr & cla
+																		'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,10.mp4"></video></center>'
+																		'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+																		gs 'arousal', 'bj', 2, 'sub'
+																		gs 'arousal', 'end'
+																		gs 'stat'
+																		act 'Stand up':gt $loc, $loc_arg
+																	end
 																end
 															end
 														end
@@ -326,7 +474,93 @@ if $ARGS[0] = 'fathersex_act1':
 								end
 							end
 						end
+
+
+						!anal version:
+						act 'Keep pounding asshole':
+							*clr & cla
+							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog2.mp4"></video></center>'
+							'To keep your virginity safe, your stepfather slams his cock back in to your asshole hard and deep, his unrelenting pounding making your tits bounce. Your moans coming out as half screams of pure pleasure. '
+							act 'Cum...':
+								*clr & cla
+								gs 'boyStat', 'A28'
+								sexpartkno = 1
+								spafinloc = 3
+								gs 'cum_manage'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5_2.jpg"></center>'
+								$orgasm_or = 'yes'
+								'You suddenly feel an intense warmth spreading inside you. Your stepfather pulls out his cock, and a slow trail of his cum slowly drips out of you.'
+								'Spreading your ass cheeks with your hands, you give him a nice view of his load in your sphincter. Your stepfather is fascinated and watches his cum slowly drip down, giving your ass a few more slaps for good measure.'
+								'When you think your asshole is finally gonna have some rest, your stepfather shoves his dick back inside of you.'
+								'"Sorry, <<$pcs_nickname>>... but we''re not done yet."'
+								gs 'arousal', 'anal', 5, 'sub', 'rough'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'More... Pounding':
+									*clr & cla
+									gs 'boyStat', 'A28'
+									sexpartkno = 1
+									spafinloc = 3
+									gs 'cum_manage'
+									if pcs_horny >= 100:
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5.mp4"></video></center>'
+										'For several minutes he pounds your ass. As your pleasure mounts, you feel yourself close to climax, clenching your sphincter around him to keep him deep inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'arousal', 'anal', 5, 'sub', 'rough'
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Stand up':gt $loc, $loc_arg
+										act 'Clean him up with your lips':
+											*clr & cla
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
+											gs 'arousal', 'bj', 2, 'sub'
+											gs 'stat'
+											act 'Use your mouth':
+												*clr & cla
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little and having in your tongue the taste of your own asshole. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Stand up':gt $loc, $loc_arg
+											end
+										end
+									else
+										gs 'boyStat', 'A28'
+										sexpartkno = 1
+										spafinloc = 3
+										gs 'cum_manage'
+										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5.mp4"></video></center>'
+										'For several minutes he pounds your asshole. As your pleasure mounts, you feel yourself close to climax, clenching your sphincter around him to keep him deep inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
+										$orgasm_or = 'yes'
+										gs 'arousal', 'anal', 5, 'sub', 'rough'
+										gs 'stat'
+										act 'Clean him up with your lips':
+											*clr & cla
+											gs 'stat'
+											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
+											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
+											gs 'arousal', 'bj', 2, 'sub'
+											gs 'stat'
+											act 'Use your mouth':
+												*clr & cla
+												'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
+												'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+												gs 'arousal', 'bj', 2, 'sub'
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Stand up':gt $loc, $loc_arg
+											end
+										end
+									end
+								end
+							end
+						end
 					end
+
 				end
 			end
 		end

+ 1 - 1
locations/fit.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'dressing room':
 
 	act 'Change outfit':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 
 	if PCloswimwear = 1:

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

+ 8 - 8
locations/gdksex.qsrc

@@ -1618,7 +1618,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1648,7 +1648,7 @@ if $ARGS[0] = 'heating_up':
 						gs 'willpower', 'exhib', 'resist', 'easy'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pav_train'
+						gt 'pav_market'
 					end
 				else
 					act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1669,7 +1669,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1716,7 +1716,7 @@ if $ARGS[0] = 'heating_up':
 									gs 'willpower', 'prostitution', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pav_train'
+									gt 'pav_market'
 								end
 							else
 								act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2226,7 +2226,7 @@ if $ARGS[0] = 'End':
 	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the hotel': gt 'pav_train'
+	act 'Leave the hotel': gt 'pav_market'
 end
 
 if $ARGS[0] = 'drug_user':
@@ -2342,7 +2342,7 @@ if $ARGS[0] = 'drugs':
 								gs 'arousal', 'end'
 								pcs_horny += 100
 								gs 'stat'
-								act 'Leave the room': gt 'pav_train'
+								act 'Leave the room': gt 'pav_market'
 							end
 						end
 					end
@@ -2363,7 +2363,7 @@ if $ARGS[0] = 'drugs':
 			'You try to excuse yourself, saying that it wasn''t your intention to lead him on...'
 			'<<$npc_firstname[$boy]>> stops for a moment and you notice that he''s clearly affected by the drugs. His eyes flare up as he leaps from the chair, shouting that you''re just some whore that was after his drugs.'
 			'He grabs hold of you and shoves you over to the door, throwing you outside. You stand in shock as the drugs take hold of you and you feel yourself becoming incredibly aroused. You knock on the door, but <<$npc_firstname[$boy]>> refuses to open it. You decide to leave... maybe you''ll get lucky somewhere else.'
-			act 'Leave the hotel': gt 'pav_train'
+			act 'Leave the hotel': gt 'pav_market'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2376,7 +2376,7 @@ if $ARGS[0] = 'no drugs':
 	'"There''s no way I''m doing that! Who knows what that powder is and I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$boy]>> snorts deeply and looks over at you. "Too bad, you''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$boy]>> just shrugs his shoulders and jumps straight back into what he started.'
-	act 'Leave the room': gt 'pav_train'
+	act 'Leave the room': gt 'pav_market'
 end
 
 --- gdksex ---------------------------------

+ 2 - 2
locations/gdksport.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 
 	act 'Change outfit in the locker room':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 
 	gs 'wardrobe', 'sports_outfit'
@@ -263,7 +263,7 @@ if $ARGS[0] = 'dance2':
 
 		act 'Leave':
 			if rand (0,4):
-				if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
+				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'
 					elseif grupTipe = 1 or grupTipe = 2:

+ 7 - 7
locations/gkafe.qsrc

@@ -17,9 +17,9 @@ if $ARGS[0] = '':
 	*nl
 	'A small shabby cafe attached to the train station. It''s closed right now, but is usually open between 08:00 and 20:00.'
 
-	act 'Leave':gt 'pav_train'
+	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
@@ -56,13 +56,13 @@ if $ARGS[0] = '':
 					*nl
 					'The cafe owner abruptly pulls his cock out of your mother''s mouth, a string of saliva still attached to it as he roughly pulls her up and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing to comply with his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately shoves his cock into her pussy. His thrusting is fast and furious and you figure that he doesn''t intend to do this much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as her pussy is roughly pounded by her boss. A few minutes later, he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates before she sees you.'
 
-					act 'Leave':gt 'pav_train'
+					act 'Leave':gt 'pav_market'
 				end
-				act 'You''ve seen enough':gt 'pav_train'
+				act 'You''ve seen enough':gt 'pav_market'
 			end
-			act 'You''ve seen enough':gt 'pav_train'
+			act 'You''ve seen enough':gt 'pav_market'
 		end
-		act 'You''ve seen enough':gt 'pav_train'
+		act 'You''ve seen enough':gt 'pav_market'
 	else
 		if hour >= 8 and hour <= 19:
 			*clr & cla
@@ -70,7 +70,7 @@ if $ARGS[0] = '':
 			*nl
 			'A small shabby cafe attached to the train station.'
 
-			act 'Leave':gt 'pav_train'
+			act 'Leave':gt 'pav_market'
 			
 			gs 'gkafe', 'menu'
 

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -764,7 +764,7 @@ if $ARGS[0] = 'change_room':
 	gs 'wardrobe', 'sports_outfit'
 	act 'Change your outfit':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'

+ 164 - 278
locations/gschool_lessons4.qsrc

@@ -663,7 +663,7 @@ if $ARGS[0] = 'pe':
 	gs 'grades', 'attend_class', 'school', 'pe'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
-	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is here.'
+	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is here, this is the only class you have where all the students from your grade is present.'
 	if week = 5 and LocalRun = 0:
 		if SchoolSorev = 0:SchoolSorev = 1
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
@@ -699,8 +699,14 @@ if $ARGS[0] = 'pe':
 						act 'Show him your tits':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra3.jpg"></center>'
-							'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. You almost immediately notice the erection growing in his tight shorts, and he awkwardly tries to hide it. As you pull your shirt back down, you give him a sweet smile and say "Try hiding that while you''re running past everyone!"'
-							'He grimaces as he sprints away from you, carefully checking to make sure no one is near him. You have a knowing smile on your face when, at the end of the class, his friends ask him why his lap time was so much slower than usual.'
+							if hotcat >= 6:
+								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. You almost immediately notice the erection growing in his tight shorts, and he awkwardly tries to hide it. As you pull your shirt back down, you give him a sweet smile and say "Try hiding that while you''re running past everyone!"'
+								'He grimaces as he sprints away from you, carefully checking to make sure no one is near him. You have a knowing smile on your face when, at the end of the class, his friends ask him why his lap time was so much slower than usual.'
+							elseif hotcat >= 4:
+								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He smiles and shakes his head, as he sprints away from you, you slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
+							else
+								'Making sure no one else is nearby, you pull up your shirt and reveal your <<$titsize>> breasts to Ivan. He makes a slightly disgusted look and shakes his head, as he sprints away from you, you slow down a little to get everything back in place. At the end of the class, Ivan puts in the fastest time, again.'
+							end
 							act 'Finish run':gt 'gschool_lessons4', 'postphys'
 						end
 						act 'Laugh it off and let him go':
@@ -743,7 +749,7 @@ if $ARGS[0] = 'pe':
 					if runinside = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/butt.jpg"></center>'
 						'"The weather isn''t great, so you''ll be running as many laps of the gym as you can. Start when you''re ready."'
-					    'You start running laps around the inside of the gym and it''s uneventful until you see Anushka pass behind Mr. Nikolaevich and pull down the back of her shorts to show off her panty clad ass. It doesn''t take too long before many of the boys catch up to Anushka, but not pass her. They wait until she passes behind the teacher and flashes them her panty clad ass again.'
+					    'You start running laps around the inside of the gym and it''s uneventful until you see Anushka pass behind Coach Nikolaevich and pull down the back of her shorts to show off her panty clad ass. It doesn''t take too long before many of the boys catch up to Anushka, but not pass her. They wait until she passes behind the teacher and flashes them her panty clad ass again.'
 						gs'arousal','erotic_nudity', 5
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -765,7 +771,7 @@ if $ARGS[0] = 'pe':
 				grupvalue[2] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra4.jpg"></center>'
-			'After the roll call, Mr. Nikolaevich announces that you will be taking turns performing vaults. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+			'After the roll call, Coach Nikolaevich announces that you will be taking turns performing vaults. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 3:
@@ -779,19 +785,27 @@ if $ARGS[0] = 'pe':
 				gs 'arousal', 'flash', -5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
-				'After the roll call, Mr. Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
-				'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+				if hotcat >= 6:
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+				elseif hotcat >= 4:
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: most of the class that are watching start laughing, with a few pointing, while some of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+				else
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+					'You''re not wearing panties and while you''re doing your pullups, your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with negative responses: most give you looks of disgust or disapproval, while Vasily comments. "OH GOD! I think, I''m blind." You quickly let go of the bar and pull your shorts back up, which gets everyone laughing, it takes a bit for Coach Nikolaevich to get the class back focused on class. You are deeply embarrassed by the whole ordeal.'
+				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra6.jpg"></center>'
-				'After the roll call, Mr. Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+				'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
 				if hotcat >= 6:'Some of the boys stop what they''re doing when it''s your turn, coming over to shout some words of support.'
 				if pcs_stren <= 20:
 					grupvalue[2] -= 1
 					'Unfortunately, pull-ups aren''t your strong point, and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 				elseif pcs_stren <= 30:
-					'Unfortunately, pull-ups aren''t your strong point, and you''re unable to do as many as most of the girls.'
+					'Unfortunately, pull-ups aren''t your strong point, and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
 				elseif pcs_stren <= 50:
-					'In the end, you wind up doing a perfectly respectable amount of pull-ups. Better than most of the girls, but less than the jocks.'
+					'In the end, you wind up doing a perfectly respectable amount of pull-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
 				elseif pcs_stren <= 70:
 					grupvalue[2] += 1
 					'In the end, you wind up doing great. You do more pull-ups than some of the boys and better than all the girls except Christina.'
@@ -807,15 +821,15 @@ if $ARGS[0] = 'pe':
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra7.jpg"></center>'
-			'After the roll call, Mr. Nikolaevich announces that you will all be doing sit-ups, but that the boys will also have to do pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
+			'After the roll call, Coach Nikolaevich announces that you will all be doing sit-ups, but that the boys will also have to do pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
 			if hotcat >= 6:'Some of the boys stop what they''re doing when it''s your turn, coming over to shout some words of support.'
 			if pcs_stren <= 20:
 				grupvalue[2] -= 1
 				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 			elseif pcs_stren <= 30:
-				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as most of the girls.'
+				'Unfortunately, sit-ups aren''t your strong point and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
 			elseif pcs_stren <= 50:
-				'In the end, you wind up doing a perfectly respectable amount of sit-ups. Better than most of the girls, but less than the jocks.'
+				'In the end, you wind up doing a perfectly respectable amount of sit-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
 			elseif pcs_stren <= 70:
 				grupvalue[2] += 1
 				'In the end, you wind up doing great. You do more sit-ups than some of the boys and better than all the girls except Christina.'
@@ -828,7 +842,7 @@ if $ARGS[0] = 'pe':
 		elseif fizrarand = 5:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_vital
 			gs 'exercise', 'tier2', 1, 'vital_exp'
-			'The teacher breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
+			'The Coach Nikolaevich breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
 			if pcs_cupsize <= 20:
 				if pcs_vital <= 30:
 					grupvalue[2] -= 1
@@ -841,7 +855,7 @@ if $ARGS[0] = 'pe':
 					'Jumping rope is a surprisingly good workout. You do very well and beat most of your classmates. While you never win any of the competitions, you don''t embarrass yourself either. You''re tired by the time you''re done.'
 				else
 					grupvalue[2] += 2
-					'The other girls in your group are surprised at just how long you can jump rope without messing up. You manage to go the longest in a couple of rounds of the competition.'
+					'The other girls are surprised at just how long you can jump rope without messing up. You manage to go the longest in a couple of rounds of the competition.'
 				end
 			elseif pcs_cupsize <= 60:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumprb.mp4"></video></center>'
@@ -862,10 +876,10 @@ if $ARGS[0] = 'pe':
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumph.mp4"></video></center>'
 				if pcs_vital <= 30:
 					grupvalue[2] -= 1
-					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. One of them shouts: "C''mon, already! We want to see them bounce!"'
+					'You''re barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. Vasily shouts: "C''mon, already! We want to see them bounce!"'
 				elseif pcs_vital <= 40:
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
-					'You do about average among the girls before you get tripped up on the rope. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. One of them shouts: "C''mon, already! We want to see them bounce!"'
+					'You do about average among the girls before you get tripped up on the rope. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. Dan shouts: "C''mon, get them titties bouncing!"'
 				elseif pcs_vital <= 60:
 					grupvalue[2] += 1
 					'Jumping rope is a complete misery. You can''t manage it for very long; although your coordination and endurance are there, the pain from your breasts slapping around builds up fast, despite the help of the sports bra. The girls you''re competing with are sympathetic at first, but that slowly changes as some of the boys wander over to cheer you on. It''s completely apparent what their eyes are focused on each time a round begins.'
@@ -886,28 +900,28 @@ if $ARGS[0] = 'pe':
 				orgasm += 1
 				rope_orgasm += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra8.jpg"></center>'
-				'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+				'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 				'You climb as instructed, but can''t help but feel the rough rope rubbing against your pussy through your clothes. You do your best to climb up, but the rubbing of the rope against your pussy gets more intense. After a few seconds, the stimulation from the rope against your clit brings you to orgasm, and you have to do everything in your power not to fall as you quiver against the rope, stifling your moans. Your teacher looks up to you and says "Why are you shaking, Miss <<$pcs_lastname>>? Are you tired or something? Go ahead and come down then."'
 			elseif pcs_horny >= 50 and pcs_horny < 100:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/rope.jpg"></center>'
 				if pcs_stren <= 30: 
 					grupvalue[2] -= 1
 					pcs_horny += 10
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough rope rubbing against your pussy through your clothes. You do your best to climb up, but the rubbing of the rope against your pussy gets more intense. You don''t even make it half way up the rope before you have to give up and slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				elseif pcs_stren <= 40: 
 					pcs_horny += 20
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough rope rubbing against your pussy through your clothes. You do your best to climb up, but the rubbing of the rope against your pussy gets more intense. You almost make it to the top before you have to give up and slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				elseif pcs_stren <= 60: 
 					grupvalue[2] += 1
 					pcs_horny += 30
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough rope rubbing against your pussy through your clothes. Despite the distraction, you manage to make it to the top, even though you almost slipped once or twice due to the pleasurable stimulation. You slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				else
 					grupvalue[2] += 2
 					pcs_horny += 30
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough rope rubbing against your pussy through your clothes. Even with the rubbing of the rope distracting you, you easily and quickly make it to the top. Once there, you slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				end
 			else
@@ -915,21 +929,21 @@ if $ARGS[0] = 'pe':
 				if pcs_stren <= 30: 
 					grupvalue[2] -= 1
 					pcs_horny += 5
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough robe rubbing against your pussy through your clothes. You don''t even make it half way up the rope before you have to give up and slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				elseif pcs_stren <= 40: 
 					pcs_horny += 10
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough robe rubbing against your pussy through your clothes. You almost make it to the top of the rope before you have to give up and slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				elseif pcs_stren <= 60: 
 					grupvalue[2] += 1
 					pcs_horny += 15
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough robe rubbing against your pussy through your clothes. Despite the distraction, you manage to make it to the top, even though you almost slipped once or twice due to the pleasurable stimulation. Once at the top you slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				else
 					grupvalue[2] += 2
 					pcs_horny += 15
-					'After the roll call, Mr. Nikolaevich announces that you will all be taking turns climbing the ropes today.'
+					'After the roll call, Coach Nikolaevich announces that you will all be taking turns climbing the ropes today.'
 					'You climb as instructed, but can''t help but feel the rough robe rubbing against your pussy through your clothes. Even with the rubbing of the rope distracting you, you easily and quickly make it to the top. Once there, you slide back down, which causes the rope to rub against your clit and turn you on even more.'
 				end
 			end
@@ -942,7 +956,7 @@ if $ARGS[0] = 'pe':
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bouncebhand.jpg"></center>'
-				'A girl from your brother''s grade is doing jumping jacks and her breasts are really bouncing - she obviously isn''t wearing a bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as her friend walks up behind her, reaches round and grabs her breasts. The girl lets out a startled squeak, followed by a blush when her friend whispers in her ear and she sees all the boys staring.'
+				'Irina is doing jumping jacks and her breasts are really bouncing - she obviously isn''t wearing a sports bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as Stasya friend walks up behind her, reaches round and grabs her breasts. The Irina lets out a startled squeak, followed by a blush when Stasya whispers in her ear and she sees all the boys staring.'
 				gs'arousal','erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -953,11 +967,11 @@ if $ARGS[0] = 'pe':
 		elseif fizrarand = 8:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_stren
 			gs 'exercise', 'tier2', 1, 'stren_exp'
-			'After the roll call, Mr. Nikolaevich announces that you will all be taking turns doing push-ups. He also says that he will count how many each person does, so it''s a bit more stressful than usual.'
+			'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing push-ups. He also says that he will count how many each person does, so it''s a bit more stressful than usual.'
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/nipslip.mp4"></video></center>'
-				'Alyona apparently doesn''t believe in wearing sports bras. During the pushup part of the class, the top of her breast pops out of her tank top, showing her nipple off for everyone to see. Anushka quickly points it out to her, making her blush a deep red as she quickly covers her nipple up and tries to ignore the laughter and all the staring boys around her.'
+				'Bella apparently doesn''t believe in wearing sports bras. During the pushup part of the class, the top of her breast pops out of her tank top, showing her nipple off for everyone to see. Lizaveta quickly points it out to her, making her blush a deep red as she quickly covers her nipple up and tries to ignore the laughter and all the staring boys around her.'
 				gs'arousal','erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1014,7 +1028,7 @@ if $ARGS[0] = 'jumping_jacks':
 			'You''re barely able to do more than a few before you are just too tired. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you''re made to give it a few more tries. There''s outright jeering from some of the boys whenever you screw up. One of them shouts: "C''mon, already! We want to see them bounce!"'
 		elseif pcs_vital <= 40:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumpr.mp4"></video></center>'
-			'You do about average among the girls before you stopping. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. One of them shouts: "C''mon, already! We want to see them bounce!"'
+			'You do about average among the girls before you stopping. The teacher wants to make sure you get enough exercise though, so you''re made to give it a couple tries. There''s outright jeering from some of the boys whenever you screw up. Vasily shouts: "C''mon, already! We want to see them bounce!"'
 		elseif pcs_vital <= 60:
 			grupvalue[2] += 1
 			'Jumping jacks is a complete misery. You can''t manage it for very long; although your coordination and endurance are there, the pain from your breasts slapping around builds up fast, despite the help of the sports bra. The girls you''re competing with are sympathetic at first, but that slowly changes as some of the boys wander over to cheer you on. It''s completely apparent what their eyes are focused on each time a round begins.'
@@ -1036,9 +1050,9 @@ if $ARGS[0] = 'pushups':
 		grupvalue[2] -= 1
 		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as any of the girls. You did the fewest in your class and most of the jocks snicker or make snide remarks.'
 	elseif pcs_stren <= 30:
-		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as most of the girls.'
+		'Unfortunately, push-ups aren''t your strong point and you''re unable to do as many as most of the girls, other than the nerds girls and a couple of the popular girls.'
 	elseif pcs_stren <= 50:
-		'In the end, you wind up doing a perfectly respectable amount of push-ups. Better than most of the girls, but less than the jocks.'
+		'In the end, you wind up doing a perfectly respectable amount of push-ups. Better than most of the girls, other than a few of the jocks and a couple of others.'
 	elseif pcs_stren <= 70:
 		grupvalue[2] += 1
 		'In the end, you wind up doing great. You do more push-ups than some of the boys and better than all the girls except Christina.'
@@ -1054,7 +1068,7 @@ if $ARGS[0] = 'postphys':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big69.jpg"></center>'
 	if christinaQW['dompath'] = 1:
 		postphys_event = daystart
 		'After class, Coach Pavlovich returns to his office. For some reason, Christina is following him while all other students go to the locker rooms as usual.'
@@ -1100,8 +1114,8 @@ if $ARGS[0] = 'postphys2':
 	$locM_arg = 'postphys2'
 	$locM = 'gschool_lessons4'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
-	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the girls in various states of undress around you, find your locker, and start to take off your clothes.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/postphys<<rand(1,4)>>.jpg"></center>'
+	'You enter the girls locker room and find most of the other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the girls in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
 	act 'Have a shower':gt 'gschool_lessons4', 'shower'
 	act 'Get dressed': gt 'gschool_lessons4', 'dress'
@@ -1113,7 +1127,7 @@ if $ARGS[0] = 'shower':
 	minut += 15
 	shower_shave = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/showers.jpg"></center>'
 	'After taking off all of your clothes, you gather up your towel, washcloth and soap, and head to the showers; you are greeted by wafts of steam and several girls who are giggling and gossiping among themselves, apparently oblivious to your existence.'
 	act 'Continue': gt 'gschool_lessons4', 'shower2'
 end
@@ -1125,13 +1139,13 @@ if $ARGS[0] = 'shower2':
 	shampoo += 1
 	dynamic $showerdin
 	gs 'stat'
-	gymshower = rand(1,6)
+	gymshower = rand(1,10)
 	if gymshower = 1:
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/showerspank.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/shower/showerspank.mp4"></video></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella talking to Albina.'
 	    'As you wash off the soap, you turn just in time to see Bella start spanking Albina; most of the girls in the shower room stop what they''re doing to watch. After several fairly hard smacks, they stop and laugh about it, Albina rubbing her ass with strange glee as Bella smiles and nods her head, seemingly in approval. Everyone then returns to showering.'
 	elseif gymshower = 2:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/picture.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/picture.jpg"></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few moments basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
 	    if christinaQW['dompath'] >= 7:
 			'As you wash off the soap, you turn just in time to see one of the girls pointing at Christina. She says something to a couple of girls near her and they all burst out laughing. Christina''s face turns bright red and she takes a step forward, before stopping and looking in your direction. Seeing you looking she cringes and tries to pretend like nothing was happening. Not falling for it, you walk over to her and ask what they were laughing at. "My buttplug." she replies, embarrassed and afraid.'
@@ -1143,19 +1157,22 @@ if $ARGS[0] = 'shower2':
 	elseif gymshower = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/aylnushkiss.jpg"></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
-		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing. One girl even says "Stop that you fucking dykes! That''s so disgusting." A hard look from Aylona sends the girl fleeing from the showers and she and Anushka laugh about it before they go back to just showering.'
+		*nl
+		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing. Katyusha even says "Stop that you fucking dykes! That''s so disgusting." Anushka looks to Katyusha, makes a V with her fingers and sticks her tongue between them wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to just showering.'
 	elseif gymshower = 4 and npc_grupTipe['A25'] = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_1.jpg"></center>'
-		'As you shower, you catch of a glimpse of Lena and Lera up to their usual tricks. Lera is on her knees with her face buried in Lena''s crotch, who is clearly enjoying herself. As it''s something you''ve seen dozens of times before, you ignore them and go back to cleaning yourself, but are interrupted by Lena calling someone out. You turn to see her getting up in Sonia''s face, who has her fingers buried deep inside her pussy. "What a horny little slut you are! You suck my brother''s dick every fucking day, so why don''t you let me have a turn?" Lena says before forcefully dragging Sonia out into the middle of the room and pushing her onto her knees.'
+		'As you shower, you catch of a glimpse of Lena and Lera up to their usual tricks. Lera is on her knees with her face buried in Lena''s crotch, who is clearly enjoying herself. Several of the other girls give disgusted looks at what is going on. Still most are use to it, as it''s something you''ve seen dozens of times before, you ignore them and go back to cleaning yourself, but are interrupted by Lena calling someone out. You turn to see her getting up in Sonia''s face, who has her fingers buried deep inside her pussy. "What a horny little slut you are! You suck my brother''s dick every fucking day, so why don''t you let me have a turn?" Lena says before forcefully dragging Sonia out into the middle of the room and pushing her onto her knees.'
 		'Sonia doesn''t resist or even hesitate and immediately buries her face right into Lena''s crotch and starts eating her out. Albina, Bella and Vicky are among the group of girls who look in disgust before walking out to get dressed.'
 		gs 'arousal', 'erotic_nudity', -3
 		gs 'stat'
-		if fame['pav_slut'] >= 150:
+		if fame['pav_slut'] >= 300:
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
-				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. "Look girls, now we''ve got TWO sluts to have fun with!" the girl who grabbed you says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue as you stare up at her.' 
-				'"What? You''ll suck the boys off, but won''t eat us out? Aren''t dick and pussy the same thing to you? Get to it you fucking whore!" another girl says and delivers a stinging smack to your face. With no way to escape, you resign yourself to the humilation and start licking the girl''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as the girl orgasms hard. When she''s done, she pulls your head up by your chin and slaps you. "Good slut." is all she says before another girl takes her place.' 
+				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. "Look girls, now we''ve got TWO sluts to have fun with!" the Lera who grabbed you says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue as you stare up at her.'
+				*nl
+				'"What? You''ll suck the boys off, but won''t eat us out? Aren''t dick and pussy the same thing to you? Get to it you fucking whore!" Lera says and delivers a stinging smack to your face. With no way to escape, you resign yourself to the humiliation and start licking the Lera''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as Lera orgasms hard. When she''s done, she pulls your head up by your chin and slaps you. "Good slut." is all she says before another Paulina takes her place.'
+				*nl
 				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
 				gs 'stat'
@@ -1176,14 +1193,16 @@ if $ARGS[0] = 'shower2':
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
-				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. You look up, and to your despair, see that it was Christina. "Let''s make it a party girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.' 
-				'With no way to escape, you resign yourself to the humilation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut." is all she says before another girl takes her place.' 
+				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. You look up, and to your despair, see that it was Christina. "Let''s make it a party girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.'
+				*nl
+				'With no way to escape, you resign yourself to the humilation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut." is all she says before another girl takes her place.'
+				*nl
 				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and quickly run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
 				gs 'stat'
 				act 'Return to the locker room':
 					*clr & cla
-					!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/bullied_sveta.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/bullied_sveta.jpg"></center>'
 					'By the time you enter the locker room, only a small group of girls remain, who laugh at and mock you further while showing you a video of the moment a girl lets out a huge squirt on your face. Feeling humiliated, you quickly get dressed before fleeing from the locker room, tears welling up in your eyes.'
 					'If you want to change clothes or do your make-up, you''ll need to go home or wait until the bullies have left and you can come back.'
 					act 'Flee in shame':
@@ -1207,9 +1226,11 @@ if $ARGS[0] = 'shower2':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
 				'As a large group of girls gather around to watch and film the show, you spot Christina trying to quietly slip out with the group of girls. She sees you looking at her and she stops in her tracks, her eyes fearfully pleading with you. You ignore her and mercilessly drag her into the middle of the room and throw her down next to Sonia. "I brought an extra bitch to the party!" you say mockingly to the laughter of the others. You waste no time and immediately present your pussy to Christina, spreading yourself wide and exposing your clit. She looks at you scornfully, but knowing that she has no choice, she reluctantly starts eating you out. "Come on slut, you can do better than that!" you say before you grab her hair and start grinding against her, smearing her face with your wetness as she keeps licking away at your clit. She seems to put more effort in and you slowly feel your orgasm building within you.'
+				*nl
 				$orgasm_txt = 'Just as you are about to climax, you pull her face out of your crotch and quickly rub your engorged clit, bringing yourself to an explosive orgasm as you spray a fountain of pussy juice across Christina''s face, much to the amazement and amusement of the other girls present.'
 				$orgasm_or = 'custom'
 				gs 'arousal', 'cuni', -8, 'lesbian', 'dom'
+				*nl
 				'When you finish cumming, you force her head back into your crotch, making her lick up every last drop of your juices. When you''re done, you pat her on the head and throw her to the floor for the other girls to have some fun with her. When everyone has had a turn, Sonia and Christina are both drenched in sticky girl cum. Christina is furious, but Sonia doesn''t care, instead focusing on fingering herself. You give Christina a mocking smile and leave her sitting there as you join the others in returning to the locker room to get dressed. She doesn''t resist, instead just sitting on the floor, dejected and defeated. She hasn''t returned to the locker room by the time you finish getting dressed and leave.'   
 				gs 'stat'
 				act 'Finish dressing':
@@ -1230,13 +1251,12 @@ if $ARGS[0] = 'shower2':
 			act 'Stay':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_2.jpg"></center>'
-				'You choose to stay and watch to see what happens. Lera, Anushka, Christina and Lina are among the large group of girls surrounding Lena and Sonia, either watching in interest or filming it. Lariska is quietly standing off to the side, clearly not wanting to get involved but not wanting to leave Christina''s side either. Lena is enjoying having Sonia go down on her and really makes her eat her out before she pulls Sonia off of her and orgasms, squirting across Sonia''s face. When she is finished, she gives Sonia a firm slap and moves to the side, inviting someone else to have a go. Lera, who has been masturbating as she watches, walks up to Sonia and also squirts on her before sitting on her face and making her eat her pussy as she rides through her orgasm Once her orgasm has passed, she climbs off of Sonia and gives her a stinging slap on the face. "Good for nothing whore!" she snarls before stepping aside to let Christina take her place.'
+				'You choose to stay and watch to see what happens. Lera, Paulina, Christina and Lina are among the large group of girls surrounding Lena and Sonia, either watching in interest or filming it. Lariska is quietly standing off to the side, clearly not wanting to get involved but not wanting to leave Christina''s side either. Lena is enjoying having Sonia go down on her and really makes her eat her out before she pulls Sonia off of her and orgasms, squirting across Sonia''s face. When she is finished, she gives Sonia a firm slap and moves to the side, inviting someone else to have a go. Lera, who has been masturbating as she watches, walks up to Sonia and also squirts on her before sitting on her face and making her eat her pussy as she rides through her orgasm Once her orgasm has passed, she climbs off of Sonia and gives her a stinging slap on the face. "Good for nothing whore!" she snarls before stepping aside to let Christina take her place.'
 				gs 'arousal', 'erotic_nudity', -3
 				gs 'stat'
 				act 'Stop watching':
 					cla
 					'You''ve seen enough and quietly slip out of the showers into the locker room. You pass by Lariska on your way, who doesn''t seem to know what to do and looks everywhere except for at the action. The girls who walked out have already gone, so you get dressed and leave as the sounds of Christina loudly orgasming and the other girls laughing and expressing amazement echo into the room.' 
-					
 					act 'Finish dressing':
 						gs 'arousal', 'end'
 						gt 'gschool_lessons4', 'post_dress'
@@ -1245,10 +1265,12 @@ if $ARGS[0] = 'shower2':
 				act 'Wait your turn':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_3.jpg"></center>'
-					'You''re getting incredibly aroused watching this show and know where it''s going. You follow the other girls in masturbating as you watch and wait your turn. Christina soon reaches her explosive orgasm and drenches Sonia in a shower of pussy juice as she moans loudly. The other girls express their amazement while Sonia looks to be greatly enjoying herself. Anushka, Lina and a few other girls take their turns squirting over Sonia as you continue to rub your clit and finger yourself. Eventually, you feel your orgasm building and step up to Sonia as another girl finishes. You are surprised when Sonia suddenly starts licking your pussy as you stand above her. She is <i>really</i> good at this and you quickly feel yourself about to cum, so you pull her face out of your crotch and rub your engorged clit to bring yourself to orgasm.'
+					'You''re getting incredibly aroused watching this show and know where it''s going. You follow the other girls in masturbating as you watch and wait your turn. Christina soon reaches her explosive orgasm and drenches Sonia in a shower of pussy juice as she moans loudly. The other girls express their amazement while Sonia looks to be greatly enjoying herself. Paulina, Lina and a few other girls take their turns squirting over Sonia as you continue to rub your clit and finger yourself. Eventually, you feel your orgasm building and step up to Sonia as another girl finishes. You are surprised when Sonia suddenly starts licking your pussy as you stand above her. She is <i>really</i> good at this and you quickly feel yourself about to cum, so you pull her face out of your crotch and rub your engorged clit to bring yourself to orgasm.'
+					*nl
 					$orgasm_txt = 'You moan loudly as your pussy explodes and you squirt your juice all over Sonia''s already drenched face and into her mouth, Sonia happily taking it all and swallowing it.'
 					$orgasm_or = 'custom'
-					'When you finish cumming, Sonia buries herself back in your pussy and starts licking you again. The pleasure is too good to stop her and for a few seconds you weakly stand there, having had one of the best orgasms in your life. You then somewhat reluctantly step off of her and let another girl have a go with her. Once the last few girls have had their turn, you all look down on Sonia, who is covered from head to breasts in girl cum, her cheeks bright red from all the slaps she recieved. She ignores the crude insults being thrown down at her and instead focuses all her attention on vigoursly fingering herself. The group insults her even more upon seeing this and a few even spit on her face and in her mouth, but she doesn''t seem to care and makes no effort to resist. You then all leave her sitting there and head to the lockers to get changed, where the girls all continue to laugh at and mock Sonia while showing videos to each other. You finish getting dressed and head out.'    
+					*nl
+					'When you finish cumming, Sonia buries herself back in your pussy and starts licking you again. The pleasure is too good to stop her and for a few seconds you weakly stand there, having had one of the best orgasms in your life. You then somewhat reluctantly step off of her and let another girl have a go with her. Once the last few girls have had their turn, you all look down on Sonia, who is covered from head to breasts in girl cum, her cheeks bright red from all the slaps she received. She ignores the crude insults being thrown down at her and instead focuses all her attention on vigorously fingering herself. The group insults her even more upon seeing this and a few even spit on her face and in her mouth, but she doesn''t seem to care and makes no effort to resist. You then all leave her sitting there and head to the lockers to get changed, where the girls all continue to laugh at and mock Sonia while showing videos to each other. You finish getting dressed and head out.'    
 					gs 'arousal', 'cuni', -8, 'lesbian', 'dom'
 					gs 'stat'
 					act 'Finish dressing':
@@ -1259,42 +1281,62 @@ if $ARGS[0] = 'shower2':
 			end
 		end
 	elseif gymshower = 5 and pcs_pubes >= 40:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho2.jpg"></center>'
+		grupvalue[1] -= 5
+		grupvalue[2] -= 2
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/postphyssho2.jpg"></center>'
 		'As you step into the shower, some girls turn to look at you and start laughing.'
-		'"Seriously <<$pcs_nickname>>? Waxing isn''t just for floors you know!"'
-		'"It''s like there''s a gorilla between her legs!"'
-		'"You''d need a chainsaw to cut that down!"'
+		'"Seriously <<$pcs_nickname>>? Waxing isn''t just for floors you know!" Bella says.'
+		'"It''s like there''s a gorilla between her legs!" Irina says.'
+		'"You''d need a chainsaw to cut that down!" Stasya says.'
 		'Other girls in the room uncomfortably ignore the exchange, pretending not to hear either because they don''t want to get involved or are just trying to avoid becoming a target themselves.'
 		act 'Take the abuse':
 			cla & *clr
 			pcs_mood -= 10
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/nudepic.jpg"></center>'
 			'You try to ignore their insults, but it really gets under your skin and it shows. Seeing their effectiveness, they re-double their abuse, taunting you more and more.'
-			'"If I''ve got a landing strip, what does she have? A farmer''s field?!"'
-			'"She probably lets it grow out like that because she doesn''t want to let boys know she''s got beef curtains down there."'
-			'"Ha! Are you kidding? What boy would want to fuck a furball like that? They probably see it and run away!"'
+			'"If I''ve got a landing strip, what does she have? A farmer''s field?!" Bella says.'
+			'"She probably lets it grow out like that because she doesn''t want to let boys know she''s got beef curtains down there." Stasya says.'
+			'"Ha! Are you kidding? What boy would want to fuck a furball like that? They probably see it and run away!" Irina says.'
 			'They cackle to themselves while you miserably douse your head under the shower, trying to drown out their hurtful words.'
-			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+			act 'Return to the locker room': gt 'gschool_post_shower', 'post_shower'
 		end
-		
 		act 'Tell them to fuck off':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho1.jpg"></center>'
-			'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now that they know they''re getting under your skin.'
-			'"That''s the only kind of fuck you can get with a <i>jungle</i> like that down there!"'
-			'"She probably has a little guide in there telling you where to find her pussy under all that!"'
-			'"A machete to hack your way through too!"'
-			'They cackle in sadistic glee and you spend the rest of your shower fuming, your face somehow feeling hotter than the water streaming down it.'
-			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/postphyssho1.jpg"></center>'
+			if grupTipe = 3 or grupTipe = 5:
+				'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now that they know they''re getting under your skin.'
+				'Bella steps up and gets in your face. "What did you say to me? Watch your mouth, unless you want us to ruin your life bitch."'
+				'You won''t meet her gaze, you know the popular girls could destroy your reputation in a heart beat, so you just start taking your shower and ignore them as best you can.'
+				*nl
+				'"That''s the only kind of fuck you can get with a <i>jungle</i> like that down there!" Irina says.'
+				'"She probably has a little guide in there telling you where to find her pussy under all that!" Bella says.'
+				'"A machete to hack your way through too!" Stasya says.'
+				'They cackle in sadistic glee and you spend the rest of your shower blushing, your face somehow feeling hotter than the water streaming down it.'
+			elseif grupTipe = 4 or grupTipe = 2:
+				'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now that they know they''re getting under your skin.'
+				'"That''s the only kind of fuck you can get with a <i>jungle</i> like that down there!" Irina says.'
+				'"She probably has a little guide in there telling you where to find her pussy under all that!" Bella says.'
+				*nl
+				'"A machete to hack your way through too!" Stasya says.'
+				'You stop and take a few steps closer to them, with your hands balled up into fists, they stop their cackling when you get close. "I said fuck off!"'
+				'They collective take a step back and then Bella says. "What can''t take a joke, fine fine, don''t get your panties in a wad." They leave you in peace for the rest of the shower and instead spend the time gossiping about a variety of stuff..'
+			else
+				'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now that they know they''re getting under your skin.'
+				'"What can''t take a joke? Well then you shouldn''t come to school looking like that, it''s shameful. The only kind of fuck you can get with a <i>jungle</i> like that down there, is if you let Lesco or Petia have a go!" Irina says.'
+				*nl
+				'"She probably has a little guide in there telling the boys where to find her pussy under all that!" Bella says.'
+				'"And a machete to hack their way through too!" Stasya says.'
+				'They cackle in sadistic glee and you spend the rest of your shower fuming, your face somehow feeling hotter than the water streaming down it.'
+			end
+			act 'Return to the locker room': gt 'gschool_post_shower', 'post_shower'
 		end
-		
 		act 'Ignore it':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You roll your eyes and ignore them completely, turning on the faucet and rinsing your hair. They continue to sling insults at you, but you pay them no mind, picking up the soap and beginning to scrub your body.'
 			*nl
 			'After a few more tries, they realize that they aren''t going to get any reaction out of you and turn back to conversing amongst themselves, finally letting you shower in peace.'
-			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+			act 'Return to the locker room': gt 'gschool_post_shower', 'post_shower'
 		end
 	else
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
@@ -1302,8 +1344,8 @@ if $ARGS[0] = 'shower2':
 	end
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 	act 'Take a long shower': gt 'gschool_lessons4', 'long_shower'
-	act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
-	act 'Check out the other girls': gt 'gschool_lessons4', 'post_shower2'
+	act 'Return to the locker room': gt 'gschool_post_shower', 'post_shower'
+	act 'Check out the other girls': gt 'gschool_post_shower', 'post_shower2'
 end
 
 if $ARGS[0] = 'long_shower':
@@ -1313,7 +1355,7 @@ if $ARGS[0] = 'long_shower':
 	pcs_mood += 10
 	shower_shave = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 	'You are just enjoying the sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before you realize it, you find yourself alone in the shower.'
 	act 'Keep taking a shower':
 		*clr & cla
@@ -1403,7 +1445,7 @@ if $ARGS[0] = 'long_shower':
 		elseif longshower = 3 and hotcat => 5:
 			minut += 10
 			pcs_mood += 10
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'The sensation of the hot water hitting your body and running down it, with the steam filling the room giving it an almost sauna feel, completely relaxes you. Before long, you no longer hear any noise at all other than the shower, at first you think all the other girls have left but then you hear a locker open and close, maybe someone is still in there. After a few minutes, you notice your fingers starting to prune up and decide it is time to get out of the shower.'
 			act 'Go to your locker':
 				*clr & cla
@@ -1432,15 +1474,15 @@ if $ARGS[0] = 'long_shower':
 					end
 				end
 			end
-		elseif longshower = 4 and hotcat => 6 and npc_rel['A23'] => 70:
+		elseif longshower = 4 and hotcat => 6 and npc_rel['A23'] => 50:
 			minut += 10
 			pcs_mood += 10
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel and completely relaxes you. Before long, you no longer hear any noise at all other than the shower. At first, you think all the other girls have left, but then you hear a phone ring and then someone talking. You can''t tell who it is from here.'
 			act 'Go to your locker':
 				*clr & cla
 				gs 'stat'
-				if hotcat => 6 and npc_rel['A23'] >= 70 and checkoutalbina = 1:
+				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 					'As you walk into the locker room, you can tell it is Albina on the phone. She''s on the phone with her father, but doesn''t sound very happy about it. Once you start drying your hair, you can''t hear what she is saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
 					gs'arousal','erotic_nudity', 2
@@ -1450,8 +1492,8 @@ if $ARGS[0] = 'long_shower':
 						npc_rel['A23'] += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
-						'There''s no point lying to her, so you decide to just be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find it hard to resist looking."'
-						'She walks up, turns you around to face the lockers and gives your ass a hard slap and then a firm squeeze. "I know, that''s why I always teased you and gave you a little show... What am I going to do with a dirty little girl like you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
+						'You decide to be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find it hard to resist looking."'
+						'She walks up, turns you around so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 						gs 'arousal', 'foreplay', 2
 						gs 'stat'
 						act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1463,7 +1505,7 @@ if $ARGS[0] = 'long_shower':
 								npc_rel['A23'] -= 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-								'You pull away from her and step back. "What are you doing?"'
+								'You pull away from her and step away. "What are you doing?"'
 								'She looks confused. "I thought... never mind." she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
 								gs'arousal','erotic_nudity', 2
 								gs 'arousal', 'end'
@@ -1478,7 +1520,7 @@ if $ARGS[0] = 'long_shower':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-						'You shake your head. "You''re very pretty, but no."'
+						'You shake your head. "You''re pretty, but no."'
 						'She arches a shapely brow. "No? Then why do you check me out when I''m naked?"'
 						'You blush slightly. You didn''t think anyone noticed you checking out the other girls.'
 						gs'arousal','erotic_nudity', 2
@@ -1486,23 +1528,23 @@ if $ARGS[0] = 'long_shower':
 						gs 'stat'
 						act 'Deny it':
 							*clr & cla
-							npc_rel['A23'] -= 3
+							npc_rel['A23'] -= 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-							'"Sorry, I was just admiring what great shape you''re in. I didn''t mean anything by it." you say while shaking your head.'
-							'She just shrugs. "Whatever." she grumbles before she starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+							'"Sorry, I was just admiring what great shape you are in. I didn''t mean anything by it." you say while shaking your head.'
+							'She just shrugs. "Whatever." she grumbles before she starts getting dressed and you do the same. Soon you are both dressed and she walks out, leaving you alone in the locker room.'
 							gs'arousal','erotic_nudity', 2
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 						end
-						act 'Confess your attraction':
+						act 'Confess your attraction to her':
 							*clr & cla
-							npc_rel['A23'] += 3
+							npc_rel['A23'] += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
-							'You decide to just confess your feelings. "Yeah, sorry, you''re beautiful and it''s hard to resist looking at your amazing body."'
-							'She walks up to you, turns you around to face the lockers and gives your ass a hard slap and then a firm squeeze. "I know, that''s why I always teased you and gave you a little show... What am I going to do with a dirty little girl like you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
+							'You decide to just confess your feelings. "Yeah, sorry, you''re beautiful and not looking is hard to resist."'
+							'She walks up to you, turns you so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! What am I going to do with you?" You can tell it is a rhetorical question, as you feel her hand sliding down between your legs.'
 							gs 'arousal', 'foreplay', 2
 							gs 'stat'
 							act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1514,8 +1556,8 @@ if $ARGS[0] = 'long_shower':
 									npc_rel['A23'] -= 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-									'You pull away from her and step back. "What are you doing?"'
-									'She looks confused. "I thought... never mind." she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+									'You pull away from her and step away. "What are you doing?"'
+									'She looks confused. "I thought... never mind." she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
 									gs'arousal','erotic_nudity', 2
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -1536,13 +1578,14 @@ if $ARGS[0] = 'long_shower':
 		elseif longshower = 5 and hotcat => 5 and fame['pav_slut'] >= 150:
 			minut += 10
 			pcs_mood += 10
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel, which completely relaxes you. Before long, you no longer hear any noise at all other than the shower. At first, you think all the other girls have left, but then you hear some lockers opening and closing. Someone is in the locker room going through the lockers.'
-			act 'Go to your locker':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/latecoach.jpg"></center>'
+			'The sensation of the hot water hitting your body and running down it. The steam filling the room gives it an almost sauna feel, which completely relaxes you. Before long, you no longer hear any noise at all other than the shower. At first, you think all the other girls have left, but then you hear some lockers opening and closing. You turn off the shower and go to your locker. Coach Pavlovich is standing in the girls locker room, he turns to look at you as you walk in naked, you quickly cover yourself up as best you can. He looks surprised, but you are not sure if it is genuine or if he is faking it.'
+			act 'What are you doing':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker1.jpg"></center>'
-				'You go to your locker and you don''t see or hear anyone. You dry your hair and then get dressed. Just as you finish getting dressed, you turn and see Coach Pavlovich standing there. He looks surprised, but you are not sure if it is genuine or if he is faking it. "Oh I didn''t know anyone was left. I thought the locker room was empty. I was just making sure all the lockers were closed."'
+				'"What are you doing in the girls locker room?" You ask him.'
+				'"Oh I didn''t know anyone was left. I thought the locker room was empty. I was just making sure all the lockers were closed." He says.'
 				'You can''t help but notice the hardon causing his shorts to bulge. His eyes follow your eyes and he smiles when he notices you looking at the bulge in his shorts. "A girl with your reputation just can''t help herself, can you? Go ahead and touch it." he says.'
 				act 'Feel his cock': gt 'gschool_sex', 'victor_lockerroom'
 				gs 'willpower', 'sex', 'resist', 'medium'
@@ -1563,7 +1606,7 @@ if $ARGS[0] = 'long_shower':
 		else
 			minut += 10
 			pcs_mood += 10
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'The sensation of the hot water hitting your body and running down it, with the steam filling the room giving it an almost sauna feel, completely relaxes you. Before long, you no longer hear any noise at all other than the shower. All the other girls must have already left. After a few minutes, you notice your fingers starting to prune up and decide it is time to get out of the shower. You go to your locker, dry off, and get dressed. By the time you get to the locker room, it is empty, all the other girls have already left.'
 			act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 		end
@@ -1578,170 +1621,11 @@ if $ARGS[0] = 'long_shower_locker':
 	menu_off = 0
 	minut += 15
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/change.jpg"></center>'
 	'You walk from the showers back into the locker room and over to your locker, where you grab your towel and diligently dry off your body. With your hair still wet, you''re ready to put the blow dryer to use. Once you finish blow drying your hair, you look around and see several other girls have left the showers and are getting dried off or dressed as well. By the time you start to get dressed, all the other girls have already left.'
 	act 'Get dressed': gt 'gschool_lessons4', 'post_dress'
 end
 
-if $ARGS[0] = 'post_shower':
-	*clr & cla
-	$menu_loc = 'gschool_lessons4'
-	$menu_arg = 'post_shower'
-	menu_off = 0
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
-	'You walk back to your locker, throwing your towel in a bin along the way, and start rifling through it, 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/peekdress.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 Anushka':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/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, her breasts are small and perky and her pussy is completely smooth.'
-			*nl
-			'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.'
-			gs'arousal','erotic_nudity', 3
-			gs 'stat'
-			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-		end
-		act 'Check out Aylona':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/aylpeek.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 triangle of carpet that matches the drapes.'
-			*nl
-			'After a few moments of observation, you let your gaze slip away and turn back to your own clothes.'
-			gs'arousal','erotic_nudity', 3
-			gs 'stat'
-			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-		end
-		act 'Check out Albina':
-			*clr & cla
-			checkoutalbina = 1
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/albpeek.jpg"></center>'
-			if tits < 2:
-				'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 every girl in school. She has a great body and you can see why so many boys consider her one of the prettiest girls in your class. Her pussy is clean shaven - in fact, you can''t see a single hair on her smooth skin. 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:
-				'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 every girl in school. She has a great body and you can see why so many boys consider her one of the prettiest girls in your class. Her pussy is clean shaven - in fact, you can''t see a single hair on her smooth skin. 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''s got one of the smaller busts in the class.'
-			else
-				'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 every girl in school. She has a great body and you can see why so many boys consider her one of the prettiest girls in your class. Her pussy is clean shaven - in fact, you can''t see a single hair on her smooth skin. Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got one of the smaller busts in the class.'
-			end
-			*nl
-			'After a few moments of observation, you let your gaze slip away and turn back to your own clothes.'
-			gs'arousal','erotic_nudity', 3
-			gs 'stat'
-			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-		end
-		act 'Check out Christina':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/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, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine.'
-			*nl
-			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.'
-			else
-				'After a few minutes, you let your gaze slide away, not wanting to get caught looking at her.'
-			end
-			gs'arousal','erotic_nudity', 3
-			gs 'stat'
-			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-		end
-		act 'Check out Lariska':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/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. She''s definitely got a classic runner''s build. You also can''t help but notice that she keeps her bush trimmed and tidy.'
-			*nl
-			'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
-		act 'Check out Lina':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/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 boys in school think she''s pretty and you''re inclined to agree.'
-			*nl
-			'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
-
-if $ARGS[0] = 'post_shower2':
-	*clr & cla
-	$menu_loc = 'gschool_lessons4'
-	$menu_arg = 'post_shower2'
-	menu_off = 0
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho<<rand(1,7)>>.jpg"></center>'
-	'Once you finish scrubbing, you begin to rinse the soap off, glancing towards the other girls as you do. Most of them are doing the same as you, quietly showering and letting the hot water pour over them or soaping up. A few of them are chatting amongst themselves, teasing or complimenting each other''s bodies.'
-	act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-	act 'Check out Anushka':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nushwatch.jpg"></center>'
-		'Your attention homes in on Anushka, who has already finished her shower and is drying herself off. 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 and her pussy is completely smooth.'
-		*nl
-		'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder making direct eye contact with you. You freeze, your eyes going wide and your mouth going slack as you try to think of some kind of excuse. Before you can say anything, she winks 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, heading back to your locker so you can get dressed.'
-		gs'arousal','erotic_nudity', 3
-		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-	end
-	act 'Check out Aylona':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch1.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 triangle of carpet that matches the drapes.'
-		gs'gschool_lessons4','shower_watch_end'
-	end
-	act 'Check out Albina':
-		*clr & cla
-		checkoutalbina = 1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-		
-		if tits < 2:
-			'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 they''re rather 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:
-			'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 they''re the same size as your own, with a nice firm shape to them. However, compared to the other girls, she''s got one of the smaller busts in the class.'
-		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 they''re a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got one of the smaller busts in the class.'
-		end
-		gs'gschool_lessons4','shower_watch_end'
-	end
-	act 'Check out Christina':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch3.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
-		
-		gs'arousal','erotic_nudity', 3
-		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
-	end
-	act 'Check out Lariska':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch4.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. She''s definitely got a classic runner''s build. 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.'
-		gs'gschool_lessons4','shower_watch_end'
-	end
-	act 'Check out Lina':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch1.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 boys in school think she''s pretty and you''re inclined to agree.'
-		gs'gschool_lessons4','shower_watch_end'
-	end
-end
-
 if $ARGS[0] = 'shower_watch_end':
 	*nl
 	'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
@@ -1762,7 +1646,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		pcs_mood += 10
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerflash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerflash.jpg"></center>'
 		'Several other girls come in from the showers together, wearing their towels. A girl picks up her phone and holds it up to take their picture. When Anushka sees this, she stops, with a lewd smile, and pulls her towel wide open, showing off her naked body as the girl takes the picture. Several girls giggle at Anushka''s antics while others whistle or cat call. All in all, everyone has a good laugh at the moment.'
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you''re finished, most of the other girls have already left.'
@@ -1772,7 +1656,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		pcs_mood += 10
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/locselfiedan.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/locker/locselfiedan.mp4"></video></center>'
 		'A girl is at the mirror, taking a selfie of herself trying to look sexy. As she does, Albina walks up beside her and then starts to dance next to her, bending over and grinding her ass against her. She can''t help but laugh and grind back, and soon both of them are teasing each other and laughing, along with many of the other girls in the locker room that saw the whole thing.'
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
@@ -1781,20 +1665,20 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 3:
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 		'You are running extra late today, by the time you finally finish dressing, nobody seems to be left in the room or showers. You take a few steps towards the door, convinced that you are the last person here, when you hear a soft moan. At first you think you misheard but... there it is again.'
 		act 'Ignore it': gt 'gschool_lessons4', 'post_dress'
 		act 'Take a peek':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/les<<rand(1,3)>>.jpg"></center>'
-			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across a couple of girls making out... and, sure enough, when you peek around the next corner, you spy two girls you don''t know making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
+			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across a couple of girls making out... and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
 			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
 			act 'Masturbate':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/sex/mast<<rand(1,2)>>.mp4"></video></center>'
-				'As you watch them, you feel yourself getting horny, <b>really</b> horny, and before you know it, you have slipped your hand under your clothes and start masturbating, the girls oblivious to their aroused observer. You pull some of your clothes away to make it easier to fondle yourself. You stifle your moans as best you can, but you don''t think they can possibly hear them over their own, too absorbed in kissing and caressing each other to notice anything around them.'
+				'As you watch them, you feel yourself getting horny, <b>really</b> horny, and before you know it, you have slipped your hand under your clothes and start masturbating, they oblivious to their aroused observer. You pull some of your clothes away to make it easier to fondle yourself. You stifle your moans as best you can, but you don''t think they can possibly hear them over their own, too absorbed in kissing and caressing each other to notice anything around them.'
 				'Your fingers make their rounds around your clit in smaller, harder circles, your eyes glued to the lovers and you feel yourself getting closer to climax.'
 				$orgasm_txt = 'About a second later, you feel like a small explosive went off inside you and you have to clamp one of your hands over your mouth to keep yourself from shouting as the other continues to rub your clit. The climax hits you hard and your legs nearly give out, your whole body shaking and shuddering like an actual shockwave is passing through it. You are momentarily blinded by the pleasure, but after a few seconds, you get yourself back under control.'
 				gs 'arousal', 'voyeur_sex', 10
@@ -1809,7 +1693,7 @@ if $ARGS[0] = 'dress':
 		end
 	elseif gymdress = 4:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,2)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nudepic<<rand(1,2)>>.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
 			'Still naked, you hear a couple of girls giggling, so you turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina trying to work her buttplug into a comfortable position. Smirking, you go over to her, slap her hand away, and yank the plug out, making her yelp in suprise. "Open." you say in a menacing tone. She cringes before closing her eyes and opening her mouth.'
 			'Shoving the plug into her mouth you spin it around a few times, letting her slobber on it a bit. Despite the taste, she does lube it up as best she can, mindful of where it is going. "Bend over." you bark at her. She sighs, but bends over and spreads her buttcheeks, trying to ignore the laughing of the other girls. Without being gentle in the slightest, you jam it back in, getting another gasp out of her.'
@@ -1820,7 +1704,7 @@ if $ARGS[0] = 'dress':
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 5:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/boysraid.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/boysraid.jpg"></center>'
 		'You start to get dressed, most of the girls around you still in their underwear or naked, when the locker room door bursts open. You and everyone else turn to see Vitek and Dan standing in the doorway and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching bright pink g-string thong, walks up to them and blocks the doorway. "Get the fuck out of here." she says in a low, menacing tone.'
 		'Dan snorts. "Or what?"'
 		'Albina, not backing down, says "Do you really want to find out?" Everyone can hear the implied threat and considering her fearsome temper and willingness to get violently physical, Dan backs off.'
@@ -1830,7 +1714,7 @@ if $ARGS[0] = 'dress':
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 6:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/christinaselfie<<rand(1,3)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/christinaselfie<<rand(1,3)>>.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
 			'As you get dressed you overhear one of the girls say to another, "Come take a picture with me. I want to send something to my boyfriend." Giggling, two of her friends came over and posed with her.'
 		else
@@ -1843,7 +1727,7 @@ if $ARGS[0] = 'dress':
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 7:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/alynushwedgie.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/alynushwedgie.jpg"></center>'
 		'As you finish getting dressed, you turn around to see Aylona sneak up behind Anushka, grab hold of her panties with both hands and then yank them up, giving Anushka a major wedgie. Several other girls laugh as Anushka tries to get away and push Aylona''s hands back down so her panties aren''t all the way up her ass crack. After a little bit of struggling and Anushka calling Aylona all kinds of names, Aylona finally lets go and collapses on one of the benches laughing, while Anushka half heartedly cusses her out as she picks her panties out of her ass crack.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
@@ -1855,7 +1739,7 @@ if $ARGS[0] = 'dress':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 			'As you get dressed you decide to have some fun with Christina, who is trying to hide in a corner so she isn''t noticed. Calling her to the center of the room, you tell her to raise her skirt and bend over. When she hesitates, you warn her if she has panties on and no buttplug inserted, you are going to spank her ass so hard she won''t be able to sit for a week. Grimacing, she bends over and flips up her skirt. Seeing she is following your rules, you tell her to turn and give everybody a good look, before letting her continue to get dressed. Several girls laugh at her while she hurries to finish dressing and flees the locker room before you mess with her some more.'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/applegirl.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/applegirl.jpg"></center>'
 			'You don''t know why but Christina says something to Lina, which causes Lina to lie down on her stomach on one of the benches. Christina then sticks an apple in her mouth and proceeds to ignore her. A few minutes pass and once Christina is fully clothed, she walks back over and then uses her belt to smack Lina hard on the ass, making her wince in pain. "Have you learned your lesson?" Chrisina asks Lina, who enthusiastically nods her head.'
 			'Lariska just stands there watching, from a safe distance, as Christina yanks hard on Lina''s hair. "Are you sure?" Lina nods even more enthusiastically.'
 			'Christina gives her a final look and then puts her belt on. "OK fine, but don''t do it again."'
@@ -1865,7 +1749,7 @@ if $ARGS[0] = 'dress':
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 9:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/chrislarwedgie.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/chrislarwedgie.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
 			'You see a couple of the girls teasing each other while getting dressed. One manages to get behind the other, grabs her panties, and pulls up. They both start laughing, obviously just messing around with each other. Things settle back down as the girl who got wedgied adjusts her panties and they leave the room, still teasing each other.'
 		else
@@ -1878,32 +1762,32 @@ if $ARGS[0] = 'dress':
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 10:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/panties.jpg"></center>'
-		'As two of the underclass girls get dressed, another girl comments on how they are wearing the exact same panties, which gets them to stop and stand next to each other to show off their panties side by side. They both get a laugh out of the fact that they are wearing the same style and color of panties.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/panties.jpg"></center>'
+		'As Bella and Irina get dressed, Stasya comments on how they are wearing the exact same panties, which gets them to stop and stand next to each other to show off their panties side by side. They both get a laugh out of the fact that they are wearing the same style and color of panties.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 11:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/younggirls.jpg"></center>'
-		'A couple of girls are horsing around and another girl starts to take pictures of them with her phone. One of them grabs her friend, reaching around to grab her by the ass as she puts her hair into a ponytail as another girl moons the one taking the picture. They get most of the girls laughing, but it quickly breaks up as everyone finishes dressing and start to leave.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/younggirls.jpg"></center>'
+		'A Christina, Lariska, and Lina are horsing around, while Lizaveta starts to take pictures of them with her phone. Lina grabs Christina, reaching around to grab her by the ass as she puts her hair into a ponytail as Lariska moons the one taking the picture. They get most of the other girls laughing, but it quickly breaks up as everyone finishes dressing and start to leave.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress <= 15:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nerdoutcast.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nerdoutcast.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'As you are getting dressed you see a girl from your brother''s grade glaring at Christina, who is trying to get dressed quietly in a corner. Deciding to punish Christina for wearing panties, and maybe cheer the girl up, you sneak up behind Christina, grab her panties and yank them up hard. Christina screams and looks over her shoulder angrily, but turns white when she sees you, too scared to fight back as you pull even harder. Just when you think you might actually lift her off the ground, you hear the loud rip of her panties tearing, making her stumble into the lockers. Her panties hang off of her, wedged so tightly into her ass and pussy that they don''t fall off. Turning and smiling at the girl, who smiles back, you go back to getting dressed while Christina holds back tears as she struggles to dig her ruined panties out.'
+			'As you are getting dressed you Natasha glaring at Christina, who is trying to get dressed quietly in a corner. Deciding to punish Christina for wearing panties, and maybe cheer the girl up, you sneak up behind Christina, grab her panties and yank them up hard. Christina screams and looks over her shoulder angrily, but turns white when she sees you, too scared to fight back as you pull even harder. Just when you think you might actually lift her off the ground, you hear the loud rip of her panties tearing, making her stumble into the lockers. Her panties hang off of her, wedged so tightly into her ass and pussy that they don''t fall off. Turning and smiling at Natasha, who smiles back, you go back to getting dressed while Christina holds back tears as she struggles to dig her ruined panties out.'
 		elseif (grupTipe = 3 or grupTipe = 5) and $pantyworntype ! 'none':
 			'Just as you finish dressing, you feel someone grabs the back of your panties. Before you can say or do anything, you feel your panties get yanked up hard, painfully digging into your ass crack and against your clit. You hear the other girls all laugh as you struggle to free yourself. As you try and get up, you almost lose your balance as the person keeps pulling your panties up higher. You are finally able to pull yourself free and turn to see Christina laughing at you. "Fucking loser, likely the closest anything has been to rubbing your clit." She laughs and then heads out with Lariska and Lina in tow. You spend a few minutes pulling your panties out of your ass crack and getting them back in place.'
 			gs 'pain', 1, 'asscheeks', 'ache'
 		else
-			'As you finish dressing, you turn around in time to see Christina stand up on one of the benches, reach down, and grab a girl from your brother''s grade''s panties from behind. She yanks up on them hard, making the girl yelp and stand up. This doesn''t stop Christina though, who keeps lifting until she manages to lift the girl off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh while others look away in disgust. The girl starts to beg Christina to let her go, which seems to only encourage Christina, who now starts bouncing the girl by her panties until there is a loud rip and the girl''s panties end up under her arms. The girl looks to be on the verge of tears and runs out once Christina finally lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'
+			'As you finish dressing, you turn around in time to see Christina stand up on one of the benches, reach down, and grab Natasha''s panties from behind. She yanks up on them hard, making the Natasha yelp and stand up. This doesn''t stop Christina though, who keeps lifting until she manages to lift Natasha off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh while others look away in disgust. Natasha starts to beg Christina to let her go, which seems to only encourage Christina, who now starts bouncing her by her panties until there is a loud rip and the Natasha''s panties end up under her arms. She looks to be on the verge of tears and runs out once Christina finally lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'
 			'You can choose another outfit while you''re here.'
 		end
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	else
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/postphys<<rand(1,4)>>.jpg"></center>'
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
@@ -1922,8 +1806,9 @@ if $ARGS[0] = 'post_dress':
 	$locclass = 'locker'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/postphys<<rand(1,4)>>.jpg"></center>'
 	*nl
+	'You can access your <a href="exec:postphys_event = daystart & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Leave school':
 		if $clothingworntype = 'nude':
@@ -1933,14 +1818,14 @@ if $ARGS[0] = 'post_dress':
 			gt 'gschool_lessons', 'short_break'
 		end
 	end
-	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'main'
+	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
 	if siga >= 1:
 		act 'Smoke a cigarette':
 			*clr & cla
 			gs 'drugs', 'smoke', 1
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokecig.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/smokecig.jpg"></center>'
 			'You feel the urge to have a smoke before you leave school, so you take out your pack of cigarettes, pull one out and place it between your lips before lighting it up and taking a long drag. You spend the next few minutes smoking your cigarette, feeling yourself relax as you do. Once finished, you snuff it out and throw the butt into one of the toilets.'
 			act'Continue':gt 'gschool_lessons4', 'post_dress'
 		end
@@ -1951,7 +1836,7 @@ if $ARGS[0] = 'post_dress':
 			gs 'drugs', 'joint', 1
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokejoint.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/smokejoint.jpg"></center>'
 			'You feel the urge to get high before you leave school, so you take a seat on one of the benches and take a joint out of your purse, placing it between your lips before lighting it up and taking a long drag. You quickly feel yourself relaxing and smile as you lean back against the lockers. You spend the next few minutes smoking the joint until you''re as high as a kite. Once you''re done, you throw the roach in one of the toilets.'
 			act'Continue':gt 'gschool_lessons4', 'post_dress'
 		end
@@ -1974,5 +1859,6 @@ if $ARGS[0] = 'post_dress':
 	gs 'din_van', 'pblc_pee'
 end
 
+
 --- gschool_lessons4 ---------------------------------
 

+ 6 - 6
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>'
@@ -1184,12 +1184,12 @@ if $ARGS[0] = 'computer':
 					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
 				else
 					if grupTipe = 3:
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
 						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
 					else
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
 					end
 				end

+ 2 - 2
locations/gschool_lessonsev3.qsrc

@@ -1593,12 +1593,12 @@ if $ARGS[0] = 'art':
 					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
 				else
 					if grupTipe = 3:
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
 						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
 					else
-						 npc_rel['A16'] += 1
+						 gs 'npc_relationship', 'modify', 'A142', 'like'
 						 'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
 					end
 				end

+ 1699 - 0
locations/gschool_post_shower.qsrc

@@ -0,0 +1,1699 @@
+# 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/shower/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/shower/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/shower/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. She has a great body and you can see why so many boys consider her one of the most attractive girls in your class, with her long dark brown hair, reaching half way down her back. Her pussy is clean shaven - in fact, you can''t see a single hair on her smooth skin.'
+			if tits < 3:
+				'Upon inspection, you notice her breasts have a nice firm shape to them and are bigger than your own.'
+			elseif tits = 3:
+				'Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them.'
+			else
+				'Upon inspection, you notice her breasts have a nice firm shape to them, but are 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['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/shower/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 of carpet that matches the black hair that hangs just past her shoulders, 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 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''s got one of the smaller busts in the class.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got 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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "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 is going on, a few seem like they might have guessed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					else
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She looks at you for a few moments while you glance down. When you look back up she went 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 a few moments of observation, 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/shower/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, her breasts are small and perky, with a firm butt, her pussy is completely smooth, while her hair is black reaching 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 models 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 bit smaller than a bit more than half the other girls.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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/shower/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 making direct eye contact with you. You freeze, your eyes going 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 in a V shape to her mouth and sticks her tongue between them, in the universal sign for eating pussy. Then she goes back to pretending like nothing happened. 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 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 a few moments of observation, 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/belpeek.jpg"></center>'
+			'You peek at Bella, who is standing by her locker, still drying herself off. She has a slim build with fairly large firm breasts, 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 meet.'
+			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 the rest 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
+			*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 you should really join me sometimes to the city gym, equipment there is worth the extra. And, no, I don''t mean that "equipment" you both giggle."'
+					elseif npc_rel['A22'] <= 20:
+						sveta_dyke_rumor =+ 1
+						'Were you watching me!? Jeeszh, fuck. Get the fuck out! Fucking lesbian!" You decide it''s time to get dressed and get out, embarrassed you were caught checking her out.'
+					else
+						sveta_dyke_rumor =+ 1
+						'I don''t blame you for staring me, I would do the same if I were you, so, thanks I guess." Her words carry so several girls look up to see who she is talking to. You decide it''s time to get dressed and get out, embarrassed 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 moments of observation, 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/shower/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. 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 bit smaller than a bit more than half the other girls.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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 body, and angrily says "No, bitch! I wont fuck you."'
+						'Girls around you look up, figure out what''s happening, and start laughing at you. You decide it''s time to get dressed and get out.'
+					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 get out, embarrassed you were caught checking her out.'
+					else
+						sveta_dyke_rumor =+ 1
+						'You look a bit too long, she seems to realize she is being watched. When she sees it''s you, she just says "What, bitch?"'
+						'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 get out, embarrassed 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/iripeek.jpg"></center>'
+			'You peek at Irina, who is standing by her locker, starting 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 very pretty, one of the prettiest girls in school, she would likely be considered the pretties 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 the rest 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
+			*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 grins and start mimicking singing "I''m too sexy." while getting dressed at her locker, the scene is just too odd, is she okay?'
+					elseif npc_rel['A17'] <= 20:
+						sveta_dyke_rumor =+ 1
+						'"Oh it is 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 most of the other girls attention. You decide it''s time to get dressed and get out, embarrassed you were caught checking her out.'
+					else
+						sveta_dyke_rumor =+ 1
+						'"Can I help you? You lost something? Lockers are that way." Irina pointing with her finger where you should be focusing. "And stop staring at my tits." she says loud enough to get most of the other girls attention. You decide it''s time to get dressed and get out, embarrassed 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 moments of observation, 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/shower/julpeek.jpg"></center>'
+			'You peek at Julia, who is standing by her locker, still drying herself off. She has a curvy build, her breasts are fairly large and perky, with a jiggly bubble butt, her pussy has a neatly trimmed landing strip above it, while her long brown hair reaches just past her shoulders. Julia is very pretty, the pretties of the nerds for sure, as pretty as 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 the rest 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
+			*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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. Then she blushes and smiles to you, she returns the look for a couple of moments before she turns back to finish getting dressed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					elseif npc_rel['A12'] <= 20:
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She blushes and looks fearful, then quickly turns away from you, followed by her quickly getting dressed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					else
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. Then she blushes, quickly turning away from you, followed by her quickly getting dressed. You turn back to your own 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 moments of observation, 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 Katja':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/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 around the same size as your own.'
+			else
+				'Her teardrop shaped breasts are averaged 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:
+					!! Player is in a relationship with her
+						'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.'
+					!! Player is not in a relationship with her
+						'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.'
+					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 Katyusha':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/katypeek.jpg"></center>'
+			'You take a peek at Katyusha while she finishes drying herself off. Her body is incredibly toned and muscled for a girl, giving her body a almost manish quality to it, with a couple of small tattoos. However, she has a flat stomach, between her legs is a unsightly bush that matches the brown hair that hangs just past her shoulders, all told she is not a very attractive girl.'
+			if tits = 0:
+				'Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. However, compared to the other girls, you and her have the smallest busts in the class.'
+			else
+				'Upon inspection, you notice her breasts are very small, barely more than puffy nipples. Compared to you and your classmates, she''s got the smallest 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
+				sveta_dyke_rumor =+ 1
+				if rand (1,4) = 1:
+					if npc_rel['A145'] <= 20:
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She walks across the locker room to you 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 is going on, a few seem like they might have guessed. Once you look away from her she walks back to her locker, while you turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					else
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "What the fuck are you looking at dyke?" Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own 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 moments of observation, 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 Lariska':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/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 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''s got one of the smaller busts in the class.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got 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 probably 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 probably 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 probably 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 probably 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 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 Lena':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/lenpeek.jpg"></center>'
+			'You take a peek at Lena while she finishes drying herself off. Her body is curvy, unlike many of the other girls she has large breasts and a fairly large butt, with a couple of small tattoos. Between her legs is a neatly trimmed landing strip of brown hair, while her red dyed hair that hangs just past her shoulders, all told she is 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 the rest 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
+			*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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She gives you a knowing smirk, she knows you was checking her out, but it seems 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 finished getting dressed as well, luckily no one else seemed to have noticed.'
+					elseif npc_rel['A20'] <= 20:
+						sveta_dyke_rumor =+ 1
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She says very loudly. "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 is going on. Once you look away from her she goes back to getting dressed muttering the whole time, while you turn back to your own locker blushing as you finish getting dressed as well, luckily no one else says anything.'
+					else
+						sveta_dyke_rumor =+ 1
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "Are you checking me out? Fucking pervert." Her comments cause other girls to look over to see what is going on. You turn back to your own 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/shower/lerpeek.jpg"></center>'
+			'You take a peek at Lera while she finishes drying herself off. Her body is fairly normal, not to skinny, not to muscular, with a couple of small tattoos. Between her legs is a neatly trimmed V of brown hair, while her long brown hair with a few highlights, hangs part way down her back, all told she is 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 are about average, but 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 '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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She gives you a knowing smile and then spreads her legs slightly and indicates down with her eyes, obviously inviting you to come over and eat her out. You turn back to your own locker blushing as you finish getting dressed, luckily no one else seemed to have noticed.'
+					elseif npc_rel['A21'] <= 20:
+						sveta_dyke_rumor =+ 1
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She says very loudly. "What the fuck? You checking me out? I know you want my pussy but I got standards loser, so fuck off!" Her comments cause other girls to look over to see what is going on. Once you look away from her she goes back to getting dressed muttering the whole time, while you turn back to your own shower blushing as you finish locker to get dressed, luckily no one else says anything.'
+					else
+						sveta_dyke_rumor =+ 1
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "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 is going on, a few give disgusted looks, but most just laugh. You turn back to your own locker blushing as you finish getting dressed, luckily no one says anything else.'
+					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/shower/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 boys in school think she''s 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 bit smaller than a bit more than half the other girls.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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 looking, she gives you a warm smile before going back to getting dressed.'
+						'You should probably get back to getting ready, before others notice you staring.'
+					elseif fame['pav_slut'] >= 225:
+						'Feeling your eyes on her, she looks in your direction. Seeing you looking, she covers her breasts with her arm and makes a rude gesture at you.'
+						'Taking the hint, you get back to getting ready, before she starts a scene.'
+					elseif grupTipe = 5:
+						'Feeling your eyes on her, she looks in your direction. Seeing you looking, she gives you a disgusted look, but otherwise ignores you.'
+						'You should probably get back to getting ready, before others notice you staring.'
+					elseif npc_rel['A19'] >= 50:
+						'Feeling your eyes on her, she looks in your direction. Seeing you looking, she gives you a friendly smile before continuing to get dressed.'
+						'You should probably get back to getting ready, before others notice you staring.'
+					elseif npc_rel['A19'] <= 20:
+						'Feeling your eyes on her, she looks in your direction. Seeing you looking, she glares at you until you look away, but otherwise doesn''t say anything.'
+						'You should probably get back to getting ready, before others notice you staring.'
+					else
+						'Feeling your eyes on her, she looks in your direction. Seeing you looking, she gives you an uncertain smile, not quite sure why you are staring at her.'
+						'You should probably 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/shower/lizpeek.jpg"></center>'
+			'Lisaveta 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 bit smaller than a bit more than half the other girls.'
+			else
+				'Looking further, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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, her mouth never seems to stop moving.'
+					if fame['pav_slut'] >= 200:
+						'Noticing you checking her out, she covers her breasts and says loudly "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 and says loudly "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. One of the other girls asks her "What was that about?"'
+						'"She was totally checking me out, I didn''t know she swung that way." A couple of the girls unconsciously cover themselves and give you dirty looks.'
+						'Now would probably be a good time to get out of here, before this gets even more awkward.'
+					elseif npc_rel['A140'] <= 20:
+						'Noticing you checking her out, she covers her chest and says loudly "Quit staring at me! It''s creeping me out."'
+						'Startled, you try to quickly look away, but it''s too late. Before long she is telling several girls 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
+						'Noticing you checking her out, she says "Can I help you with something, <<$pcs_nickname>>?"'
+						'Startled, you try to quickly look away, but it''s too late. One of the other girls asks her "What was that about?"'
+						'"She was totally checking me out, I didn''t know she swung that way."'
+						'A couple of the girls unconsciously cover themselves, now would probably be a good time to get out of here.'
+					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/shower/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. All told she is 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. Her bust is bigger than yours and all the rest of your classmates as well.'
+			elseif tits = 5:
+				'Natasha has very long light brown hair reaching half way down her back. Looking closer, you notice her breasts are large and firm, the same size as yours. However, compared to the other girls, they are the largest among your classmates. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair.'
+			else
+				'Natasha has very long light brown hair reaching half way down her back. Looking closer, you notice her breasts are large and firm, but still not as large as yours. However, compared to your classmates, her breasts are larger than any of the other girls. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair.'
+			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 something. Seeing you staring, she smiles mischievously. Pulling her socks out of her locker, she proceeds to bend over and put them on. She is facing away from you, legs slightly spread and without panties on, giving you the a perfect view between them to see her pussy.'
+						'Straightening back up she smiles again at you 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 something. Seeing you staring, she covers herself as best she can and turns away, her face a bit 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 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 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 Paulina':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/palpeek.jpg"></center>'
+			'You take a peek at Paulina 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, nor would you call her pretty, she is very average looking.'
+			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 are about average, but 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 '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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She says very loudly. "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 is going on, a few seem like they might have guessed. Once you look away she goes back to getting dressed, while you turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					else
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "What the fuck are you looking at? Fuck you another carpet muncher? Can''t a girl get dressed in peace!" Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own 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/shower/sonpeek.jpg"></center>'
+			'Your attention homes in on Sonia as she gets her clothes to get dressed. She has long brown hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. All told she is 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 bit smaller than a bit more than half the other girls.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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 smiles and turns her body, giving you a better look.'
+							'You should probably get dressed and leave, before this gets more awkward.'
+						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, 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 looking back, she gives you a hesitant smile before continuing her shower.'
+							'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 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.'
+						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/shower/stapeek.jpg"></center>'
+			'Your attention homes in on Stasya as she gets her clothes to get dressed. She has long black hair reaching just past her shoulders. Allowing your eyes to wander, you see she is complete shaved of all hair, other than on her head. All told she is 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 are about average, but 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 '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 says "Hey, stop that."'
+						'Startled, you try to quickly look away, but it''s too late. One of the other girls asks her "What was that about?"'
+						'"She was totally checking me out, I didn''t know she swung that way." A couple of the girls unconsciously cover themselves and give you dirty looks.'
+						'Now would probably be a good time to 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 that was about 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
+						'Noticing you checking her out, she says "Oh my god what is your problem?"'
+						'Startled, you try to quickly look away, but it''s too late. One of the other girls asks her "What was that about?"'
+						'"She was totally checking me out, seems <<$pcs_nickname>> is a dyke."'
+						'A couple of the girls unconsciously cover themselves, now would probably be a good time to get out of here.'
+					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/shower/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. All told she is very attractive bordering on beautiful.'
+			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 are about average, but 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 '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/shower/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 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 in your school, her breasts are about average.'
+			else
+				'Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average 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 probably 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 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 Zinaida':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/zinpeek.jpg"></center>'
+			'Your attention homes in on Zinaida as she gets her clothes to get dressed. She has long brown hair reaching just past her shoulders. 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, nor would you call her pretty, she is very average looking.'
+			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 bit smaller than a bit more than half the other girls.'
+			else
+				'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+			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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. Then she blushes, turning away from you to finish getting dressed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					elseif npc_rel['A142'] <= 20:
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She blushes and looks fearful, then quickly turns away from you, followed by her quickly getting dressed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+					else
+						'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. Then she blushes, quickly turning away from you, followed by her quickly getting dressed. You turn back to your own 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
+	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, matting her long dark hair half way down her back, as 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 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. 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 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''s got one of the smaller busts in the class.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got 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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. "What the fuck are you looking at?" Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own locker blushing as you finish getting dressed, luckily no one else says anything.'
+				else
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the locker room. She looks at you for a few moments while you glance down. When you look back up she went 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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+			else
+				'After a few moments of observation, 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, with a firm butt, her pussy is completely smooth. She is one of the most beautiful girls in school, with a models 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 bit smaller than a bit more than half the other girls.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+		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 making direct eye contact with you. You freeze, your eyes going 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 in a V shape to her mouth and sticks her tongue between them, in the universal sign for eating pussy. Then 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, 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 making direct eye contact with you. You freeze, your eyes going wide and your mouth going 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, heading back to your locker so you can get dressed.'
+				else
+					'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder making direct eye contact with you. You freeze, your eyes going wide and your mouth going slack as you try to think of some kind of excuse. Before you can say anything, she winks, 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, 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 a few moments of observation, 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 with fairly large firm breasts, 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 meet.'
+		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 the rest 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
+		*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 and says. "<<$pcs_nickname>>, I''m thinking of growing a bush." She turns to show you her shaved pussy. "what do you think about it? 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 you were checking her out while she showered.'
+					'It probably would be best to finish your shower in a hurry 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 were caught, you mumble something and look away real quick, but the damage is done. You can hear her telling others you were checking her out while she showered.'
+					'Probably would be best to finish your shower in a hurry 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 body, and angrily says "No, bitch! I wont fuck you."'
+					'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."'
+					'Girls around you look up, not sure what they missed. You think now might be a good time to end your shower, embarrassed you were caught checking her out.'
+				else
+					sveta_dyke_rumor =+ 1
+					'You look a bit too long, she seems to realize she is being watched. When she sees it''s you, she just says "What, bitch?"'
+					'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 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, under the shower, letting the water just run over her. 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 very pretty, one of the prettiest girls in school, she would likely be considered the pretties 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 the rest 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 looking but just smiles and says. "Oh, great you''re here, I''ll need your input cause like 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."'
+					'Irina replies. "What''s worse that could happen?"'
+					'Bella chimes in. "What if it swelled up and burst?" all girls start laughing, Irina apparently didn''t notice you checking her out or didn''t care.'
+				elseif npc_rel['A17'] <= 20:
+					sveta_dyke_rumor =+ 1
+					'"That''s pussy." Irina says while pointing on her crotch area, you were caught. "You want to crawl over here and lick it dyke?" Several girls look over likely to see if you are going to do it, you turn back to your shower and try to ignore the comments about you and your sexuality.'
+				else
+					sveta_dyke_rumor =+ 1
+					'As you are looking at her, she turns around and catches you looking and then yells. "What the hell! Can''t even shower in peace, without some muff diver drolling all over you, what''s happening in the world!" Several girls look over and follower her gaze to you. You turn 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, who is soaping herself up. She has a curvy build, her breasts are fairly large and perky, with a jiggly bubble butt, her pussy has a neatly trimmed landing strip above it, while her long brown hair reaches just past her shoulders. Julia is very pretty, the pretties of the nerds for sure, as pretty as 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 the rest 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
+		*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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. Then she blushes and smiles to you, she returns the look for a couple of moments before she turns back to finish showering. You turn back blushing as you finish your own shower, luckily no one else says anything.'
+				elseif npc_rel['A12'] <= 20:
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. Then she blushes and looks fearful, then quickly turns away from you, followed by her quickly turning off the shower and leaving. You turn back blushing as you finish your own shower, luckily no one else says anything.'
+				else
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. Then she blushes, quickly turning away from you, followed by her quickly turning off the shower and leaving. You turn back blushing as you finish your own shower, 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 a few moments of observation, 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 around the same size as your own.'
+		else
+			'Her teardrop shaped breasts are averaged 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:
+				!! Player is in a relationship with her
+					'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.'
+				!! Player is not in a relationship with her
+					'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.'
+				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 showers. Her body is incredibly toned and muscled for a girl, giving her body a almost manish quality to it, with a couple of small tattoos. However, she has a flat stomach, between her legs is a unsightly bush that matches the brown hair that hangs just past her shoulders, all told she is not a very attractive girl.'
+		if tits = 0:
+			'Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. However, compared to the other girls, you and her have the smallest busts in the class.'
+		else
+			'Upon inspection, you notice her breasts are very small, barely more than puffy nipples. Compared to you and your classmates, she''s got the smallest 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
+			sveta_dyke_rumor =+ 1
+			if rand (1,4) = 1:
+				if npc_rel['A145'] <= 20:
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She walks across the locker room to you 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 is going on, a few seem like they might have guessed. Once you look away from her she walks back to her shower, while you turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				else
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. "What the fuck are you looking at dyke?" Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own 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 a few moments of observation, 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''s got one of the smaller busts in the class.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, she''s got 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 getting dressed.'
+					'You probably 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 getting dressed.'
+					'You probably 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 getting dressed.'
+					'You probably 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 getting dressed.'
+					'You probably 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 Lariska, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is curvy, unlike many of the other girls she has large breasts and a fairly large butt, with a couple of small tattoos. Between her legs is a neatly trimmed landing strip of brown hair, while her red dyed hair that hangs just past her shoulders, all told she is 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 the rest 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
+		*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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She gives you a knowing smirk, she knows you was checking her out, but it seems she doesn''t really care as she just turns back to face the shower and keep showering. You turn back to your own shower blushing as you finish showering, luckily no one else seemed to have noticed.'
+				elseif npc_rel['A20'] <= 20:
+					sveta_dyke_rumor =+ 1
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She says very loudly. "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 is going on, a few seem like they might have guessed. Once you look away from her she goes back to showering muttering the whole time, while you turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				else
+					sveta_dyke_rumor =+ 1
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. "Are you checking me out? Fucking pervert." Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own 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 a few moments of observation, 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 Lariska, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is fairly normal, not to skinny, not to muscular, with a couple of small tattoos. Between her legs is clean shaven today, while her long brown hair with a few highlights, hangs part way down her back, all told she is 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 are about average, but 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:
+				if npc_rel['A21'] >= 60:
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She gives you a knowing smile and then spreads her legs slightly and indicates down with her eyes, obviously inviting you to come over and eat her out. You turn back to your own shower blushing as you finish showering, luckily no one else seemed to have noticed.'
+				elseif npc_rel['A21'] <= 20:
+					sveta_dyke_rumor =+ 1
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She says very loudly. "What the fuck? You checking me out? I know you want my pussy but I got standards loser, so fuck off!" Her comments cause other girls to look over to see what is going on. Once you look away from her she goes back to showering muttering the whole time, while you turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				else
+					sveta_dyke_rumor =+ 1
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. "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 is going on, a few give disgusted looks, but most just laugh. You turn back to your own 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 a few moments of observation, 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 boys in school think she''s 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 bit smaller than a bit more than half the other girls.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+		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 into her shower, when she suddenly stops and looks at you. Seeing you looking back, she gives you a warm smile before continuing her shower.'
+					'You should probably get back to your own shower, before others notice you staring.'
+				elseif fame['pav_slut'] >= 225:
+					'She seems into her shower, when she suddenly stops and looks at you. Seeing you looking back, she sneers and mutters "lesbo slut," loud enough for you to hear. Going back to her shower, she ignores you.'
+					'You should probably 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 looking back, she gives you a disgusted look before going back to her shower, ignoring you.'
+					'You should probably get back to your own shower, before others notice you staring.'
+				elseif npc_rel['A19'] >= 50:
+					'She seems into her shower, when she suddenly stops and looks at you. Seeing you looking back, she gives you a friendly smile and a wave before continuing her shower.'
+					'You should probably get back to your own shower, before others notice you staring.'
+				elseif npc_rel['A19'] <= 20:
+					'She seems into her shower, when she suddenly stops and looks at you. Seeing you looking back, she gives you a cold look before continuing her shower.'
+					'You should probably get back to your own shower, before others notice you staring.'
+				else
+					'She seems into her shower, when she suddenly stops and looks at you. Seeing you looking back, she gives you a hesitant smile before continuing her shower.'
+					'You should probably 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 Lisaveta as she soaps herself up. She 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. All told she is 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. However, compared to the other girls, her breasts are a little bit smaller than a bit more than half the other girls.'
+		else
+			'Looking further, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+		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, Slut? Can''t get enough cock to satisfy you?"'
+					'Startled you look away, but the damage is already done. You can hear her telling others you were staring at her while she showered.'
+					'Probably would be best to finish your shower in a hurry and get out of there, 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 others you were staring at her while she showered.'
+					'It probably would be best to finish your shower in a hurry and get out of there, 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 were caught, you mumble something and look away real quick, but the damage is done. You can hear her telling others you were staring at her while she showered.'
+					'It probably would be best to finish your shower in a hurry and get out of there, 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 others you were staring at her while she showered.'
+					'It probably would be best to finish your shower in a hurry and get out of there, 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 were caught, you mumble something and look away real quick, but the damage is done. You can hear her telling others you were staring at her while she showered.'
+					'Probably would be best to finish your shower in a hurry 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 moments of observation, 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. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. All told she is 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. Her bust is bigger than yours and all the rest of your classmates as well.'
+		elseif tits = 5:
+			'Looking closer, you notice her breasts are large and firm, the same size as yours. However, compared to the other girls, they are the largest among your classmates.'
+		else
+			'Looking closer, you notice her breasts are large and firm, but still not as large as yours. However, compared to your classmates, her breasts are larger than any of the other girls.'
+		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. Lather her hands in soap, she bends over facing away with her legs spread a bit and starts washing them, giving you the a perfect view between them to see her pussy.'
+					'Straightening back up she smiles again at you and starts to rinse, her face bright red, but looking pleased.'
+					'You should probably 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 a bit red.'
+					'You should probably 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 probably 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 probably 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 a few moments of observation, 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 Paulina':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchpau.jpg"></center>'
+		'Your attention homes in on Paulina 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, nor would you call her pretty, she is very average looking.'
+		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 are about average, but 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
+			sveta_dyke_rumor =+ 1
+			if rand (1,4) = 1:
+				if npc_rel['A24'] <= 20:
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She says very loudly. "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 is going on, a few seem like they might have guessed. Once you look away from her she goes back to showering muttering the whole time, while you turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				else
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. "What the fuck are you looking at? Fuck you another carpet muncher? Can''t a girl get dressed in peace!" Her comments cause other girls to look over to see what is going on, a few seem like they might have guessed. You turn back to your own 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 a few moments of observation, 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 Natasha as she soaps herself up. She has long brown hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. All told she is 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 bit smaller than a bit more than half the other girls.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+		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 smiles and turns her body, giving you a better look.'
+						'You should probably get dressed 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 the a perfect view  to see her pussy.'
+						'Straightening back up she smiles again at you and starts to rinse. You should probably 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 probably get dressed 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 into her shower, when she suddenly stops and looks at you. Seeing you looking back, she gives you a hesitant smile before continuing her shower.'
+						'You should probably 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 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.'
+					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 a few moments of observation, 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. Allowing your eyes to wander, you see she is complete shaved of all hair, other than on her head. All told she is 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 are about average, but 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 were caught, you mumble something and look away real quick, but the damage is done. You can hear her telling others you were checking her out while she showered.'
+					'It probably would be best to finish your shower in a hurry and get out of there, 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 with out some dyke staring at you."'
+					'Startled you look away, but the damage is already done. You can hear her telling others you were checking her out while she showered.'
+					'It probably would be best to finish your shower in a hurry and get out of there, 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 were caught, you mumble something and look away real quick, but the damage is done. You can hear her telling others you were checking her out while she showered.'
+					'Probably would be best to finish your shower in a hurry 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 moments of observation, 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. All told she is very attractive bordering on beautiful.'
+		if tits < 3:
+			'Upon inspection, you notice her breasts are average sized and have a slightly less firm shape to them compared to other girls, but are bigger than your own.'
+		elseif tits = 3:
+			'Upon inspection, you notice her breasts are the same size as your own, but are slightly less firm.'
+		else
+			'Upon inspection, you notice her breasts are smaller and less firmer 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['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 about average 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 in your school, her breasts are about average.'
+		else
+			'Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average 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 probably 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 probably get dressed 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 a few moments of observation, 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. 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, nor would you call her pretty, she is very average looking.'
+		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 bit smaller than a bit more than half the other girls.'
+		else
+			'Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit smaller than a bit more than half the other girls.'
+		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 a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. Then she blushes, turning away from you she rinses off, then turns off the shower and goes to the locker room. You turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				elseif npc_rel['A142'] <= 20:
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. She blushes and looks fearful, then quickly turns away from you, followed by her quickly turning off the shower and leaving. You turn back to your own shower blushing as you finish showering, luckily no one else says anything.'
+				else
+					'After a few moments of observation, she turns and then looks at you. You know you have just been busted checking another girl out in the shower. Then she blushes, quickly turning away from you, turning off the shower and leaving. You turn back to your own 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 a few moments of observation, 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 ---------------------------------
+

+ 1 - 1
locations/hotel_resep.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'pavlbarcont':
 			fingal = 1
 			gs 'stat'
 
-			act'Run away':gt'pav_train'
+			act'Run away':gt'pav_market'
 		end
 	end
 	exit

+ 191 - 64
locations/kinosvid.qsrc

@@ -9,36 +9,36 @@ if $ARGS[0] = '':
 	gs 'stat'
 	'<center><b>Cinema</b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
-	'You and <<$telsob>> buy your tickets, drinks, and popcorn. With some playful flirting, you settle into your seats ready to watch the movie.'
+	'You and <<$telsob>> buy your tickets, drinks, and popcorn. With that done you head into the theater where your movie is showing.'
 
 	act 'Watch the movie':
 		if $telsob = 'Alla':
 			alla += 1
 			if alla >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
 		elseif $telsob = 'Masha':
 			masha += 1
 			if masha >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
 		elseif $telsob = 'Kate':
 			npc_rel['A219'] += 1
 			if npc_rel['A219'] >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
@@ -46,10 +46,10 @@ if $ARGS[0] = '':
 			!! date with girlfriend	
 			loverrelation[lover_number] += 1		
 			if loverrelation[lover_number] >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
@@ -60,7 +60,7 @@ end
 if $ARGS[0] = '1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/1.jpg"></center>'
-	'While you''re engrossed in the movie, <<$telsob>> takes the opportunity to "accidentally" drop some popcorn down your top.'
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice it is almost completely empty. While you''re engrossed in the movie, <<$telsob>> takes the opportunity to "accidentally" drop some popcorn down your top.'
 
 	act 'Oh, my':
 		*clr & cla
@@ -233,62 +233,188 @@ end
 if $ARGS[0] = '2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
-	'<<$telsob>> says: "I have to use the little girls room. I''ll be right back."'
-
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice it is almost completely empty, just a few people spread out watching the movie. The two of you watch the movie for awhile before,<<$telsob>> reaches over and slides her hands between your legs and starts rubbing your crotch. Just as it is really starting to feel good, she says: "I have to use the little girls room. I''ll be right back."'
+	gs 'arousal', 'foreplay', 10, 'lesbian'
+	gs 'stat'
 	act 'Wait':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/20.jpg"></center>'
-
-		if kendra = 0:'While she is gone, a rude black chick sits down beside you, and forces her hand between your legs. Too stunned to say anything, you just sit there as she works her hand deeper between your thighs.<br>You''re all wet, sugar", she says with a little smirk.<br>Before you can figure out what to do or say, <<$telsob>> grabs her by the ear, and pulls the strange woman out of her seat. She doesn''t put up a fight, and even starts laughing as she goes.<br>The strange women calls back to you before she exits: "If you ever get a taste for dark chocolate come see me at the dorm. I know you want to." She leaves licking her still wet fingers.<br>Furious, <<$telsob>> throws her a parting shot: "Get the fuck gone you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
-		if kendra > 0:'While she is gone, Kendra plops right down in the chair next to you. She puts a hand between your legs, and she looks at you like a piece of property. "Oh, are you all wet for me <<$pcs_nickname>>, or are you hot for that skinny white bitch?", she says while roughly fingering your pussy.<br>Frozen, you have no idea what to do when you are saved by <<$telsob>>. She grabs Kendra by the ear and pulls her out of her seat. She doesn''t put a fight, and even starts laughing as she goes.<br>Kendra calls back to you before she exits: "Come see me when you get tired of that skinny white bitch. I know what you really want <<$pcs_nickname>>." Kendra leaves giving you a wink, while licking her still wet fingers.<br>Furious, <<$telsob>> throws her a parting shot: "Get the fuck gone you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
-
-		gs 'arousal', 'vaginal_finger', 10, 'lesbian'
-		gs 'stat'
-	
-		act 'Wait':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/21.jpg"></center>'
-			'When <<$telsob>> has calmed down a little, she looks at you with hunger in her eyes. You were so shocked by the encounter that you were still sitting there legs spread. <<$telsob>> reaches over and starts to unbutton your top too. It looks like she intends to claim her prize.'
-
-			act 'Let her':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/22.jpg"></center>'
-				'<<$telsob>> gives you a slow deep kiss, as she works two fingers into your pussy. She curls her fingers up, and gives a firm tug. "This is mine", she whispers against your lips.'
-				'All you can do is whimper, "Yes."'
-
-				$orgasm_or = 'yes'
-				gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'sub'
-				gs 'stat'
-	
-				act 'Submit':
+		if hotcat >= 5:
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+			if kendra_theater = 0:
+				if meet_kendra = 1:
+					'While she is gone, Kendra plops right down in the chair next to you. She starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "Hello again <<$pcs_nickname>>, so what are you doing." She says as she looks at you like a piece of property.'
+				else
+					'While she is gone, a black girl sits down beside you, starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "So whats your name?" She asks.'
+				end
+				act 'On a date':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/23.jpg"></center>'
-					'You obediently roll over to your knees, when <<$telsob>> tells you to. She gets to work, stretching your little pussy with finger after finger. She isn''t rough, but she leaves no doubt about who is in charge.'
-					'"I want you to cum for me now, <<$pcs_nickname>>", she says, in a firm voice.'
-					'You do.'
-					
-					$orgasm_or = 'yes'
-					gs 'arousal', 'vaginal_finger', 5, 'lesbian'
-					gs 'stat'
-	
-					act 'Pleasure her':
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+					if meet_kendra = 1:
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'The Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+						'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					else
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'The black girl snorts. "Yeah I seen that white bitch you was with, you could do better."'
+						'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The black girl jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					end
+					act 'Finish':gt 'kinosvid', '3'
+				end
+				act 'Harmless flirting':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+					if meet_kendra = 1:
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'Then Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+						'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her not sure what more to say, this is a awkward situation, on a date with a girl while another girl flirts with you.'
+						'"Want some popcorn." Then she pops a few in her mouth, one held by her lips, you know she is planning to feed you it with a kiss if you say yes.'
+					else
+						meet_kendra = 1
+						npc_rel['A84'] = 40
+						'"<<$pcs_nickname>>." You tell her and then explain you are on a date. "Uh... sorry but I am already sorta on a date. She should be back any moment."'
+						'Then black girl snorts. "Yeah I seen that white bitch you was with, you could do better."'
+						'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her not sure what more to say, this is a awkward situation, on a date with a girl while another girl flirts with you.'
+						'"By the way my name is Kendra." She says and before you can respond she adds to it. "Want some popcorn." Then she pops a few in her mouth, one held by her lips, you know she is planning to feed you it with a kiss if you say yes.'
+					end
+					act 'No thanks':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/24.jpg"></center>'
-						'<<$telsob>> gets into position, and guides your hand between her legs. "Do it to me now, sweetie", she tells you. You slowly do the same thing that she has just done to you, slowly stretching her until you get four fingers inside her. After a short time <<$telsob>> bucks wildly against your hand, as she climaxes. When she recovers she gives you a little kiss on the cheek, and goes back to watching the movie, without a word.'
-
-						gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
-						gs 'stat'
-	
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+						'You shake your head no. "No thanks, like I said my date should be back any moment."'
+						'The Kendra snorts. "You afraid of what she might do if she see''s you with someone better than her?"'
+						'Before you can answer <<$telsob>> comes back and grabs Kendra by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
 						act 'Finish':gt 'kinosvid', '3'
 					end
+					act 'Yes':
+						*clr & cla
+						gs 'npc_relationship', 'modify', 'A84', 'like'
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater2.jpg"></center>'
+						'You just nod your head and then she leans in and places the piece of popcorn in your mouth, you swallow it and soon the two of you are kissing. She taste like candy and popcorn, she is a very good kisser. You don''t know how long the two of you kiss, a couple of minutes at least but it was so good it felt like forever and no time at all, at the same time. When the kiss finally breaks she says. "I saw her rubbing you all over your pussy, show me your wet little pussy."'
+						gs 'arousal', 'kiss', 2, 'lesbian'
+						gs 'stat'
+						act 'No':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+							'You shake your head no. "No I can''t, not to mention my date should be back any moment."'
+							'The Kendra snorts. "You afraid of what she might do if she see''s you with someone better than her?"'
+							'Before you can answer <<$telsob>> comes back and grabs Kendra by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+							'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+							act 'Finish':gt 'kinosvid', '3'
+						end
+						act 'Show her':
+							*clr & cla
+							kendra_theater = 1
+							gs 'npc_relationship', 'modify', 'A84', 'like'
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater3.jpg"></center>'
+							'You pulls your clothes aside until you can bare your pussy to her. As she looks down at your pussy she licks her lips. "You are all shinny and wet." After a few moments she reaches over and starts to rub your thigh gently. Her hand starts sliding up your thigh to your pussy.'
+							gs 'arousal', 'flash', 2, 'lesbian'
+							gs 'stat'
+							act 'Let her':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater4.jpg"></center>'
+								'Her fingers trail up your thigh and over to your pussy, she starts rubbing your clit for a moment, "You''re all wet, sugar." she says, then her fingers slide down to your slit and inside of your wet pussy. For several minutes she alternates between fingering you, rubbing your clit and just teasing you by rubbing your inner thigh.'
+								gs 'arousal', 'vaginal_finger', 3, 'lesbian'
+								gs 'stat'
+								act 'girl interrupted':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+									'Just as it is starting to really feel good, <<$telsob>> shows up and grabs Kendra by the arm yanking her up. Kendra doesn''t put up a fight, and even starts laughing as she goes. Kendra calls back to you before she walks off: "If you ever get a taste for dark chocolate come see me at the dorm, ask for me by name. I know you want to." She leaves licking her still wet fingers.'
+									*nl
+									'Furious, <<$telsob>> throws her a parting shot: "Get the fuck out of here you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
+									act 'Wait':gt 'kinosvid', '23'
+								end
+							end
+						end
+					end
+				end
+			else
+				'While she is gone, Kendra plops right down in the chair next to you. She starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "Hello again <<$pcs_nickname>>, I bet your all wet for me again." She says as she looks at you like a piece of property.'
+				act 'On a date':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+					'You explain you are on a date. "Uh... sorry but I am already on a date, like last time. She should be back any moment."'
+					'The Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better and you know it."'
+					'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+					'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					act 'Finish':gt 'kinosvid', '3'
+				end
+				act 'Smile to her':
+					*clr & cla
+					kendra = 1
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+					'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+					'Then Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+					'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her as you lay your head on her shoulder.'
+					'"Show me your pussy." Kendra says to you.'
+					act 'Show her':
+						*clr & cla
+						gs 'npc_relationship', 'modify', 'A84', 'like'
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater3.jpg"></center>'
+						'You pulls your clothes aside until you can bare your pussy to her. As she looks down at your pussy she licks her lips. "Oh, are you all wet for me <<$pcs_nickname>>, or are you hot for that white bitch?" After a few moments she reaches over and starts to rub your thigh gently. Her hand starts sliding up your thigh to your pussy.'
+						gs 'arousal', 'flash', 2, 'lesbian'
+						gs 'stat'
+						act 'Let her':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater4.jpg"></center>'
+							'Her fingers trail up your thigh and over to your pussy, she starts rubbing your clit for a moment, "Look how wet that pussy gets at my touch, I know that white bitch doesn''t get you this hot." she says, then her fingers slide down to your slit and inside of your wet pussy. For several minutes she alternates between fingering you, rubbing your clit and just teasing you by rubbing your inner thigh.'
+							gs 'arousal', 'vaginal_finger', 3, 'lesbian'
+							gs 'stat'
+							act 'girl interrupted':
+								*clr & cla
+								npc_rel['A84'] = 40
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+								'Just as it is starting to really feel good, <<$telsob>> shows up and grabs Kendra by the arm yanking her up. Kendra doesn''t put up a fight, and even starts laughing as she goes. Kendra calls back to you before she walks off: "Come see me when you get tired of that white bitch. I know what you really want <<$pcs_nickname>>." She leaves licking her still wet fingers.'
+								*nl
+								'Furious, <<$telsob>> throws her a parting shot: "Get the fuck out of here you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
+								act 'Wait':gt 'kinosvid', '23'
+							end
+						end
+					end
 				end
-
-				act 'Pleasure her':gt 'kinosvid', '22'
 			end
-
-			act 'Pleasure her':gt 'kinosvid', '21'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
+			'You watch the movie while she is gone, you sit and watch the movie. About ten minutes later she comes back and sits back down next to you.'
+			act 'Finish':gt 'kinosvid', '3'
+		end
+	end
+end
+			
+if $ARGS[0] = '23':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/21.jpg"></center>'
+	'When <<$telsob>> has calmed down a little, she looks at you with hunger in her eyes. You were so shocked by the encounter that you were still sitting there legs spread. <<$telsob>> reaches over and starts to unbutton your top too. It looks like she intends to claim her prize.'
+	act 'Let her':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/22.jpg"></center>'
+		'<<$telsob>> gives you a slow deep kiss, as she works two fingers into your pussy. She curls her fingers up, and gives a firm tug. "This is mine", she whispers against your lips.'
+		'All you can do is whimper, "Yes."'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Submit':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/23.jpg"></center>'
+			'You obediently roll over to your knees, when <<$telsob>> tells you to. She gets to work, stretching your little pussy with finger after finger. She isn''t rough, but she leaves no doubt about who is in charge.'
+			'"I want you to cum for me now, <<$pcs_nickname>>", she says, in a firm voice.'
+			'You do.'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'vaginal_finger', 5, 'lesbian'
+			gs 'stat'
+			act 'Pleasure her':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/24.jpg"></center>'
+				'<<$telsob>> gets into position, and guides your hand between her legs. "Do it to me now, sweetie", she tells you. You slowly do the same thing that she has just done to you, slowly stretching her until you get four fingers inside her. After a short time <<$telsob>> bucks wildly against your hand, as she climaxes. When she recovers she gives you a little kiss on the cheek, and goes back to watching the movie, without a word.'
+				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
+				gs 'stat'
+				act 'Finish':gt 'kinosvid', '3'
+			end
 		end
+		act 'Pleasure her':gt 'kinosvid', '22'
 	end
+	act 'Pleasure her':gt 'kinosvid', '21'
 end
 
 if $ARGS[0] = '21':
@@ -331,6 +457,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	gs 'arousal', 'end'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice the theater is packed, you struggle to find a pair of empty seats next to each other.'
 
 	if $telsob = $loverdesc[lover_number]:
 		'When the movie ends, <<$telsob>> looks at you and waits for your next move.'

+ 2 - 0
locations/korrPar.qsrc

@@ -156,6 +156,8 @@ 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

+ 24 - 14
locations/kuhrPar.qsrc

@@ -50,19 +50,23 @@ 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:
+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.'
 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.'
@@ -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/leonid.qsrc

@@ -850,7 +850,7 @@ if $ARGS[0] = 'toilet':
 
 	act 'Leave the restroom':gt 'leonid', 'office'
 	
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'

+ 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/mey_home.qsrc

@@ -224,7 +224,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	*nl
 	'It feels and looks like a standard room in a hotel.'
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
 	*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 $loc, $loc_arg">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl

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

+ 1 - 1
locations/nichBedroomServant.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
 	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
+	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 	if komp = 1:
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 	else

+ 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

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

+ 35 - 38
locations/nyp_school.qsrc

@@ -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

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

+ 10 - 10
locations/olutaxi.qsrc

@@ -189,7 +189,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			'You shake your head no. "No I just wanted to talk is all, get to know you. Maybe some other time."'
 			*nl
 			'He nods but seems to have lost a lot of interest, the two of you talk for a bit but he seems a bit distracted. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he starts to walk off and then stops. "If you want come see me at the University dorms if you are ever in the city." He tells you which dorm building and room is his, then tells you bye as he heads back towards the train station.'
-			act 'Leave':minut += 3 & gt 'pav_train'
+			act 'Leave':minut += 3 & gt 'pav_train_hall'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 				'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. The two of you talk for a bit but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train'
+				act 'Leave':minut += 3 & gt 'pav_train_hall'
 			end
 		else
 			act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 					'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. Once you are dressed you open the door and climb out. "Sorry." You tell him as you get out and walk away. He gets out behind and closes the door as you walk away.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -376,7 +376,7 @@ if $ARGS[0] = 'djibril_taxi_sex_anal1':
 		gs 'cum_call', 'butt', 'A82'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train'
+		act 'Leave':minut += 3 & gt 'pav_train_hall'
 	end
 end
 	
@@ -403,7 +403,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 		'You nod to him. "Sure maybe another day." Then you walk off.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train'
+		act 'Leave':minut += 3 & gt 'pav_train_hall'
 	end
 	act 'Blow him':
 		*clr & cla
@@ -446,7 +446,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 						gs 'cum_call', 'mouth', 'A55'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':minut += 3 & gt 'pav_train'
+						act 'Leave':minut += 3 & gt 'pav_train_hall'
 					end
 				end
 			else
@@ -489,7 +489,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 							gs 'cum_call', 'mouth', 'A55'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':minut += 3 & gt 'pav_train'
+							act 'Leave':minut += 3 & gt 'pav_train_hall'
 						end
 					end
 				else
@@ -555,7 +555,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end
@@ -583,7 +583,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		else
@@ -645,7 +645,7 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end

+ 2 - 5
locations/pav_commercial.qsrc

@@ -88,7 +88,7 @@ else
 	$Pharmname = 'For easy access, there''s even a pharmacy attached to it but it''s currently closed for the day.'
 end
 
-'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_train''">train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
+'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_market''">Market square</a> with the <a href="exec:minut += 10 & gt ''pav_train_hall''">Train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
 
 if week < 6 and hour >= 9 and hour <= 18:
 	$desc_txt4 = '<a href="exec:minut += 3 & gt ''post_office'', ''start''">post office</a>'
@@ -141,11 +141,8 @@ if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 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_train'
+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'

+ 20 - 12
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.

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

+ 8 - 8
locations/pav_disco_sex.qsrc

@@ -1614,7 +1614,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1644,7 +1644,7 @@ if $ARGS[0] = 'heating_up':
 						gs 'willpower', 'exhib', 'resist', 'easy'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pav_train'
+						gt 'pav_market'
 					end
 				else
 					act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1665,7 +1665,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1712,7 +1712,7 @@ if $ARGS[0] = 'heating_up':
 									gs 'willpower', 'prostitution', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pav_train'
+									gt 'pav_market'
 								end
 							else
 								act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2222,7 +2222,7 @@ if $ARGS[0] = 'End':
 	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the hotel': gt 'pav_train'
+	act 'Leave the hotel': gt 'pav_market'
 end
 
 if $ARGS[0] = 'drug_user':
@@ -2339,7 +2339,7 @@ if $ARGS[0] = 'drugs':
 								gs 'arousal', 'end'
 								pcs_horny += 100
 								gs 'stat'
-								act 'Leave the room': gt 'pav_train'
+								act 'Leave the room': gt 'pav_market'
 							end
 						end
 					end
@@ -2360,7 +2360,7 @@ if $ARGS[0] = 'drugs':
 			'You try to excuse yourself, saying that it wasn''t your intention to lead him on...'
 			'<<$npc_firstname[$npclastsaved]>> stops for a moment and you notice that he''s clearly affected by the drugs. His eyes flare up as he leaps from the chair, shouting that you''re just some whore that was after his drugs.'
 			'He grabs hold of you and shoves you over to the door, throwing you outside. You stand in shock as the drugs take hold of you and you feel yourself becoming incredibly aroused. You knock on the door, but <<$npc_firstname[$npclastsaved]>> refuses to open it. You decide to leave... maybe you''ll get lucky somewhere else.'
-			act 'Leave the hotel': gt 'pav_train'
+			act 'Leave the hotel': gt 'pav_market'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2373,7 +2373,7 @@ if $ARGS[0] = 'no drugs':
 	'"There''s no way I''m doing that! Who knows what that powder is and I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$npclastsaved]>> snorts deeply and looks over at you. "Too bad, you''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$npclastsaved]>> just shrugs his shoulders and jumps straight back into what he started.'
-	act 'Leave the room': gt 'pav_train'
+	act 'Leave the room': gt 'pav_market'
 end
 
 --- pav_disco_sex ---------------------------------

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

+ 94 - 23
locations/pav_market.qsrc

@@ -21,23 +21,22 @@ clr
 gs 'stat'
 '<center><h2>Pavlovsk''s Market Square</h2></center>'
 if month >= 11 or month <= 3:
-!!need new images Anya
 	if hour >= 9 and hour <= 16:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
 	end
 else
 	if hour >= 7 and hour <= 18:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
 	end
 end
 *nl
-'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_market_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
-'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_market_market'', ''start''">market</a> on most days.'
+'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
@@ -52,8 +51,19 @@ if kidaloa = 0:
 		monthKidalo = month
 		gs 'stat'
 		'<center><h4>Pavlovsk''s Market Square</h4></center>'
-		!!need new image
-		
+		if month >= 11 or month <= 3:
+			if hour >= 9 and hour <= 16:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+			end
+		else
+			if hour >= 7 and hour <= 18:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+			end
+		end
 		'When you arrive at the Market Square, it''s impossible to not notice a girl holding a microphone and a man following her with a large camera. They''re coming straight towards you. The girl beckons you to come closer and glances over at towards the man holding the camera, who gives her a subtle nod.'
 		'She turns back to you and happily exclaims: "Hello! We''re shooting a pilot for TV. It''s going to be a novel program: it is a show in which we hand out gifts to random strangers, and then film their response. It''s called "Happiness in Russia", we''re hoping it will catch on all over the world. We have chosen you to be part of our pilot, congratulations!"'
 		'She grabs hold of a large box the camera man handed to her. It''s beautifully wrapped, with a nice bow to boot. She whispers to you: "This box contains a brand new laptop! Just act surprised when you open it!"'
@@ -63,8 +73,20 @@ if kidaloa = 0:
 			gs 'stat'
 			kidaloa = 1
 			'<center><h4>Pavlovsk''s Market Square</h4></center>'
-			!!need new image
-			
+			if month >= 11 or month <= 3:
+				if hour >= 9 and hour <= 16:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+				end
+			else
+				if hour >= 7 and hour <= 18:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+				end
+			end
+
 			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
 			
 			act 'Return to the station' :minut += 15 & gt $curloc
@@ -74,8 +96,20 @@ if kidaloa = 0:
 			*clr & cla
 			gs 'stat'
 			'<center><h4>Pavlovsk''s Market Square</h4></center>'
-			!!need new image
-			
+			if month >= 11 or month <= 3:
+				if hour >= 9 and hour <= 16:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+				end
+			else
+				if hour >= 7 and hour <= 18:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+				end
+			end
+
 			'You happily take the box from the girl''s hands as the man starts filming. The girl holds the microphone closer to her mouth, and invites you to give some shout-outs to relatives and friends while you''re on TV. Then she points the microphone at you. You gladly accept the invitation and address your friends and family enthusiastically while looking at the camera, sincerely hoping you did not leave anyone out. Then the man turns the camera away for a second.'
 			'The girl tells you: "Unfortunately, the government doesn''t just let us give away items for nothing. We''re legally obligated to have our winners pay VAT over the amount of money their gift is worth. In your case, this comes down to 5000 <b>₽</b>."'
 
@@ -86,7 +120,20 @@ if kidaloa = 0:
 				if pcs_mood > 5: pcs_mood = 5
 				gs 'stat'
 				'<center><h4>Pavlovsk''s Market Square</h4></center>'
-			!!need new image
+				if month >= 11 or month <= 3:
+					if hour >= 9 and hour <= 16:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+					end
+				else
+					if hour >= 7 and hour <= 18:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+					end
+				end
+
 				'You quickly give them the money and enthusiastically begin to pull at the bow. When you finally manage to tear the wrapping paper off and open the box, you only find a brick wrapped in newspaper. You look up trying to find the man and girl to get your money back, but they are nowhere to be found. You feel terrible for being scammed out of your money, and angrily stuff the box in a garbage can before you move on.'
 				
 				act 'Return to the train station':minut += 15 & gt $curloc
@@ -95,8 +142,20 @@ if kidaloa = 0:
 				*clr & cla
 				gs 'stat'
 				'<center><h4>Pavlovsk''s Market Square</h4></center>'
-			!!need new image
-			
+				if month >= 11 or month <= 3:
+					if hour >= 9 and hour <= 16:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+					end
+				else
+					if hour >= 7 and hour <= 18:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+					end
+				end
+
 				'With some regret in your voice, you apologize to the man and girl and explain that you can''t afford to pay the VAT right now. They try to explain to you that this could very well be a one-time opportunity and that you are missing out on a free laptop, but you have to decline. You simply cannot afford to spend the money you have right now on a frivolous purchase like a laptop, even if it comes really cheap.'
 				'Sympathizing with you, they promise to look for you if they ever come back to Pavlovsk for another episode of the show.'
 				
@@ -106,7 +165,7 @@ if kidaloa = 0:
 		exit
 	end
 end
-				
+	
 if kidalob = 0:
 	podrand = rand(0, 5)	
 	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista') and monthKidalo ! month:
@@ -116,8 +175,19 @@ if kidalob = 0:
 		minut += 5
 		gs 'stat'
 		'<center><h4>Pavlovsk''s Market Square</h4></center>'
-			!!need new image
-			
+		if month >= 11 or month <= 3:
+			if hour >= 9 and hour <= 16:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_day.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_winter_night.jpg"></center>'
+			end
+		else
+			if hour >= 7 and hour <= 18:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_night.jpg"></center>'
+			end
+		end
 		'As you walk across the square towards the station, you notice two well dressed men staring at you. After some brief consideration they come towards you, and you can just about hear what they''re saying: "Wow, she''s just the model we need. She has this... Claudia Schiffer feel to her, don''t you agree?"'
 		'You can see the other man nod just as they get close to you, and one of the men stops you: "Excuse me, miss. We are opening a new fashion store in the city and are looking for a model to feature in our advertisements. We have been looking for just the right girl all day and... I think we just found her!"'
 		'The second man nods enthusiastically as the first man continues: "We would be able to offer you 10.000 <b>₽</b> for an extensive photo shoot, featuring our clothing line."'
@@ -199,14 +269,15 @@ end
 
 gs 'family'
 
-act 'Enter the station building': minut += 3 & gt 'pav_market_hall'
+act 'Go to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
+if Trainpass_day > daystart:
+	'You have <<Trainpass_day - daystart>> days left on your train pass.'
+	act 'Go direct to train station platforms': gt 'pav_train_hall', 'platform'
+end
 act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
-if Trainpass_day > daystart:
-	act 'Board train (0:15)':minut += 15 & gt 'pav_market_hall', 'platform'
-end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 

+ 0 - 3
locations/pav_residential.qsrc

@@ -149,9 +149,6 @@ act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 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 Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
 
 act 'Wait':gs 'obj_din', 'wait'

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'start':
 		'The last doors lead to the <a href="exec:gt ''pav_shared_apt'', ''pcsRoom''">room</a> you have rented.'
 		*nl
 		!! Wardrobe is here, because Sveta''s bedroom is actually the unused living room, with no wardrobe, so she is using the hall cupboard.
-		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''main''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
+		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
 		*nl
 		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
 		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'

+ 9 - 3
locations/pav_train_hall.qsrc

@@ -54,7 +54,13 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	act 'Leave the train station':minut += 3 & gt 'pav_market'
+	act 'Walk to Pav market (0:03)':minut += 3 & gt 'pav_market'
+	act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
+	act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
+	act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
+	act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
+	act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
+	act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
@@ -341,7 +347,7 @@ end
 
 if $ARGS[0] = 'centre':
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	menu_off = 1
 	minut += 40
 	if rand(1, 100) < 15: gt 'train', 'private'
@@ -353,7 +359,7 @@ if $ARGS[0] = 'centre':
 	'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
 		if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 

+ 26 - 4
locations/pav_train_market.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = 'start'
 	$loc = 'pav_train_market'
 	$menu_loc = 'pav_train_market'
@@ -50,7 +51,7 @@ if $ARGS[0] = 'start':
 			exit
 		end
 		
-		act 'Go back to the station': minut += 3 & gt 'pav_train'
+		act 'Go back to the market entrance': minut += 3 & gt 'pav_market'
 		act 'Wander through the market': gt 'pav_train_market','events'
 		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pav_train_market', 3
 		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pav_train_market', 4
@@ -224,7 +225,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
-		act 'Go back to the station': minut += 3 & gt 'pav_train'
+		act 'Leave the market': minut += 3 & gt 'pav_market'
 	end
 end
 
@@ -237,17 +238,38 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Clothes.</font></b></center>'
 	'Cheap clothing on the market stall.'
 
+	gs 'clothing_QV', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 5
 		gt 'pav_train_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 ''pav_train_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 ''pav_train_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':
@@ -258,7 +280,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'pav_train_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

+ 2 - 2
locations/police_station.qsrc

@@ -1534,7 +1534,7 @@ if $ARGS[0] = 'rape_report':
 						'With that, you conclude the interview and are led to the front door.'
 						'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you."'
 						'And then he walks away. Leaving you so very alone...'
-						act'Leave':gt'pav_train'
+						act'Leave':gt'pav_market'
 					end
 					act'Can I get a rape kit?':
 						minut += rand(2,5)
@@ -1553,7 +1553,7 @@ if $ARGS[0] = 'rape_report':
 							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
 							*nl
 							'Leaving you alone with your thoughts and memories of your rape...'
-							act'Leave':gt'pav_train'
+							act'Leave':gt'pav_market'
 						end
 					end
 				end

+ 46 - 0
locations/salon.qsrc

@@ -2,6 +2,7 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
+	if momloc = 15 and momloc[11] ! daystart: gt 'salon', 'mom'
 	$sexloc = $CURLOC
 	cla & *clr
 	$menu_loc = 'salon'
@@ -2244,5 +2245,50 @@ if $ARGS[0] = 'discharge':
 	act 'Leave':gt 'salon', 'start'
 end
 
+if $ARGS[0] = 'mom':
+	*clr & cla
+	menu_off = 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/salon.jpg"></center>'
+	'As you enter the salon you see you <<$npc_nickname[''A29'']>> waiting with your Aunt Luda. They haven''t seen you yet, they seem to just be chatting as they wait for their turn. The place seems to be fairly busy today.'
+	
+	act 'Ignore them and leave':gt 'torgcentr'
+	
+	act 'Go talk to them':
+		*clr & cla
+		minut += 5
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/momsalon.jpg"></center>'
+		'You walk over to your <<$npc_nickname[''A29'']>> and Luda. "Hi <<$npc_nickname[''A29'']>>, Luda. You guys getting your hair cut?"'
+		'Your <<$npc_nickname[''A29'']>> looks up at you and seems a little surprised to see you. "Yes and we are going to get a manicure as well, you should join us. I''ll pay."'
+		'Luda speaks up as well. "Yes dear you should join us." Just then your <<$npc_nickname[''A29'']>> name is called and she gets up and takes a seat to get her hair styled. A free manicure would be nice, but that also means having to spend time with them and listening to them talk about boring stuff.'
+		
+		act 'Tell her your busy':
+			*clr & cla
+			npc_rel['A29'] -= 1
+			minut += 5
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/salon.jpg"></center>'
+			'You shakes your head. "Sorry I can''t, I already have plans."'
+			'Your <<$npc_nickname[''A29'']>> sighs a little, obviously disappointed. "Well ok then, don''t stay out to late." You tell them bye and the say the same back to you, With that her and Luda go back to talking again as you leave.'
+			act 'Leave':gt 'torgcentr'
+		end
+		
+		act 'Agree':
+			*clr & cla
+			npc_rel['A29'] += 1
+			npc_rel['A30'] += 1
+			momloc[11] = daystart
+			minut += 20
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/momsvetsalon.jpg"></center>'
+			'You sit down next to Luda but only for a moment when her name is called and she gets up and gets her hair done. Next they are both taken to have a manicure done and you are called over to join them. The three of you sit near each other as you get manicures. Luda and your mom talk about a variety of topics, mostly gossip about what''s going on in Pavlovsk of the people they both know or stories about what happened at their work.'
+			'You chime in occasionally telling them about some stuff you have been up to of late. All and all it is a surprisingly fun time and you got a nice manicure out of it. Once you are finished, your <<$npc_nickname[''A29'']>> pays for both of you and Luda pays for herself. You all walk out together, Luda says. "Well I should get back and make dinner for me and Olu."'
+			'You <<$npc_nickname[''A29'']>> and Luda share a brief hug. "Same here, Vlad wouldn''t know what to do and would likely starve if I don''t get dinner started soon." The both laugh at that, Luda tells you bye as she walks off and your mothers starts for home as well, as she says to you. "Diner will be ready in about half a hour, you should come home and join us." You tell her you might and with that she walks off as well.'
+			act 'Leave':gt 'torgcentr'
+		end
+	end
+end
+
 --- salon ---------------------------------
 

+ 63 - 34
locations/scandalicious.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc = 'scandalicious'
 	$loc_arg = 'start'
     $location_type = 'public_indoors'
@@ -61,7 +62,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Scandalicious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -69,8 +70,10 @@ if $ARGS[0] = 'clothes':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_outfits_filter
+
 	i = 1
 
 		:loopscandalicious_outfits
@@ -78,15 +81,21 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'scandalicious_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 ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/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 ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 
 		if i <= 20:jump 'loopscandalicious_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 'loopscandalicious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_outfits':
@@ -97,7 +106,7 @@ if $ARGS[0] = 'scandalicious_outfits':
 		gt 'scandalicious', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_outfits',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_outfits',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -111,7 +120,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Scandalicious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -119,8 +128,10 @@ if $ARGS[0] = 'dresses':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_dress_filter
+
 	i = 1
 
 		:loopscandalicious_dress
@@ -128,14 +139,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'scandalicious_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 ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/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 ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 100:jump 'loopscandalicious_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 'loopscandalicious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_dress':
@@ -146,7 +163,7 @@ if $ARGS[0] = 'scandalicious_dress':
 		gt 'scandalicious', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_dress',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_dress',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':
@@ -178,7 +195,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -186,8 +203,10 @@ if $ARGS[0] = 'swim':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_swimsuit_filter
+
 	i = 1
 
 		:loopscandalicious_swimsuit
@@ -195,17 +214,21 @@ if $ARGS[0] = 'swim':
 				gs 'clothing_attributes', 'scandalicious_swimsuit', 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 ''scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg" 	height="250" /></a>'
-				end
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg" 	height="250" /></a>'
 			end
 			i += 1
 		if i <= 40:jump 'loopscandalicious_swimsuit'
-	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 'loopscandalicious_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
+		jump 'loopscandalicious_swimsuit_filter'
+	end
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -215,7 +238,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -223,8 +246,10 @@ if $ARGS[0] = 'bikinis':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_bikinis_filter
+
 	i = 1
 
 		:loopscandalicious_bikinis
@@ -232,17 +257,21 @@ if $ARGS[0] = 'bikinis':
 				gs 'clothing_attributes', 'scandalicious_bikinis', 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 ''scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg" 	height="250" /></a>'
-				end
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg" 	height="250" /></a>'
 			end
 			i += 1
 		if i <= 70:jump 'loopscandalicious_bikinis'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_bikinis_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
+		jump 'loopscandalicious_bikinis_filter'
+	end
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis',i, 1750, 'shop'
 
 --- scandalicious ---------------------------------
 

+ 4 - 4
locations/selfplay.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	if sisboytrio > 0 and sis_watch = 0 and $loc = 'bedrPar':
 		sis_watch = 1
-		if sisterHere > 0:sis_watch = 2 & 'Anya smiles and lets you carry on.'
+		if anyaloc['inroom'] = 1:sis_watch = 2 & 'Anya smiles and lets you carry on.'
 	end
 
 	!!then the calculation invasion
@@ -904,13 +904,13 @@ if $ARGS[0] = 'sis_prov':
 
 	$AnyaMsg = ''
 
-	if $loc = 'bedrPar' and (hour >= 7 or hour < 23):
+	if $loc = 'bedrPar':
 		gs 'family'
 
 		if sister_indorf = 0:
-			if sisterHere = 0 and proverkasisterhere = 0:proverkasisterhere = 1
+			if anyaloc['inroom'] = 0 and proverkasisterhere = 0:proverkasisterhere = 1
 
-			if sisterHere > 0:
+			if anyaloc['inroom'] = 1:
 				cls
 				if sisboytrio > 0 and sis_watch = 1:
 					sis_watch = 2

+ 2 - 2
locations/set_home.qsrc

@@ -25,11 +25,11 @@ elseif curr_home = 5:
 	$home_name = 'My mansion'
 	$home_town = 'city'
 	$home_location = 'city_mansion_entrance'
-	$home_entrance = 'city_mansion_residence'
+	$home_entrance = 'city_mansion_residence_1'
 elseif curr_home = 6:
 	$home_name = 'My hotel room in Pavlovsk'
 	$home_town = 'pavlovsk'
-	$home_location = 'pav_train'
+	$home_location = 'pav_market'
 	$home_entrance = 'HotelHole'
 elseif curr_home = 7:
 	$home_name = 'Nicholas'' Apartment'

+ 47 - 24
locations/sexshop.qsrc

@@ -3,6 +3,7 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	CLOSE ALL
 	$loc = 'sexshop'
 	$loc_arg = 'start'
@@ -646,12 +647,13 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Fetish dresses - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_dress_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -664,17 +666,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'eroto_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 ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/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 ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 120:jump 'looperoto_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 'looperoto_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_dress',i, 1000
+if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'eroto_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'outfits':
 	$loc_arg = 'outfits'
@@ -687,12 +695,13 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Fetish outfits - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_outfits_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -705,17 +714,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'eroto_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 ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/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 ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'looperoto_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 'looperoto_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_outfits',i, 1000
+if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'eroto_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'strip':
 	$loc_arg = 'strip'
@@ -728,12 +743,14 @@ if $ARGS[0] = 'strip':
 	'<center><b><font color="maroon">eroto_strip clothing - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_strip_filter
+
 		i = 1
 
 		:looperoto_strip
@@ -741,17 +758,23 @@ if $ARGS[0] = 'strip':
 				gs 'clothing_attributes', 'eroto_strip', 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 ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<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 ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'looperoto_strip'
-	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 'looperoto_strip_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_strip_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_strip',i, 1000
+if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'eroto_strip',i, 1000, 'shop'
 
 
 if $ARGS[0] = 'shoes':

+ 2 - 1
locations/shop.qsrc

@@ -41,10 +41,11 @@ if $shoplocation = 'main':
 	'<br>Most of the space in the supermarket is taken up by the <a href="exec:$shoplocation = ''grocery'' & gt ''shop'', ''move''">grocery department</a>, but the store has many smaller departments as well. <a href="exec:$shoplocation=''cosmetics'' & gt ''shop'', ''move''">Cosmetics</a>, <a href="exec:$shoplocation = ''hardware'' & gt ''shop'', ''move''">hardware</a>, <a href="exec:$shoplocation = ''clothing'' & gt ''shop'', ''move''">clothing</a> and the department of <a href="exec:$shoplocation = ''tech'' & gt ''shop'', ''move''">household appliances</a>. Not far from the entrance is a <a href="exec:$shoplocation = ''icecream'' & gt ''shop'', ''move''">counter selling ice cream</a>.'
 	gs 'stat'
 	gs 'themes', 'indoors'
+	gs 'family_schedule'
 	
 	!! The store in the town and in the altstart only
 	if $loc = 'pav_commercial' and StoryLine = 1:
-		if week < 6 and hour >= 8 and hour < 16:
+		if anyaloc = 7:
 			*nl
 			'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'
 		end

+ 49 - 20
locations/shop_allure.qsrc

@@ -1,6 +1,7 @@
 # shop_allure
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc = 'shop_allure'
 	$loc_arg = 'start'
     $location_type = 'public_indoors'
@@ -51,7 +52,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -59,26 +60,40 @@ if $ARGS[0] = 'swim':
 		gt 'shop_allure', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopallure_swimsuit_filter
+
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 3
+		else
+			i = 2
+		end
 
 		:loopallure_swimsuit
 			if allure_swimsuit[i] = 0:
 				gs 'clothing_attributes', 'allure_swimsuit', 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 ''shop_allure'', ''swim1''"><img src="images/pc/items/allure/one/<<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 ''shop_allure'', ''swim1''"><img src="images/pc/items/allure/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
-			i += 1
+			i += 3
 		if i <= 100:jump 'loopallure_swimsuit'
-	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 'loopallure_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopallure_swimsuit_filter'
+	end
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'allure_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -88,7 +103,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -96,26 +111,40 @@ if $ARGS[0] = 'bikinis':
 		gt 'shop_allure', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopallure_bikinis_filter
+
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 3
+		else
+			i = 2
+		end
 
 		:loopallure_bikinis
 			if allure_bikinis[i] = 0:
 				gs 'clothing_attributes', 'allure_bikinis', 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 ''shop_allure'', ''bikini1''"><img src="images/pc/items/allure/two/<<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 ''shop_allure'', ''bikini1''"><img src="images/pc/items/allure/two/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
-			i += 1
+			i += 3
 		if i <= 140:jump 'loopallure_bikinis'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopallure_bikinis_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopallure_bikinis_filter'
+	end
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'allure_bikinis',i, 1750, 'shop'
 
 --- shop_allure ---------------------------------
 

+ 33 - 16
locations/shop_coco_carmen.qsrc

@@ -1,6 +1,7 @@
 # shop_coco_carmen
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_coco_carmen'
     $location_type = 'public_indoors'
@@ -36,12 +37,14 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Coco Carmen dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +56,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'coco_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 ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/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 ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_dress':
@@ -71,7 +80,7 @@ if $ARGS[0] = 'coco_dress':
 		gt 'shop_coco_carmen', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -85,12 +94,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Coco Carmen outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +113,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'coco_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 ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/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 ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_outfits':
@@ -120,7 +137,7 @@ if $ARGS[0] = 'coco_outfits':
 		gt 'shop_coco_carmen', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_outfits',i, 3000, 'shop'
 
 end
 

+ 33 - 16
locations/shop_dolls.qsrc

@@ -4,6 +4,7 @@
 !!Viola Valerievna - A205 static_num
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = 'start'
 	$loc = 'shop_dolls'
 	$menu_arg = 'start'
@@ -75,7 +76,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -83,8 +84,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_dress_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -98,14 +101,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'dolls_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 ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/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 ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopdolls_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdolls_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_dress':
@@ -116,7 +125,7 @@ if $ARGS[0] = 'dolls_dress':
 		gt 'shop_dolls', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_dress',i, 3500, 'shop'
 
 end
 
@@ -131,7 +140,7 @@ if $ARGS[0] = 'clothing':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -139,8 +148,10 @@ if $ARGS[0] = 'clothing':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -152,14 +163,20 @@ if $ARGS[0] = 'clothing':
 				gs 'clothing_attributes', 'dolls_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 ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/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 ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopdolls'
-	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 'loopdolls_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_outfits':
@@ -170,7 +187,7 @@ if $ARGS[0] = 'dolls_outfits':
 		gt 'shop_dolls', 'clothing'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_outfits',i, 3500, 'shop'
 
 end
 

+ 17 - 8
locations/shop_fancy_pancy.qsrc

@@ -2,6 +2,7 @@
 !!2021/05/12
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_fancy_pancy'
     $location_type = 'public_indoors'
@@ -36,12 +37,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Fancy Pancy outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopfancy_burlesque_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +56,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'fancy_burlesque', 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 ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<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 ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopfancy_burlesque'
-	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 'loopfancy_burlesque_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfancy_burlesque_filter'
+	end
 end
 
 if $ARGS[0] = 'fancy_burlesque':
@@ -71,7 +80,7 @@ if $ARGS[0] = 'fancy_burlesque':
 		gt 'shop_fancy_pancy', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fancy_burlesque',i, 20000
+	gt 'clothing', 'view_clothing_item', 'fancy_burlesque',i, 20000, 'shop'
 
 end
 

+ 64 - 150
locations/shop_fashionista.qsrc

@@ -25,14 +25,6 @@ if $ARGS[0] = 'start':
 		view
 		gt 'torgcentr'
 	end
-	
-	act 'View dresses': minut += 5 & gt 'shop_fashionista', 'clothes'
-
-	act 'View outfits': minut += 5 & gt 'shop_fashionista', 'outfits'
-
-	act 'View panties': minut += 5 & gt 'shop_fashionista', 'panties'
-
-	act 'View bras': minut += 5 & gt 'shop_fashionista', 'bras'
 
 	act 'View purses': minut += 5 & gt 'shop_fashionista', 'purses'
 	
@@ -51,6 +43,8 @@ if $ARGS[0] = 'changingroom':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/changingroom.jpg"</center>'
 	'As you walk through the store you notice that there''s nobody in the changing rooms. Feeling a bit bored, you go look at some clothes and grab several items to try on before heading into one of the changing rooms.'
+	*nl
+	gs 'shortgs', 'clothing_state'
 	
 	if $clothingworntype = 'nude':
 		act 'Try on dresses': gt 'shop_fashionista', 'dressingclothes'
@@ -132,41 +126,64 @@ if $ARGS[0] = 'dressingclothes':
 	$loc_arg = 'dressingclothes'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = Clothingstock +1
-
-		if Clothingstock - 12 > 0:i -= 12
-		i += 1
-		i = i/2
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_filter
+
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopfashionista2
 			if fashionista[i] = 0:
 				gs 'clothing_attributes', 'fashionista', 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 ''shop_fashionista'', ''dressingshmotmag''"><img src="images/pc/items/fashionista/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 ''shop_fashionista'', ''dressingclothes2''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>  '
 				end
 			end
-			i += 12
+			i += 4
 		if i <= 200:jump 'loopfashionista2'
-	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 'loopfashionista_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_filter'
+	end
+end
+
+if $ARGS[0] = 'dressingclothes2':
+	cla
+	
+	if fashionista[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'shop_fashionista', 'clothes'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'fashionista',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingoutfits':
@@ -174,37 +191,45 @@ if $ARGS[0] = 'dressingoutfits':
 	$loc_arg = 'dressingoutfits'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_outfits_filter
 
-		:loopfashionistaoutfits
-			if fashionista[i] = 0:
-				gs 'clothing_attributes', 'fashionista', i
-				gs 'clothing_QV', 'shop_filter'
+	i = 1
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+	:loopfashionista_outfits
+		if fashionista[i] = 0:
+			gs 'clothing_attributes', 'fashionista', i
+			gs 'clothing_QV', 'shop_filter'
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
-				end
+			!!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 ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
 			end
-			i += 1
-		if i <= 20:jump 'loopfashionistaoutfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+		end
+		i += 1
+	if i <= 20:jump 'loopfashionista_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfashionista_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingoutfits2':
@@ -215,7 +240,7 @@ if $ARGS[0] = 'dressingoutfits2':
 		gt 'shop_fashionista', 'dressingclothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista_outifits',i, 8000
+	gt 'clothing', 'view_clothing_item', 'fashionista_outifits',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingbra':
@@ -288,121 +313,10 @@ if $ARGS[0] = 'dressingpanties2':
 		gt 'shop_fashionista', 'dressingpanties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',i, 750
-end
-
-
-!! Old code
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-	
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-	i += 1
-	i = i/2
-	
-	:loopfashionista
-		if fashionista[i] = 0:
-			gs 'clothing_attributes', 'fashionista', i
-			gs 'clothing_QV', 'shop_filter'
-				
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''shmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
-		end
-		i += 6
-	if i <= 200:jump 'loopfashionista'
-end
-
-if $ARGS[0] = 'shmotmag':
-	cla
-	
-	if fashionista[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
-end
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 79:jump 'loopfashionista_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if fashionista_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_fashionista', 'panties'
-	end
-
 	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 42:jump 'loopfashionista_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if fashionista_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
 end
 
+!!only items not in dressing room
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
 	$loc = 'shop_fashionista'

+ 33 - 16
locations/shop_flamingos.qsrc

@@ -1,6 +1,7 @@
 # shop_flamingos
 !2021/04/29
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_flamingos'
     $location_type = 'public_indoors'
@@ -36,12 +37,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Flamingo''s dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +56,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'flamingos_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 ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/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 ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 90:jump 'loopflamingos_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopflamingos_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_dress':
@@ -71,7 +80,7 @@ if $ARGS[0] = 'flamingos_dress':
 		gt 'shop_flamingos', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -85,12 +94,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Flamingo''s outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +113,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'flamingos_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 ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/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 ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopflamingos'
-	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 'loopflamingos_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_outfits':
@@ -120,7 +137,7 @@ if $ARGS[0] = 'flamingos_outfits':
 		gt 'shop_flamingos', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_outfits',i, 3000, 'shop'
 
 end
 

+ 17 - 8
locations/shop_materinstvo.qsrc

@@ -3,6 +3,7 @@
 if $shoplocation = 'items': gt 'shop_materinstvo', 'items'
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	*clr & cla
 	$loc = 'shop_materinstvo'
 	$loc_arg = 'start'
@@ -59,12 +60,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Mommy Style clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_materinstvo', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmaterinstvo_filter
+
 		i = 1
 
 		:loopmaterinstvo
@@ -72,17 +75,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'materinstvo_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 ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<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 ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 10:jump 'loopmaterinstvo'
-	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 'loopmaterinstvo_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmaterinstvo_filter'
+	end
 end
 
-if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'materinstvo_dress',i, 2000
+if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'materinstvo_dress',i, 2000, 'shop'
 
 --- shop_materinstvo ---------------------------------
 

+ 51 - 26
locations/shop_nerdvana.qsrc

@@ -1,6 +1,7 @@
 # shop_nerdvana
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_nerdvana'
     $location_type = 'public_indoors'
@@ -38,12 +39,14 @@ if $ARGS[0] = 'cosplay':
 	'<center><b><font color="maroon">Viewing Nerdvana Cosplay Outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_cosplay
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_cosplay_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -55,14 +58,20 @@ if $ARGS[0] = 'cosplay':
 				gs 'clothing_attributes', 'nerdvana_cosplay', 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 ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<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 ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_cosplay'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_cosplay'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_cosplay_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_cosplay_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_cosplay':
@@ -73,7 +82,7 @@ if $ARGS[0] = 'nerdvana_cosplay':
 		gt 'shop_nerdvana', 'cosplay'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_cosplay',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_cosplay',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -87,12 +96,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Nerdvana outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -104,14 +115,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'nerdvana_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 ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/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 ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_outfits':
@@ -122,7 +139,7 @@ if $ARGS[0] = 'nerdvana_outfits':
 		gt 'shop_nerdvana', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_outfits',i, 3000, 'shop'
 
 end
 
@@ -134,12 +151,14 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_swimsuit_filter
+
 	i = 1
 
 		:loopnerdvana_swimsuit
@@ -147,17 +166,23 @@ if $ARGS[0] = 'swim':
 				gs 'clothing_attributes', 'nerdvana_swimsuit', 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 ''shop_nerdvana'', ''swim1''"><img src="images/pc/items/nerdvana/swim/one/<<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 ''shop_nerdvana'', ''swim1''"><img src="images/pc/items/nerdvana/swim/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'loopnerdvana_swimsuit'
-	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 'loopnerdvana_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_swimsuit_filter'
+	end
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'nerdvana_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -167,7 +192,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
@@ -190,7 +215,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'
 
 
 --- shop_nerdvana ---------------------------------

+ 39 - 22
locations/shop_pussycats.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$sexloc = 'shop_pussycats'
 	gs 'themes', 'indoors'
 	$menu_loc = 'shop_pussycats'
@@ -424,7 +425,7 @@ if $ARGS[0] = '6':
 end
 
 if $ARGS[0] = '7':
-	cla & *clr
+	cla
 	'<b><center><font size="4"><font color="black">Break time</font></center></b>'
 	'No customers for the rest of your shift. You are chatting with Nastya. She normally talks about her sexual experiences and feelings.'
 	'Today she decides to tell you of how she lost her virginity. She leaves very little to the imagination as she regales you with how she was gangbanged in the locker room after gym class one day. Though some time has passed, she still vividly remembers every detail, including the name of every boy involved.'
@@ -433,7 +434,7 @@ if $ARGS[0] = '7':
 end
 
 if $ARGS[0] = '8':
-	*clr & cla
+	cla
 	'<b><center><font size="4">Katia</font></center></b>'
 
 	if katia = 1:
@@ -528,7 +529,7 @@ if $ARGS[0] = '11':
 	*clr & cla
 	i = rand(1, 200)
 	'<b><center><font size="4"><font color="black">Employee Perks</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/clothing/cats_outfits/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg"></center>'
 	'"<<$pcs_nickname>>, look here," Nastya approaches you. "I''ve got a nice, new blouse but it got a slight defect. The manager is just going to put it in the <b>70%</b> off discount bin, but maybe you want to take it yourself?"'
 	'The store is selling it for <b>2400 ₽</b>, but you can buy it for <b>720 ₽</b>.'
 	if cats_dress[i] = 1:
@@ -715,7 +716,7 @@ if $ARGS[0] = '13':
 end
 
 if $ARGS[0] = '14':
-	*clr & cla
+	cla
 	'<b><center><font size="4"><font color="black">I Always Feel Like Somebody''s Watching Me</font></center></b>'
 	'You go to the changing booths and collect clothes that another buyer left after fitting. You accidentally drop a mini-skirt and as you pick it up, you notice a very inconspicuous thing on the plinth. You immediately recognize it.'
 	'"Yes, it''s a hidden camera," the thought pierces you like an arrow. You can not think of a reason why you would find something like this in the store!'
@@ -860,7 +861,7 @@ if $ARGS[0] = '16':
 end
 
 if $ARGS[0] = '17':
-	cla & *clr
+	cla
 	'<b><center><font size="4"><font color="black">Those were the days</font></center></b>'
 	'You''ve just finished hanging up some cute blouses from the new collection, when an older lady comes up to you. She looks to be in her 70s and begins a long, dull monologue about herself, her work, modern fashion and the old days.'
 	'The grandmother starts complaining about modern society and its flaws: Deception, corruption, drugs, sex and everything in general. Then she remembers the good old times when the grass was greener and women married as virgins at the age of 18:'
@@ -894,7 +895,7 @@ if $ARGS[0] = '17':
 end
 
 if $ARGS[0] = '18':
-	cla & *clr
+	cla
 	kira = 1
 	'<b><center><font size="4"><font color="black">Parents just don''t understand</font></center></b>'
 	'Twenty minutes before the end of your shift, a lady approaches you with a glamorous looking girl beside her. The girl seems somewhat upset.'
@@ -1042,7 +1043,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Pussy Kats dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1050,8 +1051,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_dress_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1067,17 +1070,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'cats_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 ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/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 ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopcats_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcats_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'cats_dress',i, 3000
+if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'cats_dress',i, 3000, 'shop'
 
 if $ARGS[0] = 'clothes':
 	$loc_arg = 'clothes'
@@ -1087,7 +1096,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Pussy Kats outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1095,8 +1104,10 @@ if $ARGS[0] = 'clothes':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_outfits_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1112,17 +1123,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'cats_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 ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/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 ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 100:jump 'loopcats_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 'loopcats_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
+if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'cats_outfits',i, 3000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

+ 0 - 76
locations/shop_skuas.qsrc

@@ -1,76 +0,0 @@
-# shop_skuas
-
-if $ARGS[0] = 'start':
-	$loc_arg = $ARGS[0]
-	$loc = 'shop_skuas'
-    $location_type = 'public_indoors'
-	$menu_loc = 'shop_skuas'
-	$menu_arg = 'start'
-	menu_off = 0
-	*clr & cla
-	mag = 1
-	gs 'stat'
-	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Skuas</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/boutique/butik.jpg"></center>'
-	*nl
-	'This exclusive boutique stands out amongst the rest of Pushkin''s small shops mostly just selling crap to tourists. It shows reverence the each outfit, displaying them with no petty concerns like fitting in more stock or speeding up the selling process. It is beautiful and every outfit is a labour of love. It''s going to cost you plenty to shop here.'
-
-	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
-	
-	!!act 'View clothing': minut += 5 & gt 'shop_skuas', 'clothes'
-
-end
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_skuas'
-	$menu_loc = 'shop_skuas'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Skuas outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_skuas', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopskuas
-			if skuas[i] = 0:
-				gs 'clothing_attributes', 'skuas', 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 ''shop_skuas'', ''skuas''"><img src="images/pc/items/skuas/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 185:jump 'loopskuas'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'skuas':
-	cla
-	menu_off = 1
-	if skuas[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_skuas', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'skuas',i, 20000
-
-end
-
---- shop_skuas ---------------------------------
-

+ 33 - 16
locations/shop_tsar_bomba.qsrc

@@ -1,6 +1,7 @@
 # shop_tsar_bomba
 !!2021/04/15
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_tsar_bomba'
     $location_type = 'public_indoors'
@@ -41,12 +42,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Tsar Bomba dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dresses
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_dresses_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -58,14 +61,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'bomba_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 ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_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 ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 70:jump 'loopbomba_dresses'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbomba_dresses_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_dresses_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_dresses':
@@ -76,7 +85,7 @@ if $ARGS[0] = 'bomba_dresses':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_dress',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -90,12 +99,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Tsar Bomba outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -107,14 +118,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'bomba_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 ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_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 ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopbomba'
-	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 'loopbomba_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_outfits':
@@ -125,7 +142,7 @@ if $ARGS[0] = 'bomba_outfits':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_outfits',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'purses':

+ 22 - 0
locations/shortgs.qsrc

@@ -730,5 +730,27 @@ if $ARGS[0] = 'parse_string':
 	end
 end
 
+if $ARGS[0] = 'clothing_state':
+	if PCloswimwear = 1:
+		'You are wearing swimwear.'
+	elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
+		'You are wearing gym clothing and shoes.'
+	elseif $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
+		'You are naked.'
+	elseif $clothingworntype = 'nude' and $braworntype = 'none':
+		'You are just wearing panties.'
+	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
+		'You are just wearing a bra.'
+	elseif 'clothing_state' = 'nude':
+		'You are in your underwear.'
+	elseif $braworntype = 'none' and $pantyworntype = 'none':
+		'You are not wearing any underwear.'
+	elseif $pantyworntype = 'none':
+		'You are not wearing panties'
+	else
+		'You are not wearing a bra'
+	end
+end
+
 --- shortgs ---------------------------------
 

+ 1 - 1
locations/shulgahall.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 	*nl
 	'The hallway of Uncle Sergey''s one bedroom apartment is similar to every other apartment in the complex. There are several doors leading to the various rooms. The bedroom is Uncle Sergey''s. There''s also the kitchen, bathroom, and finally the livingroom, which Vasily uses for a bedroom.'
 	if home_owned[2] = 0:
-		'There are several <a href="exec:gt ''wardrobe'', ''main''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
+		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	else
 		'There are several closets in the hall</a> and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	end

+ 17 - 18
locations/sister_chat.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'checks':
 				gs 'stat'
 				narkossister = 0
 				*nl
-				'You tell yourself, "Come on <<$pcs_nickname>>, deep breath, focus. You can do this."'
+				'You tell yourself, '+$OpenInnerThought+'"Come on <<$pcs_nickname>>, deep breath, focus. You can do this."'+$CloseInnerThought
 				'You feel your head is clear enough to talk to your sister once more.'
 				act 'Chat': gt 'sister_chat', 'sister_chat'
 			end
@@ -138,7 +138,7 @@ $narkosisterspalila = {
 	gs 'stat'
 	!'sister slept on drugs.'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"Come on <<$pcs_firstname>>, keep it together! Act sober," you think to yourself. "I just have to talk normally and not think about it."'
+	+$OpenInnerThought+'"Come on <<$pcs_firstname>>, keep it together! Act sober,"'+$CloseInnerThought+' you think to yourself. '+$OpenInnerThought+'"I just have to talk normally and not think about it."'+$CloseInnerThought
 	'Your sister looks at you, her eyebrow raised. "Are you stoned <<$pcs_nickname>>?"'
 	act 'No':
 		cla
@@ -335,9 +335,7 @@ if $ARGS[0] = 'sister_chat':
 				sisterQW['party'] = 1
 				if sisterQW['rexbday'] = 0: sisterQW['rexbday'] = 1
 				*clr & cla
-				!! Sicaa: This image seems wrong, given that doing anything lesbian with your sister is no longer necessary for the party. Changing it to a different picture as a temporary measure
-				!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_03.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big33.jpg"></center>'
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun! We will meet at the community center this Friday. Don''t forget to be there before 18:00, otherwise we will leave without you."'
 				'With these words, your sister hugs you and kisses you on the cheek.'
@@ -489,7 +487,6 @@ if $ARGS[0] = 'sister_chat':
 		elseif npc_rel['A33'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
 			'You try to talk to your sister, but she refuses to talk to you.'
-	!!what is this sistersorry used for? can we get rid of it and just always have the say sorry as a option?
 			if sisterQW['lowrelboost'] ! daystart:
 				act 'Apologize':
 					*clr & cla
@@ -500,6 +497,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Move away': gt $loc, $loc_arg
 				end
 			end
+			act 'Move away': gt $loc, $loc_arg
 		elseif npc_rel['A33'] < 40:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
 			'You try to talk to your sister, but she just cuts you off bluntly.'
@@ -513,6 +511,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Move away': gt $loc, $loc_arg
 				end
 			end
+			act 'Move away': gt $loc, $loc_arg
 		!! If you have piercings in that your sister doesn''t know about:
 		elseif pirsA > 0 and pirsA < 10000 and sisterQW['pirsA'] = 0 and sisterpirsadaytalk ! daystart and $loc = 'bedrPar':
 			sisterpirsadaytalk = daystart
@@ -619,7 +618,7 @@ if $ARGS[0] = 'sister_chat':
 				if temp = 1:
 					'As you chat with your sister, she says it is possible to rent an apartment in the city and live and work there, but she is happy living in Pavlovsk. Even helping pay the bills, she has way more money to spend on herself this way.'	
 				elseif temp = 2:
-					'You chat with your sister. She tells you the tailor at the garment factory is a creep who makes his customers wait around in their underwear. At least the pretty girls that is.'
+					'You chat with your sister. She tells you the tailor at the garment factory is a creep who makes his customers wait around in their underwear. At least the pretty girls, that is.'
 				elseif temp = 3:
 					'You ask Anya about the University, and she grins. "I almost went, passed the entrance exam. However, I started working in the summer and got used to having cash. What can I buy with a diploma?"'
 				elseif temp = 4:
@@ -657,7 +656,7 @@ if $ARGS[0] = 'sister_chat':
 			if $loc ! 'kuhrPar' and npc_rel['A33'] >= 70:
 				act 'Talk about sex':
 					*clr & cla
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand (5,10)
 					gs 'stat'
 					temp = rand (1,8)
 					if temp = 1:
@@ -787,7 +786,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
-						if hour > 6 and hour < 23:
+						if hour > 6 and hour < 22:
 							'You crawl over her bed towards her to kiss her, but when she realizes what you are about to do, she pulls back from you. "What are you doing? Everyone is still up. What if someone walked in?" She shakes her head. "You really need to control yourself little sister." She makes it clear nothing is going to happen.'
 							act 'Move away': gt $loc, $loc_arg
 							act 'Keep talking': gt 'sister_chat', 'sister_chat'
@@ -796,7 +795,7 @@ if $ARGS[0] = 'sister_chat':
 							'You grin at her. "Come on, it will be fun."'
 							gs 'arousal', 'kiss', 3, 'incest', 'lesbian'
 							gs 'stat'
-							if rand(1,3) = 1:
+							if rand(1,5) < 3:
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_05.jpg"></center>'
 								'Anya says, "Again? You know I enjoy this, but I''m not a lesbian, and we should only do it... occasionally... okay?"'
@@ -841,7 +840,7 @@ if $ARGS[0] = 'sister_chat':
 						minut += 5
 						temp = rand(1,14)
 						gs 'stat'
-						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart:
+						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart and (week < 5 or week = 7):
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
 							if rand(0,3) = 1:
@@ -876,7 +875,7 @@ if $ARGS[0] = 'sister_chat':
 							else
 								'"The last time Roma was here was so good! Thank you very much."'
 								'"You''re welcome, I''m always very happy to help my sister and to see her happy."'
-								'"He would like to come here again tomorrow. Could you take another walk for about an hour?"'
+								'"He would like to come here again tomorrow. Could you take another walk for about an hour or two?"'
 								gs 'willpower', 'misc', 'resist', 'easy'
 								if will_cost <= pcs_willpwr:
 									act 'No (<<will_cost>> Willpower)':
@@ -908,7 +907,7 @@ if $ARGS[0] = 'sister_chat':
 									act 'Finish': gt 'sister_chat', 'sister_chat'
 								end
 							end
-						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0:
+						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0 and (week < 5 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
@@ -961,18 +960,18 @@ if $ARGS[0] = 'sister_chat':
 								'You hug and kiss your sister.'
 								act 'Finish': gt 'sister_chat', 'sister_chat'
 							end
-						elseif temp <= 3 and sisboyday ! daystart:
+						elseif temp <= 3 and sisboyday ! daystart and (week < 5 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							if sisterQW['romatime'] = 0:
 								sisterQW['romatime'] = 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_01.jpg"></center>'
-								'Anya takes a long and hesitant look at you and eventually asks you, "<<$pcs_nickname>>, could you spend an hour tomorrow after 18:00 going for a walk or something? Roma wants to visit me here and... well, you know what I mean."'
+								'Anya takes a long and hesitant look at you and eventually asks you, "<<$pcs_nickname>>, could you spend an hour or two tomorrow after 16:00 going for a walk or something? Roma wants to visit me here and... well, you know what I mean."'
 								'Your sister is blushing a little and looks at you with pleading eyes.'
 							else
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 								'"The last time Roma was here was so good! Thank you for giving us some space, <<$pcs_nickname>>."'
 								'"You''re welcome, I''m always very happy to help my sister and to see her happy."'
-								'"He would like to come here again tomorrow, could you take another walk for about an hour?"'
+								'"He would like to come here again tomorrow, could you take another walk for about an hour or two?"'
 							end
 							gs 'willpower', 'misc', 'resist', 'easy'
 							if will_cost <= pcs_willpwr:
@@ -1269,9 +1268,9 @@ if $ARGS[0] = 'bathroom_dildo_talk1':
 		'<center><h1><font color="maroon">Anya</font></h1></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
 		if anyaQW['bathroom_dildos'] = 1:
-			'"I found that that stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know it''s not mine and I don''t think Kolka''s into that kind of thing so I assumed it must be yours. Don''t leave that laying around! If mom found it, she''d have beat your ass!"'
+			'"I found that that stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know it''s not mine and I don''t think Kolka''s into that kind of thing, so I assume it must be yours. Don''t leave that laying around! If mom found it, she''d have beat your ass!"'
 		else
-			'"I found those stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know they''re not mine and I don''t think Kolka''s into that kind of thing so I assumed they must be yours. Don''t leave those around! If mom found them, she''d have beat your ass!"'
+			'"I found those stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know they''re not mine and I don''t think Kolka''s into that kind of thing, so I assume they must be yours. Don''t leave those around! If mom found them, she''d have beat your ass!"'
 		end
 		act'Continue':gt'bedrPar'
 	end

+ 1 - 2
locations/sitr.qsrc

@@ -82,7 +82,6 @@ elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
 	end
 end
 
-			
 if ml_online['account'] = 0 and internet > 0: 
 	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 end
@@ -126,7 +125,7 @@ if hour > 8 and hour < 22:
 	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 pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
 			elseif pcs_inhib < 20: 

+ 42 - 18
locations/sportShop.qsrc

@@ -2,6 +2,7 @@
 !2021/04/29
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
     $location_type = 'public_indoors'
 	cls
 	menu_off = 1
@@ -95,7 +96,7 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Sportswear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -103,8 +104,10 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopdanilovich_outfits_filter
+
 		if Clothingstock > 16:
 			i = 1
 		elseif Clothingstock > 8:
@@ -117,18 +120,24 @@ if $ARGS[0] = 'clo':
 			if danilovich_outfits[i] = 0:
 				gs 'clothing_attributes', 'danilovich_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 ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/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 ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopdanilovich_outfits'
-	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 'loopdanilovich_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdanilovich_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_outfits',i, 2000
+if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'danilovich_outfits',i, 2000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'
@@ -159,7 +168,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -167,27 +176,42 @@ if $ARGS[0] = 'swim':
 		gt 'sportshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopswim_filter
+
 	!!4 is in he supermarket, so skipped
-		i = 1
+
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
+
 
 		:loopswim
 			if danilovich_swimsuit[i] = 0:
 				gs 'clothing_attributes', 'danilovich_swimsuit', 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 ''sportshop'', ''swim1''"><img src="images/pc/items/danilovich/swimwear/<<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 ''sportshop'', ''swim1''"><img src="images/pc/items/danilovich/swimwear/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
-			i += 4
+			i += 3
+			if i = 4: i += 2
 		if i <= 30:jump 'loopswim'
-	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 'loopswim_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopswim_filter'
+	end
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'danilovich_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

+ 5 - 5
locations/stat.qsrc

@@ -307,9 +307,9 @@ if vgape[4] = 0: vgape[4] = 10
 
 if vgape > vgape[1]:
 	vgape[3] = totminut
-	vgape = vgape[1]
+	vgape[1] = vgape
 elseif vgape > 0:
-	if vgape - (totminut - vgape[3])/vgape[4]: vgape -= 1
+	if (totminut - vgape[3])/vgape[4] >= 1: vgape -= 1
 	vgape[1] = vgape
 else
 	vgape[3] = 0
@@ -319,9 +319,9 @@ end
 
 if agape > agape[1]:
 	agape[3] = totminut
-	agape = agape[1]
+	agape[1] = agape
 elseif agape > 0:
-	if agape - (totminut - agape[3])/agape[4]: agape -= 1
+	if (totminut - agape[3])/agape[4] >= 1: agape -= 1
 	if agape = 0: agape[3] = 0
 	agape[1] = agape
 else
@@ -438,7 +438,7 @@ if minut >= 60:
 
 	if SbrosNerdism = 1 and orgasm ! 10:
 		pcs_nerd = pcs_sprt / 10 - orgasm
-	else
+	elseif sbrosnerdism = 1 and orgasm = 10:
 		pcs_nerd = pcs_sprt / 9 - orgasm
 	end
 	if pcs_nerd < 0:pcs_nerd = 0

Some files were not shown because too many files changed in this diff