1
0

207 Коммиты 5343f74e03 ... 3f84f3f223

Автор SHA1 Сообщение Дата
  philormand 3f84f3f223 Add curloc to debug 4 лет назад
  KevinSmarts a2d412d1a2 [Added] BTatiana mission from THX, proofed by Erized 4 лет назад
  KevinSmarts 97f17b3e96 [added] Trauma system to limit max mood from julzor 4 лет назад
  KevinSmarts 6f39ee9681 [fixed] Missing or broken headings/footers on files 4 лет назад
  KevinSmarts a0281e7efd Merge remote-tracking branch 'Gwen/master' 4 лет назад
  KevinSmarts cb47b0fc48 [changed] Rewritten instructions for skill attribute bleed through as it was impossible to understand. Much thanks to Philo for deducing the impact by reading the code itself 4 лет назад
  Gwyneth 93bf167581 [Change] school outfits update and addition 4 лет назад
  Gwyneth 358cabce95 [change] update the office outfit number in sucubus filefrom if i <= 101:jump 'loopoffice' to if i <= 128:jump 'loopoffice' then to if i <= 140:jump 'loopoffice' 4 лет назад
  KevinSmarts 40dcf16fb7 [fixed] Dildo usage was not coded so penetration did not occur and Security Guard data was not generated. 4 лет назад
  Vengeance11 a1be3518c7 A few tweaks, edits and fixes 4 лет назад
  KevinSmarts 5b1d5598b8 [fixed] its intel and not int 4 лет назад
  KevinSmarts 5fa67d916f Merge remote-tracking branch 'Gwen/master' 4 лет назад
  LAPTOP-NKHR88EM\USER e5f9c4aa8d [Change] Fetish Clothing Adjustments 4 лет назад
  KevinSmarts 999fdb23f2 Merge remote-tracking branch 'Gwen/master' 4 лет назад
  LAPTOP-NKHR88EM\USER baee236dd3 [changed] increased number of outfits in sex shop 4 лет назад
  KevinSmarts 8da43edaa6 [text edit] New touches and proofread by Erized 4 лет назад
  KevinSmarts 9fe3752454 [text edit] Text edits of old machin translations to full English from Pocket 4 лет назад
  KevinSmarts f7b7a84bf5 [fixed] Images links set to use old folder now corrected so the image pack can be tidied up thanks to Gwen 4 лет назад
  KevinSmarts a350798d55 [chages] New outfits and changes to existing for Mon Chèri from Gwen 4 лет назад
  KevinSmarts e4b3143d48 [fixed] Wrong variable spotted by sword 4 лет назад
  KevinSmarts 0a9674812b [fixed]Old variable still in use 4 лет назад
  KevinSmarts 2e72c5112b Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  KevinSmarts 481f4234c5 [added] Extra name for changelog 4 лет назад
  KevinSmarts a388b24eed [fixed] Referals stopped after Mom kicks you out thanks to julzor 4 лет назад
  KevinSmarts 3d613284c2 [fixed] Text edit got reversed in error 4 лет назад
  KevinSmarts ee26a12141 [fixes] Image corrections and a text edit from Gwen 4 лет назад
  KevinSmarts 1335378e74 [fixed] Made if - ifelse checks less clunky 4 лет назад
  KevinSmarts 916493df5c [fixed] Flawed logic in Luda's apartment resolved by sword 4 лет назад
  KevinSmarts 5cfa6ef61c [fixes] Sonia chat blockpost school, broken Igor chat commented out and a cleaning of text for hotel entrance from julzor 4 лет назад
  KevinSmarts 0e498a1310 [added] Update to chagelog and start for bug fix release 4 лет назад
  KevinSmarts 4998367136 [fixed] Extra colon found by analyser 4 лет назад
  KevinSmarts a5d00c179e [removed] For removed files (didn't add to staged section when making last commit, doh) 4 лет назад
  KevinSmarts 1ba812250e [removed] all starlets code and files relating to old punishment that is no longer posible 4 лет назад
  KevinSmarts f2a08aebfa [fixed] Bad links for images fixed by Gwen 4 лет назад
  KevinSmarts ec9a3f216c [fixed] Moved image location as Gwen found it in wrong folder 4 лет назад
  Vengeance11 667a4ed983 Added new gossip about Albina. 4 лет назад
  KevinSmarts 8ea124577c [fixed] Used better variables to check for nude modelling as recommended by rachels 4 лет назад
  KevinSmarts a88fd8ed11 [added] Missing changlog entry 4 лет назад
  KevinSmarts a249dfc7d4 [fixed] blocked events that move the player into the parents apartment when Sveta isn't allowed to go there from julzor 4 лет назад
  KevinSmarts c5c4a4db8a [fixed] Variables wrong way around giving player wrong info fixed by robgor95 4 лет назад
  KevinSmarts 8ee76684bd [fixed] Locations show opening hours when closed on the island now thanks to julzor 4 лет назад
  KevinSmarts 92e74687d8 [fixes] Missing actions found by robgor95 4 лет назад
  KevinSmarts fd6a241642 [fixed] Incorrect variable variations for curr_home 4 лет назад
  KevinSmarts a503eaef2e [added] Place in Pav market to sell unwanted clothing from julzor 4 лет назад
  KevinSmarts c39f4299f7 [added] Notices for closed businesses to city res so player can see that they exist there and when they are open from julzor 4 лет назад
  KevinSmarts 7bd508ed5e [fixed] Removed willpower requirement to leave when thrown out my Mom from julzor 4 лет назад
  KevinSmarts 42d321cb34 [fixed] Few more events from school blocked if not there (in journal) from Julzor 4 лет назад
  KevinSmarts ee39e94608 Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  KevinSmarts 1e903349c8 [Added] Override to turn off generic orgasm messages 4 лет назад
  Vengeance11 1c25809aad Grammar fix 4 лет назад
  Vengeance11 15ee65e309 Cleaned up some text and fixed some truly horrifying machine machine translation. 4 лет назад
  KevinSmarts 271f146749 [fixed] Some things weren't stopped from displaying adn proccessing when Sveta is expelled, from julzor 4 лет назад
  KevinSmarts ac6817ea42 Revert "Max grades linked to intelligence." 4 лет назад
  KevinSmarts 65b77470b0 Revert "Trying to move the guitar related actions to the sidebar." 4 лет назад
  KevinSmarts 0c1bc22681 Revert "New location music_actions" 4 лет назад
  KevinSmarts 3246229129 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 лет назад
  KevinSmarts e90220b2f0 [changed] Brest size desrcipions for clothing altered with one extra step to give more accurate results, reworded teh bra replacement line too 4 лет назад
  KevinSmarts 6c2ee12024 Merge remote-tracking branch 'netuttki/ml_dev' 4 лет назад
  KevinSmarts 7ba7d59e44 Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  KevinSmarts cd1aa87529 [changed] Brest size desrcipions for clothing altered with one extra step to give more accurate results, reworded teh bra replacement line too 4 лет назад
  Netuttki 6c42f06366 New location music_actions 4 лет назад
  Netuttki a3d9c9e80e Trying to move the guitar related actions to the sidebar. 4 лет назад
  Netuttki 1fb24088d6 Max grades linked to intelligence. 4 лет назад
  Netuttki ae0c77aa83 Found a missing `end` and fixed it. 4 лет назад
  Netuttki e1cee8ae62 Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 99345a089f [fixed]Wrong sign 4 лет назад
  Netuttki 6afd1b6ca8 Made the music related bits uniform for all locations. 4 лет назад
  Netuttki 2895c2d6b6 Fixed a bug that messed up a bunch of things. 4 лет назад
  Netuttki 0bde1b615a Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 9c0476873f [fixed] Syntax errors spòtted by julzor 4 лет назад
  KevinSmarts e8a7c10bce [fixed] Syntax updated by julzor 4 лет назад
  Netuttki 6a90df196d Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 79b5570ed6 [fixed]Mixing menu settings from julzor 4 лет назад
  KevinSmarts 2f10ae90bc [added] Notes to start descriptions in regard to amount of content available. 4 лет назад
  Vengeance11 7fd28e78d6 Cleaned up text so it flows better 4 лет назад
  KevinSmarts 861c639eef Merge remote-tracking branch 'hornguy6/master' 4 лет назад
  KevinSmarts 90193f6ec4 [added] Stat bars showing standing with school social groups to the journal school page. 4 лет назад
  hornguy6 dfd04a582f [changed] image links for NPCs away from the scrapbook style to the small headshots 4 лет назад
  Netuttki e78bd84719 Merge remote-tracking branch 'upstream/master' 4 лет назад
  hornguy6 459267ca3f [fixed] people working as a masseuse without having a certificate 4 лет назад
  hornguy6 62eb62608c [added] save updater to fix Katja and Natasha variables 4 лет назад
  KevinSmarts e972e82da4 Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  KevinSmarts c2d182781e Merge remote-tracking branch 'netuttki/master' 4 лет назад
  KevinSmarts 9cf131ec89 Merge remote-tracking branch 'hornguy6/master' 4 лет назад
  hornguy6 7ed0a65cef [added] text that notifies you when you think mom took your dildos 4 лет назад
  hornguy6 27767c46ce [changed] edit to text to sound nicer 4 лет назад
  hornguy6 6009f028cb [fixed] missing letter 4 лет назад
  hornguy6 d017dd7fc8 [added] variation for the runway event 4 лет назад
  hornguy6 c696421d87 [changed] how special events are selected 4 лет назад
  hornguy6 2cb9fa7137 [changed] code to account for new modelling images 4 лет назад
  hornguy6 76ce5234b1 [added] new modelling documentary event 4 лет назад
  hornguy6 77d3209be3 [fixed] the ability to meet up with Vicky and still be a cheerleader 4 лет назад
  hornguy6 6a525f0007 [changed] text change when openly buying birth control from Luda so she doesn't automatically assume you're a slut 4 лет назад
  hornguy6 24899d987e [added] new option to choose when Christina and Lina find you on the beach naked 4 лет назад
  hornguy6 e916074f06 [changed] formatting of text in an event 4 лет назад
  hornguy6 50353416bd [added] athome variable for anya to be able to use one variable to see if she's home or not 4 лет назад
  hornguy6 5de0dd11d9 [changed] updates to text and accounting for new dildo media that was added 4 лет назад
  hornguy6 43ce327458 [changed] way masseuse sex videos are handled to have creampies play that are consistent with the position you were last seen using 4 лет назад
  hornguy6 b23d97b416 [fixed] assorted bugfixes for Katja courtesy of julzor 4 лет назад
  hornguy6 252dd9dc8f [fixed] allowing you to pick up the masseuse paycheck any day after friday, not only on friday 4 лет назад
  hornguy6 d7d7773c2d [fixed] something that will set model to 0 and not constantly keep the save updater running 4 лет назад
  hornguy6 84eeaf9633 [changed] new icons for modelling and porn so the work icon is not constantly active at all times 4 лет назад
  Netuttki a75a25e194 Artem's home was missing from 'fin'?? 4 лет назад
  Netuttki d9f1c735f5 Merge remote-tracking branch 'upstream/master' 4 лет назад
  Vengeance11 7e45451449 Fixed some small spelling errors 4 лет назад
  KevinSmarts ddd4b06bed [fixed]Broken logic on Mom schedule and forced to see Mom straight after liturgy leading to far too long in the church 4 лет назад
  KevinSmarts 88ed76132e [fixed] Wrong symbol lead to Mom being in church all morning 4 лет назад
  hornguy6 e2bfc91675 [fixed] bad image link 4 лет назад
  Netuttki 134a2d5d06 Can read in bed. Hotel room had no option for reading, now it has. 4 лет назад
  Netuttki cca39bab32 Book borrowed from Artem can be read now. 4 лет назад
  hornguy6 34c79dff4c [changed] new willpower calculations for when the studio pressures you into doing something more 4 лет назад
  hornguy6 4ecb84a596 [changed] model variable to model['status'] 4 лет назад
  Netuttki e1bb7e53bb Merge remote-tracking branch 'upstream/master' 4 лет назад
  Netuttki 2bd583147b Fixed where player got locked out of the hotel even if she had a room 4 лет назад
  KevinSmarts fe4d435a30 Merge remote-tracking branch 'hornguy6/master' 4 лет назад
  hornguy6 e90395009d [fixed] incorrect image links 4 лет назад
  hornguy6 f0a371bf9f [fixed] forgot to add a requirement 4 лет назад
  KevinSmarts dc03a716ba Merge remote-tracking branch 'hornguy6/master' 4 лет назад
  Netuttki 6924924615 Merge remote-tracking branch 'upstream/master' 4 лет назад
  Netuttki 2d09d89270 Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 7beced3c5a [fixed] bimbocl variable was being turned off in clothing and therefore not giving bimbo pts in cikl. 4 лет назад
  KevinSmarts 40fd1d61de [added] Mom knows the slut start Sveta is a whore now, because of course she would. 4 лет назад
  hornguy6 835c62a614 [fixed] captialized letter that should be capitalized 4 лет назад
  hornguy6 4bad57feff [added] model['age'] variable for tracking model's age 4 лет назад
  hornguy6 f837328832 [changed] low razor warning requires even lower amount 4 лет назад
  KevinSmarts aebf6083e4 Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  KevinSmarts 2a879b6669 Merge remote-tracking branch 'hornguy6/master' 4 лет назад
  KevinSmarts ec9919d74d [added] Chat with Mom about real grandparents from Erized, proofed by Shima 4 лет назад
  KevinSmarts 8a36f18e01 [fixed] Wrong image link in changing rooms so swimwear was showing wrong images for new stuff 4 лет назад
  Vengeance11 a93d131e75 Added Bella into Albina's former place in cool kid dialogue. 4 лет назад
  hornguy6 95ef60de78 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 лет назад
  hornguy6 7bdf3d1be7 [changed] format for massage service description 4 лет назад
  hornguy6 e5531c0036 [fixed] the journal to show your shifts at the salon a little better 4 лет назад
  hornguy6 93c4db8e63 [fixed] other typos 4 лет назад
  hornguy6 875fcb3f9a [fixed] variable requirement of 0 that should have been 1 4 лет назад
  hornguy6 85adf28b1e [fixed] a typo I saw that only appears in code but bugged the crap out of me 4 лет назад
  hornguy6 894c1daba2 [changed] cleaned up the masseuse_work file to be more consistent 4 лет назад
  hornguy6 6cc0e18f63 [fixed] wrong wrong cum_cleanup variable calls 4 лет назад
  hornguy6 55471db148 [added] ability to resize individual clothes at the tailor and at home 4 лет назад
  hornguy6 6b56c2febe [added] warnings for when you're about to run out of feminine hygiene products and razors 4 лет назад
  hornguy6 8148aec959 [added] code to remove dildos from the bathroom after mom discovers it 4 лет назад
  hornguy6 310791cb01 [fixed] dildo gyno referral leading to where its supposed to 4 лет назад
  Netuttki 01129f8b98 Fixed the bug when using internet at someone else's place 4 лет назад
  Netuttki 4c79a5eb1f Fixed bug: no way to arrange guitar lesson if missed once. 4 лет назад
  Netuttki 5c73652f27 Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 3af88229a1 [fixed] fix for usage of internet payment when using someone else's pc from Julzor 4 лет назад
  KevinSmarts 62dc95ca7c Merge remote-tracking branch 'netuttki/master' 4 лет назад
  KevinSmarts e7810312fa Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  Netuttki 566c521b0e Corrected the time requirement for editing 4 лет назад
  Netuttki 40314f3d0e Fixed bugs in music account setup where computer was required 4 лет назад
  Netuttki d2d89b497a Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 1c197f29a3 [fixed] Now require computer to set up online music thingy in your room thanks to Julzor 4 лет назад
  KevinSmarts 5fa6f54d3d [Fixed] Missing menu_off settings in mother file from julzror 4 лет назад
  KevinSmarts 4125b961e3 [fixed] Count for morning after pills in handbag had wrong variable now correct thanks to julzor 4 лет назад
  KevinSmarts ea6feba75b [Fixed] Dimka blackmail now unlocks access to his house if not aready available and refuse option uses willpower. From julzor. 4 лет назад
  Vengeance11 37606466a1 Added missing puncuation 4 лет назад
  Vengeance11 5ecc049fe6 Cleaned up text in city industrial area 4 лет назад
  KevinSmarts 23f2f10029 [text edit] from machine translation to English by Pocket and proofed by Erized 4 лет назад
  KevinSmarts f8bc5289ef [changed] Version number and description for 0.8.1.1 release 4 лет назад
  Netuttki 25a7c9ad51 Merge remote-tracking branch 'upstream/master' 4 лет назад
  hornguy6 c82b85ee69 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 лет назад
  hornguy6 7da6e4617f [changed] brothersex variables to match what they're supposed to 4 лет назад
  hornguy6 c612829931 [changed] comments to have !! in front instead of just ! 4 лет назад
  hornguy6 2a3dda9891 [added] progress text for earning your masseuse certification 4 лет назад
  hornguy6 b97c47ad03 [added] missing $loc_arg in foto 4 лет назад
  hornguy6 b7a722ad16 [changed] text, cum_cleanup variables, and the frequency of types of requests 4 лет назад
  hornguy6 ac5dde0c33 [changed] masseuse job to be more subtle when first inquiring 4 лет назад
  Netuttki 42f752333d Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 5242dd0b20 Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 лет назад
  KevinSmarts 2a702c7329 [fixed] There were $loc_arg missing which made it annoying to mod the location - julzor 4 лет назад
  KeyMasterOfGozer bbf317eadd Tatiana's hair coloring changes natural Color now. 4 лет назад
  Netuttki 026c7cba38 Merge remote-tracking branch 'upstream/master' 4 лет назад
  hornguy6 bf309090de [changed] code cleanup in the massuese scheduler 4 лет назад
  hornguy6 f499d3615b [fixed] drinks in the break room at the salon 4 лет назад
  hornguy6 1b5b337fd0 [fixed] proper location tags for the break room at the salon 4 лет назад
  hornguy6 a4defa23a1 [changed] wording in sentences 4 лет назад
  KevinSmarts 4b0279a367 [fixed] Wrong park linked in old town location 4 лет назад
  KevinSmarts 457a55e345 Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  Netuttki b85bee83ea Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 9a31662228 [fixed] issues raised by temp on the repo, mostly logic errors 4 лет назад
  Vengeance11 9de448cfb1 Fixed oversight of Albina inviting the player to the disco when she no longer appears there. 4 лет назад
  Vengeance11 3f6f0b552d Spelling and grammar fixes I missed 4 лет назад
  Vengeance11 2e19125b4c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 лет назад
  KevinSmarts d6f01a58ed [fixed] Wrong variable spotted by Julzor 4 лет назад
  KevinSmarts 0e21c371f8 [fixed] Claified and corrected location setting for Anya's schedule and fixed apostrophe issue that Julzor spotted 4 лет назад
  rachels 28809b9014 remove duplicate code and fix the limit at 50 4 лет назад
  Netuttki a6012533a3 Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts cb4a0742fc [fixed] Second image added to replace duplicate that was meant to be an mp4 but that file was corrupt. 4 лет назад
  KevinSmarts 2f81df8c47 Merge remote-tracking branch 'rachels/master' 4 лет назад
  KevinSmarts dcb5e9cee3 [fixes] References to swimwear to include those from Sandalicious so you can swim in them and not escape the beaches in them through events anymore. 4 лет назад
  rachels 66aff61d34 populate files with $clothingworntype 'beach' 4 лет назад
  rachels c11809cea2 fix copy paste bug 4 лет назад
  Vengeance11 1543b13d00 Some spelling errors I missed 4 лет назад
  rachels 4c8f107df2 check also the beachwear 4 лет назад
  rachels c350da9ede use the most reliable way for the condition 4 лет назад
  rachels 39a83344ae apply function for counting swimwear 4 лет назад
  rachels 6fca35928a Add a function for counting of the available swimwear 4 лет назад
  Netuttki cc8c01b286 Merge remote-tracking branch 'upstream/master' 4 лет назад
  KevinSmarts 94ccdf904f Merge remote-tracking branch 'rachels/master' 4 лет назад
  KevinSmarts 056c3789ba [fixes] Wrong variable and bracket in wrong place (although that one is just for show). 4 лет назад
  rachels 9e24e9ba94 Add a trigger so the event would be unique 4 лет назад
  rachels fa4d31616e fix typo 4 лет назад
  rachels 83d301aa50 fix the variable name 4 лет назад
  rachels f3bd12bff0 remove superfluous check of the skill 4 лет назад
  rachels 1ad44793db Fix only saves from prior version 4 лет назад
  KevinSmarts 2fe5661f5f Merge remote-tracking branch 'Vengence_11/master' 4 лет назад
  Vengeance11 eac955aaee Fixed player being referred to as "Sveta" 4 лет назад
100 измененных файлов с 5549 добавлено и 3881 удалено
  1. 1 3
      glife.qproj
  2. 2 2
      locations/AlbFatherQW.qsrc
  3. 4 4
      locations/AlbStars.qsrc
  4. 0 15
      locations/AlbStarsEnd.qsrc
  5. 0 1022
      locations/AlbStarsWhore.qsrc
  6. 1 1
      locations/BelSex.qsrc
  7. 1 1
      locations/Cheatmenu_din.qsrc
  8. 28 28
      locations/Club2.qsrc
  9. 24 9
      locations/HotelHole.qsrc
  10. 1 1
      locations/KatjaHomeTalk.qsrc
  11. 10 5
      locations/Komp.qsrc
  12. 2 2
      locations/LakeBoyZ.qsrc
  13. 2 2
      locations/Nudelake.qsrc
  14. 1 5
      locations/ParChurch.qsrc
  15. 65 71
      locations/Peterroom.qsrc
  16. 1 1
      locations/Snpc.qsrc
  17. 1 1
      locations/Vika.qsrc
  18. 1 1
      locations/Voltrenersex.qsrc
  19. 1309 312
      locations/_attributes_fetish.qsrc
  20. 254 261
      locations/_attributes_formal.qsrc
  21. 416 350
      locations/_attributes_office.qsrc
  22. 319 196
      locations/_attributes_school.qsrc
  23. 0 145
      locations/albinaEv.qsrc
  24. 15 14
      locations/albinaRide.qsrc
  25. 47 51
      locations/albinahome.qsrc
  26. 4 4
      locations/albinaporog.qsrc
  27. 12 0
      locations/arousal.qsrc
  28. 7 3
      locations/artemhome.qsrc
  29. 26 26
      locations/autosalonF.qsrc
  30. 13 13
      locations/autotraidF.qsrc
  31. 1 0
      locations/bed2.qsrc
  32. 42 42
      locations/bedrPar.qsrc
  33. 8 8
      locations/bedrPar2.qsrc
  34. 1 1
      locations/beg.qsrc
  35. 5 0
      locations/begin.qsrc
  36. 4 4
      locations/beverage.qsrc
  37. 36 36
      locations/brother.qsrc
  38. 2 2
      locations/brother_voyeur.qsrc
  39. 2 2
      locations/budgetclothes.qsrc
  40. 27 1
      locations/changingroom.qsrc
  41. 20 4
      locations/cikl.qsrc
  42. 16 10
      locations/city_center.qsrc
  43. 9 9
      locations/city_industrial.qsrc
  44. 22 5
      locations/city_island.qsrc
  45. 7 7
      locations/city_lake.qsrc
  46. 2 2
      locations/city_musicstore.qsrc
  47. 29 7
      locations/city_residential.qsrc
  48. 25 12
      locations/clothing.qsrc
  49. 5 3
      locations/clothing_descriptions.qsrc
  50. 2 1
      locations/cum_arrcheat.qsrc
  51. 1 1
      locations/dachain.qsrc
  52. 2 2
      locations/danceclass.qsrc
  53. 18 8
      locations/dimaEv.qsrc
  54. 1 1
      locations/din_bad.qsrc
  55. 69 60
      locations/din_van.qsrc
  56. 1 1
      locations/dinfather.qsrc
  57. 5 3
      locations/dk.qsrc
  58. 62 23
      locations/ender.qsrc
  59. 4 4
      locations/etoexhib.qsrc
  60. 37 1
      locations/events.qsrc
  61. 60 18
      locations/family_schedule.qsrc
  62. 23 0
      locations/fight_npcdata.qsrc
  63. 2 2
      locations/fit.qsrc
  64. 78 33
      locations/foto.qsrc
  65. 238 100
      locations/foto_events.qsrc
  66. 1176 0
      locations/foto_model_documentary.qsrc
  67. 12 12
      locations/foto_shoot.qsrc
  68. 19 19
      locations/gLakeNude.qsrc
  69. 1 1
      locations/gLakeNudeEvent.qsrc
  70. 2 0
      locations/gaddvor.qsrc
  71. 11 11
      locations/gadriver.qsrc
  72. 1 1
      locations/garfather.qsrc
  73. 1 1
      locations/gdkin.qsrc
  74. 1 199
      locations/gdksport.qsrc
  75. 11 11
      locations/glake.qsrc
  76. 1 1
      locations/grandpahelp.qsrc
  77. 20 15
      locations/gschool_chats1.qsrc
  78. 80 41
      locations/gschool_gossip.qsrc
  79. 2 2
      locations/gschool_lessons3.qsrc
  80. 12 12
      locations/gschool_lessons4.qsrc
  81. 14 14
      locations/gschool_sex.qsrc
  82. 26 2
      locations/gschool_socialchg1.qsrc
  83. 5 0
      locations/hotel.qsrc
  84. 58 0
      locations/indik.qsrc
  85. 114 91
      locations/journal.qsrc
  86. 49 60
      locations/katjaEv.qsrc
  87. 8 9
      locations/katjaEvDin.qsrc
  88. 112 112
      locations/korr.qsrc
  89. 22 20
      locations/korrPar.qsrc
  90. 4 3
      locations/kuhr2x.qsrc
  91. 25 25
      locations/kuhrPar.qsrc
  92. 1 1
      locations/liam.qsrc
  93. 2 2
      locations/love.qsrc
  94. 1 1
      locations/lover_love.qsrc
  95. 88 84
      locations/ludahome.qsrc
  96. 3 3
      locations/masseuse_break.qsrc
  97. 45 45
      locations/masseuse_schedule.qsrc
  98. 185 117
      locations/masseuse_work.qsrc
  99. 1 1
      locations/mey_home.qsrc
  100. 3 3
      locations/mey_vika_events.qsrc

+ 1 - 3
glife.qproj

@@ -712,13 +712,10 @@
 		<Location name="NatBelGo"/>
 	</Folder>
 	<Folder name="Albina">
-		<Location name="albinaEv"/>
 		<Location name="albinaRide"/>
 		<Location name="albinahome"/>
 		<Location name="albinaporog"/>
 		<Location name="AlbFatherQW"/>
-		<Location name="AlbStarsEnd"/>
-		<Location name="AlbStarsWhore"/>
 		<Location name="AlbStars"/>
 	</Folder>
 	<Folder name="Lariska">
@@ -796,6 +793,7 @@
 		<Location name="foto_shoot"/>
 		<Location name="foto_events"/>
 		<Location name="foto_events2"/>
+		<Location name="foto_model_documentary"/>
 		<Location name="foto_albums"/>
 		<Location name="foto_models"/>
 		<Location name="foto_models2"/>

+ 2 - 2
locations/AlbFatherQW.qsrc

@@ -15,7 +15,7 @@ act 'Speak with Chernov':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 	'Chernov pulls you aside. Upon closer examination, you notice he is holstering a gun under his left armpit. "Miss <<$pcs_lastname>>, I know that you are a member of Barlovskaya''s entourage. I also know that this is just a front. Their criminal activities are about to be put on hold, with or without your collaboration."
-	"Our little talk here is quite important. When this case starts getting coverage, the whole town will know about the Starlets''s secret. We''ll have to inform your parents and your school that you were an illegal prostitute for Barlovskaya. You can testify anonymously like the other girls and keep your name out of it if you wish."'
+	"Our little talk here is quite important. When this case starts getting coverage, the whole town will know about the Starlets'' secret. We''ll have to inform your parents and your school that you were an illegal prostitute for Barlovskaya. You can testify anonymously like the other girls and keep your name out of it if you wish."'
 
 	act 'Ask him what he means':
 		*clr & cla
@@ -33,7 +33,7 @@ act 'Speak with Chernov':
 				minut += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-				'"What is so important about Albina that the Security Service are involved?" you ask. Chernov raises a brow. "You''re a smart girl, huh? You know Boris Barlovskaya, her father? He''s a retired police officer who served as the chief of police for years." In his retirement, we believe he has formed connections with the local criminal syndicate and is bribing his successor to block any investigations."'
+				'"What is so important about Albina that the Security Service are involved?" you ask. Chernov raises a brow. "You''re a smart girl, huh? You know Boris Barlovskaya, her father? He''s a retired police officer who served as the chief of police for years. In his retirement, we believe he has formed connections with the local criminal syndicate and is bribing his successor to block any investigations."'
                 '"Your friend is our way in. All we need to do is prove that Albina''s dance troupe is actually a front for illegal prostitution. We need your statement Miss <<$pcs_lastname>>."'
 				if pcs_intel >= 75:
 					act 'Ask about Albina''s involvement':

+ 4 - 4
locations/AlbStars.qsrc

@@ -169,13 +169,13 @@ if $ARGS[0] = 'albina4':
 					*clr & cla
 					minut += 5
 					gs 'stat'
-					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and (pcs_danc < 50 and hotcat < 7))):
+					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and hotcat < 7)):
 						!! If Sveta is an outcast or does not meet the nerd/gopnik requirements
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some shake their heads, others shrug in indifference.'
 						'Finally, she answers. "I don''t doubt that you could <i>eventually</i> reach our level, but you''re not exactly, how do I put it, ''socially desirable.''"'
 						'"Try improving your skills and appearance first and then get back to us." She turns and leaves with the rest of the troupe.'
-					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and (pcs_danc >= 50 and hotcat >= 7))) and pcs_vag = 0 and stat['vaginal'] = 0):
+					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and hotcat >= 7)) and pcs_vag = 0 and stat['vaginal'] = 0):
 						!! If Sveta is popular/non dancer or meets the nerd/gopnik requirements and is virgin
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some nod, others shrug.'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'starlets':
 	if perform_lvl < 35: perform_exp += 1
 
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dance_studio/fit1.jpg"></center>'
 
 	if pcs_dancero < 15:
 		'Your dancing is terrible and Albina constantly yells at you, calling you a bowlegged cow.'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'starlets':
 					elseif AlbinaQW['StarletCustomer'] = 2:
 						AlbinaQW['StarletsCustomerCount'] = 2
 						AlbinaQW['StarletPay'] = rand(6,9)
-						'You see two well dressed middled aged Armenian men approach Albina and start to talking to her.'
+						'You see two well dressed middle aged Armenian men approach Albina and start to talking to her.'
 					elseif AlbinaQW['StarletCustomer'] = 3:
 						AlbinaQW['StarletsCustomerCount'] = 2
 						AlbinaQW['StarletPay'] = rand(6,9)

+ 0 - 15
locations/AlbStarsEnd.qsrc

@@ -1,15 +0,0 @@
-# AlbStarsEnd
-
-!menu_off = 1
-!AlbinaQW['StarletsShutDown'] = 1
-!AlbinaQW['AlbFatherQW']  = 10
-!AlbinaQW['AlbCopDay'] = daystart
-!npc_rel['A23'] = -10
-!AlbinaQW['Chernov'] = 10
-!gs 'stat'
-!'You walk down the street and see Albina Barlovskuyu. Near her, a van stops; people emerge from the vehicle running towards her. They restrain her face to the ground, hands behind her back before putting her in handcuffs. Albina is furious, but her face suddenly pales when she sees the warrant for her arrest and hears the accusations of running a brothel. After a thorough search she is put on her feet, shoved into a police car and whisked away.'
-
-!act 'Leave':gt 'pav_residential'
-gt 'pav_residential'
---- AlbStarsEnd ---------------------------------
-

+ 0 - 1022
locations/AlbStarsWhore.qsrc

@@ -1,1022 +0,0 @@
-# AlbStarsWhore
-
-!!needs complete revamp, add willpower during revamp.
-! menu_off = 1
-
-! if $ARGS[0] = 'whore1':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(24,40)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'stat'
-! 	'The man leads you by the hand into the hotel room. When he flips on the lights, you immediately notice that it''s a luxury room. You smile thinking, it looks like you made the right choice.'
-! 	act 'Kneel':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bj.jpg"></center>'
-! 		'Efficiently, you get in his pants and begin working on him with your hand. He is rock hard in no time.'
-! 		'Looking him in the eye, you lick his cock from base to tip, and then give the head a little kiss.'
-! 		'When you finally take his entire length into your mouth, "Oh, God", is his only response.'
-! 		gs 'arousal', 'hj', 10, 'sub'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		minut -= 10
-! 		gs 'stat'
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'He puts his hands on your head, and pushes insistently at you mouth.'
-! 			act 'Relax your throat':
-! 				cls
-
-! 				if pcs_throat < dick:pcs_throat += 1
-
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/throat.jpg"></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					pcs_horny = 0
-! 					'The man begins to frantically fuck your mouth.'
-! 					'You do you best to take it, while drool drips from your mouth, snot runs from your nose, and tears well up in your eyes.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					pcs_horny = pcs_horny/2
-! 					'He begins roughly using your mouth.'
-! 					'You take his cock down your throat as best you, but still gag a little when he goes deep.'
-! 					'You never would have thought gagging on a stranger''s dick could be such a turn-on.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'Holding you head, the man forcefully guides you up and down his shaft.'
-! 					'You take the full length of his cock with ease. Your lips make it all the way down to the base, and his balls slap against your chin.'
-! 					'The sensation of deep-throating this strange mans dick is getting you all wet.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-! 				if tipdarand = 0:
-! 					'Without warning, the man grabs your hair, and holds your head down on his shaft.'
-! 					'You let out a strangled gurgle, as jets of semen hit the back of your throat.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 					act 'Swallow':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'You greedily suck down as much of his cum as for can.'
-! 						'By the time the time he is finished your entire face feels like a wet runny mess.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'After a few minutes he takes his cock out of your mouth, and starts jerking himself in front of your face.'
-! 					gs 'arousal', 'bj', 10, 'sub'
-! 					gs 'stat'
-! 					act 'Close your eyes':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Warm jets of semen begin to splatter against your face. You make little sounds of encouragement, until with a groan, he finishes with one last spurt that hits you right on the lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'After a few minutes he says: "I want your ass, girl."'
-
-! 			act 'Give him your ass':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/anal.jpg"></center>'
-! 				'Yoy present your ass to him, with a little giggle, you give it a wiggle.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'After a few minutes he says: "I''m ready for that pussy."'
-
-! 			act 'Lie on your back.':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/sex.jpg"></center>'
-! 				'You spread your legs for him, and motion him to you invitingly.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore2':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,23)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,23)
-
-! 	gs 'stat'
-! 	'Shyly, the boys lead you into their hotel room.'
-! 	'You think it''s sweet that they look a little nervous. Deciding to put their minds at ease, you take action.'
-! 	act 'Get their pants off':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjd.jpg"></center>'
-! 		'Squatting down in front of the boys, you give them each a turn. Licking their shafts and giving little sucking kisses to their heads, you have them hard in no time.'
-! 		'By the time you start sucking them in earnest, they both have warm smiles of appreciation on their faces.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'group'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'No longer nervous, one of the boys moves behind you and works his hand between your cheeks.'
-! 			'"That is one tight little ass you have there baby", he whispers in your ear.'
-! 			'You let out a little moan, when his finger finds your pucker and slowly begins to massage it.'
-! 			'The other boy impatiently taps his dick against your mouth, urging you to get back to work.'
-! 			gs 'arousal', 'bj', 10, 'sub', 'group'
-! 			gs 'arousal', 'anal_finger', 10, 'sub', 'group'
-! 			minut -= 10
-! 			gs 'stat'
-! 			act 'Get spit-roasted':
-! 				cls
-! 				minut += 30
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d.jpg"></center>'
-! 				'You suckle at the tip of one boys cock, while the other gets ready to enter your ass. You wiggle your hips in anticipation.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'anal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'cum_manage'
-! 				!! {Setup for #2}
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The man in your mouth groans, and suddenly you mouth is filled with wet warmth.'
-! 					act 'Swallow it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'Choking slightly, you frantically swallow cum, until his cock finishes pouring his seed into your mouth.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes hold of his cock, and starts to jerk it. It''s pointed right at your face.'
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your chin.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'The boys lay you on the sofa. One of them settles between your legs, while the other dangles his cock near your face.'
-! 			act 'Part your lips':
-! 				cls
-! 				!!stat['vaginal'] += 1
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d1.jpg"></center>'
-! 				'You begin to suck dick, while the other guy spreads your legs.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'vaginal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				tipdarand = rand(0, 1)
-! 				!! {Setup for #2}
-! 				gs 'boyStat', $npclastgenerated
-
-! 				if tipdarand = 0:
-! 					'The man in your mouth groans, and suddenly you mouth is filled with wet warmth.'
-! 					act 'Swallow it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed into your mouth.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes hold of his cock, and starts to jerk it. It''s pointed right at your face.'
-
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your face.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore3':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-
-! 	gs 'stat'
-! 	'The Armenian guy leads you into his hotel room and announces: "It is time to earn your money whore. Now, get on your knees, and show me how well you can suck.'
-! 	act 'Get on your knees':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj50.mp4"></video></center>'
-! 		'Doing your best to show him what a good cock sucker you are, you lick him from base to tip, and then give the head a little kiss. He gives you a little chuckle of appreciation.'
-! 		'When you take him fully into you mouth you looks up seeking approval.'
-! 		'"That''s a good girl", he says stroking your cheek.'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		gs 'stat'
-		
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'He firmly takes your head in his hands and says: "Now, open wide girl, here it comes."'
-
-! 			act 'Relax your throat':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral4.mp4"></video></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					'He begins roughly using your mouth.'
-! 					'You do you best, but soon drool is running from your mouth, and snot is dripping from your nose. Eventually your eyes fill with tears, as you continue to gasp and gag on his cock.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					'He begins roughly using your mouth.'
-! 					'You take his cock down your throat as best you, but still gag a little when he goes deep.'
-! 					'You never would have thought gagging on a stranger''s dick could be such a turn-on.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'Holding you head, the man forcefully guides you up and down his shaft.'
-! 					'You take the full length of his cock with ease. Your lips make it all the way down to the base, and his balls slap against your chin.'
-! 					'The sensation of deep-throating this strange mans dick is getting you all wet.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'Without warning, the man grabs your hair and holds your head down on his shaft.'
-! 					'You let out a strangled gurgle, as jets of semen hit the back of your throat.'
-
-! 					act 'Swallow':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/shared/sex/cum/cumf60.mp4"></video></center>'
-! 						'You greedily suck down as much of his cum as for can.'
-! 						'By the time the time he is finished your entire face feels like a wet runny mess.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'After a few minutes he takes his cock out of your mouth, and starts jerking himself in front of your face.'
-! 					'"Open your mouth for me, girl", he orders.'
-! 					act 'Please him':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
-! 						'You look him in the eye, and softly whisper: "Give it to me."'
-! 						'Warm jets of semen begin to splatter against your face. You make little sounds of encouragement, until with a groan, he finishes with one last spurt that hits you right on the lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'He firmly tells you: "On all fours, now girl. I will have your ass."'
-
-! 			act 'Present your ass to him':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/dog12.mp4"></video></center>'
-! 				'You give it a wiggle, and he says smiling: "Ha, now that''s a good girl."' 
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-				
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'He speaks: "On your back now, girl. Let''s see that pretty little pussy of yours."'
-! 			act 'Spread your legs for him':
-! 				cls
-! 				'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsexbonus2.mp4"></video></center>'
-! 				'Laying on your back a little thrill runs though your body, as the rough Armenian prepares to enter you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-				
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore4':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-
-! 	gs 'stat'
-! 	'Laughing, the two Armenians lead you into their hotel room. "It''s time to show us what you got, little lamb", one says.' 
-! 	'The other man chimes in with: "I want see what those <<$lip1>> lips of yours can do. They look like they were made to suck cock.'
-! 	act 'Show them':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/shared/sex/group/cocksucker6.jpg"></center>'
-! 		'You kneel down in front of the two swarthy men to show them your skills.' 
-! 		'You playfully lick, jerk, and suck until they are both throbbing in your hands.'
-! 		'"Very nice little lamb, now take my cock. Take it all", one of the men says.'
-! 		'You enthusiastically begin to suck the penis of the man who spoke.'
-! 		gs 'arousal', 'hj', 10, 'group', 'sub'
-! 		gs 'arousal', 'bj', 10, 'group', 'sub'
-! 		minut -= 10
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'After sucking for all your worth for a good ten minutes, one of them says: "Get your ass in the air. It''s time to get roasted, little lamb."'
-! 			'You get down on all fours, while the men laugh, and move into position at each end.'
-! 			'"You might be the sweetest thing I''ve ever seen. What do you say to that my little lamb?", one of the men says.'
-! 			'"Bah", you bleat with a laugh.'
-! 			act 'Get spit-roasted':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/shared/sex/group/threesomepm8.mp4"></video></center>'
-! 				'You let out another playful bleat as you begin to get filled.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'anal', 30, 'group', 'sub'
-! 				gs 'arousal', 'bj', 30, 'group', 'sub'
-! 				minut -= 30
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				tipdarand = rand(0, 1)
-! 				gs 'boyStat', $npclastgenerated
-				
-! 				if tipdarand = 0:
-! 					'The swarthy man fucking your mouth grabs your hair, and presses you firmly against him.'
-! 					'Unable to move, you gag a little as semen hits the back of your throat.'
-! 					'"Swallow that down for me pet", the man holding your head insists.'
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow3.jpg"></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed down your throat.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in his hand and says: "Open wide pet. I''ve got a treat for you."'
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cumf2.mp4"></video></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your face.'
-! 						'"Well done, little lamb", the man behind you praises, giving you a little smack on the ass.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'Eventually, one of the men announces: "On your back now lamb, It''s time to see what you have what you have between those legs."'
-! 			'You playfully hop onto the sofa, and spread your legs, presenting your pussy for approval.'
-! 			'The men chuckle as one of them settles between your legs, while the other taps his cock against your mouth.'
-! 			act 'Enjoy':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/shared/sex/group/threesomepm10.mp4"></video></center>'
-! 				'As you take one man''s cock into your mouth, as the man between your legs chuckles: "Wonderful, it looks like you have already been sheared."'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'group', 'sub'
-! 				gs 'arousal', 'bj', 30, 'group', 'sub'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The swarthy man fucking your mouth grabs you hair, and presses you firmly against him.'
-! 					'Unable to move, you gag a little as semen hits the back of your throat.'
-! 					'"Swallow that down for me pet", the man holding your head insists.'
-
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral1.mp4"></video></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed down your throat.'
-! 						act 'Drive back': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in his hand and says: "Open wide pet. I''ve got a treat for you."'
-
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cumf2.mp4"></video></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your chin.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore5':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$boy1 = $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-
-! 	gs 'stat'
-! 	'The three Armenians lead you back to a hotel room. When one of them swings the door shut with his foot a little lump forms in your throat. The thought of all that could go wrong in a hotel room with three strange men is unsettling, yet a little exciting at the same time. You take a deep breath, as you turn to face them.'
-
-! 	act 'Squat down':
-! 		cls
-! 		guy += 3
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjt.jpg"></center>'
-! 		'Deciding that eager service is the best way to avoid any problem, you get down in front of the men'
-! 		'A few minutes of licking and stroking later, you are faced by three throbbing cocks ready for more.'
-! 		'One of the swarthy men compliments your skill: "You are very skilled for such a young thing, and eager. I like eager."'
-! 		'As a way of saying thank you, you take his cock fully into your mouth, and slowly start to suck. The moan of pleasure this elicits from the man sends a little thrill running though your body.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 		gs 'arousal', 'hj', 10, 'sub', 'gangbang'
-! 		minut -= 10
-! 		gs 'stat'
-! 		!!tipdarand = rand(0, 1)
-! 		tipdarand = 0
-
-! 		if tipdarand = 0:
-! 			'After you have serviced each man for several minutes. The begin to talk to each other in their native language. It looks like they are trying to decide something.'
-! 			'One of the men looks at you: "We will have your ass now girl."'
-! 			'That was not a question, but you are in no position to refuse anyway.'
-
-! 			act 'Present your ass':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/f.jpg"></center>'
-! 				'You continue to languidly suck on the two remaining men, while the third man prepares to enter you from behind.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
-! 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'cum_manage'
-! 				gs 'boyStat', $npclastgenerated
-! 				'One of the men near your face says: "Get ready girl."'
-
-! 				act 'Open your mouth':
-! 					cls
-! 					tipdarand = rand(0, 1)
-
-! 					if tipdarand = 0:
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialt.jpg"></center>'
-! 						'The two men you''ve been blowing both finish at the same time. You flinch in surprise, when the first stream hits your face. By the time they finish, long streams of semen are dripping from your face.'
-! 						'The men all begin chatting among themselves, paying you no mind. From their excited tone, it certainly sounds like you did a good job. You smile, licking your lips with satisfaction.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					elseif tipdarand = 1:
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallowt.jpg"></center>'
-! 						'You kneel and eagerly open up for the two remaining men. They are surprisingly accurate, as they empty their loads into you mouth, other than a small drop on your chin they get it all in there.'
-! 						'Smiling up at them, you swallow it down.'
-! 						'The men all begin chatting among themselves, paying you no mind. From their excited tone, it certainly sounds like you did a good job. Smiling with satisfaction, you gather the last drop of cum from your chin with a finger, and lick it clean.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					end
-
-! 					act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore6':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'As the big black guy leads you into the room, your mind drifts to what you have seen watching porn.'
-! 	'The thought of actually being one of those little white girls talking big black cock sends a thrill through you.'
-! 	'You hope this guy lives up to the hype.'
-
-! 	act 'Find out':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjn.jpg"></center>'
-! 		'"Oh, my", you whisper softly, as you expose his girth.'
-! 		'"You like that baby? Go on, and give it a kiss. It won''t bite", he chuckles.'
-! 		'Wide eyed, you wrap your lips around his massive length. You relish the taste, as you begin to suck. It doesn''t taste like chocolate, but it tastes pretty damn good.'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'After a few minutes the man takes your head in his hands, and urges you to take more.'
-! 			act 'Relax your throat':
-! 				cls
-
-! 				if pcs_throat < dick:pcs_throat += 1
-
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/throatn.jpg"></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					pcs_horny = 0
-! 					'Oh god, he''s way too big for you. The pressure on you head isn''t letting up though.'
-! 					'Holding your head, he settles into a slow rut. After a few minutes of gaging on him, your face is covered in drool, snot, and tears. It feels good to let him take his pleasure like this, but you worry that your face must be a total mess.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					pcs_horny = pcs_horny/2
-! 					'Oh god, he''s almost too much for you. He is forcing your head down, so it looks like you only have one option'
-! 					'You do your best to handle his rough thrusts to your face, but before too long your eyes are watering and snot is dripping from your nose. It''s all very exhilarating, you just wish your make-up wasn''t getting smeared'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'You accept the challenge posed by his hands, and take his entire length down your throat'
-! 					'He smiles down at you saying: "Damn, the stories about cock hungry little white girls must be true. You take that thing like a pro, baby."'
-! 					'You smile up at him around his cock, and continue to deep-throat him.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'When you think you can''t take anymore, he grabs your hair and forces you down even further.'
-! 					'"Oh shit, here it comes baby", he growls.'
-! 					'Warm jets of semen begin to pour down your throat.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow3.jpg"></center>'
-! 						'To keep from choking, you gulp it down, as quickly as possible.'
-! 						'Mmm, maybe it does taste like chocolate.'
-! 						'"Damn baby, you must''ve been thirsty", he smiles down at you.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'When you think you can''t take anymore, the man takes his cock from your mouth.'
-! 					'"Let me see that tongue baby, I need something to aim for", he says smiling down at you.'
-! 					gs 'arousal', 'bj', 10, 'sub'
-! 					gs 'stat'
-! 					act 'Open up and say ahh':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'He grunts, and sticky streams of cum rain down around your face and mouth.'
-! 						'"Baby, you look like a fucking masterpiece, so fucking hot. I''m almost ready for another go just from looking at you.", he says panting.'
-! 						'You give him a wink, as you lick your lips'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'He informs you: "Baby, I''m glad you got me nice and lubed-up. When you find out where this is going next, you''ll be glad too." He grabs hold of one of your butt cheeks, and gives it a good squeeze.'
-! 			'You bite your lip, as equal parts of fear and excitement fill your thoughts.'
-
-! 			act 'Take it':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/analn.jpg"></center>'
-! 				'"Please be gentle", you whisper as he prepares to enter you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'After some minutes the man takes his cock out of your mouth, and easily lifts you up and lays you on your back.'
-
-! 			act 'Open legs for him':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/sexn.jpg"></center>'
-! 				'A little nervously, you slowly spread your legs for him. The big black guy moves between your legs, and prepares to penetrate you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore7':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 32
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'As the two big black guys lead you into the room, your mind drifts to what you have seen watching porn.'
-! 	'The thought of actually being one of those little white girls talking big black cock sends a thrill through you.'
-! 	'Taking care of two at the same time sounds even more delightfully naughty.'
-
-! 	act 'Get them':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjdn.jpg"></center>'
-! 		'Hands on your hips you playfully announce to the men: "OK boys, pants off, let''s see them."'
-! 		'"Now that''s my kind of woman", one of the men smiles as they both start to undress. You tap your foot with feigned impatience, while they get naked.'
-! 		'"I''m impressed boys. How is a sweet young thing like me ever going to manage?", you say smiling, as you kneel at their feet.'
-! 		'You spend the next ten minutes licking and greedily sucking their big black cocks.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'group'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'One of the men leans over and slides a hand down the crack of you ass, when he his finger finds your sphincter you move your hips to encourage him.'
-! 			'"Damn girl, is that how you want it?", he says.'
-! 			'"Yes", you whisper.'
-! 			gs 'arousal', 'anal_finger', 5, 'sub'
-! 			gs 'stat'
-			
-! 			act 'Give him your ass':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dn.jpg"></center>'
-! 				'You continue sucking away at the first guy, as the other prepares to enter your backdoor.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'anal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-				
-! 				if tipdarand = 0:
-! 					'The man fucking your mouth lets out a grunt, as his seed spills into your mouth.'
-
-! 					act 'Taste it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You swallow it down, looking up at him seeking approval.'
-! 						'He pats you on the head: "I guess you white girls really do crave it.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in hand, and starts to jerk.'
-
-! 					act 'Open you mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'you make appreciative sounds, as hot streams of semen rain down on your face'
-! 						'After he is finished, you clean him up with licks and gentle kisses.'
-! 						'"Damn girl, I guess you are what they would call a hot mess", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'One of the men gently lifts you up, and lays you on the sofa.'
-! 			'He moves to position himself between your legs, while the other guy brings his cock back to your lips.'
-
-! 			act 'Get filled':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d1n.jpg"></center>'
-! 				'You take one man in your mouth, while the other guy spreads your legs.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'vaginal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The man fucking your mouth lets out a grunt, as his seed spills into your mouth.'
-
-! 					act 'Taste it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You swallow it down, looking up at him seeking approval.'
-! 						'He pats you on the head: "I guess you white girls really do crave it.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in hand, and starts to jerk.'
-
-! 					act 'Open you mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'you make appreciative sounds, as hot streams of semen rain down on your face'
-! 						'After he is finished, you clean him up with licks and gentle kisses.'
-! 						'"Damn girl, I guess you are what they would call a hot mess", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore8':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 32
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	$boy1 = $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 30
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'This is just like one of those movies you''ve seen. Three big black guys leading a young little white girl into a hotel room, oh whatever will you do?'
-! 	'"Let''s get this party started boys", you say smiling, as you take of your top.'
-! 	'"Aren''t you just an eager little minx", one of the men laughs, as they begin to take off their pants.'
-! 	'"Crawl over here and give it a kiss, little kitty. I''m gonna make you purr", another man says.'
-
-! 	act 'Crawl to them':
-! 		cls
-! 		guy += 3
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjtn.jpg"></center>'
-! 		'The guys all rush to be first, when you make it over to them.'
-! 		'"One at a time boys. I know what I''m doing, but I can''t fit all three of those things in my mouth", you playfully chastise them.'
-! 		'The men laugh, as you settle into a rhythm of sucking and stroking. The thought of all this hot black meat eager to be serviced is making your thighs ache with hunger.'
-! 		gs 'arousal', 'hj', 10, 'sub', 'gangbang'
-! 		gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 		minut -= 10
-! 		gs 'stat'
-! 		!!tipdarand = rand(0, 1)
-! 		tipdarand = 0
-
-! 		if tipdarand = 0:
-! 			'After some minutes one of the men starts to slowly kneed one of your butt cheeks. His fingers are creeping ever closer to your sphincter.'
-! 			'"Oh, you think so do you", you say, looking up at him innocently.'
-! 			'"Oh, I know so, I know", he says with a grin.'
-! 			'Smiling, you slowly get on your hands and crawl toward the sofa. You make sure they get a good look at your white girl ass, as you do.'
-
-! 			act 'Call them over with a purr':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/fn.jpg"></center>'
-! 				'The sight of three big black guys rushing over to you puts a big smile on your face.'
-! 				'Two of the men move to get service from your mouth, while the third prepares to penetrate you.'
-! 				'"That''s one fine ass booty you got there, white girl", he says'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
-! 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				'The two men at your mouth seem close to finishing too.'
-
-! 				act 'Get some cream':
-! 					cls
-! 					tipdarand = rand(0, 1)
-
-! 					if tipdarand = 0:
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialtn.jpg"></center>'
-! 						'You kneel down, and look up at the two remaining men stroking themselves toward the finish.'
-! 						'"Oh fuck, I''m going to paint that pretty face white for you, baby!", one of them says grunting.'
-! 						'Both men erupt at the same time. So much of it splatters against your face that it almost doesn''t seem real. You giggle wildly at the thrill of it all, after they have finished.'
-! 						'"God damn, this kitty really does love her cream!", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					elseif tipdarand = 1:
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You eagerly suck the two remaining men to finish. It''s not long before both of them have poured their loads down you throat.'
-! 						'"Our little kitty must have been thirsty", one of the men laughs.'
-! 						'You look up and give him a little "meow", and lick your lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					end
-
-! 					act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-gt 'gdksport', 'start'
-
---- AlbStarsWhore ---------------------------------
-

+ 1 - 1
locations/BelSex.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 
-			if $clothingworntype = 'swimwear': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 
 			gs 'arousal', 'end'
 			gs 'stat'

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -2456,7 +2456,7 @@ $cheatmenu['vartracker'] = {
 	'$locM: <<$locM>>'
 	'<font color = red>$CURLOC: <<$CURLOC>></font>'
 	'$location_type: <<$location_type>>'
-	'home_cur: <<home_cur>>'
+	'curr_home: <<curr_home>>'
 	'$home_town: <<$home_town>>'
 	'$home_name: <<$home_name>>'
 	'daystart: <<daystart>>'

+ 28 - 28
locations/Club2.qsrc

@@ -9,9 +9,9 @@ if $ARGS[0] = 'toilet1':
 	gs 'boyStat', $npclastgenerated
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory.jpg"></center>'
 	*nl
-	'You went into the booth and closed the door. The walls are covered with obscene graffiti in the walls and booths carved strange round holes. Sitting on the toilet you hear what that noise in the next stall. Through the hole in the wall you looked someone''s eyes.'
-	'In a hole in the wall squeezed fat cock. Lustful voice said, "here''s a yum yum, baby."'
-	'This is so not surprisingly, that you do not believe in the reality of what is happening to touch the finger member. It is hard and hot.'
+	'You went into the booth and closed the door. The walls are covered with obscene graffiti, and holes are carved in opposite walls. Sitting on the toilet you hear a noise coming from the next stall, and then someone''s eye appears at the hole.'
+	'The next thing you know, a cock is pushed through the hole. A lustful voice says, "here''s a treat for you, baby."'
+	'This is so unexpected, that you hardly believe any of this is real, as you tentatively touch their member. It is hard and hot.'
 
 	act 'Leave':gt 'club', 'inside'
 
@@ -24,7 +24,7 @@ if $ARGS[0] = 'toilet1':
 		pcs_throat += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory1.jpg"></center>'
 		*nl
-		'You lean against a member, it''s so big, warm and solid, you licked it, then again and again.'
+		'This is so surreal, but you lean closer to their member and impulsively find yourself licking it, again and again.'
 		
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
@@ -33,8 +33,8 @@ if $ARGS[0] = 'toilet1':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory2.jpg"></center>'
 			*nl
-			'You bows member lips and start sucking it, trying to take it as deep as possible.'
-			'Suddenly, in your mouth and poured hot tart liquid.'
+			'You wrap your lips around the head and start sucking, trying to take it as deep as possible.'
+			'Suddenly, the reality of the situation comes flooding back into your head - and a warm liquid comes flooding into your mouth.'
 
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'stat'
@@ -47,8 +47,8 @@ if $ARGS[0] = 'toilet1':
 				money += 1000
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory3.jpg"></center>'
 				*nl
-				'You dial a mouthful of sperm, and then swallow it, sperm is not tasty, sticky and sharp taste.'
-				'A male voice telling you - excellent crumb, the money you deserve, a member of the hole and the hole disappears pushes 1,000 RUB.'
+				'You gather a mouthful of sperm, and then swallow it. Their sperm has a sticky and sharp taste which makes you grimace.'
+				'A man''s voice tells you - "That was fucking great, here, you deserve it." and then 1,000 RUB are pushed through the hole.'
 
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -63,8 +63,8 @@ if $ARGS[0] = 'toilet1':
 				money += 500
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory3.jpg"></center>'
 				*nl
-				'You dial a mouthful of sperm, the sperm is not tasty, sticky and sharp, you spit it on the floor.'
-				'A male voice telling you - excellent crumb, the money you deserve, a member of the hole and the hole disappears and is replaced by 500 RUB.'
+				'You gather a mouthful of sperm, but the sticky and sharp taste overwhelms you, and you spit it on the floor.'
+				'A man''s voice tells you - "Here, your money." and then 500 RUB are pushed through the hole.'
 
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -78,7 +78,7 @@ end
 if $ARGS[0] = 'toilet':
 	*clr & cla
 	gs 'stat'
-	'You pee sitting on the toilet and began to wipe your vagina with toilet paper. Apparently you pressed too hard because you embraced the thrill of touching between the legs.'
+	'You pee sitting on the toilet and begin to wipe with toilet paper. Apparently you pressed too hard, as you feel a thrill coming from between the legs.'
 	
 	gs 'arousal', 'masturbate', 3 
 	gs 'stat'
@@ -93,9 +93,9 @@ if $ARGS[0] = 'toilet':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/tomas.jpg"></center>'
 		*nl
-		'You caress his fingers swollen pussy until you orgasm does not cover.'
-		'After orgasm, you take it easy, but hear from the next stall pant, look at the wall you see that someone is peeking through the hole located in the wall.'
-		'The man behind the wall and realized that found giggled, great show. Eye of the holes in the wall and disappeared into it squeezed 500 RUB.'
+		'You caress swollen pussy with your fingers until you orgasm enthusiastically.'
+		'After orgasm, you catch your breath, but then notice someone is peeking at you through a hole in the wall.'
+		'The man behind the wall realises he has been caught, and giggles that you put on a great show. Suddenly the eye disappears, and 500 rubles are pushed through the hole.'
 
 		$orgasm_or = 'yes'
 		gs 'arousal', 'masturbate', 5, 'exhibitionism'
@@ -108,8 +108,8 @@ end
 
 if $ARGS[0] = 'toilet2':
 	*clr & cla
-	'You sit in a booth and hear someone come into the toilet after you and doors of adjacent booths closing. You realize there is two of them.'
-	'Voice from the next stall tells you - do not be afraid baby, we will not hurt you, on the contrary, we will give you some delicious candy with cream filling.'
+	'You sit in a booth and hear both adjacent doors closing as two others enter.'
+	'A voice from the next stall tells you - "Don''t be afraid baby, we won''t hurt you! On the contrary, we will give you some delicious candy with extra cream filling.'
 
 	act 'Leave':gt 'club', 'inside'
 
@@ -118,8 +118,8 @@ if $ARGS[0] = 'toilet2':
 		slutiness += 10
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory4.jpg"></center>'
 		*nl
-		'On both sides of your booth through holes in the walls climbed members. Voice on the wall said, come on, baby, come on, we''re fed.'
-		'You took both members and began to caress them, then bent over to one of the members and took it into your mouth.'
+		'On both sides of your booth cocks poke through holes in the wall. The same voice says, "Come on, baby, come on, feeding time".'
+		'You take both members and begin to caress them, then bend over to one and take it into your mouth.'
 		
 		gs 'arousal', 'hj', 10, 'sub', 'group'
 		gs 'arousal', 'bj', 10, 'sub', 'group'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'toilet2':
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory6.jpg"></center>'
 				*nl
 				'Finally one of the men finishes in your mouth.'
-				'You lick and start to finish processing the second in turn.'
+				'You lick it up and turn all your attention to the other.'
 				
 				gs 'arousal', 'bj', 10, 'sub', 'group'
 				gs 'stat'
@@ -149,16 +149,16 @@ if $ARGS[0] = 'toilet2':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory7.jpg"></center>'
 					*nl
-					'The second man also comes in your mouth.'
-					'You swallow a mouthful and wipe your face, but semen is smeared all over it.'
+					'Before long, the second man also comes in your mouth.'
+					'You swallow a mouthful and wipe your face, but find semen smeared all over it.'
 					
 					gs 'arousal', 'bj', 10, 'sub', 'group'
 					
 					if rand(1, 100) > pcs_horny:
-						pcs_horny += 10 & 'You were not satisfied.'
+						pcs_horny += 10 & 'You were not satisfied - after all, they were only in your mouth!'
 						$orgasm_or = 'no'
 					else
-						pcs_horny = 0 & 'Orgasm washes over you.'
+						pcs_horny = 0 & 'Even though they only fucked your mouth, you feel an orgasm wash over you from the sheer depravity of the situation.'
 						$orgasm_or = 'yes'
 					end
 					gs 'stat'
@@ -167,8 +167,8 @@ if $ARGS[0] = 'toilet2':
 						cla
 						money += 2000
 						TQuest = 3
-						'Pleased voice says from behind the wall - "You''re a great pacifier, I think you''ve earned a reward."'
-						'2,000 RUB pokes through the hole in the wall.'
+						'A pleased voice says from behind the wall - "You were great, I think you''ve earned a reward."'
+						'2,000 RUB pokes through the hole.'
 
 						guy += 2
 						swallow += 2
@@ -186,7 +186,8 @@ if $ARGS[0] = 'toilet2':
 						if pornstudio = 0:
 							act 'Continue':
 								pornstudio = 2
-								'A male voice says - "Some work for you. Take the card, come if you want to have fun and make money."'
+								'A male voice says "I have some more work for you."'
+								'He pushes a card through the hole and says "Come find me at my studio if you want to have fun and make more money."'
 
 								act 'Leave':gt 'club', 'inside'
 							end
@@ -200,5 +201,4 @@ if $ARGS[0] = 'toilet2':
 	end
 end
 
---- Club2 ---------------------------------
-
+--- Club2 ---------------------------------

+ 24 - 9
locations/HotelHole.qsrc

@@ -2,7 +2,6 @@
 
 CLOSE ALL
 $loc_arg = $ARGS[0]
-$prevloc = $loc
 $loc = $CURLOC
 $menu_loc = 'HotelHole'
 $menu_arg = ''
@@ -16,7 +15,7 @@ gs'stat'
 if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
 
 if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3 and rand(1,10) = 10)):
-	if $prevloc ! 'HotelRoom':
+	if hotelroom = 0:
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
@@ -43,7 +42,12 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			*clr & cla
 			observ_exp += 3
 			gs 'stat'
-			'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
+			if $prevloc = 'HotelRoom': 
+				'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
+			else 
+				'You find the door closed, and you realise that the receptionist and the manager are probably fooling around again. You carefully open the door with your key, and enter as quietly as you can.'
+				'Moving to the corner carefully, you sneak a glimpse.'
+			end
 			'You spy <<$receptionName>>. Yep, you nod, she''s already showing herself off to the cameras.'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event1.jpg"></center>'
 			'She flashes her breasts beneath a devilish smile.'
@@ -101,22 +105,29 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			end
 			exit
 		elseif resepseen = 0:
+			temp = 1
 			observ_exp += rand(0,1)
+			'<center><H4>Pavlovsk hotel</H4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event2.jpg"></center>'
 			'You enter the lobby and you can see the desk girl and the manager talking to each other.'
 			'When they notice you they both give you a very disappointing look.'
 			'You get the feeling you interrupted something here.'
+			*nl
 		end
 	end
 end
 
 :skipresepevent
-'<center><H4>Pavlovsk hotel</H4></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
-if pavHotelMaid = 0:
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+if temp = 1:
+	killvar 'temp'
 else
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	'<center><H4>Pavlovsk hotel</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
+	if pavHotelMaid = 0:
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	else
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	end
 end
 
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''HotelHole'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'
@@ -125,7 +136,11 @@ if hour >= 12 and hour <= 13 and GermanQW > 0: 'Next to the reception desk, you
 
 if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and watch the guests checking in an out.' & hotwait = 0
 
-act 'Leave the hotel':minut += 3 & gt'pav_train'
+act 'Leave the hotel':
+	minut += 3
+	killvar 'prevloc'
+	gt'pav_train'
+end
 
 if maidqw >= 1 and hour >= 16 and hour < 17:
 	act'<b>Work as a maid</b>':

+ 1 - 1
locations/KatjaHomeTalk.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 
-			if npc_sex['A14'] = 1:
+			if npc_sex['A14'] > 0:
 				act 'Offer to take a walk in the Park':
 					minut += 15
 					KatjaHorny += 5

+ 10 - 5
locations/Komp.qsrc

@@ -22,14 +22,16 @@ if $ARGS[0] = 'start':
 		internet = 100000
 		act 'Browse the internet':gt 'komp', 'brows'
 	elseif $loc = 'dachain':
+		internet_store = internet
 		internet = 0
 	else	
 		'You have <<internet>> hours of prepaid internet access remaining.'
 		if internet > 0: act 'Browse the internet':gt 'komp', 'brows'
 	end
 
-	act 'Shut your computer down': gt 'komp', 'fin'
-
+	act 'Shut your computer down': 
+		gt 'komp', 'fin'
+	end
 end
 
 if $ARGS[0] = 'brows':
@@ -37,7 +39,7 @@ if $ARGS[0] = 'brows':
 	gs 'stat'
 	
 	act 'Close the browser':
-		if $loc = 'shulga_room' or $loc = 'anushapt':
+		if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain':
 			internet = internet_store
 			killvar 'internet_store'
 		end
@@ -237,7 +239,7 @@ if $ARGS[0] = 'znak':
 
 			act 'Leave this website':gt 'komp', 'brows'
 		end
-	elseif home_cur ! 1 and home_cur ! 2 and home_cur ! 3 and home_cur ! 4 and home_cur ! 5:
+	elseif curr_home ! 1 and curr_home ! 2 and curr_home ! 3 and curr_home ! 4 and curr_home ! 5:
 		pcs_mood += rand(5, 10)
 		'You spend time looking at the various profiles, but it won''t let you register unless you have your own home and it is set as your current home.'
 		'Still, some of the pictures were quite raunchy and the more desperate profiles were really funny.'
@@ -1846,7 +1848,10 @@ if $ARGS[0] = 'hotornot':
 end
 
 if $ARGS[0] = 'fin': 
-	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'dachain': internet = internetS
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain': 
+		internet = internet_store
+		killvar 'internet_store'
+	end
 	gt $loc, $loc_arg
 end
 

+ 2 - 2
locations/LakeBoyZ.qsrc

@@ -95,7 +95,7 @@ $gL_boy_z = {
 							act 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LBZhouse'
 								else
 									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
@@ -112,7 +112,7 @@ $gL_boy_z = {
 							if $clothingworntype = 'nude':
 								gs 'clothing', 'wear_last_worn'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changenude.jpg"></center>'
-								if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+								if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							else
 								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changebikini.jpg"></center>'

+ 2 - 2
locations/Nudelake.qsrc

@@ -11,7 +11,7 @@ $location_type = 'secluded'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudelake.jpg"></center>'
 'The nudist beach - clothing optional.'
 
-if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
 	act'Get dressed':
 		cla
 		*clr
@@ -25,7 +25,7 @@ if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 end
 
 if temper >= 15 and month >= 5 and month <= 9:
-	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+	if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		act'Change into your swimwear':
 			menu_off = 1
 			cla

+ 1 - 5
locations/ParChurch.qsrc

@@ -275,11 +275,7 @@ if $ARGS[0] = 'liturgy':
     vokal_exp += rand(0,3)
     gs 'stat'
 
-	if $args[1] = 'mom':
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
-	else
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
-	end
+	act 'Leave the church': gt 'ParChurch' , 'start'
 end
 
 if $ARGS[0] = 'reducepavrep':

+ 65 - 71
locations/Peterroom.qsrc

@@ -25,12 +25,12 @@ if $ARGS[0] = 'start_door':
 
 		if petersexday < 1:
 			petersexday += 1
-			'You called, Peter opened the door.'
-			'- Come on, get changed. I am now.'
+			'Peter opens the door.'
+			'Come in and get changed.'
 
-			act 'Take the apartment':gt 'peterroom', 'start'
+			act 'Enter the apartment':gt 'peterroom', 'start'
 		else
-			'You rang the doorbell but no one answers.'
+			'You ring the doorbell, but no one answers.'
 
 			act 'Leave':
 				cla
@@ -50,9 +50,9 @@ if $ARGS[0] = 'start':
 	if peter > 0 :
 		peterrand = rand(1, 2)
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/9.jpg"></center>'
-		'You get undressed, pinned collar and prepared. From the next room came the voice of Peter Vlasnyi:"Who is my whore?"'
+		'You get undressed and fix your collar around your neck. You hear Peter in the next room. "Who''s my whore?"'
 
-		act 'I, my lord ...':
+		act 'I am, Master.':
 			petersex = petersex + 1
 
 			if analplugin = 1 :gt 'peterroom', 'klap'
@@ -63,19 +63,20 @@ if $ARGS[0] = 'start':
 		petersexday += 1
 		minut += 10
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/1.jpg"></center>'
-		'undressing and dressing it. He put a collar in front of you picked up this narrow strip of skin with rivets and thinking.'
+		'As you start to undress, Peter walks into the room, a multi-tailed whip in one hand and a collar in the other.'
+		'He puts the collar down in front of you. It''s a broad strip of leather with a ring at the front where a leash can be attached.'
 
-		act 'Wear' :
+		act 'Put it on' :
 			*clr
 			cla
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/2.jpg"></center>'
-			'You put the collar. Peter stroked whip you on the cheek:'
-			'- Lustful girl! Stand up, turn around, hands behind your back!'
-			'You execute the command and hands snap handcuffs.'
+			'You eagerly put the collar on and Peter strokes you gently on the cheek, but then suddenly pulls his hand back and slaps you.'
+			'"Lustful girl! Stand up and turn around - hands behind your back!"'
+			'You do as he says and feel leather cuffs being fastened around your wrists.'
 
 			if analplugin = 1 :
 				analplugin = 0
-				'"And what have we here?" Peter grips the tip of the butt plug sticking out of your ass, and eases it out.'
+				'"What do we have here?" Peter grips the end of the butt plug sticking out of your ass, and eases it out.'
 			end
 
 			act 'Smile':
@@ -83,46 +84,45 @@ if $ARGS[0] = 'start':
 				*clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/3.jpg"></center>'
-				'Peter pulled you by the collar, pushed you on your knees in front of him and ordered: "Come on bitch, open your mouth."'
+				'Peter pulls you by the collar, then shoves you to your knees in front of him. "Come on bitch, open your mouth." he orders.'
 
-				act 'Submit':
+				act 'Please him':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/4.jpg"></center>'
-					'Peter unbuttoned his pants and pulled out his 25cm dick. He grabbed you by the hair and shoved in your mouth the head of his penis. You obediently wrap your lips around it, sucking and caressing with your tongue, feeling as it grows and strains in your mouth.'
-
+					'Peter unbuttons his pants and pulls out his 25cm cock. He grabs you by the hair and shoves the head in your mouth. You obediently wrap your lips around it, then begin to suck and caress it with your tongue, feeling it grow and strain inside your mouth.'
 					gs 'arousal', 'bj', 5, 'sub'
 					gs 'stat'
 					
-					act 'Continue Composition' :
+					act 'Continue' :
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/5.jpg"></center>'
-						'And then Peter pushed you over and rudely and impatiently thrust member in your pussy and started to fuck you like a blow-up doll. A few minutes later, he stopped, pulled his cock out, pushed you to the floor and ordered:'
-						'"Crawl to me, bitch!"'
-
+						'Peter pushes you onto the bed and presses your legs up to your chest before binding your hand cuffs behind them.'
+						'With some impatience, he climbs onto the bed and thrusts his member into your pussy, fucking you like a mindless doll. After a few minutes, he stops and pulls his cock out of you, unties you and then shoves you to the floor.'
+						'He walks across the room, turns and says, "Crawl to me, bitch!"'
 						gs 'arousal', 'vaginal', 5, 'sub'
 						gs 'stat'
 					
-						act 'crawl' :gt 'peterroom', 'klap'
+						act 'Crawl' :gt 'peterroom', 'klap'
 					end
 				end
 				
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
-					act 'Does not comply (<<will_cost>> Willpower)':
+					act 'Refuse (<<will_cost>> Willpower)':
 						cla & *clr
 						gs 'pain', 8, 'asscheeks', 'spank'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/peter/4_1.jpg"></center>'
-						'"Have to punish you" with these words Peter crossed over the table and shoved a plug in your ass. - Pop up earlier than end flogging, will receive the same amount:- Peter became the side of you, spread the whip and started whipping. counting aloud strikes interspersed with your shouts and sobs ...'
-						'"Ask me to fuck you, nine docile litter?"'
-
-						act 'Yes! I''ll be your whore!' :gt 'peterroom', 'klap'
+						'"You need to be punished!" Peter rounds the table and forces you on your knees with your ass high in the air. You squeal when he shoves a butt plug deep into your ass, but it gets worse. He reaches for his whip, and starts flogging your ass, alternating cheeks. He counts the strikes aloud, ignoring your sobs as the leather tails burn across your raw ass.'
+						'"Beg me to fuck you, whore!"'
+						'Please fuck me, Master! Please! Fuck me like the dirty little whore I am!'
+						act 'Continue' :gt 'peterroom', 'klap'
 					end
 				else
-					act 'Does not comply (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Refuse (<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
@@ -136,34 +136,30 @@ if $ARGS[0] = 'klap':
 	*clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/6.jpg"></center>'
-	'Peter on a leash led you into the bedroom. Knocked on the huge bed and tied his hands and feet.'
-	'Then deftly put into your mouth gag:- ball on the strap and fastened it at the back.'
-	'"I love, <<$pcs_nickname>>," as you moan, but when you''re talking about, you start talking nonsense. So it is better groan, honey ...'
-
+	'Peter puts you on a leash and leads you into the bedroom. He pushes you onto the huge bed and ties your hands and feet to the headboard, before fastening a ball gag into your mouth.'
+	'"I love it when you moan, <<$pcs_nickname>>, but when you''re allowed to talk, you start spouting nonsense. So I think you''re better off gagged.'
 	gs 'arousal', 'foreplay', 5, 'sub', 'bound'
 	gs 'stat'
 					
-	act 'Moo':
+	act 'Moan':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/7.jpg"></center>'
-		'Peter bore down on you from above. "Check how much you sweet ass?" Said Peter'
+		'Peter spreads your legs and bears down on you from above. "Let''s see how well your sweet ass opens for me," he says'
 
 		if analplugin = 1 :
 			analplugin = 0
-			', Pulled a butt plug'
+			', pulls out your butt plug'
 		end
 
-		' and put his huge erection to your anus half-entering it. You gasped in pain, and mooed into gag. You can''t wait for him to get in your ass completely. Peter saw your reaction and began to fuck your ass with every stroke penetrating deeper and deeper until his penis completely sinks into you, and his balls slap you hard on the buttocks. He fucks you so hard that your knees start to shake, and from you pussy juices leak on buttocks.'
-
+		', and positions his huge erection against your asshole, half-entering with the first thrust. You gasp in pain, moaning into the gag. You can''t wait for him to bury himself in your ass completely. Peter sees your reaction and begins to fuck your ass, penetrating deeper with each stroke, until his dick is completely buried inside you and his balls slap hard against your buttocks. He fucks you so hard that your knees start to shake, and pussy juices trickle down your ass.'
 		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
 					
-		act 'Moo':
+		act 'Moan again':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/8.jpg"></center>'
-			'He continues to penetrate you faster, then slows the rhythm, makes several deep movements and finishes by filling your insides with hot stream of sperm ....'
-
+			'He continues to fuck you hard and fast, then slows the rhythm, finishing with several sharp uneven thrusts that fill your insides with a hot stream of cum.'
 			gs 'arousal', 'anal', 10, 'sub'
 			gs 'stat'
 		
@@ -172,10 +168,10 @@ if $ARGS[0] = 'klap':
 			if pcs_horny >= 100:
 				analorgasm += 1
 				$orgasm_or = 'yes'
-				$orgasm_txt = 'heat surges in your ass and orgasm washes over you.'
+				$orgasm_txt = 'A pleasant sensation surges within you and an orgasm washes over you, juices spraying from your pussy as you moan loudly into the gag.'
 			end
 
-			'Your ass makes squelching noise when freed from his penis. Peter sat on the bed, breathing heavily, and you remained lying bound, feeling sperm slowly leaking from your fucked ass.'
+			'Your ass makes a loud squelching noise when he pulls his dick out. Peter sits on the bed, breathing heavily while you remain bound, his cum slowly leaking from your asshole.'
 			
 			act 'Relax' :gt 'peterroom', 'end'
 		end
@@ -188,22 +184,23 @@ if $ARGS[0] = 'end':
 	minut += 30
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/vanroom.jpg"></center>'
-	'- You were great - said Peter and smacking you on the cheek, picked up and carried you to the bathroom where you showered together.'
+	'"You were great." Peter says, smacking you on the ass. After a few minutes, he picks you up and carries you to the bathroom, where you take a bath together.'
 
-	act 'Get out' :
+	act 'Leave' :
 		cla
 		*clr
 		peter += 1
 		minut += 20
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/mash.jpg"></center>'
-		'You walked down to the yard, and Peter started the car. He kissed you on the lips and said:'
-		'"<<$pcs_nickname>>, you really brighten up my lonely and gray existence. Your appearance is as the light in the dark, or a breath of fresh air ... I hope to see you again. But I need to leave for now. Want a lift?"'
+		'Leaving his apartment, Peter grabs his keys, planning to head out too. You walk down to the yard together, and when you reach his car, Peter leans in to kiss you on the lips.'
+		'"<<$pcs_nickname>>, you really brighten up my lonely existence. Your appearance is like a light in the dark - a breath of fresh air." He smiles, stroking your cheek. "I need to leave for now, but I hope I can see you against soon."'
+		'Peter slides into his car and starts the engine, but just as he''s about to drive off, he suddenly calls to you. "Forgive my rudeness, but do you need a lift somewhere?"'
 			
-		act 'To the center':
+		act 'To the city center':
 			gs 'arousal', 'end'
 			gt 'city_center'
 		end
-		act 'The house':
+		act 'To your apartment':
 			gs 'arousal', 'end'
 			gt 'city_residential'
 		end
@@ -215,23 +212,23 @@ if $ARGS[0] = 'd1':
 	*clr
 	if pcs_ass < 25:pcs_ass += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/d1-1.jpg"></center>'
-	'Peter connects your hands behind your back. His hands take you by the hips and lifted your ass, placing you cancer. You dutifully lean and Peter catches the rope to the hook.'
-
-	act 'Sucking her fingers':
+	'Peter binds your torso and hands, then lifts you up by the hips, hanging your bound form from a hook.'
+	
+	act 'Suck his fingers':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-2.jpg"></center>'
-		'Peter pushes your hands halves drives his cock in the ass. You gasped in pain, and mooing in gag. - And I see you can not wait to get his ass completely - Peter saw your reaction and began to fuck your ass with every stroke penetrating deeper and deeper until his penis did not completely sink into you, and the balls hard slap on the buttocks.'
-
+		'Peter grabs your head and shoves all of his fingers into your mouth, forcing you to suck on them.'
+		'After a few seconds of you sucking and gagging on his fingers, he withdraws them and moves around behind you.'     
 		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
 		
-		act 'Moan':
+		act 'Penetration':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-3.jpg"></center>'
-			'He fucks you so intense that you feel like my knees start to shake, and the legs from the pussy juices flow down your.'
-
+			'You think he is about to finger your ass, but squeal in surprise when he shoves his dick into you instead.'
+            'You moan in a mix of pleasure and pain as he starts thrusting, quickly picking up the pace.'
 			gs 'arousal', 'anal', 10, 'sub'
 			gs 'stat'
 		
@@ -239,20 +236,19 @@ if $ARGS[0] = 'd1':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-4.jpg"></center>'
-				'He continues to stick you faster'
+				'He continues to fuck you hard and you submit yourself to the pleasure of your ass being hammered, your pussy juices running down your legs.'
 
 				if pcs_horny >= 100:
 					analorgasm += 1
 					$orgasm_or = 'yes'
-					'You are very excited that grew in the ass sweet languor, and then suddenly become a hot orgasm washing over you. Simultaneously with you ends Peter pounding dick deeper and filling your insides hot stream of sperm ....'
+					'He continues to fuck you hard and fast and you soon feel an intense orgasm washing over you, juices squirting from your pussy as his warm cum fills your ass.'
 					
 				elseif pcs_horny < 100:
 					$orgasm_or = 'no'
-					' and then slows the rhythm, makes several deep movements and finishes filling your insides hot stream of sperm ....'
-					
+					'He suddenly slows the rhythm, finishing with several sharp uneven thrusts that fill your ass with a hot load of cum.'					
 				end
-
-				'Ass to squelch freed from his penis. Peter sat on the bed, breathing heavily, and you remained kneeling with protruding upward booty fucked from which the legs dripping sperm.'
+				
+				'Your ass makes a loud squelching noise when he pulls his dick out. Peter sits on the bed, breathing heavily while you remain kneeling with your ass in the air, his cum trickling down your leg.'
 
 				act 'Further' :gt 'peterroom', 'end'
 			end
@@ -264,7 +260,7 @@ if $ARGS[0] = 'd2':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-1.jpg"></center>'
-	'Peter put you on your knees, then lifted your head and holding her hands to force your mouth planted its piston. His head slipped down his throat, but he did not rest on this, continuing to press. And its 25 centimeter count began to enter into you further.'
+	'Peter forces you on your knees, then lifts your head and thrusts his cock into your mouth. The head of his cock goes down your throat, but he continues to thrust, forcing more of its 25cm length inside.'
 
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
@@ -273,7 +269,8 @@ if $ARGS[0] = 'd2':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-2.jpg"></center>'
-		'- Cosi better whore! Inch by inch, pushing relentlessly pounding him deeper and deeper. After another push me you felt that your lips into something rested. And in a moment you realize that it is all inside.'
+		'He thrusts mercilessly, fucking deeper into your mouth. Eventually, you feel his balls slap your chin, and realize that he''s bottomed out.'
+		'You feel a sense of pride in managing to take it all, but the feeling melts away as he begins to use your throat.'
 
 		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 		gs 'stat'
@@ -282,23 +279,21 @@ if $ARGS[0] = 'd2':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-3.jpg"></center>'
-			'Tears streamed from your eyes, and Peter began slowly began to move. He took his hands away from your head, and now you hands grabbed his buttocks and continued to sit down on his spear. You trembling, you are lost in sensation between the legs fire raged in the chest ached pleasantly shamelessness and sense of awareness of their depravity.'
-
+			'Tears stream from your eyes as he begins moving slowly. He takes his hands away from your head, and you desperately grab onto him while you let him use your throat. Trembling, you are lost in sensations - caught between the fire raging between your legs and your shameless awareness of the depravity of the situation.'
 			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 			gs 'stat'
 		
-			act 'Moo':
+			act 'Moan':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-4.jpg"></center>'
-				'Peter began to finish and stopped drove a member as far as possible, you feel like you are somewhere deep pours his sperm., And on his balls your saliva flowing ...'
-
+				'Peter is nearing climax, his thrusts becoming ragged, when he suddenly stops and pushes in deep. His balls draw up, coated with your saliva, and you feel his sperm shooting down your throat.'
 				gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 				gs 'stat'
 		
 				if pcs_horny >= 100:
 					$orgasm_or = 'yes'
-					'Suddenly you start you finish yourself. Between the legs blazing fire and waves of pleasure covered body, you moaned and shuddered with orgasm, but Peter gripped you do not allow members to slip out of his mouth ...'
+					'Your orgasm suddenly hits you. Waves of pleasure ripple through your body, and you moan and shudder with release, but Peter holds you in place and refuses to allow his cock to slip out of your mouth.'
 				end
 
 				act 'Swallow' :gt 'peterroom', 'end'
@@ -307,5 +302,4 @@ if $ARGS[0] = 'd2':
 	end
 end
 
---- Peterroom ---------------------------------
-
+--- Peterroom ---------------------------------

+ 1 - 1
locations/Snpc.qsrc

@@ -521,7 +521,7 @@ end
 
 !!Natasha Belova Botha
 if numnpc = 16:
-	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0 and npc_rel['A<<numnpc>>'] >= 80:
+	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 

+ 1 - 1
locations/Vika.qsrc

@@ -3,7 +3,7 @@
 vikaAge = age + 1
 gs'stat'
 '<center><B><font color=maroon>Vika Kirilova</font></B></center>'
-'<center><img <<$set_imgh>> src="images/pc/npc_headshots/vika.jpg" ></center>'
+'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big220.jpg" ></center>'
 'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She came to from a town much further away than you did, like you Vika comes from a poor family. You don''t really know much more about her yet.'
 if vikaslut = 1: 'You know Vika works as a whore in a brothel in the city central area.'
 

+ 1 - 1
locations/Voltrenersex.qsrc

@@ -572,7 +572,7 @@ if $ARGS[0] = 'discoSex':
 					end
 				end
 			else
-			  '<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'
+			  '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim34.jpg"></center>'
 				'Having brought you to the girls bathroom, you stop and say to him, "Not the most secluded place Mikhail," turning away, you walk off. He sighs but smiles, as he watches your tight little ass as you walk away. "Ok we can go home if this isn''t good enough."'
 				act 'Go with coach':
 					Discoclose = 1

+ 1309 - 312
locations/_attributes_fetish.qsrc

@@ -2,529 +2,1526 @@
 
 !!Quality range is 2-6.
 if ARGS[1] = 1:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 2:
-	CloQuality = 5
-	CloThinness = 5
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 3
-	ClopantsShortness = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 3:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 4:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 5:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloPanties = 1
-	CloOnePiece = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 6:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 3
-	ClopantsShortness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 7:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
+	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 8:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
-	ClopantsShortness = 6
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 9:
-	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 11:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 2
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 12:
 	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 2
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 13:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
-elseif ARGS[1] = 14:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
+	CloBra = 1
+	CloSkirtShortness = 3
+	CloPanties =1
+elseif ARGS[1] = 14:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 15:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 16:
-	CloQuality = 5
-	CloThinness = 6
-	CloBra = 1
-	CloPanties = 1
-	CloOnePiece = 10
-elseif ARGS[1] = 17:
 	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 17:
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 2
-	CloPanties = 1
-	CloOnePiece = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 18:
 	CloQuality = 4
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 2
-	CloPantsShortness = 1
-	CloOnePiece = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 19:
-	CloQuality = 4
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 4	
+	CloSkirtShortness = 3	
+	CloDress = 1
+	CloStyle= 4
 elseif ARGS[1] = 20:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 21:
 	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloOnePiece = 1
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 22:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 5
-elseif ARGS[1] = 23:
-	CloQuality = 6
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 2
-elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 4
-	CloTopCut = 3
+	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 23:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 24:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 25:
-	CloQuality = 6
+	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 4
-	CloPantsShortness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 26:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 27:
 	CloQuality = 5
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 3
-	CloPanties = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 27:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 28:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 29:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
+	CloThinness = 6
+	CloTopCut = 1
 	CloSkirtShortness = 4
-elseif ARGS[1] = 30:
+	CloDress = 1
+elseif ARGS[1] = 29:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
-	CloPanties = 1
-	CloOnePiece = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 30:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 31:
 	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloOnePiece = 1
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 32:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
-	CloPantsShortness = 1
-	CloOnePiece = 1
-elseif ARGS[1] = 33:
-	CloQuality = 6
-	CloThinness = 5
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 3
-	CloPantsShortness = 1
-	CloOnePiece = 1
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 33:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle2= 1
 elseif ARGS[1] = 34:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
+	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle2= 1
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle2= 1
 elseif ARGS[1] = 36:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 37:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 37:
-	CloQuality = 3
-	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloSkirtShortness = 3
 elseif ARGS[1] = 38:
-	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1	
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 4	
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 40:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloPantsShortness = 1
 elseif ARGS[1] = 41:
-	CloQuality = 2
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloOnePiece = 1
-elseif ARGS[1] = 42:
 	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 4
-elseif ARGS[1] = 43:
-	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 42:
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
+	CloTopCut = 4
+	CloPantsShortness = 1
+elseif ARGS[1] = 43:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
 	CloPantsShortness = 1
-	CloOnePiece = 1
 elseif ARGS[1] = 44:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloPanties = 1
+	CloBra = 2
+	CloPantsShortness = 1
+	CloBimbo = 1
 elseif ARGS[1] = 45:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 1
+	CloQuality = 5
+	CloThinness = 4
+	loTopCut = 1
 	CloPantsShortness = 1
-	CloOnePiece = 1
 elseif ARGS[1] = 46:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 4
-	CloTopCut = 3
+	loTopCut = 1
 	CloPantsShortness = 1
-	CloOnePiece = 1
 elseif ARGS[1] = 47:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 1
+	loTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 1
+	loTopCut = 1
 	CloPantsShortness = 1
-	CloOnePiece = 1	
 elseif ARGS[1] = 49:
-	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
-elseif ARGS[1] = 50:
-	CloQuality = 2
+	CloQuality = 5
 	CloThinness = 4
-	CloTopCut = 4
+	loTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 50:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 51:
-	CloQuality = 6
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 52:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 6
+	loTopCut = 1
 	CloPantsShortness = 1
-	CloOnePiece = 1
+	CloStyle = 4
 elseif ARGS[1] = 53:
 	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 2
+	CloThinness = 4
+	loTopCut = 1
 	CloPantsShortness = 1
-	CloStyle = 2
 elseif ARGS[1] = 54:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 3
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 55:
 	CloQuality = 6
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 56:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 2
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
 elseif ARGS[1] = 57:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloPantsShortness = 1
-elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 59:
+	CloTopCut = 1
+	CloSkirtShortness = 4
+elseif ARGS[1] = 58:
 	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 3
-	CloPantsShortness = 1
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
+elseif ARGS[1] = 59:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
 elseif ARGS[1] = 60:
-	CloQuality = 6
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 4
+	CloStyle = 4
 elseif ARGS[1] = 61:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloOnePiece = 1
 	CloBimbo = 1
-	CloBra = 1
-	CloPanties = 1
 elseif ARGS[1] = 62:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloPantsShortness = 1
+	CloSkirtShortness = 6
+	CloBimbo = 1
 elseif ARGS[1] = 63:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 64:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 4
-elseif ARGS[1] = 64:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 3
 elseif ARGS[1] = 65:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 4
-elseif ARGS[1] = 66:
 	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloOnePiece = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+elseif ARGS[1] = 66:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 3
 elseif ARGS[1] = 67:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloBra = 1
-	CloPanties = 1
+	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 68:
 	CloQuality = 4
-	CloThinness = 5
-	CloBimbo = 1
-	CloBra = 1
-	CloPanties = 1
-	CloOnePiece = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 69:
 	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloBra = 1
-	CloPanties = 1
-elseif ARGS[1] = 70:
-	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 4
-	CloPantsShortness = 6
-	CloBra = 1
-	CloPanties = 1
-elseif ARGS[1] = 71:
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 70:
 	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-elseif ARGS[1] = 72:
-	CloQuality = 6
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 2
-	CloPanties = 1
-	CloOnePiece = 1
-elseif ARGS[1] = 73:
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 71:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 6
-	CloBimbo = 1
+	CloTopCut = 4
 	CloBra = 2
-	CloPanties = 1
-	CloOnePiece = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 73:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 74:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloOnePiece = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 75:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 76:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 77:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 78:
 	CloQuality = 6
-	CloThinness = 6
-	CloTopCut = 1
+	CloThinness = 4
+	CloTopCut = 3
 	CloPantsShortness = 1
-	CloBimbo = 1
-	CloBra = 1
+elseif ARGS[1] = 79:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 80:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 81:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloDress = 1
 	CloPanties = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 76:
+elseif ARGS[1] = 82:
 	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloDress = 1
 	CloPanties = 1
-	CloBra = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 77:
+elseif ARGS[1] = 83:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloPanties = 1
+	CloStyle = 4
+elseif ARGS[1] = 84:
 	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 5
+elseif ARGS[1] = 85:
+	CloQuality = 5
 	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 5
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 86:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 87:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 88:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 89:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 90:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 91:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 2
+elseif ARGS[1] = 92:
+	CloQuality = 44
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 93:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 94:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 95:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 96:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 97:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 98:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 99:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 100:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 101:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 5
+elseif ARGS[1] = 102:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 103:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 1
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+elseif ARGS[1] = 104:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 105:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 106:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 107:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 108:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 109:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 110:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 3
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 111:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 112:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 113:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 114:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 115:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 4
+elseif ARGS[1] = 116:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 117:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 118:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 119:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 120:
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 121:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 122:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 123:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 124:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 125:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 126:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 127:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 128:
+	CloQuality = 2
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 129:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 130:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 131:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 132:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloDress = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 133:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 134:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloStyle = 4
+elseif ARGS[1] = 135:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloDress = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 136:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
 	CloBimbo = 1
+elseif ARGS[1] = 137:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 6
+elseif ARGS[1] = 138:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
 	CloBra = 1
-elseif ARGS[1] = 78:
+	CloSkirtShortness = 6
+elseif ARGS[1] = 139:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 140:
+	CloQuality = 2
+	CloThinness = 6
+	CloTopCut = 4
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 141:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 142:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 143:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 144:
+	CloQuality = 2
+	CloThinness = 6
+	CloTopCut = 4
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 145:
+	CloQuality = 2
+	CloThinness = 6
+	CloTopCut = 4
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 146:
+	CloQuality = 2
+	CloThinness = 6
+	CloTopCut = 4
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 147:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 148:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 149:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloDress = 1
+elseif ARGS[1] = 150:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 151:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloDress = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 152:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloStyle= 4
+elseif ARGS[1] = 153:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 154:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 1
+	CloDress = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 155:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 156:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 157:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+elseif ARGS[1] = 158:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloStyle = 4
+elseif ARGS[1] = 159:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloBra = 2
+	CloSkirtShortness = 6
+	CloPanties
+	CloDress = 1
+elseif ARGS[1] = 160:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 3
+	CloPanties = 1
+	CloOnePiece = 1
+	CloDress = 1
+elseif ARGS[1] = 161:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 162:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 163:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+elseif ARGS[1] = 164:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 165:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 166:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 167:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 168:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 169:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 170:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 171:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+elseif ARGS[1] = 172:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+elseif ARGS[1] = 173:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 6
+	CloDress = 1
+elseif ARGS[1] = 174:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloBra = 2
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloPanties = 1
+	CloBimbo = 1
+elseif ARGS[1] = 175:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 176:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 177:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloBra = 2
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 178:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 179:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 180:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+elseif ARGS[1] = 181:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloBra = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 182:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	CloBimbo = 1
+elseif ARGS[1] = 183:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 184:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 185:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+elseif ARGS[1] = 186:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+elseif ARGS[1] = 187:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 4
-elseif ARGS[1] = 79:
-	CloQuality = 3
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 188:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloStyle = 4
+elseif ARGS[1] = 189:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+elseif ARGS[1] = 190:
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloPanties = 1
-	CloBimbo = 1
-	CloBra = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 80:
-	CloQuality = 5
+elseif ARGS[1] = 191:
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 4
-elseif ARGS[1] = 81:
+	CloSkirtShortness = 6
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 192:
 	CloQuality = 3
-	CloThinness = 6
-	CloBimbo = 1
+	CloThinness = 5
+	CloTopCut = 4
 	CloBra = 2
 	CloPanties = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 82:
+elseif ARGS[1] = 193:
 	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 1
-	CloSkirtShortness = 4
-	CloBimbo = 1
-elseif ARGS[1] = 83:
+	CloThinness = 5
+	CloTopCut = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 194:
 	CloQuality = 5
-	CloThinness = 6
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 1
 	CloBimbo = 1
-	CloBra = 1
-	CloPanties = 1
-elseif ARGS[1] = 84:
+elseif ARGS[1] = 195:
 	CloQuality = 6
-	CloThinness = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 1
+elseif ARGS[1] = 196:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 1
+elseif ARGS[1] = 197:
+	CloQuality = 6
+	CloThinness = 3
+	CloTopCut = 3
+	CloPantsShortness = 1
+elseif ARGS[1] = 198:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloOnePiece = 1
+elseif ARGS[1] = 199:
+	CloQuality = 4
+	CloThinness = 5
 	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 200:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 201:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 85:
+elseif ARGS[1] = 202:
 	CloQuality = 6
-	CloThinness = 6
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 1
-	CloBimbo = 1
-elseif ARGS[1] = 86:
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 203:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 204:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 205:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 206:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 207:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 208:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 6
+	CloPanties = 1
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 209:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 210:
 	CloQuality = 6
 	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 5
+elseif ARGS[1] = 211:
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 1
-elseif ARGS[1] = 87:
+	CloPantsShortness = 5
+elseif ARGS[1] = 212:
 	CloQuality = 4
 	CloThinness = 5
+	CloTopCut = 1
 	CloBra = 1
 	CloPanties = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 88:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 4
-elseif ARGS[1] = 89:
+elseif ARGS[1] = 213:
 	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 1
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 214:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
 	CloBimbo = 1
-elseif ARGS[1] = 90:
+elseif ARGS[1] = 215:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 216:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 217:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 218:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 219:
 	CloQuality = 5
 	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 5
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 220:
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 3
-	CloPantsShortness = 1
+	CloPantsShortness = 6
+	CloDress = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 91:
+elseif ARGS[1] = 221:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 222:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-elseif ARGS[1] = 92:
-	CloQuality = 6
 	CloThinness = 6
-	CloBimbo = 1
-	CloBra = 1
+	CloTopCut = 4
+	CloBra = 2 
 	CloPanties = 1
-elseif ARGS[1] = 93:
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 223:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 224:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 5
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 225:
 	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
+	CloTopCut = 1
+	CloPantsShortness = 5
+	CloDress = 1
 	CloOnePiece = 1
-elseif ARGS[1] = 94:
+elseif ARGS[1] = 226:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 5
+	CloDress = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 227:
 	CloQuality = 4
 	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 228:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloBra = 2
+	CloPantsShortness = 6
+	CloDress = 1
+	CloOnePiece = 1
 	CloBimbo = 1
-	CloBra = 1
+elseif ARGS[1] = 229:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
 	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 230:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 1
+	CloSkirtShortness = 1
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 231:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 232:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 233:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 234:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 235:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 236:
+	CloQuality = 6
+	CloThinness = 6
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 237:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 238:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 239:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 1
+	CloDress = 1
+elseif ARGS[1] = 240:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 1
+	CloDress = 1
 end
 
 --- $attributes_fetish ---------------------------------

Разница между файлами не показана из-за своего большого размера
+ 254 - 261
locations/_attributes_formal.qsrc


+ 416 - 350
locations/_attributes_office.qsrc

@@ -2,397 +2,395 @@
 
 ! Quality range is 4-5 here. 4 for simple blouse and skirt combos, 5 for suits and expensive office dresses.
 if ARGS[1] = 1:
-	CloQuality = 5
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 3
-	CloBimbo = 1
-	CloStyle = 4
-elseif ARGS[1] = 3:
-	CloQuality = 5
-	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
+elseif ARGS[1] = 3:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 4:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 2
-	CloBimbo = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 5:
-	CloQuality = 4
-	CloThinness = 3
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 6:
-	CloQuality = 5
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 2
 	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloPantsShortness = 1
 elseif ARGS[1] = 7:
 	CloQuality = 5
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 8:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 9:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 10:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 11:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 12:
 	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 2
-	CloDress = 1
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 13:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 2
-	CloDress = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 14:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloBimbo = 1
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 15:
-	CloQuality = 5
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloDress = 1
-	CloBimbo = 1
-elseif ARGS[1] = 16:
-	CloQuality = 5
-	CloThinness = 1
+	CloQuality = 3
+	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 2
-elseif ARGS[1] = 17:
-	CloQuality = 5
+	CloPantsShortness = 1
+elseif ARGS[1] = 16:
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-elseif ARGS[1] = 18:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 3
-elseif ARGS[1] = 19:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 4
 	CloBimbo = 1
-elseif ARGS[1] = 20:
+elseif ARGS[1] = 17:
 	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 18:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 19:
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 20:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 21:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 3
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 22:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 23:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 24:
 	CloQuality = 4
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 25:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 26:
-	CloQuality = 5
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 27:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloPantsShortness = 1
 elseif ARGS[1] = 28:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloTopCut = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 29:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 6
-	CloBimbo = 1
-	CloStyle = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 30:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloPantsShortness = 1
 elseif ARGS[1] = 31:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 32:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
-elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
-elseif ARGS[1] = 34:
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 34:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 35:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 2
-	CloDress = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 36:
-	CloQuality = 5
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 37:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 2
-	CloStyle = 4
-elseif ARGS[1] = 38:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloBimbo = 1
-elseif ARGS[1] = 39:
-	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-elseif ARGS[1] = 40:
+elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 1
+	CloStyle = 4
+elseif ARGS[1] = 39:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 40:
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 41:
 	CloQuality = 4
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloPantsShortness = 1
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 43:
 	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloThinness = 3
+	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 44:
 	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
+	CloThinness = 3
+	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 45:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 46:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 47:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 48:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 49:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 3
-	CloBimbo = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 50:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 51:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 52:
-	CloQuality = 5
-	CloThinness = 3
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloPantsShortness = 1
 elseif ARGS[1] = 53:
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 2
-	CloBimbo = 1
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
 elseif ARGS[1] = 54:
 	CloQuality = 5
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 55:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 56:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 57:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 58:
-	CloQuality = 5
-	CloThinness = 2
-	CloTopCut = 2
-	CloPantsShortness = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 59:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 60:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 61:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloStyle = 4
 elseif ARGS[1] = 62:
-	CloQuality = 5
-	CloThinness = 2
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 63:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 64:
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 4
-elseif ARGS[1] = 65:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 5
 	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloBimbo = 1
+elseif ARGS[1] = 65:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 66:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 3
-	CloDress = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 67:
 	CloQuality = 4
-	CloThinness = 5
+	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloBimbo = 1
 elseif ARGS[1] = 68:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 2
 elseif ARGS[1] = 69:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 70:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 2
-	CloPantsShortness = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 71:
-	CloQuality = 4
-	CloThinness = 3
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 elseif ARGS[1] = 72:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 elseif ARGS[1] = 73:
 	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 1
+	CloThinness = 4
+	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 74:
 	CloQuality = 4
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 75:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 76:
@@ -401,272 +399,340 @@ elseif ARGS[1] = 76:
 	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 77:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloBimbo = 1
 elseif ARGS[1] = 78:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 3
-elseif ARGS[1] = 79:
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 3
+	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloBimbo = 1
-elseif ARGS[1] = 80:
-	CloQuality = 4
+elseif ARGS[1] = 79:
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+elseif ARGS[1] = 80:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 81:
 	CloQuality = 5
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 82:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 4
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 83:
 	CloQuality = 5
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 84:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 2
-	CloPantsShortness = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 85:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloBimbo = 1
-elseif ARGS[1] = 86:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
+elseif ARGS[1] = 86:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 2
 elseif ARGS[1] = 87:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 3
-	CloBimbo = 1
-elseif ARGS[1] = 88:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloPantsShortness = 1
-elseif ARGS[1] = 89:
+	CloSkirtShortness = 2
+elseif ARGS[1] = 88:
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 89:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 2
 	CloSkirtShortness = 2
 elseif ARGS[1] = 90:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 91:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 elseif ARGS[1] = 92:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 93:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloDress = 1
 elseif ARGS[1] = 94:
-	CloQuality = 4
-	CloThinness = 3
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 95:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 elseif ARGS[1] = 96:
 	CloQuality = 5
-	CloThinness = 2
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 97:
 	CloQuality = 5
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 elseif ARGS[1] = 98:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 4
 elseif ARGS[1] = 99:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloBimbo = 1
 elseif ARGS[1] = 100:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloBimbo = 1
-elseif ARGS[1] = 101:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 101:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 102:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 103:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 104:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 105:
-	CloQuality = 5
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 1
+	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 106:
-	CloQuality = 3
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 107:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 108:
 	CloQuality = 5
-	CloThinness = 2
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 109:
-	CloQuality = 3
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 110:
-	CloQuality = 5
-	CloThinness = 2	
-	CloTopCut = 1	
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 111:
-	CloQuality = 3
-	CloThinness = 2
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 1
+	CloSkirtShortness = 2
 elseif ARGS[1] = 112:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 113:
-	CloQuality = 2
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 114:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 5
 elseif ARGS[1] = 115:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 116:
 	CloQuality = 4
-	CloThinness = 2
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 2
+	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 117:
 	CloQuality = 4
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 1
 elseif ARGS[1] = 118:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 119:
-	CloQuality = 3
-	CloThinness = 2
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 120:
-	CloQuality = 2
-	CloThinness = 2
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 2
+	CloSkirtShortness = 2
 elseif ARGS[1] = 121:
-	CloQuality = 3
-	CloThinness = 2
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 122:
-	CloQuality = 3
-	CloThinness = 1
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 1
 elseif ARGS[1] = 123:
-	CloQuality = 3
-	CloThinness = 1
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 1
-	CloPantsShortness = 2
+	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 124:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 125:
 	CloQuality = 5
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 126:
 	CloQuality = 5
-	CloThinness = 2
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 elseif ARGS[1] = 127:
 	CloQuality = 5
-	CloThinness = 2
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 128:
 	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 129:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 130:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 131:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+	CloBimbo = 1
+elseif ARGS[1] = 132:
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 133:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloDress = 1
+elseif ARGS[1] = 134:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 135:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 136:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 137:
+	CloQuality = 5
 	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 138:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloBimbo = 1
+elseif ARGS[1] = 139:
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
+elseif ARGS[1] = 140:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
 end
 
 --- $attributes_office ---------------------------------

+ 319 - 196
locations/_attributes_school.qsrc

@@ -3,189 +3,175 @@
 !Quality range is usually 3-4.
 if ARGS[1] = 1:
 	CloQuality = 3
-	CloThinness = 3
+	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 3:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 4:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 5:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
-	CloBimbo = 1
-	CloStyle = 4
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
-	CloStyle2 = 4	
+	CloSkirtShortness = 2
+	CloStyle2 = 4
 elseif ARGS[1] = 7:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 8:
 	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
-	CloBimbo = 1
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
-	CloStyle = 4
 elseif ARGS[1] = 9:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
-	CloStyle = 4
 elseif ARGS[1] = 10:
-	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 4
-	CloBimbo = 1
-	CloStyle = 4
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 11:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 elseif ARGS[1] = 12:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 14:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
-	CloSkirtShortness = 4
-	CloBimbo = 1
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 15:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloSkirtShortness = 5
 elseif ARGS[1] = 16:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloBimbo = 1
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 17:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 18:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 20:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 21:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 4
+	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 elseif ARGS[1] = 22:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 24:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 25:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
-	CloBimbo = 1
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 26:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 28:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 elseif ARGS[1] = 29:
-	CloQuality = 4
-	CloThinness = 3
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
@@ -197,106 +183,105 @@ elseif ARGS[1] = 30:
 	CloStyle2 = 4
 elseif ARGS[1] = 31:
 	CloQuality = 3
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 32:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 33:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 34:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 1
+	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 35:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 elseif ARGS[1] = 36:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 37:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 38:
 	CloQuality = 3
-	CloThinness = 3
+	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 39:
 	CloQuality = 4
-	CloThinness = 2
+	CCloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
-	CloStyle2 = 4
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 elseif ARGS[1] = 40:
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloStyle2 = 4
+	CloThinness = 2
+	CloTopCut = 1
 	CloSkirtShortness = 4
-elseif ARGS[1] = 41:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 4
 	CloStyle2 = 4
+elseif ARGS[1] = 41:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloStyle2 = 4
 elseif ARGS[1] = 42:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
 elseif ARGS[1] = 43:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
 elseif ARGS[1] = 44:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 4
-	CloStyle2 = 4
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloBimbo = 1
-elseif ARGS[1] = 45:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
 	CloStyle2 = 4
+elseif ARGS[1] = 45:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloBimbo = 1
 elseif ARGS[1] = 46:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
 elseif ARGS[1] = 47:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
@@ -304,101 +289,239 @@ elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
 elseif ARGS[1] = 49:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
 elseif ARGS[1] = 50:
-	CloQuality = 4
-	CloThinness = 2
+	CloQuality = 3
+	CloThinness = 3
 	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
 elseif ARGS[1] = 51:
-	CloQuality = 4
-	CloThinness = 4
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
-	CloBimbo = 1
-	CloBra = 1
 elseif ARGS[1] = 52:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
 elseif ARGS[1] = 53:
 	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
 elseif ARGS[1] = 54:
 	CloQuality = 4
-	CloThinness = 4
+	CloThinness = 6
 	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
+	CloStyle = 4
 elseif ARGS[1] = 55:
 	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
+	CloStyle = 4
 elseif ARGS[1] = 56:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 4
-	CloBimbo = 1
 elseif ARGS[1] = 57:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 58:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 59:
-	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloSkirtShortness = 3
+	CloBimbo = 1
 elseif ARGS[1] = 60:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloSkirtShortness = 4
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 61:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloSkirtShortness = 4
+	CloStyle = 4
 	CloBimbo = 1
 elseif ARGS[1] = 62:
-	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloSkirtShortness = 3
+	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 63:
 	CloQuality = 4
-	CloThinness = 1
+	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloStyle2 = 4	
+	CloStyle2 = 4
+elseif ARGS[1] = 64:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 65:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloBimbo = 1
+elseif ARGS[1] = 66:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 67:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 68:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloBimbo = 1
+elseif ARGS[1] = 69:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 70:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+	CloBimbo = 1
+elseif ARGS[1] = 71:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+	CloBimbo = 1
+elseif ARGS[1] = 72:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 73:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 74:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloBimbo = 1
+elseif ARGS[1] = 75:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 76:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloPanties = 1
+	CloStyle2 = 4
+	CloStyle = 4
+	CloBimbo = 1
+elseif ARGS[1] = 77:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 78:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 79:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloStyle2 = 4
+	CloStyle = 4
+elseif ARGS[1] = 80:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 4
+	CloStyle = 4
+	CloBimbo = 1
 end
 
 --- $attributes_school ---------------------------------

+ 0 - 145
locations/albinaEv.qsrc

@@ -1,145 +0,0 @@
-# albinaEv
-! $din_albina_get_over_car = {
-! 	'A pair of strong hands grab you and pull you out of the car.'
-
-! 	act 'Further':
-! 		*clr & cla
-! 		menu_off = 1
-! 		AlbinaQW['Car'] = 1
-! 		gs 'stat'
-! 		$ImageNeededPlacholder
-! 		! WD: IMAGE NEEDED ~ '<center><img <<$set_imgh>> src="images/qwest/alter/grab.jpg"></center>'
-! 	end
-! }
-
-! frost = 0
-! AlbinaQW['CarDay'] = daystart
-! gs 'stat'
-! '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 'You went out to the car and see Albina sitting in it, nervously looking every which direction. As you approach, she starts the engine.'
-
-! if AlbinaQW['Car'] = 0:
-! 	act 'Ask her if the car is hers':
-! 		*clr & cla
-! 		menu_off = 1
-! 		AlbinaQW['Car'] = 1
-! 		gs 'stat'
-
-! 		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
-! 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
-! 		'You ask Albina "Is this your car?"'
-! 		'Albina squirms, grimacing and answers in a contemptuous tone "What? Of course not, this is my fathers car, I would never have bought this thing. The X5 is a car for those newly rich and not for decent people."'
-! 		'You shake your head, "Do you even have a drivers license?"'
-! 		'Albina laughs, saying "License? Why would I need one, do you know who my father is? He used to be the police chief of our town, although he''s retired now. He still has all his connections, and I''ve never been stopped in his car."'
-! 		'Albina goes quiet for a few seconds, seemingly thinking about something, then suddenly says "Let''s go for a ride."'
-
-! 		act 'Go with Albina':
-! 			*clr & cla
-! 			minut += 5
-! 			gs 'stat'
-! 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 			'You sit down on the seat next to Albina and she starts driving around town.'
-! 			'Soon enough, you find yourself on the outskirts of town. Glancing in your direction with a mysterious smile, Albina says "I have a surprise for you.".'
-! 			'Before you get a chance to ask her what the surprise is, the car slows down and turns on to a small side road, almost hidden from view by the dense vegetation.'
-! 			'As the car pushes further into the forest, you see an old building made of brick, with large chimneys jutting out of its saw-tooth roof.'
-
-! 			act 'Look around':
-! 				*clr & cla
-! 				minut += 5
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/abandoned/factory/castle.jpg"></center>'
-! 				'Looking around you realize that you''re in front of an abandoned factory building.'
-! 				'As you turn to look at Albina, she grins and points a manicured finger to a sign a few meters in front of the car, that says "Property of The Snow Queen Ltd." Still grinning, Albina says "This is the castle of the Snow Queen, my territory."'
-! 				'The car stops and two men suddenly materialize out of the shadows, walking slowly towards you. They both seem to be over 30 years of age, one tall and athletic, the other slightly shorter and rounder but with broad shoulders and powerful hands.'
-! 				'Albina opens the door and turns to the two men: "Hi guys, how are you doing?"'
-! 				'With a frown, the two men look at you for a few seconds before answering with a booming voice "Everything is fine."'
-
-! 				if AlbinaQW['StarletsLastChance'] > 0 or AlbinaQW['StarletsBlocked'] > 0:
-! 					'Leaving the engine running, Albina gets out of the car.'
-! 					'"I''ve brought you an disobedient girl who knows too much about my dancing business."'
-! 					'Grinning, the tall one says "I see.", as the short one starts walking slowly towards you.'
-! 					'A chill runs up your spine as you realize you''ve been tricked. You need to get out of here right now!'
-					
-! 					gs 'willpower', 'misc', 'self'
-! 					if will_cost <= pcs_willpwr:
-! 						act 'Jump behind the wheel (<<will_cost>> Willpower)':
-! 							*clr & cla
-! 							gs 'willpower', 'pay', 'self'
-! 							minut += 5
-! 							gs 'stat'
-! 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-
-! 							if pcs_agil >= 80:
-! 								'With a deft movement, you manage to get behind the wheel of the car.'
-! 								'Looking out the windows, you see the short one standing right in front of the car, touching the hood as if to stop you from driving forwards, while the tall one runs towards the driver side door.'
-
-! 								act 'Switch into reverse gear':
-! 									*clr & cla
-! 									minut += 1
-! 									gs 'stat'
-! 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 									'Not knowing exactly what you''re doing, it takes you a second or two to realize the stick needs to be in the ''R'' position.'
-! 									'After finding the right gear, you slam down on the accelerator just as you notice the tall one is very close and has started running towards you'
-! 									'The engine revs, and the car shoots backwards as if slung from a ballista. In your panic to escape the clutches of Short and Tall however, you fail to notice the sturdy concrete wall creeping up on you from behind at an alarming speed.'
-! 									'You notice the wall just before slamming into it, and step on the brakes. While it does lower your speed quite a bit, the car is still going fast as it hits the wall.'
-! 									'You hear the sound of metal and glass cracking and popping as the rear of your car is crushed against the concrete wall. The force of the impact throws your head back, hitting the headrest with a soft ''Foomp''.'
-! 									'After regaining your senses, you look out the window and see Short and Tall running towards you.'
-! 								end
-
-! 								act 'Put the pedal to the metal':
-! 									*clr & cla
-! 									minut += 1
-! 									gs 'stat'
-! 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 									'Taking a wild guess, you quickly jank the stick to the ''D'' position, grit your teeth and slam down the accelerator.'
-! 									'Short does not have time to react, and as the car jumps forward he is slung on top of the hood, slamming his head into the windshield leaving a crack in the glass, and then rolls of to the left.'
-! 									'Your knuckles whiten as you tighten your grip on the steering wheel and look out the windshield, trying to find a way out of here.'
-! 									'Straight ahead you see bushes and small trees, the forest slowly reclaiming the land it once lost to whatever kind of factory this once was.'
-! 									'To the right you recognize the gateway Albina drove through when she took you here.'
-! 									'To the left you see a brick wall, part of the abandoned factory building.'
-! 								end
-! 							else
-! 								'You try your best to wriggle your way over to the drivers seat, but only manage to get stuck with one of your legs between the gear shift and the seat.'
-! 								'Suddenly, the driver side door is violently thrust open.'
-
-! 								dynamic $din_albina_get_over_car
-! 							end
-! 						end
-! 					else
-! 						act 'Jump behind the wheel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-! 					end
-
-! 					act 'Get out of the car':
-! 						*clr & cla
-! 						minut += 5
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/abandoned/factory/castle.jpg"></center>'
-! 						'Thinking you can easily outrun them, you quickly jump out of the car.'
-! 						'As you get out, Short starts moving towards you from the hood, and Tall moves behind you to block your path.'
-! 						'Looking around desperately for a second way out, you suddenly notice a small building close by with an open door.'
-! 					end
-
-! 					act 'Sit in the car':
-! 						*clr & cla
-! 						minut += 5
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 						'Panicking and not knowing what to do, you freeze.'
-! 						'As you sit in your seat watching Short and Tall slowly make their way towards you, grim thoughts pop up in your head.'
-! 						'Is this the end? Will they kill me? Will I ever see my family again?'
-! 						dynamic $din_albina_get_over_car
-! 					end
-
-! 					exit
-! 				end
-
-! 				if AlbinaQW['StarletsWhore'] > 0:'Leaving the engine running, Albina gets out of the car. "Relax guys. <<$pcs_firstname>> is one of my stars. She''s a newcomer, but shows a lot of promise."'
-! 			end
-! 		end
-! 	end
-! end
-
-! act 'Move away':gt $loc, $loc_arg
-gt $loc, $loc_arg
---- albinaEv ---------------------------------
-

+ 15 - 14
locations/albinaRide.qsrc

@@ -5,34 +5,35 @@ frost = 0
 menu_off = 1
 AlbinaQW['albride'] = 1
 gs 'stat'
-'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
-'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
-'An SUV pulls up to you and the window rolls down. Albina smiles at you. "Let''s go to my place. We need to talk."'
+'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
+'An SUV pulls up to you and the front window rolls down. Albina is sitting in the driver''s seat and she smiles at you. "Let''s go to my place. We need to talk."'
 
 act 'Get in':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-	'You climb into the car and sit in the back seat next to Albina. A large man in a black leather jacket is in the driver''s seat.'
-	'The man puts the car in gear and starts driving through town. Albina turns to you.'
-	!!If Sveta helped Chernov
+	'You climb into the car next to Albina. She puts the car into gear and starts driving through town.'
+    !!If Sveta helped Chernov
 	if AlbinaQW['Chernov'] = 1:
-		'She smiles at you very happily. "You don''t know what good you''ve done for me <<$pcs_nickname>>. I didn''t think the Security Service would actually have jumped on the lead I gave them."'
-		'"Wait, you were their ''anonymous source'' that exposed the Starlets? Why?" you ask in surprise.'
-		'"I have my reasons. The main thing is that you and the other girls all testified against the ringleader and took them down." She looks away meekly as she finishes her sentence.'	
-		'The car drives through the gate to her house and stops outside the front door. Albina tells you to follow her and exits the car.'
+	    '"Is this your car? And since when could you drive?" you ask. She laughs in response. "No, this is my father''s car. I don''t have a licence, but the police ignore me since my father was the chief."'
+		'She stops at a red light and turns to you, looking rather happy. "You don''t know what good you''ve done <<$pcs_nickname>>. I didn''t think the Security Service would actually have jumped on the lead I gave them."'
+		'"Wait, <i>you</i> were their ''anonymous source'' that exposed the Starlets? Why?" you ask in surprise.'
+		'"I have my reasons. The main thing is that you and the other girls all testified against the ringleader and took them down." She looks away meekly as she finishes her sentence and the light turns green. She continues driving in silence.'	
+		*nl
+		'After driving for a while, you reach her house. She drives through the gate and stops outside the front door. She tells you to follow her and exits the car.'
 	end
 	!!If Sveta did not help Chernov
 	if AlbinaQW['Chernov'] = 2:
+		'"Is this your car? And since when could you drive?" you ask. She laughs in response. "No, this is my father''s car. I don''t have a licence, but the police ignore me since my father was the chief."'
 		'"I really wish you had told that man everything he was asking for <<$pcs_nickname>>. It would have been very helpful to me."'
 		'"What do you mean ''helpful to you?'' He was trying to get me to speak out against the Starlets." you reply.'
+		*nl
 		'Yes, because I wanted him to expose us. I gave him the evidence he needed to take down the ringleader."'
-		'"You''re the ''anonymous source''? Why?" you ask in confusion. "I have my reasons." is all she says in reply and turns to look out the window.' 
-		'The car drives through the gate of her house and stops outside the front door. Albina tells you to follow her and exits the car.'
+		'"Wait a second. <i>You''re</i> the ''anonymous source''? Why?" you ask in confusion. "I have my reasons." is all she says in reply and continues driving in silence.' 
+		'After driving for a while, you reach her house. She drives through the gate and stops outside the front door. She tells you to follow her and exits the car.'
 	end
 
-!! Can this lead to the scene where Albina sits Sveta down for some wine and admits everything to her?
-	act 'Go with Albina':gt 'albinahome', 'start' 
+    act 'Go with Albina':gt 'albinahome', 'start' 
 end
 
 --- albinaRide ---------------------------------

+ 47 - 51
locations/albinahome.qsrc

@@ -36,17 +36,17 @@ if $ARGS[0] = 'start':
 				'"Hate him that much?" you ask as you take a sip from your glass.'
 				'Albina just glares at you. "Let''s just drink." she scorns.'
 				'You sit quietly for a while, sipping your wine while Albina again gulps down the contents of her glass. She sits in silence before suddenly screaming and throwing the glass in frustration, shattering it as it hits the wall.'
-				'"Fucking bastard!! If there is a hell, there is a special place reserved just for you to suffer for what you done you fucking creep!!"'
+				'"FUCKING BASTARD!! If there is a hell, there is a special place reserved just for you to suffer for what you''ve done you fucking creep!!"'
 				act 'Ask what she''s talking about':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
 					'"What are you talking about?" you ask, startled by her outburst. Albina looks at you meekly as tears well up in her eyes.'
-					'"<<$pcs_nickname>>, my father has raped and abused me from such an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything." she tearfully admits.'
+					'"<<$pcs_nickname>>, my father has abused me from such an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything." she tearfully admits.'
 					'"When my mother found out, he used his connections to stop her taking me with her when she left him."'
 					*nl
-					'But now that he''s going down, she came back here to live with and look after me. Get me counselling if I need it, you know? That''s why she''s always checking up on me. She''s on edge about what my father can do, even in prison."'
+					'But now that he''s going down, she''s come back to live with and look after me. Get me counselling if I need it, you know? That''s why she''s always checking up on me. She''s on edge about what my father can do, even in prison."'
 					'She continues. "The truth is his political campaign never took off. He loved abusing his position as a cop to bully others, including me, but when he retired, he didn''t have that power anymore. A political career was his chance to get that back."'
 					'"Nobody was willing to back him however." She stops talking for a few seconds and you can clearly see her hands shaking. "That''s when...that''s when he decided to...whore me out to his friends. For ''a bit of fun'' with me, they would ''donate'' to his campaign fund.". She is on the verge of bursting into tears in front of you.'
 
@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
 						'"Your own father sold your body to fund his election? That''s horrible!" you exclaim in shock.'
-						'Albina nods. "That''s right, but I wasn''t earning enough for him. That''s when he discovered my dance troupe and forced me to start selling my friends instead. I had to <<$pcs_nickname>>! I had to!" she tearfully exclaims.'
+						'Albina sits in silence before quietly nodding. "However, I wasn''t earning enough for him. That''s when he discovered my dance troupe and forced me to start selling my friends instead. I had to <<$pcs_nickname>>! I had to!" she tearfully exclaims.'
 						'"I was forced to let those fucking perverts do whatever they pleased with my friends <<$pcs_nickname>>! They were humiliated and abused for some fucking rubles! Rubles that the fucking bastard spent on his own whores that he mistreated instead of his campaign!"'
                         !! if virgin or not
 						if pcs_vag = 0 and stat['vaginal'] = 0: 
@@ -73,8 +73,8 @@ if $ARGS[0] = 'start':
 							'"What did he do?" you ask.'
 							'"It was bad enough being forced to whore out my friends to abusive creeps who almost choked them to death, but......but....."'
 							'"But what?" you ask softly. She steels herself before answering you. "If I didn''t get the girl the guys wanted, my father said it was perfectly fine for them to take me and do what they wanted, even rape me." she cries.'
-							'"They would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse as well."'
-							'"My dad being a pimp for underage girls who''s abused me my entire life, my friends being subjected to abusive sexual exploitation...and I...I couldn''t anything about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
+							'"They would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse as well. Other times, he would bring his friends home and let them have their way with me. One guy or four, it didn''t matter to him so long as they paid.'
+							'"My dad abusing me my entire life while running a prostitution ring where my friends were subjected to abusive sexual exploitation...and I...I couldn''t anything about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
 
 							act 'Comfort her':
 								*clr & cla
@@ -82,9 +82,9 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissingattempt.jpg"></center>'
 								'You cradle her head against your chest as she sobs away, her tears soaking into your top. "Hey, hey. But you did do something about it. You went to the police and now he''s going to prison!" you reassure her while softly stroking her hair.'
-								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I did. I guess I just got tired of feeling helpless as my friends suffered when they didn''t deserve any of this. So I exposed him as what he is. A vile fucking creep!"'
-								'"I just want to live my life without having to fear my own father, or any other man for that matter. For the longest time, I was just too fucking submissive."'
-								'You smile at her and are about to reply when Albina closes her eyes and tilts her head towards you.'
+								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I just got tired of watching my friends suffer when they didn''t deserve any of this. So I exposed him as what he is. A vile fucking creep!"'
+								'"I just wanted to live my life without fearing what my own father, or any other man for that matter, would do to me. For the longest time, I was just too fucking submissive." she says before looking intently into your eyes.'
+								'You smile at her and are about to reply when she closes her eyes and tilts her head towards you.'
 								gs 'willpower', 'cuni', 'resist', 'medium'
 								if will_cost <= pcs_willpwr:
 									act 'Pull away (<<will_cost>> Willpower)':
@@ -109,15 +109,15 @@ if $ARGS[0] = 'start':
 									*clr & cla
 									npc_rel['A23'] += 2
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kissing.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
 									'You''re not sure if it''s just the alcohol or if something else is compelling you, but you lean towards Albina and lock lips with her.'
-									'You feel your excitement growing as you and Albina start passionately making out with each other.'
+									'You feel your excitement growing as you and Albina start passionately making out with each other, your tongues twisting around each other in a sweet embrace.'
 									gs 'arousal', 'kiss', 2
 									gs 'stat'
 									act 'Kiss':
 										*clr & cla
 										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kissing.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
 										'As you continue kissing Albina, you feel her hand slowly working its way up your inner thigh.'
 										'Reaching your crotch, her hand slowly slides into your panties and starts gently fondling your clitoris.'
 										'You moan into her mouth. Someone must have shown her a few things on pleasing a girl.'
@@ -129,10 +129,10 @@ if $ARGS[0] = 'start':
 											*clr & cla
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lesb.jpg"></center>'
-											'Albina breaks your kiss and her hand slides out of your panties. She stands and starts undressing herself.'
+											'Albina breaks the kiss and her hand slides out of your panties. She stands and starts undressing herself.'
 											'You follow her lead and undress yourself. Once naked, she pushes you back onto the sofa and moves in on top of you, resuming your passionate makeout.'
 											'Her hand works its way back down to your wet pussy. This time, she slides her fingers inside you. A wave of pleasure runs through you and you moan into her mouth as she fingerfucks your pussy.'
-											'Your own hand begins exploring Albina''s crotch and you find her pussy is already wet. You insert a finger into her and she moans into your mouth as her pussy tightly squeezes your digit.'
+											'Your own hand begins exploring Albina''s crotch and you find her smooth pussy is already wet. You insert a finger into her and she moans into your mouth as her pussy tightly squeezes your digit.'
 											gs 'arousal', 'kiss', 5
 											gs 'arousal', 'vaginal_finger', 5
 											gs 'arousal', 'vaginal_finger_give', 5
@@ -149,8 +149,8 @@ if $ARGS[0] = 'start':
 												'You moan softly at the pleasure and grab Albina by the hips, pulling her crotch down to your face. Her legs quiver as you gently trace her labia with your tongue before you spread them and start swirling your tongue around her engorged clitoris.'
 												'You are passionately eating each other out when you hear Albina''s breathing become faster and her legs start shaking as you feel your own orgasm building within you.'
 												*nl
-												'Albina lets out a pleasured scream as her pussy twitches and sprays her juices across your face. You buckle as your own orgasm overwhelms you and you scream loudly. You both collapse in ecstasy.'
-												'Albina pulls her herself up and turns back around, cuddling into you. "I didn''t take you for a squirter!" you laugh. She smirks. "I''ve been with a few girls <<$pcs_nickname>>, but you gave me the greatest orgasm I''ve ever had! I think that was actually my first squirt!"'
+												'Albina lets out a pleasured scream as her pussy twitches and sprays a huge amount of her juices across your face. You buckle as your own orgasm overwhelms you and you scream loudly. You both collapse in ecstasy.'
+												'Albina pulls her herself up and turns back around, cuddling into you. "I didn''t take you for a squirter!" you laugh. She smirks. "I''ve been with a few girls <<$pcs_nickname>>, but you gave me the greatest orgasm I''ve ever had! I think that was the biggest squirt I''ve ever done!"'
 												'She leans over and grabs some tissues from a box on a nearby table, handing you some to clean your face. She runs her hand over her still twitching pussy. "I think I''m still cumming!" she says. You both lie on the sofa, your powerful orgasms pulsing through the both of you. You eventually recover and manage to get dressed.'
                                                 'Albina remains on the sofa, pussy juices still trickling from her. "Thanks <<$pcs_nickname>>. It was nice to let it all out and just talk about it...among other things." she smirks. "Thanks for being a good friend." You smile at her and start leaving when she suddenly embraces you in a tight hug, her breasts squeezing against you, before walking you to the door.' 
 												gs 'arousal', 'kiss', 30
@@ -172,11 +172,6 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif hour >= 20 and week >= 5 and week < 7:
-		'Albina says that she wants to go to the disco.'
-
-		act 'Say goodbye and go home':gt 'pav_residential'
-		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 	elseif AlbinaQW['Room']  = 1:
 		if AlbinaQW['SportHome']  = 0:
 			*clr & cla
@@ -192,7 +187,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 				'"I don''t like the sweaty perverts at the gym staring at my ass, so I prefer training at home instead." she replies.'
 				'You can''t help but stare at her firm, shapely rear as she says that and she grins at you.'
-				'Eyes up here <<$pcs_nickname>>! Anyways, I could teach you about stripping and poledancing if you want."'
+				'Eyes up here <<$pcs_nickname>>! Anyway, I could teach you about stripping and poledancing if you want?"'
 				act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'start'
 				act 'Teach me stripping': gt 'albinahome', 'stripping'
 				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
@@ -389,7 +384,7 @@ if $ARGS[0] = 'game':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
 		if AlbinaQW['gamebet'] = 1:
-			'You and Albina lay down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
+			'You and Albina lie down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
 			act 'Accept the bet': gt 'albinahome', 'game_bet'
 			gs 'willpower', 'sex', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -412,7 +407,7 @@ if $ARGS[0] = 'game':
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
-			'You and Albina lay down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. Instead, you are just having fun together.'
+			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. Instead, you are just having fun together.'
 			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Keep playing video games': gt 'albinahome', 'playgame'
 			act 'Just chat': gt 'albinahome', 'chat'
@@ -437,7 +432,7 @@ if $ARGS[0] = 'playgame':
 		'You laugh and nod. "Sure, but you are so going down."'
 		'She laughs in response. "You''re that sure? Then how about we make it a bit more interesting then?"'
 		'You arch your brow curiously. "What do you have in mind?"'
-		'She grins at you, gets up and goes over to her dresser. She rummages around in it for a moment before pulling out a strapon harness with a sizeable dildo attached. "I bought this the other day, just for fun. The winner gets to use it on the loser how ever they want." she says with a smirk.'
+		'She grins at you, gets up and goes over to her dresser. She rummages around in it for a moment before pulling out a strapon harness with a large black dildo attached. "I bought this the other day, just for fun. The winner gets to use it on the loser how ever they want." she says with a smirk.'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -452,7 +447,7 @@ if $ARGS[0] = 'playgame':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'You shake your head. "Uhhh...I''m really not interested in doing that."'
-				'Albina puts the strapon away and you can tell she is a little disappointed. She comes back over and lays down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well I had fun, but there is some stuff I need to take care of." she says as she turns the consloe off.'
+				'Albina puts the strapon away and you can tell she is a little disappointed. She comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well I had fun, but there is some stuff I need to take care of." she says as she turns the consloe off.'
 				'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 				act 'Say goodbye and go home':gt 'pav_residential'
 			end
@@ -482,7 +477,7 @@ if $ARGS[0] = 'game_bet':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
 	'You stare at the size of the attached dildo. "Where and when did you get that?!" you laugh. "Whatever, you''re on. You are so going to get fucked!"'
-	'Albina laughs as she brings the strapon over with a bottle of lube, placing them on the floor. She lays back down beside you and picks her controller up. "Please! You are so going to lose." She starts the game and you both fall silent, your focus only on winning.'
+	'Albina laughs as she brings the strapon over with a bottle of lube, placing them on the floor. She lies back down beside you and picks her controller up. "Please! You are so going to lose." She starts the game and you both fall silent, your focus only on winning.'
 	act 'Play until someone wins':
 		*clr & cla
 		menu_off = 1
@@ -522,24 +517,24 @@ if $ARGS[0] = 'wear_strapon':
 	npc_sex['A23'] += 1
 	lesbian += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
-	'With the strapon firmly in place, you get on the bed with her and pull her head down to the dildo. "Suck my dick loser!" you giggle.'
-	'She laughs and gets down on all fours. She takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it nice and wet with her drool.'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+	'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick loser!" you giggle.'
+	'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it nice and wet with her drool.'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	act 'Fuck her pussy':
 		*clr & cla
 		gs 'boyStat', 'D3'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag1.jpg"></center>'
-		'You pull away until the dildo slides out of her mouth and then lay on your back. "Come and ride it cowgirl!" you laugh. She crawls up and straddles you, lowering herself down until the <<dick>>cm <<$dick_girth>> dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding you slowly, but picks up speed, moaning louder and louder.'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
+		'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it cowgirl!" you laugh. She straddles you and lowers herself down until the <<dick>>cm <<$dick_girth>> dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding you slowly, but picks up speed, moaning louder and louder.'
 		gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
 		gs 'stat'
 		act 'Fuck her ass': gt 'albinahome', 'fuck_albina_ass'
 		act 'Ride it like you mean it':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
 			'You slap her on the ass. "Come on Albina! Ride it like you mean it." With your encouragement, she starts really riding you hard and fast, her huge ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes until she cries out in ecstasy. She slams down on the dildo and her body shudders as an intense orgasm passes through her. She slides off the dildo, which glistens with her juices, and collapses on the bed next to you.'
 			'Once her orgasm has passed, she looks at you with an appreciative smile on her face.'
 			gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
@@ -558,7 +553,7 @@ if $ARGS[0] = 'fuck_albina_ass':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
 	'Albina then leans over and whispers in your ear. "I want you to fuck my ass <<$pcs_nickname>>..." You grin as she giggles and gets on all fours. You grab the bottle of lube and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick. You then spread her huge ass cheeks and rub the excess onto her asshole. You grab her ass in your hand and appreciate how firms it feels in your grip.'
 	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is a bit of resistance, but with a little more pressure the <<dick>>cm <<$dick_girth>> dildo pops into her ass. She moans in a mixture of pain and pleasure as you start off with slow shallow strokes, but as her groans of pain turn into moans of pleasure, you take deeper and faster strokes. You look down and admit that her ass is amazing, the dildo being enveloped by her huge, firm cheeks as you thrust in and out of her hole.' 
 	'You wonder how the guys in your class would feel knowing you''re actually fucking the best ass in school while they can only dream of it. After a few minutes, you pull out of her and she looks back over her shoulder, obviously wondering why you stopped.'
@@ -568,7 +563,7 @@ if $ARGS[0] = 'fuck_albina_ass':
 	act 'Keep fucking her ass':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
 		'"Come on <<$pcs_nickname>>. Put it back in and fuck me....hard." she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
 		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices continue leaking from her pussy. "Oh fuck yes <<$pcs_nickname>>! That was fucking amazing!"'
 		'"Fucking such a nice looking ass was amazing!" you reply and you both laugh.'
@@ -584,18 +579,18 @@ if $ARGS[0] = 'receive_strapon':
 	npc_sex['A23'] += 1
 	lesbian += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
-	'You slide your panties off while she tightens the strapon firmly in place. You climb on the bed and she pulls your head down to the dildo. "Suck my dick loser!" she says with a giggle.'
-	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it nice and wet with your drool. She pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+	'You slide your panties off while she tightens the strapon firmly in place, standing next to the bed. You lie down next to her and she pulls your head down to the dildo. "Suck my dick loser!" she says with a giggle.'
+	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it nice and wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	if pcs_vag = 0:
 		act 'You''re a virgin':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
 			'You blush deeply and she looks at you. "Oh, right. You haven''t done this before." she says, remembering that you''re still pure.'
-			'You blush even more. "Yes, I''m still a virgin." you reply.'
+			'You blush even more. "Yes, I''m... still a virgin." you reply.'
 			'"Well, I can just fuck your ass if you want?" Then she grins. "Unless you want me to pop your cherry that is?"'
 			act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
 			act 'Get your cherry popped':
@@ -603,8 +598,9 @@ if $ARGS[0] = 'receive_strapon':
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-				'She nods. "OK, don''t worry. I''l be gentle since it is your first time. Lay on your back and spread your legs." You do as she commands and she scoots up between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough. She adds a little lube to the dildo anyway and you feel it rubbing against your slit, causing it to open a bit. She then slowly slides the <<dick>>cm <<$dick_girth>> dildo into your virgin pussy.' 
-				'It is both painful and pleasurable at the same time and you moan a bit as she slowly starts to fuck your pussy. After a few minutes, it starts to hurt less but she stops. "OK that''s enough. I don''t want to wear it out the first time, but I''m not finished with you. Roll over so I can fuck that tight little ass of yours."'
+				'You give her an awkward smile. "I... I want you to... take me. My... virginity, that is." you tell her as your cheeks burn bright red.' 
+				'She smiles back. "OK, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough. She adds a little lube to the dildo anyway and you feel it rubbing against your slit. She then slowly slides the <<dick>>cm <<$dick_girth>> dildo into your virgin pussy.' 
+				'It is both painful and pleasurable at the same time and you moan softly as she slowly starts to fuck your pussy. After a few minutes, it starts to hurt less but she stops. "OK that''s enough. I don''t want to wear it out the first time, but I''m not finished with you yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -616,14 +612,14 @@ if $ARGS[0] = 'receive_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-			'"Lay on your back and spread your legs." You do as she commands and she scoots up between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough and then slowly slides the <<dick>>cm <<$dick_girth>> dildo inside you. You moan a bit as she slowly starts to fuck your pussy. As you start to moan louder, she starts fucking you a little faster.'
+			'"Lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough and then slowly slides the <<dick>>cm <<$dick_girth>> dildo inside you. You moan a bit as she slowly starts to fuck your pussy. As you start to moan louder, she starts fucking you a little faster.'
 			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
 			gs 'stat'
 			act 'Keep getting your pussy fucked':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-				'She reads your body well. She fucks you harder and faster the more you moan, but when it starts to get a little too rough she backs off a bit. She eventually finds a near perfect rhythm and you can feel youself getting wet. She is enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She stops and pulls out. "OK that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				'She proceeds to fuck you hard, but not too hard, settling into a near perfect rhythm that you enjoy, feeling youself slowly getting wetter. She seems to be enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She leans in and kisses you before suddenly stopping and pulling out. "OK that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -639,16 +635,16 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
 	'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts plenty on the dildo and strokes the shaft with it, getting it nice and lubed up. She then rubs the excess lube onto your asshole. You and the dildo now lubed up, she moves behind you and you feel the dildo press against your asshole. The pressure builds up until the tip pops into your ass, causing you to groan slightly in pain. She slowly starts to slide the <<dick>>cm <<$dick_girth>> dildo up your ass, steadily working it deeper.'
 	gs 'arousal', 'anal_strap', 5, 'lesbian'
 	gs 'stat'
-	act 'Get your ass ploughed':
+	act 'Get your ass hammered':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal2.jpg"></center>'
-		'After you seem to be used to her in your ass, she stands up over you and starts getting harder and faster with the ass fucking she is giving you. When it starts getting a little too rough, she seems to notice and backs off just a little before getting into a nice rhythm of slamming the dildo in and out of your ass. She enjoys fucking you hard, growing more aroused over time.' 
-		'Just as it is starting to hurt, she stops and lets out a pleasured moan before pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says. You turn and see her sliding the harness off, apparently finished with you. You notice the wet patch on the bed. She obviously greatly enjoyed ploughing your ass.'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
+		'Once you are comfortable with her in your ass, she stands up over you and starts getting harder and faster with the ass fucking she is giving you. When it starts getting a little too rough, she seems to notice and backs off just a little before getting into a nice rhythm of slamming the dildo in and out of your ass. She enjoys fucking you hard, growing more aroused over time.' 
+		'Just as it is starting to hurt, she stops and lets out a pleasured moan before pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says. You turn and see her sliding the harness off, apparently finished with you. You notice the wet patch on the bed. She obviously greatly enjoyed hammering your ass.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -662,12 +658,12 @@ if $ARGS[0] = 'strapon_finish':
 	lesbian += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-	'Albina embraces you and you spend the next few minutes passionately making out while fondling each other. Eventually, you both get dressed and she takes the strapon and cleans it before putting it away. Not long after, her phone buzzes. She looks at it, obviously reading a text message and frowns. "Sorry, but I need to go <<$pcs_nickname>>. I did have fun though. I''ll see later?"'
+	'Albina embraces you and you collapse onto the bed, entwined. You spend the next few minutes passionately making out while fondling each other. Eventually, you both get dressed and she takes the strapon and cleans it before putting it away. Not long after, her phone buzzes. She looks at it, obviously reading a text message and frowns. "Sorry, but I need to go <<$pcs_nickname>>. I did have fun though. I''ll see later?"'
 	'You nod in understanding. "Sure, not a problem. I had fun too." you smirk. "I''ll see you later." You share a final kiss with each other before you leave.'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Say goodbye and go home':gt 'pav_residential'
+	act 'Leave':gt 'pav_residential'
 end
 
 --- albinahome ---------------------------------

+ 4 - 4
locations/albinaporog.qsrc

@@ -6,7 +6,7 @@ if hour >= 17 and week < 6 and kanikuli = 0 and hour < 20 or hour >= 9 and week
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
 	if AlbinaQW['StarletsShutDown'] = 0:
 		'You push a button on the intercom and a deep voice crackles through the speaker, asking you to state your name and purpose of your visit.'
-		'You say that you''re here to visit Albina. After a brief wait, the gate opens. "Albina is waiting for you in her room." the voice says.'
+		'You say that you''re here to visit Albina and after a brief wait, the gate opens. "A friend of Albina''s is <i>always</i> welcome here." the voice says with an unsettling chuckle. "Albina is in her room."'
 		act 'Enter the house':gt 'albinahome', 'start'
 	elseif AlbinaQW['AfterFatherCheck'] = 0:
     	!!The first time after Albina exposes her father
@@ -16,14 +16,14 @@ if hour >= 17 and week < 6 and kanikuli = 0 and hour < 20 or hour >= 9 and week
 		act 'Enter the house':gt 'albinahome', 'start'
 	else
 		!!From then on
-		'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell it''s you and she opens the gate.'
+		'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell her it''s you and she opens the gate.'
 		'"She really enjoys having you come round and visit her you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through." she adds.'
 		act 'Enter the house':gt 'albinahome', 'start'
 	end
 else
 	if AlbinaQW['StarletsShutDown'] = 0:
-		if hour >= 9:'You push a button on the intercom and a voice booms through from the other end. You say that you''re here to visit Albina. "Albina is currently not at home. Come back later he replies."'
-		if hour < 9:'You push a button on the intercom and the voice at the other end says "It''s too early. Come back no earlier than nine."'
+		if hour >= 9:'You push a button on the intercom and the deep voice booms through from the other end. You say that you''re here to visit Albina. "She isn''t here. Come back later." he abruptly replies in an annoyed tone before hanging up.'
+		if hour < 9:'You push a button on the intercom and the voice at the other end says "It''s too early to visit. Come back later."'
 	else
 		!!After Albina exposes her father
 		if hour >= 9:'You push a button on the intercom and a female voice comes through asking who it is. When you say you''re here to see Albina, she tells you that Albina is currently unavailable and you should come back later.'

+ 12 - 0
locations/arousal.qsrc

@@ -55,6 +55,7 @@ The lubrication is binded with anal or vaginal action. I think that the best com
 Only call one at a time, if more required, use multiple calls
 
 Unaware - if one of the arguments $ARGS[2] - [8] is set to 'unaware', Sveta is not aware of this Sexact. Sveta will never know she had Sex!
+no_orgasm_msg - if one of the arguments $ARGS[2] - [8] is set to 'no_orgasm_msg', the system will not generate a generic arousal message
 
 You can override the orgasm to force or prevent, to do so use:
 $orgasm_or = 'yes' to force orgasm, it will reset in orgasm call so if you want to force it again, you have to enter it again
@@ -67,6 +68,8 @@ $orgasm_txt is used to add custom text that will be called if Sveta orgasms in t
 
 temp_anal = 0
 temp_unaware = 0
+!!turns orgasm text off, there will be no confirmation that Sveta has orgasmed
+temp_text = 0
 !!orgasms restricted to direct stimulation using this flag
 orgasm_flag = 0
 
@@ -76,6 +79,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_unaware = 1
 	end
 
+	if strpos($ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+ $ARGS[7]+ $ARGS[8],'no_orgasm_msg') > 0:
+		temp_text = 1
+	end
+	
 	if mid($ARGS[2],1,4) = 'dick':
 		temp_dick = dyneval('result='+$ARGS[2])
 		temp_silavag = dyneval('result=silavag'+mid($ARGS[2],5,len($ARGS[2])-4))
@@ -684,6 +691,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 
 	orgasm_buildup += stim['total']
 
+!! This is determining if Sveta will orgasm
 	if $orgasm_or ! 'no' and $ARGS[0] ! 'flashlite' and $ARGS[0] ! 'flash' and orgasm_flag ! 0:
 		if $orgasm_or = 'yes' or $orgasm_or = 'custom':
 			gs 'orgasm', $ARGS[0]
@@ -696,10 +704,13 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
+!!This is release is Sveta is so horny and pent up that she can cum with minimal stimulation
 	if $orgasm_or ! 'no' and orgasm_buildup >= 300 and pcs_horny >= 60: gs 'orgasm', $ARGS[0]
 
+!!Clearing temporary variables with orgasm as a gs this will catch anything there too
 	killvar 'temp_dick'
 	killvar 'temp_unaware'
+	killvar 'temp_text'
 	killvar '$orgasm_txt'
 	killvar '$stim_les'
 	killvar '$stim_foot'
@@ -710,6 +721,7 @@ end
 
 !!-----------------------------------------------
 
+!!This calculates the various sex stats and includes a small cooldown of stimulation so only use it once per event
 if $ARGS[0] = 'end':
 	if orgasm_buildup > 350: orgasm_buildup = 350
 	if orgasm_buildup > 300: orgasm_buildup -= 10

+ 7 - 3
locations/artemhome.qsrc

@@ -485,7 +485,8 @@ if $ARGS[0] = 'bookshelf':
 			gs 'stat'
 			artfall += 1
 			artem_borrowed_book = 1
-!!need code to add a book for Sveta to read other than the ones she can buy.
+			artembook = 5
+!!need code to add a book for Sveta to read other than the ones she can buy.			
 			gs 'stat'
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books till you find one you like and then you turn towards Artem. "Hey do you mind if I borrow this to read?"'
@@ -500,23 +501,26 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
+			artembook = 0
 			gs 'stat'
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back." You tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
 			'"Did you like it?"'
 			act 'I did':
+				cla
 				'"Yeah, it was good."'
 				'Artem''s face lights and he joins you at the bookshelf. "Yeah, I really liked that one too."'
 				act 'Look at more books':gt 'artemhome','bookshelf'
 				act 'Find something else to look at':gt 'artemhome','artemroom'
 			end
 			act 'Not really':
-				if pcs_int <= 40:
+				cla
+				if pcs_intel <= 40:
 					'"It was a bit too complicated." You admit, embarrassed.'
 				else
 					'"It was a bit too bland for me. In the end it just bored me. I could guess at the outcome right at the start, and it turned out I was right."'
 				end
-				'Artem looks a bit crushed as you tell him this. He had clearly hoped you''d like the book.'
+				'Artem looks a bit crushed as you tell him this. He had clearly hoped you''d like the book.'				
 				act 'Look at more books':gt 'artemhome','bookshelf'
 				act 'Find something else to look at':gt 'artemhome','artemroom'
 			end

+ 26 - 26
locations/autosalonF.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
 	nl
-	'<b><center>List of Vehicles for Sale</center></b>'
+	'<b><center>List of vehicles for sale</center></b>'
 	nl
 	'<center><table border=0><TR>'
 	'<TR><TD><a href="exec:GS ''carF1'',''car6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400 th.RUB</TD></TR>'
@@ -59,7 +59,7 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
 	'You have <<karta>> <b>₽</b> on your bank account.'
 	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
-	'"With how the economy is right now, we can''t accept payment by installments at this time, I''m afraid", he apologizes, "and a few new laws have been passed, too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
+	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid." he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
 	act 'Leave':gt 'city_industrial'
 
@@ -78,7 +78,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -99,7 +99,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -120,7 +120,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -141,7 +141,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -162,7 +162,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -183,7 +183,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -204,7 +204,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -225,7 +225,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -246,7 +246,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -267,7 +267,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -288,7 +288,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." she says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -309,7 +309,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -330,7 +330,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -351,7 +351,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -372,7 +372,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -393,7 +393,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -414,7 +414,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -435,7 +435,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -456,7 +456,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -477,7 +477,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -498,7 +498,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -519,7 +519,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -540,7 +540,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -561,7 +561,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end

+ 13 - 13
locations/autotraidF.qsrc

@@ -50,14 +50,14 @@ if $ARGS[0] = 'manager1':
 			minut += 60
 			money += bupay
 			car = 0
-			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re gonna find somebody who''s gonna offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
+			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going find somebody who''s going to offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
-			'"Maybe you see something you like."'
+			'"Maybe you''ll see something you like?"'
 
 			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		end
 	elseif cardrive ! 9:
-		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
+		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at your car before he can tell you how much it''s worth. "If you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
 
 		if money >= 3000:
 			act 'Pay for towing service to the car market (3,000 <b>₽</b>) (1:00)':
@@ -66,7 +66,7 @@ if $ARGS[0] = 'manager1':
 				minut += 60
 				cardrive = 9
 				money -= 3000
-				'You give him the money - certain that he''s ripping you off - and wait for an hour until the tow truck finally drives into the yard and your car.'
+				'You give him the money - certain that he''s ripping you off - and wait for an hour until the tow truck finally drives into the yard, your car hooked up to the rear of it.'
 
 				act 'Talk to the car salesman again': killvar 'bupay' & gt 'autotraidF', 'manager1'
 			end
@@ -86,7 +86,7 @@ if $ARGS[0] = 'car':
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
-	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. And according to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on, though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
+	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
@@ -117,7 +117,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 200
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'car':
 					tehcar = 200
 					teh = rand(10, tehcar)
 					wrek = 1
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 300
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 290
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 300
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -272,7 +272,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 350
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 1000
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 800
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'

+ 1 - 0
locations/bed2.qsrc

@@ -112,6 +112,7 @@ if $ARGS[0] = '':
 			'You are not tired enough to sleep, even for a short nap.'
 		end
 	end
+	gs 'events', 'read'
 
 	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 150) or (pcs_horny > 50 and pav_slut >= 50 and pcs_inhib >= 60):

+ 42 - 42
locations/bedrPar.qsrc

@@ -42,7 +42,7 @@ if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	*clr & cla
 	menu_off = 1
 	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
-	'You sister must have released him since you were not able to find a solution in time.'
+	'Your sister must have released him since you were not able to find a solution in time.'
 	ParrotQW['Owned2'] = 0
 	ParrotQW['Level'] = 0
 	ParrotQW['Day'] = 2
@@ -59,16 +59,16 @@ if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage'
-	'"I went to the shopping center and bought this bird. Isn''t he the cutest ?"'
+	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
+	'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
 	if npc_rel['A33'] > 50:
-		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care"'
+		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
 		ParrotQW['SisKeepParrot'] = 1
 	end
 	if npc_rel['A33']  <= 50:
-		'"No he isn''t cute, and I suggest you take it out of here, I am not sharing my room with a bird."'
-		'You feel kind of sad but you understand your sister. You should have asked her before buying it.'
-		'You go to the window, open it and release the bird'
+		'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
+		'You are somewhat upset, but you understand. You should have asked her before buying it.'
+		'You go to the window, open it and release the bird.'
 		ParrotQW['Owned2'] = 0
 	end
 
@@ -89,25 +89,25 @@ end
 if ParrotQW['Owned2'] = 1:
 	'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 	if daystart - ParrotQW['BuyDate'] <= 10: '<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
-	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
-	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
-	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
-	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
-	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
+	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
 	if ParrotQW['Level'] = 3:
 		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
-		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
-		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
-		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
-		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
-		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
-		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
-		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
-		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
-		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
+		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
+		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384....</b>"'
+		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
+		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
+		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
+		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
+		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
+		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
+		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
+		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
 		killvar 'parfixrand'
 	end
 
@@ -164,7 +164,7 @@ if sister_indorf = 0:
 		elseif anyaloc = 26:
 			if sisboypartyQW = 1: sisboypartyQW = 2
 			if sisboyparty = -1: sisboyparty = 1
-			'Your drunken sister Anya is sound asleep in her bed.'
+			'A drunken Anya is sound asleep in her bed.'
 		end
 	end
 end
@@ -198,7 +198,7 @@ sis_watch = 0
 if sisterHere = 0 or sisboytrio > 0:
 	if pornMagazine > 0:gs 'events', 'read_porn'
 	if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
-		act 'Send Rex a SMS message': gt 'reks','sms'
+		act 'Send Rex a text message': gt 'reks','sms'
 	end
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
@@ -243,7 +243,7 @@ if pcs_sewng >= 80:
 			gobramin = (pcs_sewng - 70) * 2
 			newgobelen += rand(gobramin,gobramax)
 			gs'stat'
-			if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+			if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
 				if newgobelen >= 1000:
 				newgobelen = 0
 				gobelen += 1
@@ -267,7 +267,7 @@ elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
 end
 
 			
-if ml_online['account'] = 0 and internet > 0:
+if ml_online['account'] = 0 and internet > 0: 
 	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 end
 
@@ -303,7 +303,7 @@ if hour > 8 and hour < 22:
 		act 'Play something on the guitar (10 minutes)':
 			mood += 10
 			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
-			'You hum along the tune, relaxing into the music, just enjoying it. When you look up a quarter of an hour passed and you are in a much better mood.'
+			'You hum along the tune, relaxing into the music, just enjoying it. When you look up a quarter of an hour has passed and you are in a much better mood.'
 		end
 	end
 
@@ -395,8 +395,8 @@ if hour > 8 and hour < 22:
 		else
 			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
 			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-				act 'Record and edit a song (1:30)': gt 'music_onlinemusic', 'recordAndEditSong'
-			end	
+				act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong' 
+			end
 		end
 	end
 
@@ -435,7 +435,7 @@ 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>'
 	*nl
-	'All of a sudden you hear a familiar voice yell out, "<<$pcs_nickname>>, time to get up. You can''t spend the whole day laying around!"'
+	'All of a sudden, you hear a familiar voice yell out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
 	wait 1000
 	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
 	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
@@ -446,17 +446,17 @@ if $ARGS[0] = 'intro':
 		gs 'stat'
 		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
-		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
-		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
-		'"No excuses, <<$pcs_nickname>>. The summer holidays will be over before you know it and you mustn''t get used to sleeping in, or you won''t be able to get up early when school starts again. So, from now on set your alarm to wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		'You tiredly open your eyes and see your <<$npc_nickname[''A29'']>> standing over you. "Fifteen more minutes..." you mumble.'
+		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" she says as she yanks the covers off...'
+		'"<<$npc_nickname[''A29'']>>!" you exclaim as you feel a slightly cold breeze hit your body.'
+		'"No excuses <<$pcs_nickname>>. The summer holidays will be over before you know it and you mustn''t get used to sleeping in, or you won''t be able to get up early when school starts again. So, from now on set your alarm to wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
 		act 'Get up':
 			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is no excuse to laze around all day, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
 			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
 			act 'Continue':
 				cla & *clr
@@ -464,23 +464,23 @@ if $ARGS[0] = 'intro':
 				gs 'stat'
 				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-				'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
-				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
+				'You let out an exasperated sigh. "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
+				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
 				act 'Continue':
 					cla & *clr
 					minut += 2
 					gs 'stat'
 					'<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.'
+					'"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.'
 					act 'But why do I--':
 						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms out of the room, without giving you a chance to respond..'
+						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms out of the room without giving you a chance to respond.'
 						act 'I understand...':gt 'budilnik', 'start'
 					end
 				end

+ 8 - 8
locations/bedrPar2.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 	'<center><h1><font color="maroon">Master bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar2.jpg"></center>'
 	*nl
-	'The room in which your parents live. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
+	'The room in which your parents sleep. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
 	gs 'family'
 	gs 'family_schedule'
 
@@ -39,7 +39,7 @@ if $ARGS[0] = '':
 					prezikday = daystart
 					prezikProver = 0
 					'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/condoms_steal.jpg"></center>'
-					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. Now you have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
+					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. You now have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
 					act 'Continue': gt 'bedrPar2'
 				end
 			end
@@ -55,7 +55,7 @@ if $ARGS[0] = 'kamasutra':
 	menu_off = 1
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/book.jpg"></center>'
-	'The cover says "Kamasutra"'
+	'The cover says "Kama Sutra"'
 	act 'Leave': gt $loc, $loc_arg
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
 end
@@ -125,14 +125,14 @@ if $ARGS[0] = 'peek':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'
-	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed, you hear your mother say. "Stop the kids are here." As Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
+	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
 	act 'Leave':gt 'korrPar'
 
 	act 'Keep peeking':
 		cla & *clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
-		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked he pushes her down on the bed, so she is sitting on it right in front of him. Her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, she strokes it a few times in her hand until he gets hard. Then she takes his dick into her mouth and starts sucking it, he moans softly as she does. "Fuck you are the best cock sucker ever Natasha."'
+		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
 		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 
@@ -142,7 +142,7 @@ if $ARGS[0] = 'peek':
 			cla & *clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
-			'After several minutes of watching your <<$npc_nickname[''A29'']>> sucks Vlads cock he says. "Come on I want to fuck you." With that he starts to strip and she helps him while never stopping sucking his dick. Once he is naked she finally stops and he lays down on the bed, she straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Vlad oh god your dick feels so good in my pussy, it is so big."'
+			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while contnuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
@@ -152,7 +152,7 @@ if $ARGS[0] = 'peek':
 				cla & *clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad4.jpg"></center>'
-				'Vlad suddenly grabs her and throws her on her side on the bed. Which causes his dick to come out of her, he turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against your anus, then he pushes it in, only her pussy juices for lubricate. It slides in surprisingly easy, you can only guess this is far from the firs time your <<$npc_nickname[''A29'']>> has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her butt.'
+				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against your anus, then he pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your <<$npc_nickname[''A29'']>> has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave':gt 'korrPar'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'peek':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
-					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>> ass and lets out a loud moan as he twitches a bit. After a few moments of this pass he pulls out of her and rolls off the bed. She lays on her back and pulls her butt cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says. "You are such a nasty bitch Natasha." She smiles to him and replies. "Thats why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
+					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha." She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
 					gs 'arousal', 'voyeur_sex', 3
 					gs 'stat'
 					act 'Leave':gt 'korrPar'

+ 1 - 1
locations/beg.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'start':
 	*clr
 	menu_off = 1
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit1.jpg"></center>'
 	'You are stretching and warming up before your practice run. From where you are you can see your coach, Igor Yurisovich, talking to other athletes.'
 
 	act 'Do a couple of practice races':

+ 5 - 0
locations/begin.qsrc

@@ -9,18 +9,23 @@ if $ARGS[0] = 'start':
 	*nl
 	'<b>Transformation Start:</b>'
 	'You are Mikhail Kuznetsov, a fairly average 35 year old businessman who finds an artifact that changes everything about him and his life. Features magic.'
+	'(magic is still WIP)'
 	*nl
 	'<b>Schoolgirl Start:</b>'
 	'You are a schoolgirl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone, become a sex addicted whore or anything in between? The possibilities are endless. No magic.'
+	'(currently has most content for none magic playthrough)'
 	*nl
 	'<b>Cursed Schoolgirl Start:</b>'
 	'Marvel as we recklessly squish both of the above into one start. You are a schoolgirl who finds the amulet and not much changes, except for the magic used.'
+	'(currently has most content but magic is still WIP)'
 	*nl
 	'<b>Cursed Schoolboy Start:</b>'
 	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a schoolgirl. Now you have to deal with a new body, new desires and your new life in the most lustful town in Russia. Features magic.'
+	'(currently has most content but magic is still WIP)'
 	*nl
 	'<b>New in Town Start:</b>'
 	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time, you can make your own decisions and mistakes. No magic.'
+	'(currently has the least content - no recommended for first playthrough)'
 	
 	act '<center><b>Transformation Start</b></center>':
 		settingmode = 0

+ 4 - 4
locations/beverage.qsrc

@@ -345,13 +345,13 @@ end
 if $ARGS[0] = 'bev_bbr': food_loc = 0 & gt 'brothel','bar:order:password'
 
 if $ARGS[0] = 'afteralcohol':
-	if pcs_hydra < 100:
-		$mtxt = ' while your drink, you wish you were better hydrated before you started.'
-	elseif pcs_hydra <= 80:
+	if pcs_hydra < 20:
+		$mtxt = ' while you drink, you wish you were better hydrated before you started.'
+	elseif pcs_hydra <= 40:
 		$mtxt = ' you should remind yourself to drink some water later, so you don''t get dehydrated.'
 	elseif pcs_hydra <= 60:
 		$mtxt = ' you aren''t sure how many more you can fit in before you need to pee.'
-	elseif pcs_hydra <= 40:
+	elseif pcs_hydra <= 80:
 		$mtxt = ' you definitely need to drink some water now, or you''ll end up with a hangover.'
 	else
 		$mtxt = ' you enjoyed that drink immensely. Let''s have some more!'

+ 36 - 36
locations/brother.qsrc

@@ -10,42 +10,42 @@ if (npc_dob['A34'] mod 10000)/100 = month and (npc_dob['A34'] mod 100) > day: br
 
 if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 
-! Variables used
-! brothersawpirsF: Flag 0/1 Have your brother seen your nipple piercings
-! npc_rel['A34']: relationship
-! npc_dick['A34']: size of brothers dick (14cm)
-! brotherSex = 1 - You have kissed him
-! brotherSex = 2 - You have purposely shown him your tits
-! brotherSex = 3 - You have purposely shown him your naked body
-! brotherSex = 4 - You have let him touch you
-! brotherSex = 5 - You have given him a handjob
-! brotherSex = 6 - You have given him a blowjob
-! brotherSex = 7 - You've fucked
-! brotherSex = 8 - You've done anal
-! brotherSex = 9 - You are siblings with benefits
-! brotherSex = 10 - You are lovers
-! npc_QW['A34']: Quest stages
-! brotherAge: your age - 2
-! brotherknowslut: brother knowledge of your sexual activity (1 = seen cum, 2 = groupsex in park)
-! npc_pregtalk['A34']: Flag 0/1 Do your brother know you are pregnant
-! brotherDay:
-! brotherSexCount: the number of times left that you can have sex with your brother today (resets to 5 each day)
-! brotherMorningSex: Last day this happend. Used to block to once a day.
-! brotherNightSex: Last day this happend. Used to block to once a day.
-! brotherEvSex: Last day this happend. Used to block to once a day.
-! brother_homework: last day you helped your brother with homework. Used to block to once a day.
-! brother_saw_analplug: 0/1 Have your brother seen you with analplug
-! brother_body_show
-! brother_knows_not_virgin
-! natbro:  number of times Natasha sucked your brother (can only happen once at the moment)
-! BrotherNo:
-! brother_ev1
-! brotherConfidence: if it is over 10 he might try and touch you during a homework (not used yet)
-! npc_know_sveta_lact['A34'] = 0 - Kolka does not know sveta is lactating
-! npc_know_sveta_lact['A34'] = 1 - Kolka does know sveta is lactating
-! npc_know_sveta_lact['A34'] = 2 - Kolka does know that sveta was lactating
-! npc_breastfeed_by_sveta['A34'] = 0 or 1 - Kolka was not/was breastfeed by sveta
-! npc_tasted_sveta_milk['A34'] = 0 or 1 - Does Kolka know how svetas breast milk taste? 0 = no, 1 = yes
+!! Variables used
+!! brothersawpirsF: Flag 0/1 Have your brother seen your nipple piercings
+!! npc_rel['A34']: relationship
+!! npc_dick['A34']: size of brothers dick (14cm)
+!! brotherSex = 1 - You have purposely shown him your tits
+!! brotherSex = 2 - You have purposely shown him your naked body
+!! brotherSex = 3 - You have kissed him
+!! brotherSex = 4 - You have let him touch you or touched him
+!! brotherSex = 5 - You have given him a handjob
+!! brotherSex = 6 - You have given him a blowjob
+!! brotherSex = 7 - You've fucked
+!! brotherSex = 8 - You've done anal
+!! brotherSex = 9 - You are siblings with benefits
+!! brotherSex = 10 - You are lovers
+!! npc_QW['A34']: Quest stages
+!! brotherAge: your age - 2
+!! brotherknowslut: brother knowledge of your sexual activity (1 = seen cum, 2 = groupsex in park)
+!! npc_pregtalk['A34']: Flag 0/1 Do your brother know you are pregnant
+!! brotherDay:
+!! brotherSexCount: the number of times left that you can have sex with your brother today (resets to 5 each day)
+!! brotherMorningSex: Last day this happend. Used to block to once a day.
+!! brotherNightSex: Last day this happend. Used to block to once a day.
+!! brotherEvSex: Last day this happend. Used to block to once a day.
+!! brother_homework: last day you helped your brother with homework. Used to block to once a day.
+!! brother_saw_analplug: 0/1 Have your brother seen you with analplug
+!! brother_body_show
+!! brother_knows_not_virgin
+!! natbro:  number of times Natasha sucked your brother (can only happen once at the moment)
+!! BrotherNo:
+!! brother_ev1
+!! brotherConfidence: if it is over 10 he might try and touch you during a homework (not used yet)
+!! npc_know_sveta_lact['A34'] = 0 - Kolka does not know sveta is lactating
+!! npc_know_sveta_lact['A34'] = 1 - Kolka does know sveta is lactating
+!! npc_know_sveta_lact['A34'] = 2 - Kolka does know that sveta was lactating
+!! npc_breastfeed_by_sveta['A34'] = 0 or 1 - Kolka was not/was breastfeed by sveta
+!! npc_tasted_sveta_milk['A34'] = 0 or 1 - Does Kolka know how svetas breast milk taste? 0 = no, 1 = yes
 
 
 if $ARGS[0] = 'start':

+ 2 - 2
locations/brother_voyeur.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'showertalk1':
 				npc_rel['A34'] += 5
 				*clr & cla
 				brothershowerlook = 1
-				if brotherSex < 3:brotherSex = 3
+				if brotherSex < 2:brotherSex = 2
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
 				'"Kolka..." When you say this he starts to turn towards you a little bit but then stops himself and continues to stare at the wall. You sigh sympathetically. "It''s okay to look at me you know."'
 				'He perks up and turns towards you slowly. "R-really?" His wide eyes rapidly flit between your face, your breasts, your <<$pcdesc_pubes>> pussy, the walls, and the floor, unable to make up his mind of where he should be looking.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'showertalk2':
 		act'"You can look at me you know"':
 			*clr & cla
 			brothershowerlook = 1
-			if brotherSex < 3:brotherSex = 3
+			if brotherSex < 2:brotherSex = 2
 			npc_rel['A34'] += 5
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'

+ 2 - 2
locations/budgetclothes.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'office':
 				end
 			end
 			i += 3
-		if i <= 128:jump 'loopoffice'
+		if i <= 140:jump 'loopoffice'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
@@ -303,7 +303,7 @@ if $ARGS[0] = 'school':
 			end
 			i += 3
 			if i = 6:i = 9
-		if i <= 63:jump 'loopschool'
+		if i <= 80:jump 'loopschool'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality4'
 end
 

+ 27 - 1
locations/changingroom.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopbeach
-			if beach[i] = 1 and swimwearS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
+			if beach[i] = 1 and beachS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -94,5 +94,31 @@ if $ARGS[0] = 'view_swim_item':
 	end
 end
 
+
+!! following function counts all available swim and beach wear including the one which could be dressed already.
+!! you can add 'swim' or 'beach' if you want to count just one of them
+!! use func('changingroom','count_swim_item') or func('changingroom','count_swim_item','swim') or func('changingroom','count_swim_item','beach')
+
+if $ARGS[0] = 'count_swim_item':
+	h = 0
+	if $ARGS[1] = 'swim' or $ARGS[1] = '':
+		i = 1
+		:loopcountswimwear
+			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
+	end
+
+	if $ARGS[1] = 'beach' or $ARGS[1] = '':
+		i = 1
+		:loopcountbeach
+			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
+	end
+	result = h
+	killvar 'i'
+	killvar 'h'
+end
 --- changingroom ---------------------------------
 

+ 20 - 4
locations/cikl.qsrc

@@ -76,7 +76,14 @@ if (film > 0 or pornstack = 1) and pfilmNO = 0 and pfilmSTOP = 0:
 	gs 'pornschedule', 'schedule'
 end
 
-!!modelling job check
+!!------------------------------------------------------------------------------------------------------------
+!!	Job Stuff
+!!------------------------------------------------------------------------------------------------------------
+
+!! masseuse paycheck
+if masseuse['weeks_pay'] > 0 and week = 5:masseuse['paycheck'] = 1
+
+!!modelling check
 if model_week ! (daystart - week) / 7:model_job_week = 0
 
 !!acting strings to set available jobs
@@ -101,6 +108,7 @@ end
 !!Birthday
 age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 if ((month * 100) + day) <= pcs_dob mod 10000: age -= 1
+if birthday = day and birthmonth = month and model['age'] > 0:model['age'] += 1
 
 if workDolgDay > 0: workDolgDay -= 1
 if QWdogreiqTimer > 0: QWdogreiqTimer -= 1
@@ -165,10 +173,10 @@ if succubusflag = 0 and cheatBimbo = 0:
 	if bimbosh = 1:
 		snapshotY += 1
 	end
-else
-	bimbocl = 0
 end
 
+bimbocl = 0
+
 if cheatBimbo = 0: bimbo += snapshotY
 
 !!Once bimbolevel is set to 1, must use the withdrawal in stat to return to 0
@@ -621,6 +629,9 @@ if pcs_breath = 1:pcs_breath = 0
 
 if cheatNoEat = 1 and dounspell = 1:fat += 15
 
+!!Trauma decay
+if mood_trauma > 0: mood_trauma -= 1
+
 !!STD check
 if SifacOnce = 1:Sifilis += 1
 if GerpesOnce = 1:Gerpes += 1
@@ -1336,7 +1347,7 @@ if storyline = 1:
 	if sisboyparty = 2 and sisboyparty_day + 1 < daystart: sisboyparty = 3
 
 
-	if SchoolAtestat = 0:
+	if SchoolAtestat = 0 and SchoolBlock = 0:
 		if month = 12 and day > 25:
 			if day < 31:
 				$holyday = '<b>Winter Break in <<32-day>> days.</b>'
@@ -1876,6 +1887,11 @@ ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 ml_performance['performed_minutes'] = 0
 
 
+!! Checking for missed guitar lesson
+if ml_guitarlesson['nextlesson'] < daystart and ml_guitarlesson['lessonday'] ! 8:
+	ml_guitarlesson['lessonday'] = 8
+end
+
 !! Calculating the fame increase from the uploaded songs and removing ones that do not effect fame anymore to keep the 
 !! data at a sane level
 if ml_onlinesongcount > 0:

+ 16 - 10
locations/city_center.qsrc

@@ -104,32 +104,32 @@ end
 if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-	ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)	
-	if pcs_inhib < 30: 
-		if pcs_inhib < 10: 
+	ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
+	if pcs_inhib < 30:
+		if pcs_inhib < 10:
 			$diff = 'hard'
-		elseif pcs_inhib < 20: 
+		elseif pcs_inhib < 20:
 			$diff = 'medium'
 		else
 			$diff = 'easy'
 		end
-		
+
 		gs 'willpower', 'skill', 'self', $diff
 		will_cost = (will_cost * 3) - (pcs_perform)
 		if will_cost <= pcs_willpwr:
-			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
+			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)':
 				inhib_exp += rand(1,3)
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				gs 'music_buskingevents', 'busking', 'city'
 			end
-		else	
+		else
 			act 'Start busking (<<ml_buskingtime>> minutes) (<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 'Start busking (<<ml_buskingtime>> minutes)': gs 'music_buskingevents', 'busking', 'city'
-	end	
+	end
 end
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
@@ -269,12 +269,18 @@ else
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
+if AlexandriaQW = 3 and hour >= 6 and hour <= 23:
+    *nl
+    act 'Call Tatiana to infiltrate the models agency': gt 'tatiana_missions','mission2B'
+    end
+end
+
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
 	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):
 		act 'Prostitute yourself': gt 'street_walker', 'work'
-	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):  
+	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):
 		*nl
 		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
 	else

+ 9 - 9
locations/city_industrial.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-	'The towns <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is an hours walk from here.'
+	'The town''s <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is a one hour walk from here.'
 
 	if hour > 7 and hour < 23:
 		'You can see the <a href="exec:$loc = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
@@ -61,7 +61,7 @@ if $ARGS[0] = '':
 	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''city_industrial_train'', ''outside''">train station</a>.'
 
 	if week = 3 or hour < 16:
-		'The Bar "Rabotnik" is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and 24:00.'
+		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight..'
 	else
 		'The <a href="exec: minut += 5 & gt ''qwBarPolet''">Bar "Rabotnik"</a> seems to be open.'
 	end
@@ -78,12 +78,12 @@ if $ARGS[0] = '':
 	if hour >= 9 and hour < 18 and week > 1:
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
 	else
-		'A car dealership is nearby'+iif(week = 1, ', but it''s closed on mondays.', '. It''s currently closed and will open between 09:00 and 18:00.')
+		'A car dealership is nearby'+iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.')
 	end
 	if hour >= 9 and hour <= 20 and week < 7:
 		'Next to the car dealership is a <a href="exec: minut += 5 & gt ''autoservisF'', ''start''">repair shop</a>.'
 	else
-		'Next to the car dealership is a repair shop.'+ iif(week = 7, 'It''s closed on sundays.', 'It will be open between 09:00 and 20:00.')
+		'Next to the car dealership is a repair shop.'+ iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.')
 	end
 	if hour >= 9 and hour < 17 and week < 6:
 		'The <a href="exec: minut += 5 & gt ''dk'', ''start''">community centre</a> is currently open.'
@@ -99,7 +99,7 @@ if $ARGS[0] = '':
 	if hour >= 8 and hour <= 20:
 		'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec: minut += 2 & gt ''shop'', ''start''">supermarket</a>.'
 	else
-		'The empty parking lot, which is engulfed in bright lights, belongs to a supermarket that opens between 08:00 and 20:00'
+		'The empty parking lot, which is engulfed in bright lights, belongs to a supermarket that is open between 08:00 and 20:00'
 	end
 	if hour >= 12 and hour <= 19:
 		'Above the door to a basement room is a bright neon sign for the <a href="exec: minut += 5 & gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>.'
@@ -149,14 +149,14 @@ if $ARGS[0] = 'redlight':
 		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'
 	end
 	if pornstudio >= 1 and hour >= 10 and hour < 22:
-		'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of naughty movies are created'
+		'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of adult movies are created.'
 	elseif pornstudio >= 1 and (hour < 10 or hour >= 22):
-		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of naughty movies are created'
+		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of adult movies are created.'
 	end
 	if hour < 3 or hour >= 11: 
-		'A shop for <a href="exec:minut += 5 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city.'
+		'A shop for <a href="exec:minut += 5 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city to browse its stock.'
 	else
-		'A shop for sex toys is closed and will open at 11:00.'
+		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
 	end
 	if bordel > 0 and (hour >= 20 or hour <= 3):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 

+ 22 - 5
locations/city_island.qsrc

@@ -47,11 +47,28 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> is a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
-if hour >= 4 and hour <= 23:'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
-if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'
-if student > 0 or (hour >= 6 and hour <= 23):'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
+if hour >= 8 and hour <= 22:
+	'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+else
+	'You can see a closed kiosk. It''s open between 08:00 - 23:00.'
+end
+if hour >= 8 and hour < 22:
+	'You can see <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
+else
+	'You can see Patch Work Dolls a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. It''s open every day between 08:00 - 22:00'
+end
+if hour >= 4:
+	'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
+else
+	'The Metro Station is closed. The first train will depart at 04:00.'
+end
+if week < 6 and hour >= 7:
+	'Dominating the island is the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'
+else
+	'The University is closed. It''s open during the week from 07:00.'
+end
+if student > 0 or hour >= 6:'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
+
 
 
 --- city_island ---------------------------------

+ 7 - 7
locations/city_lake.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
-	if $clothingworntype ! 'swimwear':
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
@@ -36,7 +36,7 @@ if $ARGS[0] = 'start':
 		'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 	end
 
-	if ARRSIZE('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -44,10 +44,10 @@ if $ARGS[0] = 'start':
 		*nl
 	end
 
-	if npc_QW['A192'] = 3 and temper >= 15 and $clothingworntype = 'swimwear' and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
+	if npc_QW['A192'] = 3 and temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
 
 	act 'Leave':
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			cla
 			'You need to get dressed in regular clothing first.'
 			act'Return':gt 'city_lake','start'
@@ -58,10 +58,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'Nearby are various '+iif($clothingworntype = 'swimwear' or $clothingworntype = 'beach','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
 		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
-		if temper >= 15 and $clothingworntype = 'swimwear':
+		if temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 			'Also you can sunbathe or swim.'
 
 			act 'Walk on the beach':
@@ -978,7 +978,7 @@ if $ARGS[0] = 'stasValera4':
 						StasValeraKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-						if $clothingworntype = 'swimwear':
+						if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 							gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
 						end

+ 2 - 2
locations/city_musicstore.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'musicshop':
 		act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
 		act 'Try some guitars': 
 !!			TODO: Better scenes here			
-			if pcs_instrmusic < 30 and pcs_performing < 10:
+			if pcs_instrmusic < 30 and pcs_perform < 10:
 				'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
 			else
 				'Some texts here depending on music skill and performing skill'			
@@ -101,7 +101,7 @@ if $ARGS[0] = 'cameback':
 	act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
 	act 'Try some guitars': 
 !!			TODO: Better scenes here			
-		if pcs_instrmusic < 30 and pcs_performing < 10:
+		if pcs_instrmusic < 30 and pcs_perform < 10:
 			'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
 		else
 			'Some texts here depending on music skill and performing skill'			

+ 29 - 7
locations/city_residential.qsrc

@@ -115,13 +115,35 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
-if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
-if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
-if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
-if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
-if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of <a href="exec: minut += 5 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, so employees can enter to begin their shift.'
-if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely styled diner <a href="exec: minut += 5 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear the swearing and laughing of some <a href="exec: minut += 5 & gt ''gopnew'', ''start''">gopniks</a>.'
-if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
+if (hour >= 8 and hour <= 20) or preg = 2:
+	'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
+else
+	'The clinic is close. It will open again at 08:00.'
+end
+if hour >= 6 and hour <= 9 and military = 1 and week = 6:
+	'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
+elseif military = 1:
+	'The military bus will wait between 06:00 and 09:00 on Saturdays.'
+end
+if hour >= 8 and hour <= 14 and week ! 1:
+	'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
+else
+	'You could go shopping at the noisy local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
+end
+if hour >= 8 and hour <= 15 and week < 6:
+	'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
+else	
+	'Near the market is a tailor shop where you can get your clothes resized if needed. '+iif(week < 6, 'It closes at 16:00.', 'It''s closed on weekends.')
+end
+if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:
+	'The side door of <a href="exec: minut += 5 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, so employees can enter to begin their shift.'
+elseif hour >= 12 and hour <= 22 and week ! 1:
+	'In a side alley, next to the uniquely styled diner <a href="exec: minut += 5 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear the swearing and laughing of some <a href="exec: minut += 5 & gt ''gopnew'', ''start''">gopniks</a>.'
+elseif hour > 22 or hour <= 3:
+	'In the parking lot of "The Roadhouse" diner you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
+else
+	'The diner "The Roadhouse" is closed right now. It''s open every day except Monday between 12:00 and 23:00.'
+end
 if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is about a 20-minute walk away.'

+ 25 - 12
locations/clothing.qsrc

@@ -59,7 +59,7 @@ $clothing_list_line = {
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'school' and ARGS[2] = 6:
 			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
-		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear') and $ARGS[1] ! 'beach' and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
+		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'exercise' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
 				$RESULT += '</TD>'
 			else
@@ -325,7 +325,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbeach
-				if beach[i] = 1 and formalS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
+				if beach[i] = 1 and beachS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
 				i += 1
 			if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -610,19 +610,32 @@ if $ARGS[0] = 'view_clothing_item':
 						'This item is too large for you to wear.'
 					end
 
-					if pcs_sewng >= 60 and tkan > 0:
-						cla
-						'You can resize this thanks to your sewing skill.'
+					if (pcs_sewng >= 50 and tkan > 0) or $loc_arg = 'tailor':
+						cla & *nl
+						if $loc_arg = 'tailor':
+							'You can pay to have this resized for (500 <b>₽</b>).'
+						else
+							'You can resize this thanks to your sewing skill.'
+						end
+						
+						act 'Return': gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
+						
 						act 'Resize item':
 							cla
-							tkan -= 1
-							minut += 30
-							dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
-							'You spend 30 minutes resizing the outfit.'
+							if $loc_arg = 'tailor':
+								minut += 15
+								money -= 500
+								dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
+								*nl
+								'You hand the clothing over to the tailor who takes it into the back. Fifteen minutes later, he presents your clothing back to you, adjusted to fit you perfectly.'
+							else
+								tkan -= 1
+								minut += 30
+								dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
+								'You spend 30 minutes resizing the outfit.'
+							end
 							act 'Return':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 						end
-
-						act 'Return': gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 					end
 				exit
 
@@ -843,8 +856,8 @@ if $ARGS[0] = 'wear':
 	PCloInhibit = CloInhibit
 	if cheatbimbo = 0:
 		PCloBimbo = CloBimbo
+		!! This is counter for setting bimbo points overnight, don''t change bimbocl setting unless changing that
 		if CloBimbo = 1: bimbocl = 1
-		if CloBimbo = 0: bimbocl = 0
 	else
 		PCloBimbo = 0
 		CloBimbo = 0

+ 5 - 3
locations/clothing_descriptions.qsrc

@@ -53,7 +53,7 @@ end
 if CloBra = 2:
 	$description += ', the top leaves your breasts completely exposed'
 elseif CloBra = 1:
-	$description += ', the top replaces a bra (if you are wearing one)'
+	$description += ', the top is essentially a bra and replaces any you might be wearing'
 elseif CloTopCut > 0:
 	if CloTopCut = 1:
 		$description += ', includes a very modest top'
@@ -66,8 +66,10 @@ elseif CloTopCut > 0:
 	end
 	if tits < 2:
 		$description += ', that would hang loosely around your humble bosom'
-	elseif tits < 5:
-		$description += ', that would fit your decently-sized bosom'
+	elseif tits < 4:
+		$description += ', that would hang loosely around your petite bosom'
+	elseif tits < 6:
+		$description += ', that would comfortably contain your full bosom'
 	elseif tits < 8:
 		$description += ', that would tightly strain to contain your ample bosom'
 	else

+ 2 - 1
locations/cum_arrcheat.qsrc

@@ -45,7 +45,7 @@ elseif tabletkicheck = 1:
 	end
 	$cycletemp[4] = '. You automatically take your pill. Your current pill discipline is <<tabletkipd>><<$cycletemp[6]>>. <<tabletkipt>> will be added to your pill discipline if you take the pill now, and <<tabletkipi>> will be added to your pill discipline if you do no additional action. You currently have <<pillcon>> units of birth control chemical in your body, though you believe it is actually <<pillcon2>>.'
 elseif pillcon2 > 0:
-	$cycletemp[4] = '. You currently have <<pillcon2>> units of birth control chemical in your body, but you think it is actually <<pillcon>>.'
+	$cycletemp[4] = '. You currently have <<pillcon>> units of birth control chemical in your body, but you think it is actually <<pillcon2>>.'
 else
 	$cycletemp[4] = ''
 end
@@ -263,5 +263,6 @@ else
 end
 killvar '$cycletemp'
 act 'Return to cheat index': dynamic $cheatmenu
+
 --- cum_arrcheat ---------------------------------
 

+ 1 - 1
locations/dachain.qsrc

@@ -127,7 +127,7 @@ if $args[0] = '':
 		else
 			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
 			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-				act 'Record and edit a song (1:30)': gt 'music_onlinemusic', 'recordAndEditSong'
+				act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong' 
 			end	
 		end
 	end

+ 2 - 2
locations/danceclass.qsrc

@@ -20,7 +20,7 @@ act 'Modern dance class (0:30)':
 	timemult = 0
 	abonement -= 1
 	if pcs_inhib < 40:inhib_exp += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
 
 	if pcs_danc < 100:'You study modern dance, which is very popular in the clubs.'
 	if pcs_danc >= 100:'The day has finally come, you''ve been working hard, and you realize that you''ve learned everything you can from this class.'
@@ -33,7 +33,7 @@ act 'Burlesque class (0:30)':
 	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
 	abonement -= 1
 	if pcs_inhib < 60:inhib_exp += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
 
 	if pcs_danc >= 50:
 		gs 'exercise', 'tier2', 0, 'dancero_exp'

+ 18 - 8
locations/dimaEv.qsrc

@@ -354,6 +354,22 @@ if $ARGS[0] = 'dimkaplays':
 	gs 'stat'
 	dimarudorient = 1
 	'Dimka takes some white powder from his desk and a small straw. "Here, sniff this." He offers with a cocky smile, "It''s really cool! Excellent for relaxing!" Knowing the blackmail he has on you, you know you don''t really have a choice. So you do as he commands.'
+	
+	gs 'willpower', 'drugs', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			*clr & cla
+			minut += 5
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/pre.jpg"></center>'
+			'You refuse to use the powder. Dimka chuckles and puts it away. "Well, okay, but you''re missing something really cool." You sigh with relief, as seems that he doesn''t consider this an insult and look meekly at him.'
+			act 'Continue': gt 'dimaEv', 'dimkaplays2'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
 	act 'Snort':
 		*clr & cla
 		minut += 15
@@ -365,14 +381,6 @@ if $ARGS[0] = 'dimkaplays':
 		'You sniff up the dose of powder. For a moment, you just feel numb, then you feel yourself get aroused, the heat coming from your pussy as it soaks itself, you gasp, it is almost too much to take, you desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal, he must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky'
 		act 'Continue': gt 'dimaEv', 'dimkaplays2'
 	end
-	act 'Refuse':
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/pre.jpg"></center>'
-		'You refuse to use the powder. Dimka chuckles and puts it away. "Well, okay, but you''re missing something really cool." You sigh with relief, as seems that he doesn''t consider this an insult and look meekly at him.'
-		act 'Continue': gt 'dimaEv', 'dimkaplays2'
-	end
 end
 
 if $ARGS[0] = 'dimkaplays2':
@@ -607,6 +615,8 @@ end
 
 if $ARGS[0] = 'Dimka_warning':
 !!this one is if Dimka sends a warning
+	menu_off = 1
+	if DimaBeHomeOnce = 0: DimaBeHomeOnce = 1
 	if dimkawarn = 0:
 		*clr & cla
 		pcs_mood -= 20

+ 1 - 1
locations/din_bad.qsrc

@@ -194,7 +194,7 @@ if $ARGS[0] = 'd_bag':
 		if morning_after_pill = 1:
 			'You have one <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pill</a>.'
 		else
-			'You have <b><<birth_control[''morning_after'']>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a>.'
+			'You have <b><<morning_after_pill>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a>.'
 		end
 	else
 		'You have no morning after pills.'

+ 69 - 60
locations/din_van.qsrc

@@ -70,16 +70,16 @@ $shower = {
 
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
-		'You undress and turn on the water in the shower. When it hits the right temperature you enter the shower and let the warm water rain down on you.'
+		'You undress and turn on the water in the shower. When it hits the right temperature, you step into the shower and let the warm water rain down on you.'
 		if daystart < 10 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
 			pcs_horny += rand(6,10)
-			'It''s really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips, and smooth legs. You begin to lather your body noticing how soft and tender it feels. Once you''re sure you didn''t miss a single spot on your feminine body you begin to wash yourself off, continuing to experience new and strange sensations.'
+			'It''s really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips and smooth legs. You begin to lather your body, noticing how soft and tender it feels. Once you''re sure you haven''t missed a single spot, you begin to wash yourself off, continuing to experience new and strange sensations.'
 		elseif daystart < 30 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
 			pcs_horny += rand(2,6)
-			'You have already gotten used to your feminine body and its softness doesn''t surprise you very much anymore. But you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
+			'You''ve already gotten used to your feminine body and its softness doesn''t surprise you very much anymore, but you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
 			pcs_horny += rand(0,2)
-			''+iif(noShampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'soap yourself trying not to miss any spot and then wash off.'
+			''+iif(noShampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'lather yourself up, trying not to miss any spots, and then wash off.'
 		end
 
 		if shampoo = 0 and noShampoo_tmp = 1:
@@ -106,16 +106,16 @@ $shower = {
 
 		if lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
-				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularly probably made you lactate!'
+				'As you clean your breasts, something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularly probably made you lactate!'
 				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself <= 0 and pcs_massagedherbreasts > 0:
-				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk. Regularly massaging your breasts probably made you lactate!<br>'
+				'As you clean your breasts, something catches your eye. White drops come from your nipples. It is milk. Regularly massaging your breasts probably made you lactate!<br>'
 				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts > 0:
-				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk. All that pumping and massaging your breasts probably caused you to lactate!<br>'
+				'As you clean your breasts, something catches your eye. White drops come from your nipples. It is milk. All that pumping and massaging your breasts probably caused you to lactate!<br>'
 				lactation['induced'] = 1
 			else
-				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. To your surprise it is milk. You started lactating!<br>'
+				'As you clean your breasts, something catches your eye. White drops come from your nipples. You find, to your surprise, that it is milk. You have started lactating!<br>'
 				if thinkpreg = 1 or knowpreg = 1:
 					'This is probably happening because you are pregnant.'
 				else
@@ -165,7 +165,7 @@ $shower = {
 
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
-			'In your absentmindedness you forgot to close the door.'
+			'In your absentmindedness, you have forgotton to close the door.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
 			if indorf = 0: gs 'vanrPar', 'peek'
 		end
@@ -194,12 +194,12 @@ $bath = {
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
 		*nl
-		'While the bathtub fills up you get undressed and then dip a toe into the water. It has just the right temperature so you climb in and let yourself sink into the warm water.'
+		'You undress while the bathtub fills up and dip a toe into the water. It is just the right temperature, so you climb in and let yourself sink into the warm water, moaning softly as you feel your muscles start to relax.'
 
 		if daystart < 10 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(6,10)
-			'You stare at those smooth, soft legs sticking out of the water. You''re still not used to this new body and the look of all this roundness.'
-			'Starting to soap yourself you unwittingly turn your attention to your breasts. They''re so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.'
+			'You stare at the smooth, soft legs sticking out of the water. You''re still not used to this new body and the look of all this roundness.'
+			'As you start to soap yourself, you unwittingly turn your attention to your breasts. They''re so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.'
 		elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(2,6)
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
@@ -289,7 +289,7 @@ $brit = {
 				*nl
 				if daystart < 10 and StoryLine = 0 and ntstart = 0:
 					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
 				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 					pcs_mood += 10
 					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
@@ -320,7 +320,7 @@ $brit = {
 					*nl
 					if daystart < 10 and StoryLine = 0 and ntstart = 0:
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
 					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
@@ -348,7 +348,7 @@ $brit = {
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					*nl
-					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
+					'You lather your crotch with some soapy water and carefully shave your pubic hair. After you''re done, you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
 					dynamic $dryOff
 					gs'selfplay','bathtub_dildo_check'
 					gs'selfplay','shower_dildo_check'
@@ -364,7 +364,7 @@ $brit = {
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
-					'You spend some time carefully shaving your pubic hair to your desired shape, and then trim it to make it neat and tidy.'
+					'You spend some time carefully shaving your pubic hair to your desired shape before trimming it to make it neat and tidy.'
 					dynamic $dryOff
 					gs'selfplay','bathtub_dildo_check'
 					gs'selfplay','shower_dildo_check'
@@ -421,7 +421,7 @@ $brit = {
 				*nl
 				if daystart < 10 and StoryLine = 0 and ntstart = 0:
 					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
 				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 					pcs_mood += 10
 					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
@@ -973,7 +973,7 @@ $toymanage = {
 
 			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
 			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
+			'You squat and tug gently at the butt plug, gasping as you push it out. You can''t help but feel a bit empty now that it''s out.' & !!0.2.6: Removed unneccessary var check
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
@@ -991,8 +991,8 @@ $toymanage = {
 
 			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
 			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
+			if butpluguse > 0:'You squat and gently rub the butt plug against your anus after lubricating it with a bit of saliva. After a few minutes, you''ve relaxed enough to be able to push it in. Once it''s in, you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
+			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass so I can have great adventures someday... You could even say huge and thick adventures with crimson heads..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you lubricate your anus with your saliva and push the butt plug against it. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it and then immediately feel naughty for even having thought that.'
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
@@ -1053,19 +1053,28 @@ $palelady = {
 
 if $ARGS[0] = 'private':
 	menu_off = 0
-	if stanok > 0:'Your razor will last <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	if stanok > 0:'You have enough razors left for <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	if stanok > 0 and stanok <= 2 and razor['warning'] ! daystart:
+		razor['warning'] = daystart
+		msg'	You''re about to run out of razors!'
+	end
 
 	if mosolmaz > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
 
 	if tampon = 0 and sanpad = 0:
-		'<b><font color="red">You have no tampons left.</font></b>'
+		'<b><font color="red">You have no feminine hygiene products left.</font></b>'
+	elseif tampon = 1 and tampon['warning'] ! daystart:
+		tampon['warning'] = daystart
+		msg'<font color="red">You only have <b><<tampon>></b> tampon left!</font>'
 	elseif tampon = 1:
-		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+		msg'<font color="red">You only have <b><<tampon>></b> tampon left.</font>'
 	else
 		'You have <b><<tampon>></b> tampons.'
 	end
-	if sanpad = 0 and tampon = 0:
-		'<b><font color="red">You have no pads left.</font></b>'
+	
+	if sanpad = 1 and sanpad['warning'] ! daystart:
+		sanpad['warning'] = daystart
+		msg'<font color="red">You only have <b><<sanpad>></b> pad left!</font>'
 	elseif sanpad = 1:
 		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
 	else
@@ -1137,7 +1146,7 @@ if $ARGS[0] = 'private':
 				*clr & cla
 				minut += 5
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
-				'You get dressed'
+				'You get dressed.'
 				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
 				act 'Return': menu_off = 0 & gt $loc, $loc_arg
@@ -1147,7 +1156,7 @@ if $ARGS[0] = 'private':
 				*clr & cla
 				minut += 5
 				'<center><video autoplay loop src="images/shared/accessories/computer/webcam/undress1.mp4"></video></center>'
-				'You remove your clothing'
+				'You remove your clothing.'
 				gs 'clothing', 'strip'
 				gs 'stat'
 				act 'Return': menu_off = 0 & gt $loc, $loc_arg
@@ -1254,12 +1263,12 @@ if $ARGS[0] = 'misery':
 			husporday = daystart
 			'The washing machine washed your husband''s dirty laundry.'
 		elseif poroshok < 1:
-			'You ran out of washing powder for the washing machine.'
+			'You have run out of washing powder for the washing machine.'
 		end
 	end
 
 	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
-		act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
+		act 'Wash your husband''s clothes (2 units of washing powder) (1:00)':
 			*clr & cla
 			husband += 5
 			poroshok -= 2
@@ -1294,8 +1303,8 @@ if $ARGS[0] = 'buffpick':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
 	*nl
-	'While drying off and getting dressed you examine the sleek muscles that are showing through your skin.'
-	'As you do so you think about how you look and decide:'
+	'While drying off and getting dressed, you examine the sleek muscles that are showing through your skin.'
+	'As you do so, you think about how you look and decide:'
 	act 'You like how you look.': normbuffpick = 2 & mirror_steam = hour & menu_off = 0 & gt $loc, $loc_arg
 	act 'You don''t like how you look.': nrmbfpckct += 1 & normbuffpick = 0 & mirror_steam = hour & menu_off = 0 & gt $loc, $loc_arg
 end
@@ -1310,15 +1319,15 @@ if $ARGS[0] = 'HorrifiedReact1':
 		if stat['hidden_vaginal'] > 0 and stat['vaginal'] = 1:
 			'You don''t even know how this is possible. You''ve never even had sex with anyone.'
 			'What did you do to deserve this? What is everyone going to think of you? Your life is ruined.'
-			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation youre stuck with.'
+			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation you''re stuck with.'
 		elseif rape > 0 and stat['vaginal'] > 1:
-			'It’s bad enough that you were raped, but possibly getting pregnant from it as well? It’s completely unfair.'
+			'It’s bad enough that you were raped, but possibly getting pregnant from it as well? It’s completely unfair!'
 			'What did you do to deserve this? What is everyone going to think of you? Your life is ruined.'
-			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation youre stuck with.'
+			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation you''re stuck with.'
 		else
 			'This is the worst possible thing that could have happened to you. You feel like you''re going to vomit from the stress.'
 			'What did you do to deserve this? What is everyone going to think of you? Your life is ruined.'
-			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation youre stuck with.'
+			'After several minutes of sobbing and trying to make sense of your situation, you finally pull yourself off of the floor. You straighten your clothes and wash your face as you begin to accept the situation you''re stuck with.'
 		end
 	act 'Finish' :menu_off = 0 & gt $loc, $loc_arg
 end
@@ -1332,13 +1341,13 @@ if $ARGS[0] = 'ConcernedReact1':
 	'Your mind races as you gaze at the test in your hand. The two strips clearly show that you''re pregnant. You know this isn''t the worst thing that could happen to you, but your life is definitely going to change. Are you even ready for that kind of change?'
 		if stat['hidden_vaginal'] > 0 and stat['vaginal'] = 1:
 			'The worst part about this whole situation is that you don''t even know how this happened. How can you get pregnant without having sex?'
-			'After a few minutes of weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
+			'After spending a few minutes weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
 		elseif rape > 0 and stat['vaginal'] > 1:
 			'The worst part about this whole situation is that this isn''t even your fault. This was forced on you.'
-			'After a few minutes of weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
+			'After spending a few minutes weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
 		else
 			'On some level, you''re aware that this is a consequence of your own actions, but you''re not quite ready to come to terms with that.'
-			'After a few minutes of weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
+			'After spending a few minutes weighing your options, you choose to get on with your day. You still have a lot to consider before you can decide what to do about this pregnancy, but you can’t spend all day in the bathroom without drawing suspicion.'
 		end
 	act 'Finish' :menu_off = 0 & gt $loc, $loc_arg
 end
@@ -1352,13 +1361,13 @@ if $ARGS[0] = 'ExcitedReact1':
 	'You''re overcome with glee as you look at the pregnancy test in your hand. Its two strips confirm that your wish has been granted: you are pregnant. You giggle as you clutch the pregnancy test, excited to share the news with everyone you know.'
 		if stat['hidden_vaginal'] > 0 and stat['vaginal'] = 1:
 			'You''re not sure how this happened, but you''re not going to complain. Who cares if a miracle made it happen?'
-			'You spend the next several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
+			'You spend several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
 		elseif rape > 0 and stat['vaginal'] > 1:
 			'You don’t even care about the circumstances that got you pregnant. It was absolutely worth it for this moment.'
-			'You spend the next several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
+			'You spend several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
 		else
-			'Every time you had sex, you hoped the act would make you into a mother.'
-			'You spend the next several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
+			'Every time you''ve had sex, you hoped the act would make you into a mother.'
+			'You spend several minutes fantasizing about your entry into parenthood before you remember you have places you need to be. You finally get up, still giddy as you go on with your day.'
 		end
 	act 'Finish' :menu_off = 0 & gt $loc, $loc_arg
 end
@@ -1369,16 +1378,16 @@ if $ARGS[0] = 'ArousedReact1':
 	pcs_pregtalk = 1
 	minut += 10
 	*nl
-	'You rub your thighs together as you stare at the pregnancy test in your hand. The two strips displayed confirm that you’ve been knocked up. You excitedly recount every load of cum blast into your fertile womb, wondering which one found purchase. You gently rub your clit in a circular motion as you think about the fact that, in a few months, everyone who sees your large, pregnant belly will know what a slut you are.'
+	'You rub your thighs together as you stare at the pregnancy test in your hand. The two strips displayed confirm that you’ve been knocked up. You excitedly recount every load of cum blasted into your fertile womb, wondering which one found purchase. You gently rub your clit in a circular motion as you think about the fact that, in a few months, everyone who sees your large, pregnant belly will know what a slut you are.'
 		if rape > 0 and stat['vaginal'] > 1 and incest['exp'] = 0:
-			'You pick up speed as you recall your rapist forcefully pumping you full of his wonderful semen without any concern for your desires. You loved having your agency stripped away as a complete stranger decided to make you a mother.'
+			'You pick up speed as you recall your rapist forcefully pumping you full of his wonderful semen without any concern for your desires. You loved having your dignity stripped away as a complete stranger decided to make you a mother.'
 		elseif incest['exp'] > 0:
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
 		else
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 		end
-		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
+		'After several minutes of this, you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $loc_arg
 end
 
@@ -1424,19 +1433,19 @@ if $ARGS[0] = 'prvt_pee':
 			if rand_pee = 0:
 				'You take a seat on the toilet and begin peeing, glad to feel the pressure released.'
 			elseif rand_pee = 1:
-				'After sitting on the toilet you finally release your bladder. A shiver runs down your spine as the stream flows out of you. "Wow," you think, "I had to go more than I thought."'
+				'After sitting on the toilet you finally release your bladder. A shiver runs down your spine as the stream flows out of you. "Wow." you think, "I had to go more than I thought."'
 			elseif rand_pee = 2:
-				'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
+				'Settling onto the toilet seat, you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
 			elseif rand_pee = 3:
-				'You plop down onto the porcelain throne and begin to unleash a torrent of urine into the bowl. As you wait for nature to finish it''s business you begin to daydream a bit as your mind wanders off.'
+				'You plop down onto the porcelain throne and begin to unleash a torrent of urine into the bowl. As you wait for nature to finish it''s business, you begin to daydream a bit as your mind wanders off.'
 			elseif rand_pee = 4:
-				'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
+				'While relaxing your bladder and beginning to pee, you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
 			elseif rand_pee = 5:
-				'You nearly piss yourself as you rush to seat yourself onto the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
+				'You nearly piss yourself as you rush to seat yourself on the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
 			elseif rand_pee = 6:
 				'After situating yourself on the toilet, you relax and begin peeing. The urine tickles your labia as it sprays out of you into the toilet bowl.'
 			else
-				'As you begin to sit down you nearly jump back to your feet as the cold toilet seat stings your bare bottom. You shake your head and sigh before settling back onto the icy seat and doing your business.'
+				'As you begin to sit down, you nearly jump back to your feet as the cold toilet seat stings your bare bottom. You shake your head and sigh before settling back onto the icy seat and doing your business.'
 			end
 
 	!!If PC is on her period and using tampon, then the following options should appear as well as the standard "Finish and wipe" act:
@@ -1446,7 +1455,7 @@ if $ARGS[0] = 'prvt_pee':
 					*clr & cla
 					minut += 2
 					'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
-					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
+					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one, unpack it and carefully insert it into yourself.'
 
 					gs 'din_van', 'prvt_pee_end'
 				end
@@ -1475,7 +1484,7 @@ if $ARGS[0] = 'prvt_pee_end':
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,2)
 		if rand_pee = 0:
-			'Gathering some toilet paper from the roll, you reach down wipe your vagina clean from the last drops of pee leaking from you before dropping the paper into the toilet.'
+			'Gathering some toilet paper from the roll, you reach down wipe your vagina clean from the last drops of urine leaking from you before dropping the paper into the toilet.'
 		elseif rand_pee = 1:
 			'Wrapping some toilet paper around your hand, you reach around and give your pussy and ass a quick wipe before letting the paper drop into the bowl.'
 		else
@@ -1498,7 +1507,7 @@ if $ARGS[0] = 'pblc_pee':
 			'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
 			rand_pee = rand(0,7)
 			if rand_pee = 0:
-				'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
+				'Settling onto the toilet seat, you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
 			elseif rand_pee = 1:
 				'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
 			elseif rand_pee = 2:
@@ -1515,7 +1524,7 @@ if $ARGS[0] = 'pblc_pee':
 				'As you sit down to relieve your bladder you get distracted reading some of the graffiti on the wall of the stall.'
 				$rand_girl = func('gschool_randperson', 1, '', 1, 1, 1, 1, 1, 0)
 				if rand_pee = 0:
-					'Albina and her Starlettes are a bunch of dirty whores.'
+					'Albina and her Starlets are a bunch of dirty whores!'
 				elseif rand_pee = 1:
 					'<<$rand_girl>>''s vagina smells like puke!'
 				elseif rand_pee = 2:
@@ -1533,7 +1542,7 @@ if $ARGS[0] = 'pblc_pee':
 				elseif rand_pee = 8:
 					'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote "Freebleeder for life!" Ewww.'
 				elseif rand_pee = 9:
-					'Petra''s cock is smaller than my lipstick tube, LOL!'
+					'Petka''s cock is smaller than my lipstick tube, LOL!'
 				elseif rand_pee = 10:
 					'You''re beautiful! Believe that!'
 				elseif rand_pee = 11:
@@ -1566,7 +1575,7 @@ if $ARGS[0] = 'pblc_pee':
 					*clr & cla
 					minut += 2
 					'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
-					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
+					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into yourself.'
 
 					gs 'din_van', 'pblc_pee_end'
 				end
@@ -1595,7 +1604,7 @@ if $ARGS[0] = 'pblc_pee_end':
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,6)
 		if rand_pee = 0:
-			'Gathering some toilet paper from the roll, you reach down wipe your vagina clean from the last drops of pee leaking from you before dropping the paper into the toilet.'
+			'Gathering some toilet paper from the roll, you reach down wipe your vagina clean from the last drops of urine leaking from you before dropping the paper into the toilet.'
 		elseif rand_pee = 1:
 			'Wrapping some toilet paper around your hand, you reach around and give your pussy and ass a quick wipe before letting the paper drop into the bowl.'
 		elseif rand_pee = 2:
@@ -1603,11 +1612,11 @@ if $ARGS[0] = 'pblc_pee_end':
 		elseif rand_pee = 3:
 			'You gather some of the rough, cheap toilet paper and use it to lightly wipe yourself, not wanting to irritate your sensitive skin. You drop it into the dirty toilet and use your foot to push the handle in order to flush.'
 		elseif rand_pee = 4:
-			'Looking over for the roll of toilet paper see that the roll has been used up. Noticing that the stall next to you seems occupied, you politely ask the stranger to help you out. The stranger chuckles a bit before kindly handing you a wad under the stall wall, which you happily use.'
+			'Looking for the roll of toilet paper, you are dismayed to see that the roll has been used up. Noticing that the stall next to you seems occupied, you politely ask the stranger to help you out. The stranger chuckles a bit before kindly handing you a wad under the stall wall, which you happily use.'
 		else
 			*clr
 			'<center><img <<$set_imgh>> src="images/pc/pee/wiping/no' + rand(1,6) + '.jpg"></center>'
-			'Reaching out for toilet paper you sigh as you notice that the roll is empty. Annoyed, you wiggle your ass to shake the last few drops from your lady bits before pulling up your panties and walking out of the stall.'
+			'Reaching out for toilet paper, you sigh as you notice that the roll is empty. Annoyed, you wiggle your ass to shake the last few drops off before pulling up your panties and walking out of the stall.'
 		end
 
 		act 'Finish':menu_off = 0 & gt $loc, $loc_arg

+ 1 - 1
locations/dinfather.qsrc

@@ -495,7 +495,7 @@ $d_fatherdrunk_act[2]={
                 pcs_horny -= RAND(1,5)
                 gs 'stat'
                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
-                if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
+                if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
             end
             if fatherLust=1:
                 if $pantyworntype ! 'none':

+ 5 - 3
locations/dk.qsrc

@@ -384,9 +384,11 @@ if $ARGS[0] = 'holl':
 				act 'Leave':gt 'dk', 'holl'
 			end
 		end
+		
+		if masseuse['certification'] > 0 and masseuse['certification'] < 10:'You have completed <<masseuse[''certification'']>> out of 10 massage therapist certification lessons.'
 
 		if money >= 1000 and masseuse['certification'] < 10 and masseuse_lesson ! daystart:
-			act 'Learn how to give massages (1,000 <b>₽</b> per session)':
+			act 'Get certified as a massage therapist (1,000 <b>₽</b> per session)':
 				cla
 				menu_off = 1
 				masseuse_lesson = daystart
@@ -395,8 +397,8 @@ if $ARGS[0] = 'holl':
 				minut += 120
 				gs 'stat'
 				'The next two hours are dedicated to reading detailed guides to how to relieve pain or tension in certain muscles and to putting these guides into practice with partners attending the course.'
-
-				if masseuse['certification'] = 10:'After your final lesson, you are issued a certificate: You are now a certified masseuse.'
+				*nl
+				if masseuse['certification'] = 10:'That was your final lesson! Your course complete, you are issued a certificate that shows you are a certified masseuse.'
 
 				act 'Leave':gt 'dk', 'holl'
 			end

+ 62 - 23
locations/ender.qsrc

@@ -80,11 +80,11 @@ if $ARGS[0] = 'loss':
 		'You fall to the ground. The prostitute kicks you around a couple of times. She grabs hold of your purse and takes all your money.'
 		'"This won''t do." she says as you''re ordered to kneel. She pulls her panties to the side as she sits on your face, forcing you to lick her semen filled pussy.'
 		'Afraid of getting beaten again, you carefully lick her crotch clean. After a few minutes she''s satisfied and leaves.'
-		
+
 		gs 'arousal', 'cuni_give', 10, 'sub', 'prostitution'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
@@ -105,7 +105,7 @@ if $ARGS[0] = 'loss':
 		'Kisame swims around you and laughs, "I''m having a great time baby." as he grabs and drags your feet to the bottom of the pool, where he thrusts his cock in your pussy.'
 		'You try not to drown in the water while you are fucked by Kisame, You feel him pounding your insides with his member like a hammer. You can no longer hold your breath as you begin to drown.'
 		'Kisame smiles and leans over you, "Kiss me." You stick your lips to his mouth, as his breath fill your lungs with air before keeping on pounding your pussy. Finally he finishes, pouring his shark seed into the surrounding water.'
-		
+
 		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -151,13 +151,13 @@ if $ARGS[0] = 'loss':
 		'The silence of the night is only broken by the slapping flesh and his curses, until you begin to falsely moan in excitement, trying to make your rapist to finish quicker and end the torment.'
 		'Even though the pain is intense, your trick works, and before you know it the attacker cums, shooting his seed all over your pussy and belly. He quickly wipes his dick on you, puts it away, and leaves.'
 		'As you lie there broken and humiliated, you see a single shooting star burning a fiery trail through the night sky, and wordlessly make a wish.'
-		
+
 		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
 
 		act 'Cry': gt $loc, $loc_arg
-		
+
 	elseif fightEnding = 9:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'loss':
 		fightEnding = 0
 		Loss += 1
 		'You breath deeply, totally exhausted as the naked man advances upon you. You no longer have the strength to fight him off.'
-		
+
 		act 'Lose':gt 'stallion', 'rape'
 	elseif fightEnding = 14:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -232,12 +232,12 @@ if $ARGS[0] = 'loss':
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
-		mood -= 20
+		pcs_mood -= 20
 		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
 		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
 		act 'Do as she says':
 			cla & *clr
-			mood -= 10
+			pcs_mood -= 10
 			christinaphotos = 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
@@ -249,6 +249,23 @@ if $ARGS[0] = 'loss':
 			gs 'pain', 1, 'labia', 'kick'
 			act 'Walk off': gt 'gLake'
 		end
+    elseif fightEnding = 17:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+        AlexandriaQW = 5
+        pcs_mood -= 40
+		'<center><b><font color="maroon">????</font></b></center>'
+	    '<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
+        'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
+		'"I admit that I was expecting another of Rikudo''s victims. For a moment, even I was tricked into thinking that you were... better."'
+		'Groaning, you try to make sense of the situation, and look for Tatiana''s film. It is now in the woman''s hand. She glances at it nonchalantly, before pocketing the trinket and looking at you with a frustrated sigh.'
+        '"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
+        'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
+        '"Who... Who are you?"'
+        'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
+        act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
 	end
 end
 
@@ -407,10 +424,15 @@ if $ARGS[0] = 'win':
 	elseif fightEnding = 15:
 		fightEnding = 0
 		Win += 1
-		mood += 10
+		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/losefight.jpg"></center>'
 		'Christina is a hell of a fighter, she is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave it as far as you can out into the lake where it plops into the water. Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
 		act 'Walk off': gt 'gLake'
+	elseif fightEnding = 17:
+		fightEnding = 0
+		Win += 1
+		pcs_mood += 10
+		gt'tatiana_missions','mission2E'
 	end
 end
 
@@ -499,7 +521,7 @@ if $ARGS[0] = 'surrender':
 		stellfight = stellfight - 1
 
 		'<center><img <<$set_imgh>> src="images/characters/city/ira/sex/irinaqw7.jpg"></center>'
-		
+
 		if fightPStats['Health'] = pcs_health:
 			'Just as the fight is about to begin, you realize that you don''t want any part of it. Your opponent is nearing you which has you yelling, "We don''t need to fight. I''m giving up already!"'
 		elseif fightPStats['Health'] > pcs_health/2:
@@ -511,12 +533,12 @@ if $ARGS[0] = 'surrender':
 		end
 		'"This won''t do." she says as you''re ordered to kneel. She pulls her panties to the side as she sits on your face, forcing you to lick her semen filled pussy.'
 		'Afraid of getting beaten again, you carefully lick her crotch clean. After a few minutes she''s satisfied and leaves.'
-		
+
 		if pcs_health < 100: pcs_health = 100
 		gs 'arousal', 'cuni_give', 10, 'sub', 'prostitution'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
@@ -534,12 +556,12 @@ if $ARGS[0] = 'surrender':
 		gs 'cum_manage'
 
 		'<center><img <<$set_imgh>> src="images/characters/city/kisame/sex/kisamesex.jpg"></center>'
-		
+
 
 		'Kisame swims around you and laughs, "I''m having a great time baby." as he grabs and drags your feet to the bottom of the pool, where he thrusts his cock in your pussy.'
 		'You try not to drown in the water while you are fucked by Kisame, You feel him pounding your insides with his member like a hammer. You can no longer hold your breath as you begin to drown.'
 		'Kisame smiles and leans over you, "Kiss me." You stick your lips to his mouth, as his breath fill your lungs with air before keeping on pounding your pussy. Finally he finishes, pouring his shark seed into the surrounding water.'
-		
+
 		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -577,7 +599,7 @@ if $ARGS[0] = 'surrender':
 
 		horand = RAND(1,100)
 
-		
+
 		'"Please, you don''t have to do this." you try to reason with him, "I''m begging you."'
 		'But your words are in vain, you put up a pathetic attempt to fend him off, but you lost, and now all you can do is stare at the stars while your body is used for someone''s filthiest fantasies.'
 		'Your clothes are ripped off as you shout in helpless frustration as his cold hands touch you in your most intimate places. You close your eyes, not willing to look at your torturer, nor his hard cock hanging above you.'
@@ -586,20 +608,20 @@ if $ARGS[0] = 'surrender':
 		'The silence of the night is only broken by the slapping flesh and his curses, until you begin to falsely moan in excitement, trying to make your rapist to finish quicker and end the torment.'
 		'Even though the pain is intense, your trick works, and before you know it the attacker cums, shooting his seed all over your pussy and belly. He quickly wipes his dick on you, puts it away, and leaves.'
 		'As you lie there broken and humiliated, you see a single shooting star burning a fiery trail through the night sky, and wordlessly make a wish.'
-		
+
 		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
 
 		act 'Cry': gt $loc, $loc_arg
-		
+
 	elseif fightEnding = 9:
 		if pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
 		money = money / 2
-		
+
 		if fightPStats['Health'] = pcs_health:
 			'Your opponents demeanour is making you worried, they seem to have the overhand and you start doubting in yourself. Your opponent starts running towards you but before they strike you start yelling, "I give up! I give up!"'
 		elseif fightPStats['Health'] > pcs_health/2:
@@ -616,7 +638,7 @@ if $ARGS[0] = 'surrender':
 		grupvalue[4] -= 2
 		if Loss < 0: Loss = 0
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
-		
+
 		if fightPStats['Health'] = pcs_health:
 			'What the fuck, <<$pcs_nickname>>?" Lera asks in an annoyed tone before sweeping Dimka''s legs out from under him. Lena and Lera proceed to kick and stomp Dimka until he starts begging them to stop.'
 			'After a few more hits, they get bored and check his pockets for cash. "10.000 rubles! Sweet!" They split the money among themselves leaving none for you.'
@@ -650,7 +672,7 @@ if $ARGS[0] = 'surrender':
 		Loss += 1
 
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
-		
+
 		if fightPStats['Health'] = pcs_health:
 			'Just the mere thought of a fight, your knees go weak and you feel yourself being out of breath. Before even the first punch is thrown you raise up your hands and squeak out in fear, "Don''t hurt me, I give up."'
 		elseif fightPStats['Health'] > pcs_health/2:
@@ -670,7 +692,7 @@ if $ARGS[0] = 'surrender':
 		fightEnding = 0
 		Loss += 1
 		'The naked man laughs and advances toward you.'
-		
+
 		act 'Lose':gt 'stallion', 'rape'
 	elseif fightEnding = 14:
 		killvar 'autocombat_surrender'
@@ -700,14 +722,14 @@ if $ARGS[0] = 'surrender':
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
-		mood -= 20
+		pcs_mood -= 20
 		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
 		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight.'
 		'In the end you find you are no match for her, you fall onto your back and hold you hands up to signal your surrender. You know you can''t win at this point so you just lay there.'
 		'Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
 		act 'Do as she says':
 			cla & *clr
-			mood -= 10
+			pcs_mood -= 10
 			christinaphotos = 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
@@ -719,6 +741,23 @@ if $ARGS[0] = 'surrender':
 			gs 'pain', 1, 'labia', 'kick'
 			act 'Walk off': gt 'gLake'
 		end
+    elseif fightEnding = 17:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+        AlexandriaQW = 5
+        pcs_mood -= 40
+		'<center><b><font color="maroon">????</font></b></center>'
+	    '<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
+        'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
+		'"I admit that I was expecting another of Rikudo''s victims. For a moment, even I was tricked into thinking that you were... better."'
+		'Groaning, you try to make sense of the situation, and look for Tatiana''s film. It is now in the woman''s hand. She glances at it nonchalantly, before pocketing the trinket and looking at you with a frustrated sigh.'
+        '"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
+        'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
+        '"Who... Who are you?"'
+        'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
+        act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
 	end
 end
 

+ 4 - 4
locations/etoexhib.qsrc

@@ -1628,7 +1628,7 @@ if $ARGS[0] = 'pos53':
 	'The roof of your apartment building.'
 
 	act 'Go down to the attic':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'etoexhib','pos53'
 		else
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -1646,10 +1646,10 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

+ 37 - 1
locations/events.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'read':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/books/book.jpg"></center>'
 
-		if f_book <= 0 and fantasybook <= 0 and w_book = 0 and womanbook = 0:'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
+		if f_book <= 0 and fantasybook <= 0 and w_book = 0 and womanbook = 0 and artem_borrowed_book = 0 and artembook <= 0:'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
 
 		if f_book > 0:
 			if fantasybook <= 0:fantasybook = 5 & f_book -= 1
@@ -107,6 +107,42 @@ if $ARGS[0] = 'read':
 			end
 		end
 
+
+		if artembook > 0:
+			act 'Read the book your borrowed from Artem. There are <<artembook * 100>> pages left (1:00) ':
+				*clr & cla
+				artembook -= 1
+
+				if artembook = 0:totalbook += 1
+
+				minut += 60
+
+				if pcs_nerd > 0:
+					lastread = totminut
+					lastreadday = daystart
+					pcs_nerd += 1
+					blizoruk += 1
+				end
+
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/books/book.jpg"></center>'
+
+				if pcs_nerd > 0:
+					pcs_mood = 100
+
+					if pcs_stren > 1:stren_deg -= 1
+					if pcs_vital > 5:vital_deg -= 1
+					'For an hour you enthusiastically read the book, completely immersed in the authors world.'
+				else
+					pcs_mood += 10
+					'For an hour you read the book.'
+				end
+
+				act 'Close the book':gt $loc, $loc_arg
+			end
+
+		end
+
 		act ' Close the book':gt $loc, $loc_arg
 	end
 

+ 60 - 18
locations/family_schedule.qsrc

@@ -8,8 +8,9 @@ anyaloc = 0
 kolloc = 0
 
 !!---ANYA---------------------------------------
-!! sister_opr_indorf = 1 means Anya is in the village
-if sister_opr_indorf = 0:
+!! sister_indorf = 1 means Anya is in the village
+!! anyaloc['athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
+if sister_indorf = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
@@ -17,89 +18,130 @@ if sister_opr_indorf = 0:
 		elseif hour = 7 and minut < 15:
 			!!Family breakfast
 			anyaloc = 2
+			anyaloc['athome'] = 1
 		elseif hour = 7 and minut < 30:
 			!!Helping mom clean up
 			anyaloc = 3
+			anyaloc['athome'] = 1
 		elseif hour < 8:
-			!!In Bedroom
+			!!In Bedroom getting ready
 			anyaloc = 4
+			anyaloc['athome'] = 1
 		elseif hour = 8 and minut < 20:
 			!!Shower*
 			anyaloc = 5
+			anyaloc['athome'] = 1
+			if vanrPar_suction_dildo > 0:anyaQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour = 8 and minut < 30:
 			!!Walk to work
 			anyaloc = 6
+			anyaloc['athome'] = 0
 		elseif hour < 16:
 			!!Work
 			anyaloc = 7
+			anyaloc['athome'] = 0
 		elseif hour = 16 and minut < 10:
 			!!Walk home from work
 			anyaloc = 8
+			anyaloc['athome'] = 0
 		elseif hour < 18:
-			!!Personal activities: Relaxing in bedroom, working out at the community center, etc (this is also the time frame Roma comes over some times)
-			anyaloc = func('shortgs', 'rand_pick', '', 9, 10, 11)
+			if sisboyday + 1 = daystart:
+				!! Roma visiting
+				anyaloc = 11
+			else
+				!!Personal activities: Relaxing in bedroom 9, working out at the community center 10
+				anyaloc = func('shortgs', 'rand_pick', '', 9, 10)
+				if anyaloc = 9:
+					anyaloc['athome'] = 1
+				else
+					anyaloc['athome'] = 0
+				end
+			end
 		elseif sisboyday + 1 = daystart and hour = 18:
 			!!in bedroom with Roma
 			anyaloc = 25
 		elseif hour = 18 and minut < 30:
 			!!Family dinner
 			anyaloc = 12
+			anyaloc['athome'] = 1
 		elseif hour < 22:
-			!!Goes out to hang out with friends/Roma (this could be random so sometimes she stays home to give Sveta more time to talk to her)
+			!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
 			anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
+			if anyaloc = 15:anyaloc['athome'] = 1
 		else
 			!!In her room
 			anyaloc = 15
+			anyaloc['athome'] = 1
 		end
 	else
 		if week = 7 and hour < 2:
 			!!Goes to a party
 			anyaloc = 24
+			anyaloc['athome'] = 0
 		elseif week = 7 and hour = 2 and minut < 20:
 			!!In her room drunk after party
 			anyaloc = 26
+			anyaloc['athome'] = 0
 		elseif hour < 9:
 			!!Asleep
 			anyaloc = 1
 		elseif hour = 9 and minut < 20:
 			!!Eat something in kitchen
 			anyaloc = 16
+			anyaloc['athome'] = 1
 		elseif hour = 9 and minut < 40:
 			!!Shower*
 			anyaloc = 5
+			anyaloc['athome'] = 1
 		elseif hour < 10:
 			!!In Bedroom
 			anyaloc = 4
+			anyaloc['athome'] = 1
 		elseif hour < 16:
-			!!On nice days goes to the beach, sometimes goes to the city with friends, or stays at home watching tv or reading etc
-			anyaloc = rand(17,19)
+			if temp > 15 and sunWeather = 1:
+				!!On nice days goes to the beach
+				anyaloc = 17
+				anyaloc['athome'] = 0
+			else
+				!!Stays at home
+				anyaloc = 19
+				anyaloc['athome'] = 1
+			end
 		elseif hour = 16 and minut < 15:
 			!!Walk to community center
 			anyaloc = 20
+			anyaloc['athome'] = 0
 		elseif hour = 17 and minut < 45:
 			!!Works out at the community center
 			anyaloc = 21
+			anyaloc['athome'] = 0
 		elseif hour < 18:
 			!!Walk home
 			anyaloc = 22
+			anyaloc['athome'] = 0
 		elseif hour = 18 and minut < 30:
 			!!Family dinner
 			anyaloc = 12
+			anyaloc['athome'] = 1
 		elseif hour < 19:
 			if week = 7:
 				!!helps mom clean up after dinner
 				anyaloc = 23
+				anyaloc['athome'] = 1
 			else
 				!!Goes to a party
 				anyaloc = 24
+				anyaloc['athome'] = 0
 			end
 		else
 			if week = 7:
 				!!in her room 
 				anyaloc = 15
+				anyaloc['athome'] = 1
 			else
 				!!Goes to a party
 				anyaloc = 24
+				anyaloc['athome'] = 0
 			end
 		end
 	end
@@ -119,7 +161,7 @@ if indorf = 0:
 			!!shower
 			momloc = 2
 			momloc['athome'] = 1
-			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
+			if vanrPar_suction_dildo > 0:gs'mother_sextalk','discover_dildo'
 		elseif hour < 6 or (hour = 6 and minut < 10):
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
@@ -149,7 +191,7 @@ if indorf = 0:
 			!! Using the shower
 			momloc = 5
 			momloc['athome'] = 1
-			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
+			if vanrPar_suction_dildo > 0:gs'mother_sextalk','discover_dildo'
 		elseif hour < 16 and week < 5:
 			!!Working in the cafe. On Friday she stays until 18:00
 			momloc = 6
@@ -187,7 +229,7 @@ if indorf = 0:
 				!! (cleaning the bathroom, sweeping, mopping, dusting, watching TV, taking a bath, etc in different rooms)
 				momloc = momcleaning2
 				momloc['athome'] = 1
-				if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
+				if vanrPar_suction_dildo > 0:gs'mother_sextalk','discover_dildo'
 			end
 		elseif hour < 22:
 			if week = 1:
@@ -212,7 +254,7 @@ if indorf = 0:
 			!! Shower, if Sveta knocks she''ll ask to wake Kolka
 			momloc = 2
 			momloc['athome'] = 1
-			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
+			if vanrPar_suction_dildo > 0:gs'mother_sextalk','discover_dildo'
 		elseif hour < 6 or (hour = 6 and minut < 10):
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
@@ -233,16 +275,16 @@ if indorf = 0:
 				momloc[1] = 4
 				!! Clean up breakfast table
 			end
-		elseif hour = 11:
+		elseif hour < 11:
 			!!Cleaning random room in the house/laundry
 			!! cleaning kitchen only one in use atm
 			momloc = 23
 			momloc['athome'] = 1
 		elseif hour = 11 and minut < 30:
-			!! Takes the car to town
+			!! Takes the car to town/walks to church
 			momloc = 14
 			momloc['athome'] = 0
-		elseif hour < 12 or hour = 12 and minut < 30:
+		elseif hour < 12 or (hour = 12 and minut < 30):
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
 			momloc['athome'] = 0
 			if week = 5:
@@ -250,14 +292,14 @@ if indorf = 0:
 			else
 				momloc = 16
 			end
-		elseif hour = 13 and minut < 30 and week = 6:
+		elseif hour = 12 or (hour = 13 and minut < 30) and week = 6:
 			momloc = 16
 		elseif hour < 14:
 			!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
 			momloc = 15
 			momloc['athome'] = 0
 		elseif hour < 17:
-			!!Helping out Sergey/Luda, going to Kolka's games?
+			!!Helping out Sergey/Luda, going to Kolka''s games?
 			momloc = rand(14,15)
 			momloc['athome'] = 0
 		elseif hour < 18:
@@ -273,7 +315,7 @@ if indorf = 0:
 			momloc = 13
 			momloc['athome'] = 1
 		elseif hour < 21:
-			!!Says she goes to see her sister, in reality sometimes see's her sister of fucks around with different people. - Sunday goes to evening mass
+			!!Says she goes to see her sister, in reality sometimes see''s her sister of fucks around with different people. - Sunday goes to evening mass
 			momloc['athome'] = 0
 			if week = 5:
 				momloc = 17

+ 23 - 0
locations/fight_npcdata.qsrc

@@ -55,6 +55,7 @@ $setNPCFightStats = {
 	else
 		!String type Array
 		dynamic '$<<$NPCFS_Team>>_<<$NPCFS_Attrib>>[<<NPCFS_TeamSlot>>] = ''<<$NPCFS_Value>>'''
+		!'''' colour fix for editing program
 	end
 }
 
@@ -380,6 +381,28 @@ if $args[0] = 'bitch squad':
 	fightEnding = 16
 end
 
+if $args[0] = 'btatiana':
+	dynamic $setNPCFightStats, 'name', 'BTatiana'
+	dynamic $setNPCFightStats, 'image', 'images/characters/city/btatiana/ST1.jpg'
+	dynamic $setNPCFightStats, 'def', 55
+	dynamic $setNPCFightStats, 'run', 100
+	dynamic $setNPCFightStats, 'wrstlng', 1
+	dynamic $setNPCFightStats, 'kick', 25
+	dynamic $setNPCFightStats, 'punch', 25
+	dynamic $setNPCFightStats, 'jab', 25
+	dynamic $setNPCFightStats, 'stren', 5
+	dynamic $setNPCFightStats, 'agil', 75
+	dynamic $setNPCFightStats, 'vital', 75
+	dynamic $setNPCFightStats, 'react', 85
+	dynamic $setNPCFightStats, 'willpwr', 75
+	dynamic $setNPCFightStats, 'shoot', 75
+	dynamic $setNPCFightStats, 'magik', 1
+	dynamic $setNPCFightStats, 'mana', 100
+	dynamic $setNPCFightStats, 'spells', 'energo,dambonus,init'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
+	fightEnding = 17
+end
+
 
 
 

+ 2 - 2
locations/fit.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'dressing room':
 	end
 
 	act 'Exit the locker room':
-        if $clothingworntype ! 'nude' and $clothingworntype ! 'swimwear':
+        if $clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and city_sport >=10:
                 gt 'fit', 'FMR'
             else
@@ -148,7 +148,7 @@ if $ARGS[0] = 'dressing room':
 		gt 'wardrobe', 'start'
 	end
 
-	if $clothingworntype = 'swimwear':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		act 'Use the pool': gt 'bass', 'start'
 	else
 		act 'Change into swimwear': gt 'changingroom', 'view_swim_list'

+ 78 - 33
locations/foto.qsrc

@@ -16,21 +16,22 @@ if $ARGS[0] = 'start':
 
 	close all
 	$location_type = 'indoors'
-	if model = 0:gt'foto','studio'
+	if model['status'] = 0:gt'foto','studio'
 	*clr & cla
 
 	$menu_loc = 'foto'
 	$menu_arg = 'start'
 	menu_off = 0
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if studio_strip = 0:
 		'Apparently there''s a "dress code" here and all models are required to be naked in the studio, even if they never do nude shoots. Supposedly, it''s primarily to save time when dressing up and the wardrobe department has an easier time fitting the clothing properly if you''re already naked. And if it''s a nude shoot, it saves even more time because then you can walk right on set. Makes sense you suppose... Kinda...'
 	else
 		'Entering the studio, you head to the back room to strip down.'
 	end
-	special_model = rand(30,1400)
-	special_skill_model = rand(30,500)
+	special_model['status'] = rand(30,1400)
+	special_skill_model['status'] = rand(1,500)
+	foto['documentary'] = rand(1,100)
 	act'Strip down':
 		cla & *clr
 		menu_off = 1
@@ -146,8 +147,8 @@ if $ARGS[0] = 'studio':
 	killvar '$modelopt'
 
 	if special_model < min(city_modelling, 700) and modelfoto_topless > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
-	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
-
+	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and skill_model_event < daystart:gt 'foto_events','skill'
+	if foto['documentary'] >= 95 and $pantyworntype = 'none':gt'foto_model_documentary','1st_documentary'
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -182,12 +183,12 @@ if $ARGS[0] = 'studio':
 
 	'<center><b><font color="maroon">Photography studio</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-	if model = 0:
+	if model['status'] = 0:
 		'You step into a large warehouse. Scattered throughout, you see large lights brightening a myriad of sets designed to look like different rooms or locations. As you look farther inside, you spot people move between or on the sets. Among them are beautiful women, some wearing fancy dresses or expensive underwear, and shockingly, some of them are nude. Those that stand on sets are surrounded by crews of people wearing black with cameras and other equipment. Strangely, every single woman you see who is not on a set is completely naked.'
 		'It appears you are in some kind of photography studio. Just near the door you came in is a reception desk, out of place due to the fact that it simply sits in the middle of the room. A man sits behind it in the light of a desk lamp, doing something on a computer.'
 		*nl
 		'Farther along, you can see what appear to be <a href="exec:gt ''foto_albums'',''model_portraits''">photo albums</a> that sit on a shelf.'
-	elseif model = 1:
+	elseif model['status'] = 1:
 		'You step onto the main floor of the studio, standing amongst the various sets and photographers who are working those sets. Sitting by the door is a <a href="exec:gs ''shortgs'',''img msg'',''images/locations/city/citycenter/photo/dress_code.jpg''">sign</a> to remind models of the dress code.'
 		*nl
 		'Farther along are the studio''s collection of <a href="exec:gt ''foto_albums'',''model_portraits''">photo albums</a> of their top 10 models. '
@@ -216,9 +217,9 @@ if $ARGS[0] = 'studio':
 		else
 			if krystal_in = 1:'<a href="exec:gt ''foto_models'',''krystal1''">unknown model</a>'
 		end
-		
+
 		if day < 8 and week = 6 and hour >= 9 and hour < 16:'<a href="exec:gt ''foto_models2'',''anushka_1''">Anushka</a>'
-		
+
 		if mari >= 2:
 			if mari_in = 1:'<a href="exec:gt ''foto_models'',''mari_1''">Mari</a>'
 		else
@@ -261,7 +262,7 @@ if $ARGS[0] = 'studio':
 		act 'Leave': minut += 1 & gt 'city_center'
 	end
 
-	if model = 1:
+	if model['status'] = 1:
 		act 'Leave':
 			*clr & cla
 			menu_off = 1
@@ -280,19 +281,19 @@ if $ARGS[0] = 'studio':
 				act 'Leave': minut += 1 & gt 'city_center'
 			end
 		end
-	elseif model = 0:
+	elseif model['status'] = 0:
 		act 'Leave': minut += 1 & gt 'city_center'
 	end
 
 	if parkblackmail = 2: act 'Look around for the blackmailer':gt 'foto', 'blackm'
-	
-	if model = 0:
+
+	if model['status'] = 0:
 		act 'Ask about working as a glamor model':
 			cla & *clr
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'	
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			if vidage >= 40:
 				'You ask about working as a model, but the photographer says to you, "I''m sorry, but you look like a pretty mature woman, we need models with a more youthful appearance." This is his way of telling you that you look too old for this business.'
 			elseif pcs_skin < 40:
@@ -340,8 +341,13 @@ if $ARGS[0] = 'studio':
 					'He hands you back your fake passport, smiling.'
 					*nl
 					'"Welcome to Aphrodite."'
-					model = 1
-					modelyear = year
+					model['status'] = 1
+					if age < 18:
+						model['age'] = 18
+					else
+						model['age'] = age
+					end
+					model['start_year'] = year
 					act'Leave the studio':gt'city_center'
 					act'Head to the back':gt'foto','start'
 				end
@@ -410,8 +416,13 @@ if $ARGS[0] = 'studio':
 		*nl
 		'There is no way anyone is going to want to see pictures of you while your std is so obvious, you should see a doctor.'
 	end
-	if model = 1:act 'Go to the showers':gt'foto','showers'
-	if model = 1:act 'Go to your makeup station':gt'foto','makeup'
+	if model['status'] = 1:act 'Go to the showers':gt'foto','showers'
+	if model['status'] = 1:act 'Go to your makeup station':gt'foto','makeup'
+end
+
+if $ARGS[0] = 'model_profile':
+
+
 end
 
 if $ARGS[0] = 'gave_passport':
@@ -424,8 +435,13 @@ if $ARGS[0] = 'gave_passport':
 	'He hands you back your fake passport, smiling.'
 	*nl
 	'"Welcome to Aphrodite."'
-	model = 1
-	modelyear = year
+	model['status'] = 1
+	if age < 18:
+		model['age'] = 18
+	else
+		model['age'] = age
+	end
+	model['start_year'] = year
 	act'Leave the studio':gt'city_center'
 	act'Head to the back':gt'foto','start'
 end
@@ -434,7 +450,7 @@ if $ARGS[0] = 'interview':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-	if foto_anush_referral = 1:	'You walk up to the front desk and say Anushka send you. You only have to wait a few minutes before somebody arrives to interview you.' 
+	if foto_anush_referral = 1:	'You walk up to the front desk and say Anushka send you. You only have to wait a few minutes before somebody arrives to interview you.'
 	'"You want to work here? How old are you?"'
 	if age >= 18:
 		act'I''m <<age>>':
@@ -447,15 +463,15 @@ if $ARGS[0] = 'interview':
 		howoldareyou = 2
 		act 'Tell the truth':
 			age_truth = 1
-			gt'foto','interview2' 
+			gt'foto','interview2'
 		end
-		act 'Lie': 
+		act 'Lie':
 			age_lie = 1
 			gt'foto','interview2'
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'interview2':
 	cla & *clr
 	menu_off = 1
@@ -481,14 +497,14 @@ if $ARGS[0] = 'interview2':
 		'"I''m <<age>>."'
 		'"I see. Alright, undress. Let me take a look at you."'
 	end
-	
+
 	act'I can''t do it':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 		'Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
 		act 'Leave': minut += 1 & gt 'city_center'
 	end
-	
+
 	if undress_ask = 0:
 		act'What? Why?':
 			undress_ask = 1
@@ -614,7 +630,7 @@ if $ARGS[0] = 'job_decline':
 			gs 'stat'
 			act 'Leave': minut += 1 & gt 'city_center'
 		end
-		
+
 		act'React determinedly':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -651,6 +667,12 @@ if $ARGS[0] = 'job_offer':
 		act'Show him your passport':
 			cla
 			*nl
+			if age < 18:
+				model['age'] = 18
+			else
+				model['age'] = age
+			end
+			model['age'] = age
 			'He takes it and studies it for a moment, looking back and forth between you and the document. "Okay, that confirms you''re <<age>> and we''ll put you into the database later."'
 			'"When you''re ready, speak to a photographer about work. We work on freelance basis. For our lower level models or new hires like you, we can really only afford to pay you for two shoots a week, but you can still come in any time if you want to get some practice to work on your modelling skills. Those photos will be ours to keep and use, but it will help you to build your portfolio. If your popularity increases, we might have some special work and extra jobs for you so it''s not just twice a week."'
 			'He hands you back your passport, smiling.'
@@ -662,6 +684,7 @@ if $ARGS[0] = 'job_offer':
 		act'Show him your fake passport':
 			cla
 			*nl
+			model['age'] = 18
 			'He takes it and studies it for a moment, looking back and forth between you and the document and types your info onto a computer.'
 			'"When you''re ready, speak to a photographer about work. We work on freelance basis. For our lower level models or new hires like you, we can really only afford to pay you for two shoots a week, but you can still come in any time if you want to get some practice to work on your modelling skills. Those photos will be ours to keep and use, but it will help you to build your portfolio. If your popularity increases, we might have some special work and extra jobs for you so it''s not just twice a week."'
 			'He hands you back your fake passport, smiling.'
@@ -885,7 +908,28 @@ if $ARGS[0] = 'bathroom':
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-	act'Listen to the gossip':gt'foto_models','model_chatter'
+	if AlexandriaQW = 1:
+	    act'Listen to the gossip':
+	        *clr & cla
+			AlexandriaQW = 2
+			gs 'stat'
+	        '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
+            'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
+            '"Oh my god! You need to meet this girl! She is an incredible mass...massa...masse... Damn! She is good with her hands!"'
+            '"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
+            '"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
+            '"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
+            '"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
+            '"You mean the props room"?"'
+            'Okay, that''s a clue! Maybe you should search the props room?'
+            act'Continue':gt'foto','bathroom'
+        end
+    else
+	    act'Listen to the gossip':gt'foto_models','model_chatter'
+	end
+	if AlexandriaQW = 2:
+	    act'Search the props'' room':gt'tatiana_missions','mission2A'
+	end
 end
 
 if $ARGS[0] = 'showers':
@@ -902,7 +946,7 @@ if $ARGS[0] = 'showers':
 	'A little bit aways are bathroom stalls with a line of sinks and mirrors on the wall opposite as well as several tampon dispensers.'
 
 	act 'Go to the studio floor':gt'foto','studio'
-	
+
 	if shampoo > 0:
 		act 'Take a shower (0:15)':
 			cla
@@ -1108,6 +1152,7 @@ if $ARGS[0] = 'makeup':
 	*clr & cla
 	$locM = 'foto'
 	$locM_arg = 'makeup'
+	$loc_arg = 'makeup'
 	$menu_loc = 'foto'
 	$menu_arg = 'makeup'
 	menu_off = 0
@@ -1170,7 +1215,7 @@ if $ARGS[0] = 'practicemodel':
 	gs'stat'
 	*clr & cla
 	minut += 5
-	if model = 0:model = 1
+	if model['status'] = 0:model['status'] = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -1704,7 +1749,7 @@ if $ARGS[0] = 'practicemodel':
 					end
 				end
 			end
-			
+
 			act 'Transparent Lingerie':
 				cla
 				act 'Not for me':gt 'foto','studio'
@@ -1937,7 +1982,7 @@ if $ARGS[0] = 'practicemodel':
 								end
 							end
 						end
-					end	
+					end
 				else
 					act 'Practice (2:00)':
 						*clr & cla

+ 238 - 100
locations/foto_events.qsrc

@@ -4,30 +4,52 @@ menu_off = 1
 
 if $ARGS[0] = 'fame':
 	*clr & cla
+	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
+	:reroll_1
 	special_model = 2000
 	special_skill_model = 2000
 	fame_model_event = daystart
-	if first_fame_event < 1:gt'foto_events','topless1'
-	mdlng_fame_event = rand(1,3)
-	if mdlng_fame_event = 1:gt'foto_events','pool1'
-	if mdlng_fame_event = 2 and pcs_agil < 40:
-		gt'foto_events','pool1'
+	if first_fame_event < 1:
+		gt'foto_events','topless1'
+	else
+		mdlng_fame_event = rand(1,3)
+		if mdlng_fame_event = 1 and sunWeather = 1 and daystage < 3:
+			gt'foto_events','pool1'
+		elseif mdlng_fame_event = 2 and pcs_agil >= 40:
+			gt'foto_events','tennis'
+		elseif mdlng_fame_event = 2 and sunWeather = 1 and daystage < 3:
+			gt'foto_events','pool1'
+		elseif mdlng_fame_event = 3:
+			gt'foto_events2','champagne1'
+		else
+			jump 'reroll_1'
+		end
 	end
-	if mdlng_fame_event = 3:gt'foto_events2','champagne1'
-	if mdlng_fame_event = 2 and pcs_agil >= 40:gt'foto_events','tennis'
 end
 
 if $ARGS[0] = 'skill':
+	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
+	:reroll_2
 	special_model = 2000
 	special_skill_model = 2000
 	skill_model_event = daystart
 	*clr & cla
 	mdlng_skill_event = rand(1,5)
-	if mdlng_skill_event = 1:gt'foto_events','topless2'
-	if mdlng_skill_event = 2:gt'foto_events','beach2'
-	if mdlng_skill_event = 3:gt'foto_events','pool2'
-	if mdlng_skill_event = 4:gt'foto_events','runway2'
-	if mdlng_skill_event = 5:gt'foto_events','wet'
+	if mdlng_skill_event = 1 and sunWeather = 1 and daystage < 3:
+		gt'foto_events','topless2'
+	elseif mdlng_skill_event = 2 and sunWeather = 1 and daystage < 3:
+		gt'foto_events','beach2'
+	elseif mdlng_skill_event = 3 and sunWeather = 1 and daystage < 3:
+		gt'foto_events','pool2'
+!!	elseif mdlng_skill_event = 4:
+!!		gt'foto_events','runway1'
+	elseif mdlng_skill_event = 4 and daystage > 2:
+		gt'foto_events','runway2'
+	elseif mdlng_skill_event = 5:
+		gt'foto_events','wet'
+	else
+		jump 'reroll_2'
+	end
 end
 
 !!------------------------------------------------------------------- Special Events ------------------------------------------------------------------
@@ -394,45 +416,60 @@ if $ARGS[0] = 'fashion_persuasion':
 	elseif foto_persuade = 1:
 		'"You know, that offer to do a fashion shoot is still open you know. We really think you have what it takes! Want to give it a try?"'
 	end
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
 	
-	act'No thanks':
-		cla & *clr
-		foto_persuade = 1
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-		'"Thanks for the offer, but I think I''d be more comfortable just sticking to the catalogues for now."'
-		'"Oh. Okay..."'
-		'The manager seems disappointed by your answer.'
-		'"So clothing or swimsuits today?"'
-		act'Clothing':
-			modelfoto_catalog += 1
-			cla & *clr
-			mdlng_exp += rand(2,5)
-			minut += 120
-			money += 450
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
-			'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
-			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
-		end
-		act'Swimsuits':
-			modelfoto_catalog += 1
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
-			mdlng_exp += rand(2,5)
-			minut += 120
-			money += 450
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
-			bikinicatalog += 1
-			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
-			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
+			foto_persuade = 1
+			foto['suborn'] += 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, but I think I''d be more comfortable just sticking to the catalogues for now."'
+			'"Oh. Okay..."'
+			'The manager seems disappointed by your answer.'
+			'"So clothing or swimsuits today?"'
+			act'Clothing':
+				modelfoto_catalog += 1
+				cla & *clr
+				mdlng_exp += rand(2,5)
+				minut += 120
+				money += 450
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
+				'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
+				*nl
+				'You recieve 450 <b>₽</b> for the job.'
+				act 'Leave':gt 'foto', 'end'
+			end
+			act'Swimsuits':
+				modelfoto_catalog += 1
+				cla & *clr
+				mdlng_exp += rand(2,5)
+				minut += 120
+				money += 450
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
+				bikinicatalog += 1
+				'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
+				*nl
+				'You recieve 450 <b>₽</b> for the job.'
+				act 'Leave':gt 'foto', 'end'
+			end
 		end
+	else
+		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
 	act'Yes':
 		cla & *clr
 		foto_persuade = 2
+		foto['suborn'] = 0
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"That sounds really good actually! I''ll do it!"'
 		'The manager smiles wide at you.'
@@ -454,11 +491,20 @@ if $ARGS[0] = 'lingerie_persuasion':
 		'"We can do a fashion shoot today if you like, but the studio would still really love to see you do that lingerie shoot. What do you say?"'
 	end
 	
-	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
 	if will_cost <= pcs_willpwr:
 		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
 			foto_persuade = 1
+			foto['suborn'] += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, but I think I''ll keep on doing regular fashion shoots for now."'
 			'"Oh. Okay..."'
@@ -471,6 +517,7 @@ if $ARGS[0] = 'lingerie_persuasion':
 	if foto_persuade = 2 and pcs_inhib < 20:
 		act'I guess so':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess it turned out well last time..."'
 			'The manager smiles wide at you.'
@@ -481,6 +528,7 @@ if $ARGS[0] = 'lingerie_persuasion':
 		act'Yes':
 			cla & *clr
 			foto_persuade = 2
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! I''ll do it!"'
 			'The manager smiles wide at you.'
@@ -506,10 +554,19 @@ if $ARGS[0] = 'glamour_persuasion':
 	end
 	
 	if foto_persuade = 3:
-		gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+		if foto['suborn'] >= 5:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+		elseif foto['suborn'] >= 3:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+		elseif foto['suburn'] > 0:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+		else
+			will_cost = 0
+		end
 		if will_cost <= pcs_willpwr:
 			act'No thanks (<<will_cost>> Willpower)':
 				cla & *clr
+				foto['suborn'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"Thanks for the offer, but I think I''ll stick to the lingerie shoot today."'
 				'"Oh. Okay."'
@@ -522,6 +579,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			act'I guess I could try it...':
 				cla & *clr
 				foto_persuade = 2
+				foto['suborn'] = 0
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"I guess I could try it..."'
 				'"Great! Thank you so much <<$pcs_firstname>>! Just go to this set and we''ll set somebody up for you."'
@@ -530,6 +588,7 @@ if $ARGS[0] = 'glamour_persuasion':
 		else
 			act'Yes, I''m ready':
 				cla & *clr
+				foto['suborn'] = 0
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"You know what? Yeah, I think I''ll give it a try today. I think I''m ready."'
 				'The manager smiles wide at you.'
@@ -538,11 +597,20 @@ if $ARGS[0] = 'glamour_persuasion':
 			end
 		end
 	else
-		gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+		if foto['suborn'] >= 5:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+		elseif foto['suborn'] >= 3:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+		elseif foto['suburn'] > 0:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+		else
+			will_cost = 0
+		end
 		if will_cost <= pcs_willpwr:
 			act'No thanks (<<will_cost>> Willpower)':
 				cla & *clr
 				foto_persuade = 1
+				foto['suborn'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"Thanks for the offer, but I think I''ll stick to the lingerie shoot today."'
 				'"Oh. Okay..."'
@@ -570,6 +638,7 @@ if $ARGS[0] = 'glamour_persuasion':
 						act'No (<<will_cost>> Willpower)':
 							cla & *clr
 							foto_persuade = 3
+							foto['suborn'] += 1
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 							'"No, I''m not doing anything like that. I''m just going to stick to my lingerie shoot today."'
 							'"Oh, okay. That''s fine <<$pcs_firstname>>. Maybe another time."'
@@ -581,6 +650,7 @@ if $ARGS[0] = 'glamour_persuasion':
 					act'That''s not so bad...':
 						cla & *clr
 						foto_persuade = 4
+						foto['suborn'] = 0
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 						'"That''s not so bad I guess... I''m already doing lingerie so that''s not much of a difference."'
 						'"Yes, exactly! Think of it just like that. Thanks for this <<$pcs_firstname>>. Just go to this set and we''ll set somebody up for you."'
@@ -594,6 +664,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			if foto_persuade = 2 and pcs_inhib < 45:
 				act'I guess so':
 					cla & *clr
+					foto['suborn'] = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"Well... I guess it turned out well last time... I could give it a try..."'
 					'The manager smiles wide at you.'
@@ -604,6 +675,7 @@ if $ARGS[0] = 'glamour_persuasion':
 				act'I guess I could try it...':
 					cla & *clr
 					foto_persuade = 2
+					foto['suborn'] = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"I guess I could try it..."'
 					'"Great! Thank you so much <<$pcs_firstname>>! Just go to this set and we''ll set somebody up for you."'
@@ -612,6 +684,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			else
 				act'Yes':
 					cla & *clr
+					foto['suborn'] = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"That sounds really good actually! I''ll do it!"'
 					'The manager smiles wide at you.'
@@ -639,11 +712,20 @@ if $ARGS[0] = 'trans_persuasion':
 		'"Hey <<$pcs_firstname>>, the staff have been talking again. I know I asked before, but I was wondering if you might be more comfortable now. Is it possible that you might consider doing a transparent clothing shoot today instead of a basic glamour one? No pressure if not, but I just wanted to check and see if you''re ready."'
 	end
 	
-	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
 	if will_cost <= pcs_willpwr:
 		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
 			foto_persuade = 1
+			foto['suborn'] += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, but I think I''ll stick to the basic glamour shoot today."'
 			'"Oh. Okay..."'
@@ -656,6 +738,7 @@ if $ARGS[0] = 'trans_persuasion':
 	if foto_persuade > 1 and foto_persuade < 4 and pcs_inhib < 45:
 		act'I guess so':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess it turned out well last time..."'
 			'The manager smiles wide at you.'
@@ -666,6 +749,7 @@ if $ARGS[0] = 'trans_persuasion':
 	elseif foto_persuade = 1 or foto_persuade = 4:
 		act'I guess I could try':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess I could give it a try..."'
 			'The manager smiles wide at you.'
@@ -676,6 +760,7 @@ if $ARGS[0] = 'trans_persuasion':
 		
 		act'Yes, I''m ready':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? I think I <i>am</i> ready. I''ll give it a try."'
 			'The manager smiles wide at you.'
@@ -686,6 +771,7 @@ if $ARGS[0] = 'trans_persuasion':
 	else
 		act'Yes':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! I''ll do it!"'
 			'The manager smiles wide at you.'
@@ -708,11 +794,20 @@ if $ARGS[0] = 'topless_persuasion':
 		'"Hey <<$pcs_firstname>>, you seem to be doing really well with the transparent shoots, just like we thought. I know that initially took some convincing, but we got here didn''t we? Now, I was wondering if you''d like to try go a step further just like before and take the whole top off? You''ve never done a topless shoot and it isn''t much different from what we''re doing now. Our rates for topless shoots are better and you''ll get a lot more exposure than what you''re doing now. Want to try it?"'
 	end
 	
-	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
 	if will_cost <= pcs_willpwr:
 		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
 			foto_persuade = 1
+			foto['suborn'] += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
@@ -729,6 +824,7 @@ if $ARGS[0] = 'topless_persuasion':
 	if foto_persuade = 2 and pcs_inhib < 50:
 		act'I guess so':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess you''re right, it isn''t that much different. I suppose I can give it a shot..."'
 			'The manager smiles wide at you.'
@@ -739,6 +835,7 @@ if $ARGS[0] = 'topless_persuasion':
 	elseif foto_persuade = 1:
 		act'Yes, I''m ready':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? Yeah, I think I''ll give it a try today. I think I <i>am</i> ready!"'
 			'The manager smiles wide at you.'
@@ -749,6 +846,7 @@ if $ARGS[0] = 'topless_persuasion':
 	else
 		act'Yes':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! Let''s do it!"'
 			'The manager smiles wide at you.'
@@ -771,11 +869,20 @@ if $ARGS[0] = 'nude_persuasion':
 		'"Hey <<$pcs_firstname>>, I''ve got a new offer from the studio for you. They''ve really loved your willingness to try new things like with the past shoots and all and they wanted to know if you would like to step it up to the final level. Would you be willing to do a full frontal nude shoot with us? As a special bonus, the studio said they''re willing to double your pay for your full debut. I have to say, this is a great offer. What do you think of it?"'
 	end
 	
-	gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
 	if will_cost <= pcs_willpwr:
 		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
 			foto_persuade = 1
+			foto['suborn'] += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, that''s really kind, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
@@ -794,6 +901,7 @@ if $ARGS[0] = 'nude_persuasion':
 	if foto_persuade = 2 and pcs_inhib < 60:
 		act'Wow! I... I guess I''ll take it':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Wow! That''s a really amazing offer! I mean... well to be honest, I''m not sure if I''m ready for that but... I guess, I''ll do it if the studio really believes in me so much."'
 			'The manager smiles wide at you.'
@@ -802,9 +910,11 @@ if $ARGS[0] = 'nude_persuasion':
 			foto_persuade = 5
 			act'Do the nude shoot':gt'foto_shoot','nude'
 		end
-	elseif foto_persuade = 1 and pcs_inhib < 60:
+	end
+	if foto_persuade = 1 and pcs_inhib < 60:
 		act'Well... I guess':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well..." You mull it over a little bit more, still unsure of yourself. "I mean, I... I guess I can give it a try."'
 			'The manager smiles wide at you. "Thank you so much for your courage <<$pcs_firstname>>."'
@@ -816,22 +926,23 @@ if $ARGS[0] = 'nude_persuasion':
 	elseif foto_persuade = 1:
 		act'Yes, I''m ready':
 			cla & *clr
+			foto['suborn'] = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? I think I''m ready to do it today! I''ll do the nude shoot," you say, smiling. "And I''ll take the bonus."'
 			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
 			foto_persuade = 5
 			act'Do the nude shoot':gt'foto_shoot','nude'
 		end
-	else
-		act'Wow! Yes!':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"Wow! That''s a really amazing offer! That''s so generous! Yes! I''ll absolutely do it!"'
-			'The manager smiles wide at you.'
-			'"Great! Then go to this set here and the photographer will be ready for you."'
-			foto_persuade = 5
-			act'Do the nude shoot':gt'foto_shoot','nude'
-		end
+	end
+	act'Wow! Yes!':
+		cla & *clr
+		foto['suborn'] = 0
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Wow! That''s a really amazing offer! That''s so generous! Yes! I''ll absolutely do it!"'
+		'The manager smiles wide at you.'
+		'"Great! Then go to this set here and the photographer will be ready for you."'
+		foto_persuade = 5
+		act'Do the nude shoot':gt'foto_shoot','nude'
 	end
 end
 
@@ -876,7 +987,7 @@ if $ARGS[0] = 'list':
 		'You wave goodbye as you walk back to the main floor.'
 		act'Go back to the main floor':gt'foto','studio'
 	end
-	if specialjob1 >= 95:'<a href="exec:gt ''foto_events'',''high_fasion''">	High Fashion</a>'
+	if specialjob1 >= 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
 	if specialjob2 >= 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
 	if specialjob3 >= 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
 	if specialjob4 >= 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
@@ -889,7 +1000,7 @@ if $ARGS[0] = 'list':
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end
 
-if $ARGS[0] = 'high_fasion':
+if $ARGS[0] = 'high_fashion':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"High fashion?" you ask. "What''s this one about?"'
@@ -1320,19 +1431,7 @@ if $ARGS[0] = 'designer_wedding':
 	end
 end
 
-!!if $ARGS[0] = 'documentary':
-!!	cla & *clr
-!!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-!!	'"Documentary?" you ask. "What do you mean documentary? What''s this about?"'
-!!	'"It''s not a modelling job, but someone''s going around asking about life as a model and in the industry. They want to interview some of the models here. Point a camera at them, ask them a few questions, put it on the internet and stuff. The pay is about that of a standard nude shoot but it''s also likely to increase your profile more than the average nude shoot, how many people who''ve seen your face, know your name. Could be good for increasing your reputation or popularity."'
-!!	'"Hmmm..."'
-!!	act'Back to the list':gt'foto_events','list'
-!!	act'I''d like to do this one':
-!!		cla
-!!		*nl
-!!		specialjob7 = 0
-!!
-!!end
+
 
 
 
@@ -1414,7 +1513,7 @@ end
 if $ARGS[0] = 'topless1.1':
 	*clr & cla
 	pcs_hairbsh = 1
-	pcs_makeup = 2
+	pcs_makeup = 5
 	pcs_lipbalm += 8
 	gs 'underwear', 'wear'
 	gs 'stat'
@@ -1551,7 +1650,7 @@ if $ARGS[0] = 'pool1':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
-					pcs_makeup = 2
+					pcs_makeup = 5
 					pcs_lipbalm += 8
 					'You go over to your station and touch up your makeup, make sure it''s perfect. You see a few of the other girls who are participating in the shoot doing the same. Soon, everyone is ready and you all pile into a shuttle and drive to the shooting location.'
 					'As promised, as soon as you all arrive, they''re ready to start.'
@@ -1652,7 +1751,7 @@ if $ARGS[0] = 'tennis':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
-					pcs_makeup = 2
+					pcs_makeup = 5
 					pcs_lipbalm += 8
 					'You go over to your station and see what they left for you. You see sneakers and a skirt, a visor and a sweat band, and a racket. There is a noticable lack of top or underwear. They didn''t tell you this was going to be a topless shoot, but you guess you shouldn''t be that surprised.'
 					'You pull up the skirt and put on your makeup before heading over to the set.'
@@ -1700,8 +1799,7 @@ if $ARGS[0] = 'topless2':
 		act'"What''s up?"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"You''ve been doing well around here lately. We were going to do a sunny penthouse topless pool shoot off site. Wanted to know if you wanted to be our girl and get paid for an job this week? It''ll take an extra hour though so if you''re busy we can always grab one of the other girls. How ''bout it? You want in?"'
-			
+			'"Are you free right now? We were going to do a sunny penthouse topless pool shoot off site but one of the girls who was scheduled for it cancelled on us. Wanted to know if you wanted to take her place? It''ll be about 3 hours. You want in?"'
 			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
 				act'"No thanks" (<<will_cost>> Willpower)':
@@ -1728,7 +1826,7 @@ if $ARGS[0] = 'topless2':
 					*clr & cla
 					minut += 30
 					pcs_hairbsh = 1
-					pcs_makeup = 2
+					pcs_makeup = 5
 					pcs_lipbalm += 8
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					'You head over to your makeup station to get yourself sorted out before getting changed and jumping in the van with the rest of the crew.'
@@ -1775,8 +1873,7 @@ if $ARGS[0] = 'beach2':
 		act'"What''s up?"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"Hey <<$pcs_firstname>>, Looking to get an extra job in this week? We were planning on doing a topless beach shoot today. It''s a five hour job if you include the travel time but we''ll pay you extra on top of what you''d normally get as a bit of compensation. So, do you want it?'
-
+			'"Hey <<$pcs_firstname>>, we''re looking for girls to do a topless beach shoot today. It''s a five hour job if you include the travel time but we''ll pay you extra on top of what you''d normally get as a bit of compensation. So, do you want it?"'
 			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
 				act'"No thanks" (<<will_cost>> Willpower)':
@@ -1803,7 +1900,7 @@ if $ARGS[0] = 'beach2':
 					*clr & cla
 					minut += 30
 					pcs_hairbsh = 1
-					pcs_makeup = 2
+					pcs_makeup = 5
 					pcs_lipbalm += 8
 					gs 'underwear', 'wear'
 					gs 'stat'
@@ -1860,7 +1957,7 @@ if $ARGS[0] = 'pool2':
 		act'"What''s up?"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"Hey <<$pcs_firstname>>, we were thinking about doing a topless pool shoot. It''s offsite so it''ll be an extra hour or two but it''s also an extra payday if you want it. So? Do you want it?'
+			'"Hey <<$pcs_firstname>>, we were thinking about doing a topless pool shoot. It''s offsite so it''ll be an extra hour or two but it''s also an extra payday if you want it. So? Do you want it?"'
 
 			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -1882,7 +1979,7 @@ if $ARGS[0] = 'pool2':
 			act'"Sure"':
 				*clr & cla
 				pcs_hairbsh = 1
-				pcs_makeup = 2
+				pcs_makeup = 5
 				pcs_lipbalm += 8
 				minut += 30
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
@@ -1917,6 +2014,21 @@ if $ARGS[0] = 'pool2':
 	end
 end
 
+if $ARGS[0] = 'runway1':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	'"<<$pcs_firstname>>!"'
+	'As you walk out of the changing room you hear someone call your name.'
+	act'Turn around':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'As you turn you see a photographer running towards you, waving you over. You walk over to talk to him.'
+		act'"What''s up?"':
+			*clr & cla
+			
+		end
+	end
+end
+
 
 if $ARGS[0] = 'runway2':
 	*clr & cla
@@ -1933,7 +2045,6 @@ if $ARGS[0] = 'runway2':
 			'Hey <<$pcs_firstname>>, listen. We have an emergency situation and we''re looking for whoever is available. A clothing studio we sometimes shoot for is having a fashion show tonight but for some reason something''s gone wrong and they''re missing models."'
 			'"Missing models?" you gasp. "You mean like they''ve disappeared or something?"'
 			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until 22:00 tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
-
 			gs 'willpower', 'exhib', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act'"I''m sorry, I can''t be out that late" (<<will_cost>> Willpower)':
@@ -1977,7 +2088,7 @@ if $ARGS[0] = 'runway2':
 				act'Continue':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/runway_waiting.mp4"></video></center>'
-					'Eventually the photographer succeeds in rounding up as many models including one really new girl who looks like it might have been her first day here when the photographer found her. You''re all sat down on a line of chairs and told to wait for the studio to do your makeup and wardrobe.'
+					'Eventually the photographer succeeds in rounding up as many models including girl who looks like it might have been her first day here when the photographer found her. You''re all sat down on a line of chairs and told to wait for the studio to do your makeup and wardrobe.'
 					act'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
@@ -1988,27 +2099,54 @@ if $ARGS[0] = 'runway2':
 						'The runway crew shows up and immediately moves you to the makeup station to get your hair and everything done. They really shovel it on for this. A bit different to the subtle makeup you normally put on for modelling.'
 						'They put you into the clothes that they''ve decided you''re going to be modelling and you wait for the show to begin.'
 						act'Continue':
-							hour = 20
-							modelpayfin = 6000 + (modelpay * 3) + (50*rand(0,7))
-							city_modelling += 30
-							pav_modelling += rand(0,city_modelling)/5
+							hour += 1
+							modelpayfin = 500 + (city_modelling * 10) + (modelpay * 3) + (50*rand(0,7))
+							city_modelling += rand(10,30)
+							pav_modelling += rand(0,city_modelling)/8
 							mdlng_exp += rand(8,10)
 							modelfoto_nip += 1
+							gs'stat'
 							*clr & cla
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/skill_runway.mp4"></video></center>'
-							'As soon as they send you down the runway you realize something''s gone wrong. The loose cleavage of the dress you''re wearing is too loose. With the kind of purposeful steps you''re taking and your breasts jiggling underneath, the fabric falls to the sides and your breasts are left completely exposed. You try your best to recover but the dress is just too loose and skimpy and no matter what you do your breasts end up coming loose.'
-							'With nothing left to it and not wanting to make a big deal out of it and ruin the show, you put on your best model smile and just get through the rest of your walk.'
+							model['runway_outfit'] = rand(1,5)
+							if model['runway_outfit'] = 1:
+								'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/runway/1.mp4"></video></center>'
+								'As soon as they send you down the runway you realize something''s gone wrong. The loose cleavage of the dress you''re wearing is <i>too</i> loose. With the kind of purposeful steps you''re taking and your breasts jiggling underneath, the fabric falls to the sides and your breasts are left completely exposed. You try your best to recover but the dress is just too loose and skimpy and no matter what you do your breasts end up coming loose.'
+								'With nothing left to it and not wanting to make a big deal out of it and ruin the show, you put on your best model smile and just get through the rest of your walk.'
+							elseif model['runway_outfit'] = 2:
+								'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/runway/2.mp4"></video></center>'
+								'One of the problems with being a model is that you don''t get to actually choose the clothing you''re going to wear.'
+								*nl
+								'In this case, it''s really nothing more than panties with a backless and transparent mesh top that completely exposes your breasts. You aren''t sure what the intention of the designer was, but you know that modesty wasn''t part of it. But you smile and show off the outfit and your body anyways, posing briefly before walking back.'
+							elseif model['runway_outfit'] = 3:
+								'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/runway/3.mp4"></video></center>'
+								'The outfit you''re dressed in is a leopard print jumpsuit will bellbottoms. The outrageous pattern aside, it doesn''t show much skin and as a result, you find it easy to work your body to show off the outfit instead of your own assets. With a smile, a pose, and a wink, you get it done and begin your walk back.'
+							elseif model['runway_outfit'] = 4:
+								'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/runway/4.mp4"></video></center>'
+								if tits >= 3:
+									'As you walk forward, you can''t help but wonder if the girl this outfit was designed for a girl with small breasts. It''s tight around your chest and you can feel it riding up with every step. In the short the time it takes you to get to the end of the runway, the top has risen so much that your nipples are just barely still hidden by its hem. Within a few steps on the way back you need to pull it back in place. But at least once the walk is finished you''ll finally be able to let your sweater puppies free.'
+								elseif tits >= 2:
+									'As you walk forward, you can''t help but wonder if the girl this outfit was designed for a girl with smaller breasts than you. Or maybe even a girl who is completely flat. Even around your humble bosom, you can feel the material straining against your chest and it rides up with every step you take forward. In the short the time it takes you to get to the end of the runway, the top has risen so much that your nipples are just barely still hidden by its hem. Within a few steps on the way back you need to pull it back in place. But at least once the walk is finished you''ll finally be able to take this thing off and breathe normally again.'
+								else
+									'As you walk forward, you can''t help but wonder what idiot designed this outfit. Even with your virtually flat chest, your body strains against the material. You can feel it riding up with every step you take forward. In the short the time it takes you to get to the end of the runway, the top has risen so much that your nipples are just barely still hidden by its hem. Within a few steps on the way back you need to pull it back in place. But at least once the walk is finished you''ll finally be able to take this thing off and breathe normally again.'
+								end
+							elseif model['runway_outfit'] = 5:
+								'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/runway/5.mp4"></video></center>'
+								'The outfit you''re placed in really has you wondering again if fashion is really about art and style or if it''s just about putting women in exposed situations.'
+								*nl
+								'It''s hard not to wonder when the outfit is nothing more than a pink swimsuit bottom with wide overall type straps that only exist to cover up your nipples.'
+							end
 							act'Continue':
 								*clr & cla
-								hour = 22
+								hour += 1
 								money += modelpayfin
 								modelfotomoney += modelpayfin
+								gs'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 								if StoryLine = 1 and age < 18:
-									'Two hours later, the show is over and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Your fame has almost certainly increased by a large margin thanks to your professional composure during the wardrobe malfunction and that''s great. But at the same time, this kind of thing has the tendency to circle around and you <i>really</i> hope nobody in Pavlovsky hears about this...'
+									'Another hour later, the show is over, the clothes are taken back, and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Working the runway isn''t too bad. But at the same time, this kind of thing has the tendency to circle around and you <i>really</i> hope nobody in Pavlovsk hears about this...'
 									act'Back in the studio':gt'foto','studio'
 								else
-									'Two hours later, the show is over and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Your fame has almost certainly increased by a large margin thanks to your professional composure. You''re proud of yourself that you held it together like that and you''re excited to see what opportunities this added fame might bring.'
+									'Another hour later, the show is over and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Working the runway isn''t too bad.'
 									act'Back in the studio':gt'foto','studio'
 								end
 							end
@@ -2065,14 +2203,14 @@ if $ARGS[0] = 'wet':
 						*clr & cla
 						minut += 120
 						pcs_hairbsh = 1
-						pcs_makeup = 2
+						pcs_makeup = 5
 						pcs_lipbalm += 8
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet.mp4"></video></center>'
 						'You put on your makeup and follow him over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 						'He wasn''t kidding! That water is cold!'
 						act'Continue':
 							cla
-							modelpayfin = 3000 + (modelpay * 2) + (50*rand(0,7))
+							modelpayfin = 1000 + (modelpay * 2) + (50*rand(0,7))
 							modelfoto_nip += 1
 							modelfoto_topless += 1
 							modelfoto_nude += 1

+ 1176 - 0
locations/foto_model_documentary.qsrc

@@ -0,0 +1,1176 @@
+# foto_model_documentary
+
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------- First Time Model Documentary ---------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+if $ARGS[0] = '1st_documentary':
+	if foto['1st_documentary'] = 1:gt'foto_events2','2nd_documentary'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'You step out of the locker room and almost run head first into one of the managers.'
+	'"Woah!" you say, jumping back. "What are you doing going into the girls locker room?"'
+	'"Oh <<$pcs_firstname>>, glad I caught you before you wandered off somewhere else in the studio. I was just going to see if anyone else showed up today. We''re looking for volunteers to participate in some interviews for a documentary."'
+	'"Documentary?" you ask. "What about?"'
+	'"There''s some people here today who are making a film about models, their lives, and about working here. They want to capture girls working here in their usual working environment so you wouldn''t dressing up or anything, just interviewed as in the studio approved dress code."'
+	*nl
+	'<i>You mean naked...</i> you think to yourself.'
+	*nl
+	'"They''re paying the equivalent of a two hour nude shoot for every model that participates. Do you want in?"'
+	
+	if modelfoto_nip < 1:
+		act'No way! I''ve never been naked on camera before!':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"No way! I''ve never been naked on camera before!"'
+			'"Oh, yeah that''s right. Sure you don''t want this to be your first time?"'
+			'"They''re doing them right now and they said it will only take a few minutes. Might be good for your profile. People are always more interested when they see the personality behind a pretty face. It could give your popularity as a model a big boost."'
+
+			if pcs_inhib < 30:
+				gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+			elseif pcs_inhib < 45:
+				gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+			elseif pcs_inhib < 60:
+				gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+			else
+				will_cost = 0
+			end
+			if will_cost <= pcs_willpwr:
+				act'Still no':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"Ehhh, still no."'
+					'"Alright, that''s fine. I just wanted to double check."'
+					'With that, he pays you no more mind and ducks past into the locker room, presumably to ask other girls who are in there if they want to participate.'
+					act'Go to the set':gt'foto','studio'
+				end
+			else
+				act 'Still no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			
+			act'I guess I could...':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"I guess I could... If it''s really that good for my profile..."'
+				'"Alright! Just go over to set <<rand(1,50)>> and tell a production assistant you''re one of the volunteers. They''re set up in there for the day." He points you in the direction of the right set and ducks into the locker room, presumably to ask other girls who are in there if they want to participate.'
+				act'Go to the set':gt'foto_model_documentary','documentary_1'
+			end
+		end
+	end
+	
+	act'No thanks, not interested':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Ehh, no thanks. The pay sounds nice, but I''m just not interested."'
+		'"You sure? They''re doing them right now and they said it will only take a few minutes. Might be good for your profile. People are always more interested when they see the personality behind a pretty face. It could give your popularity as a model a big boost."'
+		if pcs_inhib < 30:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+		elseif pcs_inhib < 45:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+		elseif pcs_inhib < 60:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+		else
+			will_cost = 0
+		end
+		if will_cost <= pcs_willpwr:
+			act'Still no':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"Ehhh, still no."'
+				'"Alright, that''s fine. I just wanted to double check. Not like it''s the agency is the one paying anything," he laughs, ducking into the locker room, presumably to ask other girls who are in there if they want to participate.'
+				act'Go to the set':gt'foto','studio'
+			end
+		else
+			act 'Still no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		act'I guess I could...':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"I guess I could... If it''s really that good for my profile..."'
+			'"Alright! Just go over to set <<rand(1,50)>> and tell a production assistant you''re one of the volunteers. They''re set up in there for the day." He points you in the direction of the right set and ducks into the locker room, presumably to ask other girls who are in there if they want to participate.'
+			act'Go to the set':gt'foto_model_documentary','documentary_1'
+		end
+	end
+	
+	act'No thanks, I''m here to model':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Ehh, no thanks. I''m here to model, not do interviews."'
+		'"You sure? They''re doing them right now and they said it will only take a few minutes. Might be good for your profile. People are always more interested when they see the personality behind a pretty face. Exposure is important for a model too."'
+		if pcs_inhib < 30:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+		elseif pcs_inhib < 45:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+		elseif pcs_inhib < 60:
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+		else
+			will_cost = 0
+		end
+		if will_cost <= pcs_willpwr:
+			act'Still no':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"Ehhh, still no."'
+				'"Alright, that''s fine. I just wanted to double check. Not like it''s the agency is the one paying anything," he laughs, ducking into the locker room, presumably to ask other girls who are in there if they want to participate.'
+				act'Go to the set':gt'foto','studio'
+			end
+		else
+			act 'Still no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		act'I guess I could...':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"I guess I could... If you really think it''ll help my career."'
+			'"Alright! Just go over to set <<rand(1,50)>> and tell a production assistant you''re one of the volunteers. They''re set up in there for the day." He points you in the direction of the right set and ducks into the locker room, presumably to ask other girls who are in there if they want to participate.'
+			act'Go to the set':gt'foto_model_documentary','documentary_1'
+		end
+	end
+
+!!	if storyline = 1 and age < 18:
+!!		act'No thanks (don''t want people to find out)':
+!!			cla & *clr
+!!			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+!!			'"Ehh, no thanks. I''m here to model, not do interviews."'
+!!		end
+!!	end
+	
+	act'Sure, I''ll take part':
+		cla
+		*nl
+		specialjob7 = 0
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Sure, I''ll take part," you say.'
+		'"Alright, just go over to set <<rand(1,50)>> and tell a production assistant you''re one of the volunteers. They''re set up in there for the day."'
+		act'Go to the set':gt'foto_model_documentary','documentary_1'
+	end
+end
+
+if $ARGS[0] = 'documentary_1':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	'You head over to where you were directed and see a group of people standing around several video cameras set up with lights shining on an empty set.'
+	'Walking over to them you say, "Hi, I''m one of the models who volunteered to be interviewed. Is this the right place?"'
+	'"Sure is," a woman with a notepad says. "We just got done with the last girl, why don''t you just jump in now."'
+	act'Stand on set':
+		minut += rand(2,4)
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+		'They put you in the middle of the set and spend a few minutes getting the lighting right and fiddling with camera settings. Then the woman who spoke to you before calls out to you.'
+		'"Okay, we''re all set. Ready?"'
+		'You nod.'
+		'"Okay, first question then. What''s your name, how old are you, and what is your job?"'
+		act'I''m <<$pcs_firstname>>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			if age >= 18:
+				if modelfoto_erotic > 0:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m an erotic model at Aphrodite photography."'
+				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m an artistic nude model at Aphrodite photography."'
+				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a fitness model at Aphrodite photography."'
+				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a glamour model at Aphrodite photography."'						
+				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a lingerie model at Aphrodite photography."'						
+				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a fashion model at Aphrodite photography."'
+				else
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a catalog model at Aphrodite photography."'
+				end
+			else
+				if modelfoto_erotic > 0:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m an erotic model at Aphrodite photography."'
+				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m an artistic nude model at Aphrodite photography."'
+				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a fitness model at Aphrodite photography."'
+				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a glamour model at Aphrodite photography."'
+				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a lingerie model at Aphrodite photography."'
+				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a fashion model at Aphrodite photography."'
+				elseif modelfoto_catalog > 0:
+					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a catalog model at Aphrodite photography."'
+				end
+			end
+			*nl
+			gs 'foto_model_documentary','documentary_2'
+		end
+		
+		act'I''m <<$pcs_nickname>>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			if age >= 18:
+				if modelfoto_erotic > 0:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m an erotic model at Aphrodite photography."'
+				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m an artistic nude model at Aphrodite photography."'
+				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a fitness model at Aphrodite photography."'
+				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a glamour model at Aphrodite photography."'
+				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a lingerie model at Aphrodite photography."'
+				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a fashion model at Aphrodite photography."'
+				elseif modelfoto_catalog > modelfoto_fashion and modelfoto_catalog > modelfoto_fitness and modelfoto_catalog > modelfoto_glamour and modelfoto_catalog > modelfoto_lingerie:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a catalog model at Aphrodite photography."'
+				else
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a model at Aphrodite photography."'
+				end
+			else
+				if modelfoto_erotic > 0:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m an erotic model at Aphrodite photography."'
+				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m an artistic nude model at Aphrodite photography."'
+				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a fitness model at Aphrodite photography."'
+				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a glamour model at Aphrodite photography."'
+				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a lingerie model at Aphrodite photography."'
+				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a fashion model at Aphrodite photography."'
+				elseif modelfoto_catalog > modelfoto_fashion and modelfoto_catalog > modelfoto_fitness and modelfoto_catalog > modelfoto_glamour and modelfoto_catalog > modelfoto_lingerie:
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a catalog model at Aphrodite photography."'
+				else
+					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a model at Aphrodite photography."'
+				end
+			end
+			*nl
+			gs 'foto_model_documentary','documentary_2'
+		end
+	end
+end
+
+if $ARGS[0] = 'documentary_2':
+	minut += 2
+	gs 'stat'
+	'"Why did you decide to become a model?"'
+	act'I thought it seemed fun':
+		foto_documentary['question_2'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I just thought it seemed like fun," you giggle. "You know, dressing up in clothes, striking poses, people taking pictures. It sounded interesting, so I thought I''d give it a try."'
+		'"No big special reason, just wanted to enjoy yourself?"'
+		'"Pretty much, yeah."'
+		*nl
+		gs 'foto_model_documentary','documentary_3'
+	end
+	
+	act'I''ve always wanted to be a model':
+		foto_documentary['question_2'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/9.mp4"></video></center>'
+		'"I think I actually always wanted to be a model," you say. "It seemed... glamorous. You see supermodels in the magazines you read when you''re growing up and you see how beautiful they look and the clothes they''re wearing and you just kinda naturally wish you were them. Then you grow up a little more and you see they''re wealthy, and they''re famous, and that they''ve practically got it all! Who wouldn''t want to be one?"'
+		'"So you would say that this was sort of your dream job?"'
+		'"Yeah, I''d say that."'
+		*nl
+		gs 'foto_model_documentary','documentary_3'
+	end
+	
+	act'I just wanted some extra cash':
+		foto_documentary['question_2'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"To be honest, I''m really just here to make some money," you say. "It doesn''t take up too much time per week and the pay''s pretty good, so it''s a pretty easy way of getting some extra cash in your pocket."'
+		'"Ahh, so you aren''t that passionate about modelling, it''s just something you do to get by, is that right?"'
+		'"Well, more like I wanted to be able to buy nice things."'
+		'You laugh and the interviewer laughs with you.'
+		*nl
+		gs 'foto_model_documentary','documentary_3'
+	end
+	
+	act'I was desperate and needed money':
+		foto_documentary['question_2'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/11.mp4"></video></center>'
+		'"To be honest, I was really desperate and needed the money," you say. "I was seriously in need at the time so it didn''t really matter what I did, I just needed fast cash. I heard about this place and that they paid well depending on the kind of work you did so I signed up."'
+		'"Ahh, so you aren''t that passionate about modelling, it''s just something you do to get by, is that right?"'
+		'"Yeah, pretty much that."'
+		*nl
+		gs 'foto_model_documentary','documentary_3'
+	end
+	
+	act'I love attention':
+		foto_documentary['question_2'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I love the attention!" you smile. "I like it when people notice me. Maybe I''m a little narcissistic but it''s thrilling for me to see my own face on the cover of a magazine or to hear people talking about me. I just like being seen."'
+		'"So you became a model because you''re an attention seeker?"'
+		'"Exactly!"'
+		*nl
+		gs 'foto_model_documentary','documentary_3'
+	end
+	if Exhibitionist_lvl > 0:
+		act'It turns me on':
+			foto_documentary['question_2'] = 6
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"Because it turns me on!"'
+			'The inteviewer pauses for a moment.'
+			'"Because it... turns you on?" she asks, seemingly a little surprised at your response.'
+			'"Yeah," you grin. "Knowing that other people are out there looking at my naked body is just... <i>exciting!</i> They could be jerking off to pictures of me right now. I get wet just thinking about it!"'
+			'"Ahh. I see." She clears her throat.'
+			*nl
+			gs 'foto_model_documentary','documentary_3'
+		end
+	end
+end
+
+if $ARGS[0] = 'documentary_3':
+	minut += 2
+	gs 'stat'
+	'"So, would you say that this is something you''re actively pursuing as a career? Why or why not?"'
+	act'This is just temporary':
+		foto_documentary['question_3'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/11.mp4"></video></center>'
+		'"I don''t think so," you say. "It''s been good working here but I don''t think I could ever make a career out of it. It''s just not what I want out of life, you know?"'
+		'The interviewer nods understandingly.'
+		*nl
+		gs 'foto_model_documentary','documentary_4'
+	end
+	
+	act'I want to be the number one model in the city':
+		foto_documentary['question_3'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"I want to be the number one model in the city," you say confidently.'
+		'"Wow! High reaching goals huh? Just about the prestige or is personal achivement?"'
+		act'Prestige':
+			foto_documentary['question_3.2'] = 1
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			'"Prestige. I want this to be the thing that I''m known for decades from now."'
+			'"You want your own Wankepidia page?" the interviewer smiles at you.'
+			'"Yeah," you smile back. "That''s exactly what I want."'
+			*nl
+			gs 'foto_model_documentary','documentary_4'
+		end
+		
+		act'Personal':
+			foto_documentary['question_3.2'] = 2
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+			'"Personal I suppose. I guess I just want to prove it to myself that I can do it. If I can become the number one model in the city, maybe I can do anything."'
+			'The interviewer nods understandingly.'
+			*nl
+			gs 'foto_model_documentary','documentary_4'
+		end
+	end
+	
+	act'No, I hate dieting':
+		foto_documentary['question_3'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"No," you say. "I hate dieting too much."'
+		'The interviewer lets out a bark of laugher.'
+		'"Calorie counting isn''t for you?"'
+		act'No!':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"No!" you laugh with her. "I don''t know how some of these other girls do it. They work out regularly, eat only celery and yogurt to keep flat tummies, and all I can think about is the next time I can eat something with melted cheese on it!"'
+			*nl
+			gs 'foto_model_documentary','documentary_4'
+		end
+	end
+	
+	act'As long as it pays the bills':
+		foto_documentary['question_3'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/7.mp4"></video></center>'
+		'"I wouldn''t say no I suppose. I''ll keep working here as long as it keeps paying the bills or I find something better I guess."'
+		'The interviewer nods understandingly.'
+		*nl
+		gs 'foto_model_documentary','documentary_4'
+	end
+	
+	act'Yes! I love this job!':
+		foto_documentary['question_3'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"Yes!" you say. "I love this job! I could do this for the rest of my life! Or as long as I''m young and pretty and they''ll let me stay," you laugh.'
+		'The interviewer smiles at your genuine excitment.'
+		*nl
+		gs 'foto_model_documentary','documentary_4'
+	end
+	
+	act'I''m not sure yet':
+		foto_documentary['question_3'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/2.mp4"></video></center>'
+		'"I don''t know..." you say, rubbing your chin. "It''s not bad working here, but I don''t know if it''s something I want to keep doing for the rest of my life. I guess I''m still thinking about it."'
+		'The interviewer nods understandingly.'
+		*nl
+		gs 'foto_model_documentary','documentary_4'
+	end
+end
+
+if $ARGS[0] = 'documentary_4':
+	minut += 2
+	gs 'stat'
+	'"How confident would you say you are in your body? Has your confidence changed since you started working here?"'
+	act'I''m actually really shy':
+		foto_documentary['question_4'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/4.mp4"></video></center>'
+		'"I''m actually really quite shy," you say. "I get easily embarrassed by showing my body off."'
+		'"But you''re a model! You''re talking to us completely naked without any problems."'
+		'"I wouldn''t say without <i>any</i> problems," you giggle nervously, face turning red. "I''m good at willpowering my way through things that are embarrassing. I can deal with it in the moment but it still is embarrassing when I''m doing it."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+	
+	act'It used to be worse but I''m still a little shy':
+		foto_documentary['question_4'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/3.mp4"></video></center>'
+		'"It used to be a lot worse," you start off. "I''m definitely not as shy about my body as I used to be but it can still be embarrassing from time to time. Working here has certainly changed the way I think about myself though."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+	
+	act'I used to be shy but now I''m not':
+		foto_documentary['question_4'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"I used to be shy, but I''ve moved past that now," you smile to yourself. "At the beginning I would cringe when the camera came out. And the idea of anybody seeing my boobs was hard to deal with. I used to put my hands over them when I came out of the locker rooms. It''s almost weird to think back on those times. I can''t imagine being embarrassed by somebody looking at me now."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+	
+	act'I haven''t been shy since I was little':
+		foto_documentary['question_4'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/3.mp4"></video></center>'
+		'"It''s been a long time since I was shy," you say, thinking back. "I don''t think I''ve been embarrassed about the way that I look since I was a little girl, way before I started working here. By the time I was a teenager I was already comfortable in my own skin. Working here hasn''t really changed that."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+	
+	act'I''ve never been shy':
+		foto_documentary['question_4'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I''ve never been shy," you laugh. "Never really cared what anyone else thought of my body or the way I looked. I am who I''ve always been and I love that about myself."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+	
+	
+	act'I''m fucking hot and I know it':
+		foto_documentary['question_4'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"Look, I am fucking <i>hot</i> and I know it," you say. "I knew it before I was a model and I definitely know it now that I am one."'
+		*nl
+		gs 'foto_model_documentary','documentary_5'
+	end
+end
+
+if $ARGS[0] = 'documentary_5':
+	minut += 2
+	gs 'stat'
+	'"This actually leads into our next question. We understand that Aphrodite has a strict dress code policy here. How do you feel about it? Do you think it has helped you as a model?"'
+	act'It sucks':
+		foto_documentary['question_5'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"It sucks!" you complain. "Having to be naked all the time is uncomfortable and weird. Why can''t we just wear clothes like normal and change in and out of the stuff they want us to? I don''t think it helps at all, just makes being around the studio more awkward."'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'It''s really embarrassing':
+		foto_documentary['question_5'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"It''s really embarrassing," you say. "As I said before, I can be kind of shy about my body, so having to be naked all the time except when you''re doing a shoot is really uncomfortable for me. Everything is on display all the time and when people talk to me I just want to cover up."'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I''m not very comfortable with it':
+		foto_documentary['question_5'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"I''m not very comfortable with it," you start. "First of all, everything is just on display all the time except when you''re doing clothing shoots. So that by itself is a little discomforting. But also it''s not physically very comfortable either. If you haven''t noticed they keep it pretty cold in here. They said it has something to do with balancing temperature because of all the heat from the lights, but when I''m just walking around the studio my nipples are always freezing."'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I got used to it eventually':
+		foto_documentary['question_5'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I wasn''t really comfortable with it when I first joined but I got used to it after a while," you say. "At this point it''s just kind of automatic, I don''t even really think about it anymore. I just come to work and get undressed."'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I think it really helped me':
+		foto_documentary['question_5'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"I think it actually really helped," you say. "I was so shy when I started working here. I was embarrassed by the idea of people seeing my body, of being naked in front of others. But after a while, you''re kind of forced to become accustomed to it. When I started to realize that people weren''t staring and girls weren''t judging me, my inhibitions began to fade away. And based on how the other models acted, I started to see that confidence was sexy. The dress code was a big part of that. Wear nothing but your own skin for hours on end and you''ll be surprised how quickly you get comfortable with it."'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I don''t really mind it':
+		foto_documentary['question_5'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"I don''t really mind it," you say. "It is what it is. Other places have work uniforms, why not here?"'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I love it!':
+		foto_documentary['question_5'] = 7
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I love it! Society cares so much about being ''proper'' and not being ''indecent'', but I don''t feel that way about myself. I like my body and I like being naked. So having that as a work uniform here is great!"'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	act'I think it promotes camaraderie':
+		foto_documentary['question_5'] = 8
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I think it actually helps build camaraderie between the models," you say. "You know, whatever our background, wherever we came from, whatever reason we have for being here, we''re all women at the end of the day. And being forced to be yourself—completely yourself without even a scrap of clothing to hide behind—really causes you to be genuine with each other. It''s a sort of intimacy, but not like a sexual one. In some ways I feel like it created a sisterhood here. Like that one movie, except we would have a different name. ''The Sisterhood Without Pants,'' maybe," you laugh.'
+		*nl
+		gs 'foto_model_documentary','documentary_6'
+	end
+	
+	
+!!	if Exhibitionist_lvl > 0:
+!!		act'It gets me wet':
+!!			foto_documentary['question_5'] = 8
+!!			cla & *clr
+!!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+!!			
+!!			
+!!			gs 'foto_model_documentary','documentary_6'
+!!		end
+!!	end
+end
+
+if $ARGS[0] = 'documentary_6':
+	minut += 2
+	gs 'stat'
+	'"Okay, now for some questions about your life outside the studio. What''s a hobby of yours?"'
+	act'Reading':
+		foto_documentary['question_6'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"I like to read. There''s nothing more relaxing to me than a good book."'
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+	
+	act'Sports':
+		foto_documentary['question_6'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I love sports!"'
+		'"So you''re an athletic girl?"'
+		'"Oh yeah! I always feel better when my body is in motion. Nothing like working up a good sweat."'
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+	
+	act'Dancing':
+		foto_documentary['question_6'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/5.mp4"></video></center>'
+		'"I like to dance. It feels good when I let my body flow to music, whether choreographed or just on the spot."'
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+	
+	act'I''m a foodie':
+		foto_documentary['question_6'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"It''s a little embarrassing being a model and all... but I''m a real foodie," you say. "I love trying new and different kinds of food, seeing what unexpected combinations work surprisingly well together. That''s what makes life worth living.'
+		if foto_documentary['question_3'] = 3:
+			'"I guess this must be why you hate dieting so much," the interviewer laughs.'
+			'"Seriously!"'
+		end
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+	
+	act'Going clubbing':
+		foto_documentary['question_6'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I like going clubbing," you say. "Go out with the girls, maybe meet a guy, buy drinks and have good times! Best way to spend a Saturday night!"'
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+	
+	act'Having sex (clean answer)':
+		foto_documentary['question_6'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"Actually... one of my favorite things to do is have sex." The interviewer''s mouth drops with a smile at the candid nature of your answer.'
+		'You smile back. "It feels good, makes me feel sexy, and after a really good roll in the hay it leaves me with a spring my step. It''s what I like the most in life, does that count as a hobby?"'
+		'"Sure does," the interviewer replies. "Can''t say I disagree with you either. Just curious though, do you prefer hook ups like with strangers? Or sex in a stable relationship like with a boyfriend?"'
+		act'Hook ups':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			'"Hook ups. I like meeting a guy and sleeping with him on the first date. It''s fun seeing the differences between guys and what they''re good at. Is that slutty?" you laugh.'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		if husband > 0:
+			act'With my husband':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+				'"With my husband actually," you say. "I''m married. Nothing is better than making love to him."'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+		else
+			act'With <b>my</b> boyfriend':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+				'"With my boyfriend," you say. "He just knows my body so well! Spending the time investing in a relationship is the only way to get that." She nods at your sage advice.'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+			
+			act'With <b>a</b> boyfriend':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/9.mp4"></video></center>'
+				'"I would say... with a boyfriend. I''m single for the moment, but spending the time to let someone get to know you and what turns you on really is the best. You''ll never get that kind of satisfaction randomly sleeping around." She nods at your sage advice.'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+		end
+		
+		act'Why not girlfriends?':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			'"Why not girlfriends?" you smile with a twinkle in your eye. "Who said I liked sleeping with men the most?"'
+			'The interviewer meets your eyes and blushes deeply before clearing her throat and flipping to the next page of her clipboard.'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'Group sex':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/4.mp4"></video></center>'
+			'"My favorite is actually with multiple partners," you say shyly. The interviewer gives you a <i>very</i> interested look. "Let''s just say that one set of body parts is not enough for me to feel satisfied..."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+	end
+	
+	act'Having sex (slutty answer)':
+		foto_documentary['question_6'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"Fucking!" you giggle. The interviewer pauses a moment.'
+		'"Excuse me?"'
+		'"Fucking! You know, sex. I <i>love</i> having sex. Just that feeling of a cock inside you is, mmph! Definitely my favorite hobby!"'
+		'"Ah, okayyy," she replies. "And out of curiousity, do you prefer your sex in hook ups or in stable relationships like with a boyfriend?"'
+		act'Hook ups':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"Hook ups. I <i>always</i> fuck on the first date and I like having sex with new people. It''s almost like a game for me, seeing how many guys I can sleep with." you laugh. "Right now my record''s at <<guy+temp>>."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		if husband > 0:
+			act'With my husband':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+				'"With my husband actually," you say. "I''m married. I love getting fucked by him. He knows every centimeter of my body, nobody knows how to make me cum like he does."'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+		else
+			act'With <b>my</b> boyfriend':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+				'"With my boyfriend," you say. "He just knows my body so well! I never feel better than I do after he fucks me."'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+			
+			act'With <b>a</b> boyfriend':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+				'"I would say... with a boyfriend. I''m single for the moment, which is a bit of a problem, but there''s nothing better than getting fucked by a guy who knows every part of your body. Unfortunately, most guys don''t have that information instinctively. It takes time for them to really learn how to make you cum."'
+				'She nods with eyebrows raised, as if surprised by your answer.'
+				*nl
+				gs 'foto_model_documentary','documentary_7'
+			end
+		end
+		
+		act'Why not girlfriends?':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+			'"Why not girlfriends?" you smile with a twinkle in your eye. "I like eating pussy just as much as I like getting eaten."'
+			'The interviewer blushes deeply, clearing her throat and flipping to the next page of her clipboard.'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'Group sex':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"My favorite is actually group sex," you giggle. The interviewer''s jaw drops.'
+			'"It''s more fun when I get to use more holes," you grin.'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+	end
+	
+	act'Masturbating':
+		foto_documentary['question_6'] = 7
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I actually really like masturbating," you giggle.'
+		'"Sorry...?" The interviewer asks, eyes wide.'
+		'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate...'
+		act'... in my room':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"I actually really like masturbating," you giggle.'
+			'"Sorry...?" The interviewer asks, eyes wide.'
+			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate in my room. Just me, my fingers, and plenty of orgasms." Her jaw drops.'
+			'"What can I say?" you shrug. "It''s... relaxing..."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'... with my dildo':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"I actually really like masturbating," you giggle.'
+			'"Sorry...?" The interviewer asks, eyes wide.'
+			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate with my dildo. Just me, a rubber dick, and plenty of orgasms. Her jaw drops.'
+			'"What can I say?" you shrug. "It''s... relaxing..."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'... in the shower':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"I actually really like masturbating," you giggle.'
+			'"Sorry...?" The interviewer asks, eyes wide.'
+			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate in the shower. The combination of the steam and a good pulsing showerhead is a girl''s best friend," you say with a smirk.'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'... in the bath':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"I actually really like masturbating," you giggle.'
+			'"Sorry...?" The interviewer asks, eyes wide.'
+			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate in the tub. It can be hard to do but if you can get your hips underneath the faucet..." you bite your lip. "Well... let''s just say it hits all the right spots..."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end
+		
+		act'... with my shower dildo':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+			'"I actually really like masturbating," you giggle.'
+			'"Sorry...?" The interviewer asks, eyes wide.'
+			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate with my shower dildo. Nice steamy room, hot water, a shower head to use for vibrations, a nice rubber dick to fill me up, oh man. I could spend hours in there."'
+			*nl
+			gs 'foto_model_documentary','documentary_7'
+		end		
+	end
+	
+	act'Nothing in particular':
+		foto_documentary['question_6'] = 8
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I... I don''t actually have any hobbies in particular."'
+		'"Really? No hobbies at all?"'
+		'"Not really," you shrug. "I guess I just... get by at the moment."'
+		*nl
+		gs 'foto_model_documentary','documentary_7'
+	end
+end
+
+if $ARGS[0] = 'documentary_7':
+	minut += 2
+	gs 'stat'
+	'"What is your ideal date?"'
+	act'A quiet night in':
+		foto_documentary['question_7'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"My ideal date is... a quiet night in. Nothing fancy, just a nice cooked meal or maybe some takeout, a bit of wine maybe, some cuddling on the couch, just time spent being comfortable and relaxed with another person. That kind of feeling, isn''t that what romance is all about?"'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+	
+	act'Something fun with lots of activities':
+		foto_documentary['question_7'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"My ideal date is something with a lot of activities involved. I really like having fun and having stuff to do, so... like playing games at a carnival, or a day at the beach, or going through a haunted house or an escape room type of thing. That''s the kind of stuff I''d want to do if somebody asked me out on a date."'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+	
+	act'Dinner and a movie':
+		foto_documentary['question_7'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/9.mp4"></video></center>'
+		'"My ideal date is probably... dinner and a movie. It''s a little cliche, but I like it. You know? A bit of time chatting and eating together and then some time to just hang out watching something, maybe holding hands during it. It gives us stuff to talk about too, you know?"'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+	
+	act'A long walk with scenery':
+		foto_documentary['question_7'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"My ideal date is basically just a long walk. Somewhere nice like the park or along a lake, just someplace peaceful with beautiful scenery. We could talk quietly, hold hands while we walk, just <i>be</i> with each other."'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+	
+	act'Something thrilling':
+		foto_documentary['question_7'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I would love to do something thrilling on a date. Like roller coaster rides at an amusement park or jetskiing on the lake or even skydiving out of a plane! I love experiencing that rush and being able to share that with another person only makes it that much more special."'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+	
+	act'A romantic evening that ends in sex':
+		foto_documentary['question_7'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I think for me, my ideal date is a romantic evening that ends with great sex. The sex is a big part of it, sure, but without the build up its nothing. A fancy restaurant in expensive clothing, wine and chocolates, starring at each other and taking in how beautiful the other person looks. All of these things just building, building, building our desire. And at the end of the night, when we''re at our limit, that''s when we let our inhibitions go. Hands get handsy, tongues get invasive, and every touch becomes passionate and expressive. And after we''re done we can bask in the afterglow of the evening and in each other''s presence," you smile.'
+		'"<i>Just</i> those things?" the interviewer smiles back.'
+		'"And... in the afterglow of our orgasms too," you admit.'
+		*nl
+		gs 'foto_model_documentary','documentary_8'
+	end
+end
+
+if $ARGS[0] = 'documentary_8':
+	minut += 2
+	gs 'stat'
+	'"For our next question, do you have any guilty pleasures?"'
+	act'Eating things I shouldn''t':
+		foto_documentary['question_8'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/3.mp4"></video></center>'
+		'"My guilty pleasure is eating things that I really shouldn''t be. Whether that be excessive amounts of chocolate or an extra scoop of ice cream or an entire bag of crisps, sometimes it''s so tempting I can''t help but give in. And I feel really bad about it after because I know I need to maintain my figure but it''s <i>so</i> satisfying in the moment."'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+	
+	act'Day drinking':
+		foto_documentary['question_8'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I have this bad habit where I like to drink during the day sometimes. Like, I know I shouldn''t because it''s probably messing up my liver and affecting the way I interact with people, but sometimes, I just need some alcohol to be able to kick back and relax. So I''d say that''s my guilty pleasure."'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+	
+	act'Binge watching':
+		foto_documentary['question_8'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/5.mp4"></video></center>'
+		'"I''d have to say my guilty pleasure is binge watching TV series. It''s so bad because I''ll just lose hours and hours of time but when that ''play next'' button is right there, I need to know what happens next! I lose whole weekends doing that!"'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+	
+	act'Bad romcoms':
+		foto_documentary['question_8'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/4.mp4"></video></center>'
+		'"My guilty pleasure is bad romantic comedies. I know they''re cheesy, I know that the problems could be solved if the characters just listened to each other, but I can''t help myself. They''re just so cute!"'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+	
+	act'Social media':
+		foto_documentary['question_8'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"My guilty pleasure has to be social media. One minute I''m saying I''m just going to take a quick scroll through Twatter, next thing I know I''ve been reading the feeds for an hour. It''s a huge time sink and a huge problem for productivity."'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+	
+	act'Sleeping in':
+		foto_documentary['question_8'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I''d say that my guilty pleasure is having a lie in. There''s so much that needs to get done during the day, but sometimes I can''t help but whack the off button on my alarm clock and curl back up under my covers, wake up at noon instead of <<timer>>. It feels good to sleep in, but I always regret it when I realize how much stuff I could have gotten done if I had just gotten up when I was supposed to."'
+		*nl
+		gs 'foto_model_documentary','documentary_9'
+	end
+end
+
+if $ARGS[0] = 'documentary_9':
+	minut += 2
+	gs 'stat'
+	'"What do you wear to bed?"'
+	act'Underwear':
+		foto_documentary['question_9'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"Just my usual underwear. Some panties and a bra. Maybe it''s a little weird to wear a bra to bed, but it''s just comfortable for me.'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+	
+	act'Panties':
+		foto_documentary['question_9'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"Just a pair of panties. I get hot at night so I don''t wear a top but keeping my panties on keeps anything leaking out during the night and staining the sheets."'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+	
+	act'I sleep naked':
+		foto_documentary['question_9'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"I sleep naked," you say. "Au naturel. Is there any better way to sleep than just your skin and your covers?"'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+	
+	act'Negligee':
+		foto_documentary['question_9'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I wear a negligee when I sleep. It''s sexy, it''s classy, and if I need to get up for anything (or anyone) I''m still presentable."'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+	
+	act'A big t-shirt and panties':
+		foto_documentary['question_9'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/8.mp4"></video></center>'
+		'"Oh, just a big t-shirt and a pair of panties. My boobs have get cold so having an extra layer on under the covers is nice."'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+	
+	act'Just a big t-shirt':
+		foto_documentary['question_9'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"Just an oversized t-shirt usually. I have a favorite night shirt that I wear, it''s soft and roomy and it''s comfortable to sleep in."'
+		'"Just that?"'
+		'"Just that. Panties are too hot for my hips. I like to feel the breeze," you smirk.'
+		*nl
+		gs 'foto_model_documentary','documentary_10'
+	end
+end
+
+if $ARGS[0] = 'documentary_10':
+	minut += 2
+	gs 'stat'
+	'"What''s your ideal morning?"'
+	act'Early morning with exercise':
+		foto_documentary['question_10'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		'"I like to get up early," you say. "There''s just something motivating about getting an early start to the day. After that I do some exercises. Some yoga, some body weight exercises, maybe go for a run or something like that. Just something that starts off my day active and right. Then a nice hot shower and I''m ready for the day."'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Early morning to do chores':
+		foto_documentary['question_10'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
+		'"I like to get up early and do my chores."'
+		'"Your ideal morning is doing chores?"'
+		'"It''s just a matter of maintaining structure and routine in my life. It keeps my life orderly. Making sure the laundry is pressed and my bed is made and the dishes are clean, it all puts my mind at ease. So I like doing it. And it gives me momentum to do everything else I need to accomplish later. By starting with chores, I make everything else a little easier."'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Early morning with a light breakfast':
+		foto_documentary['question_10'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"Getting an early start is important to me. Making sure my body is ready for the day you know? So I like to get up early and have a light breakfast, some scrambled eggs or maybe a salad. Nothing too heavy that will weigh me down, just give me energy for the rest of morning."'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Anything involving coffee':
+		foto_documentary['question_10'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"My ideal morning is anything that involves coffee. You give me a cup of coffee when I wake up, I will marry you."'
+		'The interviewer smiles as she writes something down in her notes and you get the feeling she''s a kindred spirit in this regard.'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Anything involving coffee (slightly crude/slutty)':
+		foto_documentary['question_10'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		'"My ideal morning is anything that involves coffee. Seriously, I will suck you off if you bring me a cup of coffee in bed."'
+		'The interviewer supresses a smile as she writes something down with eyebrows upraised. You get the feeling she knows what you mean but is a bit surprised by your choice of words.'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Sleeping in followed by brunch':
+		foto_documentary['question_10'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/3.mp4"></video></center>'
+		'"My ideal morning is one where I get to sleep in late, have a nice lazy morning, and then have brunch at the end of it. Like pancakes with jam or maybe an omlette or smoked salmon and cream cheese, oh! Or french toast and an egg quiche. If I could start every day like that I would be <i>sooooo</i> happy."'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+	
+	act'Wakeup sex':
+		foto_documentary['question_10'] = 7
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		'"My ideal morning starts with sex," you say. "Nothing to get your day going like a good orgasm right? If I wake up and somebody''s balls deep in me, that day is already a good day."'
+		'"Ahuh... Funny, someone else said something similar..." the interviewer says flipping back on her clipboard a few pages.'
+		*nl
+		gs 'foto_model_documentary','documentary_11'
+	end
+end
+
+if $ARGS[0] = 'documentary_11':
+	minut += 2
+	act'Finish interview':gt'foto_model_documentary','documentary_end'
+	gs 'stat'
+!!{	'"What''s would you like to receive as a present?"'
+	act'Early morning with exercise':
+		foto_documentary['question_11'] = 1
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/10.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'Early morning to do chores':
+		foto_documentary['question_11'] = 2
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/7.mp4"></video></center>'
+		'"'
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'Early morning with a light breakfast':
+		foto_documentary['question_11'] = 3
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'Anything involving coffee':
+		foto_documentary['question_11'] = 4
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'Anything involving coffee (slightly crude/slutty)':
+		foto_documentary['question_11'] = 5
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'Sleeping in followed by brunch':
+		foto_documentary['question_11'] = 6
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/3.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end
+	
+	act'':
+		foto_documentary['question_11'] = 7
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
+		''
+		*nl
+		gs 'foto_model_documentary','documentary_12'
+	end}
+end
+
+if $ARGS[0] = 'documentary_end':
+	foto['documentary'] = 0
+	minut += 10
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
+	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+	mdlng_exp += rand(9,10)
+	if pcs_inhib < 55: gs 'willpower','pay','self'
+	gs 'fame', 'city', 'modelling', rand(20,40)
+	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
+	inhib_exp += rand(1,3)
+	money += modelpayfin
+	modelfotomoney += modelpayfin
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	'"Well, that''s the end of the interview. Thank you so much for your time and for answering our questions! I''m sure the viewers will love what you had to say."'
+	'"No problem! You were a very good interviewer."'
+	*nl
+	'After exchanging a few more pleasantries, they hand you an envelope filled with bills that count out to <<modelpayfin>> <b>₽</b> and call the next girl in from the side.'
+	
+!!	foto['1st_documentary'] = 1
+	
+	act'Leave':gt'foto','studio'
+end
+
+
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ----------------------------- Model Documentary Follow Ups -----------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+if $ARGS[0] = '2nd_documentary':
+
+
+end
+
+--- foto_model_documentary ---------------------------------

+ 12 - 12
locations/foto_shoot.qsrc

@@ -10,7 +10,7 @@
 
 if $ARGS[0] = 'model':
 	menu_off = 1
-	if model = 0:model = 1
+	if model['status'] = 0:model['status'] = 1
 	*clr & cla
 	minut += 5
 	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
@@ -173,7 +173,7 @@ if $ARGS[0] = 'model':
 		end
 	end
 	
-	if Fit['FMR'] = 0:
+	if Fit['FMR'] = 1:
 		 act '"I''d like to do a fitness shoot"':gt'foto_shoot','fitness_shoot'
 	end
 end
@@ -557,7 +557,7 @@ if $ARGS[0] = 'fashion':
 	if fashionshoot = 1:
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion/<<rand(1,5)>>.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion/<<rand(1,14)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion/<<rand(1,31)>>.jpg"></center>'
 	end
 	'You dress up in the latest in fashion wear and spend the next two hours posing for the photographer.'
 	*nl
@@ -609,7 +609,7 @@ if $ARGS[0] = 'lingerie':
 	if shoot = 1:
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,5)>>.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie/<<rand(1,11)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie/<<rand(1,37)>>.jpg"></center>'
 	end
 	'You put on some high end lingerie and spend the next two hours striking various poses for a photographer for use in fashion magazines.'
 	*nl
@@ -633,7 +633,7 @@ if $ARGS[0] = 'sexy':
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(1,6)
 	inhib_exp += rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,20)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,48)>>.jpg"></center>'
 	'You dress up in sexy clothes and spend the next two hours posing for the photographer.'
 	*nl
 	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
@@ -654,7 +654,7 @@ if $ARGS[0] = 'transparent':
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,10)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,26)>>.jpg"></center>'
 	'You put on a transparent top and spend the next two hours in various poses for the photographer, a flash highlighting your breasts with every click of the camera.'
 	*nl
 	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
@@ -683,7 +683,7 @@ if $ARGS[0] = 'trans_ling':
 	if rand(0,1) = 1:
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,12)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,26)>>.jpg"></center>'
 	end
 	'You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
 	*nl
@@ -710,7 +710,7 @@ if $ARGS[0] = 'topless':
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless/<<rand(1,27)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless/<<rand(1,57)>>.jpg"></center>'
 	'You spend two hours striking various posing with topless breasts, listening to instruction while the photographer takes pictures of you.'
 	*nl
 	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
@@ -734,7 +734,7 @@ if $ARGS[0] = 'tasteful':
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(0,2)
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/tastenude/<<rand(1,14)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/tastenude/<<rand(1,28)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
 	*nl
 	'You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
@@ -758,7 +758,7 @@ if $ARGS[0] = 'topless_nude':
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(1,3)
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,40)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,79)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
 	*nl
 	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'			
@@ -791,7 +791,7 @@ if $ARGS[0] = 'nude':
 		*nl
 		'You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/bnude/<<rand(1,12)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/bnude/<<rand(1,20)>>.jpg"></center>'
 		'Already naked, you step onto the set and begin the shoot immediately.'
 		*nl
 		'You spend two hours posing confidently for a photographer taking pictures of you, your <<$pcdesc_pubes>> pussy providing a nice contrast to the rest of your smooth body. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
@@ -826,7 +826,7 @@ if $ARGS[0] = 'erotic':
 	gs 'fame', 'city', 'porn', rand(5,15)
 	gs 'fame', 'pav', 'porn', rand(0,15)
 	if pcs_inhib < 60:inhib_exp += rand(1,3)
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,10)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,19)>>.jpg"></center>'
 	if $pantyworntype ! 'none':
 		
 	else

+ 19 - 19
locations/gLakeNude.qsrc

@@ -61,7 +61,7 @@ end
 act'Leave the secluded beach': minut += 10 & gt 'glake'
 
 if month >= 5 and month <= 9:
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -106,7 +106,7 @@ if month >= 5 and month <= 9:
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			nudelake = rand(1,10)
-			if nudelake <= 2:
+			if nudelake <= 2 and home_owned[2] = 1:
 				minut += 5
 				pcs_mood -= 5
 				gs 'exhibitionism', 4
@@ -132,11 +132,11 @@ if temper >= 15 and month >= 5 and month <= 9:
 		pcs_mood += 5
 		gs 'stat'
 
-		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips>=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -150,7 +150,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 		act 'Continue':gt'gLakeNude'
 	end
 	
-	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
+	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
 		act 'Go swimming (30 minutes)':
 			menu_off = 1
 			*clr & cla
@@ -160,7 +160,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			pcs_mood += 5
 			! Seems appropriate. Potentially worth revisiting
 			if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-			if $clothingworntype = 'swimwear':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			elseif $clothingworntype = 'nude':
 				inhib_exp += rand(1,3)
@@ -182,15 +182,15 @@ if temper >= 15 and month >= 5 and month <= 9:
 		end
 	end
 	
-	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
+	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
 		act 'Go sunbathing (30 minutes)':
 			menu_off = 1
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 				*clr & cla
 				minut = minut + 30
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -319,7 +319,7 @@ if $ARGS[0] = 'sauna':
 		end
 	end
 	
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -350,7 +350,7 @@ if $ARGS[0] = 'sauna':
 		end
 	end
 	
-	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear':	
+	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		act 'Go to the womens section':
 			*clr & cla
 			menu_off = 1
@@ -382,7 +382,7 @@ if $ARGS[0] = 'sauna':
 					pcs_skin += rand(2,4)
 					pcs_willpwr += 3
 				end
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
 				else
@@ -405,7 +405,7 @@ if $ARGS[0] = 'sauna':
 			'It appears to be empty at the moment.'
 			act 'Leave': gt 'gLakeNude', 'sauna'
 			gs 'willpower', 'exhib', 'self', 'hard'
-			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 3
+			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 3
 			if will_cost <= pcs_willpwr:
 				act 'Use the sauna (<<will_cost>> Willpower)':
 					*clr & cla
@@ -416,7 +416,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear':
+					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -454,9 +454,9 @@ if $ARGS[0] = 'sauna':
 				end
 			end
 			gs 'willpower', 'exhib', 'self', 'easy'
-			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 0
+			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 0
 			if will_cost <= pcs_willpwr:
-				act iif(saunarand < 4 or $clothingworntype = 'swimwear', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
+				act iif(saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					minut += 30
@@ -466,7 +466,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear':
+					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -497,7 +497,7 @@ if $ARGS[0] = 'ice_plunge':
 		minut += 10
 		pcs_mood += 10
 		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/icedipbikini.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(0,1)
 		else

+ 1 - 1
locations/gLakeNudeEvent.qsrc

@@ -113,7 +113,7 @@ if $args[0] = 'gLakeNude_sex2':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_13.jpg"></center>'
-				'You can tell that the fit young guy doen''t lack for endurance as he furiously fucks his sweet girlfriend for several more minutes. As he continues pounding into her, you begin to hear both of their breathing becoming less regular, more frantic.'
+				'You can tell that the fit young guy doesn''t lack for endurance as he furiously fucks his sweet girlfriend for several more minutes. As he continues pounding into her, you begin to hear both of their breathing becoming less regular, more frantic.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Further':

+ 2 - 0
locations/gaddvor.qsrc

@@ -117,6 +117,7 @@ end
 
 if $ARGS[0] = 'root_cellar':
 	*clr & cla
+	$loc_arg = 'root_cellar'
 	'<center><h4>Root Cellar</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/root_cellar.jpg"></center>'
 	*nl
@@ -207,6 +208,7 @@ end
 
 if $ARGS[0] = 'chickens':
 	*clr & cla
+	$loc_arg = 'chickens'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
 	'Ordinary chickens clucking about their pen.'
 	minut += 1

+ 11 - 11
locations/gadriver.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'gadbitch':
 
 	act 'Go back to the river (0:05)':
 		cla
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			cla
 			'You need to dress in regular clothes first.'
 			act'Return':gt'gadriver', 'gadbitch'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 	end
 
-	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
+	if func('changingroom','count_swim_item') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
 
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 			end
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Go for a swim':
 				cla
 				*clr
@@ -368,7 +368,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 		if hour >= 8 and hour < 20 and sunWeather = 1:
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 				act 'Sunbathe (1:00)':
 					if Mira_no = 0 and npc_rel['A60'] > 0 and MiraLoc ! 1 and rand(1,10) > 7 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15:
 						cla
@@ -503,7 +503,7 @@ if $ARGS[0] = 'gadbitch':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
 				'You see Desperado happily walking around in the river.'
 
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 					act 'Wash Desperado':
 						*clr & cla
 
@@ -519,7 +519,7 @@ if $ARGS[0] = 'gadbitch':
 
 						if $clothingworntype = 'nude':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
-						elseif $clothingworntype = 'swimwear':
+						elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
 						end
 						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'gadbitch':
 
 							if $clothingworntype = 'nude':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
-							elseif $clothingworntype = 'swimwear':
+							elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_swim.jpg"></center>'
 							end
 							'You invite Mira to wash Desperado with you; having nothing better to do she agrees.'
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 		if grandpaQW['chore_bathe_horse_prog'] = 2:
 			act 'Lead Desperado back home (0:30)':
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					cla
 					'You need to dress in regular clothes first.'
 					act'Return':gt'gadriver', 'gadbitch'
@@ -634,7 +634,7 @@ if $ARGS[0] = 'gadbitch':
 					*nl
 					'"Wait Mira, I have to change out of my clothes!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
 					'You start to take off your clothes.'
-					if ARRSIZE('swimwear') > 0:
+					if func('changingroom','count_swim_item') > 0:
 						act 'Change into swimwear':
 							gs 'gadriver','get_changed','start'
 						end
@@ -686,7 +686,7 @@ if $ARGS[0] = 'get_changed':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
 		*nl
 		'You put on our swimwear and neatly fold your clothes before putting them down in a pile, now you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Swim':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'second_thoughts':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
 	*nl
-	if ARRSIZE('swimwear') = 0:
+	if func('changingroom','count_swim_item') = 0:
 		'"Actually Mira, I can''t come in right now, as I didn''t bring a swimsuit" you replied you her. "I''m going to stay on the shore for a bit."'
 		*nl
 		'You should probably buy some swimwear if you intend of spending time at the beach'

+ 1 - 1
locations/garfather.qsrc

@@ -501,7 +501,7 @@ if fatherdrunk=1:
 									pcs_horny -= rand(1,5)
 									gs 'stat'
 									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
-									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
 								else
 									if $pantyworntype ! 'none':
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim37.jpg"></center>'

+ 1 - 1
locations/gdkin.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = '':
 
 		if dimaRevenge = 7 and dimaRevChoice = 4 and dimadisco = 0: gt 'dimaRevenge', 5, 'disco'
 
-		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart:
+		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0:
 			if npc_grupTipe['A25'] ! 5 and StoryLine = 1 and BeInSchool > 0 and soniaslut >= 5 and hour < 23:
 				'You notice Sonia talking to Vitek about something.'
 				act 'Watch Sonia': soniadisco_day = daystart & gt 'soniadisco', 'start'

+ 1 - 199
locations/gdksport.qsrc

@@ -1,5 +1,4 @@
 # gdksport
-
 if $ARGS[0] = 'start':
 	CLOSE ALL
 	*clr & cla
@@ -205,7 +204,7 @@ if $ARGS[0] = 'dance2':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dance_studio/fit1.jpg"></center>'
 
 	act 'Leave': gt 'gdksport', 'start'
 
@@ -432,203 +431,6 @@ end
 ! 	end
 ! end
 
-!!if $ARGS[0] = 'starlets':
-!!	menu_off = 1
-!!	*clr & cla
-
-!!	startletsday = daystart
-
-!!	timemult = 8
-!!	loopcount = 1
-!!	:starletstimeloop
-!!	gs 'exercise', 'tier2', 0, 'agil_exp', 'dancero_exp'
-!!	if loopcount < timemult: loopcount += 1 & jump 'starletstimeloop'
-!!	loopcount = 0
-!!	timemult = 0
-!!	pcs_mood -= 5
-!!	inhib_exp += rand(2,4)
-
-!!	gs 'stat'
-!!	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
-
-!!	if pcs_dancero < 15:
-!!		'You train together with the girls in "The Starlets". You danced badly and Albina constantly yelled at you and called you a bowlegged cow.'
-!!	elseif pcs_dancero < 30:
-!!		'You train together with the girls of "The Starlets". You sometimes managed to get the moves right, but most of the time you were out of synch or made the wrong move. Albina constantly yelled at you and called you a bowlegged cow.'
-!!	elseif pcs_dancero < 45:
-!!		'You train together with the girls of "The Starlets". You managed to get into the general rhythm and moved well with the other girls, but Albina is still not happy. "<<$pcs_nickname>>, you are very sluggish, you need to put more life into it."'
-!!	elseif pcs_dancero < 55:
-!!		'You train together with the girls of "The Starlets". You had the routine down pat with no mistakes, but Albina still nagged at you. "<<$pcs_nickname>>, you are not at a funeral, raise your head and smile!"'
-!!	else
-!!		AlbinaQW['ShowTriggerCount'] += 1
-!!		'You danced beautifully and Albina started to use you as an example for the other girls.'
-!!
-!!		if AlbinaQW['ShowTriggerCount'] < 6:
-!!			if AlbinaQW['otkazDanceWhore'] = 1:
-!!				if AlbinaQW['StarletsLastChance'] = 1:
-!!					AlbinaQW['StarletsBlocked'] = 1
-!!					'After training Albina drew you aside and started berating you. "You clumsy cow. Because of you I am losing customers. So fuck off, you are no longer welcome on the team."'
-!!				else
-!!					AlbinaQW['StarletsLastChance'] = 1
-!!					AlbinaQW['otkazDanceWhore'] = 0
-!!					if AlbinaQW['AlbFatherQW']  = 0:AlbinaQW['AlbFatherQW']  = 1
-!!					'After training Albina drew you aside and started berating you. "I know you''re young and stupid, but I will explain this to you for the first and last time. You are making the customers miserable and they are giving up on "The Starlets". Entertaining the men is part of the business."'
-!!				end
-!!			end
-
-!!			if AlbinaQW['DanceWhoreT'] > 0: AlbinaQW['DanceWhoreT'] = 0
-!!			if AlbinaQW['AlbFatherQW']  = 0 and AlbinaQW['StarletsWhore'] >= 8:
-!!				AlbinaQW['AlbFatherQW']  = 1
-!!				'Albina after training beckoned you to her. "Good work, <<$pcs_nickname>>. The clients were satisfied and you were very discrete. You''re doing fine, doing excellent, in fact. Stick with me and you will have all the money, cars and apartments you could want."'
-!!			end
-!!		else
-!!			AlbinaQW['ShowTriggerCount'] = 0
-!!			albpayrand = rand(1, 5)
-!!			'Albina gathered the girls. Today we have a small show planned. Each of you will receive <<albpayrand*1000>>. The show will take a couple of hours.'
-
-!!			act 'Do the show':
-!!				*clr & cla
-!!				timemult = 8
-!!				loopcount = 1
-!!				:showtimeloop
-!!				gs 'exercise', 'tier2', 0, 'agil_exp', 'danc_exp'
-!!				if loopcount < timemult: loopcount += 1 & jump 'showtimeloop'
-!!				loopcount = 0
-!!				timemult = 0
-!!				money += albpayrand * 1000
-!!				noShampoo = 1
-!!				dynamic $showerdin
-!!				profiDanceTime += 1
-!!				inhib_exp += rand(3,5)
-!!				gs 'stat'
-!!				'You agreed and Albina called for a car. Soon the car arrived the girls and you got into the car. Soon you arrived at a building with a large hall where people were sitting around a stage.'
-!!				'You dressed in costumes that were designed and commissioned by Albina, then went on stage to dance to the fiery music. You danced very well and everything went smoothly. You left the stage and Albina distributed the money. You took turns using the shower in the small dressing room.'
-!!				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-!!
-!!				if pcs_apprnc >= 52:
-!!					if pcs_apprnc < 64:AlbinaQW['StarletCustomer'] = rand(0,15)
-!!					if pcs_apprnc >= 64 and pcs_apprnc < 72:AlbinaQW['StarletCustomer'] = rand(0,12)
-!!					if pcs_apprnc >= 72:AlbinaQW['StarletCustomer'] = rand(0,10)
-
-!!					if AlbinaQW['StarletCustomer'] = 0:
-!!						AlbinaQW['StarletsCustomerCount'] = 1
-!!						AlbinaQW['StarletPay'] = rand(3,8)
-!!						'You saw that a man in a decent suit went up to Albina and started to talk quietly with her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 1:
-!!						AlbinaQW['StarletsCustomerCount'] = 2
-!!						AlbinaQW['StarletPay'] = rand(5,10)
-!!						'You saw that two guys approached Albina and started to talk to her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 2:
-!!						AlbinaQW['StarletsCustomerCount'] = 1
-!!						AlbinaQW['StarletPay'] = rand(4,9)
-!!						'You saw that an Armenian went up to Albina and started talking to her and gesticulating wildly.'
-!!					elseif AlbinaQW['StarletCustomer'] = 3:
-!!						AlbinaQW['StarletsCustomerCount'] = 2
-!!						AlbinaQW['StarletPay'] = rand(6,12)
-!!						'You saw that two Armenians went up to Albina and started talking to her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 4:
-!!						AlbinaQW['StarletsCustomerCount'] = 3
-!!						AlbinaQW['StarletPay'] = rand(8,14)
-!!						'You saw that three Armenians approached Albina and started talking to her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 5:
-!!						AlbinaQW['StarletsCustomerCount'] = 1
-!!						AlbinaQW['StarletPay'] = rand(5,10)
-!!						'You saw that a black went up Albina and started talking to her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 6:
-!!						AlbinaQW['StarletsCustomerCount'] = 2
-!!						AlbinaQW['StarletPay'] = rand(7,15)
-!!						'You saw that two black men went up Albina and started talking to her.'
-!!					elseif AlbinaQW['StarletCustomer'] = 7:
-!!						AlbinaQW['StarletsCustomerCount'] = 3
-!!						AlbinaQW['StarletPay'] = rand(10,20)
-!!						'You saw that three black men went up Albina and started talking to her.'
-!!					end
-!!
-!!					if AlbinaQW['StarletCustomer'] <= 7:
-!!						'After talking Albina came to you. "<<$pcs_nickname>>, we need to talk."'
-!!						act 'About what?':
-!!							*clr & cla
-!!							minut += 15
-!!							gs 'stat'
-!!							'You asked Albina what she wanted to talk about.'
-!!
-!!							if AlbinaQW['StarletsCustomerCount'] = 1:
-!!								'Albina came closer to you and quietly began to speak, "You see this guy? If you stay with him for an hour or so and be affectionate, you will be able to earn <<AlbinaQW[''StarletPay'']*1000>> <b>₽</b>."'
-!!							else
-!!								'Albina came closer to you and quietly began to speak, "You see these guys? If you stay with them for a couple of hours and be affectionate, you will be able to earn <<AlbinaQW[''StarletPay'']*1000>> <b>₽</b>."'
-!!							end
-!!							
-!!							gs 'willpower', 'prostitution', 'resist', 'hard'
-!!							if will_cost <= pcs_willpwr:
-!!								act 'Refuse and leave (<<will_cost>> Willpower)':
-!!									*clr & cla
-!!									gs 'willpower', 'prostitution', 'resist', 'hard'
-!!									gs 'willpower', 'pay', 'resist'
-!!									minut += 15
-!!									AlbinaQW['otkazDanceWhore'] = 1
-!!									AlbinaQW['DanceWhoreT'] = 0
-!!									gs 'stat'
-!!									'You got in the car along with the rest of the troupe, and shortly you returned to town.'
-!!
-!!									act 'Leave': gt 'pav_residential'
-!!								end
-!!							else
-!!								act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-!!							end
-
-!!							act 'Agree':
-!!								*clr & cla
-!!								money += AlbinaQW['StarletPay'] * 1000
-!!								AlbinaQW['StarletsWhore'] += 1
-!!								AlbinaQW['DanceWhoreT'] += 1
-!!								AlbinaQW['otkazDanceWhore'] = 0
-!!								slutty += 1
-!!								gs 'stat'
-!!								'You agreed to be "nice" and Albina counted out your money.'
-!!								if AlbinaQW['StarletCustomer'] = 0:act 'Go with the man': gt 'AlbStarsWhore', 'whore1'
-!!								if AlbinaQW['StarletCustomer'] = 1:act 'Go with the men': gt 'AlbStarsWhore', 'whore2'
-!!								if AlbinaQW['StarletCustomer'] = 2:act 'Go with the Armenian': gt 'AlbStarsWhore', 'whore3'
-!!								if AlbinaQW['StarletCustomer'] = 3:act 'Go with the Armenians': gt 'AlbStarsWhore', 'whore4'
-!!								if AlbinaQW['StarletCustomer'] = 4:act 'Go with the Armenians': gt 'AlbStarsWhore', 'whore5'
-!!								if AlbinaQW['StarletCustomer'] = 5:act 'Go with the black man': gt 'AlbStarsWhore', 'whore6'
-!!								if AlbinaQW['StarletCustomer'] = 6:act 'Go with the blacks': gt 'AlbStarsWhore', 'whore7'
-!!								if AlbinaQW['StarletCustomer'] = 7:act 'Go with the blacks': gt 'AlbStarsWhore', 'whore8'
-!!							end
-!!						end
-!!					end
-!!				elseif pcs_apprnc < 52:
-!!					'After dancing Albina talked with some of the men.'
-!!				end
-!!
-!!				act 'Drive back':
-!!					*clr & cla
-!!					minut += 15
-!!					gs 'stat'
-!!					'You got in the car along with the rest of the troupe, and shortly you returned to town.'
-!!
-!!					act 'Leave': gt 'pav_residential'
-!!				end
-!!			end
-!!		end
-!!	end
-!!	act 'Leave': gt 'gdksport', 'start'
-!!end
-
-if $ARGS[0] = 'cab_home':
-	menu_off = 1
-	*clr & cla
-	minut += 15
-	gs 'stat'
-	'You called a taxi and it took you back to town.'
-	if spafinloc = 11:
-		cumspclnt = 11
-		gs 'cum_cleanup'
-		'Along the way you wiped the sperm from your face.'
-	end
-
-	act 'Leave': gt 'pav_residential'
-end
-
 if $ARGS[0] = 'racing2':
 	*clr & cla
 	menu_off = 1

+ 11 - 11
locations/glake.qsrc

@@ -12,7 +12,7 @@ $location_type = 'public_outdoors'
 gs'stat'
 
 ! --- meynold event --- !. edit to month 5~10
-if $clothingworntype ! 'swimwear' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
+if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
 
 '<center><H4>Lake</H4></center>'
 
@@ -73,7 +73,7 @@ act'Return to Pavlovsk':
 	if konki_cloth = 1:
 		'You need to remove your skates. How are you going to walk on the streets in those?'
 		act'Back':gt'glake'
-	elseif $clothingworntype = 'swimwear':
+	elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
@@ -87,7 +87,7 @@ end
 
 if month >= 5 and month <= 9:
 
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -120,14 +120,14 @@ if month >= 5 and month <= 9:
 			menu_off = 1
 			minut+=5
 			nudelake = rand(1,20)
-			if nudelake <= 3:
+			if nudelake <= 3 and home_owned[2] = 1:
 				minut += 5
 				pcs_mood -= 5
 				inhib_exp += rand(1,3)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
 				'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. When you can''t find them, you panic and run all the way home... hopefully they''ll turn up.'
 				act 'Run home naked': gt 'glake', 'nude_home'
-			elseif nudelake = 4:
+			elseif nudelake = 4 and home_owned[2] = 1:
 				minut += 5
 				pcs_mood -= 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
@@ -219,11 +219,11 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		pcs_mood += 5
 		gs'stat'
 
-		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips>=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -237,7 +237,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		act 'Continue':gt'glake'
 	end
 	
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Go swim in the lake (30 minutes)':
 			*clr & cla
 			menu_off = 1
@@ -269,7 +269,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
 				gs'stat'
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -296,7 +296,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							if $clothingworntype = 'nude':
 								act 'Get dressed and go with him':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LakeBoyDy', 'ride'
 								end
 							else

+ 1 - 1
locations/grandpahelp.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'leadcows'
 	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
+	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and func('changingroom','count_swim_item') > 0:
 		gt 'grandpahelp', 'washhorse'
 	elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
 		gt 'grandpahelp', 'pickforest_mushrooms'

+ 20 - 15
locations/gschool_chats1.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'dimka':
 		if grupTipe = 1:
 			'"Just the person I was hoping to see!" Dimka smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would have loved it out there. It really made me realize we''re wasting away out here in a place like this." You then mostly talk about the other places he has visited.'
 		else
-			'Dimka greets you with a friendly smile, making room for you in the group made up of Albina, Igor and a few other students you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides everyone and soon you are engaged in a conversation with Dimka.'
+			'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides everyone and soon you are engaged in a conversation with Dimka.'
 		end
 		if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
 	elseif npc_rel['A1'] <= 20 and pav_slut < 200:
@@ -64,7 +64,7 @@ if $ARGS[0] = 'dimka':
 		'He gets a odd look on his face then shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
 	else 
 		npc_rel['A1'] += 1
-		'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Albina!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
+		'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
 		if dimarudorient = 1: act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
 	end
 end
@@ -174,12 +174,14 @@ if $ARGS[0] = 'igor':
 	if IgorloverQW > 0:
 		npc_rel['A4'] += 1
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours. You remain holding hands and chatting until break is over. With a smile, you give him a quick kiss goodbye.'
-		act 'Help with homework':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
-			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		end
+		
+!! The event is confusing because it has no effect
+!!		act 'Help with homework':
+!!			*clr & cla
+!!			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
+!!			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
+!!			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+!!		end
 		
 		if igorstrap = 1:
 			act 'Tease him':
@@ -252,7 +254,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif pav_slut >= 200:
-		'Igor is hanging with Dimka, Stasya and Albina when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
+		'Igor is hanging with Dimka, Stasya and Bella when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
 		act 'Help with homework':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
@@ -511,7 +513,7 @@ if $ARGS[0] = 'albina':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
-		'Albina offers you a friendly smile. "<<$pcs_nickname>>! You''re progressing very well in your training. Don''t forget to keep attending practice!"'
+		'Albina offers you a friendly smile. "Hey <<$pcs_nickname>>! You''re really proving yourself to be one hell of a dancer. Don''t forget to keep attending practice!" You spend the next few minutes talking about the next show you are due to perform.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if AlbinaQW['Friends'] = 1:
@@ -520,23 +522,26 @@ if $ARGS[0] = 'albina':
 		'Albina smiles gratefully at you. "I just wanted to thank you again <<$pcs_nickname>>. It''s like they say, ''a friend in need is a friend indeed'' or something stupid like that. I''m letting you know that I''m disbanding the Starlets as well. Too many bad memories you know?" You tell her you understand and she embraces you in a tight hug before composing herself, staring down anyone looking at her with a cold glare.'
 	elseif npc_rel['A23'] >= 50 and pav_slut < 200:
 		npc_rel['A23'] += 1
-		if grupTipe = 2:
-			'Albina has a friendly conversation with you. She takes a genuine interest in what you have to say, even stopping to ask your thoughts on the things you both talk about.'
+		if AlbinaQW['Friends'] = 2:
+		    'You have a pleasant conversation with Albina where you both talk about almost anything, but you are careful not to bring up the Starlets or anything else that might upset her. The conversation ends with Albina embracing you in a tight and extended hug.'
+		elseif grupTipe = 2:
+			'Albina has a somewhat friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually outright refusing to speak about it.'
 		else
-			'Albina spends a lot of the conversation talking about herself, but does like to hear your thoughts on what she says. "I could never be in a relationship like that, having my ''boyfriend'' ignore me. I can''t tell if Stasya is being patient or really, <i>really</i> stupid for going along with Andrey''s bullshit." she huffs with crossed arms.'
+			'Albina spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but you think she''s just tolerating your presence and humouring you with conversation.'
 		end
 	elseif npc_rel['A23'] <= 20 and pav_slut < 200:	
 		npc_rel['A23'] += 1
 		if grupTipe = 2:
 			'"Hey Albina, how are things going?" you ask her with a smile.'
-			'Albina just rolls her eyes. "Like you actually care." She pushes you aside and walks away. You swear you hear her calling you a ''fake bitch'' under her breath.'
+			'Albina just rolls her eyes. "Like you actually care." she says before shoving you aside and walking away. You swear you hear her calling you a ''fake bitch'' under her breath.'
 		else
 			'"Hey Albina, how are things going?" you ask her with a smile.'
 			'"Is this some kind of joke?" Albina growls. She grabs you, shoves you against one of the lockers and glares at you. "Who put you up to this!?" she snarls. The rest of the group watch, stunned by her outburst.'
 			'"No...Nobody? I just wanted to talk..." you sheepishly reply, but her tightening grip on you and her angry demeanor tell you that she doesn''t believe you. You try buttering her up with compliments, but she isn''t interested in your grovelling. She gets up in your face and tells you to stay away from her before releasing you and storming off, the others being smart enough not to follow her.' 
 		end
 	elseif pav_slut >= 200:
-		'"Look who it is! The gopnik''s favorite cum dumpster!" Albina smirks. "There''s some <i>nasty</i> rumors about you going around school. If everyone is saying you''re a cock hungry whore, I''m inclined to believe them. They all can''t be wrong, right?" she chuckles.'
+		'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying you''re a cock hungry whore! How can you live like that - just letting guys...use you like that?"'
+		'You are about to speak up, but she shakes her head in disgust and walks away. You can''t tell if she was feeling disgusted or disappointed at you. She might even have been both.'
 	else 
 		npc_rel['A23'] += 1
 		'Your conversation, if you can call it that, with Albina is shallow and is over after only a minute or two as she excuses herself.'

+ 80 - 41
locations/gschool_gossip.qsrc

@@ -177,18 +177,18 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 17:
 		'"I heard Marcus tries to lure girls to the city, where he takes them to the university dorms and all the black guys gang bang her."'
 	elseif chat_rand = 18:
-		'"I heard Marcus is a sex fiend, he always has a hard-on."'
+		'"I heard Marcus is a sex fiend who always has a hard-on."'
 		'"Well, I heard it is because all the girls like to tease him, because they think it''s funny."'
 	elseif chat_rand = 19:
-		'"I heard, the only reason Marcus is here, is because he wants to find a nice Russian girl to marry and take her back to America."'
-		'"That''s not what I heard, I heard he came here because he thought all the Russian girls would want to jump on his dick, because he''s black."'
+		'"I heard the only reason Marcus is here is because he wants to find a nice Russian girl to marry and take her back to America."'
+		'"That''s not what I heard. I heard he came here because he thought all the Russian girls would want to jump on his dick, because he''s black."'
 	elseif chat_rand = 20:
 		'"I heard that Mr Vasilyev is gay and that he came onto some of the guys after school."'
 		'"Ugh, he shouldn''t be allowed to teach here."'
 	elseif chat_rand = 21:
 		'"I heard Miss Volkov has a drawer full of sex toys she has confiscated from students."'
 	elseif chat_rand = 22:
-		'"I heard Miss Volkov uses a strap-on on her students if she feels the paddlin'' isn''t working."'
+		'"I heard Miss Volkov uses a strap-on on her students if she feels the paddle isn''t working."'
 		'"Really? Well, I guess the gopniks would know." They both laugh at that.'
 	elseif chat_rand = 23:
 		'"I heard Miss Volkov used to work as a Dominatrix."'
@@ -205,14 +205,14 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 28:
 		'"A girl told me she went to the supply closet to get paper towels and found the janitor in there, jerking off."'
 		'"Aw that''s sick."'
-		'"She also said he had a little dick, barely big enough to fit his hand on." They start laughing at that.'
+		'"She also said he had a little dick that was barely big enough for him to fit his hand around." They start laughing at that.'
 	elseif chat_rand = 29:
 		'"I heard the janitor goes through the girls lockers and steals their panties if they leave them at school."'
 	elseif chat_rand = 30:
 		'"I heard the janitor drilled a hole in the wall of the girls shower in the gym and spies on them when they take a shower."'
 	elseif chat_rand = 31:
 		'"Oh man, did you hear what happened to Igor?"'
-		'"About him getting his shorts pulled down? Yeah, I also heard he had such a tiny dick and that it wasn''t much bigger than a girls clit."'
+		'"About him getting his shorts pulled down? Yeah, I also heard he had a tiny dick and that it wasn''t much bigger than a girl''s clit."'
 	elseif chat_rand = 32:
 		'"Man, Andrey is such an asshole!"'
 		'"Why?"'
@@ -235,9 +235,10 @@ if $ARGS[0] = 'mixed':
 		'"I heard Katja is a lesbian and that she was kissing some other girl in the hall."'
 	elseif chat_rand = 39:
 		'"I heard that Albina whores out the girls in her dance troupe and that she is a madam."'
+		'"Don''t let her hear you say that! If she doesn''t beat you up, then her dad will ruin your dad!"'
 	elseif chat_rand = 40:
 		'"If you ever want to know the latest gossip, just ask Lizaveta. That girl seems to know every bit of gossip and never shuts up about it."'
-		'The friend laughs. "I heard she even mutters about gossip in her sleep."'
+		'Their friend laughs. "I heard she even mutters about gossip in her sleep."'
 	elseif chat_rand = 41:
 		'"Don''t cross Lizaveta or she will totally ruin your reputation by spreading gossip about you."'
 	elseif chat_rand = 42:
@@ -249,7 +250,7 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 44:
 		'"I heard Lazar has a box full of girls panties at his house."'
 		'"What? He wears girls panties?"'
-		'Sigh "No, he takes the panties of all the girls he fucks for the first time, like a trophy."'
+		'Sigh. "No, he takes the panties of all the girls he fucks for the first time, like a trophy."'
 		'"Oh... how many does he have?"'
 		'"I heard a couple dozen and by the time school is over, he plans to add a pair from every girl in school... well at least the pretty girls."'
 	elseif chat_rand = 45:
@@ -267,7 +268,7 @@ if $ARGS[0] = 'mixed':
 		'"Natasha''s mom must be super poor. She is wearing the same school uniform she had last year."'
 		'"She has been wearing the same clothes for the last couple of years and she always brings a lunch from home."'
 	elseif chat_rand = 50:
-		'"What ever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
+		'"Whatever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
 		'"I heard one of the guys threatened her and told her to get his money or she better start blowing him and then she dropped right to her knees and sucked him off."'
 		'"Bullshit, no way... really? Hmmm... maybe I better ask her for my money again."'
 	elseif chat_rand = 51:
@@ -290,7 +291,7 @@ if $ARGS[0] = 'mixed':
 		'"I heard the only reason his uncle took him in is because his mom is a whore and so strung out on drugs, she left him alone for two weeks."'
 		'"I don''t blame her. If I had a son that looked like him, I would stay high all the time too."'
 	elseif chat_rand = 57:
-		'"Oh god, avoid Petia the mooch today! He smells worse than normal. Does the loser ever take a bath or brush his teeth?"'
+		'"Oh god, avoid Petia the mooch today! He smells worse than usual. Does that fat loser ever take a bath or brush his teeth?"'
 	elseif chat_rand = 58:
 		'"I bet Radomir is happy his band has their first groupie. Alyona is always hanging out with them and going to all their gigs."'
 		'"I heard she lets the whole band, including Anushka, pull trains on her."'
@@ -319,14 +320,14 @@ if $ARGS[0] = 'mixed':
 		'"I heard his dad got drunk and ran him over."'
 	elseif chat_rand = 65:
 		'"I can''t believe you aced the homework."'
-		'"I should have! Gerasim did it."'
+		'"I should have! Gerasim done it."'
 	elseif chat_rand = 66:
-		'"I heard Lina is sucking Mr. Pavlovich''s dick."'
+		'"I heard Lina is sucking Mr Pavlovich''s dick."'
 		'"I heard it was Christina."'
 	elseif chat_rand = 67:
 		'"Yeah, Vicky climbed into my mum''s old chest and pulled the lid shut."'
 		'"How the hell did she get in that?"'
-		'"How should I know? She would make a good magicians assistant."'
+		'"How should I know? She would make a good magician''s assistant."'
 	elseif chat_rand = 68:
 		'"Hey, do you know where Christina went last Friday after PE?"'
 		'"Yeah, she told me she was out on the athletics field with Mr Pavlovich."'
@@ -350,12 +351,12 @@ if $ARGS[0] = 'mixed':
 		'"She takes the train to the city. I saw her board it a couple of times."'
 		'"What would she want in the city every day?"'
 		'"I think she takes singing lessons or something."'
-		'"With a voice like hers, she''s probably gotta suck him off so he doesn''t run out."'
+		'"With a voice like hers, she probably sucks him off so he doesn''t run out."'
 	elseif chat_rand = 72:
 		'"Every time I see Avelina, I just want to punch her."'
 		'"Come on, she''s not that bad."'
 		'"Yes, she is. Just the way she keeps vying for Christina''s attention pisses me off. She''s like her lap dog."'
-		'"Well... Christina is kinda scary."'
+		'"Well... Christina is kind of scary."'
 		'"Yeah, but Lina isn''t scared - she worships her! I saw her and Christina after track training last week; Lina dropped to her knees and licked Christina''s cunt, just because Christina said she felt ''tense''. I bet Lina would fuck somebody if Christina ordered her to."'
 	elseif chat_rand = 73:
 		'"I''m telling you, Julia was trying to kiss a girl!"'
@@ -368,7 +369,7 @@ if $ARGS[0] = 'mixed':
 		'"Well, at least it explains why Julia keeps giving the boys the cold shoulder."'
 	elseif chat_rand = 74:
 		'"... I''m not saying he wasn''t being a dick, but... you know, everybody is, sometimes."'
-		'"I don''t get it: Why do you keep defending Dan? He''s one of the biggest assholes in school!"'
+		'"I don''t get it. Why do you keep defending Dan? He''s one of the biggest assholes in school!"'
 		'"Well... we used to hang out when we were younger. He was cool."'
 		'"Dan? We''re both talking about Dan Ryzhov, right?"'
 		'"I''m telling you, he was really nice back then."'
@@ -381,11 +382,11 @@ if $ARGS[0] = 'mixed':
 		'"Who cares about her name?! How did she react?"'
 		'"She shot him down. Just turned around and left without saying anything."'
 		'"Wow, that''s cold."'
-		'"I know, right? I almost felt a little sorry for the nerd."'
+		'"I know, right? I almost felt a little sorry for the little nerd."'
 	elseif chat_rand = 76 and igor_kdprogulka >= 3:
-		'"Hey, recently I saw <<$pcs_nickname>> walking through the park with some girl I''ve never seen. She was really pretty"'
+		'"I saw <<$pcs_nickname>> walking through the park with some girl I''ve never seen. She was really pretty."'
 		'"Was she a girl from our school?"'
-		'"I couldn''t get a good look at her face, but they were being really friendly with each other. Maybe a bit too friendly"'
+		'"I couldn''t get a good look at her face, but they were being really friendly with each other. Maybe a bit too friendly..."'
 		'"Maybe she''s a lesbian?"'
 	elseif chat_rand = 77:
 		'"Did I tell you that retard Evgeny spazzed out on me in class yesterday?"'
@@ -412,7 +413,7 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 81 and npc_rel['A11'] <= 25 and grupTipe ! 4:
 		'"Aren''t <<$pcs_nickname>> and Vasily childhood friends?"'
 		'"More like were. They''re not close anymore."'
-		'"Aww… when you think about it, it''s kinda sad."'
+		'"Aww… when you think about it, it''s kind of sad."'
 		'"It''s hard for me to feel bad for someone that calls Dan and Vitek his best friends."'
 	elseif chat_rand = 82:
 		'"Did you hear about the rapist in St Petersburg?"'
@@ -444,7 +445,7 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 87:
 		'You hear some students whispering about something. "Did you hear about the jocks having a secret pick up game every weekend?"'
 		'The other student nods. "Yeah, I heard they don''t let anyone else join unless they belong to that clique..."'
-		'They continue whispering that it would be nice to at least once join in the pick up games.'
+		'They continue whispering that it would be nice to join in the pick up games at least once.'
 	elseif chat_rand = 88:
 		'"You know how the gopniks sometimes grab at girls during class? Usually the girls hate it, but this one girl the other day... Oh man, did she seem to enjoy it!"'
 	elseif chat_rand = 89:
@@ -459,7 +460,7 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 91 and cheerleadingQW['quest_stage'] < 0 and cheerleadingQW['try_count'] > 0:
 		'"Did you hear about <<$pcs_nickname>> trying to be a cheerleader?"'
 		'"There''s no way someone like that made the team."'
-		'"Of course she didn''t. Albina laughed her right out of the place."'
+		'"Of course she didn''t. They laughed her right out of the place."'
 		'"Did someone record it? I bet it would be hilarious to watch."'
 	elseif chat_rand = 92 and cheerleadingQW['quest_stage'] > 1 and (grupTipe = 1 or grupTipe = 2):
 		'"So I heard <<$pcs_nickname>> joined the cheerleading squad."'
@@ -511,7 +512,7 @@ if $ARGS[0] = 'boys':
 		'"Miss Orlov is so fucking hot, I totally want to bang her."'
 		'"Get in line, she is hotter than any of the girls in school."'
 	elseif chat_rand = 12:
-		'"Miss Volkov is kinda hot, I mean, for someone almost as old as my mom."'
+		'"Miss Volkov is kind of hot, I mean, for someone almost as old as my mom."'
 		'"I hear you. She is a total MILF."'
 	elseif chat_rand = 13:
 		'"Did you see the picture of Katja kissing another girl?"'
@@ -543,12 +544,12 @@ if $ARGS[0] = 'boys':
 		'"Yeah, but they say he tore the other guy''s eyes out."'
 		'"Holy shit, are you serious?"'
 	elseif chat_rand = 20:
-		'"Lena''s kinda hot."'
+		'"Lena''s kind of hot."'
 		'"Are you crazy? You know what Vitek would do to you if he heard you were eyeing his sister?"'
 		'"Yeah yeah, but I bet she is so fucking horny, she would let you do anything you want to her. It would be totally worth it!"'
 	elseif chat_rand = 21:
 		'"Dude, you missed it. The other day Anushka goes up to the teacher during class and leans over his desk to ask him a question. While she is doing it, she pulls up her skirt and pulls her panties down, mooning the whole class."'
-		'"Damn... did you take a picture?"'
+		'"Damn. Did you take a picture?"'
 	elseif chat_rand = 22:
 		'"If I have to hear one more time about how much harder the city is, how much more badass everyone is and how lame Pavlovsk is, I think I am going to punch Arkadi in the face."'
 		'"Yeah, and then he will beat the shit out of you and likely stick his drum sticks up your ass for good measure if you give him any lip."'
@@ -560,9 +561,9 @@ if $ARGS[0] = 'boys':
 	elseif chat_rand = 25:
 		'"I bet Zinaida has some big ones hiding under that baggy shirt."'
 	elseif chat_rand = 26:
-		'"Dan."'
+		'"Dan!"'
 		'"Not so loud Vasily."'
-		'"How much did we drink last night."'
+		'"How much did we drink last night?"'
 		'"Too much. Why?"'
 		'"I think we fucked Pauline."'
 		'"What makes you think that?"'
@@ -571,7 +572,7 @@ if $ARGS[0] = 'boys':
 		'"Do you remember that girl who left the disco with Dimka yesterday?"'
 		'"Which girl?"'
 		'"I don''t know her name. Zina or Zinaida or something. You know, the nerd girl who usually doesn''t brush her hair or go out."'
-		'"Oh, uh... I guess? I was kinda drunk."'
+		'"Oh, uh... I guess? I was kind of drunk."'
 		'"You don''t remember anything, do you?"'
 		'"Oh no, I remember... She left with Dimka, sure... So?"'
 		'"Well, she looked weird this morning. Weirder than usual, I mean."'
@@ -635,7 +636,7 @@ if $ARGS[0] = 'boys':
 		'"You shouldn''t talk about him. You remember the last guy that talked behind his back?"'
 		'"I remember.. They never did find his legs did they? Umm, let''s talk about something else now..."'
 	elseif chat_rand = 35:
-		'"Dude, you''re not gonna believe this. There''s this chick in my class that''s always letting me look down her shirt!"'
+		'"Dude, you''re not going to believe this. There''s this chick in my class that''s always letting me look down her shirt!"'
 		'"Man, you''re so full of shit!"'
 	elseif chat_rand = 36:
 		'"I heard that Anushka and Alyona sometimes like to run around the school naked after lessons are over."'
@@ -686,7 +687,7 @@ if $ARGS[0] = 'boys':
 			*nl
 			'"Man, <<$pcs_nickname>> is such a washed up whore."'
 			'"I know, right? It''s kind of sad, really."'
-			'"Sad, but kinda hot at the same time. I wouldn''t mind getting a piece. She must be great in the sack with how often she gets fucked."'
+			'"Sad, but kind of hot at the same time. I wouldn''t mind getting a piece. She must be great in the sack with how often she gets fucked."'
 			'"If you can even feel anything. She must be so stretched out by now."'
 		else
 			*nl
@@ -713,13 +714,34 @@ if $ARGS[0] = 'boys':
 		'"I''m not interested in football."'
 		'"I''m not talking about the game. I''m going there to watch Bella do her stuff. I know a good spot in the stands where you can get a nice view of that toned ass."'
 		'"Oh I''m definitely down to see that!"'
+	elseif chat_rand = 43:
+	    '"I heard Albina''s ass is fake and that her dad paid for implants."'
+        'The other boy laughs. "Oh believe me, it's real. It's too firm to be fake."'
+        '"How would you know how firm her ass is? She would rip your arm off and fist you with it if you tried to cop a feel."'
+        '"I''ve watched her enough in gym class and at cheerleading. It doesn''t jiggle like implants would. It''s solid, toned muscle."'
+        'They quickly hush themselves when Albina walks past them, grinning as they gawk at her shapely rear.'
+	elseif chat_rand = 44:
+	    'You overhear two scrawny boys speaking to each other.'
+        '"Word is that Albina loves anal and makes people eat her ass." the first one whispers.'
+        'The other boy grins slyly. "The things I would do just to lick her asshole, but I would love to stick my dick between those big firm cheeks and-"'
+        'The first boy hushes his friend and looks nervously in Albina''s direction, who notices him staring at her and narrows her eyes, causing him to look back at his friend. "Quiet you idiot! You won''t have a dick left if she hears you talking about her like that!"' 
+	elseif chat_rand = 45:
+	    'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
+        '"Come on, you know you want it!" you hear one of them say.'
+        '"I don''t know. Is worth it?"'
+        '"An ass like that is always worth it. You''ve had a crush on her for as long as I know. Just go flirt with her. She might surprise you."'
+        *nl
+        'His friends push him towards her and she turns to face him. "Uh, hey. Do you wear space pants to gym class.....because your ass is out of this world." he asks with a crack in his voice, but still making a cringey attempt to act smooth.'
+        'Everyone, upon seeing or hearing what''s happening, turn and await Albina''s reaction. She is unimpressed by the attempted flirting, crossing her arms and laughing.'
+        '"No, I wear volleyball shorts because my ass is out of your league!" she answers before she stares him right in the eyes. "You have 3 seconds to get out of my sight. One..."'
+        'He doesn''t need to be told twice and flees in a panic, his laughing friends following close behind. You have never seen anyone run so fast in your life. Albina just smirks and turns back to what she was doing.'
 	else
 		gs 'gschool_gossip', 'boys'
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
 		*nl
-		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile thinking about what that means.'
+		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.'
 	end
 end
 
@@ -755,7 +777,7 @@ if $ARGS[0] = 'girls':
 		'"Maybe he''s gay?"'
 		'Her friend giggles. "No, he likes fucking girls, but just as friends."'
 	elseif chat_rand = 11:
-		'"Lazar is kinda cute."'
+		'"Lazar is kind of cute."'
 		'"Yeah and he has a huge dick. Biggest one I have ever seen, even bigger than the guys in pornos."'
 		'"When did you see it?"'
 		'"Some of us went skinny dipping one night over the summer and oh my god, it was scary big."'
@@ -781,7 +803,7 @@ if $ARGS[0] = 'girls':
 		'"Someone else told me that. They said something about a picture."'
 		'"Yeah, my sister and her friends went to see them play and during one of the sets, some slut climbs up on stage and just pulled his dick out and started sucking it right there on stage while the band kept playing. My sister took a picture and she sent it to me. It almost didn''t fit in the sluts mouth it was so big."'
 	elseif chat_rand = 16:
-		'"I kinda feel sorry for Lena. She can''t date any guys because Vitek keeps chasing them off."'
+		'"I kind of feel sorry for Lena. She can''t date any guys because Vitek keeps chasing them off."'
 		'"Yeah, I think she would be a lot nicer if he would just let her date a nice guy."'
 	elseif chat_rand = 17:
 		'"Have you seen the way Lera looks at Lena? She is so in love with Lena."'
@@ -852,8 +874,7 @@ if $ARGS[0] = 'girls':
 		'"I tried to talk to him after school, but he ignored me and stormed off towards the park."'
 		'"Hmm, I wonder what he does there."'
 	elseif chat_rand = 32:
-!!This, and the next gossip, are both parts that I felt like putting into multiple lines (it was a single line).
-		'You overhear some of the girls gossip with each other. "Who of the boys in the class do you think is the most feminine?" one of them asks.'
+        'You overhear some of the girls gossip with each other. "Who of the boys in the class do you think is the most feminine?" one of them asks.'
 		'"I don''t know, I haven''t really thought about it." The other one answers.'
 		'"Don''t be a drag, you have to pick one." she keeps on pushing.'
 		'The other girl thinks for a moment and finally answers. "I would say Igor. Sometimes he acts really strange and not like a real man."'
@@ -871,7 +892,7 @@ if $ARGS[0] = 'girls':
 			'You are laughing to yourself as you move away from them thinking, if they only knew...'
 		end
 	elseif chat_rand = 34:
-		'"Yesterday Natasha asked where I bought my top and I had to stop myself from laughing in her face."'
+		'"Natasha asked where I bought my top and I had to stop myself from laughing in her face."'
 		'"Why?"'
 		'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
 	elseif chat_rand = 35:
@@ -905,13 +926,31 @@ if $ARGS[0] = 'girls':
 		'"I''m wondering whether I should have tried out for the cheerleading squad or not."'
 		'"Yeah, I''m sure that they would have invited your unfit ass wih open arms. Besides, they''re a bunch of sluts who enjoy teasing the perverts in the stands and sucking off the football team."'
 		'"Maybe I did dodge a bullet then..."'
-	else
+	elseif chat_rand = 41:
+	    '"I might work out more. I want a big butt just like Albina''s!"'
+        '"Girl please. Her ass is as fake as her ''tough girl'' personality."'
+        '"I dare you to say that to her face!"'
+        'The girl turns silent. "Yeah, that''s what I thought." the first one quips.'
+	elseif chat_rand = 42:
+	    'Albina walks past a group of girls who check her out. Once she is out of earshot, they all start speaking.'
+        '"I wonder how much those butt implants cost!"'
+        '"Bitch, you''re just jealous because you have such a flat ass!"'
+        '"It just looks so big and firm!"'
+        '"I''m too scared to ask her what workout she does to get such a nice bum!"'
+        'You leave the girls to wallow in their envy of Albina.'
+	elseif chat_rand = 43:
+	    'You overhear some girls whispering amongst themselves.'
+        '"I was told that Albina is actually a lesbian, which is why she doesn''t like guys hitting on her." one says.'
+        '"Told by who?" a second one asks.'
+        '"Lizeveta. Although I also heard she sometimes skips class for a quicky in the bathrooms with some of the guys, so maybe she''s actually bi, like Anushka?"'
+        '"Still. You mean to say I have a better chance at eating her amazing ass than any of the guys here?" a third one says and they all laugh.'
+	else	
 		gs 'gschool_gossip', 'girls'
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
 		*nl
-		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile thinking about what that means.'
+		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.'
 	end
 end
 
@@ -1005,7 +1044,7 @@ if $ARGS[0] = 'Lizaveta':
 	elseif chat_rand = 43:
 		'"Natasha''s mom must be super poor. She is wearing the same school uniform she had last year."'
 	elseif chat_rand = 44:
-		'"What ever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
+		'"Whatever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
 	elseif chat_rand = 45:
 		'"Radomir acts like he is already the next Yuri Shatunov. I mean, he''s OK, but nowhere near as good as he likes to think he is."'
 	elseif chat_rand = 46:
@@ -1069,12 +1108,12 @@ if $ARGS[0] = 'gosip':
 			*nl
 			'"Man, <<$pcs_nickname>> is such a washed up whore."'
 			'"I know, right? It''s kind of sad, really."'
-			'"Sad, but kinda hot at the same time. I wouldn''t mind getting a piece, she must be great in the sack with how often she gets fucked."'
+			'"Sad, but kind of hot at the same time. I wouldn''t mind getting a piece, she must be great in the sack with how often she gets fucked."'
 			'"If you can even feel anything, she must be so stretched out by now."'
 		else
 			*nl
 			'"<<$pcs_nickname>> is such a washed up whore. She''ll do anything for money, nowadays."'
-			'"Yea, it''s sad. she used to be such a nice girl."'
+			'"Yea, it''s sad. She used to be such a nice girl."'
 			'"Totally. Very sad. So, can you loan me 200 <b>₽</b>?"'
 			'"Dude, seriously!? Why would you even want to touch her at all, you''d just boldly go where every man has gone before!"'
 			'"Come on man, I''m in a bit of a dry spell. Please? I''ll try to negotiate you in on the deal. Surely 200 <b>₽</b> is enough for two."'

+ 2 - 2
locations/gschool_lessons3.qsrc

@@ -204,7 +204,7 @@ if $ARGS[0] = 'literature':
 						grupvalue[4] -=1
 						grupvalue[3] += 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
-						'Realizing ir isn''t worth it, you hand over your phone without argument. "You can have this back after class." Ms Braakman says as she walks back to the blackboard.'
+						'Realizing it isn''t worth it, you hand over your phone without argument. "You can have this back after class." Ms Braakman says as she walks back to the blackboard.'
 						act 'Continue': gt 'gschool_lessonsev3', 'getphone'
 					end
 					gs 'willpower', 'exhib', 'self'
@@ -423,7 +423,7 @@ if $ARGS[0] = 'art':
 			elseif temp = 1:
 				'"Some expensive looking white lacy panties. Are they yours Katja?" Mr Vasilyev is desperately trying to get the class to calm down. You notice Katja blushing as you wonder how Anushka knows her panties.'
 			elseif temp = 2:
-				'"Ooooo. It looks like Albina''s leopard print thong." Mr Vasilyev is desperately trying to get the class to calm down. You notice Albina closing her knees together and giving them both a deathly cold stare. Erast starts frantically apologizing to her as you wonder how Anushka knows her panties.'
+				'"Oooooh. It looks like Albina''s leopard print thong." Mr Vasilyev is desperately trying to get the class to calm down. You notice Albina closing her knees together and giving them both a deathly cold stare. Erast starts frantically apologizing to her as you wonder how Anushka knows her panties.'
 			elseif temp = 3:
 				'"Black and yellow ''Slippery when wet'' panties." Mr Vasilyev is desperately trying to get the class to calm down as Anushka laughs. "Those are mine!" She grins at Erast, places a hand on his chest and looks him right in the eyes. "If you wanted to see, then all you had to do was ask." she says as she hikes up her skirt to show off her black and yellow panties. Mr Vasilyev opens his jacket wide to try and block the view.'
 			elseif temp = 4:

+ 12 - 12
locations/gschool_lessons4.qsrc

@@ -933,7 +933,7 @@ if $ARGS[0] = 'pe':
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bouncebhand.jpg"></center>'
-				'A girl from your brother''s grades is doing jumping jacks and her breasts are really bouncing, she obviously isn''t wearing a bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as her friend walks up behind her, reaches round and grabs her boobs. The first girl lets out a startled squeak then laughs, followed by a blush when her friend whispers in her ear and she sees all the boys staring.'
+				'A girl from your brother''s grade is doing jumping jacks and her breasts are really bouncing, she obviously isn''t wearing a bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as her friend walks up behind her, reaches round and grabs her boobs. The first girl lets out a startled squeak then laughs, followed by a blush when her friend whispers in her ear and she sees all the boys staring.'
 				gs 'arousal', 'voyeur', 2
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'shower2':
 	gymshower = rand(1,6)
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/showerspank.mp4"></video></center>'
-		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella asking "is it real?" and asking if she can "prove it."'
+		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella asking "Is it real?" and asking if she can "prove it."'
 	    'As you wash off the soap, you turn just in time to see Bella start spanking Albina; most of the girls in the shower room stop what they''re doing to watch. After several fairly hard smacks, they stop and laugh about it, Albina rubbing her ass with strange glee as Bella smiles and nods her head, seemingly in approval. Everyone then returns to showering.'
 	elseif gymshower = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/picture.jpg"></center>'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'long_shower':
 				gs 'stat'
 				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-					'As you walk into the locker room, you can tell it is Albina on the phone. She seems to be talking about her dance troupe and a new show they will be doing. Once you start drying your hair, you can''t hear what she says anymore. As you finish drying your hair but before you get dressed, she comes around to your side of the lockers wearing a towel while you are naked. She drops her towel, revealing her naked body before she turns towards you, giving you a even better view of her body. "So do you like what you see?" she asks.'
+					'As you walk into the locker room, you can tell it is Albina on the phone. She seems to be talking about her dance troupe and a new show they will be doing. Once you start drying your hair, you can''t hear what she says anymore. As you finish drying your hair, she comes around to your side of the lockers wearing a towel while you are naked. She smiles at you before dropping her 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', 'voyeur', 2
 					gs 'stat'
 					act 'Yes':
@@ -1368,8 +1368,8 @@ if $ARGS[0] = 'long_shower':
 						npc_rel['A23'] += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
-						'You decide to honest. "Yes, very much. I love looking at you. You''re very beautiful and I find your body very attractive."'
-						'She walks up to you and then turns you until you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are, whatever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
+						'You decide to be honest. "Yes, very much. I love looking at you. You''re very beautiful and I find your body very attractive."'
+						'She walks up, turns you around so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! Whatever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 						gs 'arousal', 'foreplay', 2
 						gs 'stat'
 						act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1420,7 +1420,7 @@ if $ARGS[0] = 'long_shower':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
 							'You decide to just confess your feelings. "Yeah I have, you''re very beautiful and I find your body very attractive."'
-							'She walks up to you and then turns you until you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are, whatever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
+							'She walks up to you, turns you so you are facing the lockers and gives your ass a hard slap and then a firm squeeze. "What a dirty girl you are! Whatever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 							gs 'arousal', 'foreplay', 2
 							gs 'stat'
 							act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
@@ -1545,7 +1545,7 @@ if $ARGS[0] = 'post_shower':
 			pcs_horny += 5
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/albpeek.jpg"></center>'
-			'You notice Albina going through her locker getting out her clothes. She is very pretty, some would even call her beautiful. You know most of the boys think she is one of the best looking girls in school and you can understand why - she has a near perfect body to go along with a beautiful face. She has a toned dancer build - thin with defined muscles and small perky breasts along with a smooth, clean shaven pussy. You doubt she has much body fat, but she has a large, firm looking ass that is the envy of every girl in school. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
+			'You notice Albina going through her locker getting out her clothes. She is very pretty, some would even call her beautiful. You know most of the boys think she is one of the best looking girls in school and you can understand why - she has a near perfect body to go along with a beautiful face. She has a toned dancer build - thin with defined muscles and small perky breasts, complimented by a smoothly waxed pussy. You doubt she has much body fat, but she has a large, firm looking ass that is the envy of every girl in school. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
@@ -1621,8 +1621,8 @@ if $ARGS[0] = 'post_shower2':
 		checkoutalbina = 1
 		pcs_horny += 5
 		pcs_mood += 10
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch<<rand(1,2)>>.jpg"></center>'
-		'You notice Albina soaping up her wet naked body, her hands rubbing all over her toned, shapely curves. She is very pretty, some would even call her beautiful. Most of the boys follow her around with their tongues hanging out and you can understand why. She is thin with defined muscles, small perk breasts and a smooth, clean shaven pussy and a large, firm looking ass. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+		'You notice Albina soaping up her wet naked body, her hands rubbing all over her curves. She has a toned dancer build - thin with defined muscles and small perky breasts, complimented by a smoothly waxed pussy as well as a large, firm looking ass. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
@@ -1725,11 +1725,11 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 5:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/boysraid.jpg"></center>'
-		'You are just starting to get dressed. Most of the girls are only in their underwear while a few are fully dressed and a couple are still naked. At that moment, the locker room door bursts open and everyone turns to look. You see Vitek and Dan standing in the doorway already dressed and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner of the locker room out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching pink thong, walks up to them and places her hand on the door. "Get the fuck out of here." she says in a low menacing tone.'
+		'You are just starting to get dressed. Most of the girls are only in their underwear while a few are fully dressed and a couple are still naked. At that moment, the locker room door bursts open and everyone turns to look. You see Vitek and Dan standing in the doorway already dressed and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching pink thong, walks up to them and places her hand on the door. "Get the fuck out of here." she says in a low menacing tone.'
 		'Dan snorts. "Or what?"'
 		'Albina doesn''t back down. "Do you really want to find out?" Everyone can hear the implied threat and considering her fearsome temper and willingness to get violently physical, Dan backs down.'
-		'Vitek however, just laughs. "Don''t get your panties in a twist. We just wanted to know if any of you girls wanted to take part in a ''private work out.''" he says lewdly.'
-		'"How is this for a workout?" Albina shouts before swiftly swinging her leg up and kicking Vitek straight in the crotch. He yelps in pain and hobbles out of the doorway clutching his crotch, a fearful looking Dan backing out behind him before Albina slams the door. "Fucking perverted assholes." With that taken care of, the girls go back to getting dressed. You notice most of them do it quicker than normal, seemingly afraid of a repeat visit.'
+		'Vitek however, just laughs. "Don''t get your panties in a twist. We just wanted to know if any of you girls wanted to take part in a ''private workout.''" he says lewdly.'
+		'"How is this for a workout?" Albina shouts before swiftly swinging her leg up and kicking Vitek straight in the balls. He yelps in pain and hobbles out of the doorway clutching his crotch, a fearful looking Dan backing out behind him before Albina slams the door. "Fucking perverted assholes." With that taken care of, the girls go back to getting dressed. You notice most of them do it quicker than normal, seemingly afraid of a repeat visit.'
 		'You can choose another outfit while you''re here.'
 		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 6:

+ 14 - 14
locations/gschool_sex.qsrc

@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'petka_lockerroom':
 												act 'No mercy':
 													*clr & cla
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/femdomlocker8.jpg"></center>'
-													'"That''s right you fucking slut!" Albina says as she grabs hold of Petka''s hips tightly with both hands and starts just hammering away at his ass as fast and hard as she can. He starts crying out and you think he isn''t enjoying her being this rough if he is even enjoying it at all. "I''m going to keep fucking your ass until you cum for me like the little slut that you are!" Albina growls. Apparently taking her at her word, Petka starts jerking off as hard and fast as he can, trying to cum while Albina rips up his ass.'
+													'"That''s right you fucking slut!" Albina says as she grabs hold of Petka''s hips tightly with both hands and starts just hammering away at his ass as fast and hard as she can. He starts crying out and you think he isn''t enjoying her being this rough, if he is even enjoying it at all. "I''m going to keep fucking your ass until you cum for me like the little slut that you are!" Albina growls. Apparently taking her at her word, Petka starts jerking off as hard and fast as he can, trying to cum while Albina rips up his ass.'
 													gs 'arousal', 'voyeur_sex', 5, 'dom', 'group'
 													gs 'stat'
 													act 'About to cum':
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'petka_lockerroom':
 														'"I''m about to cum." Petka grunts out.'
 														'"You better cum! If you don''t, then I am going to fuck you so hard you''ll wish you had." Albina threatens.'
 														'"I swear!" Pekta cries out. Albina gives him a few more hard full length strokes before pulling out of him.'
-														'"Sveta put your shoe on the bench." When you do as she asks, she grabs Petka by the throat and forces him to sit on the bench right in front of your shoes. "Now cum on her shoe." You are about to say something about not wanting cum on your shoe but she gives you a wink, so you decide to just wait and see. Petka, true to his word, doesn''t take long and he starts cumming, coating your shoe in his cum.'
+														'"Put your shoe on the bench, <<$pcs_nickname>>." When you do as she asks, she grabs Petka by the throat and forces him to sit on the bench right in front of your shoes. "Now cum on her shoe." You are about to say something, but she gives you a wink, so you decide to just wait and see. Petka, true to his word, doesn''t take long and he starts cumming, coating your shoe in his cum.'
 														gs 'arousal', 'voyeur_sex', 3, 'dom', 'group'
 														gs 'stat'
 														act 'Petka cleans up':
@@ -1324,13 +1324,13 @@ if $ARGS[0] = 'petka_anal':
 	gs 'boyStat', 'A6'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaanal1.jpg"></center>'
 	'You walk over to the bench and get down on your hands and knees. Looking over your shoulder at him, you can see him eagerly watching you. "Don''t just stand there. Come over here and fuck my ass!" you tell him. He looks momentarily surprised but then quickly rushes over, nearly tripping over his own feet in his haste. It takes him a couple of moments to line his dick up with your anus, but once he is sure he has it lined up, he pushes forward until the head of his dick pops into you. He slowly starts pumping his <<dick>>cm <<$dick_girth>> dick into your ass.'
-	gs 'arousal', 'vaginal', 5, 'dom'
+	gs 'arousal', 'anal', 5, 'dom'
 	gs 'stat'
 	act 'Reverse cowgirl':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaanal2.jpg"></center>'
 		'The mixture of pleasure and pain is intoxicating. Pain soon starts to give way to just pleasure as he reams your little asshole with his cock. He starts moaning loudly and hammering away faster and faster and you can tell he is on the verge of cumming. You pull away and he tries to follow, but you pull away fast enough that his dick slides out of your hole and you get down on your knees and start stroking him with your hand.'
-		gs 'arousal', 'vaginal', 5, 'dom'
+		gs 'arousal', 'anal', 5, 'dom'
 		gs 'stat'
 		act 'Cumtastic': gt 'gschool_sex', 'petka_titcum'
 	end
@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'albina_lockerroom':
 	act 'Eat her out':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles1.jpg"></center>'
-		'You get down on your hands and knees and place your head between her legs and start licking her already wet pussy. You can taste her juices as you lick her labia and clit. She reaches over and places a hand on the back of your head and pulls your face harder into her crouch as she starts to grind her pussy against your face. Her moans of pleasure echo in the empty locker room as your face gets smeared in her wetness. Eventually, she pulls your head away from her crotch as she stands up. "My turn to taste your pussy."'
+		'You get down on your hands and knees and place your head between her legs and start licking her already wet pussy. You can taste her juices as you lick her labia and clit. She reaches over and places a hand on the back of your head and pulls your face harder into her crotch as she starts to grind her pussy against your face. Her moans of pleasure echo in the empty locker room as your face gets smeared in her wetness. Eventually, she pulls your head away from her and stands up. "Your turn."'
 		gs 'arousal', 'cuni_give', 5, 'sub'
 		gs 'stat'
 		act 'Lie down':
@@ -1417,13 +1417,13 @@ if $ARGS[0] = 'albina_lockerroom':
 			act 'More pleasure':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles3.jpg"></center>'
-				'You spread your legs further apart, giving her even better access as you feel your arousal mounting. She stays on all fours as she tongue fucks you. She stiffens her tongue, sticking it out as far as it will go and pulls it all the way out, only to plunge it back inside of your pussy as far as it will go, tongue fucking you for all she is worth. She pulls away and stands up. "My turn again."'
+				'You spread your legs further apart, giving her even better access as you feel your arousal mounting. She stays on all fours as she tongue fucks you. She stiffens her tongue, sticking it out as far as it will go and pulls it all the way out, only to plunge it back inside your pussy as far as it will go, tongue fucking you for all she is worth. She pulls away and stands up. "My turn again."'
 				gs 'arousal', 'cuni', 5
 				gs 'stat'
 				act 'Return the favor':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles4.jpg"></center>'
-					'She straddles the bench and bends all the way over, presenting her pussy to you. You sit on the bench behind her, lean forward and start licking her pussy again which is now so wet, her juices are flowing down her inner thighs. "Eat my ass." she moans out as she reaches back and tries to pull your head up enough to lick her asshole.'
+					'She straddles the bench and bends all the way over, presenting her pussy to you. You sit on the bench behind her, lean forward and start licking her pussy again, which is now so wet that her juices are flowing down her inner thighs. "Eat my ass!" she moans out as she reaches back and tries to pull your head up enough to lick her asshole.'
 					gs 'arousal', 'cuni_give', 5
 					gs 'stat'
 					act 'Eat her ass':
@@ -1431,26 +1431,26 @@ if $ARGS[0] = 'albina_lockerroom':
 						npc_rel['A23'] += 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles5.jpg"></center>'
-						'You grab her ass and start licking her hole, getting it nice and wet as you listen to her moaning. She seems to really be enjoying this and her hand forces your face between her cheeks. "Stick your tongue in my ass." she tells you. You stick your tongue in her hole and start to tongue fuck her ass as she rocks back against your face, trying to take more of your tongue in her ass. A few minutes later, she pulls away and turns to you. "Get on your back. I want to sit on your face."'
+						'You reach up, spread her asscheeks and start licking her hole, getting it nice and wet as you listen to her moaning loudly. She seems to really be enjoying this and her hand forces your face between her cheeks. "Oh fuck yeah, taste my ass! Stick your tongue in me!" she blurts out between her moans of pleasure. You stiffen your tongue and press it against her hole. It soon slides in and you start to tongue fuck her back door as she rocks back against your face, trying to take your tongue deeper. A few minutes later, she pulls away and turns to you. "Get on your back. I want to sit on your face."'
 						gs 'arousal', 'rimming', 5
 						gs 'stat'
-						act 'Lay back': gt 'gschool_sex', 'albina_lockerroom69'
+						act 'Lie back': gt 'gschool_sex', 'albina_lockerroom69'
 					end
 					gs 'willpower', 'sex', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
-						act 'Just lick her pussy (<<will_cost>> Willpower)':
+						act 'Keep eating her pussy (<<will_cost>> Willpower)':
 							*clr & cla
 							npc_rel['A23'] -= 5
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles4.jpg"></center>'
-							'You reach up and pull her hand loose from your hair and go back to licking her pussy. she doesn''t say anything, but you don''t think she is happy about your refusal to eat her ass. A few minutes later, she pulls away and turns to you. "Get on your back. I want to sit on your face."'
+							'You reach up, pull her hand loose from your hair and go back to licking her pussy. She doesn''t say anything, but you don''t think she''s happy about your refusal to eat her ass. A few minutes later, she pulls away and turns to you. "Get on your back. I want to sit on your face."'
 							gs 'arousal', 'cuni_give', 5
 							gs 'stat'
-							act 'Lay back': gt 'gschool_sex', 'albina_lockerroom69'
+							act 'Lie back': gt 'gschool_sex', 'albina_lockerroom69'
 						end
 					else
-						act 'Just lick her pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						act 'Keep eating her pussy (<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
@@ -1461,7 +1461,7 @@ end
 if $ARGS[0] = 'albina_lockerroom69':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles6.jpg"></center>'
-	'You lie on your back and she straddles your face and lowers herself down until her pussy is grinding against your mouth. You start licking and sucking her engorged clit and she leans forward and returns the favor by licking your pussy. Several minutes of heaven pass as you both eat each other out when her body is rocked by an orgasm that completely coats your mouth and chin in her wetness. She almost collapses on top of you, barely holding herself up before finally climbing off you on shaking legs. As you stand up, she embraces you in a passionate French kiss as she reaches round and gives you a firm smack on the ass. She makes out with you for a few seconds before breaking the kiss and getting dressed.'
+	'You lie on your back and she straddles your face and lowers herself down until her pussy is grinding against your mouth. You start licking and sucking her engorged clit and she leans forward and returns the favor by licking your pussy. Several minutes of heaven pass as you both eat each other out when her body is rocked by an orgasm that completely coats your mouth and chin in her juices. She almost collapses on top of you, barely holding herself up before finally climbing off you on shaking legs. As you stand up, she embraces you in a passionate French kiss as she reaches round and gives you a firm smack on the ass. She makes out with you for a few seconds before breaking the kiss and getting dressed.'
 	gs 'arousal', 'cuni_give', 5
 	gs 'arousal', 'cuni', 5
 	minut -= 5

+ 26 - 2
locations/gschool_socialchg1.qsrc

@@ -545,9 +545,21 @@ if $ARGS[0] = 'tChristina':
 		gs 'fame', 'pav', 'sex', 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
-		'"I''m trying to get this lazy ass to perform better..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
+		'"I''m trying to get this lazy ass to perform better..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks.'
+		*nl
+		'"I am going to send these to everyone, they are going to love seeing these."'
 		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
+		act 'I don''t care':
+			socialchg['christina_day'] = daystart
+			socialchg['christina_dont_care'] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked2.jpg"></center>'
+			'"I don''t care," you shrug, looking down at yourself. "I''m not ashamed of my body. I like the way I look."'
+			'"And the boys are going to <i>love</i> the way you look," she guffaws back. Christina snaps several more pictures and inspects them before smiling to herself in satisfaction. "See you at school, slut. That''s enough of a break. Start running fatass!"'
+			'She begins shouting at Lina pushing her to start sprinting down the beach, slapping her ass when she deems she isn''t moving fast enough. Soon enough you''re left alone on the beach again.'
+			act'Continue':gt'gLake'
+		end
 	end
 end
 
@@ -586,7 +598,9 @@ if $ARGS[0] = 'tLina':
 		gs 'fame', 'pav', 'sex', 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
-		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
+		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks.'
+		*nl
+		'"I am going to send these to everyone, they are going to love seeing these."'
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Kick her ass (<<will_cost>> Willpower)':
@@ -598,6 +612,16 @@ if $ARGS[0] = 'tLina':
 		end	
 		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
+		act 'I don''t care':
+			socialchg['christina_day'] = daystart
+			socialchg['christina_dont_care'] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked2.jpg"></center>'
+			'"I don''t care," you shrug, looking down at yourself. "I''m not ashamed of my body. I like the way I look."'
+			'"And the boys are going to <i>love</i> the way you look," she guffaws back. Christina snaps several more pictures and inspects them before smiling to herself in satisfaction. "See you at school, slut. That''s enough of a break. Start running fatass!"'
+			'She begins shouting at Lina pushing her to start sprinting down the beach, slapping her ass when she deems she isn''t moving fast enough. Soon enough you''re left alone on the beach again.'
+			act'Continue':gt'gLake'
+		end
 	end
 end
 

+ 5 - 0
locations/hotel.qsrc

@@ -6,6 +6,11 @@ if $ARGS[0] = 'foyer':
 	nom_o[2] = 1000
 	nom_o[3] = 10000
 	nom_o[4] = 100000
+	$loc = 'hotel'
+	$menu_loc = 'hotel'
+	$loc_arg = 'foyer'
+	$menu_arg = 'foyer'
+	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.jpg"></center>'
 

+ 58 - 0
locations/indik.qsrc

@@ -220,6 +220,64 @@ else
 			end
 		end
 	end
+
+	if $ARGS[0] = '4':
+		if Enable_Android = 1:
+			if a  >= 65:
+				$ind = '<font color="green"><<a1>></font>'
+			elseif a >= 35:
+				$ind = '<font color="blue"><<a1>></font>'
+			else
+				$ind = '<font color="red"><<a1>></font>'
+			end
+		else
+			j = a/5
+			$ind = '<font face="courier new" size = <<i>>> </font>'
+			indik_counter = 0
+			:indik
+			if indik_counter < j:
+				$ind += '<font face="courier new" size = <<i>>>█</font>'
+				indik_counter += 1
+				jump 'indik'
+			elseif indik_counter < 20:
+				$ind += '<font face="courier new" size = <<i>>>_</font>'
+				indik_counter += 1
+				jump 'indik'
+			end
+			killvar 'indik_counter'
+			killvar 'j'
+			$ind += '<font face="courier new" size = <<i>>> </font>'
+			if grupTipe = ARGS[3]:
+				if a >= 85:
+					$ind = '<font color="green">' + $ind + 'Popular member</font>'
+				elseif a >= 60:
+					$ind = '<font color=#b3b300>' + $ind + 'Member</font>'
+				elseif a >= 40:
+					$ind = '<font color=#00CED1>' + $ind + 'Barely a member</font>'
+				elseif a >= 30:
+					$ind = '<font color="blue">' + $ind + 'Tolerated</font>'
+				elseif a >= 20:
+					$ind = '<font color=#ff6600>' + $ind + 'On last warning</font>'
+				else
+					$ind = '<font color="red">' + $ind + 'You will be kicked out</font>'
+				end
+			else
+				if a >= 80:
+					$ind = '<font color="green">' + $ind + 'Will be ask to join unless you are a slut</font>'
+				elseif a >= 70:
+					$ind = '<font color=#b3b300>' + $ind + 'Really Liked</font>'
+				elseif a >= 50:
+					$ind = '<font color=#00CED1>' + $ind + 'Liked</font>'
+				elseif a >= 20:
+					$ind = '<font color="blue">' + $ind + 'Tolerated</font>'
+				elseif a >= 10:
+					$ind = '<font color=#ff6600>' + $ind + 'Disliked</font>'
+				else
+					$ind = '<font color="red">' + $ind + 'Hated</font>'
+				end
+			end
+		end
+	end
 end
 
 --- indik ---------------------------------

+ 114 - 91
locations/journal.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'records':
 	if postjobQW = 2 or postjobQW = 4:$tab_text += dyneval($NoteBookLine,'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b> .')
 	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:$tab_text += dyneval($NoteBookLine,'You work part-time as a cleaner in the Pavlovosk clinic. Your schedule is from 16:00 to 21:00.')
 	if stripwork >= 1:$tab_text += dyneval($NoteBookLine,'You can work as a stripper in the city industrial region. You have an open schedule that can be every day from 15:00-00:00. No salary as you earn tips.')
-	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>')
+	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>.')
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.')
 	
@@ -77,12 +77,18 @@ if $ARGS[0] = 'records':
 	end
 	*nl
 	if masseuse['jobtype'] > 0:
-		if masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 9:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 13:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 17:00.</font></b>'
+		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>')
+		elseif masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>')
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>')
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>')
+		elseif masseuse['<<week>>_shift_3'] and hour < 17:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>')
+		elseif masseuse['<<week>>_shift_3'] = 1 and hour < 17:
+			$tab_text += dyneval($NoteBookLine,'<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>')
 		end
 	end
 	*nl
@@ -121,20 +127,21 @@ if $ARGS[0] = 'records':
 	
 	$tab_text += '<br><center><a href="exec: gt ''journal'', ''locations''">Locations</a></center>'
 	$tab_text += '<br><center><a href="exec: gt ''journal'', ''friends_family''">Friends & Family</a></center>'
-	if SchoolAtestat = 0 and storyline = 1: $tab_text += '<br><center><a href="exec: gt ''journal'', ''school''">School</a></center>'
+	if SchoolAtestat = 0 and storyline = 1 and SchoolBlock = 0: $tab_text += '<br><center><a href="exec: gt ''journal'', ''school''">School</a></center>'
 	$tab_text += '<br><center><a href="exec: gt ''journal'', ''clothing''">Clothing information</a></center>'
 	
 	$tab_text += '<center><h2>Relationships</h2></center>'
-
-	if grupTipe < 5 and grupvalue[grupTipe] > 700:
-		$journal_school_standing = ' You are well respected and liked within your clique.'
-	elseif grupTipe < 5 and grupvalue[grupTipe] > 300:
-		$journal_school_standing = ' You are in good standing with your clique.'
-	elseif grupTipe < 5:
-		$journal_school_standing = '<font color="red"> You are on the outs with your clique. You''re in danger of being cast out.</font>'
-	end
 	
 	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+	
+		if grupTipe < 5 and grupvalue[grupTipe] > 700:
+			$journal_school_standing = ' You are well respected and liked within your clique.'
+		elseif grupTipe < 5 and grupvalue[grupTipe] > 300:
+			$journal_school_standing = ' You are in good standing with your clique.'
+		elseif grupTipe < 5:
+			$journal_school_standing = '<font color="red"> You are on the outs with your clique. You''re in danger of being cast out.</font>'
+		end		
+		
 		if grupTipe = 0:
 			$tab_text += dyneval($NoteBookLine,'You are not a member of any particular school social group.'+$journal_school_standing)
 		elseif grupTipe = 1:
@@ -302,37 +309,37 @@ end
 
 if $ARGS[0] = 'friends_family':
 	*clr & cla
-	'<center><img src="images/pc/notebook/29.png"></center>'
+	'<center><img src="images/pc/npc_headshots/29.jpg"></center>'
 	'Mother Natasha - Your mother was born in Gadukino village. She is still quite young and attractive. You have done the math and know she had Anya when she was only sixteen years old. She works at the station cafe. Your grandmother died in child birth with your mother and your grandfather was killed a couple of years later in the Afghanistan war.'
 	*nl
-	'<center><img src="images/pc/notebook/35.png"></center>'
+	'<center><img src="images/pc/npc_headshots/35.jpg"></center>'
 	'Father Mikhail Kuznetsov - You''ve never seen your biological father since your parents divorced, so you have no real memory of him.'
 	*nl
-	'<center><img src="images/pc/notebook/28.png"></center>'
+	'<center><img src="images/pc/npc_headshots/28.jpg"></center>'
 	'Step Father Vladimir - Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father then married Vladimir when you were less than a year old. One year after being married, your parents welcomed your little brother Kolka, Vladimir''s first born child. Kolka is his only child that you know of. When not working, your stepfather can often be found working on his cars in the garage.'
 	*nl
-	'<center><img src="images/pc/notebook/33.png"></center>'
+	'<center><img src="images/pc/npc_headshots/33.jpg"></center>'
 	'Sister Anya - She is your older sister, two years your senior, but she still lives at home and shares a bedroom with you. She works at the local supermarket instead of going to the University like your mother wanted. She spends most of her free time either partying, hanging out with her friends or with her boyfriend Roma.'
 	*nl
-	'<center><img src="images/pc/notebook/34.png"></center>'
+	'<center><img src="images/pc/npc_headshots/34.jpg"></center>'
 	'Brother Kolka - He is your younger brother, born about a year after you. While you share the same mother, Kolka''s dad is your stepfather. He is a student at the same school as you and enjoys football. When he is not playing football or doing homework, he spends much of his free time hanging out with his friends.'
 	*nl
-	'<center><img src="images/pc/notebook/30.png"></center>'
+	'<center><img src="images/pc/npc_headshots/30.jpg"></center>'
 	'Aunt Lyudmila Knavs - Your aunt Luda works at the pharmacy in Pavlovsk. She is your mother''s older sister. She has a live in boyfriend named Olu that she meet while traveling. He is an African man, which causes more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care about that, and if anything, seems to enjoy flaunting her boyfriend in front of others.'
 	*nl
-	'<center><img src="images/pc/notebook/55.png"></center>'
+	'<center><img src="images/pc/npc_headshots/55.jpg"></center>'
 	'Oluuosegun "Olu" Maina - You don''t know much about your aunt''s live-in boyfriend, only that he is from Africa and doesn''t speak Russian very well. He''s a very large and muscular man. You know many in the area that find it disgraceful that your aunt lives with him.'
 	*nl
-	'<center><img src="images/pc/notebook/31.png"></center>'
+	'<center><img src="images/pc/npc_headshots/31.jpg"></center>'
 	'Great Grandpa Zlatek Knavs - Your great grandfather is a grumpy old man. He is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane. He doesn''t really leave the house anymore, unless he really has to. Your mother and aunt were raised by your great grandparents.'
 	*nl
-	'<center><img src="images/pc/notebook/32.png"></center>' 
+	'<center><img src="images/pc/npc_headshots/32.jpg"></center>' 
 	'Great Grandma Elena Knavs - Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of kids, so your great grandparents are now content with the peace and quiet of the village.'
 	*nl
-	'<center><img src="images/pc/notebook/54.png"></center>'
+	'<center><img src="images/pc/npc_headshots/54.jpg"></center>'
 	'Mikhail "Misha" - Your neighbor''s name is Mikhail, but everyone calls him "Uncle Misha". He lives in the apartment across the hall from you. Your mother always forbade you to talk to him by warning you that he used to be a local crime lord and that you shouldn''t get involved with him. However, he has always been polite and nice to you. He is close friends with your stepfather, but both have been evasive about how they met and became friends.'
 	*nl
-	'<center><img src="images/pc/notebook/112.png"></center>'
+	'<center><img src="images/pc/npc_headshots/112.jpg"></center>'
 	'Sergey Shulgin - He lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but still hearty looking. His wife, Vasily''s mother, left when Vasily was still a small child. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough, he never re-married after being left by his ex-wife.'
 	
 	act 'Go back': gt 'journal', 'records'
@@ -366,6 +373,22 @@ if $ARGS[0] = 'school':
 		'<font color="red">You are on the outs with your clique. You''re in danger of being outcast.</font>'
 	end
 	
+	*nl
+	'<center><h2>Standings by Social Group</h2></center>'
+	
+	'Cool Kids'
+
+	gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
+	
+	'Jocks'
+	gs 'indik', '4', grupvalue[2]/10, grupvalue[2], 2 & '<<$ind>>'
+	
+	'Nerds'
+	gs 'indik', '4', grupvalue[3]/10, grupvalue[3], 3 & '<<$ind>>'
+	
+	'Gopnik'
+	gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
+	
 	'<center><h2>Class schedule</h2></center>'
 	
 	'Monday: Math, Russian, Literature, Art, Biology, P.E'
@@ -401,19 +424,19 @@ end
 if $ARGS[0] = 'teachers':
 	*clr & cla
 	'<center><h2>Teachers & Facility</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/134.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/134.jpg"></center>'
 	'<center>Aleksandrina Volkov</center>'
 	'Aleksandrina Volkov is the school''s new headmistress. An attractive woman in her mid to late thirties who always dresses well, she was recently brought in to improve the school results after the school was falling behind in the national test scores. She has a reputation for being a strict, but fair disciplinarian. She also comes off as cold and distant to the students.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/132.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/132.jpg"></center>'
 	'<center>Ruslan Kuznetsov</center>'
 	'Ruslan Kuznetsov is the school''s special ed, career advisor and shop teacher. He is also the assistant Headmaster. He is one of the few teachers that''s passionate about his job and really believes that he can impact on the students future, but he is mostly ignored by everyone, even his colleagues. This has recently seen him start becoming bitter.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/26.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/26.jpg"></center>'
 	'<center>Anatoly E. Tsarev</center>'
 	'Anatoly Tsarev is the school''s math teacher. He''s a stern teacher who always demands the best out of his students. His daughter, Lera, is a gopnik who is also in your class. He''s married to Vera, who works at the train station as a ticket saleswoman and as a cleaner in the garment factory. There are rumors that since Lesco, his nephew, has come to live with them, his marriage has been on the rocks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/135.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/135.jpg"></center>'
 	'<center>Yeva Sokoloff</center>'
 	if grupTipe = 4:
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and she likes to think she is tough, often giving those in her class a hard look. It''s funny coming from someone that looks like the little old lady in the market. She is quick to send you to the Headmistress if you misbehave too much.'
@@ -421,7 +444,7 @@ if $ARGS[0] = 'teachers':
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and has a very firm no-nonsense teaching style, but can also be very kind and motherly to students that work hard and behave.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/129.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/129.jpg"></center>'
 	'<center>Serafim Ivanov</center>'
 	if grupTipe = 3:
 		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. This is to push his students to their greatest potential. He always has time to answer questions or help out if a student has trouble as long as they put in the effort. Many of the other students complain about how he picks on them, but the truth is he only accepts the best from his students and has no sympathy for those that refuse to put in the work.'
@@ -429,19 +452,19 @@ if $ARGS[0] = 'teachers':
 		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense, bitter teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. He is also known to be unfair, giving the nerds a free pass with homework or even quizzes, which he never does with the other cliques. He seems to take delight in catching the cool kids, jocks and gopniks out by ridiculing them on how little they know.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/128.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/128.jpg"></center>'
 	'<center>Makar Vasilyev</center>'
 	'Makar Vasilyev is the school''s music, art and drama teacher. He is always warm and friendly to all of his students; even those not in his class. He always smiles and will always take the time to listen or help out the students. He is well liked by most of them.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/137.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/137.jpg"></center>'
 	'<center>Raven Braakman</center>'
 	'Raven Braakman is the school''s Social Sciences and English teacher. She is from South Africa, but married a Russian man and moved to Pavlovsk. Her husband died in a car accident a few years ago. She has a strict teaching style and accepts only the best out of her students. It is rumored that she is a bit of a party goer in her free time.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/130.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/130.jpg"></center>'
 	'<center>Ilya Yenotin</center>'
 	'Ilya Yenotin is the school''s literature, language and your homeroom teacher. He does his best at keeping everyone happy, but is disliked by most of the students simply because he comes off as fake. You can often see him running down the halls chasing gopniks, trying to get them to attend class.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/131.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/131.jpg"></center>'
 	'<center>Viktor Pavlovich</center>'
 	if grupTipe = 3:
 		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall in his office. He is tough on anyone that isn''t athletically gifted and often yells at those lacking any athletic ability to the point of bringing them to tears. He is one of the meanest, if not the meanest, teacher in school.'
@@ -449,7 +472,7 @@ if $ARGS[0] = 'teachers':
 		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall his office. He likes to use it on students, especially female students. He is single and rumored to be a player. You''ve often seen him with different women around town.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/69.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/69.jpg"></center>'
 	'<center>Mikhail Nikolaevich</center>'
 	if grupTipe = 3:
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
@@ -459,15 +482,15 @@ if $ARGS[0] = 'teachers':
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. Some say he almost went pro in some sport, but hurt himself or something like that and now he tries to live through the glory of his students.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/138.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/138.jpg"></center>'
 	'<center>Arina Orlov</center>'
 	'Arina Orlov is the school''s biology and health teacher. She is the youngest teacher at school, having just finished college and this is her first job. She is a bit shy and mousey, which causes many of the students to ignore her during class. This leads to her having a bit of a problem controlling her classes. She''s not much older than her students and is very cute. This causes the boys to sometimes pay extra special attention to her during class.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/136.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/136.jpg"></center>'
 	'<center>Olga Aleksandrov</center>'
 	'Olga Aleksandrov is the school''s nurse, having transferred to your school at the start of the year. All the boys have fallen head over heels over this true beauty, describing her as slim and stacked; the ideal woman.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/133.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/133.jpg"></center>'
 	'<center>Rolan Matveev</center>'
 	if grupTipe = 1:
 		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, you and the other girls have caught him staring at you when he doesn''t think you are watching and will quickly look away.'
@@ -482,7 +505,7 @@ end
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	'<center><h2>Nerds</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/152.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/152.jpg"></center>'
 	'<center>Feofan Krupin</center>'
 	if grupTipe = 3:
 		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. He is the Game Master for the weekly game night and often invites others over to play games at his house.'
@@ -490,11 +513,11 @@ if $ARGS[0] = 'nerds':
 		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is a nerd''s nerd, but isn''t bad looking for one. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. Rumor is that he runs some silly game night for the other nerds, which has earned him the nickname "King of the Nerds."'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/2.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/2.jpg"></center>'
 	'<center>Artem Chebotarev</center>'
 	'Artem Chebotarev is a typical geek, but one could easily be deceived by his looks as he is actually not that bad looking. He does very well in school and is popular with the other geeks, not to mention that, thanks to his looks and good grades, he has befriended a lot of jocks as he is also their tutor outside of school. He otherwise tries to keep a low profile at school, especially around the cool kids and gopniks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/142.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/142.jpg"></center>'
 	'<center>Zinaida "Zina" Alkaev</center>'
 	if grupTipe = 3:
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is great at video games and knows all about fantasy, sci-fi, superheroes and other important things. The boys seem to love that she knows as much as they do about that stuff and that she can beat most of them at the games they play.'
@@ -502,7 +525,7 @@ if $ARGS[0] = 'nerds':
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is fairly popular with the male nerds for reasons unknown to everyone else. She seems to be a complete loner unless she is around her fellow nerds.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/6.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/6.jpg"></center>'
 	'<center>Petka Klyuyev</center>'
 	if grupTipe = 3:
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other students, preferring to only talk to his fellow nerds and mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes.'
@@ -510,23 +533,23 @@ if $ARGS[0] = 'nerds':
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other people, mostly spending his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes. However, he is afraid of his own shadow and is thus an easy target for bullying; other students are known to steal his homework.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/153.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/153.jpg"></center>'
 	'<center>Gerasim Vasilyev</center>'
 	'Gerasim Vasilyev is confined to a wheelchair from an early childhood accident. He is kind and nice to everyone, even if most don''t return the favor. He is well accepted by his fellow nerds and, surprisingly, a few of the jocks. The rest see him as an easy target to bully and/or force him to do their homework.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/12.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/12.jpg"></center>'
 	'<center>Julia Milov</center>'
 	'Julia is a diligent and silent girl. She''s very nerdy and doesn''t really have any friends other than her fellow nerds. She seems to like keeping to herself, but has sometimes been caught eyeing the other girls while they are changing after gym lessons, likely jealous of them.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/151.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/151.jpg"></center>'
 	'<center>Evgeny Kuznetsov</center>'
 	'Evgeny Kuznetsov is the school chess champion and you can always find him at the chess club at the community center. He is shy and very intelligent, but has not shown any interest in girls, or anyone else for that matter. No one would be surprised if he has mild autism.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/16.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/16.jpg"></center>'
 	'<center>Natasha Belova</center>'
 	'Natasha is an excellent student and one of the smartest people in your school. Even though you both live in the same building, her parents are very poor and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends as most of the other girls shun her or mock her poor clothing.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/240.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/240.jpg"></center>'
 	'<center><<"Natalia [Nat] Pavlova">></center>'	
 	'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her good looks and eagerness to help others prevents her from being an outcast. Despite this, she is rarely seen hanging out with anyone. She also fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
 	
@@ -537,49 +560,49 @@ end
 if $ARGS[0] = 'jocks':
 	*clr & cla
 	'<center><h2>Jocks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/149.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/149.jpg"></center>'
 	'<center>Lazar Pajari</center>'
 	'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the team captain. He excels in several sports, but his passion is football, at least when he is not chasing after girls or, more often not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different girls. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/3.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/3.jpg"></center>'
 	'<center>Ivan Prokhorov</center>'
 	'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and is considered to be very good looking by the girls in school. He spends a lot of time training and is regularly away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, although he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/18.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/18.jpg"></center>'
 	'<center>Christina Zvereva</center>'
 	'Christina is one of the school''s best athletes and is the most athletic girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, more than a bit of a bully to most of the other girls in school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/8.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/8.jpg"></center>'
 	'<center>Svyatoslav Voinov</center>'
 	'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest boy at school. His other focus is football, as well as many other sports the school offers. He''s always trying to one up Ivan or Lazar, but rarely manages to beat either of them at anything.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/23.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/23.jpg"></center>'
 	'<center>Albina Barlovskaya</center>'
 	'Albina Barlovskaya comes from a wealthy family and is considered to be one of the most attractive girls in school. She is a gifted dancer who is trying to conduct herself properly as her father is trying to become the town mayor, but she is well known for her short temper and is intimidating if angered. She leads a dance troupe that only the prettiest and best dancers are allowed to join. There are several rumors about her going around school, but nobody dares mention them in front of her out of fear of incurring her wrath.'
 	
 	if npc_grupTipe['A5'] = 2:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
 		'<center>Fyodor "Fedor" Kozlov</center>'
 		'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks Ivan''s level of talent. He is decent looking and often is seen chasing Ivan''s leftovers.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/141.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/141.jpg"></center>'
 	'<center>Veronika "Ronnie" Sokolov</center>'
 	'Veronika Sokolov is called the "Ice Queen" by her fellow students behind her back for a few reasons. One is that she is a very talented ice skater, there is even talk about how she might compete in the next winter Olympics. The other is because she is cold and indifferent and never lets anyone get close to her. She comes from one of the wealthier families in Pavlovsk.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/165.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/165.jpg"></center>'
 	'<center>Vanya Yanka</center>'
 	'Vanya Yanka is a little goofy jock, playing jokes on his teammates and annoying the coaches. He never goes too far with his jokes and is a good morale booster, so everyone likes him. Despite his easy going attitude, he is a better athlete than most would suspect. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. Vanya is also popular with the girls at school, but only seems to have eyes for Vicky.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/150.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/150.jpg"></center>'
 	'<center>Erast Vagin</center>'
 	'Erast Vagin is a huge boy and is very strong. He is not a looker or even clever, but is always polite and a little shy. When he is playing sports he changes into a demon, always fighting to win, putting his all into winning and nothing else. He is an average athlete and relies on his size and strength to win the day for him. Other than playing sports, he sometimes boxes with Ivan.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/19.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/19.jpg"></center>'
 	'<center>Avelina "Lina" Starov</center>'
 	'Lina Starov is a mediocre athlete. She''s sort of Christina''s friend... but not really. The right term would be Christina''s lapdog. She usually does anything Christina wants her to do, as if she doesn''t have a mind of her own. She is a very pretty girl and if she would think for herself, she would be a lot more popular.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/13.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/13.jpg"></center>'
 	'<center>Lariska Gruzdeva</center>'
 	'Lariska is a very athletic girl, with an exceptional talent for volleyball. However, she has a very weak personality and is very dependent on other people''s opinions of her. She spends most of her time trying to appease others, especially Christina. She considers Christina to be her best friend and she can often be seen following her around school.'
 	
@@ -590,22 +613,22 @@ end
 if $ARGS[0] = 'outcasts':
 	*clr & cla
 	'<center><h2>Outcast</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/7.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/7.jpg"></center>'
 	'<center>Lesco Tsarev</center>'
 	'Everyone bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and the cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very socialable. He always seems be sad and just wants to be left alone.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/159.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
 	'<center>Petia Alkaev</center>'
 	'Petia Alkaev is the class mooch. He persistently asks others for food, money and cigarettes. He can''t take a hint and doesn''t know the meaning of "personal space", which is made worse by the fact that he seems to be unaware of what soap is. He is an unattractive, overweight loser who makes girls uncomfortable by repeatedly hitting on them. No matter how many beatdowns he suffers or how many cruel pranks are pulled on him, he doesn''t seem to learn his lesson.'
 
 	if npc_grupTipe['A25'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		'After a series of slutty incidents that crescendoed at the dance where she got way too drunk, gave Vitek and his buddies a simultaneous blowjob and returned with her face covered in their cum, Sonia''s reputation has been in shambles. The girls give her the silent treatment, pretending she doesn''t exist, while the guys treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to refuse. Many say she has embraced being a cheap slut, happily letting anyone use her, while others say she has started to prostitute herself.'
 	end
 
 	if npc_grupTipe['A5'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
 		'<center>Fedor Kozlov</center>'
 		'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone, he has been an outcast. Fedor claims he was forced and had no choice, but most people think he actually wanted to do it. Many of the boys mock him, often asking if he has sucked any dicks lately. Even his former friend Ivan ignores him. The girls are nearly as bad, as many of them make fun of him as well. Fedor now mostly keeps to himself and tries to avoid the other students.'
 	end
@@ -617,7 +640,7 @@ end
 if $ARGS[0] = 'popular':
 	*clr & cla
 	'<center><h2>Cool kids</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/1.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/1.jpg"></center>'
 	'<center>Dimka Nosov</center>'
 	if grupTipe = 1:
 		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. He is the king of the school and everyone wants to either be his friend or hang out with him.'
@@ -625,19 +648,19 @@ if $ARGS[0] = 'popular':
 		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants. He seems to love verbally tormenting the nerds and outcasts when given the chance.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/22.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/22.jpg"></center>'
 	'<center>Elžbieta "Bella" Artamonov</center>'
 	'Bella Artamonov is the most beautiful girl in school and knows it, which makes her come off as arrogant. You don''t know her very well since she doesn''t want to deal with "kids." She seems to consider herself an adult already and the rest of her classmates as being beneath her, too young and childish for her to be around. You''ve heard some rumors about her only hanging around with people much older than herself.'
 	
-	'<center><img <<$set_imgh>> src="images/pc/notebook/147.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/147.jpg"></center>'
 	'<center>Andrey Aleksandrov</center>'
 	'Andrey Aleksandrov''s family took part in the exchange student program. Rumor is they were less than happy when the student they sent was an African American, but Andrey doesn''t seem to mind. He and Marcus quickly became friends and he tends to use Marcus'' rising popularity to boost his own and in the process, spends a lot less time with his long time girlfriend Stasya. The school nurse is his aunt.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/17.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/17.jpg"></center>'
 	'<center>Irina Devyatova</center>'
 	'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it. She has a very arrogant and haughty personality hidden behind her sweet smile. She often makes the boys do her dirty work.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/140.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/140.jpg"></center>'
 	'<center>Yelizaveta "Lizaveta" Petrov</center>'
 	if grupTipe = 1:
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and willing to use her looks to sweet talk boys into sharing any juicy gossip. If you want to know anything about anyone, she is the one to ask. Luckily, she seems more interested in collecting and sharing gossip than using it for her own gain.'
@@ -645,23 +668,23 @@ if $ARGS[0] = 'popular':
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and most boys seem torn. Thay are attracted to her, but are afraid she will tell everyone everything about them and their whole life becomes public knowledge.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/15.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/15.jpg"></center>'
 	'<center>Viktoriya "Vicky" Meynold</center>'
 	'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya. A good humored girl, she loves bright and crazy colored clothing. As a child, she took gymnastic lessons and as a result has excellent flexibility. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her flighty and unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/4.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/4.jpg"></center>'
 	'<center>Igor Kruglov</center>'
 	'Igor Kruglov is Dimka''s best friend and whenever you see one of them, the other is usually not too far away. With a small stature, high pitched voice and pretty face, many consider him to be very feminine. Normally a boy like him would be mocked but his friendship with Dimka, the most popular boy in school, shields him from such abuse. Many wonder about their friendship as Igor follows Dimka around so often and they seem to have always been friends. Some would even say that Igor is overly attached to Dimka. Other than Dimka, Igor doesn''t seem to have any other close friends.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/139.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/139.jpg"></center>'
 	'<center>Stanislava "Stasya" Pavlov</center>'
 	'Stasya Pavlov is a complete bitch, and always has been one, but now that her boyfriend Andrey hangs around with Marcus more than her, she has become a lot worse. She doesn''t care for Marcus at all, but never says anything around Marcus or Andrey. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/14.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/14.jpg"></center>'
 	'<center>Ekaterina "Katja" Meynold</center>'
 	'Katja Meynold is a very attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/146.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/146.jpg"></center>'
 	'<center>Marcus Larson</center>'
 	if grupTipe = 1:
 		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing and if he wasn''t such close friends with Andrey, he would have likely been a jock instead.'
@@ -669,12 +692,12 @@ if $ARGS[0] = 'popular':
 		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing, and stays with Andrey''s family, whom he has become close friends with.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/148.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/148.jpg"></center>'
 	'<center>Mefodiy Utkin</center>'
 	'Mefodiy Utkin is reasonably intelligent, with middle-of-the-road grades. He is fairly average looking, but possesses a good sense of humor and timing. He isn''t too popular, just popular enough to hang among the cool kids, who like his humor.'
 
 	if npc_grupTipe['A25'] = 1:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		if grupTipe = 4:
 			'Sonia Ivanko is an ordinary girl and doesn''t stand out much. Pretty, smart and sociable, Sonia loves to party and is rarely in a bad mood. She has started hanging out with the gopniks, trying to go to their parties. She lives with her mother in a small apartment after her father left some time ago. Her mother is a nervous, hysterical and scandalous woman who, when not at work in the Garment Factory, is often out drinking and flirting with men.'
@@ -693,44 +716,44 @@ end
 if $ARGS[0] = 'gopniks':
 	*clr & cla
 	'<center><h2>Gopniks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/9.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/9.jpg"></center>'
 	'<center>Vitek Kotov</center>'
 	'Vitek Kotov is an aggressive and strong guy who considers himself to be a "gangsta". He is very loud, obnoxious, and not very attractive. Lena is his twin sister, whom he is overly protective of, which has caused more than a fair share of drama. He is the leader of the local gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/154.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/154.jpg"></center>'
 	'<center>Radomir Popov</center>'
 	'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Buystvo (Pussy Riot). They are considered fairly talented. He is more or less an asshole who thinks he should already be a star. Thus, he can be arrogant to almost everybody. Some of the girls obviously adore him because they think he is cool or are just groupies that latch onto his limited fame. He is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/157.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/157.jpg"></center>'
 	'<center>Roman Yakovlev</center>'
 	'Roman Yakovlev is an absolute psychopath. He''s one of the smaller kids, but he is always causing trouble. He''ll start fights out of boredom, knowing that the other gopniks will have his back. He enjoys being especially cruel or sadistic to his victims. He once smashed a bottle over a guy''s head and then stabbed him in the face with it, all because he said the guy looked at him funny. Roman always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care. The other gopniks find his attitude amusing and seem to like that he''s always getting them into funny situations.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/10.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/10.jpg"></center>'
 	'<center>Dan Ryzhov</center>'
 	'Dan Ryzhov is a tall and skinny guy whose body language screams his disdain and contempt for others. He''s a very stubborn guy who will never let an argument be. He''s best friends with Vitek and Vasily and is considered to be the smartest of the bunch, although most don''t consider that to be much of a feat.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/145.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/145.jpg"></center>'
 	'<center>Ekaterina "Katyusha" Maksimov</center>'
 	'Ekaterina Maksimov, known as "Katyusha", is not a traditional beauty since her face is too masculine. She only seems to care about two things, booze and fighting. She gets the booze in any way she can, either by stealing it or convincing others to get it for her. When she "plays" with the boys, it only goes as far as she wants it. She is the only girl other than Lena who can do this. While the boys are afraid of Lena''s brother, she prefers fighting the boys herself.'
 	'Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one. This doesn''t bother her because she only cares about the opinion of the people whom earn her respect, which is really hard to do.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/158.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/158.jpg"></center>'
 	'<center>Valentin Bogdanov</center>'
 	'Valentin Bogdanov is the bassist in Radomir''s band and the nicest guy in the band. However, this doesn''t stop him from using his small amount of fame to use girls. He is just rarely a dick about it. His goal is to make enough cash from the band to buy an old American motorbike and ride it across the country. He can often be found hanging out with Anushka''s dad, working on his motorcycle when he is not hanging out with the band.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/24.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/24.jpg"></center>'
 	'<center>Pauline Sebagotulina</center>'
 	'Pauline Sebagotulina is a bit of a wild child, which makes her very unpredictable. She often hangs out with the gopniks in your class and is liked by them. No one dares to mess with her because she''s been in more fights than anyone else. She and Katyusha can sometimes be found sparring together and starting fights with others.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/156.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/156.jpg"></center>'
 	'<center>Arkadi Fyodorov</center>'
 	'Arkadi Fyodorov is the drummer in Radomir''s band. His family recently moved from Saint Petersburg to Pavlovsk. He was held back a year, so looks a bit older than his fellow students. He is very violent when angry, especially with anyone outside the gopniks. He is also not shy about reminding everyone how much harder the city is and how lame Pavlovsk is.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/20.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/20.jpg"></center>'
 	'<center>Yalena "Lena" Kotova</center>'
 	'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local gopniks. She has a chip on her shoulder, so she can be aggressive and unpredictable. She''s best friends with Lera and they can often be found together smoking in the school''s restrooms or hanging out after school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/11.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/11.jpg"></center>'
 	'<center>Vasily Shulgin</center>'
 	if grupTipe = 4:
 		'Also known as Shulga, Vasily is always hanging out with Dan and Vitek since they are his best friends. He''s considered the physically weakest one of the bunch, but is a bit of a prankster and is always making the others laugh, which makes him popular with the gopniks. He was raised by his father after his mother left when he was still an infant. When you were younger, you were good friends with him and as you both drifted towards the gopniks, have stayed good friends.'
@@ -738,23 +761,23 @@ if $ARGS[0] = 'gopniks':
 		'Also known as Shulga, Vasily is always hanging out with Dan and Vitek since they are his best friends. He''s considered the physically weakest one of the bunch, but is a bit of a prankster and is always making the others laugh, which makes him popular with the gopniks. He was raised by his father after his mother left when he was still an infant. When you were younger, you were good friends with him, but as you grew up you have somewhat drifted apart.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/144.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.jpg"></center>'
 	'<center>Anushka "Nush" Konstantinov</center>'
 	'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is not shy about her bisexuality. She is also a bit of a exhibitionist and her main goal in life seems to just be having fun. She does surprisingly well in school, but she seems to like getting into and causing trouble. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally with whatever she deems to be the most fun at the time. Other than the band, she hangs out a lot with Alyona. She and Radomir used to date.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/143.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/143.jpg"></center>'
 	'<center>Alyona Zima</center>'
 	'Alyona Zima is a hardcore troublemaker. She lives to cause trouble and jumps into any trouble she can find. She comes from a troubled family as her parents are alcoholic drug addicts. Most people view her as the apple that didn''t fall far from the tree. Knowing this, the teachers don''t even bother to try and help her out anymore. She can often be found drinking alcohol and the only person she seems to spend a lot of time around is Anushka. Her father is well known as a bad guy and a bully.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/21.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/21.jpg"></center>'
 	'<center>Valeria "Lera" Tsarev</center>'
 	'Lera Tsarev comes from a poor family, but her father works at the school as a teacher. She often hangs out with the gopniks in your class and is liked by them. She''s best friends with Lena and they can often be found together, smoking in the school''s restrooms or hanging out after school. She is protective of Lena and always takes her lead. It is rumored that she is a lesbian and in love with Lena.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/155.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/155.jpg"></center>'
 	'<center>Lavrenti Romanov</center>'
 	'Lavrenti Romanov comes from a wealthy family. He is an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which resulted in him and Dimika having a major falling out. Since the fight, he has been hanging with the gopniks. However, he is more of a follower, the gopniks tolerating him while using his money.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/189.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/189.jpg"></center>'
 	'<center>Nikolai Volkov</center>'
 	'Niko Volkov is clever, but short tempered. When he is not drinking and partying, he is hanging out with Roman, with many saying that he only spends time with Roman for his money. Niko always seems confident and well spoken, but he can sometimes come off as paranoid and unstable.'
 	

+ 49 - 60
locations/katjaEv.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = '':
 		dummy = rand(1,6)
 		gs 'stat'
 
-		if npc_rel['A14'] >= 50 and dummy = 1: minut += 5 & gt 'katjaEv','TamVal'
+		if meynoldQW = 1 and npc_rel['A14'] >= 50 and dummy = 1: minut += 5 & gt 'katjaEv','TamVal'
 
 
 		if meynoldQW > 1 and pcs_makeup <= 1:
@@ -97,7 +97,7 @@ if $ARGS[0] = '':
 		else
 			gt 'KatjaEv','kathan'
 		end
-    end
+	end
 	if meynoldQW >= 2: act '"Let''s going to do our homework, Katja"': minut += 5 & gt 'katjaEV','1'
 end
 
@@ -262,7 +262,7 @@ if $ARGS[0] = '6':
 
 		exit
 	elseif katjaDeystRand = 1:
-		if npc_sex['A14'] = 1:
+		if npc_sex['A14'] > 0:
 			if KatjaSlut <= 150:
 				'Katja invites you to take a walk in the park.'
 
@@ -821,7 +821,7 @@ if $ARGS[0] = 'kathan':
 						end
 						'You decide to pass some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 
-						if arrsize('swimwear') > 0:
+						if func('changingroom','count_swim_item') > 0:
 							act 'Put on your swimwear':
 								*clr & cla
 								if KatjaSlut >= 20 and KatjaHorny >= 20:
@@ -914,7 +914,7 @@ if $ARGS[0] = 'kathan':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
 					'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 
-					if arrsize('swimwear') > 0:
+					if func('changingroom','count_swim_item') > 0:
 						act 'Put on your swimwear':
 							*clr & cla
 							if KatjaSlut >= 20 and KatjaHorny >= 20:
@@ -1013,8 +1013,8 @@ if $ARGS[0] = 'kathan':
 end
 
 if $ARGS[0] = 'kathanlakesw1':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		minut +=10
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw1'
@@ -1034,8 +1034,8 @@ end
 
 
 if $ARGS[0] = 'kathanlakesw2':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw2'
 		gs 'changingroom', 'view_swim_list'
@@ -1058,8 +1058,8 @@ if $ARGS[0] = 'kathanlakesw2':
 end
 
 if $ARGS[0] = 'kathansaunasw1':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw1'
 		gs 'changingroom', 'view_swim_list'
@@ -1071,8 +1071,8 @@ if $ARGS[0] = 'kathansaunasw1':
 end
 
 if $ARGS[0] = 'kathansaunasw2':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw2'
 		gs 'changingroom', 'view_swim_list'
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'kathansaunasw2':
 		'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
 		'"Bitch!"'
 		'You varelly whisper your insult and take the gigling bimbo wannabe towards the sauna .'
-										
+
 		act 'Go to the sauna':gt 'katjaEv','kathan10'
 	end
 end
@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'kathan1':
 			react_exp += 1
 			icesktng_exp += 1
 			minut += 30
-			mood +=10
+			pcs_mood +=10
 			npc_rel['A14'] += 1
 			gs 'stat'
 
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'kathan1':
 						'Before you can react, Christina has returned at full speed, scraping the lake''s frozen surface with her skates and showering you with dirty ice, before turning and leaving while laughing. Seriously? Finally, you stand with Katja''s help. It seems that, at least for a while, you have lost interest in skating. It is time to look for something else to do.'
 						gs 'stat'
 
-						act 'Continue':mood -=10 & gt 'katjaEv','kathan'
+						act 'Continue':pcs_mood -=10 & gt 'katjaEv','kathan'
 					end
 				end
 
@@ -1271,7 +1271,7 @@ end
 if $ARGS[0] = 'kathan2':
 	*clr & cla
 	minut += 30
-	mood +=10
+	pcs_mood +=10
 	npc_rel['A14'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS9.jpg"></center>'
@@ -1353,14 +1353,14 @@ if $ARGS[0] = 'kathan3':
 			'You and Katja can only look with utter prepotency towards the crestfallen girls as they retreat to treat their men. This has been fun, but it is time to look for something else to do.'
 			gs 'stat'
 
-			act 'Continue':mood +=10 & gt 'katjaEv','kathan'
+			act 'Continue':pcs_mood +=10 & gt 'katjaEv','kathan'
 		else
 			'"Oh Crap! Vanya!"'
 			'You scream sadly when, after many falls, kicks (This is hockey!) and bloodied noses, your team loses. Vanya lies on the ground tired, and you can only walk towards him with the Meynolds to try to cheer the crestfallen boy as the bitch squad giggle at your defeat.'
 			'Vicky embraces her poor boyfriend and whispers something into his ear that makes the jock smile sheepishly and get up, suddenly grab the redhead and quickly leave as a smiling Vicky winks an eye towards you. Well, it is time to look for something else to do.'
 			gs 'stat'
 
-			act 'Continue':mood -=10 & gt 'katjaEv','kathan'
+			act 'Continue':pcs_mood -=10 & gt 'katjaEv','kathan'
 		end
 	end
 
@@ -1437,7 +1437,7 @@ if $ARGS[0] = 'kathan5':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	pcs_makeup = 1
 	cumspclnt = 4 & gs 'cum_cleanup'
 
@@ -1509,7 +1509,7 @@ if $ARGS[0] = 'kathan6':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	if pcs_sweat < 35 : gs 'sweat', 'add', 5
 	pcs_tan = pcs_tan + 3
 	gs 'stat'
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'kathan7':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	gs 'stat'
 
 	act 'Swim': gt 'katjaEv','kathan5'
@@ -1657,7 +1657,7 @@ if $ARGS[0] = 'kathan9':
 			if $clothingworntype = 'nude' and KatjaSlut <= 20: KatjaSlut += 5
 			npc_rel['A14'] += 1
 			npc_rel['A3'] +=1
-			mood += 10
+			pcs_mood += 10
 			KatjaHorny += 5
 			gs 'stat'
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
@@ -1682,8 +1682,7 @@ if $ARGS[0] = 'kathan9':
 
 				act '"Hey Ivan! You know, we are REALLY bored!"':
 					*clr & cla
-					gs 'arousal', 'kiss', '5'
-					group += 1
+					gs 'arousal', 'kiss', 5, 'group'
 					gs 'stat'
 					'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL9.jpg"></center>'
@@ -1694,9 +1693,9 @@ if $ARGS[0] = 'kathan9':
 
 					act 'Who is going to do the honors?':
 						*clr & cla
-						gs 'arousal', 'voyeur', '5'
-						KatjaThroat+=1
 						gs 'boyStat', 'A3'
+						gs 'arousal', 'voyeur', 5
+						KatjaThroat+=1
 						gs 'stat'
 
 						if KatjaHorny >= 40:
@@ -2227,13 +2226,11 @@ end
 if $ARGS[0] = 'kathan13':
 	*clr & cla
 	menu_off = 1
-	gs 'arousal', 'vaginal_finger_give', '5', 'exhibitionism'
-	gs 'arousal', 'cuni', '5', 'exhibitionism'
 	$orgasm_or = 'yes'
+	gs 'arousal', 'vaginal_finger_give', 5, 'exhibitionism', 'lesbian'
+	gs 'arousal', 'cuni', 5, 'exhibitionism', 'lesbian'
 	pcs_mood += 10
-	girl += 1
-	lesbian += 1
-	npc_sex['A14'] += 1
+	if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] += 1
 	gs 'fame', 'pav', 'sex', rand(0,2)
 	gs 'stat'
 
@@ -2287,7 +2284,7 @@ if $ARGS[0] = 'kathan14':
 	npc_rel['A14'] += 1
 	minut += 30
 	grupvalue[1] += 1
-	if chrsm <= 45:chrsm_exp += 1
+	if pcs_chrsm <= 45:chrsm_exp += 1
 	gs 'stat'
 
 	if random_event <= 5:
@@ -2492,7 +2489,7 @@ if $ARGS[0] = 'kathan15':
 	npc_rel['A16'] += 1
 	minut += 30
 	grupvalue[1] += 1
-	if chrsm <= 45:chrsm_exp += 1
+	if pcs_chrsm <= 45:chrsm_exp += 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS12.jpg"></center>'
@@ -3244,22 +3241,19 @@ if $ARGS[0] = 'TamVal':
 								'Too shocked and aroused, Katja lets you lie her on the bed, take away her panties, and go down on her. She has lost any reservation to be heard, and her moans fill the room. Your assault on her pussy, united to the arousal your touch has brought, makes her happily thrash all over the bed.'
 								'You feel it when Katja raises her hips and a long guttural grunt escape her lips. She orgasms, and in that instant, a sympathetic link triggers, letting her energy flow towards you. Katja moans again and again as your feeding triggers orgasm after orgasm.'
 								'Finally, exhausted, Katja lies on the bed, cuddling against you. For the next few minutes she doesn''t say anything, and in fact, seems to be on the brink of dozing off. You begin to pick up your clothes. It is probably best if you leave now.'
-								gs 'arousal', 'vaginal_finger_give', '10'
-								gs 'arousal', 'cuni_give', '10'
+								gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
+								gs 'arousal', 'cuni_give', 10, 'lesbian'
 								pcs_mood += 20
 								KatjaSlut += 20
 								npc_rel['A14'] += 5
-								npc_sex['A14'] = 1
+								if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] = 1
 								KatjaOTN = 1
-								minut -= 5
 								npcbrokehymen = 1
 								KatjaLust += 20
 								sexnutrition += 25 * scfeed
 								suclezsex = lesbian
 								succubxp += 6
 								sucabslez = 1
-								girl += 1
-								lesbian += 1
 								gs 'stat'
 
 								act 'Time to leave': gt 'katjaEv','TamVal_2'
@@ -3430,19 +3424,14 @@ end
 
 if $ARGS[0] = 'katnatsex1':
 	*clr & cla
-	gs 'arousal', 'voyeur', '10', 'lesbian'
-	girl += 2
-	lesbian += 1
-	group += 1
+	gs 'arousal', 'voyeur', 10, 'lesbian', 'group'
 	NatbelQW['training'] += 1
 	KatjaSlut += 10
 	npc_rel['A14'] += 5
-	npc_sex['A14'] += 1
+	if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] += 1
 	npc_rel['A16'] += 5
-	npc_sex['A16'] += 1
-	
+	if npc_sex['A16'] = 0: girl += 1 & npc_sex['A16'] += 1
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS6.jpg"></center>'
 	'"Ok Slut, this is what is going to happen. You see cute little Katja here? Well, you are coming with us and will eat her pussy like there is no tomorrow. Do that and I will condone some of your debt. Understood?"'
 	'Natasha looks at you, but doesn''t retort, She just looks to Katja for a moment and then nods. Yeah! Total control!'
@@ -3482,11 +3471,11 @@ if $ARGS[0] = 'katnatsex1':
 
 			gs 'willpower', 'cuni', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
-				act 'Force the girls to eat you':
+				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
 					KatjaDom += 5
-					gs 'arousal', 'cuni', '10', 'lesbian'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3506,8 +3495,8 @@ if $ARGS[0] = 'katnatsex1':
 			act 'Your turn!':
 				*clr & cla
 				KatjaDom += 5
-				gs 'arousal', 'cuni', '10', 'lesbian'
 				$orgasm_or = 'yes'
+				gs 'arousal', 'cuni', 10, 'lesbian'			
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3567,11 +3556,11 @@ if $ARGS[0] = 'katnatsex1':
 
 			gs 'willpower', 'cuni', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
-				act 'Force the girls to eat you':
+				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
 					KatjaDom += 5
-					gs 'arousal', 'cuni', '10', 'lesbian'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3588,11 +3577,11 @@ if $ARGS[0] = 'katnatsex1':
 				act 'Force the girls to eat you (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'You!':
+		act 'You':
 			*clr & cla
 			KatjaDom += 5
-			gs 'arousal', 'cuni', '10', 'lesbian'
 			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 10, 'lesbian'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 			'You shove Natasha away and jump on the redhead who, faking surprise, lets your tongue ravage her mouth.'
@@ -3623,12 +3612,12 @@ if $ARGS[0] = 'katnatsex1':
 		end
 	end
 
-	act 'You!':
+	act 'You':
 		menu_off = 1
 		*clr & cla
 		KatjaDom += 5
-		gs 'arousal', 'cuni', '10', 'lesbian'
 		$orgasm_or = 'yes'
+		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 		'You shove Natasha away and jump on the redhead who, faking surprise, lets your tongue ravage her mouth.'
@@ -3659,7 +3648,7 @@ if $ARGS[0] = 'katnatsex1':
 				act 'help Katja with Natasha':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					gs 'arousal', 'kiss', '10', lesbian
+					gs 'arousal', 'kiss', 10, lesbian
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS11.jpg"></center>'
 
@@ -3711,7 +3700,7 @@ end
 if $ARGS[0] = 'katnatsex2':
 	*clr & cla
 	minut += 10
-	gs 'arousal', 'voyeur', '5', 'lesbian'
+	gs 'arousal', 'voyeur', 5, 'lesbian'
 	NatbelQW['Debt'] -= 500
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS9.jpg"></center>'
@@ -3728,7 +3717,7 @@ end
 if $ARGS[0] = 'katnatsex3':
 	*clr & cla
 	minut += 10
-	gs 'arousal', 'voyeur', '5', 'lesbian'
+	gs 'arousal', 'voyeur', 5, 'lesbian'
 	NatbelQW['Debt'] = 0
 	npc_rel['A14'] -= 5
 	gs 'stat'

+ 8 - 9
locations/katjaEvDin.qsrc

@@ -185,7 +185,6 @@ if $ARGS[0] = 'dildo':
 	act 'Strap it on':
 		*clr & cla
 		minut += 3
-		lesbian += 1
 		gs 'boystat', 'D<<strapnumber>>', 'b'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon.jpg"></center>'
@@ -207,8 +206,7 @@ if $ARGS[0] = 'shower_kiss':
 	'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'
-	minut -= 5
+	gs 'arousal', 'vaginal_finger', -5, 'lesbian', 'dom'
 	gs 'stat'
 
 	if KatjaSlut >= 10:
@@ -253,7 +251,7 @@ if $ARGS[0] = 'shower_kiss':
 	gs 'willpower', 'cuni', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Remove her hands (<<will_cost>> Willpower)':
-			cls
+			*clr & cla
 			minut += 5
 			pcs_horny += 10
 			KatjaDom -= 1
@@ -401,7 +399,6 @@ if $ARGS[0] = 'kuni_dom':
 	menu_off = 1
 	KatjaSlut += 1
 	KatjaLust += 1
-	lesbian += 1
 	katjahorny = 0
 
 	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
@@ -514,13 +511,15 @@ if $ARGS[0] = 'kuni_dom':
 								'She keeps picking up speed, soon the sounds of the skin from her hips slapping against your butt can be heard over your moaning. She seems to lose herself in the act. She stops paying attention to you. You don''t even think she would notice if you orgasmed. After a long time she starts panting. You can tell she is starting to get physically tired and worn out.'
 
 								gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
-								gs 'stat'
-
-								if pcs_horny = 100:
-									analorgasm += 1
+								
+								if pcs_horny >= 100:
 									$orgasm_or = 'yes'
 									$orgasm_txt = 'It is then that your orgasm hits you, it is sudden and amazingly intense.'
+									gs 'arousal', 'anal_strap', -1, 'lesbian', 'sub', 'rough'
 								end
+																
+								gs 'stat'
+								
 								'Yet she doesn''t slow down her furious pace. Finally unable to keep it up anymore she collapses on your back. You can feel the sweat from her body on your back and her heavy breathing in your ear. As she rests, half leaning against and half laying on you, with the dildo still buried it''s full length up your ass.'
 								'You take the time to rest and relax yourself coming down from the amazing fucking you just received. A few moments later she kisses your back and your neck, before getting off you and pulling the dildo out slowly. Getting up yourself, you see her taking the harness off and tossing it aside. You notice that her thighs are slick with sweat and her own juices. Once it is off and you are facing her, she grabs you by the neck and gives you a passionate, deep, long kiss. Finally breaking the kiss "My god <<$pcs_nickname>> that was amazing. I hope I didn''t hurt you too much and you enjoyed it as much as I did. No wonder boys fuck us like that, that was amazing."'
 								'She says as she falls back on her bed laying on her back, still breathing hard and looking at you with a somewhat possessive look. You lay down next to her. "It was wonderful, I''m glad you enjoyed it too, even if you were a little rough at times." She leans over and gives you another kiss. "Sorry <<$pcs_nickname>> if I was to rough, but that was beyond description, we are going to have to do that again." The two of you lay quietly for a while, basking in the aftermath. You know something in your relationship has changed and you think for the better. After a while you get up and get dressed, you need to get going.'

+ 112 - 112
locations/korr.qsrc

@@ -70,28 +70,28 @@ gs 'themes', 'indoors'
 
 if remkorr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korr.jpg"></center>'
-	'In the hallway the wallpaper is somewhere detached from the walls and anyway from long time faded. A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall.'
+	'The wallpaper in the hallway has long since faded and is peeling from the walls. A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korr2.jpg"></center>'
-	'Modern hall with stylish furniture, a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
+	'A modern hall with stylish furniture, including a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 end
 
 if umbrella > 0:'On a hook hangs an umbrella.'
 
 if krolik = 1:'Resting on the floor there''s your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a>.'
-if ParrotQW['Owned1'] = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a>.'
+if ParrotQW['Owned1'] = 1:'Your parrot sits in a cage. <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a>.'
 
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
 	parkday = daystart
-	'A heavy envelope has arrived in the mail. When you open it you find several pictures inside. Shit! Are pictures of you giving blowjobs to two guys in the park.'
+	'A heavy envelope has arrived in the mail. When you open it, you find several pictures inside. Shit! Are these pictures of you giving blowjobs to two guys in the park?'
 	'A small note accompanying them says:'
-	'If you do not want these pictures to posted on your porch and sent to your work place, come to this address (address listed is a Studio)'
+	'If you do not want these pictures to be posted on your porch and sent to your work place, then come to this address (address listed is a Studio)'
 	'PS, if you do not come today, these pictures will be hanging in your entrance hall tomorrow.'
 elseif parkday ! daystart and parkblackmail = 2:
 	parkblackmail = 0
 	fotoyousuck = 1
-	'Oh shit! Photos of you with your face covered in sperm and two dicks in your mouth are covering your entrance hall walls.'
+	'Oh shit! Photos of you with your face covered in cum with two dicks in your mouth are covering your entrance hall walls.'
 end
 
 !!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
@@ -102,7 +102,7 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	act 'Go to the door':
 		*clr & cla
 		gs 'stat'
-		'You go to the door and look through the peephole. You see a dark male figure. Apparently the man heard you and says through the door. "It''s me. Grisha, the plumber. You owe me some money, remember?"'
+		'You go to the door and look through the peephole. You see a dark male figure. Apparently the man heard you. "It''s me. Grisha, the plumber. You owe me some money, remember?" he syas through the door.'
 
 		act 'Answer the door':
 			*clr & cla
@@ -137,7 +137,7 @@ if BurgerQW['IvanQW']  = 3 and hour >= 9 and hour <= 20:
 		year += 5
 		age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 		money = 2000
-		'A police patrol arrives and takes you to court. After standing a trial, you were given five years of general regime and required to pay your debt of <<DolgRS>>.'
+		'A police patrol arrives and takes you to court. After standing trial, you are given five years of jail time and are required to pay your debt of <<DolgRS>>.'
 
 		act 'Sit on the area':
 			*clr & cla
@@ -177,7 +177,7 @@ if BurgerQW['IvanQW']  = 3 and hour >= 9 and hour <= 20:
 			lektor = 0
 			gs 'stat'
 
-			'Time draggs on slowly. Your life and work are tedious and monotonous. You''ve been sewing for five years, having meals in the dining room and going to sleep in the barracks surrounded by other women inmates. With your salary of 2,000 <b>₽</b> per month 1000 of which going on debt repayment. But for as slow as it seems, time does not stand still and finally your torment comes to an end. You are released and given 2,000 <b>₽</b>. You take the train and came back to the city.'
+			'Time drags on slowly. Your life and work are tedious and monotonous. You''ve been sewing for five years, having meals in the dining room and going to sleep in the barracks surrounded by other female inmates. 1,000 <b>₽</b> of your 2,000 <b>₽</b> per month salary goes towards your debt repayment. As slow as it seems, time does not stand still and your torment finally comes to an end. You are released and given 2,000 <b>₽</b>. You board the train and come back to the city.'
 
 			act 'Get off the train': gt 'city_industrial_train', 'outside'
 		end
@@ -188,29 +188,30 @@ end
 if BurgerQW['IvanQWDay'] ! daystart and BurgerQW['IvanQW']  = 1 and hour >= 8 and hour <= 20:
 	'<b><font color="red">The doorbell rings</font></b>'
 
-	act 'Come to the door':
+	act 'Walk up to the door':
 		*clr & cla
 		gs 'stat'
-		'You came to the door and look through the peephole. You saw a few men. Even in the dark you recognize them from their caps. One of the men says through the door. <<$pcs_firstname>> <<$pcs_lastname>> open, police.'
+		'You walk up to the door and look through the peephole. You see a few men, and even in the dark, you recognize them from their caps. <<$pcs_firstname>> <<$pcs_lastname>>! This is the police, open up!'
 
 		act 'Answer the door':
 			*clr & cla
 			minut += 60
 			BurgerQW['IvanQW']  = 2
 			gs 'stat'
-			'You open the door to police wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny guy with with a weeks worth of stubble and a pistol in a holster on a belt-tied armpit says: "Witness please take a seat, while we search the apartment of the citizen accused of stealing." The investigator turns to you. "That''s a warrant for your arrest, while this is a search warrant. You can read it." The policemen full search your apartment. Soon, one of them came out and says: "Here, are found the keys, according to the description they look like the keys to the office and the safe where the money was stolen." The witnesses signs the protocol got from the investigator. He then frowns at you and nodds to the policeman, who puts your hands behind your back and snaps the handcuffs around your wrists.'
+			'You open the door, wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny guy with with a weeks worth of stubble and a pistol in a holster slung under his armpit says "Please take a seat while we search the apartment." The decective then turns to you. "That''s a warrant for your arrest and this is a search warrant. You can read them." The police fully search your apartment. Soon, one of them comes out and says: "Here are the keys. According to the description, these look like the keys to the office and the safe where the money was stolen." The detective frowns at you and nods to the policeman, who puts your hands behind your back and snaps the handcuffs around your wrists.'
 
 			act 'Go with the police':
 				*clr & cla
 				minut += 60
 				gs 'stat'
-				'You''re taken out of the house in handcuffs and pushed into a police UAZ. After the metal doors slams, the UAZ car leaves, shaking and growling at each bump. Finally you arrive somewhere and you are taken from the UAZ into a building and in an office where the investigator you already know, is waiting for you. He tooks the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair, meanwhile the investigator turns the TV on and inserts a videocassette. On the screen there''s a picture of a security camera in Bystroeshke. At the beginning it only shows corridor. Soon you appear in the corridor. You go to the office door, opened it and enter. After a while, the door opens again and you come out of the office holding a thick envelope. The investigator takes the VCR tape out and then he inserts another one. It shows Chubais office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take an envelope with <<$BurgerQW[''IvanSecurityCamDesc'']>> written on it. The investigator turns the TV off, takes a plastic bag from the table with the keys and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly shows you entering the office and taking 650.000 rubles." He takes out a pen and paper and begins to write. While writing he looks up to you with gloomy eyes and says. "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence, if you admit your guilt."'
+				'You''re taken out of the house in handcuffs and pushed into a police UAZ. After the door slams shut, the car leaves, shaking and growling at each bump. You finally arrive somewhere and you are taken from the car and into a building. You are brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is a picture of a security camera in Bystroeshke. You soon appear in the corridor, go to the office door and enter. After a while, the door opens again and you come out of the office holding a thick envelope. The detective takes the tape out and inserts another one.' 
+				'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take an envelope with <<$BurgerQW[''IvanSecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says. "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
 
 				act 'Sign confession':
 					*clr & cla
 					minut += 60
 					gs 'stat'
-					'You sign a confession and the investigator barks: "Duty officer." A policeman enters the room. The investigator nods in your direction and tells him "Take her."'
+					'You sign the confession and the detective barks: "Duty officer." A policeman enters the room and the detective nods in your direction. "Take her."'
 
 					act 'Go':gt 'kameraKPZ'
 				end
@@ -219,7 +220,7 @@ if BurgerQW['IvanQWDay'] ! daystart and BurgerQW['IvanQW']  = 1 and hour >= 8 an
 					*clr & cla
 					minut += 60
 					gs 'stat'
-					'You tell the investigator what actually happened. How Ivan framed you. But the investigator hardly listen to you for a while, them he slams his fist on the table and yells at you, "I was not born yesterday, i don''t believe such nonsense. If you will not cooperate, you''ll rot in prison!" A policeman enters the room. The investigator nods in your direction and tells "Take her."'
+					'You tell the detective what actually happened and how Ivan framed you, but he hardly listens to you before he slams his fist on the table and yells at you, "I was not born yesterday! If you will not cooperate, you''ll rot in prison!" A policeman enters the room and the detective nods in your direction. "Take her."'
 
 					act 'Go':gt 'kameraKPZ'
 				end
@@ -256,23 +257,22 @@ $ninel0 = {
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel00.jpg"></center>'
-	'You open the door. Standing on the threshold there''s a pretty young girl with a doctors bag in her hand.'
-	'You greet her.'
-	'"Hello. My name is Ninel P. - I do the home visits for the clinic. Where is the patient?"'
+	'You open the door. Standing on the threshold is a pretty young girl with a medical bag in her hand. You greet her.'
+	'"Hello, my name is Ninel. - I do the home visits for the clinic. Where is the patient?"'
 	'"That would be me ... kha-kha-kha."'
-	'"I see. First we need to get you back into bed."'
+	'"I see. First, we need to get you back into bed."'
 
 	act 'Follow the doctor in the bedroom and lay down':
 		cla
 		*clr
 		ninelmet = 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom0.jpg"></center>'
-		'The doctor sat on the edge of your bed and checks your forehead:'
-		'(Doctor) - What are your symptoms <<$pcs_nickname>>? Can I call you that?'
-		'(You) - Of course... - You start to answer but end up coughing. - Sorry, I have high fever, sore throat and a cough that''s killing me'
-		'(Doctor) - Running nose? Headaches? Aching bones?'
-		'(You) - Yes, alla of them'
-		'(Doctor) - Well, take your clothes off, so I can examine you.'
+		'The doctor sits on the edge of your bed and checks your forehead.'
+		'"What are your symptoms <<$pcs_nickname>>? Can I call you that?"'
+		'"Of course..." You start to answer but end up coughing. "Sorry. I have high fever, sore throat and a cough that''s killing me!"'
+		'"Running nose? Headaches? Aching bones?"'
+		'"Yes, all of them."'
+		'"Well, take your clothes off so I can examine you."'
 
 		act 'Undress':
 			cla
@@ -282,25 +282,25 @@ $ninel0 = {
 			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom1.jpg"></center>'
-			'You undressed and the doctor listens to your lungs for a long time. Her hands are cool and gentle as she touches you, while the stethoscope is cold...'
-			'(Doctor) - Mmmm, now lets take a look at your mouth, open wide and say Aaah...'
+			'You undress and the doctor listens to your lungs for a long time. Her hands are cool and gentle as she touches you, while the stethoscope is cold.'
+			'"Mmmm, now let''s take a look at your mouth. open wide and say Aaah."'
 
-			act 'A-a-a':
+			act 'Ahh':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel03.jpg"></center>'
-				'You open your mouth and the doctor looks in examining your sore throat'
-				'(Doctor) - I see... your throat is very red and inflamed... Now we need to take your temperature.'
+				'You open your mouth and the doctor looks in, examining your sore throat'
+				'"I see. Your throat is very red and inflamed. Now we need to take your temperature.'
 
 				act 'Put a thermometer in your mouth':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel04.jpg"></center>'
-					'(Dr.) No, not so. The temperature needs to be measured rectally.'
-					'(You) - What...?'
-					'(Doctor) - It''s more preceisa and don''t be afraid, <<$pcs_nickname>>, it''s not painful.'
-					'(You) - Well if i have to...'
-					'(Doctor) - It''s necessary. Come on, lie down on your stomach and spread your buttocks with the hands, please.'
+					'"No, not like that. The temperature needs to be measured rectally.'
+					'"What...?"'
+					'"It''s more precise. Don''t be afraid, it''s not painful."'
+					'"Well if I have to..."'
+					'"It''s necessary. Come on, lie down on your stomach and spread your buttocks with your hands please."'
 
 					act 'Change position':
 						cla
@@ -308,7 +308,7 @@ $ninel0 = {
 						clr
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom2.jpg"></center>'
-						'You obediently roll over offering your ass. The doctor lubricates your anus with some vaselin and deftly introduces a thermometer. You flinch, not from pain but pleasure. The doctor doesn''t leaves just stick the thermometer in your ass but slowly moves it back and forth... It''s very nice and you feel a growing excitement.'
+						'You obediently roll over, offering your ass. The doctor lubricates your anus with some vaselin and deftly introduces the thermometer. You flinch, not from pain but pleasure. The doctor doesn''t just stick the thermometer in your ass, but slowly moves it back and forth. It''s very nice and you feel your excitement growing.'
 
 						gs 'arousal', 'anal_dildo', 10
 						gs 'stat'
@@ -318,8 +318,8 @@ $ninel0 = {
 								cla
 								*clr
 								'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
-								'Doctor takes the thermometer out of your ass and checks it'
-								'(Dr.) 39.2 ... Very bad. Please turn on your back, I need to palpate the lymph nodes.'
+								'The doctor takes the thermometer out of your ass and checks it.'
+								'"39.2. Very bad. Please turn on your back, I need to palpate the lymph nodes.'
 
 								act 'Roll over on your back':
 									cla
@@ -327,8 +327,8 @@ $ninel0 = {
 									clr
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom5.jpg"></center>'
-									'The doctor began to stroke and knead your stomach and thighs. You are not actually sure this is a medical procedure, she does it for too long and tenderly, but it''s too pleasant and you don''t object.'
-									'Meanwhile, your excitement is growing, you feel your pussy moistening and you start to whine sweetly...'
+									'The doctor begins to stroke and knead your stomach and thighs. You are not actually sure if this is a medical procedure. She does it for too long, but it''s too pleasant and you don''t object.'
+									'Your excitement continues to grow and you feel your pussy moistening as you start to whine sweetly...'
 
 									gs 'arousal', 'foreplay', 15
 									gs 'stat'
@@ -341,17 +341,17 @@ $ninel0 = {
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom6.jpg"></center>'
 										'You blush with embarrassment, but then fall below the hands of the doctor and she begins to caress your pussy'
-										'(You) - Doctor, what are you doing! - You scream at the same time embarrassed, outraged and frightened.'
-										'(Doctor) - Flying you, silly. I feel the magic in you, which means you''re one of us, and I can use his power quietly.'
-										'(You) - So you''re a magician, too?'
-										'(Doctor) - Yes, only a special kind magic, Tantric. Have you heard of it?'
-										'(You) - No, I don''t think so...'
-										'(Doctor) - It''s a magic, based on sensuality and sex. Roughly speaking, I can cast only when having sex.'
-										'(You) - So ..?'
-										'(Doctor) - That is, if I have sex with you, I will heal you. So? Do you agree?'
-										'(You) - And what should i do in return?'
-										'(Doctor) - Nothing - I''m doing it solely for my own satisfaction. I see you have orgasms only if conjure.'
-										'(You) - Then of course - I agree.'
+										'"Doctor, what are you doing!" you scream feeling embarrassed, outraged and frightened.'
+										'"I feel the magic in you, which means you''re one of us, and I can use his power quietly." she replies.'
+										'"So you''re a magician too?"'
+										'"Yes, but only with a special kind magic. Tantric. Have you heard of it?'
+										'"No, I don''t think so..."'
+										'"It''s based on sensuality and sex. Roughly speaking, I can only cast spells when having sex."'
+										'"So ..?"'
+										'"That is, if I have sex with you, I will heal you. So? Do you agree?"'
+										'"And what should I do in return?"'
+										'"Nothing. I''m doing it solely for my own satisfaction. I will see that you only have orgasms if conjured."'
+										'"Then of course I agree."'
 
 										gs 'arousal', 'foreplay', 15
 										gs 'stat'
@@ -366,16 +366,16 @@ $ninel0 = {
 							cla
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
-							'(You) - Doctor, what the hell are you doing?'
-							'The doctor takes the thermometer out of your ass and calmly replies:'
-							'(Doctor) - I measure your temperature. 39.2 - very bad.'
+							'"Doctor, what the hell are you doing?" you squeal.'
+							'She takes the thermometer out of your ass and calmly replies:'
+							'"I''m measuring your temperature. 39.2, very bad."'
 
 							act 'Doctor, what''s wrong with me?':
 								cla
-								'(You, scared) - Doctor, what''s wrong with me?'
-								'(Dr.) Do you really have a bad flu. But I''ll make you an injection of antibiotic and antigen, and you will soon feel better.'
+								'"Doctor, what''s wrong with me?" you ask, somewhat scared.'
+								'"You have a really bad flu, but I''ll make you an injection of antibiotic and antigen. You will soon feel better."'
 
-								act 'Lie on your stomach and bare your ass':
+								act 'Get injection':
 									cla
 									*clr
 									minut += 10
@@ -384,10 +384,10 @@ $ninel0 = {
 									clr
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom4.jpg"></center>'
-									'The doctor gives you a shot in one of your ass cheeks - you cry'
-									'(Doctor) - That''s about everything. You have to rest in bed, drink hot drinks, take antibiotics and nose drops, stay on a balanced diet. When the temperature drops, come to the clinic to see me.'
-									'(You) - Thank you, Doctor, i will follow your instructions.'
-									'Doctor says goodbye and leaves.'
+									'The doctor jabs the needle into one of your ass cheeks and injects the contents. You whimper slightly.'
+									'"That''s about everything. You have to rest in bed, drink hot drinks, take antibiotics and nose drops, stay on a balanced diet. When your temperature drops, come to the clinic to see me."'
+									'"Thank you, Doctor, I will follow your instructions."'
+									'The doctor says goodbye and leaves.'
 
 									act 'Back to bed':gt 'bedr'
 								end
@@ -396,35 +396,35 @@ $ninel0 = {
 
 						act 'Doctor, what''s wrong with me?':
 							cla
-							'(You, scared) - Doctor, what''s wrong with me?'
-							'(Doctor) - I''m afraid you have angina, <<$pcs_nickname>>. I would advise you an immediate treatment'
-							'(You) - What''s ?! You mean in the hospital, or what?'
-							'(Doctor) - Yes, at the clinic.'
+							'"Doctor, what''s wrong with me?" you ask fearfully.'
+							'"I''m afraid you have angina, <<$pcs_nickname>>. I would advise you recieve immediate treatment." she replies.'
+							'"What''s that?! You mean, in the hospital?" you shriek.'
+							'"Yes, at the clinic." she calmly replies.'
 
 							act 'Refuse':
 								cla
 								*clr
-								'(You, sobbing) - Oh, Doctor, I can''t go to the hospital ...'
-								'(Doctor, thoughtfully) - Well... I guess we could do in a different way then... I''ll give you a couple of shots, to start with...'
-								'(You) - Oh, thank you, doctor!'
+								'"Doctor, I can''t go to the hospital!"'
+								'She smiles at you. "Well... I guess we could do it a different way then. I''ll give you a couple of shots to start with.'
+								'"Oh thank you, doctor!"'
 
 								act 'Lie on your stomach and bare your ass':
 									cla
 									clr
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom9.jpg"></center>'
-									'The doctor pats your ass a few times and you suddenly develop an incredible sexual arousal. It is as if a fire started between your thighs, your pussy burns and drips, your breath gets heavy, your nipples harden and get stiff...'
-									'(You) - Doctor, what''s happening? - You ask almost screaming, embarrassed and kind of frightened, but your voice breaks, betraying your arousal, and you moan voluptuously'
-									'(Doctor) - Yeah! I knew it - I can feel the magic in you, which means you''re one of us, and I can use my power quietly.'
-									'(You) - So you''re a magician too!'
-									'(Doctor) - Yes, only a special kind magic, Tantric. Have you heard of it?'
-									'(You) - No, I don''t think so...'
-									'(Doctor) - It''s magic, based on sensuality and sex, roughly speaking, I can cast spells only while having sex.'
-									'(You) - So ..?'
-									'(Doctor) - That''s it, if we have sex with you, I will heal you. Do you agree?'
-									'(You) - And what should i do in return?'
-									'(Doctor) - Nothing - I''m doing it solely for my own satisfaction. I see you, have orgasms only if conjure.'
-									'(You) - Then of course - I agree.'
+									'The doctor jabs a needle into your ass cheek and then pats your ass a few times. You suddenly develop an incredible sexual arousal and it is as if a fire has started between your thighs. Your pussy burns and drips, your breath gets heavy, your nipples harden and get stiff...'
+									'"Doctor, what''s happening?" you ask, almost screaming. You feel embarrassed and kind of frightened, but your voice breaks, betraying your arousal, and you moan voluptuously'
+									'"Yeah! I knew it! I can feel the magic in you, which means you''re one of us, and I can use my power quietly."'
+									'"So you''re a magician too?!"'
+									'"Yes, but only with a special kind magic. Tantric. Have you heard of it?"'
+									'"No, I don''t think so..."'
+									'"It''s based on sensuality and sex, roughly speaking, I can cast spells only while having sex."'
+									'"So...?"'
+									'"That''s it. If we have sex, I will heal you. Do you agree?!'
+									'"And what should I do in return?"'
+									'"Nothing. I''m doing it solely for my own satisfaction. I''ll see that you only have orgasms if conjured.'
+									'"Then of course I agree."'
 
 									gs 'arousal', 'foreplay', 15
 									gs 'stat'
@@ -443,20 +443,20 @@ $ninel0 = {
 $drPP = {
 	cla
 	*clr
-	'You answer the door. On the threshold there is an older balding man with a medical bag in his hand.'
+	'You answer the door. On the threshold is an older, balding man with a medical bag in his hand.'
 	'"Hello, doctor."'
-	'"Hello, dear. I am Peter, the local doctor. Now please go back to bed and don''t stand in this draft.'
+	'"Hello, dear. I am Peter, the local doctor. Now please go back to bed and don''t stand in this cold air.'
 
 	act 'Take the doctor to the bedroom.':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp1.jpg"></center>'
-		'You get back to the bedroom with the doctor. He sits on the edge of the bed and feels your forehead'
-		'"So <<$pcs_nickname>>. What are your symptoms?'
-		'(You) - Ahem, ahem... Well, Doctor, I have sore throat - very sore actually - and high temperature.'
-		'(Doctor) - And cough, as I see it. And judging by your voice, also a running nose.'
-		'(You) - Yes... Aachoo!'
-		'(Doctor) - Well, <<$pcs_nickname>>, please remove your clothes so i can examine you.'
+		'You walk back to the bedroom with the doctor. He sits on the edge of the bed and feels your forehead'
+		'"So Miss <<$pcs_lastname>>. What are your symptoms?'
+		'"Ahem, ahem... Well, Doctor, I have sore throat - very sore actually - and a high temperature."'
+		'"And a nasty cough I see. And judging by your voice, also a running nose."'
+		'"Yes... Aachoo!!"'
+		'"Miss <<$pcs_lastname>>, please remove your clothes so I can examine you."'
 
 		act 'Undress':
 			cla
@@ -465,15 +465,15 @@ $drPP = {
 			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp2.jpg"></center>'
-			'You undressed and the doctor listens to your lungs for a while.'
-			'"Now lets take a look at your throat, open your mouth wide and say Ah."'
+			'You undres and the doctor listens to your lungs for a while.'
+			'"Now let''s take a look at your throat. Open your mouth wide and say Aahh."'
 
-			act 'A-a-a':
+			act 'Aahh':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp3.jpg"></center>'
 				'You open your mouth and the doctor looks in.'
-				'(Doctor) - Mmmm... i see. Well, let''s take your temperature.'
+				'"Mmmm, I see. Well, let''s take your temperature."'
 
 				act 'Put the thermometer under your armpit':
 					cla
@@ -483,7 +483,7 @@ $drPP = {
 
 					act 'Doctor, what''s wrong with me?':
 						cla
-						'"You have the flu." He says "Nothing too serious, I''ll give you an injection and you''ll feel better soon. Stay in bed, drink lots of fluids and try to rest as much as possible. When you feel better come to the clinic. Now roll over so I can give you the injection."'
+						'"You have the flu." he says "Nothing too serious, I''ll just give you an injection and you''ll feel better soon. Stay in bed, drink lots of fluids and try to rest as much as possible. When you feel better come to the clinic. Now please roll over so I can give you the injection."'
 
 						act 'Roll over and lay on your stomach':
 							cla
@@ -493,10 +493,10 @@ $drPP = {
 							lekarstvo += 3
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp5.jpg"></center>'
-							'The doctor gives you a shot in the ass'
-							'(Doctor) - Remember stay in bed, drink lots of fluids and try to rest. When you feel better come by the clinic.'
-							'(You) - Thank you, Doctor, I will.'
-							'You escort the doctor to the entrace, he says goodbye and leaves. After shutting the door you head back to bed.'
+							'The doctor jabs a needle into your ass and injects the contents.'
+							'"Now remember. Stay in bed, drink lots of fluids and try to rest. When you feel better come by the clinic."'
+							'"Thank you, Doctor, I will."'
+							'You escort the doctor back to the entrace where he says goodbye and leaves. After shutting the door, you head back to bed.'
 
 							act 'Back to bed':gt 'bedr'
 						end
@@ -513,42 +513,42 @@ $polidin = {
 	minut += 15
 	callrand = rand(1, 3)
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/housecall<<picrand>>.jpg"></center>'
-	'You dial the number of the clinic several times it''s always busy.'
+	'You dial the number of the clinic several times, but it''s always busy.'
 
 	act 'Call again and again':
 		cla
-		'Finally, a tired nurse''s voice answers. "Hello clinic."'
+		'Finally, a tired nurse''s voice answers. "Hello, this is the clinic. How can I help you?"'
 
 		act 'Hello ...':
 			cla
-			'"Hello. Can I get a house call?" You manage to say between coughing fits.'
+			'"Hello. Can I get a house call?" you manage to say between coughing fits.'
 			'The nurse asks. "Your name and address?"'
 
 			act 'Give address':
 				cla
-				'After coughing "Sorry, <<$pcs_nickname>> <<$pcs_lastname>>. Street Park House 4 apartment 69." you manage before sneezing again.'
-				'The nurse responds. "One moment please." Then she puts you on hold.'
+				'You have a coughing fit before you''re able to answer. "Sorry, it''s <<$pcs_fistname>> <<$pcs_lastname>>. Street Park House 4, apartment 69." you manage before sneezing.'
+				'"One moment please." she responds before she puts you on hold.'
 
 				act 'Wait':
 					cla
 					minut += 5
 					clr
 					gs 'stat'
-					'You wait for five minutes, occasionally coughing and sneezing, until she finally returns. "So <<$pcs_lastname>> <<$pcs_nickname>>. What are your symptoms?'
+					'You wait for five minutes, occasionally coughing and sneezing, until she finally returns. "So Miss <<$pcs_lastname>>, what are your symptoms?"'
 					'You start to answer but end up coughing. "Sorry, I have a fever, sore throat, a cough and a runny nose."'
 					'"Is your temperature high?"'
-					'"Yes, quite so, 39.2°C" You tell her followed by a sneeze.'
-					'"Very well a doctor will come see you at home."'
+					'"Yes, quite so, 39.2°C" you tell her followed by a sneeze.'
+					'"Very well. A doctor will come see you at home."'
 					'"How soon?"'
-					'"As soon as one is free." She answers "Yours isn''t an isolated case"'
-					'"Thank you." You say'
+					'"As soon as one is free." she answers. "Yours isn''t an isolated case"'
+					'"Thank you." you respond.'
 
 					if ninelsex = 1:
-						act 'Is Ninel Pavlovna available?':
+						act 'Is Ninel available?':
 							cla
-							'"Is Doctor Ninel Pavlovna available? She is my regular doctor."'
-							'"Let me check" The nurse puts you on hold for a couple of minutes and then comes back on. "Yes she is free and will make the house call."'
-							'"Once again, thank you very much."'
+							'"Is Doctor Pavlovna available? She is my regular doctor."'
+							'"Let me check." The nurse puts you on hold for a couple of minutes and then comes back on. "Yes she is free and will make the house call."'
+							'"Once again, thank you very much." you reply.'
 
 							act 'Continue':gt 'housecall', 'ninel3'
 						end
@@ -561,7 +561,7 @@ $polidin = {
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick<<picrand>>.jpg"></center>'
 						timerand = rand(1, 6)
 						minut += timerand * 30
-						'You lie in bed, shivering wrapped in a blanket. Time drags by painfully slow, you can''t say, how much time passes before the doorbell rings.'
+						'You lie in bed, shivering while wrapped in a blanket. Time drags by painfully slow. You can''t say how much time passes before the doorbell rings.'
 
 						! WD: Uninitialised ~ 'ninel' use 'ninelmet'
 						act 'Answer the door':

+ 22 - 20
locations/korrPar.qsrc

@@ -76,9 +76,9 @@ act '<b>Leave and go to the courtyard</b>':
 end
 
 if blockBedrPar = 0:
-	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
+	if anyaloc = 11 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom'
-	elseif sisboyday + 1 = daystart and hour = 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
+	elseif anyaloc = 11 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
 		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else
 		act 'Go to your room':gt 'bedrPar'
@@ -86,21 +86,21 @@ if blockBedrPar = 0:
 end
 if momloc = 1:
 	if (hour = 5 and minut > 30) or (hour = 6 and minut < 10):
-		'The door is closed. You know your <<$npc_nickname[''A29'']>> is likely waking up your step father and getting dressed.'
+		'The door is closed. You know your <<$npc_nickname[''A29'']>> is likely waking up your stepfather and getting dressed.'
 		act 'Knock on your parents'' door':
 			if hour = 6 and minut < 10 and rand(0,2) ! 0:
 				cla & *clr
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
-				'You knock on the door and a few moments later your <<$npc_nickname[''A29'']>> opens the door looking like she just woke up. "I don''t have time right now. Go wake up your brother." Then she closes the door.'
+				'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door looking like she just woke up. "I don''t have time right now. Go wake up your brother." She then closes the door in your face.'
 				act 'Leave':gt 'korrPar'
 				act 'Go wake up Kolka':
 					cla & *clr
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/sleeping.jpg"></center>'
-					'You walk down the hall and into the living room where you find Kolka sound asleep still on the couch.'
+					'You walk down the hall and into the living room where you find Kolka still sound asleep on the couch.'
 
 					!!act 'Shake him':gt '', ''
 					!!I am leaving the rest of this for Sicaa so he can tie in any events he has for kolka
@@ -113,7 +113,9 @@ if momloc = 1:
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
 				if momvladroom = 1:
-					'You knock on the door and you hear your <<$npc_nickname[''A29'']>> say. "Go set the table." Which is followed by a few murmuring of voices and you think your mother giggling.'
+					'You knock on the door and you hear your <<$npc_nickname[''A29'']>> say "<<$pcs_nickname>>? Is that you? Go set the table."'
+					*nl
+					'After a few minutes of silence, you faintly hear hushed voices and what you <i>think</i> is the sound of your mother giggling.'
 
 					act 'Leave':gt 'korrPar'
 					gs 'willpower', 'voyeur', 'self', 'medium'
@@ -122,13 +124,13 @@ if momloc = 1:
 							*clr & cla
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
-							gt 'bedPar2', 'peek'
+							gt 'bedrPar2', 'peek'
 						end
 					else
 						act 'Peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 				else
-					'You knock on the door and a few moments later your <<$npc_nickname[''A29'']>> opens the door fully dressed, in the background you can see your step father starting to get out of bed. "I don''t have time right now. Go set the table for breakfast." Then she closes the door.'
+					'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door fully dressed while your stepfather gets out of bed. "I don''t have time right now. Go set the table for breakfast." She then closes the door in your face.'
 					act 'Leave':gt 'korrPar'
 				end
 			end
@@ -181,7 +183,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 		npc_rel['A29'] -= 40
 		gs 'stat'
 		*pl $korrParMomHeader
-		'Your mother stands in the hallway waiting for you, clearly angry. As soon as she sees you, she grabs your ear and pinches it hard, making you wince in pain. "I just saw this video of you sucking some guy''s dick! What the hell were you thinking!? Your stepfather and I worked so hard to raise you properly, and then you do this. Do you realize that maybe this video was sent to others too? What will the people in town think of us now? I oughta teach you a lesson. What do you have to say for yourself!? Speak up!"'
+		'Your mother stands in the hallway waiting for you, clearly angry. As soon as she sees you, she grabs your ear and pinches it hard, making you wince in pain. "I just saw this video of you sucking some guy''s dick! What the hell were you thinking!? Your stepfather and I worked so hard to raise you properly, and then you do this. Do you realize that this video was sent to others too? What will the people in town think of us now? I should teach you a lesson. What do you have to say for yourself!? Speak up!"'
 
 		act 'Beg her to do nothing':
 			cla
@@ -204,9 +206,9 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			'<center><h1><font color="maroon"><<$npc_nickname[''A29'']>></font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/spank.jpg"></center>'
 			*nl
-			'You stand in the hallway staring at the floor, too embarrassed to say anything. What is there to say, anyway?'
+			'You stand in the hallway staring at the floor, too embarrassed to say anything.'
 			'Your mother grabs you by the arm and pulls you into the living room: "Take off your pants and bend over!" You shake your head, not liking where this is going at all. Getting even angrier by your refusal, she shouts: "Vladimir, come and hold her down!"'
-			'A few seconds later your stepfather enters the living room and immediately pulls you down and keeps you in place, while your mother pulls away your clothing. She then grabs a belt and starts to flog your bare ass with it, not holding back at all.'
+			'A few seconds later, your stepfather enters the living room and immediately pulls you down and keeps you in place while your mother pulls away your clothing. She then grabs a belt and starts to flog your bare ass with it, not holding back at all.'
 			'You take your punishment as good as you can, but towards the end you''re in tears and your cries are heard throughout the apartment. When it''s finally over, you raise your head just in time to catch the startled faces of your brother and sister in the doorway.'
 
 			act 'Stand up and straighten your clothes':gt $curloc
@@ -220,7 +222,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				minut += 5
 				gs 'stat'
 				*nl
-				'You slap away her hand with a defiant look in your eyes. "Oh, really? You''re no angel yourself either, <<$npc_nickname[''A29'']>>... does Dad know what YOU have been up to lately? Why don''t we go ask him, while we''re on this subject?"'
+				'You slap away her hand with a defiant look in your eyes. "Oh really? Well you''re no angel yourself either, <<$npc_nickname[''A29'']>>! Does Vladimir know what YOU have been up to lately? Why don''t we go ask him?"'
 				'Your mother looks at you furiously, but is at a loss for words. After a few seconds of awkward silence she storms off, slamming the door shut behind her.'
 
 				act 'Continue':gt $curloc
@@ -237,7 +239,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 		pcs_mood = 5
 		gs 'stat'
 		*pl $korrParMomHeader
-		'When you enter the hallway, you find your mother waiting there for you. "What''s all this I hear about a video of you sucking some guy''s dick? How could you be so careless, <<$pcs_nickname>>? You do realize this makes our whole family look bad..."'
+		'When you enter the hallway, you find your mother waiting there for you. "What''s all this I hear about a video of you sucking some guy''s dick? How could you be so careless <<$pcs_nickname>>? You do realize this makes our whole family look bad..."'
 
 		act 'Apologize':
 			cla
@@ -246,7 +248,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			npc_rel['A29'] -= 40
 			gs 'stat'
 			*nl
-			'"I don''t know what to say, <<$npc_nickname[''A29'']>>... I''m really sorry."'
+			'"I don''t know what to say <<$npc_nickname[''A29'']>>... I''m really sorry."'
 			'Your mother is clearly very upset with you. After a short discussion, she walks away.'
 
 			act 'Continue':gt $curloc
@@ -267,7 +269,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			GspravkaT = 2
 			motherKnowSpravka = 1
 			gs 'stat'
-			'"Oh, my darling, where have you been? We have been so worried."'
+			'"Oh my darling, where have you been? We have been so worried."'
 			'You go into the kitchen with your <<$npc_nickname[''A29'']>> and spend some time explaining what happened to you. Many of the details are difficult to talk about, and you cry and hug your <<$npc_nickname[''A29'']>> as you tell your story.'
 			'Your <<$npc_nickname[''A29'']>> tells you she will sort out everything with the school and makes you a bowl of chicken soup.'
 			if pcs_energy >= 30:
@@ -303,7 +305,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				SchoolBlock = 1
 				schoolprogul = 0
 				pcs_grades = 0
-				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m extremely disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here! Right now I want you out of the house, go out and find some work!" After that, she pushes you out the door and slams it shut in your face.'
+				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school. They told me you didn''t show up yet again and expelled you. I''m extremely disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here! Right now I want you out of the house, go out and find some work!" After that, she pushes you out the door and slams it shut in your face.'
 
 				act 'Leave':gt 'pav_residential'
 				exit
@@ -312,13 +314,13 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				npc_rel['A29'] = 0
 				schoolprogul = 0
 				pcs_grades -= 40
-				'As you enter the hallway, you find your mother there waiting for you. She seems very angry with you. "School called, they said you didn''t show up for class again. They wanted to expel you! I had to go over there and beg the principal to give you one last chance. I''ve never felt so humiliated! This is the last straw for me, <<$pcs_nickname>>. You will not embarrass me any further. If you miss one more day of school, they will kick you out. And if you get kicked out of school, life is going to get a lot tougher for you, especially around here!" Having said her piece, your mother turns around and leaves.'
+				'As you enter the hallway, you find your mother there waiting for you. She seems very angry with you. "The school called saying you didn''t show up for class again. They wanted to expel you! I had to go over there and beg the principal to give you one last chance. I''ve never felt so humiliated! This is your last chance <<$pcs_nickname>>. You will not embarrass me any further. If you miss one more day of school, they will kick you out. And if you get kicked out of school, life is going to get a lot tougher for you, especially around here!" Having said her piece, your mother turns around and leaves.'
 			elseif schoolPredupr = 0:
 				schoolPredupr = 1
 				npc_rel['A29'] = 0
 				schoolprogul = 0
 				pcs_grades -= 20
-				'As you enter the hallway, you find your mother there waiting for you. "<<$pcs_nickname>>? The school called, they said you weren''t at school today. You know they''re very unforgiving when it comes to absenteeism, they said they would expel you if it happens again. What are you doing with your life? Get it together!" Your mother angrily leaves the room, leaving you to your thoughts.'
+				'As you enter the hallway, you find your mother there waiting for you. "<<$pcs_nickname>>? The school called saying you weren''t at school today. You know they''re very unforgiving when it comes to absenteeism. They said they would expel you if it happens again. What are you doing with your life? Get it together!" Your mother angrily leaves the room, leaving you to your thoughts.'
 			end
 		elseif npc_rel['A29'] < 40:
 			if schoolPredupr = 2:
@@ -337,13 +339,13 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				npc_rel['A29'] = 0
 				schoolprogul = 0
 				pcs_grades -= 40
-				'As you enter the hallway, you find your mother there waiting for you. She seems very angry with you. "School called, they said you didn''t show up for class again. They wanted to expel you! I had to go over there and beg the principal to give you one last chance. I''ve never felt so humiliated! This is the last straw for me, <<$pcs_nickname>>. You will not embarrass me any further. If you miss one more day of school, they will kick you out. And if you get kicked out of school, I will personally kick you out of the house. If you cannot be responsible and behave like a normal person, then get out, no one is forcing you to stay." Having said her piece, your mother turns around and leaves.'
+				'As you enter the hallway, you find your mother there waiting for you. She seems very angry with you. "The school called saying you didn''t show up for class again. They wanted to expel you! I had to go over there and beg the principal to give you one last chance. I''ve never felt so humiliated! This is your last chance <<$pcs_nickname>>. You will not embarrass me any further. If you miss one more day of school, they will kick you out. And if you get kicked out of school, I will personally kick you out of the house. If you cannot be responsible and behave like a normal person, then get out! No one is forcing you to stay." Having said her piece, your mother turns around and leaves.'
 			elseif schoolPredupr = 0:
 				schoolPredupr = 1
 				npc_rel['A29'] = 0
 				schoolprogul = 0
 				pcs_grades -= 20
-				'As you enter the hallway, you find your mother there waiting for you. "<<$pcs_nickname>>? The school called, they said you weren''t at school today. You know they''re very unforgiving when it comes to absenteeism, they said they would expel you if it happens again. What are you doing with your life? Get it together!" Your mother angrily leaves the room, leaving you to your thoughts.'
+				'As you enter the hallway, you find your mother there waiting for you. "<<$pcs_nickname>>? The school called saying you weren''t at school today. You know they''re very unforgiving when it comes to absenteeism. They said they would expel you if it happens again. What are you doing with your life? Get it together!" Your mother angrily leaves the room, leaving you to your thoughts.'
 			end
 		end
 

+ 4 - 3
locations/kuhr2x.qsrc

@@ -84,12 +84,13 @@ dynamic $fatdel
 dynamic $driwater
 
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-	act 'Cooking for her husband 1 h (2 Food Unit)':
+	act 'Cook meal for your husband and yourself (1hr, 2 potions of food)':
 		cla
 		*clr
 		husband += 5
-		eda = eda - 2
-		minut = minut + 60
+		eda -= 2
+		dynamic $edahotd
+		minut += 60
 
 
 		huseatday = daystart

+ 25 - 25
locations/kuhrPar.qsrc

@@ -39,8 +39,8 @@ if momloc = 4:
 		minut += 5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/gotovka.jpg"></center>'
-		'Your <<$npc_nickname[''A29'']>> turns to you. "<<$pcs_nickname>> please set the table for breakfast." You sigh and grab the dishes.'
-		act 'set the table for breakfast': gt 'kuhrPar'
+		'Your <<$npc_nickname[''A29'']>> turns to you. "<<$pcs_nickname>>, please set the table for breakfast." You sigh and grab the dishes.'
+		act 'Set the table for breakfast': gt 'kuhrPar'
 		exit
 	elseif momloc[1] = 4:
 		$mombreak = ''
@@ -59,10 +59,10 @@ elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
 elseif hour = 18 and minut <= 30 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
-	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge, to be handy for later. Of course, you could also just have a snack if you''re not that hungry.'
+	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
 end
 if momloc = 11: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here making diner.'
-if momloc = 13: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after diner.'
+if momloc = 13: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
 if momloc = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
 if hour = 7 and breakfast_day ! daystart and indorf = 0: 
@@ -73,22 +73,22 @@ if hour = 7 and breakfast_day ! daystart and indorf = 0:
 		breakfast_day = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/breakfasthome.jpg"></center>'
-		'As you sit down and join your family for breakfast, you step father asks. "How are you doing in school <<$pcs_nickname>>?"'
+		'As you sit down and join your family for breakfast, you stepfather asks. "How are you doing in school <<$pcs_nickname>>?"'
 		if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0:
             if pcs_grades >= 80:
-                'You smile to him. "Really great, actually we was just learning something interesting the other day." You go on to talk about some of the stuff you have learned recently in school. He just nods, while you mother gives you a proud smile, Kolka just rolls his eyes.'
+                'You smile to him. "Really great. We were just learning something interesting the other day." You go on to talk about some of the stuff you have learned recently in school. He just nods, while you mother gives you a proud smile, Kolka just rolls his eyes.'
                 'The rest of breakfast is taken up with some small talk about what everyone has been up to of late, You thoroughly enjoy your breakfast with your family.'
             else
-                'You glance to him. "Um ok, I guess." You notice your mother frowning at you, so you quickly try to change the subject but they won''t let you. You do your best to make them think you are doing better than you are but neither seem to have bought it. Meanwhile Kolka snickers at you getting grilled.'
-                'The rest of breakfast is taken up with talk about how Kolka is doing in school whom seems to be doing better than you and is showered in praise from your mother and step father. The food is good even if the conversation wasn''t the best, you quickly finish your meal.'
+                'You glance to him. "Um ok, I guess." You notice your mother frowning at you, so you quickly try to change the subject, but they won''t let you. You do your best to make them think you are doing better than you are, but neither seem to have bought it. Kolka snickers at you getting grilled.'
+                'The rest of breakfast is taken up with talk about how Kolka is doing in school. He seems to be doing better than you and is showered with praise from your mother and stepfather. The food is good, even if the conversation wasn''t the best. You quickly finish your meal.'
             end
         else
             if kanikuli <> 0:
                 'You smile to him. "I am enjoying some time away from school to hang out with my friends. Just to relax for a change."'
-				'Then your mother speaks up. "It wouldn''t hurt you to study your school books and get ahead of your courses to get better grades." You roll your eye but before you can respond Vladamir lays on hand on your mother. "Let her enjoy herself this is her last year before she goes to the University." He adds with a little emphasis. You just sigh a little and not, as you both know that is what your mother wants.'
+				'Then your mother speaks up. "It wouldn''t hurt you to study your school books and get ahead of your courses to get better grades." You roll your eyes, but before you can respond, your stepfather lays his hand on your mother''s. "Let her enjoy herself. This is her last year before she goes to university after all." he says with a little emphasis. You just sigh and nod as you both know that is what your mother wants.'
             else 
-                'Vladamir looks over at you. "So have you found a cute boy that is head over heels in love with you, wanting to take you out on dates and buy you stuff yet?" He says in a slightly teasing tone. You mother smacks his arm. "She is to young for that, she needs to focus on school."'
-				'You start to try and answer but Kolka chimes in. "Like any boy would want to be seen with her." Which gets you to smack your brother on the arm and before long you are all bantering at the table.'
+                'Vladamir looks over at you. "So have you found a cute boy that is head over heels in love with you, wanting to take you out on dates and buy you stuff yet?" he says in a slightly teasing tone. You mother smacks his arm. "She is too young for that! She needs to focus on school."'
+				'You are about to answer, but Kolka chimes in. "Like any boy would want to be seen with her." This earns him a playful punch on the arm from you and before long, you are all bantering at the table.'
             end
         end
 		act 'Get up from the table': gt $loc, $loc_arg
@@ -101,24 +101,24 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 		dinner_day = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/dinnerhome.jpg"></center>'
-		'As you sit down and join your family for dinner, you step father asks. "So <<$pcs_nickname>> do you have a boyfriend yet?"'
+		'As you sit down and join your family for dinner, you stepfather asks. "So <<$pcs_nickname>>, do you have a boyfriend yet?"'
 		if pav_slut > 150 and motherKnowSpravka = 0:
-			'You start to respond to him, when your mother interrupts. "Of course not, she is still too young to be thinking about boys."'
-			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
-			'You mother turns towards Kolka. "That''s not funny apologize to your sister right now, right now!" Anya just smirks at that.'
-			'Kolka freezes in place, seeing that she is pissed he decides he doesn''t want to be the one to tell her about your reputation and says. "Sorry."'
-			'Your step father clears his throat and quickly changes the subject talking about how his work went. After that you have a fairly enjoyable dinner.'
+			'You start to respond to him when your mother interrupts. "Of course not! She is still too young to be thinking about boys."'
+			'Koka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
+			'You mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!" Anya just smirks.'
+			'Kolka freezes in place, but seeing that she is pissed he decides he doesn''t want to be the one to tell her about your reputation and just says. "Sorry."'
+			'Your stepfather clears his throat and quickly changes the subject, talking about how his work went. After that, you have a fairly enjoyable dinner.'
 		elseif pav_slut > 150:
-			'You start to respond to him, when your mother interrupts. "She is two young to worry about that and ... we talked about it." She gives you a meaningful glance and you shut your mouth.'
-			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
-			'You mother turns towards Kolka. "That''s not funny." Then she glances at you for a moment. "She might have made some mistakes but she is trying to be a better girl now. Now apologize to your sister right now, right now!" Anya just smirks at that.'
+			'You start to respond to him when your mother interrupts. "She is too young to worry about that and ... we talked about it." She gives you a meaningful glance and you shut your mouth.'
+			'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
+			'You mother turns towards Kolka. "That''s not funny." Then she glances at you. "She might have made some mistakes, but she is trying to be a better girl now. Now apologize to your sister right now!" Anya just smirks.'
 			'Kolka freezes in place. "Sorry."'
-			'Your step father clears his throat and quickly changes the subject talking about how his work went. After that you have a fairly enjoyable dinner.'
+			'Your stepfather clears his throat and quickly changes the subject, talking about how his work went. After that, you have a fairly enjoyable dinner.'
 		else
-			'You start to respond to him, when your mother interrupts. "Of course not, she is still to young to be thinking about boys."'
-			'Your step father sighs a little. "She is old enough to start dating dear."'
-			'You mother gives him a hard look. "No she isn''t she needs to focus on school and then going to the University before she can start thinking about boys."'
-			'You step father decides to drop it and start talking about some of the stuff that happened at his work. All and all you have a fairly enjoyable dinner.'
+			'You start to respond to him when your mother interrupts. "Of course not, she is still too young to be thinking about boys."'
+			'Your stepfather sighs a little. "She is old enough to start dating dear."'
+			'You mother gives him a hard look. "No, she isn''t. She needs to focus on school and then going to the University before she can start thinking about boys."'
+			'You stepfather decides to drop it and start talking about some of the stuff that happened at his work. All and all, you have a fairly enjoyable dinner.'
 		end
 		
 		act 'Get up from the table': gt $loc, $loc_arg

+ 1 - 1
locations/liam.qsrc

@@ -65,7 +65,7 @@ end
 if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marina''s Apartment</a>'
 
 act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pav_train'
-act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
+act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'parks', 'start'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'

+ 2 - 2
locations/love.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'mother':
 	if diplom = 1:'"I graduated from university."'
 	if work = 0 and cheatWork = 0 and workKafe ! 1:'"I''m unemployed."'
 
-	if city_modelling > 30:
+	if modelfoto_nude > 30:
 		loverrelation[lover_number] = 0
 		'She smiles and says with disgust, "Why are you not telling us about the photos you shot for these web sites?" She pulls out the nude photos of you and lies them out on the table. "My son, your mother cares about you. This girl is not worthy of you."'
 		'<<$loverdesc[lover_number]>> blushes and screams, "<<$pcs_nickname>>, I loved you so, and you...you turn out to be just another dirty whore! Get out!"'
@@ -114,7 +114,7 @@ gs 'npcgeneratec', 0, '<<$loverdesc[lover_number]>>''s "friend"', rand(18,32)
 		'<<$loverdesc[lover_number]>> drives you to his friends. You arrive at an apartment and <<$loverdesc[lover_number]>> introduces you as his bride to two other guys. You sit down at a table set and talk for a couple of hours. Everybody has fun and after everyone finishes eating and drinking, <<$loverdesc[lover_number]>> invites you to dance, to which you gladly agree. <<$loverdesc[lover_number]>> is already pretty drunk and he''s bad at dancing, but still start to grope you, his hands squeezing your buttocks. Soon he runs them under your dress and continues to stroke your ass. He hitches up you skirt so everyone can see your panties. The other guys are sitting on the sofa intently staring at your buttocks. Soon one of them gets up he guys got up from the couch and comes over to you. "You have the best butt I''ve ever seen. I would like to check it out." he says, and slaps you on the buttocks making you jump. <<$loverdesc[lover_number]>> pulls you to him and tells the other guy "Stop that. She''s my girl. You can watch, but you can not touch."'
 	end
 
-	if city_modelling > 30 and proverka1 = 0:
+	if modelfoto_nude > 30 and proverka1 = 0:
 		'"Calm down. I''ve already seen her naked. The Internet is full of naked pictures of her." the guy says.'
 		'"Is this true?" asks <<$loverdesc[lover_number]>> turning to you.'
 		'"Yes, I did some naked photoshoots, but I only ever showed of my body. I never fucked anyone." you say'

+ 1 - 1
locations/lover_love.qsrc

@@ -55,7 +55,7 @@ elseif loverlove[lover_number] = 2:
 			loverlove[lover_number] = 3
 			'You get into a taxi with your soon to be husband and go to the store to choose a dress. You choose an expensive and luxurious dress. <<$loverdesc[lover_number]>> pays for the purchase.'
 			'After a long day you feel tired and ask <<$loverdesc[lover_number]>> to drive you home, warning him that the next time you''ll meet you will get married.'
-			gt 'din_npc', 'go_home'
+			act 'Go home': gt 'din_npc', 'go_home'
 		end
 	end
 

+ 88 - 84
locations/ludahome.qsrc

@@ -81,102 +81,106 @@ if $ARGS[0] = 'home':
 				'He opens the door wide enough you can walk in. His arm holding the door is high enough you can walk under it, he is a tall and big man. You are reminded of that every time you meet him. Once you are inside he closes the door "They are in kitchen, I watching sports." With that he walks into the living room, presumably to go watch sports.'
 				act 'Enter': gt 'ludahome', 'hallway'
 			end
-		elseif rand(1,10) <= 3 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
-			*clr & cla
-			'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
-			'You stand outside your aunts apartment, knocking on the door. The door is answered by Luda, as soon as she sees you she smiles "<<$pcs_nickname>> come in, come in." With that she invites you in and closes the door behind you.'
-			act 'Enter': 
+		elseif (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
+			if rand(1,10) <= 3:
 				*clr & cla
-				minut += 2
-				!! Temporary loc measure
-				LudaLoc = 5 & OluLoc = 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/luda_olu_tv.jpg"></center>'
-				'She leads you to her living room, where you see Olu sitting watching TV already, who gives you a big friendly smile. Then Luda sits down on the couch, next to Olu, and pats the seat next to her and says "We was just watching some TV, you are welcome to join us, or you can go help yourself to something in the kitchen."'
-				act '<b>Leave Luda''s apartment</b>': gt 'pod_ezd', 'etaj_4'
-				act 'Go explore': gt 'ludahome', 'hallway'
-				act 'Watch TV': gt 'ludahome', 'watchtv'
-			end
-		end
-		if rand(4,10) <= 6 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
-			*clr & cla
-			'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
-			'You stand outside your aunts apartment, knocking on the door. The door is answered by Luda, as soon as she sees you she smiles "<<$pcs_nickname>> come in, come in." With that she invites you in and closes the door behind you.'
-			act 'Enter': 
+				'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by Luda, as soon as she sees you she smiles "<<$pcs_nickname>> come in, come in." With that she invites you in and closes the door behind you.'
+				act 'Enter': 
+					*clr & cla
+					minut += 2
+					!! Temporary loc measure
+					LudaLoc = 5 & OluLoc = 5
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/luda_olu_tv.jpg"></center>'
+					'She leads you to her living room, where you see Olu sitting watching TV already, who gives you a big friendly smile. Then Luda sits down on the couch, next to Olu, and pats the seat next to her and says "We was just watching some TV, you are welcome to join us, or you can go help yourself to something in the kitchen."'
+					act '<b>Leave Luda''s apartment</b>': gt 'pod_ezd', 'etaj_4'
+					act 'Go explore': gt 'ludahome', 'hallway'
+					act 'Watch TV': gt 'ludahome', 'watchtv'
+				end
+			elseif rand(1,7) <= 3:
 				*clr & cla
 				'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
-				'She leads you to her living room and then sits down on the couch and pats the seat next to her. Once you sit down she says "What have you been up to?"'
-				!! Temporary loc measure
-				act 'Sit down and chat': LudaLoc = 5 & gt 'ludahome', 'chat_luda'
-			end
-		elseif rand(7,10) <= 9 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
-			*clr & cla
-			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			if OluQW['sex'] = 1:
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. We have time to have some fun, come in, come in."'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				if OluQW['anya_inv'] + OluQW['nush_inv'] + OluQW['nat_inv'] > 0:
-					act 'How about I invite someone else?':
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by Luda, as soon as she sees you she smiles "<<$pcs_nickname>> come in, come in." With that she invites you in and closes the door behind you.'
+				act 'Enter': 
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
+					'She leads you to her living room and then sits down on the couch and pats the seat next to her. Once you sit down she says "What have you been up to?"'
+					!! Temporary loc measure
+					act 'Sit down and chat': LudaLoc = 5 & gt 'ludahome', 'chat_luda'
+				end
+			elseif rand(1,4) <= 3:
+				*clr & cla
+				'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+				if OluQW['sex'] = 1:
+					'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
+					'You return his smile "Is my Aunt Luda home?"'
+					'He shakes his head no "No she not home right now. We have time to have some fun, come in, come in."'
+					act 'Leave': gt 'pod_ezd', 'etaj_4'
+					if OluQW['anya_inv'] + OluQW['nush_inv'] + OluQW['nat_inv'] > 0:
+						act 'How about I invite someone else?':
+							*clr & cla
+							'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+							'You smile to him "Actually I was thinking I could invite up someone else, if you are up for it?"'
+							'He pauses only a moment to process what you just said and then he grins "Yes more the better, is she pretty?" He asks.'
+							'You nod "Yes she is pretty, let me text her and see if she is around."'
+							gs 'ludahome', 'invite'
+						end
+					end
+					act 'Say you would rather talk':
 						*clr & cla
 						'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-						'You smile to him "Actually I was thinking I could invite up someone else, if you are up for it?"'
-						'He pauses only a moment to process what you just said and then he grins "Yes more the better, is she pretty?" He asks.'
-						'You nod "Yes she is pretty, let me text her and see if she is around."'
-						gs 'ludahome', 'invite'
+						'He looks a little surprised and maybe a bit disappointed but then he nods and opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
+						act 'Sit down and chat':
+							*clr & cla
+							'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
+							'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
+							act 'Leave': gt 'pod_ezd', 'etaj_4'
+							act 'Wait for him to return': gt 'olu', 'seduction'
+						end
+						act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
 					end
-				end
-				act 'Say you would rather talk':
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He looks a little surprised and maybe a bit disappointed but then he nods and opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
-					act 'Sit down and chat':
+					!! Temporary loc measure
+					act 'Agree to have fun': OluLoc = 5 & gt 'olu', 'olusex1'
+				elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
+					'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
+					'You return his smile "Is my Aunt Luda home?"'
+					'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
+					act 'Leave': gt 'pod_ezd', 'etaj_4'
+					act 'Go in and talk':
 						*clr & cla
-						'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
-						'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
-						act 'Leave': gt 'pod_ezd', 'etaj_4'
-						act 'Wait for him to return': gt 'olu', 'seduction'
+						'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+						'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
+						!! Temporary loc measure
+						act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+						act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
 					end
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-				!! Temporary loc measure
-				act 'Agree to have fun': OluLoc = 5 & gt 'olu', 'olusex1'
-			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Go in and talk':
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
-					!! Temporary loc measure
-					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['met'] = 0:
-				OluQW['met'] = 1
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
-				'You return his smile "Yes, is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now, you one her nieces?"'
-				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
-				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Ask if you can come in': 
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
+				elseif OluQW['met'] = 0:
+					OluQW['met'] = 1
+					'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
+					'You return his smile "Yes, is my Aunt Luda home?"'
+					'He shakes his head no "No she not home right now, you one her nieces?"'
+					'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
+					'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
+					act 'Leave': gt 'pod_ezd', 'etaj_4'
+					act 'Ask if you can come in': 
+						*clr & cla
+						'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+						'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
+						!! Temporary loc measure
+						act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+						act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+					end
+				else
+					'You stand outside your aunts apartment, knocking on the door. The door is answered by a Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
+					'You return his smile "Is my Aunt Luda home?"'
+					'He shakes his head no "No she not home right now. I will tell her you stopped by, it was nice seeing you again."'
+					act 'Leave': gt 'pod_ezd', 'etaj_4'
 					!! Temporary loc measure
-					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+					act 'Ask if you can come in': OluLoc = 5 & gt 'ludahome', 'chat_olu'
 				end
 			else
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by a Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. I will tell her you stopped by, it was nice seeing you again."'
+				'You stand in the hallway for a bit but it appears that nobody is home.'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				!! Temporary loc measure
-				act 'Ask if you can come in': OluLoc = 5 & gt 'ludahome', 'chat_olu'
 			end
 		else
 			'You stand in the hallway for a bit but it appears that nobody is home.'

+ 3 - 3
locations/masseuse_break.qsrc

@@ -7,8 +7,8 @@
 !! masseuse['jobtype'] = 5 - will fuck client instead of massage or any of the above
 
 if $ARGS[0] = 'start':
-	$locM = 'masseuse_break'
-	$locM_arg = 'start'
+	$loc = 'masseuse_break'
+	$loc_arg = 'start'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/break.jpg"></center>'
 	if masseuse['break'] = 0:
 		minut += 15
@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	gs'stat'
 	'You''re taking a break.'
 	*nl
-	'There''s a vending machine in the corner you can buy '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' from and a <a href="exec:gt ''beverage'', ''bev_wat''">fridge</a> stocked with various drinks for masseuses to enjoy.'
+	'There''s a vending machine in the corner you can buy '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' from and a fridge stocked with <a href="exec:gt ''beverage'', ''bev_wat''">bottled water</a> and <a href="exec:gt ''beverage'', ''bev_jui''">juice</a> for masseuses to enjoy, as well as a <a href="exec:gt ''beverage'', ''bev_cof''">coffee machine</a>.'
 	*nl
 	if rand(0,1) = 1:
 		if masseuse['meet_lei'] = 0:

+ 45 - 45
locations/masseuse_schedule.qsrc

@@ -68,9 +68,9 @@ end
 
 if $ARGS[0] = 'start':
 
-act'Finish scheduling':gt'salon','start'
-
-	if masseuse['new_job_week'] <= daystart: gt'masseuse_schedule','schedule_reset'
+	act'Finish scheduling':gt'salon','start'
+	
+    if masseuse['new_job_week'] <= daystart: gt'masseuse_schedule','schedule_reset'
 
 	'<Table border=1><TR><TH>Sunday</TH> <TH>Monday</TH> <TH>Tuesday</TH> <TH>Wednesday</TH> <TH>Thursday</TH> <TH>Friday</TH> <TH>Saturday</TH></TR>'
 
@@ -79,91 +79,91 @@ act'Finish scheduling':gt'salon','start'
 !! First Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_1'] = 0 and masseuse['7_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['7_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Monday Shift
 
 	if masseuse['1_shift_1'] = 0 and masseuse['1_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['1_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Tuesday Shift
 
 	if masseuse['2_shift_1'] = 0 and masseuse['2_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['2_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Wednesday Shift
 
 	if masseuse['3_shift_1'] = 0 and masseuse['3_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['3_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Thursday Shift
 
 	if masseuse['4_shift_1'] = 0 and masseuse['4_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['4_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Friday Shift
 	
 	if masseuse['5_shift_1'] = 0 and masseuse['5_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['5_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Saturday Shift
 
 	if masseuse['6_shift_1'] = 0 and masseuse['6_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['6_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
 	
@@ -173,91 +173,91 @@ act'Finish scheduling':gt'salon','start'
 !! Second Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_2'] = 0 and masseuse['7_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['7_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Monday Shift
 
 	if masseuse['1_shift_2'] = 0 and masseuse['1_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['1_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Tuesday Shift
 
 	if masseuse['2_shift_2'] = 0 and masseuse['2_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['2_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Wednesday Shift
 
 	if masseuse['3_shift_2'] = 0 and masseuse['3_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['3_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Thursday Shift
 
 	if masseuse['4_shift_2'] = 0 and masseuse['4_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['4_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Friday Shift
 	
 	if masseuse['5_shift_2'] = 0 and masseuse['5_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['5_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Saturday Shift
 
 	if masseuse['6_shift_2'] = 0 and masseuse['6_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['6_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
 	
@@ -267,91 +267,91 @@ act'Finish scheduling':gt'salon','start'
 !! Third Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_3'] = 0 and masseuse['7_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['7_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Monday Shift
 
 	if masseuse['1_shift_3'] = 0 and masseuse['1_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['1_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Tuesday Shift
 
 	if masseuse['2_shift_3'] = 0 and masseuse['2_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['2_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Wednesday Shift
 
 	if masseuse['3_shift_3'] = 0 and masseuse['3_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['3_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Thursday Shift
 
 	if masseuse['4_shift_3'] = 0 and masseuse['4_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['4_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Friday Shift
 	
 	if masseuse['5_shift_3'] = 0 and masseuse['5_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['5_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Saturday Shift
 
 	if masseuse['6_shift_3'] = 0 and masseuse['6_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['6_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
 	

+ 185 - 117
locations/masseuse_work.qsrc

@@ -46,21 +46,111 @@ if $ARGS[0] = 'last_client':
 	salon['work_minutes'] = 0
 	masseuse['<<week>>_shift_<<masseuse_shift>>'] = 0
 	*nl
-	if minut < 10:
-		if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
-			masseuse['multiple_shifts'] = 1
-			'<b><<hour>>:0<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
+	if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
+		masseuse['multiple_shifts'] = 1
+		'<b><<hour>>:0<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
+		if cumloc[11] > 0:
+			*nl
+			'And that includes cleaning your face off.'
+			act'Wipe your face':
+				cumspclnt = 12
+				gs'cum_cleanup'
+				gs'stat'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+				'You wipe your face off with a towel and throw it into the cum laundry bin.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+			if cumloc[0] > 0:
+				*nl
+				'Though shouldn''t you clean your out pussy too?'
+				act'Just your face':
+					cumspclnt = 12
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+					'Eh, who cares. The first guy of the next shift can get sloppy seconds. He''ll probably just think it''s lube. You wipe your face off with a towel and throw it into the cum laundry bin. Then you reset the room for your next client.'
+					act'Get ready for the next shift':gt'masseuse_work','shift_start'
+				end
+				act'Wipe your face and pussy':
+					cumspclnt = 10
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video> <video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'You clean your face off with a towel before wiping your pussy with it as well before throwing it into the cum laundry bin. Then you reset the room for your next client.'
+					act'Get ready for the next shift':gt'masseuse_work','shift_start'
+				end
+			end
+		elseif cumloc[0] > 0 and cumloc[11] = 0:
+			*nl
+			'But shouldn''t you clean your out pussy too?'
+			act'Don''t bother':
+				cla & *nl
+				'Eh, who cares. The first guy of the next shift can get sloppy seconds. He''ll probably just think it''s lube. Your breather over, you slip on your robe and reset the room.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+			act'Wipe your pussy':
+				cumspclnt = 12
+				gs'cum_cleanup'
+				gs'stat'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+				'You wipe your pussy with a towel until no more cum is apparent and toss it into the cum laundry bin. Then you reset the room for your next client.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+		elseif cumloc[0] = 0 and cumloc[11] = 0:
 			act'Get ready for the next shift':gt'masseuse_work','shift_start'
-		else
-			'<b><<hour>>:0<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day. You clean up your station and prepare to leave.'
 		end
-	else
-		if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
-			masseuse['multiple_shifts'] = 1
-			'<b><<hour>>:<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
-			act'Get ready for the next shift':gt'masseuse_work','shift_start'
+	else		
+		'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day.'
+		*nl
+		if cumloc[0] > 0 or cumloc[11] > 0:
+			'The only question left is if you''re going to clean yourself up first.'
+			act'Don''t bother':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
+				'Doesn''t really matter to you that much, you''ll just leave it where it is for now. You spend the next couple minutes resetting the room, slipping on your robe, and leaving the room, finishing your shift.'
+				act'Finish your shift':gt'masseuse_work','shift_end'
+			end
+			
+			if cumloc[0] > 0 and cumloc[11] > 0:
+				act'Clean everything':
+					cumspclnt = 10
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around dripping cum. Grabbing a soft towel, you carefully wipe the cum from your face and pussy before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
+			if cumloc[11] > 0:
+				act'Wipe your face':
+					cumspclnt = 12
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around  with cum dripping from your face. Grabbing a soft towel, you wipe the cum from your face before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
+			if cumloc[0] > 0:
+				act'Wipe your pussy':
+					cumspclnt = 15
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around with cum leaking from your pussy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
 		else
-			'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day. You clean up your station and prepare to leave.'
+			'You make sure all the dirty laundry is in the correct bins and then change the sheets on the table and put all the lube and oil back in their order on the table. With the room reset for the next girl, your shift is over.'
+			act'Finish your shift':gt'masseuse_work','shift_end'
 		end
 	end
 end
@@ -88,17 +178,17 @@ end
 if $ARGS[0] = 'begin':
 	masseuse_time_temp = rand(5,15)
 	masseuse['client_type'] = rand(0,2)
-	masseuse['client_request'] = rand(0,10)
+	masseuse['client_request'] = rand(0,12)
 	if masseuse['jobtype'] = 1:
 		gt'masseuse_work','1_pre'
 	elseif masseuse['jobtype'] = 2:
-		if masseuse['client_request'] >= 6:
+		if masseuse['client_request'] >= 8:
 			gt'masseuse_work','1_pre'
 		else
 			gt'masseuse_work','2_pre'
 		end
 	elseif masseuse['jobtype'] = 3:
-		if masseuse['client_request'] >= 9:
+		if masseuse['client_request'] >= 11:
 			gt'masseuse_work','1_pre'
 		elseif masseuse['client_request'] >= 7:
 			gt'masseuse_work','2_pre'
@@ -106,17 +196,25 @@ if $ARGS[0] = 'begin':
 			gt'masseuse_work','3_pre'
 		end
 	elseif masseuse['jobtype'] = 4:
-		if masseuse['client_request'] >= 10:
+		if masseuse['client_request'] >= 12:
 			gt'masseuse_work','1_pre'
-		elseif masseuse['client_request'] >= 8:
+		elseif masseuse['client_request'] >= 10:
 			gt'masseuse_work','2_pre'
-		elseif masseuse['client_request'] >= 6:
+		elseif masseuse['client_request'] >= 8:
 			gt'masseuse_work','3_pre'
 		else
 			gt'masseuse_work','4_pre'
 		end
 	elseif masseuse['jobtype'] = 5:
-		gt'masseuse_work','5_pre'
+		if masseuse['client_request'] = 12:
+			gt'masseuse_work','2_pre'
+		elseif masseuse['client_request'] = 11:
+			gt'masseuse_work','3_pre'
+		elseif masseuse['client_request'] = 10:
+			gt'masseuse_work','4_pre'
+		else
+			gt'masseuse_work','5_pre'
+		end
 	end
 end
 
@@ -124,9 +222,8 @@ if $ARGS[0] = 'normal_end':
 	gs'arousal','massage_give',15
 	salon['work_minutes'] += 15
 	gs'stat'
-	if salon['work_minutes'] >= 240:
+	if salon['work_minutes'] >= 235:
 		gs'masseuse_work','last_client'
-		act'Finish your shift':gt'masseuse_work','shift_end'
 	else
 		act'Wait for your next client':gt'masseuse_work','begin'
 		if masseuse['break'] = 0:act'Take a break':gt'masseuse_break','start'
@@ -136,7 +233,9 @@ end
 if $ARGS[0] = '1_pre':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
-	'"<<$pcs_firstname>>, you have a customer who has requested a body massage, maximum of 30 minutes."'
+	*nl
+	'"<<$pcs_firstname>>, you have a customer who has requested a <b>body massage</b>, maximum of 30 minutes."'
+	*nl
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	*nl
 	'"Hello sir, if you''d like to undress and lay on the table we can begin. You can place your clothes in the basket in the corner and there is a towel for you to place over your hips, just tell me when you''re ready."'
@@ -268,9 +367,9 @@ if $ARGS[0] = '1.handjob1':
 			*nl
 			'"That was a great massage, you''ve got talented hands," he smirks.'
 			'"Here''s a little something extra," he says, handing you 300 <b>₽</b>. "Maybe I''ll stop by again sometime for your services. Maybe you''ll even offer something a little more."'
-			if salon['work_minutes'] >= 240:
-				'With a wink, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-				act'Finish your shift':gt'masseuse_work','shift_end'
+			if salon['work_minutes'] >= 235:
+				'With a wink, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 			else
 				'With a wink, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 				act'Wait for your next client':gt'masseuse_work','begin'
@@ -306,9 +405,9 @@ if $ARGS[0] = '1.handjob2':
 			*nl
 			'"That was a great massage, you''ve got talented hands," he smirks.'
 			'"Your tip, as promised," he says, handing you 300 <b>₽</b>. "Maybe I''ll stop by again sometime for your services. Maybe even get a <i>full body</i> service from you."'
-			if salon['work_minutes'] >= 240:
-				'With a wink, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-				act'Finish your shift':gt'masseuse_work','shift_end'
+			if salon['work_minutes'] >= 235:
+				'With a wink, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 			else
 				'With a wink, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 				act'Wait for your next client':gt'masseuse_work','begin'
@@ -343,9 +442,9 @@ if $ARGS[0] = '1.handjob3':
 				'"My pleasure," you murmur. "A good <b>job</b> done is it''s own reward."'
 				'You smile innocently at your added emphasis.'
 				'"Damn..." he breathes. "I gotta come back for you..."'
-				if salon['work_minutes'] >= 240:
-					'With that, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
+				if salon['work_minutes'] >= 235:
+					'With that, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+					gs'masseuse_work','last_client'
 				else
 					'With that, he leaves and you begin changing the sheets to prepare for your next client.'
 					act'Wait for your next client':gt'masseuse_work','begin'
@@ -358,9 +457,9 @@ if $ARGS[0] = '1.handjob3':
 				'"My pleasure," you murmur. "A good <b>job</b> done is it''s own reward."'
 				'You smile innocently at your added emphasis.'
 				'"Damn..." he breathes. "I gotta come back for you..."'
-				if salon['work_minutes'] >= 240:
-					'With that, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
+				if salon['work_minutes'] >= 235:
+					'With that, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 				else
 					'With that, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 					act'Wait for your next client':gt'masseuse_work','begin'
@@ -375,11 +474,9 @@ if $ARGS[0] = '1.handjob3':
 			'Still watching the client, you raise your hand to your lips and shove your fingers inside your mouth. You taste the bitter flavor of semen mixed with the massage oils and suck every drop of the former off each of your digits and gulp it all down. Smiling at him, you take a towel and begin to wipe him down, cleaning his body of his own cum and the rest of the oil before allowing him to get dressed.'
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				if masseuse['multiple_shifts'] ! 1:act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
-					
 				else
 					gs'masseuse_work','prepare_next'
 				end
@@ -407,11 +504,9 @@ if $ARGS[0] = '1.naked':
 	massage['sex_tips'] += 200
 	if salon['work_minutes'] >= 235:
 		gs'masseuse_work','last_client'
-		act'Finish your shift':gt'masseuse_work','shift_end'
 	else
 		if masseuse['break'] = 0:
 			gs'masseuse_work','break_question'
-			
 		else
 			gs'masseuse_work','prepare_next'
 		end
@@ -425,7 +520,9 @@ if $ARGS[0] = '2_pre':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
-	'"<<$pcs_firstname>>, you have a customer who has requested a massage with a view, maximum of 30 minutes."'
+	*nl
+	'"<<$pcs_firstname>>, you have a customer who has requested a <b>massage with a view</b>, maximum of 30 minutes."'
+	*nl
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	act'Continue':
 		cla & *clr
@@ -449,8 +546,6 @@ if $ARGS[0] = '2':
 		'You oil up the client and begin kneading it with your hands, working through his muscles and loosening them up. He stares appreciatively at your body throughout the whole process. Occassionally, you lean down to get the right angles to work his body and your breasts brush up against him, though you''re fairly certain he doesn''t mind.'
 	else
 		'You oil up the client and begin kneading it with your hands, working through his muscles and loosening them up. He stares appreciatively at your body throughout the whole process. Occassionally, you lean down to get the right angles to work his body and your breasts brush up against him. And though you''re fairly certain he doesn''t mind, it drives you wild with embarrassment.'
-		*nl
-		'<i>Oh my god! What am I even doing right now?!</i>'
 	end
 	act'Continue':
 		cla & *clr
@@ -471,7 +566,6 @@ if $ARGS[0] = '2':
 		'Only once he''s left do you reach for your robe and take a look at the clock.'
 		if salon['work_minutes'] >= 235:
 			gs'masseuse_work','last_client'
-			act'Finish your shift':gt'masseuse_work','shift_end'
 		else
 			if masseuse['break'] = 0:
 				gs'masseuse_work','break_question'
@@ -489,7 +583,9 @@ if $ARGS[0] = '3_pre':
 	robe = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
-	'"<<$pcs_firstname>>, you have a customer who has requested an ''old fashioned'' massage, maximum of 30 minutes."'
+	*nl
+	'"<<$pcs_firstname>>, you have a customer who has requested an <b>old fashioned massage</b>, maximum of 30 minutes."'
+	*nl
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	act'Continue':
 		cla & *clr
@@ -581,25 +677,10 @@ if $ARGS[0] = '3.1':
 				end
 				'Only once he''s left do you look down at the cum on your body. You ought to clean up for your next customer. If you have one that is, you think before taking a look at the clock.'
 				*nl
-				if salon['work_minutes'] >= 230:
+				if salon['work_minutes'] >= 235:
 					 gs'masseuse_work','last_client'
-					 act'Wipe off the cum':
-						cumspclnt = 12
-						gs 'cum_cleanup'
-						gs 'stat'
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-						'Well, no reason to walk around wearing cum regardless. You grab another towel and wipe yourself off, tossing it into the laundry bin before cleaning up your station and prepare to leave.'
-						act'Finish your shift':gt'masseuse_work','shift_end'
-					 end
-					 act'Don''t bother':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-						'Well, they can''t tell you how to accessorise on your own time. You leave the cum where it is and clean up your station, preparing to leave.'
-						act'Finish your shift':gt'masseuse_work','shift_end'
-					end
 				else
-					cumspclnt = 12
+					cumspclnt = 4
 					gs 'cum_cleanup'
 					gs'masseuse_work','prepare_next'
 					'Well, that answers that. You grab a towel and wipe yourself off before tossing it into a laundry bin.'
@@ -638,7 +719,6 @@ if $ARGS[0] = '3.2':
 		end
 		if salon['work_minutes'] >= 235:
 			gs'masseuse_work','last_client'
-			act'Finish your shift':gt'masseuse_work','shift_end'
 		else
 			if masseuse['break'] = 0:
 				gs'masseuse_work','break_question'
@@ -656,7 +736,9 @@ if $ARGS[0] = '4_pre':
 	robe = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
-	'"<<$pcs_firstname>>, you have a customer who has requested a ''head'' massage, maximum of 30 minutes."'
+	*nl
+	'"<<$pcs_firstname>>, you have a customer who has requested a <b>head massage</b>, maximum of 30 minutes."'
+	*nl
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	act'Continue':
 		cla & *clr
@@ -683,6 +765,7 @@ if $ARGS[0] = '4':
 	cla & *clr
 	gs'arousal','massage_give',15
 	salon['work_minutes'] += 15
+	masseuse['massage_first'] = 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/nude_massage/<<rand(1,5)>>.jpg"></center>'
 	'You oil up the client and begin kneading it with your hands, working through his muscles and loosening them up. He stares appreciatively at your body throughout the whole process. Occassionally, you lean down to get the right angles to work his body and your breasts brush up against him, though you''re fairly certain he doesn''t mind.'
@@ -702,10 +785,17 @@ if $ARGS[0] = '4.1':
 		gs'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/bj1.mp4"></video></center>'
-		'Even as you feel his cum spurt into your mouth, you never stop sucking, going up and down until your mouth is full and nothing else is coming out. Remembering company policy, you gather up every drop and tilt your head back to swallow, giving the client a clean smile afterwards.'
-		'"Would you like your massage now sir?"'
-		'"No, that''s plenty for me. I got what I came for," he grins. "Though I wouldn''t mind a tongue bath to make sure I''m all cleaned up before I head out."'
-		'"Certainly sir," you say, bending over and thoroughly licking every patch of his foreskin clean.'
+		'Even as you feel his cum spurt into your mouth, you never stop sucking, going up and down until your mouth is full and nothing else is coming out. Remembering store policy, you gather up every drop and tilt your head back to swallow, giving the client a clean smile afterwards.'
+		if masseuse['massage_first'] = 1:
+			masseuse['massage_first'] = 0
+			'"Would you like your massage now sir?"'
+			'"No, that''s plenty for me. I got what I came for," he grins. "Though I wouldn''t mind a tongue bath to clean up before I head out."'
+			'"Certainly sir," you say, bending over and thoroughly licking every part of his dick clean.'
+		else
+			'"Did you enjoy your massage today sir?"'
+			'"I did, you really know how to work a cock."'
+			'"Thank you sir! Let me just clean you up so you can dress." You lean back down and use your tongue to thoroughly clean the remaining fluids from his dick.'
+		end
 		act'Finish the session':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
@@ -721,7 +811,6 @@ if $ARGS[0] = '4.1':
 			end
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
@@ -769,7 +858,6 @@ if $ARGS[0] = '4.2':
 			end
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
@@ -790,7 +878,9 @@ if $ARGS[0] = '5_pre':
 	robe = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
-	'"<<$pcs_firstname>>, you have a customer who has requested a ''full body'' massage, maximum of 30 minutes."'
+	*nl
+	'"<<$pcs_firstname>>, you have a customer who has requested a <b>full body massage</b>, maximum of 30 minutes."'
+	*nl
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	*nl
 	if pcs_inhib < 40:
@@ -809,7 +899,8 @@ end
 
 if $ARGS[0] = '5':
 	cla & *clr
-	'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/fuck<<rand(1,20)>>.mp4"></video></center>'
+	masseuse['position'] = rand(1,20)
+	'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/fuck<<masseuse[''position'']>>.mp4"></video></center>'
 	'You spend the entire session being thoroughly enjoyed by your client, fucking in any and every position he could possibly want you in. The sound of flesh slapping against flesh is deafening, the only other thing being able to be heard is the groan of your voice as you are pounded relentlessly until he cums.'
 	act'Cum':gt'masseuse_work','5.1'
 	act'Next position':gt'masseuse_work','5'
@@ -820,7 +911,17 @@ if $ARGS[0] = '5.1':
 	if rand(0,1) = 1:
 		gs'cum_call','','massage client'
 		gs'stat'
-		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(1,5)>>.mp4"></video></center>'
+		if masseuse['position'] = 1:
+			'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(1,5)>>.mp4"></video></center>'
+		elseif masseuse['position'] >= 2 and masseuse['position'] <= 7:
+			'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie1.mp4"></video></center>'
+		elseif masseuse['position'] >= 8 and masseuse['position'] <= 13:
+			'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(2,3)>>.mp4"></video></center>'
+		elseif masseuse['position'] <= 15:
+			'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie4.mp4"></video></center>'
+		else
+			'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie5.mp4"></video></center>'
+		end
 		if pcs_horny >= 90:
 			$orgasm_or = 'yes'
 			'Eventually, the client starts cumming. He keeps hammering you and grunts hard, and you can feel his semen spurt deeper inside you with every thrust. The sensation causes you to orgasm as well, groaning with pleasure right alongside him. At some point the client finishes ejaculating and removes his cock from your pussy, his cum flowing out after.'
@@ -843,34 +944,14 @@ if $ARGS[0] = '5.1':
 			*nl
 			if salon['work_minutes'] >= 235:
 				 gs'masseuse_work','last_client'
-				 *nl
-				 'Now the only real question is if you''re going to clean yourself up or just the room.'
-				 act'Wipe your pussy':
-					cumspclnt = 15
-					gs 'cum_cleanup'
-					gs 'stat'
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
-					'Well, no reason to walk around dripping cum or staining your panties. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the laundry bin. Afterwards, you reset the room and slip on your robe before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				 end
-				 act'Don''t bother':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-					'Doesn''t really matter to you that much, you''ll just leave it where it is for now. You spend the next couple minutes reseting the room and slip on your robe before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				end
 			else
 				gs'masseuse_work','prepare_next'
 				*nl
 				'Looking down at your cum dripping pussy, you think to yourself if you care enough to clean it off. Company policy says you should be completely clean for each new customer but...'
-				act'Wipe your pussy':
-					cumspclnt = 15
-					gs 'cum_cleanup'
-					gs 'stat'
+				act'Don''t bother':
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
-					'Best to just stick to the policy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the laundry bin. Afterwards, you slip on your robe and reset the room.'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
+					'Eh, who cares. The next guy can get sloppy seconds. He''ll probably just think it''s lube. Your breather over, you slip on your robe and reset the room.'
 					if masseuse['break'] = 0:
 						'Now the only question left is if you should you take a break or just wait for the next client?'
 					else
@@ -878,11 +959,15 @@ if $ARGS[0] = '5.1':
 					end
 					act'Wait for your next client':gt'masseuse_work','begin'
 					if masseuse['break'] = 0:act'Take a break':gt'masseuse_break','start'
-				 end
-				 act'Don''t bother':
+				end
+				
+				act'Wipe your pussy':
+					cumspclnt = 15
+					gs 'cum_cleanup'
+					gs 'stat'
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-					'Eh, who cares. The next guy can get sloppy seconds. He''ll probably just think it''s lube. Your breather over, you slip on your robe and reset the room.'
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Best to just stick to the policy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the cum laundry bin. Afterwards, you slip on your robe and reset the room.'
 					if masseuse['break'] = 0:
 						'Now the only question left is if you should you take a break or just wait for the next client?'
 					else
@@ -890,7 +975,7 @@ if $ARGS[0] = '5.1':
 					end
 					act'Wait for your next client':gt'masseuse_work','begin'
 					if masseuse['break'] = 0:act'Take a break':gt'masseuse_break','start'
-				end
+				 end
 			end
 		end
 	else
@@ -915,25 +1000,8 @@ if $ARGS[0] = '5.1':
 			end
 			if salon['work_minutes'] >= 235:
 				 gs'masseuse_work','last_client'
-				 *nl
-				 'Now the only real question is if you''re going to clean yourself up or just the room.'
-				 act'Clean your face':
-					cumspclnt = 4
-					gs 'cum_cleanup'
-					gs 'stat'
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
-					'Well, no reason to walk around wearing cum regardless. Grabbing a towel, you carefully wipe your face and hair, tossing it into the laundry bin before cleaning up your station and prepare to leave.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				 end
-				 act'Don''t bother':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-					'Well, they can''t tell you how to accessorise on your own time. You leave the cum where it is and spend the next couple minutes reseting the room before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				end
 			else
-				cumspclnt = 4
+				cumspclnt = 12
 				gs 'cum_cleanup'
 				gs'masseuse_work','prepare_next'
 				*nl

+ 1 - 1
locations/mey_home.qsrc

@@ -234,7 +234,7 @@ if $ARGS[0] = '3':
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Return to the hallway':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 			*clr
 			'<center><img <<$set_imgh>> src="'+'images/pc/clothing/'+iif($pantyworntype = 'none','0','tanga')+'.jpg'+'"></center>'
 			*nl

+ 3 - 3
locations/mey_vika_events.qsrc

@@ -368,7 +368,7 @@ if $ARGS[0] = 'near_school':
 	$location_type = 'event'
 	vicky_afterschool = daystart
 
-	if week mod 2 = 0:
+	if (cheerleadingQW['quest_stage'] > 1 and (week = 1 or week = 3)) or (cheerleadingQW['quest_stage'] < 2 and (week = 2 or week = 4)):
 		'<br>You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
 		if mey_vika['mey_vika_qw'] = 0:
@@ -898,9 +898,9 @@ end
 
 if $ARGS[0] = 'beach_ender':
 	act 'Go':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'zz_clothing', 'fix_emergency'
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'zz_clothing', 'fix_emergency'
 		gt 'pav_residential'
 	end
 end

Некоторые файлы не были показаны из-за большого количества измененных файлов