160 Commits 8079a02706 ... e87b4d7e4d

Author SHA1 Message Date
  KevinSmarts e87b4d7e4d Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten dfd5753936 [changed] Updated all outdated code, [added] Text to sex scenes without any and reorganized argument order for the 'LBZhouse' file. 4 years ago
  KevinSmarts c2e2d7474e [fixes] Moved some Anya stuff oout of family and fixed the duplicate anyaloc causing issues. Cleaned up the bedroom code a bit so it should notice Anya being around or asleep when wanting to do lewd stuff. 4 years ago
  Netuttki f29800d134 Renaming bug, rename didn't save. 4 years ago
  Netuttki 42e35903e0 Merge remote-tracking branch 'upstream/master' 4 years ago
  Netuttki b83b1f695a Stupid mistake, not sure why the file names got missed. 4 years ago
  KevinSmarts 8364ec354f [fixed] Files not renamed to fit their details being renamed 4 years ago
  KevinSmarts bb649b39a3 Revert "[fixed] This one changed but not to match an file name" 4 years ago
  KevinSmarts 5ee39992d3 [fixed] This one changed but not to match an file name 4 years ago
  Netuttki 3ed05559b2 Merge remote-tracking branch 'upstream/master' 4 years ago
  KevinSmarts 8df757d1fe Merge remote-tracking branch 'Philo/master' 4 years ago
  KevinSmarts 55dcf5e3f4 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts e4d6d36238 Merge remote-tracking branch 'netuttki/master' 4 years ago
  KevinSmarts 176c659be8 [fixed] When I said pav_industrial what I meant was city_industrial. 4 years ago
  KevinSmarts 4a76d2c9f3 Revert "[fixed] A number of links to 'nord' updated to 'pav_industrial'" 4 years ago
  KevinSmarts f78e4d3fc6 [fixed] A number of links to 'nord' updated to 'pav_industrial' 4 years ago
  Netuttki 0382aeaef7 Synch with main. 4 years ago
  philormand 217e0e1a47 Merge remote-tracking branch 'upstream/master' 4 years ago
  philormand ed18da64bb [Changed] Move Anatoly Borisovich Bistro / Bar story variables to BurgerQW array 4 years ago
  VioletKitten c576ed9daf [fixes] Changed all gt 'nord' with gt 'city_industrial' To match new location name. 4 years ago
  VioletKitten 72f24e73f5 [fixes] Updated journal to work with new clique system. 4 years ago
  Netuttki 1239d9a0ca Renamed parkivent->park_walkevents, parkdin->park_walkeventsrnd 4 years ago
  Netuttki 19b48e48bb Updated the locationnames 4 years ago
  Netuttki ac48f8309f Updated the calls to the new locationnames 4 years ago
  Netuttki 3dd84aac43 Renamed trashplace->city_trashplace, musorkaexh->city_trashplaceevents 4 years ago
  Netuttki 9e31cf232a Renamed city marketplace files 4 years ago
  Netuttki 4aaf75b593 Renamed dinsexgivi->city_kafegivisex 4 years ago
  Netuttki 60a7c4ff50 Renamed sauna->city_sauna and saunawhore->city_saunawhore 4 years ago
  KevinSmarts 7baef5855f Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten 0d2f8ff68d [text edit] Minor spelling error in casino. 4 years ago
  KevinSmarts fada498a9d Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten ed64ffcec6 [text edit] Minor spelling error. 4 years ago
  VioletKitten 304d374d15 [fixes] Missing colon in sexshop. 4 years ago
  KevinSmarts dcade84c34 [fixes] Extra commas removed, found by analyser 4 years ago
  KevinSmarts 350d947b15 Merge remote-tracking branch 'netuttki/master' 4 years ago
  Netuttki a070c6335d Updated with the new location names. 4 years ago
  Netuttki 19590ad6b2 Updated to refer to the new location names 4 years ago
  Netuttki 3a59dc3d1d Added city_ prefix and removed capital letters where needed 4 years ago
  Netuttki dfc00b0303 Renamed narkopriton to city_drugden 4 years ago
  Netuttki 7eaf65ca66 Renamed poli to city_clinic 4 years ago
  Netuttki fb837d4331 Renamed clener to city_smalloffice and torgpred to city_trademission 4 years ago
  Netuttki 5eaece4db0 Renamed poli to city_clinic 4 years ago
  Netuttki ee1f849614 Renaming the drug den related files to have the city_ prefix. 4 years ago
  Netuttki 03f04f96ef Renamed klofdomhouse to city_jorahouse 4 years ago
  Netuttki e121db02a3 Renamed Roadhouse coffee location and related files to city_kafe* 4 years ago
  KevinSmarts 20f452a0ff [fixed] Missing goto 4 years ago
  KevinSmarts aee8d1593a [changed] Renamed pav library and fixed teh club file wrong name 4 years ago
  KevinSmarts 5e3a6185eb [changed] Renamed main pav hubs to use pav_ prefix and remove capitals 4 years ago
  KevinSmarts 9e38999183 [Changed] Renamed pav community center and teh hub for clubs there to more fitting names 4 years ago
  KevinSmarts 4ad0cebc9f Merge remote-tracking branch 'Philo/master' 4 years ago
  philormand 01b473e4b8 [Fixes][Text Edit] Moved Parrot story variables to an array, fixed text in a few places 4 years ago
  KevinSmarts cf054db943 Merge remote-tracking branch 'Vengence_11/master' 4 years ago
  KevinSmarts 8eb3aa1326 Merge remote-tracking branch 'Philo/master' 4 years ago
  KevinSmarts 753f7fdddb [changed] Renamed factory in Pav to pav_factory 4 years ago
  KevinSmarts c500354724 [changed] Ranamed pharmacy in pav to pav_pharmacy 4 years ago
  philormand 78f726cd48 Merge remote-tracking branch 'upstream/master' 4 years ago
  Vengeance11 639a17ef37 [text edits] Updated Albina and Bella chat options at school along with proofreading. Lots and lots of proofreading. 4 years ago
  KevinSmarts 10e2d59668 [Fixed] REmoved old reference but it included a bracket which broken the whole game, oops! 4 years ago
  philormand ed02eac289 [Text Edit] added time and location to the nerd game night reminder in the journal 4 years ago
  KevinSmarts 83a57bc595 [removed] Old Tanya apartment which was replaced by the nich named after her dad 4 years ago
  KevinSmarts c4f1785073 [Removed] Old fight files that are no longer in use 4 years ago
  KevinSmarts 57ae6dcedc Merge remote-tracking branch 'Philo/master' 4 years ago
  KevinSmarts 22502d647c Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  philormand 109efdf8ca Added reminder of the day for the nerd game night in the journal, minor changes of you to your for social groups 4 years ago
  VioletKitten f0ffad10ac [changed] Swapped old inner thought system for new one in Niko files. I hope it works. 4 years ago
  KevinSmarts 65bbe3e5eb [chnaged] Swapped fuchsia colour out for magenta in font options 4 years ago
  richard_butte bd2286e7e8 changed fucshia to magenta, just for kitten :) 4 years ago
  richard_butte 5b9ac5fb5e unborked my borking. moved inner thought stuff to preSYS instead of stat 4 years ago
  richard_butte 80a1c9404c set default inner thought style 4 years ago
  KevinSmarts 80385237ec [fixed] reverting change I made to park name in these files in error and use of *nl for new line. 4 years ago
  KevinSmarts 23681272a4 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts fc72f41905 [Chaged] Renamed Island, park and lake to use city_ prefix 4 years ago
  KevinSmarts 93eb229b7b [changed] Renames for city locations in .qproj file 4 years ago
  KevinSmarts 9afeaaa953 [change] File rename for the street rename to city_residential 4 years ago
  KevinSmarts c66d780953 [change] Renamed street to city_residential 4 years ago
  VioletKitten de4949f38f [fixes] Restored goto command since missing "foto_events2" location has been added. 4 years ago
  KevinSmarts ff349cfcc9 [Changed] Renamed down to city_center 4 years ago
  KevinSmarts 37c674269d Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts 5ade5f852b Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts 5be4fa2ea2 [Chaged] Renamed Nord to city_industrial 4 years ago
  KevinSmarts 4f7e2b5fd4 [change] Increase to maximum fat level 4 years ago
  hornguy6 2a4b1efcd5 [added] second foto_events file 4 years ago
  hornguy6 bba4d2dfb5 [fixed] missing location in the qproj file 4 years ago
  VioletKitten 6e00edf967 [fixes] Disabled goto command leading to a location file that doesn't exist in the game files. 4 years ago
  VioletKitten 03a08169e6 [fixes] Updated some old code, moved misplaced goto command and fixed a text error, spotted by Philo. 4 years ago
  KevinSmarts 2748084353 [fixed] Dialogue at breakfast during the holidays added from nutluck with code from Sword 4 years ago
  KevinSmarts bd3a0d5405 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  Kevin_Smarts 97c20c1f3b Merge branch 'master' of Philormand/glife into master 4 years ago
  philormand 168af1c014 Change the starting clothes for the athlete social group start. Same school uniform as popular. Upgraded sport outfit. 4 years ago
  Vengeance11 80616bda46 [text edits] File proofread and Bella and Albina have been put in their revised cliques. 4 years ago
  VioletKitten 43764f1c4e [fixes] Fedor confronting Igor scene had an impossible requirement and wasn't properly breaking up Sveta. 4 years ago
  VioletKitten b6fe53e303 [fixes] Wrong code for cupsize. 4 years ago
  richard_butte 6a7f87d11e Initial split of gdktoilet into gdktoilet_mens and gdktoilet_womens. I may merge them back together when everything's done but I have to do this for my sanity 4 years ago
  richard_butte b2758dbab1 Corrections to foto_models2 as some things got missed in the merge 4 years ago
  KevinSmarts 5fb4fd299d Merge branch 'master' of https://git.catrenelle.com/Violet_Kitten/glife 4 years ago
  VioletKitten 370fd03f68 [fixes] Image fix for nutluck. 4 years ago
  KevinSmarts b8d0aa24fa Merge remote-tracking branch 'hornguy6/master' 4 years ago
  hornguy6 538b593654 [fixed] breast size call wasn't in << >> 4 years ago
  hornguy6 b0e9af2e10 [added] new clothes for Fashionista and G&M 4 years ago
  VioletKitten 9ff993da08 [fixes] Able to speak to Anushka at a time where she has no dialogue and 2 formatting fixes. 4 years ago
  KevinSmarts 54b9feb259 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts a78f42eb8d Merge remote-tracking branch 'Iron_Jack/master' 4 years ago
  KevinSmarts d05f3d22d7 [fixes] Group value was being updated even for new starts and intro music played right through the TG intro, which was annoying 4 years ago
  VioletKitten 4db7d27b19 [added] Updated code and tons of added stuff from nutluck. Also the most up to date foto_models2 file. 4 years ago
  richard_butte 85fa85bb12 Dorm/Africans stuff for nutluck/VK 4 years ago
  richard_butte 2d65b33431 updates to modelling studio for VK/nut 4 years ago
  KevinSmarts 01408a5020 [fixed] Added save updater for school group values 4 years ago
  VioletKitten ed8b5ada2a [changed] Updated start files that should be banced for the new appearance system. 4 years ago
  KevinSmarts 3bc33580c7 [changed] New starting values for school kid's weight and some other tweaks (Yes I know its mass, weight is measured in Newtons, stop being pedantic). 4 years ago
  KevinSmarts 12c663face Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts 1ea920cc3e Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten e606260e8f [fixes] Never ending loop in brother sex scene. 4 years ago
  VioletKitten 1c4ee267e4 [fixes] Increased the limit on the clique group values to work with the new clique system. Thanks Terlis2000. 4 years ago
  KevinSmarts ee07d9e401 [fixed] One extra colon an done missing one both fixed 4 years ago
  VioletKitten 7be58b733e Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  KevinSmarts 39a5ee89a9 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts 0dda276210 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts cfeb056540 [fixed]Bracket removed in error 4 years ago
  hornguy6 de285bb370 [fixed] being sent to the wrong photo shoots 4 years ago
  VioletKitten 480fd56853 [fixes] Hopefully this will fix the syntax error for new clique system. 4 years ago
  KevinSmarts 3bd2b08091 [fixed] Typo 4 years ago
  KevinSmarts 457b98c00b Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten 509156d7aa [added] nutluck's Anushka foto scenes as well as [fixed] some broken scenes. 4 years ago
  KevinSmarts 5641c91f3c Merge remote-tracking branch 'hornguy6/master' 4 years ago
  hornguy6 67fba0c869 [fixed] endless loop in foto_models2 4 years ago
  VioletKitten c7be7dc7f5 [fixes] Removed WIP blocks from clique slut warn scenes and made sure they do not spam the player. 4 years ago
  KevinSmarts 21e1ddde0d Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts 37d633cea2 [fixed] File postfix corrected and added heading and footing so it'll get picked up in build 4 years ago
  KevinSmarts ba09f41c60 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts 0bdf71ac56 [added] Clothing images from Snegurochka and data from Gwen 4 years ago
  VioletKitten e9945437ed [fixes] Removed WIP block and hopefully prevented clique warn scenes from spamming the player. 4 years ago
  VioletKitten 6bc18bf2d8 [text edit] Marathon text claiming to give the player more money then they actually get. 4 years ago
  KevinSmarts 41d9176af2 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts a542a683dd Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts e4496d263f [fixed] Missed one change in last commit an a text edit in swimwear descriptions 4 years ago
  KevinSmarts 4bdc0afdb5 [fixed] Slight rewrite for the park gopnick house rape to include a new image and make each stage abvious instead of just looping through it in one go 4 years ago
  hornguy6 663fae6b4f [fixed] missing image link and dialogue options 4 years ago
  hornguy6 52a36f2f7f [fixed] bra removal where it shouldn't be 4 years ago
  hornguy6 d2df143e74 [added] more dialogue to Jeff 4 years ago
  hornguy6 e3b963445a [fixed] gt place that doesn't exist 4 years ago
  KevinSmarts 37341ecec5 [added] Link to the Weed scene that was missing 4 years ago
  VioletKitten ce14c1e030 [changed] Split socialchg file into 2 locations. 4 years ago
  Vengeance11 4e134b5f3f [text edits] I went in to add in a missing quotation mark, fell down a rabbit hole and ended up proofreading the entire file. Someone please help me! 4 years ago
  KevinSmarts 3e9710d3a1 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  VioletKitten 00d038f657 Merge branch 'master' of https://git.catrenelle.com/Violet_Kitten/glife 4 years ago
  VioletKitten fa5450a9b8 [fixes] Chat option to ask Ivan for help with Niko, was missing and I reworded Vitek's help chat to give better feedback to the player. 4 years ago
  VioletKitten 525caa54cb [fixes] Chat option to ask for Ivan's for help with Niko, was missing and I reworded Vitek's help chat to give better feedback to the player. 4 years ago
  KevinSmarts d26bbde531 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts cf627f2ebd Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts 8d77b4ca1d [changed] Value for all pav_slut checks doubled and new nicknames added to match new more suitable scale 4 years ago
  hornguy6 b67eddcdf2 [fixed] grammar in an act, "you're" instead of "your" 4 years ago
  hornguy6 7ae29d129e [added] new random modelling event 4 years ago
  hornguy6 89e0bd6a6b [fixed] skipping Jeff model events 4 years ago
  KevinSmarts eb93e53d30 [added] New clothing outfits from Gwen and adjustments to shop totals so they show up 4 years ago
  VioletKitten 7dd55e2cad [fixes] nutluck's school lunch fixes. 4 years ago
  KevinSmarts e98caf3026 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts e286d4e05b [fixes] Image fix from nutluck 4 years ago
  KevinSmarts 193548998b [Changed] Coat warmth value now part of their attribute file and quality and warmth settings made dynamic so we can add more with less issues 4 years ago
  KevinSmarts 5cc8cc6f8d [fixed]Notes for shoes still had stuff copy/pasted from clothing making it hard to read 4 years ago
  VioletKitten 1a9dee63da [added] Niko romance now levels up cumeater trait. 4 years ago
100 changed files with 2374 additions and 2662 deletions
  1. BIN
      QSP/qsp-analyser/QSP_Analyser/obj/Debug/QSP_Analyser.csprojAssemblyReference.cache
  2. 47 63
      glife.qproj
  3. 2 2
      locations/AlbFatherQW.qsrc
  4. 1 1
      locations/AlbStarsEnd.qsrc
  5. 8 8
      locations/AleksandraHome.qsrc
  6. 1 1
      locations/BDSM.qsrc
  7. 1 1
      locations/BDSM_Club.qsrc
  8. 5 5
      locations/BDsex.qsrc
  9. 108 108
      locations/BurgerTip.qsrc
  10. 4 4
      locations/Cheatmenu_din.qsrc
  11. 1 1
      locations/FedorEv.qsrc
  12. 18 18
      locations/FedorEv2.qsrc
  13. 1 1
      locations/FedorEv3.qsrc
  14. 4 4
      locations/FedorEv4.qsrc
  15. 3 3
      locations/FedorMisc.qsrc
  16. 45 45
      locations/Gnpc2.qsrc
  17. 3 1
      locations/IvanEv.qsrc
  18. 1 1
      locations/JuliaMilHome.qsrc
  19. 1 1
      locations/KatjaHome.qsrc
  20. 4 4
      locations/KatjaHomeTalk.qsrc
  21. 157 134
      locations/LBZhouse.qsrc
  22. 1 1
      locations/LCporn.qsrc
  23. 7 7
      locations/LCwork.qsrc
  24. 4 4
      locations/LariskaHome.qsrc
  25. 9 9
      locations/LariskaStart.qsrc
  26. 17 17
      locations/MartinSex.qsrc
  27. 5 5
      locations/MartinSex2.qsrc
  28. 1 1
      locations/MartinSex3.qsrc
  29. 2 2
      locations/MartinTalk.qsrc
  30. 1 1
      locations/MeynoldHome.qsrc
  31. 1 1
      locations/Military.qsrc
  32. 1 1
      locations/NewCloShop.qsrc
  33. 12 7
      locations/NikoDates.qsrc
  34. 19 19
      locations/NikoDreams.qsrc
  35. 7 7
      locations/NikoEv.qsrc
  36. 30 26
      locations/NikoEv2.qsrc
  37. 5 5
      locations/NikoMeyHome.qsrc
  38. 12 3
      locations/NikoPayback.qsrc
  39. 14 2
      locations/NikoSlut.qsrc
  40. 27 23
      locations/NikoWhore.qsrc
  41. 1 1
      locations/Nudelake.qsrc
  42. 25 25
      locations/ParChurch.qsrc
  43. 1025 291
      locations/ParkKafe.qsrc
  44. 5 5
      locations/Peterroom.qsrc
  45. 1 1
      locations/Prostitute.qsrc
  46. 11 11
      locations/Snpc.qsrc
  47. 2 2
      locations/Terminal.qsrc
  48. 6 6
      locations/TerminalOffice.qsrc
  49. 1 1
      locations/Vika.qsrc
  50. 5 5
      locations/Voltrener.qsrc
  51. 4 4
      locations/VoltrenerSexShower.qsrc
  52. 3 3
      locations/Voltrenersex.qsrc
  53. 1 1
      locations/WorkHosp.qsrc
  54. 4 0
      locations/_attrib_shoe_trainers.qsrc
  55. 15 0
      locations/_attributes_average.qsrc
  56. 10 0
      locations/_attributes_cheap.qsrc
  57. 22 0
      locations/_attributes_coat.qsrc
  58. 40 0
      locations/_attributes_exercise.qsrc
  59. 58 0
      locations/_attributes_expensive.qsrc
  60. 291 0
      locations/_attributes_swimwear.qsrc
  61. 46 4
      locations/_clothing_name.qsrc
  62. 4 4
      locations/abduction.qsrc
  63. 1 1
      locations/agentned.qsrc
  64. 17 17
      locations/albinahome.qsrc
  65. 1 1
      locations/albinaporog.qsrc
  66. 1 1
      locations/alex.qsrc
  67. 1 1
      locations/alexgang.qsrc
  68. 1 1
      locations/anushapt.qsrc
  69. 1 1
      locations/artemEv.qsrc
  70. 13 13
      locations/artemhome.qsrc
  71. 2 2
      locations/arturHome.qsrc
  72. 1 1
      locations/arturQW.qsrc
  73. 1 1
      locations/arturend.qsrc
  74. 0 482
      locations/atak.qsrc
  75. 0 284
      locations/atakA.qsrc
  76. 0 305
      locations/atakA1.qsrc
  77. 0 137
      locations/atakB.qsrc
  78. 0 136
      locations/atakB1.qsrc
  79. 0 186
      locations/atakM.qsrc
  80. 25 25
      locations/autosalonF.qsrc
  81. 3 3
      locations/autoservisF.qsrc
  82. 12 12
      locations/autotraidF.qsrc
  83. 6 6
      locations/bank.qsrc
  84. 2 2
      locations/barbershop.qsrc
  85. 1 1
      locations/bass.qsrc
  86. 1 1
      locations/bed2.qsrc
  87. 83 52
      locations/bedrPar.qsrc
  88. 2 2
      locations/beg1.qsrc
  89. 2 0
      locations/begin.qsrc
  90. 1 1
      locations/belgang.qsrc
  91. 1 1
      locations/belpicknick.qsrc
  92. 1 1
      locations/body_shape.qsrc
  93. 1 1
      locations/boilerroom.qsrc
  94. 3 3
      locations/bordel.qsrc
  95. 7 7
      locations/bordelv.qsrc
  96. 0 52
      locations/boxing.qsrc
  97. 4 4
      locations/brother.qsrc
  98. 1 1
      locations/brother_lessons.qsrc
  99. 3 1
      locations/brother_voyeur.qsrc
  100. 5 5
      locations/budgetclothes.qsrc

BIN
QSP/qsp-analyser/QSP_Analyser/obj/Debug/QSP_Analyser.csprojAssemblyReference.cache


+ 47 - 63
glife.qproj

@@ -161,8 +161,8 @@
 		<Location name="lesbidomhouse"/>
 		<Location name="lesbimistress"/>
 		<Location name="lesbisubhouse"/>
-		<Location name="cafe2"/>
-		<Location name="cafe3"/>
+		<Location name="city_kafeevents2"/>
+		<Location name="city_kafeevents3"/>
 		<Location name="ParkKafe"/>
 	</Folder>
 	<Folder name="Magic Quests">
@@ -203,23 +203,12 @@
 	</Folder>
 	<Folder name="Combat">
 		<Location name="fight"/>
-		<Location name="strelba"/>
 		<Location name="before"/>
 		<Location name="init"/>
-		<Location name="boxing"/>
 		<Location name="magik"/>
-		<Location name="enemy"/>
-		<Location name="atak"/>
-		<Location name="atakA"/>
-		<Location name="atakA1"/>
-		<Location name="atakB"/>
-		<Location name="atakB1"/>
-		<Location name="atakM"/>
 		<Location name="ender"/>
 		<Location name="nill"/>
 		<Location name="test"/>
-		<Location name="priziv"/>
-		<Location name="defence"/>
 		<Location name="kikbox"/>
 		<Location name="initKik"/>
 		<Location name="Kikatak"/>
@@ -267,32 +256,32 @@
 		<Location name="postevents"/>
 	</Folder>
 	<Folder name="Home Street - Locations">
-		<Location name="street"/>
-		<Location name="pharmacy"/>
-		<Location name="clener"/>
-		<Location name="dima"/>
-		<Location name="dinsexgivi"/>
-		<Location name="IrinaRoom"/>
-		<Location name="kafe"/>
-		<Location name="kafe2"/>
-		<Location name="kafeend"/>
-		<Location name="kavkazkafe"/>
-		<Location name="klofdomhouse"/>
-		<Location name="lake"/>
+		<Location name="city_residential"/>
+		<Location name="city_pharmacy"/>
+		<Location name="city_smalloffice"/>
+		<Location name="city_dima"/>
+		<Location name="city_kafegivisex"/>
+		<Location name="city_irinaroom"/>
+		<Location name="city_kafe"/>
+		<Location name="city_kafe2"/>
+		<Location name="city_kafeend"/>
+		<Location name="city_kavkazkafe"/>
+		<Location name="city_jorahouse"/>
+		<Location name="city_lake"/>
 		<Location name="dort"/>
-		<Location name="narkopriton"/>
-		<Location name="bobka"/>
-		<Location name="park"/>
-		<Location name="parkdin"/>
-		<Location name="parkivent"/>
-		<Location name="poli"/>
-		<Location name="rinok"/>
-		<Location name="rinwork"/>
-		<Location name="sauna"/>
-		<Location name="saunawhore"/>
-		<Location name="trashplace"/>
-		<Location name="musorkaexh"/>
-		<Location name="RynokHoz"/>
+		<Location name="city_drugden"/>
+		<Location name="city_bobka"/>
+		<Location name="city_park"/>
+		<Location name="park_walkeventsrnd"/>
+		<Location name="park_walkevents"/>
+		<Location name="city_clinic"/>
+		<Location name="city_market"/>
+		<Location name="city_marketwork"/>
+		<Location name="city_sauna"/>
+		<Location name="city_saunawhore"/>
+		<Location name="city_trashplace"/>
+		<Location name="city_trashplaceevents"/>
+		<Location name="city_marketsex"/>
 	</Folder>
 	<Folder name="BDSM_Club">
 		<Location name="BDSM_Club"/>
@@ -314,7 +303,7 @@
 		<Location name="MBathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">
-		<Location name="torgpred"/>
+		<Location name="city_trademission"/>
 		<Location name="StasQW"/>
 		<Location name="StasSex"/>
 	</Folder>
@@ -354,16 +343,6 @@
 		<Location name="WorkHosp"/>
 		<Location name="worksalon"/>
 	</Folder>
-	<Folder name="Tanya">
-		<Location name="tanapartment"/>
-		<Location name="tanhouse"/>
-		<Location name="tanroom"/>
-		<Location name="tanhozspal"/>
-		<Location name="tankitchen"/>
-		<Location name="tanspalnya"/>
-		<Location name="tanvanr"/>
-		<Location name="tanNicholas"/>
-	</Folder>
 	<Folder name="Nicholas">
 		<Location name="nichApartment"/>
 		<Location name="nichBathGuest"/>
@@ -576,16 +555,16 @@
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
 	</Folder>
-	<Folder name="Town">
-		<Location name="pavResidential"/>
-		<Location name="pavCommercial"/>
-		<Location name="pavCommercialOffices"/>
-		<Location name="pavIndustrial"/>
+	<Folder name="Pavlovsk">
+		<Location name="pav_residential"/>
+		<Location name="pav_commercial"/>
+		<Location name="pav_commercial_offices"/>
+		<Location name="pav_industrial"/>
 		<Location name="leonid"/>
 		<Location name="gargazel"/>
 		<Location name="garfather"/>
-		<Location name="Gshveyfab"/>
-		<Location name="gaptek"/>
+		<Location name="pav_factory"/>
+		<Location name="pav_pharmacy"/>
 		<Location name="gkafe"/>
 		<Location name="motherkafeboss"/>
 		<Location name="gpoli"/>
@@ -656,6 +635,7 @@
 		<Location name="fbgameout"/>
 		<Location name="gschool_cheerleading"/>
 		<Location name="nerd_game_night"/>
+		<Location name="gopnik_initiation"/>
 	</Folder>
 	<Folder name="Shared_appartment">
 		<Location name="pavSharedApt"/>
@@ -663,13 +643,15 @@
 		<Location name="pavShared_nd"/>
 		<Location name="pavShared_sp"/>
 	</Folder>
-	<Folder name="House of Culture">
-		<Location name="gdk"/>
-		<Location name="gdkkru"/>
-		<Location name="gdkbibl"/>
+	<Folder name="Community center">
+		<Location name="pav_commcenter"/>
+		<Location name="pav_commclubs"/>
+		<Location name="pav_library"/>
 		<Location name="gdkin"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>
+		<Location name="gdktoilet_mens"/>
+		<Location name="gdktoilet_womens"/>
 		<Location name="gdksex"/>
 		<Location name="BMloc"/>
 		<Location name="ugel"/>
@@ -761,7 +743,7 @@
 		<Location name="brosok"/>
 	</Folder>
 	<Folder name="City Center">
-		<Location name="down"/>
+		<Location name="city_center"/>
 		<Location name="cityTrain"/>
 		<Location name="agentned"/>
 		<Location name="kameraKPZ"/>
@@ -777,6 +759,7 @@
 		<Location name="vipclub"/>
 		<Location name="danceclass"/>
 		<Location name="dorm"/>
+		<Location name="dormev1"/>
 		<Location name="downlibrary"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
@@ -799,6 +782,7 @@
 		<Location name="foto"/>
 		<Location name="foto_shoot"/>
 		<Location name="foto_events"/>
+		<Location name="foto_events2"/>
 		<Location name="foto_albums"/>
 		<Location name="foto_models"/>
 		<Location name="foto_models2"/>
@@ -809,7 +793,7 @@
 		<Location name="shoplifting"/>
 	</Folder>
 	<Folder name="North Side">
-		<Location name="Nord"/>
+		<Location name="city_industrial"/>
 		<Location name="nordtrain"/>
 		<Location name="Terminal"/>
 		<Location name="TerminalOffice"/>
@@ -901,7 +885,7 @@
 		<Location name="pronouns"/>
 	</Folder>
 	<Folder name="University">
-		<Location name="island"/>
+		<Location name="city_island"/>
 		<Location name="dolls"/>
 		<Location name="vecher"/>
 		<Location name="obkitchen"/>

+ 2 - 2
locations/AlbFatherQW.qsrc

