119 Commits 03c9e9a78e ... f62149bea4

Author SHA1 Message Date
  KevinSmarts f62149bea4 [fixes] Hunter flirting no longer causing orgasm by removing it from arousal system 6 years ago
  KevinSmarts 849330f177 Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 6 years ago
  3xpurt d114ac14fb [fixed] missing variable in family and duplication duplication of kolka links on weekend. 6 years ago
  3xpurt 9ade9b5638 [Changed] font colour of red vibrator and dildo stat display, so it doesn't seem like a warning. 6 years ago
  sovietmercader c0188aa1f9 [fixed] only clean face cum even when other cum is present and missing ass cum 6 years ago
  sovietmercader ee9ca57ba1 [fixed] no more teleporting bathrooms for pavlovsk community center or pavlovsk train station 6 years ago
  3xpurt b3eaa894c2 [fixed] clothing recovery for swamp_yard exit 6 years ago
  3xpurt a817698034 [fixed] conditions for skinny dipping vs swimming nude and duplication of actions at gadriver. 6 years ago
  3xpurt 947f694b73 [fixed] abduction maximum dildo size. 6 years ago
  3xpurt c142b2a150 [Fixed] park sleep on bench message display condition in gskver. 6 years ago
  3xpurt 2f054d731a [fixed] no exit in lact_lib exhibition check and changed to inhibition 6 years ago
  3xpurt 70e4d3579f [changed] laketoilet random event hours from 22-4. Event now working. 6 years ago
  3xpurt a32f9f89d4 [fixed] fixed accommodation debt for non-slaves, and no longer lose all your money from sleeping in saunawhore. 6 years ago
  julzor caed1ff087 [fixes] changed old A191 to the new $petID in soba 6 years ago
  julzor 5f926e076c [fixes] missing names of random boys and girls in gschool_detention 6 years ago
  julzor 6e96f9c59a [fixes] [text edit] really minor text edits and changes 6 years ago
  julzor a8ed85b0bb [fixes] fixed a dead end in placer_sex 6 years ago
  julzor e137bc1fcb [fixes] matched the if statements and descriptions in gadbana and miroslava to make them consistent when the sauna is available 6 years ago
  KevinSmarts ad7cfeb11f [text edit] Wrong location for sex shop 6 years ago
  julzor e54fa9c3ea [fixes] wrong price 6 years ago
  julzor aa022d92a8 [text edit] small text edits 6 years ago
  julzor eb6d2e7c11 [fixes] you are not longer forced to get ouside nude after going to the grandmothers sauna with mira and removed some unnecessary code 6 years ago
  julzor 6c0c0358a0 [text edit] small text edit because you can't really go outside if you are already outside 6 years ago
  julzor c595aecaa5 Revert "[text edit] small text edit because you can't really go outside if you are already outside" 6 years ago
  julzor 81d0e47fbe [fixes] removed the duplicate description if sunweather is 0 6 years ago
  julzor 68812df2a2 [text edit] small text edit because you can't really go outside if you are already outside 6 years ago
  KevinSmarts aed267c4b3 [fixes] Typo and using a dynamic where a gosub was more suitable in saunawhore 6 years ago
  KevinSmarts 47a605466f Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts 685b766afb [changed] Used the $locclass to label the bedrooms and added bedroom selfies using that variable 6 years ago
  julzor dd01244f79 [fixes] variable typo 6 years ago
  julzor 165fc367c0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 6 years ago
  KevinSmarts b9dc034364 [text edit] Typos and grammer mistakes spotted by ChiChi 6 years ago
  KevinSmarts 0be480f214 [fixes] Logic hole plugged in the shower masturbation. 6 years ago
  julzor 8f0104a0bc [fixes] missing end 6 years ago
  KevinSmarts 860edaeacd [fixes] Typo in image path 6 years ago
  KevinSmarts fd151096fe [fixes] Static number not set 6 years ago
  KevinSmarts 4ad5952a4d [fixes] Added cum on face image to replace the placeholder for facial finish. 6 years ago
  KevinSmarts ac0b6d887c Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts ded5f8cd79 Merge branch 'master' of https://git.catrenelle.com/ml/glife 6 years ago
  KevinSmarts b36c5176e6 [fixes] Set new rental/purchases as current home and a contingency so that you can set your home if it has not been done for you. 6 years ago
  julzor 14512741ce [changed] added some missing pictures and rewrote some code 6 years ago
  Mona Lisa 6f0b22e185 unused variable 6 years ago
  Mona Lisa b484396ef5 correct location of sex shop 6 years ago
  Mona Lisa fa34b45854 add taxi stop for red light district 6 years ago
  Mona Lisa 1d349ff96d typos and small fixes 6 years ago
  KevinSmarts 03235babfa [fixes] Removed old variables that weren't being used and extra incorrect 'boystat' calls that were returning warnings to the players 6 years ago
  KevinSmarts 023ffd43e8 Merge branch 'master' of https://git.catrenelle.com/sandra_schulz/glife 6 years ago
  sandra_schulz 0983d2f5c3 change in gpoli.qsrc: 6 years ago
  sandra_schulz 4d3a4a2219 change in pharmacy.qsrc: 6 years ago
  julzor 1507d47565 [fixes] more fixes to shaving/showering in the sauna 6 years ago
  julzor 32ea2bb68a [fixes] shaving as a saunawhore 6 years ago
  julzor 6f093062cd [fixes] there is an event missing in the school when bursting into the room when christina already sucked the coach of ... made a comment and removed the action for now 6 years ago
  julzor 8150e013f6 [fixes] prostitution at the gas station now checks if the player is in the city or in pavlovsk 6 years ago
  julzor 99ba6f08d0 [fixes] fixed leaving the forest if clothes are torn 6 years ago
  KevinSmarts 0d8af22705 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts 9da2ad579e [added] New location for location sorting - its so I can label places for the selfies and then asign general locations as needed automatically insteed of added multiple setting to each location 6 years ago
  julzor caff38b328 [fixes] fixed kissing loop and other small stuff 6 years ago
  julzor 34c6e94ddd [fixes] made the if conditions leading to the boys in gaddvor and gadukino identical and removed mitkadaybuh because it is handled inside mitkabuh 6 years ago
  julzor 63f78931bf Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 6 years ago
  julzor 64c3976a97 [Ìtext edit] [fixes] increased the change to find the meadow and text edits 6 years ago
  KevinSmarts c55abb23f3 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts cb87b66abe [fixes] Displayed value not reversed 6 years ago
  julzor a321a46344 [fixes] made it possible to get payed for the weekend job at the young_shop and smal other fixes 6 years ago
  julzor 23d9d20ad6 [fixes] restored missing picture and text 6 years ago
  julzor 13eb40aaec [fixed] increased the chance to meet miras brother a little bit 6 years ago
  julzor 4ee07cdd7c [text edit] ... and removed more white space 6 years ago
  julzor 83a1e855bc [text edit] removed more white space 6 years ago
  julzor 67b64f369c [text edit] removed unnecessary and annoying white space 6 years ago
  julzor 68474c8e76 [fixes] [text edit] removed unnecessary option, small text edit 6 years ago
  julzor 7830c516a4 [text edit] [fixes] added cla and moved the signing of the documents to the correct place 6 years ago
  julzor 739b6ecae0 [text edit] removed white space 6 years ago
  julzor 88ff5db4dd [fixed] added missing or removed wrong slutty increases 6 years ago
  KevinSmarts e455136dce Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts 85eb74fe9c [fixes] Rolan's group type set incorrectly so he was in cool kids and not teachers/staff 6 years ago
  julzor befbd49a75 [changed] added slutty and reduced fame increase to bring it more into line with other prostitute events 6 years ago
  julzor e26d844901 [text edit] removed unnecessary white space 6 years ago
  julzor 2a43c37369 [changed] added some stats and fame increases 6 years ago
  KevinSmarts 830c8699d3 Merge branch 'master' of https://git.catrenelle.com/ml/glife 6 years ago
  KevinSmarts f255976982 [fixes] Incorrect image links in Rolan meet events 6 years ago
  Mona Lisa 412aa0c491 this section never triggered because all the other conditions have a gt 6 years ago
  Mona Lisa 31023fcc98 variable typo 6 years ago
  Mona Lisa 268195c2a3 clarification 6 years ago
  Mona Lisa 10bce3e8c6 typo 6 years ago
  Mona Lisa 57c54ce550 gender typo 6 years ago
  Mona Lisa b345b88899 fix logic error in clothing attributes 6 years ago
  KevinSmarts 1c372f4595 [fixes] reverted the Rolan stuff from the courtyard as nutluck has other plans for its location 6 years ago
  Kevin_Smarts c33b117992 Merge branch 'master' of thavus/glife into master 6 years ago
  KevinSmarts e596127e64 [fixes] anotomy with brother dead end and lack of text if you broke your own hymen. Also reduced the vag images to realistic ones. 6 years ago
  KevinSmarts 6b9a3d617d [fixes] A deadend and some inconsistancy. Changed down the images too as vag4 and above are not meant to be used. 6 years ago
  KevinSmarts 164e31009b Merge branch 'master' of https://git.catrenelle.com/julzor/glife 6 years ago
  KevinSmarts fcfbe87d30 [fixed] Lip description wasn't updating if not wearing lip gloss in the body file 6 years ago
  KevinSmarts 13f74c3b48 [added] extra options to make navigating the apartment complex a bit easier 6 years ago
  KevinSmarts 4a520a6f56 [fixes] Break the loop so that you get the normal courtyard options after moving away from Rolan 6 years ago
  julzor a951cdf144 [fixes] underwear event would repeat every time 6 years ago
  KevinSmarts 26f0bb3413 [fixed] Message was a lie! Thanks animefreak701139 6 years ago
  KevinSmarts 41c2f187c2 [fixes] Errors located by the analyser now fixed 6 years ago
  KevinSmarts 9d46cb07f7 [fixes] Wrong variable name, but that's got to be it as I've fixed everything atleast once now 6 years ago
  KevinSmarts e48d3c7bfd [fixes] Sorted out the numbers for selfies 6 years ago
  KevinSmarts 243752671d [fixes] Slight difference in folder names for new images corrected and moved totals to their own arg so thay can be checked regardless which way you access. 6 years ago
  KevinSmarts f9a2e9a7ab [fixes] Correction for the new selfie, thanks Small Jerboa! 6 years ago
  KevinSmarts 72663745c0 [changed] New selfie handling to allow for images based on clothed, underwear or nude. Just in bathroom for now will test when images in pack tomorrow. 6 years ago
  KevinSmarts 1479f33017 [Added] Rolan events to the complex courtyard and school lunchtime 6 years ago
  3xpurt abb908b42e [fixed] thirst values for breast milk in lact_lib. 6 years ago
  3xpurt ac4f7cf977 [fixed] incorrect park links, and inconsistencies with sitting/sleeping while sober and drunk in various parks. Ran cleanup. 6 years ago
  KevinSmarts d4a881a904 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 6 years ago
  KevinSmarts 78232a0c8e [fixes] you now get an a dress from Pussy Kats as I was never going to get around to adding the unique one 6 years ago
  3xpurt fc36c72714 [fixed] gschool_grounds, still able to go to school when schoolblock = 1 6 years ago
  3xpurt 65145c50a8 [fixed] abduction throat dildo size and stat updates. 6 years ago
  KevinSmarts 6575432f59 [fixes] Made the messages and logic for the sewing club clearer and not showing up when they shouldn't. 6 years ago
  KevinSmarts 34a874123d [fixes] Missing set height tags for Rolan images 6 years ago
  KevinSmarts f06b34cf47 [fixes] Wrong variable used in postoffice for inside flashing 6 years ago
  KevinSmarts e6fec75f81 [fixed] Missed one in last commit 6 years ago
  KevinSmarts 1e7be7c9e4 [fixes] Swapped timesso it takes 5 mins to look through clothing and 1 to return, which makes more sense. 6 years ago
  KevinSmarts 16128ffe15 [fixes] Purse upgraded from old system so you now get one thanks to jimmybob 6 years ago
  KevinSmarts 2775451da8 [fixed] Small rebalancing to help with weight loss issues 6 years ago
  KevinSmarts f8ce0678ad [fixes] Rolanapt food had the fat way too high and was using wrong variable for thirst. Also changed the ones you spit out or don't finish to much lower values and made the mood impacts less dramatic 6 years ago
  Sean Patnode 9abb9e6aba Merge branch 'master' of https://git.catrenelle.com/thavus/glife 6 years ago
  Sean Patnode b12dde9a67 fix broken curlocation and add new values 6 years ago
  Sean Patnode 045a57fcfc fix broken 6 years ago
100 changed files with 2106 additions and 1106 deletions
  1. 106 95
      glife.qproj
  2. 7 3
      locations/AndreiHanter.qsrc
  3. 8 5
      locations/Cheatmenu_din.qsrc
  4. 3 1
      locations/EvBoyBuh.qsrc
  5. 5 3
      locations/EvOtelMan.qsrc
  6. 7 7
      locations/FedorMisc.qsrc
  7. 17 14
      locations/Gadbana.qsrc
  8. 8 8
      locations/Gaddvor.qsrc
  9. 3 3
      locations/Gadgarden.qsrc
  10. 21 20
      locations/Gadsarai.qsrc
  11. 2 2
      locations/HanterLoveSex.qsrc
  12. 42 51
      locations/HotelHole.qsrc
  13. 6 2
      locations/IgorHanter.qsrc
  14. 3 0
      locations/LariskaStart.qsrc
  15. 3 0
      locations/MEastbed.qsrc
  16. 1 0
      locations/MLanding.qsrc
  17. 4 0
      locations/MWestbed.qsrc
  18. 1 1
      locations/Maria1.qsrc
  19. 1 1
      locations/MartinTalk.qsrc
  20. 24 24
      locations/Meadow.qsrc
  21. 1 1
      locations/Miroslava.qsrc
  22. 16 15
      locations/MiroslavaHome.qsrc
  23. 8 8
      locations/NewCloShop.qsrc
  24. 5 24
      locations/Nord.qsrc
  25. 0 2
      locations/ParkKafe.qsrc
  26. 6 2
      locations/SergeiHanter.qsrc
  27. 148 142
      locations/SoniaHome.qsrc
  28. 4 0
      locations/VolkovHome.qsrc
  29. 16 10
      locations/abduction.qsrc
  30. 5 0
      locations/agentned.qsrc
  31. 12 4
      locations/andrey.qsrc
  32. 1 1
      locations/annafrends.qsrc
  33. 3 0
      locations/anushapt.qsrc
  34. 3 0
      locations/arturend.qsrc
  35. 1 1
      locations/barbershop.qsrc
  36. 1 0
      locations/bedrPar2.qsrc
  37. 6 3
      locations/bicycle.qsrc
  38. 1 0
      locations/body.qsrc
  39. 13 12
      locations/brothel.qsrc
  40. 33 6
      locations/brother_lessons.qsrc
  41. 20 20
      locations/budgetclothes.qsrc
  42. 6 3
      locations/burger.qsrc
  43. 10 10
      locations/butik.qsrc
  44. 2 2
      locations/cafe_parco.qsrc
  45. 5 5
      locations/cikl.qsrc
  46. 1 1
      locations/clothing_attributes.qsrc
  47. 2 2
      locations/club.qsrc
  48. 5 0
      locations/dimaHome.qsrc
  49. 4 12
      locations/divan.qsrc
  50. 4 4
      locations/dom_gor.qsrc
  51. 3 13
      locations/down.qsrc
  52. 1 1
      locations/events.qsrc
  53. 2 0
      locations/exhibitionism.qsrc
  54. 6 7
      locations/exhibitionistshop.qsrc
  55. 3 1
      locations/family.qsrc
  56. 3 3
      locations/fbDorm.qsrc
  57. 1 14
      locations/fbDormD.qsrc
  58. 1 7
      locations/fbHouse.qsrc
  59. 4 4
      locations/femcyc.qsrc
  60. 17 17
      locations/food.qsrc
  61. 1 0
      locations/foto.qsrc
  62. 5 3
      locations/foto_events.qsrc
  63. 0 1
      locations/foto_models.qsrc
  64. 3 3
      locations/gLakeNude.qsrc
  65. 4 2
      locations/gadforest.qsrc
  66. 16 13
      locations/gadforestlost.qsrc
  67. 87 104
      locations/gadriver.qsrc
  68. 29 27
      locations/gadukino.qsrc
  69. 4 0
      locations/gadukino_event.qsrc
  70. 1 1
      locations/gaptek.qsrc
  71. 69 57
      locations/gdktoilet.qsrc
  72. 2 0
      locations/gevent.qsrc
  73. 2 2
      locations/gopnik_house.qsrc
  74. 1 1
      locations/gopsex.qsrc
  75. 23 23
      locations/gopskver.qsrc
  76. 402 0
      locations/gpoli.qsrc
  77. 23 20
      locations/grigory.qsrc
  78. 26 10
      locations/gschool_detention.qsrc
  79. 3 3
      locations/gschool_grounds.qsrc
  80. 3 2
      locations/gschool_lessons.qsrc
  81. 432 1
      locations/gschool_lunch.qsrc
  82. 4 4
      locations/gskino.qsrc
  83. 152 145
      locations/gskver.qsrc
  84. 1 1
      locations/hairsalon.qsrc
  85. 11 11
      locations/hanters.qsrc
  86. 1 17
      locations/husb.qsrc
  87. 3 0
      locations/igorhome.qsrc
  88. 1 11
      locations/island.qsrc
  89. 4 2
      locations/katspalnya.qsrc
  90. 10 6
      locations/koncepod1.qsrc
  91. 1 0
      locations/korr.qsrc
  92. 1 0
      locations/korr2x.qsrc
  93. 1 0
      locations/korrPar.qsrc
  94. 8 6
      locations/kotovdom.qsrc
  95. 17 15
      locations/krupo.qsrc
  96. 1 1
      locations/kuhrPar.qsrc
  97. 95 13
      locations/lact_lib.qsrc
  98. 2 2
      locations/laketoilet.qsrc
  99. 1 1
      locations/lesbidomhouse.qsrc
  100. 1 1
      locations/lesbimistress.qsrc

+ 106 - 95
glife.qproj

@@ -20,6 +20,66 @@
 		<Location name="mod_setting"/>
 		<Location name="$difficulty"/>
 	</Folder>
+	<Folder name="Stats">
+		<Location name="DNA"/>
+		<Location name="cikl"/>
+		<Location name="daystart"/>
+		<Location name="dina"/>
+		<Location name="dinBoroda"/>
+		<Location name="MenuLoc"/>
+		<Location name="MenuMainLoc"/>
+		<Location name="starenie"/>
+		<Location name="stat"/>
+		<Location name="stat_display"/>
+		<Location name="stat_sklattrib"/>
+		<Location name="stat_sklattrib_lvlset"/>
+		<Location name="fame"/>
+		<Location name="traits"/>
+		<Location name="din_bad"/>
+		<Location name="din_van"/>
+		<Location name="statBat"/>
+		<Location name="kid"/>
+		<Location name="pattest"/>
+		<Location name="subkid"/>
+		<Location name="_statcheck"/>
+		<Location name="set_home"/>
+	</Folder>
+	<Folder name="Functions">
+		<Location name="indik"/>
+		<Location name="indiktab"/>
+		<Location name="location_settings"/>
+		<Location name="shortgs"/>
+		<Location name="show_table"/>
+		<Location name="femcyc"/>
+		<Location name="exercise"/>
+		<Location name="food"/>
+		<Location name="food_menu"/>
+	</Folder>
+	<Folder name="Body">
+		<Location name="body"/>
+		<Location name="body_shape"/>
+		<Location name="lact_lib"/>
+	</Folder>
+	<Folder name="Stimulus">
+		<Location name="boyStat"/>
+		<Location name="pain"/>
+		<Location name="arousal"/>
+		<Location name="orgasm"/>
+		<Location name="exhibitionism"/>
+		<Location name="dinSex"/>
+		<Location name="dinSex2"/>
+		<Location name="dinsexFX"/>
+		<Location name="oral"/>
+		<Location name="orgazm"/>
+	</Folder>
+	<Folder name="CumManage">
+		<Location name="Cum_Manage"/>
+		<Location name="cum_arrcheat"/>
+		<Location name="cum_cleanup"/>
+		<Location name="cum_call"/>
+		<Location name="pregriskeval"/>
+		<Location name="cuminsidereact"/>
+	</Folder>
 	<Folder name="clothing">
 		<Location name="wardrobe"/>
 		<Location name="clothing"/>
@@ -46,6 +106,8 @@
 		<Location name="$attributes_burlesque"/>
 		<Location name="$attributes_alternative"/>
 		<Location name="lost_clothes_here"/>
+		<Location name="portnoi"/>
+		<Location name="portnoi2"/>
 	</Folder>
 	<Folder name="shoes">
 		<Location name="shoes"/>
@@ -72,44 +134,6 @@
 		<Location name="$purse_image"/>
 		<Location name="sewing"/>
 	</Folder>
-	<Folder name="Stats">
-		<Location name="DNA"/>
-		<Location name="body"/>
-		<Location name="body_shape"/>
-		<Location name="cikl"/>
-		<Location name="daystart"/>
-		<Location name="dina"/>
-		<Location name="dinBoroda"/>
-		<Location name="MenuLoc"/>
-		<Location name="MenuMainLoc"/>
-		<Location name="starenie"/>
-		<Location name="stat"/>
-		<Location name="stat_display"/>
-		<Location name="stat_sklattrib"/>
-		<Location name="stat_sklattrib_lvlset"/>
-		<Location name="fame"/>
-		<Location name="traits"/>
-		<Location name="din_bad"/>
-		<Location name="din_van"/>
-		<Location name="statBat"/>
-		<Location name="kid"/>
-		<Location name="pattest"/>
-		<Location name="subkid"/>
-		<Location name="_statcheck"/>
-		<Location name="set_home"/>
-	</Folder>
-	<Folder name="Stimulus">
-		<Location name="boyStat"/>
-		<Location name="pain"/>
-		<Location name="arousal"/>
-		<Location name="orgasm"/>
-		<Location name="exhibitionism"/>
-		<Location name="dinSex"/>
-		<Location name="dinSex2"/>
-		<Location name="dinsexFX"/>
-		<Location name="oral"/>
-		<Location name="orgazm"/>
-	</Folder>
 	<Folder name="Prostitution">
 		<Location name="Prostitute"/>
 		<Location name="NormPR"/>
@@ -119,15 +143,17 @@
 	<Folder name="Quests">
 		<Location name="event"/>
 		<Location name="frot"/>
-		<Location name="kisameQW"/>
 		<Location name="lesbidomhouse"/>
 		<Location name="lesbimistress"/>
 		<Location name="lesbisubhouse"/>
-		<Location name="mainQW"/>
-		<Location name="tobiQW"/>
 		<Location name="cafe2"/>
 		<Location name="cafe3"/>
 		<Location name="ParkKafe"/>
+	</Folder>
+	<Folder name="Magic Quests">
+		<Location name="mainQW"/>
+		<Location name="tobiQW"/>
+		<Location name="kisameQW"/>
 		<Location name="succubus"/>
 		<Location name="serpent"/>
 	</Folder>
@@ -182,6 +208,27 @@
 		<Location name="enderKik"/>
 		<Location name="razrKik"/>
 	</Folder>
+	<Folder name="Furniture">
+		<Location name="bed"/>
+		<Location name="bed1"/>
+		<Location name="bed2"/>
+		<Location name="beverage"/>
+		<Location name="beverage_menu"/>
+		<Location name="dreams"/>
+		<Location name="budilnik"/>
+		<Location name="divan"/>
+		<Location name="Komp"/>
+		<Location name="kompMFC"/>
+		<Location name="kompMFCtwo"/>
+		<Location name="webcam_site"/>
+		<Location name="mirror"/>
+		<Location name="stol"/>
+		<Location name="telefon"/>
+		<Location name="$phone_theme"/>
+		<Location name="kit_din"/>
+		<Location name="TV"/>
+		<Location name="vann"/>
+	</Folder>
 	<Folder name="Shared locations">
 		<Location name="outdoors"/>
 		<Location name="indoors"/>
@@ -503,14 +550,6 @@
 		<Location name="garfather"/>
 		<Location name="Gshveyfab"/>
 		<Location name="gaptek"/>
-		<Location name="DanceWhore1"/>
-		<Location name="DanceWhore2"/>
-		<Location name="DanceWhore3"/>
-		<Location name="DanceWhore4"/>
-		<Location name="DanceWhore5"/>
-		<Location name="DanceWhore6"/>
-		<Location name="DanceWhore7"/>
-		<Location name="DanceWhore8"/>
 		<Location name="soniaDisco"/>
 		<Location name="gkafe"/>
 		<Location name="motherkafeboss"/>
@@ -547,6 +586,16 @@
 		<Location name="ParChurch2"/>
 		<Location name="brothel"/>
 	</Folder>
+	<Folder name="Starlets">
+		<Location name="DanceWhore1"/>
+		<Location name="DanceWhore2"/>
+		<Location name="DanceWhore3"/>
+		<Location name="DanceWhore4"/>
+		<Location name="DanceWhore5"/>
+		<Location name="DanceWhore6"/>
+		<Location name="DanceWhore7"/>
+		<Location name="DanceWhore8"/>
+	</Folder>
 	<Folder name="School">
 		<Location name="gschool_grounds"/>
 		<Location name="gschool_lessons"/>
@@ -666,29 +715,6 @@
 		<Location name="qwlocdog"/>
 		<Location name="RimmaSexQW"/>
 	</Folder>
-	<Folder name="Furniture">
-		<Location name="bed"/>
-		<Location name="bed1"/>
-		<Location name="bed2"/>
-		<Location name="beverage"/>
-		<Location name="beverage_menu"/>
-		<Location name="dreams"/>
-		<Location name="budilnik"/>
-		<Location name="divan"/>
-		<Location name="Komp"/>
-		<Location name="kompMFC"/>
-		<Location name="kompMFCtwo"/>
-		<Location name="webcam_site"/>
-		<Location name="mirror"/>
-		<Location name="stol"/>
-		<Location name="telefon"/>
-		<Location name="$phone_theme"/>
-		<Location name="kit_din"/>
-		<Location name="food"/>
-		<Location name="food_menu"/>
-		<Location name="TV"/>
-		<Location name="vann"/>
-	</Folder>
 	<Folder name="Encounter Generator">
 		<Location name="din_npc"/>
 		<Location name="podezdM"/>
@@ -730,12 +756,8 @@
 		<Location name="restoran"/>
 		<Location name="salon"/>
 		<Location name="hairsalon"/>
-		<Location name="sexshop"/>
 		<Location name="shopdacha"/>
 		<Location name="sportShop"/>
-		<Location name="stripclub"/>
-		<Location name="stwork"/>
-		<Location name="stwork2"/>
 		<Location name="torgcentr"/>
 		<Location name="univer"/>
 		<Location name="yarik"/>
@@ -770,6 +792,12 @@
 		<Location name="obekt2"/>
 		<Location name="dangeon"/>
 	</Folder>
+	<Folder name="Red Light">
+		<Location name="sexshop"/>
+		<Location name="stripclub"/>
+		<Location name="stwork"/>
+		<Location name="stwork2"/>
+	</Folder>
 	<Folder name="Bar Rabotnik">
 		<Location name="qwBarPolet"/>
 		<Location name="qwBarPoletToilet"/>
@@ -987,13 +1015,8 @@
 		<Location name="housing"/>
 		<Location name="husb"/>
 		<Location name="husbSex"/>
-		<Location name="indik"/>
-		<Location name="indiktab"/>
 		<Location name="Peterroom"/>
-		<Location name="portnoi"/>
-		<Location name="portnoi2"/>
 		<Location name="sexorg"/>
-		<Location name="shortgs"/>
 		<Location name="$stock_item_info"/>
 		<Location name="$stock_item"/>
 		<Location name="$single_stock_item"/>
@@ -1085,14 +1108,6 @@
 		<Location name="koncepod"/>
 		<Location name="koncepod1"/>
 	</Folder>
-	<Folder name="CumManage">
-		<Location name="Cum_Manage"/>
-		<Location name="cum_arrcheat"/>
-		<Location name="cum_cleanup"/>
-		<Location name="cum_call"/>
-		<Location name="pregriskeval"/>
-		<Location name="cuminsidereact"/>
-	</Folder>
 	<Folder name="Ibiza">
 		<Location name="IbizaStart"/>
 		<Location name="IbizaDay2"/>
@@ -1106,17 +1121,13 @@
 		<Location name="IbizaBar"/>
 		<Location name="IbizaGuard"/>
 	</Folder>
-	<Location name="LBZhouse"/>
-	<Location name="femcyc"/>
-	<Location name="lact_lib"/>
-	<Location name="show_table"/>
-	<Location name="exercise"/>
-	<Location name="BanSexType"/>
 	<Folder name="crossfit_north">
 		<Location name="crossfit_north_box"/>
 		<Location name="crossfit_north_wod"/>
 		<Location name="crossfit_north_record"/>
 		<Location name="crossfit_north_girlmeet"/>
 	</Folder>
+	<Location name="LBZhouse"/>
+	<Location name="BanSexType"/>
 	</Structure>
 </QGen-project>

+ 7 - 3
locations/AndreiHanter.qsrc

@@ -4,7 +4,7 @@ gs 'boystat', 'A172'
 harakBoy = 2
 boyage = npc_dob[$boy]
 boyage = (boyage - boyage mod 10000) / 10000
-
+boyage = year - boyage
 
 '<center><b><font color = maroon>Andrew</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
@@ -33,6 +33,9 @@ end
 if hantersAndreiQw >= 10:
 	if hantersAndreiLove = 0:
 		act 'Flirt':
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
 			*clr & cla
 			if hantersAndreiQw <= 35 and hantersKnowSlut = 0:hantersAndreiQw += 1
 			if hantersIgorQw >= 10 and hantersKnowSlut = 0:hantersIgorQw -= 1
@@ -42,7 +45,6 @@ if hantersAndreiQw >= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
 			'You flirt with Andrew. He doesn''t say so aloud but he likes the attention. You notice him checking you out unconciously.'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
 			if hantersAndreiLove = 0 and hantersAndreiQw >= 25 and hantersKnowSlut = 0 and pcs_apprnc >= 60:
@@ -110,6 +112,9 @@ if hantersAndreiQw >= 10:
         end
     else
         act 'Spend time together':
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
             *clr & cla
             hantersAndreiQw += 1
             if hantersIgorLove > 0 or hantersSergeiLove > 0:hanterslut += 1
@@ -120,7 +125,6 @@ if hantersAndreiQw >= 10:
             '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
             'You spend with Andrew time together. He can''t keep his hands and lips off of you as you lie there together. He is glad of your company, you see a look of satisfaction on his face and feel wonderful knowing you''re the one who put it there'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
             act'Depart':gt $loc, $metka

+ 8 - 5
locations/Cheatmenu_din.qsrc

