176 次代碼提交 2e58b2daee ... 11cf482f9a

作者 SHA1 備註 提交日期
  rachels 11cf482f9a [fixed] images links 1 年之前
  Anya 39761ca220 [fixed] image issues 1 年之前
  Kevin_Smarts 135312f1a1 Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts 051a406ccc Merge remote-tracking branch 'espAvalon/master' 1 年之前
  hornguy6 2666726744 [changed] new folder structure for images means new image links 1 年之前
  hornguy6 09de6e4008 [changed] video and image links - media will arrive with next dev image pack release 1 年之前
  Pepegass 08a7f16eaf [fixed] spelling error in slut fame dialog 1 年之前
  hornguy6 893b3990d0 [fixed] double dynamic call and missing noShampoo variable 1 年之前
  hornguy6 5c2f916d8f [fixed] a more surefire way to make sure that the $showerdin dynamic gets called 1 年之前
  Kevin_Smarts 85caf8b9b6 [fixed] Showering together skipped shower dynamic 1 年之前
  Kevin_Smarts 7328128f7b Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts 764daab0dd [fixed] Wrong link spotted by yanzaqw1 1 年之前
  Kevin_Smarts 2dfc704ce4 [fixed] Bodysuit thickness descriptions were reversed and some adjustments to Mon Chéi bodysuits 1 年之前
  Kevin_Smarts 2770c4a916 [fixed] Skiing had bad link for retuning to main park chunk 1 年之前
  hornguy6 9df6af5ed4 [fixed] something that goes towards addressing so many stranger is in the game 1 年之前
  hornguy6 bd39558be3 [fixed] another missing flag 1 年之前
  hornguy6 11b375a850 [fixed] "not on" not "on on" 1 年之前
  hornguy6 c652409817 [fixed] a few missing gosubs and flags 1 年之前
  Kevin_Smarts 3dfe1acafa [fixed] Link for market banner not set in 'clothing' file so it just used text 1 年之前
  Kevin_Smarts 2c0c06ec36 Merge remote-tracking branch 'origin/master' 1 年之前
  Kevin_Smarts d4b287000f [fixed] Typos 1 年之前
  Vengeance11 75dfb2b227 Fix for typo spotted by Pocket 1 年之前
  Vengeance11 70613e7228 Fixed incorrect image calls and gt's 1 年之前
  Kevin_Smarts 88e5657488 [added] Entry missd on Version history 1 年之前
  Kevin_Smarts 074c24eea1 [fixed] Books are not naps 1 年之前
  Kevin_Smarts 753d632d0a [fixed] typos 1 年之前
  Kevin_Smarts 3cfb84ca9f [added] Missing entries on version history 1 年之前
  Kevin_Smarts 4cb888239b [fixed] Stat window not updated 1 年之前
  Kevin_Smarts 1742d5e916 [fixed] typo 1 年之前
  Kevin_Smarts 9468e90fd3 [added] Missed a couple of entries from bgkjdgbizgblzdgbr for version history 1 年之前
  Kevin_Smarts 7041628623 [added] Updated version history 1 年之前
  Kevin_Smarts 5c511cb154 Merge branch 'master' of https://git.tfgames.site/hornguy6/glife 1 年之前
  Kevin_Smarts a943674f2a [changed] The version number and name in preparation for release 1 年之前
  Kevin_Smarts 93e97269b5 [text edit] Anna text you can't even see yet but needed to be committed befrore release 1 年之前
  Kevin_Smarts 73acf82b2d [fixed] Sonia check for fall in journal not set correctly in outcast group 1 年之前
  Kevin_Smarts 5230cbeac1 [fixed] Knowing Mira exists used old style variable and the checkwas not used in cow scene, also changed relationship messages to fit the new starting value 1 年之前
  hornguy6 7b067d7c7b [fixed] less than should be greater than - the better your relationship was the more likely he was to use a condom 1 年之前
  hornguy6 3a233908b9 [fixed] Mira questline impossible to start since requires 0 npc_rel 1 年之前
  hornguy6 6e92b39c21 [fixed] blank action window 1 年之前
  hornguy6 2d40453e34 [fixed[ blank action fix 1 年之前
  Kevin_Smarts 00bc6a7cea Merge remote-tracking branch 'espAvalon/master' 1 年之前
  Pepegass 4bbacaeefa [fixed] fixed lock with mari dialog about nude photoshoot 1 年之前
  Kevin_Smarts 3ed7b80526 Merge remote-tracking branch 'hornguy6/master' 1 年之前
  hornguy6 4eb7746b92 [added] something to help the scheduler work a little better 1 年之前
  hornguy6 9891e09b16 [fixed] reset flag to 0 for non-game-breaking bug 1 年之前
  hornguy6 77bf5fbb1b [fixed] extra end and bad indent 1 年之前
  Kevin_Smarts e09a273fd0 Merge remote-tracking branch 'origin/master' 1 年之前
  Kevin_Smarts 45de72681c Merge remote-tracking branch 'hornguy6/master' 1 年之前
  hornguy6 1df44a62c1 [fixed] added correct virgin failsafes 1 年之前
  Vengeance11 ea32870481 Minor text edits 1 年之前
  Vengeance11 835660aba1 Spelling 1 年之前
  hornguy6 2dd266c54d [fixed] small shower creampie inconsistency - others still remain but would require me writing more scenes 1 年之前
  hornguy6 b1f91e4964 [fixed] forced_initiative was not getting reset regularly 1 年之前
  hornguy6 02b47617ce [fixed] double extra triple sure insertion is being accounted for 1 年之前
  hornguy6 6328330e58 [fixed] another insertion inconsistency 1 年之前
  hornguy6 c80bf3c9ff [fixed] a condom insertion inconsistency 1 年之前
  hornguy6 93f61e8b6b [fixed] clothing problems 1 年之前
  hornguy6 d7ccc9050f [fixed] a few other force initative bugs 1 年之前
  hornguy6 607807ec15 [fixed] wrong number for force_initiative 1 年之前
  hornguy6 d590aed52c [fixed] really dumb error 1 年之前
  hornguy6 9a8bcff569 [fixed] missing $ sign 1 年之前
  Kevin_Smarts 8e1275c7c0 [fixed] Drinks are not food 1 年之前
  Kevin_Smarts 44b3d3cb97 [fixed] Typo 1 年之前
  Kevin_Smarts 1e188313e2 Merge remote-tracking branch 'Hooded_Silence/master' 1 年之前
  Hooded Silence e6c2f70ae5 Missing colons on 519, 525 and 533, reported by maankamara (F95). 1 年之前
  Hooded Silence a4d9190f59 Fix white page bug in journal 1 年之前
  Hooded Silence 976694d77b Temporary removal of hidden event in journal check pending integration of new code for next dev cycle. 1 年之前
  Hooded Silence d4cf0deba8 Fixed accepting job lock-out in shop. 1 年之前
  hornguy6 de07dfee06 [fixed] uncleared actions 1 年之前
  hornguy6 0195daab96 [fixed] blank screen problem 1 年之前
  hornguy6 c6e440cc15 [fixed] onmy typo 1 年之前
  hornguy6 ae3ba8b89e [fixed] wrong location 1 年之前
  hornguy6 fac4388152 [fixed] separated out argument to make the file easier to follow 1 年之前
  hornguy6 89f997fc4d [fixed] reverted previous dress loop fix because it destroys the foundation for future content - fixed the problem in a different way 1 年之前
  Kevin_Smarts cd0d2279cf [fixed] Easier to find the file if its in .qprojso that it gets included in the .qsp file. One day I will learn. 1 年之前
  Kevin_Smarts b443eff0b6 [fixed] Missing link for mon cheri bodysuit description 1 年之前
  Kevin_Smarts 567218cca2 [fixed] Bodysuits at Lusso were not turned on and display issues in wardrobe 1 年之前
  Kevin_Smarts 34fdf4570a [fixed] Journal relationship bars moved up a line so its clear who they belong to 1 年之前
  Kevin_Smarts 0ab6628940 [fixed] purchased bodysuits showing up in store 1 年之前
  Kevin_Smarts 4d0e246cbc [fixed] Bodysuits now show name of all three stores but only if you have one of their products 1 年之前
  Kevin_Smarts 324e43f0a4 [fixed] Underwear going poof after hookups and fuckbuddies, removed loop and re-did in a simplified way that works in testing. 1 年之前
  Kevin_Smarts 7c1f8e0410 [fixed] Bodysuit descriptions fixed, which means their attributes are now working. Not that the attributes do much yet 1 年之前
  Pepegass bd8e29a3f9 [fixed] nerd dialog in park with gopniks leads to unreacheble actions 1 年之前
  bgkjdgbizgblzdgbr 542bd4ba35 [text edit] Missing text for Hanging out with Katja at the mall. 1 年之前
  bgkjdgbizgblzdgbr 37683bff45 [fixed] Bad cut and paste. 1 年之前
  bgkjdgbizgblzdgbr 58779f9043 [fixed] Make sure Sveta actaully goes with Katja to the mall when they go there together. 1 年之前
  Kevin_Smarts a8d9b25ea9 Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts e787595acf [text edit] Now sewing chat will be less confusing 1 年之前
  hornguy6 4b4c5f6ff7 [fixed] white screen 1 年之前
  hornguy6 d8badfc816 [fixed] another condom inconsistency 1 年之前
  hornguy6 9dea19ec3b [fixed] stat['virgin'] should be stat['think_virgin'] 1 年之前
  hornguy6 0c64bf5912 [fixed] you will no longer think your birth control is not working just because you entered the placebo phase of your birth control 1 年之前
  hornguy6 0d09a2f747 [fixed] replaced double apostrophe line breaks with *nl 1 年之前
  hornguy6 bc63f50817 [fixed] looping condom issue 1 年之前
  hornguy6 3f6e44d05c [fixed] more virginty conversation issues 1 年之前
  hornguy6 c818b603bd [fixed] boy is no longer giving conflicting messages about randomly showing up at his doorstep 1 年之前
  hornguy6 617e580767 [fixed] can't talk about losing your virginity if you didn't actually fuck 1 年之前
  hornguy6 618a7d523f [fixed] boy will not go back to sleep after making him breakfast 1 年之前
  hornguy6 c0ac958bbf [fixed] duplicate option 1 年之前
  hornguy6 d335ae9c04 [fixed] missing word typo 1 年之前
  Kevin_Smarts b149b7df7d Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 年之前
  Kevin_Smarts b57b4220ad [fixed] Stripping availability was using days of the month not week 1 年之前
  bgkjdgbizgblzdgbr afe27f5b4b [chenged] Anushka will show up at the Coffee Hole in non school girl starts. 1 年之前
  Kevin_Smarts 6cd803277c [fixed] Duplicate text 1 年之前
  Kevin_Smarts ec81003999 [fixed] Skirt labelled as a pair of shorts 1 年之前
  Kevin_Smarts 1a4015cffe [fixed] Lack of actions after a couple of nude debut reactions 1 年之前
  Kevin_Smarts caf2daf3ee Merge remote-tracking branch 'Derryth_Love/master' 1 年之前
  Derryth_Love 3ec3db2708 [fixed] White screen after hangover vomit in mey_home 1 年之前
  Kevin_Smarts c77e0ecd4a [fixed] Text should use time references in English not QSP 1 年之前
  Kevin_Smarts d476db8e26 [fixed] Bra then panties, not the other way around. 1 年之前
  Kevin_Smarts e4eb1735b9 Merge branch 'master' of https://git.tfgames.site/hornguy6/glife 1 年之前
  hornguy6 12737fec53 [fixed] maybe taking a shower will clean you 1 年之前
  hornguy6 f5c46b7a45 [fixed] changed how a variable resets for hopefully better consistency 1 年之前
  rachels 017192edcf [fixed] add missing "end" 1 年之前
  Kevin_Smarts ded944a01c Merge remote-tracking branch 'Derryth_Love/master' 1 年之前
  Kevin_Smarts 29f7d8dbf1 Merge remote-tracking branch 'espAvalon/master' 1 年之前
  Kevin_Smarts c0781fe8ab Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts a332ac62a9 [fixed] $ARGS mislabelled 1 年之前
  Kevin_Smarts fdd2db6691 [fixed] Only half the market clothing was available 1 年之前
  Kevin_Smarts 4c433f56e4 [fixed] It now takes time to go to school with Nat and trimmed trailing spaces in file 1 年之前
  Kevin_Smarts e20344adf7 [fixed] Shave options don't show if you don't need to shave which could lead to no actions 1 年之前
  Kevin_Smarts 385180f245 [text edit] Cryptic therapist to straight talker therapist so you know where to go and when. 1 年之前
  Kevin_Smarts 62909be8ce [fixed] Consistancy of therapist naming fix from Cookie 1 年之前
  Derryth_Love b2bfb5a545 Removed random chance to walk faster than the two you are Stalking 1 年之前
  Kevin_Smarts 5eb5fdd285 [Fixed] Time is an illusion, at least when talking to Ksenya it was 1 年之前
  hornguy6 8c1ff411c8 [fixed] needed some actions instead of a straight gosub 1 年之前
  hornguy6 c695dca454 [fixed] calling wrong file causing blank actions 1 年之前
  hornguy6 c62ef1c571 [fixed] blank screens and action windows 1 年之前
  Pepegass 2ddf6bdc35 [fixed] added all timesinks home>natbel>school 1 年之前
  Pepegass 4ddca5d87b Merge branch 'master' of https://git.tfgames.site/Pepegass/glife 1 年之前
  Pepegass 4298eb0193 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 年之前
  Pepegass 7f0d827ec0 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 年之前
  Pepegass ac0ce6e332 [fixed] added time drain for natasha home events 1 年之前
  Kevin_Smarts bfd6234dfd [fixed] Sveta's difficulty in cumming paused so sex with the therapist lets her orgasm. 1 年之前
  Kevin_Smarts 82706eb6df Merge remote-tracking branch 'Hooded_Silence/master' 1 年之前
  Kevin_Smarts ef6382db5e Merge remote-tracking branch 'Derryth_Love/master' 1 年之前
  Hooded Silence 445372c168 The Inquisition fixed the unholy bug in Pav Church where your mother would repeatedly pester you. 1 年之前
  Kevin_Smarts c165db1930 [fixed] Incorrect variable name 1 年之前
  Kevin_Smarts 8e1d2c483b [fixed] Missing clearances and act to allow Sveta to leave at end of event 1 年之前
  Kevin_Smarts a665e99b3b [fixd] Missing line break and I can't spell ferappitz 1 年之前
  Derryth_Love 28bca457b6 Depressed Sveta over a missing clr & cla fixed 1 年之前
  Kevin_Smarts 9d5b779453 [fixed] duplicate args label 1 年之前
  Kevin_Smarts f8069cfcf1 Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts 0b10deca07 Merge remote-tracking branch 'hornguy6/master' 1 年之前
  hornguy6 d8f8ae8f8a [fixed] making knowledge of birth control consistent and un-fuckupable 1 年之前
  hornguy6 4b25e43a2a [fixed] argument does not exist 1 年之前
  Kevin_Smarts 2288ea8254 [fixed] guitar practice time was incorrect 1 年之前
  Kevin_Smarts e87da8fae2 [fixed] There is no cured schoolboy, only zuul 1 年之前
  Kevin_Smarts 8bc3962531 [changed] Moved dob selection for TG SG start so it could actually be seen and set. 1 年之前
  Kevin_Smarts 23ebcf4cb7 [fixed] Lower inhibition for citystart punks so its in line with school starts 1 年之前
  hornguy6 57ceafaec2 [added] big content push with the hope that it fixes lots of issues and narrows down problems for further testing 1 年之前
  Kevin_Smarts 45dd1a5430 [fixed] Links to npc_finder updated to new name 1 年之前
  Kevin_Smarts ffcf56f070 [fixed] Ivan should be Vanya, spotted by GM 1 年之前
  Kevin_Smarts 32ebf51327 [fixed] several little bugs and clean up 1 年之前
  Kevin_Smarts d6883478e5 [fixed] Threesome with Artem fix from nutluck 1 年之前
  Kevin_Smarts 62b0ecb820 [fixed] npc_finder renamed, header and footing added and a gosub to refresh the object menu as per post from Grim 1 年之前
  Kevin_Smarts d976acda84 [added] Therapist hotel visit that was submitted befoer feature lock 1 年之前
  Kevin_Smarts 245c76e02b Merge remote-tracking branch 'origin/master' 1 年之前
  Kevin_Smarts c1f94012af Merge remote-tracking branch 'hornguy6/master' 1 年之前
  bgkjdgbizgblzdgbr eaadfb8989 [added/fixed] Will now also set default relationship values with school kids and family in the city starts. 1 年之前
  bgkjdgbizgblzdgbr 42afc82e95 [fixed] Somebody got the order wrong, since that order wont do anything. 1 年之前
  hornguy6 2e756fc3ae [fixed] code seeded for the future was preventing booty calls from occurring in the first week of the game 1 年之前
  hornguy6 0806e987e7 [fixed] made the booty call invites a little more consistent 1 年之前
  bgkjdgbizgblzdgbr 9986b692de [fixed] wrong links spotted by chloflo 1 年之前
  bgkjdgbizgblzdgbr e2161e9531 [fixed] various typos spotted by test159 1 年之前
  hornguy6 ee231194ac [fixed] did not realize i forgot to push removed code 1 年之前
  hornguy6 d8371c5701 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 年之前
  Kevin_Smarts 97961f5a0f [fixed] Turns out I'm an idiot 1 年之前
  Kevin_Smarts 4ebe68711b [fixed] Missed TG start initialization 1 年之前
  hornguy6 97130ef7e9 [fixed] removal of saveupdate section that was breaking new games 1 年之前
  hornguy6 32f92911d3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 年之前
  hornguy6 21319aceda [added] code to enable a scene as a legacy event in hopes that saves won't be broken 1 年之前
  Kevin_Smarts 85c01941aa [fixed] Loop of DOOM!!! 1 年之前
  Kevin_Smarts 8780bbca6c [fixed] teleporting after taking Mom's photo removed 1 年之前
  Kevin_Smarts 77e71bedb8 [fixed] Typos spotted by BBZ01 1 年之前
  bgkjdgbizgblzdgbr 0563bdcae4 [fixed] ARGS with wrong name 1 年之前
共有 100 個文件被更改,包括 3347 次插入2005 次删除
  1. 3 0
      glife.qproj
  2. 2 2
      locations/JuliaMilHome.qsrc
  3. 0 65
      locations/NPCFinder.qsrc
  4. 1 1
      locations/_attributes_coco_outfits.qsrc
  5. 10 10
      locations/_attributes_moncheri_bodysuit.qsrc
  6. 1 1
      locations/albina_chat.qsrc
  7. 2 2
      locations/albina_election_events.qsrc
  8. 12 12
      locations/albina_house_events.qsrc
  9. 1 1
      locations/albina_school_sex.qsrc
  10. 1 1
      locations/anushka.qsrc
  11. 15 8
      locations/anushkachat.qsrc
  12. 7 7
      locations/artem_date_events.qsrc
  13. 8 16
      locations/begin.qsrc
  14. 1 11
      locations/beverage.qsrc
  15. 9 4
      locations/booty_call.qsrc
  16. 222 89
      locations/booty_call_after.qsrc
  17. 538 37
      locations/booty_call_condoms.qsrc
  18. 37 21
      locations/booty_call_cowgirl.qsrc
  19. 165 72
      locations/booty_call_cum.qsrc
  20. 93 47
      locations/booty_call_doggy.qsrc
  21. 8 14
      locations/booty_call_favorite_part.qsrc
  22. 100 59
      locations/booty_call_miss.qsrc
  23. 30 9
      locations/booty_call_morning.qsrc
  24. 4 4
      locations/booty_call_pillow_talk.qsrc
  25. 469 141
      locations/booty_call_reactions.qsrc
  26. 251 199
      locations/booty_call_sex.qsrc
  27. 45 23
      locations/booty_call_shower.qsrc
  28. 130 192
      locations/booty_call_start.qsrc
  29. 8 0
      locations/booty_call_stats.qsrc
  30. 78 9
      locations/booty_call_talk.qsrc
  31. 162 232
      locations/booty_call_virgin.qsrc
  32. 12 1
      locations/brother_voyeur.qsrc
  33. 7 1
      locations/camera.qsrc
  34. 1 1
      locations/cikl.qsrc
  35. 2 2
      locations/city_coffee_hole.qsrc
  36. 1 1
      locations/city_market.qsrc
  37. 1 1
      locations/clothing.qsrc
  38. 113 114
      locations/emp_functions.qsrc
  39. 3 8
      locations/exhibitionistshop.qsrc
  40. 2 2
      locations/fertility.qsrc
  41. 13 0
      locations/foto_nude_debut.qsrc
  42. 5 1
      locations/foto_shoot.qsrc
  43. 1 1
      locations/gadfield.qsrc
  44. 1 1
      locations/gadforest.qsrc
  45. 3 3
      locations/gadukino.qsrc
  46. 1 1
      locations/gdktoilet_mens.qsrc
  47. 1 1
      locations/gossips.qsrc
  48. 1 0
      locations/gschool_cheerleading.qsrc
  49. 1 1
      locations/home_activity.qsrc
  50. 2 0
      locations/hookup.qsrc
  51. 33 37
      locations/hookup_after.qsrc
  52. 1 1
      locations/hookup_morning.qsrc
  53. 2 2
      locations/hookup_talk.qsrc
  54. 24 11
      locations/hotel_anna.qsrc
  55. 10 0
      locations/intro_city_select.qsrc
  56. 2 0
      locations/intro_sg_select.qsrc
  57. 26 17
      locations/intro_sg_tg.qsrc
  58. 4 3
      locations/journal.qsrc
  59. 1 1
      locations/journal_quests.qsrc
  60. 11 11
      locations/katjaEvDin.qsrc
  61. 3 2
      locations/katja_chat.qsrc
  62. 5 1
      locations/katja_city.qsrc
  63. 4 4
      locations/katja_uni_sex.qsrc
  64. 2 8
      locations/lusso.qsrc
  65. 1 1
      locations/mey_vika_events.qsrc
  66. 4 4
      locations/miroslava.qsrc
  67. 1 1
      locations/model_mari.qsrc
  68. 1 5
      locations/moncheri.qsrc
  69. 1 1
      locations/music_bedroompractice.qsrc
  70. 5 1
      locations/natbelEv.qsrc
  71. 10 1
      locations/natbel_cp_1.qsrc
  72. 1 1
      locations/nerd_game_night.qsrc
  73. 71 0
      locations/npc_finder.qsrc
  74. 13 26
      locations/npc_relationship.qsrc
  75. 10 3
      locations/npcgeneratec.qsrc
  76. 1 1
      locations/obj_din.qsrc
  77. 26 8
      locations/park_walkevents.qsrc
  78. 1 0
      locations/pav_church.qsrc
  79. 0 1
      locations/pav_disco_gopniks.qsrc
  80. 20 0
      locations/pav_hotel.qsrc
  81. 73 190
      locations/pav_hotelWork.qsrc
  82. 2 2
      locations/pav_lake.qsrc
  83. 1 1
      locations/pav_library_nerdstudy.qsrc
  84. 27 26
      locations/pav_parkev.qsrc
  85. 0 11
      locations/pav_residential.qsrc
  86. 1 1
      locations/pav_train_market.qsrc
  87. 21 22
      locations/rape_events.qsrc
  88. 1 1
      locations/saveg.qsrc
  89. 3 14
      locations/saveupdater.qsrc
  90. 1 3
      locations/shop_photography.qsrc
  91. 1 7
      locations/shop_scandalicious.qsrc
  92. 0 1
      locations/sleep.qsrc
  93. 78 78
      locations/soniahome.qsrc
  94. 1 1
      locations/start.qsrc
  95. 1 1
      locations/stripclub.qsrc
  96. 1 1
      locations/telefon.qsrc
  97. 89 57
      locations/therapist.qsrc
  98. 123 0
      locations/therapist_hotel.qsrc
  99. 5 3
      locations/underwear_attributes.qsrc
  100. 40 4
      locations/underwear_bodysuits.qsrc

+ 3 - 0
glife.qproj

@@ -69,6 +69,7 @@
 		<Location name="drugs"/>
 		<Location name="npc_relationship"/>
 		<Location name="npc_reactions"/>
+		<Location name="npc_finder"/>
 		<Location name="grades"/>
 		<Location name="internet_mobile"/>
 	</Folder>
@@ -204,6 +205,7 @@
 		<Location name="$attributes_lusso_bodysuit"/>
 		<Location name="$attributes_lusso_bra"/>
 		<Location name="$attributes_lusso_panties"/>
+		<Location name="$attributes_moncheri_bodysuit"/>
 		<Location name="$attributes_salacious_panties"/>
 		<Location name="$attributes_salacious_bra"/>
 		<Location name="$attributes_salacious_bodysuit"/>
@@ -1018,6 +1020,7 @@
 		<Location name="pav_clinic"/>
 		<Location name="therapist"/>
 		<Location name="therapist_reminder"/>
+		<Location name="therapist_hotel"/>
 		<Location name="gevent"/>
 		<Location name="pav_park"/>
 		<Location name="pav_park_sex"/>

+ 2 - 2
locations/JuliaMilHome.qsrc

@@ -589,10 +589,10 @@ if $ARGS[0] = 'julia_chat':
 				act 'Stop talking': gt 'JuliaMilHome','julia_room'
 				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
 			end
-			act 'Say nothing, just hug him back':
+			act 'Say nothing, just hug her back':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-				'You kiss her and hug her back. You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
+				'You kiss her and hug her back. You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
 
 				act 'Stop talking': gt 'JuliaMilHome','julia_room'
 				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'

+ 0 - 65
locations/NPCFinder.qsrc

@@ -1,65 +0,0 @@
-*clr
-'<a href="exec: gt ''NPCFinder'', ''finder''">Enter the ID of the character.</a>'
-if $ARGS[0] = 'finder':
-	$looking = input ('ID (like <i>A17</i>)')
-	gt 'NPCFinder'
-end
-
-if $looking ! '':
-	'<br><br>'
-	'Found character:'
-	'<br>'
-	'<<$npc_pic[''<<looking>>'']>>'
-	'DNA string: <<$npc_dna[''<<$looking>>'']>>'
-	'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
-	if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
-	'Intelligence: <<npc_intel[''<<$looking>>'']>>'
-	if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
-	if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
-	if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
-	if npc_haircol['<<$looking>>'] = 0:
-		'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
-	elseif npc_haircol['<<$looking>>'] = 1:
-		'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
-	elseif npc_haircol['<<$looking>>'] = 2:
-		'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
-	else
-		'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
-	end
-	if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
-	'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
-	'Height: <<npc_height[''<<$looking>>'']>>'
-	if npc_gender['<<$looking>>'] = 0:
-		'Gender: male'
-		'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
-		'Dick length: <<npc_dick[''<<$looking>>'']>>'
-		'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
-	else
-		'Gender: female'
-		'Breast size: <<npc_bust[''<<$looking>>'']>>'
-	end
-	if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
-	if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
-	if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
-	if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
-	if $npcvendisease = '': $npcvendisease = 'none'
-	'Veneral diseases: <<$npcvendisease>>'
-	'Sexual acts with PC: <<npc_sex[''$looking'']>>'
-	'Perversion: <<npc_perv[''$looking'']>>'
-	'Notes: <<$npc_notes[''<<$looking>>'']>>'
-	''
-	'Found relationships:'
-	npctemp = 0
-	:relationshipfinder
-		gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
-		if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
-			'<br>ID: A<<npctemp>>'
-			'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
-			'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
-			'Relationship type: <<$gen_relationship>>'
-		end
-	if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'
-	killvar 'npctemp'
-	killvar 'npcvendisease'
-	killvar 'looking'
-end

+ 1 - 1
locations/_attributes_coco_outfits.qsrc

@@ -999,7 +999,7 @@ elseif ARGS[1] = 158:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloPantsShortness = 5
+	CloSkirtShortness = 5
 	CloStyle = 4
 	
 elseif ARGS[1] = 159:

+ 10 - 10
locations/_attributes_moncheri_bodysuit.qsrc

@@ -30,8 +30,8 @@ elseif ARGS[1] = 2:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 2
 
 elseif ARGS[1] = 3:
 	BraType = 4
@@ -41,8 +41,8 @@ elseif ARGS[1] = 3:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 2
+	PanCoverBack = 2
 
 elseif ARGS[1] = 4:
 	BraType = 6
@@ -52,8 +52,8 @@ elseif ARGS[1] = 4:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 5:
 	BraType = 7
@@ -511,11 +511,11 @@ elseif ARGS[1] = 46:
 	BraMaterial = 6
 	BraFun = 1
 	BraQuality = 6
-	BraThinness = 6
+	BraThinness = 5
 	BraCover = 3
-	PanThinness = 6
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanThinness = 4
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 47:
 	BraType = 7

+ 1 - 1
locations/albina_chat.qsrc

@@ -661,7 +661,7 @@ if $ARGS[0] = 'bj_fav':
 		act 'I do it for my boyfriend':
 			cla & *nl
 			'"I like making my boyfriend feel good," you smile. "He likes it, so I like it."'
-			'"Oh puh-leez," Albina rolls her eyes. "If I knew you were going to talk about romantic bullshit like that, I woudln''t have asked. Romance is for old decrepit fucks."'
+			'"Oh puh-leez," Albina rolls her eyes. "If I knew you were going to talk about romantic bullshit like that, I wouldn''t have asked. Romance is for decrepit old fucks."'
 			'Her words come across sharp, but you can see the twinkle in her eye that lets you know she''s just kidding.'
 			'"But seriously. Don''t you ever get tired of swallowing?"'
 			gs 'albina_chat','spit_or_swallow'

+ 2 - 2
locations/albina_election_events.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'din_zajava_albfather':
 				*nl
 				'You look down at your phone and see that she hung up. Despite Chernov''s promise, it feels like you sold Albina out. Yet, just before she hung up, it sounded like she might have been... <i>happy?</i>'
 				'Did she <i>want</i> you to tell Chernov everything? The whole encounter has left you feeling bewildered and confused.'
-				act 'Leave':gt 'pav_commercial'
+				act 'Leave':gt 'pav_residential'
 			end
 		end
 	end
@@ -141,7 +141,7 @@ if $ARGS[0] = 'din_zajava_albfather_no2':
 			*nl
 			'You look down at your phone and see that she hung up. Despite Chernov''s promise, it feels like you were about to sell Albina out. Yet, just before she hung up, it sounded like she might have been... disappointed?'
 			'Did she <i>want</i> you to tell Chernov? The whole encounter has left you feeling bewildered and confused.'
-			act 'Leave':gt 'pav_commercial'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end

+ 12 - 12
locations/albina_house_events.qsrc

@@ -21,8 +21,8 @@ if $ARGS[0] = 'first_visit':
 	AlbinaQW['albride'] = 2
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 	'Albina leads you to the rather well furnished and decorated sitting room. "You''ll have to excuse the mess. The maid was... loyal to my father, so she had to go." She then disappears into the kitchen. While she is gone, her phone vibrates on the table. You look and see that "Mama" is trying to call her.'
-	'<i>Strange. She''s never mentioned her mother. Hell, she barely talks about her father,</i> you think to yourself.'
-	'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. She quickly picks her phone up and types a message before stuffing it in her pocket.'
+	'<i>"Strange. She''s never mentioned her mother. Hell, she barely talks about her father,"</i> you think to yourself.'
+	'The phone rings out as Albina returns with a bottle of wine and two glasses and places them on the table. Noticing her missed call, she quickly picks her phone up and types a message before stuffing it in her pocket.'
 	act 'Continue':
 		*clr & cla
 		minut += 15
@@ -95,9 +95,9 @@ if $ARGS[0] = 'first_visit2':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
 	'Eventually Albina''s body stops shuddering and she pulls back. Her eyes are bloodshot and the fierce sobs that coursed through her have been reduced to small hiccuping gasps.'
-	'"My mama is coming home you know," she whispers with a small smile. She glances up at you with eyes that look like they could burst in to tears again at any moment, but this time with joy. "All these years after he chased her away... She''s going to come home. She''s going to come back to me! <i>For</i> me!" She is practically beaming.'
+	'"My mama is coming home you know," she whispers with a small smile. She glances up at you with eyes that look like they could burst into tears again at any moment, but this time with joy. "All these years after he chased her away... She''s going to come home. She''s going to come back to me! <i>For</i> me!" She is practically beaming.'
 	'"You really miss her, don''t you?"'
-	'Instead of answering you, she lunges forward and presses her lips against yours, forcing her tongue between them.'
+	'Instead of answering you, she leans forward and presses her lips against yours, forcing her tongue between them.'
 	gs 'willpower', 'kiss', 'resist', 'medium'
 	gs 'arousal', 'kiss', -5
 	if will_cost <= pcs_willpwr:
@@ -108,7 +108,7 @@ if $ARGS[0] = 'first_visit2':
 			gs 'willpower', 'pay', 'resist'
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 			'You jump back in fright, breaking the kiss and nearly falling off the sofa. In turn, Albina jumps back from you, looking distraught.'
 			'"I''m sorry <<$pcs_nickname>>! I-! I shouldn''t have... I don''t know what came over me! I... I''m sorry," she repeats. "You should go... I don''t want to..."'
 			act 'Do as she suggests':
@@ -123,21 +123,21 @@ if $ARGS[0] = 'first_visit2':
 				'"No, it''s okay," you shake your head. "I was just... surprised. I didn''t mean to react that way."'
 				'"You should go..." she says again, her voice flat.'
 				'"No, I''m not leaving you like this. If you want, I could just sit here and we could chat for a while?"'
-				'Raising her head, Albina looks at you with a sad smile. "I''d like that."'
+				'Raising her head, she looks at you with a sad smile. "I''d like that."'
 				*nl
 				act 'Continue':
 					cla & *clr
 					minut += 60
 					npc_rel['A23'] += 10
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 					'You sit by her side as she begins to tell you everything about herself that was once hidden from you. How her father never wanted children. How he abused her mother because of her birth. The way he chased her mother away and then blamed Albina for it after. Many of her rapes, described in graphic, painful detail. How she seeks comfort from women because of the abuse she''s endured at the hands of men. And finally, how she gathered evidence for years before submitting it to the police and having him arrested. You do nothing but sit and nod along the entire time, listening intently.'
 					*nl
 					'At the end of an hour, it seems a weight has been lifted from her shoulders and she has <i>slightly</i> sobered up.'
 					'"I''ve never told anyone that before," she says. "You... you really don''t think worse of me?"'
 					act 'No I don''t':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'"No," you shake your head. "I don''t. I think you''re one of the bravest people I''ve ever met."'
 						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave':gt 'pav_residential'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'first_sex':
 					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."' 
 					act 'Get dressed':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'Albina helps you clean up before you get dressed and you finally collect your things, preparing to bid her farewell. She forgos her clothes, choosing to walk you to the door instead. As you walk down the driveway, you turn and see her, standing naked in the doorway waving you goodbye and you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave':gt 'pav_residential'
 					end
@@ -950,7 +950,7 @@ if $ARGS[0] = 'night_stand':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushdrawer.jpg"></center>'
 			'You jump on the spot and slam the drawer closed before turning to face a rather annoyed looking Albina.'
-            '"Do you mind <i>not</i> going through my personal things when I''m not here? I wouldn''t do it to you, so I don''t appeciate you doing it to me."'
+            '"Do you mind <i>not</i> going through my personal things when I''m not here? I wouldn''t do it to you, so I don''t appreciate you doing it to me."'
             'You gingerly nod your head at her in reply.'
 			act 'Close the drawer':gt 'albinahome','bedroom'
 		end
@@ -960,7 +960,7 @@ if $ARGS[0] = 'night_stand':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushdrawer.jpg"></center>'
-		'Albina excuses herself and leaves the room. You grow bored waiting and decide to have a quick snoop around before she returns, opening the drawer of her nightstand to have a peek. You find a hairbrush, various skin care products, contraceptive pills, bottles of lube, a vibrator, dildos of various sizes and a large butt plug all tossed inside, seemingly without any care. A piece of folded paper hiding underneath the pile catches your eye.' 
+		'Albina excuses herself and leaves the room. You soon grow bored waiting and decide to have a quick snoop around before she returns, opening the drawer of her nightstand to have a peek. You find a hairbrush, various skin care products, contraceptive pills, bottles of lube, a vibrator, dildos of various sizes and a large butt plug all tossed inside, seemingly without any care. A piece of folded paper hiding underneath the pile catches your eye.' 
 		'You glance around, but it looks like Albina is still busy elsewhere, so you fish out the paper and unfold it to find that it''s actually a crumpled photo of a young Albina dancing as her mother proudly watches. You can see why it has sentimental value to Albina, but decide that you''ve invaded her privacy enough, so you carefully place the photo back inside and close the drawer just before Albina returns and smiles at you.'
 		act 'Close the drawer':gt 'albinahome','bedroom'
 	end
@@ -974,7 +974,7 @@ if $ARGS[0] = 'computer':
 		*clr & cla
 		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 		'You point towards the laptop sitting at the foot of her bed. "I should''ve guessed that you would have something like that."'
-		'"Yeah, I honestly don''t know why I bought it. I sometimes look up workout techniques and sex tips, but I mostly just use it to watch porn when I feel like rubbing one out."'
+		'"Yeah, I honestly don''t know why I bought it. I sometimes look up workout techniques and look at clothes, but I mostly just use it to watch porn when I feel like rubbing one out."'
         'You''re a little surprised that she would admit such a thing to you given how private and guarded she is about herself.'
 	
 		act 'Do something else':gt 'albinahome','bedroom'

+ 1 - 1
locations/albina_school_sex.qsrc

@@ -177,7 +177,7 @@ if $ARGS[0] = 'lunch_fun_1_2':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome7.jpg"></center>'
 							'Albina pulls her into an embrace as you sit back on the desk alongside them. You sit quietly for a few minutes in post orgasm bliss before Julia suddenly scurries to her feet.'
-							'"Oh no no no! Lunch is almost over! I.. I need to go before Zinadia wonders where I am. I said I would discuss strategies for our game night with her after I finished studying."'
+							'"Oh no no no! Lunch is almost over! I.. I need to go before Zinaida wonders where I am. I said I would discuss strategies for our game night with her after I finished studying."'
 							'You and Albina sit and watch in amusement as Julia frantically picks up her clothes and stumbles around pulling them on as quickly as she can before she picks up her scattered belongings from the floor, stuffs them into her bag and runs out of the room.'
 							'Once she''s gone, the two of you share a laugh at what just happened before you both get dressed yourselves.'
 							'"Well that certainly was fun. I suspected Julia had a thing for me, but I wasn''t expecting her to be so... enthusiastic..." Albina says with a grin as she pulls her skirt back on. "The girl''s got some great tits and an amazing ass. Shame she hangs with those geeks." The bell rings as you finish dressing and you both head out to your next class.'

+ 1 - 1
locations/anushka.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'wedgie fight':
 									gt 'anushapt', 'livingroom'
 								else
 									AnushkaLoc = 2
-									gt 'anushapt', 'anushroom'
+									gt 'anush_bedroom', 'anushroom'
 								end
 							end
 						end

+ 15 - 8
locations/anushkachat.qsrc

@@ -520,14 +520,21 @@ if $ARGS[0] = 'chat':
 		end
 	end
 	if artemQW['nush3some_ask'] = 2:
-		act 'Talk about Artem 3some':
+		act 'Talk about Artem threesome':
 			*clr & cla
 			minut += 5
-			artemQW['nush3some'] += 1
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
-			'You glance over to her. "Well, I talked to Artem about a threesome and... he''s up for it."'
-			'Anushka giggles. "Of course he is. Boys are so predictable." You briefly consider telling her how the conversation really went, but decide against it. She might tease Artem about it and you would like your boyfriend and friend get along. Instead you just agree and the two of you start talking about possible days and times you can do it.'
+			if artemQW['nush3some'] = 0:
+				artemQW['nush3some'] = 1
+				'You glance over at her. "I talked to Artem about a threesome and... he''s up for it."'
+				'Anushka giggles. "Of course he is. Boys are so predictable." You briefly consider telling her how the conversation really went, but decide against it. She might tease Artem about it and you would like your boyfriend and friend get along, so you just agree with her and the two of you start talking about possible days and times.'
+			else
+				'You glance over at her. "I''ve been thinking. Are you sure you''re up for a threesome with Artem?"'
+				'She give you a puzzled stare. "Are you changing your mind or something?"'
+				'You shake your head. "No, just making sure you haven''t is all."'
+				'She gives you a strange look and shakes her head slightly. "Whatever. Just call me when you guys want to do it and I''ll swing by if I''m not busy." You briefly consider telling her how the conversation really went, but decide against it. She might tease Artem about it and you would like your boyfriend and friend get along, so you just agree with her and the two of you start talking about possible days and times.'
+			end
 			act 'Stop talking': gt 'anush_bedroom','anushroom'
 			act 'Keep talking': gt 'anushkachat', 'chat'
 		end
@@ -542,15 +549,15 @@ if $ARGS[0] = 'photo_chat':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 	'You climb off the bed and grab your camera from your purse. "Hey, do you mind if I take your photo for my portfolio?" you ask.'
 	'She grins and lies back, stretching in a suggestive way. "You want me to model for you?"'
-	'You can''t help but grin at her antics. "Yes, will you model or me? I need the practice and I think you would make a great model."'
+	'You can''t help but grin at her antics. "Yes. I need the practice and I think you would make a great model."'
 	'She giggles. "Sure, but only if you send me copies for my modelling portfolio."'
 	if anushkaQW['model'] >= 1:
 		'You nod. "Deal."'
 	else
 		anushkaQW['model'] = 1
-		'You do a bit of a double take. "Wait what? Your modelling portfolio?"'
-		'She giggles at your reaction. "Yeah, I model at the Aphrodite Photography Agency, in the city."'
-		'You''re a little surprised, not that she models, but that you hadn''t heard about it yet. "Oh. Uh yeah, sure I can do that."'
+		'You do a bit of a double take. "Wait, what? Your modelling portfolio?"'
+		'She giggles at your reaction. "Yeah, I model at a place called Aphrodite in the city."'
+		'You''re a little surprised that you hadn''t heard about this until now. "Oh. Uh yeah, sure I can do that."'
 	end
 	act 'Take out your camera':
 		cla & *clr

+ 7 - 7
locations/artem_date_events.qsrc

@@ -544,7 +544,7 @@ if $ARGS[0] = 'gang_rape':
 		gs 'stat'
 		act 'The nightmare begins':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 			'Two of them hold you down while one pulls his dick out, shoves it in your pussy and starts hammering away, not caring if you enjoy it or not. The more you struggle or cry out, the more they seem to enjoy it.'
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
@@ -553,7 +553,7 @@ if $ARGS[0] = 'gang_rape':
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
 				'The one watching takes his turn and forces his dick inside you while the first one just watches as he jerks off.'
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
@@ -562,7 +562,7 @@ if $ARGS[0] = 'gang_rape':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape3.jpg"></center>'
 					'"Alright, my turn," the leader says. "Roll her over onto her hands and knees." You''re roughly forced into a kneeling position on the nasty old mattress, with your face forced against it. You feel someone spit on your asshole before a dick is shoved inside, causing you to cry out in pain as he starts pounding you balls deep. "Much tighter than that gaping pussy after you guys ripped it up!" He laughs and the others join in.'
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gang_rape':
 					gs 'stat'
 					act 'Two at a time':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape4.jpg"></center>'
 						'The leader pulls out of your ass and lies in front of you on his side as someone else starts roughly fucking your ass. Once he''s next to your head, the leader shoves his dick in your mouth and makes you suck his dick as the other three take turns fucking your ass. You soon feel one of them cumming in your ass as another speaks up. "Come on, she has other holes! I''m tired of waiting!"'
 						gs 'pain', 2, 'wrists', 'bind'
 						gs 'pain', 6, 'jaw', 'ache'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'gang_rape':
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 							'With that, one of them lies down on the mattress and they force you to straddle and mount him, his cock sliding into your battered pussy as another cock is shoved into your mouth and a third back in your ass. The ones who were on watch come over to take their turns as you feel one of them cumming in your pussy.'
 							gs 'pain', 2, 'wrists', 'bind'
 							gs 'pain', 6, 'jaw', 'ache'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'gang_rape':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum1.jpg"></center>'
 								'The remaining ones take turns fucking all three of your holes so much that you lose count as two of them cum inside you. When they pull out, you feel the cum leaking out of both of your holes as one of the other guys cums in your mouth.'
 								gs 'pain', 2, 'wrists', 'bind'
 								gs 'pain', 6, 'jaw', 'ache'
@@ -616,7 +616,7 @@ if $ARGS[0] = 'gang_rape':
 								gs 'stat'
 								act 'Last one':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum2.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum2.jpg"></center>'
 									'The last one starts fucking your throat. Before too long, he starts cumming as well, holding your mouth open with one hand as he jerks off with the other, milking every last drop of cum into your mouth.'
 									gs 'pain', 2, 'wrists', 'bind'
 									gs 'pain', 6, 'jaw', 'ache'

+ 8 - 16
locations/begin.qsrc

@@ -94,29 +94,21 @@ if $ARGS[0] = 'start':
 	'</table></center>'
 	
 	if $start_type = 'sg' or $start_type = 'sg_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_sg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
 	elseif $start_type = 'sg_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_sg_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_sg_tg', 'start'
 	elseif $start_type = 'city':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city', 'start'
 	elseif $start_type = 'city_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city_m', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city_m', 'start'
 	elseif $start_type = 'city_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city_tg', 'start'
 	elseif $start_type = 'uni':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni', 'start'
 	elseif $start_type = 'uni_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni_m', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni_m', 'start'
 	elseif $start_type = 'uni_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni_tg', 'start'
 	end
 	
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'

+ 1 - 11
locations/beverage.qsrc

@@ -10,7 +10,6 @@ if $ARGS[0] = 'bev_kva':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
 	pcs_mood += 15
-	pcs_energy += 8
 	if pcs_hydra >= 100:
 		pcs_hydra += 30
 	else
@@ -41,7 +40,6 @@ if $ARGS[0] = 'bev_jui':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 8
 	pcs_mood += 10
-	pcs_energy += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 40
 	else
@@ -71,7 +69,7 @@ if $ARGS[0] = 'bev_mil':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 8
+	pcs_energy += 5
 	if pcs_hydra >= 100:
 		pcs_hydra += 50
 	else
@@ -128,7 +126,6 @@ if $ARGS[0] = 'bev_cof':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 15
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
 	else
@@ -159,7 +156,6 @@ if $ARGS[0] = 'bev_tea':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
-	pcs_energy += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
 	else
@@ -190,7 +186,6 @@ if $ARGS[0] = 'bev_energy_drink':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
-	pcs_energy += 20
 	fat += 3
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -419,7 +414,6 @@ if $ARGS[0] = 'coffee':
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 15
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
 	else
@@ -442,7 +436,6 @@ if $ARGS[0] = 'only_cost_bco':
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 15
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
 	else
@@ -468,7 +461,6 @@ if $ARGS[0] = 'only_cost_cof':
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 15
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
 	else
@@ -494,7 +486,6 @@ if $ARGS[0] = 'only_cost_tea':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
-	pcs_energy += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
 	else
@@ -520,7 +511,6 @@ if $ARGS[0] = 'only_cost_esp':
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
-	pcs_energy += 15
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0

+ 9 - 4
locations/booty_call.qsrc

@@ -3,18 +3,21 @@ if $ARGS[0] = 'scheduler':
 	!! clear SMS
 	!! clear schedule
 	killvar 'booty_call_time'
+	killvar 'npc_booty_call'
+	killvar 'npc_booty_call_time'
 	i = 0
 	gs 'booty_call', 'scheduler2'
 end
 
 if $ARGS[0] = 'scheduler2':
-	if i <= arrsize('$FuckBuddy'):
+	if i <= arrsize('$fuckbuddy'):
 		gs 'booty_call', 'npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
+		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 			gs 'booty_call', 'scheduler3'
 		else
 			npc_no_booty_call[$FuckBuddy[i]] = daystart
@@ -55,7 +58,9 @@ if $ARGS[0] = 'set_booty_call_date':
 	elseif booty_call['invite_tomorrow'] = 1:
 		npc_booty_call[$boy] = daystart + 1
 	end
-	npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+	if npc_booty_call_time[$boy] = 0:
+		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+	end
 end
 
 if $ARGS[0] = 'block_booty_calls':
@@ -72,7 +77,7 @@ if $ARGS[0] = 'SMS raiser':
 	i = 0
 	:booty_call_sms_raiser_loop
 	if i < arrsize('$FuckBuddy'):
-		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
+		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_last_booty_call[$boy] ! daystart:
 			gs 'booty_call_sms', 'start', $FuckBuddy[i]
 			gs 'booty_call_sms', 'Add SMS', $FuckBuddy[i]
 			booty_call_time[$FuckBuddy[i]] = 2399

+ 222 - 89
locations/booty_call_after.qsrc

@@ -37,10 +37,15 @@ if $ARGS[0] = 'exit':
 	end
 end
 
+if $ARGS[0] = 'break_up':
+	gs 'lover', 'remove fuckbuddy', $boy
+	act'Leave':gt'booty_call_after', 'exit'
+end
+
 if $ARGS[0] = 'ending':
 !!	gs 'booty_call_stats', 'save'
 	gs 'arousal', 'end'
-	gs'booty_call_after', 'dress'
+	if $clothingworntype = 'nude': gs'booty_call_after', 'dress'
 	if booty_call['fuck'] > 0: know_virgin[$boy] = 0
 	if booty_call['creampie_orgasm'] = 1: stat_memory['creampie_orgasm'] = daystart
 	npc_last_sex[$boy] = daystart
@@ -49,8 +54,12 @@ end
 
 if $ARGS[0] = 'dress':
 	if $clothingworntype = 'nude': gs 'clothing', 'wear_last_worn'
-	if $pantyworntype = 'none': gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
-	if $braworntype = 'none': gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
+	if $pantyworntype = 'none' and $lastwornpantytype['booty_call'] ! 'none' and $lastwornpantytype['booty_call'] ! '':
+		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
+	end
+	if $braworntype = 'none' and $lastwornbratype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! '':
+		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
+	end
 	gs 'stat'
 end
 
@@ -71,7 +80,7 @@ end
 if $ARGS[0] = 'quit2':
 	booty_call['annoyed'] = 1
 	*nl
-	'Both of you lay back in bed, slightly frustrated with each other with where you''re calling things today, but neither willing to concede.'
+	'Both of you lay back in bed, slightly frustrated with each other to the point that the mood is demonstrably ruined, but neither willing to concede.'
 	if npc_smoker[$boy] > 0: *nl & '<<$npc_firstname[$boy]>> grabs his cigarettes from his nightstand and lights up, puffing away at it in annoyance.'
 	gs'booty_call_after', 'after_sex2'
 end
@@ -167,7 +176,6 @@ if $ARGS[0] = 'stop_here_options':
 	act'I don''t have time':
 		cla & *nl
 		booty_call['no_time'] += 1
-		booty_call['blue_ball'] = 1
 		if booty_call['keep_going_continue'] >= 1:
 			'"Seriously <<$npc_firstname[$boy]>>," you say. "I can''t. You''re gonna make me late."'
 		else
@@ -210,6 +218,7 @@ if $ARGS[0] = 'stop_here_options':
 					gs'booty_call_after', 'after_sex1'
 					gs'booty_call_after', 'well_continue'
 				else
+					booty_call['blue_ball'] = 1
 					'"Your mom''s a bitch, you know that?" <<$npc_firstname[$boy]>> grumbles, pulling away.'
 					act'Tell me about it':
 						cla & *nl
@@ -295,7 +304,7 @@ if $ARGS[0] = 'tap_out':
 			booty_call['sore_pussy'] = 1
 			cla & *clr
 			$npc_apt_bedroom[$boy]
-			if booty_call['cock_remove'] = 1:
+			if booty_call['cock_inserted'] = 0:
 				'"I need to tap out," you pant breathlessly. "You''re just too big for me... I can''t keep going..."'
 			else
 				'"I need to tap out," you pant breathlessly, wincing at the pain of the large cock still filling you up. "You''re just too big for me... I can''t keep going..."'
@@ -350,21 +359,23 @@ if $ARGS[0] = 'fucked_out':
 	cla & *clr
 	$npc_apt_bedroom[$boy]
 	if booty_call['fuck_again'] = 1:
-		'"Fuck me again," you moan eagerly, not having had enough yet.'
+		'"Wanna keep going?" you eagerly ask <<$npc_firstname[$boy]>>.'
+	elseif booty_call['cock_inserted'] = 1:
+		'"Wanna keep going?" you eagerly ask, flexing your pussy around <<$npc_firstname[$boy]>>''s cock.'
 	else
-		'"Wanna keep going?" you ask eagerly.'
+		'"Wanna keep going?" you eagerly ask <<$npc_firstname[$boy]>>.'
 	end
-	'"I don''t think I can..."'
-	if booty_call['cock_remove'] = 1:
-		'You look down and see his cock already going limp, rapidly deflating right before your eyes.'
+	'"I don''t think I can..." he groans.'
+	if booty_call['cock_inserted'] = 0:
+		'You look down and see <<$npc_firstname[$boy]>>''s cock already going limp, rapidly deflating right before your eyes.'
 	else
-		'You realize with a start that he''s already going soft inside you.'
+		'You realize with a start that <<$npc_firstname[$boy]>> is getting <i>softer</i>, not harder, inside you.'
 	end
 	'"I think I might be all fucked out for the day..."'
 	act'Ugh':
 		cla & *clr
 		$booty_call['end_comment'] = '"Ugh..." you groan with a roll of your eyes.'
-		if booty_call['cock_remove'] = 1:
+		if booty_call['cock_inserted'] = 0:
 			$npc_apt_bedroom[$boy]
 			$booty_call['end_comment']
 			gs'booty_call_after', 'after_sex1'
@@ -377,7 +388,7 @@ if $ARGS[0] = 'fucked_out':
 	act'Sigh':
 		cla & *clr
 		$booty_call['end_comment'] = 'You sigh in disappointment.'
-		if booty_call['cock_remove'] = 1:
+		if booty_call['cock_inserted'] = 0:
 			$npc_apt_bedroom[$boy]
 			$booty_call['end_comment']
 			gs'booty_call_after', 'after_sex1'
@@ -394,7 +405,7 @@ if $ARGS[0] = 'fucked_out':
 		else
 			$booty_call['end_comment'] = '"Oops," you giggle. "Guess that''s my fault."'
 		end
-		if booty_call['cock_remove'] = 1:
+		if booty_call['cock_inserted'] = 0:
 			$npc_apt_bedroom[$boy]
 			$booty_call['end_comment']
 			gs'booty_call_after', 'after_sex1'
@@ -501,7 +512,6 @@ if $ARGS[0] = 'wipes':
 			elseif cumloc[0] > 0 or $booty_call['last_cum'] = 'creampie':
 				!! vagina
 				if hypnoAddict > 0:
-					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 					$npc_apt_bedroom[$boy]
 					if booty_call['wipes'] = 1:
 						'You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.'
@@ -536,7 +546,6 @@ if $ARGS[0] = 'wipes':
 			booty_call['wipes'] = 0
 			gs'cum_cleanup'
 			gs'stat'
-			cla
 			if booty_call['sex_over'] = 1:
 				gs'booty_call_after', 'after_sex2'
 			else
@@ -549,9 +558,9 @@ end
 
 if $ARGS[0] = 'wipe_menu':
 	gs'booty_call_after', 'wipe_hands'
-	gs'booty_call_after', 'wipe_hands'
-	gs'booty_call_after', 'wipe_hands'
-	gs'booty_call_after', 'wipe_hands'
+	gs'booty_call_after', 'wipe_face'
+	gs'booty_call_after', 'wipe_tits'
+	gs'booty_call_after', 'wipe_pussy'
 end
 
 if $ARGS[0] = 'wipe_hands':
@@ -707,7 +716,7 @@ end
 if $ARGS[0] = 'bad_sex_end':
 	act'End here (bad end)':
 		cla & *clr
-		npc_apt_bedroom[$boy]
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/annoyed1.jpg"></center>'
 		'"Let''s call it here," you say, letting your negative feelings get to you.'
 		'"What, done already?" <<$npc_firstname[$boy]>> says, sitting up.'
 		act'Don''t feel like it anymore':
@@ -725,7 +734,7 @@ if $ARGS[0] = 'bad_sex_end':
 		act'You''re an asshole':
 			cla & *nl
 			'"You''re an asshole," you scowl at him. "You know what you did."'
-			'"I sure do," he snickers and slaps your ass, earning him a yelp from your lips and a sharp glare from your eyes.'
+!!			'"I sure do," he snickers and slaps your ass, earning him a yelp from your lips and a sharp glare from your eyes.'
 			gs'booty_call_after', 'after_sex1'
 		end
 	end
@@ -887,7 +896,7 @@ if $ARGS[0] = 'cum_clean':
 			act'Never mind': cla & gs 'booty_call_sex', 'sex_end'
 			
 			act'Ask him if he has any wipes':
-				booty_call['cock_remove'] = 1
+				booty_call['cock_inserted'] = 0
 				gs 'cum_cleanup', 'cleanloc'
 				gs'stat'
 				cla & *clr
@@ -923,7 +932,7 @@ if $ARGS[0] = 'cum_clean':
 				act'Use your wipes':
 					gs 'cum_cleanup', 'cleanloc'
 					gs'stat'
-					booty_call['cock_remove'] = 1
+					booty_call['cock_inserted'] = 0
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 					$npc_apt_bedroom[$boy]
@@ -940,7 +949,7 @@ if $ARGS[0] = 'cum_clean':
 
 			if cumloc[13] > 0:
 				act'Lick your fingers clean':
-					booty_call['cock_remove'] = 1
+					booty_call['cock_inserted'] = 0
 					gs'stat'
 					gs 'cum_cleanup', 'cleanloc'
 					stat['swallow'] += 1
@@ -1009,27 +1018,11 @@ if $ARGS[0] = 'facial_mouth_clean':
 	end
 end
 
-if $ARGS[0] = 'cum_kiss_cock':
-	if $booty_call['cum_choice'] = 'facial' or $booty_call['cum_choice'] = 'face_mouth' or $booty_call['cum_choice'] = 'mouth':
-		act'Kiss his cock':
-			booty_call['react'] = 1
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/cum/kiss_cock.mp4"></video></center>'
-			if $booty_call['last_cum'] = 'swallow':
-				'"Glad my hard work is appreciated," you smile, leaning in and giving <<$npc_firstname[$boy]>>''s cock a gentle kiss on the tip.'
-			else
-				'Feeling cheeky, you finish by leaning in to give <<$npc_firstname[$boy]>> a cute little kiss, right on the tip of his cock.'
-			end
-			gs'booty_call_sex', 'sex_end'
-		end
-	end
-end
-
 !! -------------------------------------------------------------------------------
 
 if $ARGS[0] = 'after_sex1':
 	booty_call['sex_over'] = 1
-	if booty_call['cock_remove'] = 0 and ($booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl'):
+	if booty_call['cock_inserted'] = 1 and ($booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl'):
 		act'Pull apart':
 			cla & *clr
 			gs'booty_call_after', 'pull_apart'
@@ -1068,7 +1061,7 @@ if $ARGS[0] = 'after_sex1':
 end
 
 if $ARGS[0] = 'pull_apart':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	if $booty_call['cum_choice'] = 'creampie':
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/after/miss_after1.mp4"></video></center>'
@@ -1370,7 +1363,7 @@ if $ARGS[0] = 'kiss':
 end
 
 if $ARGS[0] = 'plan_b':
-	if booty_call['creampie_count'] > 0 and morning_after_pill > 0 and booty_call['plan_b'] = 0 and birth_control['think_safe'] = 0 and booty_call['angry_after'] = 0 and mesec = 0:
+	if booty_call['creampie_count'] > 0 and morning_after_pill > 0 and booty_call['plan_b'] ! 2 and birth_control['think_safe'] = 0 and booty_call['angry_after'] = 0 and mesec = 0:
 		act'Take a morning after pill':
 			booty_call['plan_b'] = 2
 			cla & *clr
@@ -1661,6 +1654,17 @@ if $ARGS[0] = 'spend_night_ask':
 				end
 			end
 			
+			if hour < 5:
+				if mid($start_type,1,2) = 'sg':
+					act'Avoid my mom':
+						cla & *clr
+						$npc_apt_bedroom[$boy]
+						'"Mind if I spend the night?" you ask. "If I go home now, my mom will chew me out for coming back to late. She''ll still chew me out later, but I don''t want to deal with it right now."'
+						gs'booty_call_after', 'spend_night'
+					end
+				end
+			end
+			
 			if hour >= 22 or hour < 5:
 				act'It''s late':
 					cla & *clr
@@ -1691,6 +1695,7 @@ if $ARGS[0] = 'spend_night':
 	if npc_cheating_know[$boy] = 1:
 		!! this means he''s cheating on someone with you and you know it
 		if rand(1,10) > 7 and hour < 22:
+			booty_call['cant_stay'] = 1
 			'"Sorry, can''t. My girlfriend wanted to come over tonight. In fact, you should leave soon before she catches you."'
 			'"Ugh. <i>Bitch!</i>"'
 			'"Yeah, I know. Sucks."'
@@ -1708,11 +1713,13 @@ if $ARGS[0] = 'spend_night':
 	else
 		!! this means he''s cheating on someone with you
 		if rand(1,10) > 7 and hour < 22:
+			booty_call['cant_stay'] = 1
 			'"Sorry, can''t. I have something to do in the morning."'
 			'"Ugh, really?"'
 			'"Yeah, I know. Sucks."'
 			gs'booty_call_after', 'after_sex2'
 		elseif npc_girlfriend[$boy] = 1 and hour < 22:
+			booty_call['cant_stay'] = 1
 			npc_cheating_know[$boy] = 1
 			'"Sorry, my girlfriend is coming over soon. Can''t let her catch you here."'
 			'"Ugh, really?"'
@@ -1738,8 +1745,14 @@ if $ARGS[0] = 'dressing_image':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_underwear1.mp4"></video></center>'
 	elseif $booty_call['dress_describe'] = 'fastening your bra around your chest':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_bra1.mp4"></video></center>'
-	elseif $booty_call['dress_describe'] = 'zipping your skirt up over your hips':
+	elseif $booty_call['dress_describe'] = 'slipping your skirt up your legs':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_skirt1.mp4"></video></center>'
+!!	elseif $booty_call['dress_describe'] = 'slipping your skirt up over your panties':
+!!		'<center><video autoplay loop src="images/pc/activities/misc/dress_skirt1.mp4"></video></center>'
+	elseif $booty_call['dress_describe'] = 'pulling your top over your breasts':
+		'<center><video autoplay loop src="images/pc/activities/misc/dress_top1.mp4"></video></center>'
+!!	elseif $booty_call['dress_describe'] = 'pulling your top over your bra':
+!!		'<center><video autoplay loop src="images/pc/activities/misc/dress_top1.mp4"></video></center>'
 	elseif $booty_call['dress_describe'] = 'tugging your pants over your hips':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 	elseif booty_call['hotel'] = 1:
@@ -1750,8 +1763,19 @@ if $ARGS[0] = 'dressing_image':
 	end
 end
 
+if $ARGS[0] = 'dress_start_desc':
+	if booty_call['towel'] = 1:
+		!!booty_call['towel'] = 0
+		'You drop the towel and reach down for your clothes and start to pick them up.'
+	else
+		'You reach down for where you left your clothes and start to pick them up.'
+	end
+end
+
 if $ARGS[0] = 'dressing1':
 	cla & *clr
+!!	gs'booty_call_after', 'dress'
+	gs'booty_call_after', 'dress_loop'
 	gs'booty_call_after', 'dressing_image'
 	
 	if booty_call['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and booty_call['boy_asleep'] ! 0:
@@ -1761,22 +1785,21 @@ if $ARGS[0] = 'dressing1':
 		else
 			'You quietly reach down for where you left your clothes and try to pick them up without waking <<$npc_firstname[$boy]>>.'
 		end
-		gs'booty_call_after', 'dress'
-		gs'booty_call_after', 'dress_loop'
+		
 		gs'booty_call_after', 'dressing2'
 	else
-		if booty_call['towel'] = 1:
-			booty_call['towel'] = 0
-			'You drop the towel and reach down for your clothes and start to pick them up.'
-		else
-			'You reach down for where you left your clothes and start to pick them up.'
-		end
-		gs'booty_call_after', 'dress_loop'
-		if booty_call['angry_after'] = 1:
-			'"I have to go," you say flatly, getting out of the bed without looking at <<$npc_firstname[$boy]>>.'
+		gs'booty_call_after', 'dress_start_desc'
+		if booty_call['angry_after'] = 1 or booty_call['annoyed'] > 0:
+			'"I have to go," you say flatly, reaching down for your clothes without looking at <<$npc_firstname[$boy]>>.'
 			gs'booty_call_after', 'dressing2'
+		elseif booty_call['cant_stay'] = 1:
+			!! there is an additional dress_loop here to make it possible to give panties here
+			gs'booty_call_after', 'dress_loop'
+			'"Guess I''ll go then," you sigh, <<$booty_call[''dress_describe'']>>.'
+			gs'booty_call_after', 'dressing2'
+			gs 'booty_call_after', 'panty_gift'
 		elseif booty_call['npc_late'] = 0:
-			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
+			'"You heading out?" <<$npc_firstname[$boy]>> asks as you are <<$booty_call[''dress_describe'']>>.'
 			gs'booty_call_after', 'not_leaving'
 			gs'booty_call_after', 'leaving_soon'
 			if booty_call['sleepover'] < 1:
@@ -1804,7 +1827,8 @@ if $ARGS[0] = 'dressing2':
 		act'Finish getting dressed':
 			gs'booty_call_after', 'dress_loop'
 			cla & *clr
-			$npc_apt_bedroom[$boy]
+!!			$npc_apt_bedroom[$boy]
+			gs'booty_call_after', 'dressing_image'
 			'You finish <<$booty_call[''dress_describe'']>>.'
 			gs'booty_call_after', 'after_sex_dressed'
 		end
@@ -1814,7 +1838,9 @@ end
 if $ARGS[0] = 'not_leaving':
 	act'Not yet':
 		cla & *clr
+		gs'booty_call_after', 'dress_loop'
 		gs'booty_call_after', 'dressing_image'
+		gs'booty_call_after', 'dress_start_desc'
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		'"Not yet," you say, <<$booty_call[''dress_describe'']>>. "Just tired of hanging around naked."'
 		'"I''m never tired of seeing you naked."'
@@ -1827,7 +1853,9 @@ if $ARGS[0] = 'leaving_soon':
 	act'Yeah':
 		booty_call['leaving'] = 1
 		cla & *clr
+		gs'booty_call_after', 'dress_loop'
 		gs'booty_call_after', 'dressing_image'
+		gs'booty_call_after', 'dress_start_desc'
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		if booty_call['sleepover'] < 1:
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>.'
@@ -1835,7 +1863,7 @@ if $ARGS[0] = 'leaving_soon':
 			gs 'booty_call_after', 'panty_gift'
 		else
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Thanks for letting me spend the night."'
-			gs'booty_call_after', 'dress_loop'
+			
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
 				gs'booty_call_morning', 'booty_call_invite_later'
 			else
@@ -1843,6 +1871,7 @@ if $ARGS[0] = 'leaving_soon':
 				gs'booty_call_morning', 'end_morning'
 			end
 		end
+		gs'booty_call_after', 'dress_loop'
 	end
 end
 
@@ -1851,7 +1880,9 @@ if $ARGS[0] = 'going_disco':
 		if $region = 'pav':
 			act'Going to the disco':
 				cla & *clr
+				gs'booty_call_after', 'dress_loop'
 				gs'booty_call_after', 'dressing_image'
+				gs'booty_call_after', 'dress_start_desc'
 				'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 				if booty_call['disco_after'] = 1:
 					'"Weren''t you listening to me?" you say, <<$booty_call[''dress_describe'']>>. "I told you, I''m going to the disco tonight."'
@@ -1866,7 +1897,9 @@ if $ARGS[0] = 'going_disco':
 		else
 			act'Going to the club':
 				cla & *clr
+				gs'booty_call_after', 'dress_loop'
 				gs'booty_call_after', 'dressing_image'
+				gs'booty_call_after', 'dress_start_desc'
 				'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 				if booty_call['club_after'] = 1:
 					'"Weren''t you listening to me?" you say, <<$booty_call[''dress_describe'']>>. "I told you, I''m going clubbing tonight."'
@@ -1887,7 +1920,9 @@ if $ARGS[0] = 'mom_late':
 		act'Mom will kill me':
 			booty_call['mom_kill'] = 1
 			cla & *clr
+			gs'booty_call_after', 'dress_loop'
 			gs'booty_call_after', 'dressing_image'
+			gs'booty_call_after', 'dress_start_desc'
 			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			if hour < 3:
 				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I''m already going to be in trouble as it is, but if I don''t come home at all tonight, my mom will kill me."'
@@ -1906,19 +1941,24 @@ if $ARGS[0] = 'need_homework':
 		act'Need to finish my homework':
 			cla & *clr
 			gs'booty_call_after', 'dressing_image'
+			gs'booty_call_after', 'dress_start_desc'
 			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I need to do my homework."'
 			gs'booty_call_after', 'dress_loop'
 !!			if rand(0,1) = 1:
 			'"Seriously? That''s what you''re in a rush for?"'
 			act'I want to go to uni':
-				cla & *nl
+				cla & *clr
+				gs'booty_call_after', 'dressing_image'
+				gs'booty_call_after', 'dress_start_desc'
 				'"I want to go to uni," you say, <<$booty_call[''dress_describe'']>>. "Can''t do that if I fail out of school for not doing my homework."'
 				gs'booty_call_after', 'dress_loop'
 				gs 'booty_call_after', 'dressing2'
 			end
 			act'Don''t be an asshole':
-				cla & *nl
+				cla & *clr
+				gs'booty_call_after', 'dressing_image'
+				gs'booty_call_after', 'dress_start_desc'
 				'"Don''t be an asshole," you glare, <<$booty_call[''dress_describe'']>>. "My grades are important to me. More important than spending more time fucking you."'
 				gs'booty_call_after', 'dress_loop'
 				gs 'booty_call_after', 'dressing2'
@@ -1928,18 +1968,88 @@ if $ARGS[0] = 'need_homework':
 	end
 end
 
+if $ARGS[0] = 'something_to_do':
+	act'Gotta do something':
+		booty_call['leaving'] = 1
+		cla & *clr
+		gs'booty_call_after', 'dressing_image'
+		gs'booty_call_after', 'dress_start_desc'
+		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
+		if booty_call['sleepover'] < 1:
+			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Have a few things I need to get done."'
+			gs 'booty_call_after', 'dressing2'
+			gs 'booty_call_after', 'panty_gift'
+		else
+			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Have a few things I need to get done. Thanks for letting me spend the night."'
+			
+			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
+				gs'booty_call_morning', 'booty_call_invite_later'
+			else
+				'"No problem."'
+				gs'booty_call_morning', 'end_morning'
+			end
+		end
+		gs'booty_call_after', 'dress_loop'
+	end
+end
+
+if $ARGS[0] = 'see_a_friend':
+	act'Meeting a friend':
+		booty_call['leaving'] = 1
+		cla & *clr
+		gs'booty_call_after', 'dressing_image'
+		gs'booty_call_after', 'dress_start_desc'
+		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
+		if booty_call['sleepover'] < 1:
+			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Need to see a friend later."'
+			gs 'booty_call_after', 'dressing2'
+			gs 'booty_call_after', 'panty_gift'
+		else
+			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Need to see a friend later. Thanks for letting me spend the night."'
+			
+			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
+				gs'booty_call_morning', 'booty_call_invite_later'
+			else
+				'"No problem."'
+				gs'booty_call_morning', 'end_morning'
+			end
+		end
+		gs'booty_call_after', 'dress_loop'
+	end
+end
+
+if $ARGS[0] = 'another_fuckbuddy':
+	if arrsize('$fuckbuddy') > 1:
+		act'Another booty call':
+			booty_call['leaving'] = 1
+			cla & *clr
+			gs'booty_call_after', 'dressing_image'
+			gs'booty_call_after', 'dress_start_desc'
+			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
+			'"Yeah," you smirk, <<$booty_call[''dress_describe'']>>. "Got another booty call to show up to."'
+			'"You really get around don''t you?" <<$npc_firstname[$boy]>> smirks back.'
+			gs 'booty_call_after', 'dressing2'
+			gs 'booty_call_after', 'panty_gift'
+			gs'booty_call_after', 'dress_loop'
+		end
+	end
+end
+
 if $ARGS[0] = 'going_school':
 	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School':
 			cla & *clr
 			gs'booty_call_after', 'dressing_image'
+			gs'booty_call_after', 'dress_start_desc'
 			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			if booty_call['late_for_school'] = 1 and hour >= 8:
 				'"I already told you, I''m late for school," you say, <<$booty_call[''dress_describe'']>>. "But thanks for letting me spend the night. And the second fuck," you add with a wink.'
 			elseif booty_call['late_for_school'] = 1:
 				'"I already told you, I''m gonna be late for school," you say, <<$booty_call[''dress_describe'']>>. "But thanks for letting me spend the night. And the second fuck," you add with a wink.'
-			else
+			elseif hour = 7:
 				'"Gotta get to school," you say, <<$booty_call[''dress_describe'']>>. "Thanks for letting me spend the night."'
+			else
+				'"Gotta get ready for school," you say, <<$booty_call[''dress_describe'']>>. "Thanks for letting me spend the night."'
 			end
 			gs'booty_call_after', 'dress_loop'
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
@@ -1984,7 +2094,7 @@ end
 if $ARGS[0] = 'panty_gift2':
 	act'You did a good job':
 		cla & *clr
-		$npc_apt_bedroom[$boy]
+		gs'booty_call_after', 'dressing_image'
 		'"You did a good job," you smile, <<$booty_call[''dress_describe'']>>. "Consider that your reward."'
 		if npc_girlfriend[$boy] = 1:
 			if pc_know_npc_has_girlfriend[$boy] = 0: pc_know_npc_has_girlfriend[$boy] = 1
@@ -1998,7 +2108,7 @@ if $ARGS[0] = 'panty_gift2':
 	
 	act'Something to remember the occasion':
 		cla & *clr
-		$npc_apt_bedroom[$boy]
+		gs'booty_call_after', 'dressing_image'
 		if daystage > 3:
 			'"Something to remember the night," you smile, <<$booty_call[''dress_describe'']>>. "Keep the good times in mind."'
 		else
@@ -2016,7 +2126,7 @@ if $ARGS[0] = 'panty_gift2':
 	
 	act'Consider it a trophy':
 		cla & *clr
-		$npc_apt_bedroom[$boy]
+		gs'booty_call_after', 'dressing_image'
 		'"Consider it a trophy," you smile, <<$booty_call[''dress_describe'']>>. "Think of it as proof of conquest."'
 		if npc_girlfriend[$boy] = 1:
 			if pc_know_npc_has_girlfriend[$boy] = 0: pc_know_npc_has_girlfriend[$boy] = 1
@@ -2031,8 +2141,8 @@ if $ARGS[0] = 'panty_gift2':
 	if booty_call['virgin'] = 1:
 		act'To remember my virginity':
 			cla & *clr
-			$npc_apt_bedroom[$boy]
-			'"To remember my virginity," you smile, <<$booty_call[''dress_describe'']>>. "And commemorate the moment you made me into a woman."'
+			gs'booty_call_after', 'dressing_image'
+			'"To remember my virginity," you smile, <<$booty_call[''dress_describe'']>>. "And that you made me a woman."'
 			if npc_girlfriend[$boy] = 1:
 				if pc_know_npc_has_girlfriend[$boy] = 0: pc_know_npc_has_girlfriend[$boy] = 1
 				'"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.'
@@ -2113,7 +2223,12 @@ end
 
 if $ARGS[0] = 'dress_loop':
 	:dress_loop_start
-	if $lastwornpantytype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! 'none' and $pantyworntype = 'none'and booty_call['panty_wear'] ! 1 and booty_call['bra_wear'] ! 1:
+	if booty_call['dressing_start'] ! 1:
+		booty_call['dressing_start'] = 1
+		$booty_call['dress_describe'] = 'reaching down for your clothes'
+	elseif $lastwornpantytype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! 'none'  and $pantyworntype = 'none' and booty_call['panty_wear'] ! 1 and booty_call['bra_wear'] ! 1:
+		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
+		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 		booty_call['panty_wear'] = 1
 		booty_call['bra_wear'] = 1
 		killvar 'lastwornpantytype'
@@ -2126,7 +2241,7 @@ if $ARGS[0] = 'dress_loop':
 		killvar 'lastwornpantytype'
 		killvar 'lastwornpantynumber'
 		booty_call['panty_wear'] = 1
-		$booty_call['dress_describe'] = 'pulling your panties up your legs'
+		$booty_call['dress_describe'] = 'pulling your panties up'
 	elseif $lastwornbratype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! '' and $braworntype = 'none' and booty_call['bra_wear'] ! 1:
 		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 		killvar 'lastwornbratype'
@@ -2149,13 +2264,21 @@ if $ARGS[0] = 'dress_loop':
 		else
 			if CloSkirtShortness > 0 and booty_call['skirt_wear'] ! 1 and booty_call['dress_end'] ! 1:
 				booty_call['skirt_wear'] = 1
-				$booty_call['dress_describe'] = 'zipping your skirt up over your hips'
-			elseif booty_call['dress_end'] ! 1 and booty_call['pants_wear'] ! 1:
+				if $pantyworntype = 'none':
+					$booty_call['dress_describe'] = 'slipping your skirt up your legs'
+				else
+					$booty_call['dress_describe'] = 'slipping your skirt up over your panties'
+				end
+			elseif CloSkirtShortness = 0 and booty_call['dress_end'] ! 1 and booty_call['pants_wear'] ! 1:
 				booty_call['pants_wear'] = 1
 				$booty_call['dress_describe'] = 'tugging your pants over your hips'
 			else
 				booty_call['dress_end'] = 1
-				$booty_call['dress_describe'] = 'pulling your top over your breasts'
+				if $braworntype = 'none':
+					$booty_call['dress_describe'] = 'pulling your top over your breasts'
+				else
+					$booty_call['dress_describe'] = 'pulling your top over your bra'
+				end
 			end
 		end
 	elseif booty_call['dress_end'] = 1:
@@ -2195,8 +2318,7 @@ if $ARGS[0] = 'after_sex_dressed':
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I just can''t do this anymore," you say. "I''m sorry."'
 			'You grab your things and leave.'
-			gs 'lover', 'remove fuckbuddy', $boy
-			act'Leave':gt'booty_call_after', 'exit'
+			gs'booty_call_after', 'break_up'
 		end
 		gs'booty_call_after', 'unsatisfied_breakup'
 		gs'booty_call_after', 'no_more_cheating_breakup'
@@ -2214,7 +2336,7 @@ if $ARGS[0] = 'after_sex_dressed':
 end
 
 if $ARGS[0] = 'leaving_dialogue':
-	'"I gotta get going," you say'
+	'"I gotta get going," you say.'
 	'"Okay, see you later."'
 	act'"Bye"':
 		$booty_call['leave_dialogue'] = 'Bye'
@@ -2287,8 +2409,7 @@ if $ARGS[0] = 'unsatisfied_breakup':
 			'"You''re just not what I want out of a fuckbuddy," you say flatly. "I just don''t think we''re sexually compatible."'
 			*nl
 			'You shrug once, grab your things, and leave without another word.'
-			gs 'lover', 'remove fuckbuddy', $boy
-			act'Leave':gt'booty_call_after', 'exit'
+			gs'booty_call_after', 'break_up'
 		end
 		if npc_sexdrive[$boy] = 1 or npc_two_pump[$boy] = 1:
 			act'You''re a two pump chump':
@@ -2338,8 +2459,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'"You''re not going to change my mind," you say. "We''re done."'
 					*nl
 					'And with that, you head out the door.'
-					gs 'lover', 'remove fuckbuddy', $boy
-					act'Leave':gt'booty_call_after', 'exit'
+					gs'booty_call_after', 'break_up'
 				end
 				
 				act'Well...':
@@ -2360,14 +2480,13 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					end
 				end
 			else
-				gs 'lover', 'remove fuckbuddy', $boy
 				'"Oh." <<$npc_firstname[$npclastsaved]>> looks at you. "I guess that''s fair. So... I''ll see you around?"'
 				act'See you':
 					cla & *nl
 					'"Yeah," you mumble wistfully. "See you..."'
 					*nl
 					'And with that, you head out the door.'
-					act'Leave':gt'booty_call_after', 'exit'
+					gs'booty_call_after', 'break_up'
 				end
 				
 				act'No I won''t':
@@ -2376,7 +2495,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'"No, I won''t," you frown. "That''s the point."'
 					*nl
 					'And with that, you head out the door.'
-					act'Leave':gt'booty_call_after', 'exit'
+					gs'booty_call_after', 'break_up'
 				end
 			end
 		end
@@ -2391,8 +2510,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'"The truth is, I''m in a relationship with somebody," you say, hanging your head shamefully. "I''ve been cheating on them with you this whole time. It''s wrong, and I— I just can''t do this anymore!"'
 				end
 				'You grab your things and rush out the door.'
-				gs 'lover', 'remove fuckbuddy', $boy
-				act'Leave':gt'booty_call_after', 'exit'
+				gs'booty_call_after', 'break_up'
 			end
 		end
 		if pcs_girlfriends > 0:
@@ -2405,8 +2523,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'"The truth is, I''m in a relationship with somebody," you say, hanging your head shamefully. "I''ve been cheating on them with you this whole time. It''s wrong, and I— I just can''t do this anymore!"'
 				end
 				'You grab your things and rush out the door.'
-				gs 'lover', 'remove fuckbuddy', $boy
-				act'Leave':gt'booty_call_after', 'exit'
+				gs'booty_call_after', 'break_up'
 			end
 		end
 	end
@@ -2419,8 +2536,23 @@ if $ARGS[0] = 'isnt_going_to_work':
 		'"This just isn''t going to work," you say, cutting him off. "We''re done."'
 		*nl
 		'And with that, you head out the door.'
-		gs 'lover', 'remove fuckbuddy', $boy
-		act'Leave':gt'booty_call_after', 'exit'
+		gs'booty_call_after', 'break_up'
+	end
+end
+
+if $ARGS[0] = 'no_condom_breakoff':
+	if npc_no_condoms_know[$boy] = 1:
+		act'I can''t do this (break things off)':
+			!! add in rape chance later
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+			'"Fuck this," you say, getting up and grabbing your clothes.'
+			'"Where the fuck are you going?" <<$npc_firstname[$boy]>> asks in bewilderment.'
+			'"I''m not gonna be fuckbuddies with a guy who never uses condoms," you sneer at him. "<i>Don''t</i> text me again."'
+			*nl
+			'The second you''re dressed you stalk out the door and slam it behind you.'
+			gs'booty_call_after', 'break_up'
+		end
 	end
 end
 
@@ -2428,7 +2560,8 @@ if $ARGS[0] = 'dress_talk':
 	act'Finish getting dressed':
 		gs'booty_call_after', 'dress_loop'
 		cla & *clr
-		$npc_apt_bedroom[$boy]
+!!		$npc_apt_bedroom[$boy]
+		gs'booty_call_after', 'dressing_image'
 		'You finish <<$booty_call[''dress_describe'']>>'
 		gs'booty_call_after', 'after_sex_dressed'
 	end

+ 538 - 37
locations/booty_call_condoms.qsrc

@@ -6,7 +6,7 @@
 !! booty_call['out_of_condoms'] = 2 - npc has run out of condoms, will use players
 
 if $ARGS[0] = 'setup':
-	if npc_condom_conscious[$boy] = 1:
+	if npc_condom_conscious[$boy] > 0:
 		booty_call['condom_count'] = 100
 	elseif booty_call['condom_count'] = 0 and booty_call['fuck_count'] = 0 and npc_no_condoms[$boy] ! 1:
 		if rand(1,5) = 1:
@@ -40,6 +40,7 @@ if $ARGS[0] = 'condoms':
 			gs 'booty_call_condoms', 'pc_dangerous_day'
 			gs 'booty_call_condoms', 'reenable_condoms1'
 			gs 'booty_call_condoms', 'no_more_free_creampies1'
+			gs 'booty_call_condoms', 'already_creampie1'
 		elseif npc_bareback[$boy] = 2 and booty_call['no_condom'] ! 1 and booty_call['condom'] ! 1:
 			'"Is it safe?" <<$npc_firstname[$boy]>> asks. "Can we go bareback?"'
 			gs 'booty_call_condoms', 'bareback_check'
@@ -47,14 +48,20 @@ if $ARGS[0] = 'condoms':
 			if npc_condom_conscious[$boy] > 0:
 				gs 'booty_call_condoms', 'condom_conscious_npc'
 			elseif booty_call['condom_count'] > 0 and rand(0,1) = 1:
-				gs 'booty_call_condoms', 'npc_condom_use'
+				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			else
 				'<<$npc_firstname[$boy]>> makes no indication that he''s going to put on a condom.'
-				gs 'booty_call_condoms', 'pc_condom_ask'
-				gs 'booty_call_condoms', 'pc_condoms'
-				gs 'booty_call_condoms', 'dont_cum_in_me'
-				gs 'booty_call_condoms', 'pc_safe_day'
-				gs 'booty_call_condoms', 'pc_dangerous_day'
+				gs 'booty_call_sex', 'position_choose'
+				if booty_call['virgin'] = 1 and booty_call['fuck_count'] = 0:
+					gs 'booty_call_condoms', 'virgin_condom_ask1'
+				else
+					gs 'booty_call_condoms', 'pc_condom_ask'
+					gs 'booty_call_condoms', 'pc_condoms'
+					gs 'booty_call_condoms', 'dont_cum_in_me'
+					gs 'booty_call_condoms', 'pc_safe_day'
+					gs 'booty_call_condoms', 'pc_dangerous_day'
+					gs 'booty_call_condoms', 'already_creampie1'
+				end
 			end
 		elseif booty_call['using_pc_condoms'] = 1:
 			gs 'booty_call_condoms', 'pc_condoms'
@@ -62,7 +69,7 @@ if $ARGS[0] = 'condoms':
 			if booty_call['condoms_used'] >= booty_call['condom_count']:
 				gs 'booty_call_condoms', 'npc_out_of_condoms'
 			else
-				gs 'booty_call_condoms', 'npc_condom_use'
+				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			end
 		end
 	end
@@ -79,6 +86,7 @@ end
 if $ARGS[0] = 'pc_need_condoms':
 	if prezik > 0:
 		act'Use your condoms':
+			booty_call['pc_wants_condoms'] = 1
 			cla & *nl
 			'"Sorry," you say, pulling a condom from your bag. "But we need to be safe today."'
 			gs 'booty_call_condoms', 'pc_condoms'
@@ -120,7 +128,7 @@ if $ARGS[0] = 'pc_condoms':
 			act'Do you have any?':
 				cla & *clr
 				$npc_apt_bedroom
-				if booty_call['cock_remove'] = 0:
+				if booty_call['cock_inserted'] = 1:
 					'"But I''m not ready to stop," you grin, flexing your pussy around <<$npc_firstname[$boy]>>''s cock inside you. "Have you got any?"'
 				else
 					'"But I''m not ready to stop," you say. "Have you got any?"'
@@ -131,33 +139,33 @@ if $ARGS[0] = 'pc_condoms':
 					act'If you''re offering':
 						cla & *nl
 						'"Well, if you''re offering..." you smirk.'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					act'I might take you up on that':
 						cla & *nl
 						'"I just might take you up on that," you smile.'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					act'I want to do my part':
 						cla & *nl
 						'"I want to do my part," you smile. "I''m enjoying the sex with you. Only fair that I pay for it too."'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					if karta + money < 2000:
 						act'Good, money''s tight':
 							cla & *nl
 							'"Then I''ll stop buying right away," you grin. "I don''t have a lot of spare cash on hand, so saving on condoms would be great.'
-							gs'booty_call_condoms', 'npc_condom_use'
+							act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 						end
 					end
 					
 				elseif booty_call['condom_count'] > 0 and booty_call['condoms_used'] < booty_call['condom_count']:
 					'"Yeah, I have some," <<$npc_firstname[$boy]>> says.'
 					gs'booty_call_sex', 'reset'
-					gs'booty_call_condoms', 'npc_condom_use'
+					act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 				else
 					if npc_no_condoms_know[$boy] = 1:
 						'"Come on," <<$npc_firstname[$boy]>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."'
@@ -183,6 +191,7 @@ if $ARGS[0] = 'pc_condom_ask':
 	end
 	act'Ask him to put on a condom':
 		cla & *nl
+		booty_call['pc_wants_condoms'] = 1
 		if npc_bareback[$boy] = 2:
 			'"We need a condom today," you shake your head.'
 		else
@@ -245,21 +254,32 @@ if $ARGS[0] = 'npc_condom_use_stats':
 end
 
 if $ARGS[0] = 'npc_condom_use':
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
 	booty_call['must_fuck'] = 1
+	booty_call['cock_inserted'] = 0
 	if booty_call['fuck_count'] > 1 and $booty_call['last_cum'] = 'condom':
 		'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
 	elseif booty_call['fuck_count'] > 1:
 		'<<$npc_firstname[$boy]>> reaches for a new condom.'
+	else
+		'<<$npc_firstname[$boy]>> reaches for a condom from his nightstand.'
 	end
 !!	gs 'booty_call_sex', 'position_choose'
 	
+	
 	gs 'booty_call_condoms', 'npc_condom_put_on'
 	
-	if booty_call['condom'] = 0:
-		gs 'booty_call_condoms', 'disable_condoms'
-		
-		gs 'booty_call_condoms', 'temp_disable_condoms'
+	if booty_call['virgin'] = 1 and booty_call['fuck_count'] = 0:
+		gs 'booty_call_condoms', 'virgin_no_condom'
+	else
+		if booty_call['condom'] = 0:
+			gs 'booty_call_condoms', 'disable_condoms'
+			
+			gs 'booty_call_condoms', 'temp_disable_condoms'
+		end
 	end
+	
 end
 
 if $ARGS[0] = 'npc_condom_put_on':
@@ -303,7 +323,10 @@ if $ARGS[0] = 'condom_conscious_npc':
 	elseif booty_call['fuck_count'] > 1:
 		'<<$npc_firstname[$boy]>> reaches for another condom.'
 	end
-	gs 'booty_call_condoms', 'npc_condom_use'
+	act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
+	if booty_call['virgin'] = 1 and booty_call['fuck_count'] = 0:
+		gs 'booty_call_condoms', 'virgin_no_condom'
+	end
 end
 
 if $ARGS[0] = 'npc_out_of_condoms':
@@ -406,7 +429,7 @@ if $ARGS[0] = 'condom_why2':
 		if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and npc_childfree[$boy] = 1):
 			'"Don''t want to risk it," <<$npc_firstname[$boy]>> says, shaking his head and opens the condom anyways, rolling it onto his cock.'
 		else
-			if rand(npc_willpwr[$boy],100) < pcs_persuas:
+			if rand(npc_willpwr[$boy],100) < pcs_persuas + npc_rel[$boy]:
 				booty_call['no_condom'] = 1
 				booty_call['condom'] = 0
 				'<<$npc_firstname[$boy]>> stops, looking back at you for a moment before smiling.'
@@ -431,7 +454,7 @@ if $ARGS[0] = 'condom_why2':
 					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
 					'Your jaw drops.'
 					*nl
-					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+					'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
 				else
 					booty_call['no_condom'] = 1
 					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
@@ -450,7 +473,7 @@ if $ARGS[0] = 'condom_why2':
 					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
 					'Your jaw drops.'
 					*nl
-					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+					'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
 				else
 					booty_call['no_condom'] = 1
 					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
@@ -495,12 +518,12 @@ if $ARGS[0] = 'no_condom1':
 		if stat['dangerous_day'] = 1 and birth_control['think_safe'] ! 1 and npc_childfree[$boy] > 0:
 			booty_call['condom'] = 1
 			'"What the fuck! Why didn''t you say so!" he says, immediately reaching for a condom.'
-			gs 'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		elseif rand(1,10) < 8:
 			booty_call['condom'] = 1
 			'"Ugh, fine."'
 			'He reaches for a condom.'
-			gs 'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		else
 			booty_call['dont_need_condom'] = 1
 			'"Come on," he complains. "It''ll be fine. Let''s skip it. Just this once."'
@@ -528,7 +551,7 @@ if $ARGS[0] = 'no_condom1':
 				booty_call['promise_no_creampie'] = 1
 				booty_call['must_fuck'] = 1
 				cla & *nl
-				'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
+				'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
 				gs 'booty_call_sex', 'position_choose'
 			end
 		end
@@ -579,7 +602,7 @@ if $ARGS[0] = 'no_condom2':
 			booty_call['promise_no_creampie'] = 1
 			booty_call['must_fuck'] = 1
 			cla & *nl
-			'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
+			'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
 			gs 'booty_call_sex', 'position_choose'
 		end
 	end
@@ -819,7 +842,7 @@ if $ARGS[0] = 'disable_condoms_options1':
 				'Your jaw drops.'
 				*nl
 				'<i>Son of a bitch! Why is this guy so fucking careful?!</i>'
-				gs 'booty_call_condoms', 'npc_condom_use'
+				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			else
 				booty_call['no_condom'] = 1
 				npc_bareback[$boy] = 1
@@ -1056,7 +1079,7 @@ if $ARGS[0] = 'reenable_condoms2':
 				'"Do you mind if we use yours today?"'
 				'"Not at all," he says, reaching for a condom from his nightstand and you feel happy that this didn''t turn into a big deal.'
 			end
-			gs'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		end
 		
 		if prezik > 0:
@@ -1088,7 +1111,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 				'"Let''s skip the condom today," you smile. "It''ll feel better without it."'
 				gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 			end
-			
+						
 			if mesec > 0:
 				act'I''m on my period':
 					booty_call['probably_safe_day'] = 1
@@ -1163,14 +1186,14 @@ if $ARGS[0] = 'npc_preg_react':
 end
 
 if $ARGS[0] = 'npc_no_condom_react':
-	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) < pcs_persuas):
+	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) > pcs_persuas):
 		booty_call['condom'] = 1
 		booty_call['npc_condom_insist'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
-		'<i>A free pass to go bareback forever and he doesn''t take it? What''s with him??</i>'
-		gs 'booty_call_sex', 'npc_condom_use'
+		'<i>A free pass to go bareback forever and he doesn''t take it? What''s with this guy?</i>'
+		act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 	else
 		booty_call['no_condom'] = 1
 		npc_bareback[$boy] = booty_call['temp_bareback']
@@ -1185,14 +1208,14 @@ if $ARGS[0] = 'npc_no_condom_react':
 end
 
 if $ARGS[0] = 'npc_temp_no_condom_react':
-	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) < pcs_persuas):
+	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) > pcs_persuas):
 		booty_call['condom'] = 1
 		booty_call['npc_condom_insist'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
-		'<i>A free pass to go bareback and he doesn''t take it? What''s with him??</i>'
-		gs 'booty_call_sex', 'npc_condom_use'
+		'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
+		act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 	else
 		booty_call['no_condom'] = 1
 		'"This is going to feel so good," <<$npc_firstname[$boy]>> says and your smile widens into a full blown grin.'
@@ -1232,11 +1255,12 @@ if $ARGS[0] = 'bareback_check':
 		end
 	end
 	gs 'booty_call_condoms', 'need_condoms_today'
+	gs 'booty_call_condoms', 'already_creampie2'
 end
 
 if $ARGS[0] = 'need_condoms_today':
 	act'Need condoms today':
-		booty_call['danger_day'] = 1
+		if stat['dangerous_day'] = 1: booty_call['danger_day'] = 1
 		booty_call['no_creampies_today'] = 1
 		cla
 		act'Use his':
@@ -1312,6 +1336,7 @@ if $ARGS[0] = 'pc_dangerous_day':
 			
 			act'We need to use a condom':
 				cla & *clr
+				booty_call['pc_wants_condoms'] = 1
 				$npc_apt_bedroom[$boy]
 				if ovulate > 0:
 					'"I''m ovulating right now," you warn <<$npc_firstname[$boy]>>. "We need to use a condom."'
@@ -1508,6 +1533,80 @@ if $ARGS[0] = 'pc_safe_day':
 	end
 end
 
+if $ARGS[0] = 'already_creampie1':
+	!! someone already came inside you earlier today so you throw caution to the wind
+	if stat['last_creampie'] = daystart:
+		if npc_bareback[$boy] ! 1:
+			act'Already been creampied today (go bareback)':
+				booty_call['no_condom'] = 1
+				cla & *nl
+				'"Somebody came inside me earlier," you say. "So let''s skip the rubber. Seems a little too late for condoms."'
+				if $npc_cum_pref[$boy] = 'creampie':
+					'"Does that mean I can come inside you too?" <<$npc_firstname[$boy]>> asks eagerly.'
+					act'No':
+						cla & *nl
+						'"No it does not," you reply, twisting your mouth in a wry smirk. "I feel like we don''t need to be extra careful, I didn''t say I want to be extra risky."'
+						gs 'booty_call_sex', 'position_choose'
+					end
+					
+					act'Yes':
+						cla & *nl
+						booty_call['creampie_allowance'] = 1
+						'"Go for it," you smile back. "Pump me full of cum."'
+						gs 'booty_call_sex', 'position_choose'
+					end
+				else
+					'"You really get around don''t you?" <<$npc_firstname[$boy]>> says amusedly.'
+					act'Blush':
+						cla & *nl
+						'Your cheeks flush with heat as <<$npc_firstname[$boy]>> pulls you towards him.'
+						gs 'booty_call_sex', 'position_choose'
+					end
+					
+					act'Giggle':
+						cla & *nl
+						'"Shut up," you giggle back as <<$npc_firstname[$boy]>> pulls you towards him.'
+						gs 'booty_call_sex', 'position_choose'
+					end
+				end
+			end
+		end
+		if npc_creampie_okay[$boy] ! 2:
+			act'Already been creampied today (free creampies)':
+				booty_call['no_condom'] = 1
+				booty_call['creampie_allowance'] = 1
+				cla & *nl
+				'"Somebody already came inside me today," you say. "If I have to get a pill anyways, I might as well make the most of it."'
+				'You pull <<$npc_firstname[$boy]>> close to whisper in his ear.'
+				'<i>"Come inside me as much as you want."</i>'
+				gs 'booty_call_sex', 'position_choose'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'already_creampie2':
+	!! someone already came inside you earlier today so you throw caution to the wind
+	if stat['last_creampie'] = daystart:
+		act'Already been creampied today  (go bareback)':
+			cla & *nl
+			booty_call['no_condom'] = 1
+			'"Well," you say with a wry smirk. "Seeing as someone else already came inside me today, it feels a little silly to worry about condoms. So yeah, fuck me bareback."'
+			gs 'booty_call_sex', 'position_choose'
+		end
+		
+		act'Already been creampied today (free creampies)':
+			booty_call['no_condom'] = 1
+			booty_call['creampie_allowance'] = 1
+			cla & *nl
+			'"Well," you say with a wry smirk. "Seeing as someone else already came inside me today, it feels a little silly to worry about condoms. In fact..."'
+			'You pull <<$npc_firstname[$boy]>> close to whisper in his ear.'
+			'<i>"Come inside me as much as you want."</i>'
+			gs 'booty_call_sex', 'position_choose'
+		end
+	end
+end
+
 if $ARGS[0] = 'no_more_free_creampies1':
 	if npc_free_creampies[$boy] > 0:
 		act'About creampies':
@@ -1657,4 +1756,406 @@ if $ARGS[0] = 'no_more_free_creampies5':
 		gs 'booty_call_sex', 'position_choose'
 	end
 end
---- booty_call_condoms ---------------------------------
+
+if $ARGS[0] = 'virgin_condom1':
+	act'Wait for him':
+		booty_call['condom'] = 1
+		gs 'booty_call_condoms', 'npc_condom_use_stats'
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+		'He tears open the packaging and begins rolling the rubber sleeve onto his cock. You watch him, anxious with anticipation, thinking about what''s about to happen next.'
+		*nl
+		'With the condom securely wrapped around his manhood, he lines his cock up with your pussy and moments later, <<$npc_firstname[$boy]>> takes your virginity.'
+		if npc_sex_speed[$boy] = 3 and (npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1):
+			act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
+		else
+			act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
+		end
+	end
+	
+	gs 'booty_call_condoms', 'virgin_no_condom'
+end
+
+if $ARGS[0] = 'virgin_condom_ask1':
+	act'Ask him to use a condom':
+		if booty_call['condom_setup'] ! 1: gs 'booty_call_condoms', 'setup'
+		gs 'booty_call_condoms', 'check_count'
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Can you use a condom?" you whisper. "Please?"'
+		if npc_condom_conscious[$boy] = 1:
+			'"Of course," <<$npc_firstname[$boy]>> says, already tearing open a package. "I''m not an idiot you know."'
+			gs 'booty_call_virgin', 'start_with_condom'
+		else
+			if npc_no_condoms[$boy] = 1:
+				'"Nah, fuck that rubber shit. I don''t use it."'
+				npc_no_condoms_know[$boy] = 1
+				gs'booty_call_condoms', 'virgin_condom_ask2'
+				gs'booty_call_condoms', 'virgin_no_condom_shock1'
+			elseif booty_call['condom_count'] <= 0:
+				'"Can''t. I''m all out."'
+				gs'booty_call_condoms', 'virgin_condom_ask2'
+			else
+				if rand(1,2) = 2:
+					'<<$npc_firstname[$boy]>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.'
+					gs 'booty_call_virgin', 'start_with_condom'
+				else
+					'"Come on," he says. "You really want to use a condom for your first time?"'
+					gs'booty_call_condoms', 'virgin_condom_ask3'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_condom_ask2':
+	act'Then we''re not fucking':
+		cla & *clr
+		if npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1:
+			$npc_apt_bedroom[$boy]
+			if npc_no_condoms[$boy] = 1:
+				'"Woah! What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "If you''re not gonna use a condom, there''s no way I''m letting you fuck me!"'
+			elseif booty_call['condom_count'] <= 0:
+				'"Woah!" you exclaim, snapping your legs closed and pulling back from him. "If you don''t have a condom, then we can''t do this."'
+			end
+			'"Don''t be such a bitch about it! Come on! Let''s just do this!"'
+			act'Let him pressure you':
+				cla & *nl
+				'Your conscience rails against you as he pushes you down onto the bed. You want to refuse him, you <i>want</i> to tell him no, but you don''t want to fight him either. You don''t want him to see you as a bitch, even if you know you''re right.'
+				*nl
+				'With an internal sigh of resignation and not a small amount of regret, you spread your legs, and moments later, he takes your virginity.'
+				*nl
+				'<i>Without</i> a condom.'
+				gs'booty_call_virgin', 'miss_virg_start'
+			end
+			gs 'willpower', 'sex', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act'Stand firm (<<will_cost>> Willpower)':
+					cla & *nl
+					'"Nuh uh. If there''s no condom, there''s no sex." He pulls back with a sigh.'
+					gs'booty_call_virgin', 'change_mind'
+				end
+			else
+				act'Stand firm (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+			if npc_no_condoms[$boy] = 1:
+				'"Woah! What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "If you''re not gonna use a condom, there''s no way I''m letting you fuck me!"'
+			elseif booty_call['condom_count'] <= 0:
+				'"Woah!" you exclaim, snapping your legs closed and pulling back from him. "If you don''t have a condom, then we can''t do this."'
+			end
+			'<<$npc_firstname[$boy]>> takes a deep breath and pulls back.'
+			'"Sorry," he smiles shyly at you. "I was thinking with my dick instead of my head. You''re right, we shouldn''t do this without protection. What should we do instead?"'
+			gs'booty_call_start', 'foreplay_choose'
+			
+			act'Change your mind':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'You blink in surprise.'
+				'His reasonableness is somehow... unexpected? But that he was willing to accept what you wanted so easily makes you...'
+				*nl
+				'Arousal throbs in your pussy. You can feel juices practically dripping from its lips. You <i>ache</i> to feel him inside you.'
+				*nl
+				'"Okay," you whisper. "We can do it without a condom."'
+				'"But I thought-"'
+				'"You''re too reasonable. Makes me want you more," you smile. "Enough to risk doing it without a condom."'
+				'"I''m not sure I understand," he smiles back. You shrug.'
+				'"Me either."'
+				act'Let him get into position':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+					gs 'booty_call_virgin', 'start_without_condom'
+				end
+				
+				gs 'booty_call_condoms', 'virgin_condom2'
+			end
+		end
+	end
+
+	act'Maybe it''s okay?':
+		cla & *nl
+		'<i>Well... Maybe it''s okay?</i> you rationalize. It''s your first time. If he doesn''t use condoms, maybe he knows better? You can always change your mind in the future. But it''s just once. What could go wrong?'
+		booty_call['no_condom'] = 1
+		gs'booty_call_condoms', 'virgin_condom2'
+	end	
+end
+
+if $ARGS[0] = 'virgin_condom_ask3':
+	act'Maybe he has a point':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'Once again, the heady feeling of arousal becomes irresistible. You <i>ache</i> to feel him inside you and the thought of even a thin sleeve of rubber separating your cock from your pussy suddenly feels distasteful to you. It''s your first time. You want to feel <i>everything.</i>'
+		*nl
+		'"Okay," you smile. "Just this once."'
+		booty_call['no_condom'] = 1
+		gs 'booty_call_condoms', 'virgin_condom2'
+	end
+
+	act'Hell yes I do (STD)':
+		cla & *nl
+		'"Uhh, <i>hell yes</i> I do," you say with a look of suspicion. "I''m not about to have sex for the first time and immediately get an STD."'
+		'"An STD? That''s what you''re afraid of? I''m clean! Obviously!"'
+		act'I don''t know that':
+			cla & *nl
+			if npc_no_condoms_know[$boy] = 1:
+				'"How the fuck am I supposed to know that''s true?" you exclaim. "You just told me you don''t use condoms! That means you''re a risk! Unless you have a negative test on you right now, which I''m guessing you don''t. I''m not about to risk it just because you tell me to ''trust you.''"'
+				'"Well if you want to use a condom, then you''re gonna have to provide one," he huffs. "Cause I just told you: I don''t use them."'
+				gs 'booty_call_condoms', 'virgin_npc_doesnt_condom'
+			else
+				'"I don''t know that!" you spit back. "Where''s the proof? You have a negative test on you? I''m not about to risk it just because you tell me to ''trust you.''"'
+				'"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he''s totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he''s back in position between your legs.'
+				*nl
+				'A moment after that, <<$npc_firstname[$boy]>> takes your virginity.'
+				booty_call['condom'] = 1
+				gs'booty_call_virgin', 'miss_virg_start'
+			end
+		end
+
+		act'Trust him':
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"If you say so..." you say hesitantly. He just smiles back in response. You can''t help but fume just a little bit, feeling like he''s ruined the mood somewhat. But you don''t have much time to think about that as moments later, <<$npc_firstname[$boy]>> takes your virginity.'
+			gs'booty_call_virgin', 'miss_virg_start'
+		end
+	end
+
+	if birth_control['think_safe'] = 0:
+		act'Hell yes I do (pregnancy)':
+			cla & *nl
+			'"Uhh, <i>hell yes</i> I do," you say with an obvious expression on your face. "I''m not risking getting pregnant. <i>Especially</i> on my first time!"'
+			'"That''s what you''re worried about? Come on, I''ll pull out. I promise."'
+			act'No way!':
+				cla & *nl
+				'"No fucking way!" you say. "I''m not just gonna trust you to pull out because you say you will! Even if you really mean it, anything could happen by accident. I''m not taking any chances!"'
+				if npc_no_condoms_know[$boy] = 1:
+					'"Well if you want to use a condom, then you''re gonna have to provide one," he huffs. "Cause I just told you: I don''t use them."'
+					gs 'booty_call_condoms', 'virgin_npc_doesnt_condom'
+				else
+					'"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he''s totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he''s back in position between your legs. A moment after that, he takes your virginity.'
+					gs 'booty_call_condoms', 'npc_condom_use_stats'
+					gs'booty_call_virgin', 'miss_virg_start'
+				end
+			end
+
+			act'Trust him':
+				booty_call['promise_no_creampie'] = 1
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"If you say so," you sigh. "But you <i>absolutely cannot</i> cum inside me, alright?"'
+				'He just smiles back in response. You can''t help but fume just a little bit, feeling like he''s ruined the mood somewhat. But you don''t have much time to think about that as moments later, he takes your virginity.'
+				booty_call['condom'] = 3
+				gs'booty_call_virgin', 'miss_virg_start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_no_condom_shock1':
+	act'What the fuck?!':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "You don''t use condoms?"'
+		'"No! Of course I don''t!" he says. "Condoms fucking suck. Can''t feel anything with one of those on. You want to use something that gets in the way of pleasure?"'
+		gs 'booty_call_after', 'no_condom_breakoff'
+	end
+	
+	gs 'booty_call_condoms', 'virgin_condom_ask3'
+end
+
+if $ARGS[0] = 'virgin_npc_doesnt_condom':
+	if prezik > 0:
+		act'Use one of your condoms':
+			'"Fine! Here!" You fish through your bag and pull one out handing it to him.'
+			'While he rolls it on, you make sounds of annoyance, glaring at him.'
+			'"Really making my first time special," you grumble to yourself.'
+			*nl
+			'With the condom securely in place, he gets back in position between your legs.'
+			*nl
+			'A moment after that, <<$npc_firstname[$boy]>> takes your virginity.'
+			booty_call['condom'] = 1
+			gs'booty_call_virgin', 'miss_virg_start'
+		end
+		
+		gs 'booty_call_after', 'no_condom_breakoff'
+	else
+		'"Well I don''t have any either," you growl back.'
+		'"Look who wants to fuck with a condom but doesn''t have any now," <<$npc_firstname[$boy]>> rolls his eyes.'
+		act'Embarrassed':
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'You blush fiercely, turning away.'
+			'<i>I''m a virgin!</i> you think to yourself. <i>Why would I have condoms?</i>'
+			'<i>You wanted to have sex,</i> another part of you thinks. <i>Why <b>don''t</b> you have any condoms?</i>'
+			gs'booty_call_virgin', 'change_mind'
+		end
+		
+		act'Angry':
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"I''m a fucking virgin!" you shout. "Why would I have condoms?!"'
+			gs'booty_call_after', 'quit2'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_no_condom':
+	act'Ask him not to use a condom':
+		cla
+		act'Not for your first time':
+			cla & *nl
+			'"Wait," you say. "I don''t want you to use a condom. Not for my first time."'
+			gs 'booty_call_condoms', 'virgin_condom2'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_condom2':
+	if morning_after_pill > 0:
+		act'Have a morning after pill':
+			booty_call['plan_b'] = 1
+			cla & *nl
+			'"Besides," you look pointedly at your bag. "I have a morning after pill."'
+			'<<$npc_firstname[$boy]>> raises an eyebrow back at you.'
+			if hour >= 18:
+				'"Were you expecting to lose your virginity tonight?"'
+			else
+				'"Were you expecting to lose your virginity today?"'
+			end
+			if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
+				if LudaQW['condom_give_day'] = daystart:
+					'"My aunt gave it to me today," you mumble shyly. "I don''t think she was expecting me to use it this soon though..."'
+				elseif LudaQW['condom_give_day'] >= daystart - 7:
+					'"My aunt gave it to me earlier this week," you mumble shyly. "For emergencies..."'
+				elseif LudaQW['condom_give_day'] >= daystart - 30:
+					'"My aunt gave it to me a few weeks ago," you mumble shyly. "Just in case..."'
+				elseif LudaQW['condom_give_day'] >= daystart - 7:
+					'"My aunt gave it to me a long time ago," you mumble shyly. "Just in case..."'
+				end
+				gs 'booty_call_condoms', 'virgin_condom3'
+			else
+				act'No':
+					cla & *nl
+					'"No," you blush fiercely. You''re not sure if he believes you though...'
+					gs 'booty_call_condoms', 'virgin_condom3'
+				end
+				
+				act'Maybe':
+					cla & *nl
+					'"Maybe..." you smile nervously.'
+					gs 'booty_call_condoms', 'virgin_condom3'
+				end
+				
+				act'Yes':
+					cla & *nl
+					'"I was really hoping I would..." you smile nervously.'
+					gs 'booty_call_condoms', 'virgin_condom3'
+				end
+				
+				act'Rape emergency':
+					cla & *nl
+					'"A girl like me has to be careful," you mumble nervously. "There are rapists out there you know."'
+					gs 'booty_call_condoms', 'virgin_condom3'
+				end
+			end
+		end
+	else
+		act'Buy a morning after pill':
+			booty_call['pill_tomorrow'] = 1
+			cla & *nl
+			'"Besides, something bad happens I can get a morning after pill," you promise. "I might even get one regardless, just to be safe."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+	end
+	
+	if stat['safe_day'] = 1:
+		act'It''s a safe day':
+			cla & *nl
+			booty_call['safe_day'] = 1
+			'"It''s a safe day," you add nervously. "I won''t get pregnant."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+		
+		act'It''s a safe day (come inside)':
+			cla & *nl
+			booty_call['virgin_creampie_request'] = 1
+			booty_call['safe_day'] = 1
+			'"And it''s a safe day," you add hesitantly. "I won''t get pregnant if you... if you want to come inside me..."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+	elseif stat['probably_safe_day'] = 1:
+		act'It''s probably safe today':
+			booty_call['probably_safe_day'] = 1
+			cla & *nl
+			'"It''s a safe-ish day," you add nervously. "I probably won''t get pregnant."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+		
+		act'It''s probably safe today (come inside)':
+			cla & *nl
+			booty_call['virgin_creampie_request'] = 1
+			booty_call['probably_safe_day'] = 1
+			'"And it should be a safe-ish day," you add hesitantly. "I probably won''t get pregnant if you... if you want to come inside me..."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+	elseif stat['dangerous_day'] = 1:
+		act'Don''t come inside me (danger day)':
+			cla & *nl
+			booty_call['danger_day'] = 1
+			'"Just... don''t come inside me," you add nervously. "It''s a danger day for me..."'
+			gs 'booty_call_condoms', 'virgin_condom3'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_condom3':
+	if booty_call['safe_day'] = 1:
+		if npc_childfree[$boy] = 1 and booty_call['virgin_creampie_request'] = 1:
+			booty_call['condom_bonus'] -= 15
+		else
+			booty_call['condom_bonus'] -= 30
+		end
+	elseif booty_call['probably_safe_day'] = 1:
+		if npc_childfree[$boy] = 1 and booty_call['virgin_creampie_request'] = 1:
+			booty_call['condom_bonus'] -= 5
+		else
+			booty_call['condom_bonus'] -= 20
+		end
+	elseif booty_call['danger_day'] = 1:
+		if npc_childfree[$boy] = 1 and booty_call['virgin_creampie_request'] = 1:
+			booty_call['condom_bonus'] += 30
+		else
+			booty_call['condom_bonus'] -= 10
+		end
+	elseif npc_childfree[$boy] = 1 and npc_condom_conscious[$boy] > 0:
+		booty_call['condom_bonus'] += 30
+	end
+	if booty_call['condom_count'] = 0 or booty_call['no_condom'] = 1:
+		if $npc_cum_pref[$boy] = 'creampie' and booty_call['virgin_creampie_request'] = 1:
+			'<<$npc_firstname[$boy]>> gulps, apparently stunned with arousal at the thought of coming inside you. It takes several seconds before he nods slowly.'
+		else
+			'"Okay," <<$npc_firstname[$boy]>> nods.'
+		end
+		gs 'booty_call_virgin', 'start_without_condom'
+	elseif rand(npc_willpwr[$boy],100) + booty_call['condom_bonus'] < pcs_persuas + npc_rel[$boy] and npc_condom_conscious[$boy] ! 2:
+		booty_call['no_condom'] = 1
+		booty_call['condom'] = 0
+		if booty_call['virgin_creampie_request'] = 1: booty_call['creampie_allowance'] = 1
+		'<<$npc_firstname[$boy]>> stops, looking back at you for a moment before smiling.'
+		'"Okay," he says and puts the rubber back on the nightstand.'
+		*nl
+		gs 'booty_call_virgin', 'start_without_condom'
+	else
+		'"We shouldn''t risk it," <<$npc_firstname[$boy]>> says, shaking his head and opening the condom anyways. "Especially not for your first time."'
+		act'Wait for him':
+			booty_call['condom'] = 1
+			gs 'booty_call_condoms', 'npc_condom_use_stats'
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+			'He tears open the packaging and begins rolling the rubber sleeve onto his cock. You watch him, anxious with anticipation, thinking about what''s about to happen next.'
+			gs 'booty_call_virgin', 'start_with_condom'
+		end
+	end
+end
+
+--- booty_call_condoms ---------------------------------

+ 37 - 21
locations/booty_call_cowgirl.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = 'cowgirl_start':
 	if booty_call['change_pos'] = 1:
 		act'Switch to cowgirl':
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			booty_call['change_pos'] = 0
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/cowgirl1.jpg"></center>'
 			if $booty_call['position'] = 'miss':
@@ -18,27 +19,33 @@ if $ARGS[0] = 'cowgirl_start':
 
 			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
 		end
-	elseif booty_call['force_initiative'] = 2:
-		gs'booty_call_sex', 'speed_select'
-		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow1.mp4"></video></center>'
-		if $booty_call['position'] = 'miss':
-			!! IMAGE HERE
-			'You''ve barely finished your orgasm when he pulls you backwards on top of him. You groan in protest, but he continues anyways, lowering you onto his cock and forcing an involunary mew from you. At his insistence, you start moving your hips.'
-		elseif $booty_call['position'] = 'doggy':
-			!! IMAGE HERE
-			'You''ve barely finished your orgasm when he turns you over and pulls you back on top of him. You groan in protest, but he continues anyways, lowering you onto his cock and forcing an involunary mew from you. At his insistence, you start moving your hips.'
-		elseif $booty_call['position'] = 'cowgirl':
-			!! IMAGE HERE
-			'You''ve barely finished your orgasm when he begins moving his hips again underneath you. You mew in protest, hypersensitive to every movement of his cock inside your still-quivering pussy. At his insistence, you start moving your hips again.'
-		end
-		act'Ride him gently':gt 'booty_call_cowgirl', 'cowgirl1'
+	elseif booty_call['force_initiative'] = 2 and booty_call['cock_inserted'] = 1:
+		cla
+		act'Continue':
+			cla & *clr
+			booty_call['cock_inserted'] = 1
+			gs'booty_call_sex', 'speed_select'
+			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow1.mp4"></video></center>'
+			if $booty_call['position'] = 'miss':
+				!! IMAGE HERE
+				'You''ve barely finished your orgasm when he pulls you backwards on top of him. You groan in protest, but he continues anyways, lowering you onto his cock and forcing an involunary mew from you. At his insistence, you start moving your hips.'
+			elseif $booty_call['position'] = 'doggy':
+				!! IMAGE HERE
+				'You''ve barely finished your orgasm when he turns you over and pulls you back on top of him. You groan in protest, but he continues anyways, lowering you onto his cock and forcing an involunary mew from you. At his insistence, you start moving your hips.'
+			elseif $booty_call['position'] = 'cowgirl':
+				!! IMAGE HERE
+				'You''ve barely finished your orgasm when he begins moving his hips again underneath you. You mew in protest, hypersensitive to every movement of his cock inside your still-quivering pussy. At his insistence, you start moving your hips again.'
+			end
+			act'Ride him gently':gt 'booty_call_cowgirl', 'cowgirl1'
 
-		act'Ride him steadily':gt 'booty_call_cowgirl', 'cowgirl2'
+			act'Ride him steadily':gt 'booty_call_cowgirl', 'cowgirl2'
 
-		act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
-	elseif booty_call['initiative'] ! 1:
+			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
+		end
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		act'Continue':
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			if booty_call['fuck_count'] = 0:
 				'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 				'He lays back on the bed, pulling you on top of him as he does. You get the message and line yourself up with his cock.'
@@ -59,6 +66,7 @@ if $ARGS[0] = 'cowgirl_start':
 	else
 		act'Climb on top of him':
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 			if booty_call['fuck_count'] = 0:
 				'You push him back onto the bed and throw your legs over his.'
@@ -81,18 +89,19 @@ if $ARGS[0] = 'cowgirl_start':
 end
 
 if $ARGS[0] = 'cowgirl_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_cowgirl', 'cowgirl<<booty_call[''speed'']>>'
 end
 
 if $ARGS[0] = 'cowgirl1':
+	booty_call['cowgirl_fuck'] = 1
 	!! slow pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	booty_call['speed'] = 1
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl1'
 	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
-	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -155,6 +164,7 @@ if $ARGS[0] = 'cowgirl1':
 end
 
 if $ARGS[0] = 'cowgirl1.2':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -176,6 +186,7 @@ if $ARGS[0] = 'cowgirl1.2':
 end
 
 if $ARGS[0] = 'cowgirl1.bored':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -187,6 +198,7 @@ if $ARGS[0] = 'cowgirl1.bored':
 end
 
 if $ARGS[0] = 'cowgirl2':
+	booty_call['cowgirl_fuck'] = 1
 	!! medium pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	booty_call['speed'] = 2
@@ -255,6 +267,7 @@ if $ARGS[0] = 'cowgirl2':
 end
 
 if $ARGS[0] = 'cowgirl2.2':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl2'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -276,6 +289,7 @@ if $ARGS[0] = 'cowgirl2.2':
 end
 
 if $ARGS[0] = 'cowgirl2.bored':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl2'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -287,13 +301,13 @@ if $ARGS[0] = 'cowgirl2.bored':
 end
 
 if $ARGS[0] = 'cowgirl3':
+	booty_call['cowgirl_fuck'] = 1
 	!! fast/rough pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	booty_call['speed'] = 3
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl3'
 	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
-	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -355,6 +369,7 @@ if $ARGS[0] = 'cowgirl3':
 end
 
 if $ARGS[0] = 'cowgirl3.2':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl3'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -399,6 +414,7 @@ if $ARGS[0] = 'cowgirl3.2':
 end
 
 if $ARGS[0] = 'cowgirl3.bored':
+	booty_call['cowgirl_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'cowgirl3'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -447,7 +463,7 @@ if $ARGS[0] = 'cowgirl1_start_period_desc':
 		if pcs_vag <= 10:
 			'You gently roll your hips over his, grinding his cock against the inside your pussy. You breathe slowly, thankful for the blood from your period providing some lubrication for his thick shaft stretching your tight snatch.'
 		else
-			'You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it streches you out. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.'
+			'You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it stretches you out. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.'
 		end
 	elseif $npc_dick_desc[$boy] = 'long':
 		'You gently roll your hips over his, hugging the full length of his <<npc_dick[$boy]>>cm cock with your pussy. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.'
@@ -493,7 +509,7 @@ if $ARGS[0] = 'cowgirl1_start_desc':
 		if pcs_vag <= 10:
 			'You gently roll your hips over his, grinding his cock against the inside your pussy. You breathe slowly trying to adjust as his thick shaft stretches your tight snatch.'
 		else
-			'You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it streches you out.'
+			'You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it stretches you out.'
 		end
 	elseif $npc_dick_desc[$boy] = 'long':
 		'You gently roll your hips over his, hugging the full length of his <<npc_dick[$boy]>>cm cock with your pussy.'

+ 165 - 72
locations/booty_call_cum.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'girl_cum':
 !!	if pcs_horny < 30:pcs_horny = 30
 	booty_call['orgasm'] = orgasm
 	booty_call['orgasm_count'] += 1
+		
 	if $booty_call['position'] = 'miss':
 		gt'booty_call_cum', 'miss_cum'
 	elseif $booty_call['position'] = 'doggy':
@@ -212,6 +213,7 @@ if $ARGS[0] = 'cowgirl_cum':
 end
 
 if $ARGS[0] = 'fuck_cum_random':
+	booty_call['his_choice'] = 0
 	booty_call['cum_choice'] = rand(1,10)
 	booty_call['fuck_count'] += 1
 	booty_call['cum_count'] += 1
@@ -225,12 +227,16 @@ if $ARGS[0] = 'fuck_cum_random':
 !!	if npc_generous[$boy] = 1 and booty_call['cum_choice'] <= 9:
 	if booty_call['cum_choice'] > 1 and booty_call['cum_choice'] < 10: booty_call['cum_warn'] = 1
 	
+!!	if booty_call['cum_choice'] = 10 and booty_call['fucking'] = 1:
 	if booty_call['cum_choice'] = 10:
 		if booty_call['extra_caution'] = 1 and booty_call['no_condom'] = 1 and booty_call['creampie_allowance'] ! 1:
 			$booty_call['cum_choice'] = 'pullout'
 		else
 			$booty_call['cum_choice'] = 'creampie_surprise'
 		end
+	elseif booty_call['virgin_creampie_request'] = 1 and booty_call['creampie_count'] = 0 and booty_call['no_condom'] = 1:
+		booty_call['cum_where'] = 1
+		!! add something later?
 	elseif booty_call['cum_choice'] > 7:
 		gs'booty_call_cum', 'random_cum_choice'
 	elseif booty_call['cum_choice'] > 5:
@@ -244,6 +250,7 @@ if $ARGS[0] = 'fuck_cum_random':
 			end
 		end
 	else
+		!! boy will cum where he wants without asking
 		booty_call['his_choice'] = 1
 		if rand(1,10) >= 9:
 			gs'booty_call_cum', 'cum_mouth'
@@ -279,9 +286,14 @@ if $ARGS[0] = 'random_cum_choice':
 end
 
 if $ARGS[0] = 'fuck_cum':
+	cla
 	!! flags to remember what kind of fucking happened during sex
 	if booty_call['morning_after'] = 1:booty_call['morning_fuck'] = 1
 	booty_call['fuck'] = 1
+	booty_call['cock_inserted'] = 1
+	booty_call['no_sex'] = 0
+	booty_call['fuck_again'] = 0
+	booty_call['must_fuck'] = 0
 	if booty_call['speed'] = 1: booty_call['gentle_fuck'] = 1
 	if booty_call['speed'] = 2: booty_call['steady_fuck'] = 1
 	if booty_call['speed'] = 3: booty_call['rough_fuck'] = 1
@@ -323,7 +335,7 @@ if $ARGS[0] = 'fuck_cum':
 	end
 	
 !!	if (rand(0,1) = 1 or npc_selfish[$boy] = 1) and ($npc_cum_pref[$boy] = 'creampie' and booty_call['condom'] ! 1) and $npc_cum_pref[$boy] ! 'pullout' and $npc_cum_pref[$boy] ! '':
-	if booty_call['cum_warn'] = 1:	
+	if booty_call['cum_warn'] = 1 and booty_call['his_choice'] = 0:	
 		if booty_call['cum_where'] = 1:
 			'"What should I do?" <<$npc_firstname[$boy]>> asks.'
 		elseif $booty_call['cum_choice'] = 'creampie':
@@ -353,7 +365,7 @@ if $ARGS[0] = 'fuck_cum':
 		act'Come wherever you want':
 			cla & *nl
 			booty_call['cum_wherever'] = 1
-			if booty_call['he_ask'] ! 1:
+			if booty_call['he_ask'] ! 1 or booty_call['cum_warn'] = 1:
 				if $booty_call['position'] = 'doggy':
 					if booty_call['speed'] = 1:
 						'You turn your head over your shoulder to smile at <<$npc_firstname[$boy]>>.'
@@ -364,7 +376,11 @@ if $ARGS[0] = 'fuck_cum':
 						'"Come-! Wherever-! You want-!" you barely manage to get out as <<$npc_firstname[$boy]>> keeps smashing into you from behind.'
 					end
 				else
-					if booty_call['speed'] = 1:
+					if booty_call['virgin'] = 1 and booty_call['virgin_enjoyment'] = -1:
+						'"Come~! Wherever~! You~! Want~!" you whimper pathetically, squeaking in pain with every thrust.'
+					elseif booty_call['virgin'] = 1 and booty_call['virgin_feel_good'] ! 1:
+						'"Come~! Wherever~! You~! Want~!" you grunt uncomfortably with every thrust.'
+					elseif booty_call['speed'] = 1:
 						'"Come wherever you want," you smile at <<$npc_firstname[$boy]>>.'
 					elseif booty_call['speed'] = 2:
 						'"Come wherever you want!" you moan loudly as <<$npc_firstname[$boy]>> keeps fucking you.'
@@ -383,7 +399,7 @@ if $ARGS[0] = 'fuck_cum':
 		act'Finish him with your hand':gt 'booty_call_cum', 'cum_jerkoff'
 		
 		if booty_call['he_ask_facial'] = 1:
-			act'You can cum on my face':gs 'booty_call_cum', 'cum_facial'
+			act'You can come on my face':gs 'booty_call_cum', 'cum_facial'
 		else
 			act'On my face!':
 				if booty_call['cum_where'] = 1:
@@ -414,7 +430,9 @@ if $ARGS[0] = 'fuck_cum':
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['he_ask_creampie'] = 1:
-				if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1 and npc_know_bc[$boy] < 1:
+				if booty_call['orgasm'] < orgasm:
+					act'Come together':booty_call['he_ask_creampie_yes'] = 1 & gs 'booty_call_cum', 'cum_together'
+				elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1 and (npc_know_not_bc[$boy] = 1 or npc_know_bc[$boy] = 0):
 					if birth_control['think_safe'] = 1:
 						act'I''m on birth control':
 							cla & *nl
@@ -468,7 +486,11 @@ if $ARGS[0] = 'fuck_cum':
 				act'Come inside me!':
 					cla & *nl
 					booty_call['creampie_ask'] = 1
-					'"Come inside me!" you cry. "Fill me up!"'
+					if booty_call['speed'] = 1:
+						'"Come inside me," you smile. "Fill me up."'
+					else
+						'"Come inside me!" you cry. "Fill me up!"'
+					end
 					act'Continue':gt 'booty_call_cum', 'cum_inside'
 				end
 				
@@ -646,7 +668,7 @@ if $ARGS[0] = 'cum_wherever':
 end
 
 if $ARGS[0] = 'cum_jerkoff':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	$booty_call['cum_describe1'] = 'Sorry,'
 	$booty_call['cum_describe2'] = 'looking down at the strands of cum coating your fingers'
 	$booty_call['last_cum'] = 'hand'
@@ -675,7 +697,7 @@ if $ARGS[0] = 'cum_jerkoff':
 end
 
 if $ARGS[0] = 'cum_facial':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	$booty_call['cum_choice'] = 'facial'
 	$booty_call['last_cum'] = 'facial'
 	booty_call['cum_face'] += 1
@@ -713,14 +735,12 @@ if $ARGS[0] = 'cum_facial':
 		gs'booty_call_cum', 'facial_brace'
 		act'Jerk him yourself':gt'booty_call_cum', 'facial_jerk_him'
 		
-		
-		
 !!		act'Let him jerk off on your face':gt'booty_call_cum', 'facial_he_jerks'
 !!	end
 end
 
 if $ARGS[0] = 'facial_jerk_him':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	booty_call['cum_face'] += 1
 	booty_call['facial'] += 1
 	booty_call['pc_facial_jerk'] += 1
@@ -756,7 +776,7 @@ if $ARGS[0] = 'facial_jerk_him':
 end
 
 if $ARGS[0] = 'facial_he_jerks':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 
 	gs'booty_call_cum', 'facial_close_eyes'
 	gs'booty_call_cum', 'facial_tongue_swallow'
@@ -781,6 +801,7 @@ end
 
 if $ARGS[0] = 'facial_close_eyes':
 	act'Close your eyes':
+		booty_call['cum_face'] += 1
 		$booty_call['last_cum'] = 'facial'
 		$booty_call['cum_describe1'] = 'Thanks,'
 		$booty_call['cum_describe2'] = 'wiping the cum from your eyes'
@@ -902,7 +923,7 @@ if $ARGS[0] = 'facial_brace':
 			gs'booty_call_sex', 'sex_end'
 		end
 		if $npc_cum_pref[$boy] = 'facial' and booty_call['facial_ask'] = 1 and booty_call['facial_hate_comment'] ! daystart:
-			'"You hate it so much," he says "but you still asked me to do it."'
+			'"You hate it so much," he says "But you still asked me to do it?"'
 			act'I know you like it':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial_after1.mp4"></video></center>'
@@ -958,14 +979,14 @@ if $ARGS[0] = 'facial_brace':
 				act'Feels weird':
 					cla & *clr
 					'"I don''t like the feeling of that on my skin," you grimace, <<$booty_call[''cum_describe2'']>>.'
-					'"So you had me cum on your face instead?"'
+					'"So you had me come onyour face instead?"'
 					'"... Shut up!"'
 					gs'booty_call_sex', 'sex_end'
 				end
 				
-				act'I should''ve let you cum on my tits':
+				act'I should''ve let you come on my tits':
 					cla & *clr
-					'"I should''ve let you cum on my tits," you grimace, <<$booty_call[''cum_describe2'']>>. "This was a mistake!"'
+					'"I should''ve let you come on my tits," you grimace, <<$booty_call[''cum_describe2'']>>. "This was a mistake!"'
 					gs'booty_call_sex', 'sex_end'
 				end
 			else
@@ -976,10 +997,14 @@ if $ARGS[0] = 'facial_brace':
 	end
 end
 if $ARGS[0] = 'cum_mouth':
-	booty_call['cock_remove'] = 1
+	cla
+	booty_call['cock_inserted'] = 0
 	!! differing descriptions based on position
 	!!'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
-	if booty_call['his_choice'] ! 2:
+	if booty_call['his_choice'] = 1:
+		'"I''m gonna come in your mouth!" is the only warning your receive before <<$npc_firstname[$boy]>> yanks his cock from your pussy and shoves it between your lips.'
+		act'Continue':gt'booty_call_cum', 'cum_mouth1'
+	else
 		if booty_call['mouth_ask'] = 1:
 			'"In my mouth!"'
 		elseif booty_call['he_ask_mouth'] = 1:
@@ -989,18 +1014,18 @@ if $ARGS[0] = 'cum_mouth':
 				'"Okay," you say.'
 			end
 		elseif booty_call['he_ask'] = 1:
-			'"Cum in my mouth instead!"'
+			'"Come in my mouth instead!"'
+			act'Put his cock in your mouth':gt'booty_call_cum', 'cum_mouth1'
 		elseif booty_call['not_inside'] = 1:
-			'"Not inside me!" you yelp frantically.'
+			'"Not inside me!" you yelp frantically. In response, <<$npc_firstname[$boy]>> yanks his cock from your pussy and moves it towards your mouth.'
 		end
+		act'Put his cock in your mouth':gt'booty_call_cum', 'cum_mouth1'
+		gs'booty_call_cum', 'facial_tongue_swallow'
 	end
-	cla
-	act'Put his cock in your mouth':gt'booty_call_cum', 'cum_mouth1'
-	gs'booty_call_cum', 'facial_tongue_swallow'
 end
 
 if $ARGS[0] = 'cum_mouth1':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	$booty_call['cum_choice'] = 'mouth'
 	$booty_call['last_cum'] = 'mouth'
 	booty_call['cum_mouth'] += 1
@@ -1050,7 +1075,10 @@ if $ARGS[0] = 'cum_mouth1':
 			end
 		end
 	end
-	
+	gs'booty_call_cum', 'cum_mouth2'
+end
+
+if $ARGS[0] = 'cum_mouth2':
 	act'Gather it in your mouth':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum51.jpg"></center>'
@@ -1084,6 +1112,20 @@ if $ARGS[0] = 'cum_mouth1':
 		end
 	end
 	
+	act'Spit':
+		booty_call['cum_mouth'] = 1
+		booty_call['spit'] = 1
+		booty_call['swallow'] = 0
+		booty_call['cum_count'] += 1
+		$booty_call['last_cum'] = 'spit'
+		gs 'cum_call', 'mouth', $boy, 1
+		gs 'stat'
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
+		'You draw yourself back up <<$npc_firstname[$boy]>>''s cock, keeping your lips tightly sealed, allowing the cum to pool at the front of your mouth. You hold it there for a few moments and then unpurse your lips, and letting all his cum dribble out of your mouth and down your chin.'
+		gs 'booty_call_sex', 'sex_end'
+	end
+	
 	if npc_like_cum_taste[$boy] < 1:
 		act'Gag':
 			cla & *clr
@@ -1094,7 +1136,7 @@ if $ARGS[0] = 'cum_mouth1':
 			booty_call['react'] = 1
 			gs'cum_call', 'mouth', $boy, 1
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag2.mp4"></video></center>'
-			'The intensity of the bitter flavor is far more than you expect and you immediately pull your mouth off, spitting out the first load. You stick your tongue out, tryiing to soldier through and at least take the rest of it but as soon as the next shot hits your tongue your gag reflex kicks in instead, causing you to retch.'
+			'The intensity of the bitter flavor is far more than you expect and you immediately pull your mouth off, spitting out the first load. You stick your tongue out, trying to soldier through and at least take the rest of it but as soon as the next shot hits your tongue your gag reflex kicks in instead, causing you to retch.'
 			'Still holding onto <<$npc_firstname[$boy]>>''s cock with one hand, you clamp your other hand over your mouth, throat convulsing. It smears the cum on your lips all over your face, but you somehow manage to stop yourself from throwing up all over the bed.'
 			
 			if npc_cum_gag[$boy] = 1:
@@ -1194,18 +1236,18 @@ if $ARGS[0] = 'cum_mouth_after':
 end
 
 if $ARGS[0] = 'cum_tits1':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	$booty_call['last_cum'] = 'tits'
 	booty_call['cum_tits'] += 1
 	gs'cum_call', 'face',$boy,1
 	!! differing descriptions based on position
 	cla & *nl
 	if booty_call['tits_ask'] = 1:
-		'"Cum on my tits!"'
+		'"Come on my tits!"'
 	elseif booty_call['he_ask_tits'] = 1:
 		'"Go ahead," you say.'
 	elseif booty_call['he_ask'] = 1:
-		'"Cum on my tits instead!"'
+		'"Come on my tits instead!"'
 	elseif booty_call['not_inside'] = 1:
 		'"Not inside me!" you yelp frantically.'
 	end
@@ -1231,14 +1273,16 @@ if $ARGS[0] = 'cum_tits1':
 	if booty_call['not_inside'] = 1:
 		act'Continue':gt 'booty_call_cum', 'cum_tits3'
 	else
+		act'Let him do it':gt 'booty_call_cum', 'cum_tits3'
+		
 		act'Finish him yourself':gt 'booty_call_cum', 'cum_tits2'
 		
-		act'Let him do it':gt 'booty_call_cum', 'cum_tits3'
+		gs 'booty_call_cum', 'cum_tits4'
 	end
 end
 
 if $ARGS[0] = 'cum_tits2':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	cla & *clr
 	booty_call['pc_titcum_jerk'] = 1
 	$booty_call['last_cum'] = 'tits'
@@ -1253,7 +1297,7 @@ if $ARGS[0] = 'cum_tits2':
 end
 
 if $ARGS[0] = 'cum_tits3':
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	cla & *clr
 	$booty_call['last_cum'] = 'tits'
 	gs 'cum_call', 'breasts', $boy, 1
@@ -1282,15 +1326,44 @@ if $ARGS[0] = 'cum_tits3':
 		if $booty_call['position'] = 'miss':
 			'You open up your legs to let him out and he scooches forward. After just a few pumps from his fingers, cum spurts out from the tip of his cock, sending the white fluid spattering across your skin as, <<$npc_firstname[$boy]>> blows his load all over your tits.'
 		elseif $booty_call['position'] = 'doggy':
-			'You hurridely pull yourself off of him, turning around and laying down on the bed. He scooches forward. After just a few pumps from his fingers, cum spurts out from the tip of his cock, sending the white fluid spattering across your skin as, <<$npc_firstname[$boy]>> blows his load all over your tits.'
+			'You hurriedly pull yourself off of him, turning around and laying down on the bed. He scooches forward. After just a few pumps from his fingers, cum spurts out from the tip of his cock, sending the white fluid spattering across your skin as, <<$npc_firstname[$boy]>> blows his load all over your tits.'
 		elseif $booty_call['position'] = 'cowgirl':
-			'You hurridely jump off of him, laying down on the bed. After just a few pumps from his fingers, cum spurts out from the tip of his cock, sending the white fluid spattering across your skin as, <<$npc_firstname[$boy]>> blows his load all over your tits.'
+			'You hurriedly jump off of him, laying down on the bed. After just a few pumps from his fingers, cum spurts out from the tip of his cock, sending the white fluid spattering across your skin as, <<$npc_firstname[$boy]>> blows his load all over your tits.'
 		end
 	end
 	'<<$npc_firstname[$boy]>> quickly moves over to you, holding his cock in his hand. As you sit up, cum bursts from the tip, thick white droplets spattering across your breasts as <<$npc_firstname[$boy]>> shudders in pleasure.'
 	gs'booty_call_sex', 'sex_end'
 end
 
+if $ARGS[0] = 'cum_tits4':
+	if tits > 1:
+		act'Finish him with your tits':
+			booty_call['cock_inserted'] = 0
+			booty_call['cum_tits'] = 1
+			$booty_call['last_cum'] = 'tits'
+			booty_call['cum_count'] += 1
+			gs 'cum_call', 'breasts', $boy, 1
+			gs 'cum_call', 'hands', $boy, 1
+			gs 'stat'
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/cum/chest/tits1.mp4"></video></center>'
+			if booty_call['cum_choice'] = 'tits':
+				'"I can do you one better than that," you grin.'
+			else
+				'"I''ve got an even better idea," you grin.'
+			end
+			if booty_call['fucking'] = 1:
+				'You jump off his cock and kneel between his legs, smooshing your breasts together around his cock and start working them up and down his shaft. Within seconds, cum erupts from the tip, smearing it across your still bouncing tits and all over your fingers.'
+			else
+				'You kneel between his legs, smooshing your breasts together around his cock and start working them up and down his shaft. Within seconds, cum erupts from the tip, smearing it across your still bouncing tits and all over your fingers.'
+			end
+			!! reactions?
+			gs 'booty_call_sex', 'sex_end'
+			gs 'booty_call_after', 'wipe_tits'
+		end
+	end
+end
+
 if $ARGS[0] = 'cum_tits_end':
 	!! add dialogue later
 	!! missing code
@@ -1333,7 +1406,7 @@ if $ARGS[0] = 'cum_inside':
 			booty_call['simultaneous_orgasm_count'] += 1
 			'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
 			gs 'booty_call_cum', 'cum_inside_pull_away'
-			gs 'booty_call_reactions', 'creampie_react'
+			gs'booty_call_reactions', 'react_menu'
 		else
 			'<<$npc_firstname[$boy]>> drives himself inside you, grunting. His cock pulses inside you and warmth fills your pussy.'
 			act'Ride it out':
@@ -1355,7 +1428,7 @@ if $ARGS[0] = 'cum_inside':
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
 				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			end
 			
 			act'Tolerate it (disgust)':
@@ -1375,26 +1448,24 @@ if $ARGS[0] = 'cum_inside':
 			booty_call['orgasm_count'] += 1
 			booty_call['came_together'] = 2
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm2.mp4"></video></center>'
-			if booty_call['creampie_ask'] = 1:'"Come inside me!" you cry. "Fill me up!"'
 			'<<$npc_firstname[$boy]>> grunts and you feel him come, cock pulsing inside you. The sensation pushes you over the edge, and you groan, tensing as waves of orgasm wash through you. The two of come together, both of your orgasms fueling the other''s until eventually they both end.'
 			gs 'booty_call_cum', 'cum_inside_pull_away'
-			gs 'booty_call_reactions', 'creampie_react'
+			gs'booty_call_reactions', 'react_menu'
 		else
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy4.mp4"></video></center>'
-			if booty_call['creampie_ask'] = 1:'"Come inside me!" you cry. "Fill me up!"'
 			'<<$npc_firstname[$boy]>> drives himself inside you, grunting. His cock pulses inside you and warmth fills your pussy.'
 			act'Ride it out':
 				cla & *nl
 				'You stay there patiently, letting <<$npc_firstname[$boy]>> empty himself into your womb, waiting until you no longer feel him twitching inside you.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			end
 			
 			act'Tolerate it (disgust)':
 				cla & *nl
 				'You stay there, trying not to squirm in discomfort, feeling <<$npc_firstname[$boy]>>''s spunk fill your womb. Despite your disgust, you don''t move, waiting until you no longer feel him twitching inside you.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			end
 			
 			act'Come with him':
@@ -1408,13 +1479,12 @@ if $ARGS[0] = 'cum_inside':
 				booty_call['simultaneous_orgasm_count'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			end
 		end
 	elseif $booty_call['position'] = 'cowgirl':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
 		if booty_call['creampie_ask'] = 1:
-			'"Come inside me!" you cry. "Fill me up!"'
 			if pcs_horny > 90:
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
@@ -1422,11 +1492,31 @@ if $ARGS[0] = 'cum_inside':
 				booty_call['orgasm_count'] += 1
 				booty_call['came_together'] = 2
 				'You drop your hips, impaling yourself on <<$npc_firstname[$boy]>>''s cock. He thrusts his hips upward, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
+				gs 'booty_call_cum', 'cum_inside_pull_away'
+				gs'booty_call_reactions', 'react_menu'
 			else
 				'You drop your hips, impaling yourself on <<$npc_firstname[$boy]>>''s cock. He grabs you and holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.'
 			end
-			gs 'booty_call_cum', 'cum_inside_pull_away'
-			gs 'booty_call_reactions', 'creampie_react'
+			act'Ride it out':
+				cla & *nl
+				'You keep gently rocking your hips, letting <<$npc_firstname[$boy]>> empty himself into your womb, waiting until you no longer feel him twitching inside you.'
+				gs 'booty_call_cum', 'cum_inside_pull_away'
+				gs'booty_call_reactions', 'react_menu'
+			end
+			
+			act'Come with him':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/orgasm1.mp4"></video></center>'
+				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
+				gs'stat'
+				booty_call['came_together'] = 2
+				booty_call['orgasm_count'] += 1
+				booty_call['simultaneous_orgasm_count'] += 1
+				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
+				gs 'booty_call_cum', 'cum_inside_pull_away'
+				gs'booty_call_reactions', 'react_menu'
+			end
 		else
 			if pcs_horny > 90:
 				$orgasm_or = 'yes'
@@ -1436,21 +1526,21 @@ if $ARGS[0] = 'cum_inside':
 				booty_call['came_together'] = 2
 				'<<$npc_firstname[$boy]>> grabs you and pulls you down onto his cock, thrusting his hips upward at the same time, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			else
 				'<<$npc_firstname[$boy]>> grabs you and pulls you down onto his cock. He holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.'
 				act'Ride it out':
 					cla & *nl
 					'You keep gently rocking your hips, letting <<$npc_firstname[$boy]>> empty himself into your womb, waiting until you no longer feel him twitching inside you.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
-					gs 'booty_call_reactions', 'creampie_react'
+					gs'booty_call_reactions', 'react_menu'
 				end
 				
 				act'Tolerate it (disgust)':
 					cla & *nl
 					'You stay there, trying not to squirm in discomfort, feeling <<$npc_firstname[$boy]>>''s spunk fill your womb. Despite your disgust, you don''t move, waiting until you no longer feel him twitching inside you.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
-					gs 'booty_call_reactions', 'creampie_react'
+					gs'booty_call_reactions', 'react_menu'
 				end
 				
 				act'Come with him':
@@ -1464,7 +1554,7 @@ if $ARGS[0] = 'cum_inside':
 					booty_call['simultaneous_orgasm_count'] += 1
 					'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
-					gs 'booty_call_reactions', 'creampie_react'
+					gs'booty_call_reactions', 'react_menu'
 				end
 			end
 		end
@@ -1473,7 +1563,7 @@ end
 
 if $ARGS[0] = 'cum_inside_pull_away':
 	act'Pull away':
-		booty_call['cock_remove'] = 1
+		booty_call['cock_inserted'] = 0
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/drip3.mp4"></video></center>'
@@ -1489,7 +1579,7 @@ if $ARGS[0] = 'cum_inside_pull_away':
 	end
 	
 !!{	act'Let him pull out':
-		booty_call['cock_remove'] = 1
+		booty_call['cock_inserted'] = 0
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/miss1.mp4"></video></center>'
@@ -1511,7 +1601,7 @@ if $ARGS[0] = 'cum_together':
 	cla & *nl
 	if booty_call['he_ask_creampie'] = 1:
 		if $booty_call['position'] = 'miss':
-			'You just nod, unable to say anything and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
+			'You just nod, unable to say anything, and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
 		elseif $booty_call['position'] = 'doggy':
 			'You just nod, unable to say anything, eagerly throwing your hips back into his thrusts. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
 		elseif $booty_call['position'] = 'cowgirl':
@@ -1549,7 +1639,7 @@ if $ARGS[0] = 'cum_together':
 		end
 		'<<$npc_firstname[$boy]>>''s cock pulses inside you and something warm spills into your pussy. His hot cum filling you up is the last thing you need to get off and suddenly you''re right there with him, muscles going taut and quivering uncontrollably as the two of you come together.'
 		gs 'booty_call_cum', 'cum_inside_pull_away'
-		gs 'booty_call_reactions', 'creampie_react'
+		gs'booty_call_reactions', 'react_menu'
 	end
 end
 
@@ -1591,9 +1681,10 @@ end
 
 if $ARGS[0] = 'cum_force':
 	booty_call['creampie_force'] = 1
-	gs 'booty_call_cum', 'creampie_code'
+	
 	!! differing descriptions based on position
-	if booty_call['condom'] = 1:
+	if booty_call['condom'] = 1 and booty_call['no_condom'] = 0:
+		gs'cum_call', '',$boy,1,3
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
@@ -1616,6 +1707,7 @@ if $ARGS[0] = 'cum_force':
 			gs'booty_call_sex', 'sex_end'
 		end
 	else
+		gs 'booty_call_cum', 'creampie_code'
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
@@ -1631,7 +1723,7 @@ if $ARGS[0] = 'cum_force':
 				*nl
 				'Judging by the expression on his face, you just rocked his world finishing him like that.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
-				gs 'booty_call_reactions', 'creampie_react'
+				gs'booty_call_reactions', 'react_menu'
 			end
 		else
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cowgirl2.mp4"></video></center>'
@@ -1646,7 +1738,7 @@ if $ARGS[0] = 'cum_force':
 					*nl
 					'Judging by the expression on his face, you just rocked his world finishing him like that.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
-					gs 'booty_call_reactions', 'creampie_react'
+					gs'booty_call_reactions', 'react_menu'
 				end
 			end
 			act'Creampie induced orgasm':
@@ -1659,7 +1751,7 @@ if $ARGS[0] = 'cum_force':
 					*nl
 					'Both of you are breathing hard, unable to do anything but pant wordlessly until the aftershocks subside.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
-					gs 'booty_call_reactions', 'creampie_react'
+					gs'booty_call_reactions', 'react_menu'
 				end
 			end
 		end
@@ -1669,7 +1761,7 @@ end
 
 if $ARGS[0] = 'cum_pullout':
 	if booty_call['cum_choice'] > 9 and booty_call['extra_caution'] = 0: gt'booty_call_cum', 'creampie_surprise'
-	booty_call['cock_remove'] = 1
+	booty_call['cock_inserted'] = 0
 	$booty_call['cum_choice'] = 'pullout'
 	$booty_call['last_cum'] = 'pullout'
 	if booty_call['pullout_ask'] = 1:
@@ -1712,7 +1804,7 @@ if $ARGS[0] = 'cum_pullout':
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> pulls himself out of your pussy and tears off the condom, furiously jacking off over you. Moments later, he ejaculates, sending cum flying all over your body, spattering across your belly.'
 				else
-					'He barely follows your instructions in time. No sooner does his cock slip from your pussy than cum bursts from the tip, spattering all across your stomach.'
+					'"Oh fuck!" <<$npc_firstname[$boy]>> barely follows your instructions in time. No sooner does his cock slip from your pussy than cum bursts from its tip, spattering all across your stomach.'
 				end
 			else
 				if booty_call['condom'] = 1:
@@ -1734,7 +1826,7 @@ if $ARGS[0] = 'cum_pullout':
 				if booty_call['condom'] = 1 and booty_call['no_condom'] = 0:
 					'<<$npc_firstname[$boy]>> yanks himself from your pussy and you hear a <i>snap</i> as he rips the condom off of his cock and moments later, you feel hot liquid spatter all over ass and across your back.'
 				else
-					'Not even a second passes between feeling <<$npc_firstname[$boy]>>''s cock slip from your snatch and when hot liquid spatters across your back and dribbles onto your ass.'
+					'"Oh fuck!" Not even a second passes between feeling <<$npc_firstname[$boy]>>''s cock vacate your pussy and when hot liquid spatters across your back and dribbles onto your ass.'
 				end
 			else
 				'"Oh fuck!" <<$npc_firstname[$boy]>> suddenly cries out. His cock slips from your snatch and not even a moment later do you feel hot liquid spattering across your back and dribbling onto your ass.'
@@ -1762,7 +1854,7 @@ if $ARGS[0] = 'cum_pullout':
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. He rips the condom off his cock and moments later, he ejaculates, sending cum spattering across your belly.'
 				else
-					'<<$npc_firstname[$boy]>> grunts, his cock slipping from your pussy and sliding up between your ass cheeks. You reach around to put it back in when you feel something hot and wet spattering across your ass and back.'
+					'"Oh fuck!" <<$npc_firstname[$boy]>> grunts, his cock slipping from your pussy and sliding up between your ass cheeks. You reach around to put it back in when you feel something hot and wet spattering across your ass and back.'
 				end
 			end
 		end
@@ -1891,11 +1983,13 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 	end
 	if npc_know_love_creampie[$boy] = 1:
 		'He stares into your eyes, smiling.'
-	else
+	elseif booty_call['came_together'] = 2:
+		booty_call['did_we_cum_together'] = 1
 		'"Did... did we... did you...?" he pants.'
 	end
 	
-	gs'booty_call_reactions', 'creampie_react'
+!!	gs'booty_call_reactions', 'creampie_react'
+	gs'booty_call_reactions', 'react_menu'
 
 	if (booty_call['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
 		act'Collapse':gt'booty_call_after', 'black_out'
@@ -1996,19 +2090,18 @@ if $ARGS[0] = 'cum_condom':
 	if $booty_call['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid'
-		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'doggy':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
 		$booty_call['cum_describe2'] = 'looking over your shoulder as you let his rubber encased cock slip from your pussy'
-		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'cowgirl':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
 		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock'
 	end
 	if condom_break > 0:
+		$booty_call['last_cum'] = 'broken_condom'
 		booty_call['broken_condom'] = 1
 		if booty_call['orgasm'] < orgasm:
-			booty_call['came_together'] = 1
+			booty_call['came_together'] = 2
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy. It throbs inside you through the condom, causing you to come as well. You ride out your orgasms together, oblivious to everything except the pleasure.'
 			act'Continue':gs'booty_call_cum', 'broken_condom2'
 		else
@@ -2038,7 +2131,7 @@ if $ARGS[0] = 'broken_condom1':
 	end
 	
 	act'Take it in stride':
-		booty_call['cock_remove'] = 1
+		booty_call['cock_inserted'] = 0
 		cla & *clr
 		if $booty_call['position'] = 'cowgirl':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
@@ -2054,6 +2147,7 @@ if $ARGS[0] = 'broken_condom1':
 		end
 		gs'booty_call_reactions', 'oh_shit_options'
 		gs'booty_call_reactions', 'creampie_accident_birth_control'
+		gs'booty_call_reactions', 'creampie_safe_day'
 	end
 	
 	act'Come':
@@ -2086,6 +2180,7 @@ if $ARGS[0] = 'broken_condom1':
 			end
 			gs'booty_call_reactions', 'oh_shit_options'
 			gs'booty_call_reactions', 'creampie_accident_birth_control'
+			gs'booty_call_reactions', 'creampie_safe_day'
 		end
 	end
 end
@@ -2094,10 +2189,8 @@ if $ARGS[0] = 'broken_condom2':
 	cla & *clr
 	if $booty_call['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
-		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'doggy':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
-		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'cowgirl':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum81.jpg"></center>'
 	end
@@ -2105,7 +2198,7 @@ if $ARGS[0] = 'broken_condom2':
 	*nl
 	'Something feels...'
 	act'Continue':
-		booty_call['cock_remove'] = 1
+		booty_call['cock_inserted'] = 0
 		cla & *clr
 		if $booty_call['position'] = 'doggy':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy1.jpg"></center>'
@@ -2116,7 +2209,7 @@ if $ARGS[0] = 'broken_condom2':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
 			'<<$npc_firstname[$boy]>> slips his cock out from inside you and something wet trickles out after it.'
 			*nl
-			'Turning around, you look at his cock and confirm your suspicions: the condom broke.'
+			'Looking down between your legs, you see his cock and confirm your suspicions: the condom broke.'
 		end
 		gs'booty_call_reactions', 'oh_shit_options'
 		gs'booty_call_reactions', 'creampie_accident_birth_control'

+ 93 - 47
locations/booty_call_doggy.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'doggy_start':
 	if booty_call['change_pos'] = 1:
 		act'Switch to doggy':
+			booty_call['cock_inserted'] = 1
 			cla & *clr
 			booty_call['change_pos'] = 0
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
@@ -16,22 +17,28 @@ if $ARGS[0] = 'doggy_start':
 			'"I want you to fuck me from behind now."'
 			act'Keep fucking':gs'booty_call_doggy', 'doggy_goto'
 		end
-	elseif booty_call['force_initiative'] = 2:
-		gs 'booty_call_sex', 'speed_select'
-		if $booty_call['position'] = 'miss':
-			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
-			'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp as he begins fucking you again.'
-		elseif $booty_call['position'] = 'doggy':
-			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
-			'<<$npc_firstname[$boy]>> doesn''t give you a moment to rest, continuing to fuck you all the way through your orgasm. You quiver, your sensitive pussy spasming around his cock, driving your insane even after you''ve finished.'
-		elseif $booty_call['position'] = 'cowgirl':
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
-			'You''ve barely finished quivering when he pulls you off of him and rolls you onto your knees, pulling your hips back towards him. With one swift movement, he thrusts his cock into your still-quivering pussy. His actions earn him an involuntary gasp from your mouth before he begins fucking you again.'
+	elseif booty_call['force_initiative'] = 2 and booty_call['cock_inserted'] = 1:
+		cla
+		act'Continue':
+			booty_call['cock_inserted'] = 1
+			cla & *clr
+			gs 'booty_call_sex', 'speed_select'
+			if $booty_call['position'] = 'miss':
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+				'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp as he begins fucking you again.'
+			elseif $booty_call['position'] = 'doggy':
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+				'<<$npc_firstname[$boy]>> doesn''t give you a moment to rest, continuing to fuck you all the way through your orgasm. You quiver, your sensitive pussy spasming around his cock, driving your insane even after you''ve finished.'
+			elseif $booty_call['position'] = 'cowgirl':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
+				'You''ve barely finished quivering when he pulls you off of him and rolls you onto your knees, pulling your hips back towards him. With one swift movement, he thrusts his cock into your still-quivering pussy. His actions earn him an involuntary gasp from your mouth before he begins fucking you again.'
+			end
+			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
-		act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
-	elseif booty_call['initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
+			booty_call['cock_inserted'] = 1
 			cla
 			if booty_call['fuck_count'] = 0:
 				if npc_rough_lover[$boy] = 1:
@@ -90,6 +97,7 @@ if $ARGS[0] = 'doggy_start':
 	else
 		gs 'booty_call_sex', 'speed_select'
 		act'Bend over':
+			booty_call['cock_inserted'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
 			if booty_call['fuck_count'] = 0:
@@ -107,17 +115,18 @@ if $ARGS[0] = 'doggy_start':
 end
 
 if $ARGS[0] = 'doggy_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
 end
 
 if $ARGS[0] = 'doggy1':
+	booty_call['doggy_fuck'] = 1
 	!! slow pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy1'
 	!! booty_call['doggy_fuck'] tracks if you fuck in this position
-	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -137,9 +146,7 @@ if $ARGS[0] = 'doggy1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/vag/doggy/slow2.mp4"></video></center>'
 		gs 'booty_call_doggy', 'doggy1_enjoy_desc'
-		if booty_call['orgasm'] < orgasm:
-			gs 'booty_call_sex', 'girl_cum_pre'
-		end
+		if booty_call['orgasm'] < orgasm: gs 'booty_call_sex', 'girl_cum_pre'
 		gs 'booty_call_cum', 'fuck_cum'
 	end
 
@@ -187,6 +194,7 @@ if $ARGS[0] = 'doggy1':
 end
 
 if $ARGS[0] = 'doggy1.1':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -198,6 +206,7 @@ if $ARGS[0] = 'doggy1.1':
 end
 
 if $ARGS[0] = 'doggy1.2':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -241,6 +250,7 @@ if $ARGS[0] = 'doggy1.2':
 end
 
 if $ARGS[0] = 'doggy1.bored':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -254,12 +264,12 @@ if $ARGS[0] = 'doggy1.bored':
 end
 
 if $ARGS[0] = 'doggy2':
+	booty_call['doggy_fuck'] = 1
 	!! medium pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy2'
 	!! booty_call['doggy_fuck'] tracks if you fuck in this position
-	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -327,6 +337,7 @@ if $ARGS[0] = 'doggy2':
 end
 
 if $ARGS[0] = 'doggy2.1':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -339,6 +350,7 @@ if $ARGS[0] = 'doggy2.1':
 end
 
 if $ARGS[0] = 'doggy2.2':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -387,6 +399,7 @@ if $ARGS[0] = 'doggy2.2':
 end
 
 if $ARGS[0] = 'doggy2.bored':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy2'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -398,6 +411,7 @@ if $ARGS[0] = 'doggy2.bored':
 end
 
 if $ARGS[0] = 'doggy3':
+	booty_call['doggy_fuck'] = 1
 	!! fast/rough pace
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
@@ -443,38 +457,67 @@ if $ARGS[0] = 'doggy3':
 			end
 			
 			act'It hurts!':
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/2.jpg"></center>'
-				'"Oh fuck! It hurts!" you moan and <<$npc_firstname[$boy]>> stops abruptly, letting you collapse to the bed as he releases your hair.'
-				'"Oh! Sorry. I thought you liked it rough. Do you want me to stop?"'
-				act'No (enjoy)':
+				if ((npc_selfish[$boy] = 1 and npc_speed_pref[$boy] = 3) or npc_abusive[$boy] = 1) and npc_caretaker[$boy] ! 1:
 					cla & *nl
-					npc_knows_pc_likes_rough[$boy] = 1
-					booty_call['rough_enjoy'] = 1
-					'"No," you smile back at him. "I want you to pound me."'
-					'In response, <<$npc_firstname[$boy]>> yanks you back by the hair even harder than before, slamming his cock into you to fulfil your request.'
-					act'Continue':gt 'booty_call_doggy', 'doggy3.1'
-				end
+					'"Oh fuck! It hurts!" you cry.'
+					'"Hurts fucking good doesn''t it?" <<$npc_firstname[$boy]>> grunts back, not even pausing for a single beat.'
+					act'Please slow down!':
+						cla & *nl
+						booty_call['orgasm'] = orgasm
+						$orgasm_or = 'no'
+						booty_call['rough_hurt'] = 1
+						booty_call['boy_cum'] = 2
+						'"Please!" you beg, tears welling up in  your eyes. "Please slow down! I can''t-! Take-!'
+						'But <<$npc_firstname[$boy]>> is heedless of your cries. He keeps a firm hold on your hair and pulls hard with every thrust, forcing unceasing cries of pain from your lips.'
+						act'Continue':gs 'booty_call_cum', 'fuck_cum'
+					end
+					
+					act'If you slow down I will kill you':
+						pcs_sweat += 1
+						booty_call['orgasm'] = orgasm
+						booty_call['rough_enjoy'] = 1
+						gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
+						gs 'stat'
+						cla & *nl
+						'You scream another cry of agonizing pleasure and grimace at <<$npc_firstname[$boy]>>.'
+						'"If you slow down I will <i>fucking</i> kill you," you snarl, throwing your hips forward to slam into his for more force.'
+						gs 'booty_call_miss', 'miss3_enjoy_desc'
+						act'Continue':gs 'booty_call_cum', 'fuck_cum'
+					end
+				else
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/2.jpg"></center>'
+					'"Oh fuck! It hurts!" you moan and <<$npc_firstname[$boy]>> stops abruptly, letting you collapse to the bed as he releases your hair.'
+					'"Oh! Sorry. I thought you liked it rough. Do you want me to stop?"'
+					act'No (enjoy)':
+						cla & *nl
+						npc_knows_pc_likes_rough[$boy] = 1
+						booty_call['rough_enjoy'] = 1
+						'"No," you smile back at him. "I want you to pound me."'
+						'In response, <<$npc_firstname[$boy]>> yanks you back by the hair even harder than before, slamming his cock into you to fulfil your request.'
+						act'Continue':gt 'booty_call_doggy', 'doggy3.1'
+					end
 
-	!!			if npc_abusive[$boy] = 1:
-	!!				$orgasm_or = 'no'
-	!!				*nl
-	!!				'But <<$npc_firstname[$boy]>> is unrelenting. He ignores your pleas for mercy and he keeps on fucking you with barely a pause.'
-	!!			else
+		!!			if npc_abusive[$boy] = 1:
+		!!				$orgasm_or = 'no'
+		!!				*nl
+		!!				'But <<$npc_firstname[$boy]>> is unrelenting. He ignores your pleas for mercy and he keeps on fucking you with barely a pause.'
+		!!			else
 
-				act'Yes, gentle please':
-					cla & *nl
-					booty_call['too_rough'] = 1
-					'"Yes please," you say, giving him a small smile. "A little more gently would be very nice..."'
-					act'Continue':gt 'booty_call_doggy', 'doggy1.1'
-				end
+					act'Yes, gentle please':
+						cla & *nl
+						booty_call['too_rough'] = 1
+						'"Yes please," you say, giving him a small smile. "A little more gently would be very nice..."'
+						act'Continue':gt 'booty_call_doggy', 'doggy1.1'
+					end
 
-				act'Not <i>too</i> gentle':
-					cla & *nl
-					booty_call['too_rough'] = 1
-					'"You don''t have to be <i>too</i> gentle with me," you giggle. "I just don''t want to feel like I''m having sex with Vlad the Impaler here."'
-					'You sigh in relief as he picks up his pace again, this time without leaving you feel like you''re being battered to bits.'
-					act'Continue':gt 'booty_call_doggy', 'doggy2.2'
+					act'Not <i>too</i> gentle':
+						cla & *nl
+						booty_call['too_rough'] = 1
+						'"You don''t have to be <i>too</i> gentle with me," you giggle. "I just don''t want to feel like I''m having sex with Vlad the Impaler here."'
+						'You sigh in relief as he picks up his pace again, this time without leaving you feel like you''re being battered to bits.'
+						act'Continue':gt 'booty_call_doggy', 'doggy2.2'
+					end
 				end
 			end
 
@@ -527,6 +570,7 @@ if $ARGS[0] = 'doggy3':
 						end
 						*nl
 						'You don''t want to ruin the mood. Besides, <<$npc_firstname[$boy]>> wouldn''t understand...'
+						gs 'booty_call_cum', 'fuck_cum'
 					end
 					
 					act'Scream':
@@ -541,7 +585,7 @@ if $ARGS[0] = 'doggy3':
 							'But despite your desperate screams, <<$npc_firstname[$boy]>> doesn''t even slow down, instead continuing to pummel you from behind as you cry in terror.'
 							gs 'booty_call_cum', 'fuck_cum'
 						else
-							act'Continue':gs 'booty_call_talk', 'rape_explain'
+							act'Continue':gs 'booty_call_talk2', 'rape_explain'
 						end
 					end
 				end
@@ -551,6 +595,7 @@ if $ARGS[0] = 'doggy3':
 end
 
 if $ARGS[0] = 'doggy3.1':
+	booty_call['doggy_fuck'] = 1
 	$booty_call['pos_speed'] = 'doggy3'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -590,6 +635,7 @@ if $ARGS[0] = 'doggy3.1':
 end
 
 if $ARGS[0] = 'doggy3.2':
+	booty_call['doggy_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'doggy3'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'

+ 8 - 14
locations/booty_call_favorite_part.qsrc

@@ -21,15 +21,15 @@ if $ARGS[0] = 'good_for_you':
 				gs'booty_call_favorite_part', 'tit_cum_favorite'
 			elseif npc_pussyeater[$boy] = 1 and booty_call['cuni_orgasm'] > 0:
 				gs'booty_call_favorite_part', 'pussyeat_favorite'
-			elseif $npc_fav_pos[$npclastgenerated] = 'missionary' and booty_call['miss_fuck'] = 1:
+			elseif $npc_fav_pos[$boy] = 'missionary' and booty_call['miss_fuck'] = 1:
 				gs'booty_call_favorite_part', 'npc_miss_fav1'
-			elseif $npc_fav_pos[$npclastgenerated] = 'doggy' and booty_call['doggy_fuck'] = 1:
+			elseif $npc_fav_pos[$boy] = 'doggy' and booty_call['doggy_fuck'] = 1:
 				gs'booty_call_favorite_part', 'npc_doggy_fav1'
-			elseif $npc_fav_pos[$npclastgenerated] = 'cowgirl' and booty_call['cowgirl_fuck'] = 1:
+			elseif $npc_fav_pos[$boy] = 'cowgirl' and booty_call['cowgirl_fuck'] = 1:
 				gs'booty_call_favorite_part', 'npc_cowgirl_fav1'
-			elseif $npc_fav_pos[$npclastgenerated] = 'blowjob' and booty_call['bj_count'] > 0:
+			elseif $npc_fav_pos[$boy] = 'blowjob' and booty_call['bj_count'] > 0:
 				gs'booty_call_favorite_part', 'npc_bj_fav1'
-			!! elseif $npc_fav_pos[$npclastgenerated] = 'titjob':
+			!! elseif $npc_fav_pos[$boy] = 'titjob':
 			!!	 gs'booty_call_favorite_part', 'pussyeat_favorite'
 			else
 				if booty_call['virgin'] ! 1:
@@ -605,13 +605,6 @@ if $ARGS[0] = 'pussyeat_favorite':
 		end
 	end
 	
-	act'What do I taste like?':
-		cla & *nl
-		'"Yeah?" you smirk back. "What do I taste like?"'
-		'"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"'
-		gs'booty_call_favorite_part', 'pc_favorite_part'
-	end
-	
 	act'You''re really good at it':
 		cla & *nl
 		'"Did I mention that you''re really good at that?" you smile.'
@@ -620,6 +613,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 		else
 			'"You didn''t have to," he smirks back. "I could tell by the way you were screaming my name."'
 		end
+		gs'booty_call_pillow_talk', 'topics'
 	end
 	
 	gs'booty_call_pillow_talk', 'kuni_wear_out'
@@ -1351,7 +1345,7 @@ if $ARGS[0] = 'pc_creampie_fav1':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if $booty_call['boy_favorite'] = 'creampie' and npc_free_creampies[$boy] < 1 and booty_call['surprise_creampie_count'] > 0:
 				if npc_know_not_bc[$boy] = 1:
-					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m on on birth control so it''s extra important!"'
+					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m not on birth control so it''s extra important!"'
 				elseif birth_control['think_safe'] ! 1:
 					gs'booty_call_stats', 'no_birth_control_know'
 					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! I''m not on birth control so it''s dangerous."'
@@ -1371,7 +1365,7 @@ if $ARGS[0] = 'pc_creampie_fav1':
 					'"I liked it when you came inside me," you smile warmly at <<$npc_firstname[$boy]>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."'
 				end
 			end
-			if booty_call['accidental_creampie_convo'] = 0 and (npc_know_not_bc[$boy] = 1 or booty_call['risky_creampie'] > 0 or npc_childfree[$boy] > 0):
+			if booty_call['accidental_creampie_convo'] = 0 and (npc_know_not_bc[$boy] = 1 or booty_call['risky_creampie'] > 0 or npc_childfree[$boy] > 0) and booty_call['safe_day'] ! 1 and booty_call['probably_safe_day'] ! 1:
 				gs'booty_call_talk', 'boy_accidental_creampie'
 			else
 				gs'booty_call_pillow_talk', 'topics'

+ 100 - 59
locations/booty_call_miss.qsrc

@@ -1,10 +1,17 @@
 # booty_call_miss
 
 if $ARGS[0] = 'missionary_start':
-	if booty_call['change_pos'] = 1:
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+		'<<$npc_firstname[$boy]>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.'
+		act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
+		act'Let him take your virginity':gs'booty_call_virgin', 'start3'
+	elseif booty_call['change_pos'] = 1:
 		act'Switch to missionary':
 			cla & *clr
 			booty_call['change_pos'] = 0
+			booty_call['cock_inserted'] = 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
 			if $booty_call['position'] = 'doggy':
 				'You lean forward, letting <<$npc_firstname[$boy]>>''s cock slip from your pussy. You flip over onto your back, spreading your legs, giving him a sultry look.'
@@ -14,21 +21,26 @@ if $ARGS[0] = 'missionary_start':
 			'"I want you on top," you whisper huskily.'
 			act'Keep fucking':gs'booty_call_miss', 'miss_goto'
 		end
-	elseif booty_call['force_initiative'] = 2:
-		'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex1.mp4"></video></center>'
-		if $booty_call['position'] = 'miss':
-			'You''ve barely finished quivering when he starts moving his hips again. The motion inside your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again'
-		elseif $booty_call['position'] = 'doggy':
-			!! IMAGE HERE
-			'You''ve barely finished quivering when he rolls you onto your back and plunges his cock all the way inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again'
-		elseif $booty_call['position'] = 'cowgirl':
-			!! IMAGE HERE
-			'You''ve barely finished quivering when he pulls you off of him and pushes you onto your back, immediately plunging his cock back inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again.'
-		end
-		act'Get fucked':gs'booty_call_miss', 'miss_goto'
-	elseif booty_call['initiative'] ! 1:
+	elseif booty_call['force_initiative'] = 2 and booty_call['cock_inserted'] = 1:
+		cla
+		act'Continue':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex1.mp4"></video></center>'
+			if $booty_call['position'] = 'miss':
+				'You''ve barely finished quivering when he starts moving his hips again. The motion inside your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again'
+			elseif $booty_call['position'] = 'doggy':
+				!! IMAGE HERE
+				'You''ve barely finished quivering when he rolls you onto your back and plunges his cock all the way inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again'
+			elseif $booty_call['position'] = 'cowgirl':
+				!! IMAGE HERE
+				'You''ve barely finished quivering when he pulls you off of him and pushes you onto your back, immediately plunging his cock back inside you. The sudden penetration of your still-sensitive pussy elicits involuntary whimpers of protest from you, but it doesn''t stop him for a moment, ramping back into fucking you again.'
+			end
+			act'Get fucked':gs'booty_call_miss', 'miss_goto'
+		end
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
+			booty_call['cock_inserted'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
@@ -45,6 +57,7 @@ if $ARGS[0] = 'missionary_start':
 	else
 		gs 'booty_call_sex', 'speed_select'
 		act'Spread your legs':
+			booty_call['cock_inserted'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
@@ -61,12 +74,14 @@ if $ARGS[0] = 'missionary_start':
 end
 
 if $ARGS[0] = 'miss_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
 end
 
 if $ARGS[0] = 'miss1':
 	!! slow pace
+	booty_call['miss_fuck'] = 1
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss1'
@@ -100,8 +115,8 @@ if $ARGS[0] = 'miss1':
 		if rand(0,2) = 2 and booty_call['kiss_skip'] = 1 and cum_loc['face'] <= 0:
 			gs 'booty_call_miss', 'miss_kiss'
 		else
-			gs 'booty_call_cum', 'fuck_cum'
 			if booty_call['orgasm'] < orgasm:gs 'booty_call_sex', 'girl_cum_pre'
+			gs 'booty_call_cum', 'fuck_cum'
 		end
 	end
 
@@ -158,6 +173,7 @@ end
 
 if $ARGS[0] = 'miss1.1':
 	cla & *clr
+	booty_call['miss_fuck'] = 1
 	$booty_call['pos_speed'] = 'miss1'
 	booty_call['kiss'] = 0
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -170,6 +186,7 @@ if $ARGS[0] = 'miss1.1':
 end
 
 if $ARGS[0] = 'miss1.2':
+	booty_call['miss_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'miss1'
 	booty_call['kiss'] = 0
@@ -230,6 +247,7 @@ end
 
 if $ARGS[0] = 'miss1.bored':
 	cla & *clr
+	booty_call['miss_fuck'] = 1
 	$booty_call['pos_speed'] = 'miss1'
 	booty_call['kiss'] = 0
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -243,6 +261,7 @@ end
 
 if $ARGS[0] = 'miss2':
 	!! medium pace
+	booty_call['miss_fuck'] = 1
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	booty_call['kiss'] = 0
 	$booty_call['position'] = 'miss'
@@ -308,10 +327,12 @@ if $ARGS[0] = 'miss2':
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/slow2.mp4"></video></center>'
 				'"Hey," you say, looking <<$npc_firstname[$boy]>> right in the eyes. "I didn''t come here for you to hump me like a Disney princess. I came here to <b>fuck.</b> Now fuck me like you mean it already!"'
 				*nl
-				if rand(0,1) = 1:
-					'A concentrated look shadows <<$npc_firstname[$boy]>>''s face and quickly starts fucking you with accelerated speed.'
-				else
-					'Before you can even finish your sentence, <<$npc_firstname[$boy]>> grabs you by the hips and rams his cock into you.'
+				if npc_abusive[$boy] = 1 and (npc_knows_pc_likes_rough[$boy] = 0 or booty_call['rough_enjoy'] ! 1):
+					if rand(0,1) = 1:
+						'A concentrated look shadows <<$npc_firstname[$boy]>>''s face and quickly starts fucking you with accelerated speed.'
+					else
+						'Before you can even finish your sentence, <<$npc_firstname[$boy]>> grabs you by the hips and rams his cock into you.'
+					end
 				end
 				act'Continue':gt 'booty_call_miss', 'miss3.1'
 			end
@@ -328,10 +349,10 @@ if $ARGS[0] = 'miss2':
 end
 
 if $ARGS[0] = 'miss2.1':
+	booty_call['miss_fuck'] = 1
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 	booty_call['kiss'] = 0
-	$booty_call['pos_speed'] = 'miss2'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
 	if $booty_call['pos_speed'] = 'miss1':
@@ -345,6 +366,7 @@ if $ARGS[0] = 'miss2.1':
 end
 
 if $ARGS[0] = 'miss2.2':
+	booty_call['miss_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'miss2'
 	booty_call['kiss'] = 0
@@ -397,6 +419,7 @@ if $ARGS[0] = 'miss2.2':
 end
 
 if $ARGS[0] = 'miss2.bored':
+	booty_call['miss_fuck'] = 1
 	cla & *clr
 	$booty_call['pos_speed'] = 'miss2'
 	booty_call['kiss'] = 0
@@ -410,6 +433,7 @@ if $ARGS[0] = 'miss2.bored':
 end
 
 if $ARGS[0] = 'miss3':
+	booty_call['miss_fuck'] = 1
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	!! fast/rough pace
 	$booty_call['position'] = 'miss'
@@ -463,32 +487,61 @@ if $ARGS[0] = 'miss3':
 			end
 			
 			act'It hurts!':
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/1.jpg"></center>'
-				'"Oh fuck! It hurts!" you moan and <<$npc_firstname[$boy]>> stops abruptly.'
-				'"Oh! Sorry. I thought you liked it rough. Do you want me to stop?"'
-				act'No (enjoy)':
-					cla & *nl
-					npc_knows_pc_likes_rough[$boy] = 1
-					booty_call['rough_enjoy'] = 1
-					'"No," you smile back at him. "I want you to pound me."'
-					'In response, <<$npc_firstname[$boy]>> yanks you back by the hair even harder than before, slamming his cock into you to fulfil your request.'
-					act'Continue':gt 'booty_call_miss', 'miss3.1'
-				end
-				
-				act'Yes, gentle please':
-					booty_call['too_rough'] = 1
+				if ((npc_selfish[$boy] = 1 and npc_speed_pref[$boy] = 3) or npc_abusive[$boy] = 1) and npc_caretaker[$boy] ! 1:
 					cla & *nl
-					'"Yes please," you say, giving him a small smile. "A little more gently would be very nice..."'
-					act'Continue':gt 'booty_call_miss', 'miss1.1'
-				end
+					'"Oh fuck! It hurts!" you cry.'
+					'"Hurts fucking good doesn''t it?" <<$npc_firstname[$boy]>> grunts back, not even pausing for a single beat.'
+					act'Please slow down!':
+						cla & *nl
+						booty_call['orgasm'] = orgasm
+						$orgasm_or = 'no'
+						booty_call['rough_hurt'] = 1
+						booty_call['boy_cum'] = 2
+						'"Please!" you beg, tears welling up in  your eyes. "Please slow down! I can''t-! Take-!'
+						'But <<$npc_firstname[$boy]>> is heedless of your cries. He keeps a firm hold on your hair and pulls hard with every thrust, forcing unceasing cries of pain from your lips.'
+						act'Continue':gs 'booty_call_cum', 'fuck_cum'
+					end
+					
+					act'If you slow down I will kill you':
+						pcs_sweat += 1
+						booty_call['orgasm'] = orgasm
+						booty_call['rough_enjoy'] = 1
+						gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
+						gs 'stat'
+						cla & *nl
+						'You scream another cry of agonizing pleasure and grimace at <<$npc_firstname[$boy]>>.'
+						'"If you slow down I will <i>fucking</i> kill you," you snarl, throwing your hips forward to slam into his for more force.'
+						gs 'booty_call_miss', 'miss3_enjoy_desc'
+						act'Continue':gs 'booty_call_cum', 'fuck_cum'
+					end
+				else
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/1.jpg"></center>'
+					'"Oh fuck! It hurts!" you moan and <<$npc_firstname[$boy]>> stops abruptly.'
+					'"Oh! Sorry. I thought you liked it rough. Do you want me to stop?"'
+					act'No (enjoy)':
+						cla & *nl
+						npc_knows_pc_likes_rough[$boy] = 1
+						booty_call['rough_enjoy'] = 1
+						'"No," you smile back at him. "I want you to pound me."'
+						'In response, <<$npc_firstname[$boy]>> yanks you back by the hair even harder than before, slamming his cock into you to fulfil your request.'
+						act'Continue':gt 'booty_call_miss', 'miss3.1'
+					end
+					
+					act'Yes, gentle please':
+						booty_call['too_rough'] = 1
+						cla & *nl
+						'"Yes please," you say, giving him a small smile. "A little more gently would be very nice..."'
+						act'Continue':gt 'booty_call_miss', 'miss1.1'
+					end
 
-				act'Not <i>too</i> gentle':
-					booty_call['too_rough'] = 1
-					cla & *nl
-					'"You don''t have to be <i>too</i> gentle with me," you giggle. "I just don''t want to feel like I''m having sex with Vlad the Impaler here."'
-					'You sigh in relief as he picks up his pace again, this time without leaving you feel like you''re being battered to bits.'
-					act'Continue':gt 'booty_call_miss', 'miss2.2'
+					act'Not <i>too</i> gentle':
+						booty_call['too_rough'] = 1
+						cla & *nl
+						'"You don''t have to be <i>too</i> gentle with me," you giggle. "I just don''t want to feel like I''m having sex with Vlad the Impaler here."'
+						'You sigh in relief as he picks up his pace again, this time without leaving you feel like you''re being battered to bits.'
+						act'Continue':gt 'booty_call_miss', 'miss2.2'
+					end
 				end
 			end
 
@@ -523,24 +576,10 @@ if $ARGS[0] = 'miss3':
 			end
 		end
 	end
-	
-	act'If you slow down I will kill you':
-		pcs_sweat += 1
-		booty_call['orgasm'] = orgasm
-		booty_call['rough_enjoy'] = 1
-		gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
-		gs 'stat'
-		cla & *nl
-		'"Oh <i>fuck!</i>" you scream through the pain, even as you throw your hips forward to slam into his.'
-		'"Want me to slow down?" he huffs.'
-		'"If you slow down I will <i>fucking</i> kill you," you snarl back glaring directly into <<$npc_firstname[$boy]>>''s eyes.'
-		gs 'booty_call_miss', 'miss3_enjoy_desc'
-		gs 'booty_call_cum', 'fuck_cum'
-	end
-	
 end
 
 if $ARGS[0] = 'miss3.1':
+	booty_call['miss_fuck'] = 1
 	pcs_sweat += 1
 	$booty_call['pos_speed'] = 'miss3'
 	booty_call['kiss'] = 0
@@ -581,6 +620,7 @@ if $ARGS[0] = 'miss3.1':
 end
 
 if $ARGS[0] = 'miss3.2':
+	booty_call['miss_fuck'] = 1
 	pcs_sweat += 1
 	$booty_call['pos_speed'] = 'miss3'
 	booty_call['kiss'] = 0
@@ -627,6 +667,7 @@ if $ARGS[0] = 'miss3.2':
 end
 
 if $ARGS[0] = 'miss3.bored':
+	booty_call['miss_fuck'] = 1
 	cla & *clr
 	pcs_sweat += 1
 	$booty_call['pos_speed'] = 'miss3'

+ 30 - 9
locations/booty_call_morning.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'morning':
 		if pcs_lovers - pcs_girlfriends > 0:act'Your boyfriend':$booty_call['cheat'] = 'boyfriend' & gt'booty_call_morning', 'guilt1'
 		if pcs_girlfriends > 0:act'Your girlfriend': $booty_call['cheat'] = 'girlfriend' & gt'booty_call_morning', 'guilt1'
 		
-		if pilldaychk < daystart - 1: gs'booty_call_morning', 'forgot_bc_pill'
+		if pilldaychk < daystart - 1 and birth_control['using_bc'] = 1: gs'booty_call_morning', 'forgot_bc_pill'
 	end
 end
 
@@ -517,8 +517,12 @@ if $ARGS[0] = 'wakeup1':
 		
 		act'Let me cook instead':
 			cla & *nl
-			'"Please, allow me," you smile, getting out of bed and making your way to his kitchen. "Least I can do for letting me sleep over is make you breakfast."'
-			
+			if booty_call['get_up'] = 0:
+				'"Please, allow me," you smile, moving to get out of bed. "It''s the least I can do for letting me sleep over."'
+			else
+				'"Please, allow me," you smile. "It''s the least I can do for letting me sleep over."'
+			end
+			act'Make breakfast':gt'booty_call_morning', 'pc_make_breakfast'
 		end
 		
 		if booty_call['morning_fuck'] = 0:
@@ -541,8 +545,8 @@ if $ARGS[0] = 'wakeup1':
 			act'Get dressed':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				gs 'shortgs', 'dress'
-				'You get dressed.'
+!!				gs 'shortgs', 'dress'
+!!				'You get dressed.'
 				!!gs'booty_call_morning', 'dressing1'
 				gs'booty_call_after', 'dressing1'
 			end
@@ -635,7 +639,7 @@ if $ARGS[0] = 'wakeup1':
 			end
 		end
 		
-		if booty_call['boy_asleep'] = 1:
+		if booty_call['boy_asleep'] = 1 and booty_call['breakfast_eat'] = 0:
 			act'Wake <<$npc_firstname[$boy]>> with a blowjob':gt'booty_call_morning', 'bj_wake'
 		end
 	!!	act'Snuggle back into bed':
@@ -668,6 +672,7 @@ if $ARGS[0] = 'shower2':
 	minut += 10
 	shampoo += 1
 	dynamic $showerdin
+	gs 'stat'
 	'You twist the faucet and hot water comes rushing out, pouring over you, soaking into your skin. Slowly over time, your sleepiness washes away and clarity comes back.'
 	*nl
 	'Feeling sufficiently awake, you turn off the tap and step out of the shower.'
@@ -904,7 +909,7 @@ end
 
 
 if $ARGS[0] = 'sneak_out1':
-	act'Sneak out': gt'booty_call_after', 'sneak_out2'
+	act'Sneak out': gt'booty_call_morning', 'sneak_out2'
 	act'Leave a note':
 		cla & *clr
 		$npc_apt_hall[$boy]
@@ -1305,7 +1310,16 @@ if $ARGS[0] = 'guilt1':
 			'Your thoughts wander through your night with <<$npc_firstname[$boy]>>...'
 			*nl
 			if booty_call['bj'] > 0:'<i>Sucking his cock...</i>'
-			if booty_call['fuck'] > 0:'<i>Fucking him on his bed...</i>'
+			if booty_call['fuck'] > 0:
+				if booty_call['virgin'] = 1:
+					'<i>You gave him your virginity...</i>'
+				else
+					'<i>Fucking him on his bed...</i>'
+				end
+				if booty_call['no_condom'] = 1:
+					'<i>You didn''t even use condoms...</i>'
+				end
+			end
 			if booty_call['orgasm_count'] > 5:
 				'<i>He made you come so many times...</i>'
 			elseif booty_call['orgasm_count'] > 0:
@@ -1784,7 +1798,7 @@ if $ARGS[0] = 'pc_make_breakfast_cooking':
 	gs 'stat'
 	if booty_call['cooking_total'] = 1:
 		if booty_call['coffee_make'] = 1:
-			'<center><img <<$set_imgh>> src="images/pc/drink/nude_coffee2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee2.jpg"></center>'
 			'You put the coffee into the machine and wait, drumming your fingers on the counter until the dark liquid is brewed.'
 		elseif booty_call['toast_make'] = 1:
 			'<center><img <<$set_imgh>> src="images/pc/activities/cooking/nude_misc1.jpg"></center>'
@@ -1866,6 +1880,7 @@ end
 
 if $ARGS[0] = 'eat_breakfast1':
 	booty_call['breakfast_eat'] = 1
+	if booty_call['boy_asleep'] = 1: booty_call['boy_asleep'] = 0
 	npc_rel[$boy] += rand(1,3)
 	act'Eat a small portion':gs'booty_call_morning', 'eat_breakfast2'
 	act'Eat a medium portion':gs'booty_call_morning', 'eat_breakfast3'
@@ -2128,6 +2143,12 @@ end
 !! ---------------------------------- OUTSIDE APARTMENT -------------------------------------------
 
 if $ARGS[0] = 'give_lift':
+	if $region = 'city':
+		minut += 45
+	elseif $region = 'pav':
+		minut += 5
+	end
+	gs'stat'
 	!! add in option later to give road head along the way
 	if booty_call['give_lift'] = 2:
 		!!take to school

+ 4 - 4
locations/booty_call_pillow_talk.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	booty_call['pillow_talking'] = 1
 	'You and <<$npc_firstname[$boy]>> relax on the bed together, basking in the afterglow as you idly chit chat about things.'
-	if booty_call['virgin'] = 1 and booty_call['virgin_talk'] = 0:
+	if booty_call['virgin'] = 1 and booty_call['virgin_talk'] = 0 and booty_call['fuck_count'] > 0:
 		gs'booty_call_virgin', 'first_time_talk'
 	else
 		gs'booty_call_pillow_talk', 'topics'
@@ -117,7 +117,7 @@ end
 
 if $ARGS[0] = 'long_time':
 	if booty_call['long_time_talk'] = 0:
-		if $daystage['desc'] = 'pre_dawn' or $daystage['desc'] = 'dawn':
+		if $daystage['desc'] = 'pre_dawn' or $daystage['desc'] = 'dawn' and booty_call['sleepover'] = 0:
 			act'We fucked all night':
 				gs'booty_call_pillow_talk', 'talk_time_add'
 				booty_call['long_time_talk'] = 1
@@ -1236,9 +1236,9 @@ if $ARGS[0] = 'boy_broken_condom':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 		if cum_loc['vagina'] > 0:
-			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything..."'
+			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"'
 		else
-			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything..."'
+			'"Are you going to be okay?" <<$npc_firstname[$boy]>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"'
 		end
 		
 		if morning_after_pill = 0:

File diff suppressed because it is too large
+ 469 - 141
locations/booty_call_reactions.qsrc


+ 251 - 199
locations/booty_call_sex.qsrc

@@ -1,26 +1,59 @@
 # booty_call_sex
 
 if $ARGS[0] = 'sex_start':
-	if booty_call['no_sex'] = 0:
-		if stat['think_virgin'] = 1 and booty_call['virgin'] = 0 and booty_call['fuck_count'] = 0: 
-			act'Give him your virginity':gt'booty_call_virgin', 'start1'
-		elseif booty_call['fuck_count'] = 0:
-			act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & booty_call['fuck_now'] = 1 & gs 'booty_call_sex', 'sex_pre'
-		else
-			act'Fuck again':
-				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
-					booty_call['fuck_again'] = 1
-					gs 'booty_call_after', 'fucked_out'
-				else
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0: 
+		act'Give him your virginity':gs'booty_call_virgin', 'start1'
+	elseif booty_call['fuck_count'] = 0 and ($booty_call['position'] ! 'miss' or  $booty_call['position'] ! 'doggy' or  $booty_call['position'] ! 'cowgirl'):
+		act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & gs 'booty_call_sex', 'sex_pre'
+	elseif booty_call['cock_inserted'] = 1 and $booty_call['last_cum'] = 'creampie' and ($booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl'):
+		act'Fuck again':
+			booty_call['must_fuck'] = 1
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
+				gs 'booty_call_after', 'fucked_out'
+			else
+!!					cla & *nl
+				cla
+				$booty_call['reset_pos'] = $booty_call['position']
+!!					minut += rand(1,2)
+!!					'"Wanna keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."'
+				act'Stay in the same position':
 					cla
 					gs 'booty_call_sex', 'reset'
-					if booty_call['no_condom'] = 0:
+					if booty_call['no_condom'] ! 1:
+						gs 'booty_call_condoms', 'condoms'
+					else
+						gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+					end
+				end
+				
+				act'Change positions':
+					booty_call['force_initiative'] = 1
+					cla
+					if booty_call['no_condom'] ! 1:
 						gs 'booty_call_condoms', 'condoms'
 					else
 						gs 'booty_call_sex', 'position_choose'
 					end
-				!!	gs 'booty_call_sex', 'position_change'
-					
+				end
+			end
+		end
+	else
+		act'Fuck again':
+			cla
+			booty_call['fuck_again'] = 1
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
+				gs 'booty_call_after', 'fucked_out'
+			else
+!!					cla & *clr
+!!					'<center><img <<$set_imgh>> src="images/shared/sex/misc/smile.jpg"></center>'
+!!					'"Ready to go again?" you grin eagerly at <<$npc_firstname[$boy]>>.'
+!!					'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock while you decide what position you want to fuck in next.'
+				gs 'booty_call_sex', 'reset'
+				booty_call['must_fuck'] = 1
+				if booty_call['no_condom'] = 0:
+					gs 'booty_call_condoms', 'condoms'
+				else
+					gs 'booty_call_sex', 'position_choose'
 				end
 			end
 		end
@@ -70,31 +103,37 @@ if $ARGS[0] = 'sex_pre':
 end
 
 
-
 if $ARGS[0] = 'position_choose':
-	if booty_call['virgin'] = 1 and $booty_call['virgin_react'] = '': 
+	booty_call['cum_warn'] = 0
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0: 
 		gs 'booty_call_virgin', 'start_options'
 	!! initiative roll
-	elseif booty_call['no_sex'] = 0:
+!!	elseif booty_call['no_sex'] = 0:
+	else
 		booty_call['initiative'] = rand(0,1)
 		if (booty_call['initiative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
 			!! player wins initiative
-			if $booty_call['pos_speed'] = '':
-				act'Let him choose':
-					cla & *nl
+			
+			act'Let him choose':
+				cla & *nl
+				if $booty_call['pos_speed'] = '':
 					'"Take me however you want," you smile.'
-					booty_call['must_fuck'] = 1
-					if $npc_fav_pos[$boy] = 'missionary':
-						gs 'booty_call_miss', 'missionary_start'
-					elseif $npc_fav_pos[$boy] = 'doggy':
-						gs 'booty_call_doggy', 'doggy_start'
-					elseif $npc_fav_pos[$boy] = 'cowgirl':
-						gs 'booty_call_cowgirl', 'cowgirl_start'
-					else
-						gs 'booty_call_sex', 'rand_position'
-					end
-	!!				if npc_condom_conscious[$boy] = 1 or booty_call['condom'] = 1:
+				else
+					'"Fuck me again," you smile. "You pick how."'
 				end
+				booty_call['must_fuck'] = 1
+				booty_call['force_initiative'] = 2
+				if $npc_fav_pos[$boy] = 'missionary':
+					gs 'booty_call_miss', 'missionary_start'
+				elseif $npc_fav_pos[$boy] = 'doggy':
+					gs 'booty_call_doggy', 'doggy_start'
+				elseif $npc_fav_pos[$boy] = 'cowgirl':
+					gs 'booty_call_cowgirl', 'cowgirl_start'
+				else
+					gs 'booty_call_sex', 'rand_position'
+				end
+	!!				if npc_condom_conscious[$boy] = 1 or booty_call['condom'] = 1:
+	!!			end
 			end
 			gs 'booty_call_miss', 'missionary_start'
 			gs 'booty_call_doggy', 'doggy_start'
@@ -126,50 +165,64 @@ if $ARGS[0] = 'he_choose_position':
 	else
 		'"Do whatever you want to me <<$npc_lovername[$boy]>>," you smile.'
 	end
-	
-	if rand(0,1) = 1:
-		if $npc_fav_pos[$boy] = 'missionary':
-			gs 'booty_call_miss', 'missionary_start'
-		elseif $npc_fav_pos[$boy] = 'doggy':
-			gs 'booty_call_doggy', 'doggy_start'
-		elseif $npc_fav_pos[$boy] = 'cowgirl':
-			gs 'booty_call_cowgirl', 'cowgirl_start'
-		elseif $npc_fav_pos[$boy] = 'blowjob' and booty_call['must_fuck'] ! 1:
-			gs 'booty_call_start', 'bj_ask'
-		elseif npc_pussyeater[$boy] = 1 and booty_call['must_fuck'] ! 1:
-			*nl
-			'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
-			gs 'booty_call_start', 'kuni_start'
+	act'Continue':
+		if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+			'<<$npc_firstname[$boy]>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.'
+			'"I wanna fuck your pussy."'
+			act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
+			act'Let him take your virginity':gs'booty_call_virgin', 'start3'
+		elseif rand(0,1) = 1:
+			if $npc_fav_pos[$boy] = 'missionary':
+				gs 'booty_call_miss', 'missionary_start'
+			elseif $npc_fav_pos[$boy] = 'doggy':
+				gs 'booty_call_doggy', 'doggy_start'
+			elseif $npc_fav_pos[$boy] = 'cowgirl':
+				gs 'booty_call_cowgirl', 'cowgirl_start'
+			elseif $npc_fav_pos[$boy] = 'blowjob' and booty_call['must_fuck'] ! 1:
+				gs 'booty_call_start', 'bj_ask'
+			elseif npc_pussyeater[$boy] = 1 and booty_call['must_fuck'] ! 1:
+				*nl
+				'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
+				gs 'booty_call_start', 'kuni_start'
+			else
+				gs 'booty_call_sex', 'rand_position'
+			end
 		else
 			gs 'booty_call_sex', 'rand_position'
 		end
-	else
-		gs 'booty_call_sex', 'rand_position'
 	end
 end
 
 if $ARGS[0] = 'rand_position':
+	cla
 	if booty_call['must_fuck'] = 1:
 		booty_call['position_rand'] = rand(1,3)
 	else
 		booty_call['position_rand'] = rand(1,5)
 	end
-	if booty_call['position_rand'] = 1:
-		!! missionary
-		gs 'booty_call_miss', 'missionary_start'
-	elseif booty_call['position_rand'] = 2:
-		!! doggy
-		gs 'booty_call_doggy', 'doggy_start'
-	elseif booty_call['position_rand'] = 3:
-		!! cowgirl
-		gs 'booty_call_cowgirl', 'cowgirl_start'
-	elseif booty_call['position_rand'] = 4 and booty_call['must_fuck'] ! 1:
-		!! blowjob
-		gs 'booty_call_start', 'bj_ask'
-	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1 and (booty_call['creampie_count'] < 1 or npc_pussyeater[$boy] = 1):
-		*nl
-		'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
-		gs 'booty_call_start', 'kuni_start'
+	if stat['think_virgin'] = 0 or booty_call['fuck_count'] > 0:
+		if booty_call['position_rand'] = 1:
+			!! missionary
+			gs 'booty_call_miss', 'missionary_start'
+		elseif booty_call['position_rand'] = 2:
+			!! doggy
+			gs 'booty_call_doggy', 'doggy_start'
+		elseif booty_call['position_rand'] = 3:
+			!! cowgirl
+			gs 'booty_call_cowgirl', 'cowgirl_start'
+		elseif booty_call['position_rand'] = 4 and booty_call['must_fuck'] ! 1:
+			!! blowjob
+			gs 'booty_call_start', 'bj_ask'
+		elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1 and (booty_call['creampie_count'] < 1 or npc_pussyeater[$boy] = 1):
+			*nl
+			'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
+			gs 'booty_call_start', 'kuni_start'
+		else
+			!! failsafe: default to missionary
+			gs 'booty_call_miss', 'missionary_start'
+		end
 	else
 		!! failsafe: default to missionary
 		gs 'booty_call_miss', 'missionary_start'
@@ -177,7 +230,8 @@ if $ARGS[0] = 'rand_position':
 end
 
 if $ARGS[0] = 'fuck_continue':
-	booty_call['cock_remove'] = 0
+	booty_call['cock_inserted'] = 1
+	booty_call['fucking'] = 1
 	!! this is just so the game remembers what positions you fucked in
 	if $booty_call['position'] = 'miss':
 		booty_call['miss_fuck'] = 1
@@ -265,17 +319,17 @@ if $ARGS[0] = 'sex_end':
 		gs'booty_call_after', 'stop_here'
 	end
 	if booty_call['sex_stop'] = 0:
-		gs'booty_call_sex', 'keep_fucking'
+!!		gs'booty_call_sex', 'keep_fucking'
+		gs'booty_call_sex', 'keep_going'
+!!		gs'booty_call_sex', 'sex_start'
 		gs'booty_call_sex', 'take_a_break'
-!!		gs'booty_call_after', 'keep_going'
 		gs'booty_call_sex', 'harden_hand'
 		gs'booty_call_sex', 'harden_mouth'
-		gs'booty_call_sex', 'sex_start'
 	end
 	gs'booty_call_after', 'wipes'
 	if booty_call['react'] = 0:
 		gs'booty_call_after', 'facial_mouth_clean'
-		gs'booty_call_after', 'cum_kiss_cock'
+		gs'booty_call_reactions', 'cum_kiss_cock'
 		gs'booty_call_reactions', 'cum_react'
 	end
 	gs'booty_call_after', 'tap_out'
@@ -318,35 +372,6 @@ if $ARGS[0] = 'dirty_talk2':
 	gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
 end
 
-if $ARGS[0] = 'keep_fucking':
-	if booty_call['cock_remove'] = 0 and ($booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl'):
-		act'Keep fucking':
-			cla & *nl
-			$booty_call['reset_pos'] = $booty_call['position']
-			minut += rand(1,2)
-			'"Think you can keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."'
-			gs'booty_call_sex', 'reset'
-			act'Continue':
-				cla
-				gs 'booty_call_sex', 'reset'
-				gs 'booty_call_condoms', 'condoms'
-				gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'keep_fucking_act':
-	if booty_call['cock_remove'] = 0:
-		act'Keep fucking':
-			$booty_call['reset_pos'] = $booty_call['position']
-			cla
-			gs 'booty_call_sex', 'reset'
-			gs 'booty_call_condoms', 'condoms'
-			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-		end
-	end
-end
 
 if $ARGS[0] = 'take_a_break':
 	act'Take a break':
@@ -356,7 +381,7 @@ if $ARGS[0] = 'take_a_break':
 		gs 'stat'
 		booty_call['react'] = 1
 		if $booty_call['last_cum'] = 'creampie':
-			if booty_call['cock_remove'] = 1:
+			if booty_call['cock_inserted'] = 0:
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
 				gs 'booty_call_sex', 'break_ask'
 				*nl
@@ -375,17 +400,30 @@ if $ARGS[0] = 'take_a_break':
 				gs 'booty_call_sex', 'break_ask'
 				
 				act'Pull apart':
-					booty_call['cock_remove'] = 1
+					booty_call['cock_inserted'] = 0
 					cla & *clr
-					if $booty_call['position'] = 'miss':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
-						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<$npc_firstname[$boy]>>''s cum trickle from your pussy.'
-					elseif $booty_call['position'] = 'doggy':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy2.jpg"></center>'
-						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<$npc_firstname[$boy]>>''s cum trickles from your pussy.'
-					elseif $booty_call['position'] = 'cowgirl':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
-						'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.'
+					if $booty_call['last_cum'] = 'creampie':
+						if $booty_call['position'] = 'miss':
+							'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+							'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<$npc_firstname[$boy]>>''s cum trickle from your pussy.'
+						elseif $booty_call['position'] = 'doggy':
+							'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy2.jpg"></center>'
+							'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<$npc_firstname[$boy]>>''s cum trickles from your pussy.'
+						elseif $booty_call['position'] = 'cowgirl':
+							'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+							'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.'
+						end
+					elseif $booty_call['last_cum'] = 'condom':
+						if $booty_call['position'] = 'miss':
+							'<center><video autoplay loop src="images/shared/sex/after/miss_after1.mp4"></video></center>'
+							'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<$npc_firstname[$boy]>> pulls off the used condom and tosses it aside.'
+						elseif $booty_call['position'] = 'doggy':
+							'<center><video autoplay loop src="images/shared/sex/after/doggy_after1.mp4"></video></center>'
+							'<<$npc_firstname[$boy]>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.'
+						elseif $booty_call['position'] = 'cowgirl':
+							'<center><video autoplay loop src="images/shared/sex/after/cowgirl_after1.mp4"></video></center>'
+							'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<$npc_firstname[$boy]>> pulls off the used condom and tosses it aside.'
+						end
 					end
 					
 					*nl
@@ -417,7 +455,7 @@ if $ARGS[0] = 'take_a_break':
 			end
 		elseif $booty_call['last_cum'] = 'condom':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			if booty_call['cock_remove'] = 1:
+			if booty_call['cock_inserted'] = 0:
 				'You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<$npc_firstname[$boy]>> removes the condom from his cock, tossing it aside before laying down beside you.'
 				*nl
 				if booty_call['speed'] <= 2:
@@ -539,7 +577,7 @@ if $ARGS[0] = 'birth_control_take':
 			act'Take it shyly':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				if booty_call['cock_remove'] = 0:
+				if booty_call['cock_inserted'] = 1:
 					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
 					*nl
 					'"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy squeeze his cock as you swallow.'
@@ -572,7 +610,7 @@ if $ARGS[0] = 'birth_control_take':
 			
 			act'Take it sexily':
 				cla & *nl
-				if booty_call['cock_remove'] = 0:
+				if booty_call['cock_inserted'] = 1:
 					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
 					*nl
 					if booty_call['risky_creampie'] = 1:
@@ -619,20 +657,30 @@ if $ARGS[0] = 'he_end_break':
 	booty_call['position_rand'] = rand(1,5)
 	cla & *clr
 	$npc_apt_bedroom[$boy]
-	if booty_call['position_rand'] = 1 or $npc_fav_pos[$boy] = 'missionary':
+	if booty_call['position_rand'] = 1 or $npc_fav_pos[$boy] = 'missionary' or (stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0 and booty_call['position_rand'] <= 3):
 		!! missionary
 		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you. You realize what''s about to happen just before he jumps on top of you, eliciting...'
 		act'... giggles':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
-			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and plunges his cock into your pussy.'
-			act'Get fucked':gs'booty_call_miss', 'miss_goto'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.'
+			if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
+				act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
+				act'Let him take your virginity':gs'booty_call_virgin', 'start3'
+			else
+				act'Get fucked':gs'booty_call_miss', 'miss_goto'
+			end
 		end
 		act'... a yelp of surprise':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
-			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and plunges his cock into your pussy.'
-			act'Get fucked':gs'booty_call_miss', 'miss_goto'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.'
+			if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
+				act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
+				act'Let him take your virginity':gs'booty_call_virgin', 'start3'
+			else
+				act'Get fucked':gs'booty_call_miss', 'miss_goto'
+			end
 		end
 	elseif booty_call['position_rand'] = 2 or $npc_fav_pos[$boy] = 'doggy':
 		!! doggy
@@ -640,12 +688,12 @@ if $ARGS[0] = 'he_end_break':
 		act'... giggles':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
-			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.'
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
 		act'... a yelp of surprise':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/dog1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
 			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
@@ -670,49 +718,59 @@ end
 
 if $ARGS[0] = 'keep_going':
 	act'Keep going?':
-		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+		if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
 			gs 'booty_call_after', 'fucked_out'
 		elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
-			if booty_call['cock_remove'] = 1:
+			
+			minut += rand(1,2)
+			if booty_call['cock_inserted'] = 1 and $booty_call['last_cum'] = 'creampie':
+				cla & *nl
+				'"Wanna keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."'
+			else
 				cla & *clr
-				minut += rand(1,2)
 				'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
-				'"Ready to keep going?" you ask, looking over at <<$npc_firstname[$boy]>>.'
-				'"Yeah, gimme a minute to get hard again."'
-				gs'booty_call_sex', 'reset'
-				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Sex':cla & gs'booty_call_sex', 'position_choose' & gs 'booty_call_condoms', 'condoms'
-			else
-				cla & *nl
-				$booty_call['reset_pos'] = $booty_call['position']
-				minut += rand(1,2)
-				'"Think you can keep going?" you ask, flexing your pussy around his cock. You grin when you feel it twitch in response, seeming a little stiffer inside you than before. "That feels like a yes."'
-				gs'booty_call_sex', 'reset'
-				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Change position':
-					cla
-					booty_call['change_pos'] = 1
-					gs 'booty_call_sex', 'position_change'
-				end
-				gs'booty_call_sex', 'keep_fucking_act'
+				'"Wanna keep going?" you ask, looking over at <<$npc_firstname[$boy]>>.'
+				'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.'
+				!!act'Sex':cla & gs'booty_call_sex', 'position_choose' & gs 'booty_call_condoms', 'condoms'
 			end
+			gs'booty_call_sex', 'reset'
+			gs'booty_call_sex', 'sex_menu'
 		else
 			cla & *clr
 			minut += rand(1,2)
 			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
-			'"Ready to keep going?" you ask eagerly.'
+			'"Wanna keep going?" you ask eagerly.'
 			if $booty_call['cum_choice'] ! '':
-				'"Yeah, gimme a minute to get hard again."'
+				'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.'
 			else
-				'"Definitely. What do you have in mind?"'
+				'"What do you have in mind?" <<$npc_firstname[$boy]>> grins back.'
 			end
 			
 			gs'booty_call_sex', 'reset'
-			act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-			act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-			act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+			gs'booty_call_sex', 'sex_menu'
+			!!act'Sex':cla & gs'booty_call_sex', 'position_choose' & gs 'booty_call_condoms', 'condoms'
+		end
+	end
+end
+
+if $ARGS[0] = 'sex_menu':
+	act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+	act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+	gs'booty_call_sex', 'sex_start'
+end
+
+if $ARGS[0] = 'keep_fucking':
+	
+end
+
+if $ARGS[0] = 'keep_fucking_act':
+	if booty_call['cock_inserted'] = 1 and ($booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl'):
+		act'Keep fucking':
+			$booty_call['reset_pos'] = $booty_call['position']
+			cla
+			gs 'booty_call_sex', 'reset'
+			gs 'booty_call_condoms', 'condoms'
+			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
 		end
 	end
 end
@@ -726,10 +784,10 @@ if $ARGS[0] = 'ciga_break':
 				gs 'drugs', 'smoke'
 				if npc_smoker[$boy] > 0:
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-					if booty_call['cock_remove'] = 1:
+					if booty_call['cock_inserted'] = 0:
 						'You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
 					else
-						booty_call['cock_remove'] = 1
+						booty_call['cock_inserted'] = 0
 						if $booty_call['last_cum'] = 'creampie':
 							'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
 						elseif $booty_call['last_cum'] = 'condom':
@@ -759,10 +817,10 @@ if $ARGS[0] = 'ciga_break':
 					siga_bum = 1
 					gs 'drugs', 'smoke'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-					if booty_call['cock_remove'] = 1:
+					if booty_call['cock_inserted'] = 0:
 						'"Got any smokes?" you ask. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
 					else
-						booty_call['cock_remove'] = 1
+						booty_call['cock_inserted'] = 0
 						if $booty_call['last_cum'] = 'creampie':
 							'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
 						else
@@ -773,14 +831,14 @@ if $ARGS[0] = 'ciga_break':
 					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.'
 				else
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/annoyed1.jpg"></center>'
-					if booty_call['cock_remove'] = 1:
+					if booty_call['cock_inserted'] = 0:
 						'"Got any smokes?" you ask but <<$npc_firstname[$boy]>> just shakes his head.'
 					elseif $booty_call['last_cum'] = 'creampie':
 						'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
 					else
 						'"Got any smokes?" you ask as you pull apart, finally letting <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
 					end
-					booty_call['cock_remove'] = 1
+					booty_call['cock_inserted'] = 0
 					if npc_smoker[$boy] > 0:
 						'"Fresh out," he shrugs.'
 					else
@@ -797,7 +855,7 @@ end
 if $ARGS[0] = 'harden_hand':
 	if $booty_call['last_cum'] ! '':
 		act'Try to get him hard again (hand)':
-			booty_call['cock_remove'] = 1
+			booty_call['cock_inserted'] = 0
 			cla & *clr
 			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
@@ -830,17 +888,14 @@ if $ARGS[0] = 'harden_hand':
 					'"Yeah, that''s right...  Just like that little guy..."'
 				end
 				booty_call['not_done'] = 0
-				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
-				booty_call['extra_cum'] += 1
+				if booty_call['force_harden'] > 0:
+					booty_call['force_harden'] = 2
+					booty_call['extra_cum'] += 1
+				end
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				gs 'booty_call_start', 'handjob_dom1'
-				gs 'booty_call_start', 'foreplay_choose'
-				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
-				else
-					gs'booty_call_sex', 'sex_start'
-				end
+				gs'booty_call_sex', 'sex_menu'
 			end
 		end
 	end
@@ -849,7 +904,7 @@ end
 if $ARGS[0] = 'harden_mouth':
 	if $booty_call['last_cum'] ! '':
 		act'Try to get him hard again (mouth)':
-			booty_call['cock_remove'] = 1
+			booty_call['cock_inserted'] = 0
 			cla & *clr
 			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
@@ -858,7 +913,7 @@ if $ARGS[0] = 'harden_mouth':
 					'"Oh no you''re not," you growl lustfully.'
 					*nl
 				end
-				if ($booty_call['last_cum'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
+				if ($booty_call['last_cum'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_inserted'] = 1:
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard again.'
 				elseif $booty_call['last_cum'] = 'condom':
 					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard agains.'
@@ -873,14 +928,14 @@ if $ARGS[0] = 'harden_mouth':
 				!! REPLACE
 				!! IMAGE HERE
 				 '<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-				!! if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
+				!! if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_inserted'] = 1:
 				if booty_call['force_harden'] > 0:
 					'"Oh no you''re not," you growl lustfully.'
 					*nl
 				end
-				if $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1:
+				if $booty_call['last_cum'] = 'creampie' and booty_call['cock_inserted'] = 1:
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.'
-				elseif $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1 and booty_call['force_harden'] > 0:
+				elseif $booty_call['last_cum'] = 'creampie' and booty_call['cock_inserted'] = 1 and booty_call['force_harden'] > 0:
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<$npc_firstname[$boy]>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..'
 				elseif $booty_call['last_cum'] = 'condom':
 					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.'
@@ -893,31 +948,34 @@ if $ARGS[0] = 'harden_mouth':
 					'"Yeah, that''s right...  Just like that little guy..." you whisper, pulling your mouth off with a pop and smiling wickedly as you continue slowly pumping him with your hand.'
 				end
 				booty_call['not_done'] = 0
-				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
-				booty_call['extra_cum'] += 1
+				if booty_call['force_harden'] > 0:
+					booty_call['force_harden'] = 2
+					booty_call['extra_cum'] += 1
+				end
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
-				gs 'booty_call_start', 'foreplay_choose'
-				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
-				else
-					gs'booty_call_sex', 'sex_start'
-				end
+				gs'booty_call_sex', 'sex_menu'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'reset':
+	booty_call['bj_cum_choice'] = 0
+	booty_call['cum_choice'] = 0
 	$booty_call['cum_choice'] = ''
-	$booty_call['last_cum'] = ''
+!!	$booty_call['last_cum'] = ''
+	if booty_call['orgasm'] < orgasm and booty_call['virgin'] = 1:
+		booty_call['virgin_enjoyment'] = 0
+		booty_call['virgin_feel_good'] = 1
+	end
 	booty_call['orgasm'] = orgasm
 	booty_call['kiss'] = 0
 	booty_call['bored'] = 0
 	booty_call['he_ask'] = 0
 	$orgasm_or = ''
-	booty_call['cock_remove'] = 0
+!!	booty_call['cock_remove'] = 0
 	booty_call['not_inside'] = 0
 	booty_call['pullout_ask'] = 0
 	booty_call['creampie_exit'] = 0
@@ -928,12 +986,13 @@ if $ARGS[0] = 'reset':
 	if booty_call['came_together'] > 0:
 		booty_call['came_together'] = 0
 		booty_call['creampie_orgasm'] = 1
-		
+		booty_call['did_we_cum_together'] = 0
 	end
 	booty_call['cum_together_fake'] = 0
 	booty_call['cum_react'] = 0
 	if booty_call['mad'] = 1:booty_call['mad'] = 2
 	booty_call['boy_cum'] = 0
+	booty_call['bj_cum'] = 0
 	booty_call['consecutive_cuni_orgasm'] = 0
 !!	booty_call['reluctant_bj'] = 0
 !!	booty_call['cum_mouth'] = 0
@@ -953,8 +1012,7 @@ if $ARGS[0] = 'reset':
 	booty_call['spit'] = 0
 	booty_call['gag'] = 0
 	booty_call['react'] = 0
-	booty_call['fuck_again'] = 0
-	booty_call['must_fuck'] = 0
+	booty_call['force_initiative'] = 0
 	booty_call['smoke_break'] = 0
 	booty_call['first_break'] = 0
 	booty_call['cycle_limit'] = 0
@@ -963,6 +1021,8 @@ if $ARGS[0] = 'reset':
 	booty_call['just_cum_inside_me'] = 0
 	booty_call['take_in_stride'] = 0
 	booty_call['sex_over'] = 0
+	if booty_call['no_condom'] = 1: booty_call['condom'] = 0
+	booty_call['good_for_you'] = 0
 end
 
 if $ARGS[0] = 'pain':
@@ -1309,9 +1369,7 @@ if $ARGS[0] = 'sleep_wtf_forgive2':
 		*nl
 		'"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.'
 		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		gs'booty_call_sex', 'sex_menu'
 	end
 	
 	act'Sure':
@@ -1320,9 +1378,7 @@ if $ARGS[0] = 'sleep_wtf_forgive2':
 		$npc_apt_bedroom[$boy]
 		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
 		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		gs'booty_call_sex', 'sex_menu'
 	end
 end
 
@@ -1356,6 +1412,7 @@ end
 if $ARGS[0] = 'wakeup_sex':
 	booty_call['sleep_fuck'] = 1
 	booty_call['wake_fuck'] = 1
+	booty_call['morning_after'] = 1
 	gs'arousal', 'vaginal', rand(5,10), 'no_orgasm_msg'
 	if npc_sex_speed <= 2:
 		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow<<rand(1,2)>>.mp4"></video></center>'
@@ -1380,11 +1437,7 @@ end
 
 if $ARGS[0] = 'wakeup_sex2':
 	cla & *clr
-	if daystage = 2:
-		'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex0.mp4"></video></center>'
-	else
-		'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 	'Your eyes flutter open and find <<$npc_firstname[$boy]>> balls deep inside you, happily fucking you first thing in the morning.'
 	gs'booty_call_sex', 'wakeup_sex_options'
 end
@@ -1403,8 +1456,7 @@ if $ARGS[0] = 'wakeup_sex_options':
 	
 	act'Moan':
 		cla & *clr
-		booty_call['wakeup_fuck'] = 1
-		$booty_call['position'] = 'miss'
+		gs'booty_call_sex', 'morning_wake_fuck_code'
 		if daystage = 2:
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
 		else
@@ -1459,6 +1511,7 @@ if $ARGS[0] = 'wakeup_sex_options':
 end
 
 if $ARGS[0] = 'morning_wake_fuck_code':
+	booty_call['start_time'] = totminut
 	booty_call['wakeup_fuck'] = 1
 	$booty_call['position'] = 'miss'
 	if daystage = 2:
@@ -1577,30 +1630,29 @@ if $ARGS[0] = 'morning_wtf_forgive2':
 	
 	act'Oh alright':
 		booty_call['morning_fuck'] = 2
+		booty_call['start_time'] = totminut
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.'
 		*nl
 		'"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.'
 		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		gs'booty_call_sex', 'sex_menu'
 	end
 	
 	act'Sure':
 		booty_call['morning_fuck'] = 2
+		booty_call['start_time'] = totminut
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
 		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		gs'booty_call_sex', 'sex_menu'
 	end
 end
 
 if $ARGS[0] = 'wakeup_sex_continue':
+	booty_call['start_time'] = totminut
 	if npc_sex_speed <= 2:
 		booty_call['speed'] = 1
 		act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss', 'miss1.2'

+ 45 - 23
locations/booty_call_shower.qsrc

@@ -94,6 +94,8 @@ end
 
 if $ARGS[0] = 'before_together1':
 	booty_call['start_shower'] = 1
+	noShampoo = 1
+	dynamic $showerdin
 	gs'arousal', 'massage',5,'no_orgasm_msg'
 	gs'stat'
 	cla & *clr
@@ -138,11 +140,15 @@ if $ARGS[0] = 'before_together2':
 				gs'arousal', 'massage',5,'no_orgasm_msg'
 				gs'stat'
 				'You turn to face <<$npc_firstname[$boy]>>.'
-				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
+				if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
 					'"You won''t come inside me, will you?" you ask.'
 					'"Don''t worry, I won''t."'
 					*nl
 					'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+				elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+					'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+					*nl
+					'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 				else
 					'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 				end
@@ -427,7 +433,7 @@ if $ARGS[0] = 'before_shower_creampie':
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
-		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2) or npc_know_not_bc[$boy] = 1) and npc_free_creampies[$boy] < 1:
+		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2)) and npc_free_creampies[$boy] < 1:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 				cla & *clr
@@ -613,7 +619,10 @@ end
 
 if $ARGS[0] = 'after_shower_together':
 	booty_call['shower'] = 1
+	noShampoo = 1
+	dynamic $showerdin
 	cla & *clr
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shower_together.jpg"></center>'
 	'The two of you step into the shower together, hot water raining down on you, letting it wash away the sweat of your recent lovemaking.'
 	act'Continue':
@@ -714,11 +723,15 @@ if $ARGS[0] = 'after_shower_together':
 						'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel warm and wet and it''s <i>not</i> just the shower.'
 !!						if stat['think_virgin'] = 0 and booty_call['virgin'] ! 1:
 						
-						if booty_call['condom'] > 0:
-							'"You won''t cum inside me, will you?" you ask.'
+						if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
+							'"You won''t come inside me, will you?" you ask.'
 							'"Don''t worry, I won''t."'
 							*nl
 							'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+						elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+							'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+							*nl
+							'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 						else
 							'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 						end
@@ -744,11 +757,15 @@ if $ARGS[0] = 'after_shower_together':
 					gs'arousal', 'massage',5,'no_orgasm_msg'
 					gs'stat'
 					'You turn to face <<$npc_firstname[$boy]>>.'
-					if booty_call['condom'] > 0:
-						'"You won''t cum inside me, will you?" you ask.'
+					if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
+						'"You won''t come inside me, will you?" you ask.'
 						'"Don''t worry, I won''t."'
 						*nl
 						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+					elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+						'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+						*nl
+						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 					else
 						'You look at him and your expression says everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 					end
@@ -971,7 +988,7 @@ if $ARGS[0] = 'after_shower_creampie':
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
-		if booty_call['condom'] > 0 or npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2 or npc_know_not_bc[$boy] = 1:
+		if ((booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1) or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2)) and booty_call['creampie_allowance'] = 0:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 				if npc_boyfriend_creampie_rule[$boy] > 0: npc_boyfriend_creampie_rule[$boy] = 0
@@ -1206,7 +1223,7 @@ if $ARGS[0] = 'morning_look1':
 		'"Thanks," you smile, casually walking past him and closing the door behind you.'
 		act'Take a shower':gt'booty_call_morning', 'shower2'
 	end
-	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'shower'
+	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'morning_shower_join1'
 end
 
 if $ARGS[0] = 'morning_shower_join1':
@@ -1283,8 +1300,7 @@ if $ARGS[0] = 'morning_together1':
 					'"Yeah, and now I''m done. Keep it in your pants."'
 					'"Fine, fine." He backs off, as you asked.'
 				end
-				act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-				act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+				gs 'booty_call_shower', 'morning_shower_together_end'
 			end
 
 			act'I don''t have time':
@@ -1299,8 +1315,7 @@ if $ARGS[0] = 'morning_together1':
 					'"Fine, fine."'
 					'He backs off as you asked.'
 				end
-				act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-				act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+				gs 'booty_call_shower', 'morning_shower_together_end'
 			end
 		end
 
@@ -1329,8 +1344,7 @@ if $ARGS[0] = 'morning_together1':
 								'"No," you say firmly. "I''m saving my virginity."'
 							end
 							'<<$npc_firstname[$boy]>> seems disappointed, but accepts anyways. He does continue to fondle your breasts until you finish up though.'
-							act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-							act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+							gs 'booty_call_shower', 'morning_shower_together_end'
 						end
 					else
 						'"Come on... We could keep going..."'
@@ -1338,8 +1352,7 @@ if $ARGS[0] = 'morning_together1':
 							cla & *nl
 							'"No thanks, I got enough earlier."'
 							'<<$npc_firstname[$boy]>> seems disappointed, but accepts anyways. He does continue to fondle your breasts until you finish up though.'
-							act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-							act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+							gs 'booty_call_shower', 'morning_shower_together_end'
 						end
 					end
 					act'Mutual masturbation':
@@ -1396,8 +1409,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
 		'He doesn''t seem put off by it at all.'
-		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+		gs 'booty_call_shower', 'morning_shower_together_end'
 	end
 	act'Jerk him off':gt'booty_call_shower', 'morning_jerkoff1'
 	
@@ -1584,11 +1596,15 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 			gs'booty_call_shower', 'morning_sex_end'
 		end
 		
-		if booty_call['condom'] > 0:
+		if booty_call['condom'] > 0 or booty_call['npc_condom_insist'] = 1:
 			act'Tease him':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
-				'"What happened to ''Don''t worry, I won''t''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				if booty_call['npc_condom_insist'] = 1:
+					'"What happened to ''Don''t worry, I won''t come inside you''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				else
+					'"What happened to ''Don''t worry, I won''t''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				end
 				'"Sorry," he blushes. "I, uhh... I overestimated myself... I guess you need another shower, huh?"'
 				gs'booty_call_shower', 'morning_sex_end'
 			end
@@ -1647,7 +1663,7 @@ if $ARGS[0] = 'morning_shower_creampie':
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
-		if booty_call['condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2) or npc_know_not_bc[$boy] = 1:
+		if npc_creampie_okay[$boy] = 0 and booty_call['creampie_allowance'] = 0 and booty_call['no_creampies_today'] ! 1 and (booty_call['condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2)):
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 				if npc_boyfriend_creampie_rule[$boy] > 0: npc_boyfriend_creampie_rule[$boy] = 0
@@ -1743,13 +1759,19 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 	gs'booty_call_shower', 'morning_sex_end'
 end
 
-if $ARGS[0] = 'morning_sex_end':
-	booty_call['npc_morning_shower'] = 2
+if $ARGS[0] = 'morning_shower_together_end':
+	noShampoo = 1
+	dynamic $showerdin
 	act'Finish up':
 		cla
 		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
 		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
 	end
+end
+
+if $ARGS[0] = 'morning_sex_end':
+	booty_call['npc_morning_shower'] = 2
+	gs 'booty_call_shower', 'morning_shower_together_end'
 	if booty_call['morning_fuck'] = 0:
 		if booty_call['morning_shower_cum'] = 1:
 			act'Round 2 in the bed?':

+ 130 - 192
locations/booty_call_start.qsrc

@@ -63,15 +63,16 @@ end
 if $ARGS[0] = 'initiate':
 	gs 'boystat', $ARGS[1]
 	
-	if booty_call_invite[$boy] = daystart and npc_last_sex[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
+	if booty_call_invite[$boy] = daystart and npc_last_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'invited_start'
-	elseif npc_start_free_time[$boy] > hour and hour < npc_end_free_time[$boy] and npc_last_sex[$boy] ! daystart  and npc_no_booty_call[$boy] ! daystart:
+	elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_booty_call[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'uninvited_start'
 	else
 		gs 'booty_call_start', 'neighborhood_image'
 		'You knock on <<$npc_firstname[$boy]>>''s door but there is no answer.'
 		act'Leave':gt $loc
 	end
+	npc_last_booty_call[$boy] = daystart
 end
 
 
@@ -94,14 +95,22 @@ if $ARGS[0] = 'uninvited_start':
 	act'I was in the neighborhood':
 		cla & *nl
 		'"Hey," you smile at <<$npc_firstname[$boy]>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"'
-		'"You couldn''t have called first?"'
-		'You shrug.'
-		'"Wanted to surprise you. So am I coming in or what?"'
+		if npc_booty_call[$boy] = daystart:
+			'"I was just about to text you," he grins.'
+			'So am I coming in or what?" you grin back.'
+		else
+			'"You couldn''t have called first?"'
+			'You shrug.'
+			'"Wanted to surprise you. So am I coming in or what?"'
+		end
+		
 		if rand(1,10) < npc_sexdrive[$boy]:
 			if npc_humor[$boy] = 2 and npc_cum_pref[$boy] = 'creampie':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in.'
 			elseif npc_humor[$boy] = 2 and npc_cum_pref[$boy] = 'mouth':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in. "In your mouth that is."'
+			elseif npc_booty_call[$boy] = daystart:
+				'"As long as those clothes are coming off in the next 10 seconds," he says, leering at your ass as he steps aside to let you in.'
 			else
 				'"Well I won''t say no to a free fuck," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 			end
@@ -113,9 +122,9 @@ if $ARGS[0] = 'uninvited_start':
 	
 	act'Surprise!':
 		cla & *nl
-		'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$boy]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
-		'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 		if rand(1,10) < npc_sexdrive[$boy]:
+			'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$boy]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
+			'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 			act'Go to the bedroom':gt 'booty_call_start', 'undress'
 		else
 			gs 'booty_call_start', 'uninvited_deny'
@@ -124,10 +133,10 @@ if $ARGS[0] = 'uninvited_start':
 	
 	act'I need a good fuck':
 		cla & *nl
-		'<<$npc_firstname[$boy]>> stands there startled as you step forward, putting your hand on his chest.'
-		'"I need a good fuck and I need it right now," you say.'
-		'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
 		if rand(1,10) < npc_sexdrive[$boy]:
+			'<<$npc_firstname[$boy]>> stands there startled as you step forward, putting your hand on his chest.'
+			'"I need a good fuck and I need it right now," you say.'
+			'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
 			act'Go to the bedroom':gt 'booty_call_start', 'undress'
 		else
 			gs 'booty_call_start', 'uninvited_deny'
@@ -414,12 +423,12 @@ end
 if $ARGS[0] = 'generous_initiative':
 	*nl
 	!! cunnilingus or nipple play
-	if rand(0,1) = 1 or npc_pussyeater[$boy] = 1:
+	if (rand(0,1) = 1 or npc_pussyeater[$boy] = 1) and booty_call['sensitive_cuni'] ! 1:
 		!! cunnilingus
 		if booty_call['start_shower'] = 1:
 			'<<$npc_firstname[$boy]>> drags you into his bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.'
 		else
-			'As soon as the last of it is gone, <<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and kneels between your legs.'
+			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 		end
 		gs 'booty_call_start', 'kuni_start'
 	else
@@ -427,7 +436,7 @@ if $ARGS[0] = 'generous_initiative':
 		if booty_call['start_shower'] = 1:
 			'<<$npc_firstname[$boy]>> drags you into his bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.'
 		else
-			'As soon as the last of it is gone, <<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.'
+			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.'
 		end
 		act'Continue':gs 'booty_call_start', 'nipple_play'
 	end
@@ -600,6 +609,7 @@ if $ARGS[0] = 'kuni_start':
 				if booty_call['cuni_orgasm'] >= 3:
 					act'Too sensitive':
 						cla & *nl
+						booty_call['sensitive_cuni'] = 1
 						'"You''ve eaten me out too many times today already," you say with a wry smile. "My pussy is too sensitive to let you down there again."'
 						'"Oh. Well..." <<$npc_firstname[$boy]>> smirks back at you smugly.'
 						gs 'booty_call_start', 'cuni_alternatives'
@@ -634,9 +644,9 @@ if $ARGS[0] = 'cuni_alternatives':
 		'"That could be nice," he smiles, leaning back.'
 		gs 'booty_call_start', 'bj_dom1'
 	end
-	if stat['think_virgin'] = 1:
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
 		act'You can take my virginity':gt'booty_call_virgin', 'start2'
-	else
+	elseif booty_call['fuck_count'] = 0:
 		act'We could just skip to fucking?':
 			cla & *nl
 			'"We could just get right to fucking?"'
@@ -645,6 +655,15 @@ if $ARGS[0] = 'cuni_alternatives':
 			gs 'booty_call_condoms', 'condoms'
 			gs 'booty_call_sex', 'position_change'
 		end
+	else
+		act'We could fuck again?':
+			cla & *nl
+			'"How about you just fuck me again?" you ask'
+			'"That sounds good."'
+			booty_call['position_choose'] = 1
+			gs 'booty_call_condoms', 'condoms'
+			gs 'booty_call_sex', 'position_change'
+		end
 	end
 end
 
@@ -777,7 +796,7 @@ if $ARGS[0] = 'pussy_lick_loop':
 	if booty_call['consecutive_cuni_orgasm'] = 0:
 		'But <<$npc_firstname[$boy]>> is relentless. Even as your climax winds down, he doesn''t stop, continuing to eat you out.'
 	end
-	if booty_call['cuni_orgasm'] < 5:
+	if booty_call['consecutive_cuni_orgasm'] < 4:
 		act'Come again':
 			cla & *clr
 			pcs_horny = 90
@@ -807,13 +826,14 @@ if $ARGS[0] = 'pussy_lick_loop':
 				cla & *clr
 				!! IMAGE HERE
 				'He tries to dive right back in but you put your hand on his head and push him away from your pussy.'
-				'"Wait, stop!" He looks up at you with curiousity.'
+				'"Wait, stop!" He looks up at you with curiosity.'
 				'"This isn''t the only thing I want to do today," you say.'
 				gs 'booty_call_sex', 'sex_start'
 			end
 		end
 	end
 	gs 'booty_call_start', 'cuni_too_sensitive'
+	gs 'booty_call_sex', 'sex_start'
 end
 
 if $ARGS[0] = 'cuni_too_sensitive':
@@ -853,13 +873,13 @@ if $ARGS[0] = 'nipple_play':
 	'<<$npc_firstname[$boy]>> leans forward, grabbing ahold of your breasts with his hands and uses his mouth on your nipples. He sucks them up, flicks at the tips with his tongue, sending electricity flying through them. Heat spreads through your hips and you can feel wetness pooling between your thighs.'
 	act'Continue':
 		cla & *nl
-		if rand(0,1) = 1 and kuni_no[$boy] ! 1 and (mesec = 0 or npc_pussyeater_know[$boy] = 1):
+		if rand(0,1) = 1 and kuni_no[$boy] ! 1 and (mesec = 0 or npc_pussyeater_know[$boy] = 1) and booty_call['sensitive_cuni'] ! 1:
 			'After a few minutes, <<$npc_firstname[$boy]>> pulls back from your chest and pushes you down, beginning to move between your legs to eat you out.'
 			gs 'booty_call_start', 'kuni_start'
 		else
 			booty_call['position_choose'] = 1
 			'After a few minutes, <<$npc_firstname[$boy]>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.'
-			if stat['think_virgin'] = 1:
+			if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
 				act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
 				act'Let him take your virginity':gs'booty_call_virgin', 'start3'
 			else
@@ -945,6 +965,7 @@ if $ARGS[0] = 'bj_sub1':
 	booty_call['bj_count'] += 1
 	gs'arousal', 'bj',rand(2,7),'no_orgasm_msg'
 	gs'stat'
+	cla & *clr
 	if booty_call['reluctant_bj'] = 1:
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj46.mp4"></video></center>'
 		'You grumble internally but get to work anyway, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he''ll want to do something else soon.'
@@ -953,24 +974,7 @@ if $ARGS[0] = 'bj_sub1':
 		'You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<$npc_firstname[$boy]>> feel good.'
 	end
 	*nl
-	booty_call['bj_cum_choice'] = rand(1,20)
-	if booty_call['bj_cum_choice'] > 12 and booty_call['not_today'] = 0:
-		gs 'booty_call_start', 'bj_sub_lets_fuck'
-	elseif booty_call['bj_cum_choice'] > 10 or booty_call['bj_warning'] = 1:
-		gs 'booty_call_start', 'bj_sub_cum_warn'
-	elseif booty_call['bj_cum_choice'] > 8:
-		gs 'booty_call_start', 'bj_sub_cum_mouth1'
-	elseif booty_call['bj_cum_choice'] > 6:
-		gs 'booty_call_start', 'bj_sub_cum_face1'
-	elseif booty_call['bj_cum_choice'] > 4:
-		gs 'booty_call_start', 'bj_sub_cum_tits1'
-	elseif booty_call['bj_cum_choice'] > 2  and booty_call['not_today'] = 0:
-		gs 'booty_call_start', 'bj_sub_cum_wait'
-	elseif booty_call['fuck_count'] > 0:
-		gs 'booty_call_start', 'bj_sub_cum_surprise'
-	else
-		gs 'booty_call_start', 'bj_sub_cum_warn'
-	end
+	gs 'booty_call_start', 'bj_cum_sort'
 end
 
 if $ARGS[0] = 'bj_sub2':
@@ -980,24 +984,7 @@ if $ARGS[0] = 'bj_sub2':
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj52.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheekly lick, but otherwise just let <<$npc_firstname[$boy]>> keep fucking your face.'
 	*nl
-	booty_call['bj_cum_choice'] = rand(1,20)
-	if booty_call['bj_cum_choice'] > 12 and booty_call['not_today'] = 0:
-		gs 'booty_call_start', 'bj_sub_lets_fuck'
-	elseif booty_call['bj_cum_choice'] > 10 or booty_call['bj_warning'] = 1:
-		gs 'booty_call_start', 'bj_sub_cum_warn'
-	elseif booty_call['bj_cum_choice'] > 8:
-		gs 'booty_call_start', 'bj_sub_cum_mouth1'
-	elseif booty_call['bj_cum_choice'] > 6:
-		gs 'booty_call_start', 'bj_sub_cum_face1'
-	elseif booty_call['bj_cum_choice'] > 4:
-		gs 'booty_call_start', 'bj_sub_cum_tits1'
-	elseif booty_call['bj_cum_choice'] > 2  and booty_call['not_today'] = 0:
-		gs 'booty_call_start', 'bj_sub_cum_wait'
-	elseif booty_call['fuck_count'] > 0:
-		gs 'booty_call_start', 'bj_sub_cum_surprise'
-	else
-		gs 'booty_call_start', 'bj_sub_cum_warn'
-	end
+	gs 'booty_call_start', 'bj_cum_sort'
 end
 
 if $ARGS[0] = 'bj_sub_cum_surprise':
@@ -1015,6 +1002,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			booty_call['bj_cum'] = 1
 			booty_call['swallow'] = 1
 			gs 'cum_call', 'mouth_swallow', $boy, 1
+			booty_call['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1028,6 +1016,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			booty_call['bj_cum'] = 2
 			booty_call['spit'] = 1
 			gs 'cum_call', 'mouth', $boy, 1
+			booty_call['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
@@ -1040,6 +1029,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			cla & *clr
 			booty_call['bj_cum'] = 4
 			booty_call['gag'] = 1
+			booty_call['cum_count'] += 1
 			gs 'cum_call', 'mouth', $boy, 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
@@ -1058,7 +1048,8 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 					'"So that means you''ll swallow it all next time, right?"'
 					act'I''ll try':
 						cla & *nl
-						'"I''ll do my best," you say.'
+						'"I''ll do my best," you say, eyes still watering.'
+						gs 'booty_call_sex', 'sex_end'
 					end
 					act'Nod':
 						cla & *nl
@@ -1086,13 +1077,15 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 end
 
 if $ARGS[0] = 'bj_sub_cum_mouth1':
+	booty_call['he_ask_mouth'] = 1
+	$booty_call['cum_choice'] = 'mouth'
 	'Within a few minutes, <<$npc_firstname[$boy]>> taps you on the head."'
 	'"I''m gonna- <i>nngh-!</i> Can I cum in your mouth?"'
 	act'Why?':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 		'You let his cock pop out of your mouth for a moment, giving him a quizzical look.'
-		'"And, why would I let you do that?" you ask, continuing to play with his cock with a smattering of kisses, licks, and gentle sucks.'
+		'"And, why would I let you do that?" you ask, continuing to keeping him on the edge with a smattering of kisses, licks, and gentle sucks.'
 		if npc_selfish[$boy] = 1:
 			'"Because I want you to," he responds simply, like that''s the only reason you should ever need.'
 			act'No thanks':
@@ -1115,7 +1108,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth1':
 				gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 				gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 			end
-
+			
 		else
 			if rand(0,1) = 1:
 				'"Oh. Well I just... I thought... uhh... Sorry. It''s a dumb idea isn''t it?"'
@@ -1126,8 +1119,8 @@ if $ARGS[0] = 'bj_sub_cum_mouth1':
 
 		act'Couldn''t hurt':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
-			'"Well, it couldn''t hurt I suppose..." you smile, lowering your lips back down to his cock and giving a mighty suck. He blows his load moments later.'
+			'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep1.mp4"></video></center>'
+			'"Well, it couldn''t hurt I suppose..." you smile and plunge your lips all the way down to the base of <<$npc_firstname[$boy]>>''s shaft. He blows his load moments later.'
 			gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 			gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 		end
@@ -1135,13 +1128,13 @@ if $ARGS[0] = 'bj_sub_cum_mouth1':
 		act'Just wondered (let him)':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep1.mp4"></video></center>'
-			'"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of his cock. Not even a second later, you feel him explode inside your mouth.'
+			'"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of <<$npc_firstname[$boy]>>''s cock. A moment later, he exploded inside your mouth.'
 			gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 			gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 		end
 
 		gs 'booty_call_start', 'bj_sub_cum_face3'
-		act'How about my tits intstead?':
+		act'How about my tits instead?':
 			cla & *nl
 			'"How about I let you cum on my tits instead?" you smile enticingly.'
 			'"That sounds like it it would be pretty hot," he says and you scooch forward, presenting your chest for him.'
@@ -1183,16 +1176,17 @@ if $ARGS[0] = 'bj_sub_cum_mouth2':
 	act'Make him come in your mouth':
 		booty_call['cum_mouth'] = 1
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		$booty_call['cum_choice'] = 'swallow'
 		$booty_call['last_cum'] = 'mouth'
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep1.mp4"></video></center>'
-		'With a mischievous grin, you work his cock with your hand, building up his climax right to the brink. You can tell just by the expression on his face and the swelling of flesh in your hand that he''s about to blow. At that moment, you plunge your lips straight down to the base of his cock, right as he explodes inside your mouth.'
+		'With a mischievous grin, you work his cock with your hand, building up his climax right to the edge. You can tell just by the expression on his face and the swelling of flesh in your hand that he''s about to blow. At that moment, you plunge your lips straight down to the base of his cock, right as he explodes inside your mouth.'
 		gs 'booty_call_reactions', 'bj_warning_thanks'
 		gs 'booty_call_reactions', 'bj_tasty'
-		gs 'booty_call_start', 'bj_swallow_gross'
+		gs 'booty_call_reactions', 'bj_swallow_gross'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 !!		gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 !!		gs 'booty_call_start', 'bj_sub_cum_mouth_yuck1'
@@ -1204,7 +1198,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 		booty_call['cum_mouth'] = 1
 		booty_call['spit'] = 1
 		booty_call['swallow'] = 0
-		$booty_call['cum_choice'] = 'mouth'
+		booty_call['cum_count'] += 1
 		$booty_call['last_cum'] = 'mouth'
 		gs 'cum_call', 'mouth', $boy, 1
 		gs 'stat'
@@ -1218,6 +1212,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 		if booty_call['cum_mouth_surprise'] = 1:
 			gs 'booty_call_reactions', 'bj_already'
 		end
+		gs 'booty_call_reactions', 'bj_spit_gross'
 	end
 end
 
@@ -1225,6 +1220,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_gag':
 	act'Let him (and gag)':
 		booty_call['cum_mouth'] = 1
 		booty_call['gag'] = 1
+		booty_call['cum_count'] += 1
 		$booty_call['cum_choice'] = 'mouth'
 		$booty_call['last_cum'] = 'mouth'
 		gs 'cum_call', 'mouth', $boy, 1
@@ -1243,6 +1239,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'mouth'
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1258,6 +1255,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		$booty_call['last_cum'] = 'mouth'
 		booty_call['swallow'] = 1
 		booty_call['react'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1265,48 +1263,22 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		'Thick, salty sperm sprays into your mouth and you can''t help but feel just a little bit nauseous even as you continue to suck out more cum from <<$npc_firstname[$boy]>>''s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.'
 		*nl
 		if booty_call['cum_swallow'] > 1:
-			'"Yeech!" you wince. "I''m never going to get used to that!"'
+			'"<i>Yeech</i>!" you wince. "I''m never going to get used to that!"'
 			'"But you still keep doing it anyway," <<$npc_firstname[$boy]>> smirks.'
 			'"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.'
 			gs 'booty_call_sex', 'sex_end'
 		else
-			'"Blech!" you shudder. "That''s awful!"'
-			if booty_call['bj_cum_choice'] > 6 and booty_call['bj_cum_choice'] <= 8:
+			'"<i>Blech</i>!" you shudder. "That''s awful!"'
+			if $booty_call['cum_choice'] = 'face':
 				'"If you hate swallowing so much, then why didn''t you just let me cum on your face like I wanted to?" <<$npc_firstname[$boy]>> asks quizzically.'
 				gs 'booty_call_reactions', 'cum_mouth_swallow_why'
-			elseif booty_call['bj_cum_choice'] > 4 and booty_call['bj_cum_choice'] <= 8:
+			elseif $booty_call['cum_choice'] = 'tits':
 				'"If you hate swallowing so much, then why didn''t you just let me cum on your tits?" <<$npc_firstname[$boy]>> asks quizzically.'
 				gs 'booty_call_reactions', 'cum_mouth_swallow_why'
 			else
 				'"Then why''d you do it?" <<$npc_firstname[$boy]>> asks, a dumbfounded look on his face.'
 				gs 'booty_call_reactions', 'cum_mouth_swallow_why'
-
-				act'Cause boys like it':
-					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Cause boys seem to like it," you wince, airing out your tongue, trying to dissipate the taste. "I don''t want to be a shitty lay. Sometimes that means doing stuff you don''t like."'
-					'"Well it <i>was</i> pretty hot," <<$npc_firstname[$boy]>> grins at you.'
-					'"Why?!" you ask. "Why do you idiots with dicks want girls to swallow this vile stuff?"'
-					'He chuckles at you while you continue to gag for a little while longer, trying to get past your disgust.'
-					gs 'booty_call_sex', 'sex_end'
-				end
-				if booty_call['bj_cum_choice'] > 8:
-					act'Cause I like you':
-						cla & *clr
-						$npc_apt_bedroom[$boy]
-						'"Because I like you," you say, a look of betrayal on your face. "And I wanted to do something nice for you. I''m severely regretting it now. I don''t want to like you anymore, this was a mistake."'
-						'<<$npc_firstname[$boy]>> laughs wholeheartedly as you fan your mouth, hoping it will somehow make the taste go away.'
-						gs 'booty_call_sex', 'sex_end'
-					end
-
-					act'Because you asked':
-						cla & *clr
-						$npc_apt_bedroom[$boy]
-						'"Because you asked me to," you say, giving him an accusatory look. "That makes this your fault. <i>Bleeechhh...</i>"'
-						'<<$npc_firstname[$boy]>> laughs wholeheartedly as you fan your mouth, hoping it will somehow make the taste go away.'
-						gs 'booty_call_sex', 'sex_end'
-					end
-				end
+				gs 'booty_call_reactions', 'bj_swallow_gross2'
 			end
 		end
 	end
@@ -1314,6 +1286,8 @@ end
 
 if $ARGS[0] = 'bj_sub_cum_face1':
 	!! asks to come on face
+	booty_call['he_ask_facial'] = 1
+	$booty_call['cum_choice'] = 'face'
 	'Within a few minutes, <<$npc_firstname[$boy]>> taps you on the head."'
 	'"<i>nngh-!</i> <<$pcs_nickname>>-! Can I come on your face? You''d look so hot."'
 	act'No way':
@@ -1326,7 +1300,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 
 		act'How about my mouth instead?':
 			cla & *nl
-			'"How about my mouth instead?" you smile. "Don''t you want to just pump it straight down my throat instead?"'
+			'"How about my mouth?" you smile. "Don''t you want to just pump it straight down my throat instead?"'
 			'<<$npc_firstname[$boy]>>''s face turns to a hungry expression. "Well, when you put it like that..."'
 			gs 'booty_call_start', 'bj_sub_cum_mouth2'
 		end
@@ -1335,6 +1309,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 	act'Let him (gross)':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'facial'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1345,13 +1320,14 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		'"Ugh! That''s fucking disgusting!" you whine. "I can''t believe I let you talk me into this."'
 		'"You look great though." You can''t see him with the cum gluing your eyelids shut, but you''re pretty sure he''s wearing a grin you would slap him for.'
 		!! add reactions later?
-		gs 'booty_call_after', 'wipe_face'
 		gs 'booty_call_sex', 'sex_end'
+		gs 'booty_call_after', 'wipe_face'
 	end
 
 	act'Let him (passive)':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'facial'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1363,8 +1339,8 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		'"Happy?" you ask.'
 		'"You have no idea how fucking hot you look right now."'
 		!! add reactions later?
-		gs 'booty_call_after', 'wipe_face'
 		gs 'booty_call_sex', 'sex_end'
+		gs 'booty_call_after', 'wipe_face'
 	end
 
 	act'Stick our your tongue (swallow)':
@@ -1372,6 +1348,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'face_mouth'
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
@@ -1389,8 +1366,8 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 			'Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<$npc_firstname[$boy]>> with cum glazed cheeks and smile at him.'
 			'"You''re so fucking hot."'
 			'"Yeah, I know," you grin back.'
-			gs 'booty_call_after', 'wipe_face'
 			gs 'booty_call_sex', 'sex_end'
+			gs 'booty_call_after', 'wipe_face'
 		end
 	end
 
@@ -1398,6 +1375,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'face_mouth'
 		booty_call['spit'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'cum_call', 'hair', $boy, 1
 		gs 'cum_call', 'mouth', $boy, 1
@@ -1411,8 +1389,8 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		'"Happy?" you ask.'
 		'"You have no idea how fucking hot you look right now."'
 		!! add reactions later?
-		gs 'booty_call_after', 'wipe_face'
 		gs 'booty_call_sex', 'sex_end'
+		gs 'booty_call_after', 'wipe_face'
 	end
 end
 
@@ -1423,76 +1401,31 @@ end
 
 if $ARGS[0] = 'bj_sub_cum_face3':
 	!! player choosing to do it
-	act'How about my face instead?':
-		booty_call['cum_count'] += 1
+	if booty_call['he_ask_mouth'] = 1:
+		$booty_call['act_desc'] = 'How about my face instead?'
+		$booty_call['cum_desc'] = 'How about you just come on my face instead?'
+	else
+		$booty_call['act_desc'] = 'Wanna come on my face?'
+		$booty_call['cum_desc'] = 'Wanna come on my face?'
+	end
+	act'<<$booty_call[''act_desc'']>>':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
-		
-		'"How about you just cum on my face instead?" you ask pulling back. '
-		'In response, <<$npc_firstname[$boy]>> scooches forwards and grabs hold of his member, pointing at your face. You''ll take that as a yes.'
-		act'Close your eyes':
-			booty_call['cum_face'] = 1
-			$booty_call['last_cum'] = 'facial'
-			gs 'cum_call', 'face', $boy, 1
-			gs 'stat'
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
-			'You let him position himself over you and close your eyes. Moments later warm fluid spatters across your face and within seconds, your face is covered in <<$npc_firstname[$boy]>>''s cum. After a little bit to make sure <<$npc_firstname[$boy]>>''s finished, you crack an eye and look up at him.'
-			*nl
-			'"How do I look?" you grin.'
-			'"Fucking hot."'
-			'"I thought so." You give him a wink.'
-			!! add reactions later?
-			gs 'booty_call_after', 'wipe_face'
-			gs 'booty_call_sex', 'sex_end'
-		end
-
-		act'Stick our your tongue (swallow)':
-			booty_call['cum_face'] = 1
-			booty_call['cum_swallow'] += 1
-			$booty_call['last_cum'] = 'face_mouth'
-			gs 'cum_call', 'face', $boy, 1
-			gs 'cum_call', 'mouth_swallow', $boy, 1
-			gs 'stat'
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial25.mp4"></video></center>'
-			'As <<$npc_firstname[$boy]>> works his cock in front of you, you kneel before him, opening your mouth and sticking out your tongue.'
-			*nl
-			'"Ahhhhh~!"'
-			*nl
-			'The first shot goes directly into your mouth and the next spatters across your cheek. <<$npc_firstname[$boy]>> aims carefully, trying to get just as much cum on your face as he can in your mouth, but soon he runs out of steam, shaking the last drips of his load onto the tip of your tongue.'
-			act'Gulp':
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial26.mp4"></video></center>'
-				'Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<$npc_firstname[$boy]>> with cum glazed cheeks and smile at him.'
-				gs 'booty_call_after', 'wipe_face'
-				gs 'booty_call_sex', 'sex_end'
-				gs 'booty_call_reactions', 'swallow_react1'
-
-			end
-		end
-
-		act'Stick our your tongue (spit)':
-			booty_call['cum_face'] = 1
-			$booty_call['last_cum'] = 'face_mouth'
-			gs 'cum_call', 'face', $boy, 1
-			gs 'cum_call', 'hair', $boy, 1
-			gs 'cum_call', 'mouth', $boy, 1
-			gs 'stat'
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial29.mp4"></video></center>'
-			'As <<$npc_firstname[$boy]>> works his cock in front of you, you kneel before him, opening your mouth and sticking out your tongue. In return, he grabs you by the hair with one hand and works his cock right in front of your face with the other.'
-			*nl
-			'The first shot sprays directly across your face, spattering across your cheeks and even in your hair. A little falls inside your mouth and you spit it out as it comes, as <<$npc_firstname[$boy]>> finishes finishing himself over your face. When the cum stops flying, you crack an eye and look up at him.'
-			!! add reactions later?
-			gs 'booty_call_after', 'wipe_face'
-			gs 'booty_call_sex', 'sex_end'
-		end
+		'You pull your lips back from his cock with a pop.'
+		'"<<$booty_call[''cum_desc'']>>" you ask.'
+		'<<$npc_firstname[$boy]>> sits up, working his shaft with his hand as he points it at your face. That seems like a "yes" to you.'
+		gs'booty_call_cum', 'facial_close_eyes'
+		gs'booty_call_cum', 'facial_tongue_swallow'
+		gs'booty_call_cum', 'facial_tongue_spit'
+		gs'booty_call_cum', 'facial_brace'
+		act'Jerk him yourself':gt'booty_call_cum', 'facial_jerk_him'
 	end
 end
 
 
 if $ARGS[0] = 'bj_sub_cum_tits1':
+	booty_call['he_ask_tits'] = 1
+	$booty_call['cum_choice'] = 'tits'
 	'Within a few minutes, <<$npc_firstname[$boy]>> taps you on the head."'
 	'"I''m gonna- <i>nngh-!</i> You''d look super hot with my cum on your tits. Can I?"'
 	act'No way':
@@ -1505,6 +1438,7 @@ if $ARGS[0] = 'bj_sub_cum_tits1':
 
 	act'Jerk him over your tits':
 		booty_call['cum_tits'] = 1
+		booty_call['cum_count'] += 1
 		$booty_call['last_cum'] = 'tits'
 		gs 'cum_call', 'breasts', $boy, 1
 		gs 'stat'
@@ -1512,24 +1446,10 @@ if $ARGS[0] = 'bj_sub_cum_tits1':
 		'<center><video autoplay loop src="images/shared/sex/cum/chest/jerk1.mp4"></video></center>'
 		'You don''t say a word, removing your mouth and start working his shaft with your hand instead. Within moments, his cock erupts and warm cum sprays across your chest, leaving long strands dripping down your breasts.'
 		!! reactions?
-		gs 'booty_call_after', 'wipe_tits'
 		gs 'booty_call_sex', 'sex_end'
+		gs 'booty_call_after', 'wipe_tits'
 	end
-	if tits > 1:
-		act'Finish him with your tits':
-			booty_call['cum_tits'] = 1
-			$booty_call['last_cum'] = 'tits'
-			gs 'cum_call', 'breasts', $boy, 1
-			gs 'cum_call', 'hands', $boy, 1
-			gs 'stat'
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/cum/chest/tits1.mp4"></video></center>'
-			'"I''ve got an even better idea," you grin, leaning forward and smushing your breasts together around his cock. You squeeze them together with your hands and start working his shaft. Within seconds, cum erupts from the tip of his cock, smearing it all across your still moving tits and sending it dripping down your hands.'
-			!! reactions?
-			gs 'booty_call_after', 'wipe_tits'
-			gs 'booty_call_sex', 'sex_end'
-		end
-	end
+	gs 'booty_call_cum', 'cum_tits4'
 end
 
 if $ARGS[0] = 'bj_sub_cum_tits2':
@@ -1537,32 +1457,36 @@ if $ARGS[0] = 'bj_sub_cum_tits2':
 	act'Jerk him over your tits':
 		booty_call['cum_tits'] = 1
 		$booty_call['last_cum'] = 'tits'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'breasts', $boy, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/chest/jerk1.mp4"></video></center>'
-		'"How about my tits instead?"'
+		if booty_call['he_ask_tits'] = 1:'"How about my tits instead?"'
 		'With a dirty grin, you kneel beneath him grab hold of his cock and jerking it until he comes with a groan. Cum coats your tits in thick strands, warm against your skin.'
 		!! reactions?
-		gs 'booty_call_after', 'wipe_tits'
 		gs 'booty_call_sex', 'sex_end'
+!!		gs 'booty_call_after', 'wipe_tits'
 	end
 	if tits > 1:
 		act'Finish him with your tits':
 			booty_call['cum_tits'] = 1
+			booty_call['cum_count'] += 1
 			$booty_call['last_cum'] = 'tits'
 			gs 'cum_call', 'breasts', $boy, 1
 			gs 'cum_call', 'hands', $boy, 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/chest/tits1.mp4"></video></center>'
-			'"How about my tits instead?"'
+			if booty_call['he_ask_tits'] = 1:'"How about my tits instead?"'
 			'With a dirty grin, you kneel beneath him and smush his cock between your breasts. You squeeze them together as tightly as possible and work his shaft until a few moment later, he comes, spraying cum all over your tits and hands.'
 			!! reactions?
-			gs 'booty_call_after', 'wipe_tits'
 			gs 'booty_call_sex', 'sex_end'
+!!			gs 'booty_call_after', 'wipe_tits'
 		end
 	end
+	
+	gs 'booty_call_cum', 'cum_tits4'
 end
 
 if $ARGS[0] = 'bj_sub_cum_hand':
@@ -1574,9 +1498,13 @@ if $ARGS[0] = 'bj_sub_cum_hand':
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,1.mp4"></video></center>'
-		'Removing his cock from your mouth, you instead kneel in front of him and work his cock with your hand until moments later, cum erupts from the tip, spraying into the air and dribbling back down his shaft and through your fingers.'
-		gs 'booty_call_after', 'wipe_hands'
+		if booty_call['bj_cum'] ! 3:
+			'Removing his cock from your mouth, you instead kneel in front of him and work his cock with your hand. Moments later cum erupts from the tip, spraying into the air and dribbling back down his shaft and through your fingers.'
+		else
+			'Removing his cock from your mouth, you kneel in front of him and work his cock with your hand until cum erupts from the tip, spraying into the air and dribbling back down his shaft and through your fingers.'
+		end
 		gs 'booty_call_sex', 'sex_end'
+		gs 'booty_call_after', 'wipe_hands'
 	end
 end
 
@@ -1584,7 +1512,6 @@ end
 if $ARGS[0] = 'bj_force_cum_mouth':
 	booty_call['cum_mouth'] = 1
 	booty_call['cum_mouth_force'] = 1
-	booty_call['cum_count'] += 1
 	$booty_call['last_cum'] = 'mouth'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1598,6 +1525,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	end
 	act'Gag':
 		gs 'cum_call', 'mouth', $boy, 1
+		booty_call['cum_count'] += 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
@@ -1610,6 +1538,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	act'Swallow!':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'swallow'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1625,6 +1554,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	act'Swallow (take it in stride)':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'swallow'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1802,6 +1732,7 @@ end
 
 if $ARGS[0] = 'bj_sub_cum_warn':
 	booty_call['bj_cum'] = 3
+	booty_call['cum_warn'] = 1
 	'After a couple minutes, he taps you on the head.'
 	'"I''m-! Almost there-!" he groans loudly.'
 	gs 'booty_call_start', 'bj_sub_cum_hand'
@@ -1815,7 +1746,7 @@ if $ARGS[0] = 'bj_sub_cum_warn':
 			booty_call['position_choose'] = 1
 			'You pull your mouth off his cock with a pop, giving him a lusty stare.'
 			if booty_call['fuck_count'] > 0:
-				'"Not yet big boy," you grin, jerking him gently. "I want you to fuck me again."'
+				'"Not yet big boy," you grin, jerking him gently. "I want to fuck again."'
 			else
 				'"Not yet big boy," you grin, jerking him gently. "I want you inside me first."'
 			end
@@ -1914,8 +1845,14 @@ if $ARGS[0] = 'bj_resume':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
 	'You go back to blowing <<$npc_firstname[$boy]>>, humming to yourself as you relax while bobbing your head up and down the length of his cock.'
+	
+end
+
+if $ARGS[0] = 'bj_cum_sort':
 	booty_call['bj_cum_choice'] = rand(1,20)
-	if booty_call['bj_cum_choice'] > 10 or booty_call['bj_warning'] = 1:
+	if booty_call['bj_cum_choice'] > 12 and booty_call['not_today'] = 0:
+		gs 'booty_call_start', 'bj_sub_lets_fuck'
+	elseif booty_call['bj_cum_choice'] > 10 or booty_call['bj_warning'] = 1:
 		gs 'booty_call_start', 'bj_sub_cum_warn'
 	elseif booty_call['bj_cum_choice'] > 8:
 		gs 'booty_call_start', 'bj_sub_cum_mouth1'
@@ -1961,6 +1898,7 @@ end
 
 
 if $ARGS[0] = 'foreplay_choose':
+	booty_call['fucking'] = 0
 	if $booty_call['position'] ! 'makeout':gs 'booty_call_start', 'makeout_dom1'
 
 	if $booty_call['position'] ! 'handjob' and $booty_call['position'] ! 'makeout':gs 'booty_call_start', 'handjob_dom1'
@@ -1975,7 +1913,7 @@ if $ARGS[0] = 'foreplay_choose':
 
 	act'Let him lead':
 		cla & *nl
-		if npc_caretaker[$boy] = 1 or npc_pussyeater[$boy] = 1:
+		if ((npc_caretaker[$boy] = 1 and booty_call['orgasm_count'] = 0) or npc_pussyeater[$boy] = 1) and rand(1,2) = 1:
 			gs 'booty_call_start', 'generous_initiative'
 		elseif npc_selfish[$boy] = 1:
 			gs 'booty_call_start', 'selfish_initiative'
@@ -2104,7 +2042,7 @@ if $ARGS[0] = 'hj_cum1':
 	if $booty_call['position'] = 'handjob':
 		'You feel him tense under your touch and he tries to speak.'
 		'"Hang on, wai-"'
-		'But before he can finish his sentence, you finish him instead. Thick cum erupts from his cock, wads of it flying through the air, streams of it running down your fingers. A dirty grin is plastered across your face as you continue working his cock with your hand, milking him for every drop.'
+		'But before he can finish his sentence, you squeeze harder and speed up. Thick cum erupts from his cock, wads of it flying through the air, streams of it running down your fingers. A dirty grin is plastered across your face as you continue working his cock with your hand, milking him for every drop.'
 	elseif $booty_call['position'] = 'blowjob':
 		'<<$npc_firstname[$boy]>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, mixing with your saliva, making his shaft even more slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.'
 	else
@@ -2288,7 +2226,6 @@ end
 
 if $ARGS[0] = 'bj_dom_swallow1':
 !!	booty_call['cum_mouth_ask'] += 1
-	booty_call['cum_count'] += 1
 	booty_call['swallow'] = 1
 	$booty_call['cum_choice'] = 'mouth'
 	cla & *clr
@@ -2297,6 +2234,7 @@ if $ARGS[0] = 'bj_dom_swallow1':
 	gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 	act'Gulp':
 		gs'cum_call', 'mouth_swallow',$boy,1
+		booty_call['cum_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep2.mp4"></video></center>'
 		'Carefully, very carefully, you slowly draw your lips back up <<$npc_firstname[$boy]>>''s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It''s really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.'

+ 8 - 0
locations/booty_call_stats.qsrc

@@ -10,6 +10,8 @@ if $ARGS[0] = 'starting_stats':
 	lastwornpantynumber['booty_call'] = pantywornnumber
 	$lastwornbratype['booty_call'] = $braworntype
 	lastwornbranumber['booty_call'] = brawornnumber
+	$lastwornclothingtype['booty_call'] = $clothingworntype
+	lastwornclothingnumber['booty_call'] = clothingwornnumber
 	booty_call['starting_makeup'] = pcs_makeup
 	booty_call['cum_vagina'] = cum_loc['vagina']
 	booty_call['cum_labia'] = cum_loc['labia']
@@ -88,6 +90,12 @@ if $ARGS[0] = 'save':
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += booty_call['mouth_cum']
 	
+	!! number of times you have denied letting your fuckbuddy take your virginity
+	npc_virgin_deny[$boy] += booty_call['virgin_deny']
+	
+	!! if your fuckbuddy takes your virginity without consent
+	npc_virgin_rapist[$boy] += booty_call['virgin_rape']
+	
 	if booty_call['sleep_fuck'] > 0: npc_sleep_fuck += 1
 end
 

+ 78 - 9
locations/booty_call_talk.qsrc

@@ -5,17 +5,27 @@
 
 if $ARGS[0] = 'boy_accidental_creampie':
 	booty_call['accidental_creampie_convo'] = 1
-	if $booty_call['convo'] ! 'used_all_condoms': 
+!!{	if $booty_call['convo'] = 'used_all_condoms': 
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-	end
-	if cum_loc['vagina'] > 0:
-		'"Speaking of which..." <<$npc_firstname[$boy]>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"'
+	end}
+	cla & *nl
+	
+	if npc_childfree[$boy] = 1 and WIP_enabled = 1:
+		if cum_loc['vagina'] > 0:
+			'"Speaking of which..." <<$npc_firstname[$boy]>> says, looking intently at the cum slowly draining from your pussy. "You''re going to get a morning after pill, right?"'
+		else
+			'"Speaking of which..." <<$npc_firstname[$boy]>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You''re going to get a morning after pill, right?"'
+		end
+		gs'booty_call_talk', 'childfree_accidental_creampie1'
 	else
-		'"Speaking of which..." <<$npc_firstname[$boy]>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"'
+		if cum_loc['vagina'] > 0:
+			'"Speaking of which..." <<$npc_firstname[$boy]>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"'
+		else
+			'"Speaking of which..." <<$npc_firstname[$boy]>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"'
+		end
+		gs'booty_call_talk', 'boy_accidental_creampie2'
 	end
-	
-	gs'booty_call_talk', 'boy_accidental_creampie2'
 end
 
 if $ARGS[0] = 'boy_accidental_creampie2':
@@ -103,6 +113,65 @@ if $ARGS[0] = 'boy_accidental_creampie2':
 	end
 end
 
+if $ARGS[0] = 'childfree_accidental_creampie1':
+	if birth_control['think_safe'] = 1:
+		gs'booty_call_pillow_talk', 'on_birth_control'
+	else
+		if stat['safe_day'] = 1:
+			act'It''s a safe day':
+				cla & *nl
+				if $booty_call['convo'] = 'used_all_condoms':
+					'"It''s a safe day," you nod. "I should be okay. This time anyways," you smile teasingly.'
+				else
+					'"It''s a safe day, so I should be okay," you smile teasingly.'
+				end
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		elseif stat['probably_safe_day'] = 1:
+			act'I think so':
+				cla & *nl
+				if $booty_call['convo'] = 'used_all_condoms':
+					'"I think so," you say. "It <i>should</i> be a safe day for me as long as I''m keeping track of my cycle correctly..."'
+				else
+					'"I think so," you say. "It <i>should</i> be a safe day for me as long as I''m keeping track of my cycle correctly..."'
+				end
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		else
+			act'Roll the dice?':
+				cla & *nl
+				'"I''m not sure... Maybe we can just roll the dice?" you say with a hesitant smile.'
+				if npc_childfree[$boy] = 1 or npc_caretaker[$boy] = 1:
+					gs'booty_call_talk', 'morning_after_money'
+				else
+					gs'booty_call_pillow_talk', 'topics'
+				end
+			end
+			
+			act'Need plan B':
+				cla & *nl
+				'"Not really," you grimace. "I''m definitely going to need some plan B tomorrow."'
+				if npc_childfree[$boy] = 1 or npc_caretaker[$boy] = 1:
+					gs'booty_call_talk', 'morning_after_money'
+				else
+					gs'booty_call_pillow_talk', 'topics'
+				end
+			end
+			
+			act'Need plan B (safety)':
+				cla & *nl
+				'"I''ll get some plan B tomorrow just to be safe," you say.'
+				if npc_childfree[$boy] = 1 or npc_caretaker[$boy] = 1:
+					gs'booty_call_talk', 'morning_after_money'
+				else
+					gs'booty_call_pillow_talk', 'topics'
+				end
+			end
+		end
+		gs'booty_call_talk', 'pc_have_morning_after'
+	end
+end
+
 if $ARGS[0] = 'morning_after_money':
 	'<<$npc_firstname[$boy]>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.'
 	'"Here," he says, offering the cash to you. "Get a morning after pill tomorrow.'
@@ -266,7 +335,7 @@ if $ARGS[0] = 'free_creampies':
 				end
 			end
 		end
-	elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and birth_control['think_safe'] = 0:
+!!{	elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and birth_control['think_safe'] = 0:
 		if stat['safe_day'] = 1:
 			act'It''s a safe day':
 				booty_call['safe_day'] = 1
@@ -305,7 +374,7 @@ if $ARGS[0] = 'free_creampies':
 					gs'booty_call_sex', 'sex_end'
 				end
 			end
-		end
+		end}
 	end
 end
 

+ 162 - 232
locations/booty_call_virgin.qsrc

@@ -2,12 +2,11 @@
 
 if $ARGS[0] = 'start1':
 	!! player initiated
-	cla & *nl
+	cla & *clr
 	booty_call['virgin'] = 1
-	booty_call['fuck_count'] += 1
 	$npc_apt_bedroom[$boy]
 	'With a fast beating heart, you turn to look at <<$npc_firstname[$boy]>>.'
-	'<<$npc_firstname[$boy]>>... I want you to take my virginity."'
+	'"<<$npc_firstname[$boy]>>... I want you to take my virginity."'
 	gs'booty_call_virgin', 'start_flavor'
 	gs'booty_call_virgin', 'start_options'
 end
@@ -16,7 +15,6 @@ if $ARGS[0] = 'start2':
 	!! player initiated, alternative suggestion variant
 	cla & *clr
 	booty_call['virgin'] = 1
-	booty_call['fuck_count'] += 1
 	$npc_apt_bedroom[$boy]
 	'"Well..." You bite your lip, heart pounding inside your chest, mulling over what you''re about to say. "What if... I let you fuck me?"'
 	gs'booty_call_virgin', 'start_flavor'
@@ -27,9 +25,8 @@ if $ARGS[0] = 'start3':
 	!! NPC initiated, player doesn''t stop them
 	cla & *nl
 	booty_call['virgin'] = 1
-	booty_call['fuck_count'] += 1
 	'Your breath catches in your throat as <<$npc_firstname[$boy]>> moves closer and closer. Your pussy feels like it''s on fire. You want it so badly that it <i>hurts</i>.'
-	'"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have it. You can fuck me."'
+	'"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have it. Take my virginity."'
 	gs'booty_call_virgin', 'start_flavor'
 	gs'booty_call_virgin', 'start_options'
 end
@@ -37,7 +34,6 @@ end
 if $ARGS[0] = 'start4':
 	!! NPC initiated, they know that player wants to save it before attempting, player doesn''t stop them
 	booty_call['virgin'] = 1
-	booty_call['fuck_count'] += 1
 	cla & *clr
 	pcs_horny += 20
 	$npc_apt_bedroom[$boy]
@@ -50,7 +46,6 @@ end
 if $ARGS[0] = 'start5':
 	!! player initiated, player just wants to fuck
 	booty_call['virgin'] = 1
-	booty_call['fuck_count'] += 1
 	cla & *clr
 	$npc_apt_bedroom[$boy]
 	'"Enough of the foreplay," you say with a lusty growl. "It''s time to fuck."'
@@ -100,8 +95,9 @@ if $ARGS[0] = 'start_flavor':
 end
 
 if $ARGS[0] = 'start_options':
-	if booty_call['condom'] = 0 and booty_call['no_condom'] = 0:
-		gs 'booty_call_condoms', 'condoms'
+	booty_call['orgasm_count'] = orgasm
+	if booty_call['condom'] = 0 and booty_call['no_condom'] = 0 and booty_call['condom_setup'] ! 1:
+		act'Continue':cla & gs 'booty_call_condoms', 'condoms'
 	else
 		act'Let him take the lead':gt'booty_call_virgin', 'his_choice'
 
@@ -113,10 +109,67 @@ if $ARGS[0] = 'start_options':
 	end
 end
 
+if $ARGS[0] = 'start_with_condom':
+	gs 'booty_call_condoms', 'npc_condom_use_stats'
+	if npc_caregiver[$boy] = 1 or npc_generous[$boy] = 1 or (rand(1,2) = 1 and npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1):
+		'With the condom securely wrapped around <<$npc_firstname[$boy]>>''s cock, he moves back in between your legs before he stops, hesitating.'
+		gs 'booty_call_virgin', 'start_options2'
+	else
+		'With the condom securely wrapped around <<$npc_firstname[$boy]>>''s cock, he moves back in between your legs. Moments later, he takes your virginity.'
+		gs'booty_call_virgin', 'miss_virg_start'
+	end
+end
+
+if $ARGS[0] = 'start_without_condom':
+	if npc_caregiver[$boy] = 1 or npc_generous[$boy] = 1 or (rand(1,3) = 1 and npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1):
+		'<<$npc_firstname[$boy]>> moves back in between your legs before he stops, hesitating.'
+		gs 'booty_call_virgin', 'start_options2'
+	else
+		'<<$npc_firstname[$boy]>> moves back in, lining his naked cock up with your pussy. Moments later, he takes your virginity.'
+		gs'booty_call_virgin', 'miss_virg_start'
+	end
+end
+
+if $ARGS[0] = 'start_options2':
+	booty_call['orgasm_count'] = orgasm
+	'"Did you want to decide how we do this?" he asks. "It''s <i>your</i> first time after all."'
+	act'Let him take the lead':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'You shake your head.'
+		*nl
+		'"You pick. I trust your experience," you smile.'
+		act'Continue':gt'booty_call_virgin', 'his_choice'
+	end
+	
+	act'Spread your legs':gt'booty_call_virgin', 'miss_virg_norm1'
+
+	act'Get on all fours':gt'booty_call_virgin', 'doggy_virg_norm1'
+
+	act'Climb on top':gt'booty_call_virgin', 'cowgirl_virg_norm1'
+end
+
 if $ARGS[0] = 'wait':
 	cla & *clr
-	$npc_apt_bedroom[$boy]
-	if rand(1,10) > npc_sexdrive[$boy]:
+	if WIP_enabled > 0 and rand(1,10) < npc_sexdrive[$boy] and npc_abusive[$boy] > 0:
+		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
+		if know_virgin[$boy] = 1:
+			'"Wait!" you yelp. "Knock it off! You know I''m saving my virg-!"'
+			'Your protests cut off in a choked scream as <<$npc_firstname[$boy]>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you. Tears well up in your eyes as you look up at <<$npc_firstname[$boy]>>, horrified at what he''s done.'
+			if booty_call['virgin_deny'] >= 10:
+				'"I''m so fucking sick of you blueballing me," he says. "So we''re gonna fuck today, whether you like it or not."'
+			elseif booty_call['virgin_deny'] > 0:
+				'"I got tired of waiting," he says.'
+			else
+				'"Congratulations on becoming a woman," he says.'
+			end
+		else
+			'"Wait!" you yelp. "I''m a-"'
+			'Your protests cut off in a choked scream as <<$npc_firstname[$boy]>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you.'
+			'"... virgin..." you whimper helplessly, tears running down your cheeks.'
+		end
+	elseif rand(1,10) > npc_sexdrive[$boy]:
+		$npc_apt_bedroom[$boy]
 		if know_virgin[$boy] = 1:
 			'"Wait!" you yelp. "Knock it off! You know I''m saving my virginity!"'
 			'"Sorry. I got caught up in the moment. I forgot."'
@@ -128,220 +181,77 @@ if $ARGS[0] = 'wait':
 			'"A girl can have fun while saving herself for marriage."'
 			'"Well what do you want to do instead?"'
 		end
-		know_virgin[$boy] = 1
 		gs'booty_call_start', 'foreplay_choose'
 	else
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/vag/miss/pussyhump.mp4"></video></center>'
 		if know_virgin[$boy] = 1:
 			'"Wait!" you yelp. "Knock it off! You know I''m saving my virginity!"'
 		else
 			'"Wait!" you yelp. "I''m a virgin! You can''t!"'
 		end
 		gs'arousal', 'foreplay',-5
-		'He keeps moving anyways, running his hands up and down your body, trailing kisses along your neck.'
+		'<<$npc_firstname[$boy]>> can''t stop moving, rubbing his cock against your pussy lips.'
 		if npc_selfish[$boy] = 1:
 			'"Come on," he whispers. "I''m so fucking hard right now... Just let me fuck you already..."'
-		elseif npc_generous[$boy] = 1:
-			'"<<$pcs_nickname>>..." he whispers. "Please. I want you so bad. Can I? Can I be your first time?"'
+		elseif npc_gentle_lover[$boy] = 1 or npc_caretaker[$boy] = 1:
+			'"<<$pcs_nickname>>..." he whispers. "I want you so bad... Can I be your first time? Please?"'
 		else
 			'"Come on," he whispers. "Just lose it already. It''ll feel <i>really</i> good..."'
 		end
 		act'No way!':
+			booty_call['virgin_deny'] += 1
+			booty_call['no_sex'] = 1
 			cla & *clr
 			$npc_apt_bedroom[$boy]
-			'"No means no!" You snap your legs closed and turn your face away. "Take it for an answer already." '
+			'"No means no!" You snap your legs closed and turn your face away. "Take it for an answer already."'
 			'He pulls back with a sigh.'
 			gs'booty_call_virgin', 'change_mind'
 		end
 
 		act'Well...':
+			booty_call['orgasm'] = orgasm
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/pussyhump.mp4"></video></center>'
 			'<i>Well...</i> You moan softly under his touch. It feels <i>so good.</i> What if... you just... let him...'
 			'<<$npc_firstname[$boy]>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.'
 			act'Let <<$npc_firstname[$boy]>> take your virginity':
 				cla & *nl
-				'"Okay," you smile. "Just this once."'
-				if npc_condom_conscious[$boy] = 1:
-					booty_call['condom'] = 1
-					'He smiles back at your joke and grabs a condom off his nightstand, tearing open the packaging and rolling the rubber onto his cock. You spread your legs for him and moments later, <<$npc_firstname[$boy]>> takes your virginity'
-!!{					'He smiles back at your joke and reaches for a condom on his nightstand. '
-					act'Wait for him':
-
-					end
-
-					act'Ask him not to use the condom':
-
-					end}
+				'"Okay," you whisper. "Put it in."'
+				if npc_condom_conscious[$boy] > 0:
+					'<<$npc_firstname[$boy]>> grabs a condom off his nightstand.'
+					gs 'booty_call_condoms', 'virgin_condom1'
 				else
-					'With a wink, you spread your legs for him and moments later, <<$npc_firstname[$boy]>> takes your virginity.'
-				end
-				if rand(1,3) = 3 and npc_selfish[$boy] = 1:
-					act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-				else
-					act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
+					'You spread your legs for him and moments later, <<$npc_firstname[$boy]>> takes your virginity.'
+					gs'booty_call_virgin', 'miss_virg_start'
 				end
 			end
+			
+			gs 'booty_call_condoms', 'virgin_condom_ask1'
+		end
+	end
+end
 
-			act'Ask him to use a condom':
-				cla & *clr
-				$npc_apt_bedroom[$boy]
-				'"Okay," you smile. "But use a condom? Please?"'
-				if npc_condom_conscious[$boy] = 1:
-					'"Of course," he says, already tearing open a package. "I''m not an idiot you know."'
-					'He rolls it onto his cock and moves back in between your legs. Moments later, he takes your virginity.'
-					if rand(1,3) = 3 and npc_selfish[$boy] = 1:
-						act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-					else
-						act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-					end
-				else
-					if npc_no_condoms[$boy] = 1:
-						'"Nah, fuck that rubber shit. I don''t use it."'
-						act'Then we''re not fucking':
-							cla & *clr
-							$npc_apt_bedroom[$boy]
-							'"Woah! What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "If you''re not gonna use a condom, there''s no way I''m letting you fuck me!"'
-							'"Don''t be such a bitch about it! Come on! Let''s just do this!"'
-							act'Let him pressure you':
-								cla & *nl
-								'Your conscience rails against you as he pushes you down onto the bed. You want to refuse him, you <i>want</i> to tell him no, but you don''t want to fight him either. You don''t want him to see you as a bitch, even if you know you''re right.'
-								*nl
-								'With an internal sigh of resignation and not a small amount of regret, you spread your legs, and moments later, he takes your virginity.'
-								*nl
-								'<i>Without</i> a condom.'
-								if rand(1,3) = 3 and npc_selfish[$boy] = 1:
-									act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-								else
-									act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-								end
-							end
-							gs 'willpower', 'sex', 'resist', 'medium'
-							if will_cost <= pcs_willpwr:
-								act'Stand firm (<<will_cost>> Willpower)':
-									cla & *nl
-									'"Nuh uh. If there''s no condom, there''s no sex." He pulls back with a sigh.'
-									gs'booty_call_virgin', 'change_mind'
-								end
-							else
-								act'Stand firm (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-						end
-
-						act'Maybe it''s okay?':
-							cla & *nl
-							'<i>Well... Maybe it''s okay?</i> you rationalize. It''s your first time. If he doesn''t use condoms, maybe he knows better? You can always change your mind in the future. But it''s just once. What could go wrong?'
-							*nl
-							'You nod your head and lean back onto the bed. You spread your legs for him, and moments later, he takes your virginity.'
-							if rand(1,3) = 3 and npc_selfish[$boy] = 1:
-								act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-							else
-								act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-							end
-						end
-
-!!{						act'What the fuck?!':
-							cla & *clr
-							$npc_apt_bedroom[$boy]
-							'"What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "You don''t use condoms?"'
-							'"No! Of course I don''t!" he says. "Condoms fucking suck. Can''t feel anything with one of those on."'
-							act'I can''t do this':
-
-							end
-						end}
-					else
-						if rand(1,2) = 2:
-							'<<$npc_firstname[$boy]>> nods and gets one out, tearing open the package and rolling the little rubber sleeve onto his cock. He moves back between your legs. Moments later, he takes your virginity.'
-							if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-								act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-							else
-								act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-							end
-						else
-							'"Come on," he says. "You really want to use a condom for your first time?"'
-							act'Maybe he has a point':
-								cla & *clr
-								$npc_apt_bedroom[$boy]
-								'Once again, the heady feeling of arousal becomes irresistable. You <i>ache</i> to feel him inside you and the thought of even a thin sleeve of rubber separating your cock from your pussy suddenly feels distasteful to you. It''s your first time. You want to feel <i>everything.</i>'
-								*nl
-								'"Okay," you smile. "Just this once."'
-								'You spread your legs for him and moments later, <<$npc_firstname[$boy]>> takes your virginity.'
-								if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-									act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-								else
-									act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-								end
-							end
-
-							act'Hell yes I do (STD)':
-								cla & *nl
-								'"Uhh, <i>hell yes</i> I do," you say with a look of suspicion. "I''m not about to have sex for the first time and immediately get an STD."'
-								'"An STD? That''s what you''re afraid of? I''m clean! Obviously!"'
-								act'I don''t know that':
-									cla & *nl
-									'"I don''t know that!" you spit back. "Where''s the proof? You have a negative test on you? I''m not about to risk it just because you tell me to ''trust you.''"'
-									'"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he''s totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he''s back in position between your legs. A moment after that, he takes your virginity.'
-									booty_call['condom'] = 1
-									if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-										act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-									else
-										act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-									end
-								end
-
-								act'Trust him':
-									cla & *clr
-									$npc_apt_bedroom[$boy]
-									'"If you say so," you sigh. He just smiles back in response. You can''t help but fume just a little bit, feeling like he''s ruined the mood somewhat. But you don''t have much time to think about that as moments later, he takes your virginity.'
-									if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-										act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-									else
-										act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-									end
-								end
-							end
-
-							if birth_control['think_safe'] = 0:
-								act'Hell yes I do (pregnancy)':
-									cla & *nl
-									'"Uhh, <i>hell yes</i> I do," you say with an obvious expression on your face. "I''m not risking getting pregnant. <i>Especially</i> on my first time!"'
-									'"That''s what you''re worried about? Come on, I''ll pull out. I promise."'
-									act'No way!':
-										cla & *nl
-										'"No fucking way!" you say. "I''m not just gonna trust you to pull out because you say you will! Even if you really mean it, anything could happen by accident. I''m not taking any chances!"'
-										'"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he''s totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he''s back in position between your legs. A moment after that, he takes your virginity.'
-										booty_call['condom'] = 1
-										if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-											act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-										else
-											act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-										end
-									end
-
-									act'Trust him':
-										cla & *clr
-										$npc_apt_bedroom[$boy]
-										'"If you say so," you sigh. "But you <i>absolutely cannot</i> cum inside me, alright?"'
-										'He just smiles back in response. You can''t help but fume just a little bit, feeling like he''s ruined the mood somewhat. But you don''t have much time to think about that as moments later, he takes your virginity.'
-										booty_call['condom'] = 3
-										if rand(1,3) = 3 or npc_selfish[$boy] = 1:
-											act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
-										else
-											act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
-										end
-									end
-								end
-							end
-						end
-					end
-				end
-			end
+if $ARGS[0] = 'safe_day_no_condoms1':
+	if stat['safe_day'] = 1:
+		act'It <i>is</i> a safe day...':
+			booty_call['safe_day'] = 1
+			cla & *nl
+			'"I guess... it''s a safe day for me so..." you murmur, nervously opening your legs.'
+		end
+	elseif stat['probably_safe_day'] = 1:
+		act'It''s <i>probably</i> a safe day...':
+			booty_call['probably_safe_day'] = 1
+			cla & *nl
+			'"I guess... it''s a safe day for me so..." you murmur, nervously opening your legs.'
 		end
 	end
 end
 
 if $ARGS[0] = 'his_choice':
 	booty_call['his_choice_virg'] = 1
-	if rand(0,1) = 1 or npc_generous[$boy] = 1:
+	gs'booty_call_sex', 'speed_select'
+	if booty_call['speed'] < 3 or npc_generous[$boy] = 1 or npc_caretaker[$boy] = 1:
 		if $npc_fav_pos[$boy] = 'missionary':
 			gt'booty_call_virgin', 'miss_virg_norm1'
 		elseif $npc_fav_pos[$boy] = 'doggy':
@@ -357,45 +267,48 @@ if $ARGS[0] = 'his_choice':
 		elseif $npc_fav_pos[$boy] = 'doggy':
 			gt'booty_call_virgin', 'doggy_virg_hard1'
 		else
-			gt'booty_call_virgin', 'miss_virg_nhard1'
+			gt'booty_call_virgin', 'miss_virg_hard1'
 		end
 	end
 end
 
 if $ARGS[0] = 'change_mind':
+	
 	if npc_selfish[$boy] = 1:
 		if booty_call['bj_count'] = 0:
-			'"Ugh! Fine. Then at least suck me off if you''re not going to let me fuck you," he grumbles, shoving your head towards his cock.'
-			act'Blow him':gs 'booty_call_start', 'bj_sub1'
+			'"At least suck me off if you''re not going to let me fuck you," he grumbles, shoving your head towards his cock.'
+		else
+			'"At least suck me off again if you''re not going to let me fuck you," he grumbles, shoving your head towards his cock.'
+		end
+		
+		act'Blow him':cla & gs 'booty_call_start', 'bj_sub1'
 
-			act'Grumble (but still do it)':
-				cla & *nl
-				booty_call['reluctant_bj'] = 1
-				'You grumble to yourself but lean forward anyways and take his dick into your mouth.'
-				act'Suck':gt 'booty_call_start', 'bj_sub1'
-			end
+		act'Grumble (but still do it)':
+			cla & *nl
+			booty_call['reluctant_bj'] = 1
+			'You grumble to yourself but lean forward anyways and take his dick into your mouth.'
+			act'Suck':gt 'booty_call_start', 'bj_sub1'
+		end
 
-			gs 'willpower', 'bj', 'resist', 'easy'
+!!{		gs 'willpower', 'bj', 'resist', 'easy'
 
-			if will_cost <= pcs_willpwr:
-				act'Can we 69?  (<<will_cost>> Willpower)':
-					cla & *nl
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					'"Can we at least sixty-nine? I really need some loving down there right now."'
-					'"I can get behind that," he grins, laying back.'
-					act'Climb over him':gs 'booty_call_start', '69_sub'
-				end
-			else
-				act'Can we 69? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		if will_cost <= pcs_willpwr:
+			act'Can we 69?  (<<will_cost>> Willpower)':
+				cla & *nl
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				'"Can we at least sixty-nine? I really need some loving down there right now."'
+				'"I can get behind that," he grins, laying back.'
+				act'Climb over him':gs 'booty_call_start', '69_sub'
 			end
 		else
-
-		end
+			act'Can we 69? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end}
 	else
 		'"Okay, fine. What do you want to do instead then?"'
+		gs'booty_call_start', 'foreplay_choose'
 	end
-	gs'booty_call_start', 'foreplay_choose'
+	know_virgin[$boy] = 1
 end
 
 if $ARGS[0] = 'no_condom1':
@@ -432,10 +345,20 @@ if $ARGS[0] = 'no_condom2':
 
 end
 
+if $ARGS[0] = 'miss_virg_start':
+	gs'booty_call_sex', 'speed_select'
+	if booty_call['speed'] = 3 and (npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1 or npc_likes_rough[$boy] = 1) and npc_caregiver[$boy] ! 1:
+		act'Continue':gt'booty_call_virgin', 'miss_virg_hard1'
+	else
+		act'Continue':gt'booty_call_virgin', 'miss_virg_norm1'
+	end
+end
+
 if $ARGS[0] = 'miss_virg_norm1':
 	
 	!! booty_call['boy_cum'] = 2
 	booty_call['virgin'] = 1
+	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	gs'arousal', 'vaginal',1,'no_orgasm_msg'
 	gs'stat'
 	$booty_call['position'] = 'miss'
@@ -493,7 +416,7 @@ if $ARGS[0] = 'miss_virg_kiss':
 	else
 		'Caught up in the moment, you reach up and grab <<$npc_firstname[$boy]>>''s face, pulling it down to kiss him. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.'
 	end
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 
@@ -507,6 +430,7 @@ if $ARGS[0] = 'miss_virg_norm2':
 end
 
 if $ARGS[0] = 'miss_virg_hard1':
+	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	!! booty_call['boy_cum'] = 2
 	booty_call['virgin'] = 1
 	gs'arousal', 'vaginal',1,'rough', 'no_orgasm_msg'
@@ -539,18 +463,18 @@ if $ARGS[0] = 'miss_virg_hard1':
 			gs'stat'
 			cla & *nl
 			'You decided to give him your virginity and you don''t want to be a sour puss by trying to back out now. You grit your teeth and endure, spending every second hoping it will end soon.'
-			act'Continue':gs'booty_call_cum', 'fuck_cum'
+			act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 		end
 
 		act'Can we slow down?':
 			cla & *nl
 			'"Can we-! Slow down-! A little-?" you whimper under <<$npc_firstname[$boy]>>''s relentless pounding. "This is-! A bit-! Rough-!"'
-			if (rand(1,10) >= 7 or npc_selfish[$boy] = 1 or npc_abusive = 1) and npc_generous[$boy] ! 1:
+			if (rand(1,10) >= 7 or npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1) and npc_generous[$boy] ! 1:
 				$orgasm_or = 'no'
 				'"This is what sex is like," he grins. "You''ll get used to it soon, then it''ll feel really good."'
 				'He keeps fucking you roughly and you keep your teeth clenched. Despite his promises, that good feeling never comes and you spend the next few minutes in agony, waiting for it to end.'
 				!! booty_call['boy_cum'] = 2
-				act'Continue':gs'booty_call_cum', 'fuck_cum'
+				act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 			else
 				booty_call['speed_change'] = 1
 				'"Oh! Sorry! I just... I thought it would make you feel good..."'
@@ -574,7 +498,7 @@ if $ARGS[0] = 'miss_virg_hard2':
 	else
 		'It''s your first time having sex, but it''s mindblowingly good. Why didn''t you do this sooner?!'
 	end
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'miss_virg_hard2_2':
@@ -587,12 +511,14 @@ if $ARGS[0] = 'miss_virg_hard2_2':
 	*nl
 	'It hurts. But that makes it feel even better.'
 	*nl
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'doggy_virg_norm1':
 	!! booty_call['boy_cum'] = 2
+	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	booty_call['virgin'] = 1
+	$booty_call['pos_speed'] = 'doggy1'
 	gs'arousal', 'vaginal',1,'no_orgasm_msg'
 	gs'stat'
 	$booty_call['position'] = 'doggy'
@@ -626,7 +552,7 @@ if $ARGS[0] = 'doggy_virg_norm1.1':
 		act'Continue':
 			cla & *clr
 			booty_call['orgasm'] = orgasm
-			$booty_call['pos_speed'] = 'miss1'
+			$booty_call['pos_speed'] = 'doggy1'
 			gs'stat'
 			$booty_call['virgin_media'] = '<center><video autoplay loop src="images/shared/sex/vag/doggy/slow1.mp4"></video></center>'
 			$booty_call['virgin_media']
@@ -649,6 +575,7 @@ end
 if $ARGS[0] = 'doggy_virg_hard1':
 	!! booty_call['boy_cum'] = 2
 	booty_call['virgin'] = 1
+	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	gs'arousal', 'vaginal',rand(4,8),'rough', 'no_orgasm_msg'
 	gs'stat'
 	$booty_call['position'] = 'doggy'
@@ -679,7 +606,7 @@ if $ARGS[0] = 'doggy_virg_hard1':
 			gs'stat'
 			cla & *nl
 			'The next few minutes pass by in a torturous blur. You have no idea how much time actually passes by, only that every second of it is filled with pain, tears, and prayer that it will end after the next thrust.'
-			act'Continue':gs'booty_call_cum', 'fuck_cum'
+			act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 		end
 
 		act'Can we slow down?':
@@ -690,7 +617,7 @@ if $ARGS[0] = 'doggy_virg_hard1':
 				'"This is what sex is like," he grins. "You''ll get used to it soon, then it''ll feel really good."'
 				'He keeps fucking you roughly and you keep your teeth clenched. Despite his promises, that good feeling never comes and you spend the next few minutes in agony, waiting for it to end.'
 				!! booty_call['boy_cum'] = 2
-				act'Continue':gs'booty_call_cum', 'fuck_cum'
+				act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 			else
 				booty_call['speed_change'] = 1
 				'"Oh! Sorry! I just... I thought it would make you feel good..."'
@@ -714,7 +641,7 @@ if $ARGS[0] = 'doggy_virg_hard2':
 	else
 		'It''s your first time having sex, but it''s mindblowingly good. Why didn''t you do this sooner?!'
 	end
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'doggy_virg_hard2_2':
@@ -727,12 +654,13 @@ if $ARGS[0] = 'doggy_virg_hard2_2':
 	*nl
 	'It hurts. But that makes it feel even better.'
 	*nl
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'cowgirl_virg_norm1':
 	!! booty_call['boy_cum'] = 2
 	booty_call['virgin'] = 1
+	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	gs'arousal', 'vaginal',1,'no_orgasm_msg'
 	gs'stat'
 	$booty_call['position'] = 'cowgirl'
@@ -885,8 +813,10 @@ if $ARGS[0] = 'cowgirl_virg_hard1':
 	gs'arousal', 'vaginal',-10,'no_orgasm_msg'
 	$booty_call['pos_speed'] = 'cowgirl2'
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med3.mp4"></video></center>'
-	'Feeling good, you pick up the pace, bouncing up and down on <<$npc_firstname[$boy]>>''s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles. Who knew that sex was so much fun???'
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	'Feeling good, you pick up the pace, bouncing up and down on <<$npc_firstname[$boy]>>''s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles.'
+	*nl
+	'Who knew that sex was so much fun?'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'cowgirl_virg_hard2':
@@ -896,7 +826,7 @@ if $ARGS[0] = 'cowgirl_virg_hard2':
 	gs'arousal', 'vaginal',-10,'no_orgasm_msg'
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard2.mp4"></video></center>'
 	'With no warning other than a sudden cry, you throw yourself down on <<$npc_firstname[$boy]>>''s cock with as much force as you can. The impact reverberates through you flaring both the pain and the pleasure inside of your cunt. You raise yourself up and impale yourself again and again and again until you''re riding him like a bucking stallion. Tears stream down your face and protracted groans of exertion escape from behind your teeth, clenched in a fierce grin. Your pussy hurts so much, and you never want this pain to end.'
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 end
 
 if $ARGS[0] = 'virg_continue_harder':
@@ -1131,7 +1061,7 @@ if $ARGS[0] = 'doggy_cum':
 		'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 		'You orgasm in doggy style.'
 	end
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 !!	gs'booty_call_virgin', 'virgin_continue'
 end
 
@@ -1139,7 +1069,7 @@ if $ARGS[0] = 'cowgirl_cum':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/orgasm1.mp4"></video></center>'
 	'You orgasm in cowgirl.'
-	act'Continue':gs'booty_call_cum', 'fuck_cum'
+	act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 !!	gs'booty_call_virgin', 'virgin_continue'
 end
 
@@ -1313,7 +1243,7 @@ if $ARGS[0] = 'virgin_enjoyment':
 				else
 					'You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!'
 				end
-				act'Continue':gs'booty_call_cum', 'fuck_cum'
+				act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 			end
 			if $booty_call['position'] ! 'cowgirl':
 				act'"Fuck me harder"':
@@ -1354,7 +1284,7 @@ if $ARGS[0] = 'virgin_enjoyment':
 				else
 					'You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!'
 				end
-				act'Continue':gs'booty_call_cum', 'fuck_cum'
+				act'Continue':cla & gs'booty_call_cum', 'fuck_cum'
 			end
 			if $booty_call['position'] ! 'cowgirl':
 				act'"Fuck me harder"':
@@ -1495,7 +1425,7 @@ if $ARGS[0] = 'first_time_talk':
 				end
 				
 				act'Thought: Arrogant much?':
-					*nl
+					cla & *nl
 					'<i>Fuck, arrogant much?</i> you think to yourself. <i>If only his dick was as big as his head.</i>'
 					gs'booty_call_pillow_talk', 'topics'
 				end

+ 12 - 1
locations/brother_voyeur.qsrc

@@ -779,7 +779,18 @@ if $ARGS[0] = 'brother_shower_shave':
 		'"Yeah, you''re probably right. I should shave," you say looking down at yourself, frowning at the growing body hair.'
 	end
 	
-	if pcs_leghair > 3 and pcs_pubes > 3 and stanok = 1:msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
+	if pcs_leghair > 3 and pcs_pubes > 3 and stanok = 1:
+		msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
+	else
+		*nl
+		'You don''t have enough hair on either your legs of pussy for you to need shave.'
+		'"Sorry bro but I don''t need to shave. Give a couple of days and I can show you." You say to the now a bit disappointed Kolka but there''s not much you can do about that.'
+		if brotherfuck > 0 or brotheranal > 0 or brotherbj > 0 or brotherwash > 5:
+			'You could cheer him up with something sexual.'
+			act'Put his hand on your pussy': gs 'brother_shower_sex', 'sex_menu'
+		end
+		act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+	end
 	gs'brother_voyeur','shave_both'
 	gs'brother_voyeur','shave_legs'
 	gs'brother_voyeur','shave_pussy'

+ 7 - 1
locations/camera.qsrc

@@ -236,7 +236,13 @@ if $ARGS[0] = 'mother':
 		'You show her your photos and the one you finally decided on. "Here, look, this is the one I will use for my portfolio."'
 		'She smiles. "They do look nice... I still say it''s a waste of time, though."'
 		'You roll your eyes. "I know, <<$npc_nickname[''A29'']>>," you reply as she walks back inside.'
-		act 'Put your camera away': gt 'pav_complex', 'start'
+		act 'Put your camera away':
+			if $loc = 'kuhrPar' or $loc = 'sitrPar':
+				gt 'pav_complex', 'start'
+			else
+				gt 'gaddvor'
+			end
+		end
 	end
 end
 

+ 1 - 1
locations/cikl.qsrc

@@ -858,7 +858,7 @@ if mid($start_type,1,2) = 'sg':
 				:hotcat_calc_jump
 				i += 1
 				
-				if hotcat_rating['A<<i>>'] = 0: jump 'hotcat_calc_jump'
+				if hotcat_rating['A<<i>>'] = 0 and i < 145: jump 'hotcat_calc_jump'
 				
 				switch_rand = rand(1,100)
 				

+ 2 - 2
locations/city_coffee_hole.qsrc

@@ -27,8 +27,8 @@ if $args[0]= 'inner':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
 	'The cafe looks like it was once some type of industrial building, with tall ceilings, exposed pipes, ductwork and lights. The counter is in the far corner, while the middle of the room contains several tables and chairs. Along the wall opposite the counter is an area with several couches for people to sit and relax. The menu board shows a wide range of flavoured coffees, teas, espressos and pastries, among other things.'
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
-			'You see a familiar face working behind the counter, your classmate <a href="exec:gt ''city_coffee_hole'', ''anushka_work''">Anushka.</a>'
+	if yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
+		'You see a familiar face working behind the counter, your former classmate <a href="exec:gt ''city_coffee_hole'', ''anushka_work''">Anushka.</a>'
 	end
 	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'

+ 1 - 1
locations/city_market.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'clo':
 			end
 		end
 	i += 1
-	if i <= 20:jump 'loopmarket_outfits'
+	if i <= 40:jump 'loopmarket_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

+ 1 - 1
locations/clothing.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 	if ARRSIZE('materinstvo_dress') > 0:'<center><a href="exec:$ward_list_store = ''materinstvo'' & gt ''clothing'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
-	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''clothing_list'', ''market''">Clothes from the market</a></center>'
+	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''clothing_list'', ''market''"><img src="images/pc/items/market/market.png"></a></center>'
 
 	act 'Leave': killvar '$ward_list_store' & gt $loc, $loc_arg
 	act 'Your Clothes': gt 'wardrobe', 'main'

+ 113 - 114
locations/emp_functions.qsrc

@@ -8,33 +8,33 @@
 !! v.02 - Event generator partially integrated
 !! v.03 - Job management system integrated
 !! v. 04 - Start of event generation code integration
-!!
+!! 
 
 !! --------------------- UI Interface for Journal
 
 if $ARGS[0] = 'gen_schedule':
-	*clr & cla
+	*clr & cla 
 		if night_mode = 1 or night_mode = 2:
 		$header_theme = '#91B0B4'
 		$body_theme = '#303030'
-		$body_theme_alt	 = '#474747'
+		$body_theme_alt  = '#474747'
 		$font_theme = '#000000'
 	else
 		$header_theme = '#e27c00'
 		$body_theme = '#E0DED4'
-		$body_theme_alt	 = '#D58B32'
+		$body_theme_alt  = '#D58B32'
 		$font_theme = '#FFFFFF'
 	end
-	if	function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
-	if function_sw = 2:
+	if  function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
+	if function_sw = 2: 
 		gs 'journal', 'journalmenu'
 		'<center><h2>Work</h2></center>'
 	end
 	!! Enable selector if attending school or Uni by NPC group type or by character and set default to School
-	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1:
+	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1: 
 		if flag_schedule = 0: flag_schedule = 1
 		school_group = 1
-		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &	gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &	 gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
+		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &  gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &  gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
 	else
 		!! Set schedule to holiday / non-edu NPCs
 		flag_schedule = 3
@@ -43,11 +43,11 @@ if $ARGS[0] = 'gen_schedule':
 	!! Initiate loop variables
 
 	i_day = 1
-	mod_max_day = 7
+    mod_max_day = 7
 	i_hour = ARGS[1]
-	mod_max_hour = ARGS[1] + 8
-	header_switch = 1
-	killvar '$tablebody'
+    mod_max_hour = ARGS[1] + 8 
+    header_switch = 1
+	killvar '$tablebody'   
 	killvar '$tableheader'
 
 	!! create header, using header switch to fill in :00 or :30 automatically using mod to determine odd/even and set display hour automatically.
@@ -61,13 +61,13 @@ if $ARGS[0] = 'gen_schedule':
 		if header_switch = 1:
 			header_switch += 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<<display_hour >>', display_hour) + ':00</font></th>'
-		elseif header_switch=2:
+		elseif header_switch=2: 
 			header_switch = 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
-		end
+		end		
 		i_hour += 1
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
-	! Reset i_hour for next loop
+	! Reset i_hour for next loop	
 	killvar 'display_hour'
 	killvar 'header_switch'
 	i_hour = ARGS[1]
@@ -75,17 +75,17 @@ if $ARGS[0] = 'gen_schedule':
 	!! Close out table header
 	$tableheader += '</tr>'
 	!! Create table body, with alternating colour rows for legibility
-	:jmp_day_create
+    :jmp_day_create
 
-		!Set day
-		if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
-			$tablebody += '<tr><td	style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+        !Set day
+        if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
+			$tablebody += '<tr><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		else
 			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		end
 		!! fill the slots from the NPC schedule
 
-		:jmp_hour_create
+        :jmp_hour_create 
 			if i_day >= 1:
 
 				!! Create function switcher:
@@ -94,15 +94,15 @@ if $ARGS[0] = 'gen_schedule':
 				!! 3: Event Tracker
 
 				if function_sw = 1 or function_sw = 0:
-					dynamic $schedule_tracker
+					dynamic $schedule_tracker 
 				elseif function_sw = 2:
-					flag_active	 = 1
-					j_id = emp_rota_week[i_day +  '_' + i_hour]
-					if emp_rota_week[i_day +  '_' + i_hour] ! 0:
-						$transient_tb =	 '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
-					else
-						$transient_tb  = 'Free'
-					end
+                    flag_active  = 1
+                    j_id = emp_rota_week[i_day +  '_' + i_hour]
+                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
+                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+                    else
+                        $transient_tb  = 'Free'
+                    end
 				elseif function_sw = 3:
 				else
 					msg 'Error - Failed to create body. Please set content switch.'
@@ -114,42 +114,42 @@ if $ARGS[0] = 'gen_schedule':
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
 					killvar '$transient_tb'
-				end
+				end	
 			else
 				 i_day += 1
 				 jump 'jmp_day_create'
 			end
 			i_hour += 1
-			if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
+            if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
 			$tablebody +='</tr>'
 			i_day += 1
 			i_hour = ARGS[1]
-		if i_day <= mod_max_day: jump 'jmp_day_create'
+        if i_day <= mod_max_day: jump 'jmp_day_create'	
 	!! Create navigaton bars
 	if (mod_max_hour + 8)  <= 48:
 		set_hour = ARGS[1] + 8
-		$msg_forward = '<a	href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+		$msg_forward = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
 	else
 		$msg_forward = 'End of Day'
 	end
-	if (mod_max_hour  - 8) >0 :
+    if (mod_max_hour  - 8) >0 :
 		set_hour = ARGS[1] - 8
-		$msg_back = '<a	 href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
-	else
+        $msg_back = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
+    else
 		$msg_back = 'Start of day'
+    end
+
+    !! Start the table constuction    
+    '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
+    '<<$msg_back>> | <<$msg_forward>>'
+    *nl
+    if  function_sw = 1:
+	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
 	end
-
-	!! Start the table constuction
-	'<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
-	'<<$msg_back>> | <<$msg_forward>>'
-	*nl
-	if	function_sw = 1:
-	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>'
-	end
-	if	function_sw = 2:
-		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>'
+	if  function_sw = 2:
+		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>' 
 	end
-	act 'Back':
+    act 'Back':
 		killvar 'flag_schedule'
 		killvar 'school_group'
 		killvar 'j_id'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' +emp_job_wages[j_id] + '<b>₽</b></p>'
-
+	
 	msg '<<$msg_body>>'
 end
 
@@ -191,15 +191,15 @@ if $ARGS[0] = 'disp_evt':
 		'I have this job for you do you want to acccept it?'
 		*nl
 		'Event Scheduled for: ' + transient_evt_day + $evt_suffix + ', '+ $monthName[transient_evt_month] +' '+ '20' + transient_evt_year
-		'Job: ' + $evt_job[transient_evt_type]
+		'Job: ' + $evt_job[transient_evt_type]  			
 		'Pay: ' + transient_evt_wages
 		'Time: ' + transient_evt_hour + ':' +  iif(transient_evt_minutes  >= 0 and transient_evt_minutes <= 4, '00',  '30')
 		'Duration: ' + transient_evt_duration  + iif(transient_evt_duration  = 1, ' hour',  ' hours')
 		'Location reminder: ' + $transient_mc_locat
 		'Job Details: ' + $transient_desc
-
+		
 		act 'Accept the job' : gs 'emp_functions', 'cat_evt'
-		act 'Decline the job':
+		act 'Decline the job': 
 			gs 'emp_functions',  'del_evt', 1
 			gt 'emp_functions', 'evt_init'
 		end
@@ -209,22 +209,22 @@ if $ARGS[0] = 'disp_evt':
 	if ARGS[1] = 2:	
 		if evt_event[0] ! '':			
 			killvar '$evtbody'
-			job_idx = 0
+			job_idx = 0		
 			*nl
 			:jmp_list_create
-				if evt_silent[job_idx] = 1:
-					$evtbody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>'
+				!!if evt_silent[job_idx] = 1:
+					$evtbody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>' 
 					$evtbody += '<td>' + evt_wages[job_idx] + '₽</td><td>' + evt_hour[job_idx] + ':' +  iif(evt_minutes[job_idx] >= 0 and evt_minutes[job_idx] <= 4, '00', '30') + '</td>'
 					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $evt_mc_locat[job_idx] + '</td>'
 					$evtbody += '<td><a  href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
-				end
+				!!end
 				job_idx += 1
 				if job_idx < arrsize('evt_event') : jump 'jmp_list_create'
-				if evt_silent[job_idx] = 1:
-					'<center><h2>Current Task List</h2></center>'
+				!!if evt_silent[job_idx] = 1: 
+					'<center><h2>Current Task List</h2></center>'		
 					$evtheader = '<tr><th>Date</th><th>Task</th><th>Pay</th><th>Time</th><th>Duration</th><th>Location</th><th>Cancel Job</th></tr>'
 					'<center><table width="90%" align="center" width="90%" cellspacing="5" cellpadding="5" valign="top"><tr><<$evtheader>><<$evtbody>></tr></table></center>'
-				end
+				!!end
 				killvar '$evtbody'
 				killvar '$evtheader'
 			else
@@ -237,12 +237,12 @@ if $ARGS[0] = 'disp_evt':
 		act_idx = 0
 		act_tracker = 0
 		act_found = 0
-		:jmp_act_create
-			 if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1):
+		:jmp_act_create			
+			 if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1): 
 				act_found = 1
-				act_idx = act_tracker
+				act_idx = act_tracker 				
 			 end
-			 act_tracker +=1
+			 act_tracker +=1 
 		if act_tracker < arrsize('evt_event') or act_found = 0: jump 'jmp_act_create'
 		if ((evt_hour[act_idx] = hour and evt_minutes[act_idx] <= minut) or evt_hour[act_idx] = (hour - 1)) and $loc = $evt_loc[act_idx]:
 			act 'Attend your ' + $evt_job[evt_event[act_idx]] + ' event':
@@ -259,43 +259,43 @@ if $ARGS[0] = 'disp_evt':
 	end
 end
 
-if $ARGS[0] = 'gen_evt':
+if $ARGS[0] = 'gen_evt':	
 	!! Get the current year - remove 2000 to get the right year for search function.
 	transient_evt_year = year - 2000
-
+	
 	!! Figure out the month for the seed and ensure it rolls over into new calendar year.
-	if month = 12:
+	if month = 12:			
 		evt_mseed = 1
 		transient_evt_year += 1
 	else
 		evt_mseed = month + 1
 	end
 
-	!! randomise the month and month + 1
-	transient_evt_month = rand(month,  evt_mseed)
+	!! randomise the month and month + 1 	
+	transient_evt_month = rand(month,  evt_mseed)      
 	:jmp_job_create
 		if transient_evt_month = month:
 			if (day + 7) > monthsend[transient_evt_month]:
 				transient_evt_month += 1
 				evt_dseed = 1
-			end
+			end	
 		else
 			evt_dseed = day + 1
-		end
-		rnd_day = rand(evt_dseed, monthsend[transient_evt_month])
-	if transient_evt_month  = month and rnd_day <= day: jump 'jmp_job_create'
-
+		end	
+		rnd_day = rand(evt_dseed, monthsend[transient_evt_month])	
+	if transient_evt_month  = month and rnd_day <= day: jump 'jmp_job_create'	
+					
 	!! Set event transients - will be deleted upon completion
 	transient_evt_hour = rand(9, 20)
-
+	
 	!! For simplicity sake make minutes on the hour or at half hour intervals, store as a single int.
 	transient_evt_minutes = rand(0, 9)
-
-	!! Set as multiples of 60
+	
+	!! Set as multiples of 60 	
 	transient_evt_duration = rand(1,8)
-
+	
 	!! logic check for when randomising event duration
-
+	
 	if transient_evt_duration + transient_evt_hour >= 22:
 		transient_evt_hour = 22 - transient_evt_duration
 	end
@@ -305,21 +305,21 @@ if $ARGS[0] = 'gen_evt':
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
-		srch_day_l = monthsend[transient_evt_month]	 - rand(7,14)
+		srch_day_l = monthsend[transient_evt_month]  - rand(7,14)
 	else
 		srch_day_l = rnd_day
 	end
 
 	:setdayloop
 	gs 'shortgs', 'dow',  transient_evt_year, transient_evt_month,  srch_day_l
-	if result =  transient_evt_dow:
+	if result =  transient_evt_dow: 
 		transient_evt_day = srch_day_l
 	srch_day_l = 99
-	else
-	srch_day_l += 1
-	end
+	else	        
+	srch_day_l += 1					
+	end 	
 
-	if srch_day_l <= srch_day_u: jump 'setdayloop'
+	if srch_day_l <= srch_day_u: jump 'setdayloop'	
 end
 
 ! ------ Helper Functions ------
@@ -362,8 +362,8 @@ if $ARGS[0] = 'cat_evt':
 	evt_silent[] = transient_evt_silent
 	!! Event type used in Journal
 	evt_event[] = transient_evt_type
-	!! Additional ID if required
-	evt_event_sub[] = transient_evt_sub_type
+	!! Additional ID if required 
+	evt_event_sub[] = transient_evt_sub_type 
 	!! Day of Week used in Journal and content areas
 	evt_dow[] = transient_evt_dow
 	!! Event Date to check against current date & used in Journal and content areas
@@ -385,7 +385,7 @@ if $ARGS[0] = 'cat_evt':
 	!! The following are event location triggers to allow the content to appear in areas such as community centre but host their content elsewhere such as Photography shop
 	!! 	Event area triggers such as city_residential
 	$evt_loc[] = $transient_loc
-	$evt_loc_arg[] = $transient_arg
+	$evt_loc_arg[] = $transient_arg 
 	!! Content location - optional
 	$evt_trigger_exec = $transient_evt_exec
 	$evt_trigger[] = $transient_trigger
@@ -407,35 +407,35 @@ if $ARGS[0] = 'del_evt':
 		killvar 'transient_event_type'
 		killvar 'transient_evt_year'
 		killvar 'transient_evt_month'
-		killvar 'transient_evt_hour'
+		killvar 'transient_evt_hour'	
 		killvar 'transient_evt_minutes'
 		killvar 'transient_evt_duration'
 		killvar 'transient_evt_wages'
 		killvar '$transient_loc '
 		killvar '$transient_arg'
-		killvar '$transient_trigger'
+		killvar '$transient_trigger'	
 		killvar '$transient_img'
 		killvar '$transient_desc'
-		killvar 'rnd_min'
+		killvar 'rnd_min'	
 		killvar 'mseed'
-		killvar 'dseed'
+		killvar 'dseed' 
 	end
 
 	! Delete array entry
 
 	if ARGS[1] = 2:
 		!! delete event after firing or cancelled.
-		!! killvar 'arr_name', index
+		!! killvar 'arr_name', index 
 		if ARGS[2] >= 0:
 			evt_idx = ARGS[2]
 			cla
-			'You''re about to delete this job: '
-			'Delete: ' + evt_event
+			'You''re about to delete this job: ' 
+			'Delete: ' + evt_event 
 			'Index: ' + evt_idx
 			Act 'Confirm?':
 				cla
 				'Are you sure?'
-				act 'Deleting':
+				act 'Deleting': 
 					cla
 					killvar 'evt_silent', evt_idx
 					killvar 'evt_event', evt_idx
@@ -454,19 +454,19 @@ if $ARGS[0] = 'del_evt':
 					killvar '$evt_media', evt_idx
 					killvar '$evt_desc', evt_idx
 
-					act 'Return': gt 'emp_functions', 'init'
-				end
-				act 'Cancel': gt 'emp_functions', 'init'
+					act 'Return': gs 'journal_work', 'start'
+				end 	 
+				act 'Cancel': gs 'journal_work', 'start'
 			end
 		else
 			'<<evt_idx>> - Invalid record - please check your index'
 		end
-	end
+	end 
 end
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '':
+	if ARGS[1] ! '': 
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -482,8 +482,8 @@ if $ARGS[0] = 'evt_day_suffix':
 	elseif test_day = 1 or test_day = 31:
 		$evt_suffix = 'st'
 	elseif test_day = 2:
-		$evt_suffix = 'nd'
-	elseif test_day= 3:
+		$evt_suffix = 'nd'    
+	elseif test_day= 3: 
 		$evt_suffix = 'rd'
 	else
 		$evt_suffix = 'th'
@@ -511,15 +511,15 @@ end
 !! book role, creates a time slot for emp_rota_week in format day_hour to be used in schedule mode.
 if $ARGS[0] = 'emp_booking':
 	gs 'emp_functions', 'emp_chk_clk'
-	if emp_rota_fail  = 0:
+	if emp_rota_fail  = 0:	
 		gs 'emp_functions', 'loop_configure'
 		j_finish = emp_job_end[j_id]
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx]	= j_id
+				emp_rota_week[d_idx + '_' + j_idx]  = j_id
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		emp_job_status[j_id] = 1
@@ -543,14 +543,14 @@ if $ARGS[0] = 'emp_chk_clk':
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
 			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
-				!! booking failed
+				!! booking failed					
 				emp_rota_fail = 1
 			else
 				!! booking passed
 				emp_rota_fail = 0
-			end
+			end	
 			j_idx +=1
-		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'
+		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'	
 		d_idx += 1
 	if d_idx <= d_end and emp_rota_fail = 0: jump 'jmp_daily_chk'
 end
@@ -564,7 +564,7 @@ if $ARGS[0] = 'emp_terminate':
 			:jmp_hour_book
 				emp_rota_week[d_idx + '_' + j_idx] = 0
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		!! Set the termination value
@@ -576,20 +576,19 @@ if $ARGS[0] = 'emp_terminate':
 	killvar 'j_idx'
 	killvar 'j_finish'
 	killvar 'd_idx'
-	killvar 'd_end'
+	killvar 'd_end'	
 end
 
-if $ARGS[0] = 'loop_configure':
-	if	j_day= 0 or j_day = 1 or j_day = 2:
+if $ARGS[0] = 'loop_configure':	
+	if  j_day= 0 or j_day = 1 or j_day = 2:
 		d_idx = 1
 	else
 		d_idx= 6
 	end
-	if	j_day <= 1:
+	if  j_day <= 1:
 		d_end = 5
 	else
 		d_end= 7
-	end
+	end	
 end
---- emp_functions ---------------------------------
-
+--- emp_functions ---------------------------------

+ 3 - 8
locations/exhibitionistshop.qsrc

@@ -103,10 +103,10 @@ if $ARGS[0] = 'ksenya_intro':
 	end
 end
 
-if $ARGS[0] = 'ksenya_intro':
+if $ARGS[0] = 'ksenya_chat':
 	exhibitionQW['daystart'] = daystart
 	npc_rel['A263'] += 1
-	minut += 10
+	minut += 60
 	cla & *clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya9.jpg"></center>'
@@ -286,7 +286,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopsalacious_bodysuit
-		if salacious_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if salacious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 40:jump 'loopsalacious_bodysuit'
 end
@@ -294,11 +294,6 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if salacious_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'exhibitionistshop', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'salacious',i, 1000
 end
 

+ 2 - 2
locations/fertility.qsrc

@@ -221,13 +221,13 @@ if $ARGS[0] = 'birth_control':
 
 	if pillcon >= 40000:
 		birth_control['safe'] = 1
-	elseif placebopart = 0:
+	elseif placebopart <= 0:
 		birth_control['safe'] = 0
 	end
 	
 	if pillcon2 >= 40000:
 		birth_control['think_safe'] = 1
-	elseif placebopart = 0:
+	elseif placebopart <= 0:
 		birth_control['think_safe'] = 0
 	end
 	

+ 13 - 0
locations/foto_nude_debut.qsrc

@@ -1,5 +1,15 @@
 # foto_nude_debut
 
+if $ARGS[0] = 'nude_debut_memory':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'Hello, if you are seeing this page it is either because you were already doing nude modelling on a save before this content was added or the game has bugged out for some reason.'
+	*nl
+	'The following scene is a memory of your full frontal debut as a model and the creator encourages you to roleplay it as your character would have been at the time of their first nude shoot.'
+	*nl
+	'Please enjoy.'
+	act'Continue':gt'foto_nude_debut', 'nude_debut_pre'
+end
+
 if $ARGS[0] = 'nude_debut_pre':
 	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -294,6 +304,7 @@ if $ARGS[0] = 'sick_debut':
 	'A wave of dizziness passes through your head. Your legs feel like jelly, barely keeping you upright. The lights flash again and you suddenly want to throw up.'
 	*nl
 	'Time passes in a miserable blur, barely aware of your surroundings while taking stiff poses, trying with all your might to keep from ruining the shoot by vomitting all over the set. By the time the photographer calls an end to the shoot, you''re on the verge of tears, having wanted it to be over and hour ago.'
+	gs'foto_nude_debut', 'debut_after1'
 end
 
 if $ARGS[0] = 'aroused_debut':
@@ -321,6 +332,7 @@ if $ARGS[0] = 'aroused_debut':
 	end
 	*nl
 	'Time passes in a furious blur, barely aware of your surroundings while taking poses, trying with all your might not to openly pant in heat. Several pauses have to be taken just to wipe you down, the overflowing arousal of your dripping snatch won''t stop running down your thighs. The intervals between each wipe gets shorter after each one until the shoot is called to an end.'
+	gs'foto_nude_debut', 'debut_after1'
 end
 
 if $ARGS[0] = 'happy_debut':
@@ -761,6 +773,7 @@ if $ARGS[0] = 'debut_ending':
 	modelfoto['nip'] += 1
 	modelfoto['pussy'] += 1
 	modelfoto['fullnude'] += 1
+	modelfoto['nude_debut'] = 1
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'All the pictures taken, the staff begin striking the set and a manager comes out with your pay.'

+ 5 - 1
locations/foto_shoot.qsrc

@@ -435,7 +435,11 @@ if $ARGS[0] = 'nude_shoot':
 	
 	act 'Full nude':
 		$modelfoto['shoot_type'] = 'full_nude'
-		if modelfoto['fullnude'] = 0:gt'foto_nude_debut', 'nude_debut_pre'
+		if modelfoto['fullnude'] = 0:
+			gt'foto_nude_debut', 'nude_debut_pre'
+		elseif modelfoto['fullnude'] > 0 and $modelfoto['first_nude_pre'] = '':
+			gt'foto_nude_debut', 'nude_debut_memory'
+		end
 		*clr & cla
 		if pcs_inhib < 60:
 			if modelfoto['fullnude'] > 0:

+ 1 - 1
locations/gadfield.qsrc

@@ -327,7 +327,7 @@ end
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
 
-if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1) and npc_known['A60'] = 1:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira2.jpg"></center>'

+ 1 - 1
locations/gadforest.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = 'forest_edge':
 		if forestpicnic = 0 and $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 8 and hour <= 20 and miranudetalk = 1 and miratalkday ! daystart: gt 'gadforest_event', 'mira_nude_event'
 	! Events without Mira
 	else
-		if metmira = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
+		if npc_known['A60'] = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
 			mirarand = rand(1,10)
 			if mirarand >= 6: MiraLoc = 3 & gt 'gadforest_event', 'mira_morning_walk'
 		end

+ 3 - 3
locations/gadukino.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = '':
 				if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting in the street.</b>'
 			end
 		end
-		if npc_rel['A60'] > 0 and metmira = 1:
+		if npc_rel['A60'] > 0 and npc_known['A60'] = 1:
 			'Just down the road from your grandparents'' house is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
 			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
 		end
@@ -302,14 +302,14 @@ end
 
 if $ARGS[0] = 'mira_events':
 	! never met mira before
-	if npc_rel['A60'] = 0 and npc_QW['A60'] = 0:
+	if npc_known['A60'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
 		'Walking around the village, you notice a young girl your age. Unfortunately, you do not recognize her from the last time you were in the village. She is pulling on a rope attached to the collar of a small calf. The calf grunts with displeasure, shakes her head and refuses to move further.'
 		act 'Walk away': gt 'gadukino'
 		act 'Help her':
 			*clr & cla
-			metmira = 1
+			npc_known['A60'] = 1
 			npc_rel['A60'] += 10
 			minut += 15
 			gs 'stat'

+ 1 - 1
locations/gdktoilet_mens.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		gs 'stat'
 		'<center><b><font color="maroon">Community Center - Men''s Restroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
-		'You look inside the men''s restroom and hear a couple having sex in one of the stalls. You wonder who''s inside and then decide to leave. While you turn away you hear them stop and the stall slams open moments later hearing giggling from some women. While you''re outside you see Ivan and Vicky leave the men''s restroom and walk out into the crowd.'
+		'You look inside the men''s restroom and hear a couple having sex in one of the stalls. You wonder who''s inside and then decide to leave. While you turn away you hear them stop and the stall slams open moments later hearing giggling from some women. While you''re outside you see Vanya and Vicky leave the men''s restroom and walk out into the crowd.'
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'

+ 1 - 1
locations/gossips.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'complex':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
 			'Three girls are sitting on one of the benches that dot the courtyard.'
 			*nl
-			'You can''t help but notice them looking in your direction. They start whispering and giggling to each other, followed by pointed looks in your direction. "Don''t you have a cock to go and suck somewhere, slut?" They all start giggling againa as you just sigh and continue on. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
+			'You can''t help but notice them looking in your direction. They start whispering and giggling to each other, followed by pointed looks in your direction. "Don''t you have a cock to go and suck somewhere, slut?" They all start giggling again as you just sigh and continue on. It seems people are talking about your growing reputation. You should be more discreet if you want them to stop talking about you.'
 		elseif fame['pav_slut'] < 200:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/girls_gossip.jpg"></center>'
 			'Three girls are sitting on one of the benches that dot the courtyard. You overhear their conversation as you walk past.'

+ 1 - 0
locations/gschool_cheerleading.qsrc

@@ -552,6 +552,7 @@ if $ARGS[0] = 'shower':
 	end
 	
 	act 'Stay in the shower a little longer':
+		*clr & cla
 		minut += 10
 		gs 'stat'
 		'You''re enjoying this shower and choose to stay in it a little longer, long enough that you''re sure you''re the only person left.'

+ 1 - 1
locations/home_activity.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'vomiting_images':
 		$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 		$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 		$loc = 'mey_home'
-		$loc_arg = 'mey_bathroom'
+		$loc_arg = 'bathroom'
 	end
 end
 

+ 2 - 0
locations/hookup.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start':
 	lastwornpantynumber['hookup'] = pantywornnumber
 	$lastwornbratype['hookup'] = $braworntype
 	lastwornbranumber['hookup'] = brawornnumber
+	$lastwornclothingtype['hookup'] = $clothingworntype
+	lastwornclothingnumber['hookup'] = clothingwornnumber
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'
 	gs 'stat'

+ 33 - 37
locations/hookup_after.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = 'exit':
 end
 
 if $ARGS[0] = 'dress':
-	gs 'clothing', 'wear_last_worn'
-	if $lastwornpantytype['hookup'] ! '' and $lastwornpantytype['hookup'] ! 'none': gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-	if $lastwornbratype['hookup'] ! '' and $lastwornbratype['hookup'] ! 'none': gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
+	gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+	gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
+	gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
 	gs 'stat'
 end
 
@@ -1978,45 +1978,41 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
-	:dress_loop_start
-	if $lastwornpantytype['hookup'] ! 'none' and $pantyworntype = 'none' and hookup['panty_wear'] ! 1:
+	$hookup['dress_describe'] = ''
+	if $clothingworntype = 'nude':
+		if $lastwornpantytype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'pulling your panties up your legs'
+			if $lastwornbratype['hookup'] ! 'none' or $clothingworntype = 'nude': $hookup['dress_describe'] += ' and '
+		end
 		gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-		hookup['panty_wear'] = 1
-		$hookup['dress_describe'] = 'pulling your panties up your legs'
-	elseif $lastwornbratype['hookup'] ! 'none' and $braworntype = 'none' and hookup['bra_wear'] ! 1:
+		killvar 'lastwornpantytype'
+		killvar 'lastwornpantynumber'
+		
+		if $lastwornbratype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'fastening your bra around your chest'
+			if $clothingworntype = 'nude': $hookup['dress_describe'] += ' then '
+		end
 		gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
-		hookup['bra_wear'] = 1
-		$hookup['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back'
-	elseif $clothingworntype = 'nude':
-		gs 'clothing', 'wear_last_worn'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude' and hookup['dress_end'] ! 1:
-		if CloDress = 1 and $hookup['dress_top_wear'] ! 1 and $hookup['dress_skirt_wear'] ! 1:
-			if $hookup['dress_top_wear'] ! 1:
-				hookup['dress_top_wear'] = 1
-				$hookup['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif $hookup['dress_skirt_wear'] ! 1:
-				hookup['dress_skirt_wear'] = 1
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'smoothing your skirt out'
-			end
+		killvar 'lastwornbratype'
+		killvar 'lastwornbranumber'
+
+		gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'pulling your dress over your shoulders'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] = 'slipping your skirt up your legs'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		else
-			if CloSkirtShortness > 0 and hookup['skirt_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['skirt_wear'] = 1
-				$hookup['dress_describe'] = 'zipping your skirt up over your hips'
-			elseif hookup['pants_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['pants_wear'] = 1
-				$hookup['dress_describe'] = 'tugging your pants over your hips'
-			else
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'pulling your top over your breasts'
-			end
+			$hookup['dress_describe'] += 'tugging your pants over your hips'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		end
-	elseif hookup['dress_end'] = 1:
-		if CloSkirtShortness > 0:
-			'smoothing out your skirt'
+	else
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'checking your dress'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] += 'smoothing your skirt'
 		else
-			'straightening out your clothes'
+			$hookup['dress_describe'] += 'checking your clothes'
 		end
 	end
 	gs 'stat'

+ 1 - 1
locations/hookup_morning.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'guilt_excuses':
 		if stat['bf_cheated_on'] > 10:
 			'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
 		end
-		act'Continue':gt'hookup_morning','guilt3'
+		act'Continue':gt'hookup_morning','guilt2'
 	end
 end
 

+ 2 - 2
locations/hookup_talk.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'gross_condom':
 		if birth_control['think_safe'] = 1 and pillcon2 > 0:
 			act'I''m on the pill':
 				cla & *nl
-				npc_know_bc[$boy] = 1
+				gs'booty_call_stats', 'birth_control_know'
 				'"Not really," you smirk. "I''m on the pill."'
 				gs'hookup_after','pre'
 				gs'hookup_talk','pillow_talk1'
@@ -33,7 +33,7 @@ if $ARGS[0] = 'gross_condom':
 		elseif birth_control['think_safe'] = 1 and tabletkishot > 0:
 			act'I''m on the shot':
 				cla & *nl
-				npc_know_bc[$boy] = 1
+				gs'booty_call_stats', 'birth_control_know'
 				'"Not really," you smirk. "I''m on the shot."'
 				gs'hookup_after','pre'
 				gs'hookup_talk','pillow_talk1'

+ 24 - 11
locations/hotel_anna.qsrc

@@ -53,7 +53,7 @@ if ARGS[0] = 1:
 		'Feebly you respond, "I-i want to apologise, it was wrong of me to peep on you like that. I''m here to say you that I won''t do that again."'
 		'She peers straight at you, it feels like if she''s scanning through your soul. "As I said I usually encourage curiosity, but you need to know the limit of your skills. I mean: Would you be able to hack the KGB''s servers without being able to turn on a computer? But that''s not the point, I didn''t want to help you in becoming a spy."'
 		'She''s got a point, you are far from being a secret agent, and this is not the reason for you to be here of course. "Let me ask a question: Did you like what you saw?" She ask without any embarrassment.'
-		'You don''t know how you should answer, but it seems she''s not interested in reporting you. "Well I don''t know. I know a little about sex, but this is some kind of next level shit."</font> '
+		'You don''t know how you should answer, but it seems she''s not interested in reporting you. "Well I don''t know. I know a little about sex, but this is some kind of next level shit."'
 
 		act'Did I just say shit to Lariska''s mom?':
 			*clr & cla
@@ -114,7 +114,7 @@ if ARGS[0] = 2:
 		'"I don''t mean to be rude but most of the people I know would see this as some kind of perversion."'
 		'"Mmmm....What do you know about BDSM?"'
 		'"The things you have done in this room..."'
-		'"Sort of, but this is very reductive. BDSM is a popular acronym, it stands for: Bondage, Domination or Discipline, Submission or Sadism and Masochism. Those activities are obviously a part of it but not even close to the whole. It''s a lifestyle, and there''s no need to fulfil all of the criteria for you to be considered a BDSM practitioner; also a lot of "vanilla" activities are actually BDSM practices. It can be both fictional and practical, mental and physical. From an erotic spanking or a vanilla roleplay, from giving or accepting verbal commands or a simple dirty talk, through to a complex and intense full session. Limits are discussed and although they may be pushed, hard limits are never overstepped; as the matter of fact if something goes wrong we use a "safe word", usually "Red" to stop immediately. In short, we look out for each other."</font>'
+		'"Sort of, but this is very reductive. BDSM is a popular acronym, it stands for: Bondage, Domination or Discipline, Submission or Sadism and Masochism. Those activities are obviously a part of it but not even close to the whole. It''s a lifestyle, and there''s no need to fulfil all of the criteria for you to be considered a BDSM practitioner; also a lot of "vanilla" activities are actually BDSM practices. It can be both fictional and practical, mental and physical. From an erotic spanking or a vanilla roleplay, from giving or accepting verbal commands or a simple dirty talk, through to a complex and intense full session. Limits are discussed and although they may be pushed, hard limits are never overstepped; as the matter of fact if something goes wrong we use a "safe word", usually "Red" to stop immediately. In short, we look out for each other."'
 		gs 'hotel_anna', '2a'
 	end
 	act'I saw nothing!':
@@ -139,7 +139,7 @@ if $ARGS[0] = '2a':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/annaintrob1.jpg"></center>'
 		'"Who decides who plays those games and which games you play?"' 
-		'"It is decided by us. We speak about Dominance and submission, a D/s relationship for short; this can be for any duration, for an hour or a lifetime, usually within negotiated limits. The relationship will guide the roles, the games we play, and the limits within those games. A submissive is an individual who consents to give up power to a Dominant; there are different levels of submission and Dominance, for example a submissive can be a coca-cola, a light sub who only obeys the easy stuff or only when he/she feels like it, or a slave engaged into a Master/slave relationship. What really matters is not the games or the nature of those games but the relationship itself. Both will benefit from a relationship if it''s correctly built and supported. Just like any relationship, except for the sake of safety we set out rules first."</font>'
+		'"It is decided by us. We speak about Dominance and submission, a D/s relationship for short; this can be for any duration, for an hour or a lifetime, usually within negotiated limits. The relationship will guide the roles, the games we play, and the limits within those games. A submissive is an individual who consents to give up power to a Dominant; there are different levels of submission and Dominance, for example a submissive can be a coca-cola, a light sub who only obeys the easy stuff or only when he/she feels like it, or a slave engaged into a Master/slave relationship. What really matters is not the games or the nature of those games but the relationship itself. Both will benefit from a relationship if it''s correctly built and supported. Just like any relationship, except for the sake of safety we set out rules first."'
 		act'Oh!...emmmh...ok':
 			minut += 10
 			*clr & cla
@@ -197,7 +197,7 @@ if ARGS[0] = 3:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy1b.jpg"></center>'
-		'<font color = blue>"Crap even the reduction surgery wasn''t enough then, it''s always the same."'
+		'"Crap even the reduction surgery wasn''t enough then, it''s always the same."'
 		'You are surprised by such candid talk about cosmetic surgery'
 		'"Don''t mind me <<$pcs_nickname>>, the main thing is that you listen"'
 		'"In BDSM we use a lot of furniture, some are fixed, some not and some are semi-fixed. I cannot bring fixed furniture for obvious reasons, so we only have furniture that is not fixed and toys. Today we''ll look at some toys, next time furniture and restraining. The toys i''m showing you today can be used alone or with other toys. Some toys are for pain and pleasure in general, but others can be used to increase the sensations experienced during sexual acts. I can demonstrate one with you but wait until the end before you decide if you want a demonstration, first I''ll show you the items then you can make an informed choice, shall we start?" You nod.'
@@ -232,7 +232,7 @@ if $ARGS[0] = '3a':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy2c.jpg"></center>'
 		end
-		'<font color = blue>"We can divide the toys i''ve brought into different categories: beating, flogging, sensation play, pleasure and edgeplay. As you can imagine pain has a great role in BDSM, here we have two example of typical toys that can bring you pain: a paddle and a riding crop. You can easily find those items but without them you can use alternatives.'
+		'"We can divide the toys i''ve brought into different categories: beating, flogging, sensation play, pleasure and edgeplay. As you can imagine pain has a great role in BDSM, here we have two example of typical toys that can bring you pain: a paddle and a riding crop. You can easily find those items but without them you can use alternatives.'
 		'So paddle is typically used for spanking, but if you don''t have one you can use your bare hand or the back of a hair brush. While crop is more specialist it can be found in a sex shop of course or somewhere you''d buy horse riding equipment. They are used to whip across someone''s butt and also intimate areas.'
 		'We usually start with a warm up using some pain before intercourse as this allows the sex acts to last longer and builds the intensity, for this the riding crop is the most popular. Next we have some flogging tools, they are quite self explanatory. The martinet is the smallest whip we have with a very short handle and multiple tails, it gives great control and a spread of sensations compared to the riding crop which takes a bit of skill to use accurately and is very focused but can deliver a lot more pain."'
 		if annatoy = 3: 
@@ -259,7 +259,7 @@ if $ARGS[0] = '3b':
 		'"Exactly! That means you were listen to me, good I can finally loosen my top. That leather dress leaves my poor breasts numb, I think it is a couple of sizes too small." Anna let''s her top fall away completely.'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy3cb.jpg"></center>'
-		'"Exactly! That means you were listen to me, good after a day in that tight leather dress even this gown feels restricting."</font> Anna start to disrobe herself.'
+		'"Exactly! That means you were listen to me, good after a day in that tight leather dress even this gown feels restricting." Anna start to disrobe herself.'
 	end
 	'"After a good warm up we can move to some more serious toys like the quirt (or short whip). It''s used during the main part of the session. It combines parts of both the crop and the martinet having a long handle and these falls that from the whip are which are quite short. Cowboys use them to hit cattle from their horses and they can cause a lot of pain so they must be used carefully.'
 	'With a whip or none rigid implement the face and head are forbidden places to strike unless the eyes are covered, this is important these toys can be dangerous and we should never do something that could cause lasting harm to another.'
@@ -378,13 +378,13 @@ if $ARGS[0] = '4a':
 		'I''ll start with something really basic: ropes and tape. Restriction is meant to be both physical and mental within BDSM, we''ll stick to the physical restriction for now as mental restraint is a more complex subject for another time.'
 		'The basics of restriction is to limit movement. For this you can use ropes, tape, chains and cuffs securing the last two with padlocks and specialist items such as arm binders and straight jackets. There are other ways, just lying on top of someone or holding their arms or legs together will restrain someone.'
 		'Anyway, physical restriction is not limited to preventing movement it can reduce it too. For this you could use very high heels, chains between arms and/or legs, special tight skirts (called hobble skirts), a leash like you''d use on a pet or small spaces like a chest or cage. Anything that prevents someone from moving with the freedom they would otherwise have.'
-		'These can be used in normal play or to discipline and training a sub and in that case you can also use something like this chastity belt. It''s main purpose is to prevent sexual activities, not orgasms as you can see this chastity belt has a built in vibrator... . " </font> '
+		'These can be used in normal play or to discipline and training a sub and in that case you can also use something like this chastity belt. It''s main purpose is to prevent sexual activities, not orgasms as you can see this chastity belt has a built in vibrator... . "'
 		act 'Continue':
 			minut += 10
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr3.jpg"></center>'
-			'<font color = blue>"An important aspect is what is called sensation play. As I said last time warm up increase both the duration and the sensation of a session; some restriction items can be used with the same purpose: here we have a double breast clamp, some suspension cuffs and an head harness with a blindfold and a gag. To be suspended or to lose sight during a session will increase the feel both for sex or pain.'
+			'"An important aspect is what is called sensation play. As I said last time warm up increase both the duration and the sensation of a session; some restriction items can be used with the same purpose: here we have a double breast clamp, some suspension cuffs and an head harness with a blindfold and a gag. To be suspended or to lose sight during a session will increase the feel both for sex or pain.'
 			'The breast clamp can increase the sensitivity of your boobs and ropes can be used to similar effect. Much like in some vanilla sex we use roleplay to create the right mood or environment, we go a little further with it and that''s when something like this collar and leash come in.'
 			'While it might seem self explanatory you as a restraint and to support the sub and Dom roles it is commonly used in what we call pet play: A form of role play in which one or more participants act like animals. Pet play can be very serious with the pets being treated as owned much like real pets, that is in the world of M/s relationships. Such pets will sometimes need to be tamed through discipline and training, but well cared for and behaved pets are extremely faithful making them perfect slaves."'
 			act 'This would be a bad time to bark':
@@ -432,19 +432,32 @@ if ARGS[0] = 5:
 	*clr & cla 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract00.jpg"></center>'
-	'You hear some rumors coming from Anna''s room so you decide to hide yourself. Maybe Anna forgot about your encounter...anyway you decide to not disturb her. Once you realize maybe it''s the better choice to leave for you...."...Don''t worry...i''ll bring her back safe..."<font color = blue> "I''m not worried about her health...but the time i''ll need for her to cool off." </font>... . "Oh...well...a little "charge" can''t be harmful....hehehe. I''ll pass one of those week sweety to take her...i owe you one Kiss kiss... .". You''ve seen this woman with Anna before; it''s a friend of her. Anyway she''s leaving...probably Anna didn''t forget about your chit-chat.... . Once you see the woman go away you made your step through Anna''s door...<font color = #DC143C> Emmmh...Anna are you in? </font><br><font color = blue> <<$pcs_nickname>>! Don''t stand here like a potato in a land...come in! </font>'
+	'You hear some talking from Anna''s room which you guess to be a client. Maybe Anna forgot about your encounter or perhaps her client is very early? You act like a guest and walk pst her room thinking that maybe it would be better to leave as you over hear the conversation:'
+	'"Don''t worry i''ll bring her back safe."'
+	'"I''m not worried about her health, just how long it would take her to recover."'
+	'"Oh, I told you what the client wanted and I''ll make sure they stick to it, she''ll be back to you good as new sweetie, now stop worrying and get out of here." You here two kisses as they say goodbye.'
+	'As the other woman leaves you recognise her as someone you''ve seen before a friend of Anna. Seems Anna didn''t forget about your chit-chat.'
+	'Once have made sure the woman has got in the lift you make your way to Anna''s door. "Anna, are you here?"'
+	'"Don''t stand here like a potato in the soil, come in!"'
 	act'Enter':
 		minut += 10
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract01.jpg"></center>'
-		'<font color = #DC143C> Hi Anna how are y....goooh </font> She squeeze you hard hugging you...that her breast expand all over your body...<br><font color = blue> <<$pcs_nickname>> my dear! I''m totally fine now that you are here! I was waiting for you...well i wasn''t alone but my guest know i was waiting for someone...anyway... tell me about you. I miss our chit chat. </font><br><font color = #DC143C> "Oh well...i just arrived...same to me, i was waiting for our chit chat too." </font><br><font color = blu> "My dear...i''ve got a surprise for you today....a big one let met me say." </font><br><font color = #DC143C> "???" </font>'
+		'"Hi Anna how are y....ooof." She squeeze you hard in a hug, her large breasts expanding all over your body smothering your greeting in your lungs making it impossible to finish the sentence.'
+		'"<<$pcs_nickname>> my dear! I''m totally fine now that you are here! I was waiting for you, well i wasn''t alone but my guest knew I was waiting for someone, anyway tell me all about you. I miss our chit chat."'
+		'"Oh well I just got here, I saw your guest but she didn''t see me as I thought it was a client and was discreet, I have missed our chit chat too."'
+		'"My dear, you are like a spy. My friend would have liked to meet you I''m sure but that can wait. I''ve got a surprise for you today, a very special one that will be great teaching you about our special lifestyle."'
 		act'???':
 			minut += 10
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract02.jpg"></center>'
-			'<font color = blue> "Practical intercourse!" </font><br><font color = #DC143C> "WHAT? Wait...we never spoke about that..." </font><br><font color = blu> "Oh! You though...! No no...don''t worry. You will be only a spectator for our intercourse... . I assure you you will learn more than peeping that way. You will see what an intercourse really is...nothing too much serious anyway, and we got time restriction. But you will be on the first line sight...oh about that. No interaction allowed... that''s a rule for a moment and i have not reason to break that actually." </font><br><font color = #DC143C> "A spectator uh?" </font><br><font color = blue> "Exactly! Care to join me wearing clothes? You can try one if you like..." </font>'
+			'"Todays lesson: ''Practical intercourse!''"'
+			'"WHAT? Wait...we never spoke about that." You exclaim unsure how to process this huge escalation in your studies.'
+			'"Oh! You thought... No no, don''t worry. You will be only a spectator for the intercourse. You''ve always been one for peeping and this time you can actually learn something." She smiles at her little dig. "You will see what intercourse really is for those in our community, but we have got a time restriction. You will be in the room, clearly visible and with full view of what is happening but no interaction allowed. That''s a rule for this encounter and I will not have you break that."'
+			'"A spectator huh?"'
+			'"Exactly! Care to join me? You must wear something suitable."'
 			act'I think i''ll help you...(I''m sure i will see her boobs that way...hehehehe...mmm....i should do something for mine....awwww...)':
 				minut += 10
 				*clr & cla

+ 10 - 0
locations/intro_city_select.qsrc

@@ -96,6 +96,15 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
+	!! default friendship is 30 for all  npcs not covered by the other options below.
+	gs 'npc_relationship', 'defaultnotschool'
+	!! default friendship is 30 for all for all former classmates
+	gs 'npc_relationship', 'defaultfriendship'
+	!! Sets family and friends relationship values and overwrites the npcstatic data for them
+	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
+	gs 'npc_relationship', 'default_family_friends'
+	npc_rel['A18'] = 1
+
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'
@@ -1012,6 +1021,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_traits['nerd_points'] = -50
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 19
+		pcs_inhib = 30
 		pcs_stren = 65
 		pcs_react = 45
 		pcs_jab = 20

+ 2 - 0
locations/intro_sg_select.qsrc

@@ -51,6 +51,8 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
+	gs 'npc_relationship', 'defaultnotschool'
+
 	if $start_type[1] ! 'tg':
 		!!Default Names
 		$pcs_firstname = 'Svetlana'

+ 26 - 17
locations/intro_sg_tg.qsrc

@@ -6,12 +6,28 @@ $start_type[1] = 'tg'
 $start_type = 'sg_tg'
 
 if $ARGS[0] = 'start':
+	$locM = 'intro_sg_tg'
+	$locM_arg = 'start'
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_ivan.jpg"></center>'
 	'You are Mikhail Ivanov.'
 	*nl
 	'Your parents died shortly after you were born and your only remaining relative, your great uncle Ivan (pictured), took you in. Your uncle has always made it clear that he took you in as a courtesy to your parents, not to become one himself. You never became close, resulting in a lonely childhood.'
+
+	!date_toggle = args[1]
+	if birthday < 10 and birthmonth < 10:
+		$startdob = 'Your birthday: <B>0<<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday < 10 and birthmonth >= 10:
+		$startdob = 'Your birthday: <B><<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday >= 10 and birthmonth < 10:
+		$startdob = 'Your birthday: <B>0<<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday >= 10 and birthmonth >= 10:
+		$startdob = 'Your birthday: <B><<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	end
+
+	'<a href= "exec:gt ''intro_customization'', ''birthday''"><<$startdob>></a>.'
+
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/1.jpg"></center>'
@@ -161,11 +177,20 @@ if $ARGS[0] = 'settings':
 
 	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
+	gs 'npc_relationship', 'defaultnotschool'
+
 	!! Set all schoolkids to 30 rel except for outcasts
 	gs 'npc_relationship', 'defaultfriendship'
 
 	!! Set defaults for family and friends
-	gs 'npc_relationship', 'default_family_friends', 'cursedschoolboy'
+	gs 'npc_relationship', 'default_family_friends'
 
 	!! Sveta was an outcast (good girl start)
 	gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
@@ -258,22 +283,6 @@ if $ARGS[0] = 'settings':
 	money = 2000
 	prezikProver = 3
 	brothersawpirsF = 0
-
-	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/16.jpg"></center>'
-	'Your name is Mikhail Ivanov. You''ve got blond hair and blue eyes. Your parents died shortly after you were born and your great uncle Ivan took you in. He works at a construction company out of one of the suburbs of St. Petersburg. He''s a man''s man and has never been very close to you, choosing to let you make your own way as long as it does not embarrass him publicly. You''ve grown to be quite independent, but lack any real defining qualities.'
-
-	!date_toggle = args[1]
-	if birthday < 10 and birthmonth < 10:
-		$startdob = 'Your birthday: <B>0<<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
-	elseif birthday < 10 and birthmonth >= 10:
-		$startdob = 'Your birthday: <B><<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
-	elseif birthday >= 10 and birthmonth < 10:
-		$startdob = 'Your birthday: <B>0<<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
-	elseif birthday >= 10 and birthmonth >= 10:
-		$startdob = 'Your birthday: <B><<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
-	end
-
-	'<a href= "exec:gt ''intro_customization'', ''birthday''"><<$startdob>></a>.'
 	
 	gt 'intro_sg_tg', 'intro_6_looks'
 end

+ 4 - 3
locations/journal.qsrc

@@ -224,7 +224,7 @@ if $ARGS[0] = 'relationstab':
 		if npc_rel['A18'] > 0: 'Friendship with Christina:' & gs 'journal', 'relindex', 'A18'
 		if npc_rel['A19'] > 0: 'Friendship with Lina:' & gs 'journal', 'relindex', 'A19'
 		if npc_rel['A23'] > 0: 'Friendship with Albina:' & gs 'journal', 'relindex', 'A23' 
-		if npc_rel['A149'] > 0: 'Friendship with Lazat:' & gs 'journal', 'relindex', 'A149' 
+		if npc_rel['A149'] > 0: 'Friendship with Lazar:' & gs 'journal', 'relindex', 'A149' 
 		if npc_rel['A150'] > 0: 'Friendship with Erast:' & gs 'journal', 'relindex', 'A150' 
 		if npc_rel['A141'] > 0: 'Friendship with Veronika:' & gs 'journal', 'relindex', 'A141' 
 		if npc_rel['A165'] > 0: 'Friendship with Vanya:' & gs 'journal', 'relindex', 'A165' 
@@ -263,7 +263,7 @@ if $ARGS[0] = 'relationstab':
 		
 		if npc_rel['A7'] > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7' 
 		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159' 
-		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
+		if soniaPS > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
 		if fedormasha = 1 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
 		
 		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
@@ -624,7 +624,8 @@ end
 
 if $ARGS[0] = 'relindex':
 
-    *pl & gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+    gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+	*nl
 end
 
 if $ARGS[0] = 'leaveactions':

+ 1 - 1
locations/journal_quests.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 
 	'<center><h2>Quests</h2></center>'
 	
-	if metmira = 1:
+	if npc_known['A60'] = 1:
 		if meadow > 0:
 			'<center><h3>Miroslava Maximova</h3></center>'
 			*nl

+ 11 - 11
locations/katjaEvDin.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'kiss':
 				'You remove her hands and smile at Katja.'
 
 				act 'Further':
-					if $loc = 'Katja_dorm':
+					if $loc = 'katja_dorm':
 						gt 'katja_dorm', 'talk'
 					else
 						gt 'KatjaHomeTalk'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'kiss':
 				act 'Accept Katja''s decision':
 					gs 'arousal', 'end'
 					gs 'stat'
-					if $loc = 'Katja_dorm':
+					if $loc = 'katja_dorm':
 						gt 'katja_dorm', 'talk'
 					else
 						gt 'KatjaHomeTalk'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'kiss':
 							'You remove her hands and smile at Katja.'
 
 							act 'Further':
-								if $loc = 'Katja_dorm':
+								if $loc = 'katja_dorm':
 									gt 'katja_dorm', 'talk'
 								else
 									gt 'KatjaHomeTalk'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'kiss':
 		'Katja turns and begins collecting books, pretending that nothing has happened.'
 
 		act 'Talk about something else': 
-			if $loc = 'Katja_dorm':
+			if $loc = 'katja_dorm':
 				gt 'katja_dorm', 'talk'
 			else
 				gt 'KatjaHomeTalk'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'strapon_main':
 	gs 'arousal', 'end'
 
 	act 'Get dressed and talk about something else':
-		if $loc = 'Katja_dorm':
+		if $loc = 'katja_dorm':
 			gt 'katja_dorm', 'talk'
 		else
 			gt 'KatjaHomeTalk'
@@ -434,7 +434,7 @@ if $ARGS[0] = 'sex':
 			gs 'arousal', 'end'
 
 			act 'Talk about something else':
-				if $loc = 'Katja_dorm':
+				if $loc = 'katja_dorm':
 					gt 'katja_dorm', 'talk'
 				else
 					gt 'KatjaHomeTalk'
@@ -474,7 +474,7 @@ if $ARGS[0] = 'sex':
 
 			act 'Talk about something else':
 				gs 'arousal', 'end'
-				if $loc = 'Katja_dorm':
+				if $loc = 'katja_dorm':
 					gt 'katja_dorm', 'talk'
 				else
 					gt 'KatjaHomeTalk'
@@ -534,7 +534,7 @@ if $ARGS[0] = 'kuni':
 	else
 		act 'Talk about something else':
 			gs 'arousal', 'end'
-			if $loc = 'Katja_dorm':
+			if $loc = 'katja_dorm':
 				gt 'katja_dorm', 'talk'
 			else
 				gt 'KatjaHomeTalk'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'fisting':
 	else
 		act 'Talk about something else':
 			gs 'arousal', 'end'
-			if $loc = 'Katja_dorm':
+			if $loc = 'katja_dorm':
 				gt 'katja_dorm', 'talk'
 			else
 				gt 'KatjaHomeTalk'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'kuni_p':
 	else
 		act 'Talk about something else':
 			gs 'arousal', 'end'
-			if $loc = 'Katja_dorm':
+			if $loc = 'katja_dorm':
 				gt 'katja_dorm', 'talk'
 			else
 				gt 'KatjaHomeTalk'
@@ -805,7 +805,7 @@ if $ARGS[0] = 'kuni_dom':
 								'She falls back on her bed, still breathing hard and looking at you with a somewhat possessive look as you lie 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, but that was beyond description. We''re going to have to do that again sometime." 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.'
 
 								act 'Talk about something else':
-									if $loc = 'Katja_dorm':
+									if $loc = 'katja_dorm':
 										gt 'katja_dorm', 'talk'
 									else
 										gt 'KatjaHomeTalk'

+ 3 - 2
locations/katja_chat.qsrc

@@ -222,8 +222,9 @@ if $ARGS[0] = 'chat1':
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 	elseif locat['katja'] = 44:
-	
-		if katjaQW['QWstage'] >= 2 and locat['katja'] = 44 and katjaQW['shopping_day'] ! daystart:
+		'This is where Katja really is in her element. She drags you around from window to window, commenting on the clothes, shoes, jewelry, makeup  and more. It''s like following a hurricane, you barely have time to notice that is in the store window before she drags you to the next.'
+		'This goes on for a while, but she does start to slow down and actually pay attention to what you think about the things id comments on.'
+		if katjaQW['QWstage'] >= 2 and katjaQW['shopping_day'] ! daystart:
 			act 'Suggest trying on some clothes': gt 'katja_city', 'clothes_start1'
 		end
 	end

+ 5 - 1
locations/katja_city.qsrc

@@ -5,6 +5,7 @@
 
 if $ARGS[0] = 'metro':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/waiting_metro.jpg"></center>'
+	gs 'katja_meynold_schedule'
 	'You walk to the Metro station and '+iif(money >= 16, 'pay the fare.', ' since you don''t have any money Katja pays the fare for you.')+' You then go down to the platform and chat while you wait for the train.'
 	if money >= 16: money -= 16
 	act 'Wait for the train':
@@ -39,6 +40,9 @@ if $ARGS[0] = 'metro_destination':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Leaving_metro.jpg"></center>'
 	if locat['katja'] = 44:
 		minut += 5
+		$loc = 'torgcentr'
+		$location_type = 'public_indoors'
+		$menu_loc = 'torgcentr'
 		gs 'stat'
 		'You exit the metro station and walk to the Galleria shopping mall.' 
 		act 'Start shopping': gt 'katja_chat', 'chat1'
@@ -594,7 +598,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_strip':
 	end
 end
 
-if $ARGS[0] = 'pussy_cat_outfit1_strip2':
+if $ARGS[0] = 'pussy_cat_outfit2_strip2':
 	gs 'arousal', 'erotic_nudity', 3
 	gs 'arousal', 'end'
 	katjaQW['horny'] += 5

+ 4 - 4
locations/katja_uni_sex.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'library_licking2':
 		katja_library_consent = 2
 		'After a moments pause, you hear Katja reply with a low sigh. "Yes... Don''t stop <<$pcs_nickname>>... Please..."'
 		act 'Eat Katja''s pussy': gt 'katja_uni_sex', 'library_licking3'
-	elseif (katjaQW['slut'] >= 40 and katjaQW['horny'] > 50)  or katja['slut'] >= 80:
+	elseif (katjaQW['slut'] >= 40 and katjaQW['horny'] > 50)  or katjaQW['slut'] >= 80:
 		katja_library_consent = 1
 		'After a moments pause, Katja replies in a low voice. "Stop it <<$pcs_nickname>>. Not here. Later." She does not sound completely convincing though.'
 
@@ -178,9 +178,9 @@ if $ARGS[0] = 'library_licking2':
 				gs 'stat'
 				'You crawl out from under the table and continue to watch Katja while she finishes studying.'
 			end
-			gs 'katja_uni_sex', 'library_lickiing_leave_actions'
+			gs 'katja_uni_sex', 'library_leave_actions'
 		end
-	elseif katjaQW['horny'] > 50 or katja['slut'] >= 60:
+	elseif katjaQW['horny'] > 50 or katjaQW['slut'] >= 60:
 		'Katja immediately reacts by clamping her legs together with your head still between them. "Stop it <<$pcs_nickname>>. This isn''t the place for such things. Get out from there," she says in a hard tone.'
 
 		gs 'willpower', 'cuni', 'force', 'hard'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'library_licking2':
 	end
 end
 
-if $ARGS[0] = 'library_licking2':
+if $ARGS[0] = 'library_licking3':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_licking3.jpg"></center>'
 	if katja_library_consent = 2:
 		gs 'arousal', 'cuni_give', 2, 'lesbian'

+ 2 - 8
locations/lusso.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	act 'View bras': minut += 5 & gt 'lusso', 'bras'
 	
-!!	act 'View bodysuits': minut += 5 & gt 'lusso', 'bodysuit'
+	act 'View bodysuits': minut += 5 & gt 'lusso', 'bodysuit'
 end
 
 if $ARGS[0] = 'panties':
@@ -102,7 +102,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:looplusso_bodysuit
-		if lusso_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if lusso_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 90:jump 'looplusso_bodysuit'
 end
@@ -110,13 +110,7 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if lusso_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'lusso', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'lusso',i, 1000
-
 end
 
 

+ 1 - 1
locations/mey_vika_events.qsrc

@@ -386,7 +386,7 @@ if $ARGS[0] = 'near_school':
 				'"I don''t really know what the two of them are doing." Katja answers shortly and starts walking away, not wanting to keep the conversation going.'
 
 				mey_vika['mey_vika_qw'] = 2
-				act 'Stalk them': minut += rand(5,15) & gt 'pav_park', 'start'
+				act 'Stalk them': minut += 10 & gt 'pav_park', 'start'
 			end
 		elseif mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
 			gs 'mey_vika_events', 'park_qw'

+ 4 - 4
locations/miroslava.qsrc

@@ -50,13 +50,13 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 	'Mira is a sociable girl. She is <<girlage>> years old. She lives with her father, who recently moved in here because of his considerable debts to some disreputable men in the city. He had to sell all the family''s property, including an apartment in the city centre. With the money left over, they could only afford to buy a house in a rundown village like this one.'
 
 	!npc_rel['A60'] is the measure of your friendship with Mira
-	if npc_rel['A60'] < 5:
+	if npc_rel['A60'] < 25:
 		'You two have a strained relationship.'
-	elseif npc_rel['A60'] < 15:
+	elseif npc_rel['A60'] < 45:
 		'You two have a normal relationship.'
-	elseif npc_rel['A60'] < 30:
+	elseif npc_rel['A60'] < 65:
 		'You have a good relationship with Mira.'
-	elseif npc_rel['A60'] < 50:
+	elseif npc_rel['A60'] < 80:
 		'You two have a great relationship.'
 	else
 		'You and Mira are best friends.'

+ 1 - 1
locations/model_mari.qsrc

@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'mari_first_nude':
 		if modelfoto['fullnude'] = 0:
 			gs'model_mari', 'mari_first_nude2'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading3.jpg"></center>'
+			gs'model_mari', 'pc_nude_debut_talk'
 		end
 	end
 end

+ 1 - 5
locations/moncheri.qsrc

@@ -221,7 +221,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopmoncheri_bodysuit
-		if boutique_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if moncheri_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 50:jump 'loopmoncheri_bodysuit'
 end
@@ -229,10 +229,6 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if boutique_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'moncheri', 'bodysuit'
-	end
 
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'moncheri',i, 2000
 

+ 1 - 1
locations/music_bedroompractice.qsrc

@@ -2,7 +2,7 @@
 !! TODO: Practice and Rehearsal - Rename the file too. F
 if $ARGS[0] = 'guitar':
 	*clr & cla
-	minut += 30
+	minut += 15
 	ml_performance['performed_minutes'] += 15
 	ml_performance['total_time_performed'] += 15	
 	pcs_mood += 5

+ 5 - 1
locations/natbelEv.qsrc

@@ -352,7 +352,10 @@ if $ARGS[0] = 'carrybooks':
 		'Natasha grabs both of your bags and you head to school.'
 		act 'Go to school': gt 'gschool_grounds', 'main'	
 	end
-	act 'Go to school': gt 'gschool_grounds', 'main'	
+	act 'Go to school': 
+		minut += 9
+		gt 'gschool_grounds', 'main'	
+	end
 end
 
 if $ARGS[0] = 'schoolwalk':
@@ -363,6 +366,7 @@ if $ARGS[0] = 'schoolwalk':
 		'As you reach the bottom of the stairs, you notice Kolka coming down as well.'
 		'Deciding to tease him a bit you grab the bottom of Natasha''s skirt and pull it up while you bend over yourself to show him both of your asses.'
 		'Natasha quickly slaps your hand away and the two of you resume your walk to school. As you exit the hall you can''t hear Kolka''s footsteps. He must have stopped in his tracks at the sight.'
+		minut += 5
 		act 'Continue on to school': gt 'gschool_grounds', 'main'
 	else
 		gt 'gschool_grounds', 'main'

+ 10 - 1
locations/natbel_cp_1.qsrc

@@ -50,7 +50,9 @@ end
 
 !! This is the book carrying event in Natasha''s questline -- needs a check to see if it isn''t a holiday
 if $ARGS[0] = 'carrybooks':
+	minut += 4
 	menu_off = 1
+	gs 'stat'
 	if NatbelQW['QWstage'] = 4: NatbelQW['QWstage'] = 5
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/natgetreadyschool.jpg"></center>'
@@ -70,6 +72,7 @@ if $ARGS[0] = 'carrybooks':
 				'"We have some time before school." You tell her while you start pulling off her skirt and panties.'
 				'"Today you''ll be wearing them a little differently." You say, pushing her back on the couch. "Open your legs."'
 				'Natasha obediently opens her legs for you. Showing off her pretty pussy. Not wasting any time you start playing with her, first rubbing her lips, then focussing more on her clit as you watch closely while Natasha''s pussy gets wetter and wetter.'
+				minut += 5 
 				act 'Stuff her panties':
 					*clr & cla
 					NatbelQW['panty_stuff_day'] = daystart
@@ -79,6 +82,8 @@ if $ARGS[0] = 'carrybooks':
 					'When there''s only enough left to easily grab on in case you''d want to pull them out she stops and looks at you expectantly. "Like this <<$pcs_nickname>>?"'
 					'You reach down and push the last bit inside as well, holding them in with your finger for a bit before pulling your finger out again.'
 					'"This is how you''ll wear your panties for me at school today Natasha." You tell her. "Now put your skirt back on or we''ll be late.'
+					minut += 3
+					gs 'stat'
 					act 'Go to school': gt 'natbelEv', 'schoolwalk'
 				end
 			end
@@ -105,7 +110,10 @@ if $ARGS[0] = 'carrybooks':
 		'Natasha grabs both of your bags and you head to school.'
 		act 'Go to school': gt 'gschool_grounds', 'main'	
 	end
-	act 'Go to school': gt 'gschool_grounds', 'main'	
+	act 'Go to school': 
+		minut += 9
+		gt 'gschool_grounds', 'main'
+	end	
 end
 
 if $ARGS[0] = 'schoolwalk':
@@ -116,6 +124,7 @@ if $ARGS[0] = 'schoolwalk':
 		'As you reach the bottom of the stairs, you notice Kolka coming down as well.'
 		'Deciding to tease him a bit you grab the bottom of Natasha''s skirt and pull it up while you bend over yourself to show him both of your asses.'
 		'Natasha quickly slaps your hand away and the two of you resume your walk to school. As you exit the hall you can''t hear Kolka''s footsteps. He must have stopped in his tracks at the sight.'
+		minut += 5
 		act 'Continue on to school': gt 'gschool_grounds', 'main'
 	else
 		gt 'gschool_grounds', 'main'

+ 1 - 1
locations/nerd_game_night.qsrc

@@ -911,7 +911,7 @@ if $ARGS[0] = 'necromancer_adventure':
 	act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 end
 		
-if $ARGS[0] = 'mansion_adventure':
+if $ARGS[0] = 'treasure_map__adventure':
 	*clr & cla
 	nerd_game['treasure_map_adventure'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'

+ 71 - 0
locations/npc_finder.qsrc

@@ -0,0 +1,71 @@
+# npc_finder
+
+*clr
+gs 'obj_din', 'cheattabs'
+'<a href="exec: gt ''npc_finder'', ''finder''">Enter the ID of the character.</a>'
+if $ARGS[0] = 'finder':
+    $looking = input ('ID (like <i>A17</i>)')
+    gt 'npc_finder'
+end
+
+if $looking ! '':
+    '<br><br>'
+    'Found character:'
+    '<br>'
+    '<<$npc_pic[''<<looking>>'']>>'
+    'DNA string: <<$npc_dna[''<<$looking>>'']>>'
+    'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
+    if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
+    'Intelligence: <<npc_intel[''<<$looking>>'']>>'
+    if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
+    if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
+    if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
+    if npc_haircol['<<$looking>>'] = 0:
+        'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
+    elseif npc_haircol['<<$looking>>'] = 1:
+        'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
+    elseif npc_haircol['<<$looking>>'] = 2:
+        'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+    else
+        'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+    end
+    if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
+    'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
+    'Height: <<npc_height[''<<$looking>>'']>>'
+    if npc_gender['<<$looking>>'] = 0:
+        'Gender: male'
+        'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
+        'Dick length: <<npc_dick[''<<$looking>>'']>>'
+        'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+    else
+        'Gender: female'
+        'Breast size: <<npc_bust[''<<$looking>>'']>>'
+    end
+    if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
+    if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
+    if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
+    if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+    if $npcvendisease = '': $npcvendisease = 'none'
+    'Veneral diseases: <<$npcvendisease>>'
+    'Sexual acts with PC: <<npc_sex[''$looking'']>>'
+    'Perversion: <<npc_perv[''$looking'']>>'
+    'Notes: <<$npc_notes[''<<$looking>>'']>>'
+    ''
+    'Found relationships:'
+    npctemp = 0
+    :relationshipfinder
+        gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
+        if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
+            '<br>ID: A<<npctemp>>'
+            'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
+            'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+            'Relationship type: <<$gen_relationship>>'
+        end
+    if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'
+    killvar 'npctemp'
+    killvar 'npcvendisease'
+    killvar 'looking'
+end
+
+--- npc_finder ---------------------------------
+

+ 13 - 26
locations/npc_relationship.qsrc

@@ -158,32 +158,19 @@ end
 
 !! Family and friends
 if $ARGS[0] = 'default_family_friends':
-	if $ARGS[1] = 'cursedschoolboy':
-		gs 'npc_relationship', 'set', 'A28', 60	& ! stepdad (Vladimir)
-		gs 'npc_relationship', 'set', 'A29', 60	& ! mother (Natasha)
-		gs 'npc_relationship', 'set', 'A30', 50	& ! aunt Luda
-		gs 'npc_relationship', 'set', 'A31', 50	& ! grandma (Elena)
-		gs 'npc_relationship', 'set', 'A32', 50	& ! grandpa (Zlatek)
-		gs 'npc_relationship', 'set', 'A33', 70	& ! Anya
-		gs 'npc_relationship', 'set', 'A34', 50	& ! Kolka
-		
-		npc_rel['A11'] = 40		& ! Vasily Shulgin
-	else
-	 !! schoolgirl
-		gs 'npc_relationship', 'set', 'A28', 50	& ! stepdad (Vladimir)
-		gs 'npc_relationship', 'set', 'A29', 50	& ! mother (Natasha)
-		gs 'npc_relationship', 'set', 'A30', 50	& ! aunt Luda
-		gs 'npc_relationship', 'set', 'A31', 50	& ! grandma (Elena)
-		gs 'npc_relationship', 'set', 'A32', 50	& ! grandpa (Zlatek)
-		gs 'npc_relationship', 'set', 'A33', 70	& ! Anya
-		gs 'npc_relationship', 'set', 'A34', 50	& ! Kolka
-		
-		gs 'npc_relationship', 'set', 'A11', 60	& ! Vasily Shulgin
-		!! default friendship of 40 with Mitka 20 with Kolyamba and Vasyan in Gadukino
-		gs 'npc_relationship', 'set', 'A63', 40
-		gs 'npc_relationship', 'set', 'A62', 20
-		gs 'npc_relationship', 'set', 'A61', 20
-	end
+	gs 'npc_relationship', 'set', 'A28', 50	& ! stepdad (Vladimir)
+	gs 'npc_relationship', 'set', 'A29', 50	& ! mother (Natasha)
+	gs 'npc_relationship', 'set', 'A30', 50	& ! aunt Luda
+	gs 'npc_relationship', 'set', 'A31', 50	& ! grandma (Elena)
+	gs 'npc_relationship', 'set', 'A32', 50	& ! grandpa (Zlatek)
+	gs 'npc_relationship', 'set', 'A33', 70	& ! Anya
+	gs 'npc_relationship', 'set', 'A34', 50	& ! Kolka
+	
+	gs 'npc_relationship', 'set', 'A11', 60	& ! Vasily Shulgin
+	!! default friendship of 40 with Mitka 20 with Kolyamba and Vasyan in Gadukino
+	gs 'npc_relationship', 'set', 'A63', 40
+	gs 'npc_relationship', 'set', 'A62', 20
+	gs 'npc_relationship', 'set', 'A61', 20
 end
 
 

+ 10 - 3
locations/npcgeneratec.qsrc

@@ -25,9 +25,12 @@ npctempgage = ARGS[2]
 !! 4 - St. Petersburg City Center
 temp_location = ARGS[3]
 
+
+dont_know_npc_name = ARGS[4]
+
 !! For example
-!! gs 'npcgeneratec', 0, 'stranger', rand(18,45)
-!! Which would generate a male named stranger between ages of 18 and 45
+!! gs 'npcgeneratec', 0, 'stranger', rand(18,45), 3, 1
+!! Which would generate a male named stranger between ages of 18 and 45 who lives in the St. Petersburg Residential Area who will be remembered as ''stranger''
 
 
 if temp_location = 0:
@@ -209,7 +212,11 @@ gs 'npcrnamefile', 'rusSur'
 $npc_firstname[$npclastgenerated] = $npctempgn[1]
 $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
-$npc_usedname[$npclastgenerated] = $npctempgn[0]
+if dont_know_npc_name = 0 or $npctempgn[0] = '':
+	$npc_usedname[$npclastgenerated] = $npctempgn[1]
+else
+	$npc_usedname[$npclastgenerated] = $npctempgn[0]
+end
 npc_intel[$npclastgenerated] = rand(1,npctempc2)
 
 !! set them to sober

+ 1 - 1
locations/obj_din.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'cheattabs':
 	if menu_page = 15:
 		$cheat_tab_list += '<th>NPC Finder</th>'
 	else
-		$cheat_tab_list += '<th><a href="exec:menu_page = 15 & gs ''NPCFinder''">NPC Finder</a></th>'
+		$cheat_tab_list += '<th><a href="exec:menu_page = 15 & gs ''npc_finder''">NPC Finder</a></th>'
 	end
 
 	$cheat_tab_list += '<tr>'

+ 26 - 8
locations/park_walkevents.qsrc

@@ -864,22 +864,40 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'running_image':
+	cla & *clr
 	if month >= 11 or month <= 3:
 		if daystage = 2 or daystage = 3:
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jog1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog1.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jogn1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn1.jpg"></center>'
 		end
 	else
 		if daystage = 2 or daystage = 3:
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jog2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jogn2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn2.jpg"></center>'
 		end
 	end
 end
 
 
+if $ARGS[0] = 'run_cooldown_image':
+	cla & *clr
+	if month >= 11 or month <= 3:
+		if daystage = 2 or daystage = 3:
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cool1.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cooln1.jpg"></center>'
+		end
+	else
+		if daystage = 2 or daystage = 3:
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cool2.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cooln1.jpg"></center>'
+		end
+	end
+end
+
 if $ARGS[0] = 'run':
 	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 		act 'Jog through the park (1:00)':
@@ -907,9 +925,9 @@ if $ARGS[0] = 'run':
 						act'Turn':
 							cla & *clr
 							if $region = 'city':
-								gs 'npcgeneratec', 0, 'stranger', rand(18,45), rand(3,4)
+								gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
 							elseif $region = 'pav':
-								gs 'npcgeneratec', 0, 'stranger', rand(18,45), 1
+								gs 'npcgeneratec', 0, '', rand(18,45), 1
 							end
 							gs 'boy', 'details'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
@@ -1133,12 +1151,12 @@ if $ARGS[0] = 'run_reactions':
 end
 
 if $ARGS[0] = 'run_end':
-	gs 'park_walkevents', 'running_image'
+	gs 'park_walkevents', 'run_cooldown_image'
 	if temp['catcall'] = 4:
 		pcs_mood -= 30
 		'After about a full hour of running, you finally start to slow down, breathing tiredly. Under normal circumstances, you might be in the middle of your runner''s high but that guy in the middle of your jog just soured the whole thing. You feel exhausted and angry and you just want to go home.'
 	else
-		'An hour after you started, you call your run to a halt, breathing tiredly. You feel exhausted in a good way. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
+		'About an hour after you started, you call your run to a halt, breathing tiredly. You feel exhausted in a good way. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
 	end
 	if daybegskver = daystart:
 		gs 'exercise', 'tier1', 30, 'run_exp'

+ 1 - 0
locations/pav_church.qsrc

@@ -58,6 +58,7 @@ end
 
 if $ARGS[0] = 'Mom':
 	cla & *clr
+	mom_church = daystart
 	gs'stat'
 	'<center><b><h4><font color=#CB00A2>"Natasha <<$pcs_lastname>>"</font></h4></b></center>'
 	if VKChurchNo = 4 or VKChurchNo = 5:

+ 0 - 1
locations/pav_disco_gopniks.qsrc

@@ -1652,7 +1652,6 @@ if $ARGS[0] = 'anushka_walkhome':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_anushka.jpg"></center>'
-	'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
 	if func('homes_properties', 'can_live_here', 'parents_home') ! 0: 
 		'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
 		act 'Go inside': gt 'korrPar'

+ 20 - 0
locations/pav_hotel.qsrc

@@ -134,6 +134,26 @@ else
 	end
 end
 
+if therapist_key = 2 and week = 6 and hour > 19 and pcs_traits['commando_lvl'] = 3 and therapist_key[1] ! daystart:
+	therapist_key[1] = daystart
+	gs 'willpower', 'misc', 'resist', 'medium'
+
+	act 'Visit the therapist': gt 'therapist_hotel', 'start'
+
+	if will_cost <= pcs_willpwr:
+		act 'Don''t visit the therapist':
+			gs 'willpower', 'pay', 'medium'
+			gt 'pav_hotel'
+		end
+	else
+		act 'Don''t visit the therapist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	exit
+end
+
+
+
+
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''pav_hotel'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'
 
 if hour >= 12 and hour <= 13 and GermanQW > 0: 'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & gt ''pav_hotelAdmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'

+ 73 - 190
locations/pav_hotelWork.qsrc

@@ -131,17 +131,17 @@ if $ARGS[0] = 'firsthotelprosevent':
 	'You look in the direction he gestures and see another person. A big black dude sitting on a couch, already stroking his cock through his pants; his thick muscles evident through his fitted clothing.'
 	'"Why hello there honey, are you here to entertain us tonight?" The black man asks in a deep, husky voice.'
 	'"She sure is," says Pavlin as he places both hands on your shoulders and forces you down onto your knees.'
-	' '
+	*nl
 	'He opens his pants and pulls out his long, semi-erect penis. Pavlin then starts slapping it across your face, grinning at your humiliation.'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotel_threesome.jpg"></center>'
 	'You dutifully start sucking on his dick, primarily to take some amount of control for yourself. Soon you notice that Mr. Black has moved up next to you. He must have stripped out of his clothing along the way because the first thing that catches your eye is a tower of dangling ebony meat between his powerful thighs.'
-	' '
+	*nl
 	'"Shit! That thing is massive!" You think, a twinge of fear and excitement rising in your chest.'
 	'After sucking Pavlin to full erection, you focus on the next task at hand. You continue stroking the lengthy white dick with one hand as you reach for the big black cock with the other. You can''t help but be amazed by the weight of it as you guide it into your awaiting mouth. You try to fit as much of it in as you can, only to realize it''s a futile effort as your lips stretch around the thick member.'
-	' '
+	*nl
 	'"Fuck, I didn''t even know i had jaw muscles," you say, letting the fat cock fall from your lips as the soreness begins to overwhelm your jaw.'
 	'The two men laugh it off and tell you to keep sucking.'
-	' '
+	*nl
 	'For a few more minutes you switch from one cock to the other, occasionally trying to take both of them in your mouth at the same time.'
 	gs 'arousal', 'bj', 10, 'prostitution'
 	gs 'arousal', 'end'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 		if stat['think_virgin'] = 1:'As you feel the massive member rub up against your exposed snatch, your heart skips a beat. "Oh god, am I really about to lose my virginity to a black man?!?! What would my family think of me if they knew? And why do I feel so excited about it?" You think, mind racing with emotion. '
 		'He places one calloused hand on you back and starts pushing his big <<dick>> cm schlong inside your dripping pussy. "Oh fuck!" You groan as he buries himself inside you.'
 		if stat['think_virgin'] = 1:'As the thick, dark dick slams into you, you yelp in pain as tears roll down your cheeks. It feels as if you''re being split in half and you''re sure there''s some blood leaking from your conquered maidenhead. "Too late to turn back now." you think. "My virginity is his. It will always be his. God, how am i going to explain this to my mother?"'
-		' '
+		*nl
 		'Mr. Black gives you little time to adjust to his size before he''s pounding away in force.'
 		'"Don''t get distracted skank, you got plenty of dick right here too." Pavlin says as he forces your mouth back onto his cock.'
 		'You ignore the degrading comment and keep sucking Pavlin. Moans escape past your lips every few thrusts as the ebony tool rubs your g-spot in all the right places. Your pussy feels overly full as the large member stretches your labia to their limit.'
@@ -169,10 +169,10 @@ if $ARGS[0] = 'firsthotelprosevent':
 			'Suddenly you feel the black cock slide out of your pussy, your hole gaping wide and wet. A moment later you feel his thick fingers rubbing lube on and around your anus.'
 			if pcs_vag ! 0 and pcs_ass = 0:'Oh fuck, he''s going to take that virginity too? It''s the only one I have left.'
 			'The fear wells up inside you once again, but you push it down. "Well, I did agree to do whatever they wanted." You reason, and brace for impact.'
-			' '
+			*nl
 			'You feel the impossibly large, bell-shaped head of his cock push up against your back door.'
 			'Slowly he applies pressure, pushing his <<dick>> cm dick into your ass. Your hole resists, but eventually you feel the head break through, stretching you sphincter. You let out a pained yelp, tears welling up in your eyes. Showing a bit of chivalry for the first time, Mr. Black waits a moment so you can get used to the feeling. All too soon the mercy disappears as he starts pumping his dick back and forth in your bowels. The intense feeling melds into a mixture of extreme pleasure and extreme pain, and you can''t decide If it''s enjoyable or not.'
-			' '
+			*nl
 			'But before your mind can decide, Pavlin once again forces his long dick back into your throat and begins face-fucking you at full force. You gag as strands of spit fly out of your mouth and drip down the huge penis. You''re angry, but a little thankful to have something to distract you from the pain in your asshole as Mr. Black continues to ream your orifice.'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotel_threesome4.jpg"></center>'
 			gs 'arousal', 'anal', 5, 'prostitution'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotel_threesome5.jpg"></center>'
 				'"Time for the big finish, bitch." Pavlin declares.'
-				' '
+				*nl
 				'Pavlin pulls his dick out of your mouth, making a sick plop as it exits. He gives it a few hard strokes and cums full force on your face.'
 				'You gasp as the black man pulls his cock out of your ass and moves suddenly to your mouth. You take it obediently in your hand and stroke it until he cums all over your mouth and face.'
 				'Thick strands of gooey seed coat your face as you look up at the two domineering men. You listen to their heavy, masculine breathing for a few moments before you suddenly remember the reason you''re there.'
@@ -199,7 +199,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 					gs 'stat'
 					if prosmoneyhot = 0:
 						'"Ok guys, this was fun, but now I want my money," you say assertively, the smell of sticky jizz filling your nostrils.'
-						' '
+						*nl
 						'"Sure, no problem; You definitely earned it." Pavlin says, chuckling at your slathered face. He takes a wad of cash out of his pocket and gives it to you.'
 						'You start counting it and notice it is only 1500 <b>₽</b>.'
 						'"This is not enough! Where is the rest?" You yell at them, your face beet red in anger.'
@@ -210,21 +210,21 @@ if $ARGS[0] = 'firsthotelprosevent':
 						act 'Back to the lobby': gt 'pav_hotel'
 					elseif prosmoneyhot = 1:
 						'You shyly look at Pavlin and ask, "So can I have my money back now?"'
-						' '
+						*nl
 						'"Sure, no problem; you definitely earned it." He guy takes a wad of cash out of his pocket and gives it to you.'
 						'Cum drips down your face as you count it and notice it''s only 500 <b>₽</b>. "Where is the rest?" You ask, confused.'
 						'"That''s all there is today, I spent the rest on cheap whores like you. If you want to earn back the rest, you can come by any time. Just go to the receptionist and ask for ''The Peacock''. She will understand."'
-						' '
+						*nl
 						'You reluctantly put the money away, defeated and depressed, before dressing and leaving the room.'
 						pavhotprosQW = 5
 						money += 500
 						act 'Back to the lobby': gt 'pav_hotel'
 					elseif prosmoneyhot = 2:
 						'You look at Pavlin and ask: "So about my money...?"'
-						' '
+						*nl
 						'"Sure, no problem, you definitely earned it." Pavlin takes two 100 <b>₽</b> bills out of his pocket and slaps them onto your forehead, the bills sticking to the spooge still covering your face.'
 						'"If you want to earn back the rest of your money you can come by any day. Just go to the receptionist and ask for ''The Peacock''. She will understand."'
-						' '
+						*nl
 						'You pull the sticky bills off of your head and reluctantly put the money away. Tears begin streaming down your cheeks as you get dressed and leave the room, feeling cheap and used.'
 						pavhotprosQW = 6
 						money += 200
@@ -284,9 +284,9 @@ if $ARGS[0] = 'maid':
 					gs 'stat'
 					'You feel very nervous and with a shaking hand you knock on the door. After a few moments your heart skips a beat when you hear the knob turning as someone opens the door; it''s the man that took your money.'
 					'A little smile creeps across his thin lips as he recognizes you.'
-					' '
+					*nl
 					'"Well, well, well, if it isn''t our favorite little voyeur. Come to earn your money back I assume?" He says arrogantly as his eyes devour you body.'
-					' '
+					*nl
 					gs 'willpower', 'prostitution', 'self', 'hard'
 					if will_cost <= pcs_willpwr:
 						act 'Yes, but I want double my money back (<<will_cost>> Willpower)':
@@ -295,12 +295,12 @@ if $ARGS[0] = 'maid':
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							'"Yes I have." You say, not letting the man''s lecherous gaze intimidate you. "I will play the little bitch for you, but on my terms." You let your assertive words sink in for a moment before continuing.'
-							' '
+							*nl
 							'"You will pay me DOUBLE what you took and, after we are done, I don''t have to deal with you anymore."'
 							'The man laughs, "Ha ha, take a look at this slut, thinking she can boss me around." The oaf suddenly slaps you across the face without warning, the loud smack echoing in the empty hallway.'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/avatars/slap.jpg"></center>'
 							'Your cheek stings hotly but you don''t flinch. You keep staring him in the eyes with a stern look, refusing to submit.'
-							' '
+							*nl
 							'The man looks shocked, realizing that you are not playing around.'
 							'"Ok then, girl, have it your way. Come on in"'
 							prosmoneyhot = 0
@@ -318,7 +318,7 @@ if $ARGS[0] = 'maid':
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							'"Yes I have. "You say, looking meekly at his masculine form. "I really need that money back, so just tell me what to do." You hope that doing whatever he says will allow you to walk away with what he stole.'
-							' '
+							*nl
 							'"Just bring that tight ass in here and have some fun with us. I promise you''ll get what you''re after." The devious look on his face gives you second thoughts, but you enter the room anyways, feeling completely out of options.'
 							prosmoneyhot = 1
 
@@ -346,20 +346,9 @@ if $ARGS[0] = 'maid':
 			maidtime += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth6.jpg"></center>'
 			'After several hours of hard work, you finish your shift. You return to the locker room and take off the skimpy maid uniform, putting your own clothes back on. Leaving the uniform in a neat pile on the table, you grab your things and make your way to the hotel lobby. On you way to the lobby you pass the room where the 2 men were enjoying themselves with a girl. You try to resist the urge to peep again.'
-			gs 'willpower', 'voyeur', 'resist'
-			if will_cost <= pcs_willpwr:
-				act 'Walk past the door and go to the lobby (<<will_cost>> Willpower)':
-					gs 'willpower', 'voyeur', 'resist'
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					threesomewatched = 0
-					threesometojoin = 0
-					pavhotprosQW = 1
-					gt 'pav_hotel'
-				end
-			else
-				act 'Walk past the door and go to the lobby (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
+
+			act 'Walk past the door and go to the lobby':gt 'pav_hotel'
+
 			act 'Peep through the keyhole':
 				menu_off = 0
 				*clr & cla
@@ -368,19 +357,13 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 2
 				gs 'stat'
 				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Leave before someone notices you (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						threesomewatched = 0
-						threesometojoin = 0
-						pavhotprosQW = 1
-						gt 'pav_hotel'
-					end
-				else
-					act 'Leave before someone notices you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Leave before someone notices you':
+					threesomewatched = 0
+					threesometojoin = 0
+					pavhotprosQW = 1
+					gt 'pav_hotel'
 				end
+				
 				act 'Where is the other guy?':
 					*clr & cla
 					gs 'stat'
@@ -427,9 +410,9 @@ if $ARGS[0] = 'maid':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/sex/mmf/fbdranal.jpg"></center>'
 							'While the girl continues eagerly sucking the first man''s dick, the other one comes up behind her, grabs her by the waist and, without a second thought, thrusts his cock into her ass. The poor girl yelps in pain, the sound muffled by the huge cock in her mouth. She was clearly not ready for that.'
-							' '
+							*nl
 							'The man doesn''t care one bit as he sinks his fingers roughly into the flesh of her hips and begins pounding her as hard as he can, each thrust sending new jolts of pain through her body, his balls making a wet slap as they bounce against her soaking cunt with every thrust.'
-							' '
+							*nl
 							'After several minutes you see the girl beginning to relax and get used to the dick in her ass. She begins moaning in pleasure as the hard member continues pumping away inside her.'
 							'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/threea.mp4"></video></center>'
 							'The man with his dick in her mouth moves his hands to the girl''s breasts and start pinching her nipples roughly.'
@@ -437,34 +420,27 @@ if $ARGS[0] = 'maid':
 							'Without warning the man grabs one of her nipples and gives it a firm twist. You are sure that if the girl didn''t have a mouth full of dick, her scream would have been loud enough for the entire floor to hear.'
 							'Finally the man relents from his torture and starts focusing on her mouth again. He places both hands on her head and begins face-fucking her, pushing his big cock into her mouth all the way to the base. You reckon that this girl is a deep throat specialist as she seems unfazed by the rough throat-fucking.'
 							
-							gs 'willpower', 'mast', 'resist'
-							if will_cost <= pcs_willpwr:
-								act 'Continue to watch in silence (<<will_cost>> Willpower)':
-									*clr & cla
-									gs 'willpower', 'mast', 'resist'
-									gs 'willpower', 'pay', 'resist'
-									gs 'arousal', 'voyeur_sex', 20
-									gs 'arousal', 'end'
-									gs 'stat'
-									
-									'<center><img <<$set_imgh>> src="images/shared/sex/mmf/fbdrdp.jpg"></center>'
-									'"Let''s give our audience a proper show." The man says as he slides his slimy dick out of the slut''s abused esophagus.'
-									'The second guy happily agrees and shows his enthusiasm by roughly spanking the girl. "You heard him, bitch! Sit on my cock so I can pound that filthy cunt from below." He crudely orders.'
-									'The girl''s cheeks blush bright red. "She must really love being humiliated and fucked for an audience." You think to yourself. You can''t help but wonder why, and if you''d be the same in this situation.'
-									' '
-									'Meanwhile, the guy who was fucking her ass lies down on the bed and she obediently climbs on top of him. The controlling man wastes no time and shoves his cock in her main fuckhole with one powerful thrust. He begins jackhammering his swollen rod in and out of her needy twat. You can see her nails digging into the man''s torso as she happily endures the rough fucking, a blissful smile stretching her lips.'
-									'"I wish all our bitches would be so eager to please." comments the other man while casually moving behind the girl and his friend.'
-									'He firmly plants one of his hands on her hip and guides his stiff cock to her vulnerable anus with the other. You can see a glimpse of fear on her face the second before the man leans forwards and buries his member balls deep in her ass. You feel bad for the used whore, but can''t help but feel your own juices soaking your thighs as the show continues. Both of the strong, virile men show no mercy as they pound away at her holes, randomly squeezing her tits and spanking her ass between their thrusts.'
-									' '
-									'The men continue relentlessly pounding, their stamina seemingly endless. You notice the young woman''s breath becoming more and more ragged until she suddenly throws her head back and screams in an earth-shattering orgasm. Taking their cue, the men both pick up their pace before groaning in unison as they flood the girls bowels and cunt with their cum. After a moment the two boys shove the girl out from between them carelessly, now finished with their fucktoy. The satisfied slut immediately collapses on the bed, utterly spent, thick globs of seed slowly leaking from her used holes.'
-									' '
-									'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
-									'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
+							act 'Continue to watch in silence':
+								*clr & cla
+								gs 'arousal', 'voyeur_sex', 20
+								gs 'arousal', 'end'
+								gs 'stat'
+								
+								'<center><img <<$set_imgh>> src="images/shared/sex/mmf/fbdrdp.jpg"></center>'
+								'"Let''s give our audience a proper show." The man says as he slides his slimy dick out of the slut''s abused esophagus.'
+								'The second guy happily agrees and shows his enthusiasm by roughly spanking the girl. "You heard him, bitch! Sit on my cock so I can pound that filthy cunt from below." He crudely orders.'
+								'The girl''s cheeks blush bright red. "She must really love being humiliated and fucked for an audience." You think to yourself. You can''t help but wonder why, and if you''d be the same in this situation.'
+								*nl
+								'Meanwhile, the guy who was fucking her ass lies down on the bed and she obediently climbs on top of him. The controlling man wastes no time and shoves his cock in her main fuckhole with one powerful thrust. He begins jackhammering his swollen rod in and out of her needy twat. You can see her nails digging into the man''s torso as she happily endures the rough fucking, a blissful smile stretching her lips.'
+								'"I wish all our bitches would be so eager to please." comments the other man while casually moving behind the girl and his friend.'
+								'He firmly plants one of his hands on her hip and guides his stiff cock to her vulnerable anus with the other. You can see a glimpse of fear on her face the second before the man leans forwards and buries his member balls deep in her ass. You feel bad for the used whore, but can''t help but feel your own juices soaking your thighs as the show continues. Both of the strong, virile men show no mercy as they pound away at her holes, randomly squeezing her tits and spanking her ass between their thrusts.'
+								*nl
+								'The men continue relentlessly pounding, their stamina seemingly endless. You notice the young woman''s breath becoming more and more ragged until she suddenly throws her head back and screams in an earth-shattering orgasm. Taking their cue, the men both pick up their pace before groaning in unison as they flood the girls bowels and cunt with their cum. After a moment the two boys shove the girl out from between them carelessly, now finished with their fucktoy. The satisfied slut immediately collapses on the bed, utterly spent, thick globs of seed slowly leaking from her used holes.'
+								*nl
+								'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
+								'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
 
-									act 'Go to the lobby': gt 'pav_hotel'
-								end
-							else
-								act 'Continue to watch in silence (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+								act 'Go to the lobby': gt 'pav_hotel'
 							end
 							
 							act 'Start touching yourself':
@@ -474,26 +450,26 @@ if $ARGS[0] = 'maid':
 								gs 'stat'
 								gs 'arousal', 'end'
 								gs 'stat'
-								
 								'<center><img <<$set_imgh>> src="images/shared/sex/mast/finger.jpg"></center>'
 								'You can''t take it any longer and you start moving your hand towards your pussy. You begin rubbing your swelling womanhood through your clothes.'
 								'"It looks like our audience is really enjoying herself, so let''s give her a proper show." The man says as he slides his slimy dick out of the slut''s abused esophagus.'
 								'The second guy happily agrees and shows his enthusiasm by roughly spanking the girl. "You heard him, bitch, sit on my cock so I can pound that filthy cunt from below." He crudely orders.'
 								'The girl''s cheeks blush bright red. "She must really love being humiliated and fucked for an audience." You think to yourself. You can''t help but wonder why, and if you''d be the same in this situation.'
-								' '
+								*nl
 								'Meanwhile, the guy who was fucking her ass lies down on the bed and she obediently climbs on top of him. The controlling man wastes no time and shoves his cock in her main fuckhole with one powerful thrust. He begins jackhammering his swollen rod in and out of her needy twat. You can see her nails digging into the man''s torso as she happily endures the rough fucking, a blissful smile stretching her lips.'
 								'"I wish all our bitches would be so eager to please" comments the other man while casually moving behind the girl and his friend.'
 								'He firmly plants one of his hands on her hip and guides his stiff cock to her vulnerable anus with the other. You can see a glimpse of fear on her face the second before the man leans forwards and buries his member balls deep in her ass. You feel bad for the used whore, but you can''t help but feel your own juices soaking your thighs as the show continues. Both of the strong, virile men show no mercy as they pound away at her holes, randomly squeezing her tits and spanking her ass between their thrusts.'
-								' '
-								'<center><img <<$set_imgh>> src="images/shared/sex/mmf/fbdrdp.jpg"></center>'
-								'You see the girl turning her head and seductively looking in your direction while biting her lip, the desire burning in her eyes.'
-								'Your heart flutters as you start rubbing your clit vigorously, maintaining eye contact with the other woman.'
-								'Soon you feel a hot wave of bliss spreading over your entire body. You shudder but keep your eyes focused on the threesome in front of you as an orgasm soaks your fingers.'
-								'The men continue relentlessly pounding, their stamina seemingly endless. You notice the young woman''s breath becoming more and more ragged until she suddenly throws her head back and screams in an earth-shattering orgasm. Taking their cue, the men both pick up their pace before groaning in unison as they flood the girls bowels and cunt with their cum. After a moment the two boys shove the girl out from between them carelessly, now finished with their fucktoy. The satisfied slut immediately collapses on the bed, utterly spent, thick globs of seed slowly leaking from her used holes.'
-								'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
-								'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
-
-								act 'Go to the lobby': gt 'pav_hotel'
+								act'Continue':
+									cla & *clr
+									'<center><img <<$set_imgh>> src="images/shared/sex/mmf/fbdrdp.jpg"></center>'
+									'You see the girl turning her head and seductively looking in your direction while biting her lip, the desire burning in her eyes.'
+									'Your heart flutters as you start rubbing your clit vigorously, maintaining eye contact with the other woman.'
+									'Soon you feel a hot wave of bliss spreading over your entire body. You shudder but keep your eyes focused on the threesome in front of you as an orgasm soaks your fingers.'
+									'The men continue relentlessly pounding, their stamina seemingly endless. You notice the young woman''s breath becoming more and more ragged until she suddenly throws her head back and screams in an earth-shattering orgasm. Taking their cue, the men both pick up their pace before groaning in unison as they flood the girls bowels and cunt with their cum. After a moment the two boys shove the girl out from between them carelessly, now finished with their fucktoy. The satisfied slut immediately collapses on the bed, utterly spent, thick globs of seed slowly leaking from her used holes.'
+									'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
+									'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
+									act 'Go to the lobby': gt 'pav_hotel'
+								end
 							end
 						end
 					end
@@ -807,17 +783,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 				
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work':gt 'pav_hotelWork', 'maid'
 				
 				act 'Watch them for a while':
 					cla
@@ -834,17 +800,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work': gt 'pav_hotelWork', 'maid'
 
 				act 'Watch them for a while':
 					cla
@@ -863,17 +819,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work':gt 'pav_hotelWork', 'maid'
 
 				act 'Watch them for a while':
 					cla
@@ -889,18 +835,7 @@ if $ARGS[0] = 'maid':
 				if maidcheck_4 = daystart: jump 'new_maid_event'
 				maidcheck_4 = daystart
 
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'arousal', 'end'
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work': gt 'pav_hotelWork', 'maid'
 
 				if IgorevnaBDSM = 0:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/1.jpg"></center>'
@@ -1233,17 +1168,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					gs 'willpower', 'voyeur', 'resist'
-					if will_cost <= pcs_willpwr:
-						act 'Get back to work (<<will_cost>> Willpower)':
-							gs 'willpower', 'voyeur', 'resist'
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'
-							gt 'pav_hotelWork', 'maid'
-						end
-					else
-						act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
+					act 'Get back to work': gt 'pav_hotelWork', 'maid'
 
 					act 'Stay and watch for a bit':
 						*clr & cla
@@ -1252,20 +1177,7 @@ if $ARGS[0] = 'maid':
 						'She is moaning quite loudly now and you watch her insert a finger deeply inside.'
 							
 						gs 'arousal', 'voyeur', 10
-						gs 'arousal', 'end'
-						gs 'stat'
-
-						gs 'willpower', 'voyeur', 'resist'
-						if will_cost <= pcs_willpwr:
-							act 'Maybe you should get back to work (<<will_cost>> Willpower)':
-								gs 'willpower', 'voyeur', 'resist'
-								gs 'willpower', 'pay', 'resist'
-								gs 'stat'
-								gt 'pav_hotelWork', 'maid'
-							end
-						else
-							act 'Maybe you should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
+						act 'Maybe you should get back to work':gs 'arousal', 'end' & gt 'pav_hotelWork', 'maid'
 
 						act 'Stay and watch for a little more':
 							*clr & cla
@@ -1274,20 +1186,11 @@ if $ARGS[0] = 'maid':
 							'She slides a second finger inside desperate to sate her growing desire.'
 									
 							gs 'arousal', 'voyeur', 10
-							gs 'arousal', 'end'
+							
 							gs 'stat'
 
-							gs 'willpower', 'voyeur', 'resist'
-							if will_cost <= pcs_willpwr:
-								act 'You really should get back to work (<<will_cost>> Willpower)':
-									gs 'willpower', 'voyeur', 'resist'
-									gs 'willpower', 'pay', 'resist'
-									gs 'stat'
-									gt 'pav_hotelWork', 'maid'
-								end
-							else
-								act 'You really should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
+							act 'You really should get back to work':gs 'arousal', 'end' & gt 'pav_hotelWork', 'maid'
+
 					
 							act 'Stay to watch her finish':
 								*clr & cla
@@ -1297,10 +1200,10 @@ if $ARGS[0] = 'maid':
 								'"Oh God! Fuck! Yes!" Her body spasms as she finally achieves what must be a massive orgasm.'
 										
 								gs 'arousal', 'voyeur', 10
-								gs 'arousal', 'end'
 								gs 'stat'
 
 								act 'Time to leave':
+									gs 'arousal', 'end'
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate5.jpg"></center>'
 									'She is lying back recovering, the occasional twitch the only sign that she is still concious.'
@@ -1360,17 +1263,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work': gt 'pav_hotelWork', 'maid'
 
 				if hotel_rand1 <= 60:
 					act 'Keep watching':
@@ -1410,17 +1303,7 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
-				gs 'willpower', 'voyeur', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Get back to work (<<will_cost>> Willpower)':
-						gs 'willpower', 'voyeur', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_hotelWork', 'maid'
-					end
-				else
-					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				act 'Get back to work': gt 'pav_hotelWork', 'maid'
 
 				if hotel_rand1 <= 60:
 					act 'Keep watching':

+ 2 - 2
locations/pav_lake.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = '':
 				'You can''t believe your time skiing is already over. It feels like you just put on your ski boots and started around the lake. But now, as you sit down on the bench to take them off, your legs are tired and sore from a day of skiing. You unlace your boots and wiggle your toes, relieved to finally be able to stretch them out. You stand up and take a few steps, savouring the feeling of being barefoot after a day in stiff ski boots before you put your regular shoes back on.'
 				act'Continue':gt'pav_lake'
 			end
-			act'Ski around the park (30 mins)': gt 'pav_lake', 'ski'
+			act'Ski around the lake (30 mins)': gt 'pav_lake', 'ski'
 		elseif pcs_ski_owned > 0 and hour >= 8 and hour <= 17 and konki_cloth = 0:
 			act'Put your skis on':
 				*clr & cla
@@ -509,7 +509,7 @@ if $ARGS[0] = 'ski':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_2.jpg"></center>'
 	'As you ski, you take in the breathtaking views of the snow-covered trees, the crisp blue sky above and all the people ice skating out on the lake. The sound of your skis slices through the snow filled air. You feel a sense of freedom and exhilaration as you carve your way around the lake. The cold air fills your lungs and you can''t help but smile, feeling alive and free.'
-	act 'Finish skiing':  gt 'pav_lake', 'start'
+	act 'Finish skiing':  gt 'pav_lake'
 end
 
 if $ARGS[0] = 'car_sex': 

+ 1 - 1
locations/pav_library_nerdstudy.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'nerd_study_night2':
 			if npc_rel['A142'] >= 60 and grupTipe = 3:
 				'You chat about the latest video games with Zinaida. "Hey, look at this. I got into the top ten with my last score." With a small smile, Zinaida shows you her phone, and sure enough she''s number five on the leaderboard. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it. The two of you go back to some idle chatter about video games.'
 			elseif npc_rel['A142'] <= 20 or fame['pav_slut'] >= 250:
-				'Zinadia is focused on studying the book in front of her and taking notes, so she rarely says anything back as you try and talk to her. "I''d like to talk, but I''m busy trying to study. I need to finish this." she says quietly while looking up at you through her messy hair that hangs down onto her face. She resumes her studying while ignoring you.'
+				'Zinaida is focused on studying the book in front of her and taking notes, so she rarely says anything back as you try and talk to her. "I''d like to talk, but I''m busy trying to study. I need to finish this." she says quietly while looking up at you through her messy hair that hangs down onto her face. She resumes her studying while ignoring you.'
 			else
 				'You strike up a conversation with Zinaida. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 			end

+ 27 - 26
locations/pav_parkev.qsrc

@@ -898,37 +898,38 @@ if $ARGS[0] = 'gopniks':
 			if grupTipe = 3:
 				'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to, nerd?" he asks in a teasing tone as you take a seat.'
 				'Dan glances over at you with a sneer. "You sure you should be here? This part of the park isn''t really for people like you." You glance around and notice a few other rugged looks tossed your way.'
+				act 'Move away':gt 'pav_park', 'deeper_park'
 			else
 				'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to?" he asks as you take a seat.'
 				'Dan glances over at you with a sneer. "Looking to slum it a little, princess?"'
 				'Pauline snorts a laugh. "She probably got tired of all the limp dicks she normally hangs out with and wants to know what a real cock feels like."'
 				'Roman grins at that. "Is that it? You looking for some real cock?" You glance around and notice a few other rugged looks tossed your way. You know the gopniks have a bad reputation. Maybe hanging out with them in a deserted place isn''t the best idea.'
-			end
-			act 'Make excuse and leave':
-				*clr & cla
-				minut += 1
-				grupvalue[4] -= 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
-				'Starting to feel nervous, you glance down at your phone. "Oh, I didn''t notice the time. I need to get going." You wave bye to them and start walking away. You can hear them laughing behind you as you leave.'
-				act 'Move away':gt 'pav_park', 'deeper_park'
-			end
-			act 'Make small talk':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
-				'You make small talk with the guys for a while, but they seem to quickly get tired of listening and tell you they''ve got things to do before they grab the few beers left and leave without inviting you to join them.'
-				act 'Move away':gt 'pav_park', 'deeper_park'
-			end
-			act 'Ask for a beer':
-				*clr & cla
-				grupvalue[4] += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
-				'"How about you pass me one of those beers?" you ask as you take a seat.'
-				'Vasily laughs and hands you a beer. As you take the beer, you notice Anushka''s guitar propped up against the side of the picnic table. It''s one of the few times you''ve seen her take her dad''s old guitar out of her room.'
-				act 'Drink beer': gt 'pav_parkev', 'gopnik_beer'
-			end
+				act 'Make excuse and leave':
+					*clr & cla
+					minut += 1
+					grupvalue[4] -= 2
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
+					'Starting to feel nervous, you glance down at your phone. "Oh, I didn''t notice the time. I need to get going." You wave bye to them and start walking away. You can hear them laughing behind you as you leave.'
+					act 'Move away':gt 'pav_park', 'deeper_park'
+				end
+				act 'Make small talk':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
+					'You make small talk with the guys for a while, but they seem to quickly get tired of listening and tell you they''ve got things to do before they grab the few beers left and leave without inviting you to join them.'
+					act 'Move away':gt 'pav_park', 'deeper_park'
+				end
+				act 'Ask for a beer':
+					*clr & cla
+					grupvalue[4] += 1
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopniks.jpg"></center>'
+					'"How about you pass me one of those beers?" you ask as you take a seat.'
+					'Vasily laughs and hands you a beer. As you take the beer, you notice Anushka''s guitar propped up against the side of the picnic table. It''s one of the few times you''ve seen her take her dad''s old guitar out of her room.'
+					act 'Drink beer': gt 'pav_parkev', 'gopnik_beer'
+				end
+			end			
 		end
 	end
 end

+ 0 - 11
locations/pav_residential.qsrc

@@ -196,17 +196,6 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-if booty_call_time['A0'] = daystart :
-	i=0
-	*nl
-	:loopBC
-	if booty_call[$fuckbuddy[i]] = daystart and npc_residence[$fuckbuddy[i]] = 1 :
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''booty_call_start'''',''''start'''',''''<<$fuckbuddy[i]>>'''' "><<$npc_firstname[$fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-	end
-	 i +=1
-	if i < arrsize('$fuckbuddy') : jump 'loopBC'
-end
-
 !!Uncle Misha is npcstatic number 54
 if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1

+ 1 - 1
locations/pav_train_market.qsrc

@@ -262,7 +262,7 @@ if $ARGS[0] = 'clo':
 			end
 		end
 	i += 1
-	if i <= 20:jump 'loopmarket_outfits'
+	if i <= 40:jump 'loopmarket_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

+ 21 - 22
locations/rape_events.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'urban_rape_limp':
 		'Fear flashes through you. Your legs turn to jelly. Your mind goes blank as you tumble to the ground...'
 		act'Black out':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/rape/unconscious_street.mp4"></video></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/rape/unconscious_street.jpg"></center>'
 			'Time passes.'
 			*nl
 			if rand(0,1) = 1:
@@ -498,7 +498,7 @@ if $ARGS[0] = 'park_rape_fight_start':
 end
 	
 if $ARGS[0] = 'park_rape_struggle_start':
-	temp['rape_type'] = 'gang'
+	$temp['rape_type'] = 'gang'
 	gs'rape_events','rapist_generate'
 	gs'rape_events','park_image'
 	'You try to scream but the hand clamped over your mouth reduces it to nothing more than a muffled groan as you are dragged into the bushes.'
@@ -656,8 +656,7 @@ if $ARGS[0] = 'park_gangrape_start':
 !!	jump 'rapist_generate_loop'
 	
 	gs 'boyStat', $rapist[0]
-!!	'<center><img <<$set_imgh>> src="images/shared/sex/rape/gangrape1.jpg"></center>'
-	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
+	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
 	'The men haul you off into the bushes and you try to scream, but the hand clamped over your mouth prevents anything from coming out but muffled sobs. They tear the clothes from your body as you struggle but it''s no use.'
 	*nl
 	'You can''t escape.'
@@ -669,7 +668,7 @@ if $ARGS[0] = 'park_gangrape_start':
 end
 
 if $ARGS[0] = 'park_gangrape_fight_loss':
-	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
+	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
 	'A fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
 	'"Fucking bitch made us work for it."'
@@ -680,7 +679,7 @@ if $ARGS[0] = 'park_gangrape_fight_loss':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_enter1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 		'Some modicum of control makes its way back into your muscles and you begin to struggle even as your attackers force your legs apart.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -694,7 +693,7 @@ end
 
 
 if $ARGS[0] = 'park_gangrape_fight_surrender':
-	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
+	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
 	'"Stop!" you cry out. "Please! Stop! I give u-"'
 	'Even as you attempt to surrender, a fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
@@ -706,7 +705,7 @@ if $ARGS[0] = 'park_gangrape_fight_surrender':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_enter1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 		'Some modicum of control makes its way back into your muscles and you begin to struggle even as your attackers force your legs apart.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -725,7 +724,7 @@ if $ARGS[0] = 'park_gangrape_struggle1':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_enter1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 		'Despite knowing escape is an impossibility, your fight or flight response refuses to let you give in and you continue to struggle beneath the hard grips of the men assaulting you. They force your legs apart and something hard is roughly shoved into your pussy.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -742,7 +741,7 @@ if $ARGS[0] = 'park_gangrape_struggle2':
 		gs 'arousal', 'vaginal', rand(3,5), 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
 		if stat['think_virgin'] = 1:
 			'"Hey, I think this bitch is a virgin," the man giggles.'
 			'"<i>Was</i> a virgin," another voice snickers.'
@@ -765,7 +764,7 @@ if $ARGS[0] = 'park_gangrape_tp':
 		gs 'arousal', 'bj', -temp['rape_time'], 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck<<rand(2,3)>>.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
 		'The men violate you, roughly fucking you with no regard for your pain or your pleasure. With one cock choking your mouth, it''s all you can do to breathe, let alone make any noise other than the occasional groan as the others ravage your ass and pussy.'
 		*nl
 		'There''s nothing for you to do except hold on for dear life until it ends.'
@@ -792,7 +791,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	act'Endure':
 		gs 'rape_events', 'park_gangrape_cum'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck3.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'Time passes in a blur. You feel like your rape has been going on for hours. You''re not sure how much longer you can-'
 		*nl
 		'<b><i>"MMMMPH-!"</i></b>'
@@ -807,7 +806,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck<<rand(2,3)>>.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'With your body being pummelled in every hole and your mind overwhelmed, everything just shuts down, and unconsciousness takes you.'
@@ -826,7 +825,7 @@ end
 if $ARGS[0] = 'park_gangrape_end2':
 	act'Cough':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude2.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude2.jpg"></center>'
 		'Their lust satisfied, your rapists toss you aside into the mud where you retch, hacking up the remnants of the cum you were unable to swallow.'
 		*nl
 		'You writhe on the ground, trembling as they walk away laughing, as casual as if they had just finished getting drunk at the cinema. By the time you manage to struggle to your knees, they''re already gone.'
@@ -835,7 +834,7 @@ if $ARGS[0] = 'park_gangrape_end2':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck<<rand(2,3)>>.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'You try to pull back from the cock that chokes you, but you''re unable to escape it. You panic, coughing even as your vision grows blurry, but your rapist refuses to let you go until you''ve swallowed every drop.'
@@ -861,7 +860,7 @@ if $ARGS[0] = 'park_wakeup':
     gs 'stat'
 	act'Wake up':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude1.jpg"></center>'
 		
 		'Slowly, you come back to consciousness and your eyes creak open.'
 		*nl
@@ -872,7 +871,7 @@ if $ARGS[0] = 'park_wakeup':
 		'You were raped.'
 		act'Get up':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude2.mp4"></video></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude2.jpg"></center>'
 			'Shakily, you pull haul yourself out of the mud, stumbling to your feet.'
 			*nl
 			'There are no signs of your attackers except for the muddy ground where bodies wrestled.'
@@ -893,7 +892,7 @@ if $ARGS[0] = 'park_walkaway1':
 		gs 'clothing', 'dispose'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude3.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude3.jpg"></center>'
 		'Looking around, you try to find something to cover yourself with. All around you are the remains of your ruined clothing.'
 		*nl
 		if PCloDress = 1:
@@ -916,14 +915,14 @@ end
 if $ARGS[0] = 'park_walkaway2':
 	act'Back to the road':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude<<rand(4,5)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'Naked and with cum leaking from every orifice, you limp away, looking for the road...'
 		act'Continue':gt $loc, $loc_arg
 	end
 	
 	act'Back to the road (stoic)':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You limp away, forcing yourself to take one step after the other.'
 		*nl
 		'You''ve been gangraped. Your body is bruised, battered, and filthy from the ordeal, cum leaking from every orifice. And there was nothing you could have done about it.'
@@ -938,14 +937,14 @@ end
 if $ARGS[0] = 'park_walkaway3':
 	act'Back to the road':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude<<rand(4,5)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You don''t even bother trying to find your clothes. Instead you limp away, naked and with cum leaking from every orifice, looking for the road...'
 		act'Continue':gt $loc, $loc_arg
 	end
 	
 	act'Back to the road (stoic)':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You don''t even bother trying to find your clothes. Instead you limp away, forcing yourself to take one step after the other.'
 		*nl
 		'You''ve been gangraped. Your body is bruised, battered, and filthy from the ordeal, cum leaking from every orifice. And there was nothing you could have done about it.'

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 9
-version_patch = 0
+version_patch = 1
 --- saveg ---------------------------------
 

+ 3 - 14
locations/saveupdater.qsrc

@@ -354,20 +354,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 		krystal['saveupdate'] = 1
 	end
-
-	if mari > 0 and mari['status'] = 0 and mari['saveupdate'] = 0:
-		mari['status'] = mari
-		mari['busy'] = mari_busy
-		mari['farm_shoot'] = mari_farm_shoot
-		mari['cloth_shoot'] = mari_cloth_shoot
-		mari['convo'] = mari_convo
-		mari['sex'] = mari_sex
-		mari['model_exp'] = mari_model_exp
-		mari['model_ask'] = mari_modelling_exp
-		mari['fakepassport'] = mari_fakepassport
-		mari['saveupdate'] = 1
-	end
-
+	
 	if $model['firstname'] = '':
 		$model['firstname'] = $pcs_firstname
 		$model['nickname'] = $pcs_nickname
@@ -1655,6 +1642,8 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	end
 	if i <= ARRSIZE('sport_bras'):jump 'loopsportbras'
 	killvar 'sport_bras'
+	
+	if metmira = 1: npc_known['A60'] = 1 & killvar 'metmira'
 end
 
 

+ 1 - 3
locations/shop_photography.qsrc

@@ -208,7 +208,7 @@ if $ARGS[0] = 'photojob_pay':
 	elseif pcs_photoskl > 50:
 		gs 'emp_functions', 'wage_evt', 1
 	else
-		gs 'emp_functions', 'wage_evt', 5, 50
+		gs 'emp_functions', 'wage_evt', 5, 100
 	end
 end
 
@@ -223,8 +223,6 @@ if $ARGS[0] = 'job_init':
 	dynamic $photojob[evt_PhotoID]
 	!! set Day of Week for job to appear on	
 	transient_evt_dow = 6
-	!! evt_silent - hide event from player  in journal (or other locations) - 1 to enable.
-	transient_evt_silent = 0 
     !! Now set up the event date
     gs 'shop_photography' , 'photojob_pay'
     gs 'emp_functions', 'gen_evt'

+ 1 - 7
locations/shop_scandalicious.qsrc

@@ -301,7 +301,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopscandalicious_bodysuit
-		if boutique_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if scandalicious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 100:jump 'loopscandalicious_bodysuit'
 end
@@ -309,13 +309,7 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if boutique_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'shop_scandalicious', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'scandalicious',i, 1000
-
 end
 
 --- shop_scandalicious ---------------------------------

+ 0 - 1
locations/sleep.qsrc

@@ -142,7 +142,6 @@ if $ARGS[0] = 'nap_bed':
 			act 'Get up': gt $loc, $loc_arg
 		end
 	end
-	gs 'events', 'read'
 end
 
 if $ARGS[0] = 'sleep':

+ 78 - 78
locations/soniahome.qsrc

@@ -42,18 +42,18 @@ if $ARGS[0] = 'home':
 		if soniaPS > 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
-			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia is doesn''t want to see anyone, so stop bothering her." she says before closing the door, not inviting you in.'
+			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia doesn''t want to see anyone, so stop bothering her!" she says before closing the door in your face.'
 			act 'Leave': gt 'pav_residential'
 		elseif rand(0,3) = 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
-			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia is not here, but she should be home later. You can call her then," she says before politely closing the door, not inviting you in.'
+			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia isn''t here, but she should be home later. You can call her then," she says before politely closing the door, not inviting you in.'
 			act 'Leave': gt 'pav_residential'
 		elseif rand(0,2) = 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			if soniaQW['tkachenko'] = 0:
-				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello, can I help you?" she asks.'
+				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello. Can I help you?" she asks.'
 				'You smile at her. "Hi, I''m <<$pcs_nickname>>, one of Sonia''s classmates. Is she here?"'
 				'She frowns at you. It seems she doesn''t care for your casual attitude. "I am Tkachenko Ivanko, but you can call me Mrs Ivanko. Who are you exactly?"'
 				'You keep your smile. "Sorry, Mrs Ivanko. I''m <<$pcs_firstname>> <<$pcs_lastname>>."'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'home':
 				act 'Enter': gt 'soniahome','hallway'
 			else
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello again, <<$pcs_firstname>>. Sonia is in her room."'
-				'"Thank you, Mrs Ivanko," you politely reply to keep her happy, and she lets you in, closing the door behind you.'
+				'"Thank you, Mrs Ivanko," you politely reply to keep her happy, and she lets you in before closing the door behind you.'
 				soniaQW['tkachenko'] = 1
 				act 'Enter': gt 'soniahome','hallway'
 			end
@@ -348,7 +348,7 @@ if $ARGS[0] = 'soniaparents':
 	gs 'stat'
 	'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/parents_bedroom.jpg"></center>'
-	'You look into Sonia''s parents'' bedroom and see that, as with the rest of the house, it''s spotless, tidy, and tastefully decorated, making the most of the available space. There''s a wardrobe to your right and the bed on the left, with a chest of drawers and a beautiful fireplace.'
+	'You look into Sonia''s parents'' bedroom and see that, as with the rest of the house, it''s spotless, tidy and tastefully decorated, making the most of the available space. There''s a wardrobe to your right and the bed on the left, with a chest of drawers and a beautiful fireplace.'
 	if hour < 6:
 		gt 'soniahome', 'timecheck'
 	elseif hour > 22:
@@ -404,7 +404,7 @@ if $ARGS[0] = 'sonia_room':
 	gs 'stat'
 	'<center><b><font color = maroon>Vitek''s bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_room.jpg"></center>'
-	'The first thing you notice about her room is it is spotless and orderly. Nothing is out of place in the room. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the centre of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights. Along one of the other walls is a small makeup table that is clean, with all the makeup visibly lined up in a very orderly fashion.'
+	'The first thing you notice about her room is that it''s spotless and orderly. Nothing is out of place. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the centre of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights, while a small makeup table with all the makeup lined up in a very orderly fashion sits against another wall.'
 	'<a href="exec:gt ''soniahome'', ''sonia_chat''">Sonia</a> is lying on her bed relaxing.'
 	act 'Go to the hallway':gt 'soniahome','hallway'
 	if $clothingworntype = 'nude': act 'Dress yourself': gs 'shortgs' ,'dress' & gt 'soniahome', 'sonia_room'
@@ -426,7 +426,7 @@ if $ARGS[0] = 'sonia_chat1':
 	gs 'stat'
 	'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-	'You sit on the bed next to Sonia and look around her room as she starts chatting about something she recently read in a magazine.'
+	'You sit on the bed next to Sonia and look around her room as she starts chatting about something she recently read about in a magazine.'
 	act 'Stop talking': gt 'soniahome','sonia_room'
 	act 'Make small talk':
 		*clr & cla
@@ -467,8 +467,8 @@ if $ARGS[0] = 'sonia_chat1':
 		minut += 15
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-		'You know she often has older clothes, but she some how always manages to make them work and look stylish. "Hey how do you manage to always look so nice?"'
-		'She smiles. "You mean for someone that often has older or cheaper clothes?" You start to protest you didn''t mean it that way but she stops you. "I learned to sew and later clothes. You would be surprised what you can do with a little effort." Then she talks about how she goes about turning fairly plain looking clothes into stylish clothes.'
+		'She often wears older clothes, but she somehow always manages to make them work and look stylish. "How do you manage to always look so nice?"'
+		'She smiles. "You mean for someone that has cheaper clothes?" You''re about to protest that you didn''t mean it that way when she stops you. "I learned to sew. At first, it was just to fix tears and later alter clothes so they fit better and look nicer. You would be surprised what you can do with a little effort." She goes on to talk about how she goes about turning fairly plain looking clothes into stylish ones.'
 		act 'Stop talking': gt 'soniahome','sonia_room'
 		act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -479,10 +479,10 @@ if $ARGS[0] = 'sonia_chat1':
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'"Whats going on with you and the gopniks?" you ask.'
-			'"I am just tired of being the good girl, I just want to cut lose, get a little wild and have some fun. What''s wrong with that?" She replies.'
-			'You sit there in silence a moment wonder if you should push things. "Yeah but you can''t really trust those guys." you meekly reply.'
-			'She rolls her eyes. "I can take care of myself, just let me have my fun." You are about to say more but you can tell this will only lead to a argument so you let it drop.'
+			'"What''s going on with you and the gopniks?" you ask.'
+			'"I''m just tired of being the good girl. I want to cut loose, get a little wild and have some fun. What''s wrong with that?" she replies.'
+			'You sit in silence, wondering if you should push things. "Yeah, but you can''t really trust those guys," you meekly reply.'
+			'She rolls her eyes. "I can take care of myself. Just let me have my fun." You''re about to say something, but you can tell it will only cause an argument and decide to drop it.'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -493,8 +493,8 @@ if $ARGS[0] = 'sonia_chat1':
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'"So I meet your brother." You state matter of factly.'
-			'"Oh god, don''t fall for anything he says. He is a total horn dog, I can''t count the number of girl friends he has had. He just uses them and tosses them aside, yet they keep coming back to him. Do your self a favor and stay away from him." She says in all seriousness. You just nod in response to that, not sure what you could possible say back to her, but you do wonder. Can he really be that bad?'
+			'"So. I met your brother," you state matter of factly.'
+			'"Oh god, don''t fall for anything he says. He''s a total horn dog to the point I can''t count the number of ''girlfriends'' he''s had. He just uses them for sex and tosses them aside, yet they keep coming back to him. Do yourself a favor and stay away from him," she says in a serious tone. You just nod in response, not sure what you could possibly say back to her.'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -504,16 +504,16 @@ if $ARGS[0] = 'sonia_chat1':
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-		'"What is your plans after school?" you ask.'
-		'She looks at you smiling. "I''ve got good grades more than enough to get into the University in Saint Petersburg. I am planning to attend the University after school and study fashion design. My parents want me to become a Doctor or a Lawyer or get a business degree or something like that."'
-		'Before you can say something she asks you "What about you? What are your plans for the future?"'
+		'"What are your plans for after school?" you ask.'
+		'She looks at you with a smile. "I''ve got good grades, more than enough to get into the university in Saint Petersburg. I''m planning to enrol there after school and study fashion design, but my parents want me to become a doctor or a lawyer or get a business degree or something like that."'
+		'Before you can say anything, she turns to you. "What about you? What are your plans for the future?"'
 		act 'I don''t know':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'"I''m not sure, but I guess I have a few options." you tell her.'
-			'She nods a bit. "Oh well I guess you still have some time left to make up your mind." She says but sounds a little unsure like she doesn''t believe it herself.'
+			'"I''m not sure, but I guess I have a few options," you tell her.'
+			'She nods. "Oh. Well, I guess you still have some time left to make up your mind..." she says. She sounds unsure though, as if she doesn''t believe it herself.'
 			'You''re not sure what more to say about it, so you decide to change the subject.'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
@@ -523,8 +523,8 @@ if $ARGS[0] = 'sonia_chat1':
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'You get a bit excited. "I am planning to attend the University too. For sure now, I will know someone there."'
-			'She grins at that happily. "Maybe we should think about being roommates when we go. As you said, then we would know someone and we already get along. Let''s talk about it some more when the time comes to decide then."'
+			'You get a little excited. "I''m planning to attend the university too. At least now I''ll know someone there."'
+			'She grins happily. "Maybe we should think about being roommates when we go? As you said, then we would know someone and we already get along. Let''s talk about it some more when the time comes."'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -549,8 +549,8 @@ if $ARGS[0] = 'sonia_chat1':
 				'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 				'You sigh in a way only hopeless romantics do. "Hopefully I can find that special someone and get married soon."'
-				'She smiles seeing the signs of love. "If he makes you happy then I am happy for you."'
-				'You''re not sure what more to say on the topic.'
+				'She smiles, seeing the signs of love. "If he makes you happy, then I''m happy for you."'
+				'You''re not sure what more to say on the topic and decide to change the subject.'
 				act 'Stop talking': gt 'soniahome','sonia_room'
 				act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 			end
@@ -561,19 +561,19 @@ if $ARGS[0] = 'sonia_chat1':
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-		'You don''t even know if she is a virgin or not, you have never heard of her dating much. You''re not sure if you should even ask, but you are curious. "Do you have a boyfriend or girlfriend?"'
-		'She shakes her head. "Nope, but I would like to find the right guy. Until then I guess I just want to have a little fun."'
+		'You don''t even know if she''s a virgin or not and don''t know if you should even ask, but you''re curious. "Do you have a boyfriend or girlfriend?"'
+		'She shakes her head. "Nope, but I would like to find the right guy. Until then, I just want to have a little fun."'
 		act 'Ask if she has ever dated':
 			*clr & cla
 			minut += 5
 			gs 'npc_relationship', 'modify', 'A25', 'like'
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'You nod in understanding. "So have you ever... you know dated a guy."'
-			'She blushes a bit realizing what you are really asking. "A few times but nothing to serious the beginning of this summer. While on vacation with my family, I meet this boy... it was magically. He was just perfect, we spent all our time together and one night... well we did it." She giggles a bit.'
+			'You nod in understanding. "So have you ever... You know. Dated a guy?"'
+			'She blushes when she realizes what you''re really asking. "A few times, but nothing too serious until a few months ago. While on vacation with my family, I met this boy... and it was magical. We spent all our time together and one night... Well, we did it..." she giggles.'
 			*nl
-			'You smile happy for her. "I am glad you found someone, shame he isn''t close. Are you still seeing him?"'
-			'She shakes her head no. "We talked about it, but felt it wouldn''t be fair. We still talk but are free to see other people." Then she talks about her first time a bit with him and how after that almost every day they had sex until she had to come home. After she finishes she asks you. "What about you?"'
+			'You smile. "I''m glad you found someone, but it''s a shame he isn''t close. Are you still seeing him?"'
+			'She shakes her head. "We talked about it, but felt it wouldn''t be fair. We still talk, but are free to see other people." She starts talking about her first time with him and how after that, they had sex almost every day until she had to come home. When she finishes her story, she turns to you. "What about you?"'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 			if Rex_Love = 1 or artemQW['bf'] = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or (pcs_lover - pcs_girlfriends) > 0:
@@ -585,13 +585,13 @@ if $ARGS[0] = 'sonia_chat1':
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-			'You smile to her reassuringly. "I am sure you will find the right guy, or girl."'
-			'She giggles a bit. "I kinda already did."'
-			'You looked surprised. "Well tell me then, who is it?"'
-			'She blushes at your question. "While on vacation with my family, I meet this boy... it was magically. He was just perfect, we spent all our time together and one night... well we did it." She giggles a bit.'
+			'You smile at her reassuringly. "I''m sure you''ll find the right guy, or girl."'
+			'She giggles. "I kind of already did..."'
+			'You looked surprised. "Well? Who is it?"'
+			'She blushes. "While on vacation with my family, I met this boy... and it was magical. We spent all our time together and one night... Well, we did it..." she giggles.'
 			*nl
-			'You smile happy for her. "I am glad you found someone, shame he isn''t close. Are you still seeing him?"'
-			'She shakes her head no. "We talked about it, but felt it wouldn''t be fair. We still talk but are free to see other people." Then she talks about her first time a bit with him and how after that almost every day they had sex until she had to come home. After she finishes she asks you. "What about you?"'
+			'You smile. "I''m glad you found someone, but it''s a shame he isn''t close. Are you still seeing him?"'
+			'She shakes her head. "We talked about it, but felt it wouldn''t be fair. We still talk, but are free to see other people." She starts talking about her first time with him and how after that, they had sex almost every day until she had to come home. When she finishes her story, she turns to you. "What about you?"'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 			if Rex_Love = 1 or artemQW['bf'] = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or (pcs_lover - pcs_girlfriends) > 0:
@@ -608,7 +608,7 @@ if $ARGS[0] = 'sonia_chat1':
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/home/bed_kiss.jpg"></center>'
 			if hotcat >= 5:
-				'As you sit side by side you look at her for a moment. Maybe for too long, or maybe she just senses it, but she turns her head to look at you. Her face is not that far from yours and you can''t help it. You just think she is so damn pretty. You lean over to give her a kiss, at first she stiffens from the kiss, but after a moment she returns the kiss she fully.'
+				'As you sit side by side, you can''t help but look at her. Maybe for too long, or maybe she just senses it, because she turns her head to look at you. Her face is not that far from yours and you can''t help yourself. You lean over to give her a kiss, a kiss she fully returns.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
 				act 'Stop kissing and talk more': gt 'soniahome', 'sonia_chat1'
@@ -616,7 +616,7 @@ if $ARGS[0] = 'sonia_chat1':
 					*clr & cla
 					'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/home/bed_kiss.jpg"></center>'
-					'As you wrap your hands around the side of her face, you feel her hands hold you by your hips as the two of you keep kissing long and passionately. After a couple of minutes she pulls away obviously a bit flustered. She gets up and cracks the window open a bit. "It''s getting hot in here." She says but doesn''t elaborate, when she sits back down on the bed. She chooses a spot close to you but not so close as to invite another kiss.'
+					'As you wrap your hands around the side of her face, you feel her hands hold you by your hips as the two of you passionately make out. After a few minutes, she pulls away flustered. She gets up and cracks the window open. "It''s getting hot in here," she says, but doesn''t elaborate when she sits back down on the bed. She chooses a spot close to you, but not so close as to invite another kiss.'
 					gs 'arousal', 'foreplay', 2, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'sonia_chat1':
 					act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 				end
 			else
-				'As you sit side by side, you look at her for a moment. Maybe for too long, or maybe she just senses it, but she turns her head to look at you. Her face not that far from yours and you can''t help it. You just think she is so damn pretty, so you lean over and give her a kiss. She returns your kiss for a moment, then stops to pull away. Sensing that she isn''t interested, you decide to keep talking instead.'
+				'As you sit side by side, you can''t help but look at her. Maybe for too long, or maybe she just senses it, because she turns her head to look at you. Her face is not that far from yours and you can''t help yourself. You lean over to give her a kiss. She briefly returns your kiss before stopping to pull away. Sensing that she isn''t interested, you decide to keep talking instead.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -639,13 +639,13 @@ end
 if $ARGS[0] = 'boyfriend_chat':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-	'"I have a boyfriend you know." you tell her.'
-	'She grins at you. "Right who are you dating again?"'
+	'"I have a boyfriend you know," you tell her.'
+	'She grins at you. "Right. Who are you dating again?"'
 	if NikoVolkovQW >= 5:
 		act 'Niko':
 			cla
-			'"Niko." you tell her.'
-			'She smiles to you. "Oh, he seems pretty nice and charming. You know for one of the gopniks." You talk to her a bit about how great of a guy he is.'
+			'"Niko," you tell her.'
+			'She smiles at you. "Oh. He seems pretty nice and charming. You know, for one of the gopniks." You talk to her about how great of a guy he is.'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -654,18 +654,18 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Fedor':
 			cla
 			if npc_grupTipe['A5'] = 5:
-				'"Fedor." you tell her.'
-				'She arches a slender brow obviously a bit surprised. "Fedor? Is he into girls? I mean after he sucked Vasily''s dick in front of the whole school, you kinda have to wonder."'
-				'You frown at her. "He didn''t have a choice, because those criminals where going to take everything from his family. He couldn''t pay them. He''s not gay!"'
-				'She holds up her hands. "Ok ok sorry, I was just wondering is all, as long as he makes you happy that''s all that matters." she says, obviously trying to make peace.'
-				'You nod, accepting her apology and instead start telling her about how great of a guy he is.'
+				'"Fedor," you tell her.'
+				'She arches a brow in surprise. "Fedor? Is he into girls? I mean, after he sucked Vasily''s dick in front of the whole school, you kind of have to wonder..."'
+				'You frown at her. "He didn''t have a choice! Those criminals were going to take everything from his family because he couldn''t pay them. He''s not gay!"'
+				'She holds up her hands. "Okay, okay. Sorry. As long as he makes you happy, that''s all that matters," she says, trying to make peace.'
+				'You nod, accepting her apology, and start telling her about how great of a guy he is.'
 				act 'Stop talking': gt 'soniahome','sonia_room'
 				act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 			else
-				'"Fedor." you tell her.'
-				'She arches a slender brow slightly. "Fedor?" Then she grins. "If you were going to date a jock I would go for Lazar or maybe Ivan?" she says with a giggle.'
-				'You smile to her. "Well I like Fedor, he is sweet and makes me happy. You can have Lazar or Ivan."'
-				'You both giggle at that and then you tell her about how great Fedor is and what a amazing boyfriend he is.'
+				'"Fedor," you tell her.'
+				'She arches her brow slightly. "Fedor?" she asks before grinning. "If you were going to date a jock, I would have gone for Lazar. Or maybe Ivan?" she says with a giggle.'
+				'You smile at her. "I like Fedor. He''s sweet and makes me happy. You can have Lazar or Ivan."'
+				'You both giggle before you tell her about how great Fedor is and what an amazing boyfriend he is.'
 				act 'Stop talking': gt 'soniahome','sonia_room'
 				act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 			end
@@ -675,17 +675,17 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Vitek':
 			cla
 			if soniaQW['vitek_bj_watched'] = 1:
-				'"Vitek." you tell her.'
-				'Sonia seems surprised for a moment. "Really? But neither of you said anything... when he and I... you know." You can tell she thinks it is weird neither of you mentioned the two of you was dating.'
-				'You shrug a little. "He messes around sometimes but I know he loves me, so I don''t mind." After that the conversation quickly stops, so you decided to change the subject.'
+				'"Vitek," you tell her.'
+				'She seems surprised. "Really? But neither of you said anything... When he and I... You know..."'
+				'You shrug. "He messes around sometimes, but I know he loves me, so I don''t mind." After that the conversation quickly stops, so you decide to change the subject.'
 			elseif soniafall >= 6:
-				'"Vitek." you tell her.'
-				'Sonia seems surprised for a moment. "Really? I... I''m sorry but he said he wasn''t seeing anyone and we fooled around a bit." You can tell she is afraid of how she will react, but you know it isn''t her fault.'
-				'You shake your head not sure what to say. "Let''s just change the subject."'
+				'"Vitek," you tell her.'
+				'She seems surprised. "Really? I... I''m sorry, but he said he wasn''t seeing anyone and we fooled around." You can tell she''s afraid of how you''ll react, but you know it isn''t her fault.'
+				'You shake your head, not sure what to say. "Let''s just change the subject."'
 			else
-				'"Vitek." you tell her.'
-				'Sonia seems surprised for a moment. "Really? I have been hanging out with Dan, Vasily and him a little lately and he never once mentioned it." You can tell she thinks it is weird he never mentioned he was dating you.'
-				'You shrug a little. "I trust him." After that the conversation quickly stops, so you decided to change the subject.'
+				'"Vitek," you tell her.'
+				'She seems surprised. "Really? I''ve been hanging out with Dan, Vasily and him a little lately and he never once mentioned it."'
+				'You shrug. "I trust him." After that, the conversation quickly stops and you decide to change the subject.'
 			end
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
@@ -695,15 +695,15 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Artem':
 			cla
 			if grupTipe = 3:
-				'"Artem." you tell her.'
-				'She grins. "Well, you guys make a cute couple." she says with a giggle.'
-				'You sigh as those in love sigh. "He''s sweet and really nice to me."'
-				'You both giggle at that and then you tell her about how great Artem is and what a amazing boyfriend he is.'
+				'"Artem," you tell her.'
+				'She grins. "Well, you guys make a cute couple," she says with a giggle.'
+				'You sigh in a way only those in love can. "He''s sweet and really nice to me."'
+				'You both giggle before you tell her about how great Artem is and what an amazing boyfriend he is.'
 			else
-				'"Artem." you tell her.'
-				'She looks a little surprised. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute... just a little surprised is all." she says with a giggle.'
+				'"Artem," you tell her.'
+				'She looks a little surprised. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute... Just a little surprised is all," she says with a giggle.'
 				'You shake your head slightly at her comment. "He''s sweet and really nice to me."'
-				'You both giggle at that and then you tell her about how great Fedor is and what a amazing boyfriend he is.'
+				'You both giggle before you tell her about how great Artem is and what an amazing boyfriend he is.'
 			end
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
@@ -712,12 +712,12 @@ if $ARGS[0] = 'boyfriend_chat':
 	if Rex_Love = 1:
 		act 'Rex':
 			cla
-			'"Rex." you tell her.'
-			'"Who?" she asks as she cocks her head slightly, obviously trying to think if she has ever heard his name before. It seems that she thinks of him. "Wait, isn''t he the guy that throws parties all the time? My brother sometimes goes to his parties."'
+			'"Rex," you tell her.'
+			'"Who?" she asks as she cocks her head slightly. "Wait, isn''t he the guy that throws parties all the time? My brother sometimes goes to them."'
 			'You nod. "Yeah, that''s him."'
 			*nl
-			'She now has an inquisitive look on her face. "How did you meet him? He''s a few years older than you." she asks, obviously curious how you two crossed paths long enough to start dating.'
-			'You smile at her. "I was invited to his party." you tell her, then add "Ok, he is friends with my sister. She invited me to his party and that''s where we met." You talk about the night you met him and your first date.'
+			'She now has an inquisitive look on her face. "How did you meet him? He''s a few years older than you," she asks.'
+			'You smile at her. "I was invited to his party," you tell her, then add "Okay, he''s friends with my sister. She invited me to his party and that''s where we met." You talk about the night you met him and your first date.'
 			act 'Stop talking': gt 'soniahome','sonia_room'
 			act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 		end
@@ -733,13 +733,13 @@ end
 if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
-	'"I have a boyfriend you know." you tell her.'
-	'She grins at you. "Right who are you dating again?"'
-	'"<<$ARGS[1]>>." you tell her.'
+	'"I have a boyfriend you know," you tell her.'
+	'She grins at you. "Right. Who are you dating again?"'
+	'"<<$ARGS[1]>>," you tell her.'
 	*nl
-	'"Who?" She asks as she cocks her head slightly, obviously trying to think if she has ever heard his name before.'
-	'You shake your head slightly. "You''ve never met him. I just met him."'
-	'She smiles a bit. "Just some guy you met huh?" You laugh then tell her about him.'
+	'"Who?" she asks as she cocks her head slightly.'
+	'You shake your head slightly. "You''ve never met him. I only just met him."'
+	'She smiles. "Just some guy you met, huh?" You laugh before you start telling her about him.'
 	act 'Stop talking': gt 'soniahome','sonia_room'
 	act 'Keep talking': gt 'soniahome', 'sonia_chat1'
 end

+ 1 - 1
locations/start.qsrc

@@ -18,7 +18,7 @@ $fname = 'Tahoma'
 fsize = 12
 gs 'saveg'
 gs 'addbuilddate'
-$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for the "Girl Life, I presume?" version'
+$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for the so late I should have called it the 0.9.5 version'
 opPRE = 1
 
 *nl

+ 1 - 1
locations/stripclub.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 			end
 		else
 			if age >= 18 or fakepassport = 1:
-				if ((day = 3 or day = 4) and stripwork = 1) or ((day = 5 or day = 6) and stripwork1 = 1):
+				if ((week = 3 or week = 4) and stripwork = 1) or ((week = 5 or week = 6) and stripwork1 = 1):
 					'"Evening, <<$pcs_stagename>>. You working tonight?" he asks.'
 					'You give him a quick nod as you head for the employee entrance.'
 					act 'Use the employee''s entrance':frost = 0 & gt 'stwork', 'start'

+ 1 - 1
locations/telefon.qsrc

@@ -720,7 +720,7 @@ if $ARGS[0] = 'Phone_megafon':
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
 	else
-		$contractmessage = '<font size=6>You don''t have any valid contracta, you should buy one at MegFon.</font><br>'
+		$contractmessage = '<font size=6>You don''t have any valid contracts, you should buy one at MegaFon.</font><br>'
 	end
 
 	$telefon['body'] = '

+ 89 - 57
locations/therapist.qsrc

@@ -1707,8 +1707,62 @@ if $ARGS[0] = 'hypnoRandom':
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolBlow<<rand(3,4)>>.mp4"></video></center>'
 			'As instructed, you use your mouth to clean off <i>Master''s</i> cock.'
 
-			act 'Continue':
-				gt 'therapist', 'hypnoEnd'
+			if therapist_key = 0:
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+					therapist_key = 1
+					'You finish getting dressed and the doctor hands you something. It''s a keychain with a single key, a tiny bunny plush, and a tag for the Hotel by Pavlovsk market with a room number on it. "I want you to show up to this room every Saturday night from 20:00. There you will find me, waiting for you. Once a week, you will be my wife. You will do whatever I ask of you and you will do it without question. This will all be automatic for you. You will not be under hypnosis for this and you will do it because you WANT to do it" he says. "Soon, you will be my wife for real and when that day comes, you must know what is expected of you, Understand?" he states.'
+
+					act 'Yes, Master':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+						therapist_key = 2
+						'"I understand, Master, I will be your wife every Saturday night and into Sunday morning"'
+						'"Thats my girl, Heres the key, See you soon" he then places a kiss on your lips. "But remember, if you come to the clinic, you will go under upon seeing me and wont remember anything" You nod as you walk out the door.'
+						act 'Continue':	gt 'therapist', 'hypnoEnd'
+					end
+
+					gs 'willpower', 'misc', 'resist', 'hard'
+
+					if will_cost <= pcs_willpwr:
+						act 'No, master':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+							gs 'willpower', 'pay', 'hard'
+							'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
+							act 'Continue':	gt 'therapist', 'hypnoEnd'
+						end
+					else
+						act 'No, master (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				end
+			elseif therapist_key = 1:
+				'You finish getting dressed and the doctor asks you something that you think you have heard before, "I want you to show up to this room every Saturday night. There you will find me, waiting for you. Once a week, you will be my wife. You will do whatever I ask of you and you will do it without question. This will all be automatic for you. You will not be under hypnosis for this and you will do it because you WANT to do it" he says. "Soon, you will be my wife for real and when that day comes, you must know what is expected of you, Understand?" he states.'
+				act 'Yes, Master':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+					therapist_key = 2
+					'"I understand, Master, I will be your wife every Saturday night and into Sunday morning"'
+					'"Thats my girl, Heres the key, See you soon" he then places a kiss on your lips. "But remember, if you come to the clinic, you will go under upon seeing me and wont remember anything" You nod as you walk out the door.'
+					act 'Continue':	gt 'therapist', 'hypnoEnd'
+				end
+
+				gs 'willpower', 'misc', 'resist', 'hard'
+
+				if will_cost <= pcs_willpwr:
+					act 'No, master':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+						gs 'willpower', 'pay', 'hard'
+						'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
+						act 'Continue': gt 'therapist', 'hypnoEnd'
+					end
+				else
+					act 'No, master (<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 'Continue':	gt 'therapist', 'hypnoEnd'
 			end
 		end
 	! sveta will now have scheduled sessions
@@ -1719,9 +1773,30 @@ if $ARGS[0] = 'hypnoRandom':
 		'"Now that I''ve sufficiently broken your resistance, we need to make sure you show up more often. From now on, you will feel that you NEED my hypnotism treatment. You will feel that you NEED to scheduled therapy sessions every day between 6:00 and 18:00. I would prefer you be here before school so my seed will impregnate you while you sit in class, but you have to be here by at least 18:00 so you will not feel terrible. Do you understand, Cunt?"' 
 		'You nod "Yes, Master."'
 		hypnoSchedule = 1
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
+	! sveta will now hate wearing bras.
+	elseif hypnoBra ! 1 and rand(1,2) = 1:
+		cla
+		*clr
+		hypnoRandomCounter = 0
+		'"Listen Cunt, you hate wearing bras. You like the freedom of not wearing them. You enjoy the thought that people see you without them. The outline of your nipples in your shirts, the form of your curves make you never want to ever wear them again." He commands you to strip off your bra and hand it to him.'
+		if $braworntype ! 'none':
+			act 'Remove your bra':
+				*clr & cla
+				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/removeBra.mp4"></video></center>'
+				gs 'bras', 'dispose'
+				'He takes the bra and looks at it before throwing it in the trash.'
+
+				act 'Continue':	gt 'therapist', 'hypnoEnd'
+			end
+		else
+			'"You show him that you are not wearing a bra.'
+			'Good girl. Keep it that way."'
+			'"Yes, <i>Master</i>."'
 		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
+
+		hypnoBra = 1
 	elseif therapistFuckedPussyStage = 1:
 		cla
 		*clr
@@ -1745,9 +1820,7 @@ if $ARGS[0] = 'hypnoRandom':
 		'<font color="<<$hypnocolour>>">"Now lets make sure you start having my children... <font color="<<$hypnocolour>>">Although you won''t consciously know my cum is inside of you, you will subconsciously feel it. Everytime I cum inside of you, your body will crave my seed more. You will keep your pussy clenched so my cum doesn''t leak out."</font>'
 		'<font color="<<$hypnocolour>>">Also, take these." He hands you a package of pills. "You will take one every day. If you have any birth control pills, you will throw them away. You won''t think about buying more. You won''t notice anything wrong with this and you will think these are simply normal birth control pills. Understand, <i>Cunt</i>?"</font>'
 		'"Yes, <i>Master</i>."'
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	! sveta will now hate wearing panties.
 	elseif hypnoPanty ! 1:
 		*clr & cla
@@ -1763,9 +1836,7 @@ if $ARGS[0] = 'hypnoRandom':
 			'"Good girl. Keep it up."'
 			'"Yes, <i>Master</i>."'
 		end
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 		hypnoPanty = 1
 		bedPanty = 2
 	! svesta will now get commando lvl 3
@@ -1777,38 +1848,11 @@ if $ARGS[0] = 'hypnoRandom':
 		'"Cunt, It seems like you are still trying to resist my rules regarding panties. We need to change these rebelious behaviours as soon as possible. From now on you prefer not wearing panties than wearing panties. In fact, you <i>hate</i> wearing them! You find them to be restrictive and annoying. Just the thought of wearing panties make you feel uncomfortable"'
 		pcs_traits['commando_lvl'] = 3
 		act 'Continue':
-		msg 'You have gained the 3rd level of the Commando trait! From now on any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
+			msg 'You have gained the 3rd level of the Commando trait! From now on any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
 			gt 'therapist', 'hypnoEnd'
 		end
 		hypnoPanty = 1
-		bedPanty = 2	
-	! sveta will now hate wearing bras.
-	elseif hypnoBra ! 1 and rand(1,2) = 1:
-		cla
-		*clr
-		hypnoRandomCounter = 0
-		'"Listen Cunt, you hate wearing bras. You like the freedom of not wearing them. You enjoy the thought that people see you without them. The outline of your nipples in your shirts, the form of your curves make you never want to ever wear them again." He commands you to strip off your bra and hand it to him.'
-		if $braworntype ! 'none':
-			act 'Remove your bra':
-				*clr & cla
-				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/removeBra.mp4"></video></center>'
-				gs 'bras', 'dispose'
-				'He takes the bra and looks at it before throwing it in the trash.'
-
-				act 'Continue':
-					gt 'therapist', 'hypnoEnd'
-				end
-			end
-		else
-			'"You show him that you are not wearing a bra.'
-			'Good girl. Keep it that way."'
-			'"Yes, <i>Master</i>."'
-		end
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
-
-		hypnoBra = 1
+		bedPanty = 2
 	! sveta will now think it''s normal for pavlov to check if she is not wearing panties before their sessions.
 	elseif hypnoCheckPanties ! 1 and rand(1,2) = 1 and hypnoPanty = 1:
 		*clr & cla
@@ -1819,9 +1863,7 @@ if $ARGS[0] = 'hypnoRandom':
 		'"Good ..."<br>'
 		hypnoCheckPanties = 1
 		hypnoRandomCounter = 0
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	! sveta will now think it''s common courtesy to show her pussy to pavlov as a greeting.
 	elseif hypnoCheckPanties = 1 and hypnoFlashGreet ! 1 and rand(1,2) = 1 and hypnoPanty = 1:
 		cla
@@ -1833,9 +1875,7 @@ if $ARGS[0] = 'hypnoRandom':
 		'"Good ..."<br>'
 		hypnoFlashGreet = 1
 		hypnoRandomCounter = 0
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 		!! Forced Clothing, Steva will want to wear exhibitionist clothing, failing that only clothing she finds "daring" or have a cost of willpower
 	elseif hypnoPanty = 1 and hypnoBra = 1 and hypnoClothes = 0:
 		hypnoClothes = 1
@@ -1853,9 +1893,7 @@ if $ARGS[0] = 'hypnoRandom':
 		'"Lastly, if they do not have any school clothes, wear an outfit that exposes the most skin," he smiles. "Wearing normal clothing makes you feel self-conscious -- like to much clothing restricts your movement. You need to wear the bare minimum,</font> Understand cunt?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."'
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	! sveta now thinks it''s normal for pavlov to touch her inappropriately
 	elseif hypnoTouchWhenever ! 1 and rand(1,2) = 1:
 		cla
@@ -1879,9 +1917,7 @@ if $ARGS[0] = 'hypnoRandom':
 		*nl
 		'<font color="<<$hypnocolour>>">"From now on, before you leave, you will feel that it is natural to kiss me before you leave as thanks for your therapy session. You won''t find anything wrong with this. Doing so will feel perfectly normal. When you kiss me, you will do so with enthusiasm. You will enjoy the kiss and you will prefer kissing with your tongue. When we are finished, you will thank me for the session.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	! sveta will have a much harder time cumming without pavlov''s cock
 	elseif hypnoHardToCum ! 1:
 		cla
@@ -1892,9 +1928,7 @@ if $ARGS[0] = 'hypnoRandom':
 		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will have difficulty orgasming if I''m not the one making you cum.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	! sveta can ask pavlov to fuck her instead of therapy
 	elseif hypnoAskFuck ! 1 and hypnoHardToCum = 1 and hypnoKissGoodbye = 1 and hypnoTouchWhenever = 1 and hypnoFlashGreet = 1 and hypnoBra = 1:
 		cla
@@ -1906,9 +1940,7 @@ if $ARGS[0] = 'hypnoRandom':
 		'<font color="<<$hypnocolour>>">"From now on, you will feel that it is perfectly normal for you to ask me to fuck you instead of asking for therapy sessions. In fact, you will think that taking my cock is simply a normal therapy session and that doing so is not sex at all. Also, anytime you see my cock, your mind will enter the black room.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'
-		act 'Continue':
-			gt 'therapist', 'hypnoEnd'
-		end
+		act 'Continue':	gt 'therapist', 'hypnoEnd'
 	else
 		gt 'therapist', 'hypnoEnd'
 	end

+ 123 - 0
locations/therapist_hotel.qsrc

@@ -0,0 +1,123 @@
+# therapist_hotel
+
+if $ARGS[0] = 'start':
+	CLOSE ALL
+	$loc = 'therapist_hotel'
+	$loc_arg = 'start'
+	$menu_loc = 'therapist_hotel'
+	$menu_arg = 'start'
+	menu_off = 0
+	$location_type = 'private_indoors'
+	minut+= 5
+
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/room.jpg"></center>'
+	'Upon entering the room you hear the shower running which gives you a moment to look around the large suite. To start off, it looks lived in. There is a small kitchen in the corner with a mini fridge and a small portable stove with a tea kettle on it letting off some steam, letting the owner of the room know the water is soon to be ready. There is a laptop, open, on the desk with lots of papers lying around it, as if someone is transcribing them into digital form. There is one book on the bed, open and face down, as if someone was reading it.'
+
+	'Suddenly the water in the shower stopped!'
+
+	act 'Wait': gt 'therapist_hotel', 'event'
+	gs 'willpower', 'misc', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'RUN!!!':
+			gs 'willpower', 'pay', 'medium'
+			gt 'pav_hotel'
+		end
+	end
+end
+
+if $ARGS[0] = 'event':
+	*clr & cla
+	menu_off = 1
+	minut+= 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/arrive.jpg"></center>'
+	'When the man walks out of the shower in a heavy bathrobe, your mind becomes blank and you enter the black room.'
+	'The Therapist walks over to you to check your panties as he makes sure you are not wearing any. Once he realizes this, he moves you over to the bed. "Welcome to my home," he says. "I''ve lived here since I divorced my wife, just waiting for the divorce to become official." He sits down in front of you. "So, when that happens, you will be my wife, but we need to make you want that, so this is the next part of your training." He continues.'
+	act 'Continue':
+		minut+= 2
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
+		'"Every Saturday, you will show up here and we will do some more training. You can still meet me at the clinic but here?" He smiles and moves in to kiss you. "You will be trained to be my wife, in all facets. Now, please take a shower and come out naked when you are done.'
+		act 'Continue':
+			minut+= 2
+			*clr & cla
+			$lastwornclothingtype['therapist'] = $clothingworntype
+			lastwornclothingnumber['therapist'] = clothingwornnumber
+			$lastwornpantytype['therapist'] = $pantyworntype
+			lastwornpantynumber['therapist'] = pantywornnumber
+			$lastwornbratype['therapist'] = $braworntype
+			lastwornbranumber['therapist'] = brawornnumber
+			dynamic $showerdin
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked.jpg"></center>'
+			'After you shower, you walk out of the bathroom and stand naked before him. "Good, a clean wife makes a happy husband" he says and walks up to you and kisses you while fondling your chest. "Now, your first order, while you are in this room you will respond to Wife, not Cunt is that understood Wife?"'
+			act 'Yes, Master': gt 'therapist_hotel', 'post_shower'
+
+			gs 'willpower', 'misc', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'No, Master':
+					*clr & cla
+					minut+= 5
+					gs 'willpower', 'pay', 'medium'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/pavlov.jpg"></center>'
+					'"Then get out of here until you do"'
+					'He guides you out of the door and closes it behind you.'
+					act 'Continue': gt 'pav_hotel'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'post_shower':
+	minut+= 2
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/bj.jpg"></center>'
+	'"Let''s start off slow. As your husband, you have to keep me calm," he points to under the desk. When he says "get under there", you move under the desk and look at him before he sits in his chair and imprisons you. You just sit there for what feels like a couple of hours before he opens his robe and moves your face to his cock. Knowing what he wants you start to suck on his cock. You only hear, "Don''t stop, even if i cum, you keep my cock in your mouth" and he goes back to whatever he''s doing.'
+	if hypnoHardToCum = 1: hypnoHardToCum = 2
+	gs 'arousal', 'bj', 60, 'sub'
+	gs 'stat'
+	act 'Continue':
+		minut+= 2
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex.jpg"></center>'
+		'You spend most of the day here, getting cum in your mouth and throat while he works. Once he pulls his cock from your mouth, and then pulls you from under the desk, you can see its already night time. "Get on the bed, on your back, I want to breed you as a reward tonight before we sleep"'
+		gs 'arousal', 'bj', 120, 'sub'
+		gs 'stat'
+		act 'Thank you, Master':
+			minut+= 2
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex2.jpg"></center>'
+			'You stand up and move to the bed and looking up at your therapist as he climbs on top of you and pushes himself inside you. He has his way with your body, fondling your chest, sucking your nipples, kissing and sucking on your neck. He enjoys your body until he cums deep inside you. Unlike back in the clinic, he stays inside you as he pulls a blanket over you and himself before falling asleep.'
+			gs 'arousal', 'vaginal', 20, 'sub'
+			gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
+			gs 'arousal', 'end'
+			if hypnoHardToCum = 2: hypnoHardToCum = 1
+			gs 'stat'
+			act 'Sleep':
+				gs 'sleep', 'simple'
+				gt 'therapist_hotel', 'morning'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'morning':
+	dynamic $showerdin
+	gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
+	gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
+	gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
+	'You wake up alone in a hotel room. You are naked and dripping of cum. You ask yourself, "What did I do last night?" after the hypnosis ends. You only remember sleeping with someone and having sex with them, but you have no idea who. You finally use the shower in the room, dress in what you wore the day before and leave the room.'
+	act 'Continue': gt 'pav_hotel'
+end
+
+--- therapist_hotel ---------------------------------
+

+ 5 - 3
locations/underwear_attributes.qsrc

@@ -93,15 +93,17 @@ BraCover = 0
 underwear['pair'] = 0
 
 
-if $ARGS[0] = 'lusso_bodysuit':
+if $ARGS[0] = 'moncheri_bodysuits':
+	*P FUNC('$attributes_moncheri_bodysuit', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'lusso_bodysuits':
 	*P FUNC('$attributes_lusso_bodysuit', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'lusso_panties':
 	*P FUNC('$attributes_lusso_panties', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'lusso_bras':
 	*P FUNC('$attributes_lusso_bra', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'scandalicious_bodysuit':
+elseif $ARGS[0] = 'scandalicious_bodysuits':
 	*P FUNC('$attributes_scandalicious_bodysuit', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'salacious_bodysuit':
+elseif $ARGS[0] = 'salacious_bodysuits':
 	*P FUNC('$attributes_salacious_bodysuit', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'salacious_panties':
 	*P FUNC('$attributes_salacious_panties', $ARGS[0], ARGS[1])

+ 40 - 4
locations/underwear_bodysuits.qsrc

@@ -47,25 +47,61 @@ if $ARGS[0] = 'view_bodysuit_list':
 		cloc = 1
 	end
 
-	'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
+	!! Check for no bodysuits
+	j = 0
+
+	if ARRSIZE('moncheri_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+	end
+
+	i = 1
+	:loopmoncheribodysuits 
+	if moncheri_bodysuits_s[i] = metka_bodysuits and moncheri_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''moncheri'', <<i>>"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="150" /></a>'
+	i += 1
+	if i <= ARRSIZE('moncheri_bodysuits'):jump 'loopmoncheribodysuits'
+
+	if ARRSIZE('lusso_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
+	end
 
 	i = 1
 	:looplussobodysuits 
 	if lusso_bodysuits_s[i] = metka_bodysuits and lusso_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('lusso_bodysuits'):jump 'looplussobodysuits'
-	
+
+	if ARRSIZE('salacious_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
+	end
+
 	i = 1
 	:loopsalaciousbodysuits 
-	if salacious_bodysuits_s[i] = metka_bodysuits and salacious_bodysuit[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
+	if salacious_bodysuits_s[i] = metka_bodysuits and salacious_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('salacious_bodysuits'):jump 'loopsalaciousbodysuits'
-	
+
+	if ARRSIZE('scandalicious_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/scandalicious.png"></center>'
+	end
+
 	i = 1
 	:loopscandaliciousbodysuits 
 	if scandalicious_bodysuits_s[i] = metka_bodysuits and scandalicious_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''scandalicious'', <<i>>"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('scandalicious_bodysuits'):jump 'loopscandaliciousbodysuits'
+
+	if j = 0:
+		*nl
+		*nl
+		*nl
+		*nl
+		*nl
+		'<center><b><font color = red>You do not own any bodysuits</font></b></center>'
+	end
 end
 
 if $ARGS[0] = 'view_bodysuit_item':

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