@@ -15,7 +15,7 @@ $din_zajava_albfather = {
 			gs 'stat'
 			'You wrote and signed your statement to the captain. He then let you go without a fuss.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }
@@ -37,7 +37,7 @@ $din_zajava_albfather_no2 = {
 			gs 'stat'
 			'You quickly dialed Albina''s number. In a harried tone you told her of the events that had just transpired. There was a short pause and Albina thanked you and hung up.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }

+ 1 - 1
locations/AlbStarsEnd.qsrc

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

+ 8 - 8
locations/AleksandraHome.qsrc

@@ -34,14 +34,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks of books with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually, <<$npc_nickname[''A231'']>> starts to get a little annoyed at you, but continues on, none the less, with her suggestions.'
 	act 'Continue looking':
@@ -93,7 +93,7 @@ if $args[0] = 'library':
 						'She replies, "Definitely. I''m going to walk home now. I''ll see you in school <<$day_temp>> <<$pcs_nickname>>."'
 						'"See you <<$day_temp>> <<$npc_nickname[''A231'']>>."'
 						killvar $day_temp
-						act 'Stay at the Commuity Center': gt 'gdk'
+						act 'Stay at the Commuity Center': gt 'pav_commcenter'
 					end
 				end
 			end
@@ -137,14 +137,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually <<$npc_nickname[''A231'']>> starts to get a little annoyed, but continues on none the less with her suggestions.'
 	act 'Continue looking':
@@ -196,7 +196,7 @@ if $args[0] = 'library':
 						'"Definitely. I''m going to start walking home now. I''ll see you in school <<$day_temp>> <<$pcs_nickname>>," she answers'
 						'"See you <<$day_temp>> <<$npc_nickname[''A231'']>>."'
 						killvar $day_temp
-						act 'Stay at the Commuity Center': gt 'gdk'
+						act 'Stay at the Commuity Center': gt 'pav_commcenter'
 					end
 				end
 			end

+ 1 - 1
locations/BDSM.qsrc

@@ -119,7 +119,7 @@ act 'Begin participating in the shooting':
 									'You spent 9 hours for the filming'
 									'and received <<pcs_apprnc * 125>> <b>₽</b> in cash'
 
-									act 'Leave the studio':gt 'down'
+									act 'Leave the studio':gt 'city_center'
 								end
 							end
 						end

+ 1 - 1
locations/BDSM_Club.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'Hos':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hosjaika.jpg"></center>'
 	'After a few visits to your Mistress you are getting a little closer. Seeing her this evening, you catch her a little tipsy. Instead of already familiar perversions, you just sit in the kitchen and drink wine, talking about life. In conversation, the Mistress mentions a BDSM club. Sounds interesting, you and the Mistress pour glass after glass and slowly you gather details from her. Turns out, the city has an elite BDSM-club, and the missus is in it. After much persuasion, she gives you a business card – a piece of cardboard with three-dimensional logo without inscriptions, and explains how to get to the Club.'
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'start':

+ 5 - 5
locations/BDsex.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'end':
 
 	if BDcafe = 1:
 		BDcafe = 0
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	elseif Yuri_sex = 1:
 		Yuri_sex = 0
 		cumspclnt = 4
@@ -502,7 +502,7 @@ if $ARGS[0] = 'end':
 		gs 'stat'
 		'Yuri lets you have a quick shower and dress before giving you a quick kiss on the cheek.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		act 'Leave':gt 'nord'
+		act 'Leave':gt 'city_industrial'
 	elseif $boydesc = 'Michael N.':
 		act 'Leave':dynamic $brodilr
 	elseif InYouHome = 1:
@@ -514,7 +514,7 @@ if $ARGS[0] = 'end':
 		exit
 	elseif GoToGuy = 1:
 		GoToGuy = 0
-		act 'Leave':gt 'nord'
+		act 'Leave':gt 'city_industrial'
 	elseif harakBoy = 1:
 		harakBoy = 0
 		cumspclnt = 4
@@ -549,8 +549,8 @@ if $ARGS[0] = 'end':
 			tmpgorand = rand(0, 2)
 
 			if tmpgorand = 0: killvar 'tmpgorand' & dynamic $brodilr
-			if tmpgorand = 1: killvar 'tmpgorand' & gt 'down'
-			if tmpgorand = 2: killvar 'tmpgorand' & gt 'nord'
+			if tmpgorand = 1: killvar 'tmpgorand' & gt 'city_center'
+			if tmpgorand = 2: killvar 'tmpgorand' & gt 'city_industrial'
 		end
 	else
 		act 'Leave':dynamic $brodilr

+ 108 - 108
locations/BurgerTip.qsrc

@@ -2,33 +2,33 @@
 !!needs a rework to not be so linear
 menu_off = 1
 
-$kompromatFoto = ''
+$BurgerQW['IvanQWBlackmailPhoto'] = ''
 if film > 0:
  !pornoaktrissa
-	$kompromatFoto = 'The photo is a screenshot from one of your porn movies.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'The photo is a screenshot from one of your porn movies.'
 
 elseif fotoyousuck = 1:
 	!!sucked in a couple of guys and was sfotografirovanna
-	$kompromatFoto = 'The picture shows you sucking two cocks at the same time.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'The picture shows you sucking two cocks at the same time.'
 
 elseif fotoCFNMsex > 0:
-	$kompromatFoto = 'In the photo you see yourself getting fucked from behind by a random guy. This must have been taken in the stripclub.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'In the photo you see yourself getting fucked from behind by a random guy. This must have been taken in the stripclub.'
 
 elseif fotoCFNMblowjobCum > 0:
 	!!cum on face in the strip club
-	$kompromatFoto = 'In the photo you are sitting in front of a guy, kissing his cock. There seems to be cum on your face. This photo must have been taken in the stripclub.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'In the photo you are sitting in front of a guy, kissing his cock. There seems to be cum on your face. This photo must have been taken in the stripclub.'
 
 elseif fotoCFNMblowjob > 0:
 	!!sucked in front of everyone
-	$kompromatFoto = 'In the photo you are giving a guy a blowjob. You can spot a group of women in the background and it seems like this photo was taken in the stripclub.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'In the photo you are giving a guy a blowjob. You can spot a group of women in the background and it seems like this photo was taken in the stripclub.'
 
 elseif stripdancesum > 0:
 	!!stripper
-	$kompromatFoto = 'In the photo you are dancing on a pole. Obviously someone photographed you, while you were on stage at the stripclub.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'In the photo you are dancing on a pole. Obviously someone photographed you, while you were on stage at the stripclub.'
 
 elseif modelfoto > 0:
 	!!photo model
-	$kompromatFoto = 'The photo shows you naked, it is very well taken and must be from a shoot at the modeling agency.'
+	$BurgerQW['IvanQWBlackmailPhoto'] = 'The photo shows you naked, it is very well taken and must be from a shoot at the modeling agency.'
 end
 
 if $ARGS[0] = 'work':
@@ -52,9 +52,9 @@ if $ARGS[0] = 'work':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work3.jpg"></center>'
 					'You deliver him a coffee on a little tray, with cream and sugar on the side. He doesn''t comment on your extra effort.'
 				
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				end
@@ -73,9 +73,9 @@ if $ARGS[0] = 'work':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work2.jpg"></center>'
 						'You the deliver the papers to the boss, and he sends you on your way.'
 
-						if PSBBtimes = 1:
+						if BurgerQW['WorkShift'] = 1:
 							act 'Have your lunch': gt 'burgerWork', 'work'
-						elseif PSBBtimes = 2:
+						elseif BurgerQW['WorkShift'] = 2:
 							act 'Leave work': gs 'burgerWork', 'work2'
 						end
 					end
@@ -96,9 +96,9 @@ if $ARGS[0] = 'work':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work.jpg"></center>'
 						'With your mission accomplished, you get back to work.'
 
-						if PSBBtimes = 1:
+						if BurgerQW['WorkShift'] = 1:
 							act 'Have your lunch': gt 'burgerWork', 'work'
-						elseif PSBBtimes = 2:
+						elseif BurgerQW['WorkShift'] = 2:
 							act 'Leave work': gs 'burgerWork', 'work2'
 						end
 					end
@@ -184,15 +184,15 @@ if $ARGS[0] = 'work':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work5.jpg"></center>'
 
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
-				TerminalPapper = 1
-				DayTerminalPapper = daystart
+				BurgerQW['TerminalTask'] = 1
+				BurgerQW['TerminalTaskDay'] = daystart
 				'Anatoly comes out of the office, and asks, "<<$pcs_nickname>>, I know it''s lunch time, but I really need these documents taken to the storage terminal in the city industrial area to be signed. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
-				act 'Deliver the papers':gt 'down'
+				act 'Deliver the papers':gt 'city_center'
 			elseif bosstiprand = 1:
 				'Anatoly comes out of the office, and says: "<<$pcs_nickname>>, before lunch I need you to head down to the loading dock, and sign for a shipment of food that''s due to arrive. There''s a gold star in it for you if take care of this for me."'
 
@@ -201,19 +201,19 @@ if $ARGS[0] = 'work':
 					gs 'stat'
 					'Eventually you find the proper truck, and sign for the shipment. You keep an eye on them as they unload the shipment, just to be sure nothing gets lost on the way to the restaurant''s space in the warehouse.'
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				end
 
 			elseif bosstiprand = 2:
-				BankPapper = 1
-				dayBankPapper = daystart
+				BurgerQW['BankTask'] = 1
+				BurgerQW['BankTaskDay'] = daystart
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, please run these documents to the bank for me. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
-				act 'Go to the bank':gt 'down'
+				act 'Go to the bank':gt 'city_center'
 			elseif bosstiprand = 3:
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, call the that guy we had set up our computers. The on button of my PC seems to be broken."'
 
@@ -231,14 +231,14 @@ if $ARGS[0] = 'work':
 						'Your neighbor Timothy shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timothy works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug.'
 					end
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				end
 			end
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
@@ -249,12 +249,12 @@ if $ARGS[0] = 'work':
 					'The senior manager Ivan shows up in your office.'
 					gs 'BurgerTip', 'ivan_work'
 
-					if $kompromatFoto = '' or kompromatBlackMail > 1:
+					if $BurgerQW['IvanQWBlackmailPhoto'] = '' or BurgerQW['IvanQWBlackmail'] > 1:
 						'Ivan grins, "Honey, I need you to put your stamp on these papers." You give Ivan a sceptical look, as you find your company stamp. Then you put your stamp on the papers, and hand the back to Ivan.'
 
-						if PSBBtimes = 1:
+						if BurgerQW['WorkShift'] = 1:
 							act 'Have your lunch': gt 'burgerWork', 'work'
-						elseif PSBBtimes = 2:
+						elseif BurgerQW['WorkShift'] = 2:
 							act 'Leave work': gs 'burgerWork', 'work2'
 						end
 					end
@@ -264,9 +264,9 @@ if $ARGS[0] = 'work':
 					'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 					'"No, he just he just left." you tell him.'
 
-					if sergeyPQW = 1:
+					if BurgerQW['sergeyQW'] = 1:
 						'The pimply young man chuckles, and sits on the edge of your desk. "<<$pcs_nickname>>, you''re dynamite. We are very lucky to have a girl like you around," he says, leering at you.'
-					elseif sergeyPQW = 0:
+					elseif BurgerQW['sergeyQW'] = 0:
 						'The pimply young man chuckles, and sits on the edge of your desk. "<<$pcs_nickname>> you seem like such a cool girl, do you think...I mean would you like, to go out with me after work?"'
 
 						act 'Eww, no way!':
@@ -274,9 +274,9 @@ if $ARGS[0] = 'work':
 							gs 'stat'
 							'After you reject this rookie, he jumps up and scampers out of your office. What a scrub!'
 
-							if PSBBtimes = 1:
+							if BurgerQW['WorkShift'] = 1:
 								act 'Have your lunch': gt 'burgerWork', 'work'
-							elseif PSBBtimes = 2:
+							elseif BurgerQW['WorkShift'] = 2:
 								act 'Leave work': gs 'burgerWork', 'work2'
 							end
 						end
@@ -302,12 +302,12 @@ if $ARGS[0] = 'work':
 								act 'Let him down easy':
 									*clr&cla
 									minut += 15
-									sergeyPQW = 1
+									BurgerQW['sergeyQW'] = 1
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
 									'You tell him that you have to be getting home, and the little brat takes that as an opportunity to grope you, before you leave.'
 
-									act 'Leave.':gt 'down'
+									act 'Leave.':gt 'city_center'
 								end
 							end
 						end
@@ -315,9 +315,9 @@ if $ARGS[0] = 'work':
 						exit
 					end
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 
@@ -326,25 +326,25 @@ if $ARGS[0] = 'work':
 					'"No, he stepped out," you reply.'
 					'She purses her lips looking at you with disapproval, before she turns to go.'
 					
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				elseif bburand = 3:
 					'The the personnel manager Vick comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				elseif bburand > 3:
 					'With some free time at in the office alone, you screw around on the computer. The first thing you do is check for any updates on TFgamessite, disappointed you play solitaire instead.'
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				end
@@ -365,14 +365,14 @@ if $ARGS[0] = 'work':
 							gs 'stat'
 
 							if SaunaWhore > 0:
-								BuSWworkEnd = 1
+								BurgerQW['SaunaWhoreKnown'] = 1
 								'When you enter the sauna and stop dead in your tracks when you see the madam."<<$pcs_nickname>>, what a surprise are you coming back to work for us."' 
 								'Anatoly says, "Whats going on here?"'
 								'"Oh, you don''t know? Little <<$pcs_nickname>> is one of the best little cocksuckers I''ve ever had work for me, and her pussy is a goldmine," she laughs.'
 								'Anatoly is furious: "How? <<$pcs_nickname>>? You''re just a common whore?" If that''s the case you can stay here, and ply your trade. I guess I was wrong about you." He storms off, and moments later you here the screech of his car tires as he drives away.'
 								'The madam continues: "<<$pcs_nickname>>, you''re a whore. You will always be a whore. If you do manage to trick some nice man your past will eventually catch up with you. Consider this a free lesson."'
 								
-								act 'Leave':gt 'street'
+								act 'Leave':gt 'city_residential'
 							elseif SaunaWhore = 0:
 								'You head into the sauna, and up to your luxury room. Anatoly doesn''t waste anytime undressing, and motions for you to do the same. When you are both naked, he motions for you to come to him. You know just what to do.'
 
@@ -430,7 +430,7 @@ if $ARGS[0] = 'work':
 										gs 'arousal', 'end'
 										gs 'stat'
 						
-										act 'Leave':gt 'street'
+										act 'Leave':gt 'city_residential'
 									end
 								end
 							end
@@ -452,7 +452,7 @@ if $ARGS[0] = 'work':
 							gs 'arousal', 'end'
 							gs 'stat'
 						
-							act 'Leave':gt 'down'
+							act 'Leave':gt 'city_center'
 						end
 					end
 				end
@@ -475,9 +475,9 @@ if $ARGS[0] = 'work':
 						'Your neighbor Timothy shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timothy works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug'
 					end
 
-					if PSBBtimes = 1:
+					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
-					elseif PSBBtimes = 2:
+					elseif BurgerQW['WorkShift'] = 2:
 						act 'Leave work': gs 'burgerWork', 'work2'
 					end
 				end
@@ -490,7 +490,7 @@ if $ARGS[0] = 'work':
 					gs 'stat'
 					'Two men join  Anatoly in his office for the meeting. You are tasked with bringing coffee and taking notes. An hour later, the men are gone and Anatoly sends you on your way.'
 
-					act 'Leave':gt 'down'
+					act 'Leave':gt 'city_center'
 				end
 			end
 		end
@@ -498,24 +498,24 @@ if $ARGS[0] = 'work':
 		exit
 	elseif burand = 2:
 		*clr & cla
-		if $kompromatFoto ! '' and kompromatBlackMail = 0:
+		if $BurgerQW['IvanQWBlackmailPhoto'] ! '' and BurgerQW['IvanQWBlackmail'] = 0:
 			gt 'BurgerTip', 'ivan_work'
-		elseif $kompromatFoto = '' and kompromatBlackMail > 1:
+		elseif $BurgerQW['IvanQWBlackmailPhoto'] = '' and BurgerQW['IvanQWBlackmail'] > 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work.jpg"></center>'
 			'The senior manager Ivan shows up in your office.'
 			'Ivan grins, "Honey, I need you to put your stamp on these papers." You give Ivan a sceptical look, as you find your company stamp. Then you put your stamp on the papers, and hand the back to Ivan.'
 
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work.jpg"></center>'
 			'Nothing interesting happens.'
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		end
@@ -526,9 +526,9 @@ if $ARGS[0] = 'work':
 		'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 		'"No, he just he just left." you tell him.'
 
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 
@@ -538,9 +538,9 @@ if $ARGS[0] = 'work':
 		'"No, he stepped out," you reply.'
 		'She purses her lips looking at you with disapproval, before she turns to go.'
 
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 
@@ -548,9 +548,9 @@ if $ARGS[0] = 'work':
 	elseif burand = 5:
 		'The the personnel manager Vic comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
 
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 
@@ -558,32 +558,32 @@ if $ARGS[0] = 'work':
 	elseif burand = 6:
 		'An elegantly dressed woman shows up at the office.'
 
-		if gossipBU < 10:
+		if BurgerQW['SlutReputation'] < 10:
 			'The lady looks at you scornfully and asks, "Is he in there?" You nod your head meekly. Without knocking she marches into Anatoly''s office. A short time later they both come back out. "Yes dear, I''ll see you at your mothers house later, I promise," he says, as he ushers her out the door. After she is gone, he chuckles, "My wife is a rare bitch."'
 		
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		end
 
-		if gossipBU >= 10:
+		if BurgerQW['SlutReputation'] >= 10:
 			'She looks at you with contempt, and storms into Anatoly''s office. You can here her screaming through the door: "I know all about your adventures with that slut out there. If you don''t send your whore packing immediately I''m leaving you, and taking you for everything you''re worth." With that she storms out of the office, and spits on you on her way out the door.'
 			'A few minutes later Anatoly comes out, and says, "<<$pcs_nickname>>, I''m sorry, I can''t afford to lose my marriage over you. I''m going to have to insist on your resignation."'
 			
 			act 'Write a letter of resignation':
 				*clr&cla
 				work = 0
-				PersSecWork = 2
-				Pay = PersSecWorkTimes * 1250
-				PersSecWorkTimes = 0
+				BurgerQW['Secretary'] = 2
+				Pay = BurgerQW['SecretaryTimesWorked'] * 1250
+				BurgerQW['SecretaryTimesWorked'] = 0
 				money += Pay
 				gs 'stat'
 				'You quickly write out something that effectively says "I quit!" with some fancy words thrown in.'
 				'Anatoly pays you the <<pay>> <b>₽</b> you are owed, and says, "It''s over <<$pcs_nickname>>, get out of here."'
 
-				act 'Leave':gt 'down'
+				act 'Leave':gt 'city_center'
 			end
 		end
 
@@ -636,30 +636,30 @@ if $ARGS[0] = 'toilet':
 	bosstoirand = rand(0, 10)
 
 	if bosstoirand = 10:
-		gossipBU += 1
+		BurgerQW['SlutReputation'] += 1
 		'On your way to the toilet, you accidentally collide with Ivan. He looks at you with a knowing little grin, before going about his business.'
 		gs 'BurgerTip', 'toilet_wash'
 	elseif bosstoirand = 9:
-		gossipBU += 1
+		BurgerQW['SlutReputation'] += 1
 		'On your way to the toilet, you encounter Lena. The accountant notices the stain on your blouse and mutters "whore", before walking away.'
 		gs 'BurgerTip', 'toilet_wash'
 	elseif bosstoirand = 8:
-		gossipBU += 1
+		BurgerQW['SlutReputation'] += 1
 		'On your way to the toilet, you accidentally collided with the personnel manager. Vic notices the cum stain, and her eyes widen in surprise. She wrinkles her nose in disgust, and walks away.'
 		gs 'BurgerTip', 'toilet_wash'
 	elseif bosstoirand = 7:
-		gossipBU += 1
+		BurgerQW['SlutReputation'] += 1
 		'On your way to the toilet, you encounter Sergei. The pimply deputy manager notices the cum stain and laughs. "I thought you always swallowed everything, cocksucker", he says, as he walks away.'
 		gs 'BurgerTip', 'toilet_wash'
 	elseif bosstoirand < 7:
 		bosstoirandin = rand(0, 10)
 
 		if bosstoirandin = 10:
-			gossipBU += 1
+			BurgerQW['SlutReputation'] += 1
 			'You quietly slipped into the toilet, but come face to face with Lena. She notices the stain on your top and muttered "whore" before walking away.'
 			gs 'BurgerTip', 'toilet_wash2'
 		elseif bosstoirandin = 9:
-			gossipBU += 1
+			BurgerQW['SlutReputation'] += 1
 			'In the bathroom you come face to face with toilet faced nose to nose with Vik. The personnel manager notices what you are doing, and shakes her head with disdain, as she walks out.'
 			gs 'BurgerTip', 'toilet_wash2'
 		elseif bosstoirandin < 9:
@@ -674,9 +674,9 @@ if $ARGS[0] = 'toilet':
 
 			'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
 
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		end
@@ -695,9 +695,9 @@ if $ARGS[0] = 'toilet_wash':
 				
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
 
-	if PSBBtimes = 1:
+	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
-	elseif PSBBtimes = 2:
+	elseif BurgerQW['WorkShift'] = 2:
 		act 'Leave work': gs 'burgerWork', 'work2'
 	end
 end
@@ -714,9 +714,9 @@ if $ARGS[0] = 'toilet_wash2':
 
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
 
-	if PSBBtimes = 1:
+	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
-	elseif PSBBtimes = 2:
+	elseif BurgerQW['WorkShift'] = 2:
 		act 'Leave work': gs 'burgerWork', 'work2'
 	end
 end
@@ -783,9 +783,9 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
@@ -810,9 +810,9 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
-			if PSBBtimes = 1:
+			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
-			elseif PSBBtimes = 2:
+			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
@@ -865,9 +865,9 @@ if $ARGS[0] = 'sex':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
@@ -895,9 +895,9 @@ if $ARGS[0] = 'anal':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	if PSBBtimes = 1:
+	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
-	elseif PSBBtimes = 2:
+	elseif BurgerQW['WorkShift'] = 2:
 		act 'Leave work': gs 'burgerWork', 'work2'
 	end
 end
@@ -926,9 +926,9 @@ if $ARGS[0] = 'sex2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
@@ -956,9 +956,9 @@ if $ARGS[0] = 'anal2':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	if PSBBtimes = 1:
+	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
-	elseif PSBBtimes = 2:
+	elseif BurgerQW['WorkShift'] = 2:
 		act 'Leave work': gs 'burgerWork', 'work2'
 	end
 end
@@ -966,21 +966,21 @@ end
 if $ARGS[0] = 'ivan_work':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work.jpg"></center>'
 	'The senior manager Ivan shows up in your office.'
-	'Ivan grins, "<<$pcs_nickname>>, <<$pcs_nickname>>, I would have never imagined this from a sweet young thing like you." He puts a photo on your desk. You pick it up, and take a look. <<$kompromatFoto>>. Ivan is looking at you like a cat about to catch a mouse: "<<$pcs_nickname>>, we can''t have this our boss has aims at a career in politics. If something like this were to get out it would it would...well we can''t let that happen. I''m afraid you are just going to have to quit. Anatoly can''t be known as a man who keeps a slutty secretary."' 
+	'Ivan grins, "<<$pcs_nickname>>, <<$pcs_nickname>>, I would have never imagined this from a sweet young thing like you." He puts a photo on your desk. You pick it up, and take a look. <<$BurgerQW[''IvanQWBlackmailPhoto'']>>. Ivan is looking at you like a cat about to catch a mouse: "<<$pcs_nickname>>, we can''t have this our boss has aims at a career in politics. If something like this were to get out it would it would...well we can''t let that happen. I''m afraid you are just going to have to quit. Anatoly can''t be known as a man who keeps a slutty secretary."' 
 	
 	act 'Plead with him not to show the pictures': gt 'BurgerTip', 'ivan_work2'
 
 	act 'Keep silent':
 		*clr & cla
-		kompromatBlackMail = 1
+		BurgerQW['IvanQWBlackmail'] = 1
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work5.jpg"></center>'
 		'Ivan frowns slightly when you don''t say anything. "OK baby, I will keep quiet for now, but this isn''t the end of this." Irritated, he puts the photo in his pocket.'
 
-		if PSBBtimes = 1:
+		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
-		elseif PSBBtimes = 2:
+		elseif BurgerQW['WorkShift'] = 2:
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 
@@ -998,19 +998,19 @@ if $ARGS[0] = 'ivan_work2':
 
 	act 'Go with Ivan':
 		*clr&cla
-		kompromatBlackMail = 2
+		BurgerQW['IvanQWBlackmail'] = 2
 		gs 'stat'
 		'When you enter his office, Ivan locks the door. "Well baby, you can start by getting those clothes off," he orders.'
 
 		act 'Undress':
 			*clr&cla
-			kompromatBlackMail = 2
+			BurgerQW['IvanQWBlackmail'] = 2
 			gs 'stat'
 			'As you undress you feel Ivan''s gaze all over your body. When you are naked, he slowly walks across the room, staring at you. He reaches out with a hand and tweaks one of you nipples, saying, "Not bad, not bad, I think you and I will get along just fine. Now on your knees bitch, and open that cute fucking mouth of yours wide."'
 
 			act 'Get on your knees and open your mouth':
 				*clr&cla
-				kompromatBlackMail = 2
+				BurgerQW['IvanQWBlackmail'] = 2
 				spafinloc = 11
 				gs 'cum_manage'
 				facial += 1
@@ -1022,9 +1022,9 @@ if $ARGS[0] = 'ivan_work2':
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
-				if PSBBtimes = 1:
+				if BurgerQW['WorkShift'] = 1:
 					act 'Have your lunch': gt 'burgerWork', 'work'
-				elseif PSBBtimes = 2:
+				elseif BurgerQW['WorkShift'] = 2:
 					act 'Leave work': gs 'burgerWork', 'work2'
 				end
 			end
@@ -1056,26 +1056,26 @@ end
 
 if $ARGS[0] = 'ivan_work3':
 	*clr&cla
-	kompromatBlackMail = 1
+	BurgerQW['IvanQWBlackmail'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work7.jpg"></center>'
 	'When you refuse to undress, Ivan says, "I''m tired of messing with you anyway, you stupid cunt. It''s easier just to get rid of you once and for all." With that, he opens the door and orders you to exit.'
 
-	if PSBBtimes = 1:
+	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
-	elseif PSBBtimes = 2:
+	elseif BurgerQW['WorkShift'] = 2:
 		act 'Leave work': gs 'burgerWork', 'work2'
 	end
 end
 
 if $ARGS[0] = 'work4':
 	*clr&cla
-	kompromatBlackMail = 1
+	BurgerQW['IvanQWBlackmail'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work7.jpg"></center>'
 	'When you refuse, Ivan says, "I''m tired of messing with you anyway, you stupid cunt. It''s easier just to get rid of you once and for all." With that, he turns and walks away.'
 
-	act 'Leave':gt 'down'
+	act 'Leave':gt 'city_center'
 end
 
 --- BurgerTip ---------------------------------

+ 4 - 4
locations/Cheatmenu_din.qsrc

@@ -1375,7 +1375,7 @@ $cheatmenu['reputation'] = {
 		'You''ve been dating for <<loverdays[2]>> days. <a href="exec:loverdays[2] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[2] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
 	end
 	*nl
-	if pav_slut >= 25:
+	if pav_slut >= 50:
 		gs 'fame'
 		'In Pavlovsk you are known as a <font color="red"><<$gnikname>></font> <a href="exec:pav_slut = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 	end
@@ -1396,7 +1396,7 @@ $cheatmenu['reputation'] = {
 			'Your mother thinks that you are a virgin.'
 		end
 		*nl
-		if evgenQW >= 4 and pav_slut >= 125:
+		if evgenQW >= 4 and pav_slut >= 250:
 			'Your brother thinks you are a total whore. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif evgenQW >= 3:
 			'Your brother thinks you are a slut. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
@@ -2430,8 +2430,8 @@ $cheatmenu = {
 	'Jump forward <a href="exec:dynamic $cheatmenu[''quicktime''], 15 & dynamic $cheatmenu">+15</a> minutes'
 	*nl
 	*nl
-	'<a href="exec:gt''pavResidential''">Teleport to Pavlovsk</a>'
-	'<a href="exec:gt''street''">Teleport to City</a>'
+	'<a href="exec:gt''pav_residential''">Teleport to Pavlovsk</a>'
+	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'
 	*nl

+ 1 - 1
locations/FedorEv.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/fedor.jpg"></center>'
 
-			act 'Leave the school courtyard':gt 'pavResidential'
+			act 'Leave the school courtyard':gt 'pav_residential'
 		end
 	end
 end

+ 18 - 18
locations/FedorEv2.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'Train Tracks':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Walk home with Fedor': gt 'pavResidential'	
+		act 'Walk home with Fedor': gt 'pav_residential'	
 	end	
 	act 'Offer him your hand':
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'Train Tracks':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/nokiss.jpg"></center>'
 		'You think to yourself "This is going too fast." so you offer Fedor your hand. He is a little surprised at first but kisses your hand nonetheless. Fedor lowers your hand as he releases it and after a few moments of silence you notice a Fedor''s posture lowers as he turns away from you "It''s starting to get late, we should probally get going before your parents start to worry about you." He says, with a meek smile as he takes your hand and walks you home.'
 			
-		act 'Walk home with Fedor': gt 'pavResidential'
+		act 'Walk home with Fedor': gt 'pav_residential'
 	end	
 end	
 
@@ -703,7 +703,7 @@ if $ARGS[0] = 'Skate Kiss':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Skate End':	
@@ -717,7 +717,7 @@ if $ARGS[0] = 'Skate End':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Cafe':	
@@ -767,7 +767,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Take his hand':	
 				*clr & cla
@@ -784,7 +784,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end	
 		act 'Get on the swing with Fedor':	
@@ -807,7 +807,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Hug Fedor':	
 				*clr & cla
@@ -820,7 +820,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end			
 		end	
 	end
@@ -849,7 +849,7 @@ if $ARGS[0] = 'Park 2':
 
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end
 		end
 	end	
@@ -872,7 +872,7 @@ if $ARGS[0] = 'Park 2':
 			
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		act 'Relax':	
 			*clr & cla
@@ -884,7 +884,7 @@ if $ARGS[0] = 'Park 2':
 
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		gs 'willpower', 'bj', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -922,7 +922,7 @@ if $ARGS[0] = 'Park 2':
 						
 						act 'Take me home': gt 'FedorEv2', 'Park End'
 						
-						act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+						act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 					end
 					act 'Stop before he cums':	
 						*clr & cla
@@ -935,7 +935,7 @@ if $ARGS[0] = 'Park 2':
 						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 						
-						act 'Leave':minut += 15 & gt 'pavResidential'
+						act 'Leave':minut += 15 & gt 'pav_residential'
 					end						
 				end	
 			end
@@ -970,7 +970,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -981,7 +981,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end		
 		act 'Lay down between the tracks':	
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end					
 	end		
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'Fedor Breakup':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'Fedor approaches you with a serious look on his face. "Look <<$pcs_firstname>>, I''ve noticed that you and I don''t seem to be progressing at all in this relationship and I feel like I would only be holding you back if I continued this, so I think we should break this off...I''m sorry that I couldn''t be the man you needed." and before you get to say a word he turns around and leaves.'
 	
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end		
 
 --- FedorEv2 ---------------------------------

+ 1 - 1
locations/FedorEv3.qsrc

@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'Movies 3':
 	*nl	
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></video></center>'
 
-	act 'Walk away':gt 'pavResidential'
+	act 'Walk away':gt 'pav_residential'
 end		
 
 --- FedorEv3 ---------------------------------

+ 4 - 4
locations/FedorEv4.qsrc

@@ -2724,7 +2724,7 @@ if $ARGS[0] = 'Hallway':
 		else
 			FedorHomeDate = 0
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 	
@@ -3620,7 +3620,7 @@ if $ARGS[0] = 'Dimka Aftermath':
 			gt 'FedorEv4', 'Bedroom'
 		else
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -3634,7 +3634,7 @@ if $ARGS[0] = 'Home Entrance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
-	act 'Walk away': minut += 5 & gt 'pavResidential'
+	act 'Walk away': minut += 5 & gt 'pav_residential'
 	act 'Knock on the door':gt 'FedorEv4', 'Home Entrance 2'
 end
 
@@ -3657,7 +3657,7 @@ if $ARGS[0] = 'Home Entrance 2':
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
 		'You knock on the door but no one answers.'
-		act 'Walk away': minut += 5 & gt 'pavResidential'
+		act 'Walk away': minut += 5 & gt 'pav_residential'
 	end
 end
 

+ 3 - 3
locations/FedorMisc.qsrc

@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 
 							act 'Get dressed then leave':
 								gs 'clothing', 'wear_last_worn'
-								gt 'pavResidential'
+								gt 'pav_residential'
 							end
 						end
 					end
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'Dimka Party':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/fedor.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Dimka Party 2':
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'Dimka Party 2':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/outcast.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'VKwip':

+ 45 - 45
locations/Gnpc2.qsrc

@@ -19,14 +19,14 @@ $din_gboy_end_to_disco = {
 
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offers to accompany you home.'
 
-			act 'go home':gt 'pavResidential'
+			act 'go home':gt 'pav_residential'
 		end
 	elseif gnpcSex[numnpc] > 0:
 		'<<$boydesc>> invites you to his home.'
@@ -34,7 +34,7 @@ $din_gboy_end_to_disco = {
 
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -74,7 +74,7 @@ $din_gboy_go_to_disco = {
 				'While you are dancing with <<$boydesc>> a drunk kid in sweatpants and sweatshirt approaches.'
 				gs 'npcgeneratec', 0, 'Gopnik', rand((age - 1),(age + 1))
 				gs 'boyStat', $npclastgenerated, 1
-				if pav_slut < 75:
+				if pav_slut < 150:
 					'The Gopnik pushes <<$boydesc>> to the side and grabs you by the waist. "Let''s dance, babe!"'
 					*nl
 
@@ -88,11 +88,11 @@ $din_gboy_go_to_disco = {
 
 							if tiprand <= 70:
 								'Fortunately, <<$boydesc>> manages to win the fight verbally, accusing the Gopnik of grabbing you, his girlfriend. But the evening was spoiled and finally <<$boydesc>> suggests that it would be better if you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							elseif tiprand <= 85:
 								otnBoyFrend[numnpc] -= 20
 								'The Gopnik quickly pounces on your guy and punches him in the face. It seems that <<$boydesc>> doesn''t stand a chance against the three Gopniks and before he gets completely beaten up he offers all his money to the angry Gopniks and apologizes repeatedly before all of them. You quickly leave the dance floor and <<$boydesc>> suggests that you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							else
 								'The discussion escalates quickly into a fight and soon the Gopniks charge at your <<$bfTitle[numnpc]>> in the middle of the club.'
 								*nl
@@ -113,7 +113,7 @@ $din_gboy_go_to_disco = {
 											'You try to push the Gopnik, but someone pushes you roughly away from the fight.'
 											*pl $stumble
 											*pl $bfDiscoBadEnd
-											act 'Go home':gt 'pavResidential'
+											act 'Go home':gt 'pav_residential'
 										else
 											'You push back the Gopnik with all your strength and he stumbles backwards, hitting his head on the floor. But the second Gopnik turns to you and swings his fist towards your face.'
 											if pcs_agil < 60:
@@ -123,7 +123,7 @@ $din_gboy_go_to_disco = {
 												gs 'stat'
 												*pl $looseTooth
 												*pl $bfDiscoBadEnd
-												act 'Go home':gt 'pavResidential'
+												act 'Go home':gt 'pav_residential'
 											else
 												'You react just in time and quickly move your head to the side barely avoiding his punch.'
 												*nl
@@ -144,7 +144,7 @@ $din_gboy_go_to_disco = {
 														'You swing at the Gopnik and hit him right on the nose. He staggers briefly and then yells angrily at you, "Oh, you bitch!". He charges quickly at you and then a barrage of punches comes raining down on you.'
 														$looseTooth
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													else
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
@@ -152,7 +152,7 @@ $din_gboy_go_to_disco = {
 														'You try to hit the hooligan with a punch to the face but your blow is too slow. The Gopnik dodges your weak attempt and pushes you roughly away.'
 														$stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -170,7 +170,7 @@ $din_gboy_go_to_disco = {
 															*pl $discoScratch1
 															*pl $discoScratch2
 															*pl $discoScratch3
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														'You try to kick the hooligan in his face but he is faster than you and manages to shove you away before you even got your leg up.'
@@ -179,7 +179,7 @@ $din_gboy_go_to_disco = {
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
 														gs 'stat'
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -201,7 +201,7 @@ $din_gboy_go_to_disco = {
 																*pl $discoScratch1
 																*pl $discoScratch2
 																*pl $discoScratch3
-																act 'Go home':gt 'pavResidential'
+																act 'Go home':gt 'pav_residential'
 															end
 														else
 															pcs_mood -= 20
@@ -210,7 +210,7 @@ $din_gboy_go_to_disco = {
 															*pl $badKick
 															*pl $stumble
 															*pl $bfDiscoBadEnd
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														pcs_mood -= 20
@@ -219,7 +219,7 @@ $din_gboy_go_to_disco = {
 														*pl $badKick
 														*pl $stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 											end
@@ -235,7 +235,7 @@ $din_gboy_go_to_disco = {
 									gs 'stat'
 									'<<$boydesc>> can''t escape the attacks of the three Gopniks and soon falls under a barrage of punches. The Gopniks drag him into the streets where they steal all his money, take off his shoes, and throw him into the bushes.'
 									'Once they left, you help your <<$bfTitle[numnpc]>> to his feet and manage to get him back home. His face is covered in blood and bruises everywhere.'
-									act 'Go home':gt 'pavResidential'
+									act 'Go home':gt 'pav_residential'
 								end
 							end
 						end
@@ -262,7 +262,7 @@ $din_gboy_go_to_disco = {
 						act 'Leave alone':
 							cla
 							'You have already done enough damage. You tell him that you need to use the restroom, untangle yourself from his clutches and then move towards the exit.'
-							act 'Leave':gt 'gdk'
+							act 'Leave':gt 'pav_commcenter'
 						end
 					end
 				else
@@ -287,7 +287,7 @@ $din_gboy_go_to_disco = {
 						gs 'stat'
 						'Your <<$bfTitle[numnpc]>> gets himself a beer at the bar and in the meantime you continue to dance.'
 
-						if pav_slut >= 75:
+						if pav_slut >= 150:
 							'Someone walks up to you "Hey, I''ve been watching you having fun with your boyfriend here. He still does''t know that you are a <<$gnikname>>? Maybe I should tell him?"'
 							*nl
 							set $bfBreakup = 'You tell the guy to go to hell and he walks away with a sullen look on his face. At this point, <<$boydesc>> comes back and asks, "What did that guy want from you?" You quickly lie, "He wanted to dance with me, but I turned him down." Unfortunately, the guy comes back and pulls your <<$bfTitle[numnpc]>> to the side. After a while, <<$boydesc>> returns and says "We''re through. Based on the shit I was just told, I won''t waste another minute on the likes of a whore like you!"'
@@ -387,7 +387,7 @@ $din_gboy_go_to_disco = {
 												'You continue to dance with your <<$bfTitle[numnpc]>>. A few minutes pass and then you see the guys that watched your whole blowjob scene coming out of the toilet. They also see you and guffaw, noisily discussing something. <<$boydesc>> looks at them puzzled, "What''s with them?" The boys shout to him, "While you were wandering around the place, your girlfriend was in the toilet sucking on a dick!" <<$boydesc>> comes up to them, "Are you crazy?"'
 												'The Boys start to tell him how you just sucked off a guy in front of them. <<$boydesc>> rushes back over to you and slaps you across the face "Get the fuck out, slut! I don''t want to see you ever again!"'
 
-												act 'Leave':gt 'gdk'
+												act 'Leave':gt 'pav_commcenter'
 											end
 										end
 									end
@@ -808,7 +808,7 @@ $din_gboy_tits = {
 					gs 'stat'
 					'You take his hand out of your pants, and he shakes his head, not understanding.'
 
-					act 'Go home':gt 'pavResidential'
+					act 'Go home':gt 'pav_residential'
 				end
 			else
 				act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -834,7 +834,7 @@ $din_gboy_tits = {
 						'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 						'You pull his hard and hot cock out of his pants and wrap your hand around it. You start kissing him while stroking his penis. Finally the guy groans and you watch as loads of his sperm erupt again and again from his cock.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Jerk him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -866,7 +866,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
 						gs 'dinsex','bj_swallow_random'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Remove it from your mouth':
@@ -879,7 +879,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 						'You remove his member from your mouth just as a stream of hot sperm hits you in the face, then another and another until he eventually finished coating your face with his cum.'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Surrender':
@@ -898,7 +898,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'boy_puts_condom'
 						gs 'dinsex','vaginal_sex',10
 						gs 'dinsex','sexcum'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -919,7 +919,7 @@ $din_gboy_tits = {
 							gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -948,7 +948,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'You pull his hand from your pussy, and he just looks at you, slightly confused.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -978,7 +978,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'vaginal_sex', 15
 						gs 'dinsex', 'sexcum'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -998,7 +998,7 @@ $din_gboy_tits = {
 							gs 'dinSex', 'boy_wants_anal','lubri' & gs 'dinsex', 'analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1020,7 +1020,7 @@ $din_gboy_tits = {
 			gs 'stat'
 			'You remove his hands from your exposed breasts, and he looks puzzled, not sure why.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1052,7 +1052,7 @@ $din_gboy_knee = {
 			gs 'stat'
 			'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1076,7 +1076,7 @@ $din_gboy_knee = {
 				gs 'stat'
 				'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-				act 'Go home':gt 'pavResidential'
+				act 'Go home':gt 'pav_residential'
 			end
 		else
 			act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1143,7 +1143,7 @@ $din_gboy_go_to_boyhome = {
 							otnBoyFrend[numnpc] -= 20
 							gs 'stat'
 							'You got up from the couch upset with the guy claiming that you are not interested in watching that type of trash. <<$boydesc>> gets embarrassed and blushing began stuttering an apology.'
-							act 'Go home':gt 'pavResidential'
+							act 'Go home':gt 'pav_residential'
 						end
 					else
 						act 'Refuse to watch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1165,7 +1165,7 @@ $din_gboy_go_to_boyhome = {
 								gs 'stat'
 								'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							end
 						else
 							act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1187,7 +1187,7 @@ $din_gboy_go_to_boyhome = {
 								act 'Kiss him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-						act 'Go home': gt 'pavResidential'
+						act 'Go home': gt 'pav_residential'
 					end
 				end
 			end
@@ -1201,7 +1201,7 @@ $din_gboy_go_to_boyhome = {
 			dynamic $din_gboy_knee
 		end
 
-		!!act 'Go home':gt 'pavResidential'
+		!!act 'Go home':gt 'pav_residential'
 	end
 }
 
@@ -1216,7 +1216,7 @@ gs 'stat'
 if hour < 20:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		gdeystboyrand = rand(0, 1)
 
@@ -1225,20 +1225,20 @@ if hour < 20:
 			dynamic $din_gboy_go_to_boyhome
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to take you home.'
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'<<$boydesc>> suggested that you two go to his home.'
 		dynamic $din_gboy_go_to_boyhome
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1246,7 +1246,7 @@ if hour < 20:
 elseif hour >= 20 and hour < 23:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		tipgbrand = rand(0, 1)
 
@@ -1255,14 +1255,14 @@ elseif hour >= 20 and hour < 23:
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif tipgbrand = 1:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		gdeystboyrand = rand(0, 1)
@@ -1270,13 +1270,13 @@ elseif hour >= 20 and hour < 23:
 		if gdeystboyrand = 0:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to go to the disco.'
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1286,7 +1286,7 @@ elseif hour >= 20 and hour < 23:
 elseif hour >= 23:
 	'<<$boydesc>> offered to take you home.'
 
-	act 'go home':gt 'pavResidential'
+	act 'go home':gt 'pav_residential'
 end
 
 --- Gnpc2 ---------------------------------

+ 3 - 1
locations/IvanEv.qsrc

@@ -124,10 +124,12 @@ if $ARGS[0] = 'School Chat':
 		act 'Move away': gt $loc, $metka
 	end
 	
+	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+	
 	act 'Chat':
 		cla
 		if $loc ! 'gdkin':
-			if pav_slut <= 50 and IvanShowerQW = 1:
+			if pav_slut <= 100 and IvanShowerQW = 1:
 				gs 'nogorslut'
 
 				act 'Leave': gt 'gschool_lessons', 'short_break'

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -1,7 +1,7 @@
 # JuliaMilHome
 
 $location_type = 'indoors'
-$menu_loc = 'pavCommercial'
+$menu_loc = 'pav_commercial'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL

+ 1 - 1
locations/KatjaHome.qsrc

@@ -15,7 +15,7 @@ else
 	if hour >= 9:'The door is opened by Katja''s mother. "Oh, hello <<$pcs_nickname>>. Katja isn''t home right now."'
 	if hour < 9:'The door is opened by Katja''s mother. "<<$pcs_nickname>>. Shouldn''t you be in bed? You shouldn''t come around before nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- KatjaHome ---------------------------------

+ 4 - 4
locations/KatjaHomeTalk.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -263,7 +263,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -288,7 +288,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -334,7 +334,7 @@ if $ARGS[0] = '':
 	if mey_vika['key'] = 1:
 		Act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 	end
 end
 

+ 157 - 134
locations/LBZhouse.qsrc

@@ -1,159 +1,182 @@
 # LBZhouse
-CLOSE ALL
-
-$LBZH_sex={
-	act 'Give up your pussy':
-		cls
-		gs'stat'
-		mrapic=rand(0,7)
-		!'<<mrapic>>'
-		'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<mrapic>>.mp4"></video></center>'
-		''
-		gs 'arousal', 'vaginal', 10, 'sub'
-		gs 'stat'
 
-		act 'Finish':dynamic $LBZH_end
-	end
-}
+CLOSE ALL
 
-$LBZH_anal={
-	act 'Give up your ass':
-		cls
-		gs'stat'
-		mrapic=rand(0,7)
-		!'<<mrapic>>'
-		'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<mrapic>>.mp4"></video></center>'
-		''
-		gs 'arousal', 'anal', 10, 'sub'
-		gs 'stat'
+if $ARGS[0] = '':
+	*clr & cla
+	gs'stat'
+	gs 'npcgeneratec', 0, $boydesc, rand(18,34)
+	gs 'boyStat', $npclastgenerated
+	'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
+	'<<$boydesc>> leads you back to his place, then gives you a warm smile then gently brushes your cheek and says, "You are so beautiful but I bet you know that already, don''t you?" You lower your head as you feel your cheeks growing flushed. <<$boydesc>> then lowers his hand to under your chin, raising it up to his face then giving you a slow, passionate kiss.'
+
+	act 'See what he does':
+		*clr & cla
+		gs'stat'		
+		'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees3.jpg"></center>'		
+		'<<$boydesc>> continues kissing you as he begin unzipping his pants then taking his penis out. He then rubs his hands across your body, from your breasts, down to your ass. Feeling you up as you look down, watching his cock getting rock hard.'
+
+		act 'Reach for his cock':
+			*clr & cla
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj19.jpg"></center>'
+			'Feeling really aroused, you allow your hand to wander to his waist then slowly creep into his pants, as he makes no attempts to stop you. You can feel his hand shaft and wrap your fingers around it, lightly stroking it as you pull it out of his pants. <<$boydesc>> then begins lightly pushing on your shoulders bringing your face to his cock. You look up to his cock then slowly lean forward, extending your tongue before lightly licking on the tip of his penis while looking up at him. He clearly looks excited as he pushes his hips forward, signaling you to take his cock into your mouth.'
+			
+			act 'Suck his dick': gt 'LBZhouse', 'BJ'
+		end
+	end	
+	
+	act 'Continue kissing him':
+		'<center><video autoplay loop src="images/shared/sex/kiss/kiss_lips.mp4"></video></center>'
+		'<<$boydesc>> continues kissing you while his hands wonder over your body, gently rubbing over your curves until his hands reach your waist. He then lifts your shirt over your head, breaking off the kiss long enough for your shirt to pass through before getting tossed on the side of the bed. He then returns to kissing you as his hands wander down, his fingers, running across your chest, brushing your nipples until he makes his way to your pants, pulling then down and then removing your socks and shoes. His hands then return to your hips.'
 
-		spafinloc = 3
-		gs 'cum_manage'
-		'<<$boydesc>> groaned and came filling your ass with his warm sperm.'
+		act 'Jerk him off':
+			*clr & cla
+			gs'stat'
+			'<center><video autoplay loop src="images/shared/sex/handjob/hj0.mp4"></video></center>'
+			'You slowly lower to your knees in front of him then raise your hand, wrapping your fingers around his hard shaft, causing his eyes immediately squint as he welcomes your hand on his cock. Seeing his excitement you begin stroking his cock gently while looking up at him. His cock lightly throbs a bits as you stroke it and it even leaks a bit with precum. You continue stroking his hard cock as he lightly moans , occasionally moving his hips with your strokes. After a few more seconds, <<$boydesc>> starts to pant heavily then says, "<<$pcs_nickname>>, slow down, I''m about to cum."'
+			gs 'arousal', 'hj', 5, 'sub'
+			gs 'stat'
 
-		act 'Finish':dynamic $LBZH_end
-	end
-}
+			act 'Vaginal': gt 'LBZhouse', 'Vaginal'
+			act 'Anal': gt 'LBZhouse', 'Anal'
+		end	
+	end	
+end
 
-$LBZH_bj={
-	act 'Suck':
-		cls
+if $ARGS[0] = 'BJ':
+		*clr & cla
 		gs'stat'
-		mrapic=rand(0,12)
-		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<mrapic>>.mp4"></video></center>'
-		'You take a cock in your mouth and start sucking it. You get busy working up and down his dick with your mouth. Your lips lock tightly around his shaft while your tongue licks and plays with his dick.'
-		'Soon <<$boydesc>> starts to pant heavily and moans out. "<<$pcs_nickname>>, I''m about to cum."'
-
-		gs 'arousal', 'bj', 5, 'sub'
+		VK = rand(0,10)
+		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<VK>>.mp4"></video></center>'
+		'You slowly wrap your lips around <<$boydesc>>''s penis as he pushes it into your mouth. You then begin sucking his cock while doing your best to massage his cock with your tongue, hearing him lightly moan as you continue to pleasure him. You look up at him, seeing a adoring smile on his face as he looks down to you. You lick and suck on his cock as you hear him moaning more and more until he tenses up for a few seconds says, "<<$pcs_nickname>>, I''m cumming."'
+		gs 'arousal', 'bj', 5
 		gs 'stat'
 
-		 act 'Swallow':
-			cls
+		act 'Swallow':
+			*clr & cla
 			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
 			gs'stat'
-			mrapic=rand(0,10)
-			!'<<mrapic>>'
-			'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum<<mrapic>>.mp4"></video></center>'
-			'You pull his dick out of your mouth and keep working on it with your hand, within moments spurts of hot sperm splash onto your face and into your mouth.'
-			'Once the last of the cum shoots into your mouth you swallow it all down.'
-
-			act 'Finish':dynamic $LBZH_end
+			VK = rand(0,10)
+			'<center><video autoplay loop src="images/shared/sex/cum/cumf60.mp4"></video></center>'
+			'You continue sucking his cock at and increased pace, wanting him to cum for you. After a few seconds, <<$boydesc>> eyes squint as he groans, filling your mouth with his hot cum which you continue sucking down into your throat. You never break eye contact as you fully milk his cock in your mouth. After <<$boydesc>> has no cum left, he gives you a very grateful smile as he gently strokes your cheek and says, "<<$pcs_nickname>> you were amazing. Thank you." You slowly take his cock out of your mouth then return the smile as you say, "It was my pleasure." He chuckles then says, "You should get washed up and I will see you out. Take your time."'
+			gs 'arousal', 'bj', 5
+			gs 'cum_call', 'mouth', $boy
+			gs 'arousal', 'end'			
+			gs 'stat'
+			
+			act 'Finish': gt 'LBZhouse', 'Shower'
+			act 'Finish': gt 'LBZhouse', 'End'			
 		end
-
-		dynamic $LBZH_sex
-		dynamic $LBZH_anal
 	end
-}
-
-$LBZH_end={
-	cls
+end
+	
+if $ARGS[0] = 'Vaginal':
+	*clr & cla
 	gs'stat'
-	if temp_guy>0:guy += 1
-	'Once finished you get up and go to the bathroom.'
-
-	act 'Wash in the shower':
-		cls
-		noShampoo = 1
-		dynamic $showerdin
-		minut += 15
-		pcs_horny = pcs_horny + 1
-		pcs_hairbsh = 1
-		pcs_makeup = 1
-		if frost > 0:frost = 0
-		gs'stat'
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'In the bathroom you take a shower to clean up.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-		act 'Get out of the bathroom':
-			cls
+	VK = 0
+	'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<VK>>.mp4"></video></center>'
+	'<<$boydesc>> reaches down then helps you to your feet before Grabbing onto your hips and guiding you to the bed before gently pushing you on your back. He then takes a few seconds to line up his penis with your pussy before pushing it inside of you, causing a jolt of pleasure to fill you. He then starts fucking your pussy gently at first before picking up his pace while moaning loudly. You lay still, enjoying his cock inside of you, thrusting its way deeper in you, causing waves of pleasure to fill you. After a few seconds <<$boydesc>> says, "I''m about to cum."'
+	gs 'arousal', 'vaginal', 5
+	gs 'stat'
+
+	if prezik >= 1 and preziktype = 0:
+		act 'Continue':
+			*clr & cla
 			gs'stat'
-			'After you are done washing you get dressed and blow <<$boydesc>> a kiss before you leave.'
-
-
-			act 'Leave':
-				gs 'arousal', 'end'
-				gs 'stat'
-				gt'pavResidential'
-			end
-		end
-	end
-}
-
-temp_sex=0
-temp_bj=0
-temp_anal=0
-temp_hj=0
-temp_guy=0
-
-gs 'npcgeneratec', 0, $boydesc, rand(18,34)
-gs 'boyStat', $npclastgenerated
-'<center><img <<$set_imgh>> src="images/shared/sex/kiss/fbhkiss.jpg"></center>'
-'He takes you back to his house, once you are both safely inside you start kissing.'
-
-act 'Sex':
-	cls
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees3.jpg"></center>'
-	tiprand=rand(1,100)
-	
-	if tiprand<=70:
-		'<<$boydesc>> gently pushes your shoulders down and you kneel in front of him, waiting for his hard shaft.'
-		dynamic $LBZH_bj
-
-		act 'Masturbate':
-			cls
-			temp_hj+=1
-			temp_guy+=1
+			'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka2.mp4"></video></center>'
+			'<<$boydesc>> continues pounding you faster as his breathing increases before suddenly stopping as you feel his cock expanding the condom, inside you. He groans as he pounds you harder, milking his cock into the condom before taking a few deep breaths and saying, "That was great <<$pcs_nickname>>. You were great. Thank you." He then lays down beside you as he catches his breath before leaning toward you and giving you one last kiss. He thens gets up and you both get dressed.'
+			gs 'arousal', 'vaginal', 5
+			gs 'cum_call', '', $boy
+			gs 'arousal', 'end'			
+			gs 'stat'
+		
+			act 'Get dressed': gt 'LBZhouse', 'End'
+		end	
+	else
+		act 'Pull out':
+			*clr & cla
 			gs'stat'
-			mrapic=0
-			'<center><video autoplay loop src="images/shared/sex/handjob/hj<<mrapic>>.mp4"></video></center>'
-			'You immediately take his cock in your hand and start jerking him off.'
-			'Soon <<$boydesc>> starts to pant heavily and moans out. "<<$pcs_nickname>>, I''m about to cum."'
+			'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal2.mp4"></video></center>'
+			'You quickly look to him and say, "Please pull out." <<$boydesc>> continues pounding you faster as his breathing increases before suddenly stopping as he pulls out of you then begins stroking his cock over you, causing trickles of sperm to cover your stomach. <<$boydesc>> spends the next few seconds, milking his cock over you while staring at your naked body and groaning. After <<$boydesc>> is fully milked, he looks down at you and says, "That was great <<$pcs_nickname>>. You are one sexy girl. Feel free to get yourself washed up. I would want you to leave all messy like that." He then gets up and get dressed.'
+			gs 'arousal', 'vaginal', 5
+			gs 'cum_call', 'stomach', $boy
+			gs 'arousal', 'end'
+			gs 'stat'
 
-			gs 'arousal', 'hj', 5, 'sub'
+			act 'Hop in the shower': gt 'LBZhouse', 'Shower'
+			act 'Leave without a shower': gt 'LBZhouse', 'End'
+		end	
+			
+		act 'Cum':
+			*clr & cla
+			gs'stat'	
+			'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal2.mp4"></video></center>'
+			'<<$boydesc>> continues pounding you faster as his breathing increases before suddenly stopping as you feel his cock begins throbbing inside of you, filling you with his warm seed. You moan as you feel <<$boydesc>> draining his cock in your pussy, filling your pussy to the brim with his warm seed. You continues thrusting until he is fully spent and then drops on the bed next to you and says, "Wow <<$pcs_nickname>>, you are the most amazing girl I have ever been with. You are so damn sexy." You give him a warm smile and lean forward, giving him a passionate kiss. <<$boydesc>> then takes a few seconds to catch his breath before getting up to get dressed. He then points to the bathroom and say, "Feel free to get washed up. You deserve a nice shower after that performance."'
+			gs 'arousal', 'vaginal', 5
+			gs 'cum_call', '', $boy
+			gs 'arousal', 'end'			
 			gs 'stat'
+		
+			act 'Hop in the shower': gt 'LBZhouse', 'Shower'
+			act 'Leave without a shower': gt 'LBZhouse', 'End'
+		end	
+	end	
+end	
+
+if $ARGS[0] = 'Anal':
+	*clr & cla
+	gs'stat'
+	VK = 9
+	'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<VK>>.mp4"></video></center>'
+	'<<$boydesc>> reaches down then helps you to your feet before positioning himself behind you. He places his hand on your shoulder then pushes you forward before you hear him licking his finger before using it to lubricate your asshole. You try to relax yourself but the excitement is getting intense. You then feel his cock pressing against you asshole before slowly pushing its way inside, causing a jolt of pleasure to fill you. <<$boydesc>> then waits for your asshole to settle before thrusting his dick in your ass, causing him to moan loudly as he fucks your ass.'
+	gs 'arousal', 'anal', 5
+	gs 'stat'
+	
+	act 'Let him cum':
+		*clr & cla
+		gs'stat'
+		'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal2.mp4"></video></center>'
+		'<<$boydesc>> doesn''t last long as he pounds your ass faster before ramming his dick completely inside of your ass and groaning as his warm cum fills your ass. You patiently wait as he continues pumping his cum inside you while feeling his dick throbbing in sync with his thrusts. After <<$boydesc>> is fully spent, he takes a deep breath then says, "<<$pcs_nickname>> you were incredible. Best fuck of my life." You look back and give him a wink before he adds, "Outstanding. Now feel free to get yourself cleaned up before you go. I will be here when you are done."'
+		gs 'arousal', 'anal', 5
+		gs 'cum_call', 'anus', $boy
+		gs 'arousal', 'end'			
+		gs 'stat'
+		
+		act 'Hop in the shower': gt 'LBZhouse', 'Shower'
+		act 'Leave without a shower': gt 'LBZhouse', 'End'
+	end	
+end
 
-			dynamic $LBZH_sex
-			dynamic $LBZH_anal
-		end
-	else
-		'<center><video autoplay loop src="images/shared/sex/undress/kotovpre40.mp4"></video></center>'
-		'<<$boydesc>> undresses you and lays you down on the bed'
-		dynamic $LBZH_sex
-		dynamic $LBZH_anal
+if $ARGS[0] = 'Shower':
+	*clr & cla
+	noShampoo = 1
+	dynamic $showerdin
+	minut += 15
+	pcs_hairbsh = 1
+	pcs_makeup = 1
+	if frost > 0:frost = 0
+	LBZhouseShower = 1
+	gs'stat'
+	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+	'You grab your stuff then enter the bathroom before climbing into the shower. You carefully run the faucet, check the water temperature before washing yourself off while enjoying the warm water hitting your body. You spend the next few minutes. taking a relaxing bath before climbing out, drying yourself off, getting dressed then leaving the bathroom.'
+	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-	act 'Give blowjob':
-		cls
+	act 'Get out of the bathroom': gt 'LBZhouse', 'End'
+end
+	
+if $ARGS[0] = 'End':
+		*clr & cla
 		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj.jpg"></center>'
-		'You offer to give him a blowjob which he eagerly agrees too.'
-		dynamic $LBZH_bj
+		if LBZhouseShower = 1:
+			'As you leave the bathroom you see <<$boydesc>> waiting by the door for you. He walks up to you then gives you a passionate kiss before saying, "I had such a great time with you <<$pcs_nickname>> and I hope you enjoyed your time too." You give him a smile as you reply, "I had a wonderful time. Thank you <<$boydesc>>" His eyes light up as he gives you a warm loving smile then takes your hand and pulls you closer, giving you another passionate kiss before leading you out and slowly closing the door while staring into your eyes.'
+		else
+			'<<$boydesc>> takes your hand then leads you toward the front door. When you arrive, <<$boydesc>> turns to you then gives you a quick kiss before saying, "I had such a great time with you <<$pcs_nickname>> and I hope you enjoyed your time too." You give him a smile as you reply, "I had a wonderful time. Thank you <<$boydesc>>" His eyes light up as he gives you a warm loving smile then takes your hand and pulls you closer, giving you another passionate kiss before leading you out and slowly closing the door while staring into your eyes.'
 		end
-	end
-end
+
+		act 'Leave': LBZhouseShower = 0 & gt'pav_residential'
+	end	
+end	
 
 --- LBZhouse ---------------------------------
 

+ 1 - 1
locations/LCporn.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'firsttime':
 			'No, no! You quickly squirm past Eugene and leave the pantry, and don''t stop walking until you''re well away from the diner.'
 			LCEugenefirst = 0
 
-			act 'Continue':gt 'nord'
+			act 'Continue':gt 'city_industrial'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 7 - 7
locations/LCwork.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start1':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-		    act 'Get out of his car':money += randLCpay & gt 'street'
+		    act 'Get out of his car':money += randLCpay & gt 'city_residential'
 		end
 	end
 end
@@ -93,7 +93,7 @@ if $ARGS[0] = 'start2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Get out of his van':money += randLCpay & gt 'street'
+		act 'Get out of his van':money += randLCpay & gt 'city_residential'
 	end
 end
 
@@ -139,7 +139,7 @@ if $ARGS[0] = 'start3':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave the apartment building':money += randLCpay & gt 'Nord'
+		act 'Leave the apartment building':money += randLCpay & gt 'city_industrial'
 	end
 end
 
@@ -192,7 +192,7 @@ if $ARGS[0] = 'start4':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave their apartment building':money += randLCpay & gt 'street'
+			act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 		end
 	else
 !!second visit, only happens if you have seen them once.
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start4':
 				gs 'cum_call', 'anal', $boy
 				gs 'stat'
 				
-				act 'Leave their apartment building':money += randLCpay & gt 'street'
+				act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 !!end of expanded scene
 			end
 		end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'start5':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave her apartment':money += randLCpay & gt 'street'
+	act 'Leave her apartment':money += randLCpay & gt 'city_residential'
 end
 
 if $ARGS[0] = 'start6':
@@ -306,7 +306,7 @@ if $ARGS[0] = 'start6':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave his apartment':money += randLCpay & gt 'street'
+		act 'Leave his apartment':money += randLCpay & gt 'city_residential'
 	end
 end
 

+ 4 - 4
locations/LariskaHome.qsrc

@@ -49,13 +49,13 @@ else
 		'"Yes, I''m <<$pcs_nickname>>." you reply tearing your eyes away from her nearly exposed breasts.'
 		'"Ah, <<$pcs_nickname>>, Lariska has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately. I am glad that she has such a good friend! She needed someone to get her back on her feet. <<$text_home>>"'
 		lariskaMotherKnown = 1
-		act 'Go back to town':gt'pavResidential'
+		act 'Go back to town':gt'pav_residential'
 		exit
 	end
 	if hour >= 9:'Lariska''s mother opens the door. "Hello, <<$pcs_nickname>>. I''m sorry, but Lariska isn''t home."'
 	if hour < 9:'Lariska''s mother opens the door. "Good morning , <<$pcs_nickname>>. I''m sorry but Lariska is still in bed. She doesn''t get up before nine."'
 
-	act 'Return to town':gt'pavResidential'
+	act 'Return to town':gt'pav_residential'
 end
 
 if $ARGS[0] = 'in':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'in':
 		cla
 		'Lariska looks at her watch and says, "It''s time to go to the sports club."'
 		act 'Go with Lariska':lariskaTrain += 1 & minut += 20 & gt 'gdksport', 'start'
-		act 'Say goodbye and go home':gt'pavResidential'
+		act 'Say goodbye and go home':gt'pav_residential'
 		exit
 	end
 	act 'Ask for a drink':
@@ -170,7 +170,7 @@ if $ARGS[0] = 'in':
 		end
 	end
 
-	act 'Say goodbye and go home':gt'pavResidential'
+	act 'Say goodbye and go home':gt'pav_residential'
 end
 
 --- LariskaHome ---------------------------------

+ 9 - 9
locations/LariskaStart.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	'Well this is interesting, she had never shown that much interest in you before, always stuck in Christina''s stranglehold she had always been distant and you could barely get a full sentence from her.'
 	'Now that you have beaten Christina, she suddenly wants to talk. She does look more confident, happier and more active. Maybe she wants to thank you for beating up the bully?'
 	
-	act 'Leave':gt'gdk'
+	act 'Leave':gt'pav_commcenter'
 	act 'Follow Lariska':
 		cls
 		minut += 5
@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 						'"That bitch! Do not worry, I know these bastards, Nosov takes his dope from them. Nobody is dangerous, for me anyway! Do not worry about anything!"'
 
 						KotovZverHelp = 1
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 				if IvanShowerQW >= 10 and npc_rel['A3'] >= 60:
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 						'"Sure, no problem <<$pcs_nickname>>."'
 
 						IvanZverHelp = 1
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 				if AlbFrend >= 1:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'start':
 
 						AlbZverHelp = 1
 
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 
@@ -118,11 +118,11 @@ if $ARGS[0] = 'start':
 
 						FyodorZverHelp = 1
 
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 
-				act 'Leave':gt'gdk'
+				act 'Leave':gt'pav_commcenter'
 			end
 		end
 		if razradKik >= 2 and pcs_stren >= 55:
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 					'You had stood still five minutes in perplexity and thought about that you should apologize at school tomorrow, before you finally get off and go home.'
 					lariskaHelp = -1
 
-					act 'Leave':gt'gdk'
+					act 'Leave':gt'pav_commcenter'
 				end
 			end
 		end
@@ -441,7 +441,7 @@ if $ARGS[0] = 'end':
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/fight/start_end.jpg"></center>'
 												'You wake up covered in semen and with a bottle sticking out of your pussy. Your entire body is covered with obscene graffiti. Your whole body hurts, and your holes feel like glowing rods were shoved in all night.'
 
-												act 'Leave':gt'pavResidential'
+												act 'Leave':gt'pav_residential'
 											end
 										end
 									end
@@ -453,7 +453,7 @@ if $ARGS[0] = 'end':
 			end
 		end
 
-		act 'Leave':gt'pavResidential'
+		act 'Leave':gt'pav_residential'
 	end
 end
 

+ 17 - 17
locations/MartinSex.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = '':
 				*nl
 				'After about half an hour, you decide that you should let Martin finish up for the night. After a brief but friendly goodnight, you leave your friend to himself and exit the bar.'
 
-				act 'Leave': gt 'nord'
+				act 'Leave': gt 'city_industrial'
 			end
 
 			act 'Leave the bar':
@@ -51,7 +51,7 @@ if $ARGS[0] = '':
 				*nl
 				'You share a brief, friendly hug and goodbye before you turn and leave the bar.'
 
-				act 'Leave': gt 'nord'
+				act 'Leave': gt 'city_industrial'
 			end
 
 		else
@@ -73,7 +73,7 @@ if $ARGS[0] = '':
 				'You share a brief, friendly hug and goodbye before you turn and leave the bar, wondering if or when you will gather the courage to talk about this with Martin.'
 				'<i>Maybe tomorrow</i>, you think to yourself.'
 
-				act 'Leave': gt 'nord'
+				act 'Leave': gt 'city_industrial'
 			end
 
 			act 'Keep it light - Talk to Martin':
@@ -91,7 +91,7 @@ if $ARGS[0] = '':
 				'After about half an hour, you decide that you should let Martin finish up for the night. After a brief but friendly goodnight, you leave the bar with a tingly stomach - whether it''s purely from lustful longing or more, you''re not sure, but you know that the only way to find out is to talk to Martin when he''s alone again.'
 				'<i>Maybe tomorrow</i>, you think to yourself.'
 
-				act 'Leave the bar': gt 'nord'
+				act 'Leave the bar': gt 'city_industrial'
 			end
 
 			act 'Go for it - Flirt with him':
@@ -150,7 +150,7 @@ if $ARGS[0] = '':
 					*nl
 					'You give him as much of a smile as you can manage, turn around and leave the bar, utterly confused as to what you want.'
 
-					act 'Leave the bar': gt 'nord'
+					act 'Leave the bar': gt 'city_industrial'
 				end
 
 				act 'Storm out (angry)':
@@ -170,7 +170,7 @@ if $ARGS[0] = '':
 					'In the blink of an eye, you are face to face with him again, yelling at him unrestrainedly. "No! Apparently, you think I''m too young and too dumb to know what I want, so you don''t get to ''<<$pcs_firstname>>'' me! I don''t need ' + iif(StoryLine > 0,'another','a') + ' stepdad who knows what''s best for me!"'
 					'Before Martin could utter even another word, you had stormed out of the bar, livid at his paternalism and, deep down, below the layers of fury, wounded by his rejection.'
 
-					act 'Get out of the bar': gt 'nord'
+					act 'Get out of the bar': gt 'city_industrial'
 				end
 			end
 		end
@@ -223,7 +223,7 @@ if $ARGS[0] = '':
 			*nl
 			'You give him as much of a smile as you can manage, turn around and leave the bar, relieved at your reconciliation but also unsure as to whether the restored friendship is enough for you.'
 
-			act 'Leave the bar': gt 'nord'
+			act 'Leave the bar': gt 'city_industrial'
 		end
 
 		act 'You are still too angry to talk to him - Just leave the bar':
@@ -233,7 +233,7 @@ if $ARGS[0] = '':
 			*nl
 			'You turn and go towards the exit. You can hear something behind you, feel his look on your back, but you ignore it as best you can and go outside, the matter between you unresolved.'
 
-			act 'Leave': gt 'nord'
+			act 'Leave': gt 'city_industrial'
 		end
 
 		if exhibitionist_lvl > 0 and cycle ! 0:
@@ -280,7 +280,7 @@ if $ARGS[0] = '':
 			'You share a brief, friendly hug and goodbye before you turn and leave the bar, wondering if or when you will gather the courage to talk about this with Martin again.'
 			'<i>Maybe tomorrow</i>, you think to yourself.'
 
-			act 'Leave': gt 'nord'
+			act 'Leave': gt 'city_industrial'
 		end
 
 		act 'Avoid the topic - Chat with Martin':
@@ -297,7 +297,7 @@ if $ARGS[0] = '':
 			'After about half an hour, you decide that you should let Martin finish up for the night. After a brief but friendly goodnight, you leave the bar with a tingly stomach - whether it''s from nervousness, desire or something else, you can''t tell, but you probably won''t find out unless you talk about this with Martin.'
 			'<i>Maybe tomorrow</i>, you think to yourself.'
 
-			act 'Leave the bar': gt 'nord'
+			act 'Leave the bar': gt 'city_industrial'
 		end
 
 		act 'Talk about "getting involved"':
@@ -328,7 +328,7 @@ if $ARGS[0] = '':
 				'"Nevermind, it''s not urgent," you backpedal quickly. "I have to go now."'
 				'Feeling really awkward, and a little angry with yourself for chickening out, you turn around and leave, ignoring the confused but somewhat relieved Martin.'
 
-				act 'Leave the bar': gt 'nord'
+				act 'Leave the bar': gt 'city_industrial'
 			end
 
 			act 'Kiss Martin':
@@ -379,7 +379,7 @@ if $ARGS[0] = '':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave the bar': gt 'nord'
+					act 'Leave the bar': gt 'city_industrial'
 				end
 
 				act 'Go down on Martin': gt 'MartinSex3', 'MartinBlowTease'
@@ -418,7 +418,7 @@ if $ARGS[0] = '':
 			'You raise your <<$pcdesc_eyebrowrandom>> at that, but there''s no helping it - he''s gonna worry anyway.'
 			'"Always am," you reassure him, turn around and leave the bar, wondering if, maybe instead of leaving, you should have fucked Martin''s brains out.'
 
-			act 'Leave': gt 'nord'
+			act 'Leave': gt 'city_industrial'
 		end
 
 		act 'Talk to Martin':
@@ -436,7 +436,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			gs 'arousal', 'end'
 
-			act 'Leave': gt 'nord'
+			act 'Leave': gt 'city_industrial'
 		end
 
 		act 'Blow him':gt 'MartinSex3', 'MartinBlowTease'
@@ -752,7 +752,7 @@ if $ARGS[0] = 'MartinTease3':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave the bar': gt 'nord'
+					act 'Leave the bar': gt 'city_industrial'
 				end
 
 				if dildo = 1 or middildo = 1 and bag > 0:
@@ -900,7 +900,7 @@ if $ARGS[0] = 'MartinTease4':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave the bar': gt 'nord'
+						act 'Leave the bar': gt 'city_industrial'
 					end
 
 					if dildo = 1 or middildo = 1 and bag > 0:
@@ -999,7 +999,7 @@ if $ARGS[0] = 'MartinTeaseDildo':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave the bar': gt 'nord'
+				act 'Leave the bar': gt 'city_industrial'
 			end
 		end
 	end

+ 5 - 5
locations/MartinSex2.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'MartinSexPrep':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave the bar': gt 'nord'
+		act 'Leave the bar': gt 'city_industrial'
 	end
 	
 	act 'Get him off with your mouth':MartinSexStop = 1 & gt 'MartinSex3','MartinBlowjob'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'MartinSexDyn':
 				killvar 'MartinPrezik'
 				gs 'stat'
 				
-				act 'Leave the bar':gt 'nord'
+				act 'Leave the bar':gt 'city_industrial'
 			end
 		end
 	end
@@ -897,7 +897,7 @@ if $ARGS[0] = 'PainalDyn':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Leave the bar': gt 'nord'
+					act 'Leave the bar': gt 'city_industrial'
 				end
 			end
 			
@@ -941,7 +941,7 @@ if $ARGS[0] = 'PainalDyn':
 		gs 'arousal', 'end'
 		gs 'stat'
 					
-		act 'Leave the bar': gt 'nord'
+		act 'Leave the bar': gt 'city_industrial'
 	end	
 end
 
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'MartinCleanup':
 	gs 'arousal', 'end'
 	gs 'stat'
 			
-	act 'Leave the bar': gt 'nord'
+	act 'Leave the bar': gt 'city_industrial'
 end
 
 --- MartinSex2 ---------------------------------

+ 1 - 1
locations/MartinSex3.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'MartinPussyLick':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave the bar': gt 'nord'
+		act 'Leave the bar': gt 'city_industrial'
 	end
 end
 

+ 2 - 2
locations/MartinTalk.qsrc

@@ -517,7 +517,7 @@ if $ARGS[0] = '':
 						*nl
 						'This definitely could have gone better...'
 						
-						act 'Leave the bar': gt 'nord'
+						act 'Leave the bar': gt 'city_industrial'
 					end
 				
 				else
@@ -597,7 +597,7 @@ if $ARGS[0] = '':
 			end
 		end
 		
-		if leonidSecretary > 0 or PersSecWork > 0 or workSec = 1: 
+		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1: 
 			act '"I''m a secretary"':
 				cla
 				'"I''m working as a secretary."'

+ 1 - 1
locations/MeynoldHome.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 

+ 1 - 1
locations/Military.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 		minut += 60
 		money += 5000
 
-		act 'Go back to town':gt 'street'
+		act 'Go back to town':gt 'city_residential'
 	end
 end
 

+ 1 - 1
locations/NewCloShop.qsrc

@@ -159,7 +159,7 @@ if $ARGS[0] = 'dressingclothes':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
 		end
 		i += 12
-	if i <= 425:jump 'loopexpensive2'
+	if i <= 433:jump 'loopexpensive2'
 end
 
 if $ARGS[0] = 'dressingshmotmag':

+ 12 - 7
locations/NikoDates.qsrc

@@ -230,6 +230,7 @@ if $ARGS[0] =  'Date 1_2':
 												gs'stat'											
 												'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 												'You stare into Niko''s eyes, feeling more turned on at how badly he craves you. You soon hear Niko groan as he begins pumping his cum down your throat which you do your best to swallow every drop of.'
+												swallow += 1
 												gs 'arousal', 'bj', 5, 'sub'
 												gs 'cum_call', 'mouth', 'A189', 1
 												gs 'arousal', 'end'
@@ -307,7 +308,7 @@ if $ARGS[0] = 'Home 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend the rest of the time discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko gives you a hug. "You are an amazing girl <<$pcs_firstname>>, I will await anxiously for our next meeting. Take care m''lady." Niko gives you a kiss on the forehead before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Home Sad':
@@ -317,7 +318,7 @@ if $ARGS[0] = 'Home Sad':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend a few minutes discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko turns to you and says, "I hope you enjoyed yourself today. Hopefully next time we could do something more interesting." Niko gives you a kiss on the hand before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Date 2':
@@ -556,7 +557,7 @@ if $ARGS[0] = 'Date Rape':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'							
 							'Niko kisses your leg, "You were a bit wild, it was a side of you that I haven''t seen before and I liked it." You reply, "Really? well I guess I could try cutting loose a bit more often." Niko pats your ass gently as he replies, "Now that''s what I like to hear! So would you like some cereal? I have plenty downstairs." You shake your head, "No I need head back home, but thanks for the offer." You give Niko a kiss on the cheek before walking out the room, where Niko guides you out of the door.'
 
-							act 'Walk to the residential district':minut += 5 & gt 'pavResidential'
+							act 'Walk to the residential district':minut += 5 & gt 'pav_residential'
 						end
 					end	
 				end	
@@ -587,6 +588,7 @@ if $ARGS[0] =  'Cafeteria':
 			gs'stat'		
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
 			'After a few minutes, Niko''s hand tightens around your breast as his penis begins throbbing in your mouth, causing Niko''s cum to shoot down your throat which you swallow as best you can. Once Niko is fully spent, he pulls you up and kisses your forehead, "That''s my girl, so beautiful and daring too. You really are a precious gem <<$pcs_firstname>>." Niko''s words, warm your already rapidly beating heart, leaving you speechless as he gives you a wink, before buttoning his pants then walking away.'
+			swallow += 1
 			gs 'cum_call', 'mouth', 'A189', 1
 			gs 'arousal', 'bj', 5
 			gs 'arousal', 'end'
@@ -944,7 +946,7 @@ if $ARGS[0] = 'Yurik Intro':
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 							'Niko''s eyes light up as he begins kissing your hands even faster before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-							act 'Walk away':gt 'pavResidential'
+							act 'Walk away':gt 'pav_residential'
 						end
 
 						act 'I don''t believe you':
@@ -962,7 +964,7 @@ if $ARGS[0] = 'Yurik Intro':
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 								'Niko''s eyes light up as he grabs onto then begins kissing your hands before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-								act 'Walk away':gt 'pavResidential'
+								act 'Walk away':gt 'pav_residential'
 							end
 
 							act 'No, I don''t believe you <font color=#FF00FF>[Break up with Niko]</font>':
@@ -1000,7 +1002,7 @@ if $ARGS[0] = 'Yurik Intro':
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised1.jpg"></center>'
 											'Niko remains silent as he rubs his face. Yurik turns to you then says, "Get out of here girl. Niko and I have a debt to discuss." Yurik then pushes you out of the room before slamming the door closed behind you. You quickly leave the house without looking back.'
 
-											act 'Leave house':minut += 5 & gt 'pavResidential'
+											act 'Leave house':minut += 5 & gt 'pav_residential'
 										end
 									end	
 								end	
@@ -1085,6 +1087,7 @@ if $ARGS[0] = 'Hallway Strip':
 								gs'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 								'You quicken your pace until you see Niko''s head slam into the wall as he begin shooting his warm seed into your mouth. You do your best to swallow every drop of his warm nectar, despite it''s sharp, tart taste. Niko looks down to you and says, "Thank you <<$pcs_firstname>>. You are truly a goddess. Now let''s get you dressed before someone notices us." Niko kneels down and picks up your clothes then helps you get dressed while occasionally checking to see if anyone has noticed. Once you are fully dressed, Niko whispers in your ear, "You were extremely daring today, I look forward to next time." Niko gives you a kiss on your cheek before walking back into the cafeteria.'
+								swallow += 1
 								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs 'arousal', 'end'
@@ -1199,7 +1202,7 @@ if $ARGS[0] = 'After School':
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 										'Niko kneels down in front of you then removes the collar from your neck before kissing your lips passionately for a few seconds then gently rubbing your cheek. "You will always be my perfect little princess. I have an important test to take tomorrow, so I will be very busy, but feel free to stop by the <font color=#c600ff>disco</font> and we can have a good time." Niko then stands up and walks away.'
 										
-										act 'Stand up':gt 'pavResidential'
+										act 'Stand up':gt 'pav_residential'
 									end
 								end	
 							end	
@@ -1290,6 +1293,7 @@ if $ARGS[0] = 'Disco':
 								gs'stat'							
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 								'Niko''s head suddenly jerks back as he bites his lip, shooting his cum, down your throat. You do your best to swallow every drop, not wanting any of Niko''s cum to go to waste.'
+								swallow += 1
 								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs'stat'
@@ -1434,6 +1438,7 @@ if $ARGS[0] = 'After School 2':
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 							'You suddenly hear Niko groan as he begins spraying his hot cum down your throat. You swallow it while enjoying the sting as it slides down your throat, knowing that you have fully satisfied Niko. You slowly look up to Niko, "I love you Nikolai. I love you with all my heart." Niko recoils in shock, "Uhh, I love you too and I''m...glad you enjoy our time together." You can tell that your sudden show of affection caught Niko off guard which makes you giggle for a few seconds as Niko buttons his pants then says, "You were outstanding today. I always have a blast when I''m with you. Here are your clothes. You should get dressed before anyone sees us."'
+							swallow += 1
 							gs 'cum_call', 'mouth', 'A189', 1
 							gs 'arousal', 'bj', 5
 							gs 'arousal', 'end'

+ 19 - 19
locations/NikoDreams.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Family':
 		gs'stat'
 		'<center><b><h4><font color="green"><<"Vladimir <<$pcs_lastname>>">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on as Anya sits down next to you. You look around in relief, <font color=#FF00FF>That whole thing was just a dream. Oh it feels so good to be back home.</font> You hear something bumping against the kitchen door.' 
+		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on as Anya sits down next to you. You look around in relief, '+$OpenInnerThought+'That whole thing was just a dream. Oh it feels so good to be back home.'+$CloseInnerThought+' You hear something bumping against the kitchen door.' 
 		
 		act 'Turn to see what it is':	
 			*clr & cla
@@ -95,7 +95,7 @@ if $ARGS[0] =  'Woods':
 	VKSmiley = 3
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/1.jpg"></center>'
-	'You can feel grass on your face which you quickly brush away before looking around and noticing that you are in the middle of the woods with a mist that surrounds you. <font color=#FF00FF>What''s going on? Why am I here? How did I get here? Where am I?</font> You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. <font color=#FF00FF>Where is this music coming from? Was that a person laughing? Maybe they can help me.</font> you begin heading in that direction when you suddenly feel a cold chill down your spine. <font color=#FF00FF>Something about that laughter is...unnerving.</font>'
+	'You can feel grass on your face which you quickly brush away before looking around and noticing that you are in the middle of the woods with a mist that surrounds you. '+$OpenInnerThought+'What''s going on? Why am I here? How did I get here? Where am I?'+$CloseInnerThought+' You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. '+$OpenInnerThought+'Where is this music coming from? Was that a person laughing? Maybe they can help me.'+$CloseInnerThought+' you begin heading in that direction when you suddenly feel a cold chill down your spine. '+$OpenInnerThought+'Something about that laughter is...unnerving.'+$CloseInnerThought+''
 	*nl
 	'You can hear someone laughing, far away.'
 
@@ -108,7 +108,7 @@ if $ARGS[0] =  'Woods 2':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/2.jpg"></center>'
-	'<font color=#FF00FF>These woods are so dark. How did I get here?</font>'
+	''+$OpenInnerThought+'These woods are so dark. How did I get here?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -135,7 +135,7 @@ if $ARGS[0] =  'Woods 3':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/3.jpg"></center>'
-	'<font color=#FF00FF>Still so dark. Am I even going the right way?</font>'
+	''+$OpenInnerThought+'Still so dark. Am I even going the right way?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -162,7 +162,7 @@ if $ARGS[0] =  'Woods 4':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/4.jpg"></center>'
-	'<font color=#FF00FF>More woods? At least I can see some light.</font>'
+	''+$OpenInnerThought+'More woods? At least I can see some light.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -189,7 +189,7 @@ if $ARGS[0] =  'Woods 5':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/5.jpg"></center>'
-	'<font color=#FF00FF>Must keep moving. There must be a way out of here.</font>'
+	''+$OpenInnerThought+'Must keep moving. There must be a way out of here.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -216,7 +216,7 @@ if $ARGS[0] =  'Woods 6':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/6.jpg"></center>'
-	'<font color=#FF00FF>Will this ever end? That freak is still lurking around.</font>'
+	''+$OpenInnerThought+'Will this ever end? That freak is still lurking around.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -244,7 +244,7 @@ if $ARGS[0] =  'Woods 7':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/7.jpg"></center>'
-	'<font color=#FF00FF>Will I be trapped here forever? Oh wait, what is that?</font> You can see a pair of train tracks ahead of you and you can hear the music getting louder as you approach the tracks.'
+	''+$OpenInnerThought+'Will I be trapped here forever? Oh wait, what is that?'+$CloseInnerThought+' You can see a pair of train tracks ahead of you and you can hear the music getting louder as you approach the tracks.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -273,7 +273,7 @@ if $ARGS[0] =  'Woods 8':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/8.jpg"></center>'
-	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest. <font color=#FF00FF>Is this it? Am I out of this forest?</font>'
+	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest. '+$OpenInnerThought+'Is this it? Am I out of this forest?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -303,7 +303,7 @@ if $ARGS[0] =  'Woods Home':
 	'<center><b><h4><font color=#E400FF><<"Happy Home">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/mansion/happyhome.jpg"></center>'
 	if VKTeeHee = 0:
-		'You finally approach the end of the forest when you see a derelict house. As you walk toward the house, you can can see; what appears to be a woman standing in the middle of the path, leading to the house while crying. <font color=#FF00FF>She must be stranded here like me. Maybe I can help her.</font> you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
+		'You finally approach the end of the forest when you see a derelict house. As you walk toward the house, you can can see; what appears to be a woman standing in the middle of the path, leading to the house while crying. '+$OpenInnerThought+'She must be stranded here like me. Maybe I can help her.'+$CloseInnerThought+' you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
 	else
 		'There is an old derelict house in the distance, but the path to the house is blocked by a crying woman. <a href="exec:gt ''NikoDreams'', ''TeeHee''">TeeHee</a> continuously rubs against your leg while purring softly.'
 	end
@@ -392,7 +392,7 @@ if $ARGS[0] =  'Friends':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/cam/Cam2.mp4"></video></center>'
-		'You quickly stand up then begin dancing. <font color=#FF00FF>I need to keep dancing because ...Umm...Why am I dancing?</font> Vicky reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Natalia walks up to you then begins squeezing your breasts. Vicky then says, "And they thought that Sonia was a whore." Katja giggles as she responds, "That''s just silly. <<$pcs_firstname>> is the only whore here." Natalia replies, "I agree, I don''t even know why she thought that she could hide it." <font color=#FF00FF>Why are they being so mean to me? and why can''t I stop dancing?</font> Vicky gives your ass a firm smack as she says, "Alright, we kept the boys waiting long enough!"'
+		'You quickly stand up then begin dancing. '+$OpenInnerThought+'I need to keep dancing because ...Umm...Why am I dancing?'+$CloseInnerThought+' Vicky reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Natalia walks up to you then begins squeezing your breasts. Vicky then says, "And they thought that Sonia was a whore." Katja giggles as she responds, "That''s just silly. <<$pcs_firstname>> is the only whore here." Natalia replies, "I agree, I don''t even know why she thought that she could hide it." '+$OpenInnerThought+'Why are they being so mean to me? and why can''t I stop dancing?'+$CloseInnerThought+' Vicky gives your ass a firm smack as she says, "Alright, we kept the boys waiting long enough!"'
 
 		act 'Boys?':	
 			*clr & cla
@@ -423,7 +423,7 @@ if $ARGS[0] =  'Friends':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/hall1.mp4"></video></center>'
-						'Lesko then pulls you up on top of him and you begin riding his dick while tears stream down your face. <font color=#FF00FF>Why is this happening? Why are they all laughing at me? Please someone make this stop!</font>'
+						'Lesko then pulls you up on top of him and you begin riding his dick while tears stream down your face. '+$OpenInnerThought+'Why is this happening? Why are they all laughing at me? Please someone make this stop!'+$CloseInnerThought+''
 
 						act 'Continue riding Lesko':	
 							*clr & cla
@@ -449,7 +449,7 @@ if $ARGS[0] =  'Friends':
 										*clr & cla
 										gs'stat'							
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
-										'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey, are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. <font color=#FF00FF>Where did everyone go? Where am I? It''s so dark.</font> You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
+										'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey, are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. '+$OpenInnerThought+'Where did everyone go? Where am I? It''s so dark.'+$CloseInnerThought+' You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
 										
 										act '...':minut += 120 & gt 'NikoEv2', 'Niko Wake'
 									end	
@@ -492,7 +492,7 @@ if $ARGS[0] =  'Classroom Dream':
 					*clr & cla
 					gs'stat'				
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/sex.jpg"></center>'
-					'He then pushes you over then rams his dick inside of you and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class. <font color=#FF00FF>Why is this happening. Why me? Will I never have a normal life again? Will I always be...</font> You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you okay? Come on, get up..."'
+					'He then pushes you over then rams his dick inside of you and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class. '+$OpenInnerThought+'Why is this happening. Why me? Will I never have a normal life again? Will I always be...'+$CloseInnerThought+' You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you okay? Come on, get up..."'
 
 					act 'Continue':	
 						*clr & cla
@@ -528,7 +528,7 @@ if $ARGS[0] =  'Puppeteer':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/shared/home/bedroom/dream/class/1.jpg"></center>'
-		'You awake then slowly lift your head, looking around the room but immediately recoil in shock, when you notice how dark the classroom is. You quickly think to yourself, <font color=#FF00CC>Whoa, how long did I sleep? Ohh shit, I must have slept through the whole day. I should probably get home before the school doors are locked up for the day.</font> You quickly shove your books into your bag then walk for the door.'	
+		'You awake then slowly lift your head, looking around the room but immediately recoil in shock, when you notice how dark the classroom is. You quickly think to yourself, '+$OpenInnerThought+'Whoa, how long did I sleep? Ohh shit, I must have slept through the whole day. I should probably get home before the school doors are locked up for the day.'+$CloseInnerThought+' You quickly shove your books into your bag then walk for the door.'	
 	
 		act 'Go to the hallway':	
 			*clr & cla
@@ -545,21 +545,21 @@ if $ARGS[0] =  'Puppeteer':
 			PLAY 'sound/happyhome/puppet.mp3', 25
 			gs'stat'
 			'<center><img src="images/shared/home/bedroom/dream/class/2.jpg"></center>'
-			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. <font color=#FF00CC>Who could that be? Maybe someone is flooding one of the bathrooms again, but that music though. Where is it coming from? Maybe outside?</font>'		
+			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. '+$OpenInnerThought+'Who could that be? Maybe someone is flooding one of the bathrooms again, but that music though. Where is it coming from? Maybe outside?'+$CloseInnerThought+''		
 
 			act 'Head downstairs':	
 				*clr & cla
 				PLAY 'sound/happyhome/puppet.mp3', 50
 				gs'stat'
 				'<center><img src="images/shared/home/bedroom/dream/class/3.jpg"></center>'
-				'You reach the bottom of the stairs to hear the laughing getting louder. <font color=#FF00CC>Hmm I must be getting closer to whoever is laughing.</font> The hallway is so dark but you can see a light at the end.'
+				'You reach the bottom of the stairs to hear the laughing getting louder. '+$OpenInnerThought+'Hmm I must be getting closer to whoever is laughing.'+$CloseInnerThought+' The hallway is so dark but you can see a light at the end.'
 
 				act 'Continue down the hallway':	
 					*clr & cla
 					PLAY 'sound/happyhome/puppet.mp3',75
 					gs'stat'
 					'<center><img src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
-					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. <font color=#FF00CC>What is this stuff? Did someone have a drink in their locker which spilled?</font> When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
+					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. '+$OpenInnerThought+'What is this stuff? Did someone have a drink in their locker which spilled?'+$CloseInnerThought+' When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
 					
 					act 'Open the locker':	
 						*clr & cla
@@ -567,7 +567,7 @@ if $ARGS[0] =  'Puppeteer':
 						gs'stat'
 						'<center><b><h4><font color=#FFA200><<"Puppet">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppet.jpg"></center>'	
-						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. <font color=#FF00CC>Who left this doll here? and why is it all wet? What is this stuff?</font> The doll is heavier than it looks and seems to be covered in a thick warm liquid. <font color=#FF00CC>What is this?</font> You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of it''s wrists and ankles. <font color=#FF00CC>Maybe it''s a puppet?</font> You look into it''s eyes and notice your own reflection next to something else...'
+						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. '+$OpenInnerThought+'Who left this doll here? and why is it all wet? What is this stuff?'+$CloseInnerThought+' The doll is heavier than it looks and seems to be covered in a thick warm liquid. '+$OpenInnerThought+'What is this?'+$CloseInnerThought+' You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of it''s wrists and ankles. '+$OpenInnerThought+'Maybe it''s a puppet?'+$CloseInnerThought+' You look into it''s eyes and notice your own reflection next to something else...'
 						
 						act 'Turn around':	
 							*clr & cla

+ 7 - 7
locations/NikoEv.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'Lunch Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. <font color=#FF00FF>Why was he so calm? What is it with that guy?</font> Before shaking your head and walking away.'	
+		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'	
 		
 		act 'Leave':gt 'gschool_lessons', 'short_break'
 	end	
@@ -95,7 +95,7 @@ if $ARGS[0] = 'Lunch Chat':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
 	'<<$npc_notes[''A189'']>>'
-	if grupTipe[61] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
+	if grupTipe[61] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if grupTipe[61] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'Lunch Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. <font color=#FF00FF>Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
+			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. '+$OpenInnerThought+'Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
 			
 			act '<font color=#FF00FF>Go with Niko</font>':
 				if soniaPS = 0:
@@ -227,11 +227,11 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos4.jpg"></center>'
 			VK = rand(1,3)
 			if VK = 1:
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>What kind of easy lay, does he think I am?</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What kind of easy lay, does he think I am?</font>'
 			elseif VK = 2:
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>What an annoying, little punk!</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What an annoying, little punk!</font>'
 			else	
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>Something about that guy, really annoys me.</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'Something about that guy, really annoys me.</font>'
 			end
 				
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
@@ -801,7 +801,7 @@ if $ARGS[0] =  'Dimka':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: <font color=#FF00FF>Oh shit! How am I going to explain this to Niko. I''m really screwed now.</font> Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
+		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
 		
 		act 'Continue':	
 			*clr & cla

+ 30 - 26
locations/NikoEv2.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'Park':
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/shady.jpg"></center>'	
-				'As you both arrive, one of the men says, "She looks good." He then reaches out to touch you, but his hand is pushed away by Niko. "You need to pay up before you start touching." The guy chuckles, "Of course, of course. Where is my head?" He then nods to the other man, who reaches into his pocket then gives Niko some ruble which Niko counts before nodding to the men then taking a step back, signaling the men to use you. The men begin fondling your breasts as they kiss your neck. <font color=#FF00FF>This feels so wrong, but Niko needs me to do this. He is counting on me. I must not let him down. I wont let you down Niko.</font>' 
+				'As you both arrive, one of the men says, "She looks good." He then reaches out to touch you, but his hand is pushed away by Niko. "You need to pay up before you start touching." The guy chuckles, "Of course, of course. Where is my head?" He then nods to the other man, who reaches into his pocket then gives Niko some ruble which Niko counts before nodding to the men then taking a step back, signaling the men to use you. The men begin fondling your breasts as they kiss your neck. '+$OpenInnerThought+'This feels so wrong, but Niko needs me to do this. He is counting on me. I must not let him down. I wont let you down Niko.'+$CloseInnerThought+'' 
 				*nl
 				'One of the men takes off your shirt then throws it to the ground. Niko immediately picks it up. One of the men begins pushing you to your knees.'		
 
@@ -67,7 +67,7 @@ if $ARGS[0] = 'Park':
 							gs 'fame'
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/walk1.jpg"></center>'
-							'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. <font color=#FF00FF>My reward? He is going to reward me? What could it be? I really want to know.</font> You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles as he begins walking you toward his house.'
+							'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. '+$OpenInnerThought+'My reward? He is going to reward me? What could it be? I really want to know.'+$CloseInnerThought+' You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles as he begins walking you toward his house.'
 
 							act 'Follow Niko':gt 'NikoEv2', 'Home Date'
 						end
@@ -95,7 +95,7 @@ if $ARGS[0] = 'Reward':
 	gs 'fame'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/niko/bedroom.jpg"></center>'
-	'As soon as you enter the bedroom, you look around, but don''t see Niko. <font color=#FF00FF>Where did Niko go...</font>' 
+	'As soon as you enter the bedroom, you look around, but don''t see Niko. '+$OpenInnerThought+'Where did Niko go...'+$CloseInnerThought+'' 
 	
 	act '...':	
 		*clr & cla
@@ -127,7 +127,7 @@ if $ARGS[0] = 'Reward':
 					minut += 5
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat.mp4"></video></center>'
-					'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. <font color=#FF00FF>I''m choking. Should I pull away? No! Niko is so happy right now. I must let him finish. I just want you to be happy Niko.</font> You endure the chocking as your eyes tear up.' 
+					'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. '+$OpenInnerThought+'I''m choking. Should I pull away? No! Niko is so happy right now. I must let him finish. I just want you to be happy Niko.'+$CloseInnerThought+' You endure the chocking as your eyes tear up.' 
 					*nl
 					'You do your best to hold back from gagging, not wanting to interrupt Niko''s orgasm. After Niko is finished, he catches his breath then says, "<<$pcs_nickname>> you are simply divine." You take a few seconds to catch you breath before leaning forward to kiss Niko.'	
 					gs 'cum_call', 'mouth', $boy
@@ -148,13 +148,13 @@ if $ARGS[0] = 'Reward':
 							gs'stat'
 							'<center><b><h4><font color="red"><<"Yurik Volkov">></font></h4></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/intrude/yurik1.jpg"></center>'
-							'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. <font color=#FF00FF>What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?</font> Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?"' 
+							'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. '+$OpenInnerThought+'What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?'+$CloseInnerThought+' Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?"' 
 
 							act 'Nod':
 								*clr & cla
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/deek/deek.jpg"></center>'
-								'You meekly nod and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. <font color=#FF00FF>Ohh wow. his dick is so big. There is no way that will fit inside me.</font> Yurik approaches your face as you lay still, in complete shock.'
+								'You meekly nod and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. '+$OpenInnerThought+'Ohh wow. his dick is so big. There is no way that will fit inside me.'+$CloseInnerThought+' Yurik approaches your face as you lay still, in complete shock.'
 
 								act 'See what Yurik does':	
 									*clr & cla
@@ -175,6 +175,7 @@ if $ARGS[0] = 'Reward':
 											gs'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat1.mp4"></video></center>'
 											'Yurik suddenly grabs firmly onto the back of your head then shoves his penis as far down your throat as he can while groaning loudly. You can feel a surge of cum shooting down your throat which you have no choice but to swallow. Yurik pulls off of you as you continue swallow the last of his cum. Yurik begins dressing himself then walks up to you; with tears streaming down your face and says, "Whenever I am around, you will do whatever I say. Do you understand, girl?" You nod meekly, terrified of what Yurik could do to you. Yurik responds, "Good, i will be seeing you around and don''t try to avoid me, or that will make me ANGRY." Yurik then gets dressed before grabbing you up by your hair then pulling to toward the door where he opens it up before tossing you into Niko''s arms then closing the door.'
+											swallow += 1
 											gs 'cum_call', 'mouth', $boy
 											gs 'arousal', 'bj', 5
 											gs 'arousal', 'end'
@@ -187,7 +188,7 @@ if $ARGS[0] = 'Reward':
 												gs'stat'
 												'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-												'You begin coughing erratically as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are okay." Niko begins rubbing on your back gently. You continue coughing for almost a full minute as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug and begin crying in his arms, <font color=#FF00FF>He was so rough with me. I couldn''t stop him. He might do that again to me. Please no. Never again. Please.</font> Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
+												'You begin coughing erratically as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are okay." Niko begins rubbing on your back gently. You continue coughing for almost a full minute as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug and begin crying in his arms, '+$OpenInnerThought+'He was so rough with me. I couldn''t stop him. He might do that again to me. Please no. Never again. Please.'+$CloseInnerThought+' Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
 												
 												act 'Enter Niko''s room':	
 													*clr & cla
@@ -220,7 +221,7 @@ if $ARGS[0] =  'Niko Wake':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-	'You open your eyes and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, <font color=#FF00FF>It was a dream. It was only a dream. Oh my. I can''t keep doing this. Why does this keep happening to me? Why me?</font> Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."' 
+	'You open your eyes and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, '+$OpenInnerThought+'It was a dream. It was only a dream. Oh my. I can''t keep doing this. Why does this keep happening to me? Why me?'+$CloseInnerThought+' Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."' 
 	*nl
 	'Niko continues kissing your forehead before responding, "I will do everything in my power to protect you. Just stay strong. Okay <<$pcs_firstname>>?" You nod your head again before saying, "Thank you Niko. I always feel safe in your arms." Niko smiles as he wraps his arms around you.'
 
@@ -231,7 +232,7 @@ if $ARGS[0] =  'Niko Wake':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/home/bedroom/relaxing1.jpg"></center>'
 		'After relaxing for a few minutes, You get up then stretch your body before saying, "I should head home. It is getting late." Niko places his hand on your shoulder. "Will you be alright on your own?" You reply, "Of course. I''ll see you tomorrow." You lean forward and kiss Niko on the cheek before getting up, getting dressed then leaving Niko''s house.'			
 
-		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pavResidential'
+		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pav_residential'
 	end
 end
 
@@ -279,7 +280,7 @@ if $ARGS[0] =  'Lunch Chat':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/petia.mp4"></video></center>'
-						'"You finally open your mouth and wrap your lips around Petia''s dick then begin licking and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness and warmth of his Petia''s dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the loud moans that he lets out. <font color=#FF00FF>I must continue pleasing him. He need me to please him. He needs me.</font> You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by Petia''s constant squirming, that he is close to cumming.'
+						'"You finally open your mouth and wrap your lips around Petia''s dick then begin licking and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness and warmth of his Petia''s dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the loud moans that he lets out. '+$OpenInnerThought+'I must continue pleasing him. He need me to please him. He needs me.'+$CloseInnerThought+' You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by Petia''s constant squirming, that he is close to cumming.'
 						gs 'arousal', 'bj', 5
 						gs'stat'	
 									
@@ -287,7 +288,7 @@ if $ARGS[0] =  'Lunch Chat':
 							*clr & cla
 							gs'stat'
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
-							'<font color=#FF00FF>Now is my chance. The moment he and I have been waiting for. The time that he cums, for me... Cum for me, Petia. Cum for me!</font> You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let Petia''s cum fill your mouth as you push it around with your tongue, enjoying the warmth and texture of his cum as it slides down your chin. Petia catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. We need to do this again sometime."' 
+							''+$OpenInnerThought+'Now is my chance. The moment he and I have been waiting for. The time that he cums, for me... Cum for me, Petia. Cum for me!'+$CloseInnerThought+' You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let Petia''s cum fill your mouth as you push it around with your tongue, enjoying the warmth and texture of his cum as it slides down your chin. Petia catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. We need to do this again sometime."' 
 
 							act 'Turn to Niko':	
 								*clr & cla
@@ -313,7 +314,7 @@ if $ARGS[0] =  'Lunch Chat':
 										gs 'boyStat', 'A189'										
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/Home/bedroom/sex/bj5.mp4"></video></center>'
-										'You can feel your heart all aflutter as you continue sucking Niko''s dick. <font color=#FF00FF>Nikolai you are the only one I want to please. The only one love. Please realize that everything I do, I do for you. Please let me be the only one to please you. I will never fail you.</font>' 
+										'You can feel your heart all aflutter as you continue sucking Niko''s dick. '+$OpenInnerThought+'Nikolai you are the only one I want to please. The only one love. Please realize that everything I do, I do for you. Please let me be the only one to please you. I will never fail you.'+$CloseInnerThought+'' 
 										gs 'arousal', 'bj', 5
 										gs'stat'
 										
@@ -322,6 +323,7 @@ if $ARGS[0] =  'Lunch Chat':
 											gs'stat'							
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'
 											'You can feel tears running down your cheeks as you lose yourself in the moment. Niko suddenly begins groaning as he fills your mouth with his warm seed which you try your best to swallow every drop of, wanting any part of Niko to stay inside you.'
+											swallow += 1
 											gs 'cum_call', 'mouth', $boy
 											gs 'arousal', 'bj', 5
 											gs 'arousal', 'end'
@@ -425,7 +427,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
-		'Niko leans forward and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. <font color=#FF00FF>His lips are so soft and his kiss, so passionate. He really does love me. Oh Niko, keep kissing me. Please.</font>' 
+		'Niko leans forward and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. '+$OpenInnerThought+'His lips are so soft and his kiss, so passionate. He really does love me. Oh Niko, keep kissing me. Please.'+$CloseInnerThought+'' 
 		
 		act 'Sure':	
 			*clr & cla
@@ -456,7 +458,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/petia2.mp4"></video></center>'
-						'You climb on top of Petia and feel is rock hard penis entering you vagina, You feel a jolt of pleasure, causing you to moan loudly, Petia moans with you, almost in perfect harmony. You start riding Petia''s cock as he breath heavily in your ear before his breath suddenly stops and he lets out a loud moan as he fills his condom, cumming almost immediately after you begin riding him. <font color=#FF00FF>Oh wow, he couldn''t hold himself back from cumming for even a minute. He must have really wanted me. He may be a smelly loser but he deserves to receive pleasure too and I gave it to him.</font>'
+						'You climb on top of Petia and feel is rock hard penis entering you vagina, You feel a jolt of pleasure, causing you to moan loudly, Petia moans with you, almost in perfect harmony. You start riding Petia''s cock as he breath heavily in your ear before his breath suddenly stops and he lets out a loud moan as he fills his condom, cumming almost immediately after you begin riding him. '+$OpenInnerThought+'Oh wow, he couldn''t hold himself back from cumming for even a minute. He must have really wanted me. He may be a smelly loser but he deserves to receive pleasure too and I gave it to him.'+$CloseInnerThought+''
 						gs 'arousal', 'vaginal', 5
 						gs'stat'	
 						
@@ -514,7 +516,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 												*clr & cla
 												gs'stat'											
 												'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/anal.mp4"></video></center>'
-												'Niko spends a few seconds draining his cum onto your ass before taking a few seconds to catch his breath. Niko then turns to you and says, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money and I would like you to meet me <font color=#FF00FF>after school</font> where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
+												'Niko spends a few seconds draining his cum onto your ass before taking a few seconds to catch his breath. Niko then turns to you and says, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money and I would like you to meet me '+$OpenInnerThought+'after school</font> where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
 												gs 'cum_call', 'butt', $boy
 												gs 'arousal', 'vaginal', 5
 												gs 'arousal', 'end'
@@ -623,7 +625,7 @@ if $ARGS[0] =  'Diner 1':
 					minut += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bj1.jpg"></center>'
-					'You step in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking and sucking his dick, doing your best to please him. The man begins moaning loudly. <font color=#FF00FF>This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.</font> You increase the pace while feeling him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming as he sprays his load into your mouth and all over your face, you look up at the biker and see an adoring look on his face as he looks down at you.' 
+					'You step in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking and sucking his dick, doing your best to please him. The man begins moaning loudly. '+$OpenInnerThought+'This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.'+$CloseInnerThought+' You increase the pace while feeling him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming as he sprays his load into your mouth and all over your face, you look up at the biker and see an adoring look on his face as he looks down at you.' 
 					gs 'cum_call', 'face'
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -648,7 +650,7 @@ if $ARGS[0] =  'Diner 1':
 								minut += 5
 								gs'stat'							
 								'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
-								'You turn to see a nearby trucker examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum leaking off of her face!" You freeze in place. <font color=#FF00FF>Oh shit! I forgot to wash up. How did I forget that? I''m walking around with cum dripping off my chin. How could I forget?</font> the truckers and bikers in the room surround you then begin talking to each other.'
+								'You turn to see a nearby trucker examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum leaking off of her face!" You freeze in place. '+$OpenInnerThought+'Oh shit! I forgot to wash up. How did I forget that? I''m walking around with cum dripping off my chin. How could I forget?'+$CloseInnerThought+' the truckers and bikers in the room surround you then begin talking to each other.'
 								
 								act 'Listen to them':	
 									*clr & cla
@@ -666,7 +668,7 @@ if $ARGS[0] =  'Diner 1':
 										'Biker3: I wonder how much she''s chargin''?'
 									end
 									*nl
-									'Niko chuckles as he replies, "She is my girl and it will be 2000 <b>₽</b>, per customer." All of the truckers and bikers begin lining up in front of Niko giving him money, before approaching you. <font color=#FF00FF>Am I about to have sex with all these men? How can I satisfy that many men? I don''t know if I can even handle that.</font> The men begin undressing you as they roughly finger your holes. You close your eyes as one of the men pushes you down on your knees as another shoves his dick into your mouth.'
+									'Niko chuckles as he replies, "She is my girl and it will be 2000 <b>₽</b>, per customer." All of the truckers and bikers begin lining up in front of Niko giving him money, before approaching you. '+$OpenInnerThought+'Am I about to have sex with all these men? How can I satisfy that many men? I don''t know if I can even handle that.'+$CloseInnerThought+' The men begin undressing you as they roughly finger your holes. You close your eyes as one of the men pushes you down on your knees as another shoves his dick into your mouth.'
 									
 									act 'Suck their dicks':	
 										*clr & cla
@@ -726,7 +728,7 @@ if $ARGS[0] =  'Diner 1':
 														minut -= 5
 														gs'stat'
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/5.jpg"></center>'
-														'<font color=#FF00FF>That man was so rough, but Niko...My Niko protected me like he said he would.</font> As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking and sucking it eagerly. The pain in your ass fades as pleasure takes it''s place. You close your eyes and submit to the pleasure when another man approaches you.'
+														''+$OpenInnerThought+'That man was so rough, but Niko...My Niko protected me like he said he would.'+$CloseInnerThought+' As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking and sucking it eagerly. The pain in your ass fades as pleasure takes it''s place. You close your eyes and submit to the pleasure when another man approaches you.'
 														gs 'arousal', 'bj', 5
 														gs 'arousal', 'anal', 5
 														gs'stat'									
@@ -874,7 +876,7 @@ if $ARGS[0] =  'Reward 2':
 		minut += 10
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
-		'As soon as you enter Niko''s house he pulls you toward him then gives you another passionate kiss as he begins undressing you. <font color=#FF00FF>Oh his kisses are so passionate. He wants me so bad. I want him too. Please take me Nikolai. Take me!</font> Niko finishes undressing you then begins removing his clothes as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'		
+		'As soon as you enter Niko''s house he pulls you toward him then gives you another passionate kiss as he begins undressing you. '+$OpenInnerThought+'Oh his kisses are so passionate. He wants me so bad. I want him too. Please take me Nikolai. Take me!'+$CloseInnerThought+' Niko finishes undressing you then begins removing his clothes as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'		
 
 		act 'Lay back':	
 			*clr & cla
@@ -898,7 +900,7 @@ if $ARGS[0] =  'Reward 2':
 					*clr & cla
 					gs'stat'				
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/bj.mp4"></video></center>'
-					'You begin sucking on Niko''s dick. <font color=#FF00FF>Oh Niko you are so perfect. I only want to please you. To see you happy. To give you the bliss that you give me. I love you Nikolai.</font> Niko tilts his head back as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
+					'You begin sucking on Niko''s dick. '+$OpenInnerThought+'Oh Niko you are so perfect. I only want to please you. To see you happy. To give you the bliss that you give me. I love you Nikolai.'+$CloseInnerThought+' Niko tilts his head back as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
 					gs 'arousal', 'bj', 5
 					gs'stat'	
 											
@@ -924,7 +926,8 @@ if $ARGS[0] =  'Reward 2':
 								gs'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'
 								'You quickly pull off of Niko then wrap your lips around his dick and begin sucking. Niko tilts his head back then begins cumming in your mouth as you do your best to suck every drop out of Niko''s dick. Niko''s warm seed fills your mouth as you continue swallowing and sucking his dick dry. After Niko is fully spent, he gently grabs your face then brings it to his, giving you a gentle kiss on the lips before saying, "I am so lucky to have such a beautiful and obedient girl like you." You reply, "I feel so lucky to have you in my life too, Nikolai." Niko rubs on your forehead then gets up and heads to the bathroom to get washed up.'
-								gs 'cum_call', 'mouth', $boy 
+								swallow += 1
+								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs 'arousal', 'end'
 								gs'stat'	
@@ -952,7 +955,7 @@ if $ARGS[0] = 'Yurik BJ':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'
-		'You begin sucking Yurik''s massive dick, trying your best to fit as much of it in your mouth as you can. Yurik continues watching the TV as if you weren''t even there. <font color=#FF00FF>Am I not doing a good enough job. Why isn''t he enjoying this? I must try harder.</font> You begin licking his penis rapidly, trying to get a response from him. You pull his dick out of your mouth and begin licking the tip of it which causes him to grunt and look down to you.'
+		'You begin sucking Yurik''s massive dick, trying your best to fit as much of it in your mouth as you can. Yurik continues watching the TV as if you weren''t even there. '+$OpenInnerThought+'Am I not doing a good enough job. Why isn''t he enjoying this? I must try harder.'+$CloseInnerThought+' You begin licking his penis rapidly, trying to get a response from him. You pull his dick out of your mouth and begin licking the tip of it which causes him to grunt and look down to you.'
 		gs 'arousal', 'bj', 5
 		gs'stat'	
 						
@@ -979,6 +982,7 @@ if $ARGS[0] = 'Yurik BJ':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'	
 					'You quicken your pace then suddenly Yurik groans as he begins pumping your mouth full of his warm cum which you do your best to swallow every drop of. After Yurik is spent, he says to you, "I''m done girl. You can go back to Niko now." You get up then start walking away when you hear Yurik say, "And good job girl." You walk back up the stairs with a smile on your face.'
+					swallow += 1
 					gs 'cum_call', 'mouth', $boy 
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -1180,7 +1184,7 @@ if $ARGS[0] = 'Niko Search':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
-	'As you are leaving the cafeteria, you walk toward the restroom to check up on Niko. When you arrive at the restroom you can see the boys chatting with each other before turning to you then whispering to each other before Dan grabs onto your arm. "Hey <<$pcs_firstname>> I know why you are here. You miss our dicks don''t you?" You recoil before saying, "No I was just looking for..." Dan grips your arm tighter as he unbuttons his pants. "Don''t worry, My dick is right here." Dan pushes you down to your knees then presses his dick against your lips while the other gopnik circle around you. <font color=#ff00cc>There is no point in resisting.</font>' 
+	'As you are leaving the cafeteria, you walk toward the restroom to check up on Niko. When you arrive at the restroom you can see the boys chatting with each other before turning to you then whispering to each other before Dan grabs onto your arm. "Hey <<$pcs_firstname>> I know why you are here. You miss our dicks don''t you?" You recoil before saying, "No I was just looking for..." Dan grips your arm tighter as he unbuttons his pants. "Don''t worry, My dick is right here." Dan pushes you down to your knees then presses his dick against your lips while the other gopnik circle around you. '+$OpenInnerThought+'There is no point in resisting.'+$CloseInnerThought+'' 
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 
@@ -1220,7 +1224,7 @@ if $ARGS[0] =  'Niko Search 2':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
-	'As you are leaving the cafeteria, you carefully approach the restroom. <font color=#ff00cc>Please be there Niko.</font> When you arrive at the restroom you carefully peek through the door to see that no one is there. You can''t help but feel a bit relieved that none of the boys are there, but soon you hear some boys chatting from the hallway behind you, so you quickly run into one of the stalls while hoping that they don''t enter. To your dismay, they enter the restroom while continuing their conversation.'	
+	'As you are leaving the cafeteria, you carefully approach the restroom. '+$OpenInnerThought+'Please be there Niko.'+$CloseInnerThought+' When you arrive at the restroom you carefully peek through the door to see that no one is there. You can''t help but feel a bit relieved that none of the boys are there, but soon you hear some boys chatting from the hallway behind you, so you quickly run into one of the stalls while hoping that they don''t enter. To your dismay, they enter the restroom while continuing their conversation.'	
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 
@@ -1233,7 +1237,7 @@ if $ARGS[0] =  'Niko Search 2':
 		'Vasily: "I saw him leaving class, holding Dimka''s books like his little whipping boy. That guy has to be the biggest pussy, I have ever seen."'
 		'Vitek: "I swear that guy is a fag, if I have ever seen one."'
 		'Dan: "Hey who is in this stall? Are you taking a shit in there?"'
-		'Dan knocks on the door a few times as the others chuckle. <font color=#ff00cc>Oh no, do they know? Should I run?</font> Dan walks away from the door as the guys continue laughing and chatting.'
+		'Dan knocks on the door a few times as the others chuckle. '+$OpenInnerThought+'Oh no, do they know? Should I run?'+$CloseInnerThought+' Dan walks away from the door as the guys continue laughing and chatting.'
 		'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 		

+ 5 - 5
locations/NikoMeyHome.qsrc

@@ -327,7 +327,7 @@ if $ARGS[0] =  'Bathroom Locked':
 	VKMeyLock = 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/locked.jpg"></center>'
-	'You try to enter the bathroom but the door is locked. <font color=#FF00FF>Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them</font>'
+	'You try to enter the bathroom but the door is locked. '+$OpenInnerThought+'Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them'+$CloseInnerThought+''
 
 	act 'Walk away': gt 'NikoMeyHome', 'Hallway'	
 end
@@ -502,7 +502,7 @@ if $ARGS[0] = 'Leaving':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-	'As you approach the door, you think to yourself, <font color=#FF00FF>I haven''t spoken to all the girls yet. Should I leave without saying goodbye?</font>'
+	'As you approach the door, you think to yourself, '+$OpenInnerThought+'I haven''t spoken to all the girls yet. Should I leave without saying goodbye?'+$CloseInnerThought+''
 	
 	act '<font color=#FF00FF>Return to hallway</font>':gt 'NikoMeyHome', 'Hallway'
 	act '<font color="red">Leave Meynold home</font>':VKMeyLeft = 1 & gt 'NikoMeyHome', 'Vicky Goodbye'
@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 
@@ -917,7 +917,7 @@ if $ARGS[0] = 'Kat Bath':
 							cla & *clr
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/5.mp4"></video></center>'
-							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. <font color=#FF00FF>Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.</font>'
+							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. '+$OpenInnerThought+'Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.'+$CloseInnerThought+''
 							
 							act 'Continue':	
 								cla & *clr
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'Katja Bath':
 							cla & *clr
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/5.mp4"></video></center>'
-							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. <font color=#FF00FF>Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!</font>'
+							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. '+$OpenInnerThought+'Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!'+$CloseInnerThought+''
 							
 							act 'Continue':	
 								cla & *clr

+ 12 - 3
locations/NikoPayback.qsrc

@@ -69,7 +69,12 @@ if $ARGS[0] = 'Payback':
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/facial1.mp4"></video></center>'
 						'You increase your pace as you look up at Niko, noticing how much he is enjoying your performance. You stare him in the eyes as you hear him begin groaning. You suddenly feel Niko''s warm seed filling your mouth, one squirt at a time. You look up to Niko with his cum slowly leaking out of your mouth, Niko then looks down to you and says, "What are you waiting for? Swallow my cum bitch!" You give Niko a meek nod then begin swallowing his cum and after you finish, Niko pulls your head to the ground and says, "You missed a few drops, Lick it off the floor!" not wanting to anger Niko further, you obediently begin licking the last drops of cum off the floor. "Now that''s better, I''ll see you tomorrow. Remember what I said and don''t ever try to avoid me."'	
-
+						swallow += 1
+						gs 'cum_call', 'mouth', 'A189', 1
+						gs 'arousal', 'bj', 5
+						gs 'arousal', 'end'
+						gs'stat'
+					
 						act 'Stand up':gt 'FedorMisc', 'Restroom'
 					end	
 				end				
@@ -170,8 +175,9 @@ if $ARGS[0] =  'Payback 3':
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj2.mp4"></video></center>'
 			'After a few more seconds, Niko begins moaning as he runs his fingers through your hair before grabbing your head with both hands and pushes his penis down your throat as he begin spraying his warm seed down your throat. You try your best not to gag as Niko continues to pump his warm cum down your throat while you swallow every drop of it. After Niko finishes, he looks down to you then says, "You are really good at that. I will see you again soon. Niko buttons his pants then walks out of the restroom."'
 			*nl
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'			
-			gs 'cum_call', 'face', $boy
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'	
+			swallow += 1
+			gs 'cum_call', 'mouth', $boy
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'	
@@ -335,6 +341,7 @@ if $ARGS[0] =  'Payback 4':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4"></video></center>'
 				'Niko grabs the back of your head then begins fucking your throat. You try to relax your throut as NIko continues fucking it. Niko says to you, "Remember <<$pcs_firstname>> this is your place. You are my fucking bitch and nothing more." You are too focused on not gagging to respond. After a few more seconds, Niko groans, filling your throat with his warm seed which you swallow as much of it as you can, knowing that you have no choice. Niko then buttons his pants and walks out of the restroom, without saying another word.'
+				swallow += 1
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -351,11 +358,13 @@ if $ARGS[0] =  'Payback 4':
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/piss1.mp4"></video></center>'
 			'You open your mouth and close your eyes, waiting for Niko to start. A few seconds later you feel warm liquid spraying in your face, filling your mouth and getting in your nose. Niko shouts, "SWALLOW IT ALL BITCH!" You try your best not to gag as you attempt to swallow all of him bitter tasting urine. You can''t keep your self from gagging as Niko continues shooting his urine down your throat. Niko suddenly rubs his penis against your lips before shoving it into your mouth.'			
 			gs 'arousal', 'pee', -5, 'sub', 'humiliation'
+			
 			act 'Suck Niko''s dick':	
 				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 				'You know exactly what he want and begin sucking Niko''s dick, trying your best to get him off as quickly as possible, knowing that the sooner he finishes, the sooner you can wash up and leave. You lick and suck Niko''s dick while trying your best to ignore the rotten taste in your mouth and the mildly burning of Niko''s urine on your face. Niko looks down to you then says, "There you go <<$pcs_firstname>>. Keep behaving like this and we will get along just fine." He then tilts his head back and begins moaning. Niko suddenly grabs the back of your head and begin filling your throat with his warm cum as you try your best to swallow every drop of it. After Niko finishes, he turn to you and says, "You are learning, Good keep it up." Niko then buttons his pants before leaving the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'

+ 14 - 2
locations/NikoSlut.qsrc

@@ -87,6 +87,7 @@ if $ARGS[0] = 'Customer 1':
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bjcum2.jpg"></center>'
 				'You continue sucking his dick as he groans then begins cumming in your mouth. You begin swallowing every drop of the man''s cum, not wanting to disappoint hi while enjoying the creamy texture and wamth of his cum as it slides down your throat. After the man is finished, he looks down to you and says, "Wow you actually swallowed it. Thank you girl, that was really sexy." He then puts his pants back on and leaves the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Biker'
 				gs 'arousal', 'anal', 5, 'dom'
 				gs 'arousal', 'end'
@@ -217,6 +218,7 @@ if $ARGS[0] = 'Customer 2':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow7.mp4"></video></center>'
 				'He begins squirming almost immediately then groans as he fills you mouth with his cum. <font color=#FF00FF>Wow, he came so quickly. Touching on my body must have really turned him on.</font> The man fully milks his dick in your mouth before pulling up his pants then saying, "Damn girl, you really got me off quickly. Great work." He then walks back into the diner as Niko approaches you. "Are you ready for another customer, or would you like to clean up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -460,6 +462,7 @@ if $ARGS[0] = 'Customer 4':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow7.mp4"></video></center>'
 				'You start rapidly licking and sucking his dick when you hear him moan as he begins filling your mouth with his warm seed which you swallow every drop of, knowing that it will please him. The man looks down to you and says, "You are a good little slut. I will definitely be having you again." The man then pulls his pants up then walks back into the diner. Niko approaches you then says, "Are you ready, for another customer, or would you like to wash up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Biker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -559,6 +562,7 @@ if $ARGS[0] = 'Customer 5':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow6.mp4"></video></center>'
 				'You begin stroking the shaft of his penis while continuing to suck until you hear the moan lean back as his penis begins throbbing in your mouth, filling your mouth with his warm seed. You spend a few seconds using your tongue to play with his cum before finally swallowing it. The trucker looks down to you and says, "You are great at that. Thank you young lady. I really enjoyed that." He then buttons his pants before heading back inside. Niko then walks up to you and says, "Are you ready for another customer, or would you like to clean up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Keith'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -705,6 +709,8 @@ if $ARGS[0] = 'Customer 6':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/throat/3.mp4"></video></center>'
 					'The man shoves his penis in your mouth then forces you to gag on his dick while he fucks your throat as you try your best to relax your throat and let him fuck it. You can see in the corner of your eyes Niko approaching the man with an angry look on his face. You wave at him to let him know that you are okay and he relaxes.' 
+					gs 'arousal', 'bj', 5, 'sub'
+					gs 'stat'
 					
 					act 'Make him cum':	
 						*clr & cla
@@ -759,12 +765,16 @@ if $ARGS[0] = 'Customer 6':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/throat/3.mp4"></video></center>'
 					'The man shoves his penis in your mouth then forces you to gag on his dick while he fucks your throat as you try your best to relax your throat and let him fuck it. You can see in the corner of your eyes Niko approaching the man with an angry look on his face. You wave at him to let him know that you are okay and he relaxes.' 
-
+					gs 'arousal', 'bj', 5, 'sub'
+					gs 'arousal', 'end'				
+					gs 'stat'							
+					
 					act 'Make him cum':	
 						*clr & cla
 						gs'stat'					
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4"></video></center>'
 						'Suddenly the man groans then begins filling your throat with his warm seed, causing his cum to shoot down your throat. The man takes a second to catch his breath before saying, "You are really good at swallowing cum. I might use you again soon." He then pulls up his pants then walks away. Niko then approaches you and says, "Are you alright? That looked rough." You nod with a smile on your face. Niko then replies, "Good, I hope you are ready for another customer, or would you like to wash up first?"'			
+						swallow += 1
 						gs 'cum_call', 'mouth', 'Trucker'
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'arousal', 'end'				
@@ -827,6 +837,7 @@ if $ARGS[0] = 'Customer 7':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 				'You begin sucking his dick at an increased pace, causing the man to let out occasional grunts. After a few more seconds, the man groans as his hard cock begins throbbing in your mouth, filling your throat with his warm seed which you do your best to swallow every drop of. After the man finishes, he buttons his pants then reaches into his pocket, pulling out his wallet then placing some money in your pocket. "Here is a little tip for you. Buy yourself something nice." You give him a smile as you respond, "Thank you so much." He gives you a wink before escorting you out of the back room.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -968,7 +979,7 @@ if $ARGS[0] = 'Customer 8':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 					'After a few more seconds, the man groans as his penis begins throbbing in your mouth, filling it with his warm seed which you let slide down your throat and into your belly. The man takes a few seconds to catch his breath before saying, "You were outstanding <<$NikoSlutName>>. I look forward to seeing you again soon." He then buttons his pants before leaving the restroom.'
-
+					swallow += 1
 					gs 'cum_call', 'mouth', 'Trucker'
 					gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 					gs 'arousal', 'end'
@@ -1099,6 +1110,7 @@ if $ARGS[0] = 'Customer 9':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum1.mp4"></video></center>'
 				'You wrap you lips around the truckers dick, evoking a moan from him. You begin sucking his dick while massaging his cock with your tongue, enjoying the warmth of his penis in your mouth. After a minute, the trucker groans as he begin pumping his seed into your mouth which you lets slide down your throat, feeling the sting as it goes down into your belly. The trucker catches his breath then says, "You are a really good cocksucker. I will definitely be calling for your services again." He then buttons his pants before leaving the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'

+ 27 - 23
locations/NikoWhore.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'Locker Room':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	'Niko wraps his arm around your neck then leads you to the locker room. When you enter the locker room, Niko closes the door then takes a quick look around to see if anyone is there. Niko walks up behind you then whispers in your ear, "<<$pcs_firstname>> take off your clothes." You obediently do as he asks, removing all your clothes. Niko collects your clothes then puts them in a bag. You can''t help but feel nervous when you see Niko packing up your clothes. <font color=#FF00FF>Is he taking my clothes away? What if someone walks in? I wont be able to get dressed. I''m sure Niko knows what he is doing. Just follow his lead <<$pcs_firstname>>, just follow his lead.</font>'
+	'Niko wraps his arm around your neck then leads you to the locker room. When you enter the locker room, Niko closes the door then takes a quick look around to see if anyone is there. Niko walks up behind you then whispers in your ear, "<<$pcs_firstname>> take off your clothes." You obediently do as he asks, removing all your clothes. Niko collects your clothes then puts them in a bag. You can''t help but feel nervous when you see Niko packing up your clothes. '+$OpenInnerThought+'Is he taking my clothes away? What if someone walks in? I wont be able to get dressed. I''m sure Niko knows what he is doing. Just follow his lead <<$pcs_firstname>>, just follow his lead.'+$CloseInnerThought+''
 
 	act 'Take a deep breath':
 		*clr & cla
@@ -30,7 +30,7 @@ if $ARGS[0] = 'Locker Room':
 				*clr & cla
 				gs'stat'			
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker2.mp4"></video></center>'
-				'You immediately understand what he wants and begin sucking his dick thoroughly, trying your best to please him. Niko looks down to you and says, "You''re doing great <<$pcs_nickname>>, keep it up." Niko''s approval gives you a warm feeling in your heart. <font color=#FF00FF>I''m doing good. Niko likes what I''m doing for him. I only want to please you Niko. Please cum for me. I want your seed inside me.</font>'
+				'You immediately understand what he wants and begin sucking his dick thoroughly, trying your best to please him. Niko looks down to you and says, "You''re doing great <<$pcs_nickname>>, keep it up." Niko''s approval gives you a warm feeling in your heart. '+$OpenInnerThought+' I''m doing good. Niko likes what I''m doing for him. I only want to please you Niko. Please cum for me. I want your seed inside me.'+$CloseInnerThought+''
 				gs 'arousal', 'bj', 5, 'sub'
 				gs 'stat'
 								
@@ -39,6 +39,7 @@ if $ARGS[0] = 'Locker Room':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 					'Niko begins lightly moaning before grabbing onto your hair then pushing his cock down your throat, filling your throat with his warm cum. You enjoy the warm feeling of his cum entering your throat and the rapid throbbing of his penis as it pumps your throat with his seed.' 
+					swallow += 1
 					gs 'cum_call', 'mouth', 'A189', 1
 					gs 'arousal', 'bj', 5, 'sub'
 					gs 'arousal', 'end'
@@ -57,7 +58,7 @@ if $ARGS[0] = 'Locker Room':
 							gs'stat'
 							'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 							*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-							'You squirm for a few seconds, attempting to free yourself from the cuffs. <font color=#FF00FF>Where did Niko go? Did he forget to uncuff me? Maybe he just left to wash his hands before untying me. He wouldn''t forget about me. I just need to wait patiently, for him to return.</font> You spend the next few minutes trying to get comfortable until you hear the locker room door open. You quickly look up in excitement. <font color=#FF00FF>I knew that Niko wouldn''t forget me.</font> but as you look up...'
+							'You squirm for a few seconds, attempting to free yourself from the cuffs. '+$OpenInnerThought+'Where did Niko go? Did he forget to uncuff me? Maybe he just left to wash his hands before untying me. He wouldn''t forget about me. I just need to wait patiently, for him to return.'+$CloseInnerThought+' You spend the next few minutes trying to get comfortable until you hear the locker room door open. You quickly look up in excitement. '+$OpenInnerThought+'I knew that Niko wouldn''t forget me.'+$CloseInnerThought+' but as you look up...'
 							gs 'arousal', 'flash', 2, 'sub', 'humiliation'
 							gs 'stat'
 							
@@ -75,7 +76,7 @@ if $ARGS[0] = 'Locker Room':
 									minut += 2
 									gs'stat'							
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker4.jpg"></center>'
-									'You shout at Dan, "Let go of me, or I''ll scream!" Dan''s grin grows even wider and who would hear you? Everyone is in the cafeteria, laughing and shouting over each other. Even if someone heard you, would you like them to see you chained up naked, like this? Maybe I should just walk you into the cafeteria where you can scream all you want." <font color=#FF00FF>I''m completely naked. If he walks me into the cafeteria then I will be completely humiliated.</font>'
+									'You shout at Dan, "Let go of me, or I''ll scream!" Dan''s grin grows even wider and who would hear you? Everyone is in the cafeteria, laughing and shouting over each other. Even if someone heard you, would you like them to see you chained up naked, like this? Maybe I should just walk you into the cafeteria where you can scream all you want." '+$OpenInnerThought+'I''m completely naked. If he walks me into the cafeteria then I will be completely humiliated.'+$CloseInnerThought+''
 									gs 'arousal', 'flash', 2, 'sub', 'humiliation'
 									gs 'stat'
 									
@@ -83,9 +84,9 @@ if $ARGS[0] = 'Locker Room':
 										*clr & cla
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker5.mp4"></video></center>'	
-										'You lower your head in submission, "Please don''t do that. I''ll stay quiet." Dan quickly turns you around then unbuttons his pants before sliding his dick inside of your ass, causing a surge of pressure and pain to fill your ass. Dan wastes no time and begins fucking your ass, slowly at first then continues picking up the pace. <font color=#FF00FF>I can''t believe this is happening. Niko where are you? Please help me!</font> Dan continues fucking your ass when his phone begins ringing.'
+										'You lower your head in submission, "Please don''t do that. I''ll stay quiet." Dan quickly turns you around then unbuttons his pants before sliding his dick inside of your ass, causing a surge of pressure and pain to fill your ass. Dan wastes no time and begins fucking your ass, slowly at first then continues picking up the pace. '+$OpenInnerThought+'I can''t believe this is happening. Niko where are you? Please help me!'+$CloseInnerThought+' Dan continues fucking your ass when his phone begins ringing.'
 										*nl
-										'Dan doesn''t even stop fucking you as he answers his phone. The person on the other end of the phone says something to Dan, to which he responds, "I can''t right now. I''m too busy fucking <<$pcs_firstname>>''s ass." Your eyes widen as Dan continues, "Yeah, I''m in the locker room...Sure you can come." <font color=#FF00FF>Did he just tell someone about this? Who was he talking too? I can''t do anything. Please tell me I''m dreaming.</font>'
+										'Dan doesn''t even stop fucking you as he answers his phone. The person on the other end of the phone says something to Dan, to which he responds, "I can''t right now. I''m too busy fucking <<$pcs_firstname>>''s ass." Your eyes widen as Dan continues, "Yeah, I''m in the locker room...Sure you can come." '+$OpenInnerThought+'Did he just tell someone about this? Who was he talking too? I can''t do anything. Please tell me I''m dreaming.'+$CloseInnerThought+''
 										$orgasm_txt = ''
 										gs 'arousal', 'anal', 5, 'sub'
 										gs 'stat'
@@ -111,7 +112,7 @@ if $ARGS[0] = 'Locker Room':
 													kotovloveQW = -1
 													'Vitek and Vasily enter the room then Vitek begins shouting at Dan, "What the fuck do you think you''re doing Dan? <<$pcs_firstname>> is mine!" Dan suddenly rams his dick far in your ass, causing you to scream as he fills your ass with his cum. You feel his dick throbbing inside you as his warm cum fills your ass. Vitek suddenly wraps his hand around Dan''s throat, "Answer my fucking question! What are you doing, fucking my girl?" Dan chokes on his words as he tries to explain, "<<$pcs_firstname>> is a...whore and I can...Grr...prove it. Check this out," Dan reaches into his pocket then pulls out his phone and taps the screen a few times. After a few more taps, he lift the phone up to Vitek''s face. A video plays where you hear sucking sounds followed by a groan then shortly after hear yourself saying,'
 													*nl
-													'"I love you Nikolai. I love you with all my heart." You suddenly realize what that Dan must have recorded you as you sucked Niko''s dick in the hallway, after school. <font color=#FF00FF>There is no way I can talk my way out of this. What will Viktor do to me?</font> Vitek watches the video for a few more seconds before releasing Dan''s throat then turning to you with his face; seething with rage. "You fucking worthless whore!" He then lifts his hand and smacks you hard, knocking you to the ground. Vitek begins smashing a nearby garbage can in rage then Dan places his hand on Vitek''s shoulder, "It''s alright Vitek, you don''t need her, you never did." Vitek takes a few seconds to calm himself then brushes Dan''s hand off his shoulder as he unbuttons his pants then pushes his dick against your lips. "What are you waiting for, whore? Start sucking." You meekly nod before wrapping your lips around his dick.'
+													'"I love you Nikolai. I love you with all my heart." You suddenly realize what that Dan must have recorded you as you sucked Niko''s dick in the hallway, after school. '+$OpenInnerThought+'There is no way I can talk my way out of this. What will Viktor do to me?'+$CloseInnerThought+' Vitek watches the video for a few more seconds before releasing Dan''s throat then turning to you with his face; seething with rage. "You fucking worthless whore!" He then lifts his hand and smacks you hard, knocking you to the ground. Vitek begins smashing a nearby garbage can in rage then Dan places his hand on Vitek''s shoulder, "It''s alright Vitek, you don''t need her, you never did." Vitek takes a few seconds to calm himself then brushes Dan''s hand off his shoulder as he unbuttons his pants then pushes his dick against your lips. "What are you waiting for, whore? Start sucking." You meekly nod before wrapping your lips around his dick.'
 												else
 													'Vitek and Vasily enter the room then quickly begin whistling at you before Vitek says, "I thought that Dan was fucking with me when he told me about this." Dan suddenly rams his dick far in your ass, causing you to scream as he fills your ass with his cum. You feel his dick throbbing inside you as his warm cum fills your ass. "You take a second to catch your breath when you look up to see Vitek''s dick in your face. "What are you waiting for slut? Start sucking."'
 													*nl
@@ -160,6 +161,7 @@ if $ARGS[0] = 'Locker Room':
 																'Vitek: That sounds like a great idea. <<$pcs_firstname>> looks like a overgrown pig, but we can always fuck her from behind. Alright let''s do it. Hey <<$pcs_firstname>>, you''re coming with us.'
 															end
 														end	
+														swallow += 1
 														gs 'cum_call', 'mouth', 'A9', 1
 														gs 'arousal', 'bj', 5, 'sub'
 														gs 'boyStat', 'A11'
@@ -172,7 +174,7 @@ if $ARGS[0] = 'Locker Room':
 															inhib_exp += 2
 															gs'stat'
 															'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'
-															'<font color=#FF00FF>No this can''t be! Why is this happening? This will ruin my reputation forever. I will be an outcast like Sonia. The boys will abuse me. This can''t be happening.</font>"Please don''t do this. I will do anything! Please just let me go." Vitek pulls on your collar. "Less talking, more walking." Vitek walks you out of the locker room as Dan tells you, "Don''t worry <<$pcs_firstname>>, you will get used to it. Imagine it, every boy in school will be giving you a lot of attention. You will be popular among all the boys." You look back to Vasily and he whispers in your ear, "I''m sorry <<$pcs_nickname>>, but I can''t help you. It''s too late." As he follows closely behind you.'
+															''+$OpenInnerThought+'No this can''t be! Why is this happening? This will ruin my reputation forever. I will be an outcast like Sonia. The boys will abuse me. This can''t be happening.'+$CloseInnerThought+'"Please don''t do this. I will do anything! Please just let me go." Vitek pulls on your collar. "Less talking, more walking." Vitek walks you out of the locker room as Dan tells you, "Don''t worry <<$pcs_firstname>>, you will get used to it. Imagine it, every boy in school will be giving you a lot of attention. You will be popular among all the boys." You look back to Vasily and he whispers in your ear, "I''m sorry <<$pcs_nickname>>, but I can''t help you. It''s too late." As he follows closely behind you.'
 															gs 'arousal', 'flash', 2, 'sub', 'humiliation', 'exhibitionism'
 															gs 'stat'
 															
@@ -182,7 +184,7 @@ if $ARGS[0] = 'Locker Room':
 																gs'stat'
 																'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 																*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'										
-																'Your heart is pounding and you can feel tears streaming down your eyes. <font color=#FF00FF>I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!</font> You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
+																'Your heart is pounding and you can feel tears streaming down your eyes. '+$OpenInnerThought+'I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!'+$CloseInnerThought+' You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
 																*nl
 																if fedorkozlovQW > 1 or fedorKozlovQW < -10:
 																	'You suddenly hear Fedor Kozlov shouting, "What are you guys doing with <<$pcs_firstname>>?" Dan begins laughing as he replies, "Didn''t <<$pcs_firstname>> tell you? She wants to join Sonia as our fuck puppet." Fedor looks to you with concerning eyes, "They are lying, aren''t they?"'
@@ -500,7 +502,7 @@ if $ARGS[0] = 'Locker Room 2':
 	inhib_exp += 1
 	gs'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock2.mp4"></video></center>'
-	'As soon as you reach the locker room, Dan shoves you into the crowd and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. <font color=#FF00FF>This is it. This is my life now. How did I let this happen?</font> Roman leans forward and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"'
+	'As soon as you reach the locker room, Dan shoves you into the crowd and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. '+$OpenInnerThought+'This is it. This is my life now. How did I let this happen?'+$CloseInnerThought+' Roman leans forward and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"'
 	$orgasm_txt = ''
 	gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 	gs 'stat'
@@ -594,7 +596,7 @@ if $ARGS[0] = 'Locker Room 2':
 										minut -= 5
 										gs'stat'
 										'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumAnal2.mp4"></video></center>'
-										'<font color=#FF00FF>Vitek is so strong and aggressive. He is always so rough. Why is he always so angry?</font> After a few more seconds, Vitek says, "This is what a whore like you deserves." Vitek then fills your ass with his warm seed. You can feel Vitek''s hot cum filling your ass and then leaking out as he pulls out of you. "You better get used to this <<$pcs_firstname>> Because this is your new life now." Vitek pulls up his pants then leaves the locker room.'
+										''+$OpenInnerThought+'Vitek is so strong and aggressive. He is always so rough. Why is he always so angry?'+$CloseInnerThought+' After a few more seconds, Vitek says, "This is what a whore like you deserves." Vitek then fills your ass with his warm seed. You can feel Vitek''s hot cum filling your ass and then leaking out as he pulls out of you. "You better get used to this <<$pcs_firstname>> Because this is your new life now." Vitek pulls up his pants then leaves the locker room.'
 										$orgasm_txt = ''
 										gs 'cum_call', 'anus', 'A9', 1
 										gs 'arousal', 'anal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
@@ -617,6 +619,7 @@ if $ARGS[0] = 'Locker Room 2':
 												gs'stat'					
 												'<center><video autoplay loop src="images\shared\sex\cum\mouth\cum1,3.mp4"></video></center>'
 												'You obediently  open you mouth as Valentin grabs you head then holds it to his dick before jerking off then shooting his load onto your tongue. You keep your mouth open accepting his cum inside as you swallow it as quickly as you can to make room for more. The taste is horrible but you know that you have no choice. After Valentin fully drains his cock into your mouth he then brushes your cheek and says, "That''s how you do it <<$pcs_nickname>>." He then zips up his pants and walks out of the locker room, leaving you on the floor.'
+												swallow += 1
 												gs 'cum_call', 'mouth', 'A158', 1
 												gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 												gs 'stat'	
@@ -647,7 +650,7 @@ if $ARGS[0] = 'Locker Room 2':
 															gs'stat'
 															'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 															*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-															'You can feel all of your energy sapped, your will... Broken as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, <font color=#FF00FF>So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.</font> Tears begin streaming down your cheeks as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
+															'You can feel all of your energy sapped, your will... Broken as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, '+$OpenInnerThought+'So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.'+$CloseInnerThought+' Tears begin streaming down your cheeks as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
 															*nl
 															if artembf = 1 and artembrokenheart = 0 and artemblok = 0:
 																artembf = 0
@@ -682,7 +685,7 @@ if $ARGS[0] = 'Locker Room 2':
 																		*clr & cla
 																		gs'stat'
 																		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock8.mp4"></video></center>'
-																		'Petka begins fucking you, thrusting at an increased pace as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing as Petka continues using your body. <font color=#FF00FF>Wha...what''s going...feel...so hot...head...can''t think...why...</font>'
+																		'Petka begins fucking you, thrusting at an increased pace as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing as Petka continues using your body. '+$OpenInnerThought+'Wha...what''s going...feel...so hot...head...can''t think...why...'+$CloseInnerThought+''
 																		$orgasm_txt = ''
 																		gs 'cum_call', 'stomach', 'A6', 1
 																		gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
@@ -742,7 +745,7 @@ if $ARGS[0] = 'Walk Of Shame':
 			gs'stat'
 			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-			'<font color=#FF00FF>Maybe Roman can help me out, he is being nice to me when he doesn''t have to.</font> You meekly nod to the boy and his eyes light up as he replies, "Great! let''s get going." He then grabs your arm and guides you to the restroom.'
+			''+$OpenInnerThought+'Maybe Roman can help me out, he is being nice to me when he doesn''t have to.'+$CloseInnerThought+' You meekly nod to the boy and his eyes light up as he replies, "Great! let''s get going." He then grabs your arm and guides you to the restroom.'
 
 			act 'Follow him to the Restroom':
 				*clr & cla
@@ -776,7 +779,7 @@ if $ARGS[0] = 'Walk Of Shame':
 							*clr & cla
 							gs'stat'						
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/3.jpg"></center>'
-							'You continue sucking while enjoying the warmth of Roman''s balls and how they occasionally bounce in your mouth. Roman looks down at you and says, "That a girl, keep doing that." You continue gently sucking on his balls, feeling excited, knowing that you are pleasing him. After a few more moments, Roman grabs onto your shoulders then lifts you up before kissing you passionately. You can feel your heart warming up. <font color=#FF00FF>He is kissing me so passionately. Maybe he cares for me. Please care for me. I need someone to care for me. Please care for me.</font>'
+							'You continue sucking while enjoying the warmth of Roman''s balls and how they occasionally bounce in your mouth. Roman looks down at you and says, "That a girl, keep doing that." You continue gently sucking on his balls, feeling excited, knowing that you are pleasing him. After a few more moments, Roman grabs onto your shoulders then lifts you up before kissing you passionately. You can feel your heart warming up. '+$OpenInnerThought+'He is kissing me so passionately. Maybe he cares for me. Please care for me. I need someone to care for me. Please care for me.'+$CloseInnerThought+''
 							gs 'arousal', 'kiss', 5, 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -791,7 +794,7 @@ if $ARGS[0] = 'Walk Of Shame':
 									*clr & cla
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/5.jpg"></center>'
-									'You suddenly feel Roman''s hard cock ram it''s way into your anus, causing a sudden jolt of pain. You scream out loud before Roman covers your mouth with his hand for a few seconds before the pain reduces to a manageable level. As Roman begin rapidly fucking your ass, you ask him "Can you...Ehh...take it slow...Ehhh...Please." Roman continues fucking you at the same pace, It seems that he is either ignoring you, or didn''t hear you speak. <font color=#FF00FF>Owww It hurts, he is fucking me so hard. Please slow down. It hurts, please stop. OOOwwwwww!</font> You close your eyes and just wait for it to be over. Roman suddenly wraps his arms around yours then drops back causing you to be on top of him with his dick still in your ass. Roman then says, "Ride me."'
+									'You suddenly feel Roman''s hard cock ram it''s way into your anus, causing a sudden jolt of pain. You scream out loud before Roman covers your mouth with his hand for a few seconds before the pain reduces to a manageable level. As Roman begin rapidly fucking your ass, you ask him "Can you...Ehh...take it slow...Ehhh...Please." Roman continues fucking you at the same pace, It seems that he is either ignoring you, or didn''t hear you speak. '+$OpenInnerThought+'Owww It hurts, he is fucking me so hard. Please slow down. It hurts, please stop. OOOwwwwww!'+$CloseInnerThought+' You close your eyes and just wait for it to be over. Roman suddenly wraps his arms around yours then drops back causing you to be on top of him with his dick still in your ass. Roman then says, "Ride me."'
 									gs 'arousal', 'anal', 5, 'sub'
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -800,7 +803,7 @@ if $ARGS[0] = 'Walk Of Shame':
 										*clr & cla
 										gs'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/6.jpg"></center>'
-										'Even though the pain is quite severe, you do as he says, not wanting to disappoint him. Feeling his dry dick roughly scraping against your inner ass. You close your eyes and try to think of anything other than the pain. <font color=#FF00FF>Please cum soon. Please. I can''t take much more of this. Please just cum. PLEEEEAASE!</font> to your relief you hear Roman groan then feel his warm seed filling your ass. You focus on the warm as he continues pumping you with his cum. After Roman is spent, he pushes you off of him then says, "You were great <<$pcs_firstname>>. We should do this again sometime." You reply, "Does that mean that we can out together maybe?" Roman laughs as he replies, "Hell no! I fuck whores, not date them, but you have my permission to keep dreaming about me though." Roman chuckles and gives you a wink as he gets dressed then leaves you alone in the restroom. <font color=#FF00FF>So...He didn''t care for me. Does no one care for me? I need someone. Why wont anyone care for me anymore?</font> you suddenly hear, "Ah there you are. I''ve been looking all over for you."'
+										'Even though the pain is quite severe, you do as he says, not wanting to disappoint him. Feeling his dry dick roughly scraping against your inner ass. You close your eyes and try to think of anything other than the pain. '+$OpenInnerThought+'Please cum soon. Please. I can''t take much more of this. Please just cum. PLEEEEAASE!'+$CloseInnerThought+' to your relief you hear Roman groan then feel his warm seed filling your ass. You focus on the warm as he continues pumping you with his cum. After Roman is spent, he pushes you off of him then says, "You were great <<$pcs_firstname>>. We should do this again sometime." You reply, "Does that mean that we can out together maybe?" Roman laughs as he replies, "Hell no! I fuck whores, not date them, but you have my permission to keep dreaming about me though." Roman chuckles and gives you a wink as he gets dressed then leaves you alone in the restroom. '+$OpenInnerThought+'So...He didn''t care for me. Does no one care for me? I need someone. Why wont anyone care for me anymore?'+$CloseInnerThought+' you suddenly hear, "Ah there you are. I''ve been looking all over for you."'
 										gs 'cum_call', 'anus', 'A189', 1
 										gs 'arousal', 'anal', 5, 'sub'
 										gs 'arousal', 'end'
@@ -820,7 +823,7 @@ if $ARGS[0] = 'Walk Of Shame':
 												gs'stat'
 												'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-												'You return the hug as you think to yourself, <font color=#FF00FF>I know Katja told me that he is no good for me, but I need him. Niko takes care of me and I just want to make him happy. I know that he wouldn''t lie to me. I''m sure that he will even find a way to clear my reputation. I just need to do what he says. Ohh Nikolai, I love you so much.</font>' 
+												'You return the hug as you think to yourself, '+$OpenInnerThought+'I know Katja told me that he is no good for me, but I need him. Niko takes care of me and I just want to make him happy. I know that he wouldn''t lie to me. I''m sure that he will even find a way to clear my reputation. I just need to do what he says. Ohh Nikolai, I love you so much.'+$CloseInnerThought+'' 
 	
 												act 'Continue':
 													*clr & cla
@@ -835,13 +838,14 @@ if $ARGS[0] = 'Walk Of Shame':
 														minut += 5
 														gs'stat'
 														'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj23.mp4"></video></center>'
-														'You reply, "Of course I will Niko. You need only ask." You eagerly unbutton his pants then pull out his dick before quickly wrapping your lips around it, hearing Niko moan as you do it. <font color=#FF00FF>It feels so good to be sucking Niko''s dick again. My man. Oh How I missed you. I don''t even care if I''m a whore, but I want to be your whore Niko. I only want to please you. Only you.</font>' 
+														'You reply, "Of course I will Niko. You need only ask." You eagerly unbutton his pants then pull out his dick before quickly wrapping your lips around it, hearing Niko moan as you do it. '+$OpenInnerThought+'It feels so good to be sucking Niko''s dick again. My man. Oh How I missed you. I don''t even care if I''m a whore, but I want to be your whore Niko. I only want to please you. Only you.'+$CloseInnerThought+'' 
 
 														act 'Continue':
 															*clr & cla
 															gs'stat'
 															'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
 															'You continue sucking Niko''s dick firmly while staring into his eyes, enjoying the pleased look that he is giving you which shows you that you are doing a good job. Suddenly Niko''s eyes squint as he groans, filling your mouth with his warm seed which you swallow eagerly, enjoying the warmth of it sliding down your throat and even the sting as it goes down. Niko places his hand on your cheek, gently stroking it with his thumb as he says, "You are so perfect <<$pcs_firstname>>. I am so lucky to have you and don''t worry, I will find a way to fix what happened yesterday. Meet me after school and we will go out on a nice walk. We''ll discuss what to do next then." Niko kisses you on your forehead before zipping his pants then leaving the restroom.'
+															swallow += 1
 															gs 'cum_call', 'mouth', 'A189', 1
 															gs 'arousal', 'bj', 5, 'sub'
 															gs 'arousal', 'end'
@@ -867,7 +871,7 @@ if $ARGS[0] = 'Walk Of Shame':
 													gs'stat'
 													'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-													'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation. You can trust me and try to cheer up." You nod your head while giving Niko a warm smile. <font color=#FF00FF>I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.</font>' 
+													'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation. You can trust me and try to cheer up." You nod your head while giving Niko a warm smile. '+$OpenInnerThought+'I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.'+$CloseInnerThought+'' 
 													
 													act 'Kiss Niko':
 														*clr & cla
@@ -910,7 +914,7 @@ if $ARGS[0] = 'Walk Of Shame':
 		*clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos3.jpg"></center>'
-		'You keep your head lowered as you quicken your pace. One of the boys smacks your ass hard, causing you to jump up, but you try to ignore it while you feel tears streaming down your face. <font color=#FF00FF>Is this what my life will be like for now on? Will things ever go back to the way they were before? Why is this happening? What did I do wrong? Can''t they just leave me alone?</font>' 
+		'You keep your head lowered as you quicken your pace. One of the boys smacks your ass hard, causing you to jump up, but you try to ignore it while you feel tears streaming down your face. '+$OpenInnerThought+'Is this what my life will be like for now on? Will things ever go back to the way they were before? Why is this happening? What did I do wrong? Can''t they just leave me alone?'+$CloseInnerThought+'' 
 		
 		act 'Continue walking':
 			*clr & cla
@@ -940,7 +944,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 		gs'stat'
 		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-		'You let out your tears, submitting to your own sorrow while answering your own question in your head. <font color=#FF00FF>No matter what happens, Nikolai will be here for me, He is the only one who cares for me. I need you Niko. Please don''t leave me...Please!</font>' 
+		'You let out your tears, submitting to your own sorrow while answering your own question in your head. '+$OpenInnerThought+'No matter what happens, Nikolai will be here for me, He is the only one who cares for me. I need you Niko. Please don''t leave me...Please!'+$CloseInnerThought+'' 
 
 		act 'Embrace Niko':
 			*clr & cla
@@ -967,7 +971,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-			'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation, trust me and try to cheer up." You nod your head while giving Niko a warm smile. <font color=#FF00FF>I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.</font>'
+			'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation, trust me and try to cheer up." You nod your head while giving Niko a warm smile. '+$OpenInnerThought+'I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.'+$CloseInnerThought+''
 
 			act 'Push him away':
 				*clr & cla

+ 1 - 1
locations/Nudelake.qsrc

@@ -98,7 +98,7 @@ if $clothingworntype = 'nude':
 		gs 'underwear', 'wear'
 	end
 else
-	act 'Return to the main beach':gt 'lake', 'start'
+	act 'Return to the main beach':gt 'city_lake', 'start'
 end
 
 if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:

+ 25 - 25
locations/ParChurch.qsrc

@@ -30,8 +30,8 @@ if $ARGS[0] = 'start':
 	'Vigil is held Saturdays at 19h.'
 	'The Divine Liturgy is on Sundays between 9h and 12h.'
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'ParChurch', 'vigil'
@@ -41,8 +41,8 @@ if $ARGS[0] = 'start':
 		if Churchbad = 3 and Churchbadtime > daystart:
 			cla & nl
 			'The priest is probably still mad at you. You decide to avoid him for now.'
-			act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-			act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+			act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+			act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 		elseif Churchbad = 3 and Churchbadtime <= daystart:
 			Churchbad = 2
 			*nl
@@ -140,29 +140,29 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod and say, "I''d love to stay but I... need to get back to clinic. I am doing volunteer work there." Your mother approvingly nods her head before saying. "You''re volunteering at the clinic? I''m very proud of you. Go on, I''ll see you back at home." You wave to your mother as you walk away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 1:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod then say, "I need to get back to the clinic." I just came to pick someone up." Your <<$npc_nickname[''A29'']>> nods then says with a sad tone. "Okay, I was just hoping that you could stay for a bit, but I won''t stop you from doing gods work." You return the nod before walking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 2:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You give your <<$npc_nickname[''A29'']>> a nod then say, "I would stay bu..." you mother finishes your sentence, "You need to get back to the clinic, I understand." She then waves at you while looking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 3:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod before your mother asks you, "Can you not stay for at least a little bit? God blesses his devout children." you lower your posture before replying, "I know he does but, I really need to go. I will see you at home." your <<$npc_nickname[''A29'']>> sighs as she turns away and says, "I''ll see you at home."'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 4:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -170,8 +170,8 @@ if $ARGS[0] = 'Excuses':
 		'You mother firmly guides you out the door to the side of the church then angrily says, "<<$pcs_nickname>> I went to the clinic the other day to ask if you could have time off and the receptionist told me that you haven''t been working there at all. YOU HAVE BEEN LYING TO ME IN THE LORDS HOUSE OF ALL PLACES!!! If you don''t want to stay with me or pay respect to our creator then at least be honest about it. Telling lies is what sinners do when they are too afraid to face their problems."'
 		*nl
 		'You lower your head as your mother continues, "I''m going to go back in there and do my part as a child of Christ. You can go back to whatever you were planning on doing. I won''t force you to stay." She then shakes her head at you before walking back into the church. You take a few seconds to collect yourself as you feel tears rolling down your face. You never realized that you were crying. You then walk away feeling like you really screwed up.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 5:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -185,8 +185,8 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost11.jpg"></center>'
 		'You turn to walk out of the church and see your mother sigh, as she turns back toward the front.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	end
 end
 
@@ -209,11 +209,11 @@ if $ARGS[0] = 'vigil':
 	PLAY 'sound/church/Blessing.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,5) +'.jpg"></center>'
 	'You attend the vigil and reflect on the recent events in your life. The harmonies as the hymns and psalms are sung sweep aside some of the worries in your heart, although you know they will return once you leave this holy place, you still enjoy the rest. The sweet scent of incense tickles your nose and reminds you of the scent of' + iif(rex_love = 1, 'Rex', 'your step-father') + '''s cologne.'
-	if pav_slut >= 125:
+	if pav_slut >= 250:
 		'Most of the parishioners seem upset that you are here. You notice that parents are making sure their children don''t go near you. Even a couple of the acolytes glare at you angrily.'
-	elseif pav_slut >= 100:
+	elseif pav_slut >= 200:
 		'A number of poeple give you dirty looks and intentionally turn away from you whenever you make eye contact.'
-	elseif pav_slut >= 75:
+	elseif pav_slut >= 150:
 		'You notice some of the old women looking at you with disapproval and one or two of the old men looking at you with interest.'
 	end
 	gs 'stat'
@@ -249,12 +249,12 @@ if $ARGS[0] = 'liturgy':
 	gs 'themes', 'indoors'
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
-	if pav_slut < 75 and Conf_Kirill <= 1:
+	if pav_slut < 150 and Conf_Kirill <= 1:
 		pcs_mood += 20
 		church_moral += 2
 		pcs_sleep += 5
 		'You join the congregation for the Divine Liturgy. You see mostly older people, but there are some youngsters. You participate in the singing but that is about all. Your presence seems to go largely unnoticed, but you have the chance to rest a bit. You feel a lot better.'
-	elseif pav_slut < 75 and Conf_Kirill >= 2:
+	elseif pav_slut < 150 and Conf_Kirill >= 2:
 		Kirill += 1
 		pcs_mood += 20
 		church_moral += 2
@@ -368,8 +368,8 @@ if $ARGS[0] = 'Leave Early':
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	'You approach your <<$npc_nickname[''A29'']>> and say, "I had a great time but I should be heading home now." Your <<$npc_nickname[''A29'']>> replies, "Alright thank you for stopping by and you learned something about yourself today." She then lightly rubs your arm before going back to praying.'
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] =  'Leave':
@@ -404,8 +404,8 @@ if $ARGS[0] =  'Leave':
 		'As the church ceremonies ends, you and your <<$npc_nickname[''A29'']>> get up and collect your things before walking out of the church. Your <<$npc_nickname[''A29'']>> says, "I had a great time today. I always enjoy spending time with my loving daughter. Hopefully I''l see you here again next week." She then kisses your cheek then hands you 300 <b>₽</b> before walking away.'
 	end
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'candle':

File diff suppressed because it is too large
+ 1025 - 291
locations/ParkKafe.qsrc


+ 5 - 5
locations/Peterroom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start_door':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'down'
+		gt 'city_center'
 	end
 
 	act 'Ring the doorbell':
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start_door':
 			act 'Leave':
 				cla
 				minut += 5
-				gt 'down'
+				gt 'city_center'
 			end
 		end
 	end
@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		act 'Leave':gt 'down'
+		act 'Leave':gt 'city_center'
 	end
 end
 
@@ -201,11 +201,11 @@ if $ARGS[0] = 'end':
 			
 		act 'To the center':
 			gs 'arousal', 'end'
-			gt 'down'
+			gt 'city_center'
 		end
 		act 'The house':
 			gs 'arousal', 'end'
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 end

+ 1 - 1
locations/Prostitute.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'start':
 	act 'Go back to the park':
 		cla
 		minut += 5
-		gt 'park', 'start'
+		gt 'city_park', 'start'
 	end
 end
 

+ 11 - 11
locations/Snpc.qsrc

@@ -38,7 +38,7 @@ gs 'cumreaction'
 if grupTipe[numnpc] = 5 and grupTipe ! 5:
 	gs 'willpower', 'humiliation', 'force', 'easy'
 	if will_cost <= pcs_willpwr:
-		if pav_slut < 50:
+		if pav_slut < 100:
 			act 'Mock (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'force'
 				cls
@@ -95,7 +95,7 @@ end
 !!!!!!!!!!!!!
 if npc_grupTipe['A<<numnpc>>'] = 4:
 	if $loc = 'gdkin':
-		if pav_slut < 150:
+		if pav_slut < 300:
 			if numnpc ! 9:
 				if npc_gender['A<<numnpc>>'] = 0:
 					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
@@ -116,7 +116,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					act 'Move away':gt $loc, $metka
 				end
 			end
-		elseif pav_slut >= 150:
+		elseif pav_slut >= 300:
 			if npc_gender['A<<numnpc>>'] = 0:
 				'<<$npc_firstname[''A<<numnpc>>'']>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
 			else
@@ -205,7 +205,7 @@ if numnpc = 23:
 	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0:
 		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 
-		if pav_slut >= 125:'By the way, some people are telling some pretty disgusting rumours about you.'
+		if pav_slut >= 250:'By the way, some people are telling some pretty disgusting rumours about you.'
 	end
 
 	if artemIzdev = 1:
@@ -307,14 +307,14 @@ if numnpc = 2:
 
 			npc_rel['A<<numnpc>>'] += 5
 
-			if pav_slut < 125: artemLernQW = 1
+			if pav_slut < 250: artemLernQW = 1
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
-			if pav_slut >= 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
+			if pav_slut < 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
+			if pav_slut >= 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
 
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -352,8 +352,8 @@ if numnpc = 12:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -533,8 +533,8 @@ if numnpc = 16:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else

+ 2 - 2
locations/Terminal.qsrc

@@ -15,7 +15,7 @@ if trfatherQW = 4 and week >= 6 and hour >= 12 and hour < 14:'Near one of the di
 act 'Leave':
 	cla
 	minut += 5
-	gt 'nord'
+	gt 'city_industrial'
 end
 
 $askfather = {
@@ -79,7 +79,7 @@ $askfather = {
 						'You tell him about your mother, she remarried, and you now have a stepfather and half brother Kolka..'
 						'After talking for awhile your father says. "<<$pcs_nickname>> I have to go, schedule to keep, I am here on weekends 12 00 to 14 00, I would be happy if you would visit me sometimes." With that he got up, paid for lunch and kissed you on the cheek goodbye.'
 						trfatherQW = 4
-						act 'Leave':minut += 5 & gt 'nord'
+						act 'Leave':minut += 5 & gt 'city_industrial'
 					end
 				end
 			end

+ 6 - 6
locations/TerminalOffice.qsrc

@@ -9,7 +9,7 @@ gs 'stat'
 ! In the office if he knows we can buy a product or to perform a task boss of bystrousky.
 ! About the possibility of the sale of goods GG learns at the train station in Pavlovo in the dynamics $d_vokzal_vera_talk location vokdinvera
 ! verakassir > 0 - you can buy the product
-! TerminalPapper = 1 and DayTerminalPapper = daystart - you can fulfill the order
+! BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart - you can fulfill the order
 !
 ! In the office, several offices, one for the purchase of the goods, the second for documents from bystrousky, and the third for a bright future
 !
@@ -238,7 +238,7 @@ if $ARGS[0] = '11':
 	end
 	
 	!He Has papers, but a Manager should say to go to the accounting Department.
-	if AboutDocsManager=0 and TerminalPapper = 1 and DayTerminalPapper = daystart:
+	if AboutDocsManager=0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 		'"I''m Anatoly Chubais from the company "OOO Bystroushka limited", do you have the required documents with you?"'
 		act 'Give him the documents':
 			'"Looks good. Go and see Elizabeth in the account department, she needs to register you. You can find her next door."'
@@ -248,7 +248,7 @@ if $ARGS[0] = '11':
 	end
 
 	!The GG yet topics of conversation.
-	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and TerminalPapper = 0: 
+	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and BurgerQW['TerminalTask'] = 0: 
 		'You have nothing to say or left to do, you can leave the office.'
 	end
 end
@@ -270,13 +270,13 @@ if $ARGS[0] = '21':
 		!GG not a complete idiot, so will limit communication with only Buch documents, then that thread again
 		'A cute girl looks up from the monitor, turning to you and asks, "What can I help you with?"'
 		
-		if TerminalPapper = 1 and DayTerminalPapper = daystart:
+		if BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 			'"I was talking with Anatoly Chubais from the company ''OOO Bystroushka limited'', I was instructed to deliver these documents."'
 			'"Yes, I''ve been expecting these, may I?" she holds out her hand.'
 			act 'Give her the documents':
 				cla
 				minut += 1
-				TerminalPapper = 2
+				BurgerQW['TerminalTask'] = 2
 				gs 'stat'
 				'You hand the girl the folder, she opens it and quickly checks the content.'
 				'"Tell Anatoly Borisovich that Elizabeth said thank you."'
@@ -328,7 +328,7 @@ if $ARGS[0] = '31':
 			end
 		end
 	
-		if AboutDocs = 0 and TerminalPapper = 1 and DayTerminalPapper = daystart:
+		if AboutDocs = 0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 			act 'Give him the documents':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
 				

+ 1 - 1
locations/Vika.qsrc

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

+ 5 - 5
locations/Voltrener.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'talk':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
-				if pav_slut <= 25:
+				if pav_slut <= 50:
 					if trenerSex = 1:
 						volleysostav = 1
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'talk':
 							act 'Leave':gt 'gdksport', 'start'
 						end
 					end
-				elseif pav_slut > 75:
+				elseif pav_slut > 150:
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
 					act 'It''s all lies':
 						*clr & cla
@@ -336,7 +336,7 @@ if $ARGS[0] = 'trener_speak':
 	elseif npc_rel['A69'] >= 0 and trener_Speak = 0:
 		trener_Speak += 1
 		'You decided to talk to the coach about how he is rumored to have played on the European championship winning team. But the coach responded painfully to your inquiries and begged you, "<<$pcs_lastname>>, I don''t want to talk about that just to satisfy your curiosity".'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 2
 			trenerlust += 2
 			'"You don''t want to satisfy my curiosity? How about just satisfying me?" you whispered suggestively. Coach looked uncertainly at you as if he were about to say something but turned away instead.'
@@ -344,14 +344,14 @@ if $ARGS[0] = 'trener_speak':
 	elseif npc_rel['A69'] > 10 and trener_Speak = 1:
 		trener_Speak = 2
 		'Seeing that the subject upset Mikhail, you made attempts to cheer him up. Chirping all sorts of nonsense, you eventually asked if he has a girlfriend or wife. Coach said, "<<$pcs_lastname>> do you have nothing better to do than ask about stuff that doesn''t concern you?" You continued to pester him and say that you are very interested. Coach finally gave up and said, "Yes, I have a wife. She is, of course, beautiful and jealous. So if she sees you hanging around me, she''ll try to kill you."'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 2
 			'"I''m not afraid, and I doubt she is prettier than me." you retort and the coach just smiled at your words.'
 		end
 	elseif npc_rel['A69'] > 20  and trener_Speak = 2:
 		trener_Speak = 3
 		'Studiously avoiding all mention of the European championship, you asked the coach to talk about volleyball. He told you that being a competitive player means being focused. Responsible players do not go to dances and guzzle booze right before competitions. You were hoping to hear something more interesting, and instead got a lecture about the grass was greener and the trees above, yada yada.'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 3
 			'Quickly bored, you decided to interrupt his monologue with a bit of provocative action.'
 		end

+ 4 - 4
locations/VoltrenerSexShower.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = '1':
 		act 'Finish shower': gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self', 'easy'
- 	if (pcs_horny >= 60 or pav_slut > 25) and will_cost <= pcs_willpwr:
+ 	if (pcs_horny >= 60 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Carry on (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
 			npc_rel['A69'] += 2
@@ -55,7 +55,7 @@ if $ARGS[0] = '1':
 				act 'Finish shower': gt 'gdksport', 'start'
 			end
 		end
-	elseif (pcs_horny >= 60 or pav_slut > 25) and will_cost > pcs_willpwr:
+	elseif (pcs_horny >= 60 or pav_slut > 50) and will_cost > pcs_willpwr:
 		act 'Carry on (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
@@ -71,7 +71,7 @@ if $ARGS[0] = '2':
 		act 'Leave':gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self'
-	if (pcs_horny >= 70 or pav_slut > 25) and will_cost <= pcs_willpwr:
+	if (pcs_horny >= 70 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Masturbate (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
 			if IvanShowerYes = 2: VoltrenerVoyeur += 1
@@ -95,7 +95,7 @@ if $ARGS[0] = '2':
 				act 'Finish shower': gt 'gdksport', 'start'
 			end
 		end
-	elseif (pcs_horny >= 70 or pav_slut > 25) and will_cost > pcs_willpwr:
+	elseif (pcs_horny >= 70 or pav_slut > 50) and will_cost > pcs_willpwr:
 		act 'Masturbate (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end

+ 3 - 3
locations/Voltrenersex.qsrc

@@ -58,9 +58,9 @@ if $ARGS[0] = 'talk':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex2.jpg"></center>'
 		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you and doesn''t say a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
-		if guy < 3 and pav_slut <= 25: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
-		if (guy >= 3 and guy < 7) or pav_slut > 25: 'You stand and wait until the coach is done playing with your breasts.'
-		if guy >= 7  or pav_slut > 50:
+		if guy < 3 and pav_slut <= 50: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
+		if (guy >= 3 and guy < 7) or pav_slut > 50: 'You stand and wait until the coach is done playing with your breasts.'
+		if guy >= 7  or pav_slut > 100:
 			killvar 'volleytanga'
 			'Knowing what the coach wants from you, you pull up your shirt exposing your bare breasts and drawing his strong hands to them. Coach inspired by your actions with obvious pleasure kneads your breasts with his hands. "I go to shower, and here is how boring", - You say you are looking at the challenge of the coach.'
 			!! volleytanga cleared to end the coach without panties gdksport events

+ 1 - 1
locations/WorkHosp.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
 		'Your shift has ended.'
 
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 

+ 4 - 0
locations/_attrib_shoe_trainers.qsrc

@@ -116,6 +116,10 @@ elseif ARGS[1] = 29:
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+elseif ARGS[1] = 30:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
 end
 
 --- $attrib_shoe_trainers ---------------------------------

+ 15 - 0
locations/_attributes_average.qsrc

@@ -3407,6 +3407,21 @@ elseif ARGS[1] = 538:
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
+elseif ARGS[1] = 539:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 540:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 541:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 1
 end
 
 --- $attributes_average ---------------------------------

+ 10 - 0
locations/_attributes_cheap.qsrc

@@ -2577,6 +2577,16 @@ elseif ARGS[1] = 417:
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
+elseif ARGS[1] = 418:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 419:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 5
 end
 
 --- $attributes_cheap ---------------------------------

+ 22 - 0
locations/_attributes_coat.qsrc

@@ -2,42 +2,64 @@
 
 if ARGS[1] = 1:
 	CloQuality = 5
+	CloWarm = 1
 elseif ARGS[1] = 2:
 	CloQuality = 2
+	CloWarm = 1
 elseif ARGS[1] = 3:
 	CloQuality = 5
+	CloWarm = 1
 elseif ARGS[1] = 4:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 5:
 	CloQuality = 1
+	CloWarm = 2
 elseif ARGS[1] = 6:
 	CloQuality = 4
+	CloWarm = 3
 elseif ARGS[1] = 7:
 	CloQuality = 3
+	CloWarm = 3
 elseif ARGS[1] = 8:
 	CloQuality = 4
+	CloWarm = 2
 elseif ARGS[1] = 9:
 	CloQuality = 5 
+	CloWarm = 3
 elseif ARGS[1] = 10:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 11:
 	CloQuality = 6
+	CloWarm = 3
 elseif ARGS[1] = 12:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 13:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 14:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 15:
 	CloQuality = 6
+	CloWarm = 3
 elseif ARGS[1] = 16:
 	CloQuality = 4
+	CloWarm = 2
 elseif ARGS[1] = 17:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 18:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 19:
 	CloQuality = 4
+	CloWarm = 2
+elseif ARGS[1] = 20:
+	CloQuality = 3
+	CloWarm = 2
 end
 
 --- $attributes_coat ---------------------------------

+ 40 - 0
locations/_attributes_exercise.qsrc

@@ -697,6 +697,46 @@ elseif ARGS[1] = 137:
 	CloThinness = 2
 	CloBra = 1
 	CloSkirtShortness = 4
+elseif ARGS[1] = 138:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 139:
+	CloQuality = 3	
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 140:
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 141:
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 142:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 143:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 144:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 145:
+	CloQuality = 3
+	CloThinness = 1	
+	CloTopCut = 1
+	CloPantsShortness = 1
 end
 
 --- $attributes_exercise ---------------------------------

+ 58 - 0
locations/_attributes_expensive.qsrc

@@ -2483,6 +2483,64 @@ elseif ARGS[1] = 432:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+elseif ARGS[1] = 433:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 4
+elseif ARGS[1] = 434:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloPantsShortness = 4
+	CloOnePiece = 1
+elseif ARGS[1] = 435:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 436:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 437:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 438:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 4
+elseif ARGS[1] = 439:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 440:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 441:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 442:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 1
+	CloDress = 1
 end
 
 --- $attributes_expensive ---------------------------------

+ 291 - 0
locations/_attributes_swimwear.qsrc

@@ -1072,6 +1072,297 @@ elseif ARGS[1] = 158:
 	CloPanties = 1
 	CloInhibit = 20
 	CloTopCut = 3
+elseif ARGS[1] = 159:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 160:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 161:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 162:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 163:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 164:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 165:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 166:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 167:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 168:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 169:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 170:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 171:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 172:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 173:
+	CloOnePiece = 1
+	CloInhibit = 25
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 174:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 175:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 176:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloTopCut = 3
+elseif ARGS[1] = 177:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 178:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 179:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 180:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 181:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 182:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 183:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 184:
+	CloOnePiece = 1
+	CloInhibit = 10	
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 185:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 186:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 4
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 187:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3	
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 188:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 189:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 190:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 191:
+	CloOnePiece = 1	
+	CloInhibit = 5
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 192:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 193:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 194:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 195:
+	CloOnePiece = 1
+	CloInhibit = 25
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 4
+	CloPanties = 1
+elseif ARGS[1] = 196:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 197:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 198:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 1	
+	CloTopCut = 1
+elseif ARGS[1] = 199:
+	CloBra = 1
+	CloPanties = 1
+	CloInhibit = 35
+	CloQuality = 2
+	CloThinness = 5
 end
 
 --- $attributes_swimwear ---------------------------------

+ 46 - 4
locations/_clothing_name.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 68:$RESULT = 'A pink patterned bikini with white strings.'
 	if ARGS[1] = 69:$RESULT = 'A modest black-blue one-piece swimsuit, cut so the fabric shows off nearly all of the thighs in a seductive manner.'
 	if ARGS[1] = 70:$RESULT = 'A very daring light-blue bikini, which fabric is too thin or revealing to cover any private parts.'
-	if ARGS[1] = 71:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placer or the private parts to allow easy access.'
+	if ARGS[1] = 71:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placed over the private parts to allow easy access.'
 	if ARGS[1] = 72:$RESULT = 'Made for all the unashamed whores out there, this bikini is nothing more than a few purple straps and doesn''t even try to cover the private parts.'
 	if ARGS[1] = 73:$RESULT = 'This slutty pink and black monokini just about covers your private parts.'
 	if ARGS[1] = 74:$RESULT = 'Made from a shiny blue material, this monokini barely covers your private parts. Somehow it''s always a tad too small, forcing the fabric, which should cover your vagina, between your labia.'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 108:$RESULT = 'An orange bikini, with yellow straps and a tie strapped thong.'
 	if ARGS[1] = 109:$RESULT = 'A classic light-blue bikini.'
 	if ARGS[1] = 110:$RESULT = 'Made from a shiny pink fabric, this daring bikini is perfect for any aspiring bimbo.'
-	if ARGS[1] = 111:$RESULT = 'A strapless dark blue swimsuit, with white decor around the fabric covering the breast.'
+	if ARGS[1] = 111:$RESULT = 'A strapless dark blue swimsuit, with white décor around the fabric covering the breast.'
 	if ARGS[1] = 112:$RESULT = 'This classic gold-black bikini is made from a shiny fabric, which briefs are held together by two metal rings.'
 	if ARGS[1] = 113:$RESULT = 'A classic black-white patterned bikini, with light green straps. Its thong is held together by tie strings.'
 	if ARGS[1] = 114:$RESULT = 'A silver bikini made from a shiny material, has its thong held together by tie straps.'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 120:$RESULT = 'A classic colourful bikini, with tie strapped briefs.'
 	if ARGS[1] = 121:$RESULT = 'A classic colourful bikini.'
 	if ARGS[1] = 122:$RESULT = 'This blue swimsuit got a copper-brown zipper in the front, making it possible to show off quite a cleavage. Additionally the swimsuit shows off the wearers hips, as the sides are open.'
-	if ARGS[1] = 123:$RESULT = 'Black plastic rings hold together is classic all-black bikini.'
+	if ARGS[1] = 123:$RESULT = 'Black plastic rings hold together this classic all-black bikini.'
 	if ARGS[1] = 124:$RESULT = 'This bright pink bikini is perfect for any aspiring bimbo.'
 	if ARGS[1] = 125:$RESULT = 'A classic orange bikini.'
 	if ARGS[1] = 126:$RESULT = 'This dark-blue swimsuits bottom part is cut so, that is shows off the wearers thighs seductively. The fabric covering the breasts is decorated with a white pattern.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 142:$RESULT = 'A dark green bikini with multiple string sides to the bottoms.'
 	if ARGS[1] = 143:$RESULT = 'A pink string outline of a bikini that shows everything and is pretty much pointless.'
 	if ARGS[1] = 144:$RESULT = 'A blue and white hooped one piece, very nautical.'
-	if ARGS[1] = 145:$RESULT = 'A A cyan, melon and fuschia tie string bikini.'
+	if ARGS[1] = 145:$RESULT = 'A cyan, melon and fuschia tie string bikini.'
 	if ARGS[1] = 146:$RESULT = 'A blue and white short tankini with red detail on the bottoms.'
 	if ARGS[1] = 147:$RESULT = 'A very minimal black bikini that just about covers your dignity.'
 	if ARGS[1] = 148:$RESULT = 'A shiny gold swimsuit with zipper on the front so you can show off your cleavage.'
@@ -162,6 +162,47 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 156:$RESULT = 'A well made choral and black tankini.'
 	if ARGS[1] = 157:$RESULT = 'A basic white bikini.'
 	if ARGS[1] = 158:$RESULT = 'A pale turquoise bikini with an almost tube top and tie string bottoms.'
+	if ARGS[1] = 159:$RESULT = 'A Maillot style, one-piece swimsuit, its simplistic design is balanced out by fashionable print patterns.'
+	if ARGS[1] = 160:$RESULT = 'A blue one-piece swimsuit, it mixes one-shoulder design with transparent meshes on various parts of the body.'
+	if ARGS[1] = 161:$RESULT = 'One-piece, sporty swimsuit with two yellow stripes that emphasize your figure a little.'
+	if ARGS[1] = 162:$RESULT = 'A classic, one-piece black swimsuit, it might not be flirty enough for some.'
+	if ARGS[1] = 163:$RESULT = 'A deep V one-piece black swimsuit with floral print, it shows and entices.'
+	if ARGS[1] = 164:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the opposite side of the shoulder strap, it''s a rather showy swimsuit.'
+	if ARGS[1] = 165:$RESULT = 'A pink one-piece swimsuit, it shows modest amount of your cleavage.'
+	if ARGS[1] = 166:$RESULT = 'A black one-piece high cut swimsuit with an inviting deep plunge, the design is quite flirty .'
+	if ARGS[1] = 167:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the strap side, it''s a rather showy swimsuit.'
+	if ARGS[1] = 168:$RESULT = 'A black one-piece swimsuit with jagged-cut and decorated with little gold tubes.'
+	if ARGS[1] = 169:$RESULT = 'An orange one-piece swimsuit, it has a plunge but still overs you very modestly.'
+	if ARGS[1] = 170:$RESULT = 'A blue one-piece swimsuit with a plunge, it shows decent amount of your cleavage.'
+	if ARGS[1] = 171:$RESULT = 'A blue one-piece lacy swimsuit, it''s more for showy display than practical usage.'
+	if ARGS[1] = 172:$RESULT = 'One-piece swimsuit in black, it''s very simple except the modest spacing that tastefully shows your skin.'
+	if ARGS[1] = 173:$RESULT = 'A black bikini with cross strap that resemble one-piece swimsuit, it''s more for show than being practical.'
+	if ARGS[1] = 174:$RESULT = 'An one-piece sporty swimsuit with boyleg-cut, unassuming and highly practical.'
+	if ARGS[1] = 175:$RESULT = 'A peanut coloured one-piece swimsuit, it has a very simplistic, practical design.'
+	if ARGS[1] = 176:$RESULT = 'An one-piece swimsuit in light blue, it has a very simplistic, practical design.'
+	if ARGS[1] = 177:$RESULT = 'A modest one-piece swimsuit with white floral prints.'
+	if ARGS[1] = 178:$RESULT = 'An one-piece swimsuit in iris color, it has a plunge that shows off your cleavage quite nicely.'
+	if ARGS[1] = 179:$RESULT = 'A fashionable one-piece swimsuit in Egyptian blue, it teases yet remain some what functional.'
+	if ARGS[1] = 180:$RESULT = 'Open-piece swimsuit that is actually just lacy & crochet lingerie that can be worn underwater, it shows off your body quite nicely.'
+	if ARGS[1] = 181:$RESULT = 'A high-neck monokini in midnight blue and it is connected tastefully by a strap. More for show, less for actual swimming.'
+	if ARGS[1] = 182:$RESULT = 'A pink cross-strap monokini, it is rather showy and highly impractical, might just be the perfect thing for you?'
+	if ARGS[1] = 183:$RESULT = 'A belted, one-piece, denim colored swimsuit, it looks pretty good despite its price tag.'
+	if ARGS[1] = 184:$RESULT = 'A navy one-piece swimsuit, it has a light and flirty plunge and looks pretty good despite its price tag.'
+	if ARGS[1] = 185:$RESULT = 'A white one-piece swimsuit, it has very simple design and practical. Solid white never goes out of style!'
+	if ARGS[1] = 186:$RESULT = 'A black monokini with deep v plunge, the hallow cuts help to emphasize your body, it''s a conspicuous swimsuit!'
+	if ARGS[1] = 187:$RESULT = 'One-piece swimsuit with boat-neck cut and paradise print, it is fashionable despite its rather conservative.'
+	if ARGS[1] = 188:$RESULT = 'One-piece black swimsuit that looks like 2 pieces, the middle is crochet together, highly showy and not practical at all.'
+	if ARGS[1] = 189:$RESULT = 'A coffee coloured one-piece swimsuit'
+	if ARGS[1] = 190:$RESULT = 'One-piece ruffled swimsuit with a scoop cut in cream, it has some innocent appeal to them...'
+	if ARGS[1] = 191:$RESULT = 'one-piece swimsuit with tasselled halter neckline and lace up front in taupe, it''s stylish and fashionable.'
+	if ARGS[1] = 192:$RESULT = 'A white one-piece swimsuit, it has colorful side-stripes that gives a retro feel to it.'
+	if ARGS[1] = 193:$RESULT = 'A strapless monokini with side-strings in fuscia, it''s very flirty and conspicuous.'
+	if ARGS[1] = 194:$RESULT = 'A crepe coloured, crocheted one-piece swimsuit, its deep plunge shows off your body like you mean business!.'
+	if ARGS[1] = 195:$RESULT = 'A black monokini, it has a very fun and flirty design, it emphasizes your curves a deal.'
+	if ARGS[1] = 196:$RESULT = 'One-piece swimsuit in black, it has scoop neckline and thin shoulder straps to create a curve hugging silhouette.'
+	if ARGS[1] = 197:$RESULT = 'Backless one-piece swimsuit with a deep v plunge, eggplant in color, it''s both practical and fashionable.'
+	if ARGS[1] = 198:$RESULT = 'A chlorine-resistant, training swimsuit, high-leg-height and still manage to look somewhat fashionable!'
+	if ARGS[1] = 199:$RESULT = 'A bikini in the color of the Russian flag, it has a deep v plunge, who says patriotism cannot be sexy?'
 
 elseif $ARGS[0] = 'coat':
 	if ARGS[1] = 1:$RESULT = 'A light jacket offering very little protection from the weather.'
@@ -183,6 +224,7 @@ elseif $ARGS[0] = 'coat':
 	if ARGS[1] = 17:$RESULT = 'A coat with Dalmatian lining (not real fur) offering moderate protection from the weather.'
 	if ARGS[1] = 18:$RESULT = 'A dark red steam-punk classic offering moderate protection from the weather.'
 	if ARGS[1] = 19:$RESULT = 'A bomber jacket offering moderate protection from the weather.'
+	if ARGS[1] = 20:$RESULT = 'A blue puffer jacket with high-neck, it offers moderate protection in the cold months.'
 end
 
 --- $clothing_name ---------------------------------

+ 4 - 4
locations/abduction.qsrc

@@ -564,9 +564,9 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	deodorant = deodorant_bak
 
 	act 'Turn and run the opposite direction':gt 'road'
-	act 'Run left':gt 'Nord'
-	act 'Run right':gt 'pavCommercial'
-	act 'Run forward':gt 'lake', 'start'
+	act 'Run left':gt 'city_industrial'
+	act 'Run right':gt 'pav_commercial'
+	act 'Run forward':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'abdFood':
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	stanok = stanok_bak
 	deodorant = deodorant_bak
 
-	act 'Continue':gt 'sauna', 'saunaroom'
+	act 'Continue':gt 'city_sauna', 'saunaroom'
 end
 
 if $ARGS[0] = 'abdFailedCustomer':

+ 1 - 1
locations/agentned.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 		'We are at your service if you decide to <a href="exec:gt ''agentned'',''sell''">sell</a>.'
 	end
 
-	act 'Leave': minut += 5 & gt'down'
+	act 'Leave': minut += 5 & gt 'city_center'
 	
 	act 'View rentals': gt 'agentned', 'rent'
 	act 'View properties for sale': gt 'agentned', 'buy'

+ 17 - 17
locations/albinahome.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	if hour >= 20 and week >= 5 and week < 7:
 		'Albina says that she wants to go to the disco.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 	elseif hour < 20 and npc_sex['A23'] = 0:
 		'Albina smiles at you affably and says, "<<$pcs_firstname>> I have a bottle of fine wine here, let''s drink."'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 										'"I should really get going, I''m sorry, I wish I could help." Albina nods her head in understanding. "I will see you later ok?" You tell her.'
 										'She smiles. "Of course, <<$pcs_nickname>>." Then you get up and leave her house.'
 
-										act 'Continue':gt 'pavResidential'
+										act 'Continue':gt 'pav_residential'
 									end
 								else
 									act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'start':
 												minut -= 30
 												gs 'stat'
 
-												act 'Say goodbye and go home':gt 'pavResidential'
+												act 'Say goodbye and go home':gt 'pav_residential'
 											end
 										end
 									end
@@ -205,7 +205,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about video games': gt 'albinahome', 'game'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'stripping':
 		'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 		'Albina recommends that you start with learning to dance.'
 	end
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Rest':gt 'albinahome', 'start'
 end
 
@@ -266,7 +266,7 @@ if $ARGS[0] = 'poledancing':
 		'Albina taught you various acrobatic moves on the pole.'
 		if pcs_dancpol >= 100: 'You could not learn anything new, you already know everything she could teach you.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
 		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'poledancing':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
 			act 'Rest':gt 'albinahome', 'start'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 		end
 	else
 		minut += 120
@@ -302,7 +302,7 @@ if $ARGS[0] = 'poledancing':
 			'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 			'Albina recommends that you start with learning to dance.'
 		end
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	end
 end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'dressing':
 		'You and Albina open her huge wardrobe and begin digging into her various dresses.'
 		'As you rummage around in her wardrobe, you are amazed by how many different clothes she can fit in there. It feels like her wardrobe is a bottomless pit filled with dresses, leggings, jeans, and all kinds of other clothes!'
 		'You end up spending an hour trying on various dresses with Albina.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Chat some': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 	end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'chat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You chat with Albina about school, love interest, family, makeup up, even the latest tv shows or movies you have watched.'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Keep chatting':
 		*clr & cla
 		menu_off = 1
@@ -362,7 +362,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head no. "Not right now, thanks. I was just noticed all of them is all, maybe some other time."'
 		'She shrugs. "Sure if you ever want to, all you have to do is ask."'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
 	end
@@ -394,14 +394,14 @@ if $ARGS[0] = 'game':
 					'You shake your head no. "Not this time, maybe next time.."'
 					'You can tell she is a little disappointed, but then turns her attention to the game instead. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 					'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-					act 'Say goodbye and go home':gt 'pavResidential'
+					act 'Say goodbye and go home':gt 'pav_residential'
 				end
 			else
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'You and Albina lay down in front of a huge flat screen TV, after picking one of the games. The two of you play as you chat about varies things and trash talk, though neither one of you is giving your full attention to the game, instead you are just having fun together.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Keep playing video games': gt 'albinahome', 'playgame'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'playgame':
 				'You shake your head no. "Uh that''s ok. I really am not interested in that."'
 				'Albina puts the strapon away, but you can tell she is a little disappointed. Then she comes back over and lays down beside you again. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 				'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-				act 'Say goodbye and go home':gt 'pavResidential'
+				act 'Say goodbye and go home':gt 'pav_residential'
 			end
 		else
 			act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -454,7 +454,7 @@ if $ARGS[0] = 'playgame':
 		act 'Keep playing video games': gt 'albinahome', 'playgame'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 	end
 end
 
@@ -648,7 +648,7 @@ if $ARGS[0] = 'strapon_finish':
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 

+ 1 - 1
locations/albinaporog.qsrc

@@ -11,7 +11,7 @@ else
 	if hour >= 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate. You say that you''re here to visit Albina. He shakes his head and says, "Albina is currently not at home."'
 	if hour < 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate, saying "Come no earlier than nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- albinaporog ---------------------------------

+ 1 - 1
locations/alex.qsrc

@@ -55,7 +55,7 @@ act 'Get on your knees and take it in your mouth':
 			gs 'stat'
 			'After finishing, Alexey slips out of bed goes to the bathroom.'
 			gs 'dinsex', 'after_anal','no_plug'
-			act 'Leave':gt 'nord'
+			act 'Leave':gt 'city_industrial'
 		end
 	end
 end

+ 1 - 1
locations/alexgang.qsrc

@@ -54,7 +54,7 @@ act 'Get on your knees and give head':
 		gs 'arousal', 'bj', 10, 'sub', 'group'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gt 'nord'
+		act 'Leave':gt 'city_industrial'
 	end
 end
 

+ 1 - 1
locations/anushapt.qsrc

@@ -1272,7 +1272,7 @@ if $ARGS[0] = 'livingroom':
 					'You smile to Eduard. "Hello Mr Konstantinov is Anushka around?"'
 					'A agitated Eduard calls you over. "Call me Ed, but come here <<$pcs_nickname>> I need to ask you about something?"'
 					'You freeze in your tracks as you cautiously reply, "Sure what''s up?"'
-					if pav_slut >= 100:
+					if pav_slut >= 200:
 						'Eduard grunts as he starts to speak, "I''ve heard you and Nush are starting to get quite the reputation around town. Do I need to be worried about the two of you?"'
 						'You squirm a little as he expects an answer...'
 						act 'Tell the truth':

+ 1 - 1
locations/artemEv.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'learn':
 	gs 'stat'
 	!act 'Take a break from studying':gt 'artemhome', 'artemroom'
 	!act 'Talk instead': gt 'artemhome', 'chat'
-	if pav_slut > 100:
+	if pav_slut > 200:
 !!this triggers instead of the two above if pav slut is high enough
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'

+ 13 - 13
locations/artemhome.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'home':
 				metArtemMom = 1
 				'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face. "Hello can I help you?" She asks.'
 				'You return her smile. "Yes, is Artem home?"'
-				if pav_slut >= 100 or grupTipe = 4:
+				if pav_slut >= 200 or grupTipe = 4:
 					'Her smile falters a bit. "Oh? Are you one of his school friends?"'
 					'You nod. "Yes we go to school together."'
 					'"I am Glinina, Artem''s mom. What''s your name?"'
@@ -144,7 +144,7 @@ if $ARGS[0] = 'home':
 				if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 					'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face, until she recognizes you then it turn to a frown, you have never seen her frown before. "Oh, it''s you. I don''t know what you did to my sweet Artem but he says he never wants to see you again. I thought you was such a sweet girl, but he says your not, so please leave." With that she closes the door in your face.'
 					act 'Leave': gt'pod_ezd','etaj_1'
-				elseif pav_slut >= 100 or grupTipe = 4:
+				elseif pav_slut >= 200 or grupTipe = 4:
 					'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face, that falters when she sees you. "Oh, Hello again <<$pcs_firstname>>, can I help you?" She asks.'
 					'You return her smile. "Yes, I''m here to see Artem."'
 					'She doesn''t seem pleased to see you again. "Oh, Well come in then." Then she turns to face down the hall. "Artem dear, ''that girl'' is here to see you again." You can just hear the judgment in her voice when she said that girl, Before turning back to you. "Go on back he is in his room."'
@@ -614,7 +614,7 @@ if $ARGS[0] = 'livingroom':
 			gs 'stat'
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-			if pav_slut >= 100 or grupTipe = 4:
+			if pav_slut >= 200 or grupTipe = 4:
 				'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
 				'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
 				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because you know, he''s not used to girls like you..."'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'livingroom':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-					if pav_slut >= 100 or grupTipe = 4:
+					if pav_slut >= 200 or grupTipe = 4:
 						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again...'
 						'"Yeah, well you know how it goes." you nonchalantly answer.'
 						'All of a sudden his posture changes and he slouches back in his chair, "<<$pcs_firstname>>, can''t you find some other boy to toy with, other than my son?"'
@@ -744,7 +744,7 @@ if $ARGS[0] = 'livingroom':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-					if pav_slut >= 100 or grupTipe = 4:
+					if pav_slut >= 200 or grupTipe = 4:
 						'You barge in without paying any respect to them, "What are the two of you watching?" you ask.'
 						'Startled, they jump to as they turn their attention towards you, "We''re watching the news..." Masharin annoyingly replies.'
 						'"I see, the news is boring as hell to watch, always something depressing on there." you answer back.'
@@ -891,7 +891,7 @@ if $ARGS[0] = 'kitchen':
 			'As you start to enter the kitchen you see Artems mom Glinina busy working away.'
 			act 'Leave':gt 'artemhome','hallway'
 			act 'Talk to her':
-				if pav_slut >= 100 or grupTipe = 4:
+				if pav_slut >= 200 or grupTipe = 4:
 					*clr & cla
 					'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 					if metArtemMom = 0:
@@ -1244,7 +1244,7 @@ if $ARGS[0] = 'chat':
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 !! If Sveta has fallen because of her slut reputation in Pavlovsk
-	elseif artemslutlove = 0 and artsveslut = 0 and artemlove = 1 and pav_slut >= 125 and grupTipe = 5:
+	elseif artemslutlove = 0 and artsveslut = 0 and artemlove = 1 and pav_slut >= 250 and grupTipe = 5:
 !!need code if Sveta is a slut outcast, not sure how to do it since different groups kick Sveta out at different levels of pav slut rep
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk1.jpg"></center>'
 		'You quietly walk past Artem and enter his room. You sit down on the couch, without saying a word.'
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'chat':
 			'After you gather your things you leave his apartment, ignoring his pleas.'
 			act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
 		end
-	elseif artdate = 0 and artfall >= 10 and pav_slut < 75 and artemQW['dateask'] ! daystart:
+	elseif artdate = 0 and artfall >= 10 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
 			act 'Walk in the park': gt 'artemdate','firstdate'
 		end
-	elseif artdate > 0 and artdate <= 3 and pav_slut < 75 and artemQW['dateask'] ! daystart:
+	elseif artdate > 0 and artdate <= 3 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1338,7 +1338,7 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-	elseif artdate = 4 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate = 4 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'chat':
 			'"I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
 		end
 		gs 'artemhome', 'askedstrip'
-	elseif artdate = 5 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate = 5 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		artemQW['dateask'] = daystart
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/flowers.jpg"></center>'
@@ -1423,7 +1423,7 @@ if $ARGS[0] = 'chat':
 				act 'Just talk': gt 'artemhome', 'chat'
 			end
 		end
-	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate >= 6 and artdate <= 8 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1456,7 +1456,7 @@ if $ARGS[0] = 'chat':
 		'He smiles at you as he says: "Well, we''ve spent a lot of time dating, I figured it would be nice to make it official."'
 		'You''re still not sold on the idea, and question him further: "Make what official? And where did you get that wine from?"'
 		*nl
-		if pav_slut >= 100 or grupTipe = 4:
+		if pav_slut >= 200 or grupTipe = 4:
 			'Artem reassures you: "Relax, <<$pcs_nickname>>... my parents are leaving to see a friend, I got the wine from my uncle. So please... let''s just sit down and chat?"'
 		else
 			'Artem reassures you: "Relax, <<$pcs_nickname>>... my parents are leaving to see a friend, to give us some privacy. And my mom gave me that wine, to share with you! My parents are very happy I met you, and my mother picked the wine. So please... let''s just sit down and chat?"'

+ 2 - 2
locations/arturHome.qsrc

@@ -36,7 +36,7 @@ act 'Go to his home':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -50,7 +50,7 @@ act 'Go to his home':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 1 - 1
locations/arturQW.qsrc

@@ -1,7 +1,7 @@
 # arturQW
 if $ARGS[0] = 'arturQW_1':
 	menu_off = 1
-	if arturTimes >= 5 and pav_slut >= 25 and pcs_apprnc >= 120:
+	if arturTimes >= 5 and pav_slut >= 50 and pcs_apprnc >= 120:
 		*clr & cla
 		minut += 2
 		gs 'stat'

+ 1 - 1
locations/arturend.qsrc

@@ -43,7 +43,7 @@ act 'Brush up':
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'
 	end
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 end
 
 --- arturend ---------------------------------

+ 0 - 482
locations/atak.qsrc

@@ -1,482 +0,0 @@
-# atak
-
-menu_off = 1
-
-if $ARGS[0] = 'player':
-	cla
-	tip = 0
-	strenA = pcs_stren
-	speedA = speed
-	agilA = pcs_agil
-	vitalA = pcs_vital
-	!Skills
-	boxingA = boxing
-	!Parameters
-	healthA = pcs_health
-	BonusA = BonusAtak
-	strenD = strenV
-	speedD = speedV
-	agilD = agilV
-	vitalD = vitalV
-	!Skills
-	boxingD = boxingV
-	!Parameters
-	healthD = healthV
-	initBonusA = initBonus
-	initBonus = 0
-	initBonusV = 0
-	BonusD = BonusDefV
-
-	if stunV <= 0:
-		xgt'atak','popad'
-	elseif stunV > 0:
-		'<b><font color = green><<$boydesc>> Can not move a critical hit</font></b>'
-
-		xgt'atak','uronKrit'
-	end
-end
-
-if $ARGS[0] = 'enemy':
-	cla
-	tip = 1
-	strenA = strenV
-	speedA = speedV
-	agilA = agilV
-	vitalA = vitalV
-	!Skills
-	boxingA = boxingV
-	!Parameters
-	healthA = healthV
-	BonusA = BonusAtakV
-	strenD = pcs_stren
-	speedD = speed
-	agilD = pcs_agil
-	vitalD = pcs_vital
-	!Skills
-	boxingD = boxing
-	!Parameters
-	healthD = pcs_health
-	BonusD = BonusDef
-	initBonusA = initBonusV
-	initBonus = 0
-	initBonusV = 0
-
-	if stun <= 0:
-		xgt'atak','popad'
-	elseif stun > 0:
-		'<b><font color = red>YOU can not move a critical hit</font></b>'
-
-		xgt'atak','uronKritV'
-	end
-end
-
-if $ARGS[0] = 'popad':
-	cla
-	!payment hit dodge
-	poSp = speedA*20/100
-	uvAg = agilD*20/100
-	poBox = boxingA*20/100
-	uvBox = boxingD*20/100
-	popad = RAND(boxingA-poBox,boxingA+poBox) + RAND(speedA-poSp,speedA+poSp) + BonusA + initBonusA
-	uvorot = RAND(boxingD-uvBox,boxingD+uvBox) + RAND(agilD-uvAg,agilD+uvAg) + BonusD
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			if tip = 0:
-				!attack players
-				'<b><font color = green>Critical hits</font></b>'
-
-				xgt'atak','uronKrit'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = red>Critical hits</font></b>'
-
-				xgt'atak','uronKritV'
-			end
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			if tip = 0:
-				!attack players
-				'<b><font color = green>EYE</font></b>'
-
-				xgt'atak','uron'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = red>EYE</font></b>'
-
-				xgt'atak','uronV'
-			end
-		end
-	elseif popad <= uvorot:
-		if popad+popKoef <= uvorot:
-			!critical blunder
-			if tip = 0:
-				!attack players
-				'<b><font color = red>CRITICAL SLIP</font></b>'
-
-				xgt'atak','uronKritV'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = green>CRITICAL SLIP</font></b>'
-
-				xgt'atak','uronKrit'
-			end
-		elseif popad+popKoef > uvorot:
-			!bloomer
-			if tip = 0:
-				!attack players
-				'<b><font color = red>LOST</font></b>'
-
-				xgt'fight','sta'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = green>LOST</font></b>'
-
-				xgt'fight','sta'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damage = RAND(pcs_stren,pcs_stren*2) + weapbonus + magweapbonus
-
-	if knife > 0:
-		knibon = knife+1
-		knife = 0
-		damage = damage*knibon
-		knibon = 0
-
-		'<b><font color = green>The enemy flies your throwing knife</font></b>'
-	end
-
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damage = damage - dospehDefV & dospehEnV = dospehEnV - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		if weaponTipe = 1:bloodV = bloodV + RAND(weapon/4,weapon/2)
-		if weaponTipe = 2:stun = stun + RAND(1,2)
-		if weaponTipe = 3:bloodV = bloodV + RAND(weapon/4,weapon/2)
-
-		if stunner > 0:
-			stunner = 0
-			stunV = RAND(3,6)
-
-			'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-		end
-
-		'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Protection of the enemy suffered damage <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone, he still had <<KlonV>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your kick flew right through the opponent''s body. <<$boydesc>> Not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			healthV = healthV - damage
-			if weaponTipe = 1:bloodV = bloodV + RAND(weapon/4,weapon/2)
-			if weaponTipe = 2:stun = stun + RAND(1,2)
-			if weaponTipe = 3:bloodV = bloodV + RAND(weapon/4,weapon/2)
-
-			if stunner > 0:
-				stunV = RAND(3,6)
-
-				'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-			end
-
-			'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	stKo = pcs_stren*20/100
-	damage = RAND(pcs_stren-stKo,pcs_stren+stKo) + weapbonus + magweapbonus
-
-	if knife > 0:
-		knibon = knife+1
-		knife = 0
-		damage = damage*knibon
-		knibon = 0
-
-		'<b><font color = green>The enemy flies your throwing knife</font></b>'
-	end
-
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damage = damage - dospehDefV & dospehEnV = dospehEnV - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-
-		if stunner > 0:
-			stunner = 0
-			stunV = RAND(1,3)
-
-			'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-		end
-
-		'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Protection of the enemy suffered damage <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone, he still had <<KlonV>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your kick flew right through the opponent''s body. <<$boydesc>> Not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			healthV = healthV - damage
-
-			if stunner > 0:
-				stunV = RAND(1,3)
-
-				'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-			end
-
-			'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritV':
-	cla
-	damage = RAND(strenV,strenV*2) + weapbonusV + magweapbonusV
-
-	if knifeV > 0:
-		knibonV = knifeV+1
-		knifeV = 0
-		damage = damage*knibonV
-		knibonV = 0
-
-		'<b><font color = red>As you fly throwing knife</font></b>'
-	end
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		if weaponTipeV = 1:blood = blood + RAND(weaponV/4,weaponV/2)
-		if weaponTipeV = 2:stunV = stunV + RAND(1,2)
-		if weaponTipeV = 3:blood = blood + RAND(weaponV/4,weaponV/2)
-
-		if stunnerV > 0:
-			stunnerV = 0
-			stun = RAND(3,6)
-
-			'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-		end
-
-		'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-		xgt'fight','sta'
-	elseif defence > 0 and klon <= 0 and unmaterial <= 0:
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_health = pcs_health - damage
-			if weaponTipeV = 1:blood = blood + RAND(weaponV/4,weaponV/2)
-			if weaponTipeV = 2:stunV = stunV + RAND(1,2)
-			if weaponTipeV = 3:blood = blood + RAND(weaponV/4,weaponV/2)
-
-			if stunnerV > 0:
-				stun = RAND(3,6)
-
-				'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronV':
-	cla
-	stKo = strenV*20/100
-	damage = RAND(strenV-stKo,strenV+stKo) + weapbonusV + magweapbonusV
-
-	if knifeV > 0:
-		knibonV = knifeV+1
-		knifeV = 0
-		damage = damage*knibonV
-		knibonV = 0
-
-		'<b><font color = red>As you fly throwing knife</font></b>'
-	end
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-
-		if stunnerV > 0:
-			stunnerV = 0
-			stun = RAND(3,6)
-
-			'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-		end
-
-		'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defence > 0 and klon <= 0 and unmaterial <= 0:
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_health = pcs_health - damage
-
-			if stunnerV > 0:
-				stun = RAND(3,6)
-
-				'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
---- atak ---------------------------------
-

+ 0 - 284
locations/atakA.qsrc

@@ -1,284 +0,0 @@
-# atakA
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speed * 20 / 100
-	uvAg = agilV * 20 / 100
-	poBox = pcs_react * 20 / 100
-	uvBox = reactV * 20 / 100
-	popad = RAND(pcs_react - poBox,pcs_react + poBox) + RAND(speed - poSp,speed + poSp) + bonusSh
-	uvorot = RAND(reactV - uvBox,reactV + uvBox) + RAND(agilV - uvAg,agilV + uvAg)
-	uvorKoef = uvorot * 50 / 100
-	popKoef = popad * 50 / 100
-
-	if popad > uvorot:
-		if popad >= uvorot + uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			xgt'atakA','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			xgt'atakA','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip+damKoef,damTip+damKoef*2)
-
-	if damTipM > 0:
-		damKoefM = damTipM*20/100
-		damageM = RAND(damTipM+damKoefM,damTipM+damKoefM*2)
-	end
-
-	xgt'atakA','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip-damKoef,damTip+damKoef)
-
-	if damTipM > 0:
-		damKoefM = damTipM*20/100
-		damageM = RAND(damTipM-damKoefM,damTipM+damKoefM)
-	end
-
-	xgt'atakA','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-
-		if damTipM > 0:
-			manaV = manaV - damageM
-			pcs_mana = pcs_mana + damageM
-
-			'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-		end
-
-		!pcs_mana = pcs_mana - damageM
-
-		if eleSh > 0:
-			stunV = RAND(eleSh,eleSh*3)
-
-			'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damage>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			damage = damage - barierV
-			healthV = healthV - damage
-
-			if damTipM > 0:
-				manaV = manaV - damageM
-				pcs_mana = pcs_mana + damageM
-				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-			end
-
-			if eleSh > 0:
-				stunV = RAND(eleSh,eleSh*3)
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'atakW':
-	cla
-	!payment hit dodge
-	poSp = speed * 20 / 100
-	uvAg = agilV * 20 / 100
-	poBox = pcs_react * 20 / 100
-	uvBox = reactV * 20 / 100
-	popad = RAND(pcs_react - poBox,pcs_react + poBox) + RAND(speed - poSp,speed + poSp)
-	uvorot = RAND(reactV - uvBox,reactV + uvBox) + RAND(agilV - uvAg,agilV + uvAg)
-	uvorKoef = uvorot * 50 / 100
-	popKoef = popad * 50 / 100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA','uronKritW'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA','uronW'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritW':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip+damKoef,damTip+damKoef*2)
-	damKoefM = damTipM*20/100
-	damageM = RAND(damTipM+damKoefM,damTipM+damKoefM*2)
-	xgt'atakA','damageW'
-end
-
-if $ARGS[0] = 'uronW':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip-damKoef,damTip+damKoef)
-	damKoefM = damTipM*20/100
-	damageM = RAND(damTipM-damKoefM,damTipM+damKoefM)
-	xgt'atakA','damageW'
-end
-
-if $ARGS[0] = 'damageW':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		manaV = manaV - damageM
-
-		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		damSum = damage + damageM
-		defenceV = defenceV - damSum
-		!defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damSum>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			manaV = manaV - damageM
-			healthV = healthV - damage
-			!healthV = healthV - damage
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakA ---------------------------------
-

+ 0 - 305
locations/atakA1.qsrc

@@ -1,305 +0,0 @@
-# atakA1
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp) + bonusShV
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA1','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA1','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV+damKoef,damTipV+damKoef*2)
-
-	if damTipMV > 0:
-		damKoefM = damTipMV*20/100
-		damageM = RAND(damTipMV+damKoefM,damTipMV+damKoefM*2)
-	end
-
-	xgt'atakA1','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV-damKoef,damTipV+damKoef)
-
-	if damTipMV > 0:
-		damKoefM = damTipMV*20/100
-		damageM = RAND(damTipMV-damKoefM,damTipMV+damKoefM)
-	end
-
-	xgt'atakA1','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-
-		if hidanAtk = 1:
-			hidanAtk = 0
-			zerkaloV = zerkaloV + 50
-			bloodV = bloodV + 50
-
-			'<b><font color = red><<$boydesc>> drink your blood.</font></b>'
-		end
-
-		if damTipMV > 0:
-			pcs_mana = pcs_mana - damageM
-			pcs_mana = pcs_mana + damageM
-
-			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units mana you.</font></b>'
-		end
-
-		if poisonAV = 1:
-			poisonV = 50
-
-			'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
-		end
-
-		!pcs_mana = pcs_mana - damageM
-
-		if eleShV > 0:
-			stun = RAND(eleShV,eleShV*3)
-
-			'<b><font color = red>You paralyzed on <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = red><<$boydesc>> Damage caused to you <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> got a <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy passed through you. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			pcs_health = pcs_health - damage
-
-			if damTipM > 0:
-				pcs_mana = pcs_mana - damageM
-				manaV = manaV + damageM
-
-				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-			end
-
-			if eleShV > 0:
-				stun = RAND(eleShV,eleShV*3)
-
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			if poisonAV = 1:
-				poisonV = 50
-
-				'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
-			end
-
-			'<b><font color = red>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You have reflected the damage and the opponent was <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'atakW':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp)
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA1','uronKritW'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA1','uronW'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritW':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV+damKoef,damTipV+damKoef*2)
-	damKoefM = damTipMV*20/100
-	damageM = RAND(damTipMV+damKoefM,damTipMV+damKoefM*2)
-	xgt'atakA1','damageW'
-end
-
-if $ARGS[0] = 'uronW':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV-damKoef,damTipV+damKoef)
-	damKoefM = damTipMV*20/100
-	damageM = RAND(damTipMV-damKoefM,damTipMV+damKoefM)
-	xgt'atakA1','damageW'
-end
-
-if $ARGS[0] = 'damageW':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-		!defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damSum>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-			!healthV = healthV - damage
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakA1 ---------------------------------
-

+ 0 - 137
locations/atakB.qsrc

@@ -1,137 +0,0 @@
-# atakB
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speed*20/100
-	uvAg = agilV*20/100
-	poBox = pcs_react*20/100
-	uvBox = reactV*20/100
-	popad = RAND(pcs_react-poBox,pcs_react+poBox) + RAND(speed-poSp,speed+poSp) + bonusSh
-	uvorot = RAND(reactV-uvBox,reactV+uvBox) + RAND(agilV-uvAg,agilV+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			gs'atakB','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			gs'atakB','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damDef = defence/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef+damKoef,damDef+damKoef*2)
-	gs'atakB','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damDef = defence/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef-damKoef,damDef+damKoef)
-	gs'atakB','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		!pcs_mana = pcs_mana - damageM
-
-		if eleSh > 0:
-			stunV = RAND(eleSh,eleSh*3)
-
-			'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			defence = defence - damage
-
-			'<b><font color = red><<$boydesc>> It reflected the damage and your defense received <<damage>> points of damage</font></b>'
-		end
-
-		!xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Your defense caused damage <<damage>> Protection of enemy units</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Blow your protection passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your protection</font></b>'
-
-			!xgt'fight','sta'
-		elseif barierV < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			healthV = healthV - damage
-
-			if eleSh > 0:
-				stunV = RAND(eleSh,eleSh*3)
-
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			'<b><font color = green>Your defense caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				defence = defence - damage
-
-				'<b><font color = red>Opponent reflected damage and your defense received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		!xgt'fight','sta'
-	end
-end
-
---- atakB ---------------------------------
-

+ 0 - 136
locations/atakB1.qsrc

@@ -1,136 +0,0 @@
-# atakB1
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp) + bonusShV
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			gs'atakB1','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			gs'atakB1','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damDef = defenceV/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef+damKoef,damDef+damKoef*2)
-	gs'atakB1','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damDef = defenceV/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef-damKoef,damDef+damKoef)
-	gs'atakB1','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		!pcs_mana = pcs_mana - damageM
-
-		if eleShV > 0:
-			stun = RAND(eleShV,eleShV*3)
-
-			'<b><font color = red>Defense paralyzed you to <<stun>> Rounds</font></b>'
-		end
-
-		'<b><font color = red>Defense caused you damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			defenceV = defenceV - damage
-
-			'<b><font color = green>You have reflected the damage of the defense and the defense received <<damage>> points of damage</font></b>'
-		end
-
-		!xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units of the defense</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the defense went through you. YOU are not material</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the defense</font></b>'
-
-			!xgt'fight','sta'
-		elseif barier < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			pcs_health = pcs_health - damage
-
-			if eleShV > 0:
-				stun = RAND(eleShV,eleShV*3)
-
-				'<b><font color = red>Defense paralyzed you to <<stun>> Rounds</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units of the defense</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				defenceV = defenceV - damage
-
-				'<b><font color = green>You have reflected damage and defense received <<damage>> points of damage</font></b>'
-			end
-		end
-		!xgt'fight','sta'
-	end
-end
-
---- atakB1 ---------------------------------
-

+ 0 - 186
locations/atakM.qsrc

@@ -1,186 +0,0 @@
-# atakM
-
-menu_off = 1
-
-if $ARGS[0] = 'atakVmana':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp)
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakM','uronKritV'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakM','uronV'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritV':
-	cla
-	damage = RAND(1000,2000)
-	damageM = RAND(1000,2000)
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-
-		'<b><font color = red>Your protection harmed <<damSum>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronV':
-	cla
-	damage = RAND(500,1000)
-	damageM = RAND(500,1000)
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-
-		'<b><font color = red>Your protection harmed <<damSum>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakM ---------------------------------
-

+ 25 - 25
locations/autosalonF.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'manager1':
 	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
 	'"With how the economy is right now, we can''t accept payment by installments at this time, I''m afraid", he apologizes, "and a few new laws have been passed, too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
-	act 'Leave':gt 'Nord'
+	act 'Leave':gt 'city_industrial'
 
 	if karta + bankDebtLimit >= 400000:
 		act 'Buy a Kalina VAZ (400 th.RUB)':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -101,7 +101,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -122,7 +122,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -143,7 +143,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -164,7 +164,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -206,7 +206,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -227,7 +227,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -248,7 +248,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -290,7 +290,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -332,7 +332,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -395,7 +395,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -437,7 +437,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -458,7 +458,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -479,7 +479,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -521,7 +521,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -542,7 +542,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -563,7 +563,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 end

+ 3 - 3
locations/autoservisF.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
 						'Since he tells you that it''s not gonna take long, you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, the car is ready and you pay <<normrem>> <b>₽</b>.'
 
-						act 'Leave': minut += 5 & gt 'Nord'
+						act 'Leave': minut += 5 & gt 'city_industrial'
 					end
 				end
 			end
@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 					'The car looks brandnew! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
 					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he was joking or not.'
 
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 end
 
 --- autoservisF ---------------------------------

+ 12 - 12
locations/autotraidF.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 	
 	if hour <= 17:
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
@@ -37,12 +37,12 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
 	gs 'avb'
 
-	act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 	
 	if cardrive = 9 and car > 0:
 		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
-		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		
 		act 'Sell ​your car (<<bupay>> <b>₽</b>) (1:00)':
 			cla
@@ -54,7 +54,7 @@ if $ARGS[0] = 'manager1':
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you see something you like."'
 
-			act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		end
 	elseif cardrive ! 9:
 		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
@@ -120,7 +120,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -151,7 +151,7 @@ if $ARGS[0] = 'car':
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -213,7 +213,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -244,7 +244,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -275,7 +275,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -307,7 +307,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -339,7 +339,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end

+ 6 - 6
locations/bank.qsrc

@@ -31,27 +31,27 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		minut += 2
 		if bankloc = 1:
-			gt 'down'
+			gt 'city_center'
 		else
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		end
 	end
 	
-	if BankPapper = 1 and dayBankPapper = daystart:
+	if BurgerQW['BankTask'] = 1 and BurgerQW['BankTaskDay'] = daystart:
 		act 'Show documents':
 			*clr & cla
 			menu_off = 1
 			minut += 15
-			BankPapper = 2
+			BurgerQW['BankTask'] = 2
 			gs 'stat'
 			'You went to the office and showed the required documents to the manager.'
 
 			act 'Leave':
 				minut += 5
 				if bankloc = 1:
-					gt 'down'
+					gt 'city_center'
 				else
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				end
 			end
 		end

+ 2 - 2
locations/barbershop.qsrc

@@ -100,12 +100,12 @@ if $ARGS[0] = 'start':
 		*clr & cla
 		'The barber shop is closed at the moment, you should probably come back, when Mr. Syomin is in'
 
-		act 'Leave':minut += 3 & gt 'pavCommercial'
+		act 'Leave':minut += 3 & gt 'pav_commercial'
 
 		exit
 	end
 
-	act 'Leave':minut += 3 & gt 'pavCommercial'
+	act 'Leave':minut += 3 & gt 'pav_commercial'
 end
 
 if money >= 60:

+ 1 - 1
locations/bass.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/bass.jpg"></center>'
 	'You must wear a swimsuit in the pool.'
 
-	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
+	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'city_jorahouse', 'ev42'
 
 	act 'Swim':
 		cla

+ 1 - 1
locations/bed2.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = '':
 	end
 
 	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
-		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 75) or (pcs_horny > 50 and pav_slut >= 25 and pcs_inhib >= 60):
+		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 150) or (pcs_horny > 50 and pav_slut >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0
 				gt 'selfplay', 'start'

+ 83 - 52
locations/bedrPar.qsrc

@@ -27,25 +27,25 @@ if momloc = 26:
 	end
 end
 
-if saveparQW = 2:
+if ParrotQW['Level'] = 2:
 	*clr & cla
 	menu_off = 1
-	'As soon as you enter the room you rush over to <<$namepopu2>>''s cage and pour the contents of the vial in to his water bowl.'
-	'You really hope this will work and keep him from spilling yours and your  sister''s bedroom secrets.'
-	saveparQW = 3
-	saveparjourQW = 3
+	'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial in to his water bowl.'
+	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
+	ParrotQW['Level'] = 3
+	ParrotQW['Day'] = 3
 	act 'Continue':gt $loc, $metka
 	exit
 end
-if sisrelparday + 3 < daystart and saveparQW = 1:
+if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	*clr & cla
 	menu_off = 1
-	'When you enter the room you notice <<$namepopu2>>''s cage is open and he is gone.'
+	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
 	'You sister must have released him since you were not able to find a solution in time.'
-	popugai2 = 0
-	saveparQW = 0
-	saveparjourQW = 2
-	saveparQWfailed = 0
+	ParrotQW['Owned2'] = 0
+	ParrotQW['Level'] = 0
+	ParrotQW['Day'] = 2
+	ParrotQW['Failed'] = 0
 	act 'Continue':gt $loc, $metka
 	exit
 end
@@ -54,21 +54,21 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'to
 
 if anyaloc = 25: gt 'sisterQW', 'sisboyQW_expel'
 
-if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
+if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$namepopu2>> in his cage'
+	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage'
 	'"I went to the shopping center and bought this bird. Isn''t he the cutest ?"'
 	if npc_rel['A33'] > 50:
 		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care"'
-		sispopconf = 1
+		ParrotQW['SisKeepParrot'] = 1
 	end
 	if npc_rel['A33']  <= 50:
 		'"No he isn''t cute, and I suggest you take it out of here, I am not sharing my room with a bird."'
 		'You feel kind of sad but you understand your sister. You should have asked her before buying it.'
 		'You go to the window, open it and release the bird'
-		popugai2 = 0
+		ParrotQW['Owned2'] = 0
 	end
 
 	act 'Leave':gt $loc, $metka
@@ -85,28 +85,28 @@ end
 *nl
 'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
-if popugai2 = 1:
-	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
-	if daystart - parbuydate <= 10: '<<$namepopu2>> starts squawking at you when you enter the room.'
-	if daystart - parbuydate > 10 and daystart - parbuydate <= 20: 'When <<$namepopu2>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - parbuydate > 20 and daystart - parbuydate <= 30: 'When <<$namepopu2>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - parbuydate > 30 and daystart - parbuydate <= 35: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
-	if daystart - parbuydate > 35 and daystart - parbuydate <= 40: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
-	if daystart - parbuydate > 40 and daystart - parbuydate <= 50: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
-	if daystart - parbuydate > 50 and daystart - parbuydate <= 55: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
-	if daystart - parbuydate > 55 and saveparQW < 3: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
-	if saveparQW = 3:
+if ParrotQW['Owned2'] = 1:
+	'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
+	if daystart - ParrotQW['BuyDate'] <= 10: '<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
+	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
+	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
+	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
+	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
+	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
+	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
+	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
+	if ParrotQW['Level'] = 3:
 		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
-		if parfixrand = 1:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
-		if parfixrand = 2:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
-		if parfixrand = 3:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
-		if parfixrand = 4:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
-		if parfixrand = 5:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
-		if parfixrand = 6:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
-		if parfixrand = 7:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
-		if parfixrand = 8:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
-		if parfixrand = 9:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
+		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
+		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
+		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
+		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
+		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
+		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
+		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
+		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
+		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
+		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
 		killvar 'parfixrand'
 	end
 
@@ -133,19 +133,46 @@ if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your de
 gad = 0
 
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
+!!Default is Anya not being here, can be overwritten in next block
+sisterHere = 0
+
+if sister_indorf = 0:
+	if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
+		*clr & cla
+		menu_off = 1
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_6_<<rand(1,7)>>.jpg"></center>'
+		'Drunk and disheveled, Anya bursts into the room.'
+		'You notice that her hair, and all her clothes are smeared in sticky sperm.'
+		'In this state, she falls on the bed and instantly falls asleep.'
+		sisboyparty = 1
+		act 'Move away': gt $loc
+	else
+		sisterdialog = 1
+
+		if anyaloc = 1:
+			'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
+		elseif anyaloc = 4:
+			sisterdialog = 3
+			sisterHere = 1
+			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
+		elseif anyaloc = 15:
+			sisterHere = 1
+			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
+		elseif anyaloc = 26:
+			if sisboypartyQW = 1: sisboypartyQW = 2
+			if sisboyparty = -1: sisboyparty = 1
+			'Your drunken sister Anya is sound asleep in her bed.'
+		end
+	end
+end
 
 act 'Exit the room':
-	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 : gt 'sister_chat', 'pargone'
+	if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 	gt'korrPar'
 end
 
-if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
-	gs'family'
-else
-	gs'family'
-
-	if rexCarCount >= 9 and sisterHere = 1 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13: act 'Send Rex a SMS message': gt 'reks','sms'
-
 	if student > 0 and kursovik < 100:
 		act 'Do coursework (1:00)':
 			*clr & cla
@@ -163,23 +190,27 @@ else
 		end
 	end
 
+	if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
 	!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 	sis_watch = 0
 
-	if pcs_horny >= 50 and (sisboytrio > 0 or sisterHere = 0):
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
+	if sisterHere = 0 or sisboytrio > 0:
+		if pornMagazine > 0:gs 'events', 'read_porn'
+		if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
+			act 'Send Rex a SMS message': gt 'reks','sms'
+		end
+		if pcs_horny >= 50:
+			act 'Masturbate':gt 'selfplay', 'start'
+		end
 
-	if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
-	if (sisboytrio > 0 or sisterHere = 0) and pornMagazine > 0:gs 'events', 'read_porn'
+		if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+		if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+	end
 
 	gs 'events', 'read'
 
 	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
-
 	dynamic $palelady
 end
 

+ 2 - 2
locations/beg1.qsrc

@@ -239,7 +239,7 @@ if $ARGS[0] = '2':
 		bronzebeg += 1 & money += 750 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 750 <b>₽</b>'
 	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 4
-		silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,5000 <b>₽</b>'
+		silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,500 <b>₽</b>'
 	else
 		gs 'fame', 'city', 'running', 5
 		razradbeg = 3 & goldbeg += 1 & money += 2500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,500 <b>₽</b> and became the "Track Champion of the City of Saint Petersburg", which qualifies you for the next oblast championship!'
@@ -297,7 +297,7 @@ if $ARGS[0] = '1':
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 5
-		bronzebeg += 1 & money += 1500 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1,5000 <b>₽</b>'
+		bronzebeg += 1 & money += 1500 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1,500 <b>₽</b>'
 	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 5
 		silverbeg += 1 & money += 2000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 2,000 <b>₽</b>'

+ 2 - 0
locations/begin.qsrc

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

+ 1 - 1
locations/belgang.qsrc

@@ -190,7 +190,7 @@ elseif $ARGS[0] = 'payday':
 					'Silence fills the room as he waits for you to acknowledge what he just said. Mortified about what might happen if you don''t, you nod. He decides to paint the picture anyway: "If you try to escape or refuse to work, we''ll put a bullet in your head, chop you up and bury you in the woods in pieces. And that would be a waste, with such a pretty face as yours." He pinches your cheeks and then slaps your face; not hard enough to be painful, but it certainly drives the message home. You can tell he''s dead serious.'
 					'After looking you in the eyes for a few more seconds to make sure you get the message, he turns around and leaves. You are all alone now.'
 					
-					act 'Look around': gt 'sauna', 'saunaroom'
+					act 'Look around': gt 'city_sauna', 'saunaroom'
 				end	
 			end
 		end

+ 1 - 1
locations/belpicknick.qsrc

@@ -515,7 +515,7 @@ if $ARGS[0] = 'end':
 	if rand(1,100) <= 70:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are, "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsk, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'
-		act'Return to Pavlovsk':gt 'pavCommercial'
+		act'Return to Pavlovsk':gt 'pav_commercial'
 	else
 		minut += 10
 		'Siple looks at your face in disgust. "That looks fucking disgusting... there''s no way you''re getting in our car. Find your own way home, slut!"'

+ 1 - 1
locations/body_shape.qsrc

@@ -152,7 +152,7 @@ put this in comment as old calculation so I don''t find out I need it later
 	end
 
 !!This is the salo cap for the weight approximation
-	if salo > 200: salo = 200
+	if salo > 250: salo = 250
 	
 !!This calculates the current salo category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
 	:salocatloop

+ 1 - 1
locations/boilerroom.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/qwest/alter/boiler/boilerroom'+ rand(1,3) +'.jpg"></center>'
 	'This event is still not completed. Please bug Ekay until he gets it done.'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 --- boilerroom ---------------------------------

+ 3 - 3
locations/bordel.qsrc

@@ -10,11 +10,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	elseif pcs_apprnc < 100:
 		'"Look at you, no one will pay for such a product, get cleaned up and come back."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	else
 		act 'In the room':gt 'bordel', 'brothel'
 	end
@@ -39,7 +39,7 @@ if $ARGS[0] = 'brothel':
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
-			gt 'Nord', 'redlight'
+			gt 'city_industrial', 'redlight'
 		else
 			cla
 			'You can''t go outside naked.'

+ 7 - 7
locations/bordelv.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'end':
 				act 'Leave':
 					npc_rel['A220'] = 0
 					vikaend = 1
-					gt 'street'
+					gt 'city_residential'
 				end
 				
 				gs 'willpower', 'misc', 'self'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'end':
 						gs 'willpower', 'pay', 'self'
 						gs 'stat'
 						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
-						act 'Leave':gt 'street'
+						act 'Leave':gt 'city_residential'
 					end
 				else
 					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'end':
 					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
 					'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			else
 				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'end':
 				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
 				'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
 
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'city_residential'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'end':
 					'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
 					'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			else
 				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'out':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		gt 'street'
+		gt 'city_residential'
 	end
 	
 	gs 'willpower', 'misc', 'self', 'hard'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'out':
 			gs 'arousal', 'end'
 			gs 'stat'
 			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	else
 		act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 0 - 52
locations/boxing.qsrc

@@ -1,52 +0,0 @@
-# boxing
-!Choosing a physical attack
-
-menu_off = 1
-
-if weapon = 0 and autocombat_cheat = 0:
-	act 'Fist':
-		cla
-		!gs'atak'
-		xgt'atak','player'
-	end
-elseif weapon = 0 and autocombat_cheat = 1:
-	cla
-	!gs'atak'
-	xgt'atak','player'
-end
-
-if weapon > 0:
-	if weaponTipe = 1:$weap = 'sword'
-	if weaponTipe = 2:$weap = 'mace'
-	if weaponTipe = 3:$weap = 'ax'
-
-	act 'Hit <<$weap>>':
-		cla
-		!gs'atak'
-		xgt'atak','player'
-	end
-end
-
-if kunai > 0:
-	'You have <<kunai>> throwing knives.'
-
-	act 'Throw the knife':
-		cla
-		knife = input ("How to throw a knife?")
-		if knife > kunai:
-			knife = kunai
-			kunai = 0
-		elseif knife <= kunai:
-			kunai = kunai - knife
-		end
-
-		'<font color = green>You hurled <<knife>> knives.</font>'
-
-		xgt'atak','player'
-	end
-end
-
-if pcs_magik > 0: act 'Magic Attack':gt'magik'
-
---- boxing ---------------------------------
-

+ 4 - 4
locations/brother.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 			act 'Leave':gt $loc, $metka
 			exit
 		else
-			if evgenQW >= 4 and pav_slut >= 75 and kolkaseepornday ! daystart:
+			if evgenQW >= 4 and pav_slut >= 150 and kolkaseepornday ! daystart:
 				'Your brother grins, "Hey, sis! We''re done playing for now. Let''s go watch some porn."'
 
 				act 'Go with the boys':minut += 5 & gt 'seeporn'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start':
 			if hour = 23 and brotherSex > 4 and brotherNightSex ! daystart and momloc ! 19:
 				'As you approach your sleeping brother, he suddenly opens his eyes and looks at you.'
 				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 				!!	'"<<$pcs_nickname>>, help me sleep," he begs while throwing back the blanket, revealing his erection.'
 				!!	gs 'boyStat', 'A34'
 				!!	brotherSexCount -= 1
@@ -327,7 +327,7 @@ if $ARGS[0] = 'start':
 			if father_go = 1 and hour >= 18 and hour < 23 and brotherSex > 4 and brotherEvSex ! daystart and momloc ! 19:
 				'When you get close, Kolka turns to you.'
 				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 					!!gs 'boyStat', 'A34'
 					!!'"Come on, <<$pcs_nickname>>, you have work to do!" Your brother drops his pants, exposing his hard <<npc_dick[''A34'']>> cm dick. "And be quiet, you don''t want to wake up <<$npc_nickname[''A29'']>> and dad."'
 					!!brotherSexCount -= 1
@@ -861,7 +861,7 @@ if $ARGS[0] = 'brotherSexEnd':
 	gs 'arousal', 'end'
 	gs 'stat'
 	!!sub/dom dialog needs fixing
-	!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+	!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 		!!if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
 			!!'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
 			!!act 'Leave': gt 'sitrPar'

+ 1 - 1
locations/brother_lessons.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'homework':
 				ivrand = RAND(1,3)
 				if ivrand = 1 and brotherEvSex ! daystart:
 					cla
-					if (sub > 0 and brotherknowslut = 1) or pav_slut >= 75 or brotherknowslut = 2:
+					if (sub > 0 and brotherknowslut = 1) or pav_slut >= 150 or brotherknowslut = 2:
 						'Kolka boldly slides his hands further upwards, continuing to stroke the insides of your leg, while he tells you:'
 						'"<<$pcs_nickname>>, help me with another matter now!"'
 						if pcs_horny > 90:

+ 3 - 1
locations/brother_voyeur.qsrc

@@ -1026,6 +1026,8 @@ if $ARGS[0] = 'brother_shower_shave':
 							act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
 						end
 					else
+						cla & *clr
+						gs 'stat'						
 						'Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the feeling.'
 						'You put your hands on either side of your pussy and say, "Well? Satisfied now?"'
 						'"Yeah..." he says, trailing off at the end, obviously hypnotized by your pussy, causing you to roll your eyes.'
@@ -1718,7 +1720,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 		
 		act'Fuck him till he cums':gt'brother_voyeur','shower_creampie'
 			
-		act'Fill me up!':'brother_voyeur','shower_fill_me_up'
+		act'Fill me up!':gt 'brother_voyeur','shower_fill_me_up'
 		
 	elseif brothercumchoice = 3:
 		'"<<$pcs_nickname>>-! I''m almost there! Let me cum on your face!"'

+ 5 - 5
locations/budgetclothes.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 			minut += 3
 			gt 'torgcentr'
 		else
-			gt 'pavIndustrial'
+			gt 'pav_industrial'
 		end
 	end
 	
@@ -133,7 +133,7 @@ if $ARGS[0] = 'clothes':
 		if i = 45: i = 57
 		if i = 80:i = 86
 		if i = 414:i = 415
-	if i <= 414:jump 'loopcheap'
+	if i <= 419:jump 'loopcheap'
 end
 
 if $ARGS[0] = 'cheapclo':
@@ -182,7 +182,7 @@ if $ARGS[0] = 'office':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 3
-	if i <= 101:jump 'loopoffice'
+	if i <= 128:jump 'loopoffice'
 end
 
 if $ARGS[0] = 'officeclo':
@@ -352,7 +352,7 @@ if $ARGS[0] = 'trainers':
 		if strainers[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''training_shoes''"><img src="images/pc/shoes/trainers/<<i>>.jpg" height="250" /></a>'
 		i += 2
 		if i = 21:i = 23
-	if i <= 29:jump 'looptrainers_shoes'
+	if i <= 30:jump 'looptrainers_shoes'
 end
 
 if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 800
@@ -379,7 +379,7 @@ if $ARGS[0] = 'coats':
 		if i = 5:i = 6
 		if i = 9:i = 10
 		if i = 11:i = 12
-	if i <= 19:jump 'loopcoats'
+	if i <= 20:jump 'loopcoats'
 end
 
 if $ARGS[0] = 'coatsclo':

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