@@ -521,8 +521,8 @@ $cheatmenu['looks3'] = {
 	if hairgrowcht = 1:pl'<a href="exec:hairgrowcht = 0 & dynamic $cheatmenu[''looks3'']">Allow hair growth</a>'
 	nl
 	pl'<<$glaza>>'
-	if pcs_lashes < 2:pl'<a href="exec:pcs_lashes += 1 & dynamic $cheatmenu[''looks3'']">Enlarge lashes</a>'
-	if pcs_lashes > 0:pl'<a href="exec:pcs_lashes -= 1 & dynamic $cheatmenu[''looks3'']">Shrink lashes</a>'
+	if pcs_naturallashes < 2:pl'<a href="exec:pcs_naturallashes += 1 & dynamic $cheatmenu[''looks3'']">Enlarge lashes</a>'
+	if pcs_naturallashes > 0:pl'<a href="exec:pcs_naturallashes -= 1 & dynamic $cheatmenu[''looks3'']">Shrink lashes</a>'
 	if pcs_eyesize < 3:pl'<a href="exec:pcs_eyesize += 1 & dynamic $cheatmenu[''looks3'']">Increase the size of the eye</a>'
 	if pcs_eyesize > 0:pl'<a href="exec:pcs_eyesize -= 1 & dynamic $cheatmenu[''looks3'']">Reduce the size of the eye</a>'
 	if pcs_eyecol <= 0:
@@ -580,7 +580,7 @@ $cheatmenu['vneshpara'] = {
 	nl
 	pl 'Appearance Parameters'
 	pl 'vidage = <<vidage>>'
-	pl 'pcs_lashes = <<pcs_lashes>>'
+	pl 'pcs_naturallashes = <<pcs_naturallashes>>'
 	pl 'pcs_eyesize = <<pcs_eyesize>>'
 	pl 'pcs_lip = <<pcs_lip>>'
 	pl 'pcs_apprncbase = <<pcs_apprncbase>>'
@@ -662,8 +662,10 @@ $cheatmenu['setAttrs'] = {
 		"
 		loop_index += 1
 		! Magic is the last attribute, so if it's a non-magic game we'll end the loop one iteration early
-		if MagikDostup = 0 and loop_index < arrsize('$att_name'): jump 'set_attrs_loop'
-		elseif loop_index < arrsize('$att_name') - 1: jump 'set_attrs_loop'
+		if MagikDostup = 0 and loop_index < arrsize('$att_name'):
+			jump 'set_attrs_loop'
+		elseif loop_index < arrsize('$att_name') - 1:
+			jump 'set_attrs_loop'
 		end
 	killvar 'loop_index'
 	dynamic $cheatmenu['stats']
@@ -1466,6 +1468,7 @@ $cheatmenu['display'] = {
 	nl
 
 	pl '<center><B>Difficulty Setting</B></center>'
+	pl 'At the moment it only improves rate of skill gain'
 
 	pl 'Difficulty: Currenty at <<func(''_difficulty'',''getdifficulty'')>>'
 	pl '<ul><li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''easy peasy'') & dynamic $cheatmenu[''display'']">easy peasy</a></li>'

+ 3 - 1
locations/EvBoyBuh.qsrc

@@ -739,6 +739,7 @@ elseif pav_slut > 150:
 
 		bmHJ[Tboynum] += 1
 		money += 50
+		slutty += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj.jpg"></center>'
 		'You squat before him as you wrap your fingers around his shaft, and slowly begin to jerk him off.'
@@ -799,7 +800,8 @@ if pav_slut >= 25:
 				cls
 				pcs_dom += 1
 				minut += 3
-				pav_prostitute += 30
+				pav_prostitute += 12
+				slutty += 1
 				money += 300
 				gs 'stat'
 				'You take a deep breath. You don''t really want to touch him, but maybe if you can get something out of it? "I don''t do favours like that for just anyone! If you''d pay me, however..." you shrug.'

+ 5 - 3
locations/EvOtelMan.qsrc

@@ -340,7 +340,7 @@ if $ARGS[0] = 'sex':
 					gs 'cum_manage'
 					bmANAL[Tboynum] += 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal2.jpg"></center>'
-					'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt.'
+					'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt. You feel him begin to cum in your ass but he''s not done with you yet.'
 					gs 'arousal', 'anal', 10, 'prostitution'
 					gs 'stat'
 					act 'Finish him off':
@@ -532,9 +532,11 @@ if $ARGS[0] = 'sex':
 						act 'Continue':
 							*clr
 							cla
+							spafinloc = 3
+							gs 'cum_manage'
 							bmANAL[Tboynum] += 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal2.jpg"></center>'
-							'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt.'
+							'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt. You feel him begin to cum in your ass but he''s not done with you yet.'
 							gs 'arousal', 'anal', 10, 'prostitution'
 							gs 'stat'
 							act 'Finish him off':
@@ -564,7 +566,7 @@ if $ARGS[0] = 'End':
 	'<center><video autoplay loop src="images/pc/activities/otel1.mp4"></video></center>'
 	'After the two of you relax for a while longer, you smile at <<$boydesc>> and say: "That was fun! But I should really get going..."'
 	'<<$boydesc>> stretches lazily on the bed, not bothering to get up. "You were great, <<$pcs_nickname>>! I hope I''ll run into you again, next time I''m in Pavlovsk!"'
-	if sparrloc[temp] = 11 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'When you look around the room, you find a packet of sanitary napkins. You take one and quickly wipe the sperm off your face, in an attempt to make yourself presentable enough to go outside.'
+	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'When you look around the room, you find a packet of sanitary napkins. You take one and quickly wipe the sperm off your face, in an attempt to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave the hotel':gt 'vokzalG'

+ 7 - 7
locations/FedorMisc.qsrc

@@ -816,7 +816,7 @@ if $ARGS[0] =  'Outcast Intro':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 				'You slowly step toward Fedor and say, "Look Fedor...I never meant for any of this to happen." Fedor shouts "YOU AGREED TO GO OUT WITH VIKTOR WHILE DATING ME! How can you expect me to believe that you cared for me at all... Just go away <<$pcs_firstname>>. I have nothing for you." you step away from Fedor knowing that nothing you say will console him while thinking to yourself "If only he trusted me more, then maybe he would believe that my apology is sincere."'
 
-				act 'Walk away':gt 'gskver'
+				act 'Walk away':gt 'gskver', 'start'
 			end
 			act 'Mock':
 				cls
@@ -828,7 +828,7 @@ if $ARGS[0] =  'Outcast Intro':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 				'You grin as you reply, "Well yes. I do so love having a real man as my boyfriend and not a little cocksucker like you." Fedor immediately charges at you and pushes you on the ground. "The only thing Viktor sees in you is right between your legs." You are too shaken to speak as Fedor takes a few seconds to calm himself then walks away from you while saying "Just go <<$pcs_firstname>>. You''ve already taken everything from me. There is nothing left for you here."'
 
-				act 'Walk away':gt 'gskver'
+				act 'Walk away':gt 'gskver', 'start'
 			end
 		end
 	elseif FedorLove = 1:
@@ -867,7 +867,7 @@ if $ARGS[0] =  'Outcast Intro':
 			end
 		end
 	end
-	act 'Walk away':gt 'gskver'
+	act 'Walk away':gt 'gskver', 'start'
 end
 
 if $ARGS[0] =  'Outcast':
@@ -919,9 +919,9 @@ if $ARGS[0] =  'Outcast':
 
 				act 'Remain here':gt 'FedorMisc', 'Outcast'
 
-				act 'Return to park':gt 'gskver'
+				act 'Return to park':gt 'gskver', 'start'
 			end
-			act 'I need some time to think about it':gt 'gskver'
+			act 'I need some time to think about it':gt 'gskver', 'start'
 		end
 	elseif fedorKozlovQW = -15:
 		act 'Ask out on a date':
@@ -939,13 +939,13 @@ if $ARGS[0] =  'Outcast':
 
 			act 'Ask for a smoke':gt 'FedorMisc', 'Smoke 2'
 
-			act 'Just wanted to say hi':gt 'gskver'
+			act 'Just wanted to say hi':gt 'gskver', 'start'
 		end
 	end
 
 	act 'Ask for a smoke':gt 'FedorMisc', 'Smoke 2'
 
-	act 'Walk away':gt 'gskver'
+	act 'Walk away':gt 'gskver', 'start'
 end
 
 if $ARGS[0] =  'Fedor Vs Dimka':

+ 17 - 14
locations/Gadbana.qsrc

@@ -17,6 +17,7 @@ gs 'stat'
 if mira = 0:
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
+			minut += 1
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			gt 'Gadbana'
@@ -63,18 +64,20 @@ if mira = 0:
 					'You strip, sit down and relax. After a proper banya session, you pick up a bucket filled with cold water and pour it over yourself and head over to the shower. You feel like a completely new person.'
 
 					act 'Get dressed':
+						minut += 1
 						gs 'clothing', 'wear_last_worn'
 						gs 'underwear', 'wear'
 						gt 'Gadbana'
 					end
-					act 'Go outside': minut += 1 & gt 'Gaddvor'
+					
+					act 'Go outside nude': minut += 1 & gt 'Gaddvor'
 				end
 			end
 		else
-			'The banya is not in use at this time, it is available between 19:00 and 22:00 during the week.'
+			'The banya is not in use at this time, it is available between 19:00 and 22:00 during the weekend.'
 		end
-	elseif week ! 6:
-		'The banya is not used at the weekend, it is usually ready to use from 19:00 during the week.'
+	elseif week < 6:
+		'The banya is not used during the week, it is usually ready to use from 19:00 during the weekend.'
 	end
 
 	act 'Wash your body (0:25)':
@@ -251,15 +254,6 @@ else
 			gs 'arousal', 'voyeur', 10
 			gs 'stat'
 			act 'Steam':
-				!{
-				dynamic $showerdin
-				vidageday += 1
-				pcs_mood += 20
-				pcs_health += healthmax/20
-				pcs_skin += 5
-				if pcs_skin >= 20:pcs_skin = 0 & skin += 1
-				}
-				!copy from 40~62, different sauna in Russian.
 				cls
 				dynamic $showerdin
 				pcs_hairbsh = 0
@@ -276,7 +270,16 @@ else
 				gs 'arousal', 'voyeur', 120
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Finish': mira = 0 & gt 'gaddvor'
+				
+				act 'Get dressed':
+					mira = 0
+					minut += 1
+					gs 'clothing', 'wear_last_worn'
+					gs 'underwear', 'wear'
+					gt 'Gadbana'
+				end
+				
+				act 'Go outside nude': mira = 0 & minut += 1 & gt 'Gaddvor'
 			end
 		end
 	end

+ 8 - 8
locations/Gaddvor.qsrc

@@ -44,9 +44,9 @@ if $ARGS[0]='':
 		end
 	end
 	if StoryLine = 1:
-		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch there are a few chairs to sit in.'
+		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch are a few chairs to sit in.'
 	else
-		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch there are a few chairs to sit in.'
+		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch are a few chairs to sit in.'
 	end
 
 
@@ -59,19 +59,19 @@ if $ARGS[0]='':
 		*nl
 		'You are naked and can only go to your grandparents to get dressed or go to the banya.'
 	else
-		if hour >= 6 and hour < 20 and month >= 4 and month <= 10:'In the yard there are <a href="exec:gt ''Gaddvor'',''chickens''">chickens</a> running around.'
+		if feed_chickens = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are <a href="exec:gt ''Gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''Miroslava'', ''Start''">Mira</a> stands next to you.'
 
-		act 'Enter the barn':minut += 1 & gt 'Gadsarai'
-		act 'Enter garden':minut += 1 & gt'Gadgarden','garden'
+		act 'Go to the barn':minut += 1 & gt 'Gadsarai'
+		act 'Go to the garden':minut += 1 & gt'Gadgarden','garden'
 		if meadow > 0 and hour >= 6 and hour < 20 and month >= 4 and month <= 10:act 'Go to the meadow':minut += 20 & gt 'Meadow', 'start'
 		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
 		!removed from 1.2.5
 		if hour >= 17 and hour < 20:
 			if mitkaday!daystart:'<a href="exec:gt ''mitka''">Mitka</a> is hanging out near the barn in your grandparents'' backyard, he is following you while taking a smoke.'
-		elseif hour >= 20 and mitkadaybuh ! daystart:
+		elseif hour >= 20 and sunWeather = 1:
 			'Several <a href="exec:gt ''mitkabuh''">young men</a> are sitting near your grandparents'' backyard, drinking moonshine and talking loudly.'
 		end
 		!125s
@@ -95,7 +95,7 @@ if $ARGS[0]='chickens':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
 	'Ordinary chickens clucking about their pen.'
-	minut += 5
+	minut += 1
 	gs 'stat'
 
 	!job Granny
@@ -113,7 +113,7 @@ if $ARGS[0]='chickens':
 			act 'Finish':gt'Gaddvor'
 		end
 	end
-	act 'Go': gt'Gaddvor'
+	act 'Leave': gt'Gaddvor'
 end
 !!125e
 

+ 3 - 3
locations/Gadgarden.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'garden':
 			act 'Finish':gt'Gadgarden','garden'
 	    end    
 	end
-    act 'Go outside':minut += 1 & gt'Gaddvor'
+    act 'Leave':minut += 1 & gt'Gaddvor'
 end	
 
 if $ARGS[0] = 'strawberry':
@@ -151,7 +151,7 @@ if $ARGS[0] = 'strawberry':
 		end
 	end	
 
-	act 'Go':minut += 5 & gt'Gadgarden','garden'
+	act 'Leave':minut += 1 & gt'Gadgarden','garden'
 end	
 
 
@@ -212,7 +212,7 @@ if $ARGS[0] = 'fruit_garden':
 			act 'Finish':gt 'Gadgarden','fruit_garden'   
 		end
 	end	
-	act 'Go':minut += 5 & gt'Gadgarden','garden'
+	act 'Leave':minut += 1 & gt'Gadgarden','garden'
 end	
 
 --- Gadgarden ---------------------------------

+ 21 - 20
locations/Gadsarai.qsrc

@@ -316,7 +316,7 @@ if $ARGS[0] = '':
 		clr
 		gs 'stat'
 
-		act 'Go outside':minut += 1 & gt 'Gaddvor'
+		act 'Leave':minut += 1 & gt 'Gaddvor'
 
 		act 'Poke around in the barn':
 			if grigoryEV > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
@@ -382,29 +382,30 @@ if $ARGS[0] = '':
 					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
 				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
-			elseif findbraclet > 0:
-				if findneck = 0:
-					cls
-					if RAND(0,20) >= 19:
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
-						if altQS = 1:
-							'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
-						else
-							'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
-						end
-						findneck = 1
-						observ_exp += 3
+			elseif findbraclet > 0 and findneck = 0:
+				cls
+				if RAND(0,20) >= 19:
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
+					if altQS = 1:
+						'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 					else
-						cls
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-						'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+						'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
 					end
-					act 'Leave and get some fresh air':gt 'Gadsarai'
+					findneck = 1
+					observ_exp += 3
+				else
+					cls
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
+					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
 				end
+				act 'Leave and get some fresh air':gt 'Gadsarai'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
+				'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
+				act 'Leave and get some fresh air':gt 'Gadsarai'
 			end
-			act 'Leave and get some fresh air':gt 'Gadsarai'
 		end
 
 		if vcard > 0:

+ 2 - 2
locations/HanterLoveSex.qsrc

@@ -2915,7 +2915,7 @@ end &! --- din_hanters_sex_dog_bonus1 ---
 if $ARGS[0] = 'din_hanters_sex_dog_bonus2':
 	'<center><H4>Hut</H4></center>'
 	'<center><video autoplay loop src="images/shared/sex/sequence/kotovsexbonus21.mp4"></video></center>'
-	'The two of you hold eachother tightly, <<$boydesc>> supports you as he continues to violently batter away at your hole.'
+	'The two of you hold each other tightly, <<$boydesc>> supports you as he continues to violently batter away at your hole.'
 	*pl
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -2947,7 +2947,7 @@ if $ARGS[0] = 'din_hanters_sex_dog':
 	sexa += 1
 	'<center><H4>Hut</H4></center>'
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex1'+rand(0,3)+'.mp4"></video></center>'
-	'<<$boydesc>> pulls you and you are a sexy ass in front of him.'
+	'<<$boydesc>> pulls you closer and you shake your sexy ass in front of him.'
 	*pl
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'

+ 42 - 51
locations/HotelHole.qsrc

@@ -27,7 +27,7 @@ if hour = 0 and $prevloc ! 'HotelRoom':
 	end
 	act 'Go back to the High Street':minut += 3 & gt'vokzalG'
 	exit
-end	
+end
 if hour = 0 and $prevloc = 'HotelRoom':
 	if resepseen = 1:
 	hotresepQW = 3
@@ -50,7 +50,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 		'"Oh Mister Leonidovich," she says pouting like a little girl, "I am so sorry, I have been bad daddy."'
 		'At that moment you figure out they are just playing a game and being caught flashing was all part of their weird little roleplay.'
 		act 'Continue':
-			
+
 			*clr
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event9.jpg"></center>'
@@ -64,7 +64,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 			 'All of a sudden, she moves the dick between her breasts and starts fucking it through the space between them.'
 			'"Miss Tanich, you should slow down, I don''t want to blow my load before I get to try that sweet little pussy of yours."'
 			act 'Continue':
-				
+
 				*clr
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event5.jpg"></center>'
@@ -89,8 +89,8 @@ if hour = 0 and $prevloc = 'HotelRoom':
 					'"Thank you Miss Tanich, I believe your monthly bonus is again very much deserved"'
 					'Miss Tanich just smiled at him while showing off her pussy and cum stained buttocks.'
 					'You have seen enough and quietly go back to your room'
-						
-						
+
+
 					act 'Continue':
 						if hotelroom = 1:gt'hotelroom','normal'
 						if hotelroom = 2:gt'hotelroom','better'
@@ -166,22 +166,13 @@ if HotelRoom > 0:
 		if hotelroom = 3:gt'hotelroom','best'
 	end
 end
-act 'Kill some time in the hotel lobby ':
 
-	waiting = input ("How long do you want to sit down? (No more than 120 minutes) default = 30 minutes")
-	if waiting <= 0 or waiting > 120:
-				minut += 30
-	elseif waiting > 0 and waiting <= 120:
-				minut += waiting
-				pcs_mood += 10
-				pcs_willpwr += 10
-			
-	end
-	cls
-	gs'stat'
+act 'Kill some time in the hotel lobby ':
+	gs 'obj_din', 'rest'
 	hotwait = 1
 	gt 'hotelhole'
 end
+
 act 'Leave the hotel':minut += 3 & gt'vokzalG'
 
 if $ARGS[0] = 'Pavlin' :
@@ -199,7 +190,7 @@ if $ARGS[0] = 'Pavlin' :
 				cls
 				cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
-				minut += 10	
+				minut += 10
 				if pavchat ! daystart:npc_rel['A217'] += 2
 				pavchat = daystart
 				talkrand = RAND(0,6)
@@ -218,13 +209,13 @@ if $ARGS[0] = 'Pavlin' :
 					'It looks like you really hit a nerve there. You wonder what that''s about.'
 				end
 				if talkrand = 2:
-					'Pavlin tells you a story from his childhood.'					
+					'Pavlin tells you a story from his childhood.'
 					'"My father used to beat me everyday. One day when I was 12 after another savage beating I asked my mother to do something about it. The bitch started giving me another beating and then locked me out in my underpants on the balcony for 2 hours."'
 					'"This was in the middle of January, so I got lucky I didn''t freeze to death that day."'
 					'It seems he had a very rough childhood.'
 				end
 				if talkrand = 3:
-					'Pavlin tells you a story from his childhood.'					
+					'Pavlin tells you a story from his childhood.'
 					'"My father frequently brought working girls to the house for punishment. If they were lucky he just beat them up. If their mistake was worse he would involve my mother and she ..."'
 					'"Let''s just say that these girls would never go against my father''s wishes again once my mother was done with them."'
 					'"I always felt sorry for these girls at the time and did not want to watch, but they always forced me."'
@@ -246,7 +237,7 @@ if $ARGS[0] = 'Pavlin' :
 					'It seems he had a very rough childhood.'
 				end
 				if talkrand = 6:
-					'It looks like Pavlin is drunk.' 
+					'It looks like Pavlin is drunk.'
 					'"You will never disobey me? right <<$pcs_firstname>> ? "'
 					'"Your face is so pretty, I really don''t want to mess that up"'
 					'"What are you saying Pavlin? stop that , you are scaring me."'
@@ -269,7 +260,7 @@ if $ARGS[0] = 'Pavlin' :
 			act 'No thanks':
 				cla
 				'"No, thanks. I''ll just take a regular customer today"'
-				'"No problem, one regular john, coming right up. You can go ahead to the usual room."' 
+				'"No problem, one regular john, coming right up. You can go ahead to the usual room."'
 				act 'Perform your duty':gt 'hotel_resep', 'pavgenpros'
 			end
 			act 'Sure, sounds like fun':
@@ -279,7 +270,7 @@ if $ARGS[0] = 'Pavlin' :
 				'Pavlin gives you the key for the hotelroom.'
 				act 'Go to room 312':gt 'HotelHole','clown'
 			end
-			
+
 		end
 	end
 	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW ! 3:
@@ -324,7 +315,7 @@ if $ARGS[0] = 'Pavlin' :
 					'"You are lucky we are in a public place right now or I would fucking murder you!"'
 				end
 					'"Go away <<$pcs_firstname>>, I am too angry right now, we can discuss this later"'
-				
+
 				pavldaystart2 = daystart
 			elseif pavtalk = 0:
 				PavlinQW = 6
@@ -373,7 +364,7 @@ if $ARGS[0] = 'Pavlin' :
 				'You feel anger towards Pavlin rising up inside you. "Do you ever pay attention to me? Can''t you see I am pregnant?" You ask, gesturing at your obviously swollen belly.'
 				'"Of course I know that!" Pavlin''s brows furrow, letting you know he''s getting mad. Butterflies flutter in your stomach, fear trying to match up with the anger.'
 				'His expression softens a little before continuing. "This customer has some pretty weird requests, are you up for it?"'
-				
+
 				act 'Not really, let''s stick with vanilla for now': gt 'HotelHole','Pavlin'
 				act 'What kind of weird requests?':
 					'"He told me he is really in to pissing pregnant chicks." You cringe at the idea.'
@@ -388,15 +379,15 @@ if $ARGS[0] = 'Pavlin' :
 				act 'Ok': gt 'HotelHole','Pavlin'
 			end
 			if knowpreg = 0:
-			
+
 				'Pavlin looks at your body and you know what he is thinking.'
 				'"Yeah that''s definitly tough, good luck with that." You say before quickly leaving'
 				cla
 				act 'Back to lobby': gt 'HotelHole'
 			end
-				
+
 		end
-	
+
 	end
 	act '<B>Move away</B>':gt'HotelHole','skip_resepevent'
 end
@@ -443,13 +434,13 @@ if $ARGS[0] = 'PregBDSM' :
 		'.....WHISHP....'
 		'"<<$pitfs>>Fuck this hurts, but I can''t let it show!<<$pitfe>>" Again you refuse to scream out, not wanting to give your torturer the satisfaction.'
 		'But then...'
-		'.....WHOOSH....'    
+		'.....WHOOSH....'
 		'.....WHAP....'
 		'The whip snaps across each breast before you see it coming.'
 		'You finally scream out involuntarily, the unexpected spike in pain proving too much to ignore.'
 		'"<<$pitfs>>Damn it, I shouldn''t show any weakness! Who knows how far he will take this!<<$pitfe>>" You admonish yourself, but it is too late.'
 		'"Well, well, it looks like the little bitch can feel pain after all." The cruel pervert says, a smile plastered across his vile face.'
-		'.....WHIP....'     
+		'.....WHIP....'
 		'.....SNAP....'
 		'Two more hits slice sharply across your sensitive nipples, eliciting one big scream after another.'
 		'The torment continues for what feels like an eternity. The client alternates randomly between striking yours breasts, back, and buttocks. But the worst by far is when he zeroes in on your quivering pussy. As the instrument slaps viciously across your labia you scream and beg, tears streaming down your tortured face, mascara straining your cheeks. When the whip lands directly on your clit you feel like passing out and vomiting at the same time, your stomach twisting in agony.'
@@ -460,7 +451,7 @@ if $ARGS[0] = 'PregBDSM' :
 			*clr & cla
 			gs 'arousal', 'bj', 30, 'rough','sub','humiliation'
 			gs 'arousal','end'
-			if pcs_dom => 5: 
+			if pcs_dom => 5:
 				pcs_dom -5
 			else
 				sub = sub + 5 - pcs_dom
@@ -510,7 +501,7 @@ if $ARGS[0] = 'PregBDSM' :
 				act 'Swallow your last bit of pride and take a sip':
 					*clr & cla
 					pcs_hydra += 20
-					if pcs_dom => 20: 
+					if pcs_dom => 20:
 						pcs_dom -20
 					else
 						sub = sub + 20 - pcs_dom
@@ -549,7 +540,7 @@ if $ARGS[0] = 'PregBDSM' :
 						preghumdone = 1
 						npc_rel['A217'] += 20
 						act 'Back to lobby':gt 'HotelHole'
-					end	
+					end
 				end
 				act 'No, I can''t do this, let me go':
 					*clr & cla
@@ -583,7 +574,7 @@ if $ARGS[0] = 'PregBDSM' :
 							cla
 							:faintbegin
 							if faintcounter < 9:
-								
+
 								minut += 180
 								wait 1000
 								'.....................................'
@@ -592,10 +583,10 @@ if $ARGS[0] = 'PregBDSM' :
 								if faintcounter = 7:'"<<$pitfs>>What happened?<<$pitfe>>"'
 								faintcounter +=1
 								jump 'faintbegin'
-							else	
+							else
 								act 'Wake up':
 									killvar 'faintcounter'
-									
+
 									*clr & cla
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/wakeup.jpg"></center>'
@@ -653,7 +644,7 @@ if $ARGS[0] = 'PregBDSM' :
 										'The doctor tries to console you, telling you that she''s sorry but nothing could be done. She says that it could''ve been much worse; you could have died, or could have needed a hysterectomy. But they were able to save you from those fates.'
 										'<br>'
 										act 'Continue':
-										
+
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/pavlin_policewoman.jpg"></center>'
 											' '
@@ -668,7 +659,7 @@ if $ARGS[0] = 'PregBDSM' :
 											'She slides you a big wad of cash. It''s at least 20,000 <b>₽</b>.'
 											'"Besides, who would believe a whore over our legitimate businessman friend." She says, smirking.'
 											'"<<$pitfs>>So that''s it? 20 000 <b>₽</b> for the life of my child. And that monster just gets away with it?<<$pitfe>>" You can barely form thoughts as the rage, pain, and desperation overwhelm you.'
-											
+
 											act 'Sign the document':
 												money += 20000
 												*clr & cla
@@ -688,7 +679,7 @@ if $ARGS[0] = 'PregBDSM' :
 												killvar 'dailyhealthimprov'
 												npc_rel['A217'] = -1
 												PavlinQW = 9
-												
+
 												act 'Leave':gt 'gpoli'
 											end
 										end
@@ -768,13 +759,13 @@ if $ARGS[0] = 'Twins' :
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins6.jpg"></center>'
 				'The man suddenly pushes Anya off the couch and says, "Your sister is a great fuck, indeed. But I think you should go ahead and start doing some work too."'
 				'The client continues to slam into your sensitive pussy with all his might while Anya begins to lick and massage his balls.'
-				
+
 				act 'Continue':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins7.jpg"></center>'
 					'After a few minutes, the man pushes you off of him. His coarse, calloused hands manipulate your body until you are laying stomach down on the couch.'
-					'"Get up." He says gruffly to Anya. You stay in your place while looking back to see what they''re doing.' 
+					'"Get up." He says gruffly to Anya. You stay in your place while looking back to see what they''re doing.'
 					' '
 					'By the time he''s satisfied, he has your sister stacked on top of you, her twat just above yours. The client takes a moment to admire his masterpiece before he thrusts his dick into Anya''s waiting pussy. Your sister cries out in pleasure as the stranger buries himself inside of her.'
 					'You are glad that your pussy is getting some rest after the furious pounding it received, but the relief doesn''t last long. Soon enough he pulls out of Anya and plunges into your depths once again. You scream out in surprise, not expecting the sudden penetration, as new waves of pleasure ripple through your body.'
@@ -792,7 +783,7 @@ if $ARGS[0] = 'Twins' :
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins9.jpg"></center>'
 						'You position yourself with your head resting on a pillow sitting on the couch and your butt high in the air. You wiggle your ass at the client enticingly. "Your anal slut is waiting." You say, a mischievous grin on your face.'
-						'"God, I love an eager whore."<<$boydesc>> says as he comes up behind you and starts rubbing his dick against your little star.' 
+						'"God, I love an eager whore."<<$boydesc>> says as he comes up behind you and starts rubbing his dick against your little star.'
 						'He starts to slowly push it in and you can''t stop a groan from escaping your mouth as your butthole resists the invasion.'
 						'"Just relax girl, it will go a lot easier." The man says.'
 						'"Yeah <<$pcs_nickname>>, just relax. I know this is not the first dick you have had in your ass." Anya agrees, mockingly, unable to hide a giggle that follows her words.'
@@ -805,7 +796,7 @@ if $ARGS[0] = 'Twins' :
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins11.jpg"></center>'
 						'The pleasure quickly builds to a crescendo before exploding. While being stimulated in 3 erogenous zones at once you feel an earth-shattering orgasm like you''ve never experienced before.'
 						'Your whole body begins shaking uncontrollably as you cum and, if you sister hadn''t jumped up to hold you, you would have fallen off the couch.'
-						$orgasm_or = 'yes' 
+						$orgasm_or = 'yes'
 						gs 'arousal','anal',10,'prostitution'
 						'<<$boydesc>> laughs. "Ok woman, you had your release. Now it is my turn."'
 							act 'Continue':
@@ -851,7 +842,7 @@ if $ARGS[0] = 'Twins' :
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins12.jpg"></center>'
 							'<<$boydesc>> pulls out of your sister''s ass and motions for you to come closer.'
 							'You kneel down next to your sister and move your head close to hers. You both open your mouths while <<$boydesc>> starts jerking his dick quickly, awaiting your prize.'
-							'"Here it comes girls, now you play nice and share my gift." He immediately starts spraying cum while adjusting his aim between you and your sister.' 
+							'"Here it comes girls, now you play nice and share my gift." He immediately starts spraying cum while adjusting his aim between you and your sister.'
 							'You each catch some of his seed in you mouths while the rest splatters across your faces. You turn to you sister and you both start licking the cum from each other''s faces before swapping the load back and forth with a kiss. Anya ends up swallowing most of it while you smile.'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins13.jpg"></center>'
 							'"Since your sister was a real champ by taking it in the ass, you can be on cleaning duty." <<$boydesc>> says while pushing his cum-soaked dick between your lips.'
@@ -864,7 +855,7 @@ if $ARGS[0] = 'Twins' :
 					end
 				end
 			end
-		end	
+		end
 	end
 end
 if $ARGS[0] = 'twinhome':
@@ -945,7 +936,7 @@ if $ARGS[0] = 'clown':
 			cla
 			cls
 			gs 'stat'
-			
+
 			'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown3.mp4"></video></center>'
 			'You remove your clothes and move towards the quibbling clowns.'
 			'You grab them by the crotch.'
@@ -969,7 +960,7 @@ if $ARGS[0] = 'clown':
 			gs 'npcgeneratec', 1, 'Clown Popov', rand(18,45)
 			gs 'boyStat', $npclastgenerated
 			gs 'arousal', 'bj', 15, 'prostitution'
-			
+
 			act 'Continue':
 				cla
 				cls
@@ -978,7 +969,7 @@ if $ARGS[0] = 'clown':
 				'Popav starts licking your pussy while Popov places his balls over your mouth.'
 				'"Let''s go girl, these balls aren''t going to lick themself."'
 				'You take the hint and put the balls in your mouth.'
-				gs 'arousal', 'cuni', 15, 'prostitution' 
+				gs 'arousal', 'cuni', 15, 'prostitution'
 				'After a minute Popav stops licking and asks: "Are you ready for some cock?"'
 				'"Ow yeah, give it to me you silly clown"'
 				'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown7.mp4"></video></center>'
@@ -1006,9 +997,9 @@ if $ARGS[0] = 'clown':
 					'"Because you could easily fit another pair of tits in there."'
 					'Again you groan at the stupid joke and can''t hide the fact that your are tired of these 2 clowns.'
 					'"Ok girl, now we will give you one last present before we go, just sit up on the bed and look at me."'
-					
+
 					gs 'cum_call','breasts', $npclastgenerated, 1
-					gs 'npcgeneratec', 1, 'Clown Popav', rand(18,45) 
+					gs 'npcgeneratec', 1, 'Clown Popav', rand(18,45)
 					gs 'cum_call','breasts', $npclastgenerated, 1
 					gs 'arousal','end'
 					guy += 2
@@ -1040,7 +1031,7 @@ if $ARGS[0] = 'clown':
 							'Not at all, this was one of the weirdest things I ever encountered in my life.'
 							'Just give me my money so I can go on and try to wash away this pie and try to forget this ever happened.'
 							'Ha ha , no problem <<$pcs_firstname>>. Here is your money, enjoy it. '
-							'He hands you 2000 <b>₽</b>.' 
+							'He hands you 2000 <b>₽</b>.'
 							'You think this experience traumatised you for life and you would never look at another clown the same way again.'
 							act 'Back to the hotel lobby':gt 'HotelHole'
 						end

+ 6 - 2
locations/IgorHanter.qsrc

@@ -48,6 +48,9 @@ end
 if hantersIgorQw >= 10:
     if hantersIgorLove = 0:
         act 'Flirt':
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
             *clr & cla
             if hantersIgorQw <= 35 and hantersKnowSlut = 0:hantersIgorQw += 1
             if hantersAndreiQw >= 10 and hantersKnowSlut = 0:hantersAndreiQw -= 1
@@ -57,7 +60,6 @@ if hantersIgorQw >= 10:
             '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
             'You spend time with Igor, flirting all the while. He flirts back, and blushes when you catch him checking you out.'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
             if hantersIgorLove = 0 and hantersIgorQw >= 35 and hantersKnowSlut = 0 and bfA = 1 and pcs_apprnc >= 60:
@@ -125,6 +127,9 @@ if hantersIgorQw >= 10:
     else
         act 'Spend time together':
             *clr & cla
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
             pcs_mood = 100
             hantersIgorQw += 1
             if hantersSergeiLove > 0 or hantersAndreiLove > 0:hanterslut += 1
@@ -135,7 +140,6 @@ if hantersIgorQw >= 10:
             '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
             'You cuddle up with Igor, and trade gentle kisses with him. He adores you and wishes you were always with him and you wish the same.'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
             act'Depart':gt $loc, $metka

+ 3 - 0
locations/LariskaStart.qsrc

@@ -1,8 +1,11 @@
 # LariskaStart
 
+!!Lariska = A13
+
 if $ARGS[0] = 'start':
 	numnpc = 13
 	minut += 5
+	$static_num = 'A13'
 	gs'stat'
 	
 	'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'

+ 3 - 0
locations/MEastbed.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'guestB':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedb.jpg"></center>'
@@ -64,6 +65,7 @@ end
 
 if $ARGS[0] = 'guestC':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedc.jpg"></center>'
@@ -123,6 +125,7 @@ end
 
 if $ARGS[0] = 'guestD':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedd.jpg"></center>'

+ 1 - 0
locations/MLanding.qsrc

@@ -1,5 +1,6 @@
 # MLanding
 $location_type = 'private'
+killvar '$locclass'
 
 if $ARGS[0] = 'west':
 	cls

+ 4 - 0
locations/MWestbed.qsrc

@@ -2,6 +2,8 @@
 $location_type = 'private'
 
 if $ARGS[0] = 'master':
+    $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/masterbed.jpg"></center>'
@@ -56,6 +58,8 @@ if $ARGS[0] = 'master':
 end
 
 if $ARGS[0] = 'guest':
+    $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/beda.jpg"></center>'

+ 1 - 1
locations/Maria1.qsrc

@@ -33,7 +33,7 @@ if nom_1 = 0:
 			tobiQW = 2001
 			minut += 1
 			'"Why so the hotel so crowded today?" you ask.'
-			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." he says laughing.'
+			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
 
 			act 'Move away':gt 'Maria1'
 		end

+ 1 - 1
locations/MartinTalk.qsrc

@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
 	
-	elseif StoryLine = 1 and ParHomeBlock = 0:
+	elseif StoryLine = 1 and home_owned[2] = 1:
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'

+ 24 - 24
locations/Meadow.qsrc

@@ -45,13 +45,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		elseif npc_QW['A60'] >= 11 and temper >= 25 and temp_md = 5:
 			'In the clearing you notice <a href="exec: gt ''Meadow'', ''5''">Mira with Vasya</a>.'
 		elseif npc_QW['A60'] >= 11 and temper >= 12 and temp_md = 6:
-			'In the clearing you notice  <a href="exec: gt ''Meadow'', ''6''">Mira with Mitka, By Vasya and Kalambay</a>.'
+			'In the clearing you notice <a href="exec: gt ''Meadow'', ''6''">Mira with Mitka, Vasya and Kalambay</a>.'
 		elseif npc_QW['A60'] >= 20 and temper >= 12 and temp_md = 7:
-			'In the clearing you notice  <a href="exec: gt ''Meadow'', ''7''">Mira with Vasya and Kalambay</a>.'
+			'In the clearing you notice <a href="exec: gt ''Meadow'', ''7''">Mira with Vasya and Kalambay</a>.'
 		elseif npc_QW['A60'] >= 30 and temper >= 20 and temp_md = 8:
-			'In the clearing you notice  <a href="exec: gt ''Meadow'', ''8''">A bunch of half-naked hillbilly men</a>.'
+			'In the clearing you notice <a href="exec: gt ''Meadow'', ''8''">A bunch of half-naked hillbilly men</a>.'
 		elseif npc_QW['A60'] >= 20 and temper >= 25 and temp_md = 9:
-			'In a clearing you see  <a href="exec: gt ''Meadow'', ''9''">Mira</a>.'
+			'In a clearing you see <a href="exec: gt ''Meadow'', ''9''">Mira</a>.'
 		end
 	end
 	if sunWeather = 1:
@@ -59,7 +59,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			if $clothingworntype ! 'exercise' and pcs_inhib < 35:
 				'You could do some exercises here if you were wearing workout clothes.'
 			elseif $clothingworntype ! 'exercise' and $clothingworntype ! 'nude' and pcs_inhib >= 35 and Miraloc ! 2 and temper >= 10:
-				'Your meadow is a perfect place to do some exercises. There is no one around, so you could do it <a href="exec: gs ''clothing'', ''strip'', ''Meadow''& gs ''underwear'', ''remove'' & gt ''exercise'', ''workout'', ''nude'', ''Meadow''"> in the nude</a>.'
+				'Your meadow is a perfect place to do some exercises. There is no one around, so you could do it <a href="exec: gs ''clothing'', ''strip'', ''Meadow''& gs ''underwear'', ''remove'' & gt ''exercise'', ''workout'', ''nude'', ''Meadow''">in the nude</a>.'
 			elseif $clothingworntype ! 'exercise' and $clothingworntype = 'nude' and pcs_inhib >= 35 and Miraloc ! 2 and temper >= 10:
 				'Your meadow is a perfect place to do some exercises. There is no one around, so you could do it <a href="exec: gs ''underwear'', ''remove'' & gt ''exercise'', ''workout'', ''nude'', ''Meadow''"> in the nude</a>.'
 			else
@@ -85,15 +85,15 @@ if $ARGS[0] = 'Mira':
 	gs 'stat'
 	if meadow = 2:
 	gs 'Miroslava', 'miraclothes'
-		'"Wow!  This place is awesome.  My family and I have only been in the village a few months, but I have never heard anyone ever speaking about this place." Mira tells you.  "Now I know where I can come to, when I want to be alone.  You don''t mind, do you?"'
+		'"Wow! This place is awesome. My family and I have only been in the village a few months, but I have never heard anyone ever speaking about this place." Mira tells you. "Now I know where I can come to, when I want to be alone. You don''t mind, do you?"'
 		act 'You allow her to come here on her own':
 			*clr & cla
 			meadow = 3
 			minut += 2
 			gs 'stat'
 			gs 'Miroslava', 'miraclothes'
-			'"I think you are a responsible person, Mira, you can come to the meadow whenever it pleases you.  BUT, I want this place to remain a secret so you can never tell anyone about this place."'
-			'Mira, readily agrees and is as happy as a lark.  Mira energetically nodding her head and says, "I''ll take this secret to the grave, I swear.  If I don''t, then I''ll grant you three wishes, that I promise I will perform no matter what..."'
+			'"I think you are a responsible person, Mira, you can come to the meadow whenever it pleases you. BUT, I want this place to remain a secret so you can never tell anyone about this place."'
+			'Mira, readily agrees and is as happy as a lark. Mira energetically nodding her head and says, "I''ll take this secret to the grave, I swear. If I don''t, then I''ll grant you three wishes, that I promise I will perform no matter what..."'
 			act 'Finish': gt 'Meadow', 'start'
 		end
 		act 'Sorry, I want to keep this meadow private':
@@ -102,9 +102,9 @@ if $ARGS[0] = 'Mira':
 			minut += 2
 			gs 'stat'
 			gs 'Miroslava', 'miraclothes'
-			'You tell her that this is your haven, you would prefer if she wants to come to the meadow that she can only do so with you.  Mira looks crestfallen, tears start to well up in her eyes, though she tries not to let you know.  She tell you, sure she will abide by your wishes.'
-			'You and Mira speak for awhile.  Her mood is a little down, but as you chat a smile slowly creeps onto her face.'
-			'Mira then asks you if you could help cheer up her father?  He has been depressed ever sinse her mother''s death nearly two years before'
+			'You tell her that this is your haven, you would prefer if she wants to come to the meadow that she can only do so with you. Mira looks crestfallen, tears start to well up in her eyes, though she tries not to let you know. She tell you, sure she will abide by your wishes.'
+			'You and Mira speak for awhile. Her mood is a little down, but as you chat a smile slowly creeps onto her face.'
+			'Mira then asks you if you could help cheer up her father? He has been depressed ever sinse her mother''s death nearly two years before'
 			act 'Maybe':
 				*clr & cla
 				meadow = 5
@@ -117,8 +117,8 @@ if $ARGS[0] = 'Mira':
 				else
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3.jpg"></center>'
 				end
-				'You agree, intrigued.  You ask Mira what see has in mind?  After a few seconds, she tells you she saw her father masturbateing that morning.  She doesn''t think her father has been with a woman since her mother passed away.  Mira is sorry for her father''s lose, hers too for that matter, but she has an overwhelming desire to help him.  She can''t just do nothing.'
-				'You know Mira loves her father very much, you don''t know what you can do to help.  You don''t want or need this drama in your life.  First, you find out about migic being real.  School is rapid approaching.  You tell her that there is nothing you can do to help with her father''s depression.  Mira''s pouts and stands with her arms crossed. Her whole demeaner is one of injured innocence.'
+				'You agree, intrigued. You ask Mira what see has in mind? After a few seconds, she tells you she saw her father masturbateing that morning. She doesn''t think her father has been with a woman since her mother passed away. Mira is sorry for her father''s lose, hers too for that matter, but she has an overwhelming desire to help him. She can''t just do nothing.'
+				'You know Mira loves her father very much, you don''t know what you can do to help. You don''t want or need this drama in your life. First, you find out about migic being real. School is rapid approaching. You tell her that there is nothing you can do to help with her father''s depression. Mira''s pouts and stands with her arms crossed. Her whole demeaner is one of injured innocence.'
 				'A few minutes later, to your surprise, you feel an unexpectedly nice itch and a wicked heat rises up in your crotch of thoughts of his sucking Mira''s father.'
 				act 'Maybe a little followup wont hurt': gt 'Meadow', 'start'
 			end
@@ -135,14 +135,14 @@ if $ARGS[0] = 'Mira':
 				gs 'stat'
 				if $pantyworntype ! 'none':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick.jpg"></center>'
-					'Mira immediately sits on the grass and waits until you get undress.  Holding out your hand, you throw caution to the winds and push your panties aside, revealing your already dripping snatch...'
+					'Mira immediately sits on the grass and waits until you get undress. Holding out your hand, you throw caution to the winds and push your panties aside, revealing your already dripping snatch...'
 					gs 'arousal', 'foreplay', 5, 'lesbian'
 					gs 'stat'
 					act 'Further':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick1.jpg"></center>'
-						'You enjoy, Mira''s gentle touch between your legs.  She teases you by gently touching your clit...'
+						'You enjoy, Mira''s gentle touch between your legs. She teases you by gently touching your clit...'
 						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
 						gs 'stat'
 						act 'Further':
@@ -162,7 +162,7 @@ if $ARGS[0] = 'Mira':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick2.jpg"></center>'
-						'Mira obediently kneels at your feet and pulls starts licking your clit and starts to finger your pussy.  After a few minutes of this treatment, Mira brings you to blazing orgasm.'
+						'Mira obediently kneels at your feet and pulls starts licking your clit and starts to finger your pussy. After a few minutes of this treatment, Mira brings you to blazing orgasm.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'cuni', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
@@ -182,11 +182,11 @@ if $ARGS[0] = '0':
 	if temper < 20:
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr.jpg"></center>'
-		'You were about to approach her, but stop as she undoes her pants.  You decide to watch it to what she does...'
+		'You were about to approach her, but stop as she undoes her pants. You decide to watch it to what she does...'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr1.jpg"></center>'
-			'Mira, pulls harshly on her panties so that they bite deeply between her labia.  Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
+			'Mira, pulls harshly on her panties so that they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
 			gs 'arousal', 'voyeur', 2, 'lesbian'
 			gs 'stat'
 			act 'Watch':
@@ -389,7 +389,7 @@ if $ARGS[0] = '4' or $ARGS[0] = '5':
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave':minut += 30 & gt 'gadukino'
-	elseif temper >= 15 and  temper < 20:
+	elseif temper >= 15 and temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj4.jpg"></center>'
 		'They are both completely naked and lustful Mira with squeals, like crazy, galloping on Vaskerom member. The long such rate does not stand up and unceremoniously throwing off his rider, cums on her buttocks...'
 		gs 'arousal', 'voyeur', 5
@@ -517,9 +517,9 @@ if $ARGS[0] = 'miraperversion11':
 	pcs_horny += 10
 	npc_QW['A60'] = 12
 	gs 'stat'
-	'You don''t know where to begin, so you stay silent just staring at Mira.  Mira at the same time is looking at her feet and blushing hard.'
-	'Finally you gather your wits and ask what happened last night?  Mira, still no looking you in the eye, stammers out that she doesn''t know why she did it.  She says that she was out of control.'
-	'But you were also drunk, and did not do what she did.  Her face sinks with shame and she continues to look at the ground.'
+	'You don''t know where to begin, so you stay silent just staring at Mira. Mira at the same time is looking at her feet and blushing hard.'
+	'Finally you gather your wits and ask what happened last night? Mira, still no looking you in the eye, stammers out that she doesn''t know why she did it. She says that she was out of control.'
+	'But you were also drunk, and did not do what she did. Her face sinks with shame and she continues to look at the ground.'
 	'You speak with her awhile and somehow manage to soothe her and tell her that, she should just bite the bullet and move on.'
 	'Mira thanks you most sincerely for your support, but her eyes still look down....'
 	act 'Leave': gt $loc, $metka
@@ -781,7 +781,7 @@ if $ARGS[0] = 'mirameadow':
 				end
 			end
 		end
-	elseif meadow = 3 and MiraLoc = 0 and mirasextimes < 15 and temper >= 20  and temper < 25 and sunWeather = 1 and temp_md = 0:
+	elseif meadow = 3 and MiraLoc = 0 and mirasextimes < 15 and temper >= 20 and temper < 25 and sunWeather = 1 and temp_md = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr7.jpg"></center>'
 		'Mira is standing, leaning against a tree and starts to caress herself.'
@@ -947,7 +947,7 @@ if $ARGS[0] = 'mirameadow':
 		else
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj6.jpg"></center>'
-			'Mira fully naked, bends over, standing in front of Vasya and intensively exposes her ass to him, Vasya drives his cock deep into your ass.  Judging by her lustful moans, she likes having her ass violated and after a couple of minutes Vasya pulls out of her ass and cums on her backside.'
+			'Mira fully naked, bends over, standing in front of Vasya and intensively exposes her ass to him, Vasya drives his cock deep into your ass. Judging by her lustful moans, she likes having her ass violated and after a couple of minutes Vasya pulls out of her ass and cums on her backside.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'

+ 1 - 1
locations/Miroslava.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_rel['A60'] >= 20 and week = 6 and hour > 18 and hour < 22:
+		if npc_rel['A60'] >= 20 and week >= 6 and hour > 18 and hour < 22:
 
 			act 'Suggest taking a steam bath in your grandparents sauna':
 				if Mira_no = 0:

+ 16 - 15
locations/MiroslavaHome.qsrc

@@ -27,14 +27,14 @@ if $ARGS[0] = 'start':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
 			'You are passing Mira''s house when you see Mira''s father headed in your direction.'
-			'"<<$pcs_firstname>>, wait.  I need to speak with you," he says coming closer to you.'
+			'"<<$pcs_firstname>>, wait. I need to speak with you," he says coming closer to you.'
 			'You stop and look at him frightfully. "Did Mira tell him what I made her do?" you think as panicked thoughts race through your head.'
 			'"<<$pcs_nickname>>, do you know what happened to Mira?" Afanasiy asks, looking you in the eye.'
-			'"N-no, what happened to her?"  you ask in a confused voice, expecting him to start shouting any second.'
-			'"I don''t know.  She is just sitting at home all the time.  She doesn''t leave the yard, I''m concerned." Mira''s father answers.'
-			'"Oh, ah...I don''t know," you say, trying to make it sound believable and make your eyes look innocent.  "Maybe she was by hurt some local boy, or had a fight with someone..."'
-			'"Okay, I think it will pass...soon I hope.  But, I want you come and visit us, I think your company would do Mira a lot of good. It might bring her out of this funk faster." Mira''s father says good-bye, and leaves to resume working around his house.'
-			'"Close call,"  you think as you watch his retreating back and exhale with relief.'
+			'"N-no, what happened to her?" you ask in a confused voice, expecting him to start shouting any second.'
+			'"I don''t know. She is just sitting at home all the time. She doesn''t leave the yard, I''m concerned." Mira''s father answers.'
+			'"Oh, ah...I don''t know," you say, trying to make it sound believable and make your eyes look innocent. "Maybe she was by hurt some local boy, or had a fight with someone..."'
+			'"Okay, I think it will pass...soon I hope. But, I want you come and visit us, I think your company would do Mira a lot of good. It might bring her out of this funk faster." Mira''s father says good-bye, and leaves to resume working around his house.'
+			'"Close call," you think as you watch his retreating back and exhale with relief.'
 			MiraLoc = 0
 			minut += 10
 			mirafathertalk = 1
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 		elseif temper >= 15 and sunWeather = 1 and npc_QW['A60'] = 7 and hour >= 8 and hour <= 18:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
-			'Entering the courtyard, you notice Miroslav, working in the garden.  She is bent over and, to your amazement, you see her bare naked crotch...'
+			'Entering the courtyard, you notice Miroslav, working in the garden. She is bent over and, to your amazement, you see her bare naked crotch...'
 			MiraLoc = 0
 
 			act 'Approach it':
@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 			else
 				'Near the house <a href="exec: gt ''mirafather'' ">Afanasiy</a> is working.'
 			end
-			if month >= 5 and month <= 9 and hour >= 18 and hour <= 21 and RAND(0,30) >= 30:'You hear a motorcycle in the village.  <a href="exec: gt ''miroslavahome'', ''mirabrother''">Miras brother</a> has come in from the city to visit his siblings and father.'
+			if month >= 5 and month <= 9 and hour >= 18 and hour <= 21 and rand(0,30) >= 28:'You hear a motorcycle in the village. <a href="exec: gt ''miroslavahome'', ''mirabrother''">Miras brother</a> has come in from the city to visit his siblings and father.'
 			if MiraLoc > 0 and npc_QW['A60'] > 30:
 				act 'Check on Mira':
 					*clr & cla
@@ -121,7 +121,8 @@ if $ARGS[0] = 'start':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
 					'Mira''s father tells you that she''s not home, she is over at the river.'
 
-					act 'Go to river':gt 'gadriver','start'
+					act 'Go to the river':gt 'gadriver','start'
+					act 'Leave':gt 'Gadukino'
 				elseif mira_temp >= 10 and sunWeather = 0 and hour < 20 and MiraLoc ! 0 and Mira_no = 0:
 					*clr & cla
 					minut += 2
@@ -175,7 +176,7 @@ if $ARGS[0] = 'mirabrother':
 				act 'You look shocked and walk away.': gt 'gadukino'
 			else
 
-				'"No problem", he says to you, and then adds with a mischievous smile.  "But first, sit down on him, he''ll check to make sure he likes you.  He is fussy sombitch."'
+				'"No problem", he says to you, and then adds with a mischievous smile. "But first, sit down on him, he''ll check to make sure he likes you. He is fussy sombitch."'
 				act 'Get on the bike':
 					*clr & cla
 					pcs_horny += 10
@@ -183,9 +184,9 @@ if $ARGS[0] = 'mirabrother':
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto.jpg"></center>'
-					'You quickly swing your leg up and over the iron horse, you plop your ass down on the motorcycles padded seat and grab the handlebars.  Mira''s brother, with a satisfied smile, never takes his eyes off your crotch.  You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
+					'You quickly swing your leg up and over the iron horse, you plop your ass down on the motorcycles padded seat and grab the handlebars. Mira''s brother, with a satisfied smile, never takes his eyes off your crotch. You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
 
-					'"Fine", he say still smiling, "Just fine!  You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank,"is looking forward to having you ride on him. You know what I mean, yes?"  You give him a wicked grin and nod.  "We''ll give you a ride to remember, and then you can give me a ride to remember..."  You just continue to nod.'
+					'"Fine", he say still smiling, "Just fine! You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank,"is looking forward to having you ride on him. You know what I mean, yes?" You give him a wicked grin and nod. "We''ll give you a ride to remember, and then you can give me a ride to remember..." You just continue to nod.'
 
 
 					act 'Hell yes, you agree...':
@@ -208,7 +209,7 @@ if $ARGS[0] = 'mirabrother':
 
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto1.jpg"></center>'
 
-							'You slide your as back to allow him room to mount the motorcycle.  He grabs his helmet from the handlebars and slams it down on his head.'
+							'You slide your as back to allow him room to mount the motorcycle. He grabs his helmet from the handlebars and slams it down on his head.'
 
 
 							act 'Wrap your arms around his waist...':
@@ -219,7 +220,7 @@ if $ARGS[0] = 'mirabrother':
 
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto2.jpg"></center>'
 
-								'He guns the engine, which roars and then sets out at furious pace.  The rear wheel burns rubber and smokes a little as he rides you down the highway, after a few miles he does a U-turn and heads back towards Gadyukino and does not stop in the village.'
+								'He guns the engine, which roars and then sets out at furious pace. The rear wheel burns rubber and smokes a little as he rides you down the highway, after a few miles he does a U-turn and heads back towards Gadyukino and does not stop in the village.'
 
 
 								act 'One ride ends and another begins...':
@@ -229,7 +230,7 @@ if $ARGS[0] = 'mirabrother':
 									gs 'stat'
 
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto3.jpg"></center>'
-									'He rolls down a higway another mile he pulls the motorcycle off the main road onto a little side track and parks a couple hundred meters off the road. He jumps off the bike, pulling off his helmet, and turns to you with a "devil may care" attitude.	He pulls the helmet of your head and drops it to the ground.  He turns you around and begins to paw your crotch and tits...'
+									'He rolls down a higway another mile he pulls the motorcycle off the main road onto a little side track and parks a couple hundred meters off the road. He jumps off the bike, pulling off his helmet, and turns to you with a "devil may care" attitude. He pulls the helmet of your head and drops it to the ground. He turns you around and begins to paw your crotch and tits...'
 
 									act 'Stand':
 										*clr & cla

+ 8 - 8
locations/NewCloShop.qsrc

@@ -25,13 +25,13 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'View Clothing': minut += 1 & gt 'NewCloShop', 'clothes'
+	act 'View Clothing': minut += 5 & gt 'NewCloShop', 'clothes'
 
-	act 'View panties': minut += 1 & gt 'NewCloShop', 'panties'
+	act 'View panties': minut += 5 & gt 'NewCloShop', 'panties'
 
-	act 'View bras': minut += 1 & gt 'NewCloShop', 'bras'
+	act 'View bras': minut += 5 & gt 'NewCloShop', 'bras'
 
-	act 'View purses': minut += 1 & gt 'NewCloShop', 'purses'
+	act 'View purses': minut += 5 & gt 'NewCloShop', 'purses'
 end
 
 if $ARGS[0] = 'clothes':
@@ -46,7 +46,7 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'NewCloShop', 'start'
 	end
 	
@@ -84,7 +84,7 @@ if $ARGS[0] = 'panties':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'NewCloShop', 'start'
 	end
 
@@ -116,7 +116,7 @@ if $ARGS[0] = 'bras':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'NewCloShop', 'start'
 	end
 
@@ -147,7 +147,7 @@ if $ARGS[0] = 'purses':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'NewCloShop', 'start'
 	end
 

+ 5 - 24
locations/Nord.qsrc

@@ -44,18 +44,8 @@ if $ARGS[0] = '':
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
 	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'Nord', 'redlight'
-	act 'Wait':
-		cla
-		waiting = input ("How long would you like to wait? (Not more than 120 minutes)")
-
-		if waiting <= 0 or waiting > 120:
-			minut += 15
-		elseif waiting > 0 and waiting <= 120:
-			minut += waiting
-		end
 
-		act 'Take a look at the clock':gt curloc
-	end
+	act 'Wait':gs 'obj_din', 'wait'
 
 	gs 'taxi'
 
@@ -69,7 +59,7 @@ if $ARGS[0] = '':
 
 	'<a href="exec:minut += 15 & gt ''vokzal''">Train Station</a> to get to the small Town.'
 
-	if week = 3 or hour < 16: 
+	if week = 3 or hour < 16:
 		'The Bar "Rabotnik" is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and 24:00.'
 	else
 		'The <a href="exec: minut += 5 & gt ''qwBarPolet''">Bar "Rabotnik"</a> seems to be open.'
@@ -125,19 +115,10 @@ if $ARGS[0] = 'redlight':
 	if bordel > 0 and hour >= 20 or bordel > 0 and hour <= 3:'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
 	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'Nord'
-	
-		act 'Wait':
-		cla
-		waiting = input ("How long would you like to wait? (Not more than 120 minutes)")
-
-		if waiting <= 0 or waiting > 120:
-			minut += 15
-		elseif waiting > 0 and waiting <= 120:
-			minut += waiting
-		end
 
-		act 'Take a look at the clock': gt 'Nord', 'redlight'
-	end
+	act 'Wait':gs 'obj_din', 'wait'
+	
+	gs 'taxi'
 end
 
 

+ 0 - 2
locations/ParkKafe.qsrc

@@ -314,7 +314,6 @@ if $ARGS[0] = 'negros':
 		act 'Leave': minut += 5 & gt 'park', 'start'
 	else
 		afra = 1
-		obs = 1
 		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as DeMarcus, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
 
 		act 'Leave': minut += 5 & gt 'park', 'start'
@@ -335,7 +334,6 @@ if $ARGS[0] = 'the_boy':
 			act 'Leave': minut += 5 & gt 'park', 'start'
 		else
 			gosh = 1
-			obs = 1
 			'A young man comes to your table and introduces himself as Gosha, you become acquainted with him, you learn that he is a student and that he lives in the hostel. Gosha tells you how to get to the hostel and how to find his dorm.'
 
 			act 'Leave': minut += 5 & gt 'park', 'start'

+ 6 - 2
locations/SergeiHanter.qsrc

@@ -35,6 +35,9 @@ end
 if hantersSergeiQw >= 10:
 	if hantersSergeiLove = 0:
 		act 'Flirt':
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
 			*clr & cla
 			if hantersSergeiQw <= 35 and hantersKnowSlut = 0:hantersSergeiQw += 1
 			if hantersIgorQw >= 10 and hantersKnowSlut = 0:hantersIgorQw -= 1
@@ -44,7 +47,6 @@ if hantersSergeiQw >= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
             'You flirt playfully with Sergey. He is glad for your company, though he can'' stop himself from letting his eyes wander.'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
 			if hantersSergeiLove = 0 and hantersSergeiQw >= 30 and hantersKnowSlut = 0 and pcs_apprnc >= 60:
@@ -111,6 +113,9 @@ if hantersSergeiQw >= 10:
         end
     else
         act 'Spend time together':
+			minut += 120
+			!!not using arousal as no orgasm chance
+			pcs_horny += 10
             *clr & cla
             hantersSergeiQw += 1
             if hantersIgorLove > 0 or hantersAndreiLove > 0:hanterslut += 1
@@ -121,7 +126,6 @@ if hantersSergeiQw >= 10:
             '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
             'You and Sergey spend time together, spooning the whole while. You can almost feel how much he needed to spend time with you. You notice the happy look on his face, feeling very satisfied you put it there.'
 
-			gs 'arousal', 'foreplay', 120
 			gs 'stat'
 
             act'Depart':gt $loc, $metka

+ 148 - 142
locations/SoniaHome.qsrc

@@ -11,19 +11,21 @@ if $ARGS[0] = 'Aftermath':
 	pcs_sleep += 45
 	cumspclnt = 1
 	gs 'cum_cleanup'
-	pcs_sweat += 5	
+	pcs_sweat += 5
 	minut += 270
 	NikoAftermath = 1
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/soniawake.jpg"></center>'
-	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess but...Where am I?" Sonia replies, "After what happened at school, we couldn''t just leave you alone, to be abused by the boys, so we brought you back to my house." You scratch your head. "We?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "I''m so glad that you are ok. I was worried when you didn''t wake up after we kept splashed your face with water." Julia adds, "I also cleaned your hair for you."' 
+	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess but...Where am I?" Sonia replies, "After what happened at school, we couldn''t just leave you alone, to be abused by the boys, so we brought you back to my house." You scratch your head. "We?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "I''m so glad that you are ok. I was worried when you didn''t wake up after we kept splashed your face with water." Julia adds, "I also cleaned your hair for you."'
 	*nl
 	'You look around the room then back at Sonia. "Thank you all, for helping me. I can''t believe what happened in school was not a dream. I want it to be a dream, so bad." You can feel tears forming under your eyes. Katja hugs you, as she says, "I don''t know what caused it, but we will find a way to make things better. You didn''t deserve what they did to you." Sonia whispers to herself, "Do any of us?" Julia downcasts her eyes, not knowing how to console Sonia while Katja sighs, "What is going at school these days, first Sonia then <<$pcs_firstname>>. These boys are vicious." You reply, "Yes they are." Julia places her hand on your leg, "<<$pcs_firstname>> what happened exactly?"'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	
-	act 'Tell them your story':	
+
+	act 'Tell them your story':
 		cls
 		minut += 5
 		gs'stat'
@@ -32,21 +34,21 @@ if $ARGS[0] = 'Aftermath':
 		'You take a deep breath, "It all stared when I met a boy named Nikolai. He..." Katja cuts you off, "Wait, do you mean that gopnik punk, Niko? You can''t trust that loser." Julia nods, "She''s right. That boy is bad news. He is always lying to everyone. Even the other boys know, not to trust him." You look up, surprised by their opinions of Niko. "But he treats me with such love and compassion. He always calls me his princess." Katja places her arms around you neck. "Listen <<$pcs_nickname>>, you can go out with whoever you want. I am just concerned that he will use you." You lay back, as you consider your options, Julia asks, "So how did you end up...naked at school?"'
 		*nl
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
 
-		act 'Continue your story':	
+		act 'Continue your story':
 			cls
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
-			'"Niko is always teaching me how to be more confident, and daring. He tells me to do things that are very scary at first, but end up being very exciting. I don''t know why it excites me so much, but I feel so alive when I am with Niko. He always makes me feel safe, and he tells me..." Katja cuts you off. "Makes you feel safe? Like how he kept you safe today?" You lower your head, and remain silent, for a few seconds before Katja says, "I''m sorry <<$pcs_firstname>>, I just get so angry when I see good people getting used by assholes like him. Continue your story, please."' 
+			'"Niko is always teaching me how to be more confident, and daring. He tells me to do things that are very scary at first, but end up being very exciting. I don''t know why it excites me so much, but I feel so alive when I am with Niko. He always makes me feel safe, and he tells me..." Katja cuts you off. "Makes you feel safe? Like how he kept you safe today?" You lower your head, and remain silent, for a few seconds before Katja says, "I''m sorry <<$pcs_firstname>>, I just get so angry when I see good people getting used by assholes like him. Continue your story, please."'
 			*nl
 			'You take a second before continuing your story. "He helps me find my confidence, and break out of my safety bubble. I''m alway trying something new, and facing my fears. I...I just don''t know what to do without him. Niko always guides me in bettering myself, and feeling so alive." Sonia places her hand on your shoulder, "If Niko is the one in your heart then stay with him..." Katja immediately cuts Sonia off, "Stay with that freak who striped her down, and let those gopnik punks, rape her?" Julia calms her. "We might not like him, but it is <<$pcs_firstname>>''s decision, and we can''t control her. We can only give her our advice, and hope that she makes the right decision, on her own."'
 			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'	
-			
-			act 'Continue':	
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
+
+			act 'Continue':
 				cls
 				gs'stat'
 				'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
@@ -54,10 +56,10 @@ if $ARGS[0] = 'Aftermath':
 				'You lightly grip your hair, as you respond, "I just...need to think about this, for a while." Sonia stands up, and says, "Well I''ll make us something to eat, I hope you all have a sweet tooth." Sonia then walks to the door then motions the other girls to follow her. Katja gets up then tells you, "I''m sorry that I have been a bit stern, I just don''t want to see what happened today repeat itself. When you finish resting then come see me ok? We can have a nice chat together, and don''t worry, I won''t lecture you again." Julia adds, "Come see me too, I would like to speak with you. Now get some rest." The girls leave the room, and you lay down then close your eyes...'
 				'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-				
+
 				act 'Rest':gt 'NikoDreams', 'Woods'
 			end
-		end	
+		end
 	end
 end
 
@@ -71,35 +73,37 @@ if $ARGS[0] = 'Aftermath 2':
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	'You quickly jump up, and see Katja with a concerned look on her face. "It''s ok <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope this doesn''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. Don''t worry." You giggle when you notice the goofy doll that Sonia had was tucked in right next to you. Katja responds, "Now that''s what I like to see, a fresh smile."' 
+	'You quickly jump up, and see Katja with a concerned look on her face. "It''s ok <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope this doesn''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. Don''t worry." You giggle when you notice the goofy doll that Sonia had was tucked in right next to you. Katja responds, "Now that''s what I like to see, a fresh smile."'
 	*nl
 	'You both giggle before Katja tells you, "Sonia should be done soon making whatever she''s cooking in there. Every time I ask, the only reply she gives me is: "All in good time." So I guess that it''s a mystery. You should wash up in the shower before we eat because Sonia told me that she wants us out before her mother gets home. You should also speak with Julia. She seems very worried about you." You give Katja a nod, as you climb out of bed.'
 
 	act 'Get up':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Hallway':	
+if $ARGS[0] = 'Hallway':
 	cls
 	if NikoAftermath = 0:minut += 5
+	$location_type = 'private'
+	killvar '$locclass'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hallway.jpg"></center>'
-	'This is the central hallway that connect the house. There is a lot of artwork on the walls, and the house smells lovely.'	
+	'This is the central hallway that connect the house. There is a lot of artwork on the walls, and the house smells lovely.'
 	if VKSoniaChat = 1 and SoniaCupcake = 2 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat''">Sonia</a> is standing next to the front door, as she adjusts her bra.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	elseif VKSoniaChat = 2 and SoniaCupcake = 2 and VKJuliaChat < 4 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat 2''">Sonia</a> is standing next to the front door, as she browses the web, on her phone.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	elseif VKJuliaChat = 4 and NikoAftermath = 1:
 		'Sonia is standing next to the front door, as she browses the web, on her phone.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	end
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-	
+
 	act 'Kitchen':
 		if SoniaCupcake = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Sonia Cooking'
@@ -108,17 +112,19 @@ if $ARGS[0] = 'Hallway':
 		else
 			gt 'SoniaHome', 'Kitchen'
 		end
-	end	
+	end
 
 	act 'Livingroom':gt 'SoniaHome', 'Livingroom'
-end	
+end
 
-if $ARGS[0] = 'Bedroom':	
+if $ARGS[0] = 'Bedroom':
 	cls
 	$metka = 'Bedroom'
 	$loc = 'SoniaHome'
 	$metkaM = 'Bedroom'
-	$locM = 'SoniaHome'	
+	$locM = 'SoniaHome'
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bedroom/bedroom.jpg"></center>'
 	'Sonia has such a cute bedroom, so clean and well organized. Sonia has an expensive standing <a href="exec:gt ''mirror'', ''start''">mirrors</a>, and she even has a packed <a href="exec:gt ''SoniaHome'', ''Shoe Closet''">shoe closet</a>.'
@@ -128,65 +134,65 @@ if $ARGS[0] = 'Bedroom':
 		'<a href="exec:gt ''SoniaHome'', ''Katja Chat''">Katja</a> is standing in front of a mirror, tweezing her eyes brows while humming a soothing tune.'
 	elseif SoniaCupcake = 2 and VKKatjaChat = 1 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Katja Chat 2''">Katja</a> is laying on the bed while humming a sweet melody.'
-	end	
-	
+	end
+
 	act 'Sonia Bathroom':
 		if VKKatjaChat = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Katja Chat'
 		elseif VKSoniaChat = 0 or VKJuliaChat = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Katja Reminder'
-		else	
+		else
 			gt 'SoniaHome', 'Sonia Bathroom'
-		end	
-	end	
-	
+		end
+	end
+
 	act 'Leave room':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Sonia Cooking':	
+if $ARGS[0] = 'Sonia Cooking':
 	cls
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake1.jpg"></center>'
 	if VKSoniaChat = 1:
 		'As soon, as you enter the kitchen Sonia shoos you away. "No peeking. It will be ready when it''s ready. Be patient."'
-	else			
+	else
 		'You walk into the kitchen, and smell something lovely, Sonia notices you enter then stands in front of a tray while saying, "Hey no peeking!" She giggles before saying, "I''m glad that you rested well, I am making us a special treat, and it won''t be ready for another 20 minutes, so why don''t you jump in the shower, and get washed up? I should be done by then." You give Sonia a warm smile as you walk out of the kitchen.'
 	end
 
 	act 'Leave':VKSoniaChat = 1 & gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Cupcake Time':	
+if $ARGS[0] = 'Cupcake Time':
 	cls
 	minut += 15
 	pcs_health += 10
-	pcs_willpwr += 25	
+	pcs_willpwr += 25
 	pcs_mood += 25
 	pcs_energy += 40
 	pcs_hydra += 40
 	fat += 2
-	cumspclnt = 2		
+	cumspclnt = 2
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake2.jpg"></center>'
 	'You walk into the kitchen, as Katja, and Juila enter. You all take a seat at the table just as Sonia approaches with a tray of cupcakes. Katja says, "So.. cupcakes were your secret treat." Sonia responds, "Sometimes the most simple treat, can be the greatest surprise." Julia takes a bite of a cupcake then responds, "Thank you Sonia. These cupcakes are so tasty." Sonia nods with a warm smile on her face. "I''m glad that you like them. now eat up everyone." You all spend the next 15 minutes, eating cupcakes while chatting about various topics.'
-	
+
 	act 'Finish eating':
 		cls
 		SoniaCupcake = 2
 		gs'stat'
 		'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
 		'After you all finish your cupcakes, Katja stands up and says, "I had a great time but it''s getting late. I better get going. I''m going to use the restroom before I go." Katja walks out of the room as she waves at everyone. Julia gets up next and says, "We should get going too <<$pcs_firstname>>. Sonia''s mom should be coming home soon, and we''d only disturb her." Sonia nods, as she responds, "I''ll be waiting by the front door when you are ready to go, and before you go, can you do me a favor and make sure that Katja doesn''t use all my hair care products. I told her she can use some, but that girl keeps "Sampling" each one." Julia adds, "When you have a moment please see me in the living room. I have something I would like to ask you." You nod at Julia, as she, and Sonia walk out of the kitchen.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'	
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
+
 		act 'Stand up':gt 'SoniaHome', 'Kitchen'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Kitchen':	
+if $ARGS[0] = 'Kitchen':
 	cls
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen/kitchen.jpg"></center>'
@@ -195,11 +201,11 @@ if $ARGS[0] = 'Kitchen':
 	else
 		'Sonia''s kitchen is nice, and clean with plenty of potted plants, and other decorations.'
 	end
-	
+
 	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end		
-				
-if $ARGS[0] = 'Livingroom':	
+end
+
+if $ARGS[0] = 'Livingroom':
 	cls
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/livingroom/livingroom.jpg"></center>'
@@ -217,45 +223,45 @@ if $ARGS[0] = 'Livingroom':
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
 	end
-	
+
 	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end		
-					
-if $ARGS[0] = 'Sonia Bathroom':	
+end
+
+if $ARGS[0] = 'Sonia Bathroom':
 	cls
 	$metka = 'Sonia Bathroom'
 	$loc = 'SoniaHome'
 	$metkaM = 'Sonia Bathroom'
 	$locM = 'SoniaHome'
-	$location_type = 'Sonia Bathroom'		
+	$location_type = 'bathroom'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom/bathroom.jpg"></center>'
 	'This bathroom is very clean, and well organized with a sink, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and a shower.'
-	
+
 	if SoniaCupcake = 0 and NikoAftermath = 1:
 		act 'Take a shower':SoniaCupcake = 1 & gt 'SoniaHome', 'Sonia Shower'
 	elseif NikoAftermath = 0:
 		act 'Take a shower':gt 'SoniaHome', 'Sonia Shower'
 	end
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
 end
 
-if $ARGS[0] = 'Sonia Shower':	
-	cls	
+if $ARGS[0] = 'Sonia Shower':
+	cls
 	pcs_hairbsh = 0
 	pcs_makeup = 1
 	minut += 20
 	cumspclnt = 1
 	gs 'cum_cleanup'
-	if sweat > 14: sweat = 10 + rand(0,4)	
+	if sweat > 14: sweat = 10 + rand(0,4)
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/shower/wash.jpg"></center>'
 	'You climb into the shower, and begin lathering your body, cleaning yourself, as thoroughly, as possible before turning off the water. You grab a spare towel, and begin drying yourself off before getting dressed then leaving the bathroom.'
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-end	
-				
+end
+
 if $ARGS[0] = 'Shoe Closet':
 	cls
 	if SoniaShoesDay ! daystart:pcs_mood += 20 & SoniaShoesDay = daystart
@@ -264,27 +270,27 @@ if $ARGS[0] = 'Shoe Closet':
 	'Sonia has so many shoes. She must be very wealthy, and everything is so well organized. I wonder which is her favorite pair of heels.'
 
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Sonia Chat':	
-	cls	
+if $ARGS[0] = 'Sonia Chat':
+	cls
 	VKSoniaChat = 2
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	'As you are approaching Sonia, she looks up from her phone then flashes you a warm smile, as she says, "I hope that you are holding up alright. I remember the time at the disco. I was so terrified when I got home, and the next day at school was...terrible. All of my friends turned on me. No one lent me a hand, or even cared about what happened to me. Imagine losing all of your friends overnight. I made sure that same didn''t happen to you. At least you will still have some of your friends to support you." You lightly grab onto Sonia''s arm, as you feel tears dripping down your cheeks. "Thank you Sonia. I''m...I''m so sorry for not helping you at the disco. I was so scared of the boys, and...I was a coward." Sonia brushes your tears away.' 
+	'As you are approaching Sonia, she looks up from her phone then flashes you a warm smile, as she says, "I hope that you are holding up alright. I remember the time at the disco. I was so terrified when I got home, and the next day at school was...terrible. All of my friends turned on me. No one lent me a hand, or even cared about what happened to me. Imagine losing all of your friends overnight. I made sure that same didn''t happen to you. At least you will still have some of your friends to support you." You lightly grab onto Sonia''s arm, as you feel tears dripping down your cheeks. "Thank you Sonia. I''m...I''m so sorry for not helping you at the disco. I was so scared of the boys, and...I was a coward." Sonia brushes your tears away.'
 	*nl
-	'"Don''t worry, there was nothing you could do anyway. I have come to terms with my situation, and even have fun sometimes. Everyone likes to be in control of their body, and make all choices themself, but sometimes letting someone else make choices for you, can lead to a much simpler, and exciting life. I never know what tomorrow will bring. That is why I believe that if you want to truly live your life then you need to throw caution to the wind, and accept any opportunities that come your way." You nod, as you reply, "I think I understand, By letting someone else choose my path then I can make things easier for me, and I will have the freedom to sleep with anyone I want, without worry of my reputation being ruined."' 
+	'"Don''t worry, there was nothing you could do anyway. I have come to terms with my situation, and even have fun sometimes. Everyone likes to be in control of their body, and make all choices themself, but sometimes letting someone else make choices for you, can lead to a much simpler, and exciting life. I never know what tomorrow will bring. That is why I believe that if you want to truly live your life then you need to throw caution to the wind, and accept any opportunities that come your way." You nod, as you reply, "I think I understand, By letting someone else choose my path then I can make things easier for me, and I will have the freedom to sleep with anyone I want, without worry of my reputation being ruined."'
 	*nl
 	'Sonia nods, "Exactly, living a life of freedom, and mystery with no fear of ever being bored." You think to yourself, <font color=#FF00FF>With Niko, I can live this life. A life of freedom and excitement. By destroying my reputation Niko may have freed me from my shackles. I have really enjoyed being fucked by all those boys. I just didn''t know it at the time. This could be my new life.</font> You smile, as you say, "Thank you again Sonia, I have much to think about." Sonia replies, "I''m sure you do."'
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'	
-	
+	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+
 	act 'Walk away':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Sonia Chat 2':	
-	cls	
+if $ARGS[0] = 'Sonia Chat 2':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
@@ -292,71 +298,71 @@ if $ARGS[0] = 'Sonia Chat 2':
 		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go or would you like to talk to the other girls before leaving?"'
 		act 'Stay to chat with Julia, and Katja':gt 'SoniaHome', 'Hallway'
 		act 'Leave house':gt 'SoniaHome', 'Sonia Goodbye'
-	else	
+	else
 		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go?"'
 		act 'Not yet':gt 'SoniaHome', 'Hallway'
-		act 'I''m ready':gt 'SoniaHome', 'Sonia Goodbye'		
+		act 'I''m ready':gt 'SoniaHome', 'Sonia Goodbye'
 	end
-end	
+end
 
-if $ARGS[0] = 'Sonia Goodbye':	
-	cls	
+if $ARGS[0] = 'Sonia Goodbye':
+	cls
 	if grupTipe[61] = 4:grupTipe[61] = 600
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
 	'You walk out of the door, as Sonia says, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. what''s the point of living a boring life?" You nod at Sonia, "Thank you for everything Sonia. I owe you all so much." Sonia replies, "It was no trouble at all. Goodbye <<$pcs_firstname>>." Sonia then closes the door.'
-	
+
 	act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
-end	
+end
 
-if $ARGS[0] = 'Katja Chat':	
-	cls	
+if $ARGS[0] = 'Katja Chat':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
 	if VKKatjaChat = 0:
 		pcs_makeup = 3
-		'As you approach Katja, she waves you over. You stand next to her before she walks around you while keeping her eyes on the mirror. "Let''s gussy you up." Katja reaches into her hand bag then takes out her compact makeup case. She pulls out her brush then begins applying some makeup on you, for a few seconds before saying, "Look at that pretty girl in the mirror. Isn''t she lovely?" You reply, "I agree, she is so pretty, but what about me?" Katja smirks, as she places her fingertip on your nose. "I was referring to you, silly." You both giggle before Katja asks, "So, how are you holding up?" You reply, "I have a lot to think about." Katja responds, "Make sure that you take your time, and think carefully about your future because one wrong decision, can go a long way." You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders,' 
+		'As you approach Katja, she waves you over. You stand next to her before she walks around you while keeping her eyes on the mirror. "Let''s gussy you up." Katja reaches into her hand bag then takes out her compact makeup case. She pulls out her brush then begins applying some makeup on you, for a few seconds before saying, "Look at that pretty girl in the mirror. Isn''t she lovely?" You reply, "I agree, she is so pretty, but what about me?" Katja smirks, as she places her fingertip on your nose. "I was referring to you, silly." You both giggle before Katja asks, "So, how are you holding up?" You reply, "I have a lot to think about." Katja responds, "Make sure that you take your time, and think carefully about your future because one wrong decision, can go a long way." You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders,'
 		*nl
 		'"No one can change who you are beside you. Remember that. Anyway you should take a shower before Sonia finishes making her "Secret Treat." That she won''t tell me about. You would think that she is preparing human flesh...You don''t think...?" You poke Katja in her arm as you reply, "Oh stop." She giggles, as she pulls out her tweezers then begins plucking her eyebrows while telling you, "Oh, by the way, Julia wanted to speak to you, she seems very worried about you. She is such a sweet girl. It''s a shame that she isn''t more talkative in school." You reply, "I agree. I will go speak with her." You then give Katja a nod before stepping away.'
 		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'		
+		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		act 'Walk away':VKKatjaChat = 1 & gt 'SoniaHome', 'Bedroom'
 	else
 		'You approach Katja and she continues tweezing her eyebrow as she tells you, "You should talk to Julia then shower before Sonia''s mom gets home. You also check up on Sonia. I''m sure that she will be glad to see you walking around." You nod as you walk toward the hallway.'
 		act 'Walk away':gt 'SoniaHome', 'Hallway'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Katja Chat 2':	
-	cls	
+if $ARGS[0] = 'Katja Chat 2':
+	cls
 	VKKatjaChat = 2
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
 	'You sit down next to Katja, and she turns to you. "I know that I said that I wouldn''t lecture you, but that boy Niko is not what he seems. He doesn''t care about you, he is just trying to use you. I only tell you this because I care about you. Don''t let this punk corrupt you." You look at your feet whie you consider what she said. Katja begins rubbing on your shoulders, "You can do better then him <<$pcs_firstname>>. Don''t let him trick you into believing otherwise. I just needed to tell you that before I left. Please stay safe <<$pcs_firstname>>. You are too good a girl to be used like that." Katja gets up then waves goodbye, as she walks out of the bedroom.'
-	
+
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Katja Reminder':	
-	cls	
+if $ARGS[0] = 'Katja Reminder':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
 	'As you approach the bathroom door, Katja turns to you then says, "Have you spoken to Julia and Sonia? They were both worried about you, and would love to see you up and about." You reply, "I haven''t yet but I will visit them right now. i wouldn''t want to leave them to worry about me." You turn around, and walk away.'
-		
+
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Julia Chat':	
-	cls	
+if $ARGS[0] = 'Julia Chat':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	if VKJuliaChat = 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
-		'As soon as you approach, Julia turns to you before flashing you a smile. "<<$pcs_firstname>> you''re up. How are you feeling?" You return the smile, as you reply, "I''m feeling much better. i hope I didn''t worry you." Julia giggles before replying, "I''m just glad that you''re ok. I have never seen anyone go through as much as you did today, but I''m sure everything will work out in the end." You reply, "I can only hope." Julia responds, "Try not to let things get to you." You reply, "Don''t worry I won''t." Julia says, "Good, I will always be around, if you want to talk."' 
+		'As soon as you approach, Julia turns to you before flashing you a smile. "<<$pcs_firstname>> you''re up. How are you feeling?" You return the smile, as you reply, "I''m feeling much better. i hope I didn''t worry you." Julia giggles before replying, "I''m just glad that you''re ok. I have never seen anyone go through as much as you did today, but I''m sure everything will work out in the end." You reply, "I can only hope." Julia responds, "Try not to let things get to you." You reply, "Don''t worry I won''t." Julia says, "Good, I will always be around, if you want to talk."'
 		*nl
 		'You respond, "Thank you, for everything you all have done for me. I shutter to think of what would have happened to me, if you weren''t around." Julia replies with a warm smile before saying, "You are very welcome. Now you should take a relaxing shower before Sonia finishes with her treats."'
 		act 'Walk away':VKJuliaChat = 1 & gt 'SoniaHome', 'Livingroom'
@@ -365,17 +371,17 @@ if $ARGS[0] = 'Julia Chat':
 		'When you approach Julia, she says, "Is there something else you need?" You reply, "I just wanted to know where the bathroom is." Julia points toward the bedroom. "Sonia''s bathroom is in her bedroom...I wish I had a bathroom in my bedroom." You reply, "As do I." You both giggle before you walk back into the hallway.'
 		act 'Walk away':gt 'SoniaHome', 'Hallway'
 	end
-end	
+end
 
-if $ARGS[0] = 'Julia Chat 2':	
-	cls	
+if $ARGS[0] = 'Julia Chat 2':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 	'As you approach Julia, she asks, "How did you like the cupcakes? I found them very tasty." You reply, "They were super yummy, Sonia could win a cooking contest, if we had those, that is." Julia giggles before asking, "We are going to be leaving in a bit, and I wanted to ask you...Would you like to walk home with me?"'
 
 	act 'I would love too':
-		cls	
+		cls
 		VKJuliaChat = 4
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
@@ -383,67 +389,67 @@ if $ARGS[0] = 'Julia Chat 2':
 		'Julia''s eyes light up, as she responds, "Great are you ready to head out now or would you like to speak to Sonia, or Katja first?"'
 
 		act 'Stay to chat with Sonia, and Katja':gt 'SoniaHome', 'Livingroom'
-		
+
 		act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-	end	
-	
+	end
+
 	act 'I can''t right now':
-		cls	
+		cls
 		VKJuliaChat = 3
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 		'"I would love too, but I have other places I need to be today, maybe next time." Julia lowers her head, "Ok I guess...Just stay safe <<$pcs_firstname>>. I...I''m concerned for you." You reply, "That is really sweet Julia, but I''m fine." Julia responds, "I''m glad to hear that. Goodbye <<$pcs_firstname>>." Julia then walks out of the house while giving both, you, and Sonia a friendly smile.'
-		
+
 		act 'Wave goodbye':gt 'SoniaHome', 'Livingroom'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Chat 3':	
-	cls	
+if $ARGS[0] = 'Julia Chat 3':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 	'As you walk up to Julia, she asks, "Would you like to leave now?"'
 
 	act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-	
+
 	act 'Not yet':gt 'SoniaHome', 'Livingroom'
-end	
+end
 
-if $ARGS[0] = 'Julia Walk':	
-	cls	
+if $ARGS[0] = 'Julia Walk':
+	cls
 	minut += 5
 	NikoAftermath = 0
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
 	'You, and Julia begin walking toward the front door. Sonia asks, "Are you two ready to head out?" You both nod simultaneously as Sonia holds the door open for you. As you are walking past Sonia, she leans forward then whispers in your ear, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. What''s the point of living a boring life?" She then gives you a wink, as you and Julia head into town.'
-	
+
 	act 'Continue walking':
-		cls	
+		cls
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
-		'You and Julia continue walking in silence until you begin walking past the park when Julia asks, "Would you like to stop by the park?"'	
+		'You and Julia continue walking in silence until you begin walking past the park when Julia asks, "Would you like to stop by the park?"'
 
 		act 'Sure':gt 'SoniaHome', 'Julia Park'
-		
-		act 'It''s getting too late':			
-			cls	
+
+		act 'It''s getting too late':
+			cls
 			minut += 10
 			gs'stat'
 			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/sad1.jpg"></center>'
-			'Julia lowers her head, "Oh, ok then, sorry for asking." You both walk home in silence. When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to do whatever you feel is right. Goodbye." You wave goodbye to Julia, as she walks away.'	
+			'Julia lowers her head, "Oh, ok then, sorry for asking." You both walk home in silence. When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to do whatever you feel is right. Goodbye." You wave goodbye to Julia, as she walks away.'
 
 			act 'Enter your apartment':gt 'korrPar'
 		end
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Park':	
-	cls	
+if $ARGS[0] = 'Julia Park':
+	cls
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
@@ -454,48 +460,48 @@ if $ARGS[0] = 'Julia Park':
 		'"I..um..care for you, I..." Julia remains silent for a few seconds, as she rubs her arm while staring at the ground, in front of her.'
 		act 'Kiss her':VKJuliaKiss = 1 & gt 'SoniaHome', 'Julia Kiss'
 		act 'Change subject':gt 'SoniaHome', 'Julia Park 2'
-	else	
+	else
 		'"I just couldn''t leave you like that. You looked so scared, and helpless. I needed to help in any way I can." You place your hand on her knee, "Thank you Julia. You saved me." Julia''s face grows red, as she replies, "I didn''t do it alone, but you''re welcome." Julia gives you a meek smile.'
 		act 'Continue talking':gt 'SoniaHome', 'Julia Park 2'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Park 2':	
-	cls	
+if $ARGS[0] = 'Julia Park 2':
+	cls
 	minut += 15
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/12.jpg"></center>'
 	'You, and Julia continue chatting for a few minutes before Julia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home.  When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Julia, as she walks away.'
-	
+
 	act 'Enter your apartment':gt 'korrPar'
-end	
+end
 
 if $ARGS[0] = 'Julia Kiss':
-	cls	
+	cls
 	gs'stat'
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'	
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
 	'You place your hand on Julia''s cheek then gently pull her face to yours. You both share a passionate kiss for what feels like two minutes. After you finish, you both stare into each others eyes, as you whisper to her, "Thank you for saving me Julia. i will never forget what you have done for me." Julia''s face is very red, as she replies, "I would do anything for you. You only need to ask." You reply, "You''re so sweet Julia, and I am so lucky to have you." Julia gives you a trembling smile before she quickly darts forward, giving you another passionate kiss.'
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/park/kiss1.mp4"></video></center>'
 	gs 'arousal', 'kiss', 5
-	gs'stat'	
-							
+	gs'stat'
+
 	act 'Finish kissing':
-		cls	
+		cls
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
 		'After a long passionate kiss, Julia begins giggling playfully then checks her phone before saying, "It''s getting late, maybe we should start heading home." You reply, "Sure, let''s walk home." As you are walking home, Julia wraps her fingers around yours then gives you an innocent smile. When you arrive at your apartment, Julia says, "Please stay safe <<$pcs_firstname>>, I care for you so much... Just remember to follow your heart, and I''m sure that everything will work out for you. Have a good night." Julia then gives you a soft kiss before walking away while looking back at you with an innocent smile.'
 		*nl
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
 		gs 'arousal', 'kiss', 10
 		gs 'arousal', 'end'
-		gs'stat'	
-							
+		gs'stat'
+
 		act 'Enter your apartment':gt 'korrPar'
-	end	
-end		
+	end
+end
 
 --- SoniaHome ---------------------------------
 

+ 4 - 0
locations/VolkovHome.qsrc

@@ -5,6 +5,8 @@ if $ARGS[0] = 'Niko Bedroom':
 	$metka = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/niko/bedroom.jpg"></center>'
 	'Niko''s room is very messy with two lamps, a bed, and various electronics scattered around.'
@@ -17,6 +19,8 @@ if $ARGS[0] = 'Hallway 2':
 	$metka = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
+	$location_type = 'private'
+	killvar '$locclass'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/hallway2.jpg"></center>'
 	if NikoEv = 18:

+ 16 - 10
locations/abduction.qsrc

@@ -255,6 +255,13 @@ if $ARGS[0] = 'abdBrokenGiveTools':
 	'"Aren''t you glad, whore? These dildos are here for you to train on, so you can perform better later in a "live" situation."'
 	'"Uhmm... thank you, Master."'
 	'He puts the stuff down next to your bed and leaves without saying another word.'
+	if lactate > 0:
+		if breastpump = 0:breastpump = 1
+		'In the bottom of the box, under the various dildos, you also found a working breast pump.'
+		if lact_engorgement > 3:
+		 'You are relieved, that you can now empty your painfully full breasts'
+		end
+	end
 	act 'Continue':gt 'abduction', 'abdRoom'
 end
 
@@ -568,6 +575,9 @@ if $ARGS[0] = 'abdFood':
 
 	if abdTools = 1:
 		act 'Train with dildos':gt 'abduction', 'abdTrainDildos'
+		if breastpump > 0:
+			act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+		end
 	end
 
 	if vitamin > 0:
@@ -600,11 +610,6 @@ if $ARGS[0] = 'abdFood':
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-	if breastpump > 0:
-		act 'Use breast pump':
-			gt 'lact_lib', 'bp_milking'
-		end
-	end
 	act 'Take a cold shower (0:15)':
 		cumspclnt = 1
 		gs 'cum_cleanup'
@@ -1268,7 +1273,7 @@ if $ARGS[0] = 'abdTrainDildos':
 	dildoSmall = 10
 	dildoRegular = 20
 	dildoBig = 30
-	dildoHorse = 40
+	dildoHorse = 35
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhoredildos1.jpg"></center>'
 	'You take the dildos from the ground and clean them up a bit in the shower.'
 	'There are four of them: small, regular, big and one that''s horse sized.'
@@ -1417,7 +1422,7 @@ if $ARGS[0] = 'abdTrainDildosHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosHorseUse':
-	dick = 40
+	dick = 35
 	if pcs_vag > dildoHorse:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildoshorse.mp4"></video></center>'
 		'You start fucking the dildo with ease, your pussy swallows it whole without any problem.'
@@ -1543,7 +1548,7 @@ if $ARGS[0] = 'abdTrainDildosAnalHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalHorseUse':
-	dick = 40
+	dick = 35
 	if pcs_ass > dildoBig:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosanalhorse.mp4"></video></center>'
 		'You start fucking the dildo with ease, your anus swallows it whole without any problem.'
@@ -1668,10 +1673,11 @@ if $ARGS[0] = 'abdTrainDildosMouthHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
-	dick = 40
-	if pcs_throat > 35:
+	dick = dildoHorse
+	if pcs_throat > dildoHorse:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorse.mp4"></video></center>'
 		'You start sucking the dildo with ease, your throat swallows it whole without any problem.'
+		gs 'stat'
 		gs 'arousal', 'deepthroat', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorsehurt.mp4"></video></center>'

+ 5 - 0
locations/agentned.qsrc

@@ -254,6 +254,7 @@ if $ARGS[0] = 'rent_cityres':
 			minut += 30
 			money -= home_rent[1]
 			home_owned[1] = 1
+			if ARRSIZE('home_owned') = 0: gs 'set_home', 1
 			ArendHouseSL += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -299,6 +300,7 @@ if $ARGS[0] = 'rent_pushkin':
 			minut += 30
 			money -= home_rent[4]
 			home_owned[4] = 1
+			if ARRSIZE('home_owned') = 0: gs 'set_home', 4
 			ArendHouseSL4 += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -335,6 +337,7 @@ if $ARGS[0] = 'buy_cityres':
 	minut += 30
 	karta -= home_value[1]
 	home_owned[1] = 2
+	if ARRSIZE('home_owned') = 0: gs 'set_home', 1
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
@@ -351,6 +354,7 @@ if $ARGS[0] = 'buy_dacha':
 	minut += 30
 	karta -= home_value[3]
 	home_owned[3] = 1
+	if ARRSIZE('home_owned') = 0: gs 'set_home', 3
 	etoexhib = 0
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -368,6 +372,7 @@ if $ARGS[0] = 'buy_Mansion':
 	minut += 30
 	karta -= home_value[5]
 	home_owned[5] = 1
+	if ARRSIZE('home_owned') = 0: gs 'set_home', 5
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'

+ 12 - 4
locations/andrey.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'apply':
 		*nl
 		'He barely glances your way as he shuffles some papers around. "Oh yeah, I forgot about that...well, the job is still open. I need an extra worker around the store and it needs to be a girl, a young girl," he says before suddenly dropping the papers and looking at you accusingly. "And before you start with that gender equality crap, I had a guy working here and all he cared about was getting into the pants of female customers rather than their wallets. I''m saving myself from another headache...<i>hopefully</i>."'
 		*nl
-		'You''re at a loss for words, this wasn''t how you imagined the interview to go, but your silence goes unnoticed as the store manager continues to talk. "The salary is 205 ₽ a hour, alright? Trust me, no one is fighting you for the chance to work here but don''t think that means you can slack off. Miss work three times and you''re fired, no questions. I have two part-time positions, those are from 16:00 until 20:00, Monday through Friday.  Or the weekend shift between 09:00 to 15:00."'
+		'You''re at a loss for words, this wasn''t how you imagined the interview to go, but your silence goes unnoticed as the store manager continues to talk. "The salary is 205 ₽ a hour, alright? Trust me, no one is fighting you for the chance to work here but don''t think that means you can slack off. Miss work three times and you''re fired, no questions. I have two part-time positions, those are from 16:00 until 20:00, Monday through Friday. Or the weekend shift between 09:00 to 15:00."'
 		*nl
 		'He seems to have found what he was looking for, which is the employment documents "You''ll need to sign these to start work here." He holds them out to you, "So, are you interested?"'
 
@@ -49,28 +49,33 @@ if $ARGS[0] = 'apply':
 
 		if ((work = 0 and young_shop_work = 0 and cheatWork = 0) or (young_shop_work = 0 and cheatWork = 1)):
 			*nl
-			'You find the conditions suiting, and without batting and eye you sign the documents.'
-
+			
 			act 'Take the evening job':
+				cla
 				work = 1
 				young_shop_work = 100
 				minut += 5
 				*nl
+				'You find the conditions suiting, and without batting and eye you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
 				act 'Continue': gt 'young_shop', 'start'
 			end
 			act 'Take the weekend job':
+				cla
 				young_shop_work1 = 100
 				minut += 5
 				*nl
+				'You find the conditions suiting, and without batting and eye you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
 				act 'Continue': gt 'young_shop', 'start'
 			end
 !!			act 'Take the full time job':
+!!				cla
 !!				work = 1
 !!				young_shop_work2 = 100
 !!				minut += 5
 !!				*nl
+!!				'You find the conditions suiting, and without batting and eye you sign the documents.'
 !!				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 09:00.'
 !!				act 'Continue': gt 'young_shop', 'start'
 !!			end
@@ -81,11 +86,14 @@ if $ARGS[0] = 'apply':
 end
 
 if $ARGS[0] = 'regular':
+	cla
+	*clr
+	'<b><center><font size="4">Manager Andrew M. Sobulyagin</font></center></b>'
 	'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\manager_andrew.jpg"></center>'
 	*nl
 	'You knock on the door and Mr. Sobulyagin calls you in. Normally he would be reading the paper, but instead he''s just sitting there with a weird look on his face, almost like you scared him or something.'
 
-	if week = 5 and young_shop_salary > 0:
+	if (week = 5 or week = 7) and young_shop_salary > 0:
 		if young_shop_miss = 0:
 			'"Came to get your pay?" he asks quickly and you nod. He beckons you closer and you oblige. He digs around in his desk drawer for your money and as you wait, you catch a glimpse of his computer screen and see an image of a naked woman. He must think you can''t see the screen from where you are. "Here you go," Mr. Sobulyagin says as he holds out a white envelope with the money inside.'
 		elseif young_shop_miss < 3:

+ 1 - 1
locations/annafrends.qsrc

@@ -278,7 +278,7 @@ if $ARGS[0] = 'scene1':
 				gs 'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/reks/event/community/rexda.mp4"></video></center>'
 				*nl
-				'Laughing, you wait until Rex finishes wiping your foot.  While you are giggling, Rex becomes more bold, gradually replacing his sleeve with his palm and working up your thigh towards your panties. Just as Rex''s finger is about to touch your panties, you realize what is going on and hurriedly remove his hand, saying: "Hey..."'
+				'Laughing, you wait until Rex finishes wiping your foot. While you are giggling, Rex becomes more bold, gradually replacing his sleeve with his palm and working up your thigh towards your panties. Just as Rex''s finger is about to touch your panties, you realize what is going on and hurriedly remove his hand, saying: "Hey..."'
 				act 'Continue to drink beer':gt 'annafrends', 'scene2'
 			end
 		elseif rexPark = 1 and rexParkDay < daystart and rexSisTalk = 2:

+ 3 - 0
locations/anushapt.qsrc

@@ -132,6 +132,7 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
+	killvar '$locclass'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$location_type = 'indoors'
@@ -254,6 +255,7 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'anushroom':
+	$locclass = 'bedr'
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
@@ -593,6 +595,7 @@ end
 if $ARGS[0] = 'bed':
 	cla
 	*clr
+	gs 'stat'
 	if AnushkaLoc = 2:
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/nushbed.jpg"></center>'
 		'Anushka sits on her bed and waves you over to sit next to her. You quickly jump up on the bed next to her.'

+ 3 - 0
locations/arturend.qsrc

@@ -34,6 +34,9 @@ act 'Brush up':
 			'Arthur looks away guiltily and says "Uh, so I did not have time to look for a gift for you. But here is some money. Buy what do you like, sweet girl."'
 		end
 	elseif bag = 0:
+		cheap_purses[13] = 1
+		$currentpursetype = 'cheap'
+		currentpursenumber = 13
 		bag = 1
 		if menu_option = 1:dynamic $menu_addoldmenu
 		if menu_option = 0:gs 'obj_din', 'new'

+ 1 - 1
locations/barbershop.qsrc

@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'dyehair':
 			gs 'stat'
 			'"I want to try something really different." you tell him.'
 			'"And what would that be?" Mr. Syomin asks cheerfully.'
-			'"IA nice dark purple, like a dark wine." you announce.'
+			'"I want it nice dark purple, like a dark wine." you announce.'
 			'"As you wish, although I''ve not done too many like that. Please have a seat.", he says and turns around one of the chairs for you.'
 
 			act 'Sit down':

+ 1 - 0
locations/bedrPar2.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = '':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
     $location_type = 'private'
+	$locclass = 'bedr'
 	clr
 	minut += 1
 	gs 'stat'

+ 6 - 3
locations/bicycle.qsrc

@@ -11,9 +11,12 @@ if $ARGS[0] = 'sarai':
 	!gs'time'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-	'You notice an old bike. But it looks like being in a good condition, you can probably ride it without any trouble.'
-	if sunWeather = 0:'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
-
+	if sunWeather = 0:
+		'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
+	else
+		'You notice an old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
+	end
+		
 	if hour >= 6 and hour <= 20 and sunWeather = 1 and month >= 4 and month <= 10:
 		if findvelday ! daystart:
 			act 'Ride the bike (1:00)':

+ 1 - 0
locations/body.qsrc

@@ -1111,6 +1111,7 @@ else
 	$pcdesc_lipglossinsertive = ''
 	$pcdesc_lipglossed = 'softened'
 	$pcdesc_lipglosswordy = 'soft'
+	$lip = 'You have <<$pcdesc_lipswordy>> lips. <<$pirsB>> <<$pirsA>>'
 end
 
 !! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.

+ 13 - 12
locations/brothel.qsrc

@@ -705,6 +705,19 @@ if $ARGS[0] = 'brothel:section1:session:play':
 	if rageMeter = 100:
 		gt 'brothel', '<<$base>>:ragefinish'
 	end
+	
+	!too much pain - Sveta pushes out the anal plug by accident
+	if (pain['total'] > 50 and analplugIN = 1):
+		chPlug = rand(0, 100)
+		if chPlug < prob_chPlug:
+			gt 'brothel', '<<$base>>:pushplugout'
+		end
+	end
+
+	prob = rand (0, 100)
+	if analplugIN = 0 and prob < 30 and analplay = 1:
+		gt 'brothel', '<<$base>>:buttplug'
+	end
 
 	if $actType = 'boundPlay':
 		analplay = 0
@@ -896,18 +909,6 @@ if $ARGS[0] = 'brothel:section1:session:play':
 		end
 	end
 
-	!too much pain - Sveta pushes out the anal plug by accident
-	if (pain['total'] > 50 and analplugIN = 1):
-		chPlug = rand(0, 100)
-		if chPlug < prob_chPlug:
-			gt 'brothel', '<<$base>>:pushplugout'
-		end
-	end
-
-	prob = rand (0, 100)
-	if analplugIN = 0 and prob < 30 and analplay = 1:
-		gt 'brothel', '<<$base>>:buttplug'
-	end
 end
 
 if $ARGS[0] = 'brothel:section1:session:play:finish':

+ 33 - 6
locations/brother_lessons.qsrc

@@ -370,8 +370,24 @@ if $ARGS[0] = 'anatomylesson3':
 
 			elseif pcs_vag > 0 and guy > 0:
 				if pcs_vag <= 25:
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag1.jpg"></center>'
+					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
+					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
+					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+					'	He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
+					'	"That I''ve had sex? Yeah. Someone already took my v-card," You say somewhat proudly. "But don''t tell mom!"'
+					'	He nods in acknowledgement while writing down some more notes.'
+					'	After a couple more questions, you continue on with the lesson.'
+					act'Continue':gt'brother_lessons', 'anatomylesson4'
+					
 				elseif pcs_vag > 25 and pcs_vag <= 35:
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag2.jpg"></center>'
+					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
+					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
+					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+					'	He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
+					'	"That I''ve had sex? Yeah. Someone already took my v-card," You say somewhat proudly. "But don''t tell mom!"'
+					'	He nods in acknowledgement while writing down some more notes.'
 					'	"Is it supposed to look this loose?" he asks, causing you to blush hard.'
 					act'"I''ve had a lot of sex"':
 						cla
@@ -388,9 +404,8 @@ if $ARGS[0] = 'anatomylesson3':
 						'	After a couple more questions, you continue on with the lesson.'
 						act'Continue':gt'brother_lessons', 'anatomylesson4'
 					end
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag4.jpg"></center>'
 				elseif pcs_vag > 35:
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag5.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag3.jpg"></center>'
 					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
 					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
 					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
@@ -420,15 +435,27 @@ if $ARGS[0] = 'anatomylesson3':
 				end
 			else
 				if pcs_vag <= 25:
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag1.jpg"></center>'
+					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
+					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
+					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+					'	He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
+					'	"That I''ve had sex? No actually. I actually broke mine-" You stop and blush with the realization of what you''re about to admit. "... mastur...bating..."'
+					'	After a couple more questions, you continue on with the lesson.'
+					act'Continue':gt'brother_lessons', 'anatomylesson4'
 				elseif pcs_vag > 25 and pcs_vag <= 35:
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag2.jpg"></center>'
+					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
+					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
+					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+					'	He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
+					'	"That I''ve had sex? No actually. I actually broke mine-" You stop and blush with the realization of what you''re about to admit. "... mastur...bating..."'
 					'	"Is it supposed to look this loose?" he asks again. You blush even harder.'
 					'	"I masturbate a lot..."'
 					'	After a couple more questions, you continue on with the lesson.'
 					act'Continue':gt'brother_lessons', 'anatomylesson4'
 				elseif pcs_vag > 35:
-					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag5.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag3.jpg"></center>'
 					'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
 					'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
 					'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'

+ 20 - 20
locations/budgetclothes.qsrc

@@ -36,22 +36,22 @@ if $ARGS[0] = 'start':
 		act 'Return':gt 'budgetclothes', 'start'
 		
 		act 'View cheap clothing':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'clothes'
 		end
 		
 		act 'View office wear':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'office'
 		end
 
 		act 'View uniforms':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'uniform'
 		end
 
 		act 'View school uniforms':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'school'
 		end
 	end
@@ -62,33 +62,33 @@ if $ARGS[0] = 'start':
 		act 'Return':gt 'budgetclothes', 'start'
 		
 		act 'Look at regular shoes':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'shoes'
 		end
 
 		act 'Look at exercise shoes':
-			minut += 1
+			minut += 5
 			gt 'budgetclothes', 'trainers'
 		end
 	end
 
 	act 'View coats':
-		minut += 1
+		minut += 5
 		gt 'budgetclothes', 'coats'
 	end
 
 	act 'View purses':
-		minut += 1
+		minut += 5
 		gt 'budgetclothes', 'purses'
 	end
 
 	act 'View panties':
-		minut += 1
+		minut += 5
 		gt 'budgetclothes', 'panties'
 	end
 
 	act 'View bras':
-		minut += 1
+		minut += 5
 		gt 'budgetclothes', 'bras'
 	end
 end
@@ -105,7 +105,7 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -157,7 +157,7 @@ if $ARGS[0] = 'office':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -203,7 +203,7 @@ if $ARGS[0] = 'uniform':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -249,7 +249,7 @@ if $ARGS[0] = 'school':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -292,7 +292,7 @@ if $ARGS[0] = 'shoes':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -321,7 +321,7 @@ if $ARGS[0] = 'trainers':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -348,7 +348,7 @@ if $ARGS[0] = 'coats':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -381,7 +381,7 @@ if $ARGS[0] = 'purses':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -402,7 +402,7 @@ if $ARGS[0] = 'panties':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 
@@ -425,7 +425,7 @@ if $ARGS[0] = 'bras':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'budgetclothes', 'start'
 	end
 

+ 6 - 3
locations/burger.qsrc

@@ -188,9 +188,9 @@ if $ARGS[0] = 'dishes':
 						swallow += 1
 						spafinloc = 12
 						gs 'cum_manage'
-						dress[24] = 1
-						dressH[24] = 160
-						dressB[24] = pcs_hips
+						average[23] = 1
+						averageH[23] = 160
+						averageB[23] = pcs_hips
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/bj.jpg"></center>'
 						'You squat down in front of Anatoly, he unbuttons his pants and pulls out his penis. You lean over his hard cock and kiss it, feeling its warmth. You run your tongue along his cock finally putting it in your big wet mouth and start to suck his dick.'
@@ -431,6 +431,7 @@ if $ARGS[0] = 'dishes':
 						spafinloc = 12
 						gs 'cum_manage'
 						money += 500
+						slutty += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/bj4.jpg"></center>'
 						'You squat in front of the manager and swallow his sperm before licking the remnants of his semen off of the still standing, but quickly lowering penis.'
@@ -475,6 +476,7 @@ if $ARGS[0] = 'dishes':
 							spafinloc = 12
 							gs 'cum_manage'
 							money += 500
+							slutty += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/bj4.jpg"></center>'
 							'You squat in front of the manager and swallow his sperm as you began to lick the remnants of his semen off of the still standing, but quickly lowering penis.'
@@ -618,6 +620,7 @@ if $ARGS[0] = 'dishes':
 				spafinloc = 12
 				gs 'cum_manage'
 				money += 300
+				slutty += 1
 				soplakTimes1 += 1
 				if soplaktimes1=10:set soplaktimes=3
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum19.jpg"></center>'

+ 10 - 10
locations/butik.qsrc

@@ -57,15 +57,15 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'Browse the clothing': minut += 1 & gt 'butik', 'clothes'
+	act 'Browse the clothing': minut += 5 & gt 'butik', 'clothes'
 
-	act 'Browse the panties': minut += 1 & gt 'butik', 'panties'
+	act 'Browse the panties': minut += 5 & gt 'butik', 'panties'
 
-	act 'Browse the bras': minut += 1 & gt 'butik', 'bras'
+	act 'Browse the bras': minut += 5 & gt 'butik', 'bras'
 
-	act 'Browse the shoes': minut += 1 & gt 'butik', 'shoes'
+	act 'Browse the shoes': minut += 5 & gt 'butik', 'shoes'
 
-	act 'Browse the handbags': minut += 1 & gt 'butik', 'purses'
+	act 'Browse the handbags': minut += 5 & gt 'butik', 'purses'
 
 	if money >= 50000:
 		if coat[9] < 1:
@@ -90,7 +90,7 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'butik', 'start'
 	end
 
@@ -131,7 +131,7 @@ if $ARGS[0] = 'panties':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'butik', 'start'
 	end
 
@@ -163,7 +163,7 @@ if $ARGS[0] = 'bras':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'butik', 'start'
 	end
 
@@ -195,7 +195,7 @@ if $ARGS[0] = 'shoes':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'butik', 'start'
 	end
 
@@ -221,7 +221,7 @@ if $ARGS[0] = 'purses':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'butik', 'start'
 	end
 

+ 2 - 2
locations/cafe_parco.qsrc

@@ -10,7 +10,7 @@ if $args[0]= 'start':
 	if hour >= 14 and hour < 21:
 		act 'Enter': gt 'cafe_parco', 'inner'
 	end
-	act 'Go back to the square': gt 'gskver'
+	act 'Go back to the square': gt 'gskver', 'start'
 end
 
 if $args[0]= 'inner':
@@ -21,7 +21,7 @@ if $args[0]= 'inner':
 	act 'Order food':gs 'food_menu', 'cafe'
 	act 'Order drinks':gs 'beverage_menu', 'cafe'
 	
-	act 'Go back outside': gt 'gskver'
+	act 'Go back outside': gt 'gskver', 'start'
 	
 	gs 'family'
 

+ 5 - 5
locations/cikl.qsrc

@@ -1115,7 +1115,7 @@ if day = 25:
 					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment.To avoid eviction, please make manual payment as soon as possible.</font></b>'
 				else
 					nl
-					'<b><b><font color="red">You''re card was declined during automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
 				end
 			elseif home_owned[1] = 1 and ArendHouseSL >= 31:
 				'<b><font color="yellow">Your rent for your city apartment is already paid in full for this month.</font></b>'
@@ -1141,7 +1141,7 @@ if day = 25:
 					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment.To avoid eviction, please make manual payment as soon as possible.</font></b>'
 				else
 					nl
-					'<b><b><font color="red">You''re card was declined during automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
 				end
 			elseif home_owned[4] > 0 and ArendHouseSL4 >= 31:
 				'<b><font color="yellow">Your rent for your Pushkin apartment is already paid in full this month.</font></b>'
@@ -1175,7 +1175,7 @@ if day = 25:
 				money -= elektro * hcount_util
 			end
 		else
-			'<b><font color="red">You''re card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
+			'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
 		end
 	end
 
@@ -1186,7 +1186,7 @@ if day = 25:
 			'<b><font color="yellow">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
 			kabelday = 1
 			karta -= 300 * hcount_cable
-			'<b><font color="red">You''re card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
+			'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
 		elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
 			'<b><font color="yellow">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
 			kabelday = 1
@@ -1196,7 +1196,7 @@ if day = 25:
 			kabelday = 1
 			money -= 300 * hcount_cable
 		else
-			'<b><font color="red">You''re card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
+			'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
 		end
 	end
 end

+ 1 - 1
locations/clothing_attributes.qsrc

@@ -115,7 +115,7 @@ elseif $ARGS[0] = 'alternative':
 	*P FUNC('$attributes_alternative', $ARGS[0], ARGS[1])
 end
 
-if $ARGS[0] ! 'swimwear' or $ARGS[0] ! 'coat' or $ARGS[0] ! 'exercise':
+if $ARGS[0] ! 'swimwear' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':
 	if CloSkirtShortness = 6:
 		CloInhibit = 35
 	elseif CloSkirtShortness = 5 or CloPantsShortness = 6:

+ 2 - 2
locations/club.qsrc

@@ -971,8 +971,8 @@ if $ARGS[0] = 'bar1':
 	'While you sit on one of the bar stools a man comes to and grabs on of your ass cheeks. "Why don''t we both have some fun together, huh?", the bloke says and you can hear, that he had more than one beer.'
 
 	act 'Send':
-		if drunk < 4:gt 'club', 'bar'
-		if drunk >= 4:gt 'club', 'rape'
+		if alko < 4:gt 'club', 'bar'
+		if alko >= 4:gt 'club', 'rape'
 	end
 
 	if pcs_dom > 10:

+ 5 - 0
locations/dimaHome.qsrc

@@ -125,6 +125,7 @@ end
 
 if $ARGS[0] = 'hallway2':
 	$location_type = 'indoors'
+	killvar '$locclass'
 	cls
 	minut += 1
 	gs 'stat'
@@ -219,6 +220,7 @@ end
 if $ARGS[0] = 'dimkaparents':
 	*clr & cla
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><b><font color = maroon>Dimka''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/parentsroom.jpg"></center>'
@@ -238,6 +240,7 @@ if $ARGS[0] = 'dimkaparents':
 		$loc = 'dimaHome'
 		$metkaM = 'bathroom'
 		$locM = 'dimaHome'
+		killvar '$locclass'
 		gs 'stat'
 		$location_type = 'bathroom'
 		'<center><h4><font color="maroon">Master bathroom</font></h4></center>'
@@ -284,6 +287,8 @@ end
 if $ARGS[0] = 'guest':
 	cls
 	minut += 1
+	$locclass = 'bedr'
+	gs 'stat'
 	'<center><h4><font color="maroon">Guest Room</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/guestroom.jpg"></center>'
 	'You enter the guest bedroom and it just as clean and neat as the rest of the home. The furniture is all highly polished wood. You feel almost overwhelmed by how beautifully the room is decorated.'

+ 4 - 12
locations/divan.qsrc

@@ -16,15 +16,15 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/divmas.jpg"></center>'
 		'You lie down on the sofa and began to fondle your chest with one hand while you slide the other hand down your stomach and across your mound.'
 		'With your middle finger you start rubbing and stroking your clit, which responds to the touch by bringing a sensual warmth to your entire body.'
-		
+
 		gs 'arousal', 'masturbate', 15
 		gs 'stat'
 
 		if pcs_horny >= 100:orgasm += 1 & pcs_horny = 0 & 'Suddenly a sumptuous jolt hits your body and you delight in a powerful orgasmn.'
-	
+
 		$orgasm_or = 'yes'
 		gs 'stat'
-		
+
 		act 'Get off the couch':divanmastr = 0 & gt 'divan', 'fin'
 
 		if pcs_horny >= 75:act 'Proceed':dynamic $divmastr
@@ -36,15 +36,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/shared/home/divan.jpg"></center>'
 	'You lie down on the sofa.'
 
-	act 'Chill out':
-		cla
-		waiting = input ("For how many minutes do you chill out? (No more than 120 minutes)")
-
-		if waiting <= 0 or waiting > 120:minut += 15
-		if waiting > 0 and waiting <= 120:minut += waiting
-
-		act 'Get off the couch':gt 'divan', 'fin'
-	end
+	act 'wait':gs 'obj_din', 'wait'
 
 	if TV > 0 and $loc ! 'dachain':
 		act 'Watch TV':

+ 4 - 4
locations/dom_gor.qsrc

@@ -45,7 +45,7 @@ if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart
 				'You''re running with one of your pupils'', sometimes stopping and chatting with ease.'
 				'Pupil: "Miss <<$pcs_lastname>>, you are so beautiful, and we are all very fond of you!" You: "Hmm, thank you!"'
 
-				act 'Complete run':gt 'gskver'
+				act 'Complete run':gt 'gskver', 'start'
 			end
 		elseif parkrand >4 and beguch >= 3 and beguch < 6:
 			'In the park you meet a pupil of the school who asks to go for a run with you.'
@@ -57,7 +57,7 @@ if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hostel/stop2.jpg"></center>'
 				'You stop to do some stretching exercises for your muscles.'
 				'Pupil: "Ahh, if only our girls would be at least a little like you!" You: "Get to know them! You''ll find out how they really are."'
-				act 'Complete run':gt 'gskver'
+				act 'Complete run':gt 'gskver', 'start'
 			end
 		elseif parkrand >4 and beguch >= 6 and beguch < 9:
 			'In the park you meet a pupil of the school who asks to go for a run with you.'
@@ -74,11 +74,11 @@ if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart
 				'Pupil: "Im sorry, it was a bad idea." You: "I''m just kidding! Okay, but remember to give me a copy."'
 				''
 				'You pick a background, stand in a pose and let yourself be photographed.'
-				act 'Complete run':gt 'gskver'
+				act 'Complete run':gt 'gskver', 'start'
 			end
 		end
 
-		act 'Complete run':gt 'gskver'
+		act 'Complete run':gt 'gskver', 'start'
 	end
 end
 

+ 3 - 13
locations/down.qsrc

@@ -85,14 +85,14 @@ if shantpopala > 0:
 	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said, as he noticed you moving. Some of them are starting to get a evil grin on their face.'
 	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
 	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
-	
+
 	gs 'arousal', 'bj', 60, 'sub', 'gangbang','humiliation', 'rough'
 	gs 'arousal', 'vaginal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'anal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'end'
 	minut -= 60
 	gs 'stat'
-	
+
 	act 'Leave':gt $curloc
 
 	exit
@@ -100,18 +100,8 @@ end
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-act 'Wait':
-	cla
-	waiting = input ("How long would you like to wait? (Not more than 120 minutes)")
-
-	if waiting <= 0 or waiting > 120:
-		minut += 15
-	elseif waiting > 0 and waiting <= 120:
-		minut += waiting
-	end
 
-	act 'Take a look at the clock':gt curloc
-end
+act 'wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 

+ 1 - 1
locations/events.qsrc

@@ -221,7 +221,7 @@ if $ARGS[0] = 'snkayf':
 
 	if snkz = 2:
 		hour += 2
-		gt'gskver'
+		gt 'gskver', 'start'
 	end
 
 	if snkz = 3:

+ 2 - 0
locations/exhibitionism.qsrc

@@ -31,5 +31,7 @@ elseif ARGS[0] = 4:
 	if exhibitionist_lvl = 3: arousal += 80
 end
 
+if pcs_exhib > 100: pcs_exhib = 100
+
 --- exhibitionism ---------------------------------
 

+ 6 - 7
locations/exhibitionistshop.qsrc

@@ -6,7 +6,6 @@ if $ARGS[0] = 'start':
 	$metka = 'start'
     $location_type = 'public_indoors'
 	cls
-	minut += 5
 	if exhibitionQW = 3: exhibitionQW = 4
 	gs 'stat'
 
@@ -29,17 +28,17 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'View clothing':
-		minut += 1
+		minut += 5
 		gt 'exhibitionistshop', 'clo'
 	end
 
 	act 'View panties':
-		minut += 1
+		minut += 5
 		gt 'exhibitionistshop', 'panties'
 	end
 
 	act 'View bras':
-		minut += 1
+		minut += 5
 		gt 'exhibitionistshop', 'bras'
 	end
 end
@@ -56,7 +55,7 @@ if $ARGS[0] = 'clo':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'exhibitionistshop', 'start'
 	end
 
@@ -100,7 +99,7 @@ if $ARGS[0] = 'panties':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'exhibitionistshop', 'start'
 	end
 
@@ -132,7 +131,7 @@ if $ARGS[0] = 'bras':
 
 	act 'Return':
 		cla
-		minut += 5
+		minut += 1
 		gt 'exhibitionistshop', 'start'
 	end
 

+ 3 - 1
locations/family.qsrc

@@ -121,8 +121,10 @@ if StoryLine = 1:
 
 		 if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 			if hour < 7 and brothemorningsex = daystart:
+				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
 			elseif hour < 7 and brothermorningsex ! daystart:
+				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
 			elseif hour >= 23:
 				ocpd_room = 1
@@ -165,7 +167,7 @@ if StoryLine = 1:
 					end
 				end
 
-				if hour >= 18 and hour <= 23:
+				if hour >= 18 and hour < 23:
 					ocpd_room = 1
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end

+ 3 - 3
locations/fbDorm.qsrc

@@ -1,18 +1,18 @@
 # fbDorm
 gs 'stat'
 gs 'fbDormD'
-'<<$bname>> leads you towards the shabby hostel in Pavlovsk, and smiles at you: "Come on, let''s go to my room."'
+'<<$boydesc>> leads you towards the shabby hostel in Pavlovsk, and smiles at you: "Come on, let''s go to my room."'
 dynamic $d_fbd_start
 
 act '"Ehmm... I changed my mind"':
 	cls
 	minut += 5
 	gs 'stat'
-	'Seeing that <<$bname>> brought you to his crappy hostel, you''re not so sure about this any more. You''ve heard lots of stories about girls being taken to this place... none of them good. On the other hand, <<$bname>> is kind of cute. What''s the worst that could happen? You can always leave, if you don''t like what''s happening in there.'
+	'Seeing that <<$boydesc>> brought you to his crappy hostel, you''re not so sure about this any more. You''ve heard lots of stories about girls being taken to this place... none of them good. On the other hand, <<$boydesc>> is kind of cute. What''s the worst that could happen? You can always leave, if you don''t like what''s happening in there.'
 	'He notices your hesitation and tries to persuade you: "Come on, babe! It''ll just be you and me, having some fun in there! What''s the harm?"'
 
 	if pcs_dom > 0:
-		'You make up your mind; you should not be doing this. You apologize to him: "Sorry <<$bname>>, but I don''t think this is such a good idea. I have to go... take care." Then you quickly kiss him on the cheek and leave, ignoring his pleas. Fortunately he doesn''t follow you.'
+		'You make up your mind; you should not be doing this. You apologize to him: "Sorry <<$boydesc>>, but I don''t think this is such a good idea. I have to go... take care." Then you quickly kiss him on the cheek and leave, ignoring his pleas. Fortunately he doesn''t follow you.'
 
 		act 'Leave':gt 'pavResidential'
 	else

+ 1 - 14
locations/fbDormD.qsrc

@@ -53,11 +53,6 @@ $d_fbd_regular = {
 		cls
 		boy += 1
 		parkfuckboy += 1
-		$ppBoyName[parkfuckboy] = $boy
-		ppBoyTipe[parkfuckboy] = 1
-		ppBoyPlace[parkfuckboy] = 3
-		!!masturbate 2 blow_job 3 gangbang
-		ppdick[parkfuckboy] = dick
 		fbdormtimes += 1
 		pphj = 0
 		ppbj = 0
@@ -122,7 +117,6 @@ $d_fbd_miss = {
 		cls
 		ppsex += 1
 		pose = 0
-		gs 'boyStat', $bname
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbdmiss.jpg"></center>'
 		gs 'dinsex', 'boy_puts_condom'
@@ -150,7 +144,6 @@ $d_fbd_dog = {
 		cls
 		pose = 1
 		ppsex += 1
-		gs 'boyStat', $bname
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbhdog.jpg"></center>'
 		gs 'dinsex', 'boy_puts_condom'
@@ -265,7 +258,7 @@ $d_fbd_drunk = {
 			end
 			kol_man = rand(5, 16)
 			$kol_man_text = 'guys'
-			gt 'placer_sex'
+			gt 'placer_sex', 'meet'
 		end
 	end
 }
@@ -276,11 +269,6 @@ $d_fbd_mass = {
 		boy += 2
 		gang += 1
 		parkfuckboy += 1
-		$ppBoyName[parkfuckboy] = $boy
-		ppBoyTipe[parkfuckboy] = 1
-		ppBoyPlace[parkfuckboy] = 4
-		!!masturbate 2 blow_job 3 gangbang
-		ppdick[parkfuckboy] = dick
 		fbdormtimes += 1
 		pphj = 0
 		ppbj = 0
@@ -402,7 +390,6 @@ $d_fbd_threesome = {
 			cls
 			ppsex += 1
 			pose = 1
-			gs 'boyStat', $bname
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbdrsex.jpg"></center>'
 			'You keep sucking on the cock in front of you, as you figure the guys want you to do. You focus for a moment and realize that <<$boydesc>> is behind you. The dick that''s rubbing against your pussy lips is probably his... right? It must be.'

+ 1 - 7
locations/fbHouse.qsrc

@@ -1,7 +1,7 @@
 # fbHouse
+
 cls
 gs 'stat'
-gs 'boyStat', $bname
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbhouse.jpg"></center>'
 '<<$boydesc>> leads you to his house, and gallantly opens the door for you. He invites you to take a seat on the couch and then sits down next to you, putting his arm around you. After you cuddle for a while, he puts his hand on your chin as he guides your face towards his.'
 
@@ -9,12 +9,6 @@ act 'Kiss him':
 	cls
 	boy += 1
 	parkfuckboy += 1
-	$ppBoyName[parkfuckboy] = $boy
-	ppBoyTipe[parkfuckboy] = 1
-	ppBoyPlace[parkfuckboy] = 2
-	!!masturbate 2 blow_job 3 gangbang
-	ppdick[parkfuckboy] = dick
-	gs 'boyStat', $bname
 	fbhousetimes += 1
 	pphj = 0
 	ppbj = 0

+ 4 - 4
locations/femcyc.qsrc

@@ -301,7 +301,7 @@ if $ARGS[0] = '':
 						if total_preg_growth > total_milkinduce_growth: nbsize += 1
 					end
 				end
-				if lactatemm > lactatemv:
+				if lactatemm > lactatemv and salo > 11:
 					lactatemv += lactaterate
 					temp_var = lactaterate/100
 					if temp_var <= 0: temp_var = 1
@@ -350,7 +350,7 @@ if $ARGS[0] = '':
 				breastpumped = 0
 			else
 				milkgrowday = daystart
-				if lactatemm >= lactatemv:
+				if lactatemm >= lactatemv and salo > 11:
 					lactatemv += lactaterate
 					if lactatemv > lactatemm:
 						lactatemv = lactatemm
@@ -362,7 +362,7 @@ if $ARGS[0] = '':
 			milkgrowday = daystart
 		else
 			if milkgrowday < daystart:
-				if lactatemm > lactatemv:
+				if lactatemm > lactatemv and salo > 11:
 					lactatemv += lactaterate
 					temp_var = lactaterate/100
 					if temp_var <= 0: temp_var = 1
@@ -418,7 +418,7 @@ if $ARGS[0] = '':
 				breastpumped = 0
 			else
 				milkgrowday = daystart
-				if lactatemm >= lactatemv:
+				if lactatemm >= lactatemv and salo > 11:
 					lactatemv += lactaterate
 					if lactatemv > lactatemm:
 						lactatemv = lactatemm

+ 17 - 17
locations/food.qsrc

@@ -1,10 +1,10 @@
 # food
-! Snacks: +20 pcs_energy, +6 fat (most cases has water available separately)
-! Fast Food: +70 pcs_energy +70 pcs_hydra, +12 fat (hamburgers, fried food, like the downtown diner)
-! Small Meal: +40 pcs_energy +40 pcs_hydra, +3 fat (soup and sandwiches, cafe light lunches, etc)
-! Medium Meal and Hotel Food: +60 pcs_energy +60 pcs_hydra, +6 fat (home cooked dinners and room service equivalent)
-! Large Meal: +100 pcs_energy +100 pcs_hydra, +50 fat (steak dinners, new years party dinner, etc)
-! Bagged Lunch: +30 pcs_energy +30 pcs_hydra, +3 fat (sandwich, cold leftovers, etc)
+! Snacks: +20 pcs_energy, +7 fat (most cases has water available separately)
+! Fast Food: +70 pcs_energy +70 pcs_hydra, +14 fat (hamburgers, fried food, like the downtown diner)
+! Small Meal: +40 pcs_energy +40 pcs_hydra, +4 fat (soup and sandwiches, cafe light lunches, etc)
+! Medium Meal and Hotel Food: +60 pcs_energy +60 pcs_hydra, +7 fat (home cooked dinners and room service equivalent)
+! Large Meal: +100 pcs_energy +100 pcs_hydra, +14 fat (steak dinners, new years party dinner, etc)
+! Bagged Lunch: +40 pcs_energy +40 pcs_hydra, +5 fat (sandwich, cold leftovers, etc)
 ! Health Meal: +50 pcs_energy +50 pcs_hydra, +1 fat (Diet food, Salads, rice cakes with peanut butter)
 
 if $ARGS[0] = 'pirosh':
@@ -351,7 +351,7 @@ if $ARGS[0] = 'vegburg':
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 10
-	fat += 6
+	fat += 8
 	pcs_energy += 60
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -429,7 +429,7 @@ if $ARGS[0] = 'cheburg':
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 20
-	fat += 12
+	fat += 14
 	pcs_energy += 120
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -474,7 +474,7 @@ if $ARGS[0] = 'f_food':
 	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 12
+	fat += 14
 	pcs_energy += 70
 	if pcs_hydra >= 100:
 		pcs_hydra += 35
@@ -499,7 +499,7 @@ if $ARGS[0] = 's_meal':
 	minut += 25
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 3
+	fat += 4
 	pcs_energy += 40
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
@@ -524,7 +524,7 @@ if $ARGS[0] = 'm_meal':
 	minut += 30
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 6
+	fat += 8
 	pcs_energy += 60
 	if pcs_hydra >= 100:
 		pcs_hydra += 30
@@ -550,7 +550,7 @@ if $ARGS[0] = 'l_meal':
 	minut += 35
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 12
+	fat += 14
 	pcs_energy += 100
 	if pcs_hydra >= 100:
 		pcs_hydra += 50
@@ -576,12 +576,12 @@ if $ARGS[0] = 'bag_lunch':
 	minut += 15
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 3
-	pcs_energy += 30
+	fat += 5
+	pcs_energy += 40
 	if pcs_hydra >= 100:
 		pcs_hydra += 15
 	else
-		pcs_hydra += 30
+		pcs_hydra += 40
 	end
 	cumspclnt = 2
 	gs 'cum_cleanup'
@@ -601,7 +601,7 @@ if $ARGS[0] = 'h_food':
 	minut += 25
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	fat += 6
+	fat += 7
 	money -= 100
 	pcs_energy += 60
 	if pcs_hydra >= 100:
@@ -640,7 +640,7 @@ if $ARGS[0] = 'h_meal':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/eating-salad.jpg"></center>'
-	'You enjoy a crisp salad of fresh green and<<$mtxt>>'
+	'You enjoy a crisp salad of fresh greens and<<$mtxt>>'
 	gs 'stat'
 	killvar '$_eat'
 

+ 1 - 0
locations/foto.qsrc

@@ -738,6 +738,7 @@ if $ARGS[0] = 'showers':
 				if hypnoAddict > 0:
 					minut += 10
 					'You unconsciously avoid spraying water into your vagina.'
+					act 'Dry off':gt 'foto', 'showers'
 				else
 					if pcs_horny >= 70:
 						if exhibitionist_lvl > 0:

+ 5 - 3
locations/foto_events.qsrc

@@ -202,6 +202,7 @@ if $ARGS[0] = 'underwear_steal2':
 				'	"I promise that from now I will always be completely naked in the studio unless it''s for a shoot."'
 				'	"Good. Feel free to go home now. Hope to see you again soon."'
 				'	With your underwear returned and safely covering your hips, you awkwardly make your exit.'
+				studio_underwear_steal = 0
 				act'Leave':gt 'down'
 			end
 		end
@@ -233,6 +234,7 @@ if $ARGS[0] = 're-dress':
 	gs 'underwear', 'wear'
 	gs 'stat'
 	'	Unable to do it in front of the manager, you go all the way back to the back room to completely undress and re-dress to get your underwear in place before leaving again. It takes a lot more time than you''d like but it''s at least less shameful than doing it in front of the manager...'
+	studio_underwear_steal = 0
 	act'Leave':gt 'down'
 end
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
@@ -310,7 +312,7 @@ if $ARGS[0] = 'high_fasion':
 			mdlng_exp += rand(1,2)
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
-			pcs_exhib += rand(0,1)
+			gs 'exhibitionism', 1
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'	You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -578,7 +580,7 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(1,21)
-				pcs_exhib += 5
+				gs 'exhibitionism', 4
 				modern_art_projet = 1
 				pcs_horny += 20
 				'	The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -1325,7 +1327,7 @@ if $ARGS[0] = 'wet':
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4
-							pcs_exhib += 5
+							gs 'exhibitionism', 4
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'	Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

+ 0 - 1
locations/foto_models.qsrc

@@ -775,7 +775,6 @@ if $ARGS[0] = 'mari_modelling_chat':
 						'	"Yeah he did! What a perv! Going out of his way to make excuses to take pictures of underage girls like us!"'
 						'	You both burst into fits of laughter before clapping your hands over your mouths and trying to stifle your hysterics. You probably shouldn''t spread it around that you''re only <<age>>...'
 						act'Keep chatting':gt 'foto_models','mari_modelling_chat'
-						end
 					end
 				end
 			end

+ 3 - 3
locations/gLakeNude.qsrc

@@ -44,7 +44,7 @@ if month=1 or month=2 or month=12:
 	''
 end
 
-'This small natural beach is hidden away from the general public.  To reach it you had to travel around the lake along a forest trail.  On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
+'This small natural beach is hidden away from the general public. To reach it you had to travel around the lake along a forest trail. On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
 
 if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 	act'Get dressed':
@@ -208,7 +208,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				minut += 5
 				voyeurism += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br>  You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
+				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
 				act'Stop Watching!': gt'gLakeNude'
 			else
 				voyeurism_start = 2
@@ -216,7 +216,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				pcs_horny += 75
 				voyeurism += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br>  But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
+				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
 				act'Watch the couple': 
 					gs'gLakeNudeEvent','gLakeNude_sex'
 				end

+ 4 - 2
locations/gadforest.qsrc

@@ -223,9 +223,10 @@ if $ARGS[0] = '1':
 	act 'Out of the woods':
 		dirtyclothes = 0 & swamp_clothes = 0
 		if $clothingworntype = 'nude':
-			if $CloLosTyp[$CURLOC] = '':
-				inhib_exp += rand(0,2)
+			if $CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1:
 				!no cloth here, it must be broken. There may be a good exhibi or rape event entry point.
+				inhib_exp += rand(0,2)
+				gadforest_clothestorn = 0
 				'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
 				'You Successfully reach home without witness.'
 				cla
@@ -555,6 +556,7 @@ if $ARGS[0] = 'torncloth':
 			!add remove cloth if worn out, need better texting by illume.
 			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
 				'Your raggedy clothes have finally had enough and fall apart. You are naked now.'
+				gadforest_clothestorn = 1
 				gs 'clothing', 'strip', 'gadforest', 2
 			end
 		end

+ 16 - 13
locations/gadforestlost.qsrc

@@ -23,8 +23,12 @@ if $ARGS[0] = 'forestrescue':
 			'Staying in one place is a good idea when you are lost.'
 		end
 	end
-	'You get ready quickly and you follow the forest ranger home.'
-	act 'Further':gt'Gadhouse'
+	'You get ready quickly and you follow the forest ranger out of the woods.'
+	if $clothingworntype ! 'nude':
+		act 'Further':gt'Gadhouse'
+	elseif $clothingworntype = 'nude':
+		act 'Further':gt'gadforest', '1'
+	end
 end
 if $ARGS[0] = '1':
 	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
@@ -53,9 +57,9 @@ if $ARGS[0] = '1':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on':gs 'gadforestlost', 'gadforestlostfinish1'
+			act 'Look for the road':gs 'gadforestlost', 'gadforestlostfinish1'
 		else
-			act 'Look for the road on':gt 'gadforestlost','1'
+			act 'Look for the road':gt 'gadforestlost','1'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -88,9 +92,9 @@ if $ARGS[0] = '2':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish2'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish2'
 		else
-			act 'Look for the road on':gt 'gadforestlost','2'
+			act 'Look for the road':gt 'gadforestlost','2'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -122,9 +126,9 @@ if $ARGS[0] = '3':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish3'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish3'
 		else
-			act 'Look for the road on':gt 'gadforestlost','3'
+			act 'Look for the road':gt 'gadforestlost','3'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -157,7 +161,7 @@ if $ARGS[0] = '4':
 		gs 'stat'
 
 		gs 'gadforestlost', 'lostclothes'
-		act 'Look for the road on ':
+		act 'Look for the road ':
 			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
@@ -196,7 +200,7 @@ end
 if $ARGS[0] = 'gadforestlostfinish':
 	'<center><H4>Somewhere in the woods</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
-	'You look over and realize that you finally see houses, glad to get out of this alive you rush forward.'
+	'You look over and realize that you finally see lights shining from distnat houses, glad to get out of this alive you rush forward.'
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	lost_girl = 0
 	dirtyclothes = 0 & swamp_clothes = 0
@@ -205,10 +209,9 @@ if $ARGS[0] = 'gadforestlostfinish':
 	if $clothingworntype = 'nude':
 		act 'Out of the woods':
 			minut += 25
-			'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
-			'You Successfully reach home without witness.'
+			'You find your way out of the woods, hiding your naked body in shadow and moving toward the edge of the forest, where you left your clothes.'
 			cla
-			act 'Further':gt'Gadhouse'
+			act 'Continue':gt'gadforest', '1'
 		end
 		temp=0
 		!disable further act add.

+ 87 - 104
locations/gadriver.qsrc

@@ -183,52 +183,44 @@ if $ARGS[0] = 'Gadbitch':
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''Gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
 	if temper >= 15 and month >= 5 and month <= 9:
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		temp_gr = RAND(0,9)
+		if $clothingworntype ! 'nude':
+			act 'Strip naked':
+				cla
+				minut += 5
+				gs 'underwear', 'remove'
+				gs 'clothing', 'strip', 'VillageRiver'
+				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+				act 'Continue': gt 'Gadriver', 'Gadbitch'
+			end
+		end
+		if $clothingworntype = 'swimwear':
 			act 'Go for a swim':
 				cla
 				*clr
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 30
-				if $clothingworntype = 'nude':
-					gs 'exercise', 'tier1', 1, 'stren_exp'
-					inhib_exp += rand(1,3)
-				else
-					gs 'exercise', 'tier1', 1, 'stren_exp'
-					if pcs_inhib < 50:inhib_exp += rand(1,3)
-				end
+				gs 'exercise', 'tier1', 1, 'stren_exp'
+				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				pcs_sweat = 10 + rand(0,4)
-				if $clothingworntype = 'swimwear':
-					if hour >= 22 or hour <= 6:
-						if RAND(0,10) < 5 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-							'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
-						end
+				if hour >= 22 or hour <= 6:
+					if RAND(0,10) < 5 and MiraLoc = 1:
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+						'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
 					else
-						if RAND(0,10) < 5 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You and Mira take a swim in the river, splashing water at each other and having fun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-							'You take a swim in the river, feeling the refreshing and invigorating water flowing across your body.'
-						end
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+						'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
 					end
 				else
-					temp_gr = RAND(0,15)
-					if temp_gr >= 10 and MiraLoc = 1:
-						pcs_horny += RAND(5,15)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-						'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+					if RAND(0,10) < 5 and MiraLoc = 1:
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+						'You and Mira take a swim in the river, splashing water at each other and having fun.'
 					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
-						'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+						'You take a swim in the river, feeling the refreshing and invigorating water flowing across your body.'
 					end
 				end
-				temp_gr = RAND(0,9)
 
 				act 'Get out of the water':
 					if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
@@ -286,80 +278,71 @@ if $ARGS[0] = 'Gadbitch':
 					end
 				end
 			end
-
 		else
-
-			act 'Go skinny dipping':
-				cla
-				*clr
-				temp_gr = RAND(0,15)
-				cumspclnt = 4
-				gs 'cum_cleanup'
-				minut = minut + 20
-				pcs_sweat = 10 + rand(0,4)
-				pcs_mood += 5
-				pcs_willpwr = pcs_willpwr + 5
-				inhib_exp += rand(1,3)
-				if pcs_stren < 30: stren_exp += 1
-				if hour >= 22 and hour <= 6:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
-					'You strip your clothes off and slowly step in to the cold river, knowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
-				else
-					if temp_gr >= 10 and MiraLoc = 1:
-						pcs_horny += RAND(5,15)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-						'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+			if $clothingworntype = 'nude':
+				act 'Go skinny dipping':
+					cla
+					*clr
+					temp_gr = RAND(0,15)
+					cumspclnt = 4
+					gs 'cum_cleanup'
+					minut = minut + 20
+					pcs_sweat = 10 + rand(0,4)
+					pcs_mood += 5
+					pcs_willpwr = pcs_willpwr + 5
+					inhib_exp += rand(1,3)
+					if pcs_stren < 30: stren_exp += 1
+					if hour >= 22 and hour <= 6:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
+						'You strip your clothes off and slowly step in to the cold river, knowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
 					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
-						'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						if temp_gr >= 10 and MiraLoc = 1:
+							pcs_horny += RAND(5,15)
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
+							'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
+							'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						end
 					end
-				end
-				act 'Get out of the water':
-					if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
-						'As soon as you step out of the water, you find yourself standing naked in front of a couple of the village boys, judging from the fishing poles they are carrying, you know they were coming to the river to do some fishing.'
-						'But, seeing you skinny dipping, they instead start talking amongst themselves about how much of a slut you are and the only good thing you are for is sucking cock. You tell them to fuck off, but they are too worked up and not listening to you at all.'
-						gs 'boyStat', 'A63'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'cum_call','butt',$boy, 1
-						gs 'boyStat', 'A61'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
-						gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'cum_call','anus',$boy, 1,'','',20
-						gs 'boyStat', 'A62'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
-						gs 'cum_call','mouth',$boy
-						swallow += RAND(0,1)
-						gs 'stat'
-						gs 'arousal', 'end'
-						gs 'stat'
-						gang +=1
-
-						act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
-					else
-						minut += 5 & gt'Gadriver', 'Gadbitch'
+					act 'Get out of the water':
+						if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
+							'As soon as you step out of the water, you find yourself standing naked in front of a couple of the village boys, judging from the fishing poles they are carrying, you know they were coming to the river to do some fishing.'
+							'But, seeing you skinny dipping, they instead start talking amongst themselves about how much of a slut you are and the only good thing you are for is sucking cock. You tell them to fuck off, but they are too worked up and not listening to you at all.'
+							gs 'boyStat', 'A63'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'cum_call','butt',$boy, 1
+							gs 'boyStat', 'A61'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
+							minut -= 10
+							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'cum_call','anus',$boy, 1,'','',20
+							gs 'boyStat', 'A62'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							minut -= 10
+							gs 'cum_call','mouth',$boy
+							swallow += RAND(0,1)
+							gs 'stat'
+							gs 'arousal', 'end'
+							gs 'stat'
+							gang +=1
+
+							act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+						else
+							minut += 5 & gt'Gadriver', 'Gadbitch'
+						end
 					end
 				end
-				
-			end
-			act 'Strip naked':
-				cla
-				minut += 5
-				gs 'underwear', 'remove'
-				 gs 'clothing', 'strip', 'VillageRiver'
-				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-				act 'Continue': gt 'Gadriver', 'Gadbitch'
 			end
 		end
 		if hour >= 8 and hour < 20 and sunWeather = 1:
@@ -505,13 +488,13 @@ if $ARGS[0] = 'Gadbitch':
 								gt'Gadriver', 'Gadbitch'
 							end
 						end
-					end 
+					end
 				end
 			end
 		end
 	end
 	if $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
-	if $clothingworntype = 'nude': 
+	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
 			cla

+ 29 - 27
locations/gadukino.qsrc

@@ -63,8 +63,10 @@ if $ARGS[0] = '':
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1 :
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
+			act 'Grandparent''s house': gt 'Gaddvor'
 		else
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
+			act 'Old couple''s house': gt 'Gaddvor'
 		end
 		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl
@@ -90,7 +92,7 @@ if $ARGS[0] = '':
 !---------------------------------------------
 
 		if hour >= 17 and hour < 20:'Not far from the house scared <a href="exec:GT ''mitka''">Mitka Kingpin</a>'
-		if hour >= 20 and sunWeather = 1 and month >= 4 and month <= 10:
+		if hour >= 20 and sunWeather = 1:
 			!MiraLoc = 0
 			'Not far from the house sits a rustic style company of <a href="exec:GT ''mitkabuh''">youths</a>'
 		end
@@ -99,10 +101,10 @@ if $ARGS[0] = '':
 		*nl
 		if hour >= 8 and hour < 20:
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
-			'One of the building facing the square has a sign saying <a href="exec: gt ''gadmarket''">General Store</a>. A sign in the door proclames it "OPEN". It looks like the only place in the village to buy goods.'
+			'One of the building facing the square has a sign saying <a href="exec: gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
 		else
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
-			'One of the building facing the square has a sign saying General Store. A sign in the door proclames it "CLOSED". It looks like the only place in the village to buy goods.'
+			'One of the building facing the square has a sign saying General Store. A sign in the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
 		if hour >= 6 and hour < 20:
 			if month >= 4 and month <= 10:
@@ -119,7 +121,7 @@ if $ARGS[0] = '':
 				!skip mira events if Mira_no not 0. maybe a break up for future version?
 				!What does Mira_no represent?? by FinnMacha
 				!re-arrange random chance by illume, during 1.2.5 importation
-					if temp > 95 and meadow = 0:
+					if temp > 90 and meadow = 0:
 					!find meadow
 						gt 'gadukino', '1'
 					elseif meadow = 1 and temp < 10 and Mira_no = 0:
@@ -257,7 +259,7 @@ end
 
 if $ARGS[0] = '1':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
-	'Walking around the village you see a small path that leds between neighbor''s houses, the path leads away from the village into a dense thicket...'
+	'Walking around the village you see a small path that leads between neighbor''s houses, the path leads away from the village into a dense thicket...'
 
 	act 'Follow the path to see where it goes':
 		*clr & cla
@@ -265,36 +267,36 @@ if $ARGS[0] = '1':
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
-		'You follow the path to see where it goes, but about ten minutes later the path disapears into a very dense thicket if bushes and trees.'
+		'You follow the path to see where it goes, but about ten minutes later the path disappears into a very dense thicket if bushes and trees.'
 
 		act 'Look for a way around':
 			*clr & cla
 			minut += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
-			'Your about to return to the village, but you spot a small break in the thicket, from the looks of it it''s an animal trail.'
+			'You''re about to return to the village, but you spot a small break in the thicket, from the looks of it it''s an animal trail.'
 
-			act 'follow the trail':
+			act 'Follow the trail':
 				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
-				'You carefully walk down the trail through the thicket until you emerge into a small grove of fruit trees standing next the the ruins of a long abandoned house.'
+				'You carefully walk down the trail through the thicket until you emerge into a small grove of fruit trees standing next the ruins of a long-abandoned house.'
 
 				act 'Take an apple and keep walking':
 					*clr & cla
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_path.jpg"></center>'
-					' A few minutes later, snacking on an apple, you stubble upon the remains of an overgrown dirt road running through the middle of a majestic meadow filled with wildflowers. Judging by its undisturbed state no one uses it.'
+					' A few minutes later, snacking on an apple, you stumble upon the remains of an overgrown dirt road running through the middle of a majestic meadow filled with wildflowers. Judging by its undisturbed state no one uses it.'
 
 					act 'Further':
 						*clr & cla
 						minut += 20
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
-						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loadly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village and to your surprise, the path you follow back emerges into your grandparents back yard.'
+						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village and to your surprise, the path you follow back emerges into your grandparents back yard.'
 
 						act 'Return to the village': gt 'Gaddvor'
 					end
@@ -316,7 +318,7 @@ if $ARGS[0] = '2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
 			'You decide to lend a hand to help the girl with the calf. Your lonely in the village, maybe this girl, if you get to know her, could make it seem to the other villagers that you are not a complete stranger in Gadyukino. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately to moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava.'
-			'Together you are able to guide the calf back into its pen. Miroslava turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were destitute and could only afford to buy a house in this seedy dust covered village. You walk with her and chat until you reach her house, which is only a few away from your grandparents place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
+			'Together you are able to guide the calf back into its pen. Miroslava turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were destitute and could only afford to buy a house in this seedy dust covered village. You walk with her and chat until you reach her house, which is only a few away from your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 
 			act 'Finish': gt 'gadukino'
 		end
@@ -340,10 +342,10 @@ if $ARGS[0] = '2':
 					temp = RAND(0,30)
 					if temp < 5:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp2.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually sits down on the fence and, looking at you with a gleam in her eyesback and a mischievous smile, she pulls aside panties showing off her juicy pussy...'
+						'You ask Mira to show you her pussy. She smiles casually sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her juicy pussy...'
 					elseif temp < 10:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t waering any panties.'
+						'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t wearing any panties.'
 					elseif temp < 25:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp1.jpg"></center>'
 						'You ask Mira to show you her pussy. She smiles casually and sits down on the fence and slightly spreading his legs, showing you her bare naked pussy. She isn''t waering any panties.'
@@ -400,10 +402,10 @@ if $ARGS[0] = '2':
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad1.jpg"></center>'
-				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitkin''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
+				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
 			end
 		else
-			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitike''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitkin''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
+			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
 		end
 		gs 'arousal', 'voyeur', 5, 'exhibitionism'
 		gs 'stat'
@@ -416,7 +418,7 @@ if $ARGS[0] = '2':
 	elseif npc_rel['A60'] > 0 and npc_QW['A60'] >= 6 and mirasextimes >= 10 and temper < 18 and sunWeather = 1 and temp >= 7:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad2.jpg"></center>'
-		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increaded his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just grunts and laughs.'
+		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just grunts and laughs.'
 		gs 'arousal', 'voyeur', 10, 'exhibitionism'
 		gs 'stat'
 		act 'Watch':
@@ -431,7 +433,7 @@ if $ARGS[0] = '2':
 				*clr & delact 'Watch'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-				'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mirka continues to drive his cock into her asshole until his pubs rub up against her ass. Mira wriths under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving a bright red mark. Mitka begins to stutter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets our a beastal growl as he begins to cum...'
+				'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubs rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving a bright red mark. Mitka begins to stutter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
 				gs 'arousal', 'voyeur', 5, 'exhibitionism'
 				gs 'stat'
 			end
@@ -483,7 +485,7 @@ if $ARGS[0] = '3':
 				minut += 45
 				pcs_dom += RAND(0,2)
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-				'You lead her out to the main road. You tell Miroslava, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitue and fullfil the desires of anyone who asks for her serivces. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
+				'You lead her out to the main road. You tell Miroslava, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfil the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
 				gs 'stat'
 
 				act 'Watch her perform a trick...':
@@ -493,7 +495,7 @@ if $ARGS[0] = '3':
 					npc_QW['A60'] += 1
 					!Image does not exist -'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirawish2_2.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-					'It isn''t long before Mira''s first customer pulls up in a nice vehicle. She takes a deep breath, looks you in the eyes, winks and approachs the vehicle and starts talking to the driver.'
+					'It isn''t long before Mira''s first customer pulls up in a nice vehicle. She takes a deep breath, looks you in the eyes, winks and approaches the vehicle and starts talking to the driver.'
 					gs 'stat'
 
 					act 'Continue':
@@ -523,7 +525,7 @@ if $ARGS[0] = '3':
 										*clr & cla
 										minut += 10
 										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
-										'Eventually, the guys grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
+										'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
 										gs 'stat'
 
 										act 'Continue':
@@ -542,21 +544,21 @@ if $ARGS[0] = '3':
 								*clr & cla
 								miraprost += 1
 								'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
-								'You walk up and look into the van. You see Mira showing the John her tits and rubbing her pussy. You see a hungry gleam in the guys eyes, which Mira returns in force.'
+								'You walk up and look into the van. You see Mira showing the John her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns in force.'
 								gs 'arousal', 'voyeur', 20, 'exhibitionism', 'prostitution'
 								gs 'stat'
 
 								act 'Continue':
 									*clr & cla
 									'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-									'Mira and her John jump into the back of the van and you watch as he start fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the John is hitting or entering her cervix.'
+									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the John is hitting or entering her cervix.'
 									gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
 									gs 'stat'
 
 									act 'Continue':
 										*clr & cla
 										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
-										'You have to duck behing some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
+										'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
 										gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
 										gs 'stat'
 
@@ -584,7 +586,7 @@ end
 if $ARGS[0] = '4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -595,7 +597,7 @@ end
 if $ARGS[0] = '5':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad6.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -708,7 +710,7 @@ if $ARGS[0] = '15':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol4.jpg"></center>'
-	'Walking through the village, you see the younger generation. They happily smile you teeth and staring with all his eyes...'
+	'Walking through the village, you see the younger generation. They happily smile at you...'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'

+ 4 - 0
locations/gadukino_event.qsrc

@@ -792,6 +792,8 @@ if $ARGS[0] = 'go_home':
 			family_trip_month = month
 			if month >= 6 or month <= 8:
 				*clr & cla
+				'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 				'Mom asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
 				act 'Stay':
 					staygad = daystart
@@ -814,6 +816,8 @@ if $ARGS[0] = 'go_home_ender':
 	*clr & cla
 	minut += rand(15,25)
 	if grandmahelp > 0:
+		'<center><b><font color="maroon">Your grandmother</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
 		'Before leaving grandma gives you <<grandmahelp*50>> rubles.'
 		money += grandmahelp*50
 		grandmahelp = 0

+ 1 - 1
locations/gaptek.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC, $ARGS[0])
 	*P FUNC ('$single_stock_item', 1, 'enema kit', 1250, 'klisma', $CURLOC, $ARGS[0], StoryLine, 'You should be stealthy')
-	*P FUNC ('$single_stock_item', 1, 'breast pump', 800, 'breastpump', $CURLOC, $ARGS[0])
+	*P FUNC ('$single_stock_item', 1, 'breast pump', 2200, 'breastpump', $CURLOC, $ARGS[0])
 	*P '</table></center>'
 	!! for original start we can just use stockitem, for alt start there are other plot elements involved
 	!strip polt-related item, other use new system

+ 69 - 57
locations/gdktoilet.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
 
 	if hour >= 8 and hour <= 23:
-		act 'Go in the Men''s toilet': gt 'gdktoilet', 'mens'
+		act 'Go in the Men''s toilet': gt 'gdktoilet', 'mens_entrance_events'
 		act 'Go in the Women''s toilet': gt 'gdktoilet', 'womens'
 	end
 
@@ -66,24 +66,8 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'mens':
-	$metka = 'mens'
-	$loc = 'gdktoilet'
-	cls
+if $ARGS[0] = 'mens_entrance_events':
 	temp = RAND(1,100)
-	gs 'stat'
-	if hour >=20 and hour <=23:
-		if music_on = 1:
-			$track_loop = 'sound/komb.mp3'
-			volume = 50
-			music_loop = 1
-			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
-		else
-			music_loop = 0
-			close all
-			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
-		end
-	end
 !!Gloryhole1
 	if temp >= 80:
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -161,7 +145,7 @@ if $ARGS[0] = 'mens':
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						else
-							act 'leave': gt'gdktoilet', 'start'
+							act 'Leave': gt'gdktoilet', 'start'
 						end
 					end
 				else
@@ -169,13 +153,13 @@ if $ARGS[0] = 'mens':
 					'You look at his naked body and you wonder who''s on the other side. You feel a little turned on by the man''s naked body. You decide to leave.'
 					gs 'arousal', 'voyeur', 10
 					gs 'stat'
-					act 'leave': gt'gdktoilet', 'start'
+					act 'Leave': gt'gdktoilet', 'start'
 				end
 			else
 				pcs_horny += 5
 				gs 'stat'
 				'You look at his naked body and you''re not sure what''s going on. You decide to leave before things get too awkward.'
-				act 'leave': gt'gdktoilet', 'start'
+				act 'Leave': gt'gdktoilet', 'start'
 			end
 		end
 !!Sonia
@@ -293,39 +277,67 @@ if $ARGS[0] = 'mens':
 		minut += 1
 		temp = RAND(1,2)
 		gs 'stat'
+		gt 'gdktoilet', 'mens'
+	end
+end
+
+if $ARGS[0] = 'mens':
+	$metka = 'mens'
+	$loc = 'gdktoilet'
+	$metkaM = 'mens'
+	$locM = 'gdktoilet'
+	$location_type = 'bathroom'
+	cls
+	gs 'stat'
+	
+	if hour >=20 and hour <=23:
+		if music_on = 1:
+			$track_loop = 'sound/komb.mp3'
+			volume = 50
+			music_loop = 1
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+		else
+			music_loop = 0
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
+		end
+	end
+	
+	'<center><b><font color="maroon">Men''s Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
+	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss. As you look around you notice a hole in the wall.'
+	
+	act 'Leave': gt 'gdktoilet', 'start'
+	
+	act 'Look at the hole':
+		cls
+		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
-		'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss. As you look around you notice a hole in the wall.'
-		act 'Look at the hole':
-			cls
-			gs 'stat'
-			'<center><b><font color="maroon">Men''s Room</font></b></center>'
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/menghpeek.mp4"></video></center>'
-			'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
-			gs 'arousal', 'voyeur', 5
-			gs 'stat'
-			if pcs_horny >=50:
-				act 'Masturbate':
-					cla
-					gs 'stat'
-					'You walk into one of the men''s stalls.'
-					gs 'arousal', 'masturbate', 5
-					gs 'stat'
-					act 'start': gt 'gdktoilet', 'mensmast'
-				end
-			end
-			act 'Move away':
-				cls
-				minut += 1
+		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/menghpeek.mp4"></video></center>'
+		'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
+		gs 'arousal', 'voyeur', 5
+		gs 'stat'
+		if pcs_horny >=50:
+			act 'Masturbate':
+				cla
 				gs 'stat'
-				'<center><b><font color="maroon">Men''s Room</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
-				'You decide to leave before things get too crazy.'
-				act 'Leave': gt'gdktoilet', 'start'
+				'You walk into one of the men''s stalls.'
+				gs 'arousal', 'masturbate', 5
+				gs 'stat'
+				act 'start': gt 'gdktoilet', 'mensmast'
 			end
 		end
-		act 'Leave': gt'gdktoilet', 'start'
+		act 'Move away':
+			cls
+			minut += 1
+			gs 'stat'
+			gt'gdktoilet', 'mens'
+		end
 	end
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
 end
 
 if $ARGS[0] = 'mensmast':
@@ -384,13 +396,13 @@ if $ARGS[0] = 'mensmast':
 								gs 'underwear', 'dispose'
 								minut += 2
 								gs 'stat'
-								'You run out of the stall and in doing so quickly you leave your underwear behind.'
-								act 'Leave': gt 'gdk'
+								'You slip past the man and run out of the bathroom so quickly you leave your underwear behind.'
+								act 'Leave': gt 'gdktoilet', 'start'
 							else
 								minut += 2
 								gs 'stat'
-								'You run out of the stall.'
-								act 'Leave': gt 'gdk'
+								'You slip past the man and run out of the bathroom.'
+								act 'Leave': gt 'gdktoilet', 'start'
 							end
 						end
 					else
@@ -422,14 +434,14 @@ if $ARGS[0] = 'mensmast':
 									minut += 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast5.jpg"></center>'
-									'The man leaves the stall, he mumbles something but you are too far gone and woozy. You stay crouched on the floor with cum all over your mouth as you try to recover. You get up and leave.'
-									act 'Leave':gt 'gdktoilet', 'start'
+									'The man leaves the stall, he mumbles something but you are too far gone and woozy. You stay crouched on the floor with cum all over your mouth as you try to recover.'
+									act 'Leave the stall':gt 'gdktoilet', 'mens'
 								end
 							end
 						end
 					end
 				end
-				act 'Leave Stall':gt 'gdktoilet', 'start'
+				act 'Leave Stall':gt 'gdktoilet', 'mens'
 			end
 		end
 	else
@@ -440,7 +452,7 @@ if $ARGS[0] = 'mensmast':
 		minut += 1
 		gs 'stat'
 		'You decide that you shouldn''t continue in fear of being discovered.'
-		act 'Leave Stall':gt 'gdktoilet', 'start'
+		act 'Leave Stall':gt 'gdktoilet', 'mens'
 	end
 end
 

+ 2 - 0
locations/gevent.qsrc

@@ -213,6 +213,8 @@ if $ARGS[0] = '5':
 	gs 'cum_manage'
 	minut += 15
 	money += 100
+	slutty += 1
+	pav_prostitute += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/5.jpg"></center>'
 	'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls your clothes to the side and thrusts his dick inside you. Within minutes, his breathing grows heavier and he growls as he shoots his load onto your ass cheeks. He pants: "Nice, babe... you''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'

+ 2 - 2
locations/gopnik_house.qsrc

@@ -2,7 +2,7 @@
 gs 'stat'
 
 if gophouse = 0:
-	'You take your glass of vodka and sit down on a rickety chair at the table, between two of the guys. The apartment is in rather poor condition; there''s very little furniture, and the wallpaper is peeling off the walls. Nevertheless, you enjoy the Gopniks'' company, <<$bname>>''s in particular.'
+	'You take your glass of vodka and sit down on a rickety chair at the table, between two of the guys. The apartment is in rather poor condition; there''s very little furniture, and the wallpaper is peeling off the walls. Nevertheless, you enjoy the Gopniks'' company, <<$boydesc>>''s in particular.'
 	*pl
 
 	if alko < 6:
@@ -54,7 +54,7 @@ elseif gophouse = 1:
 	gs 'stat'
 
 	if RAND (0,1) = 0:
-		'Finally the Gopniks are finished with you. They talk loudly about what a good fuck you were while they get dressed. When they realize you''re too drunk to get dressed, they help you pull your clothes back on and sloppily button them up, before they drag you outside. After you walk for a few minutes, <<$bname>> slaps your ass and tells you: "You should be able to find your way home from here. You were a good fuck, <<$pcs_nickname>>. Come look us up in the park again if you want more where that came from."'
+		'Finally the Gopniks are finished with you. They talk loudly about what a good fuck you were while they get dressed. When they realize you''re too drunk to get dressed, they help you pull your clothes back on and sloppily button them up, before they drag you outside. After you walk for a few minutes, <<$boydesc>> slaps your ass and tells you: "You should be able to find your way home from here. You were a good fuck, <<$pcs_nickname>>. Come look us up in the park again if you want more where that came from."'
 		
 		gs 'arousal', 'end'
 		gs 'stat'

+ 1 - 1
locations/gopsex.qsrc

@@ -1104,7 +1104,7 @@ if $ARGS[0] = 'hide':
 
 		rnd_viewgg_text = rand(1,7)
 		if rnd_viewgg_text = 1:$rnd_viewgg_text = 'notices you'
-		if rnd_viewgg_text = 2:$rnd_viewgg_text = 'spots you '
+		if rnd_viewgg_text = 2:$rnd_viewgg_text = 'spots you'
 		if rnd_viewgg_text = 3:$rnd_viewgg_text = 'spies you'
 		if rnd_viewgg_text = 4:$rnd_viewgg_text = 'catches a sight of you'
 		if rnd_viewgg_text = 5:$rnd_viewgg_text = 'throws a look at you'

+ 23 - 23
locations/gopskver.qsrc

@@ -104,7 +104,7 @@ $d_gop_triple_blow = {
 						'You nod your head meekly and say in a soft voice: "I understand."'
 						'The boys give you an approving nod, and Dan says: "You''re a smart slut, that makes me happy. Most of them need longer to accept their place in life. Anyway... get the hell out, the mess on your face is ruining my appetite."'
 
-						act 'Leave':gt 'gskver'
+						act 'Leave':gt 'gskver', 'start'
 					end
 
 					act 'Object':
@@ -118,7 +118,7 @@ $d_gop_triple_blow = {
 						'You don''t like the sound of that. When you carefully try to open your eyes again you notice the guys have surrounded you, and they all have their cocks out. Your vision is still blurry though, and you shriek in disgust when you feel a stream of urine hit your face. Then another, and a third. You realize you can''t fight off the three of them, and just let it happen.'
 						'Noticing your change in demeanour, Dan smirks at you when the streams have dried up: "That''s right, whore, just let it happen. Let that be a reminder for you.. now get the fuck out of here and clean yourself up, you look disgusting."'
 
-						act 'Leave':gt 'gskver'
+						act 'Leave':gt 'gskver', 'start'
 					end
 				end
 			end
@@ -152,7 +152,7 @@ if kotovLoveQW > 0:
 			if $prevloc = 'gkafe':
 				gt 'gkafe'
 			else
-				gt 'gskver'
+				gt 'gskver', 'start'
 			end
 		end
 		act 'Drink beer with Vitek and the guys':
@@ -178,7 +178,7 @@ if kotovLoveQW > 0:
 				if $prevloc = 'gkafe':
 					gt 'gkafe'
 				else
-					gt 'gskver'
+					gt 'gskver', 'start'
 				end
 			end
 		end
@@ -199,7 +199,7 @@ if kotovLoveQW > 0:
 	elseif hour >= 20:
 		'It''s evening, and the boys are getting ready to go to the disco like they do every night. You could call it a night and leave them alone, or tag along.'
 
-		act 'Leave':gt 'gskver'
+		act 'Leave':gt 'gskver', 'start'
 		if week = 5 or week = 6:
 			act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
 		end
@@ -209,14 +209,14 @@ else
 		if alko < 3:
 			'It''s evening, and the boys are getting ready to go to the disco like they do every night. You could call it a night and leave them alone, or tag along.'
 
-			act 'Leave':gt 'gskver'
+			act 'Leave':gt 'gskver', 'start'
 			if week = 5 or week = 6:
 				act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
 			end
 		elseif alko >= 3 and alko < 6 and DansOralSlut = 1:
 			'You''re quite drunk, and before going to the disco Dan offers to walk you home.'
 
-			if pcs_dom >= 5:act '"No need, I can find my own way home"':pcs_dom -= 5 & gt 'gskver'
+			if pcs_dom >= 5:act '"No need, I can find my own way home"':pcs_dom -= 5 & gt 'gskver', 'start'
 
 			act 'Go with Dan':
 				cls
@@ -239,7 +239,7 @@ else
 		elseif alko >= 3 and alko < 6 and DansOralSlut = 0:
 			'You''re quite drunk, and before going to the disco Dan offers to walk you home.'
 
-			if pcs_dom >= 5:act 'Decline':pcs_dom -= 5 & gt 'gskver'
+			if pcs_dom >= 5:act 'Decline':pcs_dom -= 5 & gt 'gskver', 'start'
 
 			act 'Go with Dan':
 				cls
@@ -264,7 +264,7 @@ else
 		elseif alko >= 6:
 			'You got absolutely hammered in the park, and are swaying from side to side when you walk down the pathway. Suddenly Vasily hugs your waist tightly and begins to lead you somewhere, with his friends following him.'
 
-			if pcs_dom >= 5:act 'Say you have to go and leave them':pcs_dom -= 5 & gt 'gskver'
+			if pcs_dom >= 5:act 'Say you have to go and leave them':pcs_dom -= 5 & gt 'gskver', 'start'
 
 			act 'Go with the guys':
 				cls
@@ -312,7 +312,7 @@ else
 					if $prevloc = 'gkafe':
 						gt 'gkafe'
 					else
-						gt 'gskver'
+						gt 'gskver', 'start'
 					end
 				end
 				act 'Drink beer with the guys':
@@ -335,7 +335,7 @@ else
 						if $prevloc = 'gkafe':
 							gt 'gkafe'
 						else
-							gt 'gskver'
+							gt 'gskver', 'start'
 						end
 					end
 				end
@@ -343,7 +343,7 @@ else
 				'You''re already not exactly sober any more, and feel a bit looser while you chat with the guys.'
 				
 
-				!act 'Decline the beer and leave':gt 'gskver'
+				!act 'Decline the beer and leave':gt 'gskver', 'start'
 
 				if pav_slut < 25:
 					act 'Drink beer with the guys':
@@ -357,7 +357,7 @@ else
 							if $prevloc = 'gkafe':
 								gt 'gkafe'
 							else
-								gt 'gskver'
+								gt 'gskver', 'start'
 							end
 						end
 					end
@@ -371,7 +371,7 @@ else
 						'You smile and nod at him: "I like getting guys all worked up with my body, that''s true. Why?"'
 						'Vasily stutters for a moment, and then manages to say: "Oh n- no reason, I was just curious is all."'
 
-						act 'Thank them for the beer and leave':gt 'gskver'
+						act 'Thank them for the beer and leave':gt 'gskver', 'start'
 					end
 
 					act '"What? No!"':
@@ -380,7 +380,7 @@ else
 						'You raise your voice a little and act surprised: "What? No way! Whoever told you that was lying!"'
 						'However, Dan doesn''t fall for your act, and matter-of-factly says: "<<$pcs_nickname>>, you''re a slut. We''ve all seen you, the whole town knows it. Why are you even trying to deny it? You''re such a terrible liar..."'
 
-						act 'Leave':gt 'gskver'
+						act 'Leave':gt 'gskver', 'start'
 					end
 				elseif pav_slut < 75:
 					if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
@@ -427,7 +427,7 @@ else
 									'The boys take out some markers and write several obscene words onto your skin. Soon, the whole town can read what a huge slut you are!'
 									'You don''t want to anger them any further, knowing the boys are much stronger than you, and don''t dare to protest while they keep writing more things on you. Eventually they''re satisfied, and let you get up. They even let you put your clothes back on, so you can cover up at least the majority of the writings. Dan smirks: "Maybe that''ll help you remember what you are, slut. When you''re ready to apologize, you know where to find us."'
 
-									act 'Leave':gt'gskver'
+									act 'Leave':gt 'gskver', 'start'
 								end
 							end
 
@@ -477,14 +477,14 @@ else
 			if $prevloc = 'gkafe':
 				act 'Blush and quickly leave the cafe':gt'vokzalG'
 			else
-				act 'Blush and keep walking':gt'gskver'
+				act 'Blush and keep walking':gt 'gskver', 'start'
 				if BjBeerQW >= 5:act 'Approach the guys':gt'zsoft_gopskverGorSlut','1'
 				act 'Ask for a beer': 
 					if BjBeerDay = daystart:
 						cla
 						cls
 						'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."' 
-						act 'Leave them and walk away':gt'gskver' 
+						act 'Leave them and walk away':gt 'gskver', 'start' 
 					else
 						gt 'gopskver', 'BjBeerStart'
 					end
@@ -520,7 +520,7 @@ if $ARGS[0] = 'BjBeerStart':
 				cla
 				cls
 				'The Gopniks don''t take your refusal very well, and try to force you anyway when they realize you''re not going to do what they want. However, your athletic training pays off and you manage to outrun them. Once you''re certain they''re no longer following you, you stop for a moment to catch your breath.' 
-				act 'Return to the park': gt'gskver'
+				act 'Return to the park': gt 'gskver', 'start'
 			end
 		end
 	end
@@ -765,7 +765,7 @@ if $ARGS[0] = 'BjBeerFace':
 	
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<BeerRand>>.jpg"></center>'
 			'Dan grins at you and offers you his unfinished bottle, and smiles when you drink it eagerly. Your mood improves slightly.'
-			act 'Return to the park': BjBeerActiv = 0 & gt'gskver'
+			act 'Return to the park': BjBeerActiv = 0 & gt 'gskver', 'start'
 	
 		elseif BjBeerActiv = 0:
 			pcs_mood = 0
@@ -776,7 +776,7 @@ if $ARGS[0] = 'BjBeerFace':
 			'Dan shrugs: "It took you way too long to finish us off, we drank all the beer in the meantime."'
 			'He grins as he shows you the empty bottle. You bite your lip in frustration and disappointment when you mutter: "But... but I... how..."'
 			'Maybe you should try harder, next time.'
-			act 'Return to the park': gt'gskver'
+			act 'Return to the park': gt 'gskver', 'start'
 		end
 	end  
 end	
@@ -978,7 +978,7 @@ if $ARGS[0] = 'BjBeerVag':
 					*pl
 					'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 					'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
-					act 'Return to the park': gt'gskver'
+					act 'Return to the park': gt 'gskver', 'start'
 				end   
 			end
 		end
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'BjBeerAnal2':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<BeerRand>>.jpg"></center>'
 				'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 				'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
-				act 'Return to the park': gt'gskver'
+				act 'Return to the park': gt 'gskver', 'start'
 				
 			end
 		end

+ 402 - 0
locations/gpoli.qsrc

@@ -17,6 +17,9 @@ if $ARGS[0] = '':
 	end
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+	if prcptn_lvl > 40 and pcs_know_mward <= 0:
+		'<br><br>You see a sign that reads <a href="exec: minut += 5 & gt ''gpoli'', ''maternity_ward''">"Maternity ward"</a>.'
+	end
 
 	act 'Leave':minut += 5 & gt 'pavCommercial'
 
@@ -163,6 +166,10 @@ if $ARGS[0] = '':
 		if therapistday ! daystart:
 			act 'Visit the therapist (1:00)': gt 'therapist'
 		end
+		
+		if pcs_know_mward > 0:
+			act 'Visit the maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
+		end
 	end
 
 	if preg = 2:
@@ -1267,5 +1274,400 @@ if $ARGS[0] = 'spravka_arrange_pale':
 	end
 end
 
+if $ARGS[0] = 'maternity_ward':
+	pcs_know_mward = 1
+	*clr
+	cla
+	gs 'stat'
+	minut += 5
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/mward.jpg"></center>'
+	'<center>You are at the maternity ward. There are alot of babies and nurses taking care of them.</center>'
+	if lactate > 0 and pcs_gpolimilkdonation = 3:
+		act 'Talk to the nurse (0:05)':
+			gs 'stat'
+			*clr
+			cla
+			minute += 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+			'Nurse: Hello <<$pcs_firstname>>, how can I help you?'
+			act 'Donate your breast milk (0:15)':
+				*clr
+				cla
+				milkedvolume = 0
+				pcs_gpoli_donationsessioncount = 0
+				!!if rand(0,100) = 95 and orphanfeed = 0:
+				!!	orphanfeed = 1
+				!!end
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+				'You talk to the old nurse and she leads you into the quiet room.'
+				!!if orphanfeed = 1:
+				!!	'It seems like there is a crib with a baby inside in this room, too.'
+				!!end
+				act 'have your breasts pumped':
+					*clr
+					cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+					'You sit down and take off your top.'
+					if lactatemv > lactatemm*8/10:
+						'The nurse looks surprised at your engorged breasts'
+						'Nurse: Oh dear! These look painfully full. I hope the pumping will make you feel better.'
+					end					
+					if pain['nipples'] >= 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit more of the yellowish cream from the tin.'
+						'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+						pain['nipples'] -= 20
+					else
+						'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+					end
+					nipple_cream = 1
+					act 'continue':	gt 'gpoli', 'maternity_ward_donation'
+				end
+			end
+			act 'Check your file (0:05)':
+				*clr
+				cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/formular.jpg"></center>'
+				'The nurse hands you a file on how much you have donated so far.'
+				'<br>----------------------------------------'
+				'Analyzed milksample measurements'
+				'Volume in ml: <<mward_donatesv/10>>ml'
+				'Fat in %: <<mward_donatesf/10>>.<<mward_donatesf mod 10>>%'
+				'Lactose in %: <<mward_donatess/10>>.<<mward_donatess mod 10>>%'
+				'<br>----------------------------------------'
+				if pcs_gpoli_totalmilkdonation_count > 0:
+					'Total breast milk donation statistics'
+					if pcs_gpoli_totalmilkdonation < 100:
+						'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.0<<pcs_gpoli_totalmilkdonation mod 1000>>l'
+					else
+						'Donated milk volume in liter: <<pcs_gpoli_totalmilkdonation/1000>>.<<pcs_gpoli_totalmilkdonation mod 1000>>l'
+					end
+					'Donation count: <<pcs_gpoli_totalmilkdonation_count>>'
+					'Average milk volume per donation in ml: <<pcs_gpoli_totalmilkdonation/pcs_gpoli_totalmilkdonation_count>>'
+					'Paid money: <<(((pcs_gpoli_totalmilkdonation*10)/3)*75)/100>><b>₽</b>'
+					'<br>----------------------------------------'
+				end
+				act 'Leave': gt 'gpoli', 'maternity_ward'
+			end
+			!!act 'Mammography (1:00)':
+			!!	
+			!!end
+			act 'Leave': gt 'gpoli', 'maternity_ward'			
+		end
+	end
+	if lactate > 0 and lactatemv > lactatemm/8 and pcs_gpolimilkdonation <= 2:
+		'<br><br><center>One of the nurses looks at you suspiciously.<center>'
+		act 'Talk to the nurse (0:05)':
+			*clr
+			cla
+			minut += 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+			if preg >= 0 and pregtimes > 0 and pcs_gpolimilkdonation <= 0:
+				'You walk up to the nurse'
+				'You: Uhm, Hello...'
+				'Nurse: Which one is yours?'
+				'You: Mine? I don''t understand...'
+				'The nurse looks at your face then down at your breast and than back at your face.'
+				'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
+				'She concludes on you, giving you a rised eyebrow.'
+			elseif preg = 0 and pregtimes = 0 and pcs_gpolimilkdonation <= 0:
+				'You walk up to the nurse'
+				'You: Uhm, Hello...'
+				'The nurse looks you up and down, rising an eyebrow on you.'
+				'Nurse: You don''t look like you ever had a child, how come you are lactating?'
+				'You are surprised by the sudden and precise analysis of the nurse.'
+				'You: How... how do you know?'
+				'Nurse: I''ve been working here for ages. Trust me ... I can tell by the smell. Now why are you lactating?'
+			elseif pcs_gpolimilkdonation <= 0:
+				'You walk up to the nurse'
+				'You: Uhm, Hello...'
+				'Nurse: Which one is yours?'
+				'You: Mine? I don''t understand...'
+				'The nurse looks at your face then down at your breast and than back at your face.'
+				'Nurse: Well, you are obviously lactating, so you came here to breastfeed your offspring?'
+				'She concludes on you, giving you a rised eyebrow.'
+			else
+				'You walk up to the nurse'
+				'You: Hello...'
+				'Nurse: Ah, it is you again...'
+				'She looks you up and down'
+				if pcs_gpolimilkdonation = 1 and preg = 0 and pregtimes = 0:
+					'Nurse: So, why are you lactating again?'
+				elseif pcs_gpolimilkdonation = 2:
+					'Nurse: Did you change your mind and want donate your breast milk?'
+				else
+					'Nurse: What do you want?'
+				end
+			end
+			if pcs_gpolimilkdonation < 1: pcs_gpolimilkdonation = 1
+			if pcs_gpolimilkdonation < 2:
+				act 'explain yourself':
+					*clr
+					cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
+					if preg = 0 and pregtimes = 0:
+						pcs_gpolimilkdonation = 2
+						if lactateinduced = 1:
+							'You: Erm ... I used a breast pump on myself...'
+							'You blush a bit from embarresment, while telling it to her.'
+						else
+							'You: I don''t really now... it just started some day.'
+							'You explain, blushing from embarresment.'
+						end
+						'The nurse nods at you professionally, then pulls some paper together, while she looks really thoughful. She then looks up at you and starts to speak.'
+						'Nurse: Have you ever thought of donating your breast milk?'
+						'You: Donating?'
+						'Nurse: Yes, donating. We would pump your breasts and collect the milk. We can use the milk for the mothers that are not able to breastfeed yet. We also offer a bit of money for your donated breast milk.'
+						'You look at her with wide eyes.'
+						'Nurse: So, what do you think?'
+						pcs_gpolimilkdonation = 2
+						act 'give it a try (0:15)':
+							*clr
+							cla
+							minut += 15
+							pcs_gpolimilkdonation = 3
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+							'The nurse leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
+							'You sit down and the nurse invites you to take off your top.'
+							if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
+								'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+								'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+								'You: What is that?'
+								'The nurse looks up at you.'
+								'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
+								'You nod your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
+								pain['nipples'] -= 20
+								'You: Where do I get this stuff?'
+								'Nurse: You can buy it in the pharmacy...'
+								pcs_knows_nipplecream = 1
+								'The nurse finishes rubbing you nipples with the nipple balm.'
+							elseif pain['nipples'] >= 60:
+								'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+								'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+								'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+								pain['nipples'] -= 20
+							else
+								'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+							end
+							nipple_cream = 1
+							'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough. So this time you won''t get paid for your milk.'
+							'You nod and pull up your shirt. The nurse takes the pumps and puts them on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+							milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+							breastpumped += 4
+							pcs_orphanfeed = 0
+							if milkedvolume >= 1000:
+								'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
+								'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
+							elseif milkedvolume >= 500 and milkedvolume < 1000:
+								'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
+								'Nurse: Okay... it seems you are able to make enough milk for a 50ml donation, but you could have trouble to breastfeed a baby properly.'
+							else
+								'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
+								'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation.'
+							end
+							'The nurse detaches the pump and allows you to dress up again.'
+							if milkedvolume > 500:
+								mward_donatesv = 500
+							else
+								mward_donatesv = milkedvolume
+							end
+							if salo > 40:
+								mward_donatesf = 60
+							elseif salo > 20:
+								mward_donatesf = 45
+							elseif salo > 15:
+								mward_donatesf = 20
+							else
+								mward_donatesf = 10
+							end
+							if pcs_energy > 30:
+								mward_donatess = rand(69, 80)
+							elseif sick > 1:
+								mward_donatess = rand(0,45)
+							else
+								mward_donatess = rand(45, 69)
+							end
+							act 'Leave':gt 'gpoli'								
+						end
+						act 'deny to donate':
+							*clr
+							cla
+							'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
+							act 'Leave':gt 'gpoli'							
+						end
+					end						
+				end
+			elseif pcs_gpolimilkdonation = 2:
+				act 'Offer to donate your breast milk (0:15)':
+				*clr
+					cla
+					minut += 15
+					pcs_gpolimilkdonation = 3
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pump_room.jpg"></center>'
+					'The nurse smiles and gets up, then she leads you into a room. It is quiet in here. There is a chair a table and a breastpump.'
+					'You sit down and the nurse invites you to take off your top.'
+					if pain['nipples'] >= 60 and pcs_knows_nipplecream <= 0:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+						'You: What is that?'
+						'The nurse looks up at you.'
+						'Nurse: This is nipple balm. It helps with sore nipples during pumping. Don''t you now this?'
+						'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples and they hurt less.'
+						pain['nipples'] -= 20
+						'You: Where do I get this stuff?'
+						'Nurse: You can buy it in the pharmacy...'
+						pcs_knows_nipplecream = 1
+						'The nurse finishes rubbing you nipples with the nipple balm.'
+					elseif  pain['nipples'] >= 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
+						'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
+						'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'
+						pain['nipples'] -= 20
+					elseif pcs_knows_nipplecream <= 0:
+						'The nurse grabs a small tin and takes a bit of yellowish cream from it.'
+						'You: What is that?'
+						'The nurse looks up at you.'
+						'Nurse: This is nipple balm. It helps during pumping and prevents nipple soreness. Don''t you now this?'
+						'You shake your head and watch as the nurse applies the cream to your nipples. The cream feels nice on your nipples.'
+						'You: Where do I get this stuff?'
+						'Nurse: You can buy it in the pharmacy...'
+						pcs_knows_nipplecream = 1
+						'The nurse finishes rubbing you nipples with the nipple balm.'
+					else
+						'The nurse grabs the nipple balm and applies it to your nipples. It feels nice on your nipples as she rubs it in.'
+					end
+					nipple_cream = 1
+					'Nurse: Okay, I am going to pump a bit milk off first, to check the quality and if you are able to donate enough.'
+					'You nod and pull up your shirt. The nurse takes the pumps and puts it on your breasts. She flicks a switch and you can feel your nipples being sucked in with force. The pump slowly working your nipples.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+					milkedvolume = func('lact_lib','$get_breastmilk', 4, 15)
+					breastpumped += 4
+					pcs_orphanfeed = 0
+					if milkedvolume >= 1000:
+						'Your breasts are able to fill both small bottles easily. The nurse nods at you confidently.'
+						'Nurse: Yes, it seems you are able to make good amount of milk. You could breastfeed a baby with no issue.'
+					elseif milkedvolume >= 50 and milkedvolume < 1000:
+						'Your breasts are not able to fill both small bottles. The nurse rises an eyebrow on you.'
+						'Nurse: Okay... it seems you are able to make enough milk for a donation, but you could have trouble to breastfeed a baby properly.'
+					else
+						'You have trouble to fill the bottles to the first mark. The nurse shakes her head disappointed.'
+						'Nurse: Mhmm ... your breasts don''t seem to make enough milk. You can still come and be pumped, but we need at least 50ml for a valid donation.'
+					end
+					'The nurse detaches the pump and allows you to dress up again.'
+					if milkedvolume > 500:
+						mward_donatesv = 500
+					else
+						mward_donatesv = milkedvolume
+					end
+					if salo > 40:
+						mward_donatesf = 60
+					elseif salo > 20:
+						mward_donatesf = 45
+					elseif salo > 15:
+						mward_donatesf = 20
+					else
+						mward_donatesf = 10
+					end
+					if pcs_energy > 30:
+						mward_donatess = rand(69, 80)
+					elseif sick > 1:
+						mward_donatess = rand(0,45)
+					else
+						mward_donatess = rand(45, 69)
+					end							
+					act 'Leave':gt 'gpoli'				
+				end
+			end
+			act 'Leave':gt 'gpoli'
+		end
+	end
+	act 'leave':gt 'gpoli'
+end
+
+if $ARGS[0] = 'maternity_ward_donation':	
+	*clr
+	cla
+	gs 'stat'
+	nipple_cream = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
+	'The nurse attaches the pumps and switches them on.'
+	if lactatemv >= 0:
+		'Your nipples are worked by the pumps, pumping your milk out, first draining at your collected milk resevoir. You feel the pressure in your breasts easing down.'
+	else
+		'Your nipples are worked by the pumps, pumping your milk out, you feel the pressure in your breasts easing down. Then your breasts tingle from the milk production as the pump demands more of your milk.'
+	end
+	act 'continue':
+		*clr
+		cla
+		milkedvolume += func('lact_lib','$get_breastmilk', 4, 15)
+		breastpumped += 4
+		'After 15 minutes, the nurse detaches the pumps from your breasts.'
+		if milkedvolume > 500:
+			temp_var = milkedvolume/500
+			!!'milkedvolume: <<milkedvolume>> - temp var test: <<temp_var>>'
+			pcs_gpoli_donationsessioncount += temp_var
+			pcs_gpoli_totalmilkdonation_count += 1
+			pcs_gpoli_totalmilkdonation += temp_var*50
+			if temp_var < 2:
+				'She looks satisfied at you as she puts away one bottle with 50ml of your breast milk.'
+			elseif temp_var => 4:
+				'She looks satisfied at you as she puts away the <<temp_var>> bottles containing <<temp_var*50>>ml of your breast milk.'
+				'Nurse: This is a good amount of milk.'
+			elseif temp_var => 8:
+				'She looks surprised at the at the amount of milk you made as she stores away the <<temp_var>> bottles that contain <<temp_var*50>>ml of your breast milk.'
+				'Nurse: Dear, that is much milk...'
+			else
+				'She looks satisfied at you as she puts away <<temp_var>> bottles with <<temp_var*50>>ml of your breast milk inside.'
+			end
+		else
+			'She looks at you a bit disappointed.'
+			'Nurse: Mhmm... I am sorry, but this isn''t enough milk for a valid donation. You only made <<milkedvolume/10>>ml of breast milk.'
+		end
+		if pcs_gpoli_donationsessioncount > 0:
+			mward_donatemoney = (((pcs_gpoli_donationsessioncount*500)/3)*75)/100
+		else
+			mward_donatemoney = 0
+		end
+		money += mward_donatemoney
+		minut += 15
+		nipple_cream = 0
+		if lactatemv > lactatemm/2:
+			'The nurse looks at your breasts'
+			'Nurse: Looks like you could go for a another pumping...shall we?'
+			act 'have your breasts pumped again': gt 'gpoli', 'maternity_ward_donation'
+			act 'enough for today':
+				*clr
+				cla
+				gs 'stat'
+				if pcs_gpoli_donationsessioncount > 0:
+					'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+				else
+					'You put on your top'
+				end
+				act 'leave':
+					milkedvolume = 0
+					gt 'gpoli', 'maternity_ward'
+				end
+			end
+		else
+			act 'ask to donate more': gt 'gpoli', 'maternity_ward_donation'
+			act 'enough for today':
+				*clr
+				cla
+				gs 'stat'
+				if pcs_gpoli_donationsessioncount > 0:
+					'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+				else
+					'You put on your top'
+				end
+				act 'leave':
+					milkedvolume = 0
+					gt 'gpoli', 'maternity_ward'
+				end
+			end
+		end
+	end
+end
 --- gpoli ---------------------------------
 

+ 23 - 20
locations/grigory.qsrc

@@ -1101,26 +1101,29 @@ if $ARGS[0] = 'drunk_late':
 				'After a  few seconds consideration, you pull remove your own shoes, then pull back the covers on the other side of the bed before crawling in beside him.'
 				'Snuggling up against the warmth of his big body, you feel him roll onto his side, one of his arms slipping around your middle.  "Love you Kiska,"  He mumbles in his drunken sleep.'
 				'Smiling to yourself, you close your eyes and drift off to sleep.'
-
-!!				--------------------------------------------
-!!				Scene break
-!!				--------------------------------------------
-
-				'You''re woken by the early morning sun peeking past the drapes of the bedroom.  You start to shy away from the light, but then realize that you''re alone in the bed.'
-				'Looking around the room, you see that Grigory is nowhere to be seen.  '
-				'"Grigory?"  You call softly when you finally motivate yourself to crawl out of bed, "Grigory?  Where''d you get off to?"'
-				'With no response, you exit the bedroom and start to look around.  The first thing you notice is that all of Grigory''s clothes have been picked up, and that the end table has been moved back to where it belongs.  The second is when you look out the living room window and notice that his truck is gone.'
-				'You sigh, then start back toward the bedroom to grab your shoes and tidy up before leaving.  You''re almost to the front door when you notice a note stuck to the door.  '
-				*nl
-				'<b>Sorry about last night.  I had a bit too much to drink.  Please forgive me.'  
-				'I was going to wake you this morning, but you looked like a sleeping angel and I couldn''t bring myself to wake you up.  I hope you slept well.'
-				'Help yourself to the fridge for breakfast, maybe I''ll see you a little later.'
-				'Love you Kiska,'
-				'Grigory</b>'
-				*nl
-				'Smiling to yourself, you take down the note.'
-
-				act 'Continue':gt 'grigory','dummy'
+				act 'Wake up':
+					*clr
+					cla
+					minut += ((33 - hour) * 60) - minut
+					pcs_energy += 100
+					pcs_hydra += 100
+					gs 'stat'
+					'You''re woken by the early morning sun peeking past the drapes of the bedroom.  You start to shy away from the light, but then realize that you''re alone in the bed.'
+					'Looking around the room, you see that Grigory is nowhere to be seen.  '
+					'"Grigory?"  You call softly when you finally motivate yourself to crawl out of bed, "Grigory?  Where''d you get off to?"'
+					'With no response, you exit the bedroom and start to look around.  The first thing you notice is that all of Grigory''s clothes have been picked up, and that the end table has been moved back to where it belongs.  The second is when you look out the living room window and notice that his truck is gone.'
+					'You sigh, then start back toward the bedroom to grab your shoes and tidy up before leaving.  You''re almost to the front door when you notice a note stuck to the door.  '
+					*nl
+					'<b>Sorry about last night.  I had a bit too much to drink.  Please forgive me.'  
+					'I was going to wake you this morning, but you looked like a sleeping angel and I couldn''t bring myself to wake you up.  I hope you slept well.'
+					'Help yourself to the fridge for breakfast, maybe I''ll see you a little later.'
+					'Love you Kiska,'
+					'Grigory</b>'
+					*nl
+					'Smiling to yourself, you take down the note.'
+
+					act 'Continue':gt 'grigory','dummy'
+				end
 			end
 		end
 	end

+ 26 - 10
locations/gschool_detention.qsrc

@@ -269,12 +269,14 @@ if $ARGS[0] = 'incidental_events':
 	end
 end
 
+!!can be any of the girls from school but a nerd, Veronika, Ekaterina, or Anushka.
 if $ARGS[0] = 'upskirt1':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
-!!can be any of the girls from school but a nerd, Veronika, Ekaterina, or Anushka.
+	:newupskirtgirl1
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka': jump'newupskirtgirl1'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you, after a few minutes she leans back in her chair and relaxes. Spreading her legs slightly as she does, the movement draws your eyes and you are given a eye full. Apparently she forgot her panties today because her pussy is now on full display for any to see, well any from the right vantage point, like yourself.'
@@ -302,12 +304,14 @@ if $ARGS[0] = 'upskirt1':
 	end
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Anushka.
 if $ARGS[0] = 'upskirt2':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
-!!can be any of the girls from school but a nerd, Veronika, or Anushka.
+	:newupskirtgirl2
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Anushka': jump'newupskirtgirl2'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/upskirt.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> climbing up the small ladder uses to get to the top shelves of the books. As you watch her climb you quickly realize she is not wearing any panties and is giving everyone watching a clear view of her pussy. Before you can say anything someone whistles, which causes the teacher to start demanding who did it. During the distraction she quickly climbs back down and returns to her seat, blushing slightly but also smiling.'
@@ -317,14 +321,16 @@ if $ARGS[0] = 'upskirt2':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 if $ARGS[0] = 'flashing girl':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	:newflashinggirl
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newflashinggirl'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detflash1.mp4"></video></center>'
-!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting in a spot that blocks almost everyones view of her, but yours. She has her phone held in front of her, obviously having a video conversation with someone, then you see her lift her shirt and flash who ever it is on the phone. She laughs a bit apparently at their reaction, the teacher clears his throat at her outburst. She quickly ends the call and spends the rest of the time playing on her phone. After watching her a bit more, you realize she is not going to do anything more so you play on your phone as well, at least there was a little excitement today.'
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
@@ -332,14 +338,16 @@ if $ARGS[0] = 'flashing girl':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 if $ARGS[0] = 'teasing girl':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	:newteasinggirl
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newteasinggirl'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/tease.jpg"></center>'
-!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> has snuck off into the book stacks, she is watching some boys watch her, she pulls down her pants and starts to pull down her panties but she stops just before she shows anything, grins as she pulls her clothes back up. After  doing this a few times, each time the boys look hopefully this might be the time, but it never is. Finally she gets bored teasing them and wanders off. After that you start playing on your phone again, at least there was a little excitement today.'
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
@@ -347,14 +355,18 @@ if $ARGS[0] = 'teasing girl':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!boy can be Dimka, Andrey, Ivan, Lazar, Svyatoslav, or any of the gopnik boys but Niko. If Sveta is dating any of the boys then they should not be called either.
 if $ARGS[0] = 'handjob':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	gs 'gschool_events', 'rand_boy_arg', 0, 0, 0, 1, 0, 0
+	
+!!fixed the gs, but the other boys must still be included and niko and lovers excluded, if somebody fixes that, remove this comment and the next line (julzor)
+	$rand_boy = 'a boy you don''t know'
+	
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/handjob.jpg"></center>'
-!!boy can be Dimka, Andrey, Ivan, Lazar, Svyatoslav, or any of the gopnik boys but Niko. If Sveta is dating any of the boys then they should not be called either.
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice a girl, you have seen her around but she is from another grade and you can''t recall her name. She is sitting next to <<$rand_boy>> she has his shorts pulled down in front and is jerking him off under the desk. Both of them do a fairly good job of acting like nothing is going on, but from your seat, you have a perfect view of the action.'
 	*nl
 	'Some time later, she has to switch hands one than once, but he finally leans back and closes his eyes. Sensing he is close she tilts his dick down as she keeps jerking him off and cups her other hand under the head of his dick. Moment later he is shooting his load into her hand, a bit of it shoots out onto the floor as well. Once he finishes she lets go of him and brings her hands up to her face, where she starts to lick all his cum off them, as he tucks his dick away. Not long after they sit side by side playing on their phones, pretending like nothing happened. Soon you start playing on your phone as well, at least there was a little excitement today.'
@@ -374,6 +386,7 @@ end
 !!If outcast social group random girl is Sonia or any girl Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_girl>>':
 	*clr & cla
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -391,6 +404,7 @@ end
 !!If outcast social group random boy is Lesco Tsarev, Petia Alkaev or any boy Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_boy>>':
 	*clr & cla
+	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -440,6 +454,7 @@ if $ARGS[0] = 'Help Friends in need':
 	'They have a whispered argument or discussion - you are not sure which - but when they are done, they both look around and you can tell they are up to something. <<$rand_girl>> leans over to you and whispers: "Can you distract Mr <<$rand_teacher>> for us, so we can slip away?" Both of them give you pleading looks.'
 !!I changed this to give the player a choice if they want to help the couple or not.
 	act 'No':
+		cla & *clr
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
 !!not sure if you can code it to give a friend boost to which ever NPC it is, but if so I put in the code but blank number.
@@ -449,6 +464,7 @@ if $ARGS[0] = 'Help Friends in need':
 		act 'Go home': gt 'gschool_detention', 'end'
 	end
 	act 'Yes':
+		cla & *clr
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
 !!not sure if you can code it to give a friend boost to which ever NPC it is, but if so I put in the code but blank number.

+ 3 - 3
locations/gschool_grounds.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'main':
 		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock ! 1:
+	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour = 14:
 			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
 		if $clothingworntype = 'school' or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'main':
 
 	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1:
+	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0:
 		act 'Go to detention': gt 'gschool_detention', 'start'
 	end
 

+ 3 - 2
locations/gschool_lessons.qsrc

@@ -2742,7 +2742,8 @@ if $ARGS[0] = 'postphys':
 					'Mr. Pavlovich groans, and after a few minutes he can''t hold back any more and shoots his load into Christina''s mouth. She diligently swallows his sperm without even taking her mouth off his cock, giving it a thorough tongue-bath before tucking it back into his shorts. You hear her ask, "Did I do a good job, sir? Did I earn my spot in the regional championships?"'
 					*nl
 					'He groans, petting her head as he instructs her to stay on her knees for a while longer, "Absolutely babe, as long as you keep taking care of me, I''ll make sure you''ll be running those championships. Don''t get up, stay there and keep nuzzling. I think I can go again in a minute."'
-					act 'Burst into the room':gt 'gschool_lessons', 'postphys'
+					!!Event missing for bursting into the room when christina already sucked him off 
+					!!act 'Burst into the room':gt 'gschool_lessons', 'postphys'
 					act 'Admit defeat':
 						*clr & cla
 						'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
@@ -3370,7 +3371,7 @@ if $ARGS[0] = 'npc_data':
 !!Rolan Matveev
 	$school_static_num[57] = 'A133'
 	npcPol[57] = 0
-	grupTipe[57] = 0
+	grupTipe[57] = 6
 	$npcGo[57] = '<a href="exec:numnpc = 57 & GT ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 end
 

+ 432 - 1
locations/gschool_lunch.qsrc

@@ -243,6 +243,16 @@ if $ARGS[0] = 'break':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 			'You stay in the cafeteria where some of the <a href="exec:gt ''Sgrup''">teachers</a> are eating or watching over the kids making sure there is no trouble.'
+			if rolanmeet < 1: 
+				'A man is sitting with his head on the table, he seems lonely.'
+				act 'Look for the lonely man': gt 'gschool_lunch', 'rolan_meet'
+			elseif rolanmeet < 2: 
+				'The man is sleeping at the table as usual.'
+				act 'Wake him': gt 'gschool_lunch', 'rolan_meet'	
+			elseif rolanmeet < 8: 
+				act 'Look for Rolan': gt 'gschool_lunch', 'rolan_meet'
+			else
+			end
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		end
 	end
@@ -797,7 +807,7 @@ if $ARGS[0] = 'bjs':
 		if pav_slut >= 150:'He then adds, "I''ll give you 50 <b>₽</b>?"'
 
 		act 'Go to the men''s restroom with him':
-			if pav_slut >= 150: money += 50
+			if pav_slut >= 150: money += 50 & slutty += 1
 			gt 'gschool_sex', 'lunch_bj'
 		end
 
@@ -869,5 +879,426 @@ if $ARGS[0] = 'bjs':
 	end
 end
 
+if $ARGS[0] = 'rolan_meet':
+	*clr & cla
+	gs 'stat'
+	if rolanmeet < 1:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet0.jpg"></center>'
+		!! LURK MORRISON images are currently located in ''...images\locations\pavlovsk\resident\apartment\aptrolan\rolanmeet'\'
+		'He looks like he''s sleeping. You try waking him, "Hey mister, you shouldn''t sleep here!"'
+		'He''s snoring pretty loudly. It''s a wonder no one else has tried to wake him.'
+		'"Hey... Hey... Wake up!"'
+		'"...I don''t know anything... no, Miss Volkov, I wasn''t working that day..."'
+		'Is he talking in his sleep? "SIR!"'
+		'"...you can''t prove anything, Miss Volkov..."'
+		act 'Poke him':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet1.jpg"></center>'		
+			'You poke him in the shoulder, "Hey... Hey... Mister!" He doesn''t stir.'
+			'"...please, Miss Volkov... leave me alone..."'
+			'You grow frustrated, "What th-?" You try shaking his char, "Wake up!"'
+			'He continues to snore, "...the staircases are clean... leave me alone..."'
+			'Finally, you give up. "He must be drunk."'
+			act 'leave ': gt 'gschool_lessons', 'short_break'
+		end
+	elseif rolanmeet = 1:	
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet2.jpg"></center>'		
+		'Once again, you approach the man but he doesn''t seem to be asleep this time, he''s eyeing a glass that you''re sure is filled with alcohol. "Hey! You can''t drink here at school!"'
+		'The man doesn''t look at you, "Leave me alone, I''m enjoying my break..."'
+		'You scold him, "I''m telling you that you can''t drink here!"'
+		'He starts swirling his glass around, "Miss Volkov, I''m not doing anything, and besides, I''ve finished my work. Shouldn''t you be worrying about yours?"'
+		'You raise your voice, "I''m <b>NOT</b> Miss Volkov and <b>YOU</b> are giving us a bad example!"'
+		'He suddenly looks up at you, "Wha-?"'
+		act 'Pull his chair out':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet3.jpg"></center>'		
+			'He comically falls on the floor, "Hey! What are you doing!?"'
+			'"You are in no position to question me! Why are you drunk? You''re in a school, do you know that? I should call the police!"'
+			'He starts to reach for the chair you pulled out from under him, "Hey! I''m not drunk and I''m on break!"'
+			'"Right, like I believe that. What are you doing here? Are you... homeless?" You start feeling a little bit of remorse.'
+			'"Huh? No, I''m the janitor! <i>I</i> should be the one reporting <i>you</i>! Who do you think you are, throwing people around like this? I should have a word with Miss Volkov..."'
+			'"Wha-" you start to ask when you notice the name tag on the table. <i>Rolan Matveev: Janitor</i>. Shit! He really does work here! "Oh, uh, I''m really sorry, sir. I didn''t see your badge..."'
+			'He stands back up, "Hmph. Fine, you can go, I''ll let you off with a warning <b>this time</b>. Now, shoo, leave me alone!"'
+			'You feel a little guilty, but still he is drinking in a school. "I''m really sorry, sir, but... why are you drinking at school? If Miss Volkov finds out, you could be fired!"'
+			'"Didn''t I say ''shoo''? Anyways, this isn''t alcohol." He takes a quick swig of his drink.'
+			'With how he''s been acting and drinking his beverage, you''re not sure you believe that.'
+			'"Are you mocking me? No one ever wants to talk to me..."'
+			'"No, I''m just curious about you is all."'
+			'He sighs and laughs, "Oh, okay, I''m dreaming again. Hmm, the doctor said to let my dreams play out to better understand myself. Alright, <i>Miss Dream</i> this drink is actually..."'
+			act 'Continue': 
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet4.jpg"></center>'		
+				'He holds up a bottle you hadn''t noticed before, "Leninade! The only thing normal this school offers to wake you up!"'
+				'You eye the bottle, then his glass, "That doesn''t look like what''s in your glass! The color is completely different!"'
+				'He eyes you curiously, "Uh? The dream doesn''t usually talk back... what in the...?"'
+				'"Hey! I''m not a dream! Why on the Earth would Leninade wake up you? It''s just a soda."'
+				'"Okay, wow, for a figment of my imagination, you sure are pretty dumb..."'
+				'What did he say about you? You slap at his arm.'
+				'"Hey! I really felt that! You are real! But, why are speaking to me?"'
+				'"Are you for real? if that is Leninade then why is the color different? You''re lying, this is alcohol!" You grab the glass and smell it for alcohol. While it certainly doesn''t smell good, you don''t actually smell any alcohol. "Huh, what is this?"'
+				'He snatches his glass back from you, "I already told you, it''s Leninade. It just has some coffee and tea mixed in with it."'
+				'If he mixes those three drinks together... "You must really need the energy. Why don''t you eat the food here instead, Mister..." Dammit! You''ve forgotten his name already!'
+				'"Matveev, Rolan Matveev. I can understand a girl not liking a drink like this. What you would you know about needing energy for work, Miss..."'
+				'"<<$pcs_lastname>>, <<$pcs_firstname>> <<$pcs_lastname>>... anyways, you didn''t answer my question: Why don''t you eat here like everyone else?"'
+				'"Well, Miss <<$pcs_lastname>>, I don''t trust the cook. She never lets me enter the kitchen."'
+				'"Well, if something were wrong with the food, you''d see a lot of people in the hospital. I think you''re being paranoid." The bell rings. "I have to go. See you around, Mr. Matveev!"'
+				'"Sure, see you around, Miss <<$pcs_lastname>>."'
+				act 'Leave': gt 'gschool_lessons', 'short_break'
+			end
+		end
+	elseif rolanmeet = 2:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet5.jpg"></center>'		
+		'You see Rolan sitting alone at his usual table and decide to approach him, "Hello, Mr. Matveev!"'
+		'"Huh? Me? Oh..." Rolan raises his eyes to yours, "G-good morning, Miss <<$pcs_lastname>>."'
+		'"Do you mind if I sit with you? It seems like there''s plenty of space."'
+		'"Um, hey! Where''s the camera? Is this another joke?" He sounds a bit agitated.'
+		'You''re a bit confused, "Huh? What are you talking about?"'
+		'"So there''s no camera?" Rolan quickly looks around, "This isn''t some kind of joke or prank...?"'
+		'"Mr. Matveev, I don''t understand. I wanted to apologize for last time."'
+		'"Oh, okay... apology accepted." He sounds somewhat relieved but still hesitant, "You can go now, Miss <<$pcs_lastname>>."'
+		'"You don''t want me to sit with you? Are you waiting for someone?" You peak around the cafeteria.'
+		act 'Continue':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet6.jpg"></center>'		
+			'"Waiting for someone? Me?" You take his answer as a no and sit in the table.'
+			'"I can leave if you really want me to. I just wanted to show you that the school''s food isn''t that bad."'
+			'"You can stay, if you want. It''s just, no one has ever wanted to stay near me."'
+			'"Well, i was rude to you last time. And besides, you need to eat something. Let me go grab some food and I''ll be right back!"'
+			'"I don''t know, Miss <<$pcs_lastname>>..."'
+			'"What''s the problem? C''mon, it''s my treat! I''ll even take a few bites first to show you it''s okay!"'
+			'Roman stammers, trying to make an excuse.'
+			'"I''ll be back in a minute!" You walk away from the table and grab some food.'
+			'Roman is still stammering when you get back.'
+			'"Here we go! I''ll take the first bite!" You savour a little of the lunch, "See? It''s all good! Now you try a bite!"'
+			'Rolan grabs at a piece with his bare hands.'
+			'"No, silly! Use the knife and fork  You''re making a mess..."'
+			act 'Help Rolan':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet7.jpg"></center>'		
+				'"Err, are you sure this is a good idea?"'
+				'"Yes, you don''t want to make a mess, do you? Here, let me help you." You show Mr. Matveev the proper way to use a knife and fork.'
+				'Rolan takes a few bites of his food, "Oh, this is not so bad, actually."'
+				'"See? Neither of us died. I know it''s not the best but it still fills you up and gives you energy."'
+				act 'Continue':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet8.jpg"></center>'		
+					'Rolan starts sniffling.'
+					'"Oh, too much onion? Next time we''ll try something different then."'
+					'Rolan clears his throat "...t-thanks... M-Miss <<$pcs_lastname>>..."'
+					'"Take a drink of some water, that should help. I have to get to close now. I''ll see you next time, Mr. Matveev."'
+					'You can''t help but think that Rolan seems like a lonely man. You make a mental note to try and spend more time with him.'
+					act 'Leave ': gt 'gschool_lessons', 'short_break'
+				end
+			end
+		end
+	elseif rolanmeet = 3:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet9.jpg"></center>'		
+		'You decided to visit Rolan in your free time, but he''s not at his usual table. You turn and see he''s mopping the floor. "Hi, Mr. Matveev!"'
+		'"M-miss <<$pcs_lastname>>, good morning. You shouldn''t be seen talking to me!"'
+		'"Hmm? Why not? I can talk with whoever i like."'
+		'He only stammers.'
+		'"Oh, I guess you''re busy working?"'
+		'"Well, no. To be honest, I was waiting for the lunch break to finish."'
+		'"Great!" You tell him. "Then grab a lunch, they are free for staff you know. I''ll wait for you at our table."'
+		'He seems surprised. "What, our lunches are free?"'
+		'"Um, yes, they are. Did you not know that? Just grab your food and show your badge to the cashier."'
+		'"No..." Rolan stands in the lunch line apprehensively, as if he still doesn''t believe you. When he returns with his food, he smiles at you. "Hey, it worked!"'
+		'You lightly laugh, "I told you so!"'
+		'"So, now what?"'
+		'"Uh, we go and eat."'
+		'"Oh, right..."'
+		'You motion Rolan to follow you, "Come on, Mr. Matveev, or someone will take our table."'
+		act 'Go sit':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet10.jpg"></center>'		
+			'When you get seated, you noticed Rolan is staring at his food. "Is there something wrong, Mr. Matveev?"'
+			'"Uh..."'
+			'"Oh, let me take a bite first." You grab a piece of lettuce and munch on it.'
+			'"Hmm." Rolan is still staring at the food.'
+			'"What is it, Mr. Matveev?"'
+			'He stares for another moment before looking up at you, "Umm, what is this?"'
+			'Did he really just ask you that? "It''s a salad with walnuts..."'
+			'"I remember walnuts being bigger and i could crack them with my hands."'
+			'You have to stifle a laugh, "Well, they removed the shells. It would be awkward if you had to crack them while you ate."'
+			'"Hmm? Strange."'
+			'"Okay, you don''t have all day to eat. And don''t forget to use your fork."'
+			act 'Continue':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet11.jpg"></center>'		
+				'"Use a fork? Again?" He almost sounds like a child.'
+				'"Yes, it''s not polite to eat with your hands," you explain.'
+				'"Oh, okay." Rolan start to eat.'
+				act 'Continue':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet12.jpg"></center>'		
+					'After a few bites, Rolan looks a bit happier. "It''s good, right, Mr. Matveev?"'
+					'He continues eating.'
+					'"Well, how is it?"'
+					'He''s chomping on a few of the walnuts, "Hmm, no tooth loss..."'
+					'"Uh? Ha-ha, okay." He is really strange sometimes. "I have to get to class now. I''ll see you later, Mr. Matveev!"'
+					'"Oh, goodbye Miss <<$pcs_lastname>>..."'
+					act 'Leave ': gt 'gschool_lessons', 'short_break'
+				end
+			end
+		end
+	elseif rolanmeet = 4:
+		*clr & cla
+		minut += 4
+		gs 'stat'
+		'You decide to spend a little of your free time with Rolan. You wonder if his goofy behaviour is due to his loneliness or if that''s just who he is. You''ll have to spend a little more time with him to find the answer. "Hmm, where is he today? Maybe it''s his off day?"'
+		'<i><b>WHOOOSSSHHH!</b></i>'
+		'The wind howls as the door next to you opens.'
+		act 'Continue':
+			*clr & cla
+			minut += 4
+			gs 'stat'
+			rolanmeet += 1
+			$track_loop = 'sound/windhowl.mp3'
+			volume = 50
+			music_loop = 1
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet13.jpg"></center>'		
+			'<i><b>WHOOOSSSHHH!</b></i>'
+			'Rolan walks through the door. "Woah, windy day, isn''t it, Miss <<$pcs_lastname>>!"'
+			'"Uh? Mr. Matveev?"'
+			'Rolan is struggling to close the door. "Could you lend me a hand, Miss <<$pcs_lastname>>? It''s hard with this wind..."'
+			'<i><b>WHOOOSSSHHH!</b></i>'
+			'"Sure!" You rush over to Rolan to offer your help.'
+			'<i><b>WHOOOSSSHHH!</b></i>'
+			'It''s a really windy day...'
+			act 'Close the door':
+				*clr & cla
+				music_loop = 0 & close all
+				minut += 4
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet14.jpg"></center>'		
+				'You''re both a little out of breath, "Whew, thank you, Miss <<$pcs_lastname>>. Excuse me for a second, the wind messed up my hair."'
+				'"Okay, Mr. Matveev."'
+				'"I was trying to clean the courtyard outside, but with this wind today it''s nearly impossible! I''ll have to try again later."'
+				'"Well, in that case, you should eat something so you have energy for later."'
+				'"Mmm, yes, I think I could eat something."'
+				'"Good! Why don''t you grab a lunch? I think they''re serving steak today. i''ll save you a seat, Mr. Matveev." You find an empty table and wait for Rolan.'
+				act 'Wait for Rolan':
+					*clr & cla
+					minut += 4
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet15.jpg"></center>'		
+					'You see Rolan with his plate and wave at him, "Mr. Matveev, over here!"'
+					'"Oh there you are, Miss <<$pcs_lastname>>." Rolan walks over to you and sits down.'
+					'You snatch a small piece and ''test'' it for Rolan. It tastes really good but you know Rolan needs to eat, "It''s good! Eat so you have your energy for later."'
+					'Rolan starts to eat. With his hands. Again.'
+					'You lightly smack the table, "No! Fork and knife, fork and knife... we are civilized people, Mr. Matveev!"'
+					'"Ehh, right, right."'
+					'Rolan takes his fork and knife and quickly cuts his steak into two pieces before basically swallowing both. Did he even chew either piece?'
+					'"Wow, Mr. Matveev! You must have really enjoyed that steak. Well, since you''re finished eating so soon, we have some time to talk."'
+					'"Talk? I-I dont''t know... usually only Miss Volkov talks to me when she gives me the tasks for the day..."'
+					'You pout, "Aww, you don''t want to talk with me..."'
+					'"Oh no! No, no, no, no... Miss <<$pcs_lastname>>... I-I... just don''t know what to talk about. i''m not used to speaking with anyone."'
+					'"Well, what kind of hobbies do you have? What do you do when you''re done working?"'
+					'"Oh, uh, I go home." Suddenly, the bell rings.'
+					act 'Say goodbye':
+						*clr & cla
+						minut += 4
+						gs 'stat'
+						'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet16.jpg"></center>'		
+						'"I have to go, I don''t want to be late! We''ll continue another time if you don''t mind. Bye, Mr. Matveev!"'
+						'"Goodbye, Miss <<$pcs_lastname>>."'
+						act 'Leave ': gt 'gschool_lessons', 'short_break'
+					end
+				end
+			end
+		end
+	elseif rolanmeet = 5:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet17.jpg"></center>'		
+		'"Miss <<$pcs_lastname>>!" Rolan seems cheerful this morning.'
+		'You wave at him, "Mr. Matveev! Good morning!"'
+		'He points to an empty seat, "Do you want to sit with me? You always ask me, so I feel it''s my turn to ask you."'
+		'"Of course, Mr. Matveev. I actually wanted to see how you are." You sit down across from him.'
+		'"I''m doing pretty well, Miss <<$pcs_lastname>>. i feel full of energy today!"'
+		'"I see that." You notice him holding something. It looks like food. "What have you got there? It doesn''t look like something they were serving today."'
+		'"Oh this? I''ve brought something from home, a sandwich I made with my own hands! I''d like you to try some it! It''s delicious... not that what they serve here isn''t good."'
+		act 'Continue':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet18.jpg"></center>'		
+			'Rolan is actually eating his sandwich with a fork and knife. You find it somewhat amusing. "Mr. Matveev, it''s okay to eat a sandwich with your hands!"'
+			'He shakes his head, "No, no, we are civilized people, remember?"'
+			'You laugh, "Yes, Mr. Matveev, I remember. But i assure you, that it''s okay this time."'
+			'"Okay, if you say so, Miss <<$pcs_lastname>>." He tears off a piece and hands it towards you, "Please, have a bite. It''s safe, I promise!"'
+			'You''re a bit hesitant, but you don''t want to offend Rolan.'
+			act 'Take a bite':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet19.jpg"></center>'
+				!! LURK MORRISON Suggestion - Should be a minor mood decrease here. Maybe a hunger decrease as well?
+				'You almost retch after taking a bite. What... is in this? It''s a medley of different flavors, none of which should go together. You also taste... <i>CHEWING GUM</i>?'
+				'You attempt to gather yourself before speaking. "...t-thanks. So, um, last time we were talking about what you do in your free time...?"'
+				'Rolan takes back his sandwich and continues to eat, oblivious to your disgust. "Yes, when I get off work, I go home. Sometimes I like to go for a walk or do chores, maybe take a bath. Do you want another bite?" He offers you the ''sandwich'' again.'
+				'"Er, no thanks, Mr. Matveev..." Rolan stops chewing.'
+				act 'Continue':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet20.jpg"></center>'		
+					'"Was there too much garlic? You can pinch your nose if it bothers you..."'
+					'You really don''t want to insult Rolan so you make up an excuse, "No, no. I''m, uh, I''m going to be a model some day, so I need to watch my figure, you know?"'
+					'"Oh, is there a class you take for that? I wasn''t aware." He actually fell for that?'
+					'You suddenly feel your stomach lurch, the sandwich is making a return trip. You quickly get up, "I''m sorry, Mr. Matveev, but I have to go. I just remembered something I have to do!"'
+					'Rolan continues eating, "Oh? Goodbye, Miss <<$pcs_lastname>>!"'
+					act 'RUN!':
+						*clr & cla
+						minut += 5
+						gs 'stat'
+						'<center><img src="images/characters/pavlovsk/resident/rolan/apartment/kitch/rolansoup0.jpg"></center>'		
+						'"...shit!...i hate to puke... " ... BLUURB...And you spend some time to clean your stomach. "What the fuck!...that ... roll... . Better clean..." Fortunately you avoid to make a mess...just in time.'
+						'<i>Shit! I''m going to puke!</i> You race to the restroom and find an empty stall just in time. If you''d thought it tasted awful the first time...'
+						act 'Leave ': gt 'gschool_lessons', 'short_break'
+					end
+				end
+			end
+		end
+	elseif rolanmeet = 6:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet21.jpg"></center>'		
+		'You spot Rolan and he''s already waving you over, "Miss <<$pcs_lastname>>, good morning! I''ll get our lunch today!"'
+		'"NO!  Um, I mean, good morning to you as well, Mr. Matveev!" You remember your last lunch together, "Let''s keep our meal light today, yeah?"'
+		'"Uh?" He looks a little perplexed.'
+		'You turn him around and gently push him towards the tables, "Yes, why don''t you find us a spot to sit and I''ll grab our food!"'
+		'"Uh, okay, Miss <<$pcs_lastname>>..."'
+		act 'Continue':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet22.jpg"></center>'		
+			'You opt to grab two ice cream cones instead. Surely Rolan can''t mess that up?'
+			'He looks at you a bit confused, "Hmm, I didn''t know you could have ice cream for lunch. Is this beef flavored?"'
+			'You laugh at Rolan for a few seconds, "Uh? No, silly... when would they ever... oh, I see, you''re mocking me!"'
+			'Mr. Matveev quickly eats his ice cream. If you ate ice cream that fast, you''d definitely have a brain freeze...'
+			act 'Continue':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet23.jpg"></center>'		
+				'"Wow, that was fast! I guess you really liked it? Oh, but now you''re a little dirty..."'
+				'"Huh?"'
+				act 'Uh?':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet24.jpg"></center>'		
+					'Rolan looks down, "Oh! You mean my jacket?"'
+					'You stare at Mr. Matveev for a moment. "How do you eve-never mind... Well i assume you enjoyed that?"'
+					'"It was... sweet tasting. What flavor was it?"'
+					'"It was white ... i assume it was vanilla."'
+					'"Vanilla? I think I''ve heard of that before. Tastes different from beef though. Very sweet."'
+					'You keep yourself from shuddering at thought of meat flavored ice cream. "I''m no expert on ice cream flavors but i think that the sweetness comes from the sugar..."'
+					'"Sugar, huh? I should add that to my foods..." You don''t doubt he would.'
+					'"I''m happy you liked it." The bell rings, "Oh! I gotta run. Goodbye, Mr Matveev. I''ll see you next time!"'
+					'You stand up. "Rolan. You call me Rolan," he says to you. "See you soon, Miss <<$pcs_lastname>>."'
+					'"Oh sure... Rolan. You can call me <<$pcs_nickname>>."'
+					'"No, that wouldn''t be polite for a man to do to a woman. Goodbye, Miss <<$pcs_lastname>>."'
+					'"Ah, okay. Goodbye Mr Matv... I mean, Rolan!"'
+					act 'Leave ': gt 'gschool_lessons', 'short_break'
+				end
+			end
+		end
+	elseif rolanmeet = 7:
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		rolanmeet += 1
+		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet25.jpg"></center>'		
+		'"Miss <<$pcs_lastname>>! It''s a pleasure to see you. Having a nice day?"'
+		'"Oh, the same as always. Good morning, Mr... uh, Rolan. It''s a bit odd that I can call you by your first name, but you can''t do the same."'
+		'"I told you, it''s not polite for a man to address a lady in such a way. Besides," he smiles, "calling me ''Rolan'' helps me feel a bit younger."'
+		'You look down at your feet, "Well ''Miss <<$pcs_lastname>>'' makes me feel old..."'
+		'He shakes his head, "Nonsense! Women cannot be old!"'
+		'You giggle, "Oh, well I''ll take it as a compliment then, Rolan!"'
+		'"It''s simply the truth, Miss <<$pcs_lastname>>."'
+		'"Say Rolan... have you had lunch yet? We could eat together?"'
+		act 'Continue':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet26.jpg"></center>'		
+			'"I''m sorry, Miss <<$pcs_lastname>>. Miss Volkov has increased my work duties and I''m afraid I can only eat after I''m done working..." He sounds pretty disappointed.'
+			'"Aww," you return his disappointment. "I was enjoying our lunch talks."'
+			'"As was I, Miss <<$pcs_lastname>>, but unfortunately that is my job. I cannot say no to Miss Volkov." He stares down at his mop.'
+			'"Can''t you do something? Surely, you do enough work for the school already?" You''re almost pleading with him now.'
+			'"No, it''s perfectly legal. Plus, I am getting paid more for the extra work."'
+			'"Oh, well." You think it over. "Maybe I could come by and see you after school?"'
+			'"I don''t know, Miss <<$pcs_lastname>>. A young girl visiting an older man outside of school, people might talk..."'
+			'"What''s wrong with a visit from a friend?"'
+			'"I-I don''t know..." he stammers.'
+			'"Come on... where do you live? I''ll stop by sometime and we could have tea?"'
+			'"Maybe you''re right."'
+			act 'Give him a sheet of paper':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet27.jpg"></center>'		
+				'"Great! Here, write down your address, Rolan! I''ll come visit you sometime. Just keep some water heated up for our tea!"'
+				'He eyes the paper, "Err, okay, water for the tea. But are you sure about this?"'
+				'"Of course! We are friends and I want to know you better."'
+				'"Sure, we''re friends. I like that! Okay, but..."'
+				'"No buts, Rolan! Now write your address down, I have to get to class!"'
+				'"Oh, uh, right." Rolan writes down his address and hands you the paper. "Here''s where I live. I know it''s not the greatest place..."'
+				'You look over the address. Hey! It''s on the <b>first floor of the apartment complex west of yours</b>!'
+				'"Oh, we live in the same area! Don''t worry, I know how awful the complexes are. I really have to go now, bye bye Rolan!"'
+				act 'Continue':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet28.jpg"></center>'		
+					'"Goodbye, Miss <<$pcs_lastname>>! Don''t be late for your class... Bah, water for the tea. Kids today!"'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				end
+			end
+		end
+	end
+end
+
 --- gschool_lunch ---------------------------------
 

+ 4 - 4
locations/gskino.qsrc

@@ -20,7 +20,7 @@ $kinoevent = {
 		'<center><img src="images/locations/pavlovsk/park/theater/sex/kino.mp4"></center>'
 		'You see on the back row a girl sucking a guy, nobody reacts to the loud smacking sound that can be heard by the whole cinema.'
 		'You turn back and watch the rest of the film.'
-		act 'Leave the cinema':gt'gskver'		
+		act 'Leave the cinema':gt 'gskver', 'start'		
 	end
 }
 
@@ -39,7 +39,7 @@ if money >= 100:
 			act 'Reject':
 				cla
 				'You tell him you''d rather watch the film, he mutters something that sounded like bitch and leaves you to watch the rest of the movie in peace.'
-				act 'Leave the cinema':gt 'gskver'
+				act 'Leave the cinema':gt 'gskver', 'start'
 			end
 			
 			exit
@@ -50,11 +50,11 @@ if money >= 100:
 			'You quietly watch the movie, but suddenly behind you there is a strange sound.' & dynamic $kinoevent
 		end
 
-		act 'Leave the cinema':gt 'gskver'
+		act 'Leave the cinema':gt 'gskver', 'start'
 	end
 end
 
-act 'Leave the cinema':minut += 5 & gt 'gskver'
+act 'Leave the cinema':minut += 5 & gt 'gskver', 'start'
 
 --- gskino ---------------------------------
 

+ 152 - 145
locations/gskver.qsrc

@@ -1,180 +1,187 @@
 # gskver
 CLOSE ALL
-if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
-	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
+
+if $ARGS[0] = 'start':
+	cls
+	$metka = 'start'
+	$loc = 'gskver'
+	$location_type = 'public_outdoors'
+	gs 'stat'
+
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+		else
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
+		end
 	end
-end
-$metka = ''
-$loc = 'gskver'
-$location_type = 'public_outdoors'
-cls
-gs 'stat'
-
-if $clothingworntype = 'nude':pcs_willpwr -= 15 & pcs_mood -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$pcs_lastname>> girl. Youth these days, they have no shame at all!"'
-
-if month=3 or month=4 or month=5:
-	if hour>=6 and hour<=17:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'
-		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
-		'There are puddles on the ground everywhere, all remains from the melted snow. A lot of people in the park are having fun with them, trying to jump over them and mocking those that fail. They''re not particularly deep though, and plenty of others just walk through without giving them a second thought.'
-		'The park is not particularly crowded, this time of year. Many people think it''s still too cold to spend much time outdoors.'
-		''
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.night.jpg"></center>'
-		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
-		'There is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
-		''
+
+	if $clothingworntype = 'nude':pcs_willpwr -= 15 & pcs_mood -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$pcs_lastname>> girl. Youth these days, they have no shame at all!"'
+
+	if month=3 or month=4 or month=5:
+		if hour>=6 and hour<=17:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'
+			'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
+			'There are puddles on the ground everywhere, all remains from the melted snow. A lot of people in the park are having fun with them, trying to jump over them and mocking those that fail. They''re not particularly deep though, and plenty of others just walk through without giving them a second thought.'
+			'The park is not particularly crowded, this time of year. Many people think it''s still too cold to spend much time outdoors.'
+			''
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.night.jpg"></center>'
+			'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
+			'There is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
+			''
+		end
 	end
-end
-if month=6 or month=7 or month=8:
-	if hour>=6 and hour<=19:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
-		'The main square of Pavlovsk Park. At this time of year, it''s one of the primary places in town that locals and tourists enjoy spending their spare time in. It''s always busy: people are resting, walking, playing and dating to their heart''s desires, enjoying the nice surroundings.'
-		''
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.summer.night.jpg"></center>'
-		'The main square of Pavlovsk Park. At this time of year, it''s one of the places where locals and tourists enjoy going in their spare time.'
-		'However, there is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
-		''
+	if month=6 or month=7 or month=8:
+		if hour>=6 and hour<=19:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
+			'The main square of Pavlovsk Park. At this time of year, it''s one of the primary places in town that locals and tourists enjoy spending their spare time in. It''s always busy: people are resting, walking, playing and dating to their heart''s desires, enjoying the nice surroundings.'
+			''
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.summer.night.jpg"></center>'
+			'The main square of Pavlovsk Park. At this time of year, it''s one of the places where locals and tourists enjoy going in their spare time.'
+			'However, there is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
+			''
+		end
 	end
-end
-if month=9 or month=10 or month=11:
-	if hour>=6 and hour<=18:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.jpg"></center>'
-		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves. The leaves that are still on the trees have changed colour, and are a beautiful mix of red and brown.'
-		'Everywhere in the park, people are enjoying nature. Some are taking photos of the fallen leaves, kids are playing everywhere, and couples are walking hand-in-hand, simply enjoying each other''s company.'
-		''
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.night.jpg"></center>'
-		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves.'
-		'It gets quite cold at night, and you try to stay active to keep yourself warm. The lone soul you see running across the park is probably trying to get home faster, to warm up with some nice cocoa.'
-		''
+	if month=9 or month=10 or month=11:
+		if hour>=6 and hour<=18:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.jpg"></center>'
+			'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves. The leaves that are still on the trees have changed colour, and are a beautiful mix of red and brown.'
+			'Everywhere in the park, people are enjoying nature. Some are taking photos of the fallen leaves, kids are playing everywhere, and couples are walking hand-in-hand, simply enjoying each other''s company.'
+			''
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.night.jpg"></center>'
+			'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves.'
+			'It gets quite cold at night, and you try to stay active to keep yourself warm. The lone soul you see running across the park is probably trying to get home faster, to warm up with some nice cocoa.'
+			''
+		end
 	end
-end
-if month=1 or month=2 or month=12:
-	if hour>=7 and hour<=16:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
-		'The main square of Pavlovsk Park. It''s winter, and the park is quite busy with locals and tourists alike.'
-		'There''s snow everywhere, and kids from the whole town have gathered here to make snowmen and enjoy snowball fights. Some of the adults are joining them, happy to play like kids again for just a moment.'
-		''
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
-		'The main square of Pavlovsk Park. It''s winter, and the nights in Pavlovsk are very cold.'
-		'As you expected, the park is mostly deserted at this time of day. You occasionally see a wild animal, scrounging for food.'
-		''
+	if month=1 or month=2 or month=12:
+		if hour>=7 and hour<=16:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
+			'The main square of Pavlovsk Park. It''s winter, and the park is quite busy with locals and tourists alike.'
+			'There''s snow everywhere, and kids from the whole town have gathered here to make snowmen and enjoy snowball fights. Some of the adults are joining them, happy to play like kids again for just a moment.'
+			''
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
+			'The main square of Pavlovsk Park. It''s winter, and the nights in Pavlovsk are very cold.'
+			'As you expected, the park is mostly deserted at this time of day. You occasionally see a wild animal, scrounging for food.'
+			''
+		end
 	end
-end
 
-*nl
+	*nl
 
-if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
-'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace.'
+	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
+	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace.'
 
-if GvstreBoy = 1:'You see <a href="exec:numnpc = SkverBoy & gt ''Gnpc''"><<$nameBoyfrend[SkverBoy]>></a> walking across the main square of Pavlovsk Park. He doesn''t look like he''s going anywhere in particular, and seems to just be enjoying his walk.'
-!!if kotovLoveQW > 0 and hour >= 18 and hour < 20 and week < 6 or week >= 6 and kotovLoveQW > 0 and hour >= 9 and hour < 20:'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> sitting on a bench in the park, drinking beer by himself. Judging from the empty bottles near the bench, he''s already had a few.'
-if StoryLine = 1 and SchoolAtestat = 0:
-	if (sunWeather = 1 and temper > 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
-		'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting on a park bench, drinking beer.'
+	if GvstreBoy = 1:'You see <a href="exec:numnpc = SkverBoy & gt ''Gnpc''"><<$nameBoyfrend[SkverBoy]>></a> walking across the main square of Pavlovsk Park. He doesn''t look like he''s going anywhere in particular, and seems to just be enjoying his walk.'
+	!!if kotovLoveQW > 0 and hour >= 18 and hour < 20 and week < 6 or week >= 6 and kotovLoveQW > 0 and hour >= 9 and hour < 20:'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> sitting on a bench in the park, drinking beer by himself. Judging from the empty bottles near the bench, he''s already had a few.'
+	if StoryLine = 1 and SchoolAtestat = 0:
+		if (sunWeather = 1 and temper > 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
+			'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting on a park bench, drinking beer.'
+		end
 	end
-end
 
-if week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 0:
-	'You can see the <a href="exec:gt ''FedorMisc'', ''Outcast Intro''">train tracks</a> from here.'
-elseif week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 1:
-	'You can see the train tracks where <a href="exec:gt ''FedorMisc'', ''Outcast''">Fedor</a> spends his time.'
-end
+	if week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 0:
+		'You can see the <a href="exec:gt ''FedorMisc'', ''Outcast Intro''">train tracks</a> from here.'
+	elseif week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 1:
+		'You can see the train tracks where <a href="exec:gt ''FedorMisc'', ''Outcast''">Fedor</a> spends his time.'
+	end
+
+	if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
+		'You see Rex walking in the park.'
+		act 'Go and see Rex':gt 'reks', 'skver'
+	end
 
-if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
-	'You see Rex walking in the park.'
-	act 'Go and see Rex':gt 'reks', 'skver'
-end
 
-if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
-	!nowhere to live in town
 	if hour >= 20 or hour < 6 :
-		'It''s quite dark now, and you have no where to stay. Maybe you should try to sleep on a bench?'
-		if StoryLine = 1:*P ' Or try your luck, go Uncle Shulgin''s Apartment?'
-		act 'Sleep on a bench': ParkBench = 0 & gt'placer_sex','sleeping_parc_bench'
+		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
+			!nowhere to live in town
+			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
+			if StoryLine = 1:*P ' Or try your luck, go Uncle Shulgin''s Apartment?'
+		else
+			'It''s quite dark now, and you don''t feel like walking. Maybe you Should try sleeping on a bench?'
+		end
+		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
 	end
-end
 
-act 'Sit down on the bench': ParkBench = 0 & gt'placer_sex','sleeping_parc_alco'
-
-act 'Go for a walk (0:15)':
-	if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
-	cla
-	*clr
-	minut += 15
-	place = 1
-	Frend_num = 0
-		if MagikDostup ! 1:
-			if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
-				gt 'MagEncounterFairy'
-			end
-		end
-	gt 'placer'
-end
+	act 'Sit down on the bench': gt'placer_sex','sitting_park_bench'
 
-if hour >= 8 and hour < 22:
-	act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
+	act 'Go for a walk (0:15)':
+		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 		cla
 		*clr
-		minut += 60
-		money += 50
-		pcs_mood -= 5
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
-		'You spend an hour handing out flyers to park visitors, advertising something or another. You get paid 50 <b>₽</b> for your efforts.'
-
-		act 'Continue':gt 'gskver'
+		minut += 15
+		place = 1
+		Frend_num = 0
+			if MagikDostup ! 1:
+				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
+					gt 'MagEncounterFairy'
+				end
+			end
+		gt 'placer'
+	end
+
+	if hour >= 8 and hour < 22:
+		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
+			cla
+			*clr
+			minut += 60
+			money += 50
+			pcs_mood -= 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
+			'You spend an hour handing out flyers to park visitors, advertising something or another. You get paid 50 <b>₽</b> for your efforts.'
+
+			act 'Continue':gt 'gskver', 'start'
+		end
 	end
-end
 
-gs 'parkivent', 'run'
+	gs 'parkivent', 'run'
 
-! meynold`s events
-if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-	!disable after can access home
-	act 'Look for Vika': 
-		gs 'mey_vika_events', 'park_meet'
-		gs 'stat'
-		if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
+	! meynold`s events
+	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
+		!disable after can access home
+		act 'Look for Vika': 
+			gs 'mey_vika_events', 'park_meet'
+			gs 'stat'
+			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
+		end
 	end
-end
 
-if pcs_inhib >= 35:
-	act 'Flash your tits':
-		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-		cls
-		gs 'exhibitionism', 1
-		gs 'flash', 'tits', 'outdoors', 5
-		gs 'stat'
+	if pcs_inhib >= 35:
+		act 'Flash your tits':
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			cls
+			gs 'exhibitionism', 1
+			gs 'flash', 'tits', 'outdoors', 5
+			gs 'stat'
 
-		act 'Continue': gt 'gskver'
+			act 'Continue': gt 'gskver', 'start'
+		end
 	end
-end
 
-gs 'kseniyaQW', 'events'
+	gs 'kseniyaQW', 'events'
 
-if exhibitionist_lvl > 1:
-	act 'Flash your pussy':
-		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-		cls
-		gs 'exhibitionism', 3
-		gs 'flash', 'pussy', 'outdoors', 5
-		gs 'stat'
+	if exhibitionist_lvl > 1:
+		act 'Flash your pussy':
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			cls
+			gs 'exhibitionism', 3
+			gs 'flash', 'pussy', 'outdoors', 5
+			gs 'stat'
 
-		act 'Continue': gt 'gskver'
+			act 'Continue': gt 'gskver', 'start'
+		end
 	end
-end
 
-act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-act 'Go to the high street':minut += 5 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+	act 'Go to the high street':minut += 5 & gt 'pavCommercial'
+end
 
 --- gskver ---------------------------------
 

+ 1 - 1
locations/hairsalon.qsrc

@@ -981,7 +981,7 @@ if $ARGS[0] = 'dyehair':
 			gs 'stat'
 			'"I want to try something really different." you tell her.'
 			'"And what would that be?" The hairdresser asks cheerfully.'
-			'"IA nice dark purple, like a dark wine." you announce.'
+			'"I want it nice dark purple, like a dark wine." you announce.'
 			'"No problem, this''ll be fun. Please have a seat.", she says and turns around one of the chairs for you.'
 
 			act 'Sit down':

+ 11 - 11
locations/hanters.qsrc

@@ -112,9 +112,9 @@ elseif hour = 8 or hour = 14 or hour = 19:
 			gs 'stat'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-			'You enthusiasticly listen to the their hunting stories and even share some of your stories.'
+			'You enthusiastically listen to the their hunting stories and even share some of your stories.'
 			gs 'hanters', 'hanters_talk'
-			'You get caught up in the conversation, you don''t even notice how fast the time flies by.'
+			'You get so caught up in the conversation, you don''t even notice how fast the time flies by.'
 		end
 		act 'Move away': gt 'swamp_yard'
 	end
@@ -176,14 +176,14 @@ elseif hour = 8 or hour = 14 or hour = 19:
 						shootingday = daystart
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-						'You approach the hunters sitting in a clearing "Guys, could you give me the rifle I want to try it out again?" you ask the hunters.'
+						'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
 						if shooting = 1:
 							shooting = 2
 							'"Okay, <<$pcs_nickname>>, just don''t end up like the first time," Andrei said jokingly.'
 						elseif pcs_shoot <= 10:
 							'"Sure, <<$pcs_nickname>>, just be careful." Andrei said smiling.'
 						else
-							'"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expansive." Andrei said smiling.'
+							'"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expensive." Andrei said smiling.'
 						end
 						if pcs_shoot >= 1 and pcs_shoot <= 10:
 
@@ -237,8 +237,8 @@ elseif hour = 8 or hour = 14 or hour = 19:
 						shootingday = daystart
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-						'You approach the hunters sitting in a clearing "Guys, could you give me the rifle I want to try it out again?" you ask the hunters.'
-						'"You need to heal your forehead first." Andrei said smiling. "You''re like an amazon, you need to relax."'
+						'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
+						'"You need to heal your forehead first." Andrei says smiling. "You have the spirit of an Amazon, you need to relax."'
 
 						act'Further':gt 'swamp_yard'
 					end
@@ -3367,7 +3367,7 @@ if $ARGS[0]='hanterslutLEG2':
 	if pcs_health <= 50:act 'Lose consciousness':gt 'hanters', 'hantersgroupfaint'
 end
 
-if $ARGS[0]='hanters_talk':
+if $ARGS[0] = 'hanters_talk':
 	temp = rand(1,35)
 	if temp = 1:
 		'"What''s the difference between a dog and a fox?"'
@@ -3389,7 +3389,7 @@ if $ARGS[0]='hanters_talk':
 		'Not wanting to spook the little fella into spraying him, my dad slowly retreated toward the fence line, walking backwards and keeping the light trained on the skunk.'
 		'Suddenly, he felt something brush across his shoulders and back and quickly swung the flashlight around and shone it directly into the face of a scarecrow!'
 	elseif temp = 6:
-		'There once was politican that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walks into the forest, and met a man in sandals, a simple hat and a torn jacket, he looked like a typical village guy.'
+		'There once was politician that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walks into the forest, and met a man in sandals, a simple hat and a torn jacket, he looked like a typical village guy.'
 		'Man: "Where are you heading?"'
 		'Politician: "I''m gonna shoot a bear!"'
 		'Man: "Yes, you seem well prepared..."'
@@ -3408,9 +3408,9 @@ if $ARGS[0]='hanters_talk':
 	elseif temp = 9:
 		'The three hunters are talking:'
 		'"I once killed a whale with one shot."'
-		'"I strangled a bear with my bear hands."'
-		'"Have you ever heard of the Dead sea?"'
-		'"Who hasn??????t heard?"'
+		'"I strangled a bear with my bare hands."'
+		'"Have you ever heard of the Dead Sea?"'
+		'"Who hasn''t heard of it?"'
 		'"So I..."'
 	elseif temp = 10:
 		'"As I''m getting out of the house I see something resembling a eagle standing on the telephone pole."'

+ 1 - 17
locations/husb.qsrc

@@ -1,23 +1,7 @@
 # husb
 
-CLOSE ALL
-!! {location do not delete!}
-	if $loc = 'korr':$husb_action = ''
-	if $loc = 'bedr':
-		if hour > 22 or hour < 7: $husb_loc = 'Your husband <<$husName>> is lying in bed eyes open. "What do you want? It is late, go to sleep."'
-	end
-	if $loc = 'sitr':
-		if hour > 7 and hour < 17 and week >= 6: $husb_loc = 'Sitting on the couch is <a href="exec: gt''husb'',''start'' "><<$husName[1]>></a> watching TV.'
-		if hour > 17 and hour <= 22: $husb_loc = 'Sitting on the couch is <a href="exec: gt''husb'',''start'' "><<$husName[1]>></a> watching TV.'
-	end
-	if $loc = 'vanr':$husb_loc = ''
-	if $loc = 'kuhr':
-		if hour = 17 or hour = 7: $husb_loc = '<<$husName>> is sitting at the kitchen table.'
-	end
-	'<<$husb_loc>>'
-!! {end}
-
 if $ARGS[0] = 'start':
+	CLOSE ALL
 	cls
 	cla
 	gs'stat'

+ 3 - 0
locations/igorhome.qsrc

@@ -58,6 +58,7 @@ if $ARGS[0] = 'hallway':
 	$location_type = 'indoors'
 	cls
 	minut += 1
+	killvar '$locclass'
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
@@ -111,6 +112,7 @@ end
 if $ARGS[0] = 'igorroom':
 	cls
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
@@ -1106,6 +1108,7 @@ end
 if $ARGS[0] = 'igorparents':
 	*clr & cla
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><b><font color = maroon>Igor''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/bedroom.jpg"></center>'

+ 1 - 11
locations/island.qsrc

@@ -39,18 +39,8 @@ if student > 0:act '<b>GO HOME</b> (University dorm)':gt 'dorm', 'start'
 
 if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-act 'Wait':
-	cla
-	waiting = input ("How long would you like to wait? (Not more than 120 minutes)")
 
-	if waiting <= 0 or waiting > 120:
-		minut += 15
-	elseif waiting > 0 and waiting <= 120:
-		minut += waiting
-	end
-
-	act 'Take a look at the clock':gt curloc
-end
+act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 

+ 4 - 2
locations/katspalnya.qsrc

@@ -2,8 +2,10 @@
 $sexloc = $CURLOC
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'start'
+	$loc = 'katspalnya'
+	$location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><b><font color="maroon">Katja''s apartment</font></b></center>'

+ 10 - 6
locations/koncepod1.qsrc

@@ -15,7 +15,7 @@ end
 if $ARGS[0]='krr2x1':
     cla
     *clr
-    set minut = minut + 1
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Stairs</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod3.jpg" ></center>'
@@ -34,8 +34,10 @@ end
 if $ARGS[0]='krr2x':
     cla
     *clr
-    set minut = minut + 1
+	killvar '$locclass'
+    minut += 5
     pavserpsiday = daystart
+	gs 'stat'
     '<center><B><font color=maroon>Corridor</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/corridor.jpg" ></center>'
 
@@ -64,7 +66,7 @@ end
 if $ARGS[0]='str2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
     gs'stat'
 
     '<center><B><font color=maroon>Hall</font></B></center>'
@@ -83,7 +85,7 @@ end
 if $ARGS[0]='khr2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Kitchen</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/kitchen.jpg" ></center>'
@@ -102,7 +104,7 @@ if $ARGS[0] = 'vnr2x':
 	$metka = 'vnr2x'
 	$loc = 'koncepod1'
     cls
-    set minut += 5
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Bathroom</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/bathroom.jpg" ></center>'
@@ -119,7 +121,9 @@ end
 if $ARGS[0]='bdr2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
+	$location_type = 'private'
+	$locclass = 'bedr'
     gs'stat'
     '<center><B><font color=maroon>Bedroom</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/bedroom.jpg" ></center>'

+ 1 - 0
locations/korr.qsrc

@@ -7,6 +7,7 @@ $locM = $CURLOC
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'private'
+killvar '$locclass'
 if sound = 0:PLAY 'sound/korr.mp3',30
 
 if lesbiday + 14 <= daystart and lesbiQW >= 11 and hour >= 19 and santehnikDolg = 0:

+ 1 - 0
locations/korr2x.qsrc

@@ -4,6 +4,7 @@ if sound = 0:PLAY 'sound/korr.mp3',30
 $metka = ''
 $loc = 'korr2x'
 $location_type = 'private'
+killvar '$locclass'
 clr
 popolaini = 0
 saunaYouRoom = 0

+ 1 - 0
locations/korrPar.qsrc

@@ -9,6 +9,7 @@ $locM = $CURLOC
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'private'
+killvar '$locclass'
 clr
 popolaini = 0
 saunaYouRoom = 0

+ 8 - 6
locations/kotovdom.qsrc

@@ -67,9 +67,10 @@ if $ARGS[0] = 'vann':
 end
 
 if $ARGS[0] = 'kor':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kor'
+	$locM = 'kotovdom'
 	$location_type = 'private'
+	killvar '$locclass'
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -81,8 +82,9 @@ if $ARGS[0] = 'kor':
 end
 
 if $ARGS[0] = 'kotovkom':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kotovkom'
+	$locM = 'kotovdom'
+	$locclass = 'bedr'
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -95,8 +97,8 @@ if $ARGS[0] = 'kotovkom':
 end
 
 if $ARGS[0] = 'kuh':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kuh'
+	$locM = 'kotovdom'
 	*clr & cla
 	minut += 1
 	gs 'stat'

+ 17 - 15
locations/krupo.qsrc

@@ -26,31 +26,33 @@ end
 
 if pcs_sewng >= 40:
 	if tkanfirst = 0:
-		'The teacher tells you that you will need to bring in fabric for further studies, you can buy some in the hardware department at the supermarket.'
+		minut += 60
+		sewng_exp += rand(pcs_intel/20, pcs_intel/10)
+		'She has some spare fabric for you as it''s the first time you need some, but she tells you to bring some next time.'
+		msg 'The teacher tells you that you will need to bring in fabric for further studies, you can buy some in the hardware department at the supermarket.'
 		tkanfirst = 1
 	elseif tkan <= 0:
-		'The teacher reminds you, that in order to further improve your skills, you need to buy some fabric to work with.'
-		if tkanfirst = 1:
-			tkanfirst = 2
-			tkan = 1
-			'She has some spare fabric and gives it to you as it''s the first time you have forgotten, but she reminds you to bring some next time.'
-		end
+		msg 'The teacher reminds you, that in order to further improve your skills, you need to buy some fabric to work with.'
+		'You can''t do your lesson without fabric so there is nothing you can do here now.'
 	else
 		minut += 60
 		tkan -= 1
 		sewng_exp += rand(pcs_intel/20, pcs_intel/10)
 		'For an hour you learn more advanced techniques and practice cutting and sewing the fabric you purchased.'
-	end
-end
 
-if pcs_sewng >= 60 and poTalk = 0:
-	poTalk=1
-	'With a satisfied smile your teacher tells you, "Well done, now you can alter clothes to fit your size perfectly! However, this does not mean that any further studies would be useless. With further lessons I feel that I can teach you how to embroider splendid tapestries, which would be highly sought after, although very laborious to make."'
-end
+		if pcs_sewng >= 60 and poTalk = 0:
+			poTalk = 1
+			*nl
+			'With a satisfied smile your teacher tells you, "Well done, now you can alter clothes to fit your size perfectly! However, this does not mean that any further studies would be useless. With further lessons I feel that I can teach you how to embroider splendid tapestries, which would be highly sought after, although very laborious to make."'
+		end
 
-if pcs_sewng >= 80 and poTalk = 1:
-	'The teacher nods quietly and says, "You have mastered simple tapestries. It''s not without flaws, but good enough to be able to sell them and as your skills continue to grow, the quality will improve as well."'
+		if pcs_sewng >= 80 and poTalk = 1:
+			*nl
+			'The teacher nods quietly and says, "You have mastered simple tapestries. It''s not without flaws, but good enough to be able to sell them and as your skills continue to grow, the quality will improve as well."'
+		end
+	end
 end
+
 *nl
 'Your sewing skill is now <<pcs_sewng>>.'
 *nl

+ 1 - 1
locations/kuhrPar.qsrc

@@ -36,7 +36,7 @@ end
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 if hour = 7 and indorf = 0:
 	!r125
-	*nl '<a href="exec:gt''father''">Your stepfather</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a>  are sitting at the table eating Breakfast. <a href="exec:gt''mother''">Your mother</a> is hard at work to make sure everybody has enough to eat for the rest of the day.'
+	*nl '<a href="exec:gt''father''">Your stepfather</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating Breakfast. <a href="exec:gt''mother''">Your mother</a> is hard at work to make sure everybody has enough to eat for the rest of the day.'
 	! on weekdays Anka here too
 	if week <= 5: *P ' <a href="exec:gt''sister''">Anya</a> is trying to lose some weight so she is only having a very light breakfast.'
 else

+ 95 - 13
locations/lact_lib.qsrc

@@ -1,5 +1,82 @@
 # lact_lib
 
+if $ARGS[0] = '$get_bfat_tissue':
+	!! func('lac_lib', 'get_bfattissue', npc_nbsize, npc_lactatemm)
+	!! function to get breast fat tissue amount. Can be used for NPC as well as PC.
+	!! ARGS[1] = npc_nbsize - the natural bust size of the NPC/PC.
+	!! ARGS[2] = npc_lactatemm - he lactatemm of the NPC/PC.
+	!! RESULT = Fat amount in ccm * 10.
+	!! function for cup size volume in ccm y = 0,0002023*x^3 + 0,029199*x^2 + 4,3791*x + 70
+	!! x = ((ARGS[1]/5) + 1)*10
+	!! this function is based on the x figures for pcs_bust size (moving in steps of 5) and the actual cup sizes from a wikipedia table, which can be found here: https://en.wikipedia.org/wiki/Bra_size
+	!! The function was estimated with excel using a trend line estimation for polynoms of third grade and a y = 0 at 70ccm
+	!! https://www.ncbi.nlm.nih.gov/pubmed/11936199
+	!! The percentage of fat volume in the total breast volume varied from 7 to 56% and the percentage of fat weight in the total breast weight varied from 3.6 to 37.6%. This great variability in the respective proportions of fat and glands in the evaluated specimens was not significantly correlated to age and body mass index.
+	if ARGS[1] > 0:
+		temp_var = ((ARGS[1]/5) + 1)*10
+		temp_var2 = (((2023*temp_var*temp_var*temp_var)/10000000)+((29199*temp_var*temp_var)/1000000)+((43791*temp_var)/10000)+70)*10
+		if temp_var2 > ARGS[2]:
+			RESULT = temp_var2 - (ARGS[2] + ARGS[2]/50)
+		elseif temp_var2 = ARGS[2]:
+			RESULT = 0
+		else
+			cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$get_bfat_tissue</i>!</font> - Node ARGS[1] - more mammary gland tissue available then total breast tissue.</b>'
+		end		
+	else
+		if ARGS[2] > 700:
+			cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$get_bfat_tissue</i>!</font> - Node ARGS[2] - more mammary gland tissue available then total breast tissue.</b>'
+		else
+			RESULT = 700
+		end
+	end
+end
+
+if $ARGS[0] = '$calc_npc_lactatemm_0':
+	!! func('lact_lib', 'calc_npc_lactatemm_0', npc_glandamount, npc_prodstate, npc_breastage, npc_breastcount)
+	!! New calc lactatemm function usuable for NPCs. Test function number one.
+	!! ARGS[1] = npc_glandamount - The glandamount of the npc per breast. Glandamount here is actually the alveoli amount per breast. The value is 4500 to 150000 per breast depending on the genetics or if the npc went through pregnancy already.
+	!! ARGS[2] = npc_prodstate - The breast production state of the npc. State can be "none", "induced" or "natural".
+	!! ARGS[3] = npc_breastage - State can be "virgin" or "mature". Virgin in this case means that the breasts did not go through pregnancy changes yet, while mature is a fully developed breast that had all the changes during pregnancy.
+	!! To determine the breastage, just check if the NPC has gone through pregnancy or not.
+	!! ARGS[4] = npc_breastcount - The breast count of the NPC. If 0 the result will always be 0. Could be used for amputation events or multiple breasts events.
+	!! The function will return something even if there is no lactation currently happening. this could be used for special events where sudden lactation is induced with the help of drugs. For example a lactation pill that will cause the NPC to lactate immediately without classical induction or natural growth during pregnancy.
+	!! RESULT = lactatemm in ml*10
+
+	if ARGS[2] = 'none':
+		if ARGS[3] = 'virgin':
+			temp_var = 2
+		elseif ARGS[3] = 'mature':
+			temp_var = 2
+		else
+			cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$calc_npc_lactatemm_0</i>!</font> - Node ARGS[2] "none".</b>'
+		end
+	elseif ARGS[2] = 'induced':
+		if ARGS[3] = 'virgin':
+			temp_var = 20
+		elseif ARGS[3] = 'mature':
+			temp_var = 80
+		else
+			cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$calc_npc_lactatemm_0</i>!</font> - Node ARGS[2] "induced".</b>'
+		end
+	elseif ARGS[2] = 'natural':
+		if ARGS[3] = 'virgin':
+			temp_var = 20
+		elseif ARGS[3] = 'mature':
+			temp_var = 80
+		else
+			cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$calc_npc_lactatemm_0</i>!</font> - Node ARGS[2] "natural".</b>'
+		end
+	else
+		cls & '<b><font color="red">BAD ARGUMENT CHECK IN <i>$calc_npc_lactatemm_0</i>!</font> - Root Node ARGS[2].</b>'
+	end
+	
+	if ARGS[1] <= 0:
+		RESULT = 0
+	else
+		RESULT = (ARGS[1]*temp_var*ARGS[4])/1000
+	end
+end
+
 if $ARGS[0] = '$calc_lactatemm':
 
 	!! func('lact_lib', 'calc_lactatemm')
@@ -86,7 +163,7 @@ if $ARGS[0] = '$get_breastmilk':
 		soreness_mod += temp_var
 		if soreness_mod > 20: soreness_mod = 20
 		if nipple_cream = 1:
-			soreness_mod += 10
+			soreness_mod += 20
 			nipple_cream = 0
 		end
 	end
@@ -288,17 +365,19 @@ end
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0
 	pumptype = 0
-	if $location_type ! 'bathroom' and exhibitionist_lvl < 1:
+	if $location_type ! 'bathroom' and pcs_inhib < 50:
 		'You can''t use it here.'
+		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
+		pumptime = input ("How long do you plan to pump your breasts?<br>(Defaults 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
+		if pumptime > 0 and pumptime <= 60:
+			gt 'lact_lib', 'milking'
+		elseif pumptime <= 0 or pumptime > 60:
 			minut += 2
 			act 'Don''t pump':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
-			gt 'lact_lib', 'milking'
 		end
 	end
 end
@@ -309,17 +388,19 @@ end
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
 	pumptype = 1
-	if $location_type ! 'bathroom' and exhibitionist_lvl < 1:
+	if $location_type ! 'bathroom' and pcs_inhib < 50:
 		'You can''t do this here.'
+		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
-			minut += 2
-			act 'Don''t milk':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
+		pumptime = input ("How long would you like to milk your breasts?<br>(Default 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
+		if pumptime > 0 and pumptime <= 60:
 			gt 'lact_lib', 'milking'
+		elseif pumptime <= 0 or pumptime > 60:
+			minut += 2
+			act 'Don''t pump':gt $loc, $metka
 		end
 	end
 end
@@ -434,4 +515,5 @@ if $ARGS[0] = 'engorged_morning':
 	act 'Finish':gt $loc, $metka
 end
 
---- lac_lib ---------------------------------
+--- lac_lib ---------------------------------
+

+ 2 - 2
locations/laketoilet.qsrc

@@ -11,9 +11,9 @@ if $ARGS[0] = 'main':
 
 	cla
 	*clr
-	LCtoiletiventrand = rand(1, 100)
+	LCtoiletiventrand = rand(1,100)
 
-	if hour < 4 and LCtoiletiventrand >= 83:
+	if (hour >= 22 or hour <= 4) and LCtoiletiventrand >= 75:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/toiletsexstart.jpg"></center>'
 		'When you enter the restroom, you see a naked man slowly jerking himself off. He hasn''t noticed you yet.'
 

+ 1 - 1
locations/lesbidomhouse.qsrc

@@ -2071,7 +2071,7 @@ if $ARGS[0] = 'QW11':
 		'She smiles mysteriously at you before guiding you to the living room, and invites you to take a seat at the dining table.'
 		'"I''m sorry Madam, this will only take a minute", she says... but not to you. Mistress has another guest you failed to notice until now. It''s a slightly older woman, fully dressed in leather.'
 		'You meekly wave at the other woman, while Mistress walks over to you. She barely acknowledges you, but gives you an amused little smirk. Does she know why you are here?'
-		'"So, slave... you know there is a sex shop in the city center, yes?" she asks, raising an eyebrow. Then she laughs: "Of course you know. Being the little minx that you are, there''s simply no way you haven''t been there already!"'
+		'"So, slave... you know there is a sex shop in the city red light district, yes?" she asks, raising an eyebrow. Then she laughs: "Of course you know. Being the little minx that you are, there''s simply no way you haven''t been there already!"'
 		'You smile defensively while Mistress mocks you in front of her guest, not daring to look her in the eye.'
 		'Mistress continues: "For your assignment, you will have to go there. To the basement, to be exact. I know you''re great at servicing women with your mouth... you''ve proven that to me first-hand! Now I need you to prove that you can suck a good cock as well. Do you think you can be a good little slut for me?"'
 		'Your face is a deep red by now. She''s talking about you pleasing her with your mouth, and making you suck dick... in front of this stranger! This is so embarrassing! Still, you nod despite yourself, you really want to please her.'

+ 1 - 1
locations/lesbimistress.qsrc

@@ -1119,7 +1119,7 @@ if $ARGS[0] = 'neutral_7':
 	'"I''m sorry Madam, this will only take a minute", she says... but not to you. Mistress has another guest you failed to notice until now. It''s a slightly older woman, fully dressed in leather. You''re fairly sure you''ve seen her before.'
 	'When you meekly wave at the other woman, she barely acknowledges you but gives you an amused little smirk. She has definitely seen <b>you</b> before.'
 	'Mistress waits impatiently until you assume a proper position befitting a slave, before she continues.'
-	'"So, slave... you remember the sex shop in the city center, yes? Your little cocksucking adventure?" she asks, raising an eyebrow. Then she laughs: "People have been asking for you non-stop there, and Peter begged me to have you return. Business had never been better for him."'
+	'"So, slave... you remember the sex shop in the red light district, yes? Your little cocksucking adventure?" she asks, raising an eyebrow. Then she laughs: "People have been asking for you non-stop there, and Peter begged me to have you return. Business had never been better for him."'
 	'You blush while Mistress praises the first time you sucked twenty dicks there, right in front of her guest.'
 	'Mistress continues: "He made me a good offer, so... you''re going back there. I told him you will service twelve cocks this time. He begged for more, but I gave him twelve. I don''t want to go without you for too long."'
 	'Your face is a deep red by now. She''s talking about you pleasing more dicks with your mouth... in front of this stranger! As if that''s a regular everyday thing for you! This is so embarrassing!'

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