1
0

155 İşlemeler ef44ace940 ... 787cd9bd44

Yazar SHA1 Mesaj Tarih
  Thavus 787cd9bd44 fix issue in therapist where the pills are not set to zero correctly 2 yıl önce
  Kevin_Smarts b94c1c2bf9 Merge remote-tracking branch 'Thavus/master' 2 yıl önce
  Kevin_Smarts 1da6be3f9a [fixed] Sveta won't mention sex with Olu to 'Nush if she hasn't had any 2 yıl önce
  Kevin_Smarts d688400e01 [added] Purses added to Nerdvana 2 yıl önce
  rachels b664699449 fix the rest of the variables related to locations 2 yıl önce
  rachels ba5ccdfd12 first attempt to fix the location renaming (thanks sachana for reporting it) 2 yıl önce
  Anya a14bbd7e85 [fixed] missing image in random call 2 yıl önce
  Kevin_Smarts 2e28ad7a1b [fixed] Return button in Mon Chéri changing room went to main screen and not back to changing room 2 yıl önce
  Kevin_Smarts 99331b5e9d Merge remote-tracking branch 'Thavus/master' 2 yıl önce
  Kevin_Smarts 2a483dcfb6 [fixed] Starting swimwear for Cool and jock starts was using way too high numbers in sports shop from old list before they were split and teh sports wear the volleyball start had was too risqué. Also had repeating starting school uniforms in the clothing list. 2 yıl önce
  Kevin_Smarts a153ae644d [fixed] Missed something from version history list 2 yıl önce
  Kevin_Smarts 2d44280028 [updated] version number and version records ready for new release 2 yıl önce
  Kevin_Smarts f29ab8f1be Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts a7b6709351 [fixed] Value wasn't getting set correctly for string used for butt description in this file 2 yıl önce
  rachels a610421438 check your work with QSP_A! 2 yıl önce
  Kevin_Smarts 5d607c0afe [fixed] typo 2 yıl önce
  Kevin_Smarts 511dcd58c1 Merge branch 'master' of https://git.catrenelle.com/bgkjdgbizgblzdgbr/glife 2 yıl önce
  Kevin_Smarts 9d1a19e964 Merge remote-tracking branch 'Thavus/master' 2 yıl önce
  bgkjdgbizgblzdgbr 0fa3bbae02 [fixed/changed] Added reduction of KatjaQW['horny'] if you don't have sex after she kisses you, which will prenvent loops. 2 yıl önce
  Vengeance11 d7da2d72b4 Fixed some typos 2 yıl önce
  Kevin_Smarts b5fd290e31 [fixed] Tips from stripping which were meant to be more generous ended up far too generous. Toned it back down 2 yıl önce
  Kevin_Smarts 4de6efc6bc Merge branch 'master' of illit/glife into master 2 yıl önce
  rachels 26feee408a a few more changes in the picture links 2 yıl önce
  rachels 8c2956aae3 fix the image links for kendra male dom 2 yıl önce
  Kevin_Smarts 7919c9ad2b Merge remote-tracking branch 'NOX/master' 2 yıl önce
  N0X 8c5e668123 [fixed] wrong time flow during milking 2 yıl önce
  rachels 5164d9ed37 no more compatibility with the old Nicholas story 2 yıl önce
  rachels 7297d92ba7 Help with moded saves 2 yıl önce
  Anya 45ded556b0 [changed] made the apartment and house accessible at same time if both owned 2 yıl önce
  Kevin_Smarts b88718624d Merge remote-tracking branch 'rachels/master' 2 yıl önce
  Kevin_Smarts 3ac4e3c744 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 yıl önce
  Kevin_Smarts b9b47f4da3 [fixed] Internet time wasn't reverted after you left when using computer in library 2 yıl önce
  rachels 401e873e5b allow update also the mod data 2 yıl önce
  rachels e803b8bf19 fix typo 2 yıl önce
  illit 7becbb7165 [fixed] MyFreeCams money duplication glitch 2 yıl önce
  bgkjdgbizgblzdgbr 9683b2edb7 [fixed/added] The option to ask Ivan for help with Niko, had not made it over to the way school chats are done now. 2 yıl önce
  Kevin_Smarts bf5f7d0c02 [fixed] Use of old npcsex and incorrect value in comment 2 yıl önce
  Kevin_Smarts 3949a09ad6 [fixed] Operators not in standard order 2 yıl önce
  Kevin_Smarts f85c86f65a Merge remote-tracking branch 'Gwen/master' 2 yıl önce
  rachels 57314d9968 add missing routine (reported by IllNero) 2 yıl önce
  rachels 8402893af0 fix the typo reported by almostideal 2 yıl önce
  Kevin_Smarts 8ebd20a209 [fixed] Corrections from Gwen 2 yıl önce
  Gwen 41750eeda6 [Fixed] Better Values to Reflect Clothing Items 2 yıl önce
  Kevin_Smarts c936dd6187 [Fixed] A couple of errors in Flamingos outfits 2 yıl önce
  Kevin_Smarts 395c503f01 [fixed] Commented out link to dorm party as it shouldn't be accessable until it has rewrite 2 yıl önce
  bgkjdgbizgblzdgbr 79ff124a1d [fixed] When I fixed the condition such that event could actually fire I overlocked that the alternative event was behind an if and not an elseif, so you would get both at once. 2 yıl önce
  Kevin_Smarts 8fdd6744f9 [fixed] Added a goto to stop repeat of same check that was creating a weird error and used a substitute for some long variable names in the default wear section 2 yıl önce
  Vengeance11 2d9f741419 Finished proofreading uni files 2 yıl önce
  bgkjdgbizgblzdgbr 3dd384f26d [fixed/changed/added] Fixed it so that you can still meet you dat if you are a university student. Did by changing it to use curr:home and added meeting points for the homes that was missing. 2 yıl önce
  bgkjdgbizgblzdgbr 26aaf427cc [fixed] Wrong value for a check ment you could not use your strap-on on Katja. 2 yıl önce
  Kevin_Smarts 63e193faca [fixed] It's tea biscuits not tea + biscuits 2 yıl önce
  Kevin_Smarts 2be0f7b58e Merge branch 'master' of https://git.catrenelle.com/thavus/glife-fork 2 yıl önce
  Vengeance11 122acc3f68 Proofread uni files and cleaned up journal hints file 2 yıl önce
  rachels d48e0ed36c I cannot rely on variables 2 yıl önce
  rachels d2c8f7b533 fix typo 2 yıl önce
  rachels b519673d9f add missing apostrophes 2 yıl önce
  Kevin_Smarts cc3755d646 [fixed] Could be introduced to porn studio even if you already had access 2 yıl önce
  Kevin_Smarts d81f8a3d1f Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 yıl önce
  rachels 9a4a413d95 fix the wrong image variable (reported by HiddenFlame) 2 yıl önce
  bgkjdgbizgblzdgbr c1d5e770ad [cahnged] The calculation for weight increase so that you can actually eat as a normal person without gaining weight, as discussed on the discord. 2 yıl önce
  Kevin_Smarts 471550578d [fixed] Missing apostrophe 2 yıl önce
  Kevin_Smarts d50c283c37 [removed] Line with link to a file long since gone, to do a check long since forgotten with a note that made no sense. 2 yıl önce
  Kevin_Smarts 96d2772289 Merge branch 'master' of Nekoforce/glife into master 2 yıl önce
  Nekoforce 4217079543 Changed unreadable section in brothel.qsrc 2 yıl önce
  Kevin_Smarts 12b2b37785 Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Kevin_Smarts 519dc0e1a4 [changed] Mon Cheri now uses changing room for buying outfits and Rimma moved from there to Fashionista. She takes a picture for later but otherwise is not accessable. 2 yıl önce
  Anya 9f6c692a6c [changed] missing images to be ignored this release 2 yıl önce
  Anya 04c367eb7f [fixed] bad image calls 2 yıl önce
  Kevin_Smarts f1aa106246 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  rachels f1dce1d6c6 add proper location when use a shortcut (bug reported by Big Al) 2 yıl önce
  rachels 0203eda38a partly changed the output of the missing links 2 yıl önce
  hornguy6 54a68bd909 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  hornguy6 28a47cb329 [added] more detailed clothing descriptions based on bust size (forgot i was given the go ahead to push this) 2 yıl önce
  hornguy6 40aeece4ab [fixed] text 2 yıl önce
  Kevin_Smarts 8fa00f5bca [fixed] Goto pointing at wrong file 2 yıl önce
  rachels 77bbe1bf58 change the link to the py files 2 yıl önce
  rachels 09deb40b1d add missing picture files and list of "false" positives 2 yıl önce
  rachels c75b54a890 improve the code, remove duplicates and false positive 2 yıl önce
  Kevin_Smarts b535528e8f [fixed] Money from ditribute flyers was wrong 2 yıl önce
  Kevin_Smarts 9f52ab863d [fixed] Couple of missing gotos 2 yıl önce
  Kevin_Smarts c420369fe3 Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Anya 1c332f1255 [fixed] bad image calls 2 yıl önce
  bgkjdgbizgblzdgbr 25ab6d30e5 [changed/added] Revision of the katja dominant varibale quest for Katja in the journal. 2 yıl önce
  hornguy6 89e4b8c949 [removed] requirement to have skipped once to quit cheerleading (that makes no sense) 2 yıl önce
  hornguy6 3c0bc93932 [fixed] missing failsafes 2 yıl önce
  Nekoforce 0eeffa88d5 Added loc_arg = Inner so that rain won't fall in the hotel 2 yıl önce
  Kevin_Smarts 4864f7afd8 [fixed] Losing i value for index when trying to wear sports default clothing 2 yıl önce
  Kevin_Smarts 8d93c5cabd Merge remote-tracking branch 'Thavus/master' 2 yıl önce
  Kevin_Smarts 260710c882 Merge remote-tracking branch 'Anya/master' 2 yıl önce
  rachels 2e77c0324c fix some image links 2 yıl önce
  Anya bac14c6058 [fixed] bad image call 2 yıl önce
  Anya 01f8581809 [fixed] bad image calls 2 yıl önce
  Kevin_Smarts 50420cfd01 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts a5f0bf3a5e [added] Delete option for clothing view in wardrobe and default outfits without main clothing part can now be worn and not tell you that you've lost the main item over and over again 2 yıl önce
  rachels 21512e5e67 put empty slots at the end of the list 2 yıl önce
  Kevin_Smarts eabe081344 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts ed5c083ec0 [fixed] default outfits not using the correct remove code if failing the strength or ownership checks 2 yıl önce
  rachels 595b09f0e6 fix the doubled label causing mixing sport and normal set 2 yıl önce
  Kevin_Smarts 09a3b20520 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts 781757eb16 [Fixed] Getting phone number wasn't making them a lover 2 yıl önce
  rachels e1b0a2f325 fix image links - "/" instead "\" 2 yıl önce
  Kevin_Smarts a3ab7f346e [fixed] Added contingency for escape post hookup if regiion not found so npc_residence not set 2 yıl önce
  Kevin_Smarts 336c35094f [fixed] Default outfit list selected in school defaulted to sports section 2 yıl önce
  Kevin_Smarts 1fcb770afb Merge remote-tracking branch 'hornguy6/master' 2 yıl önce
  Kevin_Smarts d1c44f2abf Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Kevin_Smarts acfa923fff Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts cd09eee225 [fixed] Wrong floder name in address, spotted by rachels 2 yıl önce
  rachels a61492ad44 add missing brackets (thanks Cookie) 2 yıl önce
  hornguy6 eda2e135a4 [fixed] sending to the wrong location for some reason 2 yıl önce
  hornguy6 4809349c47 [text edits] grammar and formatting fixes 2 yıl önce
  Anya 02499b7f74 [fixed] bad image call 2 yıl önce
  hornguy6 afcb693f78 [fixed] a bunch of spaces that should have been tabs 2 yıl önce
  hornguy6 699ff39e34 [fixed] accidental double screens 2 yıl önce
  Kevin_Smarts b100dba636 [fixed] npc ID missing the A, spotted by darren1992 2 yıl önce
  Kevin_Smarts 1fa45ec532 Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Kevin_Smarts e6f3997b87 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 yıl önce
  Kevin_Smarts c15c96f194 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  Kevin_Smarts a268a7ec1e [fixed] PCloDress and PCloStyle3 were not set or removed when dressing/undressing 2 yıl önce
  rachels 4713f21db9 update the difference list 2 yıl önce
  Anya c67d08cead [fixed] typo 2 yıl önce
  rachels 781b776949 fix typo 2 yıl önce
  rachels 3db84629d7 fix typo 2 yıl önce
  rachels 276dc6aec5 fix typo 2 yıl önce
  bgkjdgbizgblzdgbr 9ededf4a3d [fixed] Lavrenti and Arkadi ar not identical twins, so we should use Lavrenti's picture and not Arkadi's when speaking whit Lavrenti. 2 yıl önce
  bgkjdgbizgblzdgbr 4f1fa2a617 [fixes] Some fixes to the new Katja varibles, one of the reported on the forum by pellizza. 2 yıl önce
  Kevin_Smarts c7c973df76 [fixed] Wrong variable tracking butt_slut experience 2 yıl önce
  rachels abee5d7dbe Merge https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  rachels be95ff2f25 help mods developers 2 yıl önce
  Kevin_Smarts 84f709a0ff [changed] Bit more fluids more really thirsty Sveta during family meals 2 yıl önce
  Kevin_Smarts b715023def Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Kevin_Smarts 1e1a8e0005 [fixed] G&M dress from mom not getting coded correctly 2 yıl önce
  Anya 9129492deb [fixed] no hyperlink to the new house 2 yıl önce
  Kevin_Smarts e599c88fa5 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 yıl önce
  bgkjdgbizgblzdgbr f7f01c24e2 [fixed] Wrong argument lead to wrong return link for studying for you uni classes. 2 yıl önce
  hornguy6 a57bef0b93 [fixed] dead end 2 yıl önce
  rachels 52202b1f7b Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git 2 yıl önce
  rachels 7a5fd50ba3 fix the lenght of the sleep and wrong loop label 2 yıl önce
  hornguy6 4e3018e40a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 yıl önce
  hornguy6 0a86ebeab6 [updating] booty_call WIP stuff 2 yıl önce
  Nekoforce 23cd4fe823 Spellcheck uni_library.qsrc 2 yıl önce
  Kevin_Smarts 294c889fd1 [fixed] Anal exp could degrade below 0 and the trait acreen didn't give the info it should when working on lvl 1, also couldn't increase exp by more than 1 per day 2 yıl önce
  Kevin_Smarts e8ac2bb6d8 [fixed] Default sets should go to last one used and not back to sports each time 2 yıl önce
  Kevin_Smarts ae793ce5be [fixed] Can't have viginity checks if not a virgin 2 yıl önce
  Kevin_Smarts 70b9ae7b05 Merge remote-tracking branch 'Anya/master' 2 yıl önce
  Anya 9524e449b8 [fixed] forgot to change the daystage to 3 2 yıl önce
  Anya 26fb7244d9 [Changed] nutlucks Kendra additions 2 yıl önce
  Anya 05a36df543 [changed] City Lake revamp 2 yıl önce
  Kevin_Smarts 301ee609c2 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 yıl önce
  Kevin_Smarts bcdd55b77d Merge branch 'master' of Ensus/glife into master 2 yıl önce
  Ensus c30f0cd5cd Removing falsely added end 2 yıl önce
  bgkjdgbizgblzdgbr 194f13c1a7 [fixed/added] Fixed the second semester so it will work and added exams for it. 2 yıl önce
  Ensus 13c9e642d9 Fixed two missing ' 2 yıl önce
  Ensus 657f61cf5b Final Spellcheck for brothl.qsrc and adding two new lines 2 yıl önce
  Ensus b99a1ba85b Spellcheck for brothel.qsrc and adding pregnancy warning to vaginal creampies 2 yıl önce
  Ensus d2c524cdba Fix Spelling up to Line 552 2 yıl önce
100 değiştirilmiş dosya ile 3659 ekleme ve 2751 silme
  1. 175 0
      LinksToSkip.txt
  2. 335 0
      changes from 0_8_4 to 0_8_5.txt
  3. 2 2
      checkpics.bat
  4. 1 0
      glife.qproj
  5. 9 0
      isample_mod/locations/mod_isample_saveupdater.qsrc
  6. 4 2
      locations/Cheatmenu_din.qsrc
  7. 1 1
      locations/FedorMisc.qsrc
  8. 91 40
      locations/KatjaHomeTalk.qsrc
  9. 4 1
      locations/Komp.qsrc
  10. 1 1
      locations/LariskaHome.qsrc
  11. 1 1
      locations/NikoEv2.qsrc
  12. 6 5
      locations/NikoMeyHome.qsrc
  13. 1 1
      locations/NikoWhore.qsrc
  14. 4 4
      locations/_attributes_flamingos_outfits.qsrc
  15. 1 1
      locations/_attributes_gm_outfits.qsrc
  16. 42 33
      locations/albina_chat.qsrc
  17. 16 4
      locations/albina_house_events.qsrc
  18. 1 1
      locations/albina_school_sex.qsrc
  19. 19 8
      locations/albina_starlets.qsrc
  20. 1 1
      locations/albinahome.qsrc
  21. 36 36
      locations/andrey.qsrc
  22. 67 7
      locations/anushkachat.qsrc
  23. 2 1
      locations/bedrPar.qsrc
  24. 1 1
      locations/body_shape.qsrc
  25. 73 20
      locations/booty_call_after.qsrc
  26. 297 1451
      locations/booty_call_morning.qsrc
  27. 79 31
      locations/booty_call_sex.qsrc
  28. 161 151
      locations/brothel.qsrc
  29. 4 4
      locations/cikl.qsrc
  30. 0 6
      locations/city_center.qsrc
  31. 307 113
      locations/city_lake.qsrc
  32. 15 0
      locations/city_mansion_entrance.qsrc
  33. 9 6
      locations/city_residential.qsrc
  34. 21 4
      locations/clothing.qsrc
  35. 1 1
      locations/clothing_QV.qsrc
  36. 67 6
      locations/clothing_descriptions.qsrc
  37. 15 0
      locations/dachi.qsrc
  38. 1 1
      locations/dimaRevenge.qsrc
  39. 2 0
      locations/food.qsrc
  40. 1 1
      locations/foto.qsrc
  41. 4 2
      locations/gadhouse.qsrc
  42. 14 0
      locations/gadukino.qsrc
  43. 58 24
      locations/gossips.qsrc
  44. 2 2
      locations/gschool_chats.qsrc
  45. 8 1
      locations/gschool_chats1.qsrc
  46. 3 4
      locations/gschool_cheerleading.qsrc
  47. 1 1
      locations/gschool_detention.qsrc
  48. 4 4
      locations/gschool_events.qsrc
  49. 1 1
      locations/gschool_gossip.qsrc
  50. 1 1
      locations/gschool_grounds.qsrc
  51. 3 3
      locations/gschool_lessons.qsrc
  52. 6 5
      locations/gschool_lessons4.qsrc
  53. 2 2
      locations/gschool_lunch.qsrc
  54. 66 66
      locations/gschool_post_shower.qsrc
  55. 6 6
      locations/gschool_sex.qsrc
  56. 2 2
      locations/hookup.qsrc
  57. 21 1
      locations/hookup_after.qsrc
  58. 8 3
      locations/hookup_morning.qsrc
  59. 10 10
      locations/hotel_anna_gear.qsrc
  60. 1 1
      locations/journal.qsrc
  61. 118 60
      locations/journal_quests.qsrc
  62. 61 50
      locations/katjaEv.qsrc
  63. 10 76
      locations/katjaEvDin.qsrc
  64. 773 58
      locations/kendra.qsrc
  65. 2 10
      locations/kit_din.qsrc
  66. 0 2
      locations/lact_lib.qsrc
  67. 13 4
      locations/liames.qsrc
  68. 0 2
      locations/loadg.qsrc
  69. 0 3
      locations/mey_vika_events.qsrc
  70. 4 4
      locations/mirror.qsrc
  71. 61 179
      locations/moncheri.qsrc
  72. 3 3
      locations/mother.qsrc
  73. 0 76
      locations/nichUtil.qsrc
  74. 4 4
      locations/nyp_school.qsrc
  75. 9 0
      locations/obj_din.qsrc
  76. 1 1
      locations/pav_church.qsrc
  77. 2 2
      locations/pav_disco_gopniks.qsrc
  78. 3 3
      locations/pav_discoev1.qsrc
  79. 15 0
      locations/pav_market.qsrc
  80. 1 1
      locations/pav_park.qsrc
  81. 2 2
      locations/pav_residential.qsrc
  82. 1 1
      locations/pavlov_home.qsrc
  83. 1 1
      locations/praiders_garage.qsrc
  84. 11 11
      locations/preCUST.qsrc
  85. 2 2
      locations/preSYS.qsrc
  86. 10 0
      locations/purses.qsrc
  87. 2 2
      locations/saveg.qsrc
  88. 38 0
      locations/saveupdater.qsrc
  89. 203 27
      locations/shop_fashionista.qsrc
  90. 23 0
      locations/shop_nerdvana.qsrc
  91. 4 7
      locations/sleep.qsrc
  92. 1 1
      locations/start.qsrc
  93. 22 6
      locations/stat_display.qsrc
  94. 4 4
      locations/stol.qsrc
  95. 17 8
      locations/street_event.qsrc
  96. 3 3
      locations/stwork.qsrc
  97. 1 1
      locations/telefon.qsrc
  98. 43 1
      locations/therapist.qsrc
  99. 2 2
      locations/traits.qsrc
  100. 94 49
      locations/uni_admin.qsrc

+ 175 - 0
LinksToSkip.txt

@@ -0,0 +1,175 @@
+images" folder of the game with a file of the same name and format JPEG (.jpg
+images/characters/city/vika/'+iif(ARGS[1]=0,5,3)+'.jpg
+images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility1.jpg
+images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility2.jpg
+images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility3.jpg
+images/characters/pavlovsk/school/boy/fedor/fedormisc/park/vkwip.jpg
+images/characters/pavlovsk/school/boy/fedor/fedormisc/school/lockerroom/lr.jpg
+images/characters/pavlovsk/school/boy/fedor/school/lockerroom/lr.jpg
+images/characters/pavlovsk/school/boy/niko/nikoev2/.jpg
+images/characters/pavlovsk/school/boy/niko/nikoev2/school/restroom/1.jpg
+images/characters/pavlovsk/school/boy/niko/yurikev/bike2.jpg
+images/characters/pavlovsk/school/boy/niko/yurikev/kiss.mp4
+images/characters/pavlovsk/school/girl/albina/albinahome.jpg
+images/characters/pavlovsk/school/girl/albina/albinahome1.jpg
+images/characters/pavlovsk/school/girl/albina/wine_talk.jpg
+images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg
+images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya3.jpg
+images/characters/pavlovsk/school/girl/vicky/event/party'+zz_stage+'.jpg
+images/characters/pavlovsk/school/girl/vicky/event/reputation'+zz_stage+'.jpg
+images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.jpg
+images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.mp4
+images/characters/shared/headshots_generic/'+lover_picrand+'.jpg
+images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg
+images/locations/city/redlight/studio_porn/blonde_2.jpg
+images/locations/city/redlight/studio_porn/blonde_3.jpg
+images/locations/city/redlight/studio_porn/blonde_4.jpg
+images/locations/city/redlight/studio_porn/blonde_5.jpg
+images/locations/city/redlight/studio_porn/blonde_6.jpg
+images/locations/city/redlight/studio_porn/blonde_7.jpg
+images/locations/city/redlight/studio_porn/blonde_8.jpg
+images/locations/city/redlight/studio_porn/blonde_9.jpg
+images/locations/city/redlight/studio_porn/brown_2.jpg
+images/locations/city/redlight/studio_porn/brown_3.jpg
+images/locations/city/redlight/studio_porn/brown_4.jpg
+images/locations/city/redlight/studio_porn/brown_5.jpg
+images/locations/city/redlight/studio_porn/brown_6.jpg
+images/locations/city/redlight/studio_porn/brown_7.jpg
+images/locations/city/redlight/studio_porn/brown_8.jpg
+images/locations/city/redlight/studio_porn/brown_9.jpg
+images/locations/city/redlight/studio_porn/brunette_2.jpg
+images/locations/city/redlight/studio_porn/brunette_3.jpg
+images/locations/city/redlight/studio_porn/brunette_4.jpg
+images/locations/city/redlight/studio_porn/brunette_5.jpg
+images/locations/city/redlight/studio_porn/brunette_6.jpg
+images/locations/city/redlight/studio_porn/brunette_7.jpg
+images/locations/city/redlight/studio_porn/brunette_8.jpg
+images/locations/city/redlight/studio_porn/brunette_9.jpg
+images/locations/city/redlight/studio_porn/redhead_2.jpg
+images/locations/city/redlight/studio_porn/redhead_3.jpg
+images/locations/city/redlight/studio_porn/redhead_4.jpg
+images/locations/city/redlight/studio_porn/redhead_5.jpg
+images/locations/city/redlight/studio_porn/redhead_6.jpg
+images/locations/city/redlight/studio_porn/redhead_7.jpg
+images/locations/city/redlight/studio_porn/redhead_8.jpg
+images/locations/city/redlight/studio_porn/redhead_9.jpg
+images/locations/city/residential/apartment/stairs/elevator_ob1.jpg
+images/locations/city/residential/apartment/stairs/elevator_ob2.jpg
+images/locations/city/residential/apartment/stairs/pod_ob1.jpg
+images/locations/city/residential/apartment/stairs/pod_ob2.jpg
+images/locations/city/residential/lake/volleyballnite2.jpg
+images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg
+images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_out_day.jpg
+images/locations/gadukino/hunters/'+iif(PCloSkirt > 0,'backwaterundress_ski.jpg
+images/locations/gadukino/hunters/goswamp_nude0.'+swamprand+'.jpg
+images/locations/gadukino/hunters/shooting_strip.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_1.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_2.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_3.5.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_3.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_4.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_1.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_2.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_tit_expose_3.jpg
+images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_tit_expose_4.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuh1.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhanal0.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhcum0.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhdance0.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup0.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup1.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoral0.'+mitkapicrand+'.jpg
+images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoralcum0.'+mitkapicrand+'.jpg
+images/locations/pavlovsk/pharmacy/apteka_worker_'+pav_pharma_picrand+'.jpg
+images/locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat00.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat01.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat02.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat10.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat11.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat12.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat130.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat20.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat21.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat22.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat30.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat31.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat32.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat40.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat41.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat42.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat50.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat51.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat52.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat60.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat61.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat62.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat70.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat71.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat72.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat80.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat81.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat82.jpg
+images/locations/pavlovsk/resident/apartment/aptrolan/done.jpg
+images/locations/pavlovsk/resident/apartment/natbelapt/touch_belly'+iif(npc_pregtalk['A16'] = 1,'_preg','')+'.jpg
+images/locations/pavlovsk/resident/meynolds/sex/vika_beach11.jpg
+images/locations/pavlovsk/resident/meynolds/tamara_tea' + zz_stage + '.jpg
+images/pc/activities/flashing/dress/inside/bra/' + rand(1,dress_ind_bra) + '.jpg
+images/pc/activities/flashing/dress/inside/butt/' + rand(1,dress_ind_butt) + '.jpg
+images/pc/activities/flashing/dress/inside/full/' + rand(1,dress_ind_full) + '.jpg
+images/pc/activities/flashing/dress/inside/full/hairy' + rand(1,dress_ind_full_hairy) + '.jpg
+images/pc/activities/flashing/dress/inside/panty/' + rand(1,dress_ind_panties) + '.jpg
+images/pc/activities/flashing/dress/inside/pantyrear/' + rand(1,dress_ind_pantyrear) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/' + rand(1,dress_ind_pussy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/' + rand(1,pants_ind_pussy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/hairy' + rand(1,dress_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/hairy' + rand(1,pants_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/inside/tits/' + rand(1,dress_ind_tits) + '.jpg
+images/pc/activities/flashing/dress/outside/bra/' + rand(1,dress_out_bra) + '.jpg
+images/pc/activities/flashing/dress/outside/butt_plug/' + rand(1,dress_out_butt_plug) + '.jpg
+images/pc/activities/flashing/dress/outside/butt/' + rand(1,dress_out_butt) + '.jpg
+images/pc/activities/flashing/dress/outside/full/' + rand(1,dress_out_full) + '.jpg
+images/pc/activities/flashing/dress/outside/full/hairy' + rand(1,dress_out_full_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/panty/' + rand(1,dress_out_panties) + '.jpg
+images/pc/activities/flashing/dress/outside/pantyrear/' + rand(1,dress_out_pantyrear) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/' + rand(1,dress_out_pussy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/' + rand(1,pants_out_pussy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/hairy' + rand(1,dress_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/hairy' + rand(1,pants_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/tits/' + rand(1,dress_out_tits) + '.jpg
+images/pc/activities/flashing/pants/inside/bra/' + rand(1,pants_ind_bra) + '.jpg
+images/pc/activities/flashing/pants/inside/butt/' + rand(1,pants_ind_butt) + '.jpg
+images/pc/activities/flashing/pants/inside/full/' + rand(1,pants_ind_full) + '.jpg
+images/pc/activities/flashing/pants/inside/full/hairy' + rand(1,pants_ind_full_hairy) + '.jpg
+images/pc/activities/flashing/pants/inside/panty/' + rand(1,pants_ind_panties) + '.jpg
+images/pc/activities/flashing/pants/inside/pantyrear/' + rand(1,pants_ind_pantyrear) + '.jpg
+images/pc/activities/flashing/pants/inside/pussy/' + rand(1,pants_ind_pussy) + '.jpg
+images/pc/activities/flashing/pants/inside/pussy/hairy' + rand(1,pants_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/pants/inside/tits/' + rand(1,pants_ind_tits) + '.jpg
+images/pc/activities/flashing/pants/outside/bra/' + rand(1,pants_out_bra) + '.jpg
+images/pc/activities/flashing/pants/outside/butt_plug/' + rand(1,pants_out_butt_plug) + '.jpg
+images/pc/activities/flashing/pants/outside/butt/' + rand(1,pants_out_butt) + '.jpg
+images/pc/activities/flashing/pants/outside/full/' + rand(1,pants_out_full) + '.jpg
+images/pc/activities/flashing/pants/outside/full/hairy' + rand(1,pants_out_full_hairy) + '.jpg
+images/pc/activities/flashing/pants/outside/panty/' + rand(1,pants_out_panties) + '.jpg
+images/pc/activities/flashing/pants/outside/pantyrear/' + rand(1,pants_out_pantyrear) + '.jpg
+images/pc/activities/flashing/pants/outside/pussy/' + rand(1,pants_out_pussy) + '.jpg
+images/pc/activities/flashing/pants/outside/pussy/hairy' + rand(1,pants_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/pants/outside/tits/' + rand(1,pants_out_tits) + '.jpg
+images/pc/body/nerd.jpg
+images/pc/body/shape/ and name it anything you want (shorter will be easier to remember). Then put in it any images you want named 1.jpg
+images/pc/items/accessories/books/kamasutra/ik' + kamasutra_page + '.jpg
+images/pc/pnx.jpg
+images/qwest/alter/boiler/boilerroom1.jpg
+images/qwest/alter/boiler/boilerroom2.jpg
+images/qwest/alter/boiler/boilerroom3.jpg
+images/shared/misc/signature.jpg
+images/system/icons/status/hair_'+pcs_hairbsh+'.png
+images/system/icons/status/makeup_'+pcs_makeup+'.png
+images/locations/pavlovsk/resident/pavlovhome/hallway.jpg
+images/locations/pavlovsk/resident/pavlovhome/bedroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/kitchen.jpg
+images/locations/pavlovsk/resident/pavlovhome/livingroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/bathroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/spareroom.jpg
+images/characters/pavlovsk/resident/Anna/sessionpracticend/gameicons/0.jpg

+ 335 - 0
changes from 0_8_4 to 0_8_5.txt

@@ -0,0 +1,335 @@
+Locations:
+
+=== added locations ===
+
+$attributes_fashionista_outfits
+
+albina_starlets				<- AlbStars
+albina_starlets_aftermath	<- albinaRide
+
+city_house_res_misc
+city_house_res_bedr
+city_house_res_bathr
+city_house_res_kitch
+
+city_church
+gad_church
+pav_church					<- ParChurch
+pav_church2					<- ParChurch2
+
+city_mansion_entrance		<- youplace
+city_mansion_residence_1	<- ybass, yban, ymans, ybedr, yvan, ykuh, yzal, ykamin, ydet, ybib, ysport, ykabinet
+city_mansion_residence_2	<- ybass, yban, ymans, ybedr, yvan, ykuh, yzal, ykamin, ydet, ybib, ysport, ykabinet
+city_mansion_residence_3	<- ybass, yban, ymans, ybedr, yvan, ykuh, yzal, ykamin, ydet, ybib, ysport, ykabinet
+
+city_redlight				<- gt 'city_industrial', 'redlight' -> gt 'city_redlight', 'start'
+
+gossips
+
+gschool_post_shower			<- splited from gschool_lessons4
+
+hookup_talk
+
+hotel_work					<- HotelWork
+
+
+pav_library_nerdstudy
+
+pav_market					<- pav_train
+
+pavlov_home
+
+piercing_management			<- moved from din_van
+
+therapist_reminder
+
+uni_admin					<- univer
+uni_dorm					<- dorm
+uni_exams1
+uni_exams2
+uni_grounds
+uni_lessons
+uni_lessons1
+uni_lessons2
+uni_lessonsev1
+uni_library
+uni_programs
+uni_shop
+
+gosha						<- dormev1
+kendra						<- dormev1
+vikaev1						<- univer_din
+
+=== deleted locations ===
+
+albinaRide					-> albina_starlets_aftermath
+AlbStars					-> AlbStars
+
+dorm						-> uni_dorm
+dormev1						-> gosha, kendra
+
+HotelWork					-> hotel_work
+
+ParChurch					-> pav_church
+ParChurch2					-> pav_church2
+
+pav_train					-> pav_market
+
+seeparentsex				-> replaced with gt 'bedrPar2', 'peek'
+
+shop_skuas
+
+univer						-> uni_admin
+univer_din					-> vikaev1
+
+yban						\  
+ybass						 \
+ybedr						  \
+ybib						   \
+ydet							\
+ykabinet						 \
+ykamin							 -> city_mansion_residence_1-3
+ykuh							 /
+ymans							/
+youplace					   /
+ysport						  /
+yvan						 /
+yzal						/
+
+
+Variables:
+
+=== Deleted variables ===
+
+[Numeric variables]
+alarm_now
+alarm_set
+alarm_time
+analorgasm -> orgasm_anal
+cloth_vid
+clothingfilter_bimbo
+clothingfilter_comf
+clothingfilter_daring
+clothingfilter_norm
+clothingfilter_norm2
+clothingfilter_pandb
+clothingfilter_prost
+clothingfilter_risk
+clothingfilter_too_daring
+encrand
+exhibition_exp		-> inhib_exp
+figurelover
+hookup_rape_chance
+hypnosexing
+chris_dico_talk
+
+flag_start_parc		-> katjaQW['school_kiss']
+katja_debug
+katja_disco_end 	-> katjaQW['no_panties_at_disco']
+katja_disco_Foto 	-> katjaQW['disco_Foto']
+Katja_tanga 		-> katjaQW['pantiesQWstage']
+Katja_tanga_end 	-> katjaQW['pantiesQWstage'] = 5
+KatjaAnus 			-> npc_ass['A14']
+KatjaBJ
+katjaDeystRand
+KatjaGang
+KatjaGuy
+KatjaHorny			-> katjaQW['horny']
+KatjaKiss 			-> katjaQW['QWstage'] = 3
+KatjaOTN  			-> katjaQW['QWstage'] = 3
+KatjaKnowAnal 		-> katjaQW['knows_anal']
+KatjaKnowBJ 		-> katjaQW['knows_BJ']
+KatjaKnowKuni 		-> katjaQW['knows_cuni']
+KatjaKnowMastr 		-> katjaQW['knows_masterbation']
+KatjaKnowPirsA 		-> katjaQW['know_Pirced_tongue']
+KatjaKnowSex 		-> katjaQW['knows_sex']
+katjaLernQW
+katjaLernTimes
+KatjaLust
+katjalustrand
+KatjaMastr 			-> katjaQW['masturbates']
+katjaMeynoldday 	-> katjaQW['afterschool_hangout_day']
+KatjaOhrenet 		-> katjaQW['sex_in_the_park_comment']
+KatjaOrgasm 		-> katjaQW['orgasm_day']
+KatjaSex			-> katjaQW['park_sex']
+KatjaSlut 			-> katjaQW['slut']
+KatjaThroat 		-> npc_throat['A14']
+katschoolsex 		-> katja['school_sex']
+meynoldQW 			-> katjaQW['QWstage'], meynoldQW = 3 ->  katjaQW['drunk_help'] = 1
+SelfFistingKnow 	-> katjaQW['knows_self_fisting']
+tangaday 			-> katjaQW['no_panties_day']
+
+katrand
+lariskaHelp -> LariskaQW['LariskaHelp']
+last_vid
+loopcount
+loQuality
+momvladroom
+p_lust
+param
+payrand
+pcs_scstng
+plcooked
+posudomashina
+prepclassstats
+quick_dress
+sisterHere
+swimwear
+swimwear_b
+swimwear_h
+temp_anal
+temp_count
+temp_time
+twister_rand
+zanrand
+
+[String variables]
+
+$din_zajava_albfather
+$din_zajava_albfather_no
+$din_zajava_albfather_no2
+$gardmess
+$parBedroomCloseDoor
+$parBedroomTitle
+$pir_title
+$pirBrow    \
+$pirEars     \
+$pirLip       \
+$pirNavel      \ piercing_management
+$pirNips       /
+$pirNose      /
+$pirPubic    /
+$pirTongue  /
+
+
+
+´=== Added variables ===
+
+[Numeric variables]
+albina
+AlbVsNiko
+AlexandriaMissionQW
+annaclean1
+buttslut_exp
+citysexreduction
+citysextreshold
+class_count
+clo_i
+clothing_default_page
+complx_rand
+cosmetic_tattoo
+danilovich_swimsuit_h
+def_exp
+dress_out_butt_plug
+
+fashionista_outfits
+fashionista_outfits_b
+fashionista_outfits_h
+fashionista_outfits_s
+foundGuy
+gaveIntoSlavaPleasure
+gaveSlavaVirginity
+gopnew
+
+dreamedOfTherapistFucking
+haveHypnoDream
+hypnoAskFuck
+hypnoBra
+hypnoFlashGreet
+hypnoHardToCum
+hypnoCheckPanties
+hypnoKissGoodbye
+hypnoMoney
+hypnoOldGuyProst
+hypnoOutcast
+hypnoPanty
+hypnoProstFatMan
+hypnoProstIsGuy
+hypnoProstNotGuy
+hypnoProstRubles
+hypnoRandomCounter
+hypnoSchedule
+hypnoStage
+hypnoStripped
+hypnoTimesResistedStage
+hypnoTouchWhenever
+numHypnoProst
+numTimesHypnoed
+therapistFuckedAss
+therapistFuckedMouth
+therapistFuckedPussy
+therapistFuckedPussyStage
+therapistWantsSlave
+thingsTheTherapistLikes
+
+imgset0ovr
+
+jab_exp
+kick_exp
+punch_exp
+
+katjaQW <--- Katja event 
+
+kendra_male_slave
+kendra_theater
+locM_arg
+loopmarket_outfits
+masturbate
+mcnt
+nerdstudynight
+no_study
+npc_ass
+npc_throat
+NushVsNiko
+orgasm_anal
+orgasm_clit
+orgasm_masturbate
+pants_out_butt_plug
+passed_count
+PCloDress
+randomFlashGreetResponse
+randSuck
+remindedtherapyday
+reminderCount
+reminderFreebee
+reminderMoodCostHigh
+reminderMoodCostLow
+reminderMult
+scandalicious_bikinis_h
+slyQW
+study_mod
+sveta_dyke_rumor
+temp_glory_fuck
+tractatus
+uglyduck_flag
+uni_event_hour
+uni_period
+university
+varsleep
+villagesexreduction
+villagesextreshold
+
+[String variables]
+
+$clothing_default_page
+$default_clothing_line
+$default_entry
+$default_sports_line
+$hypnoKitchenDirtiness
+$hypnoTxt0
+$hypnoTxt1
+$hypnoTxt2
+$hypnoTxt3
+$numHypnoProst
+$pcs_vag_image
+$position
+$stat_uni_icon_msg
+$stat_uni_msg
+$stat_uni_tooltip
+$stat_volleyball_msg
+$therapistDoneCumDesc1
+$therapistDoneFuckingDesc0
+$therapistDoneFuckingDesc1
+$therapistDoneFuckingDesc3
+$university
+$ward_list_file

+ 2 - 2
checkpics.bat

@@ -11,12 +11,12 @@ echo python is not installed or python's path Path is not in the %%$path%% env.
 exit/b
 
 :2
-python tools/check_images2.py > missing_pictures.txt
+python ./tools/check_images2.py > missing_pictures.txt
 
 exit/b
 
 :3
-python tools/check_images3.py > missing_pictures.txt
+python ./tools/check_images3.py > missing_pictures.txt
 
 exit/b
 

+ 1 - 0
glife.qproj

@@ -988,6 +988,7 @@
 		<Location name="uni_lessons2"/>
 		<Location name="uni_lessonsev1"/>
 		<Location name="uni_exams1"/>
+		<Location name="uni_exams2"/>
 		<Location name="uni_library"/>
 		<Location name="unicoursework"/>
 		<Location name="uniutil"/>

+ 9 - 0
isample_mod/locations/mod_isample_saveupdater.qsrc

@@ -0,0 +1,9 @@
+# mod_isample_saveupdater
+!! This file is for updating save game when one variable have been replaced by another.
+!! The code in this location will be processed by the main game saveupdater routine as a subroutine
+!! First will be processed the code in the main routine and then all the installed mods in the order of their installation
+
+
+--- mod_isample_saveupdater ---------------------------------
+
+

+ 4 - 2
locations/Cheatmenu_din.qsrc

@@ -2981,12 +2981,14 @@ $cheatmenu['about'] = {
 	*clr & cla
 	gs 'obj_din', 'settingtabs'
 	gs 'stat'
+	gs 'saveg'
+	gs 'addbuilddate'
 	'<center><h1>About Window</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top">'
 	'<tr><td><h3><center>Girl Life version <<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>></center></h3></td></tr>'
 	'<tr><td><h3><center>built on <<$builddate>></center></h3></td></tr>'
-	$tmp = STRFIND($version, '"(.+)"', 1)
-	'<tr><td cellspacing="0" cellpadding="20" valign="top"><h3><center>for</center></h3><h4><center><<$tmp>></center><h4></td></tr>'
+	'<tr><td><h5><center>if loaded so it was the save from</center></h5></td></tr>'
+	'<tr><td cellspacing="0" cellpadding="20" valign="top"><center><<$version>></center></td></tr>'
 	'</table></center>'
 	killvar '$tmp'
 }

+ 1 - 1
locations/FedorMisc.qsrc

@@ -1059,7 +1059,7 @@ if $ARGS[0] = 'Dimka Party 2':
 	gs 'stat'
 	'<center><b><h4><font color="maroon"><<"Dimka Nosov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-	'You push Dimka away from you while shouting "hey! Beat it! Are you crazy or something?" but he doesn''t let go and begins dragging you into the next room when you both hear "Take your hands off her!" You both turn to the corner of the room to see Fedor in the shadows. Dimka laughs as he says, "Well look who it is... the cocksucker Masha. If you want to suck my dick then you better get lost because I have <$pcs_firstname>> for that." after 2 seconds of silence Fedor charges Dimka and begins punching him repeatedly.'
+	'You push Dimka away from you while shouting "hey! Beat it! Are you crazy or something?" but he doesn''t let go and begins dragging you into the next room when you both hear "Take your hands off her!" You both turn to the corner of the room to see Fedor in the shadows. Dimka laughs as he says, "Well look who it is... the cocksucker Masha. If you want to suck my dick then you better get lost because I have <<$pcs_firstname>> for that." after 2 seconds of silence Fedor charges Dimka and begins punching him repeatedly.'
 	*nl
 	'You rush over to Fedor to pull him away and he looks back at you and asks "Are you alright? He didn''t hurt you, did he?" You give him a warm smile as you reply, "It''s alright. I''m fine. We should get going." you and Fedor then leave the house together.'
 	*nl

+ 91 - 40
locations/KatjaHomeTalk.qsrc

@@ -10,9 +10,13 @@
 !! katjaQW['pantiesQWstage'] The stages of the side quest of getting Katja to go comando to school. 1 to 3 are just temprary counts,
 !!									4 means you have gotten Katja to take of her panties when you ask her, and 5 means that she wont wear panties to school anymore.
 !!									So if you waht to chack if Katja are not wearing pantios at school use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
+
+!! katjaQW['school_kiss'] Increases the first two times you kiss as school, used to trigger the kissing competition in the park. (flag_start_parc)
 									
 !! katjaQW['slut'] a number that increasese as Katja becomes more and more sexualy liberated, and alows her to be villing to do more sexual stuff. (katjaSlut)
 !! katjaQW['horny'] a messure of Katja''s arousal. Grows until she have an orgasmn and will determine how willing she is at the moment to have sex.
+!! katjaQW['dom'] a number that tell if Katja is dominant or submissiv. 0 is neutal, a negative means she is submessive and a possitive that she is dominant. In general the absulut valu nee to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
+
 !!	katjaQW['park_sex'] 	a messure of what experience Katja have had with random guys in the park. 0 means she have not have had sex whit anybody in the park, 
 !!								1 means that she have had sex with one guy at a time (either alone, in a threesome with the player character or in while the the player have sex with another guy next to them)
 !!								2 means she have had a threesome whit 2 guys you met in the park, and 3 means she has paticipated in an orgy with guys from the park. (katjaSex)
@@ -23,6 +27,11 @@
 !! npc_vag['A14'] The capacity for Katja to take a dick (or dildo) in the vagina.
 !! npc_ass['A14'] The capacity for Katja to take a dick (or dildo) in her ass. (KatjaAnus)
 
+!! katjaQW['strapon_bj'] = 1 Katja have given a bj to your strap-on.
+!! katjaQW['strapon_vag'] = 1 You have fucked Katja''s pussy with youe strap-on.
+!! katjaQW['strapon_ass'] = 1 You have fucked Katja''s ass with youe strap-on.
+
+!! katjaQW['ivan_pussy'] = 1 Katja have take Ivan''s cock in her pussy.
 !! katjaQW['ivan_anal'] = 1 Katja have take Ivan''s cock in her ass.
 
 !! KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all palces). (KatjaOrgasm)
@@ -81,7 +90,6 @@ if $ARGS[0] = '':
 					if frost > 0:frost = 0
 
 					gs 'stat'
-					! WD: Correct Image path ~ "images/dush.jpg"
 					'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 					'You kick Katja out of the bathroom and close the door. You get into the shower and begin to lather your body with a cloth.'
 					'After washing off the soap you wash your hair with shampoo. Once you rinse the shampoo off, you are completely clean.'
@@ -248,6 +256,26 @@ if $ARGS[0] = '':
 				act 'Continue':gt 'KatjaHomeTalk'
 			end
 
+			if katjaQW['boy_lie'] = 1:
+				act 'Ask Katja who the boy she likes is':
+					cla & *clr
+					katjaQW['horny'] += 1
+					minut += 15
+					gs 'stat'
+					'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You ask Katja who the Boy she mentions being interested earlier is.' 
+					if katjaQW['slut'] >= 60 and npc_sex['A14'] > 0 and katjaQW['horny'] > 40:
+						'"Nobody you dummy. It was just an excuse so that you would kiss me" she answers laughing at you.'
+						katjaQW['boy_lie'] = 2
+						act 'continue': gt 'KatjaHomeTalk', 'hornykiss'
+					else
+						'"That is my secret, and I am not going to tell you" she says with a wink in her eye.'
+						act 'Continue':gt 'KatjaHomeTalk'
+					end
+				end
+			end
+
 			if npc_sex['A14'] > 0 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
 				act 'Look for boys in the park':
 					minut += 15
@@ -259,7 +287,7 @@ if $ARGS[0] = '':
 					place = 1
 					Frend_num = 14
 					p_slut = katjaQW['slut']
-					p_dom = KatjaDom
+					p_dom = KatjaQW['dom'] + 50
 					p_horny = katjaQW['horny']
 					p_alko = 0
 					gt 'placer'
@@ -322,7 +350,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if katja_dom_sex = 1 and katjaQW['horny'] >= 70:
+			if katjaQW['slut'] >= 50 and katjaQW['horny'] >= 80:
 				act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 			end
 
@@ -641,7 +669,7 @@ if $ARGS[0] = 'shower_kiss_home':
 			cla & *clr
 			minut += 5
 			pcs_horny += 10
-			KatjaDom -= 1
+			KatjaQW['dom'] -= 1
 			katjaQW['horny'] -= 10
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
@@ -760,7 +788,7 @@ if $ARGS[0] = 'Sextalk':
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You tell Katja about the times you have had gone down on another girl and how it feels. Katja blushes and bites her lip.'
 				
-				if katjaQW['horny'] > 50 and katjaQW['slut'] >= 20:
+				if katjaQW['horny'] > 50 and katjaQW['slut'] >= 40 and rand(-30,30) < katjaQW['dom']:
 					'Katja asks you to show her how you lick pussy.'
 
 					act 'Show her':
@@ -769,8 +797,7 @@ if $ARGS[0] = 'Sextalk':
 						pcs_horny += 20
 						katjaQW['horny'] = 0
 						katjaQW['slut'] += 1
-						KatjaDom += 2
-						katja_dom_sex = 1
+						katjaQW['dom'] += 2
 						if npc_sex['A14'] = 0: npc_sex['A14'] = 1 & girl += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
@@ -861,7 +888,6 @@ if $ARGS[0] = 'Sextalk':
 
 	act 'Refuse to talk about such topics':
 		cls
-		KatjaDom -= 1
 		gs 'stat'
 		'You refuse to talk about such topics with her. Katja looks down, confused, and  mummbles "Sorry, <<$pcs_nickname>>, I didn''t mean to pry."'
 
@@ -891,12 +917,12 @@ if $ARGS[0] = 'hornykiss':
 !!				if pcs_dom > 0:
 					act 'Seize Katja''s face':
 						cla & *clr
-						KatjaDom -= 5
+						KatjaQW['dom'] -= 2
 						katjaQW['horny'] -= 10
 						gs 'stat'
 						'You wrapped your hands around her face and bring you lips to Katja''s.'
 
-						!!if pcs_dom < KatjaDom:
+						!!if pcs_dom < KatjaQW['dom']:
 							!!'Katja firmly takes your hands and removes them from her face, allowing you to understand, that she does not intend to kiss you.'
 
 							!!act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
@@ -916,6 +942,7 @@ end
 if $ARGS[0] = 'tender_kiss':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'Katja thinks about something, then embarrassed and blushing asks you "<<$pcs_nickname>>, have you kissed a boy?"'
+	katjaQW['boy_lie'] = 1
 
 	act 'Yes':
 		*clr & cla
@@ -925,24 +952,36 @@ if $ARGS[0] = 'tender_kiss':
 
 		act 'Kiss': gt 'katjaEv', 'kiss'
 
-		gs 'willpower', 'kiss', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'No (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You refuse to kiss Katja and she gets mad at you.'
+		act 'Say no':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'You tell Katja no and she look at you with her big eyes "Please <<$pcs_nickname>>, you don''t want me to be bad at kissing do you?"'
+		
+			act 'Relent and kiss Katja': 
+				katjaQW['dom'] += 2 
+				gt 'katjaEv', 'kiss'
+			end
+			
+			gs 'willpower', 'kiss', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Stand firm (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You refuse to kiss Katja and she gets mad at you.'
 
-				act 'Talk about something else': gt 'KatjaHomeTalk'
-				if mey_vika['key'] = 1:
-					Act 'Leave the room': gt 'mey_home', 'start'
-				else
-					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+					act 'Talk about something else': gt 'KatjaHomeTalk'
+					if mey_vika['key'] = 1:
+						Act 'Leave the room': gt 'mey_home', 'start'
+					else
+						act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+					end
 				end
+			else
+				act 'Stand firm (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 
@@ -953,24 +992,36 @@ if $ARGS[0] = 'tender_kiss':
 		'You shake your head and say that you have never kissed a boy. Katja, even more shyly, "You see <<$pcs_nickname>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Maybe we could try kissing and learn that way?"'
 		act 'Kiss': gt 'katjaEv', 'kiss'
 
-		gs 'willpower', 'kiss', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'No (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You refuse to kiss Katja and she gets mad at you.'
+		act 'Say no':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'You tell Katja no and she look at you with her big eyes "Please <<$pcs_nickname>>, I will help os both so we are better when we finally are kissing a boy?"'
+		
+			act 'Relent and kiss Katja': 
+				katjaQW['dom'] += 2 
+				gt 'katjaEv', 'kiss'
+			end
 
-				act 'Talk about something else': gt 'KatjaHomeTalk'
-				if mey_vika['key'] = 1:
-					Act 'Leave the room': gt 'mey_home', 'start'
-				else
-					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+			gs 'willpower', 'kiss', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Stand firm (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You refuse to kiss Katja and she gets mad at you.'
+
+					act 'Talk about something else': gt 'KatjaHomeTalk'
+					if mey_vika['key'] = 1:
+						Act 'Leave the room': gt 'mey_home', 'start'
+					else
+						act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+					end
 				end
+			else
+				act 'Stand firm (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end

+ 4 - 1
locations/Komp.qsrc

@@ -635,6 +635,7 @@ if $ARGS[0] = 'startpagemfc':
 		'While you sit in your chair, you can''t help but wince every time you move. You want to put up a show, but it hurts too much. And besides... you doubt your viewers would want to see you in your current state! You should heal up a bit before trying again.'
 		act 'Collect your earnings and leave':
 			karta += tokens * 2
+			tokens = 0
 			gt 'komp','mfc'
 		end
 	else
@@ -645,6 +646,7 @@ if $ARGS[0] = 'startpagemfc':
 		act 'Turn on your webcam':gt 'komp','waitclients'
 		act 'Collect your earnings and leave':
 			karta += tokens * 2
+			tokens = 0
 			gt 'komp','mfc'
 		end
 	end
@@ -1736,6 +1738,7 @@ if $ARGS[0] = 'waitclients':
 		topmfc = 1
 		backmfc = 1
 		karta += tokens * 2
+		tokens = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
 		'Suddenly you hear the handle of your door creak, and an annoyed voice shouting: "<<$pcs_nickname>>, what the hell!? Why is the door locked? Let me in!"'
@@ -1837,7 +1840,7 @@ if $ARGS[0] = 'hotornot':
 end
 
 if $ARGS[0] = 'fin': 
-	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain' or $loc = 'albinahome': 
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain' or $loc = 'albinahome' or $loc = 'pav_library': 
 		internet = internet_store
 		killvar 'internet_store'
 	end

+ 1 - 1
locations/LariskaHome.qsrc

@@ -330,7 +330,7 @@ end
 if $ARGS[0] = 'bathroom_join_1':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchlar.jpg"></center>'
 	if lariskalove >= 6:
 		'You take a minute to watch Lariska. She still hasn''t seen you yet, so you could leave without her knowing you were even there.'
 		'Where would the fun be in that though.'

+ 1 - 1
locations/NikoEv2.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'Park':
 				act 'Drop to your knees':	
 					*clr & cla
 					gs'stat'
-					'<center><video autoplay loop src="images/characters\pavlovsk\school\boy\fedor\fedorev2\home\3way/foreplay2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/3way/foreplay2.mp4"></video></center>'
 					'You drop down to your knees in front of them. One of the men shoves his cock into your mouth as the other pulls out then begins stroking his. You close your eyes and pretend that you are sucking Niko''s dick. Enjoying the warmth of it on your tongue, the occasional throbs as it leaks pre-cum into your mouth. The other man begins pulling at your hair which tells you that he wants his dick sucked too, you obediently switch dicks and begin sucking the second man vigorously. After a few seconds, one of the men begins groaning as he fills your mouth with his cum which you quickly spit out, not knowing if this guy has any STD''s or not.' 
 
 					act 'Continue':	

+ 6 - 5
locations/NikoMeyHome.qsrc

@@ -870,17 +870,18 @@ if $ARGS[0] = 'Bathroom':
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 	'A luxurious bathroom that looks like the five-star hotel bathrooms you read about in magazines.'
-	if VKAftermathEvent = 0 and KatjaDom ! 0 and VKKatjaChat = 1 or VKAftermathEvent = 0 and NataliaPavlovaQW >= 10 and VKNatChat = 1:
-		if KatjaDom > 0 and KatjaDom <= 50 or KatjaDom > 50 or NataliaPavlovaQW >= 10:'Above the beautiful vanity and sink is a huge mirror. You can feel a hand on your shoulder.'
+	if VKAftermathEvent = 0 and VKKatjaChat = 1 and ((katjaQW['dom'] > 30 and npc_sex['A14'] > 0) or  NataliaPavlovaQW >= 10):
+		'Above the beautiful vanity and sink is a huge mirror. You can feel a hand on your shoulder.'
 	else
 		'Above the beautiful vanity and sink is a huge <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	end
-	if VKAftermathEvent = 0 and KatjaDom > 50 and VKKatjaChat = 1:
+	if VKAftermathEvent = 0 and KatjaQW['dom'] > 30 and npc_sex['A14'] > 0 and VKKatjaChat = 1:
 		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Kat Bath'
 	elseif VKAftermathEvent = 0 and NataliaPavlovaQW >= 20 and VKNatChat = 1:
 		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Natalia Bath'
-	elseif VKAftermathEvent = 0 and KatjaDom > 0 and KatjaDom <= 50 and VKKatjaChat = 1 and VKWip = 100:
-		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Katja Bath'
+!!	This used to have the variable that what replaced by katjQW['dom'] in the conditions so this should be acounted when this event is added back in. Remember to also to look at the conditions of the text before this section of if and elseif.
+!!	elseif VKAftermathEvent = 0 and VKKatjaChat = 1 and VKWip = 100:
+!!		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Katja Bath'
 	elseif VKAftermathEvent = 0:
 		act 'Take a bath': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Bath'
 	elseif VKAftermathEvent = 1:

+ 1 - 1
locations/NikoWhore.qsrc

@@ -715,7 +715,7 @@ if $ARGS[0] = 'Locker Room 2':
 											act 'Open your mouth':
 												*clr & cla
 												gs'stat'					
-												'<center><video autoplay loop src="images\shared\sex\cum\mouth\cum1,3.mp4"></video></center>'
+												'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,3.mp4"></video></center>'
 												'You obediently open your mouth and Valentin grabs your head and holds it to his dick before jerking off. He shoots his load onto your tongue; the taste is horrible, but you know that you have no choice. After Valentin finishes, he gently brushes your cheek. "That''s how you do it <<$pcs_nickname>>." He then zips up his pants and walks out of the locker room, leaving you on the floor.'
 												gs 'cum_call', 'mouth_swallow', 'A158', 1
 												gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'

+ 4 - 4
locations/_attributes_flamingos_outfits.qsrc

@@ -1,5 +1,5 @@
 # $attributes_flamingos_outfits
-!2021/11/14
+!2021/12/09
 !prince range from 2 to 5, avoid adding too many 2s and 5s
 
 if ARGS[1] = 1:
@@ -50,7 +50,7 @@ elseif ARGS[1] = 7:
 	
 elseif ARGS[1] = 8:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1	
 	
@@ -375,7 +375,7 @@ elseif ARGS[1] = 57:
 	
 elseif ARGS[1] = 58:
 	CloQuality = 3
-	CloThinness = 6
+	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	
@@ -1046,7 +1046,7 @@ elseif ARGS[1] = 159:
 	CloBimbo = 1
 	CloStyle = 4
 	
-elseif ARGS[1] = 10:
+elseif ARGS[1] = 160:
 	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1

+ 1 - 1
locations/_attributes_gm_outfits.qsrc

@@ -1206,7 +1206,7 @@ elseif ARGS[1] = 184:
 	CloPantsShortness = 5
 	
 elseif ARGS[1] = 185:
-	CCloQuality = 2
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5

+ 42 - 33
locations/albina_chat.qsrc

@@ -18,8 +18,9 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Have you seen the new maid, Milena, yet? She''s a little older but just as, if not more, attractive than the last one, but my father isn''t here to charm her into sucking his dick. Not that it would work anyway. She bats for the other team, if you know what I mean..." she says with a wink. "Mama says I shouldn''t disturb her when she''s doing her work, but we like chatting with each other about pretty much everything. That''s when I found out about her girlfriend."'
-			'You laugh. "Disappointed that you can''t get in her panties?"'
-			'She gives you a hard stare in response. "She has to hide the fact that she''s openly lesbian or she''d get fired by her asshole boss. He''s not quite... accepting and I wouldn''t risk her job like that." She then smiles softly. "Mama would no doubt find out anyway, but she would understand and not say anything. She''d be more pissed at me for fucking the maid and preventing her from doing her job. Mama likes a clean house after all." You both laugh before she changes the subject.'
+			'You laugh. "Disappointed that you can''t get in her pants?"'
+			'She gives you a hard stare in response. "She has to hide the fact that she''s openly lesbian or she''d get fired by her asshole boss. He''s not quite... accepting and I wouldn''t risk her job like that." She smiles softly. "Mama would no doubt find out anyway, but she would understand and not say anything. She''d be more pissed at me for fucking the maid and preventing her from doing her job. Mama likes a clean house after all."'
+			'You both laugh before she changes the subject.'
 			AlbinaQW['Maid'] = 0
 			act 'Stop talking': gt 'albinahome', 'bedroom'
 			act 'Change the subject': gt 'albina_chat', 'chat'
@@ -29,7 +30,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"So are you friends with Bella? You seem to talk a lot," you ask.'
-		'Albina gives you a curious gaze. "Why? You jealous?" she says before laughing. "I''m just kidding. We run in the same social circles and have known each other for a long time. She''ll never admit it, but yeah, we are sort of like friends. She and Vicky were the only girls I could trust growing up, so we formed a sort of trio at school, even if Bella is a bit of a bitch. She''s invited me to hang with the people she calls her friends, but these are guys and girls who are <i>way</i> older than her and I didn''t get a good feeling from them, so I choose to keep my distance. They throw awesome parties though, if Bella decides you''re ''mature enough'' for her to invite you."'
+		'Albina gives you a curious gaze. "Why? You jealous?" she laughs. "I''m just kidding. We run in the same social circles and have known each other for a long time. She''ll never admit it, but yeah, we are sort of like friends. She and Vicky were the only girls I could trust growing up, so we formed a sort of trio at school, even if Bella is a bit of a bitch. She''s invited me to hang with the people she calls her friends, but these are guys and girls who are <i>way</i> older than her and I didn''t get a good feeling from them, so I choose to keep my distance. They throw awesome parties though, if Bella decides you''re ''mature enough'' for her to invite you."'
 		'"She seems a bit too bitchy for anyone to be her friends," you reply, but Albina cuts you off.'
 		'"I''m not going down that rabbit hole, <<$pcs_nickname>>. She is who she is, but she is actually kind of cool if she decides to be friendly with you. Fat chance of that happening though."'
 		act 'Stop talking': gt 'albinahome', 'bedroom'
@@ -42,19 +43,20 @@ if $ARGS[0] = 'chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			if AlbinaQW['Lazar_Threesome'] = 1:
 				'"What''s the deal with you and Lazar?" you ask her.'
-				'She gives you a puzzled stare. "What do you mean? I told you, it''s just casual sex. Hell, you''ve had a threesome with us!"'
-				'"<i>Is</i> it just sex or is there something more?" you imply.'
-				'She shakes her head. "No, we''re just friends with benefits. Or ''fuck buddies'' as Marcus says it''s called in America."'
+				'"What do you mean?" She gives you a puzzled look. "I told you, it''s just casual sex. Hell, you''ve had a threesome with us!"'
+				'"<i>Is</i> it just sex or is there something more?" you try to imply but she shakes her head.'
+				'"We''re just friends with benefits. Or ''fuck buddies'' as Marcus says it''s called in America."'
 				'"So there''s nothing serious then? No chance of you guys ever becoming a couple?"'
-				'She hesitates, as if trying to decide how much to say. "Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story."  She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
+				'She hesitates, as if trying to decide how much to say.'
+				'"Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story." She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
 				'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
 			else
 				'"What''s the deal with you and Lazar?" you ask her.'
-				'She gives you a puzzled stare. "What do you mean?"'
-				'"It''s no secret that the two of you hook up at school. Is it just sex or is there something more?" you imply.'
-				'She shakes her head. "No, we''re just friends with benefits. Or ''fuck buddies'' as Marcus says it''s called in America. We just have sex when we feel like it, no strings attached. I don''t care about being his ''girlfriend'' and he enjoys all the female attention he gets. It would never work between us."'
+				'What do you mean?" She gives you a puzzled look.'
+				'"It''s no secret that the two of you hook up at school. Is it just sex or is there something more?" you imply but she he shakes her head.'
+				'"No, we''re just friends with benefits. Or ''fuck buddies'' as Marcus says it''s called in America. We just have sex when we feel like it, no strings attached. I don''t care about being his ''girlfriend'' and he enjoys all the female attention he gets. It would never work between us."'
 				'"So there''s nothing serious then? No chance of you guys ever becoming a couple?"'
-				'She hesitates, as if trying to decide how much to say.. "Look <<$pcs_nickname>>, Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story." She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
+				'She hesitates, as if trying to decide how much to say. "Look <<$pcs_nickname>>, Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story." She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
 				'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
 			end
 			act 'No':
@@ -241,9 +243,10 @@ if $ARGS[0] = 'Cowgirl':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'Definitely cowgirl. I love getting on top and taking control." you admit.'
-	'She smiles in response. "Oh, so little <<$pcs_nickname>> here likes riding dick? Who knew?" she says teasingly and you gently punch her arm. "Well, what about you?" you ask.'
-	'"Doggystyle." she says without hesitation. "Getting bent over and having my holes pounded is such a turn on for me." she admits before tightly closing her legs and biting her lip. "It''s even better when they spank me at the same time. The harder, the better." You are surprised by her graphic answer and find yourself a little turned on by it.'
+	'Definitely cowgirl. I love getting on top and taking control."'
+	'"Oh, so little <<$pcs_nickname>> here likes riding dick? Who knew?" she smiles teasingly and you gently punch her arm.'
+	'"Well, what about you?" you ask back.'
+	'"Doggystyle," she says without hesitation. "Getting bent over and having my holes pounded is such a turn on for me." she admits before tightly closing her legs and biting her lip. "It''s even better when they spank me at the same time. The harder, the better." You are surprised by her graphic answer and find yourself a little turned on by it.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
@@ -253,8 +256,8 @@ if $ARGS[0] = 'Doggystyle':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'"I like doggystyle. Getting fucked from behind, it turns me on just thinking about it." you admit.'
-	'Albina gives you a wide smile. "That''s my girl!" she says slyly. "Getting bent over and having my holes pounded is my favourite too!" she admits while she tightly closes her legs and bites her lip. "Especially when they spank me at the same time. The harder, the better." You giggle at her answer and find yourself a little turned on.'
+	'"I like doggystyle. Just thinking about it getting fucked from behind turns me on."'
+	'"That''s my girl!" Albina grins back at you. "Getting bent over and having my holes pounded is my favourite too! Especially when they spank me at the same time. The harder, the better!" You giggle at her answer and find yourself a little turned on. Judging by the way she''s chewing her lips and rubbing her thighs together, you think she is too.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
@@ -264,9 +267,9 @@ if $ARGS[0] = 'Missionary':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'Missionary." you admit. "There''s just something...nice about it."'
-	'"BO-RING!" she says in response. "Bend over and get pounded and spanked from behind and tell me that lying on your back doing nothing is ''nice''. Doggystyle is the way to go!" she adds with a laugh. You notice her tightly closing her legs and biting her lip as she speaks.'
-	'You both agree to disagree, but find yourself a little turned on by her comment.'
+	'Missionary," you admit. "There''s just something... nice about it."'
+	'"BO-RING!" she rolls her eyes in response. "You''re trying to tell me that lying on your back doing nothing is ''nice''? Nuh uh. Bend me over, spank my ass, and pound me on all fours! Doggystyle is the way to go!"'
+	'You both agree to disagree, but find yourself a little turned on by her comment. Judging by the way she''s chewing her lips and rubbing her thighs together, you think she is too.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
@@ -276,10 +279,16 @@ if $ARGS[0] = 'Anal':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'You''re curious about her anal fetish and now seems like a good time to ask. "So..." you sheepishly ask. "What is it, you like, about...anal?"
-	She glares at you for a few seconds before answering. "And why do you want to know?"'
+	'You''re curious about her anal fetish and now seems like a good time to ask.'
+	'"So..." you sheepishly ask. "... what is it you like about anal?"'
+	'"And why do you want to know?" She gives you a dry look.'
 	'You stutter, flustered by her response. "Oh, it''s just...you know there''s...stuff going around school about you?"'
-	'"Oh I know all about that. ''Albina is just a cheap butt slut whore.'', ''I bet Albina''s asshole is looser than Lizeveta''s lips!'', ''I would fuck Albina''s asshole while slapping her juicy cheeks like I''m playing some bongos!'', ''I bet her pussy is tighter than a nun''s with all the anal she does.'' I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. To answer your question, I''m not going to. I don''t need to explain my sex life to anyone." She then turns away and goes quiet.'
+	'"Oh I know all about that. ''Albina is just a cheap butt slut whore.'' '
+	'''I bet Albina''s asshole is looser than Lizeveta''s lips!'' '
+	'''I would fuck Albina''s asshole while slapping her juicy cheeks like I''m playing some bongos!'' '
+	'''I bet her pussy is tighter than a nun''s with all the anal she does.'' '
+	*nl
+	'"I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. To answer your question, I''m not going to. I don''t need to explain my sex life to anyone." She then turns away and goes quiet.'
 	'You''ve clearly hit a nerve and know better than to push her further, so you change the subject.'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
@@ -331,16 +340,16 @@ end
 
 if NikoPayback > 1 and AlbVsNiko = 0:
 	act 'Ask for help with Niko':
-    *clr & cla
-    AlbVsNiko = 1
-    minut += 30
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-    'You feel Albina wrap an arm around you. "What''s wrong <<$pcs_nickname>>? You''re looking pretty glum."'
-    'You collect your thoughts before replying. "Ever since I broke up with Niko, he''s been raping me at lunchtime and I..."'
-    'Her face contorts in rage. "That slimy motherfucker! Don''t worry, I''ll sort him out..." She doesn''t eleborate on what she''s planning when you ask, but you give her a tight hug. "Thanks Albina, I just don''t know what to do!"'
-    'She holds you tight and comforts you as tears run down your cheeks. "Don''t worry <<$pcs_nickname>>. I''ll make it all go away... How about we do something to take your mind off it?"'
-    act 'Continue': gt 'albinahome','bedroom'
-    end
+	*clr & cla
+	AlbVsNiko = 1
+	minut += 30
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'You feel Albina wrap an arm around you. "What''s wrong <<$pcs_nickname>>? You''re looking pretty glum."'
+	'You collect your thoughts before replying. "Ever since I broke up with Niko, he''s been raping me at lunchtime and I..."'
+	'Her face contorts in rage. "That slimy motherfucker! Don''t worry, I''ll sort him out..." She doesn''t eleborate on what she''s planning when you ask, but you give her a tight hug. "Thanks Albina, I just don''t know what to do!"'
+	'She holds you tight and comforts you as tears run down your cheeks. "Don''t worry <<$pcs_nickname>>. I''ll make it all go away... How about we do something to take your mind off it?"'
+	act 'Continue': gt 'albinahome','bedroom'
+	end
 end
 
 
@@ -419,7 +428,7 @@ if $ARGS[0] = 'first_visit':
 						end
 					else
 						'She turns to face you, eyes brimming. "And when it wasn''t enough, he sold my friends too."'
-						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I didn''t want to! But I didn''t stop them! I just handed them over to be raped because I didn''t want it to be  me! I had-! They-! I-! I''m-! <i>UWAHHHH!!</i>"'
+						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I didn''t want to! But I didn''t stop them! I just handed them over to be raped because I didn''t want it to be me! I had-! They-! I-! I''m-! <i>UWAHHHH!!</i>"'
 						*nl
 						'You throw your arms around her, wrapping her in a tight hug as she continues to cry, her fingers gripped tight across the back of your top as her tears soak into your shoulder.'
 					end

+ 16 - 4
locations/albina_house_events.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'after_swim_shower':
 		'That twinkle is back in her eye again and you reflexively swallow, knowing exactly what will happen if you take her up on the offer.'
 		act 'Refuse':
 			cla & *nl
-			'You turn down her offer and she looks a little disappointed, but she directs you to the bathroom anyway. "Feel free to use whatever soap is in there. There''s towels in the cupboard as well," she says before disappearing into her bedroom. You walk down to the bathroom, enter and place your clothes in a neat pile. You turn the shower on and lock the door as you wait for the water. When it''s the right temperature, you step in and start washing yourself.'
+			'You turn down her offer and she looks a little disappointed, but she directs you to the bathroom anyway. "Feel free to use whatever''s in there. There''s towels in the cupboard as well," she says before disappearing into her bedroom. You walk down to the bathroom, enter and place your clothes in a neat pile. You turn the shower on and lock the door as you wait for the water. When it''s the right temperature, you step in and start washing yourself.'
 			act'Shower':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
@@ -305,7 +305,11 @@ if $ARGS[0] = 'hot_tub3':
 					'"Mama will have a fit if you go in there naked, so you better get dressed," she warns as she passes you a towel. "You''ll just have to make do without your panties for now."'
 					act'Get dressed':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+						if month >= 11 or month <= 3:
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
+						end
 						if CloDress = 1:
 							'"So she''s okay with us being topless out here?" you inquire, struggling to tug your dry dress down over your wet shoulders.'
 						elseif PCloSkirt > 0:
@@ -352,7 +356,11 @@ if $ARGS[0] = 'hot_tub3':
 						'"Mama will have a fit if you go in there naked, so you better get dressed," she warns as she passes you a towel.'
 						act'Get dressed':
 							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+							if month >= 11 or month <= 3:
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+							else
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
+							end
 							if CloDress = 1:
 								'"So she''s okay with us being topless out here?" you inquire, struggling to tug your dry dress down over your wet shoulders.'
 							elseif PCloSkirt > 0:
@@ -415,7 +423,11 @@ if $ARGS[0] = 'hot_tub_no_panties':
 		'"Mama will have a fit if you went in there naked, so you better get dressed," she warns as she passes you the other one.'
 		act'Get dressed':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+			if month >= 11 or month <= 3:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
+			end
 			if CloDress = 1:
 				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry dress down over your wet shoulders.'
 			elseif PCloSkirt > 0:

+ 1 - 1
locations/albina_school_sex.qsrc

@@ -1,6 +1,6 @@
 # albina_school_sex
 
-!! If AlbQW['Friend'] = 2 and npc_sex [A23] > 1 when the player tries speaking to Albina during break, then there is the random chance that they will get this event instead. This should only happen once or twice a week and be somwhat uncommon.
+!! If AlbQW['Friend'] = 2 and npc_sex[A23] > 0 when the player tries speaking to Albina during break, then there is the random chance that they will get this event instead. This should only happen once or twice a week and be somwhat uncommon.
 
 if $ARGS[0] = 'break_fun_1':
 	menu_off = 1

+ 19 - 8
locations/albina_starlets.qsrc

@@ -402,19 +402,30 @@ if $ARGS[0] = 'starlets':
 										gs 'stat'
 										'You agree to be "nice" and Albina reluctantly hands over the money.'
 										'As you are led away, Albina looks like she is about to say something, but instead just looks at the floor, disheartened. You hear her muttering to herself about how the men can be "way too rough sometimes" while cursing her father.'
-										if AlbinaQW['StarletCustomer'] = 1:act 'Go with the Armenian': gt 'albina_starlets', 'whore1'
-										if AlbinaQW['StarletCustomer'] = 2:act 'Go with the Armenians': gt 'albina_starlets', 'whore2'
-										if AlbinaQW['StarletCustomer'] = 3:act 'Go with the young men': gt 'albina_starlets', 'whore3'
-										if AlbinaQW['StarletCustomer'] = 4:act 'Go with the black man': gt 'albina_starlets', 'whore4'
-										if AlbinaQW['StarletCustomer'] = 5:act 'Go with the black men': gt 'albina_starlets', 'whore5'
-										if AlbinaQW['StarletCustomer'] = 6:act 'Go with the man': gt 'albina_starlets', 'whore6'
-										if AlbinaQW['StarletCustomer'] = 7:act 'Go with the older man': gt 'albina_starlets', 'whore7'
-										if AlbinaQW['StarletCustomer'] = 8:act 'Go with the woman': gt 'albina_starlets', 'whore8'
+										if AlbinaQW['StarletCustomer'] = 1:
+											act 'Go with the Armenian': gt 'albina_starlets', 'whore1'
+										elseif AlbinaQW['StarletCustomer'] = 2:
+											act 'Go with the Armenians': gt 'albina_starlets', 'whore2'
+										elseif AlbinaQW['StarletCustomer'] = 3:
+											act 'Go with the young men': gt 'albina_starlets', 'whore3'
+										elseif AlbinaQW['StarletCustomer'] = 4:
+											act 'Go with the black man': gt 'albina_starlets', 'whore4'
+										elseif AlbinaQW['StarletCustomer'] = 5:
+											act 'Go with the black men': gt 'albina_starlets', 'whore5'
+										elseif AlbinaQW['StarletCustomer'] = 6:
+											act 'Go with the man': gt 'albina_starlets', 'whore6'
+										elseif AlbinaQW['StarletCustomer'] = 7:
+											act 'Go with the older man': gt 'albina_starlets', 'whore7'
+										elseif AlbinaQW['StarletCustomer'] = 8:
+											act 'Go with the woman': gt 'albina_starlets', 'whore8'
+										end
 									end
 								end
 							else
 								gt 'albina_starlets', 'after_show'
 							end
+						else
+							gt 'albina_starlets', 'after_show'
 						end
 					end
 				end

+ 1 - 1
locations/albinahome.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'hallway':
 		elseif temp = 3 and temper < 10:
 			!! swim winter
 			AlbinaQW['event'] = 1
-			gt 'albina_house_events', 'swim_winter2'
+			gt 'albina_house_events', 'swim_winter1'
 		elseif temp = 11:
 			!! Mom Event
 			gt 'albina_mother_events', 'zoya_sunbathing_solo'

+ 36 - 36
locations/andrey.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = '':
 	menu_off = 1
 	'<b><center><font size="4">Manager Andrew M. Sobulyagin</font></center></b>'
 	if young_shop_work = 2:
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 		*nl
 		'You knock on Mr. Sobulyagin''s office door, and when he sees you enter, his expression hardens. "What do you want," he questions you with a scowl.'
 	end
@@ -31,7 +31,7 @@ end
 
 if $ARGS[0] = 'apply':
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 	*nl
 	'You knock on the door, and someone calls you in from the other side, "You can enter." After you enter, you''re greeted by the sight of a sour-faced older man reading papers at his desk. When he sees you, his expression hardens. "Surprised to see an old man managing a clothing store for teenage girls?" he grunts. You didn''t even say anything yet, but he doesn''t seem to care. "Yeah, I get that a lot...," he adds under his breath before sighing and looking back to his papers. "What do you need?"'
 
@@ -40,7 +40,7 @@ if $ARGS[0] = 'apply':
 		minut += 5
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 		*nl
 		'He barely glances your way as he shuffles some papers around. "Oh yeah I forgot about that... well, the job is still open. I need an extra worker around the store, and it needs to be a girl... a young girl," he says before suddenly dropping the papers to look at you accusingly. "Before you start with that gender equality crap, I had a guy working here, and all he cared about was getting into the pants of female customers rather than their wallets. I''m saving myself from another headache...<i>hopefully</i>."'
 		*nl
@@ -92,7 +92,7 @@ if $ARGS[0] = 'regular':
 	*clr
 	menu_off = 1
 	'<b><center><font size="4">Manager Andrew M. Sobulyagin</font></center></b>'
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 	*nl
 	'You knock on the door, and Mr. Sobulyagin calls you in. Normally, he would be reading the paper, but instead he''s just sitting there with a weird look on his face. It''s almost like you scared him or something.'
 
@@ -126,14 +126,14 @@ if $ARGS[0] = 'regular':
 	act 'Resign':
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 		*nl
 		'"I would like to resign," You say as you walk up to his desk.'
 		'Mr. Sobulyagin gives you a confused look. "Are you sure? I mean... If you''re serious I can arrange everything right now." He scratches his head and starts pulling out the required paperwork, but pauses a moment. "Why so suddenly?"'
 		act 'Change your mind':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 			*nl
 			'"Actually, I''d like to think about this a bit more..." You say as you''re moving back towards the door. "Sorry for bothering you Mr. Sobulyagin."'
 			'He shakes his head. "It''s fine, but if there''s nothing else, I''m busy right now."'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'regular':
 			work = 0
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 			*nl
 			'"I''ve already made up my mind on this," you say firmly.'
 			'"Alright, alright," Mr. Sobulyagin says and starts filling out several forms before handing them over to you to sign.'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'punish':
 !!this happens the first time Sveta misses three days and is fired
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 		*nl
 		'"Well look who decided to drag their ass into work today," Mr. Sobulyagin exclaims as his expression twists into a scowl when he greets you at the store entrance. "I realize coming to work is difficult for you, but do you think you can spare me a moment and come into my office," he asks dryly. You sigh and follow him as he takes you into his office then closes the door. "Didn''t I tell you that missing work for three days means you''ll be fired! You''re no exception to the rules girl."'
 		act 'Agree and accept being fired':
@@ -187,7 +187,7 @@ if $ARGS[0] = 'punish':
 			work = 0
 			bonus_mood -= 50
 			minut +=15
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 			*nl
 			'"You''re right. I''ve skipped out on work too many times," you sigh. Mr. Sobulyagin pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them in silence.'
 			msg 'You are no longer employed at this store.'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'punish':
 	elseif young_shop_fired <= 5:
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 		*nl
 		'"Well look who decided to drag their ass into work today," Mr. Sobulyagin exclaims as his expression twists into a scowl as he greets you at the store entrance. "I realize coming to work is difficult for you, but do you think you can spare me a moment and come into my office," he asks dryly. You sigh and follow him as he takes you into his office then closes the door. He nods and seems to be talking to himself as much as he is talking to you. He leans against his desk and cups his crotch as he smiles at you. "Well you know the deal if you want to keep your job."'
 		gs 'willpower', 'bj', 'resist'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'punish':
 				gs 'willpower', 'bj', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 				*nl
 				'"You''re right, and I''ve decided that I''m not doing you anymore favors to keep my job." Mr. Sobulyagin scowls at you, but puts his dick away. He pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them in silence.'
 				msg 'You are no longer employed at this store.'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'punish':
 	else
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 		*nl
 		'"Well look who decided to drag their ass into work today," Mr. Sobulyagin exclaims as his expression twists into a scowl as he greets you at the store entrance. "I realize coming to work is difficult for you, but do you think you can spare me a moment and come into my office," he asks dryly. You sigh and follow him as he takes you into his office then closes the door. "You are missing too much work and the other employees are noticing. I am going to need something more from you to prove your deserve to keep your job."'
 		*nl
@@ -302,7 +302,7 @@ if $ARGS[0] = 'punish':
 				gs 'willpower', 'anal', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 				*nl
 				'"You''re right, I''ve skipped out on work too many times, but I''m not doing that '+iif(young_shop_fired = 6, '', 'anymore ')+'to keep my job." Mr. Sobulyagin scowls at you, but puts his dick away and pulls out a document from his desk drawer to begin filling in the blanks. A few minutes later he hands you some papers and you sign them without a word.'
 				msg 'You are no longer employed at this store.'
@@ -352,7 +352,7 @@ if $ARGS[0] = 'beg':
 	act 'Beg for your job back':
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 		*nl
 		'"And why in the hell would I do that," Mr. Sobulyagin asks scoffingly.'
 		'"Oh please! I''ll do anything you want. I really need this job!" You say trying your absolute best to convince him.'
@@ -373,7 +373,7 @@ if $ARGS[0] = 'beg':
 			act 'Refuse (<<will_cost>> Willpower)':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 				*nl
 				if young_shop_fired <= 6:
 					'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob... then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
@@ -394,7 +394,7 @@ end
 
 if $ARGS[0] = 'reapply':
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 	*nl
 	'Mr. Sobulyagin doesn''t mind having you back since you ended it all on quite good terms.'
 	act 'Accept your previous position':
@@ -434,28 +434,28 @@ if $ARGS[0] = 'fired1':
 	young_shop_miss = 0
 	young_shop_salary = 1
 	young_shop_bonus = 2
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 	'You swallow hard and nod your head. "If this means keeping my job... I''ll do it."'
 	*nl
 	'Mr. Sobulyagin smiles. "Good girl. I''m happy to have such a hard worker here at the store," he says almost mockingly. He brings his hand to your cheek and cups it admiring your face with a triumphant smirk. "On your knees," he commands as his hand suddenly moves to the top of your head to push you down towards his crotch.'
 	act 'Get on your knees':
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/bj1.jpg"></center>'
 		'Falling to your knees, you see he''s already unzipped his pants, pulled his cock out, and started stroking his <<dick>> cm <<$dick_girth>> cock. It looks enormous in your small hands as you give it a few tentative pumps before opening your mouth. You start off by gently licking the head then move on to licking the entire shaft up and down.'
 		gs 'arousal', 'bj', 3, 'sub'
 		gs 'stat'
 		act 'Continue':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/bj2.jpg"></center>'
 			'After a few minutes, you put his cock in your mouth and start moving your head back and forth with your tongue constantly rolling over the head of his shaft. You feel his dick growing and stiffening as you caress it with your mouth and tongue. You pull his pants down to his knee''s to make it easier to suck his cock.'
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'stat'
 			act 'Continue':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/bj3.jpg"></center>'
 				'You soon settle into a rhythm with your eyes closing as you start to enjoy yourself a bit. Mr. Sobulyagin''s breathing quickens and you hear him moaning in pleasure. Eventually, he places his hand on the back of your head and starts forcing you to deepthroat him, which causes you to gag.'
 				gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 				gs 'pain', 2, 'throat', 'stretch'
@@ -463,7 +463,7 @@ if $ARGS[0] = 'fired1':
 				act 'Continue':
 					cla
 					*clr
-					'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/bj4.jpg"></center>'
 					'He keeps your head deep down his cock for so long that your throat starts feeling a little numb. You hear him starting to grunt. "I''m about to cum," He yells out as he removes his hand from your head and leans fully back. You pull out, which makes a popping sound, and start jerking him off straight away.'
 					gs 'arousal', 'hj', 3, 'sub'
 					gs 'stat'
@@ -471,7 +471,7 @@ if $ARGS[0] = 'fired1':
 						cla
 						*clr
 						gs 'cum_call', 'mouth', 'A101', 1
-						'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/bj5.jpg"></center>'
 						'He starts grunting louder. "Open your mouth and stick out your tongue." You do as he commands and he takes over jerking his cock. Suddenly, he is shooting ropes of his hot cum in your mouth and all over your tongue. After a few moments, his cock stops twitching and spurting cum. He lets go of his cock as it starts to go limp. "Now swallow." You do as you''re told and swallow his whole load.'
 						*nl
 						'"You did very well, <<$pcs_nickname>>! You''ve shown me how hard of a worker you are and how badly you want this job, so I''ll give you another chance." As he zips up his pants you look up to see him smiling down at you. "You''ve done enough for today, so you''re free to go home if you want. Just make sure to not miss work anymore!" With these words he walks out of the office leaving you to put yourself in order.'
@@ -495,21 +495,21 @@ if $ARGS[0] = 'fired2':
 	cla
 	*clr
 	gs 'boyStat', 'A101'
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 	*nl
 	'Taking a deep breath you nod your head. "Fine... I''ll do it." You see Mr. Sobulyagin smile as he places his hand on top of your head and pushes you down to your knees.'
 	act 'Get on your knees':
 		cla
 		*clr
 		gs 'boyStat', 'A101'
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired1.jpg"></center>'
 		'Falling to your knees you see he''s already unzipped his pants, pulled his cock out, and started stroking his <<dick>> cm <<$dick_girth>> cock. It looks enormous in your small hands as you give it a few tentative pumps before opening your mouth. You start off by gently licking the head before you start sucking.'
 		gs 'arousal', 'bj', 3, 'sub'
 		gs 'stat'
 		act 'Continue':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired2.jpg"></center>'
 			'After a few minutes, you put his cock in your mouth and start moving your head back and forth with your tongue constantly rolling over the head of his shaft. You feel his cock growing and stiffening as you caress it with your mouth and tongue.'
 			'You soon settle into a rhythm with your eyes closing as you start to enjoy yourself a bit. Mr. Sobulyagin''s breathing quickens, and you hear him moaning in pleasure. Eventually, he places his hand on the back of your head and starts forcing you to deepthroat him which causes you to gag.'
 			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'fired2':
 			act 'Continue':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired3.jpg"></center>'
 				'"I''ve changed my mind, and I can''t wait. I want your ass now. You can clean my cock up with your mouth after," he smirks, and you feel your stomach turn slightly from the look he gives you. His hands start to roam over your body, squeezing and massaging your breasts through your top as he turns you so your back and ass are facing him. He pushes you forward, making you bend over his desk. He quickly removes any clothes in the way until your bare ass is exposed to him.'
 				*nl
 				'He gives your ass checks several hard slaps, which cause you to wince in pain. "Yeah, bad little girls get their asses punished, and you have been a very bad girl." You can hear the leering in his voice as he gives your bare ass another hard smack. With that done, he spreads your cheeks and rams his cock against your anus. He doesn''t even spit on your asshole. The only lubrication is the little bit of your slobber that''s left on his cock.'
@@ -531,7 +531,7 @@ if $ARGS[0] = 'fired2':
 					cla
 					*clr
 					gs 'boyStat', 'A101'
-					'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired4.jpg"></center>'
 					'With a hard thrust he shoves his <<dick>> cm <<$dick_girth>> cock deep inside you. The sudden forceful pain causes you to cry out and try to squirm away, but your hips are pressed against the edge of the desk while his hands hold them in place. He quickly forces his cock, balls deep into your ass, and the more you cry out and resist the more he seems to like it. While he is fucking you, he reaches up and pulls your top off, leaving your breasts exposed.'
 					gs 'arousal', 'anal', 5, 'sub', 'maso', 'rough'
 					gs 'pain', 7, 'asshole', 'stretch'
@@ -539,7 +539,7 @@ if $ARGS[0] = 'fired2':
 					act 'Continue':
 						cla
 						*clr
-						'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired5.jpg"></center>'
 						'He soon settles into a hard, pounding rhythm. You are tearing up from the pain and grip the table tightly as you try to endure. Your asshole already feels like it is on fire, but he doesn''t relent in the slightest. He just keeps pounding your little asshole, leaving you to wish he would hurry up and finish.'
 						gs 'arousal', 'anal', 5, 'sub', 'maso', 'rough'
 						gs 'pain', 7, 'asshole', 'stretch'
@@ -550,7 +550,7 @@ if $ARGS[0] = 'fired2':
 							gs 'cum_call', 'mouth', 'A101', 1
 							gs 'cum_call', 'breasts', 'A101', 1
 							gs 'cum_call', 'face', 'A101', 1
-							'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired6.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired6.jpg"></center>'
 							'He starts grunting louder then, finally, he pulls his cock out of your ass and you sigh in relief. He takes a step back from you. "Get on your knees and finish me off." You turn around and do as he says. You take his dick in your mouth and start sucking it. You try not to think about where it just was, but at least the pain has stopped. Suddenly he pulls his cock out of your mouth and starts shooting ropes of his hot cum all over your face and tits. After a few moments, his cock stops twitching and spurting cum on you. He lets go of his cock as it begins to go limp.'
 							*nl
 							'"You did very well, <<$pcs_nickname>>! You''ve shown me how badly you want this job, so I''ll give you another chance." As he zips his pants, you look up to see him smiling down at you. "You''ve done enough for today, so you''re free to go home if you want. Just make sure to not miss work anymore!"'
@@ -578,21 +578,21 @@ if $ARGS[0] = 'rehired':
 	cla
 	*clr
 	gs 'boyStat', 'A101'
-	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/fired.jpg"></center>'
 	*nl
 	'Taking a deep breath you nod your head. "Fine... I''ll do it." You see Mr. Sobulyagin smile as he places his hand on top of your head and pushes you down to your knees.'
 	act 'Get on your knees':
 		cla
 		*clr
 		gs 'boyStat', 'A101'
-		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired1.jpg"></center>'
 		'Falling to your knees you see he''s already unzipped his pants, pulled his cock out, and started stroking his <<dick>> cm <<$dick_girth>> cock. It looks enormous in your small hands as you give it a few tentative pumps before opening your mouth. You start off by gently licking the head before you start sucking.'
 		gs 'arousal', 'bj', 3, 'sub'
 		gs 'stat'
 		act 'Continue':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired2.jpg"></center>'
 			'After a few minutes, you put his cock in your mouth and start moving your head back and forth with your tongue constantly rolling over the head of his shaft. You feel his cock growing and stiffening as you caress it with your mouth and tongue.'
 			'You soon settle into a rhythm with your eyes closing as you start to enjoy yourself a bit. Mr. Sobulyagin''s breathing quickens, and you hear him moaning in pleasure. Eventually, he places his hand on the back of your head and starts forcing you to deepthroat him which causes you to gag.'
 			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
@@ -601,7 +601,7 @@ if $ARGS[0] = 'rehired':
 			act 'Continue':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired3.jpg"></center>'
 				'"I''ve changed my mind, and I can''t wait. I want your ass now. You can clean my cock up with your mouth after," he smirks, and you feel your stomach turn slightly from the look he gives you. His hands start to roam over your body, squeezing and massaging your breasts through your top, as he turns you so your back and ass are facing him. He pushes you forward, making you bend over his desk. He quickly removes any clothes in the way until your bare ass is exposed to him.'
 				*nl
 				'He gives your ass checks several hard slaps, which cause you to wince in pain. "Yeah, bad little girls get their asses punished and you have been a very bad girl." You can hear the leering in his voice as he gives your bare ass another hard smack. With that, he spreads your cheeks and rams his cock against your anus. He doesn''t even spit on your asshole. The only lubrication is the little bit of your slobber that''s left on his cock.'
@@ -614,7 +614,7 @@ if $ARGS[0] = 'rehired':
 					cla
 					*clr
 					gs 'boyStat', 'A101'
-					'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired4.jpg"></center>'
 					'With a hard thrust he shoves his <<dick>> cm <<$dick_girth>> cock deep inside you. The sudden forceful pain causes you to cry out and try to squirm away, but your hips are pressed against the edge of the desk while his hands hold them in place. He quickly forces his cock, balls deep into your ass, and the more you cry out and resist the more he seems to like it. While he is fucking you, he reaches up and pulls your top off, leaving your breasts exposed.'
 					gs 'arousal', 'anal', 5, 'sub', 'maso', 'rough'
 					gs 'pain', 7, 'asshole', 'stretch'
@@ -622,7 +622,7 @@ if $ARGS[0] = 'rehired':
 					act 'Continue':
 						cla
 						*clr
-						'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired5.jpg"></center>'
 						'He soon settles into a hard, pounding rhythm. You are tearing up from the pain and grip the table tightly while you try to endure. Your asshole already feels like it is on fire, but he doesn''t relent in the slightest. He just keeps pounding your little asshole, leaving you to wish he would hurry up and finish.'
 						gs 'arousal', 'anal', 5, 'sub', 'maso', 'rough'
 						gs 'pain', 7, 'asshole', 'stretch'
@@ -633,7 +633,7 @@ if $ARGS[0] = 'rehired':
 							gs 'cum_call', 'mouth', 'A101', 1
 							gs 'cum_call', 'breasts', 'A101', 1
 							gs 'cum_call', 'face', 'A101', 1
-							'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired6.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/fired6.jpg"></center>'
 							'He starts grunting louder then, finally, he pulls his cock out of your ass, and you sigh in relief. He takes a step back from you. "Get on your knees and finish me off." You turn around and do as he says. You take his dick in your mouth and start sucking it. You try not to think about where it just was, but at least the pain has stopped. Suddenly, he pulls his cock out of your mouth and starts shooting ropes of his hot cum all over your face and tits. After a few moments, his cock stops twitching and spurting cum on you. He lets go of his cock as it begins to go limp.'
 							*nl
 							'"You did very well, <<$pcs_nickname>>! You''ve shown me how badly you want this job, so I''ll give you another chance." As he zips his pants, you look up to see him smiling down at you. "You''ve done enough for today, so you''re free to go home if you want. Just make sure to not miss work anymore!"'

+ 67 - 7
locations/anushkachat.qsrc

@@ -150,12 +150,12 @@ if $ARGS[0] = 'chat':
 	if OluQW['tell'] = 1 and OluQW['nush_inv'] = 0:
 		act 'Invite to see Olu': gt 'anushkachat', 'invite_olu'
 	end
-	if npc_sex['A82'] > 0 and OluQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0 and DjibrilQW['tell'] = 0:
-		act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
-	end
-!!check I did these correct
-	if npc_sex['A82'] > 0 and DjibrilQW['invite'] = 1 and DjibrilQW['tell'] = 0:
-		act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
+	if npc_sex['A82'] > 0 and DjibrilQW['invite'] = 0 and DjibrilQW['tell'] = 0:
+		if OluQW['tell'] = 1:
+			act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
+		else
+			act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril1'
+		end
 	end
 	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0:
 		act 'Invite to see Djibril': gt 'anushkachat', 'invite_djibril'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'tell_about_djibril':
 	'She shoves you slightly. "Spill already, what about him?"'
 	'You shove her back slightly and grin. "Well I had sex with him too, he isn''t as big as his uncle. But lets just say, big dicks run in the family."'
 	'She bites her lower lip. "Damn black college boy with a big dick, I am so jealous right now, come on dish with the details."'
-	act 'Tell her about sex with him.':
+	act 'Tell her about sex with him':
 		*clr & cla
 		minut += 3
 		pcs_horny += 20
@@ -941,6 +941,66 @@ if $ARGS[0] = 'tell_about_djibril':
 	end
 end
 
+if $ARGS[0] = 'tell_about_djibril1':
+	*clr & cla
+	minut += 3
+	DjibrilQW['tell'] = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'You smile as you look at her like you have a big secret, which perks her interest. "Remember when I told you about Olu, my aunts boyfriend?" you tell her and she nods to that, arching a brow slightly, obviously curious where you are going with this.'
+	'"Well he has a nephew at the university in the city." You tell her, dragging this out.'
+	'She shoves you slightly. "Spill already, what about him?"'
+	'You shove her back slightly and grin. "Well I had sex with him and he has one of the biggest dicks I have ever seen, I mean just massive." Holding up your hands to show her roughly how big it is.'
+	'She bites her lower lip. "Damn black college boy with a big dick, I am so jealous right now, come on dish with the details."'
+	act 'Tell her about sex with him':
+		*clr & cla
+		minut += 3
+		pcs_horny += 20
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+		'You tell her about hooking up with him, she asks a few questions and you get pretty graphic and fairly worked up by your story, you can tell she does as well.'
+		'"Afterwards he game me a open invitation to come visit him in his dorm room." You tell her with a sly smile.'
+		'She grins. "Well have you?"'
+		if DjibrilQW['dorm_sex'] = 1:
+			act 'Yes':
+				*clr & cla
+				minut += 10
+				pcs_horny += 20
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+				'You nod your head. "Yeah, I did and ..."'
+				'"And what? Don''t leave me hanging." She says.'
+				'You laugh and blush a bit. "We hung out for a little while and then we started kissing..."'
+				'She looks like she is about to strangle you, when you keep trailing off. "And then?"'
+				*nl
+				'You tell her about it and get into some pretty graphic details at times. After you tell her about it you are feeling more than a bit turned on and you can see she is as well. Maybe you could invite her to come with you to his dorm room, you doubt Djibril would mind.'
+				act 'Hang out in her room': gt 'anushapt','anushroom'
+				act 'Talk about something else': gt 'anushapt', 'bed'
+				if DjibrilQW['nush_inv'] = 0:
+					act 'Ask her if she wants join in': gt 'anushkachat', 'invite_djibril'
+				end
+			end
+		end
+		act 'No':
+			*clr & cla
+			minut += 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			if npc_sex['A82'] > 0:
+				'You shake your head no. "No not yet, I want to... I think."'
+				'She rolls her eyes. "You think? You already hooked up with him, when you are in the city and feeling the itch go see him girl."'
+				'You nod. "Yeah I think I will." A thought occurs to you, maybe you could invite her to come with you, you are sure Djibril wouldn''t mind.'
+			else
+				'You shake your head no. "No not yet, I want to... I think."'
+				'She rolls her eyes. "You think? You find him attractive don''t you?" You nod your head, he is attractive. "Then what is there to think about? Next time you are in the city and are feeling the itch go see him girl. Go see him and let him scratch it for you."'
+				'You nod. "Yeah I think I will." You tell her.'
+			end
+			act 'Hang out in her room': gt 'anushapt','anushroom'
+			act 'Talk about something else': gt 'anushapt', 'bed'
+		end
+	end
+end
+
 if $ARGS[0] = 'invite_djibril':
 	*clr & cla
 	DjibrilQW['nush_inv'] = 1

+ 2 - 1
locations/bedrPar.qsrc

@@ -470,7 +470,8 @@ if $ARGS[0] = 'intro':
 					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
-					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either." she warns you before making her way towards the kitchen. "Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month." she adds quickly.'
+					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either." she warns you before making her way towards the kitchen.'
+					if pcs_vag = 0: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month." she adds quickly.'
 					act 'But why do I--':
 						cla & *clr
 						minut += 2

+ 1 - 1
locations/body_shape.qsrc

@@ -99,7 +99,7 @@ if $ARGS[0] = '':
 	if sftrstflag = 1 or cheatNoFat = 1:
 		fat = 0
 	else
-		if fat > (2 + vitalbuf / 25): salo += 1 & fat = 0
+		if fat > (17 + vitalbuf / 25): salo += 1 & fat = 0
 		if fat < (-2 - (vitalbuf / 10)): salo -= 1 & fat = 0
 	end
 

+ 73 - 20
locations/booty_call_after.qsrc

@@ -1,6 +1,7 @@
 # booty_call_after
 
 if $ARGS[0] = 'exit':
+	gs 'arousal', 'end'
 	if $clothingworntype = 'nude': gs'shortgs','dress'
 	
 	killvar 'booty_call_after'
@@ -359,6 +360,12 @@ if $ARGS[0] = 'after_sex2':
 				end}
 			else
 				'"Sure thing. Don''t use up all my soap."'
+				act'Okay':
+					cla & *nl
+					'"Okay. I won''t," you promise and head into the bathroom.'
+					act'Shower':gt'booty_call_after','shower_alone'
+				end
+				
 				act'I''ll try':
 					cla & *nl
 					'"I''ll try not to," you smile and head into the bathroom.'
@@ -377,7 +384,11 @@ if $ARGS[0] = 'after_sex2':
 	if booty_call['phone'] = 0:
 		act'Play with your phone':
 			booty_call['phone'] = 1
-			
+			cla & *clr
+			minut += rand(2,5)
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/phone.jpg"></center>'
+			'You play with your phone.'
+			gs'booty_call_after','after_sex2'
 		end
 	end
 	
@@ -443,19 +454,19 @@ if $ARGS[0] = 'after_sex2':
 					gs'booty_call_after','spend_night'
 				end
 			end
-!!{			if pcs_boyfriend > 0:
+			if pcs_boyfriend > 0:
 				act'I don''t want to see my boyfriend(annoyed)':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
 					'"Mind if I spend the night?" you ask. "My boyfriend''s been pissing me off lately and I don''t want to see his face."'
-					
+					gs'booty_call_after','spend_night'
 				end
 				
-				act'I don''t want to see my boyfriend(guilt)':
+!!{				act'I don''t want to see my boyfriend(guilt)':
 					
 					
-				end
-!!			end}
+				end}
+			end
 		end
 	end
 	if pcs_sleep < 30 and booty_call['get_up'] = 0:
@@ -515,8 +526,12 @@ if $ARGS[0] = 'spend_night':
 		else
 			'"Sure, my girlfriend isn''t gonna be around for a while. You can crash here."'
 			'"Thanks," you yawn, snuggling into <<$npc_firstname[$boy]>>. "Appreciate it."'
-			'He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.'						
-			gs'booty_call_after','sleep'
+			act'Cuddle up':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
+				'He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.'						
+				gs'booty_call_after','sleep'
+			end
 		end
 	else
 		!!if npc_cheating[$boy] = 1:
@@ -529,9 +544,13 @@ if $ARGS[0] = 'spend_night':
 		else
 			'"Sure, I''m not doing anything tomorrow. You can crash here."'
 			'"Thanks," you yawn, snuggling into <<$npc_firstname[$boy]>>. "Appreciate it."'
-			'He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.'						
-			gs'booty_call_after','sleep'
-		end		
+			act'Cuddle up':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
+				'He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.'						
+				gs'booty_call_after','sleep'
+			end
+		end
 	end
 end
 
@@ -684,12 +703,18 @@ if $ARGS[0] = 'after_sex_dressed':
 		act'Leave':gt'booty_call_after','exit'
 	end
 	act'Hang out':msg 'Work in progress! To be continued!'
-!!{	
 	act'Break things off':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"I can''t do this anymore."'
 		'"Why not?"'
+		'"I just can''t. I''m sorry."'
+		'You leave the apartment.'
+		!! missing code
+		!! lover removal code
+		act'Leave':gt'booty_call_after','exit'
+	end
+!!{
 		act'You don''t satisfy me anymore':
 		
 		
@@ -831,8 +856,36 @@ if $ARGS[0] = 'shower_together':
 		'<center><video autoplay loop src="images/shared/sex/shower/grope1.mp4"></video></center>'
 		'It doesn''t take long before you feel <<$npc_firstname[$boy]>>''s hands on you, running up and down your body, across your breasts and down towards your pussy.'
 		act'Protest':
-			cla
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/shower/grope1.mp4"></video></center>'
+			'"Hey!" you protest.'
+			act'I''m not in the mood':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/shower/grope1.mp4"></video></center>'
+				'"Hey!" you protest. "I''m not in the mood for this."'
+				if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+					'"They were staring right at me," he grins. But he backs off as you asked.'
+				else
+					'"You showed up for a booty call didn''t you?"'
+					'"Yeah, and now I''m done. Keep it in your pants."'
+					'"Fine, fine." He backs off, as you asked.'
+				end
+				act'Finish shower':gt'booty_call_after','shower_together_end'
+			end
 			
+			act'I don''t have time':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/shower/grope1.mp4"></video></center>'
+				'"Hey!" you protest. "I don''t have time for this. I have shit to do and I can''t have you making me late."'
+				if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+					'"They were staring right at me," he grins. But he backs off as you asked.'
+				else
+					'"You showed up for a booty call didn''t you?"'
+					'"Yeah, and now I have something <i>else</i> to do."'
+					'"Fine, fine." He backs off, as you asked.'
+				end
+				act'Finish shower':gt'booty_call_after','shower_together_end'
+			end
 		end
 		
 		act'Enjoy his touch':
@@ -844,7 +897,7 @@ if $ARGS[0] = 'shower_together':
 			act'That''s enough':
 				cla & *nl
 				'"Okay, that''s enough for now," you smile at him.'
-				if npc_condom_conscious[$boy] = 1:
+				if npc_condom_conscious[$boy] = 1 or booty_call['cum_count'] >= npc_sexdrive[$boy]:
 					'<<$npc_firstname[$boy]>> backs down and you finish your shower together.'
 					act'Finish shower':gt'booty_call_after','shower_together_end'
 				else
@@ -856,7 +909,7 @@ if $ARGS[0] = 'shower_together':
 						act'Finish shower':gt'booty_call_after','shower_together_end'
 					end
 					
-					act'Well...':
+!!{					act'Well...':
 						cla & *nl
 						gs'arousal','massage',5,'no_orgasm_msg'
 						'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel so wet, and it''s not just the shower.'
@@ -866,7 +919,7 @@ if $ARGS[0] = 'shower_together':
 						else
 							'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he pushes his cock inside you.'
 						end
-						act'Finish shower':gt'booty_call_after','shower_together_sex'
+						act'Shower sex':gt'booty_call_after','shower_together_sex'
 					end
 					
 					if booty_call['condom'] = 1:
@@ -874,15 +927,15 @@ if $ARGS[0] = 'shower_together':
 							cla & *nl
 							'"We don''t have a condom," you protest.'
 							
-						end
-					end
+						end}
+!!					end
 				end
 			end
 			
-			act'':
+!!			act'Shower sex':
 			
 			
-			end
+!!			end
 		end
 	end
 end

+ 297 - 1451
locations/booty_call_morning.qsrc

@@ -2,38 +2,25 @@
 
 if $ARGS[0] = 'morning':
 	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
-	if pcs_makeup > 1 and cosmetic_tattoo = 0:
-		pcs_makeup = 0
-		vidageday -= 1
-		*nl
-		if hangover = daystart:
-			!! hungover
-			'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover. With an internal groan, you realize your makeup still smeared across your face from last night too.'
-		else
-			'Something stirs in your mind and you slowly come to consciousness. Blearily, you wake up, wondering why your face feels itchy before you internally groan, realizing you never washed off your makeup last night and it''s now smeared across your face.'
-		end
-	elseif hangover = daystart:
+!!{	if hangover = daystart:
 		'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover.'
-	else
-		'Something stirs in your mind and you slowly come to consciousness. Blearily, you rub your forehead, yawning as you wake up.'
-	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
-		!! late for school
-		act'Continue':gt'booty_call_morning','late_for_school'
-	else
-		*nl
-		if booty_call['sleep_accident'] = 1:
-			gs'booty_call_morning','confused'
-		else
-			gs'booty_call_morning','wakeup'
+		act'<i>Ugh, my head</i>':gt'booty_call_morning','hangover'
+	else}
+		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
+		act'<i>Yawn</i>':gt'booty_call_morning','yawn_wake'
+!!	end
+	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+		act'School!':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
+			'Your eyes snap open. You frantically grab for your phone and turn on the screen.'
+			gs'booty_call_morning','late_for_school'
 		end
 	end
+!!	if pcs_boyfriend > 0:act'Guilt':gt'booty_call_morning','guilt'
 end
 
 if $ARGS[0] = 'late_for_school':
-	cla & *clr
-	'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
-	'Eyes fluttering open, you see the faint light of the sun before they go wide in shock. You grab your phone and turn on the screen.'
 	*nl
 	'<b><<$month>> <<day>></b>'
 	'<b><<$week>></b>'
@@ -59,790 +46,157 @@ if $ARGS[0] = 'late_for_school':
 			'You need to get home and change into your uniform! You''re not sure if you have time for a shower, but you definitely <i>need</i> to get your uniform!'
 		end
 
-		if booty_call['continuation'] = 0:booty_call['continuation'] = rand(0,2)
-		if booty_call['continuation'] = 0:
-			'"Hey, what''s wrong?" <<$npc_firstname[$npclastsaved]>> says, turning over and squinting at you with sleepy eyes.'
-			act'I need to be somewhere!':
-				cla & *nl
-				'"I''m gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
-				act'Leave':gs'booty_call_after','exit'
-			end
+		'"Hey, what''s wrong?" <<$npc_firstname[$boy]>> says, turning over and squinting at you with sleepy eyes.'
+		act'I need to be somewhere!':
+			cla & *nl
+			'"I''m gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
+			act'Leave':gs'booty_call_after','exit'
+		end
 
-			act'I''m gonna be late for school!':
-				cla & *nl
-				if PCloStyle2 = 4:
-					!! you were wearing your school uniform last night
-					'"I need to go! I''m going to be late for school!" you huff, pulling your skirt up and buttoning your shirt as fast as you can. It''s a bit wrinkled from laying in a pile all night, but it''ll do in a pinch.'
-				else
-					'"I need to go! I''m going to be late for school!" you huff. "I need to go home! I don''t have my uniform! Shit! <i>Fuck!</i>"'
+		act'I''m gonna be late for school!':
+			cla & *nl
+			if PCloStyle2 = 4:
+				!! you were wearing your school uniform last night
+				'"I need to go! I''m going to be late for school!" you huff, pulling your skirt up and buttoning your shirt as fast as you can. It''s a bit wrinkled from laying in a pile all night, but it''ll do in a pinch.'
+			else
+				'"I need to go! I''m going to be late for school!" you huff. "I need to go home! I don''t have my uniform! Shit! <i>Fuck!</i>"'
+			end
+			if npc_car[$boy] = 1 and npc_selfish[$boy] ! 1:
+				'"You need a ride? I can drop you off in my car."'
+				act'No thanks':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"No, I''ll be okay. Thanks for the offer though." '
+					*nl
+					'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
+					act'Leave':gs'booty_call_after','exit'
 				end
-				if npc_car[$boy] = 1:
-					'"You need a ride? I can drop you off in my car."'
-					act'No thanks':
-						cla & *clr
-						$npc_apt_bedroom[$boy]
-						'"No, I''ll be okay. Thanks for the offer though." With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-!!{					act'That''d be great':
-						cla & *clr
-						$npc_apt_bedroom[$boy]
-						'"Really? That''d be great!" With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
-						
-					end}
+				
+				act'That''d be great':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
 					
-					act'Can''t let people see':
+					'"Really?" you perk up. "That''d be great!"'
+					'"Let me just get dressed."'
+					'You collect the rest of your things while he throws on some clothes and grabs his keys, then both of you head outside and climb into his car.'
+					'"Where do you want me to take you?" he asks'
+					act'Take me home':booty_call['give_lift'] = 1 & gt'booty_call_morning','give_lift'
+					act'Take me to school':booty_call['give_lift'] = 2 & gt'booty_call_morning','give_lift'
+				end
+				
+				if npc_residence[$boy] = 1:
+					act'I can walk':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
-						'You hesitate for a moment, considering. "No," you shake your head. "I don''t want someone seeing me get out of your car. Rumors already spread through my school. I can''t risk it." With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
+						'"Nah," you shake your head. "It''s okay. It''s right here in the residential area. I can just walk.Thanks for the offer though."'
+						*nl
+						'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
 						act'Leave':gs'booty_call_after','exit'
 					end
-				else
-					
-				end
-			end
-		elseif booty_call['continuation'] = 1:
-			!! FWB/Booty calls?
-			'"I had a good time last night," he says, seeming to ignore your panic.'
-			'"Yeah?" you reply absentmindedly, looking for your bag.'
-			'"I''d love to hook up with you again sometime."'
-			'"What, just like fuck buddies or something?" you say, kneeling on the floor looking under the furniture.'
-			'"Yeah."'
-		elseif booty_call['continuation'] = 2:
-			!! Ask to start dating
-			'"I know you''re in a rush but I just wanted to let you know I had a really good time last night."'
-			'"Yeah?" you reply absentmindedly, looking for your bag.'
-			'"Could I see you again sometime? Take you out on a date or something?"'
-		end
-
-		if booty_call['continuation'] > 0:
-			act'I don''t have time for this!':
-				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
-				'"I really don''t have time for this right now! Gotta go!"'
-				if PCloStyle2 = 4:
-					!! you were wearing your school uniform last night
-					'You quickly check your uniform one last time, making sure everything''s in place. It''s a bit wrinkled from laying in a pile all night, but it''ll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
-				else
-					'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
 				end
-				act'Leave':gt'booty_call_after','exit'
-			end
-
-			act'<i>Sure!Callme!</i>':
-				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
-				'"Uhh, sure!"'
-				'<i>Found it!</i> You grab your bag from where it slipped under the bed. Standing back up, you pull a pen from it and frantically scribble your number down on a piece of paper you found while you were looking around.'
-				if booty_call['continuation'] = 1:
-					'"Call me when you want to hook up!" you shout over your shoulder as you run out the door.'
-				elseif booty_call['continuation'] = 2:
-					'"Call me when you want to hang out!" you shout over your shoulder as you run out the door.'
+				
+				act'Can''t let people see':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'You hesitate for a moment, considering it. "No," you shake your head. "I don''t want someone seeing me get out of your car. Rumors spread like fire at my school. I can''t risk it." With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
+					act'Leave':gs'booty_call_after','exit'
 				end
-				act'Leave':gt'booty_call_after','exit'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'dress_loop1':
-	:dress_loop_start
-	if $lastpantyworntype ! 'none' and $pantyworntype = 'none':
-		gs'panties','wear'
-		$booty_call['dress_describe'] = 'pulling your panties up your legs'
-	elseif $lastbraworntype ! 'none' and $braworntype = 'none':
-		gs'bras','wear'
-		$booty_call['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back.'
-	elseif $clothingworntype = 'nude':
-		gs'clothing','wear'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude':
-		if CloDress = 1:
-			booty_call['dress_end'] = 1	
-			$booty_call['dress_describe'] = 'pulling your dress up'
-		else
-			if booty_call['pants_dress'] = 0 and booty_call['dress_end'] ! 1:
-				booty_call['pants_dress'] = 1
-				$booty_call['dress_describe'] = 'tugging your pants over your hips'
 			else
-				booty_call['dress_end'] = 1	
-				$booty_call['dress_describe'] = 'pulling your top down'
+				'With one last quick check, you make sure all your clothes are in place and grab the rest of your things. "See you later!" you call over your shoulder as you rush out the door.'
+				act'Leave':gs'booty_call_after','exit'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'confused':
-	minut += rand(1,5)
-	'What happened last night...? You blink blearily, looking around, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
+if $ARGS[0] = 'yawn_wake':
+	cla & *clr
+	$npc_apt_bedroom[$boy]
+	'You open your mouth wide, yawning loudly and stretching your arms back as the covers fall off of you.'
+	'Your movement causes <<$npc_firstname[$boy]>> to stir as well, blinking his eyes open. Reaching down, you grab your phone and switch on the display.'
 	*nl
-	'That''s right! You hooked up with a guy last night and accidentally fell asleep in his bed...'
-	act'... <i>his</i> bed...?':
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
-		'Wait... If you fell asleep in his bed, then...'
-		*nl
-		gs'booty_call_morning','wakeup'
-	end
-	if StoryLine = 1:
-		act'Mom! Shit!':
-			gs'stat'
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
-			'... in his bed? Wait! Shit!'
-			'You grab for your phone, turning on the display to check the time.'
-			*nl
-			if minut = 0:
-				'<b><<hour>>:00</b>'
-			elseif minut < 10:
-				'<b><<hour>>:0<<minut>></b>'
-			else
-				'<b><<hour>>:<<minut>></b>'
-			end
-			*nl
-			'Fuck! You never went home last night!'
-			'<i><<$npc_nickname[''A29'']>>''s gonna kill me!</i>'
-			act'Get dressed!':
-				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
-				if npc_earlyriser = 1:
-						'You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<$npc_firstname[$npclastsaved]>>? Was that his name?) isn''t in the room but you can hear water running. He must be in the shower.'
-					if cumloc[11] > 0:
-						*nl
-						'There''s no time for that anywa- Wait, what''s this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<$npc_nickname[''A29'']>> is going to <i>strangle</i> you if you don''t clean this up before you get home!'
-					end
-
-					act'Rush out':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'No time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before heading out the door, accidentally slamming it behind you in your rush.'
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-					act'Leave your number for hooking up':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'No time to say goodbye, but you don''t want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:'
-						*nl
-						'	<i>Hey,</i>'
-						'	<i>I had a lot of fun last night but I really gotta go! Gimme a call if you wanna hook up again!</i>'
-						*nl
-						'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
-						*nl
-						'Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.'
-						
-						if npc_goal[$npclastsaved] = 1:gs'lover','add',$boy
-						
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-					act'Leave your number for dating':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'No time to say goodbye, but you don''t want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:'
-						*nl
-						'	<i>Hey,</i>'
-						'	<i>I had a lot of fun last night but I really gotta go! I''d really love to see you again sometime! Call me? Maybe we can go on a date?</i>'
-						*nl
-						'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
-						*nl
-						'Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.'
-						
-						if npc_goal[$npclastsaved] > 1:gs'lover','add',$boy
-						
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-				elseif npc_latesleeper = 1:
-						'You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<$npc_firstname[$npclastsaved]>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.'
-					if cumloc[11] > 0:
-						*nl
-						'Where the hell is your- Wait, what''s this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<$npc_nickname[''A29'']>> is going to <i>strangle</i> you if you don''t clean this up before you get home!'
-					end
-					act'Rush out':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'You definitely don''t feel like waking him up and besides, there''s no time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-					act'Leave your number for hooking up':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'You definitely don''t feel like waking him up, but you don''t want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:'
-						*nl
-						'	<i>Hey,</i>'
-						'	<i>I had a lot of fun last night but I really gotta go! Gimme a call if you wanna hook up again!</i>'
-						*nl
-						'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
-						*nl
-						'Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
-						
-						if npc_goal[$npclastsaved] = 1:gs'lover','add',$boy
-						
-						act'Leave':gs'booty_call_after','exit'
-					end
-					
-					act'Leave your number for dating':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'No time to say goodbye, but you don''t want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:'
-						*nl
-						'	<i>Hey,</i>'
-						'	<i>I had a lot of fun last night but I really gotta go! I''d really love to see you again sometime! Call me? Maybe we can go on a date?</i>'
-						*nl
-						'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
-						*nl
-						'Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
-						
-						if npc_goal[$npclastsaved] > 1:gs'lover','add',$boy
-						
-						act'Leave':gs'booty_call_after','exit'
-					end
-				else
-					'You frantically haul yourself out of bed and start grabbing clothing off the floor. The guy you slept with last night (<<$npc_firstname[$npclastsaved]>>? Was that his name?) starts awake, rapidly blinking in confusion at the noise you''re making.'
-					'"Hey, what''s going on?" he asks.'
-					'"I didn''t mean to stay here last night!" you explain hastily, tugging your clothes on. "My <<$npc_nickname[''A29'']>> is gonna <i>kill</i> me for not coming home!"'
-					if cumloc[11] > 0:
-						*nl
-						'As you move to brush your messy hair out of your face, you realize there''s something something strange there. Some kind of crusty white substance? It''s kind of flakey and-'
-						'"HOLY FUCK! I fell asleep with your cum on my face?! Why didn''t you say something? <<$npc_nickname[''A29'']>> really is going to kill me if I come home looking like this!"'
-					end
-					if booty_call['continuation'] = 0:booty_call['continuation'] = rand(0,2)
-					if booty_call['continuation'] = 0:
-						act'Rush out':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'You finish getting dressed as quickly as possible and give yourself a once over before grabbing your stuff and rushing out the door, accidentally slamming it behind you.'
-							act'Leave':gs'booty_call_after','exit'
-						end
-						
-						act'Ask to hook up again later':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Listen," you say, still panickedly looking for your bag. "I''m in a rush now but I still want to see you again. We could hook up again? Like we did last night?"'
-							if npc_goal[$npclastsaved] = 1:
-								'"What, like fuck buddies?"'
-								'"Yeah, just like that," you say, finally finding it under the bed somehow.'
-								'"Sure, I''ll sleep with you again if you''re offering."'
-								'"Great!" You pull out a pen and frantically scribble your number down on a piece of paper you found while you were looking around. "Text me when you want to hook up!" you shout over your shoulder as you run out the door.'
-								gs'lover','add',$boy
-							elseif rand(1,3) = 1:
-								'"Nah, this was a one time thing. I never fuck the same girl twice."'
-								'Despite the desperation of your situation, his comment gives you pause for a moment and you turn to give him a look. "Seriously?"'
-								'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-								'<i>Free access to pussy and you''re just gonna turn it down. Whatever...</i> you think to yourself finally managing to find your bag where it somehow slipped beneath the bed.'
-								*nl
-								'"Well, see you never then," you say and hurry out the door.'
-							else
-								'"That''s uhh... Well it''s not really something I''m interested in."'
-								'"Your loss," you shrug, yanking your bag out from underneath the bed. How did it even get down there anyways?! Without another word, you run out the door, slamming it behind you.'
-							end
-							
-							act'Leave':gs'booty_call_after','exit'
-						end
-						
-						act'Ask to go on a date':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Listen," you say, still panickedly looking for your bag. "I''m in a rush now but I still want to see you again. We could go on a date or something?"'
-							if npc_goal[$npclastsaved] > 1:
-								'"Yeah, I think I''d like that," he smiles at you.'
-								'"Great!" Despite the desperation of your situation, you can''t help but smile at his words when you finally find your bag hiding underneath his bed. How did it get down there anyways?! You pull out a pen and frantically scribble your number down on a piece of paper you found earlier and rush towards the door.'
-								*nl
-								'"Call me sometime!" you shout over your shoulder as you slam it behind you.'
-								gs'lover','add',$boy
-							elseif rand(1,3) = 1:
-								'"Nah, this was a one time thing. I never fuck the same girl twice."'
-								'Despite the desperation of your situation, his comment gives you pause for a moment and you turn to give him a look. "Seriously?"'
-								'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-								'<i>Wow... You can really pick em, huh <<$pcs_nickname>>...</i> you think to yourself finally managing to find your bag where it somehow slipped beneath the bed. <i>Ugh. Whatever...</i>'
-								*nl
-								'"Well, see you never then," you say feeling a little hurt, and hurry out the door.'
-							else
-								'"That''s uhh... I''m not really interested in anything like that. I''m really just in it for sex to be honest."'
-								'"Oh... Okay then..." you reply, stiffling your hurt feelings. You finally yank your bag out from underneath the bed. How did it even get down there anyways?! "See you later, I guess..." you say awkwardly, running out the door and slamming it behind you.'
-							end
-							
-							act'Leave':gs'booty_call_after','exit'
-						end
-					else
-						if npc_goal[$npclastsaved] = 1:
-							!! FWB/Booty calls?
-							'"I had a good time last night," he says, seeming to ignore your panic.'
-							'"Yeah?" you reply absentmindedly, looking for your bag.'
-							'"I''d love to hook up with you again sometime."'
-							'"What, just like fuck buddies or something?" you say, kneeling on the floor looking under the furniture.'
-							'"Yeah."'
-						elseif npc_goal[$npclastsaved] > 1:
-							!! Ask to start dating
-							'"I know you''re in a rush but I just wanted to let you know I had a really good time last night."'
-							'"Yeah?" you reply absentmindedly, looking for your bag.'
-							'"Could I see you again sometime? Take you out on a date or something?"'
-						end
-						
-						act'I don''t have time for this!':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Sorry, I really don''t have time for this right now and honestly, I''m just not interested," you say, finally finding your bag beneath the bed and yanking it out. "Gotta go!"'
-							'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
-							act'Leave':gt'booty_call_after','exit'
-						end
-						
-						act'<i>Sure!Callme!</i>':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Uhh, sure!"'
-							'<i>Found it!</i> You grab your bag from where it slipped under the bed. Standing back up, you pull a pen from it and frantically scribble your number down on a piece of paper you found while you were looking around.'
-							if booty_call['continuation'] = 1:
-								'"Text me when you want to hook up!" you shout over your shoulder as you run out the door.'
-							elseif booty_call['continuation'] = 2:
-								'"Call me when you want to hang out!" you shout over your shoulder as you run out the door.'
-							end
-							act'Leave':gt'booty_call_after','exit'
-						end						
-					end
-				end
-			end
-		end
+	'<b><<$month>> <<day>></b>'
+	'<b><<$week>></b>'
+	if minut = 0:
+		'<b><<hour>>:00</b>'
+	elseif minut < 10:
+		'<b><<hour>>:0<<minut>></b>'
+	else
+		'<b><<hour>>:<<minut>></b>'
 	end
+	gs'booty_call_morning','wakeup'
 end
 
-if $ARGS[0] = 'wakeup':
-
-!!{	if npc_earlyriser = 1:
-		!! he woke up before you
-		
-		if npc_generous[$npclastsaved] = 1 and npc_apt_type[$npclastsaved] ! 1:
-			!! breakfast in bed
-			booty_call['b_i_b'] = 1
-			if booty_call['sleep_accident'] = 0:
-				'You wake up, blearily blinking and slightly confused, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
-			else
-				'Turning over, you look for the the guy you were with last night (<<$npc_firstname[$npclastsaved]>>? Was that his name?) only to find that you''re alone in the bed, no one else with you.'
-			end
-			*nl
-			if npc_apt_type[$npclastsaved] = 2:
-				'Slowly, you realize you smell food and looking up, you see <<$npc_firstname[$npclastsaved]>> in the corner of the room, standing in front of a tiny stove.'
-			else
-				'You start when the door opens and <<$npc_firstname[$npclastsaved]>> walks in holding a tray.'
-				'"Sorry about that," he grins. "You were still sleeping so I didn''t want to wake you up. I made breakfast."'
-			end
-
-			act'Clingy much?':
-				cla & *clr
-				!! IMAGE HERE
-				'Geez, clingy much?'
-				act'Take the food':
-			end
-
-			act'Wow, thanks!':
-				cla & *clr
-				!! IMAGE HERE
-
-			end
-		else
-			if booty_call['sleep_accident'] = 0:
-				'You wake up, blearily blinking and slightly confused, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
-			else
-				'Turning over, you look for the the guy you were with last night (<<$npc_firstname[$npclastsaved]>>? Was that his name?) only to find that you''re alone in the bed, no one else with you.'
-			end
-			if npc_apt_type[$npclastsaved] = 1:
-				'It''s a... dorm room...?'
-			elseif npc_apt_type[$npclastsaved] = 2:
-				'He''s in the shower'
-			elseif npc_apt_type[$npclastsaved] = 3:
-				'He''s in the shower and you can hear it through the wall'
-			else
-				'You''re alone'
-			end
-		end
-	elseif npc_latesleeper = 1:
-		'You turn and see him still sleeping next to you.'
-		act'Slip out of bed':
-			cla & *clr
-			!! IMAGE HERE
-			'Slip out of bed, get dressed'
-			act'Sneak out':
-				cla & *clr
-				!! IMAGE HERE
-
-				act'Leave':gt'booty_call_after','exit'
-			end
-			act'Leave your number behind':
-				cla & *clr
-				!! IMAGE HERE
-
-				act'Leave':gt'booty_call_after','exit'
-			end
-		end
-
-		act'Look for the shower':
-
-
-			dynamic $showerdin
-
-		end
-
-		act'Wake him up with a blowjob':
+if $ARGS[0] = 'wakeup1':
+!!	if npc_earlyriser = 1:
+!!		gt'booty_call_morning','earlyriser1'
+!!	elseif npc_latesleeper = 1:
+!!		gt'booty_call_morning','latesleeper'
+!!	else
+	act'Prepare to leave':gt'booty_call_morning','head_out'
+	if $clothingworntype = 'nude':
+		act'Get dressed':
 			cla & *clr
-			!! IMAGE HERE
-			gs 'arousal','bj',rand(2,5)
-			gs 'stat'
-			'You blow him until he wakes up.'
-			act'Keep sucking':
-				gs 'arousal','bj',rand(2,5)
-				gs 'stat'
-
-				'I''m gonna cum!'
-				act'Let him cum in your mouth':
-
-
-				act'Let him cum on your face':
-
-
-			end
-
-			if pcs_vag > 0:
-				act'Let''s fuck':
-					booty_call['position'] = rand(1,3)
-					if booty_call['position'] = 1:
-						!! IMAGE HERE
-
-					elseif booty_call['position'] = 2:
-
-					elseif booty_call['position'] = 3:
-
-
-					end
-					if booty_call['condom'] = 1:
-						'He starts reaching for a condom'
-
-						act'Wait for him':
-
-							'Impatient waiting'
-
-							act'Sex':gt'booty_call_morning','morning_fuck'
-						end
-
-						act'Skip it!'
-
-							'Skip it! I need you inside me now!'
-							if npc_condomconscious = 1:
-								'No'
-							else
-								booty_call['condom'] = 2
-								'Hell yeah'
-							end
-							act'Sex':gt'booty_call_morning','morning_fuck'
-						end
-					else
-
-					end
-					gt'booty_call_morning','fuck'
-				end
-			end
-		end
-		if npc_apt_type[$npclastsaved] > 2:
-			act'Put your underwear on':
-
-			end
-
-			act'Go explore his place':gt'booty_call_morning','explore'
-
-			act'Find the kitchen':
-
-		end
-	else}
-		'Turning over, you see <<$npc_firstname[$npclastsaved]>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.'
-		'"Mornin''," he mumbles. "You just wake up too?"'
-		'"Yeah," you mumble back.'
-		act'I need coffee':
-			cla & *clr
-			$npc_apt_bedroom[$npclastsaved]
-			booty_call['coffee'] = 1
-			'"I could really use a cup of coffee," you say.'
-			if npc_apt_type[$npclastsaved] > 2:
-				!! if not a studio or a dorm
-				'"Me too. I have some in the kitchen if you wanna come with."'
-				act'Sure':
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/romance/misc/nude_walk1.mp4"></video></center>'
-					'"Sure, lead the way."'
-					'You climb out of bed, not bothering to get dressed as you follow him. You already spent the night naked with him, what''s a cup of coffee longer?'
-					if npc_apt_spare[$npclastsaved] = 1:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a desk with a monitor and a keyboard on top.</a> <i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
-						*nl
-						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
-					elseif npc_apt_spare[$npclastsaved] = 2:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a room filled with various exercise equipment.</a> <i>Likes to work out huh?</i> you think to yourself, strutting past.'
-						*nl
-						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
-					else
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
-					end
-
-					act'Wait':gt'booty_call_morning','coffee'
-				end
-
-				act'I''ll catch up (get dressed first)':
-					cla & *clr
-					$npc_apt_bedroom[$npclastsaved]
-					'"Sounds good, but I''ll catch up. I think I''d like to avoid any accidents with hot drinks and bare skin," you smirk.'
-					'"Yeah that''s a good idea," he agrees. Reaching down, he pulls on a pair of shorts before stepping out of the room. "Just come out whenever you''re ready."'
-					'"I will," you reply as the door clicks shut behind him.'
-					act'Get dressed':
-						cla & *clr
-						'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-						gs'clothing','wear_last_worn'
-						gs'underwear','wear'
-						gs'stat'
-						'Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<$npc_firstname[$npclastsaved]>> in the kitchen.'
-						act'Continue':gt'booty_call_morning','coffee'
-					end
-				end
-
-				act'Borrow your shower?':gt'booty_call_morning','shower'
-			else
-				'"Me too. Let me just get the pot going." Getting up from the bed, he steps across his tiny room to his little kitchen and starts rifling through cupboards, pulling out various coffee paraphernalia.'
-				act'Wait in bed':
-					cla & *clr
-					$npc_apt_bedroom[$npclastsaved]
-					'You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<$npc_firstname[$npclastsaved]>> pours two cups, bringing one over to you.'
-					'"Here you go."'
-					'"Thanks," you smile, taking the cup from him and bringing it to your lips.'
-					act'Focus on the coffee':
-						cla & *clr
-						minut += 2
-						gs 'beverage','coffee'
-						'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
-						'Your attention is completely consumed by the coffee as you drink it greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
-						act'Time to get going':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
-							'"That was great," you sigh. "But I should get going."'
-							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
-							act'Get dressed':gt'booty_call_morning','morning_leave'
-
-							gs'booty_call_morning','later_nude'
-						end
-						!! act'Doing anything later today?':
-					end
-
-					act'Make small talk':
-						cla & *clr
-						minut += 2
-						gs 'beverage','coffee'
-						'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
-						'You make small talk while drinking coffee.'
-						act'Time to get going':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"That was great," you sigh. "But I should get going."'
-							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
-							act'Get dressed':gt'booty_call_morning','morning_leave'
-
-							gs'booty_call_morning','later_nude'
-						end
-					end
-				end
-
-				act'Get dressed':
-					cla & *clr
-					gs'booty_call_after','dress'
-					minut += 1
-					'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-					'While the coffee brews, you haul yourself out of bed and pick up your clothes from where you threw them last night. You frown, noticing they''re a bit wrinkled, but it''s not like you cared much about hanging it up last night or anything like that. Whatever, nothing you can do about it now.'
-					*nl
-					'By the time you''ve pulled them on, the coffee is done and <<$npc_firstname[$npclastsaved]>> pours two cups, handing one to you.'
-					'"Thanks," you smile, taking it gratefully.'
-					act'Drink':
-						cla & *clr
-						minut += 2
-						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
-						'It''s cheap stuff, but caffeine is caffeine and you drink it greedily, savoring every gulp. Within a couple minutes, the mug is empty.'
-						act'Time to get going':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"That was great," you sigh. "But I should get going."'
-							'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-							act'Gather your things':gt'booty_call_morning','morning_leave'
-
-							gs'booty_call_morning','later_dressed'
-						end
-					end
-
-					act'Make small talk':
-						cla & *clr
-						minut += 2
-						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
-						'You make small talk while drinking coffee.'
-						act'Time to get going':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"That was great," you sigh. "But I should get going."'
-							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
-							act'Gather your things':gt'booty_call_morning','morning_leave'
-
-							gs'booty_call_morning','later_dressed'
-						end
-					end
-				end
-
-				act'Borrow your shower?':gt'booty_call_morning','shower'
-			end
+			$npc_apt_bedroom[$boy]
+			gs 'shortgs','dress'
+			'You get dressed.'
+			gs'booty_call_morning','wakeup1'
 		end
+	end
+	
+	if booty_call['morning_shower'] = 0:
+		act'Head to the shower':gt'booty_call_morning','shower'
+	end
+	
+!!	act'Snuggle back into bed':
+	
+end
 
-		act'Can I use your shower?':gt'booty_call_morning','shower'
-!!	end
-!!	this end is for earlyrising and latesleeping
+if $ARGS[0] = 'wakeup2':
+	if booty_call['morning_shower'] = 1:
+		booty_call['morning_shower'] = 3
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_wet.jpg"></center>'
+		'You leave the bathroom wrapped in a towel.'
+	elseif booty_call['morning_shower'] = 2:
+		$npc_apt_bedroom[$boy]
+		'You leave the bathroom naked.'
+	elseif booty_call['morning_shower'] = 3:
+		$npc_apt_bedroom[$boy]
+		'Hair still wet from the shower, you consider what to do next.'
+	else
+		$npc_apt_bedroom[$boy]
+		'You are in <<$npc_firstname[$boy]>>''s room.'
+	end
+	gs'booty_call_morning','wakeup1'
 end
 
 if $ARGS[0] = 'shower':
 	booty_call['morning_shower'] = 1
-	$npc_apt_bathroom[$npclastsaved]
-	if npc_apt_type[$npclastsaved] > 2:
-		'"Actually, do you mind if I borrow your shower?"'
-		'"Yeah, go ahead. You can catch up when you''re done."'
-		'"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<$npc_firstname[$npclastsaved]>>''s bathroom in the hallway and hop in the shower.'
-	else
-		'"Mind if I borrow your shower?" you ask, glancing towards the bathroom door of his small apartment.'
-		'"Yeah, go ahead."'
-		'"Thanks," you smile gratefully. Hauling yourself out of the bed, you duck inside, twist the faucet of the shower.'
-	end
-	act'Shower':
+	$npc_apt_bathroom[$boy]
+	'You pull yourself out of bed and pad your way over to the bathroom, yawning again along the way.'
+	act'Turn on the water':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		minut += 10
 		shampoo += 1
-		'You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<$npc_firstname[$npclastsaved]>>''s shampoo and start scrubbing your hair, washing it out shortly after.'
+		'You twist the faucet and hot water comes rushing out, pouring over you, soaking into your skin. Slowly over time, it washes away your sleepiness and brings your mind clarity.'
 		dynamic $showerdin
 		*nl
-		'Figuring you''ve used enough of his water, you turn off the tap and step out.'
-		if booty_call['coffee'] = 1 and npc_apt_type[$npclastsaved] > 2:
-			act'Go to the kitchen':gt'booty_call_morning','coffee'
-
-			act'Go get dressed':
-				cla & *clr
-				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-				gs'clothing','wear_last_worn'
-				gs'underwear','wear'
-				gs'stat'
-				'Heading back to <<$npc_firstname[$npclastsaved]>>''s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.'
-				act'Go to the kitchen':gt'booty_call_morning','coffee'
-			end
-		elseif booty_call['coffee'] = 1:
-			act'Time for coffee':gt'booty_call_morning','coffee'
-
-			act'Go get dressed':
-				cla & *clr
-				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-				gs'clothing','wear_last_worn'
-				gs'underwear','wear'
-				gs'stat'
-				'Stepping out of the bathroom, you''re immediately hit by the smell of cooked food.'
-				'"Coffee''s done," <<$npc_firstname[$npclastsaved]>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you''re ready. I thought I''d fry up some eggs while you were in there."'
-				'"Thanks," you say, beginning to pick up your clothes. "I''m just going to get dressed first. Don''t want any accidents."'
-				'"Yeah sure. Help yourself when you''re ready."'
-				'You tug your clothes on, frowning at the wrinkles on them. Well, that''s going to happen when you throw your clothes on the ground rushing to get into somebody''s pants.'
-				act'Just coffee':
-					cla & *clr
-					minut += 2
-					gs 'beverage','coffee'
-					$npc_apt_bedroom[$npclastsaved]
-					'You grab a mug and fill it up, drinking greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
-					'"No breakfast for you?"'
-					'"Coffee is all I need," you smile back.'
-					act'Time to get going':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-						act'Gather your things':gt'booty_call_morning','morning_leave'
-
-						gs'booty_call_morning','later'
-					end
-				end
-
-				act'Have breakfast together':gt'booty_call_morning','eggs'
-			end
-		elseif booty_call['b_i_b'] = 1:
-			act'Join <<$npc_firstname[$npclastsaved]>> for breakfast':gt'booty_call_morning','breakfast'
-
-			act'Get dressed':
-				cla & *clr
-				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-				gs'clothing','wear_last_worn'
-				gs'underwear','wear'
-				gs'stat'
-				if npc_apt_type[$npclastsaved] > 2:
-					'Feeling refreshed, you leave the bathroom and head back to <<$npc_firstname[$npclastsaved]>>''s room to tug on your clothes.'
-					act'Skip out on <<$npc_firstname[$npclastsaved]>>':
-						cla & *clr
-						$npc_apt_hall[$npclastsaved]
-						'While you''re at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<$npc_firstname[$npclastsaved]>> watches you with confusion.'
-						'"Hey! Where''re you going? You''re not staying for breakfast?"'
-						'"Sorry, I really can''t stay."'
-						'"Wait but-"'
-						'"Toodles!" You waggle your fingers and slip in and out the door in a second.'
-						*nl
-						'<i>Ugh. Why can''t a one night stand just be a one night stand anymore?</i>'
-						act'Leave':gt'booty_call_after','exit'
-					end
-					act'Head to the kitchen':gt'booty_call_morning','breakfast'
-				else
-					'Stepping out of the bathroom, you''re immediately hit by the smell of the food again.'
-					'"Have a good time in there?"'
-					'"The best," you grin back, heading straight for your clothes and tugging them on.'
-					'"So, gonna join me for breakfast then?"'
-					act'Nope, gotta go (skip out)':
-						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
-						'"Nope, gotta go."'
-						'"You sure? I-"'
-						'"Nah, I''m good." Grabbing the rest of your things, you pop open the door and waggle your fingers at him. "Toodles!" and shut the door behind you.'
-						*nl
-						'<i>Geez. Who cooks breakfast after a hookup?</i>'
-						act'Leave':gt'booty_call_after','exit'
-					end
-					act'Just coffee':
-						cla & *clr
-						minut += 2
-						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
-						'"Just coffee for me," you smile. Grabbing a mug, you fill it up with coffee and enjoy a long sip. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
-						act'Time to get going':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"That was great," you sigh. "But I should get going."'
-							'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-							act'Gather your things':gt'booty_call_morning','morning_leave'
-
-							gs'booty_call_morning','later'
-						end
-					end
-
-					act'Sure':gt'booty_call_morning','breakfast'
-				end
-
-			end
-		else
-			act'Dry off':
-				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
-				'You step out of the bathroom and see <<$npc_firstname[$npclastsaved]>> still laying in bed.'
-				'"Love that view," he smirks, shamelessly ogling your moist naked body.'
-				'"Thanks, I really needed that," you smile back. "I should really get going though."'
-				act'Get dressed':gt'booty_call_morning','morning_leave'
-				gs'booty_call_morning','later'
-			end
-		end
+		'Feeling sufficiently awake, you turn off the tap and step out of the shower.'
+		act'Wrap yourself in a towel':gt'booty_call_morning','wakeup2'
+		act'Just dry off':booty_call['morning_shower'] = 2 & gt'booty_call_morning','wakeup2'
+	end
+end
+
+if $ARGS[0] = 'head_out':
+	if $clothingworntype = 'nude':
+		gt'booty_call_morning','dressing1'
+	else
+	
 	end
 end
 
+
 !!{
 if $ARGS[0] = 'hangover':
 
@@ -852,7 +206,7 @@ if $ARGS[0] = 'hangover':
 		act'I need coffee':
 			cla & *nl
 			'"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-			'"Me too." <<$npc_firstname[$npclastsaved]>> says, seemingly in the same state.'
+			'"Me too." <<$npc_firstname[$boy]>> says, seemingly in the same state.'
 
 		end
 
@@ -874,736 +228,228 @@ if $ARGS[0] = 'hangover':
 		act'I''m so hungover':
 			cla & *clr
 			booty_call['im_hungover'] = 1
-			$npc_apt_bedroom[$npclastsaved]
+			$npc_apt_bedroom[$boy]
 			'"I''m so hungover right now," you groan.'
 			'"Same..."'
 		end
 	end
 end}
 
-if $ARGS[0] = 'explore':
-	booty_call['explore'] = 1
-	if $pantyworntype ! 'none':
-		!! IMAGE HERE
-
+if $ARGS[0] = 'dress_image':
+	if booty_call['CloDress'] = 1:
+		'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/bed_dress.jpg"></center>'
 	else
-		!! IMAGE HERE
-
-
-	end
-	if npc_apt_type[$npclastsaved] = 3:
-		'End up in the kitchen'
-
-	elseif npc_apt_type[$npclastsaved] = 4:
-
-		'Peek into a bunch of rooms, get naked surprised by roommates.'
-
-	elseif npc_apt_type[$npclastsaved] = 5:
-		'Peek into a bunch of rooms, end up in the kitchen.'
-
-	elseif npc_apt_type[$npclastsaved] = 6:
-		'Peek into a bunch of rooms, they''re very high quality.'
-	end
-
-
-end
-
-if $ARGS[0] = 'kitchen':
-	act'Look for some cereal':
-		cla & *clr
-
-		if booty_call['hangover'] = 1:
-
-		else
-
-		end
-		if npc_apt_type[$npclastsaved] = 1:
-			!! studio apartment
-			'<<$npc_firstname[$npclastsaved]>> wakes up'
-		else
-			'<<$npc_firstname[$npclastsaved]>> comes out'
-		end
-	end
-
-
-	act'Get a glass of water':
-		cla & *clr
-
-		if booty_call['hangover'] = 1:
-
-		else
-
-		end
-		if npc_apt_type[$npclastsaved] = 1:
-			!! studio apartment
-			'<<$npc_firstname[$npclastsaved]>> wakes up'
-		else
-			'<<$npc_firstname[$npclastsaved]>> comes out'
-		end
-
-	end
-
-
-	act'Cook breakfast':
-		cla & *clr
-
-		if booty_call['hangover'] = 1:
-			'You despreately need some thing to deal with this pounding headache'
-		else
-			'You cook breakfast normally.'
-		end
-		if npc_apt_type[$npclastsaved] = 4 and booty_call['explore'] ! 1:
-			'<<$npc_firstname[$npclastsaved]>>''s roommates come out'
-			act'Shriek':
-
-
-			end
-
-			act'Act casual':
-
-
-			end
-		else
-			if npc_apt_type[$npclastsaved] = 1:
-				!! studio apartment
-				'<<$npc_firstname[$npclastsaved]>> wakes up'
-			else
-				'<<$npc_firstname[$npclastsaved]>> comes out'
-			end
-			'"Made us breakfast"'
-			act'Eat together':
-				cla & *clr
-
-				!!{if npc_perv >= 70 or ($braworntype = 'none' and npc_perv >= 50):
-					'He starts coming onto you'
-					act'Stop it':
-
-					end
-
-					act'Let''s take this to the bedroom':gt'booty_call_morning','morning_sex'
-				else}
-					act'Finish eating and clean up':
-						cla & *clr
-						!! IMAGE HERE
-						'You clean up together'
-						gt'booty_call_morning','morning_leave'
-					end
-
-					act'Can I borrow your shower?':
-
-						dynamic $showerdin
-
-						gt'booty_call_morning','morning_leave'
-					end
-
-					gt'booty_call_morning','morning_leave'
-				!!end
-			end
-		end
+		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 	end
 end
 
+!! ------------------------------------ Dressing Stuff -------------------------------------------------------
 
-if $ARGS[0] = 'coffee':
-	if npc_apt_type[$npclastsaved] > 2:
-		!! not a studio or dorm
-		$npc_apt_kitchen
-		if booty_call['morning_shower'] = 1:
-			'As you wander towards the kitchen, you sniff the air, detecting something more than just coffee.'
-			'"That smells nice," you say, entering the room.'
-			if $clothingworntype = 'nude':
-				'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eg-"'
-				'He stops mid sentence when he sees you standing there naked, hair still wet from the shower. You smirk at his stare.'
-				'"Thanks."'
+if $ARGS[0] = 'dress_loop1':
+	:dress_loop_start
+	if $lastpantyworntype ! 'none' and $pantyworntype = 'none':
+		gs'panties','wear'
+		$booty_call['dress_describe'] = 'pulling your panties up your legs'
+	elseif $lastbraworntype ! 'none' and $braworntype = 'none':
+		gs'bras','wear'
+		$booty_call['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back.'
+	elseif $clothingworntype = 'nude':
+		gs'clothing','wear'
+		jump 'dress_loop_start'
+	elseif $clothingworntype ! 'nude':
+		if booty_call['dress_end'] = 0:
+			if CloDress = 1:
+				booty_call['dress_end'] = 1	
+				$booty_call['dress_describe'] = 'pulling your dress up'
 			else
-				'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs in the meantime. Coffee''s already done if you want to pour yourself a cup."'
-				'"Thanks."'
-			end
-			act'Just have coffee':
-				cla & *clr
-				minut += 2
-				gs 'beverage','coffee'
-				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
+				if booty_call['pants_dress'] = 0 and booty_call['dress_end'] ! 1:
+					booty_call['pants_dress'] = 1
+					$booty_call['dress_describe'] = 'tugging your pants over your hips'
 				else
-					$npc_apt_kitchen
-				end
-				'You grab a mug and fill it up, drinking greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
-				'"No breakfast for you?"'
-				'"Coffee is all I need," you smile back.'
-				act'Time to get going':
-					cla & *clr
-					if $clothingworntype = 'nude':
-						'<center><img <<$set_imgh>> src="images/shared/romance/misc/nude_kitchen1.jpg"></center>'
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
-					else
-						$npc_apt_kitchen
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-					end
-					act'Gather your things':gt'booty_call_morning','morning_leave'
-
-					gs'booty_call_morning','later'
+					booty_call['dress_end'] = 1	
+					$booty_call['dress_describe'] = 'pulling your top down'
 				end
 			end
-
-			act'Have breakfast with him':gt'booty_call_morning','eggs'
 		else
-			minut += 5
-			if $clothingworntype = 'nude':
-				'You follow <<$npc_firstname[$npclastsaved]>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.'
+			if CloDress = 1:
+				$booty_call['dress_describe'] = 'smoothing out your skirt'
 			else
-				'You step into the kitchen and are immediately hit by the wonderful smell of coffee.'
-				'"Hey, you''re just in time. Pot just finished brewing." He pours a cup and hands it to you, which you gratefully accept.'
-			end
-
-			act'Drink':
-				cla & *clr
-				minut += 2
-				gs 'beverage','coffee'
-				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
-				else
-					$npc_apt_kitchen
-				end
-				'You drink deeply, savoring the hot liquid as it runs down your throat. It''s cheap stuff, but caffeine is caffeine and you gulp it down greedily. Within a couple minutes, the mug is empty.'
-				act'Time to get going':
-					cla & *nl
-					if $clothingworntype = 'nude':
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
-						act'Get dressed':gt'booty_call_morning','morning_leave'
-					else
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-						act'Gather your things':gt'booty_call_morning','morning_leave'
-					end
-				end
-			end
-			act'Make small talk':
-				cla & *clr
-				minut += 2
-				gs 'beverage','coffee'
-				if $clothingworntype = 'nude':
-					!! if possible, replace with two people drinking coffee naked
-					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
-					'You make small talk as you sip your coffee.'
-				else
-					$npc_apt_kitchen
-					'You make small talk as you sip your coffee.'
-				end
-				act'Time to get going':
-					cla & *nl
-					if $clothingworntype = 'nude':
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
-						act'Get dressed':gt'booty_call_morning','morning_leave'
-					else
-						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-						act'Gather your things':gt'booty_call_morning','morning_leave'
-					end
-				end
-			end
-		end
-	else
-		!! studio apartment/dorm
-		$npc_apt_kitchen
-		if booty_call['morning_shower'] = 1 and $clothingworntype = 'nude':
-			'Stepping out of the bathroom, you''re immediately hit by the smell of cooked food.'
-			'"That smells nice," you say, stepping out into the room.'
-			'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs."'
-			'Ignoring your clothes and the eggs, you head straight to the coffee pot, grabbing a mug and filling it to the brim.'
-			act'Just coffee':
-				cla & *clr
-				minut += 2
-				gs 'beverage','coffee'
-				'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
-				'You grab a mug and fill it up, drinking greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
-				'"No breakfast for you? Or... anything else...?"'
-				'"Coffee is all I need," you smirk back.'
-				act'Time to get going':
-					cla & *clr
-					$npc_apt_kitchen
-					'"That was great," you sigh. "But I should get going."'
-					'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
-					act'Gather your things':gt'booty_call_morning','morning_leave'
-
-					gs'booty_call_morning','later'
-				end
+				$booty_call['dress_describe'] = 'adjusting your top'
 			end
-
-			act'Have breakfast together':gt'booty_call_morning','eggs'
-		end
-	end
-end
-
-if $ARGS[0] = 'eggs':
-	gs'food','family_meals','breakfast'
-	if $clothingworntype = 'nude':
-		!! if possible replace with two people eating breakfast naked
-		$npc_apt_kitchen
-		'The two of you enjoy your eggs and coffee together. The coffee is cheap, the eggs are alright, but the company is pleasant as you chit-chat about nothing. Soon enough, your cups are empty and your plates are clean.'
-		act'I should go':
-			cla & *nl
-			'"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<$npc_firstname[$npclastsaved]>>''s bedroom, with him following along behind.'
-			act'Get dressed':gt'booty_call_morning','morning_leave'
-		end
-	else
-		if npc_apt_type[$npclastsaved] = 1:
-			$npc_apt_kitchen
-		elseif npc_apt_type[$npclastsaved] = 2:
-			$npc_apt_kitchen
-		else
-			$npc_apt_kitchen
-		end
-		'The two of you enjoy your eggs and coffee together. The coffee is cheap, the eggs are alright, but the company is pleasant.'
-		act'I should go':
-			cla & *nl
-			'"Well, I should probably get going," you say, standing up and putting your dishes in the sink.'
-			act'Grab your things':gt'booty_call_morning','morning_leave'
 		end
 	end
 end
 
-if $ARGS[0] = 'breakfast':
-
-	if booty_call['morning_shower'] = 1:
-
+if $ARGS[0] = 'dressing1':
+	cla & *clr
+	if booty_call['CloDress'] = 1:
+		'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/bed_dress.jpg"></center>'
 	else
-
-	end
-end
-
-if $ARGS[0] = 'morning_leave':
-	if booty_call['continuation'] = 0:booty_call['continuation'] = rand(0,2)
-	if $clothingworntype = 'nude':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		gs'clothing','wear_last_worn'
-		if booty_call['dress'] = 1:
-			'You pick up your dress off the floor, pulling your head through it and down over your shoulders.'
-			if booty_call['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you.'
-				$booty_call['reaction'] = 'pulling your dress all the way down and smoothing out the skirt.'
+	end
+	'You reach down for where you left your clothes and start to pick them up.'
+	'"You heading out?" <<$npc_firstname[$boy]>> asks.'
+	gs'booty_call_morning','dress_loop'
+	
+	act'Yeah':
+		gs'booty_call_morning','dress_loop'
+		cla & *nl
+		'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Thanks for letting me spend the night."'
+		if rand(1,3) = 3:
+			'"No problem. Hey, did you want to get together again later today?"'
+			act'Can''t':
+				cla & *nl
+				'"Sorry," you say, <<$booty_call[''dress_describe'']>>. "Can''t. Got some stuff to do later. Maybe some other time."'
+				gs'booty_call_morning','end_morning'
 			end
-		elseif PCloSkirt > 0:
-			'You pick your skirt off the floor, pulling it up your legs and over your hips.'
-			if booty_call['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you dress.'
-				$booty_call['reaction'] = 'pulling your top down over shoulders and tugging it past your breasts and all the way down.'
+			
+			act'Sure':
+				!! missing code
+				!! make him call you later
+				cla & *nl
+				'"Sure," you smile, <<$booty_call[''dress_describe'']>>. "Love to. Give me a call later?"'
+				'"Will do."'
+				gs'booty_call_morning','end_morning'
 			end
-		else
-			'You pick your pants off the floor, putting your legs through and tugging it up over your hips.'
-			if booty_call['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you dress.'
-				$booty_call['reaction'] = 'pulling your top down over shoulders and tugging it past your breasts and all the way down.'
+			
+			act'Maybe':
+				cla & *nl
+				'"I''m not sure," you say hesitantly, <<$booty_call[''dress_describe'']>>. "I might have some stuff I need to do later? If I''m free, maybe I''ll give you a call?"'
+				'"Okay, that sounds fine."'
+				gs'booty_call_morning','end_morning'
 			end
-		end
-
-		gs'clothing','strip'
-		if booty_call['continuation'] > 0:
-			gs'booty_call_morning','continuation_reponse1'
-		else
-			gs'booty_call_morning','later_nude'
-		end
-	else
-		$npc_apt_bedroom[$npclastsaved]
-		'Stooping down next to the bed, you find your bag on the floor and scoop it up before heading towards the exit.'
-		if booty_call['continuation'] > 0:
-			'"You know," <<$npc_firstname[$npclastsaved]>> says, leaning against the door frame. "I had a great time last night."'
-			gs'booty_call_morning','continuation_reponse1'
 		else
-			gs'booty_call_morning','later_dressed'
+			'"No problem."'
+			gs'booty_call_morning','end_morning'
 		end
 	end
-end
-
-if $ARGS[0] = 'continuation_reponse1':
-	act'Yeah?':
-		cla
-		'"Yeah?" you reply, <<$booty_call[''reaction'']>>'
-		gs'booty_call_morning','continuation_reponse2'
-	end
 
-	act'Me too':
-		cla
-		'"Yeah, me too," you smile, <<$booty_call[''reaction'']>>'
-		gs'booty_call_morning','continuation_reponse2'
-	end
-
-	act'If you say so':
-		cla
-		'"If you say so," you shrug, <<$booty_call[''reaction'']>>'
-		gs'booty_call_morning','continuation_reponse2'
-	end
+!!	act'Talk while you dress':
+!!		gs'booty_call_morning','dress_talk'
+!!	end
 end
 
-if $ARGS[0] = 'continuation_reponse2':
-	if booty_call['continuation'] = 1:
-		!! FWB/Booty calls?
-		'"I was thinking maybe we should hook up again sometime. You down for it?"'
-		'"Like what? Just Booty calls?"'
-		'"Yeah, nothing serious. Just sex."'
-	elseif booty_call['continuation'] = 2:
-		!! Ask to start dating
-		'"I was wondering... would you be up for seeing each other again? Maybe on a... date? Or something?"'
-	end
-	gs'booty_call_morning','continuation_reponse3'
-end
+!! ------------------------------------ Leaving Stuff -------------------------------------------------------
 
-if $ARGS[0] = 'continuation_reponse3':
-	act'This was a one night stand':
-		cla & *nl
-		if $clothingworntype = 'nude':
-			'"Sorry," you shake your head. "This was a one time thing. I''m not looking for anything lasting."'
-			if booty_call['continuation'] = 1:
-				'"Whatever, your loss," he shrugs.'
-				'"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
-			elseif booty_call['continuation'] = 2:
-				'"Oh. Uhh, well..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-				'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
-			end
-			gs'booty_call_after','dress'
-		else
-			'"Sorry," you shake your head. "This was a one time thing. I''m not looking for anything lasting."'
-			if booty_call['continuation'] = 1:
-				'"Whatever, your loss," he shrugs.'
-				'"Pfft-! Yeah, sure," you snigger back, turning towards the door. "Still, maybe we''ll run into each other again or something. See you."'
-				'With a half-hearted goodbye, you open the door and leave <<$npc_firstname[$npclastsaved]>>''s apartment.'
-			elseif booty_call['continuation'] = 2:
-				'"Oh. Uhh, well..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence.'
-				'<i>Well this is awkward...</i> you think to yourself as you turn towards the door.'
-				'"I guess I''ll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.'
-			end
+if $ARGS[0] = 'end_morning':
+	act'Finish getting dressed':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'You finish <<$booty_call[''dress_describe'']>>.'
+		act'Bye':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Bye then." You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after','exit'
 		end
-		act'Leave':gt'booty_call_after','exit'
-	end
-
-	if arrsize('pcs_lovers') <= 2:
-		act'Sure':
-			gs 'boyfrend', 'start'
+		
+		act'See ya':
 			cla & *clr
-			$npc_apt_hall[$npclastsaved]
-			if $clothingworntype = 'nude':
-				if booty_call['continuation'] = 1:
-					!! npc_QW = 1
-					'"Sure, sounds fun," you smile.'
-					'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-					*nl
-					booty_call['text_message'] = rand(1,2)
-					if booty_call['text_message'] = 1:
-						'		<b><font color="blue">hey fuck buddy</font></b>'
-						*nl
-						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-					elseif booty_call['text_message'] = 2:
-						*nl
-						'		<b><font color="blue">send nudes</font></b>'
-						*nl
-						'"We''ll see about that," you smirk back. "Anyways, see you around."'
-					end
-					'Your little exchange done, you wave him goodbye and head out the door.'
-				elseif booty_call['continuation'] = 2:
-					!! npc_QW = 2
-					'"Yeah, I think I''d like that," you smile gently.'
-					'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-					*nl
-					booty_call['text_message'] = rand(1,2)
-					if booty_call['text_message'] = 1:
-						'		<b><font color="blue">hey cutie</font></b>'
-						*nl'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-					elseif booty_call['text_message'] = 2:
-						'		<b><font color="blue">dont forget to call :)</font></b>'
-						*nl
-						'"I won''t," you promise.'
-					end
-					'That bit of business done, you wave him goodbye and head out the door.'
-				end
-				gs'booty_call_after','dress'
-			else
-				$npc_apt_hall[$npclastsaved]
-				if booty_call['continuation'] = 1:
-					!! npc_QW = 1
-					'"Sure, sounds fun," you smile.'
-					'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
-					*nl
-					booty_call['text_message'] = rand(1,2)
-					if booty_call['text_message'] = 1:
-						'		<b><font color="blue">hey fuck buddy</font></b>'
-						*nl
-						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-					elseif booty_call['text_message'] = 2:
-						'	<b><font color="blue">send nudes</font></b>'
-						*nl
-						'"We''ll see about that," you smirk back. "Anyways, see you around."'
-					end
-					'Your little exchange done, you wave him goodbye and head out the door.'
-				elseif booty_call['continuation'] = 2:
-					!! npc_QW = 2
-					'"Yeah, I think I''d like that," you smile gently.'
-					'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
-					*nl
-					booty_call['text_message'] = rand(1,2)
-					if booty_call['text_message'] = 1:
-						'		<b><font color="blue">hey cutie</font></b>'
-						*nl
-						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-					elseif booty_call['text_message'] = 2:
-						'		<b><font color="blue">dont forget to call :)</font></b>'
-						*nl
-						'"I won''t," you promise.'
-					end
-					'That bit of business done, you wave him goodbye and head out the door.'
-				end
-			end
+			$npc_apt_hall[$boy]
+			'"Well, see ya." You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after','exit'
+		end
+		
+		act'Blow him a kiss':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Until next time," You give him a wink and blow him a kiss and head out the door.'
 			act'Leave':gt'booty_call_after','exit'
 		end
 	end
+end
 
-	if booty_call['continuation'] = 2:
-		act'I''m not up for anything serious':
-			cla & *clr
-			$npc_apt_hall[$npclastsaved]
-			'"I''m not looking for anything serious right now."'
-			act'Sorry':
-				cla & *nl
-				'"Sorry..."'
-				if $clothingworntype = 'nude':
-					gs'booty_call_after','dress'
-					'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-					'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
-				else
-					'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-					'<i>Well this is awkward...</i> you think to yourself as you turn towards the door.'
-					'"I guess I''ll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.'
-				end
 
-				act'Leave':gt'booty_call_after','exit'
-			end
+!! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
 
-			act'If it''s just a hookup...':
-				cla & *nl
-				'"If it''s just a hookup," you continue. "or something like last night, I wouldn''t mind getting together for some fun, but I''m just not interested in dating anybody."'
-				if rand(1,10) > 7:
-					'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$npclastsaved]>> doesn''t really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.'
-					'"So uhh, yeah... Call me sometime?"'
-					'"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<$npc_firstname[$npclastsaved]>>''s apartment.'
-					act'Leave':gt'booty_call_after','exit'
-				else
-					'"No," he shakes his head. "I don''t want to get led on by you if you''re only interested in a fuck and not anything real. Guess this is just a one night stand."'
-					act'Taken aback':
-						cla & *clr
-						$npc_apt_hall[$npclastsaved]
-						'You blink in surprise, recoiling slightly at his words. That response really wasn''t what you saw coming. After all, what guy just gives up free access to sex?'
-						'"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards out the door.'
-						act'Leave':gt'booty_call_after','exit'
-					end
 
-					act'It''s to be expected':
-						cla & *clr
-						$npc_apt_hall[$npclastsaved]
-						'You nod to yourself, admittedly a little bit wistfully. It''s to be expected from a guy like him. But if he wants something more, you just can''t give it to him. You''re only after pleasure, you don''t want to get tangled up in a relationship.'
-						'"Well, guess I won''t see you around then so... Bye?" You wave <<$npc_firstname[$npclastsaved]>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.'
-						act'Leave':gt'booty_call_after','exit'
-					end
-				end
-			end
-		end
-	end
-end
 
-if $ARGS[0] = 'later_nude':
-	if booty_call['fuck'] > 0:
-		$booty_call['fun'] = 'fuck'
-	else
-		$booty_call['fun'] = 'fun'
-	end
-	if $clothingworntype = 'nude':gs'booty_call_after','dress'
-	if booty_call['continuation'] = 0:booty_call['continuation'] = rand(0,2)
-	act'I should go':
-		cla & *clr
-		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		if booty_call['dress'] = 1:
-			'"Well," you say, almost apologetically, pulling your dress down over your breasts and smoothing it out over your legs. "I should go."'
-		else
-			'"Well," you say, almost apologetically, throwing your top over your shoulders and down over your breasts. "I should go."'
-		end
-		'"Alright. See you around. Or not. Whatever."'
-		'You smirk and shrug on the rest of your clothes before heading out the door.'
-		act'Leave':gt'booty_call_after','exit'
-	end
+!! ------------------------------------ Misc Stuff -------------------------------------------------------
 
-	act'Thanks for the <<$booty_call[''fun'']>>':
-		cla & *clr
-		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		if booty_call['dress'] = 1:
-			'"Well, thanks for the <<$booty_call[''fun'']>>," you say, smoothing your skirt out over your legs.'
+if $ARGS[0] = 'give_lift':
+	!! add in option later to give road head along the way
+	if booty_call['give_lift'] = 2:
+		!!take to school
+		'<center><b><font color="maroon">Outside School</font></b></center>'
+		if month >= 11 or month <= 3:
+			$booty_call['drop_off_image'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/schoolwinter.jpg"></center>'
 		else
-			'"Well, thanks for the <<$booty_call[''fun'']>>," you say, pulling your top down over your head.'
+			$booty_call['drop_off_image'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 		end
-		'"Right back at you," he smiles in return.'
-		'"I gotta get going though."'
-		'"Alright. See you around. Or not. Whatever."'
-		'You smirk and shrug on the rest of your clothes before heading out the door.'
-		act'Leave':gt'booty_call_after','exit'
-	end
-
-	act'We should hook up again later':
-		cla & *clr
-		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		if $clothingworntype = 'nude':gs'booty_call_after','dress'
-		if booty_call['dress'] = 1:
-			'"We should hook up again some time," you say, pulling your dress over head.'
-			$booty_call['reaction1'] = 'as you finish pulling your dress all the way down'
-			$booty_call['reaction2'] = 'finish smoothing out the wrinkles in your skirt'
-		elseif PCloSkirt > 0:
-			'"We should hook up again some time," you say, pulling your skirt up over your hips.'
-			$booty_call['reaction1'] = 'your top just above your breasts ready to be pulled down'
-			$booty_call['reaction2'] = 'tug your top all the way down'
+		$booty_call['drop_off_image']
+		!! add correct travel times for each location
+		if npc_residence[$boy] = 1:
+			!! Pav residential 
+			'<<$npc_firstname[$boy]>> drives you the short distance to school, stopping right outside the gates. You probably could have just walked, but it''s nice to spend a little more time with him.'
 		else
-			'"We should hook up again some time," you say, pulling your pants up over your hips.'
-			$booty_call['reaction1'] = 'your top just above your breasts ready to be pulled down'
-			$booty_call['reaction2'] = 'tug your top all the way down'
+			'<<$npc_firstname[$boy]>> drives you from the city back to Pavlovsk, stopping right outside the school gates.'
+			if npc_residence[$boy] = 2:
+				!! Student dorms 
+			elseif npc_residence[$boy] = 3:
+				!! St. Petersburg Residential 
+			elseif npc_residence[$boy] = 4:
+				!! St. Petersburg City Center 
+			end
+		end
+		gs'stat'
+		!! go to school
+		act'Thanks for the ride':
+			cla & *clr
+			$booty_call['drop_off_image']
+			'"Thanks for the ride," you say, giving him a quick smile and open up the passenger door.'
+			gs 'booty_call_morning','classmates_see'
+			act'Continue':gt 'gschool_grounds', 'main'
 		end
-		if rand(1,3) = 1:
-			'"Nah, this was a one time thing. I never fuck the same girl twice."'
-			'You pause for a moment, <<$booty_call[''reaction1'']>>, giving him a look. "Seriously?"'
-			'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-			'<i>Free access to pussy and you''re just gonna turn it down. Whatever...</i> you think to yourself as you <<$booty_call[''reaction2'']>>.'
-			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
-			act'Leave':gt'booty_call_after','exit'
-		else
-			'"What, like fuck buddies?"'
-			'"Why not?" you smirk.'
-			'"Sure, I''ll sleep with you again if you''re offering."'
-			'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-			if booty_call['text_message'] = 1:
-				'	<b><font color="blue">hey fuck buddy</font></b>'
-				'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-			elseif booty_call['text_message'] = 2:
-				'	<b><font color="blue">send nudes</font></b>'
-				*nl
-				'"We''ll see about that," you roll your eyes back. "Anyways, see you around."'
-			end
-			'That little exchange done, you cheerfullly wave him goodbye and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
+		
+		act'Kiss him goodbye (cheek)':
+			cla & *clr
+			$booty_call['drop_off_image']
+			'"Thanks for the ride," you say, leaning over and giving him a quick peck on the cheek before opening up the passenger door.'
+			gs 'booty_call_morning','classmates_see'
+			act'Continue':gt 'gschool_grounds', 'main'
 		end
-	end
-
-	act'Maybe I could see you again sometime?':
-		cla & *clr
-		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		gs'booty_call_after','dress'
-		if booty_call['dress'] = 1:
-			'"Maybe I could see you again? Maybe we could go on a date?" you say, pulling your dress over head.'
-			$booty_call['reaction1'] = 'as you finish pulling your dress all the way down'
-			$booty_call['reaction2'] = 'finish smoothing out the wrinkles in your skirt'
-		elseif PCloSkirt > 0:
-			'"Maybe I could see you again? Maybe we could go on a date?" you say, pulling your skirt up over your hips.'
-			$booty_call['reaction1'] = 'your top just above your breasts ready to be pulled down'
-			$booty_call['reaction2'] = 'tug your top all the way down'
-		else
-			'"Maybe I could see you again? Maybe we could go on a date?" you say, pulling your pants up over your hips.'
-			$booty_call['reaction1'] = 'your top just above your breasts ready to be pulled down'
-			$booty_call['reaction2'] = 'tug your top all the way down'
+		
+		act'Kiss him goodbye (mouth)':
+			cla & *clr
+			$booty_call['drop_off_image']
+			'"Thanks for the ride," you say, leaning over and giving him a quick peck on the lips before opening up the passenger door.'
+			gs 'booty_call_morning','classmates_see'
+			act'Continue':gt 'gschool_grounds', 'main'
 		end
-		if rand(1,3) = 1:
-			'"Nah, this was a one time thing. I never fuck the same girl twice."'
-			'You pause for a moment, <<$booty_call[''reaction1'']>>, giving him a look. "Seriously?"'
-			'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-			'<i>Wow... You can really pick em, huh <<$pcs_nickname>>...</i> you think to yourself as you <<$booty_call[''reaction2'']>>. <i>Ugh. Whatever...</i>'
-			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
-			act'Leave':gt'booty_call_after','exit'
-		else
-			'"You mean like a date?"'
-			'"Yeah... like a date..."'
-			'For a moment you feel intensely awkward as you finish tugging on your clothes waiting for his response, but when you turn to look at him he''s smiling.'
-			'"A date... Yeah, I''d like to take you on a date sometime." Your expression bursts into a smile as well, unable to contain yourself.'
-			'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-			*nl
-			booty_call['text_message'] = rand(1,2)
-			if booty_call['text_message'] = 1:
-				'	<b><font color="blue">hey cutie</font></b>'
-				'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-			elseif booty_call['text_message'] = 2:
-				'	<b><font color="blue">dont forget to call :)</font></b>'
-				*nl
-				'"I won''t," you promise.'
-			end
-			'That little exchange done, you cheerfullly wave him goodbye and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
+		
+		act'Kiss him goodbye (tongue)':
+			cla & *clr
+			$booty_call['drop_off_image']
+			gs'arousal','kiss', -5
+			'"Thanks for the ride," you say. You lean over and give him a deep kiss, forcing your tongue past his lips and enjoying the feeling of his tongue pushing past into yours. You hold the kiss for a good ten seconds before pulling away, saliva trailing with you. You wipe your mouth with a lusty grin before opening the passenger door.'
+			gs 'booty_call_morning','classmates_see'
+			act'Continue':gt 'gschool_grounds', 'main'
 		end
+		
+		
+	else
+		!! take home
+		if npc_residence[$boy] = 1:
+			!! Pav residential 
+		elseif npc_residence[$boy] = 2:
+			!! Student dorms 
+		elseif npc_residence[$boy] = 3:
+			!! St. Petersburg Residential 
+		elseif npc_residence[$boy] = 4:
+			!! St. Petersburg City Center 
+		end
+		!! go to five estate
+		gt 'pav_complex', 'start'
 	end
 end
 
-if $ARGS[0] = 'later_dressed':
-	act'We should hook up again later':
-		cla & *nl
-		if $clothingworntype = 'nude':gs'booty_call_after','dress'
-		'"You know, I was thinking you say," stopping at the door. "We should hook up again some time."'
-		if rand(1,3) = 1:
-			'"Nah, this was a one time thing. I never fuck the same girl twice."'
-			'You pause for a moment, giving him a look. "Seriously?"'
-			'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-			'<i>Free access to pussy and you''re just gonna turn it down. Whatever...</i> you think to yourself, rolling your eyes and turning towards the door.'
-			*nl
-			'You grab the handle and fling it open, leaving in exasperation.'
-			act'Leave':gt'booty_call_after','exit'
-		else
-			'"What, like fuck buddies?"'
-			'"Why not?" you smirk.'
-			'"Sure, I''ll sleep with you again if you''re offering."'
-			'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-			if booty_call['text_message'] = 1:
-				'	<b><font color="blue">hey fuck buddy</font></b>'
-				'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-			elseif booty_call['text_message'] = 2:
-				'	<b><font color="blue">send nudes</font></b>'
-				*nl
-				'"We''ll see about that," you roll your eyes back. "Anyways, see you around."'
-			end
-			'That little exchange done, you wink as you pass him and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
-		end
-	end
-
-	act'Maybe I could see you again sometime?':
-		cla & *nl
-		if $clothingworntype = 'nude':gs'booty_call_after','dress'
-		'"I was thinking..." you say, stopping at the door. "Maybe I could see you again? Like a... date...?"'
-
-		if rand(1,3) = 1:
-			'"Nah, this was a one time thing. I never fuck the same girl twice."'
-			'You pause for a moment, <<$booty_call[''reaction1'']>>, giving him a look. "Seriously?"'
-			'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
-			'<i>Wow... You can really pick em, huh <<$pcs_nickname>>...</i> you think to yourself as you <<$booty_call[''reaction2'']>>. <i>Ugh. Whatever...</i>'
-			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
-			act'Leave':gt'booty_call_after','exit'
-		else
-			'For a moment you feel intensely awkward as you wait for his response, but when you turn to look at him he''s smiling.'
-			'"A date... Yeah, I''d like to take you on a date sometime." Your expression bursts into a smile as well, unable to contain yourself.'
-			'You tell him your number and he taps it into his phone. A few moments later, a notification pings in your messages:'
-			*nl
-			booty_call['text_message'] = rand(1,2)
-			if booty_call['text_message'] = 1:
-				'	<b><font color="blue">hey cutie</font></b>'
-				'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-			elseif booty_call['text_message'] = 2:
-				'	<b><font color="blue">dont forget to call :)</font></b>'
-				*nl
-				'"I won''t," you promise.'
-			end
-			'That little exchange done, you cheerfullly wave him goodbye and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
-		end
+if $ARGS[0] = 'classmates_see':
+	if hour > 6 and rand(1,20) > rand(3,6):
+		'You step out of the car, looking around and don''t see anybody who would recognize you. <<$npc_firstname[$boy]>> gives you a wave and you wave back as he drives off.'
+	else
+		'As you exit the vehicle, some of your classmates are walking by and they glance at you stepping out of a stranger''s car. Some of them immediately look away. Others wear a look of disgust. Judging by the reactions, they must have clocked you.'
+		*nl
+		'<<$npc_firstname[$boy]>> gives you a small wave and drives off.'
 	end
 end
-
-!! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
-
-
-
 --- booty_call_morning ---------------------------------

+ 79 - 31
locations/booty_call_sex.qsrc

@@ -518,7 +518,7 @@ if $ARGS[0] = 'miss2':
 		'<<$npc_firstname[$boy]>> drives into you at a steady pace, hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you.'
 	end
 	if rand(0,1) = 1 or booty_call['kiss_skip'] = 1:
-		:kiss_skip2
+!!		:kiss_skip2
 		act'Don''t stop!':
 			booty_call['orgasm'] = orgasm
 			gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
@@ -583,7 +583,7 @@ end
 
 if $ARGS[0] = 'miss2.11':
 	cla & *clr
-	$booty_call['pos_speed'] = 'miss1'
+	$booty_call['pos_speed'] = 'miss2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/slow2.mp4"></video></center>'
@@ -593,7 +593,7 @@ end
 
 if $ARGS[0] = 'miss2.12':
 	cla & *clr
-	$booty_call['pos_speed'] = 'miss1'
+	$booty_call['pos_speed'] = 'miss2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/slow2.mp4"></video></center>'
@@ -603,7 +603,7 @@ end
 
 if $ARGS[0] = 'miss2.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'miss1'
+	$booty_call['pos_speed'] = 'miss2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/slow2.mp4"></video></center>'
@@ -707,7 +707,7 @@ end
 
 if $ARGS[0] = 'miss3.1':
 	cla & *clr
-	$booty_call['pos_speed'] = 'miss1'
+	$booty_call['pos_speed'] = 'miss3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
@@ -717,7 +717,7 @@ end
 
 if $ARGS[0] = 'miss3.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'miss1'
+	$booty_call['pos_speed'] = 'miss3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
@@ -758,6 +758,8 @@ if $ARGS[0] = 'miss_kiss':
 	end
 end
 
+
+
 if $ARGS[0] = 'doggy_start':
 	if booty_call['change_pos'] = 1:
 		act'Switch to doggy':
@@ -983,7 +985,7 @@ end
 
 if $ARGS[0] = 'doggy2.11':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/med4.mp4"></video></center>'
@@ -993,7 +995,7 @@ end
 
 if $ARGS[0] = 'doggy2.12':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/med4.mp4"></video></center>'
@@ -1003,7 +1005,7 @@ end
 
 if $ARGS[0] = 'doggy2.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/med4.mp4"></video></center>'
@@ -1013,7 +1015,7 @@ end
 
 if $ARGS[0] = 'doggy2.bored':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/bored2.mp4"></video></center>'
@@ -1117,7 +1119,7 @@ end
 
 if $ARGS[0] = 'doggy3.1':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/hard1.mp4"></video></center>'
@@ -1127,7 +1129,7 @@ end
 
 if $ARGS[0] = 'doggy3.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'doggy1'
+	$booty_call['pos_speed'] = 'doggy3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/hard1.mp4"></video></center>'
@@ -1367,7 +1369,7 @@ end
 
 if $ARGS[0] = 'cowgirl2.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'cowgirl1'
+	$booty_call['pos_speed'] = 'cowgirl2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med1.mp4"></video></center>'
@@ -1377,7 +1379,7 @@ end
 
 if $ARGS[0] = 'cowgirl2.bored':
 	cla & *clr
-	$booty_call['pos_speed'] = 'cowgirl1'
+	$booty_call['pos_speed'] = 'cowgirl2'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med2.mp4"></video></center>'
@@ -1388,7 +1390,7 @@ end
 if $ARGS[0] = 'cowgirl3':
 	!! fast/rough pace
 	booty_call['speed'] = 3
-	$booty_call['pos_speed'] = 'cowgirl2'
+	$booty_call['pos_speed'] = 'cowgirl3'
 	$booty_call['position'] = 'cowgirl'
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
@@ -1453,7 +1455,7 @@ end
 
 if $ARGS[0] = 'cowgirl3.2':
 	cla & *clr
-	$booty_call['pos_speed'] = 'cowgirl1'
+	$booty_call['pos_speed'] = 'cowgirl3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard1.mp4"></video></center>'
@@ -1463,7 +1465,7 @@ end
 
 if $ARGS[0] = 'cowgirl3.bored':
 	cla & *clr
-	$booty_call['pos_speed'] = 'cowgirl1'
+	$booty_call['pos_speed'] = 'cowgirl3'
 	gs 'arousal', 'vaginal', rand(3,5),'no_orgasm_msg'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard2.mp4"></video></center>'
@@ -1492,6 +1494,47 @@ if $ARGS[0] = 'cowgirl_change_pace':
 	end
 end
 
+if $ARGS[0] = 'girl_cum':
+	if $booty_call['position'] = 'miss':
+		gt'booty_call_sex','miss_cum'
+	elseif $booty_call['position'] = 'doggy':
+		gt'booty_call_sex','doggy_cum'
+	elseif $booty_call['position'] = 'cowgirl':
+		gt'booty_call_sex','cowgirl_cum'
+	end
+end
+
+if $ARGS[0] = 'miss_cum':
+	cla & *clr
+	if $booty_call['pos_speed'] = 'miss3':
+		'<center><video autoplay loop src="images/shared/sex/vag/miss/orgasm_rough1.mp4"></video></center>'
+		'You orgasm in rough missionary position.'
+	else
+		'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
+		'You orgasm in missionary position.'
+	end
+	gs'booty_call_sex','fuck_continue'
+end
+
+if $ARGS[0] = 'doggy_cum':
+	cla & *clr
+	if $booty_call['pos_speed'] = 'doggy3':
+		'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm_rough1.mp4"></video></center>'
+		'You orgasm in rough missionary position.'
+	else
+		'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+		'You orgasm in doggy style.'
+	end
+	gs'booty_call_sex','fuck_continue'
+end
+
+if $ARGS[0] = 'cowgirl_cum':
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/orgasm1.mp4"></video></center>'
+	'You orgasm in cowgirl.'
+	gs'booty_call_sex','fuck_continue'
+end
+
 if $ARGS[0] = 'fuck_cum_random':
 	booty_call['cum_choice'] = rand(1,10)
 	if npc_generous[$boy] = 1 and booty_call['cum_choice'] <= 9:
@@ -1505,25 +1548,30 @@ if $ARGS[0] = 'fuck_cum_random':
 	end
 end
 
+if $ARGS[0] = 'fuck_continue':
+	if booty_call['bored'] = 1:
+		act'Keep going':gt 'booty_call_sex', '<<$booty_call[''pos_speed'']>>.bored'
+	else
+		act'Keep going':gt 'booty_call_sex', '<<$booty_call[''pos_speed'']>>.2'
+	end
+	
+	if $booty_call['position'] ! 'cowgirl':
+		act'Change position':
+			booty_call['change_pos'] = 1
+			gs 'booty_call_sex', 'position_change'
+		end
+	else
+		act'Change pace':gs 'booty_call_sex', 'cowgirl_change_pace'
+	end
+end
+
 if $ARGS[0] = 'fuck_cum':
 	booty_call['boy_cum'] = rand(-1,1)
 	if booty_call['boy_cum'] = 1:
 		gs 'booty_call_sex', 'fuck_cum_random'
 	else
-		if booty_call['bored'] = 1:
-			act'Keep going':gt 'booty_call_sex', '<<$booty_call[''pos_speed'']>>.bored'
-		else
-			act'Keep going':gt 'booty_call_sex', '<<$booty_call[''pos_speed'']>>.2'
-		end
-		
-		if $booty_call['position'] ! 'cowgirl':
-			act'Change position':
-				booty_call['change_pos'] = 1
-				gs 'booty_call_sex', 'position_change'
-			end
-		else
-			act'Change pace':gs 'booty_call_sex', 'cowgirl_change_pace'
-		end
+		if booty_call['orgasm'] < orgasm: gt'booty_call','girl_cum'
+		gs'booty_call_sex','fuck_continue'
 	end
 	
 	if $booty_call['cum_choice'] = 'warn':

+ 161 - 151
locations/brothel.qsrc

@@ -51,6 +51,7 @@ payRate = 1000
 if $ARGS[0] = 'lobby':
 	$menu_loc = 'brothel'
 	$menu_arg = 'lobby'
+	$loc_arg = 'inner'
 	menu_off = 0
 	'<h3>Hotel Lobby</h3>'
 	*nl
@@ -105,21 +106,21 @@ if $ARGS[0] = 'bar':
 	if alko <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/bar.jpg"></center>'
 		*nl
-		'Cozy bar made of fine hard wood. There are few patrons here, but no one you can recognize. Probably travelling guests.'
+		'A cozy bar made of fine hard wood. There are a few patrons here, but no one you can recognize. Probably travelling guests.'
 		*nl
 		'The barman is cleaning some glasses, occasionally looking your way, checking if you want to order something.'
 	elseif alko > 3 and alko < 6:
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/bardrunk.jpg"></center>'
 		*nl
-		'Cozy bar made of fine hard wood. There are few patrons here, but no one you can recognize. Probably travelling guests.'
+		'A cozy bar made of fine hard wood. There are a few patrons here, but no one you can recognize. Probably travelling guests.'
 		*nl
 		'<font color=#<<$red_font>>>You are drunk and the barman is obviously enjoying the presence of a nice girl in such a state, often flirting with you and enjoying the looks.</font>'
 	elseif alko >= 6:
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barwasted.jpg"></center>'
 		*nl
-		'Cozy bar made of fine hard wood. There are few patrons here, but no one you can recognize. Probably travelling guests.'
+		'A cozy bar made of fine hard wood. There are a few patrons here, but no one you can recognize. Probably travelling guests.'
 		*nl
-		'<font color=#<<$red_font>>>You are wasted. Lying your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
+		'<font color=#<<$red_font>>>You are wasted, lying with your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
 	end
 	act 'Leave the bar': gt 'brothel', 'lobby'
 	act 'Order something':gt 'brothel', 'order'
@@ -142,7 +143,7 @@ if $ARGS[0] = 'sit':
 		'You are too drunk to sit up straight, instead, you rest your head on the bar, mumbling incoherently'
 		'The barman was obviously waiting for this moment.'
 		'He walks out of the bar, taking you in his arms and carrying away.'
-		'On the way you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems as one of the hotel rooms.'
+		'On the way, you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems to be one of the hotel rooms.'
 		act 'Continue':gt 'brothel', 'abducted'
 	else
 		'You take a seat behind the bar, looking around at the few guests sitting around the dining room.'
@@ -176,7 +177,7 @@ if $ARGS[0] = 'order':
 		'You try to order another drink, but as you faint all that gets out of your mouth is some drunken babble...'
 		'The barman was obviously waiting for this moment.'
 		'He walks out of the bar, taking you in his arms and carrying you away.'
-		'On the way you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems as one of the hotel rooms.'
+		'On the way, you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems to be one of the hotel rooms.'
 		act 'Continue':gt 'brothel', 'abducted'
 	else
 		act 'Cancel order':gt 'brothel', 'bar'
@@ -208,10 +209,10 @@ if $ARGS[0] = 'abducted1':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/pinchandfingertiedtobed.jpg"></center>'
 	*nl
 	'He jumps on to you, grabbing your ass and pinching your cheeks.'
-	'<font color=#<<$pcs_font>>>"Ouch! It... hurts... Ouch!"</font> The pain forces you back to a brief consciousness moment.'
-	'Aroused with your reaction, he pushes his finger into your pussy, one by one until there are four of them.'
+	'<font color=#<<$pcs_font>>>"Ouch! It... hurts... Ouch!"</font> The pain forces you back to a brief, conscious moment.'
+	'Aroused with your reaction, he pushes his finger into your pussy, one by one until there are four of them inside.'
 	'<font color=#<<$mas_font>>>"What a whore! She''s already wet!"</font>'
-	'He uses the juiced fingers and thrusts them into your anus, once again forcing you back to a living world.'
+	'He uses the juiced fingers and thrusts them into your anus, once again forcing you back to the living world.'
 	'<font color=#<<$pcs_font>>>"Auuuuuuu!"</font> you wriggle in a cramp, feeling the sharp pain in your anus.'
 	gs 'pain', 3, 'asshole', 'pinch'
 	$orgasm_or = 'no'
@@ -226,11 +227,11 @@ if $ARGS[0] = 'abducted2':
 	*nl
 	'<center><video autoplay loop src="images/locations/shared/brothel/openchampagne.mp4"></video>  <video autoplay loop src="images/locations/shared/brothel/champagneenema.mp4"></video></center>'
 	*nl
-	'<font color=#<<$mas_font>>>"Now slut let''s get you your drink!"</font>'
+	'<font color=#<<$mas_font>>>"Now slut, let''s get you your drink!"</font>'
 	'He reaches for a bottle of champagne from the minibar.'
-	'All you can hear in that moment is a popping sound as the bottle plug shoots out... The barman covers the neck of the bottle with his thumb and shakes it to build up a pressure...'
-	'...and then he forces it into your anus as far as it goes, while the sparkling wine gushes out deep into your intestines.'
-	'<font color=#<<$mas_font>>>"Ayyyieeee!"</font> Again you scream aloud shaking both in surprise and pain.'
+	'All you can hear in that moment is a popping sound as the bottle plug shoots out... The barman covers the neck of the bottle with his thumb and shakes it to build up pressure...'
+	'...and then forces it into your anus as far as it goes, while the sparkling wine gushes out deep into your intestines.'
+	'<font color=#<<$mas_font>>>"Ayyyieeee!"</font> Again you scream aloud, shaking both in surprise and pain.'
 	gs 'pain', 6, 'asshole', 'stretch'
 	gs 'arousal', 'anal_dildo', 5
 	gs 'arousal', 'end'
@@ -244,10 +245,10 @@ if $ARGS[0] = 'abducted3':
 	*nl
 	'The champagne bottle is still inside your anus like a giant buttplug, but the flow has stopped.'
 	'He takes it and pulls it out. The wine slowly leaks out of your wrecked anus...'
-	'<font color=#<<$mas_font>>>"Well, now that the drink is taken care of, we have also got you an expensive enema, so now we can finally get to the business!"</font>'
+	'<font color=#<<$mas_font>>>"Well, now that the drink is taken care of, we have also got you an expensive enema, so now we can finally get to business!"</font>'
 	'He cleans your ass from the remains of whatever little was inside.'
 	'His dick is not the biggest one, but it is quite thick.'
-	'Your pussy is a first victim of the phallus, and after short while he moves to your anus.'
+	'Your pussy is the first victim of his phallus, and after a short while he moves to your anus.'
 	'Another jolt of pain runs through your bottom, but this time you fade away for sure...'
 	anal_slip += 4
 	gs 'pain', 6, 'asshole', 'stretch'
@@ -299,9 +300,9 @@ if $ARGS[0] = 'abducted4':
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/wakeupboundonbedanalplug.jpg"></center>'
 	*nl
-	'You wake up, still being bound to the bed. Behind the curtains you can see that it is late morning.'
-	'Your head is in pain and spinning, your stomach is like on a water.'
-	'You feel strange fullness in your abdomen and your pussy and anus itch.'
+	'You wake up, still bound to the bed. Behind the curtains you can see that it is late morning.'
+	'Your head is in pain and spinning, your whole body is aching along with it.'
+	'You feel a strange fullness in your abdomen and your pussy and anus itch.'
 	'As you try to struggle out of the bounds you realize what has happened... and what is left as a reminder...'
 	'You desperately try to push the plug out of your ass, but its rim is too wide and it rests well inside you.'
 	gs 'pain', 2, 'armL', 'bind'
@@ -316,13 +317,13 @@ if $ARGS[0] = 'abducted5':
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/wakeupboundonbedanalplug2.jpg"></center>'
 	*nl
-	'Finally you hear the door open, someone is coming in.'
+	'Finally you hear the door open, someone is comming in.'
 	'<font color=#<<$mas_font>>>"So girl, how was your night?"</font>'
 	'<font color=#<<$pcs_font>>>"What? Who are you? Untie me!"</font>'
 	'<font color=#<<$mas_font>>>"I will, but first you will tell me how your night was."</font>'
-	'<font color=#<<$pcs_font>>>"Wh... How could it be? I don''t remember most of it, I lie tied naked to a bed with something stuck in my anus I do not even know what is! My pussy and anus hurt and I was probably raped whole night unconscious!"</font>'
-	'<font color=#<<$mas_font>>>"Well, you mostly covered it all. But you still didn''t tell me how did you like it."</font>'
-	'<font color=#<<$pcs_font>>>"Please just untie me! All of me hurts like hell! Please!"</font>'
+	'<font color=#<<$pcs_font>>>"Wh... How could it have been? I don''t remember most of it, I''m tied naked to a bed with something stuck in my anus I do not even know what it is! My pussy and anus hurt and I was probably raped the whole night, while I was unconscious!"</font>'
+	'<font color=#<<$mas_font>>>"Well, you mostly covered it all. But you still didn''t tell me how, you liked it."</font>'
+	'<font color=#<<$pcs_font>>>"Please just untie me! Everything hurts like hell! Please!"</font>'
 	'<font color=#<<$mas_font>>>"OK, but then you will answer me. And first we need to get rid of the plug, don''t we?"</font>'
 	act 'Continue':gt 'brothel', 'abducted6'
 end
@@ -337,7 +338,7 @@ if $ARGS[0] = 'abducted6':
 	'<font color=#<<$mas_font>>>"Quick or slow, girl?"</font>'
 	'<font color=#<<$pcs_font>>>"What?! No, don''t touch it!"</font>'
 	'<font color=#<<$mas_font>>>"Haha, they say do it swift, it hurts less! Let''s try it!"</font>'
-	'With those words he pulls the plug out, leaving your anus with a huge gaping hole...'
+	'With those words he pulls the plug out, leaving your anus as a huge gaping hole...'
 	gs 'pain', 3, 'asshole', 'stretch'
 	gs 'stat'
 	act 'Sob from pain':gt 'brothel', 'abducted7'
@@ -367,7 +368,7 @@ end
 if $ARGS[0] = 'abducted_like':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/abusedface.jpg"></center>'
 	*nl
-	'You just admitted to a complete stranger, who abducted, tied and raped for a whole night, that you actually liked the experience...'
+	'You just admitted to a complete stranger, who abducted, tied and raped you for a whole night, that you actually liked the experience...'
 	'<font color=#<<$mas_font>>>"I thought so. What a nice submissive slut you are. I have an offer for you..."</font>'
 	'<font color=#<<$pcs_font>>>"An offer?"</font> you didn''t know what to expect, but this is even more surprising.'
 	'<font color=#<<$mas_font>>>"Yes. You know, this is not just a hotel. This is something more."</font>'
@@ -379,11 +380,11 @@ if $ARGS[0] = 'abducted_like':
 	'<font color=#<<$pcs_font>>>"How?"</font>'
 	'<font color=#<<$mas_font>>>"It is a sado maso brothel. Whores get used by dominant males and vice versa."</font>'
 	'<font color=#<<$pcs_font>>>"Oh... OK. And the offer?"</font> you are confused.'
-	'<font color=#<<$mas_font>>>"Well you just proved you like to be bound, abused, raped and humiliated. You''ve got the perfect CV. I want you to be one of our girls."</font>'
+	'<font color=#<<$mas_font>>>"Well you have just proven you like to be bound, abused, raped and humiliated. You''ve got the perfect CV. I want you to be one of our girls."</font>'
 	'<font color=#<<$pcs_font>>>"Uhm... I, I need to think about it. I don''t know if I like it THAT much."</font>'
 	'<font color=#<<$mas_font>>>"That''s OK. We don''t force our girls to work here. Most of the time at least... But the pay is above anything you can get anywhere these days!"</font>'
 	'<font color=#<<$pcs_font>>>"OK, I understand. I''ll think it through..."</font>'
-	'He looks at you as if he''s trying to read in you:'
+	'He looks at you as if he''s trying to read you:'
 	'<font color=#<<$mas_font>>>"Oh I think you will come soon enough. When you do so, go to whoever is behind the bar and tell him that you want a special drink. The Blue Blooded Russian. Everything else will be taken care of."</font>'
 	'He seems to be finished talking to you. On his way back to the door he tosses a pile of your clothes your way. Without a word he shuts the door and is gone.'
 	hotelWhore = 1
@@ -393,7 +394,7 @@ end
 if $ARGS[0] = 'abducted_hate':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/abusedface.jpg"></center>'
 	*nl
-	'<font color=#<<$mas_font>>>"Well bitch than you should not get wasted in a bar in middle of nowhere, full of strangers you don''t know!"</font>'
+	'<font color=#<<$mas_font>>>"Well bitch than you should not get wasted in a bar in the middle of nowhere, full of strangers you don''t know!"</font>'
 	'<font color=#<<$pcs_font>>>"You moron! Rapist! Idiot!"</font>'
 	'<font color=#<<$mas_font>>>"Fuck off you slut. Take your clothes a begone!"</font>'
 	'You furiously take your clothes, put them on and run away through the door back to the lobby.'
@@ -411,7 +412,7 @@ if $ARGS[0] = 'password':
 	*nl
 	'"Oh I see. Come with me please." he leads you to the lobby, looking for the Errand Boy. He finds him leaning on a wall near the elevator.'
 	'"This young miss is here for the special drink. The Blue Blooded Russian."'
-	'The boy just nods and saying not a word leads you to the elevator. "Please look the other way, I now have to enter the combination."'
+	'The boy just nods and, saying not a word, leads you to the elevator. "Please look the other way, I now have to enter the combination."'
 	act 'Turn around and don''t look':gt 'brothel','elevator'
 end
 
@@ -424,7 +425,7 @@ if $ARGS[0] = 'elevator':
 	*nl
 	'You arrive to a level which you can just guess is underground, beneath the Hotel. Looking at the surroundings it probably was an underground shelter during the Cold War.'
 	'"Go through the hall to the reception, they will give you instructions." the boy says.'
-	'Leaving the elevator you faintly hear murmuring him "Have fun, slut". But maybe it''s just your imagination...'
+	'Leaving the elevator you faintly hear him murmuring "Have fun, slut". But maybe it''s just your imagination...'
 	act 'Go to reception':gt 'brothel','reception'
 end
 
@@ -437,7 +438,7 @@ if $ARGS[0] = 'reception':
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/receptionist.jpg"></center>'
 	*nl
-	'Behind the desk sits an older, grey haired man. "Ah, just in time. We lack several girls right now. Which section do you want to attend this time? Just choose one and go to its lobby."'
+	'Behind the desk sits an older, grey haired man. "Ah, just in time. We lack several girls right now. Which section do you want to attend this time? Just choose one and go to the lobby."'
 	if custTime > 0:
 		act 'Ask to get your hard earned wage': gt 'brothel', 'get_paid'
 	end
@@ -466,7 +467,7 @@ if $ARGS[0] = 'leave':
 		end
 		act 'Go back to suit up': gt 'brothel', 'section1_dressingroom'
 	else
-		'The Receptionist pushes a hidden button, probably signaling the errand boy, because in a minute he arrives with the elevator.'
+		'The Receptionist pushes a hidden button, probably signaling the errand boy, because after a minute he arrives with the elevator.'
 		'<font color=#<<$rec_font>>>"Go <<$pcs_firstname>>, you are free to leave."</font>'
 	act 'Go to the elevator': gt 'brothel', 'lobby'
 	end
@@ -492,8 +493,8 @@ if $ARGS[0] = 'section1_lobby':
 	$sect = 'section1'
 	'<h3>Brothel Lobby</h3>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/lobby.jpg"></center>'
-	'A section 1 lobby. Spacy hall-like room, leading to several smaller rooms.'
-	'Comfortable couch is in the middle of the lobby, next to it are several cages sized just for a smaller person.'
+	'The section 1 lobby.A spacy hall-like room, leading to several smaller rooms.'
+	'A Comfortable couch is in the middle of the lobby, next to it are several cages sized just for a smaller person.'
 	'One of the doors also leads to a <a href="exec:gt ''brothel'', ''section1_dressingroom''">room</a> made for the girls. '
 	if (klismaday = daystart and (pcs_leghair <= 3 or pcs_pubes <= 3) and pcs_hairbsh = 1 and pcs_makeup >= 1 and pcs_lipbalm >= 1 and $pantyworntype = 'none' and $clothingworntype = 'nude' and (cumloc[1] = 0 and cumloc[4] = 0 and cumloc[8] = 0 and cumloc[9] = 0 and cumloc[10] = 0 and cumloc[11] = 0 and cumloc[15] = 0 and cumloc[16] = 0 and cumloc[17] = 0) and pcs_sweat < 40):
 		act 'Get in the cage': gt 'brothel', 'section1_cage'
@@ -529,15 +530,15 @@ if $ARGS[0] = 'section1_dressingroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'From a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $loc_arg">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $loc_arg">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
 	'-------------------------------------------------------------------------------------'
 	' 1) You are the Slave.'
 	' 2) The Client is the Master and can do any practice with the Slave, except specifically named practices in point 3.'
-	' 3) The Slave will not be injured in such way that requires hospitalisation or leaves a lasting injury, unless the Slave agrees to such practice voluntarily.'
-	' 4) Each session is for safety purposes recorded on a camera. The record is ownership of the Organization.'
+	' 3) The Slave will not be injured in such way that requires hospitalisation or leaves a lasting injury, unless the Slave agrees to such a practice voluntarily.'
+	' 4) Each session is for safety purposes recorded by a camera. The record is ownership of the Organization.'
 	' 5) The Master can hide his/her identity by wearing a mask.'
 	' 6) The Slave earns a pay of '+payRate+' <b>₽</b> for every started hour of a session.'
 	*nl
@@ -564,7 +565,8 @@ if $ARGS[0] = 'section1_dressingroom':
 			if stanok > 0: dynamic $brit
 		end
 	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+      !Changed from buying to taking from the box, since shampoo is handed out for free at this location
+		'<font color="red">You''ve run out of shampoo and will have to grab some more from the box before you can wash yourself.</font>'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage
@@ -590,7 +592,7 @@ if $ARGS[0] = 'section1_cage':
 	'<h3>Brothel Lobby</h3>'
 	'<h5>Slave cage</h5>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/slaveincage.jpg"></center>'
-	'You are locked in a cage, like an animal. The bars are cold on touch, stressing the feeling of helplesness even more.'
+	'You are locked in a cage, like an animal. The bars are cold to the touch, stressing the feeling of helplesness even more.'
 	act 'Wait for a client': gt 'brothel', 'section1_cage_client'
 	act 'Signal the receptionist that you want to leave': gt 'brothel', 'section1_cage_leave'
 end
@@ -599,7 +601,7 @@ if $ARGS[0] = 'section1_cage_leave':
 	menu_off = 1
 	'<h3>Brothel Lobby</h3>'
 	'<h5>Slave cage: receptionist comes</h5>'
-	'He unlocks the self-locking mechanism from outside and let''s you crawl out.'
+	'He unlocks the self-locking mechanism from outside and lets you crawl out.'
 	'<font color=#<<$rec_font>>>"Changed your mind, girl? That''s not what we like, you know?"</font>'
 	brothelCredit -= 1
 	act 'Say an excuse and leave': gt 'brothel', 'section1_dressingroom'
@@ -643,8 +645,8 @@ if $ARGS[0] = 'section1_start':
 	menu_off = 1
 	'<h3>Playroom</h3>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/playroom.jpg"></center>'
-	'This room is designed for any perverted action you could think of. The thick walls indicate it is soundproof, though the walls are painted with smooth coating, probably to be easily washable.'
-	'It is quite spacious, in each corner there is a different bounding device. Next to the already locked doors lies large boxes with who-knows-what kinds of devices.'
+	'This room is designed for every perverted action you could think of. The thick walls indicate it is soundproof, though the walls are painted with a smooth coating, probably to be easily washable.'
+	'It is quite spacious, in each corner is a different bondage device. Next to the already locked doors lies a large box with who-knows-what kind of devices.'
 	'The only thing that connects you with the outside are cameras in each corner of the room, watchfully recording all that happens here.'
 	if rageMeter <= 100:
 		'<font color=#'+$mas_font+'>"So what will we do today, my little painslut?"</font>'
@@ -659,13 +661,13 @@ end
 if $ARGS[0] = 'section1_slave_chooses':
 	menu_off = 1
 	'<h3>Playroom</h3>'
-	'<h5>You decided to suggest what your Master should do with you...</h5>'
+	'<h5>You decide to suggest what your Master should do with you...</h5>'
 	'You ask him: <font color=#<<$pcs_font>>>"Master, please..."</font>'
-	!!act '..let''s just have us sex and see where it leads':
+	!!act '..let''s just have sex and see where it leads':
 	!!act '..just bind me and use my holes':
 	!!act '..I''ve been a bad girl, I should be punished':
 	!!act '..I need to recharge my batteries':
-	!!act '..I''m so thirsty, I could use a bit of water':
+	!!act '..I''m so thirsty, I could use something to drink':
 	!!act '..I am so tight, I need some exercise':
 	act 'Reconsider and be quiet': gt 'brothel', 'section1_master_chooses'
 end
@@ -894,7 +896,7 @@ if $ARGS[0] = 'section1_finish':
 		th = rand (1, 2)
 		if step = 0:
 			'The client now leaves all the toys behind and goes behind you. Unable to see him you can just guess what''s he doing behind your bare ass.'
-			'He puts his hands on your asscheeks, spreading them wide to get better look on both your holes...'
+			'He puts his hands on your asscheeks, spreading them wide to get a better look on both your holes...'
 			'You start to shake as you know what''s coming...'
 			if analplugIN = 1:
 				'<center><img <<$set_imgh>> src="images/locations/shared/brothel/spreadasswithplugfrombehind.jpg"></center>'
@@ -908,11 +910,11 @@ if $ARGS[0] = 'section1_finish':
 			if th = 1:
 				if analplugIN = 1:
 					'Both your pussy and your anus are too well on display... You say to yourself: <font color=#<<$pcs_font>>>(At least he won''t put it in my anus... the plug is already there...)</font>'
-					'Right at that moment the Client penetrates your pussy and thrusts his pole up to the rim!'
+					'Right at that moment the Client penetrates your pussy and thrusts his pole in, up to the rim!'
 					'<center><img <<$set_imgh>> src="images/locations/shared/brothel/insertvaginalwithplugfrombehind.jpg"></center>'
 				else
 					'Both your pussy and your anus are too well on display... You say to yourself: <font color=#<<$pcs_font>>>(Oh just please just don''t put it in my poor anus!)</font>'
-					'Right at that moment the Client penetrates your pussy and thrusts his pole up to the rim!'
+					'Right at that moment the Client penetrates your pussy and thrusts his pole in, up to the rim!'
 					'<center><video autoplay loop src="images/locations/shared/brothel/insertvaginalfrombehind.mp4"></video></center>'
 				end
 			!pls not in pussy
@@ -923,8 +925,8 @@ if $ARGS[0] = 'section1_finish':
 					'The pain is intensified as the previously inserted anal plug is still in its place, rubbing the thin wall between your vagina and intestines.'
 					'The Client seems to disregard that, as he pounds your pussy even deeper...'
 					'<center><img <<$set_imgh>> src="images/locations/shared/brothel/insertvaginalwithplugfrombehind.jpg"></center>'
-					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no no take it ouuuut! Maaaster pleaaase!"</font>'
-					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
+					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no, no, take it ouuuut! Maaaster, pleaaase!"</font>'
+					'Just as you say that the next pound of the Client''s dick pushes out the plug, which falls out down between your bound legs.'
 					analplugIN = 0
 					gs 'pain', 2, 'pussy', 'stretch'
 					gs 'stat'
@@ -941,10 +943,14 @@ if $ARGS[0] = 'section1_finish':
 			step = 3
 			act 'Endure it': gt 'brothel', 'section1_finish'
 		elseif step = 3:
-			'After what seems as eternity, the Client seems to be closing to his orgasm.'
-			'<font color=#<<$pcs_font>>>"Yes Master, please fill me with your cum!"</font> You shout from the rest of your remaining energy, trying to get him cum as soon as possible.'
+			'After what seems like eternity, the Client seems to be close to orgasm.'
+			'<font color=#<<$pcs_font>>>"Yes Master, please fill me with your cum!"</font> You shout with the rest of your remaining energy, trying to get him to cum as soon as possible.'
 			'It works as your words arouse him even more and finally he pumps all his vile seed deep into your vagina...'
 			'<font color=#<<$pcs_font>>>(Yuk... I think it went even to my uterus! That''s gross!)</font>'
+      		if knowpreg = 0 and thinkpreg = 0 and pillcon2 < 1000:
+                *nl
+				'With a growing sense of horror, you realize that you aren''t on the shot and have no idea when you last took a birth control pill.'
+			end
 			'<center><video autoplay loop src="images/locations/shared/brothel/cuminpussyfrombehind.mp4"></video></center>'
 			step = 0
 			$subloc = 'section1_end'
@@ -976,11 +982,11 @@ if $ARGS[0] = 'section1_finish':
 			if th = 1:
 				if analplugIN = 1:
 					'Both your pussy and your anus are too well on display... You say to yourself: <font color=#<<$pcs_font>>>(At least he won''t put it in my anus... the plug is already there...)</font>'
-					'But as if you said your thought aloud, in precisely that moment the Client sticks a warm hard pole right in your ass... up to his rim!'
+					'But as if you said your thought aloud, in precisely that moment the Client sticks a warm, hard pole right in your ass... up to his rim!'
 					'<center><video autoplay loop src="images/locations/shared/brothel/fuckanalwithplugfrombehind.mp4"></video></center>'
-					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no no take it ouuuut! Maaaster pleaaase!"</font>'
-					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
-					'The Client seems to disregard that, as he stretches your anus even more with his fallus... Or maybe he does it on purpose!'
+					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no, no, take it ouuuut! Maaaster, pleaaase!"</font>'
+					'Just as you say that the next pound of the Client''s dick pushes out the plug, which falls out down between your bound legs.'
+					'The Client seems to disregard that, as he stretches your anus even more with his phallus... Or maybe he does it on purpose!'
 					analplugIN = 0
 					gs 'pain', 2, 'anus', 'stretch'
 					gs 'stat'
@@ -993,14 +999,14 @@ if $ARGS[0] = 'section1_finish':
 			!pls not in pussy
 			elseif th = 2:
 				'Both your pussy and your anus are well on display... You say to yourself: <font color=#<<$pcs_font>>>(Please just don''t put it in my sore pussy!)</font>'
-				'Ironically you actually sigh in relief as the Client sticks his warm yet hard pole in your anus and not your pussy.'
+				'Ironically you actually sigh in relief as the Client sticks his warm, hard pole in your anus and not your pussy.'
 				if analplugIN = 1:
 					'But you entirely forgot about that thing already inside you!'
 					'The pain is intensified as the previously inserted anal plug is still in its place... in your ass!'
-					'The Client seems to disregard that, as he stretches your anus even more with his fallus...'
+					'The Client seems to disregard that, as he stretches your anus even more with his phallus...'
 					'<center><video autoplay loop src="images/locations/shared/brothel/fuckanalwithplugfrombehind.mp4"></video></center>'
-					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no no take it ouuuut! Maaaster pleaaase!"</font>'
-					'Just as you say that the next pound of Client''s dick pushes out the plug, which falls out down between your bound legs.'
+					'<font color=#<<$pcs_font>>>"Owwwwuuch! Pleaaase no, no, take it ouuuut! Maaaster, pleaaase!"</font>'
+					'Just as you say that the next pound of the Client''s dick pushes out the plug, which falls out down between your bound legs.'
 					analplugIN = 0
 					gs 'pain', 4, 'anus', 'stretch'
 					gs 'stat'
@@ -1017,8 +1023,8 @@ if $ARGS[0] = 'section1_finish':
 			step = 3
 			act 'Endure it': gt 'brothel', 'section1_finish'
 		elseif step = 3:
-			'After what seems as eternity, the Client seems to be closing to his orgasm.'
-			'<font color=#<<$pcs_font>>>"Yes Master, please fill me with your cum!"</font> You shout from the rest of your remaining energy, trying to get him cum as soon as possible.'
+			'After what seems like eternity, the Client seems to be close to orgasm.'
+			'<font color=#<<$pcs_font>>>"Yes Master, please fill me with your cum!"</font> You shout with the rest of your remaining energy, trying to get him to cum as soon as possible.'
 			'It works as your words arouse him even more and finally he pumps all his vile seed deep into your intestines... <font color=#<<$pcs_font>>>(Finally...)</font>'
 			'<center><video autoplay loop src="images/locations/shared/brothel/cuminassfrombehind.mp4"></video></center>'
 			step = 0
@@ -1038,8 +1044,12 @@ if $ARGS[0] = 'section1_finish':
 		'<center><video autoplay loop src="images/locations/shared/brothel/cummissionaryvaginal.mp4"></video></center>'
 		*nl
 		'Being still bound on your back, you finally expect it to end.'
-		'The Client increases his pace and groaning cums into your vagina, releasing the hot sperm down your pussy, reaching even to your cervix...'
-		$subloc = 'section1_end'
+		'The Client increases his pace and, with a groan, cums into your vagina, releasing his hot sperm down your pussy, reaching even to your cervix...'
+		if knowpreg = 0 and thinkpreg = 0 and pillcon2 < 1000:
+      			*nl
+				'With a growing sense of horror, you realize that you aren''t on the shot and have no idea when you last took a birth control pill.'
+		end
+        $subloc = 'section1_end'
 		gs 'cum_call', '', 'Master'
 		act 'Continue': gt 'brothel', $subloc
 	elseif $finType = 'missionary:anal':
@@ -1054,7 +1064,7 @@ if $ARGS[0] = 'section1_finish':
 		'<center><video autoplay loop src="images/locations/shared/brothel/cummissionaryanal.mp4"></video></center>'
 		*nl
 		'Being still bound on your back, you finally expect it to end.'
-		'The Client increases his pace and groaning cums into your anus, releasing the hot sperm inside the intestines.'
+		'The Client increases his pace and, with a groan, cums into your anus, releasing his hot sperm inside your intestines.'
 		$subloc = 'section1_end'
 		gs 'cum_call', 'anus', 'Master'
 		act 'Continue': gt 'brothel', $subloc
@@ -1069,7 +1079,7 @@ if $ARGS[0] = 'section1_finish':
 		*nl
 		if step = 0:
 			'The client now leaves all the toys behind and goes to you.'
-			'He starts to caress your face... unable to move you just hold and endure his touches...'
+			'He starts to caress your face... unable to move, you just hold still and endure his touches...'
 			'You start to shake as you know what''s coming...'
 			*nl
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/caressface.jpg"></center>'
@@ -1077,15 +1087,15 @@ if $ARGS[0] = 'section1_finish':
 			act 'Continue':gt 'brothel', 'section1_finish'
 		elseif step = 1:
 			'As you were afraid of, the Client takes his cock and thrusts it in your mouth: <font color=#<<$mas_font>>"Now let''s use this mouthy hole!"</font>'
-			'Unable even to react or moan, you are plugged with his meat, choking and dribbling all around...'
+			'Unable to even react or moan, you are plugged with his meat, choking and dribbling all around...'
 			*nl
 			'<center><video autoplay loop src="images/locations/shared/brothel/fuckfacetied.mp4"></video></center>'
 			step = 2
 			act 'Continue':gt 'brothel', 'section1_finish'
 		elseif step = 2:
-			'His pace is increasing as orgasms builds in his cock.'
+			'His pace is increasing as an orgasm builds in his cock.'
 			'The warm feel of his cum surprises you...'
-			'Most of the cum penetrates directly in your throat and down to the belly, the rests flows out around your mouth and his dick...'
+			'Most of the cum penetrates directly into your throat and down to your belly, the rest flows out around your mouth and his dick...'
 			*nl
 			'<center><video autoplay loop src="images/locations/shared/brothel/cuminmouth.mp4"></video></center>'
 			step = 0
@@ -1103,19 +1113,19 @@ if $ARGS[0] = 'section1_finish':
 		*nl
 		if step = 0:
 			'The client now leaves all the toys behind and goes to you.'
-			'He starts to caress your face... unable to move you just hold and endure his touches...'
+			'He starts to caress your face... unable to move, you just hold still and endure his touches...'
 			'You start to shake as you know what''s coming...'
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/caressface.jpg"></center>'
 			step = 1
 			act 'Continue':gt 'brothel', 'section1_finish'
 		elseif step = 1:
 			'As you were afraid of, the Client takes his cock and thrusts it in your mouth: <font color=#<<$mas_font>>"Now let''s use this mouthy hole!"</font>'
-			'Unable even to react or moan, you are plugged with his meat, choking and dribbling all around...'
+			'Unable to even react or moan, you are plugged with his meat, choking and dribbling all around...'
 			'<center><video autoplay loop src="images/locations/shared/brothel/fuckfacetied.mp4"></video></center>'
 			step = 2
 			act 'Continue':gt 'brothel', 'section1_finish'
 		elseif step = 2:
-			'His pace is increasing as orgasms builds in his cock.'
+			'His pace is increasing as an orgasm builds in his cock.'
 			'The warm feel of his cum surprises you as it lands all over your face.'
 			'The sticky white liquid gets in your eyes and nose, slowly dripping around your mouth...'
 			'<center><video autoplay loop src="images/locations/shared/brothel/cumonface.mp4"></video></center>'
@@ -1139,12 +1149,12 @@ if $ARGS[0] = 'section1_tied_mouth':
 	'<center><video autoplay loop src="images/locations/shared/brothel/tied_mouth.mp4"></video></center>'
 	*nl
 	'You are still bound on your back, with hands and knees tied together, exposing both of your holes.'
-	'The Client reaches to you, looking down to your round crotch.'
+	'The Client reaches out to you, looking down at your crotch.'
 	'<font color=#<<$pcs_font>>>"So what will it be, slut?"</font>'
 	'<font color=#<<$mas_font>>>"Uhm... a fucking of my pussy? Or anus?"</font>'
 	'<font color=#<<$pcs_font>>>"Fucking indeed, but neither of those. Open your mouth!"</font>'
-	'You have no option but to do as he wants, opening your lips for his thick phallus.'
-	'You choke, saliva everywhere, but it seems he won''t stop until you either suffocate or until he cums!'
+	'You have no other option, but to do as he wants, opening your lips for his thick phallus.'
+	'You choke, saliva everywhere, but it seems he won''t stop until you either suffocate or he cums!'
 
 	gs 'arousal', 'bj', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1165,14 +1175,14 @@ if $ARGS[0] = 'section1_tied_anal':
 	'<center><video autoplay loop src="images/locations/shared/brothel/tied_anal.mp4"></video></center>'
 	*nl
 	'You are still bound on your back, with hands and knees tied together, exposing both of your holes.'
-	'The Client reaches to you, looking down to your round crotch.'
+	'The Client reaches out to you, looking down at your crotch.'
 	'<font color=#<<$pcs_font>>>"So what will it be, slut?"</font>'
-	'Before you even try to decide how to react to this straight question, he forces his dick down your... anus!'
+	'Before you can even try to decide how to react to this straight question, he forces his dick down your... anus!'
 	'<font color=#<<$mas_font>>>"Owwwch!"</font>'
 	'<font color=#<<$pcs_font>>>"Didn''t expect such a quick entry, did you?"</font>'
-	'But again you are unable to answer, because he starts to pound you so fast and deep, that even an attempt to get a sound out of your mouth is futile.'
+	'But again you are unable to answer, because he starts to pound you so fast and deep, that every attempt to get a sound out of your mouth is futile.'
 	'You can just helplessly endure the hard fucking he''s giving you...'
-	'As it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
+	'As if it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
 
 	gs 'arousal', 'anal', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1193,14 +1203,14 @@ if $ARGS[0] = 'section1_tied_vaginal':
 	'<center><video autoplay loop src="images/locations/shared/brothel/tied_vaginal.mp4"></video></center>'
 	*nl
 	'You are still bound on your back, with hands and knees tied together, exposing both of your holes.'
-	'The Client reaches to you, looking down to your round crotch.'
+	'The Client reaches out to you, looking down at your crotch.'
 	'<font color=#<<$pcs_font>>>"So what will it be, slut?"</font>'
-	'Before you even try to decide how to react to this straight question, he forces his dick down your... pussy!'
+	'Before you can even try to decide how to react to this straight question, he forces his dick down your... pussy!'
 	'<font color=#<<$mas_font>>>"Owwwch!"</font>'
 	'<font color=#<<$pcs_font>>>"Didn''t expect such a quick entry, did you?"</font>'
-	'But again you are unable to answer, because he starts to pound you so fast and deep, that even an attempt to get a sound out of your mouth is futile.'
+	'But again you are unable to answer, because he starts to pound you so fast and deep, that every attempt to get a sound out of your mouth is futile.'
 	'You can just helplessly endure the hard fucking he''s giving you...'
-	'As it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
+	'As if it wasn''t enough, he slaps your tits every now and then, making the whole experience even more hopeless.'
 
 	gs 'arousal', 'vaginal', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1219,7 +1229,7 @@ if $ARGS[0] = 'section1_tied_tease':
 	*nl
 	'<center><video autoplay loop src="images/locations/shared/brothel/tied_tease.mp4"></video></center>'
 	*nl
-	'The client circles around you, touching every part of your body as if he were looking for something.'
+	'The client circles around you, touching every part of your body as if he is looking for something.'
 	'He starts by exploring both of your holes, stretching the lips and probing the insides.'
 	'Then he twists your nipples around, waiting for you to make an uncomfortable sound.'
 	'After a while he seems to be done, likely looking content with his explorations.'
@@ -1243,17 +1253,17 @@ if $ARGS[0] = 'section1_tied_analfisting':
 	*nl
 	'<center><video autoplay loop src="images/locations/shared/brothel/tied_analfisting.mp4"></video></center>'
 	*nl
-	'<font color=#<<$mas_font>>>"How long dick are you able to take inside your ass, slut?"</font>'
+	'<font color=#<<$mas_font>>>"What''s the longest dick you are able to take inside your ass, slut?"</font>'
 	'<font color=#<<$pcs_font>>>"I... I don''t know master, I have never measured any."</font>'
 	'<font color=#<<$mas_font>>>"Then we need to take the measurements, I''d say!"</font>'
 	'He takes a big bottle of lube, squirting it on his hand.'
-	'<font color=#<<$pcs_font>>>"No please, this won''t fit in me!"</font>'
+	'<font color=#<<$pcs_font>>>"No please, this won''t fit inside me!"</font>'
 	'<font color=#<<$mas_font>>>"How can you know if you didn''t try, dumb cunt?"</font>'
-	'He pushes few finger into your anus right away, causing you a cramp in your abdomen.'
-	'But he doesn''t stop, putting one by one all of his fingers, even the thumb.'
-	'You scream in pain and horror but he pushes even more until finally his hand jumps inside you.'
+	'He pushes a few fingers into your anus right away, causing your abdomen to cramp.'
+	'But he doesn''t stop, putting one by one all of his fingers in, even the thumb.'
+	'You scream in pain and horror, but he pushes even more until finally his hand slips inside you.'
 	'<font color=#<<$mas_font>>>"Now let us see how far can we get!"</font>'
-	'He pushes his hand even more inside, almost the whole elbow is in your intestines now!'
+	'He pushes his hand even deeper inside, almost the whole elbow is in your intestines now!'
 	'He turns his fist from side to side, making your thin stomach bulge!'
 	gs 'arousal', 'anal_fist', 15, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1278,9 +1288,9 @@ if $ARGS[0] = 'section1_tied_vibrate':
 	'<font color=#<<$pcs_font>>>"I... I would say regularly sensitive, master."</font>'
 	'<font color=#<<$mas_font>>>"After this, it will be nothing like regular, haha!"</font>'
 	'With those words his face turns grim - and you feel an unpleasant shiver down your back.'
-	'Your fears come true in few seconds - he takes out a giant vibration device!'
-	'He puts the top of the device right on your exposed pussy lips, also spreading them to get right onto your clitoris.'
-	'Then he slowly reaches for the button with big red ON.'
+	'Your fears come true in a few seconds - he takes out a giant vibration device!'
+	'He puts the top of the device right on your exposed pussy lips, spreading them to get right onto your clitoris.'
+	'Then he slowly reaches for the button with a big red ON.'
 	gs 'pain', 3, 'clitoris', 'bind'
 	$orgasm_or = 'What comes next is too intensive for you, forcing you into an orgasm mixed with pain and loud screams!'
 	$orgasm_or = 'yes'
@@ -1304,8 +1314,8 @@ if $ARGS[0] = 'section1_tied_whip':
 	'<font color=#<<$mas_font>>>"Is your pussy a sensitive one, girl?"</font>'
 	'<font color=#<<$pcs_font>>>"I... I would say regularly sensitive, master."</font>'
 	'<font color=#<<$mas_font>>>"After this, it will be nothing like regular, haha!"</font>'
-	'With those words his face turn grim - and you get unpleasant shiver on your back.'
-	'Your fears come true in few seconds - he takes out a whip!'
+	'With those words his face turn grim - and you feel an unpleasant shiver down your back.'
+	'Your fears come true in a few seconds - he takes out a whip!'
 	'He puts the top of the whip right on your exposed pussy lips, enjoying the frightened face you are giving him.'
 	'Then suddenly he starts to punish the most sensitive part of your young body, giving you no mercy.'
 
@@ -1364,7 +1374,7 @@ if $ARGS[0] = 'section1_nailsandneedlestits':
 		'<font color=#<<$pcs_font>>>"What the...?"</font>'
 		'<font color=#<<$mas_font>>>"... and I think those nipples of yours are aching for them!"</font>'
 		'<font color=#<<$pcs_font>>>"You can''t be serious! This IS against the rules, let me out!"</font>'
-		'<font color=#<<$mas_font>>>"Not if you agree with this. So what will it be?"</font>'
+		'<font color=#<<$mas_font>>>"Not if you agree with it. So what will it be?"</font>'
 		step = 1
 		act 'No way, you''ll never do that': gt 'brothel', 'section1_nailsandneedlestits'
 	elseif step = 1:
@@ -1373,7 +1383,7 @@ if $ARGS[0] = 'section1_nailsandneedlestits':
 		'<font color=#<<$mas_font>>>"Wh... what bonus?"</font>'
 		'<font color=#<<$mas_font>>>"Ah, let''s say 50% more?"</font>'
 		act 'Say you''ll do it': step = 2 & bonus = 50 & gt 'brothel', 'section1_nailsandneedlestits'
-		act 'Say you''ll do it fot 100% more': step = 3 & gt 'brothel', 'section1_nailsandneedlestits'
+		act 'Say you''ll do it for 100% more': step = 3 & gt 'brothel', 'section1_nailsandneedlestits'
 		act 'No way, you''ll never do that': step = 10 & gt 'brothel', 'section1_nailsandneedlestits'
 	elseif step = 2:
 		'<font color=#<<$mas_font>>>"A whore is a whore I see. Now let us begin!"</font>'
@@ -1389,7 +1399,7 @@ if $ARGS[0] = 'section1_nailsandneedlestits':
 		else
 			'<font color=#<<$mas_font>>>"What? Who do you think I am slut? A fucking monger?"</font>'
 			'<font color=#<<$pcs_font>>>"I... No! I didn''t mean..."</font>'
-			'<font color=#<<$mas_font>>>"Shut up slave! You will agree to it for free NOW!"</font>'
+			'<font color=#<<$mas_font>>>"Shut up slave! You will agree to it for free, NOW!"</font>'
 			step = 10
 			act 'Continue': gt 'brothel', 'section1_nailsandneedlestits'
 		end
@@ -1397,34 +1407,34 @@ if $ARGS[0] = 'section1_nailsandneedlestits':
 	elseif step = 4:
 		gs 'pain', 3, 'nipples', 'pierce'
 		gs 'stat'
-		'He comes with a set of needles of various sizes. Judging by the fancy bag he carries them in, he is not doing this to a first girl...'
+		'He brings a bag with a set of needles of various sizes. Judging by the fancy bag he carries them in, he is not doing this to a girl for the first time...'
 		'One by one he takes them out of the bag and slowly penetrates your areola.'
-		'It hurts like being at doctor taking blood, but worse, because they don''t take blood from your nipples in the hospital!'
-		'When you think it''s over he takes out one large needle with longer rod than the others...'
-		'<font color=#<<$mas_font>>>"Now where do you think this one goes?"</font>'
-		'Not waiting for answer he stabs your nipple in the middle!'
+		'It hurts like being at the doctor''s office, getting blood taken, but worse, because they don''t take blood from your nipples there!'
+		'When you think it''s over he takes out one large needle with a longer rod than the others...'
+		'<font color=#<<$mas_font>>>"Now, where do you think this one goes?"</font>'
+		'Not waiting for answer, he stabs it in the middle of your nipple!'
 		'<center><video autoplay loop src="images/locations/shared/brothel/needlesintits.mp4"></video></center>'
 		*nl
 		'<font color=#<<$mas_font>>>"Owwwwwwwwwwwwwwwwww"</font>'
-		'And af it wasn''t already enough, he moves with the needle inside you in and out...'
+		'And if it wasn''t already enough, he moves the needle in and out...'
 		'<font color=#<<$pcs_font>>>"Pleaase, no more... no more..."</font>'
-		'Stepping away he looks at his doing, at your poor tits.'
+		'Stepping away he looks at his doing, and your poor tits.'
 		'<font color=#<<$mas_font>>>"Yes, no more. No more needles. Now to the nails!"</font>'
 		step = 5
 		act 'Continue': gt 'brothel', 'section1_nailsandneedlestits'
 	elseif step = 5:
 		gs 'pain', 4, 'breasts', 'pierce'
 		gs 'stat'
-		'He pulls out the needles, fast and not caring about the further pain it cuases.'
-		'He let''s you down, lies you on a wooden plank with your tits touching it.'
+		'He pulls out the needles, fast and not caring about the further pain it causes.'
+		'He let''s you down, laying you on a wooden plank with your tits touching it.'
 		'The hammer and nails in his hands frighten you to another level.'
 		'<font color=#<<$pcs_font>>>"Oh my... I thought it through! I don''t agree with this! Take your money back and release me now!"</font>'
-		'<font color=#<<$mas_font>>>"Too late bitch! Once you agree there''s no going back! It''s on the camera, remember? Now enjoy!"</font>'
+		'<font color=#<<$mas_font>>>"Too late bitch! Once you agree there''s no going back! It''s on camera, remember? Now enjoy!"</font>'
 		*nl
 		'<center><video autoplay loop src="images/locations/shared/brothel/nailtits.mp4"></video></center>'
 		*nl
 		'<font color=#<<$pcs_font>>>"Owwwwwwwwwwwwwwwwww"</font>'
-		'The nails are put on your tits and nailed like one plank to another.'
+		'He puts the nails to your tits and starts nailing them to the plank.'
 		step = 6
 		act 'Endure': gt 'brothel', 'section1_nailsandneedlestits'
 	elseif step = 6:
@@ -1479,7 +1489,7 @@ if $ARGS[0] = 'section1_whiptits':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/whiptits.mp4"></video></center>'
-	'As you hang with hands tied, you can just watch as the Client takes a whip and repeatedly punishes your tender titties...'
+	'As you hang with your hands tied, you can just watch as the Client takes a whip and repeatedly punishes your tender titties...'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww! Not... Any... More... Please... Oww..."</font> with each stroke you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1511,7 +1521,7 @@ if $ARGS[0] = 'section1_pinchtits':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/pinchtits.mp4"></video></center>'
-	'As you hang with hands tied, you can just watch as the Client takes a wooden pins and pinches your sensitive nipples and areolas.'
+	'As you hang with hands tied, you can just watch as the Client takes a few wooden pins and pinches your sensitive nipples and areolas.'
 	'First it is just unpleasant but the repeated attacks on your tits make it worse with each attempt...'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww!"</font> with each pinch you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
@@ -1528,8 +1538,8 @@ if $ARGS[0] = 'section1_punchtits':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/punchtits.mp4"></video></center>'
-	'As you hang with hands tied, you can just watch as the Client closes his strong manly fists.'
-	'Your tender titties are but punchbags for as if this was a boxing session!'
+	'As you hang with hands tied, you can just watch as the Client closes his strong, manly fists.'
+	'Your tender titties are but punchbags for him, as if this was a boxing session!'
 	'<font color=#<<$pcs_font>>>"Oww! Oww! Nooo! Owww!"</font> with each punch you try to beg him to stop it but it seems to arouse him even more.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1545,10 +1555,10 @@ if $ARGS[0] = 'section1_bindtits':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/bindtits.jpg"></center>'
-	'Client takes a piece of rope and starts attaching it to your chest.'
-	'First you do not know what is his purpose, but as soon as he circles your breasts with the ropes, you know it well.'
+	'The client takes a piece of rope and starts attaching it to your chest.'
+	'First you do not know what he is planning, but as soon as he circles your breasts with the ropes, you know it well.'
 	'He ties the strings around your tits very tight, making them even more sensitive and as an addition turning more purple with each minute.'
-	'<font color=#<<$pcs_font>>>"Not so tight Master please!"</font>'
+	'<font color=#<<$pcs_font>>>"Not so tight Master, please!"</font>'
 	'<font color=#<<$mas_font>>>"Shut up slut!"</font> he obviously wants you to suffer...'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1566,7 +1576,7 @@ if $ARGS[0] = 'section1_pinchboundtits':
 	'<center><video autoplay loop src="images/locations/shared/brothel/pinchboundtits.mp4"></video></center>'
 	'Your tits are already squeezed by the ropes, but the Client wants to unleash additional suffering upon them.'
 	'He uses his fingers to pinch your nipples, stretching them as far as they go.'
-	'Your tits are already so full that you feel as they should rupture any second, and by trying to catch the nipples, Client causes you extremely unpleasant sensations!'
+	'Your tits are already so full that you feel as they should rupture any second, and by trying to catch the nipples, the client causes you extremely unpleasant sensations!'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'pain', 3, 'nipples', 'stretch'
@@ -1582,8 +1592,8 @@ if $ARGS[0] = 'section1_pullnipples':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/pullnipples.mp4"></video></center>'
-	'Client takes a piece of rope and attaches it to your nipples.'
-	'As soon as both strings are on place, he pulls them hard, as if he was trying to tear off your nipples!'
+	'The client takes a piece of rope and attaches it to your nipples.'
+	'As soon as both strings are in place, he pulls them hard, as if he was trying to tear off your nipples!'
 	'<font color=#<<$pcs_font>>>"Owwwwuuch!!!"</font> you gasp both in surprise and pain, trying to endure the continuous pull.'
 	'<font color=#<<$mas_font>>>"Nice! Do you think this will make your nipples longer, slut? Or will those shrink again? Let''s see!"</font>'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
@@ -1601,10 +1611,10 @@ if $ARGS[0] = 'section1_hangbyneck':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/hangbyneck.jpg"></center>'
-	'First he bounds your hands behind the back.'
-	'As you stand there, you are getting more nervous about what''s he going to do with you...'
-	'The Client comes with another rope, attaching it to already prepared hook hanging from the ceiling.'
-	'To your horror he snaps the rope around your neck as if he''s going to hang you dead!'
+	'First he binds your hands behind your back.'
+	'As you stand there, you are getting more nervous about what he''s going to do with you...'
+	'The Client comes with another rope, attaching it to an already prepared hook hanging from the ceiling.'
+	'To your horror he snaps the rope around your neck as if he''s going to hang you!'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1619,10 +1629,10 @@ if $ARGS[0] = 'section1_hangbytits':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/hangbytits.mp4"></video></center>'
-	'Client attaches another rope to your already bound tits, using a pulley attached to the ceiling.'
-	'You start to shake in the moment you connect the ropes attached to your breasts and the pulley above you...'
-	'<font color=#<<$pcs_font>>>"No Master, you can''t be serious!! You will tear the off! It is against the rules, stop it!</font> you desperately try to avoid whats coming.'
-	'<font color=#<<$mas_font>>>"NO, it''s not against the rules. They won''t tear off, you''ll see!"</font> with those words he starts to pull the rope up, leveling you from the ground just by your tits.'
+	'The client attaches another rope to your already bound tits, using a pulley attached to the ceiling.'
+	'You start to shake the moment he connects the ropes attached to your breasts with the pulley above you...'
+	'<font color=#<<$pcs_font>>>"No Master, you can''t be serious!! You will tear them off! It is against the rules, stop it!</font>, you desperately try to avoid what''s coming.'
+	'<font color=#<<$mas_font>>>"NO, it''s not against the rules. They won''t tear off, you''ll see!"</font> with those words he starts to pull the rope up, lifting you from the ground just by your tits.'
 	'<font color=#<<$pcs_font>>>"AYYYEEEEEEEEEEEE!</font> you yell more from horror than actual pain, as you slowly realize...'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
@@ -1639,7 +1649,7 @@ if $ARGS[0] = 'section1_asshigh':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/asshigh.mp4"></video></center>'
-	'You are bound lying on your chest, Master raises your ass high in the air, forcing you to awkward position with both your holes on display, while tying you so you cannot move at all.'
+	'You are bound, lying on your chest, Master raises your ass high in the air, forcing you in an awkward position with both your holes on display, while tying you so you cannot move at all.'
 	gs 'arousal', 'foreplay', 10, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
 	act 'Continue': gt 'brothel', 'section1_play'
@@ -1653,11 +1663,11 @@ if $ARGS[0] = 'section1_buttplug':
 	'<h3>Playroom</h3>'
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
-	'<font color=#<<$pcs_font>>>(What in the world have I gotten to...)</font> you start to have second thoughts, but before they even form, you are interrupted with sharp pain:'
+	'<font color=#<<$pcs_font>>>(What in the world have I gotten into...)</font> you start to have second thoughts, but before they even form, you are interrupted with a sharp pain:'
 	'<center><video autoplay loop src="images/locations/shared/brothel/buttplug.mp4"></video></center>'
 	'<font color=#<<$pcs_font>>>"Owwchhh!" Take it out! Take it ouuuut PLEASE!"</font>'
 	'Disregarding your plea, Master says half for himself, obviously entertained <font color=#'+$mas_font+'>"It fits just nice, what a surprise! It looked quite thick!"</font>"'
-	'You can but guess what as you don''t see what happens behind you, however you feel cold, probably metallic plug in your anus.'
+	'You can only guess what as you don''t see what happens behind you, however you feel a cold, probably metallic plug in your anus.'
 	gs 'arousal', 'anal_dildo', 2, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1674,7 +1684,7 @@ if $ARGS[0] = 'section1_electrodesAss':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/electrodesass.jpg"></center>'
-	'You feel slightly cold sensation, as if something wet was put on and near your private areas.'
+	'You feel a slightly cold sensation, as if something wet was put on and near your private areas.'
 	gs 'arousal', 'foreplay', 5, 'bound', 'sub', 'prostitution', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1694,7 +1704,7 @@ if $ARGS[0] = 'section1_electrocuteAss':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/electrocuteass.mp4"></video></center>'
-	'Your body trembles in cramps as the electric discharge flows through your sensitive parts.'
+	'Your body trembles and cramps as the electric discharge flows through your sensitive parts.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1717,13 +1727,13 @@ if $ARGS[0] = 'section1_electrocuteAssMore':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/electrocuteassmore.mp4"></video></center>'
-	'Your body trembles in cramps to a limit as the electric discharge set on high settings flows through your sensitive parts.'
-	'You feel as your skin should peel away and your anus would tear apart any second.'
+	'Your body trembles and cramps, pushing you to your limit, as the electric discharge set on high settings flows through your sensitive parts.'
+	'You feel as if your skin should peel away and your anus would tear apart at any second.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<font color=#<<$pcs_font>>>"Owwchhh! It hurts so much! STOPP ITT!"</font>'
-	'<font color=#'+$mas_font+'>"You should''ve subdue at the first point, dumb slut. How do you like it now?"</font>'
+	'<font color=#'+$mas_font+'>"You should''ve subdued at the first point, dumb slut. How do you like it now?"</font>'
 
 	act 'Tell him you hate it and want him to stop':gt 'brothel', 'dislike'
 	act 'Tell him you love it':gt 'brothel', 'like'
@@ -1741,12 +1751,12 @@ if $ARGS[0] = 'section1_electrocuteAssMax':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/electrocuteassmax.mp4"></video></center>'
-	'Your body trembles in cramps beyond a limit as the electric discharge set on highest settings flows through your sensitive parts and spreads throughout the whole body.'
-	'You feel as your skin should turn upside down and your anus would explode together with the stomach.'
+	'Your body trembles and cramps far beyond what you thought possible, as the electric discharge set on the highest settings flows through your sensitive parts and spreads throughout your whole body.'
+	'You feel as if your skin should turn inside out and your anus would explode together with your stomach.'
 	gs 'arousal', 'anal', 5, 'sub', 'rough', 'maso', 'bound'
 	gs 'arousal', 'end'
 	gs 'stat'
-	'<font color=#<<$pcs_font>>>"Owwchhh! AAARHHHGHHGHGH!!!"</font> You are unable to even get out a senseless moan anymore...'
+	'<font color=#<<$pcs_font>>>"Owwchhh! AAARHHHGHHGHGH!!!"</font> You are unable to do anything but scream...'
 	'<font color=#'+$mas_font+'>"Now this is what I call a barbecue party!"</font>'
 
 	act 'Cry that you hate it and want him to stop':gt 'brothel', 'dislike'
@@ -1768,8 +1778,8 @@ if $ARGS[0] = 'section1_shockAnus':
 	'<center><video autoplay loop src="images/locations/shared/brothel/shockanus.mp4"></video></center>'
 	'You have obviously annoyed the Client by what you did.'
 	'He takes a long rod: <font color=#<<$mas_font>>>"Now where''s the fucking button!"</font>'
-	'A shiver runs through your spine and soon you know why! He sticks the rod in your anus, giving you an electrocuting your sensitive hole!"'
-	'<font color=#<<$pcs_font>>>"Owwwwwwwwwwwwwwwwww!"</font> Tears run out of your eyes in pain and terror...'
+	'A shiver runs through your spine and soon you know why! He sticks the rod in your anus, electrocuting your sensitive hole!"'
+	'<font color=#<<$pcs_font>>>"Owwwwwwwwwwwwwwwwww!"</font> Tears run down your cheeks in pain and terror...'
 	'<font color=#<<$mas_font>>>"Don''t do it again slut! Or this will be halfway in your anus!"</font>'
 
 	act 'Continue':gt 'brothel', 'section1_play'
@@ -1787,7 +1797,7 @@ if $ARGS[0] = 'section1_pushplugout':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/pushplugout.mp4"></video></center>'
-	'Unable to withstand all the pain your muscles pull themselves in a massive cramp, causing the anal plug fall out like an apple from a tree.'
+	'Unable to withstand all the pain, your muscles pull themselves in a massive cramp, causing the anal plug fall out like an apple from a tree.'
 
 	chRod = rand(0, 100)
 	if chRod < prob_chRod:
@@ -1807,9 +1817,9 @@ if $ARGS[0] = 'section1_ragefinish':
 	'<b>Orgasm meter: <<orgasmMeter>> / 100</b>'
 	'<b color=#'+$red_font+'>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/masturbateinface.mp4"></video></center>'
-	'The client is now too excited by the violence unleashed upon you. He takes his own dick in his hands and starts masturbating right in front of your face.'
-	'Being bound you have no choice but witness his slimy dick turning dark red as he furiously masturbates.'
-	'Finally in a few minutes a large amount of slimy cum lands all over your face. It gets in your mouth and even sticks your eyelids together.'
+	'The client is now too excited by the violence unleashed upon you. He takes his dick in his hands and starts masturbating right in front of your face.'
+	'Being bound, you have no choice but to witness his slimy dick turning dark red as he furiously masturbates.'
+	'Finally, after a few minutes, a large amount of slimy cum lands all over your face. It gets in your mouth and even sticks your eyelids together.'
 	gs 'cum_call', 'face', 'Master'
 	act 'Continue': gt 'brothel', 'section1_end'
 end
@@ -1828,9 +1838,9 @@ if $ARGS[0] = 'section1_end':
 			recPlugCh = rand(0,100)
 			step = 2
 		if analplugIN = 1 and recPlugCh < prob_recPlugCh:
-			'Then he notices the anal plug that is still well inside your anus. He gigles aloud but says not a word... this is not good...'
+			'Then he notices the anal plug that is still well inside your anus. He gigles aloud but doesn''t say a word... this is not good...'
 			'<center><video autoplay loop src="images/locations/shared/brothel/pullplugfromass.mp4"></video></center>'
-			'With one hard pull he rips the plug out of your anus, causing your already weared anus additional pain!'
+			'With one hard pull he rips the plug out of your anus, causing your already abused anus additional pain!'
 			'<font color=#<<$pcs_font>>>"Ouuuuchhhhh! You moron, you didn''t even pay for this!"</font>'
 			analplugIN = 0
 			gs 'pain', 3, 'asshole', 'stretch'
@@ -1843,7 +1853,7 @@ if $ARGS[0] = 'section1_end':
 		end
 	elseif step = 2:
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/receptionistslaverelease.jpg"></center>'
-		'Finally he reaches to you and starts with the untying, letting you go.'
+		'Finally he reaches out to you and starts with the untying, letting you go.'
 		if analplugIN = 1:
 			step = 3
 			act 'Get up': gt 'brothel', 'section1_end'
@@ -1852,10 +1862,10 @@ if $ARGS[0] = 'section1_end':
 			act 'Leave': gt 'brothel', 'section1_dressingroom'
 		end
 	elseif step = 3:
-		'As you try to get up, suddenly you realize the massive plug still deep in your anus...'
+		'As you try to get up, suddenly you realize the massive plug is still deep in your anus...'
 		'<font color=#<<$pcs_font>>>(I have to take it out...)</font>'
 		'<center><video autoplay loop src="images/locations/shared/brothel/pullplugfromassyourself.mp4"></video></center>'
-		'<font color=#<<$pcs_font>>>Oww... Oww... Owwwch!</font> with loud wet "plop" the plug finally goes out!'
+		'<font color=#<<$pcs_font>>>Oww... Oww... Owwwch!</font> with a loud wet "pop" the plug finally goes out!'
 		step = 0
 		analplugIN = 0
 		gs 'pain', 4, 'asshole', 'stretch'
@@ -1864,10 +1874,10 @@ if $ARGS[0] = 'section1_end':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/sessionend.jpg"></center>'
 		'It seems you have served your purpose. The client is satisfied, his needs are taken care of.'
-		'He starts to pack the few things he brought to the room, entirely ignoring your uncomfortable moans and pleads. As if you weren''t there anymore.'
-		'The last little indication that he is even aware of you is a rough loud slap on your ass. Afterwards he leaves the room, closing the door behind you, leaving you in the pitiful state and awkward position you were the whole session tied in.'
+		'He starts to pack the few things he brought to the room, entirely ignoring your uncomfortable moans and pleas. As if you weren''t there anymore.'
+		'The last little indication that he is even aware of you is a rough, loud slap on your ass. Afterwards he leaves the room, closing the door behind you, leaving you tied in the pitiful state and awkward position you were in the whole session.'
 		*nl
-		'<font color=#<<$pcs_font>>>"Oh my please someone get me out of here!"</font>'
+		'<font color=#<<$pcs_font>>>"Please, someone get me out of here!"</font>'
 		*nl
 		'Finally in a few minutes the receptionist enters the playroom.'
 		step = 1

+ 4 - 4
locations/cikl.qsrc

@@ -240,13 +240,13 @@ bimbo_flag = 0
 !!	Butt slut
 !!------------------------------------------------------------------------------------------------------------
 
-if orgasm_anal > orgasm_anal[1]: 
-	buttslut_exp += 1
+if orgasm_anal > orgasm_anal[1]:
+	if traits['buttslut_lvl'] > 0: traits['buttslut_exp'] += orgasm_anal - orgasm_anal[1]
 else
-	buttslut_exp -= 1
+	if traits['buttslut_exp'] > 1: traits['buttslut_exp'] -= 1
 end
 orgasm_anal[1] = orgasm_anal
-if orgasm_anal >= 10 and traits['buttslut_lvl'] = 0: traits['buttslut_lvl'] = 1
+if orgasm_anal > 10 and traits['buttslut_lvl'] = 0: traits['buttslut_lvl'] = 1
 if traits['buttslut_exp'] >= 15 and traits['buttslut_lvl'] = 1: traits['buttslut_lvl'] = 2 & traits['buttslut_exp'] = 0
 if traits['buttslut_exp'] >= 50 and traits['buttslut_lvl'] = 2: traits['buttslut_lvl'] = 3
 if traits['buttslut_exp'] <= 0 and traits['buttslut_lvl'] = 3: traits['buttslut_lvl'] = 2 & traits['buttslut_exp'] = 0

+ 0 - 6
locations/city_center.qsrc

@@ -292,11 +292,5 @@ end
 
 gs 'camera', 'check_location'
 
-
-!! Savegame Compatibility
-if tanwork ! 0:
-	gt 'nichUtil','updateNotice'
-end
-
 --- city_center ---------------------------------
 

+ 307 - 113
locations/city_lake.qsrc

@@ -87,12 +87,20 @@ if $ARGS[0] = 'start':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake.jpg"></center>'
 				'You go for a walk along the shore.'
-				walkrand = rand(0, 100)
 
-				if walkrand >= 50 and walkrand < 60:gt 'city_lake', 'walklake1'
-				if walkrand >= 60 and walkrand < 70:gt 'city_lake', 'walklake2'
+				walkrand = rand(0, 100)
 
-				act 'Finish':gt 'city_lake', 'start'
+				if walkrand >= 60 and walkrand < 70 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and hotcat >= 7:
+					act 'Continue': gt 'city_lake', 'bonfire'
+				elseif walkrand >= 70 and walkrand < 80 and temp >= 20 and daystage = 3 and hour >= 10 and hour <= 19 and hotcat >= 7:
+					act 'Continue': gt 'city_lake', 'volleyball_day'
+				elseif walkrand >= 80 and walkrand < 90:
+					act 'Continue': gt 'city_lake', 'walklake1'
+				elseif walkrand >= 90 and walkrand < 100:
+					act 'Continue': gt 'city_lake', 'walklake2'
+				else
+					act 'Finish':gt 'city_lake', 'start'
+				end
 			end
 
 			act 'Go for a swim':
@@ -137,101 +145,22 @@ if $ARGS[0] = 'start':
 					end
 
 					evrand = rand(0, 100)
-                    
-					if evrand > 90:
+					
+					if evrand <= 90 and evrand > 80 and temp >=20 and daystage = 3 and hour >= 19 and hour <= 21 and hotcat >= 7:
+						act 'Continue': gt 'city_lake', 'volleyball_intro_nite'
+					elseif evrand <= 80 and evrand > 60 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and hotcat >= 7:
+						act 'Continue': gt 'city_lake', 'bonfire'
+                    elseif evrand <= 60 and evrand > 40 and temp >= 20 and daystage = 2 and hour >= 10 and hour <= 19 and hotcat >= 7: 
+						act 'Continue': gt 'city_lake', 'volleyball_intro_day'
+					elseif evrand <= 40 and andrei > 30:
+						act 'Continue': gt 'city_lake', 'Andrei intro'
+                    elseif evrand <= 30 and evrand > 20:
+						act 'Continue': gt 'city_lake', 'vlake1'
+                    elseif evrand <= 20 and evrand > 10:
+						act 'Continue': gt 'city_lake', 'vlake2'
+                    else
 						act 'Get up':gt 'city_lake', 'start'
-					elseif evrand >= 50 and evrand <= 90 and hotcat >= 7:
-					    'You are peacefully enjoying you time in the sun when you hear a commotion nearby, raising up on your elblows and lowering your sunglasses you look to where you hear the noise just in time to dodge an errant volleyball. You eye the ball with contempt then hear someone call out. "Hey can we get our ball?" You look up to see a rather fit young man wearing loose swim trunks, behind him are several of his friend it looks like they are having a party. You see coolers a grill and a volleyball net. You reach over grab the ball and heave it back with a sigh, "be more careful please I don''t want a face full of volleyball thanks." you say with some rancour as you pass him the ball awkwardly from your towel. He lunges forward and catches it then tosses back into the game. Turning back to you he offers a smile "Kinda noticed you were all alone here wanna join us we got plenty of food and could use one more for the game?"'
-						act 'agree to join':gt 'city_lake', 'volleyball'
-						act 'decline  (polite)':
-							'"No, Thanks, I am not feeling it today, I am just wanting to take in some sun. You say with a smile. He smiles back and says "If you change your mind you know where we are." With a laugh he rejoins his friends. You spend time enjoying relaxing in the sun then decide it it time to get up.'
-							act 'Get up':gt 'city_lake', 'start'
-							act 'Decided to join':gt 'city_lake', 'volleyball'
-						end
-						act 'decline (rude)':
-							'You give the guy a cold sneer and say "Go eat a bag of dicks" You put you sunglasses back on and begin to lay down when you hear him say "Damn, bitch no wonder you are here alone" He turns to go back to his party being sure to kick sand in your face as he leaves. Grumbling you remove the sand while glowering at him, then go back to tanning."'
-							act 'Get up':gt 'city_lake', 'start'
-						end
-					elseif evrand <= 30 and andrei > 0:
-						act 'Get up':gt 'city_lake', 'start'
-					elseif evrand <= 30 and andrei = 0:
-						anreirape = 1
-						'You fall asleep while sunbathing and dream that someone is caressing your chest. Your nipples harden and you moan softly when something wet glides across your breast.'
-						'Strong hands caress your body and you feel yourself get covered in goosebumps before a finger slides under your swimwear and starts to rub your pussy. You gasp when it finds your clit.'
-						'Your body is thrown into a fever, sweat runs down your back, and you''re growing wet. You grow aware that the pleasure comes from reality and not a dream, but are still unable to overcome the sleepy bliss and open your eyes.'
-						'The pleasure you''re feeling leads you into a trance and you moan loudly, wriggling under the hot sun. Just when you think something is about to happen, you''re startled awake.'
-
-						act 'Open your eyes':
-							*clr & cla
-							'Opening your eyes, you see the shadowy figure of an unshaven man lustfully staring at you. You become uncomfortable - you''re lying in front of a stranger, moaning in sexual bliss like a slut. There''s no one else on the beach and you fear what he might do with you.'
-							'Thoughts flash through your head as the man pulls off his shorts. You can''t help but stare at his dick - it''s huge.'
-							'"Like what you see, girl?" he asks with a smile.'
-
-							act 'Run away':
-								*clr & cla
-								'You try to get up, but he pulls you in close to his chest.'
-								
-								gs 'willpower', 'misc', 'resist', 'hard'
-								if will_cost <= pcs_willpwr:
-									act 'Knee him in the balls (<<will_cost>> Willpower)':
-										*clr & cla
-										andrei = 1
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										'You very accurately knee him in the balls and he screams and lets you go. You quickly dash away while he''s down.'
-
-										act 'Escape':gt 'city_lake', 'start'
-									end
-								else
-									act 'Knee him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end	
-
-								act 'Escape from his clutches':
-									*clr & cla
-									andrei = 2
-									anreiday = daystart
-									guy += 1
-									gs 'boyStat', 'A46'
-									gs 'arousal', 'anal', 10
-									gs 'stat'
-
-									'<center><img <<$set_imgh>> src="images/characters/city/andrew/sex/andreia.jpg"></center>'
-									'You try to break out of his grasp, but your feeble struggling makes him even more excited and you feel his now rock hard cock firmly press into your tender thigh.'
-									'The stranger flips you onto your stomach and begins to lube your anus with his saliva.'
-									'He forcefully spreads your ass and a wheeze escapes from your throat as his giant cock painfully enters your backdoor.'
-									'You grit your teeth in pain as he starts fucking your ass. However, his fingers start rubbing your clit and you start moaning softly.'
-
-									act 'More':
-										*clr & cla
-										gs 'cum_call', 'anus', 'A46', 1
-										'<center><img <<$set_imgh>> src="images/characters/city/andrew/sex/andrei.jpg"></center>'
-										'The pleasure overtakes the pain as he keeps rubbing your clit, and a few seconds later you explode in orgasm. He then changes positions and pulls you into an upright position, continues to stimulate your clit as you ride his dick.'
-										'A few minutes later, he lets out a dull growl and warm cum starts spurting into your ass. When he finishes, he lifts you off of his dick and his cum starts trickling out of your ravaged asshole.'
-										'"Did you like that?" the man asks with a touch of irony.'
-										$orgasm_or = 'yes'
-										gs 'arousal', 'vaginal_finger', -10, 'no_orgasm_msg'
-										gs 'arousal', 'anal', 10, 'no_orgasm_msg'
-										gs 'arousal', 'end'
-										gs 'stat'
-
-										act 'Chat':
-											*clr & cla
-											'"Who, who are you?" you ask feebly as you sit on the sand next to him.'
-											'"My name is Andrew." he grins. "And yours?"'
-											'"<<$pcs_firstname>>." you answer and he smiles.'
-											'"So did you like our little game, <<$pcs_firstname>>? Want to catch an even bigger thrill? Then come back tomorrow." he says suavely while pulling his shorts back on.'
-
-											act 'Leave the beach':gt 'city_lake', 'start'
-										end
-									end
-								end
-							end
-						end
-					elseif evrand <= 50 and evrand > 40:
-						gt 'city_lake', 'vlake1'
-					elseif evrand <= 40 and evrand > 30:
-						gt 'city_lake', 'vlake2'
-					end
+                    end 
 				end
 			end
 		end
@@ -253,7 +182,8 @@ if $ARGS[0] = 'aquapark':
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
-	'You go to the attractions. There is <a href="exec:gt ''city_lake'', ''gidro''">jet skiing</a>, a <a href="exec:gt ''city_lake'', ''banan''">banana ride</a> and the <a href="exec:gt ''city_lake'', ''gorka''">water slide</a>.'
+	'You go to the attractions. There is <a href="exec:gt ''city_lake'', ''gidro''">jet skiing</a>, a <a href="exec:gt ''city_lake'', ''banan''">banana ride</a>, the <a href="exec:gt ''city_lake'', ''gorka''">water slide</a>, and a <a href="exec:gt ''city_lake'', ''tour_boat''">tour boat</a>.'
+	'There is also a small <a href="exec:gt ''city_lake'', ''hut''">hut</a> that rents out surf boards.'
 	act 'Leave':gt 'city_lake', 'start'
 end
 
@@ -279,7 +209,7 @@ if $ARGS[0] = 'gidro':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/gidro.jpg"></center>'
 			'You hire a jet ski and have fun out on the water.'
 
-			if rand(0,4) = 0:gt 'city_lake', 'kater1'
+			if rand(0,10) = 0:gt 'city_lake', 'kater1'
 
 			act 'Finish':gt 'city_lake', 'aquapark'
 		end
@@ -377,9 +307,9 @@ if $ARGS[0] = 'horse':
 			'You are helped into the saddle and have a pleasant ride along the lake shore.'
 			horserand = rand(0, 100)
 
-			if horserand >= 60 and horserand < 80:
+			if horserand >= 80 and horserand < 90:
 				gt 'city_lake', 'horse1'
-			elseif horserand >= 80:
+			elseif horserand >= 90:
 				gt 'city_lake', 'horse2'
 			end
 
@@ -390,6 +320,89 @@ if $ARGS[0] = 'horse':
 	act 'Move away':gt 'city_lake', 'start'
 end
 
+if $ARGS[0] = 'tour_boat':
+	cla & *clr
+	$location_type = 'event_outdoors'
+	$menu_loc = 'city_lake'
+	$menu_arg = 'tour_boat'
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
+	'You step up to the tour boat que and wait your turn the cost of a 2 hour tour is 100 <b>₽</b>.'
+
+	if money >= 100:
+		act 'Go for a ride':
+			cla & *clr
+			menu_off = 1
+			pcs_mood += 10
+			money -= 100
+			minut += 120
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/tourboat.jpg"></center>'
+			'You pay for your ticket and board the boat spending tour hours enjoying the bay.'
+			act 'Continue':
+				cla & *clr
+			    menu_off = 1
+			    pcs_mood += 10
+			    minut += 20
+				gs 'stat'
+				if daystage = 3:
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sunset.jpg"></center>'
+				elseif temper >= 10:
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/seal.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sealwinter.jpg"></center>'
+				end
+				'By luck you spy a couple chances to take photographs for your portfolio.'
+				act 'Finish': gt 'city_lake', 'aquapark'
+			end
+		end
+	end
+	act 'Move away': gt 'city_lake', 'aquapark'
+end
+
+if $ARGS[0] = 'hut':
+	cla & *clr
+	$location_type = 'event_outdoors'
+	$menu_loc = 'city_lake'	
+	$menu_arg = 'gidro'
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/hut.jpg"></center>'
+	'There is a young man here renting surf bourds and wind surfing boards. He smiles and talks you through using each and tells you it would cost 100 <b>₽</b> to rent either for 2 hours.'
+	act 'Surf': gt 'city_lake', 'surf'
+	act 'WindSurf': gt 'city_lake', 'windsurf'
+	act 'Move away': gt 'city_lake', 'aquapark'
+end
+
+if $ARGS[0] = 'surf':
+	cla & *clr
+	$location_type = 'event_outdoors'
+	$menu_loc = 'city_lake'
+	$menu_arg = 'gidro'
+	menu_off = 0
+	minut += 120
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/surf.jpg"></center>'
+    'You spend 2 hours surfing and riding the smalls waves from the near by sea, several guys whistle and cheer as you ride the waves. At the end of the 2 hours you return the surfboard to the hut.'
+    act 'Continue': gt 'city_lake', 'hut'
+end
+
+if $ARGS[0] = 'windsurf':
+	cla & *clr
+	$location_type = 'event_outdoors'
+	$menu_loc = 'city_lake'
+	$menu_arg = 'gidro'
+	menu_off = 0
+	minut += 120
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/windsurf.jpg"></center>'
+    'You spend 2 hours 	enjoying being on the water and windsurfing you are not confident enough to try any tricks and simply ride the small sea side waves to and fro. At the end of the 2 hours you return the windboard to the hut'
+	act 'Continue': gt 'city_lake', 'hut'
+end
+
 if $ARGS[0] = 'walklake1':
 	$location_type = 'event_outdoors'
 	*clr & cla
@@ -411,15 +424,15 @@ if $ARGS[0] = 'walklake1':
 
 			act 'Leave':gt 'city_lake', 'start'
 
-			if pcs_apprnc < 60:
+			if hotcat <= 4:
 				'The man frowns. "You look terrible. You really should look after yourself better." he says with a hint of disappointment.'
-			elseif pcs_apprnc < 120:
+			elseif hotcat >= 5 and hotcat < 9:
 				'The man grins. "Looking good..."'
-			else
+			elseif hotcat >= 9:
 				'The man nods. "I don''t often see women as beautiful as you around here."'
 			end
 
-			if pcs_apprnc >= 60:
+			if hotcat > 4:
 				act 'What do you want?':
 					cla & *clr
 					minut += 2
@@ -1146,17 +1159,17 @@ if $ARGS[0] = 'vlake1cum':
 	gs 'cum_call', 'mouth', 'a stranger at the lake'
 	gs 'cum_call', 'face', 'a stranger at the lake'
 
-	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake5.jpg"></center>'
 	'The men begin jerking their dicks and their cum is soon splattering across your face and into your mouth. Once they''re all finished, you lick the cum off their dicks and swallow it. Satisfied, they dress and walk away, leaving you sitting in the sand covered in cum.'
 
-	act 'Leave': gt 'city_lake', 'start'
+	act 'Leave': gs 'arousal', 'end' & gt 'city_lake', 'start'
 
 	act 'Masturbate':
 		*clr & cla
+		gs 'arousal', 'masturbate', 5
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake6.jpg"></center>'
-		'Left unsatisfied, you take matters into your own hands and vigorously caress your pussy.'
+		'Left unsatisfied, you take matters into your own hands and vigorously caress your pussy until you scream out in orgasm.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'clit_finger', 5
 		gs 'arousal', 'end'
@@ -1816,16 +1829,197 @@ if $ARGS[0] = 'horse2':
 	end
 end
 
-if $ARGS[0] = 'volleyball':
+if $ARGS[0] = 'volleyball_intro_day':
+    'You are peacefully enjoying your time in the sun when you hear a commotion nearby, raising up on your elbows and lowering your sunglasses you look to where you hear the noise just in time to dodge an errant volleyball.'
+	'You eye the ball with contempt then hear someone call out.'
+	'"Hey can we get our ball?"'
+	'You look up to see a rather fit young man wearing loose swim trunks. Behind him are several of his friend, it looks like they are having a party.'
+	'You see coolers, a grill, and a volleyball net.'
+	'You reach over, grab the ball, and heave it back with a sigh. "Be more careful please. I don''t want a face full of volleyball, thanks." you say with some rancour as you pass him the ball awkwardly from your towel.'
+	'He lunges forward and catches it then tosses back into the game.'
+	'Turning back to you he offers a smile. "Kinda noticed you were all alone here. Wanna join us? We got plenty of food and could use one more for the game."'
+	act 'Agree to join': gt 'city_lake', 'volleyball_day'
+	act 'Decline (polite)':
+	    cla & *clr
+	    menu_off = 1
+	    minut += 30
+		pcs_tan += 1
+	    '"No, Thanks, I am not feeling it today, I am just wanting to take in some sun," you say with a smile.'
+        'He smiles back and says "If you change your mind you know where we are."'
+		'With a laugh he rejoins his friends.'
+		'You spend time enjoying relaxing in the sun, then decide it it time to get up.'
+		act 'Get up': gt 'city_lake', 'start'
+		act 'Decided to join': gt 'city_lake', 'volleyball_day'
+	end
+	act 'Decline (rude)':
+	    cla & *clr
+	    menu_off = 1
+	    minut += 30
+		pcs_tan += 1
+	    'You give the guy a cold sneer and say "Go eat a bag of dicks."'
+		'You put you sunglasses back on and begin to lay down.'
+		'Then you hear him say "Damn, bitch. No wonder you are here alone".'
+		'He turns to go back to his party being sure to kick sand in your face as he leaves.'
+		'Grumbling you remove the sand while glowering at him, then go back to tanning.'
+		act 'Get up': gt 'city_lake', 'start'
+	end
+end
+
+if $ARGS[0] = 'volleyball_day':
 	cla & *clr
 	menu_off = 1
 	minut += 120
+	pcs_tan += 2
 	pcs_mood += 10
 	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
-	'You walk over to the beach party several people greet you and you are handed a beer. You hangout and dance to the songs coming from the speaker nearby and join in the volleyball game. You are not great but have fun and everyone is laughing and having a good time. As the party winds down you say goodbye to the rest and gather your things and begin making your way home.'
-	 
-	act 'Leave':gt 'city_lake', 'start'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyballday.jpg"></center>'
+	'You walk over to the beach party several people greet you, and you are handed a beer.'
+	'You hangout and dance to the songs coming from the speaker nearby and join in the volleyball game.'
+	'You are not great but have fun and everyone is laughing and having a good time.'
+	'As the party winds down you say goodbye to the group and gather your things to begin making your way home.'
+	act 'Leave': gt 'city_lake', 'start'
+end
+
+if $ARGS[0] = 'volleyball_nite':
+	cla & *clr
+	menu_off = 1
+	minut += 120
+	pcs_mood += 10
+	gs 'drugs', 'alcohol', 'beer'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyballnite1.jpg"></center>'
+	'You walk over to the beach party several people greet you and you are handed a beer.'
+	'You hangout and dance to the songs coming from the speaker nearby and join in the volleyball game.'
+	'You are not great but have fun and everyone is laughing and having a good time.'
+	'As the party winds down, and the sun finishes setting, you say goodbye to the group, gather your things and begin making your way home.'
+	!!vollybal + 1
+	act 'Leave': gt 'city_lake', 'start'
+end
+
+!!TO DO !!
+!!if $ARGS[0] = 'volleyball_nite2':!!
+	!!cla & *clr!!
+	!!menu_off = 1!!
+	!!minut += 120!!
+	!!pcs_mood += 10!!
+	!!gs 'drugs', 'alcohol', 'beer'!!
+	!!gs 'stat'!!
+	!!'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyballnite2.jpg"></center>'!!
+	!!add flirting need a to learn how to add a variable!!
+
+	!!act 'Leave': gt 'city_lake', 'start'
+!!end
+
+if $ARGS[0] = 'bonfire':
+    cla & *clr
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/bonfire.jpg"></center>'
+	'As you are gathering your things to leave young guy in trunks runs up to you.'
+	'"Hey, wanna join us?" He says waving to his friends around a bonfire, "we have plenty of food and drinks."'
+	'You consider a momment then decide..."'
+	act 'Join in':
+	    cla & *clr
+	    menu_off = 1
+	    minut += 120
+	    pcs_mood += 10
+	    gs 'drugs', 'alcohol', 'beer'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/bonfire.jpg"></center>'
+		'As you follow your new friend over to the fire pit, he asks, "Hey what''s your name? Mine is Gregor"'
+		'"<<$pcs_firstname>>." you responde, as the two of you reach the party.'
+        'You set down your things, and are handed a beer and a stick with a marshmellow on it.'
+        'You enjoy the next couple of hours with Gregor and his friends, laughing, flirting and dancing.'
+        'You finally succeed in roasting a marshmellow and enjoy a tasty smore as the party winds down.'
+        '"We need to do this again sometime," Gregor says as he hands you your towel and beach bag.'
+        'You smile and say "Definately, I am looking forward to it."' 
+        'You wave goodbye and head off the beach."'
+        act 'Leave':gt 'city_lake', 'start'	
+	end
+    act 'Decline':
+	    cla
+		'"No Thanks, I need to get home. I have an early day tomorrow, Raincheck?" You say with a smile.'
+		'"Sure, we are here pretty often see ya round," He waves and heads back to his group.'
+		act 'Continue': gt 'city_lake', 'start'
+	end
+end
+
+if $ARGS[0] = 'Andrei_intro':
+	*clr & cla
+	!!needs an image
+    anreirape = 1
+	'You fall asleep while sunbathing and dream that someone is caressing your chest. Your nipples harden and you moan softly when something wet glides across your breast.'
+	'Strong hands caress your body and you feel yourself get covered in goosebumps before a finger slides under your swimwear and starts to rub your pussy. You gasp when it finds your clit.'
+	'Your body is thrown into a fever, sweat runs down your back, and you''re growing wet. You grow aware that the pleasure comes from reality and not a dream, but are still unable to overcome the sleepy bliss and open your eyes.'
+	'The pleasure you''re feeling leads you into a trance and you moan loudly, wriggling under the hot sun. Just when you think something is about to happen, you''re startled awake.'
+
+	act 'Open your eyes':
+		*clr & cla
+		!!needs an image
+		'Opening your eyes, you see the shadowy figure of an unshaven man lustfully staring at you. You become uncomfortable - you''re lying in front of a stranger, moaning in sexual bliss like a slut. There''s no one else on the beach and you fear what he might do with you.'
+		'Thoughts flash through your head as the man pulls off his shorts. You can''t help but stare at his dick - it''s huge.'
+		'"Like what you see, girl?" he asks with a smile.'
+
+	    act 'Run away':
+			*clr & cla
+			'You try to get up, but he pulls you in close to his chest.'
+
+			gs 'willpower', 'misc', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Knee him in the balls (<<will_cost>> Willpower)':
+					*clr & cla
+					andrei = 1
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'You very accurately knee him in the balls and he screams and lets you go. You quickly dash away while he''s down.'
+
+					act 'Escape':gt 'city_lake', 'start'
+				end
+			else
+				act 'Knee him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+
+		act 'Escape from his clutches':
+			*clr & cla
+			andrei = 2
+			anreiday = daystart
+			guy += 1
+			gs 'boyStat', 'A46'
+			gs 'arousal', 'anal', 10
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/city/andrew/sex/andreia.jpg"></center>'
+			'You try to break out of his grasp, but your feeble struggling makes him even more excited and you feel his now rock hard cock firmly press into your tender thigh.'
+			'The stranger flips you onto your stomach and begins to lube your anus with his saliva.'
+			'He forcefully spreads your ass and a wheeze escapes from your throat as his giant cock painfully enters your backdoor.'
+			'You grit your teeth in pain as he starts fucking your ass. However, his fingers start rubbing your clit and you start moaning softly.'
+
+			act 'More':
+				*clr & cla
+				gs 'cum_call', 'anus', 'A46'
+				'<center><img <<$set_imgh>> src="images/characters/city/andrew/sex/andrei.jpg"></center>'
+				'The pleasure overtakes the pain as he keeps rubbing your clit, and a few seconds later you explode in orgasm. He then changes positions and pulls you into an upright position, continues to stimulate your clit as you ride his dick.'
+				'A few minutes later, he lets out a dull growl and warm cum starts spurting into your ass. When he finishes, he lifts you off of his dick and his cum starts trickling out of your ravaged asshole.'
+				'"Did you like that?" the man asks with a touch of irony.'
+				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal_finger', -10, 'no_orgasm_msg'
+				gs 'arousal', 'anal', 10, 'no_orgasm_msg'
+				gs 'arousal', 'end'
+				gs 'stat'
+
+				act 'Chat':
+					*clr & cla
+					'"Who... who are you?" you ask feebly as you sit in the sand next to him.'
+					'"My name is Andrew." he grins. "And yours?"'
+					'"<<$pcs_firstname>>." you answer and he smiles.'
+					'"So did you like our little game, <<$pcs_firstname>>? Want to catch an even bigger thrill? Then come back tomorrow." he says suavely while pulling his shorts back on.'
+
+					act 'Leave the beach':gt 'city_lake', 'start'
+				end
+   			end
+		end
+	end
 end
 
 --- city_lake ---------------------------------

+ 15 - 0
locations/city_mansion_entrance.qsrc

@@ -29,6 +29,21 @@ if $ARGS[0] = '':
 		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
 	end
 
+	if curr_home = 5:
+		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
+		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
+
+		if hour = meethour[0]:
+			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+		if hour = meethour[1]:
+			if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+		if hour = meethour[2]:
+			if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your mansion.</b>'
+		end
+	end
+
 	act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
 	if home_owned[5] = 3: act 'Walk inside the mansion': minut += 4 & gt 'city_mansion_residence_1', 'yfoyer'
 

+ 9 - 6
locations/city_residential.qsrc

@@ -74,8 +74,16 @@ if car > 0 and cardrive = 1 or cardrive = 8:
 	end
 end
 
+if home_owned[15] = 1:
+	'Your <a href="exec: minut += 10 & gs ''city_house_res_misc'', ''fronty''">house</a> is within walking distance.'
+	act '<b>Go to your house</b>':
+		minut += 10
+		gt 'city_house_res_misc', 'fronty'
+	end
+end
+
 if home_owned[1] > 0:
-	act '<b>Go home</b>':
+	act '<b>Go to your apartment</b>':
 		gorand = rand(0, 100)
 
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80:
@@ -90,11 +98,6 @@ if home_owned[1] > 0:
 		minut += 1
 		gt 'korr'
 	end
-elseif home_owned[15] = 1:
-	act '<b>Go home</b>':
-		minut += 10
-		gt 'city_house_res_misc', 'fronty'
-	end
 end
 
 act 'Wait':gs 'obj_din', 'wait'

+ 21 - 4
locations/clothing.qsrc

@@ -79,9 +79,13 @@ $clothing_list_line = {
 		else
 			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 		end
+		
+		if ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qdelete'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/delete_on.png"></a></center></TD>'
+		end	
 
 	else
-		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD>'
+		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 		if pcs_sewng >= 50 and tkan > 0 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''tresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
 		else
@@ -134,6 +138,12 @@ if $ARGS[0] = 'qrepair':
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 end
 
+if $ARGS[0] = 'qdelete':
+	*clr
+	dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
+	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
+end
+
 if $ARGS[0] = 'tresize':
 	*clr
 	minut += 5
@@ -143,13 +153,14 @@ if $ARGS[0] = 'tresize':
 end
 
 if $ARGS[0] = 'view_clothing_list':
+	if $wloc = '': $wloc = 'default1'
 	!! ARGS 0 - view_clothing_list
 	!! ARGS 1 - action type (wardrobe, resize)
 	!! ARGS 2 - Shop name (kats, moncheri, gm, etc)
 	
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
-		'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></TH><TH><a href="exec:gt ''wardrobe'', ''default''"><img src="images/system/icons/clothing/default.png" height="50"></a></TH><TH><b>Your Wardrobe</b></TH></table></center>'
+		'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></TH><TH><a href="exec:gt ''wardrobe'', $wloc"><img src="images/system/icons/clothing/default.png" height="50"></a></TH><TH><b>Your Wardrobe</b></TH></table></center>'
 	elseif $ARGS[1] = 'resize':
 		$ward_list_page = $ARGS[1]
 		'<h3><center><b><font color="maroon">Choose item/s to resize</font></b></center></h3>'
@@ -206,7 +217,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 	act 'Leave': killvar '$ward_list_store' & gt $loc, $loc_arg
 	act 'Your Clothes': gt 'wardrobe', 'main'
-	act 'Your sets': gt 'wardrobe', 'default'
+	act 'Your sets': gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'clothing_list':
@@ -398,7 +409,9 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		end
 
 		i = 1
 		:loopschool
@@ -1687,6 +1700,7 @@ if $ARGS[0] = 'strip':
 	PShoCut = 0
 	PShoHeels = 0
 	PShoStyle = 0
+	PCloDress = 0
 	PCloPanties = 0
 	PCloBra = 0
 	PCloQuality = 0
@@ -1696,6 +1710,7 @@ if $ARGS[0] = 'strip':
 	PCloSkirt = 0
 	PCloStyle = 0
 	PCloStyle2 = 0
+	PCloStyle3 = 0
 	PCloBimbo = 0
 	PCloInhibit = 0
 	PCloOnePiece = 0
@@ -1775,8 +1790,10 @@ if $ARGS[0] = 'wear':
 	PCloPants = CloPantsShortness
 	PCloSkirt = CloSkirtShortness
 	PCloPanties = CloPanties
+	PCloDress = CloDress
 	PCloStyle = CloStyle
 	PCloStyle2 = CloStyle2
+	PCloStyle3 = CloStyle3
 	PCloInhibit = CloInhibit
 	if cheatbimbo = 0:
 		PCloBimbo = CloBimbo

+ 1 - 1
locations/clothing_QV.qsrc

@@ -1093,7 +1093,7 @@ if $ARGS[0] = 'clothing_list':
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
 					if CloInhibit <= pcs_inhib:
-						if market_outfits_s[i] = 0 and market_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''market_outfits'', <<i>>"><img src="images/pc/items/market/clothing/<<i>>.jpg" 	height="250" /></a>'
+						if market_outfits_s[i] = 0 and market_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''market_outfits'', <<i>>"><img src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
 					end
 				end
 			end

+ 67 - 6
locations/clothing_descriptions.qsrc

@@ -64,16 +64,77 @@ elseif CloTopCut > 0:
 	elseif CloTopCut = 4:
 		$description += ', includes a very revealing cut top'
 	end
-	if tits < 2:
-		$description += ', that would hang loosely around your humble bosom'
+	
+	if tits < 1 and CloTopCut = 1:
+		$description += ' that would fit well over your flat chest'
+	elseif tits < 1 and CloTopCut = 2:
+		$description += ' that would hang awkwardly around flat chest'
+	elseif tits < 1 and CloTopCut = 3:
+		$description += ' that would hang very awkwardly around flat chest'
+	elseif tits < 1 and CloTopCut = 4:
+		$description += ' that would hang extremely loosely over your flat chest'
+	elseif tits < 1:
+		$description += ' that would hang loosely around your flat chest'
+	elseif tits < 2 and CloTopCut = 1:
+		$description += ' that would fit well over your tiny breasts'
+	elseif tits < 2 and CloTopCut = 2:
+		$description += ' that would emphasize your lack of cleavage'
+	elseif tits < 2 and CloTopCut = 3:
+		$description += ' that would hang loosely over your tiny breasts'
+	elseif tits < 2 and CloTopCut = 4:
+		$description += ' that would drape breezily over your tiny breasts'
+	elseif tits < 2:
+		$description += ' that would hang loosely around your tiny breasts'
+	elseif tits < 3 and CloTopCut = 1:
+		$description += ' that would fit well over your small breasts'
+	elseif tits < 3 and CloTopCut = 2:
+		$description += ' that would slightly emphasize your small breasts'
+	elseif tits < 3 and CloTopCut = 3:
+		$description += ' that would emphasize your small breasts'
+	elseif tits < 3 and CloTopCut = 4:
+		$description += ' that would greatly emphasize your small breasts'
+	elseif tits < 3:
+		$description += ' that would hang loosely over your small breasts'
+	elseif tits < 4 and CloTopCut = 1:
+		$description += ' that would fit well around your shapely breasts'
+	elseif tits < 4 and CloTopCut = 2:
+		$description += ' that would help emphasize your shapely breasts'
+	elseif tits < 4 and CloTopCut = 3:
+		$description += ' that would show off your shapely breasts'
+	elseif tits < 4 and CloTopCut = 4:
+		$description += ' that would really show off your shapely breasts'
 	elseif tits < 4:
-		$description += ', that would hang loosely around your petite bosom'
+		$description += ' that would fit well around your shapely breasts'
+	elseif tits < 6 and CloTopCut = 1:
+		$description += ' that would comfortably wrap around your large breasts'
+	elseif tits < 6 and CloTopCut = 2:
+		$description += ' that would help emphasize your large breasts'
+	elseif tits < 6 and CloTopCut = 3:
+		$description += ' that would show off your large breasts'
+	elseif tits < 6 and CloTopCut = 4:
+		$description += ' that would attract a lot of attention to your large breasts'
 	elseif tits < 6:
-		$description += ', that would comfortably contain your full bosom'
+		$description += ' that would comfortably wrap around your large breasts'
+	elseif tits < 8 and CloTopCut = 1:
+		$description += ' that your ample bosom would strain against'
+	elseif tits < 8 and CloTopCut = 2:
+		$description += ' that would emphasize the cleavage of your ample bosom'
+	elseif tits < 8 and CloTopCut = 3:
+		$description += ' that would emphasize the size your exceptionally large breasts'
+	elseif tits < 8 and CloTopCut = 4:
+		$description += ' that would draw everyone''s eyes to your exceptionally large breasts'
 	elseif tits < 8:
-		$description += ', that would tightly strain to contain your ample bosom'
+		$description += ' that would tightly strain to contain your ample bosom'
+	elseif CloTopCut = 1:
+		$description += ' that would struggle to contain your huge breasts'
+	elseif CloTopCut = 2:
+		$description += ' that would emphasize your enormous cleavage'
+	elseif CloTopCut = 3:
+		$description += ' that your huge breasts would spill out of'
+	elseif CloTopCut = 4:
+		$description += ' that might fail to contain your huge breasts'
 	else
-		$description += ', that your huge bosom would spill out of'
+		$description += ' that would struggle to contain your huge breasts'
 	end
 end
 

+ 15 - 0
locations/dachi.qsrc

@@ -34,6 +34,21 @@ if home_owned[3] > 0:
 	end
 end
 
+if curr_home = 3:
+	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
+	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your yard.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your yard.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your yard.</b>'
+	end
+end
+
 if etoexhib < 13:'You feel a slight presence of magic.'
 
 act 'Stroll through the alleys':gt 'etoexhib', 'pos2'

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -791,7 +791,7 @@ if dimaRevChoice = 4:
 					*clr & cla
 					gs 'npc_relationship', 'modify', 'A1', -20
 					grupvalue[4] += 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/showers.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/lockerroom.jpg"></center>'
 					'You wait in the men''s locker room for Dimka. You pass the time until lunch talking to Lavrenti about what you are going to Dimka when he gets here. After a few more minutes, you hear footsteps and both of you hide in a corner. Dimka walks in. Seeing no one, he walks further into the room. You take that moment to strike.'
 					win = 1
 					if win = 0:

+ 2 - 0
locations/food.qsrc

@@ -862,6 +862,8 @@ if $ARGS[0] = 'family_meals':
 	pcs_energy += 60
 	if pcs_hydra >= 100:
 		pcs_hydra += 30
+	elseif pcs_hydra < 20:
+		pcs_hydra += 80
 	else
 		pcs_hydra += 60
 	end

+ 1 - 1
locations/foto.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'studio':
 	anastasia_in = rand(0,1)
 	emily_in = rand(0,1)
 	krystal_in = rand(0,1)
-	if krystal_porn['day'] > 0 and ((krystal_porn['day'] = daystart and hour >= krystal_porn['hour']) or krystal_porn['day'] < daystart):gt'foto_models','krystal_porn_card'
+	if krystal_porn['day'] > 0 and ((krystal_porn['day'] = daystart and hour >= krystal_porn['hour']) or krystal_porn['day'] < daystart) and pornstudio = 0:gt'foto_models','krystal_porn_card'
 	jeff_in = rand(0,1)
 	mari_in = rand(0,1)
 

+ 4 - 2
locations/gadhouse.qsrc

@@ -1572,9 +1572,11 @@ if $ARGS[0] = 'intro':
 					*nl
 					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
 					if month = 6:
-						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or your grandparents will have started work without you, and I won''t be having any of that." she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or your grandparents will have started work without you, and I won''t be having any of that." she warns you before making her way outside.'
+						if pcs_vag = 0: '"Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
 					else
-						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside.'
+						if pcs_vag = 0: '"Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
 					end
 					act 'But why do I--':
 						cla & *clr

+ 14 - 0
locations/gadukino.qsrc

@@ -103,6 +103,20 @@ if $ARGS[0] = '':
 			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
+		if curr_home = 12 or curr_home = 14:
+			if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
+			if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
+
+			if hour = meethour[0]:
+				if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in the street.</b>'
+			end
+			if hour = meethour[1]:
+				if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting in the street.</b>'
+			end
+			if hour = meethour[2]:
+				if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting in the street.</b>'
+			end
+		end
 		if npc_rel['A60'] > 0 and metmira = 1:
 			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
 			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'

+ 58 - 24
locations/gossips.qsrc

@@ -42,23 +42,40 @@ if $ARGS[0] = 'complex':
 		gs 'stat'
 		if fame['pav_slut'] < 100:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors "Hey isn''t that the girl Sergia was talking about?" you overhear one of them ask. "Yeah, but she''s just a tease." his friend replies. They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
+			'Two boys around your age are standing near the apartment doors.'
+			*nl
+			'"Hey isn''t that the girl Sergia was talking about?" you overhear one of them ask.'
+			'"Yeah, but she''s just a tease," his friend replies. They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 150:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors. "Hey isn''t that the girl that will let you feel her up for a cigarette?" you overhear one of them ask. "Yeah, I heard she gave Dimitri a handjob behind the garages." his friend replies. They keep talking, but you''re too far away to hear what they are saying. You can only assume it''s still about you. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
+			'Two boys around your age are standing near the apartment doors.'
+			'"Hey isn''t that the girl that will let you feel her up for a cigarette?" you overhear one of them ask.'
+			'"Yeah, I heard she gave Dimitri a handjob behind the garages," his friend replies. They keep talking, but you''re too far away to hear what they are saying. You can only assume it''s still about you. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 200:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors. "Hey, isn''t that the slut that''s always giving guys blowjobs behind the garages?" you overhear one of them ask. "Yeah that''s her. Come on over here slut, I''ve got a cock you can suck on right here!" He and his friend laugh as he grabs his crotch. You just ignore them and keep walking. It seems people are talking about your reputation, which is only getting worse. You should be more discreet if you want people to stop talking about you.'
+			'Two boys around your age are standing near the apartment doors.'
+			*nl
+			'"Hey, isn''t that the slut that''s always giving guys blowjobs behind the garages?" you overhear one of them ask.'
+			'"Yeah that''s her. Come on over here slut, I''ve got a cock you can suck on right here!" He and his friend laugh as he grabs his crotch. You just ignore them and keep walking. It seems people are talking about your reputation, which is only getting worse. You should be more discreet if you want people to stop talking about you.'
 		elseif fame['pav_slut'] < 250:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors. "Hey slut, why don''t you come over here? We''ve got something for you." His friends laughs. "Yeah, we all know how much you love sucking dick!" They both laugh as you just keep walking, at least they don''t follow you. It seems like everyone is now aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
+			'Two boys around your age are standing near the apartment doors.'
+			*nl
+			'"Hey slut! Why don''t you come over here? We''ve got something for you," one of them hollers.'
+			'"Yeah, we all know how much you love sucking dick!" They both laugh as you just keep walking, at least they don''t follow you. It seems like everyone is now aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
 			act 'Keep going': gt 'pav_complex', 'start'
 		elseif fame['pav_slut'] < 300:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors. "Hey whore, come over here. We''ve got something for you." His friend laughs. "Yeah, we all know you love sucking dick more than anything in the world!" They both laugh as you keep walking, but they follow you and make more crude comments. You pass by a few other people that give you disgusted looks at the boys comments. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
+			'Two boys around your age are standing near the apartment doors.'
+			*nl
+			'"Hey whore! Come over here! We''ve got something for you!" one of them hollers.'
+			'"Yeah, we all know you love sucking dick more than anything in the world!" They both laugh as you keep walking, but they follow you and make more crude comments. You pass by a few other people that give you disgusted looks at the boys comments. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
 		elseif fame['pav_slut'] >= 300:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boys_gossip.jpg"></center>'
-			'Two boys around your age are standing near the apartment doors. "I''m surprised you can even walk with all the cocks that have fucked your dirty holes." one them says tauntingly as his friend laughs before joining in. "I wouldn''t touch you with three condoms on. Who knows how many diseases you have, or how much old cum is still inside you!" They give you looks of utter disgust as you walk away. There is little you can say in your defense.'
+			'Two boys around your age are standing near the apartment doors.'
+			*nl
+			'"I''m surprised you can even walk with all the cocks that have fucked your dirty holes," one them says tauntingly as his friend laughs before joining in.'
+			'"I wouldn''t touch you with three condoms on. Who knows how many diseases you have, or how much old cum is still inside you!" They give you looks of utter disgust as you walk away. There is little you can say in your defense.'
 		end
 		
 		act 'Keep going': gt 'pav_complex', 'start'
@@ -72,20 +89,34 @@ if $ARGS[0] = 'complex':
 		
 		if fame['pav_slut'] < 150:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
-			'Three girls are sitting on one of the benches that dot the courtyard. You can''t help but notice them looking in your direction. They start whispering and giggling to each other, followed by pointed looks in your direction. "Don''t you have a cock to go and suck somewhere, slut?" They all start giggling againa as you just sigh and continue on. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
+			'Three girls are sitting on one of the benches that dot the courtyard.'
+			*nl
+			'You can''t help but notice them looking in your direction. They start whispering and giggling to each other, followed by pointed looks in your direction. "Don''t you have a cock to go and suck somewhere, slut?" They all start giggling againa as you just sigh and continue on. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 200:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
-			'Three girls are sitting on one of the benches that dot the courtyard. You overhear their conversation as you walk past. "Look, it doesn''t taste that bad." The second one chimes in. "And you can just spit it out if you want." The third one just frowns. "I guess..." They spot you and giggle as they point. "You could always ask her. She loves swallowing cum and does it all the time!" They all laugh at you before returning to their conversation. You just sigh and continue on. It seems people are talking about your reputation, which is only getting worse. You should be more discreet if you want people to stop talking about you.'
+			'Three girls are sitting on one of the benches that dot the courtyard. You overhear their conversation as you walk past.'
+			*nl
+			'"Look, it doesn''t taste that bad."The second one chimes in. "And you can just spit it out if you want."'
+			'The third one just frowns. "I guess..." They spot you and giggle as they point.'
+			'"You could always ask her. She loves swallowing cum and does it all the time!"'
+			'They all laugh at you before returning to their conversation. You just sigh and continue on. It seems people are talking about your reputation, which is only getting worse. You should be more discreet if you want people to stop talking about you.'
 		elseif fame['pav_slut'] < 250:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
-			'Three girls are sitting on one of the benches that dot the courtyard. You can''t help but notice them looking in your direction as they start whispering and giggling, followed by pointed looks in your direction. They notice you looking at them and one of them frowns. "What are you looking at slut? Mind your own business!" They all give you looks of utter disgust and go back to talking quietly to each other. You just sigh and continue on. It seems everyone is now aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
+			'Three girls are sitting on one of the benches that dot the courtyard.'
+			*nl
+			'You can''t help but notice them looking in your direction as they start whispering and giggling, followed by pointed looks in your direction. They notice you looking at them and one of them frowns. "What are you looking at slut? Mind your own business!" They all give you looks of utter disgust and go back to talking quietly to each other. You just sigh and continue on. It seems everyone is now aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
 		elseif fame['pav_slut'] < 300:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
-			'Three girls are sitting on one of the benches that dot the courtyard. You can''t help but notice them looking in your direction as they start whispering and giggling, followed by pointed looks in your direction. One of them frowns when they notice you staring. "What are you looking at whore? Don''t you have a bunch of boys waiting to gangbang you somewhere?" They all give you looks of utter disgust and go back to talking quietly to each other. You just sigh and continue on. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
+			'Three girls are sitting on one of the benches that dot the courtyard.'
+			*nl
+			'You can''t help but notice them looking in your direction as they start whispering and giggling, followed by pointed looks in your direction. One of them frowns when they notice you staring. "What are you looking at whore? Don''t you have a bunch of boys waiting to gangbang you somewhere?" They all give you looks of utter disgust and go back to talking quietly to each other. You just sigh and continue on. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
 		elseif fame['pav_slut'] >= 300:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
-			'Three girls are sitting on one of the benches that dot the courtyard. You can''t help but notice them looking in your direction. They start talking out loud, apparently not caring who hears them. "Well well, if it isn''t the town bicycle!"'
-			'"Yeah, anyone can ride her as much as they want!" another chimes in. The last one stops laughing before replying. "I wouldn''t even touch a boy that has been with her. Who knows what kind of filthy diseases she gave him?!" They give you looks of utter disgust and go back to talking to each other and ignoring you. You just sigh and continue on. There is little you can say in your defense.'
+			'Three girls are sitting on one of the benches that dot the courtyard. You can''t help but notice them looking in your direction.'
+			*nl
+			'They start talking out loud, apparently not caring who hears them. "Well well, if it isn''t the town bicycle!"'
+			'"Yeah, anyone can ride her as much as they want!" another chimes in. The last one just sneers at you.'
+			'"I wouldn''t even touch a boy that has been with her. Who knows what kind of filthy diseases she gave him?!" They give you looks of utter disgust and go back to talking to each other and ignoring you. You just sigh and continue on. There is little you can say in your defense.'
 		end
 		
 		act 'Keep going': gt 'pav_complex', 'start'
@@ -100,24 +131,27 @@ if $ARGS[0] = 'school':
 		menu_off = 1
 		minut += 3
 		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+		'Two boys are standing in the hallway talking.'
+		*nl
 		if fame['pav_slut'] < 100:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "Hey isn''t that the girl the gopniks were talking about?" one of them asks as you walk past. "Yeah, but she''s just a tease." his friend replies. They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
+			'"Hey isn''t that the girl the gopniks were talking about?" one of them asks as you walk past.'
+			'"Yeah, but she''s just a tease." his friend replies. They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 150:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "Hey isn''t that the girl that gave one of the gopniks a handjob in the restroom?" one of them asks as you walk past. The other one looks at you before replying. "No, I think she just likes to tease guys and flash her panties at them." They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
+			'"Hey isn''t that the girl that gave one of the gopniks a handjob in the restroom?" one of them asks as you walk past. The other one looks at you before replying.'
+			'"No, I think she just likes to tease guys and flash her panties at them." They seem to lose interest in you, but you can''t help but notice people are talking about your reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 200:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "Hey isn''t that the slut the gopniks said was giving them blowjobs in the the old school building?" His friend laughs as he replies. "Yeah that''s her. I hear she''s a world class cock sucker." They keep watching and talking about you before the sound of the school drowns out their voices. It seems everyone is aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
+			'"Hey isn''t that the slut the gopniks said was giving them blowjobs in the the old school building?" one of them says loudly, pointing at you.'
+			'"Yeah that''s her. I hear she''s a world class cock sucker." They keep watching and talking about you before the sound of the school drowns out their voices. It seems everyone is aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
 		elseif fame['pav_slut'] < 250:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "Look who it is, one of the school sluts." His friend laughs before replying. "She looks sad. Maybe she needs a cock or two to cheer her up?" They laugh and keep talking about you until the sounds of the school drown out their voices as you walk down the hall. It seems everyone is aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
+			'"Look who it is, one of the school sluts," one of them taunts.'
+			'"She looks sad. Maybe she needs a cock or two to cheer her up?" They laugh and keep talking about you until the sounds of the school drown out their voices as you walk down the hall. It seems everyone is aware of your tarnished reputation. You should be more discreet if you want people to stop talking about you.'
 		elseif fame['pav_slut'] < 300:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "Hey whore, come over here. We''ve got something for you." His friend laughs. "Yeah, we all know you love sucking dick more than anything in the world!" They both laugh as you keep walking, but they follow you and make more crude comments. Several of your fellow students laugh or give you disgusted looks when they hear the boys comments. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
+			'"Hey whore, come over here. We''ve got something for you!" one of them laughs.'
+			'"Yeah, we all know you love sucking dick more than anything in the world!" They both laugh as you keep walking, but they follow you and make more crude comments. Several of your fellow students laugh or give you disgusted looks when they hear the boys comments. Your reputation is in tatters, but maybe it isn''t too late to redeem yourself.'
 		elseif fame['pav_slut'] >= 300:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
-			'Two boys are standing in the hallway talking. "I''m surprised you can even walk with all the cocks that have fucked your dirty holes." one them says tauntingly as his friend laughs before joining in. "I wouldn''t touch you with three condoms on. Who knows how many diseases you have, or how much old cum is still inside you!" They give you looks of utter disgust as you walk away. There is little you can say in your defense.'
+			'"I''m surprised you can even walk with all the cocks that have fucked your dirty holes," one them says tauntingly as his friend laughs before joining in.'
+			'"I wouldn''t touch you with three condoms on. Who knows how many diseases you have, or how much old cum is still inside you!" They give you looks of utter disgust as you walk away. There is little you can say in your defense.'
 		end
 		act 'Continue on': gt 'gschool_events', 'leave_break_events2'
 	end

+ 2 - 2
locations/gschool_chats.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'nerds':
 				end
 			end
 		else
-			'You are using the school uniform cheat and are not wearing a uniform, therefore there are no reactions to your uniform'
+			'You are using the school uniform cheat and are not wearing a uniform, therefore there are no reactions to your uniform.'
 			*nl
 			gs 'gschool_groups', 'nerds'
 		end
@@ -210,7 +210,7 @@ if $ARGS[0] = 'cooljocks':
 			end
 			'Stasya glances at Bella. "My god, she is an absolute social disaster. Really no sense of style at all." Then she turns towards Andrey. "If I ever wore something like that, would you still love me?"'
 			'Andrey shakes his head. "Hell no, a man has to have his standards after all.", which just gets more and more of them to laugh.'
-			'Then Dimka steps forwards. "Maybe you''re lost? The nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hang out in. "Perhaps you would find those who might appreciate your sense of... style there." Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar and Erast either ignore what is going on or join in on mocking your clothes.'
+			'Dimka steps forwards. "Maybe you''re lost? The nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hang out in. "Perhaps you would find those who might appreciate your sense of... style there." Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar and Erast either ignore what is going on or join in on mocking your clothes.'
 			gs 'gschool_groups', 'popular'
 			gs 'gschool_groups', 'jocks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'

+ 8 - 1
locations/gschool_chats1.qsrc

@@ -537,7 +537,7 @@ if $ARGS[0] = 'albina':
 	menu_off = 1
 	temp = rand(1, 5)
 	gs 'stat'
-	if AlbinaQW['Friends'] = 2 and npcsex['A23'] => 1 and albina_schoolsex ! daystart and temp = 5:
+	if AlbinaQW['Friends'] = 2 and npc_sex['A23'] >= 1 and albina_schoolsex ! daystart and temp = 5:
 		albina_schoolsex = daystart
 		if school_period = 3:
 			gt 'albina_school_sex', 'break_fun_1'
@@ -1537,11 +1537,16 @@ if $ARGS[0] = 'ivan':
 			'You nod at what Ivan says. "Sure Ivan I understand, I am OK with just being friends, really close friends who sometimes fool around in the shower." you say in your best sexy voice with a wink.'
 			'He gives you a one armed hug. "<<$pcs_nickname>> you''re the best! Not only are you smoking hot, but you are a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." he says with a suggestive tone and waggled eyebrows.'
 			'You laugh at his silly antics. It is nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
+			
+			if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			act 'Tell him you''re bored right now':gt 'gdksport', 'Ivan_bored'
 		end
 	elseif IvanShowerQW = 11 and IvanShowerYes = 1:
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+
 		if rand(0,4) = 0:
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan2.jpg"></center>'
@@ -1567,6 +1572,7 @@ if $ARGS[0] = 'ivan':
 		end
 	elseif npc_rel['A3'] >= 50 and fame['pav_slut'] < 250:
 		npc_rel['A3'] += 1
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 		if grupTipe = 2:
 			'"Hi, Ivan. I wanted to ask you if you could show me some boxing pointers some day?" you ask.'
 			'"I guess, but you better be ready. I''m a tough coach." You notice a little smile.'
@@ -1587,6 +1593,7 @@ if $ARGS[0] = 'ivan':
 		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	elseif fame['pav_slut'] >= 250:
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 		'"So hold up Ivan. I need to talk to you..." You step in front of him.'
 		'Ivan stops and gives you a confused look. "Why are you talking to me? I don''t really have anything to say to you."'
 		'"Come on, don''t be like that... I thought we could have some fun..." You give him a wink.'

+ 3 - 4
locations/gschool_cheerleading.qsrc

@@ -236,9 +236,8 @@ if $ARGS[0] = 'afterschool_practice':
 	else
 		act 'Skip practice (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	if cheerleadingQW['skipped'] > 1:
-		act 'Quit cheerleading squad': gt 'gschool_cheerleading', 'Quit'
-	end
+	
+	act 'Quit cheerleading squad': gt 'gschool_cheerleading', 'Quit'
 end
 
 if $ARGS[0] = 'afterschool_game':
@@ -688,7 +687,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 		end
-	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 and npc_sex['A23'] => 1:
+	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 and npc_sex['A23'] >= 1:
 		if First_time_3some_with_Lazar = 0:
 			'You stay in the shower a little longer than usual and it''s quiet when you enter the empty locker room. As you are getting your clothes ready, the door opens and Albina peeks in. "Oh fuck." she mumbles before walking in. "I was hoping it would be empty in here. I''m so fucking wet right now and was going to spend a little time here before I went home..."
 			At this point, Lazar peeks his head in the door, a wide grin on his face. "So we doing this or no- Oh hey <<$pcs_nickname>>..." he trails off as he spots you. Albina just laughs. "Yeah, turns out the place isn''t as empty as we thought." she tells him before she turns back to you. "This is exactly what it looks like <<$pcs_nickname>>. What did Marcus call it? ''Friends with benefits''? We''re not in a relationship, we just have sex when we feel like it. This horny idiot should be honoured. He''s one of the <i>very</i> few guys I have my eye on." she says with a teasing wink while wiggling her ass at him.'   

+ 1 - 1
locations/gschool_detention.qsrc

@@ -540,7 +540,7 @@ if $ARGS[0] = 'strange':
 					minut -= 5
 					gs 'stat'
 					act 'Make him cum':
-						orgasm_or = 'no'
+						$orgasm_or = 'no'
 						gs 'arousal', 'clit_finger', 1, 'masturbate'
 						gt 'gschool_detention', 'strange_cum'
 					end

+ 4 - 4
locations/gschool_events.qsrc

@@ -850,7 +850,7 @@ if $ARGS[0] = 'break_events':
 		'"Lesco, are you out of your mind!?" you cry out as the other boys burst out into laughter. You can see the panic in his face as he raises his hands in defense, rapidly apologizing:'
 		*nl
 		'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
-		'You stare him down for a few seconds and realize he''s not lying. You know Lesco already doesn''t have an easy time in school, so you let him off the hook. "Alright, I believe you. Just don''t do it again, okay?" then turn to the other guys and consider your options while Lesco quickly takes his seat for the class, visibly relieved you didn''t report him.'
+		'You stare him down for a few seconds and realize he''s not lying. You know Lesco doesn''t have an easy time in school, so you let him off the hook. "Alright, I believe you. Just don''t do it again, okay?" You turn to the other guys and consider your options while Lesco quickly takes his seat for the class, visibly relieved you didn''t report him.'
 		
 		act 'Give them a derogatory look':
 			*clr & cla
@@ -865,7 +865,7 @@ if $ARGS[0] = 'break_events':
 
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
-			act 'Tease him (<<will_cost>> Willpower)':
+			act 'Tease them (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
@@ -879,7 +879,7 @@ if $ARGS[0] = 'break_events':
 				gs 'arousal', 'flash', -5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'<i>Some of them are actually kind of cute...</i> you think to yourself.'
-				'You pretend the other people aren''t there and sweetly ask them "Come on boys, you know you only have to ask if you want to see more..." you smile sweetly as you slowly begin to lift your skirt. All the boys stare at your body in disbelief that their ploy worked. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip back, giggling. "Just kidding you perverts! Not in public anyway." and you give them all a cute wink as you sit down and get ready for your next class. When you look back, you can see their faces all flustered.'
+				'You pretend the other people aren''t there and sweetly smile at them. "Come on boys, you know you only have to ask if you want to see more..." you tease as you slowly begin to lift your skirt. All the boys stare at your body in disbelief that their ploy worked. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip back, giggling. "Just kidding you perverts! Not in public anyway." You give them all a cute wink as you sit down and get ready for the class. When you look back, you can see their faces all flustered.'
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
@@ -939,7 +939,7 @@ if $ARGS[0] = 'break_events':
 		act 'Flirt back':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
-			'You think he is kinda cute, so you decide to flirt back with him. You lay your hand on his chest and tell him he isn''t so bad himself. Soon, you are flirting back just as much as he is flirting with you.'
+			'You think he is kinda cute, so you decide to flirt back with him. You place your hand on his chest and tell him he isn''t so bad himself. Soon, you are flirting back just as much as he is flirting with you.'
 			*nl
 			'After a while, he seems emboldened by you flirting back at him and if you are not mistaken, he is sporting a raging hard-on as well. "Hey <<$pcs_nickname>>, want to go somewhere private and have some fun?"'
 			

+ 1 - 1
locations/gschool_gossip.qsrc

@@ -1177,7 +1177,7 @@ if $ARGS[0] = 'sveta_dyke_rumors':
 		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>> has been at it again, caught checking out several of the other girls." one of them says.'
 		'"Damn, I guess she is a lez." Eventually you walk far enough way to no longer be able to hear them as you head on your way.'
 	else
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/event/boys_gossip.jpg"></center>'
+		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
 		'Two boys are chatting in the hallway as you walk past. "Did you hear about <<$pcs_nickname>>?" one of them asks the other as you walk past.'
 		'"What about her?" his friend replies, glancing at you.'
 		'"I heard she was checking the other girls out in the girls locker room after gym." The first one replies.'

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -731,7 +731,7 @@ if $ARGS[0] = 'change_room':
 	menu_off = 0
 	*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>'
 
 	act 'Leave':
 		if $clothingworntype = 'nude':

+ 3 - 3
locations/gschool_lessons.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'morning':
 		gs 'gschool_socialchg', 'test'
 	end
 		
-	if $breaktype ! 'first':	
+	if $breaktype ! 'first':
 		if detention_set = 1 and week = 1:
 			detention_set = 2
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big134.jpg"></center>'
@@ -45,7 +45,7 @@ if $ARGS[0] = 'morning':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 			'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to.'
 			gs 'gschool_gossip', 'morning'
-			*nl			
+			*nl
 			gs 'gschool_lessons', 'uniform_check'
 			gs 'gschool_schedule'
 			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'morning':
 			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
 			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
 			if week = 1 and class['grade_check_day'] ! daystart:
-				act 'Check you grades': gt 'gschool_lessons', 'grade_check'
+				act 'Check your grades': gt 'gschool_lessons', 'grade_check'
 			end
 		end
 	else

+ 6 - 5
locations/gschool_lessons4.qsrc

@@ -1534,7 +1534,7 @@ if $ARGS[0] = 'long_shower':
 							act 'Finish getting dressed': gt 'gschool_lessons4', 'post_dress'
 						end
 					end
-				elseif checkoutalbina = 1 and npc_sex['A23'] => 1:
+				elseif checkoutalbina = 1 and npc_sex['A23'] >= 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She is happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
 					gs'arousal','erotic_nudity', 2
@@ -1679,7 +1679,7 @@ if $ARGS[0] = 'long_shower_locker':
 end
 
 if $ARGS[0] = 'shower_watch_end':
-	*nl
+	cla & *nl
 	'After watching for a few more seconds, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 	gs'arousal','erotic_nudity', 3
 	gs 'stat'
@@ -1708,7 +1708,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		pcs_mood += 10
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/locker/locselfiedan.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/locselfiedan.mp4"></video></center>'
 		'Bella is at the mirror, taking a selfie of herself trying to look sexy. As she does, Albina walks up beside her and then starts to dance next to her, bending over and grinding her ass against her. She can''t help but laugh and grind back, and soon both of them are teasing each other and laughing, along with many of the other girls in the locker room that saw the whole thing.'
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
@@ -1847,7 +1847,7 @@ if $ARGS[0] = 'dress':
 end
 
 if $ARGS[0] = 'post_dress':
-	*clr & cla
+	if $wloc = '': $wloc = 'default1'
 	$loc_arg = 'post_dress'
 	$locM_arg = 'post_dress'
 	$loc = 'gschool_lessons4'
@@ -1857,10 +1857,11 @@ if $ARGS[0] = 'post_dress':
 	$location_type = 'bathroom'
 	$locclass = 'locker'
 	menu_off = 0
+	*clr & cla
 	gs 'stat'
 	'<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.'
+	'You can access your <a href="exec:postphys_event = daystart & gt ''wardrobe'', $wloc">default clothing</a> options directly.'
 
 	act 'Leave school':
 		if $clothingworntype = 'nude':

+ 2 - 2
locations/gschool_lunch.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'events':
 	if npc_sex['A14'] = 1 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 40 and katjaQW['horny'] > 60 and ivan_afterschool = 0:
 		cla
 		'During the break, Katja approaches you, her face flushed in a mixture of shame and what seems to be arousal. After a few seconds, she gathers enough courage to ask if you want go somewhere quiet with her.'
-		act 'Refuse': KatjaDom -= 1 & gt 'gschool_lunch', 'break'
+		act 'Refuse': gt 'gschool_lunch', 'break'
 		act 'Go with Katja':
 			*clr & cla
 			minut += 5
@@ -362,7 +362,7 @@ if $ARGS[0] = 'events':
 			else
 				act 'Eat Katja out':
 					*clr & cla
-					KatjaDom += 1
+					KatjaQW['dom'] += 1
 					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 
 					katjaQW['slut'] += 1
 					katjaQW['horny'] = 0

+ 66 - 66
locations/gschool_post_shower.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'post_shower':
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 			act 'Keep checking her out':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/nushwatch2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchnush2.jpg"></center>'
 				if rand (1,4) = 1:
 					if npc_rel['A144'] >= 60:
 						'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder and makes direct eye contact with you. You freeze, your eyes growing wide and your mouth going slack as you try to think of some kind of excuse. Before you can say anything, she puts her fingers up to her mouth in a V shape and sticks her tongue between them, the universal sign for eating pussy. She then goes back to pretending like nothing happened, so you turn back to your own locker, blushing a little as you finish getting dressed.'
@@ -857,7 +857,7 @@ if $ARGS[0] = '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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 	act 'Check out Albina':
 		*clr & cla
 		checkoutalbina = 1
@@ -872,7 +872,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -886,12 +886,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			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'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -909,7 +909,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -921,12 +921,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -944,7 +944,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs '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>'
@@ -958,12 +958,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -981,7 +981,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1000,12 +1000,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1045,12 +1045,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1067,7 +1067,7 @@ if $ARGS[0] = 'post_shower2':
 		end
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1085,12 +1085,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1121,12 +1121,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1144,7 +1144,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1155,12 +1155,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			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'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1176,7 +1176,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			sveta_dyke_rumor += 1
@@ -1188,12 +1188,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1233,12 +1233,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1271,12 +1271,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1294,7 +1294,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1309,12 +1309,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1331,7 +1331,7 @@ if $ARGS[0] = 'post_shower2':
 		end
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1356,12 +1356,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'post_shower2':
 		end
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1407,12 +1407,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'post_shower2':
 		end
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1449,12 +1449,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1472,7 +1472,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			sveta_dyke_rumor += 1
@@ -1484,12 +1484,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1507,7 +1507,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			*clr & cla
 			if rand (1,4) = 1:
@@ -1537,19 +1537,19 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchson1.jpg"></center>'
 				'After watching for a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':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/watch' + rand(1,4) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watchsta.jpg"></center>'
 		'Your attention homes in on Stasya as she soaps herself up. She has long black hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a completely smooth pussy. She has that cute girl next door level of looks.'
 		if tits < 3:
 			'Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average compared to the rest of your classmates.'
@@ -1561,7 +1561,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1581,12 +1581,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1604,7 +1604,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1615,12 +1615,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			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'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'post_shower2':
 		end
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1650,12 +1650,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end
@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'post_shower2':
 		*nl
 		gs'arousal','erotic_nudity', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+		act 'Stop peeping':gs 'arousal', 'end' & gs 'gschool_lessons4','shower_watch_end'
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
@@ -1686,12 +1686,12 @@ if $ARGS[0] = 'post_shower2':
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			else
 				'After watching her a little longer, you decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'
-				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','shower_watch_end'
+				act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 			end
 		end
 	end

+ 6 - 6
locations/gschool_sex.qsrc

@@ -773,13 +773,13 @@ if $ARGS[0] = 'storagesex':
 										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>'
 										'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin and the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 										act 'Go to the locker room':
 											*clr & cla
 											minut += 5
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/change.jpg"></center>'
 											'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
 											'You can choose another outfit while you''re here.'
 											act 'Continue': gt 'gschool_lessons4', 'post_dress'
@@ -828,13 +828,13 @@ if $ARGS[0] = 'storagesex':
 								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>'
 								'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin and the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 								act 'Go to the locker room':
 									*clr & cla
 									minut += 5
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/change.jpg"></center>'
 									'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
 									'You can choose another outfit while you''re here.'
 									act 'Continue': gt 'gschool_lessons4', 'post_dress'
@@ -873,13 +873,13 @@ if $ARGS[0] = 'storagesex_anal':
 			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>'
 			'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
 			act 'Go to the locker room':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/change.jpg"></center>'
 				'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
 				'You can choose another outfit while you''re here.'
 				act 'Continue': gt 'gschool_lessons4', 'post_dress'

+ 2 - 2
locations/hookup.qsrc

@@ -879,7 +879,7 @@ if $ARGS[0] = 'bj2':
 						'Your clothes in place, you grab your bag and walk straight out of the apartment, slamming the door behind you.'
 						*nl
 						'<i>Fucking ridiculous!</i> you fume to yourself on your way out the door.'
-						act'Leave':'hookup','exit'
+						act'Leave':gt 'hookup_after', 'exit'
 					end			
 				end
 				
@@ -904,7 +904,7 @@ if $ARGS[0] = 'bj2':
 							*nl
 							'You finish getting dressed and stomp out the door, closing it angrily behind you.'
 							'Yup... Really sucked... In every sense of the word... You face palm in the hall before moving to leave the building.'
-							act'Leave':'hookup','exit'
+							act'Leave':gt 'hookup_after', 'exit'
 						end
 						gs'hookup_after','pre'
 					else

+ 21 - 1
locations/hookup_after.qsrc

@@ -2,9 +2,10 @@
 !2021/05/06
 if $ARGS[0] = 'exit':
 	gs 'arousal', 'end'
+	stat['hookup'] += 1
 	if $clothingworntype = 'nude': gs'shortgs','dress'
 	if npc_QW[$npclastsaved] > 0:
-		gs'lover','add',$boy
+		gs'lover','add',$npclastsaved
 		know_virgin[$npclastsaved] = hookup['virgin']
 	end
 	killvar 'hookup'
@@ -22,6 +23,25 @@ if $ARGS[0] = 'exit':
 	elseif npc_residence[$npclastsaved] = 4:
 		!! St. Petersburg City Center exit
 		gt 'city_center'
+	else
+		!! failsafes
+		if $region = 'pav_residential':
+			gt 'pav_residential'
+		elseif $region = 'pav_commercial':
+			gt 'pav_commercial'
+		elseif $region = 'pav_park':
+			gt 'pav_park','start'
+		elseif $region = 'city_residential':
+			gt 'city_residential'
+		elseif $region = 'city_center':
+			gt 'city_center'
+		elseif $region = 'city_park':
+			gt 'city_park','start'
+		elseif $region = 'city_island':
+			gt 'city_island'
+		else
+			gt 'pav_residential'
+		end
 	end
 end
 

+ 8 - 3
locations/hookup_morning.qsrc

@@ -522,15 +522,15 @@ if $ARGS[0] = 'wakeup':
 					'"Sure, lead the way."'
 					'You climb out of bed, not bothering to get dressed as you follow him. You already spent the night naked with him, what''s a cup of coffee longer?'
 					if npc_apt_spare[$npclastsaved] = 1:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a desk with a monitor and a keyboard on top.</a> <i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a desk with a monitor and a keyboard on top.</a> <i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
 						*nl
 						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
 					elseif npc_apt_spare[$npclastsaved] = 2:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a room filled with various exercise equipment.</a> <i>Likes to work out huh?</i> you think to yourself, strutting past.'
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a room filled with various exercise equipment.</a> <i>Likes to work out huh?</i> you think to yourself, strutting past.'
 						*nl
 						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
 					else
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
 					end
 
 					act'Wait':gt'hookup_morning','coffee'
@@ -1533,6 +1533,11 @@ if $ARGS[0] = 'later_dressed':
 			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
 			act'Leave':gt'hookup_after','exit'
 		else
+			gs 'boy', 'details'
+			bmFrend[Tboynum] = 1
+			gs 'boy'
+			gs 'boyfrend', 'start'
+			gs 'stat'
 			'For a moment you feel intensely awkward as you wait for his response, but when you turn to look at him he''s smiling.'
 			'"A date... Yeah, I''d like to take you on a date sometime." Your expression bursts into a smile as well, unable to contain yourself.'
 			'You tell him your number and he taps it into his phone. A few moments later, a notification pings in your messages:'

+ 10 - 10
locations/hotel_anna_gear.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'toys_vacuum':
 		act'Perhaps some other time.':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Well, I told you I won''t force you and I''m faithful to my promise. Next time I''ll teach you about restraints and maybe another time you can try the vacuum cups if you desire."'
 			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
 		end
@@ -154,7 +154,7 @@ if $ARGS[0] = 'toys_vacuum':
 	act'Leave':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"Well, I told you I won''t force you and i''m faithful to my promise. Next time I''l teach you about restraints and maybe another time you can try the vacuum cups if you desire."'
 		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
 	end
@@ -835,7 +835,7 @@ if $ARGS[0] = 'restraints_rope':
 	act'Excuse yourself':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"Thank you Anna, but I don''t think I''m ready for this."'
 		'"Don''t worry <<$pcs_nickname>>, you are free to learn at your own pace and only do what you are comfortable with. Next time something a bit more exciting, if I can get it arranged in time."'
 		'"Thank you Anna, good bye."'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'restraints_harness':
 			*clr & cla
 				gs 'arousal', 'end'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Hope you don''t mind Anna, but I have to get home."'
 			'"Understandable. The main thing is you got the basic idea about the harness and what it can do. Here let me get your clothes." Anna gives you your clothes and you put them back on, Anna talks a little bit about her first experience with harnesses before you leave.'
 			act 'Leave': gt'HotelHole'
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'restraints_harness':
 		act'Thanks for your offer Anna, but I have to go...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Hope you don''t mind Anna, but I really have to go."'
 			'"That''s fine, we can pick this up again next time. I hope that you got a little bit of an insight into what this harness can bring. You can take it off now and redress." You put your clothes back on, and after some small talk you say goodbye and leave.'
 			act 'Leave': gt'HotelHole'
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'restraints_harness':
 				*clr & cla
 				gs 'arousal', 'end'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 				'"Hope you don''t mind Anna, I really have to get going."'
 				'"That''s okay, we can continue this another day then. I hope you''ve learned something here today." You get dressed before chatting a bit with Anna about school before you say goodbye and leave.'
 				act 'Leave': gt'HotelHole'
@@ -1098,7 +1098,7 @@ if $ARGS[0] = 'restraints_harness':
 	act'Thank you Anna, but I have to go...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"As you wish. We''ll continue another time. Hopefully I''ve given you some things to think about tonight. Let me show you out." You chat a bit on the way to the door when you reach the door you kindly say goodbye and leave.'
 		act 'Leave': gt'HotelHole'
 	end
@@ -1326,7 +1326,7 @@ if $ARGS[0] = 'restraints_cuff':
 	act'Leave':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"Alright. If you don''t want to I can understand that and I won''t force you. Just think about some of the things you''ve seen here today okay? Now, let me show you out." Anna leads you to the front door and you leave.'
 		act 'Leave': gt'HotelHole'
 	end
@@ -1820,10 +1820,10 @@ if $ARGS[0] = 'restraints_leash':
 		act'I think i''ll pass this time.':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Annaintro1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Well <<$pcs_nickname>>... in that case we''re done for today. Hopefully you''ve gotten some things to think about tonight."'
 			'"I''m sorry."'
-			'"That''s okay <<$pcs_nickname>> we''ll continue another day, let me show you to the out." You both chat a little as you walk to the door, when you reach the door you say goodbye and leave.'
+			'"That''s okay <<$pcs_nickname>> we''ll continue another day, let me show you out." You both chat a little as you walk to the door, when you reach the door you say goodbye and leave.'
 			act 'Leave': gt'HotelHole'
 		end
 	end

+ 1 - 1
locations/journal.qsrc

@@ -1549,7 +1549,7 @@ if $ARGS[0] = 'uni':
 
 	elseif university['semester_week'] > 0:
 		if university['semester_week'] < 11:
-			'You are in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['semester_week']*8-7,7))+' week of the semester which last 15 weeks.'
+			'You are in the '+trim(MID('  first, second, third, fourth, fifth, sixth, seventh, eighth,  ninth,  tenth', university['semester_week']*8-7,7))+' week of the semester which last 15 weeks.'
 		else
 			'You are in the '+str(university['semester_week'])+'th week of the semester which last 15 weeks.'
 		end

+ 118 - 60
locations/journal_quests.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'start':
 		elseif cheerleadingQW['quest_stage'] = -2:
 			'For one reason or another, I don''t want to join the cheerleading squad.'
 		elseif cheerleadingQW['quest_stage'] = 1:
-			'I have signed up to tryout for the cheerleading squad.'
+			'I have signed up to try out for the cheerleading squad.'
 		elseif cheerleadingQW['quest_stage'] = 2:
-			'I was accepted into the cheerleading squad as a backup. Unless people start thinking I am a jock or see me as cool enough, this is as far as Albina will let me go.'
+			'I was accepted into the cheerleading squad as a backup. Unless people start thinking I''m a jock or see me as cool enough, this is as far as Albina will let me go.'
 		elseif cheerleadingQW['quest_stage'] = 3:
 			'I joined the cheerleading squad as a full member.'
 		else
@@ -40,35 +40,35 @@ if $ARGS[0] = 'start':
 		if christinaQW['dompath'] >= 1 or christinaQW['subpath'] >= 1:
 			if christinaQW['dompath'] >= 1:
 				if christinaQW['dompath'] = 7:
-					'I own Christina now. I completely ruined her life, took away everything she loves, gave her new rules to follow, or she gets punished. I am the Queen Bitch now!'
+					'I own Christina now. I completely ruined her life, took away everything she loves and gave her new rules to follow or she gets punished. I am the Queen Bitch now!'
 				elseif christinaQW['dompath'] = 6:
-					'I won the fight! First I ruined her school rep, then beat the shit out of her, and then blackmailed the coach. She is ruined! Only time will tell what the fallout of all this will be.'
+					'I won the fight! I ruined her reputation before beating the shit out of her and blackmailing the coach. She is ruined! Only time will tell what the fallout of all this will be.'
 				elseif christinaQW['dompath'] = 5:
 					'Just like I thought, she attacked me the moment school let out. This is going to be a rough fight...'
 				elseif christinaQW['dompath'] = 4:
 					'Christina is going to know who spread those rumors about her. I hope I prepared enough, otherwise my plan could backfire pretty badly...'
 				elseif christinaQW['dompath'] = 3:
-					'I have managed to successfully blackmail Christina. She can''t say no to me now! Of course, I could tell some people about the dirt I found, but I shouldn''t do that unless I am ready for one hell of a fight...'
+					'I have managed to successfully blackmail Christina. She can''t say no to me now! Of course, I could tell some people about the dirt I found, but I shouldn''t do that unless I''m ready for one hell of a fight...'
 				elseif christinaQW['dompath'] = 2:
-					'I need to chat with Christina at school, let her know what I have on her. Unless she does what I want, I am going to ruin her reputation.'
+					'I need to chat with Christina at school, let her know what I have on her. Unless she does what I want, I''m going to ruin her reputation.'
 				else
-					'I shouild wait, and see what opportunities come up to get some dirt on Christina.'
+					'I should wait and see what opportunities come up to get some dirt on Christina.'
 				end
 			else
 				if christinaQW['subpath'] = 3:
-					'Christina owns me now. After gym classes, in the showers, she makes me do things.'
+					'Christina owns me now. After gym class, she makes me do things in the showers.'
 				elseif christinaQW['subpath'] = 2:
 					if christinaQW['fight'] = -1:
 						'I challenged Christina ... and lost. I have a feeling that is going to catch up to me somehow...'
 					else
-						'I submitted myself to Christina''s control. I am just going to have to wait and see what the future brings...'
+						'I submitted myself to Christina''s control. I have to wait and see what the future brings...'
 					end
 				else
-					'I have heard Christina trains Lina by the lake afterschool. I should pay them a visit.'
+					'I heard Christina trains Lina by the lake after school. I should pay them a visit.'
 				end
 			end
 		else
-			'I should talk to Christina at school sometime. I cannot decide what I think about her...'
+			'I should talk to Christina at school sometime. I can''t decide what to think about her...'
 		end
 		*nl
 		*nl
@@ -77,14 +77,14 @@ if $ARGS[0] = 'start':
 		if npc_rel['A3'] >= 60:
 			if kotovVSprohorov = 2:
 				if IvanShowerQW = 11:
-					'Ivan joins me sometimes in the showers at the sports center now. If I want it to happen for sure then I need to talk with him about it at school.'
+					'Ivan sometimes joins me in the showers at the sports center. If I want it to happen more often, then I need to talk with him about it at school.'
 				elseif IvanShowerQW = 1:
-					'I should talk to Ivan about what happened in the sports center the next time I am at school.'
+					'I should talk to Ivan about what happened in the sports center the next time I''m at school.'
 				else
-					'I need to not chicken out the next time Ivan tries to join my in the sports center shower.'
+					'I need to not chicken out the next time Ivan tries to join me in the sports center shower.'
 				end
 			elseif kotovVSprohorov = 1:
-				'I am feeling dirty, I should take a shower at the sports center.'
+				'I''m feeling dirty. I should take a shower at the sports center.'
 			else
 				'I see Ivan at the sports center around 17:00 a lot. I should try and chat with him then.'
 			end
@@ -109,16 +109,16 @@ if $ARGS[0] = 'start':
 									'I should try talking to Julia about sex.'
 								end
 							else
-								'I should spend some time chatting with Julia. I bet if I get to know her weel enough, she would open up to me more.'
+								'I should spend some time chatting with Julia. I bet if I get to know her well enough, she would open up to me more.'
 							end
 						else
 							'I bet if I bought some wine, Julia would drink it with me.'
 						end
 					else
-						'Julia agreed to help me with my homework, she should be waiting for me after school ends.'
+						'Julia agreed to help me with my homework. She should be waiting for me after school ends.'
 					end
 				else
-					'I should ask Julia to help me with my homework afterschool sometime. I can find her hanging out with the other nerds in a classroom during school breaks.'
+					'I should ask Julia to help me with my homework after school sometime. I can find her hanging out with the other nerds in a classroom during school breaks.'
 				end
 			else
 				'I need to get to know Julia better before she is willing to hang out with me after school.'
@@ -134,71 +134,71 @@ if $ARGS[0] = 'start':
 			'Lariska trusts you more than anybody else in her life now, and will (eventually) be able to do plenty of stuff around town with you.'
 		elseif LariskaQW['story'] = 18:
 			if LariskaBoyDay > daystart:
-				'There isn''t anything to talk about right now, give it some time.'
+				'There isn''t anything to talk about right now. Give it some time.'
 			else
-				'Lariska called me crying again, I need to go see her at home the next chance I get.'
+				'Lariska called me crying again. I need to go see her at home the next chance I get.'
 			end
 		elseif LariskaQW['story'] = 17:
 			if LariskaBoyDay > daystart:
-				'There isn''t anything to talk about right now, give it some time.'
+				'There isn''t anything to talk about right now. Give it some time.'
 			else
-				'Lariska called me crying, I need to go see her at home the next chance I get.'
+				'Lariska called me crying. I need to go see her at home the next chance I get.'
 			end
 		elseif LariskaQW['story'] = 16:
 			if LariskaBoyDay > daystart:
-				'There isn''t anything to talk about right now, give it some time.'
+				'There isn''t anything to talk about right now. Give it some time.'
 			else
-				'Lariska needs to talk to me, she said it was important. I should go to her bedroom afterschool or on the weekends.'
+				'Lariska needs to talk to me, saying it was important. I should go to her bedroom after school or on the weekends.'
 			end
 		elseif LariskaQW['story'] = 15:
-			'I need to tell Lariska what I saw (name) doing when she is in her bedroom afterschool or on the weekends.'
+			'I need to tell Lariska what I saw (name) doing when she is in her bedroom after school or on the weekends.'
 		elseif LariskaQW['story'] = 14:
-			'I feel like clubbing, I should hit up the disco next weekend'
+			'I feel like clubbing. I should hit up the disco next weekend.'
 		elseif LariskaQW['story'] = 13:
 			if LariskaBoyDay > daystart:
-				'There isn''t anything to talk about right now, give it some time.'
+				'There isn''t anything to talk about right now. Give it some time.'
 			else
-				'I should chat with Lariska when she is in her bedroom afterschool or on the weekends.'
+				'I should chat with Lariska when she is in her bedroom after school or on the weekends.'
 			end
 		elseif LariskaQW['story'] = 12:
-			'She wants me to meet her new boyfriend at Del Parco next Saturday'
+			'She wants me to meet her new boyfriend at Del Parco next Saturday.'
 		elseif LariskaQW['story'] = 11:
 			if LariskaBoyDay > daystart:
-				'There isn''t anything to talk about right now, give it some time.'
+				'There isn''t anything to talk about right now. Give it some time.'
 			else
 				'I should chat with Lariska when she is cooking in her kitchen on a weekday.'
 			end
 		elseif LariskaQW['story'] = 10:
-			'I should chat with Lariska when she is in her bedroom afterschool or on the weekends.'
+			'I should chat with Lariska when she is in her bedroom after school or on the weekends.'
 		elseif LariskaQW['story'] = 9:
 			'I need to keep flirting with her to build her trust.'
 		elseif LariskaQW['story'] = 8:
-			'I should try to flirt with Lariska afterschool or on the weekends, when she is in her bedroom.'
+			'I should try to flirt with Lariska after school or on the weekends when she is in her bedroom.'
 		elseif LariskaQW['story'] = 7:
-			'We should get to know each other better, so I should chat with Lariska when she is in her bedroom afterschool or on the weekends.'
+			'We should get to know each other better, so I should chat with Lariska when she is in her bedroom after school or on the weekends.'
 		elseif LariskaQW['story'] = 6:
-			'I should do my homework with Lariska afterschool.'
+			'I should do my homework with Lariska after school.'
 		elseif LariskaQW['story'] = 5:
-			'Lariska invited me to come over afterschool and do our homework together.'
+			'Lariska invited me to come over after school and do our homework together.'
 		elseif LariskaQW['story'] = 4:
 			'I should talk to Lariska at school again.'
 		elseif LariskaQW['story'] = 3:
 			if christinaQW['dompath'] >= 3 or christinaQW['subpath'] >= 2:
 				'I should talk to Lariska at school.'
 			else
-				'I have to find a way to deal with Christina, before Lariska is willing to be more involved with me.'
+				'I have to find a way to deal with Christina before Lariska is willing to be more involved with me.'
 			end
 		elseif LariskaQW['story'] = 2:
-			'I should return the volleyball Lariska left behind during school. Maybe I can figure out why she freaked out.'
+			'I should return the volleyball Lariska left behind during school. Maybe then I can figure out why she freaked out.'
 		elseif LariskaQW['story'] = 1:
 			if npc_rel['A13'] > 40:
-				'I should try talking to her outside of the Five Eight Estates again. Maybe I should be a little nicer this time, though.'
+				'I should try talking to her outside of the Five Eight Estate again. Maybe I should be a little nicer this time, though.'
 			else
 				'I need to get to know Lariska better before she would hang out with me.'
 			end
 		else
 			if npc_rel['A13'] > 40:
-				'I think I heard the sound of a ball outside the Five Eight Estates.'
+				'I think I heard the sound of a ball outside the Five Eight Estate.'
 			else
 				'I need to get to know Lariska better before she would hang out with me.'
 			end
@@ -211,27 +211,27 @@ if $ARGS[0] = 'start':
 		if NatbelQW['QWstage'] >= 11:
 			'This is the end of Natasha''s quest line, for now.'
 		elseif NatbelQW['QWstage'] = 10:
-			'I should check Natasha''s fridge, I am sure there is something I can use to keep corrupting her. It would be a good time to do this when she is in the laundry room.'
+			'I should check Natasha''s fridge. I''m sure there''s something I can use to keep corrupting her. It would be a good time to do this when she is in the laundry room.'
 		elseif NatbelQW['QWstage'] = 9:
 			'I bet Olu would love to give Natasha a ride. I should see what he thinks of other girls joining us. If I haven''t had sex with him yet, I will need to do that first.'
 		elseif NatbelQW['QWstage'] = 8:
 			'Kolka seems pretty horny these days. I could invite him over to Natasha''s apartment in the afternoon. I should talk to him about it, after teasing him in the mornings when I have her carry my books.'
 		elseif NatbelQW['QWstage'] = 7:
-			'I think Natasha could learn to please me, I should have her practice with her tongue when I am in her room.'
+			'I think Natasha could learn to please me. I should have her practice with her tongue when I am in her room.'
 		elseif NatbelQW['QWstage'] = 6:
-			'Natasha has a kinky side, she just doesn''t realize it yet. Next time I am in her bedroom, I should see how she handles bodily fluids in her mouth.'
+			'Natasha has a kinky side, she just doesn''t realize it yet. Next time I''m in her bedroom, I should see how she handles bodily fluids in her mouth.'
 		elseif NatbelQW['QWstage'] = 5:
-			'Natasha is pretty much my slave now. Let''s see how well she can handle worshipping my feet the next time I am in her bedroom.'
+			'Natasha is pretty much my slave now. Let''s see how well she can handle worshipping my feet the next time I''m in her bedroom.'
 		elseif NatbelQW['QWstage'] = 4:
 			'I need to have Natasha carry my books to school if I want to keep corrupting her. I can do that before school, in the hallway of my parents apartment.'
 		elseif NatbelQW['QWstage'] = 3:
-			'Since Natasha cannot seem to pay her debt to me, I should start forcing her to do things for me. Making her do my homework all by herself seems like a good place to start. I will let her do that for me a few times, and see what else I can get her to do.'
+			'Since Natasha cannot seem to pay back her debt to me, I should start forcing her to do things for me. Making her do my homework seems like a good place to start. I will let her do that for me a few times, and see what else I can get her to do.'
 		elseif NatbelQW['QWstage'] = 2:
-			'Natasha has borrowed money from me, in return she has to do my homework whenever I tell her to. Once her 30 days are up I should ask for my money back and see where it goes, because I don''t actually expect her to be able to pay it back.'
+			'Natasha has borrowed money from me. In return, she has to do my homework whenever I tell her. Once her 30 days are up, I should ask for my money back and see where it goes because I don''t actually expect her to be able to pay it back.'
 		elseif NatbelQW['QWstage'] = 1:
-			'Natasha agreed to help me with my homework. I just need to visit her in her apartment after school. I should chat with her a few times, before bringing up anything involving money though.'
+			'Natasha agreed to help me with my homework. I just need to visit her in her apartment after school. I should chat with her a few times before bringing up anything involving money though.'
 		else
-			'Natasha seems really smart, I should try to befriend her to help me with my grades. During school breaks seems like a good time to chat her up. It might take a lot of effort for her to trust me though.'
+			'Natasha seems really smart. I should try to befriend her to help me with my grades. During school breaks seems like a good time to chat her up. It might take a lot of effort for her to trust me though.'
 		end
 		*nl
 		*nl
@@ -241,13 +241,13 @@ if $ARGS[0] = 'start':
 			'Coach Mikhail has finally made me a starter on the Volleyball Team.'
 		elseif trener_Speak = 7 and volleysostav > 0:
 			if pcs_vball > 70:
-				'I am pretty sure I have pushed every button and jumped through every hoop I can with the coach. It''s time to request that starter spot again.'
+				'I''m pretty sure I''ve pushed every button and jumped through every hoop I can with the coach. It''s time to request that starter spot again.'
 			else
-				'I have done everything I can do to twist Mikhail around my finger. Now I just need to keep practicing my volleyball skills to be worthy of a starter position.'
+				'I''ve done everything I can do to twist Mikhail around my finger. Now I just need to keep practicing my volleyball skills to be worthy of a starter position.'
 			end
 		elseif trener_Speak = 6 and volleysostav > 0:
 			if trenerSex >= 1:
-				'It''s time to start pushing for a spot as a starter. I should be careful about pushing too hard though, or I could ruin my chances, and worse.'
+				'It''s time to start pushing for a spot as a starter. I should be careful about pushing too hard though, or I could ruin my chances.'
 			else
 				'I need to at least give the coach a blowjob to finish my seduction scheme.'
 			end
@@ -282,17 +282,17 @@ if $ARGS[0] = 'start':
 								'I should chat with Ivan at school again.'
 							end
 						elseif IvanShowerQW = 1:
-							'I should talk to Ivan about what happened in the sports center the next time I am at school.'
+							'I should talk to Ivan about what happened in the sports center the next time I''m at school.'
 						else
 							'I need to not chicken out the next time Ivan tries to join my in the sports center shower.'
 						end
 					elseif kotovVSprohorov = 1:
 						'I should take a shower at the sports center. If the rumors I heard about Ivan are true, he should try to join me.'
 					else
-						'I want to use Ivan to make the coach jealous, somehow. I should start by chatting with him in the sports section when he is just showing up, usually around 17:00.'
+						'I want to use Ivan to somehow make the coach jealous. I should start by chatting with him in the sports section when he shows up, usually around 17:00.'
 					end
 				else
-					'I need something to make the coach jealous of me. Ivan spends a lot of time at the sports center, maybe I can use him to my advantage. I should put some effort into getting to know him better.'
+					'I need something to make the coach jealous of me. Ivan spends a lot of time at the sports center, maybe I can use him to my advantage? I should put some effort into getting to know him better.'
 				end
 			elseif VoltrenerVoyeur = 2:
 				if trenerlust >= 40:
@@ -302,7 +302,7 @@ if $ARGS[0] = 'start':
 				end
 			elseif VoltrenerVoyeur = 1:
 				if trenerlust >= 40:
-					'I should take a shower again at the sports center. Maybe this time he wont run away so fast.'
+					'I should take a shower again at the sports center. Maybe this time he won''t run away so fast?'
 				else
 					'I need to keep trying to tease the coach.'
 				end
@@ -314,17 +314,75 @@ if $ARGS[0] = 'start':
 				end
 			end
 		elseif trener_Speak = 3 and volleysostav > 0:
-			'As much as I did not enjoy the lecture about volleyball the last time I spoke with the coach, if I keep asking about it, maybe he will volunteer some information on his own about his past on the European Team. If all else fails, maybe I can straight seduce him.'
+			'As much as I didn''t enjoy the lecture about volleyball the last time I spoke with the coach, if I keep asking about it, maybe he will volunteer some information on his own about his past on the European Team. If all else fails, maybe I can straight up seduce him?'
 		elseif trener_Speak = 2 and volleysostav > 0:
-			'Lets see what other information I can get out of the Coach. Surely there is something I can use to manipulate him. I should try just asking about volleyball in general.'
+			'Let''s see what other information I can get out of the coach. Surely there''s something I can use to manipulate him. I should try asking about volleyball in general.'
 		elseif trener_Speak = 1 and volleysostav > 0:
-			'Apparently the memories of the Coach''s time on the European team are painful, something bad must have happened. I should remember that for later, for now, lets see what I can get out of him about his personal life.'
+			'Apparently the memories of the coach''s time on the European team are painful, something bad must have happened. I should remember that for later. For now, let''s see what I can get out of him about his personal life.'
 		elseif trener_Speak = 0 and volleysostav > 0:
-			'I should talk to Mikhail. The only way I am ever going to be a starter for the team is if I manage to wrap him around my finger. Maybe I should ask him about the rumors of him playing for the European championship winning team in the past.'
+			'I should talk to Mikhail. The only way I''m ever going to be a starter for the team is if I manage to wrap him around my finger. Maybe I should ask him about the rumors of him playing for the European championship winning team in the past?'
 		elseif volleysostav < 0:
-			'I got kicked off the Volleyball Team, pretty sure there is nothing I can say or do to get back on the team.'
+			'I got kicked off the volleyball team. I''m pretty sure there''s nothing I can say or do to get back on the team.'
 		else
-			'If I want to join the Volleyball Team, I need to practice my skills at the community center, then talk to the coach about joining.'
+			'If I want to join the volleyball team, I need to practice my skills at the community center, then talk to the coach about joining.'
+		end
+		*nl
+		*nl
+		'<center><h1>Katja Meynold</h1></center>'
+		*nl
+		if katjaQW['QWstage'] = 0:
+			'Katja is both cute, smart and popular. If I want to be her friend'+iif(npc_rel['A14'] < 60, ', I need to get to know her better by talking with her at school or the disco', '')+ +iif(pcs_makupskl < 40, ', I need to improve my make up skill since she is very into make up', '')+ +iif(class['school_grade_average'] < 64, ', I need to improve my grades since being good at school is important to her', '')+ +iif(fame['pav_slut'] >= 25, ', I need to be seen as less of a slut', '')+ +iif(hotcat >= 6, ', I need to improve my looks', '')+ +iif(npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6, ', I should probably go to school and see if somthing happens.', '.')
+		elseif katjaQW['QWstage'] = 1:
+			'Katja has agreed to hang out after school. I should do this more often to see where this leads.'
+		elseif katjaQW['QWstage'] = 2:
+			'Katja and I saw her mother and a girl not much older than us kissing and it clearly affected Katja. I thought about asking her if we should try kissing, but decided not to. Maybe if I hang out more with her at her house there will be another opportunity to try?'
+		elseif katjaQW['QWstage'] > 2:
+			if npc_sex['A14'] = 0:
+				'I''ve kissed Katja, but not gone any further.'+iif(katjaQW['slut'] < 20, ' Katja needs to loosen up a little before she will go any further. Maybe I should try to push her a little when kissing or getting her to be naked at the beach?', ' I think it''s possible that she will go further if the opportunity comes up when hanging out at her home.')
+			end
+				'While Katja is a shy girl, she is still quite strong willed, and will not do anything sexual if not in the mood. Fortunately for me, it''s pretty easy to determine if she is aroused by how red her face is.'
+
+			if katjaQW['school_kiss'] = 0 and katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
+				'I should try to kiss Katja at school.'
+			elseif katjaQW['school_kiss'] = 1:
+				'I should kiss Katja again in school and see what happens.'
+			end
+
+			if katjaQW['pantiesQWstage'] = 0:
+				'It could be fun to see if I could get Katja to go to school without panties. To do this, I need to speak with her at school when I''m not wearing panties so she can see that I''m not wearing any'+iif(katjaQW['slut'] >= 40 and katja['school_sex'] = 0, ', I should probably accept her advances at school', '')+ +iif(katjaQW['slut'] < 20, ', I need to loosen up Katja in other ways first. For example, by getting her to be naked at the beach.', '.')
+			elseif katjaQW['pantiesQWstage'] < 4:
+				'I think I''m getting close to having Katja take off her panties at school. Just have to push her a little more...'
+			elseif katjaQW['pantiesQWstage'] = 4:
+				'I''ve gotten Katja to take off her panties at school. Now she just needs to lose some more inhibition so she doesn''t put them on in the morning.'
+			elseif katjaQW['pantiesQWstage'] > 4:
+				'Success. Katja doesn''t wear panties to school anymore.'
+			end
+			if npc_sex['A14'] = 1:
+				if strapon = 0:
+					'I should buy a strap-on so that I can use it on Katja.'
+				elseif katjaQW['slut'] < 40:
+					'You need to get Katja to lose some more of her inhibition before you can use your strap-on on her.'
+				elseif katjaQW['strapon_vag'] + katjaQW['strapon_ass'] + katjaQW['strapon_bj'] < 3:
+					'You should' +iif(katjaQW['strapon_bj'] = 0, '; make Katja give your strap-on a blowjob', '')+ +iif( katjaQW['strapon_vag'] = 0, '; fuck Katja''s pussy with your strap-on', '')+ +iif(katjaQW['strapon_ass'] = 0, '; fuck Katja in the ass with your strap-on', '')+'.'
+				end
+
+				if katjaQW['school_kiss'] > 1 and (katjaQW['ivan_pussy'] + katjaQW['ivan_anal']) = 0:
+					'Ivan seems interested in Katja and I. Maybe I can get them to have a threesome? Kissing Katja at school should get his attention, or maybe we will run into him at the beach.' +iif(katjaQW['slut'] < 60, ' Katja needs to lose some more inhibition before she will agree.', '')+ +iif(IvanShowerQW ! 11, ' I need to have sex with Ivan first (See his quest on how to do this).', '')
+				end
+
+				if katjaQW['slut'] < 100:
+					'I should continue to corrupt Katja. There might be more things I can push her to do.'
+				elseif katjaQW['park_sex'] = 0:
+					'I should take Katja to the park to get her to to hook up with random guys.'
+				elseif katjaQW['park_sex'] = 1:
+					'I took Katja to the park and she had sex with a random guy. Maybe if we go again I could get her to have sex with several guys.'
+				elseif katjaQW['park_sex'] = 2:
+					'Katja had a threesome in the park with two random guys. Let''s go again and see where it ends.'
+				else
+					'You have managed to tun Katja from an innocent virgin into a complete slut that will have orgies with random people you meet in the park.'
+					'You have unlocked all the scenes with Katja that are in the game at the moment' +iif(NatbelQW['QWstage'] < 8, ', except a scene started by going to the market which requires you to advance Natasha''s quest line.', '.')
+				end
+			end
 		end
 	end
 end

+ 61 - 50
locations/katjaEv.qsrc

@@ -163,7 +163,6 @@ if $ARGS[0] = '3':
 	end
 end
 
-
 if $ARGS[0] = 'kiss':
 	*clr & cla
 	minut += 5
@@ -177,7 +176,6 @@ if $ARGS[0] = 'kiss':
 		else
 			katjaQW['slut'] += 5
 		end
-		KatjaDom = 50
 		katjaQW['QWstage'] = 3
 	end
 
@@ -195,7 +193,6 @@ if $ARGS[0] = 'kiss':
 			*clr & cla
 			minut += 5
 			pcs_horny += 10
-			KatjaDom += 1
 			katjaQW['horny'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
@@ -211,8 +208,9 @@ if $ARGS[0] = 'kiss':
 				*clr & cla
 				minut += 5
 				pcs_horny += 10
-				KatjaDom -= 1
+				KatjaQW['dom'] -= 1
 				katjaQW['horny'] -= 10
+				katjaQW['horny'] = min(katjaQW['horny'], 60)
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -246,13 +244,13 @@ if $ARGS[0] = 'kiss':
 						*clr & cla
 						minut += 5
 						pcs_horny += 10
-						KatjaDom -= 5
+						KatjaQW['dom'] -= 1
 						katjaQW['horny'] -= 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/grab.jpg"></center>'
 						'You grab Katja firmly so she can''t back away.'
 !!{
-						if pcs_dom < KatjaDom:
+						if pcs_dom < KatjaQW['dom']:
 							'Katja pushes your arms apart and pulls away, you understand that she doesn''t want more.'
 
 							if mey_vika['key'] = 1:
@@ -267,7 +265,6 @@ if $ARGS[0] = 'kiss':
 								*clr & cla
 								minut += 5
 								pcs_horny += 10
-								KatjaDom -= 1
 								katjaQW['horny'] += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits_katja_get.jpg"></center>'
@@ -289,7 +286,6 @@ if $ARGS[0] = 'kiss':
 					*clr & cla
 					minut += 5
 					pcs_horny += 10
-					KatjaDom += 1
 					katjaQW['horny'] += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
@@ -300,23 +296,45 @@ if $ARGS[0] = 'kiss':
 					gs 'KatjaEvDin', 'sex'
 				end
 
-				gs 'willpower', 'foreplay', 'resist', 'hard'
-				if will_cost <= pcs_willpwr:
-					act 'Remove her hands (<<will_cost>> Willpower)':
+				act 'Ask Katja to stop.':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/touch.jpg"></center>'
+					'You ask Katja to stop but she ignores you.'
+
+					gs 'willpower', 'foreplay', 'resist', 'hard'
+
+					act 'Give in to her touch':
 						*clr & cla
 						minut += 5
 						pcs_horny += 10
-						KatjaDom -= 1
-						katjaQW['horny'] -= 10
-						gs 'willpower', 'pay', 'resist'
+						KatjaQW['dom'] += 1
+						katjaQW['horny'] += 10
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-						'You remove her hands and smile at Katja.'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
+						'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-						act 'Further':gt 'KatjaHomeTalk'
+						gs 'boystat', 'A14', 'a'
+						gs 'KatjaEvDin', 'sex'
+					end
+					
+					if will_cost <= pcs_willpwr:
+						act 'Remove her hands (<<will_cost>> Willpower)':
+							*clr & cla
+							minut += 5
+							pcs_horny += 10
+							KatjaQW['dom'] -= 1
+							katjaQW['horny'] -= 10
+							katjaQW['horny'] = min(katjaQW['horny'], 60)
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'You remove her hands and smile at Katja.'
+
+							act 'Further':gt 'KatjaHomeTalk'
+						end
+					else
+						act 'Remove her hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-				else
-					act 'Remove her hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 		end
@@ -335,16 +353,16 @@ end
 !!School and dance actions
 if $ARGS[0] = 'kiss_events':
 	cla
-	if flag_start_parc = 0:
-		flag_start_parc += 1
+	if katjaQW['school_kiss'] = 0:
+		katjaQW['school_kiss'] += 1
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view. But when you could break away from Katja''s lips, there was no one there.'
 		if $loc = 'pav_disco':
 			act 'Return to dance': gt 'pav_disco'
 		else
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
-	elseif flag_start_parc = 1:
-		flag_start_parc += 1
+	elseif katjaQW['school_kiss'] = 1:
+		katjaQW['school_kiss'] += 1
 		if pcs_haircol = 0:
 			$textEvent = 'fire in the night'
 		elseif pcs_haircol = 1:
@@ -364,7 +382,7 @@ if $ARGS[0] = 'kiss_events':
 		else
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
-	elseif flag_start_parc >= 2:
+	elseif katjaQW['school_kiss'] >= 2:
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view.'
 		'"How beautiful," again it was Ivan, he was waiting for you or something. Not being distracted, you continued to kiss Katja.'
 		'"Look, look, lesbians." one guy yelled and pointed at Katja and you.'
@@ -1347,7 +1365,7 @@ if $ARGS[0] = 'kathan8':
 				*clr & cla
 				gs 'willpower', 'pay', 'force'
 				katjaQW['slut'] += 5
-				KatjaDom += 5
+				KatjaQW['dom'] -= 1
 				npc_rel['A14'] -= 1
 				inhib_exp += rand(1,2)
 				if sound = 0:PLAY 'sound/lakeshore1.mp3', 30
@@ -1763,7 +1781,7 @@ if $ARGS[0] = 'kathan10':
 					act 'Ice dipping!':
 						*clr & cla
 						gs 'willpower', 'pay', 'force'
-						KatjaDom +=5
+						KatjaQW['dom'] -= 1
 						katjaQW['slut'] +=5
 						gs 'stat'
 						gt 'katjaEv','kathan11'
@@ -1773,7 +1791,7 @@ if $ARGS[0] = 'kathan10':
 				end
 			end
 
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & KatjaDom +=5 & katjaQW['slut'] +=5 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & katjaQW['slut'] +=5 & minut += 10 & gt 'katjaEv','kathan'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS7.jpg"></center>'
@@ -1841,7 +1859,7 @@ if $ARGS[0] = 'kathan12':
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS9.jpg"></center>'
 
-	if KatjaDom <20:
+	if KatjaQW['dom'] > 30:
 		'There is a tense silence as you both realize what is going to happen. Finally, the tension is broken when Katja smile cutely, sits up straight and opens her legs invitingly.'
 		'"Come on <<$pcs_nickname>>. What are you waiting?"'
 		'She manages to sound utterly innocent and you, charmed by the slutty redhead, rise without hesitation, consumed by your need to love this cute little thing. Katja isn''t passive and as soon as you are within reach, she grabs a handful of your hair and forces a kiss on your lips.'
@@ -1854,7 +1872,7 @@ if $ARGS[0] = 'kathan12':
 			menu_off = 1
 			*clr & cla
 			gs 'arousal', 'cuni_give', 10, 'exhibitionism', 'sub'
-			KatjaDom -= 5
+			KatjaQW['dom'] += 2
 			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS10.jpg"></center>'
@@ -1874,7 +1892,7 @@ if $ARGS[0] = 'kathan12':
 				*clr & cla
 				gs 'willpower', 'pay', 'force'
 				gs 'arousal', 'cuni_give', 10, 'exhibitionism', 'dom'
-				KatjaDom += 5
+				KatjaQW['dom'] -= 2
 				pcs_mood += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
@@ -1904,7 +1922,6 @@ if $ARGS[0] = 'kathan12':
 			menu_off = 1
 			*clr & cla
 			gs 'arousal', 'cuni_give', 10, 'exhibitionism', 'sub'
-			KatjaDom -= 5
 			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS10.jpg"></center>'
@@ -1920,7 +1937,6 @@ if $ARGS[0] = 'kathan12':
 			menu_off = 1
 			*clr & cla
 			gs 'arousal', 'cuni_give', 10, 'exhibitionism', 'dom'
-			KatjaDom += 5
 			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
@@ -2675,8 +2691,7 @@ if $ARGS[0] = 'kathan22':
 			act 'Continue walking and talking': katjaQW['horny'] += 5 &  gt 'katjaEv','kathan16'
 			act 'Look for something else to do': katjaQW['horny'] += 5 &  gt 'katjaEv','kathan'
 		end
-	end
-	if katjaQW['slut'] >= 20 and katjaQW['QWstage'] > 2 and npc_rel['A14'] >= 50:
+	elseif katjaQW['slut'] >= 20 and katjaQW['QWstage'] > 2 and npc_rel['A14'] >= 50:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT16.jpg"></center>'
 		'You and Katja stand silently, observing pavlovsk''s landscape without too much to do or say, just chilling in your mutual company. Then, you feel a hand on your waist that soon slides down towards one of your pockets, where it rest snugly.'
 		'Turning to your side, you see Katja blushing, embarrassed at her display of affection until your hand reaches to her pocket. You both stand, relaxing in your mutual company. This situation lasts a while, the two of you oblivious to the world beyond your little happy bubble until some bystander says something... encouraging? Insulting? You are barely aware, but that takes you out of your reverie. It is time to look for something else to do.'
@@ -2823,10 +2838,11 @@ if $ARGS[0] = 'TamVal':
 		'Katja looks at you with a mix of emotions in her face. Confusion, surprise, doubt, fear. She opens and closes her mouth, looks at you, blushes and says something surprising...'
 		'"I don''t know... maybe? I never thought about something like that. Ehm... <<$pcs_nickname>>... what would you think, if I... I mean... ehm... behaved like Valentina and... tried to kiss you?"'
 
-		gs 'willpower', 'kiss', 'force', 'hard'
 		minut += 5
 		gs 'stat'
 
+		gs 'willpower', 'kiss', 'force', 'hard'
+
 		if will_cost <= pcs_willpwr:
 			act '"What if I''m the one that wants to kiss you?" (<<will_cost>> Willpower)':
 				*clr & cla
@@ -2842,9 +2858,9 @@ if $ARGS[0] = 'TamVal':
 				gs 'willpower', 'pay', 'force', 'hard'
 				npc_rel['A14'] += 1
 				katjaQW['slut'] += 5
-				KatjaDom += 5
+				katjaQW['dom'] -= 2
 				katjaQW['QWstage'] = 3
-				minut -= 5
+				minut += 5
 				pcs_mood += 10
 				gs 'arousal', 'kiss', 10
 				gs 'stat'
@@ -2875,7 +2891,7 @@ if $ARGS[0] = 'TamVal':
 				npc_rel['A14'] += 1
 				katjaQW['slut'] += 5
 				katjaQW['QWstage'] = 3
-				minut -= 5
+				minut += 5
 				pcs_mood += 10
 				gs 'arousal', 'kiss', 10
 				gs 'stat'
@@ -2970,7 +2986,7 @@ if $ARGS[0] = 'TamVal':
 								if npc_vag['A14'] = 0: npc_vag['A14'] = 1
 								katjaQW['QWstage'] = 3
 								npcbrokehymen = 1
-								KatjaDom += 5
+								KatjaQW['dom'] -= 5
 								sexnutrition += 25 * scfeed
 								suclezsex = lesbian
 								succubxp += 6
@@ -3164,7 +3180,6 @@ if $ARGS[0] = 'katnatsex1':
 	act 'Katja':
 		menu_off = 1
 		*clr & cla
-		KatjaDom -= 5
 		gs 'arousal', 'cuni_give', 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
@@ -3192,7 +3207,7 @@ if $ARGS[0] = 'katnatsex1':
 			if will_cost <= pcs_willpwr:
 				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
-					KatjaDom += 5
+					KatjaQW['dom'] -= 2
 					$orgasm_or = 'yes'
 					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
@@ -3213,7 +3228,7 @@ if $ARGS[0] = 'katnatsex1':
 
 			act 'Your turn!':
 				*clr & cla
-				KatjaDom += 5
+				KatjaQW['dom'] += 2
 				$orgasm_or = 'yes'
 				gs 'arousal', 'cuni', 10, 'lesbian'			
 				gs 'stat'
@@ -3230,7 +3245,6 @@ if $ARGS[0] = 'katnatsex1':
 
 				act 'Too tired for sex, so "help" Natasha in another way':
 					*clr & cla
-					KatjaDom += 5
 					gs 'arousal', 'kiss', 10, 'lesbian'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS11.jpg"></center>'
@@ -3259,7 +3273,6 @@ if $ARGS[0] = 'katnatsex1':
 
 		act 'Katja!':
 			*clr & cla
-			KatjaDom -= 5
 			gs 'arousal', 'cuni_give', 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
@@ -3277,7 +3290,7 @@ if $ARGS[0] = 'katnatsex1':
 			if will_cost <= pcs_willpwr:
 				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
-					KatjaDom += 5
+					KatjaQW['dom'] -= 2
 					$orgasm_or = 'yes'
 					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
@@ -3298,7 +3311,7 @@ if $ARGS[0] = 'katnatsex1':
 		end
 		act 'You':
 			*clr & cla
-			KatjaDom += 5
+			KatjaQW['dom'] += 2
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni', 10, 'lesbian'
 			gs 'stat'
@@ -3314,7 +3327,7 @@ if $ARGS[0] = 'katnatsex1':
 
 			act 'Groaning help Katja':
 				*clr & cla
-				KatjaDom -= 5
+				KatjaQW['dom'] += 2
 				gs 'arousal', 'cuni_give', 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
@@ -3334,7 +3347,6 @@ if $ARGS[0] = 'katnatsex1':
 	act 'You':
 		menu_off = 1
 		*clr & cla
-		KatjaDom += 5
 		$orgasm_or = 'yes'
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'stat'
@@ -3348,7 +3360,6 @@ if $ARGS[0] = 'katnatsex1':
 
 		act 'Katja':
 			*clr & cla
-			KatjaDom -= 5
 			gs 'arousal', 'cuni_give', 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
@@ -3386,6 +3397,7 @@ if $ARGS[0] = 'katnatsex1':
 
 		act 'Natasha':
 			*clr & cla
+			katjaQW['dom'] += 2
 			gs 'arousal', 'cuni_give', 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS8.jpg"></center>'
@@ -3398,7 +3410,6 @@ if $ARGS[0] = 'katnatsex1':
 
 			act 'Groaning help Katja':
 				*clr & cla
-				KatjaDom -= 5
 				gs 'arousal', 'cuni_give', 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'

+ 10 - 76
locations/katjaEvDin.qsrc

@@ -62,6 +62,7 @@ if $ARGS[0] = 'strapon_bj':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_bj.jpg"></center>'
 	'You grab a handful of Katja red hair and keep a good hold on it. You pull her face over to the strap-on and smack her lips with it a couple of times till she opens her mouth. Once her mouth is open you slide it in and let her suck it for a bit. Then you buck your hips forward and start fucking her mouth and throat with the strap-on, your hand in her hair holding her head in place as you do.'
 
+	if katjaQW['strapon_bj'] = 0: katjaQW['strapon_bj'] = 1
 	gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 	gs 'stat'
 
@@ -98,6 +99,7 @@ if $ARGS[0] = 'strapon_miss':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_miss.jpg"></center>'
 	'You lay Katja on her back and spread her legs. You crawl between her legs, rubbing the dildo against her wet pussy. Then you slip it into her and start to fuck her, you slowly work the strap-on balls deep into her, as you start to fuck her hard.'
 
+	if katjaQW['strapon_vag'] = 0: katjaQW['strapon_vag'] = 1
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 
@@ -147,6 +149,7 @@ if $ARGS[0] = 'strapon_anal':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_anal.jpg"></center>'
 	'You roll Katja onto her stomach and spread her legs, spreading her ass cheeks with your hands you being to rub her anus with your fingers. Grabbing a bottle of lube you lube up your fingers and slide one then a second one into her ass, working it a bit and lubing it up. Then you stop and lube up the strap-on. Once it is good and lubed you lean over her and slip the strap-on in her ass and being anally fucking her.'
 
+	if katjaQW['strapon_ass'] = 0: katjaQW['strapon_ass'] = 1
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 
@@ -202,79 +205,6 @@ if $ARGS[0] = 'strapon_start':
 	end
 end
 
-if $ARGS[0] = 'shower_kiss':
-	*clr & cla
-	menu_off = 1
-	katjaQW['slut'] += 1
-	katjaQW['horny'] += 10
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showerkiss.jpg"></center>'
-	'Katja gently hugs you with one hand and kisses you on the lips, you feel her soft palm on your naked pussy and her thin finger finds your clitoris and begins to rub it.'
-
-	gs 'arousal', 'kiss', 5, 'lesbian', 'dom'
-	gs 'arousal', 'vaginal_finger', -5, 'lesbian', 'dom'
-	gs 'stat'
-
-	if katjaQW['slut'] >= 10:
-		'Katja, gently but firmly puts you on the edge of the tub.'
-	elseif katjaQW['slut'] < 10:
-		'Katja gently caresses your clitoris with her fingers and her lips begin to kiss your neck, slowly making her way down.'
-	end
-
-	act 'Sit on the edge of the tub':
-		*clr & cla
-		katjaQW['horny'] -= 10
-
-		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
-
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
-		'You sit on the edge of the tub and open your legs to expose your wet pussy. Katja gets on her knees in front of you and gently licks your swollen red petals.'
-		'Her tongue begins to briskly caress your pussy, not forgetting about the clitoris. Soon bliss envelopes your entire body.'
-		'You notice Katja''s hand between her legs and get even more turned on watching her pleasure herself while she''s pleasuring you.'
-		'Suddenly you are hit by a powerful orgasm. You feel like you might lose consciousness. Your whole body convulses and a hot wave of pleasure washes over you.'
-
-		$orgasm_or = 'yes'
-		gs 'arousal', 'cuni', 5, 'lesbian', 'dom'
-		gs 'stat'
-
-		if mey_vika['key'] = 1:
-			Act 'Smile and leave the room': 
-				gs 'arousal', 'end'
-				gt 'mey_home', 'start'
-			end
-		else
-			act 'Say goodbye and leave':
-				minut += 5
-				gs 'arousal', 'end'
-				gt 'pav_residential'
-			end
-		end
-	end
-
-	gs 'willpower', 'cuni', 'resist', 'hard'
-	if will_cost <= pcs_willpwr:
-		act 'Remove her hands (<<will_cost>> Willpower)':
-			*clr & cla
-			minut += 5
-			pcs_horny += 10
-			KatjaDom -= 1
-			katjaQW['horny'] -= 10
-			gs 'willpower', 'pay', 'resist'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'You remove her hands and smile at her. Then you dismiss Katja, who shyly looks to the floor and leaves the bathroom.'
-
-			act 'Get out of the shower':
-				gs 'arousal', 'end'
-				gt 'KatjaHomeTalk'
-			end
-		end
-	else
-		act 'Remove her hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-end
-
 if $ARGS[0] = 'sex':
 	menu_off = 1
 	act 'relax':
@@ -292,11 +222,13 @@ if $ARGS[0] = 'sex':
 			act 'Spread your legs': gt 'KatjaEvDin', 'kuni_p'
 
 		else
+			katjaQW['slut'] += 1
+			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and pulls her hand away from you.'
 
 			act 'Talk about something else': gt 'KatjaHomeTalk'
 				if mey_vika['key'] = 1:
-				Act 'Leave the room': gt 'mey_home', 'start'
+				act 'Leave the room': gt 'mey_home', 'start'
 			else
 				act 'Say goodbye and go home':gt 'pav_residential'
 			end
@@ -319,6 +251,7 @@ if $ARGS[0] = 'sex':
 			act 'Lick Katja': gt 'KatjaEvDin', 'kuni'
 		else
 			katjaQW['slut'] += 1
+			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and removes your hand.'
 
 			act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -335,7 +268,7 @@ if $ARGS[0] = 'sex':
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 
-	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 1 and strapon > 0:
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and strapon > 0:
 		act 'Get your Strap On': gt 'KatjaEvDin', 'strapon_start'
 	end
 end
@@ -418,7 +351,7 @@ if $ARGS[0] = 'kuni_dom':
 	gs 'stat'
 
 	if pcs_horny >= 50:
-		if rand(0,1) = 0:
+		if katjaQW['dom'] < rand(-50,50) and (katjaQW['strapon_bj'] + katjaQW['strapon_vag'] + katjaQW['strapon_ass']) < 3:
 			'Katja smiles at you "That was great <<$pcs_nickname>>, spread your legs."'
 			act 'Spread your legs': gt 'KatjaEvDin', 'kuni_p'
 		else
@@ -437,6 +370,7 @@ if $ARGS[0] = 'kuni_dom':
 
 			act 'Beg her to give you a turn.':
 				*clr & cla
+				katjaQW['dom'] += 1
 				pcs_horny += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/myturn.jpg"></center>'

+ 773 - 58
locations/kendra.qsrc

@@ -9,17 +9,19 @@ if $ARGS[0] = 'kendra_room_start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/kendraroom/room.jpg"></center>'
 	'There are two beds, one on each side of the window. There are various pictures and posters hanging on both sides of the room. One side also has a string of large lights hanging up as well. Just down from the beds on each side are two desks, against each wall. Both are decorated with slight differences. Near the door is a small couch and two wardrobes.'
-	'As you walk in the room, she follows behind you as says. "What should I do with you today slave." You know it is a rhetorical question and she really doesn''t want you to answer. As you turn to look at her, you can tell she has something in mind that will likely either humiliate you are turn you into her submissive. Perhaps if you just go now you can avoid it, or maybe you should stay and see what happens.'
+	'As you walk in the room, she follows behind you as says. "What should I do with you today slave?" You know it is a rhetorical question and she really doesn''t want you to answer. As you turn to look at her, you can tell she has something in mind that will likely either humiliate you are turn you into her submissive. "Maybe I will have you do my nails, or maybe lick my ass, perhaps I will fuck you, or find someone to fuck you, so many choices." Perhaps if you just go now you can avoid it, or maybe you should stay and submit to her every whim, it might be fun.'
 	act 'I should get going':
 		*clr & cla
-		npc_rel['A84'] -= 10
+		gs 'npc_relationship', 'modify', 'A84', 'loathe'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 		'You look over at the clock in her room. "I should really get going, sorry to have bothered you."'
 		'She looks at you very annoyed. "What is this? I don''t have time for games. Don''t come back unless you are serious about playing." Then she grabs you by the arm and shoves you out the door, closing it behind you.'
 		act 'Go to eighth floor': gt 'uni_dorm', 'eighth_floor'
 	end
-	act 'Wait to see what she does':
-		npc_rel['A84'] += 1
+	act 'Submit to your mistress':
+		gs 'npc_relationship', 'modify', 'A84', 'like'
+		gs 'stat'
 		gt 'kendra', 'kendra_room_routing'
 	end
 end
@@ -49,8 +51,20 @@ if $ARGS[0] = 'kendra_room_routing':
 		gt 'kendra', 'kendra_room_10'
 	elseif kendra_dom = 11:
 		gt 'kendra', 'kendra_room_11'
+	elseif kendra_dom = 12:
+		gt 'kendra', 'kendra_couch'
+	elseif kendra_dom = 13:
+		gt 'kendra', 'kendra_bed'
+	elseif kendra_dom = 14:
+		gt 'kendra', 'kendra_couch_strap'
+	elseif kendra_dom = 15:
+		gt 'kendra', 'kendra_bed_strap'
+	elseif kendra_dom = 16:
+		gt 'kendra', 'kendra_gloryhole'
+	elseif kendra_dom = 17:
+		gt 'kendra', 'kendra_gloryhole'
 	else
-		kendra_dom = rand(0, 11)
+		kendra_dom = rand(0, 17)
 		gt 'kendra', 'kendra_room_routing'
 	end
 end
@@ -58,7 +72,7 @@ end
 if $ARGS[0] = 'kendra_room_0':
 	menu_off = 1
 	$location_type = 'event'
-	kendra_dom = 1
+	kendra_dom += 1
 	minut += 45
 	gs 'stat'
 	*clr & cla
@@ -81,7 +95,7 @@ if $ARGS[0] = 'kendra_room_1':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 2
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom2_' + rand(1,2) + '.jpg"></center>'
 	'She goes over and sits on the couch. "Come over here and clean my boots slave." You walk over and kneel down next to the couch, you start to grab some tissue to clean her boots but she stops you. "No use your tongue."'
 	'You nod a bit. "Yes mistress." Then you start licking her boots clean, once you finish one you start on the other. A few times she smacks you on top of the head and points out a spot you missed, that you have to go back over.'
@@ -97,7 +111,7 @@ if $ARGS[0] = 'kendra_room_2':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 3
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom3.jpg"></center>'
 	'She goes over and grabs a bowl of water, with some other stuff. Then she sits on the couch. "Come over here and clean my feet slave." You walk over and kneel down next to the couch, you add a little soap to the water. Then use the cloth and water in the bowl to clean her feet'
 	'She mostly ignores you and reads a magazine. Once you have finally finished cleaning her feet she looks them over and says. "Kiss them."'
@@ -113,7 +127,7 @@ if $ARGS[0] = 'kendra_room_3':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 4
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom4.jpg"></center>'
 	'She goes over and sits on the couch. "Come over here and clean my feet slave." You start to go get the bowl of water when she says. "No use your tongue."'
 	'You nod a bit. "Yes mistress." You walk back over and kneel next to the couch. You remove her boots and then start licking her feet, after a bit you suck on her toes and lick her feet and legs half way up her calves there the boots had ended.'
@@ -129,7 +143,7 @@ if $ARGS[0] = 'kendra_room_4':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 5
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom5.jpg"></center>'
 	'Once inside she leads you over to her bed, then she opens the night stand and pulls out a collar. Which she promptly and tightly buckles around your neck, making it a little hard for you to breath and swallow. With that firmly in place she gets out a leash and attaches it to the collar. She pushes you down as she says. "Get down, like a good slave." You get down on your hands and knees. Then she leads you around the dorm room for a bit, before she finally takes you out into the hall. She leads you down the communal kitchen area and then to the lounge, where she gets some snacks and drinks for herself. Several people notice the two of you, some laugh, some just ignore it, while others give you or sometimes both of you disgusted looks.'
 	*nl
@@ -145,7 +159,7 @@ if $ARGS[0] = 'kendra_room_5':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 6
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom6.jpg"></center>'
 	'She goes over and pulls her chair away from her desk before sitting down on it."Come over here slave." You walk over and stand next to her, she suddenly grabs you and pulls you across her lap, before you even know what is happening she starts spanking you.'
 	'"You are such a worthless and bad slave." She says as she keeps spanking you.'
@@ -165,7 +179,7 @@ if $ARGS[0] = 'kendra_room_6':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 7
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom7.jpg"></center>'
 	'She goes over and pulls her chair away from her desk. She grabs a paddle that was laying on her desk before sitting down on the chair."Come over here slave." You walk over and lay yourself across her lap. You already know what she plans to do, at once she start paddling your ass.'
 	'"You are such a worthless and bad slave." She says as she keeps spanking you.'
@@ -185,7 +199,7 @@ if $ARGS[0] = 'kendra_room_7':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 8
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom8.jpg"></center>'
 	'She goes over and sits on the couch. "Come over here." You walk over next to her. "Strip!" she commands you.'
 	'You nod a bit. "Yes mistress." Then your remove your clothes and strip down.'
@@ -204,7 +218,7 @@ if $ARGS[0] = 'kendra_room_8':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 9
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom9.jpg"></center>'
 	'She goes over and sits on the couch. "Come over here and strip." You walk over and strip naked while standing next to her. Once you are fully naked she says. "Now lick my shoes clean."'
 	'You kneel down. "Yes mistress." Then you start licking her shoes and feet clean, once you finish one you start on the other. A few times she smacks you on top of the head and points out a spot you missed, that you have to go back over.'
@@ -220,7 +234,7 @@ if $ARGS[0] = 'kendra_room_9':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 10
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom10.jpg"></center>'
 	'Once inside she leads you over to her bed, then she turns toward you and says. "Strip!"'
 	'As you strip you reply. "Yes mistress." She opens the night stand and pulls out a collar. Once you are fully naked she tightly buckles it around your neck, making it a little hard for you to breath and swallow. With that firmly in place she gets out a leash and attaches it to the collar. She pushes you down as she says. "Get down, like a good slave." You get down on your hands and knees.'
@@ -238,7 +252,7 @@ if $ARGS[0] = 'kendra_room_10':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 11
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom11.jpg"></center>'
 	'She goes over and sits down on the couch. "Come over here slave." You walk over and stand next to her. "Now strip!"'
 	'As you strip you reply. "Yes mistress." Once you are naked she pulls you over her laps and starts spanking your bare ass with her hand.'
@@ -259,79 +273,780 @@ if $ARGS[0] = 'kendra_room_11':
 	menu_off = 1
 	$location_type = 'event'
 	*clr & cla
-	kendra_dom = 12
+	kendra_dom += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom12.jpg"></center>'
 	'As you enter you notice another African girl sitting on the couch as well. You assume another student and a friend of Kendra''s. Kendra goes over and sits down on the coffee table. "Come over here slave." You walk over and stand next to her. "Now strip!"'
 	'You glance at the other girl and then you strip, as you reply. "Yes mistress."'
+	*nl
 	'The other girl laughs. "I can''t believe you get these white bitches to do this shit.'
 	'Once you are naked she pulls you over her laps and starts spanking your bare ass with a paddle. "I just train them to accept their natural place, deep down they all know where their place is and they crave us to put them their." Then she turns her face to you. "Don''t you slave."'
+	gs 'arousal', 'foreplay', 10, 'sub', 'humiliation', 'inhibition', 'group'
+	gs 'stat'
+	act 'Yes mistress':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom7.jpg"></center>'
+		'You nod. "Yes mistress, I do." They both laugh at your response.'
+		'She paddles you even harder now. You grit your teeth against the pain. "You should have seen what I did to that boy from biology."'
+		'"Which one?" Her friend asks.'
+		'"You know the one that was so confident, always hitting on us. Expecting us to to just fall to our knees and suck his dick the first day in class." She replies to her friend.'
+		*nl
+		'"Oh ... him... yeah I remember him. What did you do to him?" Her friend asks.'
+		'Kendra laughs as she keeps paddling you, they almost seem to have forgotten you was here. "I fucked him with a strapon until I had an orgasm."'
+		'"OH MY GOD! You did not." Her friend says in shock.'
+		gs 'arousal', 'foreplay', 10, 'sub', 'humiliation', 'inhibition', 'group'
+		gs 'stat'
+		act 'Listen':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom12.jpg"></center>'
+			'"Oh I did, here look." She stops paddling you a moment to pull out her phone to show here friend. You can''t see what is on it but you can hear some grunting noise coming from the phone. They both start laughing.'
+			'"I can''t believe you got him to do that, next time you do that, call me. I want to fuck him." Soon they are talking about things they would like to do to this mysterious guy, while Kendra paddles you. After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
+			'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
+			'You stand up and get dressed again. "Yes mistress." As you walk to the door, the two of them are still talking about the guy.'
+			gs 'arousal', 'foreplay', 10, 'sub', 'humiliation', 'inhibition', 'group'
+			gs 'pain', 3, 'asscheeks', 'spank'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Go to eighth floor': gt 'uni_dorm', 'eighth_floor'
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_couch':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom1.jpg"></center>'
+	'She goes over and sits down on the couch. "Come over here slave." You walk over and stand next to her. "Now sit!"'
+	'She gets up on her knees on the couch sitting on the heels of her feet and turns to face you, with one look you know she wants you to do the same, so you do. As you do she starts to kiss you softly, you return the kisses. She takes your hands and pulls them over to her breasts so you start playing with them as the two of you kiss. With out warning she suddenly pulls away breaking the kiss. "Get on all fours."'
+	gs 'arousal', 'kiss', 3, 'lesbian', 'sub'
+	gs 'stat'
+	act 'On all fours':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom2.jpg"></center>'
+		'You so as you are told and get in your hands and knees, she kneels down next to you and slaps your ass hard and starts spanking you. Each open handed smack causes your butt cheeks to sting.'
+		gs 'arousal', 'foreplay', 3, 'lesbian', 'sub'
+		gs 'pain', 1, 'asscheeks', 'spank'
+		gs 'stat'
+		act 'Get spanked more':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom3.jpg"></center>'
+			'After several minutes of that she stops and takes off her clothes and then pulls your clothes aside enough to bare your ass, before going back to spanking your bare ass cheeks.'
+			gs 'arousal', 'foreplay', 3, 'lesbian', 'sub'
+			gs 'pain', 1, 'asscheeks', 'spank'
+			gs 'stat'
+			act 'Eat pussy':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom4.jpg"></center>'
+				'Once your ass is cherry red she stops and leans back on the couch, spreading her legs wide, exposing her pussy to you. "Come over here and lick my pussy slave." She commands you, so you turn and crawl over to her and start licking her pussy.'
+				gs 'arousal', 'cuni_give', 3, 'lesbian', 'sub'
+				gs 'stat'
+				act 'Keep licking':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom5.jpg"></center>'
+					'She grabs you by the back of the head and forces your face into her crotch. "Fuck me with your tongue." You do as she commands and stick your tongue into her hot wet twat, fucking it as best you can with your tongue as she grinds her crotch against your face. Minutes go by before she grabs you by the hair and pulls you face away from her crotch, then she turns over onto all fours. "Eat my ass."'
+					gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
+					gs 'stat'
+					act 'Lick ass':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom6.jpg"></center>'
+						'You put your face between her butt cheeks and start licking her asshole, she moans as you lick her butthole and grinds her butt back against you face as you keep licking. With out warning she stands up and drags you up on the couch onto your back.'
+						gs 'arousal', 'rimming_give', 5, 'lesbian', 'sub'
+						gs 'stat'
+						act 'Lay back':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/lezdom7.jpg"></center>'
+							'Once you have laid back on the couch, she straddles your face and sits on it, you start licking her pussy and asshole, which ever hole is right above your mouth as she grind her crotch into your face. She starts moaning loudly, her thighs tighten against the sides or your face as you feel her muscles spasm. Her twat soaks your face in her juices as she cums hard, you keep licking her through her orgasm and for several minutes afterwards as she just lays on top of you.'
+							*nl
+							'Finally she gets up and starts to clean herself up. "You may go now." You know that is her way to tell you to leave, you gather up your clothes and get dressed before you leave her dorm room.'
+							gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Leave': gt 'uni_dorm', 'eighth_floor'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_bed':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage1.jpg"></center>'
+	'She goes over and sits on the bed. "Come over here and give me a massage slave." You walk over and sit on the bed, behind her and start massaging her shoulders and upper back. Some time later once you have massaged her she says. "My shoulder still hurts, I think I pulled something, kiss it and make it better." You do as your are told and start kissing her shoulder, her soft moans cause you to slowly work you way over to kissing her neck as well.'
+	gs 'arousal', 'massage_give', 20, 'lesbian', 'sub'
+	gs 'stat'
+	act 'Get kissed':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage2.jpg"></center>'
+		'She turns her body as you was kissing up near her ear and faces you, she leans in and kissing you on the lips. You return her kiss, not noticing her filming the  two of you on her phone at first. She breaks the kiss and gets off the bed, when you start to follow she motions you to stop. She holds up her phone filming you. "Show my your tits slave."'
+		gs 'arousal', 'kiss', 3, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Show your tits':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage3.jpg"></center>'
+			'You expose your tits to her and she laughs as she files you with your breasts exposed for a bit. Then she places her phone down and pulls off her own shirt exposing her own breasts now, she climbs back on the bed as she says. "Come over here and suck my tits."'
+			gs 'arousal', 'foreplay_give', 3, 'lesbian', 'sub'
+			gs 'stat'
+			act 'Suck her tits':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage4.jpg"></center>'
+				'You do as you are told and start sucking on one and then the other breast, you use your hands to massages her breasts as you suckle them. As you do that she pulls her shorts off and then her panties off tossing them aside, leaving her completely naked. She starts pulling your clothes off as well, you stop what you are doing long enough to help her get you mostly stripped naked as well. With that done she lays back on the bed and spreads her legs wide. "Get over here and eat my pussy."'
+				gs 'arousal', 'foreplay_give', 3, 'lesbian', 'sub'
+				gs 'stat'
+				act 'Eat pussy':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage5.jpg"></center>'
+					'You lean forward while on your knees until your breasts are against the bed and your face is between her legs, you start licking her dark twat and twirling her clit around with your pink tongue, you reach up to squeeze her breasts with one of your hands as you lick her pussy.'
+					gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
+					gs 'stat'
+					act 'Keep licking':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage6.jpg"></center>'
+						'You slip your tongue between her pussy''s lips, plunging it as deeply as you can inside of her, she moans louder as you do, you alternate between tongue fucking her and licking her clit, the whole time your hand massages and squeezes her breasts. "Oh fuck, I''m close, lay back." She says as she pushes you back.'
+						gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
+						gs 'stat'
+						act 'Lay back':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage7.jpg"></center>'
+							'You do as you are told and lay back, you are barely on your back when she lifts one of your legs straight up and throws one of her legs over you. She straddles you until her clit is against yours and starts rubbing back and forth against you. You moan in pleasure as she does, she starts getting louder and louder.'
+							gs 'arousal', 'trib', 5, 'lesbian', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Finish':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/massage8.jpg"></center>'
+								'She rubs against you more frantically until she finally cries out and her buddy shudders, you feels her wetness pour over your own pussy. She shutters for several moments before she gets off you, then pull you up into a kiss. Once she breaks the kiss she gets up and starts getting cleaned up. When she looks at you sitting on her bed still she says. "Don''t just sit there, get out, I''m done with you today." You quickly get cleaned up and dressed and hurry out of her dorm room, just as she is finishing getting dressed herself.'
+								gs 'arousal', 'kiss', 5, 'lesbian', 'sub'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Leave': gt 'uni_dorm', 'eighth_floor'
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_couch_strap':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap1.jpg"></center>'
+	'She goes over and sits down on the couch, you follow her over. After she sits she gives a look to the spot next to her on the couch so you sit as well. With that she starts texting on her phone while making a bit of small talk, mostly asking how classes was. Then she starts asking if you have been having sex lately and what you have been doing or if you have anyone you fancy. You talk like this for several minutes just like you are friends hanging out.'
+	act 'Keep talking':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap2.jpg"></center>'
+		'With no warning she leans over and kisses you and starts to fondle your breasts, as the two of you keep kissing she starts removing some of her clothes then some of yours. You quickly don''t need to be told and start doing the same, removing your own clothes and helping her remove her''s until you are both naked. Then she slides you off the couch until you are on the floor on your knees and she leans back on the couch spreading her legs.'
+		gs 'arousal', 'kiss', 3, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Eat pussy':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap3.jpg"></center>'
+			'You lean forward placing your face between her legs and start licking her clit and then her slit. You work your tongue and lips all over her pussy, even plunging your tongue into her wet twat to tongue fuck her. Several minutes of this goes by until she pulls you away from her, she turns over on the couch and gets on all fours, then grabs you by the hair and pulls your face towards her ass.'
+			gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
+			gs 'stat'
+			act 'Eat ass':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap4.jpg"></center>'
+				'With your face pulled between her cheeks you start licking her asshole, she holds you by the hair and pulls your face in tighter against her butt the more you lick, by the sounds of her moans she is really enjoying it. A couple of minutes later she lets go of you and stands up. "Stay there on the floor, play with your self. I will be right back." Then she moves off behind a changing screen in the room, you stay sitting on your feet while you start to rub your clit.'
+				gs 'arousal', 'rimming_give', 3, 'lesbian', 'sub'
+				gs 'stat'
+				act 'Masturbate':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap5.jpg"></center>'
+					'You sit there and masturbate for a couple of minutes until Kendra emerges from behind the screen wearing a strapon harness with a fairly large black dildo attached to it. The dildo looks nearly as long as your forearm, at least not a thick. She stops right next to you with the dildo right next to your face, pointed right at your mouth.'
+					gs 'arousal', 'masturbate', 3, 'lesbian', 'sub'
+					gs 'stat'
+					act 'Suck strapon':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap6.jpg"></center>'
+						'You open your mouth and she sticks the large dildo in your mouth you can barely fit your mouth around the black shaft. She strokes the base of the dildo like it is a real cock. "That''s right slut, suck my big black cock." You do as you are told as you keep rubbing your clit.'
+						*nl
+						if pcs_vag ! 0:
+							'"Thats it get it nice and wet. So when I fuck that little wet pussy of yours it slides in balls deep nice and easy." She thrusts her hips a bit fucking your mouth with the strapon, before she steps back popping it out of your mouth as she points to the couch. "Get on the couch, slut!" She commands. As you start to get on the couch, she grabs you by the hips from behind and gets you to get on the couch on your knees. Then she pushes your forward bending you over in front of her.'
+							gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+							gs 'arousal', 'clit_finger', -3, 'lesbian', 'sub'
+							gs 'stat'
+							act 'Get on the couch': gt 'kendra', 'kendra_couch_strap_vag'
+						else
+							'"Don''t worry my little pet, I''m not going to take your virginity, I have something special in mind for that." She caresses the side of your face as she thrusts the dildo in your mouth, fucking it with the strapon. "Thats it get it nice and wet. So when I fuck that little asshole of yours it slides in balls deep nice and easy." She says before stepping back, popping the dildo out of your mouth as she points to the couch. "Get on the couch, slut!" She commands. As you start to get on the couch, she grabs you by the hips from behind and gets you to get on the couch on your knees. Then she pushes your forward bending you over in front of her.'
+							gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+							gs 'arousal', 'clit_finger', -3, 'lesbian', 'sub'
+							gs 'stat'
+							act 'Get on the couch': gt 'kendra', 'kendra_couch_strap_anal'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_couch_strap_vag':
+	menu_off = 1
+	*clr & cla
+	gs 'boyStat', 'D7'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap7.jpg"></center>'
+	'She steps up behind you, placing one foot on the couch as she does. The inner thigh of her leg up on the couch brushing against the outside of your hip, as you feel her slide the tip of the <<dick>>cm <<$dick_girth>> dildo against your wet slit. Getting the tip of the dildo and your twat wetter the more she does it, then with out a word she pushes it about half way into you, causing you to gasp and moan as it fills you up, as she starts fucking you with it. You can hear a vibrating sound, obviously her harness has a built in vibrator for her pleasure.'
+	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub', 'rough'
+	gs 'stat'
+	act 'Get pounded':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap8.jpg"></center>'
+		'She steadily works herself deeper until she is fucking your balls deep with the dildo, she thrusts hard and fast at first. Then she starts pulling the long dildo nearly completely out of you before slamming it back in as deep as it will go, her hips slapping against your butt cheeks with each thrust. Over and over she does this, until finally she does pull completely out of you, leaving your pussy feeling suddenly very empty.'
+		gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub', 'rough'
+		gs 'stat'
+		act 'Get butt fucked': gt 'kendra', 'kendra_couch_strap_anal'
+	end
+end
+
+if $ARGS[0] = 'kendra_couch_strap_anal':
+	menu_off = 1
+	*clr & cla
+	gs 'boyStat', 'D7'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap9.jpg"></center>'
+	'Kendra starts rubbing the large wet head of the dildo against your asshole, you feel her squirt a little lube in the crack of your butt where it runs down to where she is rubbing the tip of the dildo against your asshole lubing both you and it up. She holds onto your hips with one hand while the other guides the dildo, with no warning she suddenly thrusts forward with her hips while using her one hand to jerk you backwards by your hips.'
 	*nl
-	'You nod. "Yes mistress, I do." They both laugh at your response.'
-	'She paddles you even harder now. You grit your teeth against the pain. "You should have seen what I did to that boy from biology."'
-	'"Which one?" Her friend asks.'
-	'"You know the one that was so confident, always hitting on us. Expecting us to to just fall to our knees and suck his dick the first day in class." She replies to her friend.'
-	'"Oh ... him... yeah I remember him. What did you do to him?" Her friend asks.'
-	*nl
-	'Kendra laughs as she keeps paddling you, they almost seem to have forgotten you was here. "I fucked him with a strapon until I had an orgasm."'
-	'"OH MY GOD! You did not." Her friend says in shock.'
-	'"Oh I did, here look." She stops paddling you a moment to pull out her phone to show here friend. You can''t see what is on it but you can hear some grunting noise coming from the phone. They both start laughing.'
-	*nl
-	'"I can''t believe you got him to do that, next time you do that, call me. I want to fuck him." Soon they are talking about things they would like to do to this mysterious guy, while Kendra paddles you. After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
-	'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
-	'You stand up and get dressed again. "Yes mistress." As you walk to the door, the two of them are still talking about the guy.'
-	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition', 'group'
-	gs 'pain', 3, 'asscheeks', 'spank'
-	gs 'arousal', 'end'
+	'You yelp a little and try to pull away as the <<dick>>cm <<$dick_girth>> dildo stretches your butthole, but she quickly grabs onto both of your hips with her hands not letting you pull away. "Stop trying to pull away from me or I will see just how many hours I can fuck your ass before I pass out." You stop resisting believing she would do it, she moans as she starts fucking your butt, the built in vibrator in her harness obviously making her really enjoy this.'
+	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
 	gs 'stat'
-	act 'Go to eighth floor': gt 'uni_dorm', 'eighth_floor'
+	act 'Get ass wrecked':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap10.jpg"></center>'
+		'She drives the massive long dildo deep in your butt until her hips start slapping against your butt cheeks with each thrust. For several minutes this goes on, as she moans louder and louder before she almost falls on top of you with the dildo buried deep in your ass. She feel her body shaking as she has a orgasm. She takes a shuddering breath. "My god that was amazing, I hope for you sake you enjoyed that half as much as I did." And just to assert her dominance even more she pulls back and start thrusting the dildo inside your butt again for a little bit again before she finally pulls it out, leaving your ass gapping and feeling empty and full at the same time.'
+		gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
+		gs 'stat'
+		act 'Aftermath':
+			*clr & cla
+			minut += 5
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap11.jpg"></center>'
+			'Once she has pulled the dildo out of your butt she grabs you by the hair and pulls you off the couch onto the floor again. There you sits on your knees and feet as before. She squats down next to you as she strokes her dildo. "I love fucking that little ass of yours, one of these days I am going to fuck raw, fuck it until I am too exhausted to fuck you anymore." Then she kisses you for a few moments. Once she breaks the kiss she stands up and starts taking off the harness, with it off she hands it to you. "Clean it up before you leave." You take the harness and dildo and clean them up, as you do she gets dressed and sits back down on the couch to watch some tv, with the harness clean you get dressed again yourself, as you finish she gives you a look and flicks her eyes towards the door. You understand what she wants, so once you are ready you walk towards the door and leave.'
+			gs 'arousal', 'kiss', 1, 'lesbian', 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave': gt 'uni_dorm', 'eighth_floor'
+		end
+	end
 end
 
-if $ARGS[0] = 'kendra_male_slave':
+if $ARGS[0] = 'kendra_bed_strap':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap1.jpg"></center>'
+	'She goes over and sits on the bed. "Come over here slave." You walk over and sit on the bed, she reaches up and caresses your cheek and your neck, soon she leans in and kisses you, the two of you start kissing and removing each others clothes. With her fully naked she leans back on the bed and spreads her legs, pulling your head between her legs.'
+	gs 'arousal', 'kiss', 3, 'lesbian', 'sub'
+	gs 'stat'
+	act 'Eat pussy':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap2.jpg"></center>'
+		'You start licking her pussy, making it even wetter than it already is. You suck on her clit as well, giving ever part of her twat attention. The more you do the more she moans and the wetter she gets.'
+		gs 'arousal', 'cuni_give', 3, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Keep licking':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap3.jpg"></center>'
+			'You keep teasing her pussy with your tongue and lips, she moans louder and louder until she finally tenses up. Closing her thighs against the side of your head, you are pretty sure she just had a orgasm, moments latter she relax''s and get up. She rolls off the bed and opens her nightstand to pull out a strapon harness with a massive black dildo attached to it, nearly the size and length of your forearm. Once she has the harness in place she walks over and rubs the tip against your lips.'
+			gs 'arousal', 'cuni_give', 3, 'lesbian', 'sub'
+			gs 'stat'
+			act 'Suck strapon':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap4.jpg"></center>'
+				'You open your mouth as wide as you can and can barely get your mouth around the massive dildo. "That''s it you dirty slut, suck my big black cock." Kendra says as you take the dildo as deep as you can in your mouth.'
+				gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+				gs 'stat'
+				act 'Keep sucking':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap5.jpg"></center>'
+					if pcs_vag ! 0:
+						'"Thats it get it nice and wet. So when I fuck that little wet pussy of yours it slides in balls deep nice and easy." She thrusts her hips a bit fucking your mouth with the strapon, she reaches over your back and starts slapping your ass as she fucks your mouth. "Turn around, slut!" She commands. As you start to turn around, she grabs you by the hips from behind and gets you up on your knees, so you are on fours in front of her.'
+						gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+						gs 'arousal', 'bdsm', -3, 'lesbian', 'sub'
+						gs 'stat'
+						act 'Get fucked': gt 'kendra', 'kendra_bed_strap_vag'
+					else
+						'"Don''t worry my little pet, I''m not going to take your virginity, I have something special in mind for that." She caresses the side of your face as she thrusts the dildo in your mouth, fucking it with the strapon. "Thats it get it nice and wet. So when I fuck that little asshole of yours it slides in balls deep nice and easy." She says before stepping back, popping the dildo out of your mouth as she points to the couch. "Turn around, slut!" She commands. As you start to turn around, she grabs you by the hips from behind and gets you up on your knees, so you are on fours in front of her.'
+						gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+						gs 'arousal', 'bdsm', -3, 'lesbian', 'sub'
+						gs 'stat'
+						act 'Get butt fucked': gt 'kendra', 'kendra_bed_strap_anal'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_bed_strap_vag':
 	menu_off = 1
 	*clr & cla
+	gs 'boyStat', 'D7'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap6.jpg"></center>'
+	'She steps up behind you, as you feel her slide the tip of the <<dick>>cm <<$dick_girth>> dildo against your wet slit. Getting the tip of the dildo and your twat wetter the more she does it, then with out a word she pushes it about half way into you, causing you to gasp and moan as it fills you up, as she starts fucking you with it. You can hear a vibrating sound, obviously her harness has a built in vibrator for her pleasure.'
+	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub', 'rough'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom_male1.jpg"></center>'
-	'You decided you want to see this, most guys you know would never let a girl dominate them like this. You wonder how she manages it, as you walk across the room and take a seat on one of the beds, to watch. Kendra closes the door and then walks over to the boy, she smacks him in the face and then shoves him backwards, until the back of his head is resting on the seat of the couch. Then she straddles his face and sits on it. "Lick my pussy bitch, you better get me off. If not, no lube for you." She says with a evil laugh, you can''t help but notice she loves being in control.'
+	act 'Get pounded':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap7.jpg"></center>'
+		'She steadily works herself deeper until she is fucking your balls deep with the dildo, she thrusts hard and fast at first. Then she starts pulling the long dildo nearly completely out of you before slamming it back in as deep as it will go, her hips slapping against your butt cheeks with each thrust. Over and over she does this, until finally she does pull completely out of you, leaving your pussy feeling suddenly very empty.'
+		gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub', 'rough'
+		gs 'stat'
+		act 'Get butt fucked': gt 'kendra', 'kendra_bed_strap_anal'
+	end
+end
+
+if $ARGS[0] = 'kendra_bed_strap_anal':
+	menu_off = 1
+	*clr & cla
+	gs 'boyStat', 'D7'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap8.jpg"></center>'
+	'Kendra squirts a little lube in the crack of your butt where it runs down to where she is rubbing the tip of the dildo against your asshole lubing both you and it up. She holds onto your hips with one hand while the other guides the dildo, with no warning she suddenly thrusts forward with her hips while using her one hand to jerk you backwards by your hips.'
 	*nl
-	'She starts moaning and really starting to ride his face after a couple of minutes, apparently he knows how to eat pussy well. Just as it sounds like she is about to have a orgasm she suddenly gets off him and stands up. "Times up, you almost made it this time." You notice he looks a little let down, apparently he really thought he was going to get her off this time.'
+	'You yelp a little and try to pull away as the <<dick>>cm <<$dick_girth>> dildo stretches your butthole, but she quickly grabs onto both of your hips with her hands not letting you pull away. "Stop act like you don''t love this, you wouldn''t keep coming back if you wasn''t a complete buttslut." You stop resisting she has a point if you don''t enjoy it why do you keep coming back? She moans as she starts fucking your butt, the built in vibrator in her harness obviously making her really enjoy this.'
+	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
+	gs 'stat'
+	act 'Get ass wrecked':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap9.jpg"></center>'
+		'She drives the massive long dildo deep in your butt until her hips start slapping against your butt cheeks with each thrust. For several minutes this goes on, as she moans louder and louder before she almost falls on top of you with the dildo buried deep in your ass. She feel her body shaking as she has a orgasm. She takes a shuddering breath. "My god that was amazing, I hope for you sake you enjoyed that half as much as I did." And just to assert her dominance even more she pulls back and start thrusting the dildo inside your butt again for a little bit again before she finally pulls it out, leaving your ass gapping and feeling empty and full at the same time.'
+		gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
+		gs 'stat'
+		act 'Suck strapon':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/bed/strapon/bed_strap10.jpg"></center>'
+			'Once she has pulled the dildo out of your butt she grabs you by the hair and pulls you around until you are sitting on the edge of the bed next to her. She squats in the floor next to the edge of the bed and detaches the dildo from the harness then shoves it in your mouth. "Thats right suck my dildo clean you disgusting whore." You suck on the the dildo for a couple of minutes before she pulls it out of your mouth and drops it on the bed, as she starts taking off the harness. "Clean it up before you leave." You take the harness and dildo and clean them up, as you do she gets dressed and sits on the couch to watch some tv, with the harness clean you get dressed again yourself, as you finish she gives you a look and flicks her eyes towards the door. You understand what she wants, so once you are ready you walk towards the door and leave.'
+			gs 'arousal', 'bj', 3, 'lesbian', 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave': gt 'uni_dorm', 'eighth_floor'
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole':
+	menu_off = 1
+	*clr & cla
+	minut += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory1.jpg"></center>'
+	'Then she smiles. "I know just the thing. Come on." Then she takes you by the hand and leads you out of her dorm room. You go down the hall and back into the elevator together, riding down to the first floor and out of the building. She leads you across the quad, texting on her phone as she leads you to a campus public toilet, she shoves you inside the restroom. "Down there, to the last stall." She says as she pushes you along to the last stall, as you open it you immediately notice the hole in the wall.'
+	act 'Get choked':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory2.jpg"></center>'
+		'She follows you into the stall and then closes the door. Suddenly she grabs you from behind by the throat and starts choking you, you can still breath but just barely. She leans in and whispers in your ear as she keeps choking you. "What ever dick comes through that hole you are going to suck and keep sucking until who ever it is cums in your mouth and then you are going to swallow it down. You are going to keep doing this until I get bored, got it?" You are unable to speak so you just nod.'
+		gs 'arousal', 'bdsm', 2, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Accept your fate':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory3.jpg"></center>'
+			'"Good." She says as she lets go of you and then roughly turns you around till you are facing her. She smiles and reaches up and jerks your top down exposing your breasts. You instinctively cover up with your hands. "Put your hands down." She commands.'
+			gs 'arousal', 'flashlite', 2, 'lesbian', 'sub', 'humiliation'
+			gs 'stat'
+			act 'Stop covering up':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory4.jpg"></center>'
+				'You drop your hands from your exposed tits, Kendra pulls out her phone and starts taking your picture. After a couple of minutes of taking pictures of you topless she grabs you by the hair. "Looks like the first one arrived." She turns you by the hair towards the wall and you see a black dick poking through it. She forces you down to your knees in front of it.'
+				gs 'arousal', 'flashlite', 5, 'lesbian', 'sub', 'humiliation'
+				gs 'stat'
+				if kendra_dom >= 17 and pcs_vag ! 0:
+					act 'Suck the dick': gt 'kendra', 'kendra_gloryhole_suck2'
+				else
+					act 'Suck the dick': gt 'kendra', 'kendra_gloryhole_suck1'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole_suck1':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory5.jpg"></center>'
+	'You open your mouth and start sucking the strangers dick. You can hear soft moans from the other side as you suck the dick, you feel Kendra''s hands on the sides of your head as you are bopping back and forth on the cock, pushing you to take the dick deeper.'
+	gs 'arousal', 'bj', 3, 'sub'
+	gs 'stat'
+	act 'Deep throat':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory6.jpg"></center>'
+		'You take it a bit deeper, Kendra forces your head all the way forward until you feel your lips touch his balls, causing you to gag as the dick slides down your throat. You understand so start doing it on your own so she doesn''t force you to do it.'
+		gs 'arousal', 'bj', 3, 'sub', 'deepthroat'
+		gs 'stat'
+		act 'Deep throat on your own':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory7.jpg"></center>'
+			'Once you start deep throating enough on your own she removes her hands from your head and is silent, you glance over as you keep sucking the cock taking it as deep as you can and notice she has her phone out filming you.'
+			gs 'arousal', 'bj', 3, 'sub'
+			gs 'stat'
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory8.jpg"></center>'
+				'You try to ignore her filming you but you can''t help but blush, still you focus on sucking the guy off as best you can. You can hear him starting to moan louder and louder as you keep up the pace.'
+				gs 'arousal', 'bj', 3, 'sub'
+				gs 'stat'
+				act 'Suck till he cums':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory_mouth.jpg"></center>'
+					if rand(1,4) = 1:
+						minut += 7
+						'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouth showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+						*nl
+						'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks to suck." Then she gets up and walks out, leaving you in the stall alone. You get off your knees and fix your top, you walk out of the stall and check yourself in the mirror before walking out of the restroom.'
+						gs 'arousal', 'bj', 3, 'sub'
+						gs 'cum_call', 'mouth_swallow', 0
+						gs 'arousal', 'end'
+						gs 'stat'
+						killvar 'temp_glory_fuck'
+						act 'Leave': gt 'uni_grounds', 'main'
+					else
+						minut += 2
+						'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouth showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+						*nl
+						'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. You wait for several minutes and nothing happens. Then just as it looks like she is about to give up another black dick pops through the hole and Kendra smiles. "Well get to work slut." She says to you.'
+						gs 'arousal', 'bj', 3, 'sub'
+						gs 'cum_call', 'mouth_swallow', 0
+						gs 'stat'
+						act 'Suck another dick': gt 'kendra', 'kendra_gloryhole_suck1a'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole_suck1a':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory7.jpg"></center>'
+	'You open your mouth and start sucking the next strangers dick. You can hear soft moans from the other side as you suck the dick, you glance over as you keep sucking the cock taking it as deep as you can and notice she still has her phone out filming you.'
+	gs 'arousal', 'bj', 5, 'sub'
+	gs 'stat'
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory8.jpg"></center>'
+		'You ignore her filming you at this point you are getting use to it and instead you focus on sucking the guy off as best you can. You can hear him starting to moan louder and louder as you keep up the pace.'
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+		act 'Suck till he cums':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory_mouth.jpg"></center>'
+			if rand(1,4) = 1:
+				minut += 7
+				'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouthing showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+				*nl
+				'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks to suck." Then she gets up and walks out, leaving you in the stall alone. You get off your knees and fix your top, you walk out of the stall and check yourself in the mirror before walking out of the restroom.'
+				gs 'arousal', 'bj', 3, 'sub'
+				gs 'cum_call', 'mouth_swallow', 0
+				gs 'arousal', 'end'
+				gs 'stat'
+				killvar 'temp_glory_fuck'
+				act 'Leave': gt 'uni_grounds', 'main'
+			else
+				minut += 2
+				'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouthing showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+				*nl
+				'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. Almost at once another black dick pops through the hole and Kendra smiles. "It''s your lucky day, seems they are lining up for you." She says to you.'
+				gs 'arousal', 'bj', 3, 'sub'
+				gs 'cum_call', 'mouth_swallow', 0
+				gs 'stat'
+				act 'Suck another dick': gt 'kendra', 'kendra_gloryhole_suck1a'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole_suck2':
+	menu_off = 1
+	*clr & cla
+	kendra_dom += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory5.jpg"></center>'
+	'You know the drill at this point and go down on your knees mostly on your own and start sucking the strangers dick right away. You can hear soft moans from the other side as you suck the dick, you feel Kendra''s hands on the sides of your head as you are bopping back and forth on the cock, pushing you to take the dick deeper.'
+	gs 'arousal', 'bj', 3, 'sub'
+	gs 'stat'
+	act 'Deep throat':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory6.jpg"></center>'
+		'You take it until you feel your lips touch his balls, causing you to gag as the dick slides down your throat. Her hands arn''t needed but she keeps them in place apparently making sure you don''t stop deep throating it.'
+		gs 'arousal', 'bj', 3, 'sub', 'deepthroat'
+		gs 'stat'
+		act 'Suck him':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory7.jpg"></center>'
+			'You deep throat the dick as you hear her say. "We''re going to make you into a porn star yet." You glance over as you keep sucking the cock taking it as deep as you can and notice is filming you again, you ignore it as well.'
+			gs 'arousal', 'bj', 3, 'sub'
+			gs 'stat'
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory8.jpg"></center>'
+				'You focus on sucking the guy off as best you can. You can hear him starting to moan louder and louder as you keep up the pace. You don''t even pay any attention to nor really even notice Kendra filming you, on your knees sucking some strangers dick in a public restroom.'
+				gs 'arousal', 'bj', 3, 'sub'
+				gs 'stat'
+				act 'Suck till he cums':
+					*clr & cla
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory_mouth.jpg"></center>'
+					if rand(1,4) = 1:
+						minut += 7
+						'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. Before she can even tell you, you turn towards her and open and open your mouth showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+						*nl
+						'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks to suck." Then she gets up and walks out, leaving you in the stall alone. You get off your knees and fix your top, you walk out of the stall and check yourself in the mirror before walking out of the restroom.'
+						gs 'arousal', 'bj', 3, 'sub'
+						gs 'cum_call', 'mouth_swallow', 0
+						gs 'arousal', 'end'
+						gs 'stat'
+						killvar 'temp_glory_fuck'
+						act 'Leave': gt 'uni_grounds', 'main'
+					else
+						minut += 2
+						'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. Before she can even tell you, you turn towards her and open and open your mouth showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+						*nl
+						'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. Almost at once another black dick pops through the hole and Kendra smiles. "Well get to work slut." She says to you.'
+						gs 'arousal', 'bj', 3, 'sub'
+						gs 'cum_call', 'mouth_swallow', 0
+						gs 'stat'
+						act 'Suck another dick': gt 'kendra', 'kendra_gloryhole_suck2a'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole_suck2a':
+	menu_off = 1
+	*clr & cla
+	if rand(1,2) = 1:
+		if temp_glory_fuck >= 1:
+			gt 'kendra', 'kendra_gloryhole_fuck'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory9.jpg"></center>'
+			'You start to wrap your lips around the next cock when you feel Kendra grab you by the hair and pull you up, into a standing position. Confused you stand up, plus it hurts when she pulls your hair. As you stand the starts stripping off your clothes, soon you are mostly naked.'
+			gs 'arousal', 'flash', 2, 'sub'
+			gs 'stat'
+			act 'Wait':
+				*clr & cla
+				temp_glory_fuck = 1
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory10.jpg"></center>'
+				'Kendra turns you around until you are facing you. "Fuck that cock." She tells you. You are surprised for a moment but she grabs you and bends you over and pushes you back until you feel the dick poking against your butt. You reach back and grab the dick and help line it up as you push back, you feel the cock slide inside of you, causing you to moan softly as it does.'
+				gs 'arousal', 'vaginal', 3, 'sub'
+				gs 'stat'
+				act 'Fuck the cock':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory11.jpg"></center>'
+					'You push back until your butt is against the wall, you start moving back and forth fucking the cock of the stranger on the other side of the wall, you don''t know if you feel shame at what you are doing or excited by the act. You can feel Kendra''s hands running along your body.'
+					gs 'arousal', 'vaginal', 3, 'sub'
+					gs 'stat'
+					act 'Keep fucking':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory12.jpg"></center>'
+						'As you keep fucking the strangers dick you start moaning louder and louder yourself, at least part of you is really loving this. Kendra''s hands continue to run along your body but you barely notice as you focus on the strangers cock filling your twat as you take him.'
+						gs 'arousal', 'vaginal', 3, 'sub'
+						gs 'stat'
+						act 'Fuck until he cums':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory13.jpg"></center>'
+							if rand(1,4) = 1:
+								minut += 7
+								'You pick up the pace as you fuck him and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your pussy, his loud filling you. You keep bouncing on his dick, milking ever last drop out of it of cum out of it with your pussy. Kendra gets down to take a look between your legs, you feel the dick getting soft and then pulling out of you, you can feel his cumming running out of you. "Good girl." Kendra says to you as you glance over, you see the hole is now empty.'
+								*nl
+								'Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks." Then she gets up and walks out, leaving you in the stall alone. You fix your clothes before walking out of the stall and check yourself in the mirror, once you are sure you are presentable you head back to the quad.'
+								gs 'arousal', 'vaginal', 3, 'sub'
+								gs 'cum_call', 'vaginal', 0
+								gs 'arousal', 'end'
+								gs 'stat'
+								killvar 'temp_glory_fuck'
+								act 'Leave': gt 'uni_grounds', 'main'
+							else
+								minut += 2
+								'You pick up the pace as you fuck him and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your pussy, his loud filling you. You keep bouncing on his dick, milking ever last drop out of it of cum out of it with your pussy. Kendra gets down to take a look between your legs, you feel the dick getting soft and then pulling out of you, you can feel his cumming running out of you. "Good girl." Kendra says to you as you glance over, you see the hole is now empty.'
+								*nl
+								'Kendra raps on the wall. Almost at once you feel another hard dick poking against you and Kendra smiles. "It''s your lucky day, seems they are lining up for you." She says to you.'
+								gs 'arousal', 'vaginal', 3, 'sub'
+								gs 'cum_call', 'vaginal', 0
+								gs 'stat'
+								act 'Another dick': gt 'kendra', 'kendra_gloryhole_suck2a'
+							end
+						end
+					end
+				end
+			end
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory7.jpg"></center>'
+		if temp_glory_fuck >= 1:
+			'Kendra turns you around and pushes you back down to your knees in front of this cock. You open your mouth and start sucking the next strangers dick. You can hear soft moans from the other side as you suck the dick, you glance over as you keep sucking the cock taking it as deep as you can and notice she still has her phone out filming you.'
+		else
+			'You open your mouth and start sucking the next strangers dick. You can hear soft moans from the other side as you suck the dick, you glance over as you keep sucking the cock taking it as deep as you can and notice she still has her phone out filming you.'
+		end
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory8.jpg"></center>'
+			'You ignore her filming you at this point you are getting use to it and instead you focus on sucking the guy off as best you can. You can hear him starting to moan louder and louder as you keep up the pace.'
+			gs 'arousal', 'bj', 5, 'sub'
+			gs 'stat'
+			act 'Suck till he cums':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory_mouth.jpg"></center>'
+				if rand(1,4) = 1:
+					minut += 7
+					'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouthing showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+					*nl
+					'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks to suck." Then she gets up and walks out, leaving you in the stall alone. You get off your knees and fix your top, you walk out of the stall and check yourself in the mirror before walking out of the restroom.'
+					gs 'arousal', 'bj', 3, 'sub'
+					gs 'cum_call', 'mouth_swallow', 0
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Leave': gt 'uni_grounds', 'main'
+				else
+					minut += 2
+					'You pick up the pace as you suck him off and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your mouth, his salty loud filling it. You stroke his dick, milking ever last drop out of it. "Don''t swallow it, not yet. Now show me." Kendra tells you, so you turn and open your mouthing showing it full of cum to her. "Good girl, now swallow it down." You do as you are told and swallow it, you glance over and see the hole is now empty.'
+					*nl
+					'You wipe the bit of cum dribble off your chin, as you do Kendra raps on the wall. Almost at once another black dick pops through the hole and Kendra smiles. "It''s your lucky day, seems they are lining up for you." She says to you.'
+					gs 'arousal', 'bj', 3, 'sub'
+					gs 'cum_call', 'mouth_swallow', 0
+					gs 'stat'
+					act 'Another dick': gt 'kendra', 'kendra_gloryhole_suck2a'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_gloryhole_fuck':
+	menu_off = 1
+	*clr & cla
+	temp_glory_fuck = 1
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory10.jpg"></center>'
+	'You don''t have to be told what to do. You just reach back and grab the dick and help line it up as you push back, you feel the cock slide inside of you, causing you to moan softly as it does.'
+	gs 'arousal', 'vaginal', 3, 'sub'
+	gs 'stat'
+	act 'Fuck the cock':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory11.jpg"></center>'
+		'You push back until your butt is against the wall, you start moving back and forth fucking the cock of the stranger on the other side of the wall, you don''t know if you feel shame at what you are doing or excited by the act. You can feel Kendra''s hands running along your body.'
+		gs 'arousal', 'vaginal', 3, 'sub'
+		gs 'stat'
+		act 'Keep fucking':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory12.jpg"></center>'
+			'As you keep fucking the strangers dick you start moaning louder and louder yourself, at least part of you is really loving this. Kendra''s hands continue to run along your body but you barely notice as you focus on the strangers cock filling your twat as you take him.'
+			gs 'arousal', 'vaginal', 3, 'sub'
+			gs 'stat'
+			act 'Fuck until he cums':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory13.jpg"></center>'
+				if rand(1,4) = 1:
+					minut += 7
+					'You pick up the pace as you fuck him and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your pussy, his loud filling you. You keep bouncing on his dick, milking ever last drop out of it of cum out of it with your pussy. Kendra gets down to take a look between your legs, you feel the dick getting soft and then pulling out of you, you can feel his cumming running out of you. "Good girl." Kendra says to you as you glance over, you see the hole is now empty.'
+					*nl
+					'Kendra raps on the wall. You wait for several minutes and nothing happens. She sighs a bit. "Well looks like everyone else is busy, maybe next time we can find you more dicks." Then she gets up and walks out, leaving you in the stall alone. You fix your clothes before walking out of the stall and check yourself in the mirror, once you are sure you are presentable you head back to the quad.'
+					gs 'arousal', 'vaginal', 3, 'sub'
+					gs 'cum_call', 'vaginal', 0
+					gs 'arousal', 'end'
+					gs 'stat'
+					killvar 'temp_glory_fuck'
+					act 'Leave': gt 'uni_grounds', 'main'
+				else
+					minut += 2
+					'You pick up the pace as you fuck him and your efforts are awarded with the sounds of him moaning even louder a few moments later you feel him cum in your pussy, his loud filling you. You keep bouncing on his dick, milking ever last drop out of it of cum out of it with your pussy. Kendra gets down to take a look between your legs, you feel the dick getting soft and then pulling out of you, you can feel his cumming running out of you. "Good girl." Kendra says to you as you glance over, you see the hole is now empty.'
+					*nl
+					'Kendra raps on the wall. Almost at once another black dick pops through the hole and Kendra smiles. "It''s your lucky day, seems they are lining up for you." She says to you.'
+					gs 'arousal', 'vaginal', 3, 'sub'
+					gs 'cum_call', 'vaginal', 0
+					gs 'stat'
+					act 'Another dick': gt 'kendra', 'kendra_gloryhole_suck2a'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'kendra_male_slave':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom/femdom_male1.jpg"></center>'
+	if kendra_male_slave = 1:
+		'You liked watching last time and you kinda got off watching a guy get dominated and fucked by a girl. You wonder how she manages it, as you walk across the room and take a seat on one of the beds, to watch. Kendra closes the door and then walks over to the boy, she smacks him in the face and then shoves him backwards, until the back of his head is resting on the seat of the couch. Then she straddles his face and sits on it. "Lick my pussy slut and you better get me off. If not, I''m going to fuck you until you can''t sit." She says with a evil laugh, she really loves dominating others.'
+		*nl
+		'She starts moaning and really starting to ride his face after a couple of minutes, apparently she is struggling a bit to keep from cumming. Just as it sounds like she is about to have a orgasm she suddenly gets off him and stands up. "Times up, you almost made it this time." You are certain she gave him less time than last time to get her off, he looks crestfallen that he failed again.'
+	else
+		'You decided you want to see this, most guys you know would never let a girl dominate them like this. You wonder how she manages it, as you walk across the room and take a seat on one of the beds, to watch. Kendra closes the door and then walks over to the boy, she smacks him in the face and then shoves him backwards, until the back of his head is resting on the seat of the couch. Then she straddles his face and sits on it. "Lick my pussy bitch, you better get me off. If not, no lube for you." She says with a evil laugh, you can''t help but notice she loves being in control.'
+		*nl
+		'She starts moaning and really starting to ride his face after a couple of minutes, apparently he knows how to eat pussy well. Just as it sounds like she is about to have a orgasm she suddenly gets off him and stands up. "Times up, you almost made it this time." You notice he looks a little let down, apparently he really thought he was going to get her off this time.'
+	end
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
 	act 'Keep watching':
 		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom_male2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom/femdom_male2.jpg"></center>'
 		'She grabs him by the hair and pulls his face to her fake cock. "Suck it bitch!" He opens his mouth at once obeying her with out question. She sticks the fake black cock in his mouth, he closes his lips tightly around it and starts sucking it. He looks like he really knows what he is doing, you idly wonder how many times he has done this. "Mhm you are such a good little cock sucker." She says to him as she places a hand on his head and starts fucking his throat, causing him to gag.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		act 'Keep watching':
 			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom_male3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom/femdom_male3.jpg"></center>'
 			'She pulls his head away and then sits down on the couch, only to grab his head and pull it over. He already has his mouth open and she shoves the dildo back in his mouth. He starts bobbing his head up and down sucking her fake cock. After a few moments she grabs his head and forces him to take the full length of the dildo in his mouth, once more making him gag. "That''s right slut, gag on my dick. You better get it nice and wet, because that is the only lube your going to get." For several more minutes she keeps forcing him to deep throat her.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Keep watching':
 				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom_male4.jpg"></center>'
-				'She pulls his head away again and stands up once more. She places one knee on the couch and the other foot on the floor. "Get on the couch slut!" She tells him, he climbs on the couch, as he does she turns him away from her. He places one knee on the couch and one foot on the floor just like she did, the she pushes him forward until his elbows are also on the couch, with his ass facing her. She spits on his ass, then says. "Never say I am not a kind mistress." She scoots forward a bit closer behind him, taking hold of the dildo with one hand to line it up. He tenses up as she does and a moment later she thrusts her hips forward and he cries out in pain.'
-				*nl
-				'"Shut up bitch, this is what you get for being so bad at eating pussy. Maybe this will motivate you better next time." She says with a angry snarl, then she grabs onto both of his hips with her hands and plunges herself all the way into him. She hangs onto his hips as she roughly, rapid fire hammers his ass with her fake black cock. She starts moaning in pleasure, as he grunts and hisses in pain. The more he grunts and hisses in pain the harder she fucks him, you can see his limp dick violently bouncing around, with each savage thrust she takes.'
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom/femdom_male4.jpg"></center>'
+				if kendra_male_slave = 1:
+					'She pulls his head away again and stands up once more. She places one knee on the couch and the other foot on the floor. "Time to fuck your boipussy." She tells him, he seems to know what that means. He climbs on the couch, as he does she turns him away from her and bends over until his elbows are also on the couch, presenting his ass to her. She gets up behind him and spits on his ass, then says. "That''s more than you deserve." She scoots forward a bit closer behind him, she reaches down and does something to the harness and you can hear the vibrating sound coming from it and a soft moan from her.'
+					*nl
+					'Taking hold of the dildo with one hand to line it up, she sticks it between his butt cheeks. As she does that he tenses up just before, she thrusts her hips forward, causing him to cry out in pain. "Shut up bitch, I know you love it, you know you love it, even <<$pcs_nickname>> knows you love getting your ass fucked by a big hard cock." She says with a laugh, then she grabs onto both of his hips with her hands and plunges herself all the way into him. She hangs onto his hips as she roughly, rapid fire hammers his ass with her fake black cock. She starts moaning in pleasure, as he grunts and hisses in pain. The more he grunts and hisses in pain the harder she fucks him, you can see his limp dick violently bouncing around, with each savage thrust she takes.'
+				else
+					'She pulls his head away again and stands up once more. She places one knee on the couch and the other foot on the floor. "Get on the couch slut!" She tells him, he climbs on the couch, as he does she turns him away from her. He places one knee on the couch and one foot on the floor just like she did, the she pushes him forward until his elbows are also on the couch, with his ass facing her. She spits on his ass, then says. "Never say I am not a kind mistress." She scoots forward a bit closer behind him, she reaches down and does something to the harness and you can hear the vibrating sound coming from it and a soft moan from her.'
+					*nl
+					'Taking hold of the dildo with one hand to line it up. He tenses up as she does and a moment later she thrusts her hips forward and he cries out in pain. "Shut up bitch, this is what you get for being so bad at eating pussy. Maybe this will motivate you better next time." She says with a angry snarl, then she grabs onto both of his hips with her hands and plunges herself all the way into him. She hangs onto his hips as she roughly, rapid fire hammers his ass with her fake black cock. She starts moaning in pleasure, as he grunts and hisses in pain. The more he grunts and hisses in pain the harder she fucks him, you can see his limp dick violently bouncing around, with each savage thrust she takes.'
+				end
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 				act 'Keep watching':
 					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom_male5.jpg"></center>'
-					'As she hammers away at his ass, you notice he starts leaning forward and down more and more. Gently trying to pull away from her relentless fucking she is giving him. She seems to have noticed as well, as she tightens her grips on his hips and yanks him back. "Don''t pull away from me slut." As she says that she pulls her own hips way back and then slams them forward causing him to cry out again.'
-					*nl
-					'Then she goes back to savagely fucking him again, you can hear the slapping of flesh or her hips against her butt cheeks over his groans and her moans. After a few more minutes of this she starts moaning even louder. Moments later she cries out obviously having a orgasm, you don''t know if it was a mental orgasm from dominating someone like that or her clit rubbing against the harness that made her cum or maybe both. Either way she fucks him through her orgasm and then slows down as she comes down off it. Finally she stops, leaning forward she grabs his chin with one hand and forces his head up and to the side to look directly at you. "Look at her." He does as she commands'
-					*nl
-					'"How does it make you feel to know she just watched you get fucked like a slut by your ebony mistress and her big black cock? Think she is going to go around telling everyone what a sissy slut you are?"'
-					'He blushes at her words but respond to her. "I love getting fucked by your black cock mistress."'
-					'She gives you a confident grin. "I know you do slut, maybe next time I will let her fuck you too, would you like that?"'
-					'She throws her head back and laughs, before looking at you. "Soon I will break you just like I broke him. Now leave."'
-					'You nod and get up. "Yes mistress." As you open the door to leave, you hear them starting to grunt again, you look back and see she has started fucking him again. You know better than to stay, so you open the door and leave.'
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/femdom/femdom_male5.jpg"></center>'
+					if kendra_male_slave = 1:
+						'As she hammers away at his ass, he starts puffing out his breath similar to how you have seen women told to do while giving birth, he stops hissing in pain, while he still grunts you would say they are almost turning into moans of pleasure, it seems he really is starting to learn to enjoy it, it even looks like his dick is semi hard as he it bouncing back and forth with each one of her thrusts.'
+						*nl
+						'You can hear the sounds of slapping of flesh of her hips against her butt cheeks over her moans, and his groans and puffing breath. After a few more minutes of this she starts moaning even louder. Moments later she cries out obviously having a orgasm, knowing her better you think her orgasm is more from mental side, she just loves to dominate others, the built in vibrator you are sure helped, but you are just as sure she would cum either way.'
+						*nl
+						'She slows down during her orgasm but doesn''t stop. Leaning forward she grabs his chin with one hand and forces his head up and to the side to look directly at you. "Look at her." He does as she commands'
+						'"Would you like her to fuck you too?" She asks him while looking at you as well'
+						'He blushes at her words but respond to her. "Yes mistress I would love that."'
+						*nl
+						'She gives you a confident grin as she replies to him. "I know you would slut, maybe next time we will take turns fucking you, would you like that?"'
+						'He blushes more at her words but you also notice the precum leaking out of his dick. "Oh yes mistress please, I would love that."'
+						'She throws her head back and laughs. "But not today, I''m not finished with you." She says as she starts to savagely fuck him again. Then she glances over to you with a wicked grin. "You maybe go slave."'
+						'"Yes mistress." You nod and get up, walking over to the door, the sounds her her fucking him filling the room. As you open the door to leave.'
+					else
+						kendra_male_slave = 1
+						'As she hammers away at his ass, you notice he starts leaning forward and down more and more. Gently trying to pull away from her relentless fucking she is giving him. She seems to have noticed as well, as she tightens her grips on his hips and yanks him back. "Don''t pull away from me slut." As she says that she pulls her own hips way back and then slams them forward causing him to cry out again.'
+						*nl
+						'Then she goes back to savagely fucking him again, you can hear the slapping of flesh of her hips against her butt cheeks over his groans and her moans. After a few more minutes of this she starts moaning even louder. Moments later she cries out obviously having a orgasm, you don''t know if it was a mental orgasm from dominating someone like that or the vibrator of the harness that made her cum or maybe both. Either way she fucks him through her orgasm and then slows down as she comes down off it. Finally she stops, leaning forward she grabs his chin with one hand and forces his head up and to the side to look directly at you. "Look at her." He does as she commands'
+						*nl
+						'"How does it make you feel to know she just watched you get fucked like a slut by your ebony mistress and her big black cock? Think she is going to go around telling everyone what a sissy slut you are?"'
+						'He blushes at her words but respond to her. "I love getting fucked by your black cock mistress."'
+						'She gives you a confident grin. "I know you do slut, maybe next time I will let her fuck you too, would you like that?"'
+						'She throws her head back and laughs, before looking at you. "Soon I will break you just like I broke him. Now leave."'
+						'You nod and get up. "Yes mistress." As you open the door to leave, you hear them starting to grunt again, you look back and see she has started fucking him again. You know better than to stay, so you open the door and leave.'
+					end
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'

+ 2 - 10
locations/kit_din.qsrc

@@ -454,7 +454,7 @@ $pranik = {
 		else
 			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
 		end
-		act 'Have tea with biscuits (0:05)':
+		act 'Eat some tea biscuits (0:05)':
 			*clr & cla
 			menu_off = 1
 			minut += 5
@@ -462,19 +462,11 @@ $pranik = {
 			pcs_health += 30
 			pcs_mood += 20
 			pcs_energy += 20
-			if pcs_hydra >= 100:
-				pcs_hydra += 30
-			else
-				pcs_hydra += 60
-			end
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
 			fat += 4
 			frost = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-			'You drank some tea and enjoyed your biscuits. You know they''re too sweet and can''t be good for your figure, but they taste so good!'
+			'You enjoy your biscuits. You know they''re too sweet and can''t be good for your figure, but they taste so good!'
 
 			act 'Get up from the table':gt $loc, $loc_arg
 		end

+ 0 - 2
locations/lact_lib.qsrc

@@ -969,8 +969,6 @@ if $ARGS[0] = '$get_breastmilk':
 			
 			!! Next check is for cases when not only there is less milk than demanded, but also not enough max_nip_flow_rate 
 			if pumptime_left > 0: 
-				!! returning unused time (could use it a lot in RL... -_-)
-				minut -= pumptime_left
 				pumptime = ARGS[2] - pumptime_left + 1 
 				!!	time to add the pumped lactation['breastmv'] to the milkedvolume and empty lactation['breastmv'].
 				lactation['get_bm_milkedvolume'] += lactation['breastmv']

+ 13 - 4
locations/liames.qsrc

@@ -74,10 +74,19 @@ if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on th
 
 act 'wait':gs 'obj_din', 'wait'
 
-if home_owned[4] = 1 and hour = meethour:
-	if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & gt ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
-	if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & gt ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
-	if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
+if curr_home = 4:
+	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
+	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting at the entrance to your apartment building.</b>'
+	end
 end
 
 if rand(0,50) = 50 and fame['event_day'] ! daystart and hour > 8 and hour < 21:

+ 0 - 2
locations/loadg.qsrc

@@ -2,7 +2,5 @@
 
 gs 'saveupdater'
 
-gs 'nichUtil','onLoad'
-
 --- loadg ---------------------------------
 

+ 0 - 3
locations/mey_vika_events.qsrc

@@ -899,8 +899,6 @@ end
 if $ARGS[0] = 'beach_ender':
 	act 'Go':
 		if ($clothingworntype = 'nude' or PCloswimwear = 1): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
-		! on vsjak the fireman still wears check whether gg
-		if ($clothingworntype = 'nude' or PCloswimwear = 1): gs 'zz_clothing', 'fix_emergency'
 		gt 'pav_residential'
 	end
 end
@@ -1588,7 +1586,6 @@ if $ARGS[0] = 'bang_katya2':
 						KatjaQW['horny'] = 0
 						Katjastat['vaginal'] += 1
 						if KatjaQW['slut'] < 20:
-							KatjaDom += 20
 							KatjaQW['slut'] = 0
 						end
 						gs 'stat'

+ 4 - 4
locations/mirror.qsrc

@@ -579,28 +579,28 @@ if $ARGS[0] = 'steam':
 end
 
 if $routine1 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine1custname>>':gt 'mirror','works',mid($routine1,1,1),mid($routine1,2,1),mid($routine1,3,1)
 	end
 end
 if $routine2 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine2custname>>':gt 'mirror','works',mid($routine2,1,1),mid($routine2,2,1),mid($routine2,3,1)
 	end
 end
 if $routine3 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine3custname>>':gt 'mirror','works',mid($routine3,1,1),mid($routine3,2,1),mid($routine3,3,1)
 	end
 end
 if $routine4 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine4custname>>':gt 'mirror','works',mid($routine4,1,1),mid($routine4,2,1),mid($routine4,3,1)

+ 61 - 179
locations/moncheri.qsrc

@@ -25,16 +25,6 @@ if $ARGS[0] = 'start':
 		act 'Stare at the woman':gt 'event', 'lesbi'
 	end
 
-	if QWdogreiqTimer = 0 and QWdogReiq = 1 and week = 7 and qwdogiventday ! daystart:
-		qwdogiventday = daystart
-		'Going into the boutique you begin to look at some dresses on hangers, considering to buy one. You casually try one on in the changing room when suddenly one of the dresses attracts your attention. When you look at it more closely, you feel strange, as if you are being watched.'
-
-		act 'Disregard':gt 'moncheri', 'start'
-		act 'Look around':gt 'moncheri', 'rima'
-
-		exit
-	end
-
 	if RimmaSex > 0:
 		if rimmaday ! daystart:
 			'<a href="exec:gt ''RimmaSexQW''">Rima</a> smiles at you. She bites her lip and looks longingly in your direction.'
@@ -46,10 +36,6 @@ if $ARGS[0] = 'start':
 	'The boutique sells designer winter coats, formal clothing, beautiful shoes and exquisite handbags.'
 
 	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
-	
-	act 'View gowns': minut += 5 & gt 'moncheri', 'gowns'
-
-	act 'View dresses': minut += 5 & gt 'moncheri', 'dresses'
 
 	act 'View shoes': minut += 5 & gt 'moncheri', 'shoes'
 
@@ -57,8 +43,67 @@ if $ARGS[0] = 'start':
 
 	act 'View coats': minut += 5 & gt 'moncheri', 'coats'
 
+	if $pantyworntype ! 'none':
+		act 'Enter changing room (strip to underwear)':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/underwear.jpg"</center>'
+			gs 'clothing', 'strip'
+			gs 'moncheri', 'changingroom', 1
+		end
+	end
+
+	act 'Enter changing room (strip naked)':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
+		gs 'clothing', 'strip_all'
+		gs 'moncheri', 'changingroom', 1
+	end
+end
+
+if $ARGS[0] = 'changingroom':
+	$locclass = 'changingroom'
+	$loc_arg = 'changingroom'
+	$loc = 'moncheri'
+	$menu_loc = 'moncheri'
+	$menu_arg = 'changingroom'
+	gs 'stat'
+	menu_off = 0
+
+	if $ARGS[1] = '':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/changingroom.jpg"</center>'
+		'You are in the changing rooms in Mon Chéri with several outfits available to try on.'
+	else
+		'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.'
+	end
+	*nl
+
+	gs 'shortgs', 'clothing_state'
+	act 'Try on dresses': gt 'moncheri', 'dresses'
+	act 'Try on gowns': gt 'moncheri', 'gowns'
+	if $pantyworntype = 'none':
+		act 'Put on underwear':
+			gs 'underwear', 'wear'
+			gt 'moncheri', 'changingroom'
+		end
+	end
+	if $pantyworntype ! 'none':
+		act 'Get naked':
+			gs 'clothing', 'strip_all'
+			gt 'moncheri', 'changingroom'
+		end
+	end
+	act 'Get dressed and go back to the store': gt 'moncheri', 'changingend'
+end
+
+if $ARGS[0] = 'changingend':
+	!! Sveta dresses again
+	if $pantyworntype = 'none': gs 'underwear', 'wear'
+	gs 'clothing', 'wear_last_worn'
+	gt 'moncheri', 'start'
 end
 
+
 if $ARGS[0] = 'gowns':
 	$loc_arg = 'gowns'
 	$loc = 'moncheri'
@@ -72,7 +117,7 @@ if $ARGS[0] = 'gowns':
 
 	gs 'clothing_QV', 'shop_filter_header'
 
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
+	act 'Return': minut += 1 & gt 'moncheri', 'changingroom'
 
 	!!To filter just this set
 	clo_i = 0
@@ -122,7 +167,7 @@ if $ARGS[0] = 'dresses':
 
 	gs 'clothing_QV', 'shop_filter_header'
 
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
+	act 'Return': minut += 1 & gt 'moncheri', 'changingroom'
 
 	!!To filter just this set
 	clo_i = 0
@@ -219,168 +264,5 @@ end
 
 if $ARGS[0] = 'coats2': gt 'coats', 'view_coat_item', 'shop', 'moncheri',i, 4000
 
-if $ARGS[0] = 'rima':
-	*clr & cla
-	menu_off = 1
-	minut += 5
-    $location_type = 'event'
-	gs 'stat'
-	'Turning your head, you think nobody noticed, but your actions have attracted the saleswoman. The seller is a young girl in a little-too-narrow shirt with the logo of the Boutique, it''s not enough that her shirt was so tight, but she had to unbutton the top button as well (You think if it was a woman''s shirt it would be okay, but since it''s a man you wonder what the administration must be thinking.) she came up to you a little bit uncomfortably and quickly asked:'
-	'"Can I help you with anything?" the seller asks.'
-
-	act 'No, thank you':gt 'moncheri', 'start'
-	act 'Silently leave': minut += 8 & gt 'city_center'
-
-	act 'Stare at her breasts':
-		*clr & cla
-		gs 'stat'
-		'Seeing that the she is a novice saleswoman and that you are most likely her first client, you decided to go for it. Just as you opened your mouth to say some harsh sentence, your eyes came to rest on her chest. The bra together with the shirt successfully emphasized her breasts, and even though only the upper part of her chest was visible, your imagination filled in the rest. You wonder what her nipples are like The thought crossed your mind suprisingly'
-		'"Yes, you can give me a few minutes of your time, "You said.'
-		'Your words make an impression on the saleswoman, and she blushes slightly embarassed.'
-		'"Yes, yes, yes - often we ask: what dress color do you like? shape of the neckline of the dress? do you want more freedom to move? or turn? do you want to highlight your perfect figure?"'
-		'"Stop, stop, - you''re a person and not a stranger, first tell me what you would like me to call you" Your words make an impression on the girl, she is flattered by your words. '
-		'"Irina" she says, before correcting herself "Saleswoman Rima."'
-		'"May I call you Rimma?" You ask."I''m <<$pcs_nickname>>".'
-		'"Yes, of course, if you''d like.", responds Rima, smiling shyly.'
-		
-		gs 'arousal', 'erotic', 5
-		gs 'stat'
-
-		act 'Choose a dress with Rimma':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-
-			if pcs_hairbsh = 1 and pcs_makeup > 1 and pcs_leghair <= 0 and pcs_sweat < 20 and $clothingworntype = 'moncheri':
-				'You choose some things  and evaluate them together with Rima while hanging out a bit.'
-				'"Rima, where is the dressing room?" You ask suddenly.'
-				'Come with me - Rima didn''t notice that the invisible barrier between you is lost: the seller and the buyer.'
-
-				act 'Go inside the dressing room':
-					*clr & cla
-					minut += 5
-					gs 'stat'
-					'You and Rima went together into the dressing room.'
-
-					act 'You do not like the dress':
-						*clr & cla
-						minut += 5
-						gs 'stat'
-						'As a result, you spent time together, while in your head you wonder about Rima, and her mysterious and curious body.'
-						'As you go home you suddenly feel eyes on you'
-
-						act 'Ignore': minut += 8 & gt 'city_center'
-
-						act 'Look around':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-							'You start to turn your head, looking around sharply.'
-							'You notice that a girl is looking at you.'
-
-							act 'Approach her':
-								*clr & cla
-								minut += 5
-								gs 'stat'
-								'You silently move towards her and give her a look'
-								nl
-								'"Good afternoon," you announce. "Do I know you?"'
-								'"Good day," she says, "Do you not remember me?"'
-								'The girl does not respond to your sharpness'
-								'"In principle, there is no way out of the situation that you had?" the girl answers'
-								'"What is the situation where when?" You will not hide anger.'
-								'"Yes, in the vacant lot where you were having ''fun'' with a dog" girl replied with a grin.'
-
-								act 'Yes you ohereli! (Go)': minut += 8 & gt 'city_center'
-
-								act 'Extort taken in head? What do you want?':
-									*clr & cla
-									minut += 5
-									QWdogReiq = 2
-									QWdogreiqTimer = 7
-									gs 'stat'
-									'"So you decided to blackmail me? And how much do you want?" You spit viciously '
-									'Again, your words fail to disturb her. She cocks her head to the side, and asks "Is your tantrum over?"'
-									'You tell her irritably that you have not even begun to get angry.'
-									'"No, you''re still upset let''s meet next week." The girl says suddenly.'
-									'"I guess..." you say, shaking your head.'
-									'"That''s fine, my name is Margaret" she says, looking at you expectantly.'
-									'"<<$pcs_nickname>>" you reply.'
-									'"I''m looking forward to our meeting." she says as she leaves.'
-
-									act 'Leave': minut += 8 & gt 'city_center'
-								end
-							end
-						end
-					end
-
-					act 'Take your panties off in front of Rimma.':
-						*clr & cla
-						minut += 5
-						gs 'stat'
-						'You remove your panties in front Rimma and noticed how her cheeks glowed red, and her breathing quickened.'
-
-						act 'Do you like me?':
-							*clr & cla
-
-							if RimmaSex = 0:RimmaSex = 1 & girl += 1
-
-							rimmaday = daystart
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/primer.jpg"></center>'
-							'"Rimma, do you like me?" you ask quietly'
-							'"yes, very much" Rimma answers excitedly'
-							'"Then lick me" you demand'
-							'Rimma kneels down and begins to kiss your body, not very skillfully at first, starting by timidly kissing your belly then licking and covering all of your body as she grew more confident. Rimma successfully made your pussy very wet. She starts kissing and licking your crotch little by little, then bites at it. The unexpectedness makes the body flow into a sweet languor. '
-							'You smell of sex, Rimma looks up at you from between your legs for a second'
-							'After putting her right palm gently on the pubis, Rimma fingers spread your wet lips, poking out her tongue and running it inside.'
-							'The soft reciprocating action of the tongue on the clitoris excits you and causes a mild spasm. Rimma suddenly begins to press her tongue on your clitoris. Your body is already weak and no longer obeys your brain, only trying not moan load enough to alert the whole store.'
-							$orgasm_or = 'custom'
-							$orgasm_txt = 'Suddenly, Your body begins to shake and is covered in a soft wave of spasms, with the last spasm you cum. You let out a loud moan while falling to your knees.'
-							'You collapse to the floor, exhausted with pleasure.'
-							
-							gs 'arousal', 'cuni', 10, 'dom', 'lesbian'
-							gs 'arousal', 'vaginal_finger', 10, 'dom', 'lesbian'
-							minut -= 10
-							gs 'arousal', 'end'
-							gs 'stat'
-
-							act 'leave the dressing room':
-								*clr & cla
-								minut += 5
-								QWdogReiq = 2
-								QWdogreiqTimer = 7
-								gs 'stat'
-								'Rimma walked you to the door.'
-								'"<<$pcs_nickname>>, did you like it?" Rimma asked, blushing.'
-								'"What do you think? I want more, Do you want to continue?"'
-								'"No, I can''t, my parents are waiting at home" Rimma tells you, looking upset. '
-								'"Then how about next week?" you offer'
-								'"let''s do it" Rimma looks very happy.'
-								'You head home, on the way you hear a woman''s voice behind you:'
-								'"Goodnight" said the strange woman.'
-								'Looking closely you recognize her as girl at the vacant lot.'
-								'"Hi" you cheerfully answered, "was it you that was watching me the entire time?"'
-								'"Yes," she smiled in response. "I saw you in the boutique, but I didn''t dare to approach you at that time, so I decided to wait outside for you."'
-								'"But why did you wait?"'
-								'"Now it''s too late, Meet me next week so we can talk" She looks at you, waiting for your response'
-								'"Let''s meet then," You agree"By way I''m <<$pcs_nickname>>"'
-								'"Margaret" She responds'
-
-								act 'Leave': minut += 8 & gt 'city_center'
-							end
-						end
-					end
-				end
-			else
-				'You and Rimma search for a dress, but couldn''t find one. You leave and Rimma is a little sad in saying goodbye to you.'
-				'You think it might help keep her attention if you make a real effort with your appearance and wear one of the nce outfits from here.'
-
-				act 'Leave': minut += 8 & gt 'city_center'
-			end
-		end
-	end
-end
-
 --- moncheri ---------------------------------
 

+ 3 - 3
locations/mother.qsrc

@@ -478,7 +478,7 @@ if $ARGS[0] = '':
 											if rand(0,1) = 0:
 												numrand = rand(1, 150)
 
-												gs 'clothing_attributes', 'gm_outfits', numrand
+												gs 'clothing_attributes', 'gm_dress', numrand
 												!!not prostitute
 												if CloStyle = 4:jump 'markbuyclomother'
 												!!Sveta can wear it and not too revealing
@@ -486,8 +486,8 @@ if $ARGS[0] = '':
 
 												if gm_dress[numrand] = 0:
 													gm_dress[numrand] = 1
-													gm_dress[numrand] = 50
-													gm_dress[numrand] = pcs_hips
+													gm_dress_h[numrand] = 50
+													gm_dress_b[numrand] = pcs_hips
 													'<center><img <<$set_imgh>> src="images/pc/items/gm/dress/<<numrand>>.jpg"></center>'
 												else
 													jump 'markbuyclomother'

+ 0 - 76
locations/nichUtil.qsrc

@@ -365,82 +365,6 @@ if $ARGS[0] = 'hired':
 	$npc_nickname['A52'] = 'Master '+$npc_firstname['A52']
 end
 
-if $ARGS[0] = 'onLoad':
-	gs 'nichUtil','updateVars'
-	if $loc = 'tanapartment' or $loc = 'tanhouse' or $loc = 'tanhousezal' or $loc = 'tanhozspal' or $loc = 'tankitchen' or $loc = 'tanNicholas' or $loc = 'tanroom' or $loc = 'tanspalnya' or $loc = 'tanvanr':
-		$loc = 'nichApartment'
-		$loc_arg = ''
-		gt 'nichUtil','updateNotice'
-	end
-end
-
-!!
-if $ARGS[0] = 'updateVars':
-	if nichTanyaOpinion > 0:
-		nichTanyaKnown = 1
-		if nichTanyaOpinion = 1:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-		elseif nichTanyaOpinion = 10:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 20
-		elseif nichTanyaOpinion = 20:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-		elseif nichTanyaOpinion = 30:
-			nichTanyaRelationship = 0
-			nichTanyaRelationshipState = 1010
-		end
-		killvar 'nichTanyaOpinion'
-	end
-end
-
-
-!! convert the old vars to the new system
-if $ARGS[0] = 'convert':
-	
-	killvar 'MaidWorkDay'
-	killvar 'MaidWork'
-	killvar 'TanHallClean'
-	killvar 'TanRoomClean'
-	killvar 'TanBathClean'
-	killvar 'TanMasterClean'
-	killvar 'TanLivingClean'
-	killvar 'TanMaidRoomClean'
-	killvar 'TanKitchenClean'
-	killvar 'TanMadeBreakfast'
-	killvar 'tanwork'
-	killvar 'tan_work_rep'
-	killvar 'tan_work_evaluation'
-end
-
-if $ARGS[0] = 'updateNotice':
-	
-	'<b><font color = red>Update Notice</font></b>'
-	'It appears as if you are currently the live-in maid of Nicholas.'
-	*nl
-	'This story-line has changed drastically in the last updates.'
-	*nl
-	'Please select one option:'
-	'1. Start over: You can play the whole story-line all over again as if it has never happened.'
-	'2. Stay hired: You will stay the maid of Nicholas and your job performance will be translated to the new system. You will be in a sexual relationship with Tanya.'
-	gs 'nichUtil','convert'
-	
-	act 'Start over':
-		gt $loc, $loc_arg
-	end
-	
-	act 'Stay hired':
-		gs 'nichUtil', 'hired'
-		nichPerformance = max(tan_work_rep * 5,10)
-		nichTanyaRelationship = 1
-		nichTanyaRelationshipState = 10
-		nichTanyaRelationshipBreakup = 0
-		gt $loc, $loc_arg
-	end
-	
-end
-
 if $ARGS[0] = 'checkOutfit':
 	if $clothingworntype = 'gm_maid':
 		nichOutfitState = 1

+ 4 - 4
locations/nyp_school.qsrc

@@ -261,7 +261,7 @@ if $ARGS[0] = 'cool jocks':
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end
-	elseif flag_start_parc >= 2:
+	elseif npc_sex['A14'] > 0:
 		!!if Sveta has started having sex with Katja
 		'While you are hanging out with the girls chatting, Katja strikes up a conversation with you. After a few moments,  a song comes on and Katja says "I love this song." She turns to you, grins and grabs you by the hand. "Come dance with me <<$pcs_nickname>>."'
 
@@ -618,7 +618,7 @@ if $ARGS[0] = 'gopniks':
 			end
 			act 'Tag the locker room':
 				cla & *clr
-				'<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>'
 				'"Where should we do it?" you ponder for a second before deciding on tagging the gym. "What do you say about the locker room?"'
 				'The others nod while you can see a clear smile on Paulina''s face as you''ve picked her suggestion.'
 				'"Shall we?" you ask. The others nod and you sneak into the boys locker room, where you start searching for the perfect spot.'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'gopniks':
 
 			act 'Head to the girls locker room':
 				cla & *clr
-				'<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 sneak into the girls locker room and find a bench to sit on, but Arkadi is nowhere to be seen. You look around worried, but Anushka calms you down. "Don''t worry, he''ll be here shortly. He just went to roll the joint."'
 				'You sit and chat for a while waiting for Arkadi and it doesn''t take long before you can see him coming towards you.'
 				'"Took you long enough!" Radomir yells out to him.'
@@ -734,7 +734,7 @@ if $ARGS[0] = 'gopniks':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						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>'
 						'As Alyona is passing the joint to you, you begin to internally freak out. You shake your head and show with a hand gesture that you pass.'
 						'"What now?" Arkadi asks. "I thought you wanted to smoke?" he irritably says.'
 						'"I''ve changed my mind." you meekly answer.'

+ 9 - 0
locations/obj_din.qsrc

@@ -2012,6 +2012,15 @@ if $ARGS[0] = 'emergency':
 	cla
 	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pav_residential'
 	act 'Go to City Residental':gt 'city_residential'
+	act 'Remove all mods':
+		killqst
+		set mod_list=0
+		killvar '$mod_name'
+		killvar '$mod_version'
+		killvar '$mod_author'
+		killvar '$mod_desc'
+		killvar '$mod_opt'
+	end
 	if $loc ! '' and $loc_arg ! '':
 		act 'Cancel':gt $loc, $loc_arg
 	elseif $loc ! '':

+ 1 - 1
locations/pav_church.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'Mom':
 			cla & *clr
 			VKChurchIntro = 1
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images\locations\pavlovsk\church\enterchurch.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
 			if VKChurch = 0:
 				'You try to make yourself comfortable on the hard wooden pew while waiting for the sermon to start. Your mother turns to you and says "It''s been a long time since you''ve been here. I should show you how to follow the sermon." You give your mother a nod while everyone takes a seat around you. The room slowly silences as the sermon begins.'
 			elseif VKChurch = 1:

+ 2 - 2
locations/pav_disco_gopniks.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'vitek_dan_vasily':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 	'Vitek, Dan and Vasily are hanging out in the dark corner of the hall with the other gopniks. It''s dimly lit and hard to make out details, but it looks like they''re sharing some beers they''ve smuggled in.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	if npc_rel['9'] => 60 and kotovLoveQW = 0:
+	if npc_rel['A9'] => 60 and kotovLoveQW = 0:
 		act 'Talk to Vitek': gt 'kotovtalker'
 	end
 	act 'Hang out with them':
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'lavrenti':
 						*clr & cla
 						minut += 15
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big155.jpg"></center>'
 						'"Want to dance?" you ask with a smile.'
 						'He pauses before nodding. "Sure, why not." Lavrenti leads you out onto the dance floor and you start dancing together.'
 						act 'Go and dance': gt 'pav_disco_gopniks', 'lavrenti_dance'

+ 3 - 3
locations/pav_discoev1.qsrc

@@ -711,7 +711,7 @@ if $ARGS[0] = 'valentin':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/valentin/sex/disco/watched_cum.jpg"></center>'
 						'A few minutes later, he starts to tense up and grunt before he pulls out of your mouth and his cum splatters across your exposed tits.'
 						'"Jesus, that''s so much cum!" She seems utterly shocked, turned on and intrigued by what she sees.'
-						'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <$pcs_nickname>>. We should do it again sometime."'
+						'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <<$pcs_nickname>>. We should do it again sometime."'
 						'Marisha clamps her hand over her mouth. "You guys do this all the time?"'
 						*nl
 						'You sigh and shake your head. "No, not all the time, Just... sometimes, when I''m in the mood."'
@@ -841,7 +841,7 @@ if $ARGS[0] = 'valentin_vag':
 				'You reach back and grab his hand. "Just fuck my pussy." He looks a little disappointed, but nods and keeps fucking your pussy.'
 				'A few minutes later, he starts to tense up and grunt before he pulls out of your pussy. He quickly turns you around and pushes you down onto the toilet. He jerks his dick and his cum starts splattering across your exposed tits.'
 				'"Jesus, that''s so much cum!" She seems utterly shocked, turned on and intrigued by what she sees.'
-				'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <$pcs_nickname>>. We should do it again sometime."'
+				'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <<$pcs_nickname>>. We should do it again sometime."'
 				'Marisha clamps her hand over her mouth. "You guys do this all the time?"'
 				*nl
 				'You sigh and shake your head. "No, not all the time, Just... sometimes, when I''m in the mood."'
@@ -900,7 +900,7 @@ if $ARGS[0] = 'valentin_anal':
 			if watched = 1:
 				'A few minutes later, he starts to tense up and grunt before he pulls out of your ass. He quickly turns you around and pushes you down onto the toilet. He jerks his dick and his cum starts splattering across your exposed tits.'
 				'"Jesus, that''s so much cum!" She seems utterly shocked, turned on and intrigued by what she sees.'
-				'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <$pcs_nickname>>. We should do it again sometime."'
+				'"Fuck, I needed that!" Once he finishes, Valentin tucks his dick away and walks out of the stall. "That was great, <<$pcs_nickname>>. We should do it again sometime."'
 				'Marisha clamps her hand over her mouth. "You guys do this all the time?"'
 				*nl
 				'You sigh and shake your head. "No, not all the time, Just... sometimes, when I''m in the mood."'

+ 15 - 0
locations/pav_market.qsrc

@@ -40,6 +40,21 @@ end
 *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.'
 
+if curr_home = 6:
+	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
+	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
+
+	if hour = meethour[0]:
+		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in front of the hotel.</b>'
+	end
+	if hour = meethour[1]:
+		if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting in front of the hotel.</b>'
+	end
+	if hour = meethour[2]:
+		if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting in front of the hotel.</b>'
+	end
+end
+
 if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0: gt 'dimaRevenge', dimaRevenge
 
 if kidaloa = 0:

+ 1 - 1
locations/pav_park.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'start':
 			*clr & cla
 			menu_off = 1
 			minut += 60
-			money += 60
+			money += 50
 			pcs_mood -= 5
 			gs 'stat'
 			'<center><h2>Pavlovsk Park</h2></center>'

+ 2 - 2
locations/pav_residential.qsrc

@@ -122,14 +122,14 @@ end
 if Enable_tablemap = 0:
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:'<a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	if (igor_history = 1 or IgorLoverQW > 0) and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
-	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Nearby is a large house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
+	if katjaQW['QWstage'] >= 2 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Nearby is a large house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
 	if LariskaQW['story'] >= 6: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
 	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
 	if (igor_history = 1 or IgorLoverQW > 0) and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
-	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','The house of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
+	if katjaQW['QWstage'] >= 2 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','The house of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
 	if LariskaQW['story'] >= 6:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
 	if AlbinaQW['KnowsHouse'] = 1:gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'

+ 1 - 1
locations/pavlov_home.qsrc

@@ -219,7 +219,7 @@ if $ARGS[0] = 'second_bedroom':
 	*clr & cla
 	minut += 1
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlov_home/spareroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/spareroom.jpg"></center>'
 	'text'
 	
 	act 'Hallway':gt 'pavlov_home', 'hallway'

+ 1 - 1
locations/praiders_garage.qsrc

@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'chat_valentin':
 			'"I didn''t know that you were all having orgies together." you reply in surprise.'
 			'"Sometimes, you just have to give into your urges, you know. Everyone has a good time and we all know that it''s just sex for the fun of it." he smiles. "You know, we might even invite you one day."'
 			'You feel your cheeks flushing at his suggestion.'
-			act 'Party over': gt 'praiders_garage', 'party_over' ''
+			act 'Party over': gt 'praiders_garage', 'party_over'
 		end
 	elseif gopnikbandQW['valob'] = 2 and gopnikbandQW['lavrenti_present'] = 1:
 		'As you and Valentin talk, Lavrenti walks over and they engage in an overly complicated handshake before Lavrenti takes a seat and joins in on the conversation. It mostly turns into them talking about girls they have or would like to fuck before someone calls Lavrenti over and he gets up.'

+ 11 - 11
locations/preCUST.qsrc

@@ -571,14 +571,14 @@ if $ARGS[0] = 'Done':
 		sportsclothingnumber = 15
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
-	if swim_start = 98:
-		danilovich_swimsuit[98] = 1
-		danilovich_swimsuit_h[98] = 60
-		danilovich_swimsuit_b[98] = pcs_hips
-	elseif swim_start = 69:
-		danilovich_swimsuit[69] = 1
-		danilovich_swimsuit_h[69] = 60
-		danilovich_swimsuit_b[69] = pcs_hips
+	if swim_start = 99:
+		allure_swimsuit[99] = 1
+		allure_swimsuit_h[99] = 60
+		allure_swimsuit_b[99] = pcs_hips
+	elseif swim_start = 1:
+		danilovich_swimsuit[1] = 1
+		danilovich_swimsuit_h[1] = 60
+		danilovich_swimsuit_b[1] = pcs_hips
 	end
 	
 !!setting default danilovich outfit and setting coats
@@ -640,9 +640,9 @@ if $ARGS[0] = 'Done':
 			gm_school[17] = 1
 			gm_school_h[17] = 120
 			gm_school_b[17] = pcs_hips
-			danilovich_outfits[4] = 1
-			danilovich_outfits_h[4] = 100			
-			sportsclothingnumber = 4
+			danilovich_outfits[65] = 1
+			danilovich_outfits_h[65] = 100			
+			sportsclothingnumber = 65
 			danilovich_shoe[17] = 1
 			danilovich_shoe[21] = 0
 		end

+ 2 - 2
locations/preSYS.qsrc

@@ -849,7 +849,7 @@ if $ARGS[0] = 'jock':
 	pcs_makupskl = 30
 	pcs_heels = 20
 	pcs_inhib = 20
-	swim_start = 69
+	swim_start = 1
 	pirsC = 1
 	PirsC1_owned = 1
 	$currentpursetype = 'fashionista'
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'cool':
 	pcs_danc = 10
 	pcs_persuas = 30
 	pcs_inhib = 20
-	swim_start = 98
+	swim_start = 99
 	kosmetica = 20
 	shampoo = 20
 	stanok = 20

+ 10 - 0
locations/purses.qsrc

@@ -91,6 +91,14 @@ if $ARGS[0] = 'view_purse_list':
 	i += 1
 	if i <= ARRSIZE('flamingos_purses'):jump 'loop_flamingos_purses'
 
+	'<center><img src="images/locations/city/island/nerdvana/shop_name.png"></center>'
+
+	i = 1
+	:loop_nerdvana_purses
+	if nerdvana_purses[i] = 1 and nerdvana_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''nerdvana'', <<i>>"><img src="images/pc/items/nerdvana/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('nerdvana_purses'):jump 'loop_nerdvana_purses'
+
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
@@ -229,6 +237,8 @@ if $ARGS[0] = 'descriptions':
 		'A sports bag for all your junk. Practical and durable but not fashionable'
 	elseif $ARGS[1] = 'fashionista':
 		'A stylish handbag for any fashion-forward female!'
+	elseif $ARGS[1] = 'nerdvana':
+		'For the geek inside you.'
 	elseif $ARGS[1] = 'gm':
 		'A functional, if not too fashionable, handbag for carrying all of the essentials.'
 	elseif $ARGS[1] = 'cats':

+ 2 - 2
locations/saveg.qsrc

@@ -15,7 +15,7 @@
 
 version_major = 0
 version_minor = 8
-version_revision = 4
-version_patch = 3
+version_revision = 5
+version_patch = 0
 --- saveg ---------------------------------
 

+ 38 - 0
locations/saveupdater.qsrc

@@ -1343,9 +1343,47 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if meynoldQW = 3: katjaQW['drunk_help'] = 1 & killvar 'meynoldQW'
 	if katja_disco_end > 0: katjaQW['no_panties_at_disco'] = 1 & killvar 'katja_disco_end'
 	if KatjaOhrenet > 0: KatjaQW['sex_in_the_park_comment'] = KatjaOhrenet & killvar 'KatjaOhrenet'
+	if flag_start_parc > 0: katjaQW['school_kiss'] = flag_start_parc & killvar 'flag_start_parc'
 
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080500:
+	if $loc = 'dorm': $loc = 'uni_dorm' & $menu_loc = 'uni_dorm'
+	if $loc = 'HotelWork': $loc = 'hotel_work' & $menu_loc = 'hotel_work'
+	if $loc = 'ParChurch': $loc = 'pav_church' & $menu_loc = 'pav_church'
+	if $loc = 'pav_train': $loc = 'pav_market' & $menu_loc = 'pav_market'
+	if $loc = 'univer': $loc = 'uni_admin' & $menu_loc = 'uni_admin'
+	if $loc='youplace': $loc = 'city_mansion_entrance' & $menu_loc = 'city_mansion_entrance'
+	if $loc='ykamin':   $loc ='city_mansion_residence_2' & $loc_arg='ylounge'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='ylounge'
+	if $loc='ykuh':     $loc ='city_mansion_residence_1' & $loc_arg='ykitchen'  & $menu_loc ='city_mansion_residence_1' & $menu_arg='ykitchen'
+	if $loc='ydet':     $loc ='city_mansion_residence_2' & $loc_arg='ynursery'  & $menu_loc ='city_mansion_residence_2' & $menu_arg='ynursery'
+	if $loc='ybib':     $loc ='city_mansion_residence_2' & $loc_arg='ylibrary'  & $menu_loc ='city_mansion_residence_2' & $menu_arg='ylibrary'
+	if $loc='ybedr':    $loc ='city_mansion_residence_1' & $loc_arg='ybedroom'  & $menu_loc ='city_mansion_residence_1' & $menu_arg='ybedroom'
+	if $loc='ybass':    $loc ='city_mansion_residence_3' & $loc_arg='ypool'     & $menu_loc ='city_mansion_residence_3' & $menu_arg='ypool'
+	if $loc='yban':     $loc ='city_mansion_residence_3' & $loc_arg='ysauna'    & $menu_loc ='city_mansion_residence_3' & $menu_arg='ysauna'
+	if $loc='yvan':     $loc ='city_mansion_residence_1' & $loc_arg='ybathroom' & $menu_loc ='city_mansion_residence_1' & $menu_arg='ybathroom'
+	if $loc='ymans':    $loc ='city_mansion_residence_1' & $loc_arg='yfoyer'    & $menu_loc ='city_mansion_residence_1' & $menu_arg='yfoyer'
+	if $loc='yzal':     $loc ='city_mansion_residence_2' & $loc_arg='yliving'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yliving'
+	if $loc='ysport':   $loc ='city_mansion_residence_3' & $loc_arg='ygym'      & $menu_loc ='city_mansion_residence_3' & $menu_arg='ygym'
+	if $loc='ykabinet': $loc ='city_mansion_residence_2' & $loc_arg='yoffice'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yoffice'
+end
+
+
+if mod_list > 0:
+	mod_i=1
+	:mod_data_updater
+	if $mod_name[mod_i] ! '':
+		$mod_su_name = 'mod_<<$mod_name[mod_i]>>_saveupdater'
+		if LOC($mod_su_name): gs $mod_su_name
+	end
+	if mod_list > mod_i:
+		mod_i+=1
+		jump 'mod_data_updater'
+	end
+	killvar '$mod_su_name'
+	killvar 'mod_i'
+end
+
 gs 'saveg'
 --- saveupdater ---------------------------------
 

+ 203 - 27
locations/shop_fashionista.qsrc

@@ -62,41 +62,53 @@ if $ARGS[0] = 'changingroom':
 	else
 		'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.'
 	end
+
+	if $pantyworntype = 'none' and week = 7 and rimma['photo'] = 0:
+		*clr & cla
+		rimma['photo'] = 1
+		rimma['day'] = daystart
+		'<center><img <<$set_imgh>> src="images/characters/city/rimma/photo.jpg"</center>'
+		'While in the changing room you get a strange feeling like you are being watched, thinking nothing of it you pose like you are a model. Wait was that the sound of a phone camera? You can''t see anyone and you are not going to run out and look while naked, it was probably just your imagination.'
+
+		act 'Disregard':gt 'shop_fashionista', 'changingroom'
+		exit
+	end
+
 	*nl
 	gs 'shortgs', 'clothing_state'
+
+!!	if week = 7 and rimma['photo'] = 1 and rimma['day'] ! daystart: Rimma event will start here
 	
-	if $clothingworntype = 'nude':
-		act 'Try on dresses': gt 'shop_fashionista', 'dressingclothes'
-		act 'Try on outfits': gt 'shop_fashionista', 'dressingoutfit'
-		act 'Try on bra':
-			if NatbelQW['seethrough'] = 0 and NatbelQW['QWstage'] > 5 and NatbelQW['underwearShop'] = 0:
+	act 'Try on dresses': gt 'shop_fashionista', 'dressingclothes'
+	act 'Try on outfits': gt 'shop_fashionista', 'dressingoutfit'
+	act 'Try on bra':
+		if NatbelQW['seethrough'] = 0 and NatbelQW['QWstage'] > 5 and NatbelQW['underwearShop'] = 0:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
+			'As you try on a particularly spicy set of see-through underwear, you notice that it doesn''t quite fit you.'
+			'"This should fit Natasha perfectly though. And it only costs 750 <b>₽</b>." You think to yourself, imagining the look on her face if you make her wear it.'
+			act 'Buy it':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
-				'As you try on a particularly spicy set of see-through underwear, you notice that it doesn''t quite fit you.'
-				'"This should fit Natasha perfectly though. And it only costs 750 <b>₽</b>." You think to yourself, imagining the look on her face if you make her wear it.'
-				act 'Buy it':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
-					'You put the underwear aside for now so that you can take it to the register with you.'
-					money -= 750
-					NatbelQW['seethrough'] = 1
-					act 'Stay in the changing room': gt 'shop_fashionista', 'changingroom'
-					act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
-				end			
-				act 'Don''t buy it':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
-					'Deciding against it, you look through the rest of the underwear for something that would fit you better.'
-					NatbelQW['underwearShop'] = 1
-					act 'Stay in the changing room': gt 'shop_fashionista', 'changingroom'
-					act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
-				end
-			else
-				gt 'shop_fashionista', 'dressingbra'
+				'You put the underwear aside for now so that you can take it to the register with you.'
+				money -= 750
+				NatbelQW['seethrough'] = 1
+				act 'Stay in the changing room': gt 'shop_fashionista', 'changingroom'
+				act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
+			end			
+			act 'Don''t buy it':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
+				'Deciding against it, you look through the rest of the underwear for something that would fit you better.'
+				NatbelQW['underwearShop'] = 1
+				act 'Stay in the changing room': gt 'shop_fashionista', 'changingroom'
+				act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 			end
+		else
+			gt 'shop_fashionista', 'dressingbra'
 		end
-		act 'Try on panties': gt 'shop_fashionista', 'dressingpanties'
 	end
+	act 'Try on panties': gt 'shop_fashionista', 'dressingpanties'
 	if $pantyworntype = 'none':
 		act 'Put on underwear':
 			gs 'underwear', 'wear'
@@ -331,5 +343,169 @@ end
 
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'fashionista',i, 3000
 
+!!Not available yet. This part needs images for most scenes, second part (not triggered here) changed to candid photo from old dog sex blackmail to trigger
+if $ARGS[0] = 'rima':
+	*clr & cla
+	menu_off = 1
+	minut += 5
+    $location_type = 'event'
+	gs 'stat'
+	'Turning your head, you think nobody noticed, but your actions have attracted the saleswoman. The seller is a young girl in a little-too-narrow shirt with the logo of the Boutique, it''s not enough that her shirt was so tight, but she had to unbutton the top button as well (You think if it was a woman''s shirt it would be okay, but since it''s a man you wonder what the administration must be thinking.) she came up to you a little bit uncomfortably and quickly asked:'
+	'"Can I help you with anything?" the seller asks.'
+
+	act 'No, thank you':gt 'moncheri', 'start'
+	act 'Silently leave': minut += 8 & gt 'city_center'
+
+	act 'Stare at her breasts':
+		*clr & cla
+		gs 'stat'
+		'Seeing that the she is a novice saleswoman and that you are most likely her first client, you decided to go for it. Just as you opened your mouth to say some harsh sentence, your eyes came to rest on her chest. The bra together with the shirt successfully emphasized her breasts, and even though only the upper part of her chest was visible, your imagination filled in the rest. You wonder what her nipples are like The thought crossed your mind suprisingly'
+		'"Yes, you can give me a few minutes of your time, "You said.'
+		'Your words make an impression on the saleswoman, and she blushes slightly embarassed.'
+		'"Yes, yes, yes - often we ask: what dress color do you like? shape of the neckline of the dress? do you want more freedom to move? or turn? do you want to highlight your perfect figure?"'
+		'"Stop, stop, - you''re a person and not a stranger, first tell me what you would like me to call you" Your words make an impression on the girl, she is flattered by your words. '
+		'"Irina" she says, before correcting herself "Saleswoman Rima."'
+		'"May I call you Rimma?" You ask."I''m <<$pcs_nickname>>".'
+		'"Yes, of course, if you''d like.", responds Rima, smiling shyly.'
+
+		gs 'arousal', 'erotic', 5
+		gs 'stat'
+
+		act 'Choose a dress with Rimma':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+
+			if pcs_hairbsh = 1 and pcs_makeup > 1 and pcs_leghair <= 0 and pcs_sweat < 20 and $clothingworntype = 'moncheri':
+				'You choose some things  and evaluate them together with Rima while hanging out a bit.'
+				'"Rima, where is the dressing room?" You ask suddenly.'
+				'Come with me - Rima didn''t notice that the invisible barrier between you is lost: the seller and the buyer.'
+
+				act 'Go inside the dressing room':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'You and Rima went together into the dressing room.'
+
+					act 'You do not like the dress':
+						*clr & cla
+						minut += 5
+						gs 'stat'
+						'As a result, you spent time together, while in your head you wonder about Rima, and her mysterious and curious body.'
+						'As you go home you suddenly feel eyes on you'
+
+						act 'Ignore': minut += 8 & gt 'city_center'
+
+						act 'Look around':
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							'You start to turn your head, looking around sharply.'
+							'You notice that a girl is looking at you.'
+
+							act 'Approach her':
+								*clr & cla
+								minut += 5
+								gs 'stat'
+								'You silently move towards her and give her a look'
+								nl
+								'"Good afternoon," you announce. "Do I know you?"'
+								'"Good day," she says, "Do you not remember me?"'
+								'The girl does not respond to your sharpness'
+								'"In principle, there is no way out of the situation that you had?" the girl answers'
+								'"What is the situation where when?" You will not hide anger.'
+								'"Yes, in the vacant lot where you were having ''fun'' with a dog" girl replied with a grin.'
+
+								act 'Yes you ohereli! (Go)': minut += 8 & gt 'city_center'
+
+								act 'Extort taken in head? What do you want?':
+									*clr & cla
+									minut += 5
+									QWdogReiq = 2
+									QWdogreiqTimer = 7
+									gs 'stat'
+									'"So you decided to blackmail me? And how much do you want?" You spit viciously '
+									'Again, your words fail to disturb her. She cocks her head to the side, and asks "Is your tantrum over?"'
+									'You tell her irritably that you have not even begun to get angry.'
+									'"No, you''re still upset let''s meet next week." The girl says suddenly.'
+									'"I guess..." you say, shaking your head.'
+									'"That''s fine, my name is Margaret" she says, looking at you expectantly.'
+									'"<<$pcs_nickname>>" you reply.'
+									'"I''m looking forward to our meeting." she says as she leaves.'
+
+									act 'Leave': minut += 8 & gt 'city_center'
+								end
+							end
+						end
+					end
+
+					act 'Take your panties off in front of Rimma':
+						*clr & cla
+						minut += 5
+						gs 'stat'
+						'You remove your panties in front Rimma and noticed how her cheeks glowed red, and her breathing quickened.'
+
+						act 'Do you like me?':
+							*clr & cla
+
+							if RimmaSex = 0:RimmaSex = 1 & girl += 1
+
+							rimmaday = daystart
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/primer.jpg"></center>'
+							'"Rimma, do you like me?" you ask quietly'
+							'"yes, very much" Rimma answers excitedly'
+							'"Then lick me" you demand'
+							'Rimma kneels down and begins to kiss your body, not very skillfully at first, starting by timidly kissing your belly then licking and covering all of your body as she grew more confident. Rimma successfully made your pussy very wet. She starts kissing and licking your crotch little by little, then bites at it. The unexpectedness makes the body flow into a sweet languor. '
+							'You smell of sex, Rimma looks up at you from between your legs for a second'
+							'After putting her right palm gently on the pubis, Rimma fingers spread your wet lips, poking out her tongue and running it inside.'
+							'The soft reciprocating action of the tongue on the clitoris excits you and causes a mild spasm. Rimma suddenly begins to press her tongue on your clitoris. Your body is already weak and no longer obeys your brain, only trying not moan load enough to alert the whole store.'
+							$orgasm_or = 'custom'
+							$orgasm_txt = 'Suddenly, Your body begins to shake and is covered in a soft wave of spasms, with the last spasm you cum. You let out a loud moan while falling to your knees.'
+							'You collapse to the floor, exhausted with pleasure.'
+
+							gs 'arousal', 'cuni', 10, 'dom', 'lesbian'
+							gs 'arousal', 'vaginal_finger', 10, 'dom', 'lesbian'
+							minut -= 10
+							gs 'arousal', 'end'
+							gs 'stat'
+
+							act 'leave the dressing room':
+								*clr & cla
+								minut += 5
+								QWdogReiq = 2
+								QWdogreiqTimer = 7
+								gs 'stat'
+								'Rimma walked you to the door.'
+								'"<<$pcs_nickname>>, did you like it?" Rimma asked, blushing.'
+								'"What do you think? I want more, Do you want to continue?"'
+								'"No, I can''t, my parents are waiting at home" Rimma tells you, looking upset. '
+								'"Then how about next week?" you offer'
+								'"let''s do it" Rimma looks very happy.'
+								'You head home, on the way you hear a woman''s voice behind you:'
+								'"Goodnight" said the strange woman.'
+								'Looking closely you recognize her as girl at the vacant lot.'
+								'"Hi" you cheerfully answered, "was it you that was watching me the entire time?"'
+								'"Yes," she smiled in response. "I saw you in the boutique, but I didn''t dare to approach you at that time, so I decided to wait outside for you."'
+								'"But why did you wait?"'
+								'"Now it''s too late, Meet me next week so we can talk" She looks at you, waiting for your response'
+								'"Let''s meet then," You agree"By way I''m <<$pcs_nickname>>"'
+								'"Margaret" She responds'
+
+								act 'Leave': minut += 8 & gt 'city_center'
+							end
+						end
+					end
+				end
+			else
+				'You and Rimma search for a dress, but couldn''t find one. You leave and Rimma is a little sad in saying goodbye to you.'
+				'You think it might help keep her attention if you make a real effort with your appearance and wear one of the nce outfits from here.'
+
+				act 'Leave': minut += 8 & gt 'city_center'
+			end
+		end
+	end
+end
+
 --- shop_fashionista ---------------------------------
 

+ 23 - 0
locations/shop_nerdvana.qsrc

@@ -26,6 +26,8 @@ if $ARGS[0] = 'start':
 	act 'View swimsuits': minut += 5 & gt 'shop_nerdvana', 'swim'
 
 	act 'View bikinis': minut += 5 & gt 'shop_nerdvana', 'bikinis'
+
+	act 'View purses': minut += 5 & gt 'shop_nerdvana', 'purses'
 end
 
 if $ARGS[0] = 'cosplay':
@@ -225,6 +227,27 @@ end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'
 
+if $ARGS[0] = 'purses':
+	$loc_arg = 'purses'
+	$loc = 'shop_nerdvana'
+	$menu_loc = 'shop_nerdvana'
+	$menu_arg = 'purses'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
+
+	i = 1
+
+	:loopnerdvana_purses
+		if nerdvana_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''purses2''"><img src="images/pc/items/nerdvana/purses/<<i>>.jpg" 	height="150" /></a> '
+		i += 1
+	if i <= 20:jump 'loopnerdvana_purses'
+end
+
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'nerdvana',i, 2000
+
 
 --- shop_nerdvana ---------------------------------
 

+ 4 - 7
locations/sleep.qsrc

@@ -4,15 +4,12 @@ if $ARGS[0] = 'simple':
 !! to avoid sleeping the whole day I decide to calcululate the duration of the sleep in advance
 !! the quality of the sleep depends on many factors, so the time of sleep can be modify later, especially the part when the time of sleep is shortened
 
-	varsleep['time_to_full'] = (100 - pcs_sleep) * 4
+	varsleep['time_to_full'] = (100 - pcs_sleep) * 6
 !! fully exhausted Sveta can recover in 420 minutes = 7 hours of sleep
 !! healthy Sveta can hardly sleep more then 10 hours = 600 minutes
 !! so we can add about 3 hours to time to full as a limit
 	varsleep['time_to_full'] += 150 + rand(0,60)
 
-	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
-
-
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 	varsleep['alarm_time_end'] = daystart*1440 + timerEnd * 60 + timerEndM
 	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
@@ -44,14 +41,14 @@ if $ARGS[0] = 'simple':
 	if alarm_holiday = 1 and kanikuli > 0:
 	!! use weekend time alarm
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
 	elseif week > 5:
 	!! use weeken time alarm 
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
-		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_bed'
+		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
 	else 
 		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
-		if varsleep['minutes to wakeup'] > 0:jump 'loopson_bed'
+		if varsleep['minutes to wakeup'] > 0:jump 'loopson_sleep'
 	end
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 	InSleep = 0

+ 1 - 1
locations/start.qsrc

@@ -18,7 +18,7 @@ $fname = 'Tahoma'
 fsize = 12
 gs 'saveg'
 gs 'addbuilddate'
-$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for "The we just blamed each other for everything so who knows how it worked out version."'
+$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for "The finally got the uni started version."'
 opPRE = 1
 
 *nl

+ 22 - 6
locations/stat_display.qsrc

@@ -1801,16 +1801,32 @@ if $pantyworntype ! 'none' and clit_size >= 25: $stat_msg += '<BR><font color =
 
 if $mudnerd ! '':$stat_msg += '<BR><<$mudnerd>>'
 
-if home_owned[1] > 0:
+if curr_home = 1:
 	$streetev_home = 'your apartment'
-elseif tanwork = 1:
+elseif curr_home = 2 or curr_home = 9 or curr_home = 13:
+	$streetev_home = 'your apartment block'
+elseif curr_home = 3:
+	$streetev_home = 'your cottage'
+elseif curr_home = 4:
+	$streetev_home = 'your apartment building at Okhlopkov Square'
+elseif curr_home = 5:
+	$streetev_home = 'the entrance to your mansion'
+elseif curr_home = 6:
+	$streetev_home = 'the hotel at Pavlovsk market.'
+elseif curr_home = 7:
 	$streetev_home = 'Tanya''s apartment'
-elseif func('uniutil', 'student', 'enrolled'):
+elseif curr_home = 8:
+	$streetev_home = 'Niko''s apartment block'
+elseif curr_home = 10:
+	$streetev_home = 'High Street in the Pavlovsk Comercial District'
+elseif curr_home = 11:
 	$streetev_home = 'your dorm'
-elseif home_owned[2] = 1:
-	$streetev_home = 'outside your apartment block'
+elseif curr_home = 12 or curr_home = 14:
+	$streetev_home = 'the street in Gadukino'
+elseif curr_home = 15:
+	$streetev_home = 'your house'
 else
-	$streetev_home = 'the train station'
+	$streetev_home = 'the city center'
 end
 
 if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'

+ 4 - 4
locations/stol.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = 'start':
 		:study_loop
 		if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
 			if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
-				dynamic '	act ''Study for your <<$class_list_name[i]>> class (30 minuts)'': gt ''stol'', ''studying'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''stol'' '
+				dynamic '	act ''Study for your <<$class_list_name[i]>> class (30 minuts)'': gt ''stol'', ''studying'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''start'' '
 			else
 				*nl
 				'You don''t need to study more this week for you <<$class_list_name[i]>> class'
@@ -121,7 +121,7 @@ if $ARGS[0] = 'start':
 		i = 0
 		:exam_loop
 		if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
-			dynamic '	act ''Study intensely for your <<$class_list_name[i]>> exam (30 minuts)'': gt ''stol'', ''studying_exam'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''stol'' '
+			dynamic '	act ''Study intensely for your <<$class_list_name[i]>> exam (30 minuts)'': gt ''stol'', ''studying_exam'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''start'' '
 		end
 		
 		i += 1
@@ -409,7 +409,7 @@ if $args[0] = 'studying':
 	else
 		'You study for half an hour, and you think you understand everything that is covered this week'
 	end
-	act 'Get up from you desk': gt 'stol', '<<$ARGS[3]>>'
+	act 'Get up from your desk': gt 'stol', '<<$ARGS[3]>>'
 end
 
 if $ARGS[0] = 'studying_exam':
@@ -492,7 +492,7 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'study_mod'
 	killvar 'nod_study'
 
-	act 'Get up from you desk': gt 'stol', '<<$ARGS[3]>>'
+	act 'Get up from your desk': gt 'stol', '<<$ARGS[3]>>'
 end
 --- stol ---------------------------------
 

+ 17 - 8
locations/street_event.qsrc

@@ -30,9 +30,12 @@ if $ARGS[0] = 'city_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if home_owned[1] > 0:
+	if curr_home = 1:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your apartment block'
+	elseif curr_home = 15:
+		streetev_home = 1
+		$streetev_home = 'near the entrance to your house'
 	end
 elseif $ARGS[0] = 'city_center':
 	$streetev_title = '<center><b>City center</b></center>'
@@ -40,9 +43,12 @@ elseif $ARGS[0] = 'city_center':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if tanwork = 1:
+	if curr_home = 7:
+		streetev_home = 1
+		$streetev_home = 'near the entrance to Nicholas'' Apartment'
+	elseif curr_home = 0 or curr_home > 15:
 		streetev_home = 1
-		$streetev_home = 'near the entrance to your home'
+		$streetev_home = 'on the street'
 	end
 elseif $ARGS[0] = 'city_industrial':
 	$streetev_title = '<center><b>City industrial region</b></center>'
@@ -60,9 +66,12 @@ elseif $ARGS[0] = 'pav_residential':
 	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
-	if home_owned[2] = 1:
+	if curr_home = 2 or curr_home = 9 or curr_home = 13:
 		streetev_home = 1
 		$streetev_home = 'outside your apartment block'
+	elseif curr_home = 8:
+		streetev_home = 1
+		$streetev_home = 'outside Niko''s apartment block'
 	end
 elseif $ARGS[0] = 'pav_commercial':
 	$streetev_title = '<center><b>Pavlovsk high street</b></center>'
@@ -70,7 +79,7 @@ elseif $ARGS[0] = 'pav_commercial':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if home_owned[1] = 0 and tanwork = 0 and func('uniutil', 'student', 'not_enrolled'):
+	if curr_home = 10:
 		streetev_home = 0
 		$streetev_home = 'on the high street'
 	end
@@ -86,7 +95,7 @@ elseif $ARGS[0] = 'city_island':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if func('uniutil', 'student', 'enrolled'):
+	if curr_home = 11:
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your dorm'
 	end
@@ -143,8 +152,8 @@ if $ARGS[1] = 'extras':
 	end
 
 	if streetev_home = 1:
-		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your building, and standing beside it, you notice Vladimir</a>.'
-		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your building, and standing beside it, you notice Vladimir</a>.'
+		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
+		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
 
 		if hour = meethour[0]:
 			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting <<$streetev_home>>.</b>'

+ 3 - 3
locations/stwork.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'tipcalculator':
 		if rand(0,5) = 0:
 			'The customers were pleased with your performance, not enough to both tipping you.'
 		else
-			paymoneyrand = rand(3,10) * 10
+			paymoneyrand = rand(3,10) * 3
 			money += paymoneyrand
 			pcs_mood += rand(1,5)
 			'The customers were pleased with your performance. They gave you <<paymoneyrand>> <b>₽</b> in tips.'
@@ -225,13 +225,13 @@ if $ARGS[0] = 'tipcalculator':
 		if rand(0,10) = 0:
 			'The customers followed your movements between their conversations. You deserved some tips but luck was against you and you got nothing.'
 		else
-			paymoneyrand = rand(10,(striptip/2)) * 10
+			paymoneyrand = rand(10,(striptip/2)) * 3
 			money += paymoneyrand
 			pcs_mood += rand(3,10)
 		'The customers followed your movements between their conversations. After counting out your tips it amounts to <<paymoneyrand>> <b>₽</b>.'
 		end
 	else
-		paymoneyrand = rand(10,striptip) * 10
+		paymoneyrand = rand(10,striptip) * 3
 		money += paymoneyrand
 		pcs_mood += rand(5,20)
 		'The customers were mesmerized by your dancing and tipped you <<paymoneyrand>> <b>₽</b>.'

+ 1 - 1
locations/telefon.qsrc

@@ -1572,7 +1572,7 @@ end
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
 	
 	To add an incoming message 
-	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images\pc\selfies\bathroom\underwear\1.jpg', 'images\pc\selfies\school_bathroom\pussyflash\1.jpg'
+	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	You can have up to 4 pictures attached to the message
 

+ 43 - 1
locations/therapist.qsrc

@@ -1777,6 +1777,12 @@ if $ARGS[0] = 'hypnoRandom':
 		*clr
 		hypnoRandomCounter = 0
 		therapistFuckedPussyStage += 1
+		pillsleft[0] = 0
+		pillsleft[1] = 0
+		pillsleft[2] = 0
+		pillsleft[3] = 0
+		pillsleft[4] = 0
+		pillsleft[5] = 0
 		tabletki = 1
 		tabletkiold = 0
 		tabletkifert = 1
@@ -2349,7 +2355,43 @@ if $ARGS[0] = 'hypnoProstitute':
 						'Then his eyes go wide and he grabs you by the arm and pulls you over by the dumpster, practically dragging you. "Yea I wanna fuck you! Little slut! Get over here!"'
 						act 'Continue':
 							:hypnoProstGuy3Start1
-
+							i = rand(1,3)
+									if i = 3:
+										'He tells you to get on your hands and knees.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									elseif i = 2:
+										'You pull your clothes off. He tells you to sit on his cock and ride him.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									else
+										'You pull your clothes off. He tells you to get on your hands and knees on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									end
+									act 'Crawl onto the seat':
+										'<<$img1>>'
+										'You get into position and offer him your pussy.'
+										'He quickly presses the head of his cock against your hole and it slides in easily.'
+										act 'Get Fucked':
+											'<<$img2>>'
+											$butt = dyneval('$result = <<''$pcs_butt_adj''+rand(1,2)>> ')
+											''
+											'He fucks your pussy hard and fast. The car fills with the sound of his hips slapping against your <<$butt>> and the squelching of your wet pussy.'
+											'He uses your pussy for his own pleasure for some time until you start to feel his cock bulge inside of you and he lets out a moan.'
+											act 'Take his cum':
+												'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
+												'He unloads inside of your vagina.'
+												act 'Continue':
+													'You dress and step out of the car. The man drives away, leaving you alone at the gas station.'
+													
+													act 'Continue waiting':
+														gt 'therapist', 'hypnoProstitute'
+													end
+												end
+											end
+										end
+									end
 						end
 					end
 				else

+ 2 - 2
locations/traits.qsrc

@@ -153,8 +153,8 @@ if $ARGS[0] = 'menu':
 	!!exp earned from anal sex but degrades over time. Level 3 can be lost but lvl1 and 2 cannot
 	'<center><b>Buttslut</b></center>'
 	if traits['buttslut_lvl'] = 0:
-		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to gain more anal orgasm exp.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to have more anal than 10 anal orgasms.'
+		'You currently have had <<orgasm_anal>> anal orgasms.'
 	elseif traits['buttslut_lvl'] = 1:
 		'You have this trait at level 1. To reach lvl 2 you need to gain more anal orgasm exp.'
 		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'

+ 94 - 49
locations/uni_admin.qsrc

@@ -1,13 +1,13 @@
 # uni_admin
 
 !!This is the file containing the university administartion office.
-!!It is important since include to option to enroll in university, and therefore sets the variable regarding the choice of study.
+!!It is important to include an option to enroll in university, and therefore set the variable regarding the choice of study.
 
-!!The follwoing vables will be set in this file.
-!! university['prep_enrolled'] is set to 1 in the player enrolls in the university preparation program. 
-!! university['student'] is set to 1 in the player enrolls in a university program.
-!! $university['enrolled_in'] is set to the name of the university program the player enrolls in, there is the following progams: teaching_studies
-!! university['enrolled_in_semester'] is set to the semester the player enrolls in starting fom 1 for the first semester and ending with 8 for the last.
+!!The following variables will be set in this file.
+!! university['prep_enrolled'] is set to 1 if the player enrolls in the university preparation program. 
+!! university['student'] is set to 1 if the player enrolls in a university program.
+!! $university['enrolled_in'] is set to the name of the university program the player enrols in. There is the following progams: teaching_studies
+!! university['enrolled_in_semester'] is set to the semester the player enrolls in starting at 1 for the first semester and ending with 8 for the last.
 
 
 
@@ -25,25 +25,24 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">The University Administration Building</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/uni_admin.jpg"></center>'
-	'The main lobby is large with several pillars across the room, on each end is a large set of stairs that go up to the next level. Opposite you is a long wall with several hallways going off to each side and two straight ahead.'
-	!!this below will all need to be updated and cleaned up. I am leaving it as is for now as I don''t know how to fix it
-	if university['diploma'] > 0:
-		'You have graduated from the University.'
+	'The main lobby is large with several pillars spread across the room. At each end of the room is a large set of stairs that go up to the next level. Several hallways going off in all directions stand opposite you.'
+    if university['diploma'] > 0:
+		'You have graduated from the university.'
 	elseif university['expelled_for_missing_exam'] = 0 and university['expelled'] = 1:
-		'You have been expelled from the University for failing your exams.'
+		'You have been expelled from the university for failing your exams.'
 	elseif university['expelled_for_missing_exam'] = 1:
-		'You have been expelled from the University for skipping your exams.'
+		'You have been expelled from the university for skipping your exams.'
 	elseif func('uniutil', 'student', 'expelled_for_other_reason'):
-		'You have been expelled from the University for reasons unrelated to your exam results.'
+		'You have been expelled from the university for reasons unrelated to your exam results.'
 	elseif university['student'] = 0:
 		if university['prep_enrolled'] = 1 and month = 8:
 			'You''ve enrolled in the preparatory classes.'
 		elseif university['prep_enrolled'] = 1:
 			'You''ve enrolled in the preparatory classes. They will start in August'
 		else
-			'You can take preparatory classes at the University on weekdays for 15000<b>₽</b>.'
+			'You can take preparatory classes at the university on weekdays for 15000<b>₽</b>.'
 		end
-		'Admission examinations for the University are held in August.'
+		'Admission exams for the university are held in August.'
 	end
 	act 'Leave':
 		minut += 2
@@ -58,7 +57,10 @@ if $ARGS[0] = 'start':
 		act 'Take the entrance exam (1:00)': gt 'uni_admin', 'take_test'
 	end
 	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and (storyline ! 1 or SchoolAtestat = 1) and month < 9:
-		act 'Enroll at the University': gt 'uni_admin', 'enrollment'
+		act 'Enroll at the university': gt 'uni_admin', 'enrollment'
+	end
+	if university['enrolled_in_semester'] > 0 and university['enrolled_in_semester'] = university['semester_passed'] and university['semeter_passed'] < 8:
+		act 'Enroll in your next semester': gt 'uni_admin', 'enrollment_semester'
 	end
 	!!the if below should only show up if Sveta tried to enroll and didn''t or couldn''t pay for the classes before
 	if university['entrance_information'] = 1 and university['prep_enrolled'] = 0 and university['student'] = 0 and month < 9: gs 'uni_admin', 'prep_pay'
@@ -69,27 +71,27 @@ if $ARGS[0] = 'enrollment':
 	cla & *clr
 	minut += 15
 	gs 'stat'
-	'<center><b><font color="maroon">Enrollment office</font></b></center>'
+	'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment1.jpg"></center>'
-	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of young people about your age waiting in a side room. You inform them you wish to enroll at the university, they take down your name and ask you to go wait in the waiting room until your name is called. You walk into the other room, smile and nod to the other prospective students and take a seat.'
+	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of people around your age waiting in a side room. You inform them that you wish to enrol at the university. They take down your name and ask you to wait in the waiting room until your name is called. You walk into the other room and nod at the other prospective students before taking a seat.'
 	act 'Wait your turn':
 		cla & *clr
 		'<center><b><font color="maroon">Enrollment office</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
-		'You wait until until your name is called by one of the women. She then leads you down a side hall to one of the offices, letting you take a seat and introduce yourself. After a brief discussion the woman takes your information and enters it into the computer.'
+		'You wait until until your name is called by one of the women, who leads you down a side hall to one of the offices. You take a seat and introduce yourself, and after a brief discussion the woman takes your information and enters it into the computer.'
 		if class['school_grade_average'] >= 70 or university['entrance_exam_passed'] = 1:
 			minut += 15
-			'She looks over the information for a bit, filling in some data. Several minutes later she turns to you and smiles, telling you that you are eligible to enroll at the university. She gives you a lot of paperwork and you spend some time filling it all out. Once done, she asks you to stand up so she can take your picture. As she works on your university ID card she tells you about the different degrees, giving you time to decide which route you want to choose.'
+			'She looks over your information and fills in some data. Several minutes later, she turns to you and smiles, telling you that you are eligible to enrol at the university. She gives you a lot of paperwork and you spend some time filling it all out. Once done, she asks you to stand up so she can take your picture. As she works on your university ID card she tells you about the different degrees, giving you time to decide which one you want to choose.'
 			act 'Teaching degree':
 				cla
-				'You inform her you wish to acquire a teaching degree. She hands you a packet of information about your classes you will be attending and about dorm life., next she inquires if you will be signing up for any elective classes at this time.'
-				act 'No not now':
+				'You inform her you wish to acquire a teaching degree. She hands you a packet of information about the classes you will be attending and about dorm life. She then inquires if you will be signing up for any elective classes at this time.'
+				act 'Not right now':
 					cla
-					'You shake your head no and tell her you don''t intend to sign up for any elective classes right now. She nods and makes a few more notes and then hands over your finished paperwork, welcoming you to Saint Petersburg University. You get up and leave, looking forward to when you can come back and start your classes.'
+					'You shake your head and tell her you don''t intend to sign up for any elective classes right now. She nods and makes a few more notes before handing over your finished paperwork, welcoming you to Saint Petersburg University. You get up and leave, looking forward to when you can come back and start your classes.'
 					act 'Leave':gt 'uni_admin', 'start'
 				end
-				act 'Enroll':
-					!!This sets the variables such that the player is enrroled in the first semester of the teaching program.
+				act 'Enrol':
+					!!This sets the variables such that the player is enrolled in the first semester of the teaching program.
 					university['prep_counter'] = 0
 					university['prep_enrolled'] = 0
 					university['student'] = 1
@@ -97,36 +99,36 @@ if $ARGS[0] = 'enrollment':
 					university['enrolled_in_semester'] = 1
 					home_owned[11] = 1
 					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'teaching methods', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'learning theories', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'general education', 35
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'teaching methods', 35
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories', 35
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'teaching methods 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'learning theories 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'general education 101', 35
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'teaching methods 101', 35
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories 101', 35
 					cla
-					'You tell her you would like to pursue a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take. Once the ID is done she hands it over, along with all of your paperwork. You are now officially enrolled as a student at the Saint Petersburg University.'
+					'You tell her you would like to pursue a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take. Once your ID is done she hands it over, along with all of your paperwork. You are now officially enrolled as a student at the Saint Petersburg University.'
 					if (day - week) >= 27 and month = 8:
 						university['semester_week'] = 1
 						*nl
 						'She tells you that you enrolled at the last minute, and the classes have already started this week.'
 					end
 					act 'Leave':gt 'uni_admin', 'start'
-!!once we have the framework working i will start working on some elective classes, once we have a couple of them I will add them here.
+                    !!Once we have the framework working, I will start working on some elective classes and add them here.
 					!!act 'Take some elective classes':
 				end
 			end
 		else
 			university['entrance_information'] = 1
 			minut += 5
-			'She looks over the information for a bit, filling in some data. Several minutes later she turns to you frowning and tells you that you not are eligible to enroll at the university at this time, your grades from Pavlovsk Secondary School were not good enough. She informs you with so many students applying they can only take those with better grades, but you can still get in if you sign up and take the preparatory classes and pass them with a high enough grade. You do have to pay for the classes though.'
+			'She looks over the information, filling in some data. Several minutes later she turns to you and frowns, telling you that you''re not eligible to enrol at the university at this time. Your grades from secondary school were not good enough. She informs you that with so many students applying, they can only take those with better grades, but you can still get in if you take the preparatory classes and pass them with a high enough grade. You do have to pay for them though.'
 			act 'You don''t want to sign up':
 				cla
-				'You shake your head and thank her, but tell her you will think about it. She smiles to you and tells you she understands, then you leave.'
+				'You shake your head and thank her, telling her you will think about it. She smiles at you and tells you she understands before you leave.'
 				act 'Leave class':gt 'uni_admin', 'start'
 			end
 			act 'You don''t have enough money':
 				cla
-				'You tell her you don''t have enough money to pay for the classes. She nods in understanding and tells you if you get the money to come back and you can sign up later. You thank her for the information and leave.'
+				'You tell her you don''t have enough money to pay for the classes. She nods in understanding and tells you to come back and sign up later if you get the money. You thank her for the information and leave.'
 				act 'Leave class':gt 'uni_admin', 'start'
 			end
 			gs 'uni_admin', 'prep_pay'
@@ -134,30 +136,74 @@ if $ARGS[0] = 'enrollment':
 	end
 end
 
+if $ARGS[0] = 'enrollment_semester':
+	$sexloc = 'uni_admin'
+	cla & *clr
+	minut += 15
+	gs 'stat'
+	'<center><b><font color="maroon">Enrollment Office</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment1.jpg"></center>'
+	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of people around your age waiting in a side room. You inform them that you wish to enrol at the university. They take down your name and ask you to wait in the waiting room until your name is called. You walk into the other room and nod at the other prospective students before taking a seat.'
+	act 'Wait your turn':
+		cla & *clr
+		'<center><b><font color="maroon">Enrollment office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
+		'You wait until until your name is called by one of the women, who leads you down a side hall to one of the offices. You take a seat and introduce yourself, and after a brief discussion the woman takes your information and enters it into the computer.'
+		if 	$university['enrolled_in']= 'teaching_studies':
+			minut += 15
+			'She looks over your information and fills in some data. Several minutes later she turns to you and smiles, telling you that you since you passed your last semester you can enrol in the '+trim(MID('  first, second, third, fourth, fifth, sixth, seventh, eighth,  ninth,  tenth', (university['enrolled_in_semester']+1)*8,7))+' of the Teaching Studies Program. She gives you the paperwork and you spend some time filling it all out.'
+			act 'Enrol':
+				!!This sets the variables such that the player is enrolled in next semester of the teaching program.
+				university['enrolled_in_semester'] += 1
+				if university['enrolled_in_semester'] = 2:
+					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'general education 102', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'teaching methods 102', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'general education 102', (class['uni_teaching_studies_semester_1_general education 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'teaching methods 102', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 35
+				end
+				cla
+				'You tell her you would like to continue pursuing a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take.'
+				if (day - week) >= 27 and month = 8:
+					university['semester_week'] = 1
+					*nl
+					'She tells you that you enrolled at the last minute, and the classes have already started this week.'
+				end
+				act 'Leave':gt 'uni_admin', 'start'
+                    !!Once we have the framework working, I will start working on some elective classes and add them here.
+					!!act 'Take some elective classes':
+			end
+		end
+	end
+end
+
+
 if $ARGS[0] = 'prep_pay':
 	if money >= 15000:
-		act 'Pay for the preparatory classes 15000<b>₽</b>) (Cash)':
+		act 'Pay for the preparatory classes (15000<b>₽</b>) (Cash)':
 			cla & *clr
 			minut += 10
 			money -= 15000
 			gs 'stat'
 			university['prep_enrolled'] = 1
-			'<center><b><font color="maroon">Enrollment office</font></b></center>'
+			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/payment.jpg"></center>'
-			'You go back to the enrollment office, paying 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
+			'You go back to the enrollment office and pay 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
 			act 'Leave':gt 'uni_admin', 'start'
 		end
 	end
 	if karta >= 15000:
-		act 'Pay for the preparatory classes 15000<b>₽</b>) (Card)':
+		act 'Pay for the preparatory classes (15000<b>₽</b>) (Card)':
 			cla & *clr
 			minut += 10
 			karta -= 15000
 			gs 'stat'
 			university['prep_enrolled'] = 1
-			'<center><b><font color="maroon">Enrollment office</font></b></center>'
+			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/payment.jpg"></center>'
-			'You go back to the enrollment office, paying 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
+			'You go back to the enrollment office and pay 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
 			act 'Leave':gt 'uni_admin', 'start'
 		end
 	end
@@ -170,7 +216,7 @@ if $ARGS[0] = 'take_prep':
 	university['prep_counter'] += 1
 	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 	gs 'stat'
-	'<center><b><font color="maroon">Preparatory class</font></b></center>'
+	'<center><b><font color="maroon">Preparatory Class</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'
 	'You attend the preparatory class for an hour. You pay close attention to what is being said and take notes for the entrance examination later on.'
 	act 'Leave class':gt 'uni_admin', 'start'
@@ -184,17 +230,16 @@ if $ARGS[0] = 'take_test':
 	gs 'stat'
 	'<center><b><font color="maroon">Entrance Exam</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'
-	'You enter the exam room and take your seat. A professor comes out and talks over all the different parts of the exam you will be taking and discusses what is required to pass. Once that is done he passes out the test, then starts the clock. You have one hour to complete the test.'
-!!this is a copy of the old stuff, the code will need to be completely rewritten not sure how we will do it. I assume it will take intel and pav school grades into account? don''t know
-	if pcs_intel +university['prep_counter'] >= 100:
+	'You enter the exam room and take your seat. A professor comes out and talks about the different parts of the exam you will be taking and what is required to pass. Once he''s finished, he passes out the papers and starts the clock. You have one hour to complete the test.'
+    if pcs_intel +university['prep_counter'] >= 100:
 		university['entrance_exam_passed'] = 1
-		'You completed the entrance examination, passing it with a perfect score.'
+		'You completed the entrance examination and passed it with a perfect score.'
 	elseif pcs_intel + university['prep_counter'] >= 80:
 		university['entrance_exam_passed'] = 1
-		'You completed the entrance examination, passing it.'
+		'You completed the entrance examination and passed it.'
 	else
 		university['entrance_exam_passed'] = -1
-		'You completed the entrance examination, failing to pass the exam.'
+		'You completed the entrance exam, but failed to pass.'
 	end
 	act 'Leave the exam room':gt 'uni_admin', 'start'
 end

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor