1
0

116 İşlemeler 1de2afaf48 ... 9d64fe43a5

Yazar SHA1 Mesaj Tarih
  Kevin_Smarts 9d64fe43a5 Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  Kevin_Smarts 64933fdd6a Merge remote-tracking branch 'Anjuna/master' 4 ay önce
  Kevin_Smarts a02a19cc64 [changed] Clothing menu page now shows all clothing and not just outfit and coat 4 ay önce
  Kevin_Smarts c66bc506e7 [added] Missing default clothing option for bedroom in Pav family home 4 ay önce
  Kevin_Smarts 9cc1781d55 [fixed] things got a bit fucky if you were in default school uniform and wanted to change to default sports necitating extra steps, can now change directly from school to sports 4 ay önce
  Myles Croft (Hooded Silence) dfcd55e120 [Code update] Gad's favourite pest added back into grandparents. Initial code commit for chores (incomplete). 4 ay önce
  anjuna krokus e81580418e Merge remote-tracking branch 'master/master' 4 ay önce
  Kevin_Smarts 9dd1ba718f [fixed] Wrong variable name check for nudity 4 ay önce
  anjuna krokus ab1ef4d2c4 [fixed] Forgot to add the `boystat` calls when I removed the `boygirl` calls (which had those implicit 4 ay önce
  anjuna krokus 3b215fef08 [fixed] tg start leading to a blank screen when starting in gad 4 ay önce
  anjuna krokus ee83f6e3c4 [added] Gadukino Farmers market. Mostly still a skeleton, and still needs images and more text. But it's there 4 ay önce
  anjuna krokus 280485f07b [fixed] broke bath selfies. Reported by Skylah 4 ay önce
  Kevin_Smarts 9c74f3b770 Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  Myles Croft (Hooded Silence) 2650e9aa72 [media update] Anjuna's opening of a new postal room required the image path to be updated. letter.jpg changed to letter_open3.jpg 4 ay önce
  anjuna krokus ecebc1a3ed [changed] Extracted the various mail images to a singular `images/shared/mail/...` folder. Ballet update left to Myles 4 ay önce
  anjuna krokus 046bbf6b0f [fixed] forgot to removed `boygirl` from the qproj. Thanx Skylah 4 ay önce
  Myles Croft (Hooded Silence) 5bf886284a Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  anjuna krokus 973af1b5c9 [added] boystat calls, just in case 4 ay önce
  anjuna krokus dff7c71bcc [removed] `boygirl` 4 ay önce
  anjuna krokus 84b8d33d63 [Added/fixed] Last pre-live fixes to the new Natasha Lover content. Now officially public with BBZ01's blessings 4 ay önce
  anjuna krokus 107ecab111 [fixed] different times between walking to the bus stop and walking back in pushkin 4 ay önce
  anjuna krokus 6087b84064 [changed] Removed reliance on `boyGirl` entirely. `npcgeneratec` is now sufficient. Still multiple variables with bad names though. But that's a problem for later 4 ay önce
  anjuna krokus 28b6b00f60 [changed] `hotcat` to `pcs_hotcat` 4 ay önce
  anjuna krokus f0ed4e216f [changed] `hotcat_rating` to `npc_hotcat` and `npc_apprnc` is now on a scale of 0 to 200 (like `pcs_apprnc`). `npcgeneratec` will be updated as soon as possible 4 ay önce
  anjuna krokus 141274bc54 [changed] ConvertToHotcat function can now take any number, and can thus also work for npcs 4 ay önce
  Kevin_Smarts a105956df8 [fixed] coding errors spotted by Steuchs 4 ay önce
  Kevin_Smarts 9a17eac03c Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  Myles Croft (Hooded Silence) 39288f6a7e [bug fix] forgot to comment out an end. 4 ay önce
  anjuna krokus 60c043620c [fixed] layout 4 ay önce
  anjuna krokus 958b1b9b68 [changed] Moved the camera functions to `phone_selfies`, clustering related code better 4 ay önce
  anjuna krokus 11ae42dd96 [changed] code simplification 4 ay önce
  anjuna krokus 5869a8304a [changed] loc setting done through shortgs + code simplifications 4 ay önce
  anjuna krokus 4b88f916bc [fixed] Therapist still showing up after rejecting the form + Added an additional warning to rejecting the therapist 4 ay önce
  anjuna krokus 784a31c520 [changed] skip the dynamic lowering of money if the price is less than (or equal to) 0. 4 ay önce
  anjuna krokus bf659be8db [fixed] Forgot to set a relevant variable 4 ay önce
  Kevin_Smarts 50526c6dbe Merge remote-tracking branch 'Anjuna/master' 4 ay önce
  Kevin_Smarts f413df8878 Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  anjuna krokus c60702104b Merge remote-tracking branch 'master/master' 4 ay önce
  Kevin_Smarts 36c754bd1d [fixed] missing 4 ay önce
  Myles Croft (Hooded Silence) 73e1370c10 [formatting] the migrating line took out the end terminator. 4 ay önce
  Myles Croft (Hooded Silence) 9900c04a16 [Formatting] migrating lines 4 ay önce
  Myles Croft (Hooded Silence) b8ba6736a0 [Ballet update] quality of life updates based on feedback and play testing, partial implementation of an <event> in kitchen, hallway and communal room is partially complete, and initial test of assessment grades, formatting, text in residence and school. new media added to improve user feedback for certain events. balancing various quest aspects such as fame, skill growth and other aspects. 4 ay önce
  Myles Croft (Hooded Silence) a2772b2eac Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Kevin_Smarts 108df8569c Merge remote-tracking branch 'Anjuna/master' 4 ay önce
  anjuna krokus 5c56189cd8 [removed] needless whitelines I accidentally added 4 ay önce
  anjuna krokus 40f8b8bdc8 [changed] Vitek, Dan, and Vasily should now take your slutty behaviour (dancing after the card-game, and sleeping with the gang) into account for fame gates. Removed trailing spaces 4 ay önce
  anjuna krokus 5aed731edd [fixed] Food menu's having broken links 4 ay önce
  anjuna krokus a92209bb37 [fixed] Blackmailer police report showing up too early 4 ay önce
  anjuna krokus 8800d34bdb Merge remote-tracking branch 'master/master' 4 ay önce
  LinaHirata e369685d6e Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Kevin_Smarts c6912f1ee4 Merge remote-tracking branch 'Felix/master' 4 ay önce
  Kevin_Smarts 3a9a070e18 Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  LinaHirata 0acff8ab27 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  LinaHirata c1e44feb37 [fixed] removed redundant checks when `is_dark` couldnt have possibly changed 4 ay önce
  anjuna krokus a78669c0fb [fixed] killvar is not applied correctly (its `killvar 'var'`) not `killvar var` 4 ay önce
  Vengeance_11 385d5ea9e7 Added Penis Envy to Albina game bet 4 ay önce
  Vengeance_11 8d4cad0f68 Edits to Albina file edits 4 ay önce
  Vengeance_11 137d3ed034 Proofreading 4 ay önce
  Vengeance_11 e0b1e872b2 Variable migration for cheerleading 4 ay önce
  LinaHirata 7b6fa4f87c [fixed] `themes` failsafe now actually working, also added `$location_type` to `metro` 4 ay önce
  LinaHirata db33f81317 [fixed] typo 4 ay önce
  LinaHirata 776e553668 [changed] moved `outdoors` call from `stat_display` to `stat`, added a failsafe to `themes` that re-renders `stat_display` if it was rendered using incorrect colors 4 ay önce
  LinaHirata 325011a7bf Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Myles Croft (Hooded Silence) 9352f2c256 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Myles Croft (Hooded Silence) 736723c2e2 [File change] change the new clock icon name to match other icons in directory. 4 ay önce
  anjuna krokus ec3ba7fb8f [added] Inactive next part of Natasha's love quest. Written by BBZ01 4 ay önce
  anjuna krokus e5da23d1ac [changed] Running now returns to `$loc, $loc_arg`. Since that is just the havana changingroom. Done in preparation for a specific future event (Thank BBZ for that one) 4 ay önce
  anjuna krokus a1d9596b62 [removed] stat_only food clearing the screen. It wasn't needed for the events that they were in and were actively hurting their use 4 ay önce
  anjuna krokus 9a223d1d3d [fixed] schoolgirl TG start now has a default starting age of 40-something before transforming into Sveta 4 ay önce
  anjuna krokus bf7ea6187c [fixed/removed] model agency refering to Sveta's real name and not her model name 4 ay önce
  anjuna krokus 608bc6cfe9 [fixed] Winning by KO in led to a soft-lock 4 ay önce
  anjuna krokus 751fd2439a [changed] Small changes to blackmailer to make the initialization and dreams stand out better 4 ay önce
  anjuna krokus 03adab28d6 Merge remote-tracking branch 'master/master' 4 ay önce
  bgkjdgbizgblzdgbr b0b6429efa [fixed] Wrong links. 4 ay önce
  anjuna krokus a6e84ee18d [removed] stuff related to the second banner which is no longer used 4 ay önce
  anjuna krokus 358c3f5db7 [fixed] extracted the display header function and updated the naming to use health and stamina, instead of life and endurance. Also updated `staminaV` which I had forgotten 4 ay önce
  Kevin_Smarts 9275dbecb6 Merge remote-tracking branch 'Anjuna/master' 4 ay önce
  Kevin_Smarts 38eb7be420 Merge remote-tracking branch 'Awesome/master' 4 ay önce
  anjuna krokus 785dff0744 [changes] Fully extracted the remaining direct links to havana from `kickboxing_funcs` (now without `havana_`) so it can be used by other locations if need be. Simplified some code in `havana.qsrc` 4 ay önce
  anjuna krokus 1d089a0b14 [changed] Finished the rest of the kickboxing migration to the `havana_` central location. Also did a full variable migration for kickboxing, simplifying logic, and a better temp variable cleanup. 4 ay önce
  anjuna krokus 52ad34a465 [changed] better description of unread books 4 ay önce
  Awesome 018fafae22 [Fixed] Teleport to Pav after Sex in Anushka shared apt 4 ay önce
  anjuna krokus 5419117c5e [added] a clause to handle 0 and 1 for setStat. Usually only relevant for setting `stren_plus` 4 ay önce
  anjuna krokus 8872c91d47 [added] clickeable links to the skill descriptions giving a popup message with an explenation of the modified calculation. 4 ay önce
  anjuna krokus c4e1503ed2 [fixed] Better description of unread books 4 ay önce
  anjuna krokus 1799409a93 [removed] duplicate line 4 ay önce
  anjuna krokus 3b8b02e52d [changed] layout stuff 4 ay önce
  anjuna krokus 6ebd3f2474 [added/changed/removed] Migrated more functions to the library_functions locations. Added the remaining book types to be able to be bought, loaned, and read. You now read a variable number of pages per read (increased by the nerd trait). Removed trailing spaces 4 ay önce
  Kevin_Smarts 42462c0a20 Merge remote-tracking branch 'Hooded_Silence/master' 4 ay önce
  Myles Croft (Hooded Silence) b438671f0c [File rename] changed the canal district name to city_canals in preparation for content and dating. 4 ay önce
  anjuna krokus 9376cff339 [changed] Extracted the kickboxing stuff to it's own file and made some layout changes 4 ay önce
  anjuna krokus b22562bd6d [changed] `beg` and `beg1` to `havana_running` 4 ay önce
  anjuna krokus f46e5afde1 [changed] `crossfit_north_...` to `havana_crossfit` and `havana_crossfit_funcs` 4 ay önce
  anjuna krokus a2f76d6dba [changed] `danceclass` to `havana_dance` 4 ay önce
  anjuna krokus 0414d560dd [changed] `bass` to `havana_pool` 4 ay önce
  anjuna krokus d4ca4977d7 [changed/removed] `fit` to `havana`. Removed trailing spaces 4 ay önce
  Kevin_Smarts 83b7722131 Merge remote-tracking branch 'Anjuna/master' 4 ay önce
  anjuna krokus 44854bf211 [changed] Max level skills now display "Max Level" instead of the progress bar 4 ay önce
  Myles Croft (Hooded Silence) 5076f9c085 [Bug fix] Removed incomplete call in gdksport. 4 ay önce
  Myles Croft (Hooded Silence) 6246caf174 [Bug fixes] fixed formatting bugs in various locations 4 ay önce
  Myles Croft (Hooded Silence) 86088492b0 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Kevin_Smarts d4e03e50a6 [fixed] Missing identifier in attribute check causing underwear toi have no stats 4 ay önce
  Kevin_Smarts ce46cb8946 Merge remote-tracking branch 'Awesome/master' 4 ay önce
  Myles Croft (Hooded Silence) cfe7353131 [Code clean up] Removal of the Wait action from various locations as it is now globally integrated into the stats display. 4 ay önce
  Awesome abcd3d7045 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Myles Croft (Hooded Silence) f0de23dc4a [Bug fix] When copying code, remember to save. 4 ay önce
  Myles Croft (Hooded Silence) 4841cc554e Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Kevin_Smarts ee325264c7 [fixed] Appearance system was checking BraQuality and not PBraQuality variable so it was not testing what Sveta was actually wearing. Same for Panties 4 ay önce
  Myles Croft (Hooded Silence) 6ce93ced95 [UI improvements and bug fixes] New UI feedback system being trialled for not wearing the right clothing in gyms, and to give feedback in ballet for school assessment. Mixed variable types resolved, and file migration completed in qproj. 4 ay önce
  Myles Croft (Hooded Silence) a0db3520c6 [Feature request] all ye who have waited for the wait button, ye can wait no more for lo it has arrived. all praise the gl gods. 4 ay önce
  Myles Croft (Hooded Silence) 7ec2bbbcad Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Awesome b136e5e7fe Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Myles Croft (Hooded Silence) bdef8681d2 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  Awesome f69610f82f [Fixed] Blank Screen when playing with Anushkas brothers 4 ay önce
  LinaHirata 09b2450c63 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
  LinaHirata 34dcbb81c2 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 ay önce
100 değiştirilmiş dosya ile 3985 ekleme ve 4472 silme
  1. 14 19
      glife.qproj
  2. 16 16
      locations/AppearanceSystem.qsrc
  3. 0 91
      locations/Kikatak.qsrc
  4. 6 3
      locations/Komp.qsrc
  5. 214 214
      locations/NikoWhore.qsrc
  6. 47 47
      locations/ParkKafe.qsrc
  7. 0 1
      locations/Prostitute.qsrc
  8. 15 15
      locations/UnitAppearance.qsrc
  9. 8 8
      locations/VolleyTrenCentr.qsrc
  10. 135 133
      locations/albina_chat.qsrc
  11. 59 59
      locations/albina_chat2.qsrc
  12. 278 191
      locations/albina_house_events.qsrc
  13. 78 78
      locations/albina_mother_events.qsrc
  14. 190 194
      locations/albina_sex_chat.qsrc
  15. 350 187
      locations/albina_sex_scenes.qsrc
  16. 14 14
      locations/albina_starlets.qsrc
  17. 23 22
      locations/albina_wine_event.qsrc
  18. 25 24
      locations/albinahome.qsrc
  19. 9 8
      locations/anush_bedroom.qsrc
  20. 1 1
      locations/anush_bedroom_city.qsrc
  21. 242 236
      locations/anushapt.qsrc
  22. 159 140
      locations/anushapt_city.qsrc
  23. 162 159
      locations/anushaptbr.qsrc
  24. 30 30
      locations/anushka.qsrc
  25. 12 12
      locations/anushkachat.qsrc
  26. 10 10
      locations/anushkachat_city.qsrc
  27. 12 12
      locations/anushkaev1.qsrc
  28. 8 8
      locations/anushkaev2.qsrc
  29. 9 8
      locations/anushkamaksim.qsrc
  30. 22 22
      locations/artem_date_events.qsrc
  31. 18 18
      locations/artem_dorm.qsrc
  32. 3 3
      locations/artem_nush_sex.qsrc
  33. 3 6
      locations/artem_sex.qsrc
  34. 48 48
      locations/artemhome.qsrc
  35. 6 6
      locations/arturQW.qsrc
  36. 1 4
      locations/audition_reflections.qsrc
  37. 18 17
      locations/auditions_minor1.qsrc
  38. 2 2
      locations/bed2.qsrc
  39. 2 2
      locations/bedr.qsrc
  40. 1 1
      locations/bedr2x.qsrc
  41. 5 2
      locations/bedrPar.qsrc
  42. 0 49
      locations/beg.qsrc
  43. 24 10
      locations/blackmailer.qsrc
  44. 0 388
      locations/boygirl.qsrc
  45. 1 1
      locations/bras.qsrc
  46. 1 1
      locations/bus.qsrc
  47. 87 87
      locations/cardgame_durak.qsrc
  48. 5 5
      locations/changingroom.qsrc
  49. 22 24
      locations/cikl.qsrc
  50. 29 29
      locations/city_apt_building.qsrc
  51. 2 2
      locations/city_canals.qsrc
  52. 1 5
      locations/city_center.qsrc
  53. 16 16
      locations/city_coffee_hole.qsrc
  54. 6 6
      locations/city_house_res_bedr.qsrc
  55. 0 4
      locations/city_industrial.qsrc
  56. 1 5
      locations/city_island.qsrc
  57. 52 52
      locations/city_jorahouse.qsrc
  58. 46 46
      locations/city_lake.qsrc
  59. 1 1
      locations/city_library.qsrc
  60. 8 8
      locations/city_mansion_residence_1.qsrc
  61. 1 1
      locations/city_mansion_residence_2.qsrc
  62. 1 41
      locations/city_market.qsrc
  63. 2 2
      locations/city_musicstore.qsrc
  64. 27 24
      locations/city_nightclub.qsrc
  65. 0 3
      locations/city_redlight.qsrc
  66. 0 4
      locations/city_residential.qsrc
  67. 2 2
      locations/city_sauna.qsrc
  68. 1 2
      locations/clothing.qsrc
  69. 3 5
      locations/core_library.qsrc
  70. 1 1
      locations/courtletter.qsrc
  71. 0 94
      locations/crossfit_north_box.qsrc
  72. 0 54
      locations/crossfit_north_girlmeet.qsrc
  73. 0 85
      locations/crossfit_north_record.qsrc
  74. 0 72
      locations/crossfit_north_wod.qsrc
  75. 0 85
      locations/danceclass.qsrc
  76. 3 2
      locations/dateF.qsrc
  77. 13 12
      locations/dateM.qsrc
  78. 5 5
      locations/dimaEv.qsrc
  79. 3 3
      locations/dimaHome.qsrc
  80. 6 6
      locations/dimaRevenge.qsrc
  81. 2 8
      locations/divan.qsrc
  82. 4 4
      locations/djibril.qsrc
  83. 39 39
      locations/djibrilev1.qsrc
  84. 0 205
      locations/enderKik.qsrc
  85. 2 219
      locations/events.qsrc
  86. 403 403
      locations/father.qsrc
  87. 5 14
      locations/food.qsrc
  88. 22 12
      locations/food_menu.qsrc
  89. 19 19
      locations/foto.qsrc
  90. 107 107
      locations/foto_models2.qsrc
  91. 57 56
      locations/foto_shoot.qsrc
  92. 1 1
      locations/gad_gpbarn.qsrc
  93. 47 0
      locations/gad_gpchores.qsrc
  94. 4 1
      locations/gad_gphouse.qsrc
  95. 49 12
      locations/gad_gpyard.qsrc
  96. 485 0
      locations/gad_market.qsrc
  97. 1 1
      locations/gad_miroslava_home.qsrc
  98. 7 7
      locations/gad_prostitutes.qsrc
  99. 105 50
      locations/gad_river.qsrc
  100. 1 1
      locations/gadukino.qsrc

+ 14 - 19
glife.qproj

@@ -320,11 +320,7 @@
 		<Location name="ender"/>
 		<Location name="nill"/>
 		<Location name="test"/>
-		<Location name="kikbox"/>
-		<Location name="initKik"/>
-		<Location name="Kikatak"/>
-		<Location name="enderKik"/>
-		<Location name="razrKik"/>
+		<Location name="kickboxing_funcs"/>
 	</Folder>
 	<Folder name="Furniture">
 		<Location name="bed"/>
@@ -869,7 +865,6 @@
 		<Location name="boylove"/>
 	</Folder>
 	<Folder name="Lover">
-		<Location name="boygirl"/>
 		<Location name="girlfriend"/>
 		<Location name="lover"/>
 		<Location name="lover_change"/>
@@ -938,7 +933,6 @@
 		<Location name="city_train"/>
 		<Location name="agentned"/>
 		<Location name="kameraKPZ"/>
-		<Location name="bass"/>
 		<Location name="burger"/>
 		<Location name="burgerWork"/>
 		<Location name="BurgerTip"/>
@@ -946,10 +940,8 @@
 		<Location name="city_nightclub"/>
 		<Location name="city_nightclubToilet"/>
 		<Location name="Club2"/>
-		<Location name="danceclass"/>
 		<Location name="city_library"/>
 		<Location name="city_hermitage"/>
-		<Location name="fit"/>
 		<Location name="talent_agency"/>
 		<Location name="casting"/>
 		<Location name="tatiana_lab"/>
@@ -977,6 +969,15 @@
 		<Location name="city_musicstore"/>
 		<Location name="city_musicstore_stock"/>
 	</Folder>
+	<Folder name="Havana Fitness Center">
+		<Location name="havana"/>
+		<Location name="havana_pool"/>
+		<Location name="havana_dance"/>
+		<Location name="havana_crossfit"/>
+		<Location name="havana_crossfit_funcs"/>
+		<Location name="havana_running"/>
+		<Location name="havana_kickboxing"/>
+	</Folder>
 	<Folder name="City Residential">
 		<Location name="city_residential"/>
 		<Location name="city_apt_building"/>
@@ -1167,6 +1168,7 @@
 		<Location name="gad_forest_lost"/>
 		<Location name="gad_meadow"/>
 		<Location name="gad_church"/>
+		<Location name="gad_market"/>
 		<Location name="gad_swamp"/>
 		<Location name="gad_swamp_yard"/>
 		<Location name="gad_swamphouse"/>
@@ -1175,6 +1177,7 @@
 		<Location name="gad_backwater"/>
 		<Location name="gp_elene_schedule"/>
 		<Location name="gp_zlatek_schedule"/>
+		<Location name="gad_gpchores"/>
 	</Folder>
 	<Folder name="Gadyukino Characters">
 		<Location name="hunters"/>
@@ -1304,8 +1307,6 @@
 		<Location name="hookup_after"/>
 	</Folder>
 	<Folder name="Misc">
-		<Location name="beg"/>
-		<Location name="beg1"/>
 		<Location name="housing"/>
 		<Location name="husb"/>
 		<Location name="husbSex"/>
@@ -1378,12 +1379,6 @@
 		<Location name="koncepod"/>
 		<Location name="koncepod1"/>
 	</Folder>
-	<Folder name="crossfit_north">
-		<Location name="crossfit_north_box"/>
-		<Location name="crossfit_north_wod"/>
-		<Location name="crossfit_north_record"/>
-		<Location name="crossfit_north_girlmeet"/>
-	</Folder>
 	<Location name="LBZhouse"/>
 	<Location name="BanSexType"/>
 	<Folder name="Magic">
@@ -1401,7 +1396,7 @@
 		<Location name="pushkin_ballet_init"/>
 		<Location name="core_library"/>
 		<Location name="npc_274_init"/>
-		<Location name="npc_292_init"/>
+		<Location name="npc_283_init"/>
 		<Location name="maya_residence"/>
 		<Location name="pushkin_ballet_center"/>
 		<Location name="pushkin_ballet_res"/>
@@ -1411,7 +1406,7 @@
 		<Location name="pushkin_ballet_secrets"/>
 		<Location name="marlilnsky_theatre"/>
 		<Location name="pushkin_theatre"/>
-		<Location name="st_petersburg_canals"/>
+		<Location name="city_canals"/>
 	</Folder>
 	<Location name="cleanHTML"/>
 	</Structure>

+ 16 - 16
locations/AppearanceSystem.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = '':
 	groomingBonus = func('AppearanceSystem', 'CalcGroomingBonus')
 	groomingPenalty = func('AppearanceSystem', 'CalcGroomingPenalty')
 	pcs_apprnc = func('AppearanceSystem', 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
-	Hotcat = func('AppearanceSystem', 'ConvertToHotcat')
+	pcs_hotcat = func('AppearanceSystem', 'ConvertToHotcat', pcs_apprnc)
 
 	killvar 'clothingBonus'
 	killvar 'accessoriesBonus'
@@ -166,18 +166,18 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 
 	!!bonuses for certain underwear
 	if $pantyworntype ! 'none':
-		if PanQuality => 4:
-			pantyBonus = PanQuality - 2
+		if PPanQuality => 4:
+			pantyBonus = PPanQuality - 2
 		else
-			pantyBonus = PanQuality - 1
+			pantyBonus = PPanQuality - 1
 		end
 	end
 
 	if $braworntype ! 'none':
-		if BraQuality => 4:
-			braBonus = BraQuality - 2
+		if PBraQuality => 4:
+			braBonus = PBraQuality - 2
 		else
-			braBonus = BraQuality - 1
+			braBonus = PBraQuality - 1
 		end
 	end
 
@@ -267,23 +267,23 @@ if $ARGS[0] = 'CalcAppearance':
 end
 
 if $ARGS[0] = 'ConvertToHotcat':
-	if pcs_apprnc <= 40:
+	if ARGS[1] <= 40:
 		result = 1
-	elseif pcs_apprnc <= 60:
+	elseif ARGS[1] <= 60:
 		result = 2
-	elseif pcs_apprnc <= 80:
+	elseif ARGS[1] <= 80:
 		result = 3
-	elseif pcs_apprnc <= 100:
+	elseif ARGS[1] <= 100:
 		result = 4
-	elseif pcs_apprnc <= 125:
+	elseif ARGS[1] <= 125:
 		result = 5
-	elseif pcs_apprnc <= 150:
+	elseif ARGS[1] <= 150:
 		result = 6
-	elseif pcs_apprnc <= 165:
+	elseif ARGS[1] <= 165:
 		result = 7
-	elseif pcs_apprnc <= 180:
+	elseif ARGS[1] <= 180:
 		result = 8
-	elseif pcs_apprnc <= 199:
+	elseif ARGS[1] <= 199:
 		result = 9
 	else
 		result = 10

+ 0 - 91
locations/Kikatak.qsrc

@@ -1,91 +0,0 @@
-# Kikatak
-if $ARGS[0] = 'player':
-	defsumV = agilV + reactV + KikDefV
-	defkofV = defsumV * 20 / 100
-	defV = rand(defsumV - defkofV, defsumV + defkofV)
-
-	if popad >= defV * 2:
-		'<b><font color="green">HIT</font></b>'
-		damageKrit = damage * 20 / 100
-		damage += damageKrit
-		healthV -= damage
-		pointKik += 1
-		'<font color="green">You have dealt <<damage>> points of damage.</font>'
-
-		if damage >= healthV * 20 / 100:
-			pointKik += 1
-			'<font color="green"><<$boydesc>> falls to the ground.</font>'
-
-			if healthV < (vitalV * 10 + strenV * 5) / 4:
-				'<font color="green"><<$boydesc>> is knocked out. You''ve won!</font>'
-				xgt 'enderKik', 'winKO'
-				exit
-			end
-		end
-	elseif popad < defV * 2 and popad >= defV:
-		'<font color="green">Contact</font>'
-		healthV -= damage
-		pointKik += 1
-		'<font color="green">You have dealt <<damage>> points of damage.</font>'
-
-		if damage >= healthV * 20 / 100:
-			pointKik += 1
-			'<font color="green"><<$boydesc>> falls to the ground.</font>'
-
-			if healthV < (vitalV * 10 + strenV * 5) / 4:
-				'<font color="green"><<$boydesc>> is knocked out. You''ve won!</font>'
-				xgt 'enderKik', 'winKO'
-				exit
-			end
-		end
-	elseif popad < defV:
-		'<font color="red">You''ve missed.</font>'
-	end
-end
-
-if $ARGS[0] = 'enemy':
-	defsum = pcs_agil + pcs_react + pcs_def
-	defkof = defsum * 20 / 100
-	def = rand(defsum - defkof, defsum + defkof)
-
-	if popad >= def * 2:
-		'<b><font color="red">You''ve gotten hit.</font></b>'
-		damageKrit = damage * 20 / 100
-		damage += damageKrit
-		pcs_health -= damage
-		pointKikV += 1
-		'<font color="red">You have received <<damage>> points of damage.</font>'
-
-		if damage >= pcs_health * 20 / 100:
-			pointKikV += 1
-			'<font color="red">You have fallen to the ground.</font>'
-
-			if pcs_health < (pcs_vital * 10 + pcs_stren * 5) / 4:
-				'<font color="red">You are knocked out. You''ve lost!</font>'
-				xgt 'enderKik', 'lossKO'
-				exit
-			end
-		end
-	elseif popad < def * 2 and popad >= def:
-		'<font color="red">You''ve gotten hit.</font>'
-		pcs_health -= damage
-		pointKikV += 1
-		'<font color="red">You have received <<damage>> points of damage.</font>'
-
-		if damage >= pcs_health * 20 / 100:
-			pointKikV += 1
-			'<font color="red">You have fallen to the ground.</font>'
-
-			if pcs_health < (pcs_vital * 10 + pcs_stren * 5) / 4:
-				'<font color="red">You are knocked out. You''ve lost!</font>'
-				xgt 'enderKik', 'lossKO'
-				exit
-			end
-		end
-	elseif popad < def:
-		'<font color="green">Missed</font>'
-	end
-end
-
---- Kikatak ---------------------------------
-

+ 6 - 3
locations/Komp.qsrc

@@ -365,7 +365,8 @@ if $ARGS[0] = 'znak':
 		if pcs_lover < 3:
 			act 'Look for a kind man':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -375,7 +376,8 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a normal guy':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -385,7 +387,8 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a strong man':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 2
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'

Dosya farkı çok büyük olduğundan ihmal edildi
+ 214 - 214
locations/NikoWhore.qsrc


+ 47 - 47
locations/ParkKafe.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'guys':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 5: 
+	if pcs_hotcat >= 5:
 		if kloftimes > 0:
 			'You notice Jora and Semyon sitting a bit further away from you. They clearly notice you as one of them nods towards your general direction to the other one. In the end, they ignore you to continue drinking beer and talking to each other.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'guys':
 				*clr & cla
 				gs 'boyStat', 'A44'
 				gs 'npcgeneratec', 0, 'Sporty Guy', rand(18,35)
-				gs 'boyStat', $npclastgenerated				
+				gs 'boyStat', $npclastgenerated
 				gs 'fame', 'city', 'sex', 3
 				gs 'drugs', 'alcohol', 'beer'
 				'You drink a glass of beer while the guys order another. One of them quietly slips something into your glass. You get drunk very quickly and the guys guide you to the nearest woods.'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'guys':
 					gs 'cum_call', 'mouth', $boy
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Become acquainted':gt 'parkkafe', 'klof 1'
 				else
 					if parkara = 0:parkara = 1
@@ -101,7 +101,7 @@ if $ARGS[0] = 'guys':
 					gs 'cum_call', 'anus', $boy
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Become acquainted':gt 'parkkafe', 'klof 1'
 				end
 			end
@@ -120,13 +120,13 @@ if $ARGS[0] = 'klof 1':
 	clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/11 1.jpg"></center>'
-	'You try to rise from the grass in front of the guys, but your legs and hands are shaking from the rough pounding they gave you.' 
+	'You try to rise from the grass in front of the guys, but your legs and hands are shaking from the rough pounding they gave you.'
 	if parkarainmouthnow = 0:
 		'Your vagina feels itchy as warm gooey sperm tickles down your legs. "Did you like it baby?" one of the guys mockingly asks.'
-	else	
+	else
 		'You still have the taste of the guys sperm in your mouth as you hear one of the guys, mockingly ask, "Did you like it baby?"'
 		parkarainmouthnow = 0
-	end	
+	end
 	act 'Yes':gt 'event', 'klof 2'
 	act 'No, walk away': gt 'parkKafe', 'end'
 end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'seniors':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/oldman.jpg"></center>'
-	if hotcat >= 4:
+	if pcs_hotcat >= 4:
 		'A senior citizen, looking a bit scrappy, suddenly stops in his tracks and yells out, "Hey, girl! You don''t want to drink that piss that they serve. Come with me and I''ll get you the real stuff..."'
 		'You look around thinking that the senior is yelling at someone else, but you notice he''s got his eyes locked on you. Pointing at yourself he starts yelling again, "Yes, you!"'
 		gs 'willpower', 'drink', 'resist'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'man':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		*clr & cla
 		minut += 15
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/drink.jpg"></center>'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'man':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/parkcafe.jpg"></center>'
 			'You look over towards the man, smile, and politely nod your thanks to him.'
-			'The man probably expected a different outcome, but there''s nothing he can do except smile and nod back.'	
+			'The man probably expected a different outcome, but there''s nothing he can do except smile and nod back.'
 			act 'Go back to your own': gt 'parkKafe', 'end', 'cafe'
 		end
 		act 'Walk over to him':
@@ -341,7 +341,7 @@ if $ARGS[0] = 'man':
 								end
 							else
 								act 'Stop! (<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 'Give in':
 								*clr & cla
 								gs 'stat'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'man':
 												gs 'arousal', 'end'
 												gs 'stat'
 												act 'Leave':gt 'city_center'
-											end									
+											end
 										end
 										act 'Pull out':
 											*clr & cla
@@ -442,7 +442,7 @@ if $ARGS[0] = 'man':
 							'The man gives you a small breather before he continues fucking you rapidly, and recognizing the usual grunts, you know what is about to happen...'
 							gs 'arousal', 'vaginal', 15
 							$orgasm_or = 'yes'
-							gs 'stat'		
+							gs 'stat'
 							act 'Cum inside me':
 								*clr & cla
 								gs 'cum_call', 'vaginal'
@@ -459,11 +459,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -481,7 +481,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'man':
 							'You lay with your back to him and tuck yourself in as the little spoon while he embraces you. With one of his arms he grabs his hard cock and starts teasing you with it by going up and down your pussy.'
 							'You let out a moan telling him that you''re ready as he slowly leads his cock inside you. He starts slowly thrusting into you as you feel an indescribable feeling hit you. Your moans get louder as he picks up his pace in reaction to you.'
 							'You keep squeaking, "Yes, yes, yes! Fuck me!" as he''s really picked up the pace by now. It doesn''t take long before it darkens in front of your eyes and you orgasm. You forget all about him as your insides enclose themselves and you have an amazing orgasm.'
-							'The man gives you a small breather before he continues fucking you rapidly. You recognize the usual grunts, so you know what is about to happen...'	
+							'The man gives you a small breather before he continues fucking you rapidly. You recognize the usual grunts, so you know what is about to happen...'
 							gs 'arousal', 'vaginal', 15
 							$orgasm_or = 'yes'
 							gs 'stat'
@@ -515,11 +515,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -537,7 +537,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -555,7 +555,7 @@ if $ARGS[0] = 'man':
 							'You take a small breather before continuing to bounce on top of him. It doesn''t take long before you recognize the usual grunt, you know what awaits next...'
 							gs 'arousal', 'vaginal', 15, 'dom'
 							$orgasm_or = 'yes'
-							gs 'stat'	
+							gs 'stat'
 							act 'Cum inside me':
 								*clr & cla
 								gs 'cum_call', ''
@@ -572,11 +572,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time," you say as you wink.'
-									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -594,7 +594,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time," you say as you wink.'
-									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -613,7 +613,7 @@ if $ARGS[0] = 'man':
 				'The man, noticing that he messed up, tries to save the situation, "I-It came out wrong. I didn''t mean it like that..."'
 				'However, it''s already too late because you''ve made up your mind. "No thank you! I see that ring on your finger. Go back to your wife instead of chasing girls in a different city... jerk!"'
 				act 'Leave': gt 'parkKafe', 'end', 'cafe'
-			end		
+			end
 		end
 	else
 		'You stealthily glance at the respectable man, but during the time you two sit there he doesn''t give any attention to you.'
@@ -659,12 +659,12 @@ if $ARGS[0] = 'youth':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/drinking.jpg"></center>'
-	if hotcat >= 4:
+	if pcs_hotcat >= 4:
 		'As you take a seat, you notice a loud group of people that are a bit farther away. Judging by the bottles on their table, you can tell that they''ve been drinking for a while. While you''re waiting for a waiter, you notice that some of them look at and then point towards you and whisper something to each other. Before you know it, there''s a younger woman standing in front you. "Me and my friends were wondering if you would like to join us?" She''s clearly tipsy from alcohol.'
 		'She turns around and looks towards her friends. She turns back to you while leaning into your personal space. "Listen, I was dared to come over to talk to you and..." she stops because she is having a hard time remembering what she wanted to say. "So what do you say? I promise it''s nothing dangerous and we''ll remain in the park."'
 		gs 'willpower', 'misc', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Decline (<<will_cost>> Willpower)': 
+			act 'Decline (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'youth':
 			'"Well yeah, the next part is quite simple. We want the two of you to walk around the park and give us a little show." They start to snicker at the thought of the two of you.'
 			'You look at them suspiciously. "What kind of show?"'
 			'They give you a look like you''re an idiot. "To go fuck of course."'
-			act 'Decline': 
+			act 'Decline':
 				*clr & cla
 				pcs_mood -= 20
 				gs 'stat'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'youth':
 									minut += 15
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-									'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.' 
+									'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.'
 									'The group is still flabbergasted as they didn''t expect it to play out the way it did, but are very pleased with the show.'
 									'The next few minutes are spent on putting your panties back on, and chatting with the rest of the group. At the same time you can hear the girl describe how good you taste.'
 									gs 'arousal', 'end'
@@ -807,8 +807,8 @@ if $ARGS[0] = 'youth':
 								minut += 15
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-								'You let out a moan, but before it escalates farther she stops and smiles. "Can''t have too much fun." You frown a little as though you''ve been robbed of something. However, you accept. The girl has already dressed herself and ran towards the group.' 
-								'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.' 
+								'You let out a moan, but before it escalates farther she stops and smiles. "Can''t have too much fun." You frown a little as though you''ve been robbed of something. However, you accept. The girl has already dressed herself and ran towards the group.'
+								'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.'
 								'The group is still flabbergasted as they didn''t expect it to play out the way it did, but are very pleased with the show.'
 								'The next few minutes are spent putting your panties back on, and chatting with the rest of the group. At the same time you can hear the girl describe how good you taste.'
 								gs 'arousal', 'end'
@@ -858,7 +858,7 @@ if $ARGS[0] = 'youth':
 								minut += 15
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-								'The two of you start laughing. "What is your problem old man?! Enjoy the show instead" the girl yells out before the two of you dress yourselves and run off giggling. He yells out after you.' 
+								'The two of you start laughing. "What is your problem old man?! Enjoy the show instead" the girl yells out before the two of you dress yourselves and run off giggling. He yells out after you.'
 								'As you return, the girl starts telling the group what happened and that you managed to complete the dare. They sit in awe as the two of you tell them about the old man that interrupted you.'
 								'The next few minutes are spent putting your panties back on, and chatting with the rest of the group as suddenly the old man passes by. "There he is!" she exclaims as she points to him. The group start making a lot of noise, laughing as the man passes by.'
 								gs 'arousal', 'end'
@@ -868,8 +868,8 @@ if $ARGS[0] = 'youth':
 						end
 					end
 				end
-			end	
-		end	
+			end
+		end
 	else
 		'You look at the group of snickering youth, but they don''t seem to pay attention towards you and are mostly ignoring everyone around them.'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'blacks':
 			'You pull away from him. "What are you doing?"'
 			'His friends laugh and he blushes a bit. "Sorry, I just thought after last time... anyways, we should get going." With that he gets up to head for the door and his friends follow him.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
-		end	
+		end
 		act 'Sit in his lap':
 			*clr & cla
 			minut += 5
@@ -900,7 +900,7 @@ if $ARGS[0] = 'blacks':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/africantable2.jpg"></center>'
 			'You take a seat on his lap. One of them asks Djibril "Is this the girl?" He nods and they all smile. Apparently, he has been talking about you. They all start talking to you in an overtly flirty and sexual way before Djibril finally says "We were about to head back to our dorm. We were wondering if you would like to come with us and fuck. I promise that it will be a lot of fun. Are you interested?"'
-			act 'Accept': 
+			act 'Accept':
 				*clr & cla
 				minut += 20
 				DjibrilQW['invite'] = 1
@@ -928,10 +928,10 @@ if $ARGS[0] = 'blacks':
 			'He glances over at them, then looks back to you. "Sorry, I have to go. But it was nice meeting you again. Have a nice day." after saying that, he turns and leaves to join his friends outside. Then he stops at the door. "Hey if you want, why don''t you stop by my dorm some time." Then he tells you which building it is and which room is his. After that he walks outside with his friends and they walk away.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
 		end
-	elseif DjibrilQW['meet'] = 1 and hotcat >= 5:
+	elseif DjibrilQW['meet'] = 1 and pcs_hotcat >= 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/africantable1.jpg"></center>'
 		'You notice Djibril sitting with a few other young African men at another table. They see you and start to talk among themselves. From their constant glances, you are sure that they are talking about you. Djibril gives you a huge grin and waves you over. You, not wanting to be rude, get up to walk over to their table. "Hello again, <<$pcs_nickname>>! We are about to head back to our dorm. We were wondering if you would like to come with us and fuck. I promise that it will be a lot of fun. Are you interested?"'
-		act 'Accept': 
+		act 'Accept':
 			*clr & cla
 			minut += 20
 			DjibrilQW['invite'] = 1
@@ -963,8 +963,8 @@ if $ARGS[0] = 'blacks':
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
 		'You notice Djibril sitting with a few other young African men at another table. They see you and start to talk amongst themselves. After a few minutes they get up, and Djibril heads over to your table as his friends head outside. "Hello again <<$pcs_nickname>>, I didn''t expect to see you in the city." You talk to him for a few moments before one of his friends peeks their head back inside to yell, "Djibril, come on, let''s go."'
 		'He glances over at them, then looks back to you. "Sorry, I have to go. But it was nice meeting you again. Have a nice day." after saying that, he turns and leaves to join his friends outside. Then he stops at the door. "Hey if you want, why don''t you stop by my dorm some time." Then he tells you which building it is and which room is his. After that he walks outside with his friends and they walk away.'
-		act 'Leave': gt 'parkKafe', 'end', 'cafe'		
-	elseif hotcat >= 5:
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
+	elseif pcs_hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'A few young African men sitting at another table see you and start to talk among themselves. From the constant glances you receive, you are sure they are talking about you. Eventually, they get up and come over to your table. One of them introduces himself. "I am Djibril. What''s your name?"'
 		'You smile to him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people call me <<$pcs_nickname>>."'
@@ -974,7 +974,7 @@ if $ARGS[0] = 'blacks':
 		'He shakes his head with a slight laugh. "He is my uncle. They have told me about you. Small world, huh?"'
 		'You giggle as well, small world indeed. "Yeah, it really is."'
 		'He says. "We were about to head back to our dorm, so I was wondering if you would like to come with us. I promise it will be a lot of fun. Are you interested?"'
-		act 'Accept': 
+		act 'Accept':
 			*clr & cla
 			minut += 20
 			DjibrilQW['invite'] = 1
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'the_boy':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 5 or gosh >= 1:
+	if pcs_hotcat >= 5 or gosh >= 1:
 		if gosh >= 1:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big127.jpg"></center>'
 			'The two of you exchange glances, you do recognize him from somewhere. Then it hits you... it''s Gosha! Just as you remember, he comes to the same realization. Before you know it, he''s heading over. "Hi, <<$pcs_nickname>>! I''m surprised to see you here."'
@@ -1103,7 +1103,7 @@ if $ARGS[0] = 'the_boy':
 										gs 'stat'
 										act 'Head back to the café': gt 'parkKafe', 'end', 'cafe'
 									end
-									
+
 									gs 'willpower', 'bj', 'self'
 									if will_cost <= pcs_willpwr:
 										act 'Suggest a blowjob (<<will_cost>> Willpower)':
@@ -1125,13 +1125,13 @@ if $ARGS[0] = 'the_boy':
 										end
 									else
 										act 'Suggest a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-									end	
+									end
 									gs 'willpower', 'flash', 'resist', 'easy'
 									if will_cost <= pcs_willpwr:
 										act 'What for? (<<will_cost>> Willpower)':
 											*clr & cla
 											gs 'willpower', 'pay', 'resist'
-											minut += 15	
+											minut += 15
 											npc_rel['A127'] -= 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
@@ -1144,7 +1144,7 @@ if $ARGS[0] = 'the_boy':
 										act 'What for? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 									end
 								end
-							end	
+							end
 							gs 'willpower', 'misc', 'self', 'easy'
 							if will_cost <= pcs_willpwr:
 								act 'Head back (<<will_cost>> Willpower)':
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'the_boy':
 			'"Cute name!" he says as the two of you become acquainted with one another. You learn that he is a student and that he lives in the hostel. Gosha invites you visit him. He even gives you directions to the hostel and how to find his dorm. "Well, I won''t disturb you anymore, <<$pcs_nickname>>! Don''t be a stranger and come by!"'
 			act 'Leave': gosh = 1 & gt 'parkKafe', 'end', 'cafe'
 		end
-	elseif hotcat < 5 and gosh = 0:
+	elseif pcs_hotcat < 5 and gosh = 0:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big127.jpg"></center>'
 		'The two of you exchange glances, but you keep yourselves to only that. After a while, he finishes his meal and leaves the café without either of you saying anything to each other.'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'

+ 0 - 1
locations/Prostitute.qsrc

@@ -295,7 +295,6 @@ if $ARGS[0] = 'work2':
 		*clr
 		gs 'npcgeneratec', 0, '"John"', rand(18,45)
 		gs 'boyStat', $npclastgenerated
-		!! gs 'boygirl', 'details'    & !! does not seem to be needed for "Johns"
 		guy += 1
 		if pcs_throat < dick: pcs_throat += 1
 

+ 15 - 15
locations/UnitAppearance.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'GenRow':
     else
 	    '<<$ARGS[1]>>,<<unitHotcat>>,<<unitpcs_apprnc>>,<<unitbmi_calc>>,<<unitbodykoef>>,<<unitHeadBonus>>,<<unitAttributeBonus>>,<<unitclothingbonus>>,<<unitAccessoriesBonus>>,<<unitGroomingBonus>>,<<unitGroomingPenalty>>,<<unitpcs_apprncbase>>'
     end
-end 
+end
 
 if $ARGS[0] = 'GenRowBreak':
     if unitDisplayType = 0:
@@ -32,9 +32,9 @@ if $ARGS[0] = 'GenRowBreak':
             '<tr><th align="left"><<$ARGS[1]>></th><th align="right">clothingbonus Q1</th></th><th align="right">clothingbonus Q2</th></th><th align="right">clothingbonus Q3</th></th><th align="right">clothingbonus Q4</th></th><th align="right">clothingbonus Q5</th></th><th align="right">clothingbonus Q6</th></th><th align="right">clothingbonus Q7</th><th align="right">clothingbonus Nude</th></tr>'
         end
     else
-        '<<$ARGS[1]>>,hotcat,pcs_apprnc,bmi,bodykoef,HeadBonus,AttributeBonus,clothingbonus,AccessoriesBonus,GroomingBonus,GroomingPenalty,pcs_apprncbase'
+        '<<$ARGS[1]>>,pcs_hotcat,pcs_apprnc,bmi,bodykoef,HeadBonus,AttributeBonus,clothingbonus,AccessoriesBonus,GroomingBonus,GroomingPenalty,pcs_apprncbase'
     end
-end 
+end
 
 if $ARGS[0] = 'calcHotcat':
 	unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
@@ -233,7 +233,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-   
+
     $svetadesc = 'Computer Geek Start'
     unitsalo = 132
     unitpcs_hgt = 170
@@ -271,7 +271,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-   
+
     $svetadesc = 'Chess Player Start'
     unitsalo = 40
     unitpcs_hgt = 170
@@ -309,7 +309,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Volleyball Start'
     unitsalo = 75
     unitpcs_hgt = 170
@@ -347,7 +347,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Dancer Start'
     unitsalo = 55
     unitpcs_hgt = 170
@@ -385,7 +385,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Runner Start'
     unitsalo = 51
     unitpcs_hgt = 170
@@ -423,7 +423,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Football Start'
     unitsalo = 80
     unitpcs_hgt = 170
@@ -461,7 +461,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Popular Friends Start'
     unitsalo = 80
     unitpcs_hgt = 170
@@ -879,7 +879,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
    gs 'UnitAppearance', 'GenRowBreak', 'BMI Maximums'
 
     unitstrenbuf = 100
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
 
     $svetadesc = 'Current Clothes'
-    
+
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
 
     $svetadesc = 'Naked'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitlegkoef = 0
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
 
-end 
+end
 
 if $ARGS[0] = 'GetClothThick':
 	if ARGS[1] < 16:
@@ -1380,7 +1380,7 @@ end
 
 if $args[0] = 'SaloGenerateRows':
 
-    $unitclothingworntype = ''    
+    $unitclothingworntype = ''
     unitPCloQuality = 1
     $svetadesc = '<<$ARGS[2]>> Q1'
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
@@ -1416,7 +1416,7 @@ if $args[0] = 'SaloGenerateRows':
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
     unitclothingbonus7 = unitclothingbonus
 
-    $unitclothingworntype = 'nude'    
+    $unitclothingworntype = 'nude'
     $svetadesc = '<<$ARGS[2]>> Nude'
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
     unitclothingbonusnude = unitclothingbonus

+ 8 - 8
locations/VolleyTrenCentr.qsrc

@@ -23,9 +23,9 @@ if ShowerIvan = 4 and centr = 1:
 		'"I am sorry, <<$pcs_nickname>> and Guang, but my wife is expecting me and I must be going," the coach says, looking at his watch. He then departs, leaving you in the company of the Chinese trainer.'
 		act 'Ask about the coach':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak12.jpg"></center>'
-			'As soon as Mikhail left, you bombard the other trainer with questions about the coach, wanting to know about his life, his girlfriend, competitions and, of course, the European championship. Dumbfounded, Guang stares at you, unable to get a word in edgewise for the next few minutes as you jump from subject to subject without pause.' 
+			'As soon as Mikhail left, you bombard the other trainer with questions about the coach, wanting to know about his life, his girlfriend, competitions and, of course, the European championship. Dumbfounded, Guang stares at you, unable to get a word in edgewise for the next few minutes as you jump from subject to subject without pause.'
 			'Guang finally manages to force himself into the conversation as you pause momentarily to draw in a breath.'
 			'"If you don''t know these things, it means that Misha didn''t tell you, so why should I tell you and betray my friend''s trust?" he asks you.'
 			'You are at a loss, not knowing how to proceed. Fearing that he is going to continue to scold you, you prepare to leave.'
@@ -38,7 +38,7 @@ if ShowerIvan = 4 and centr = 1:
 			'The older man just smiles at you and shrugs.'
 			'You think about it and remember there were a couple of Chinese merchants at the market back home. Maybe one of them will have the rice wine.'
 			ShowerIvan = 5
-			act 'Move away':gt 'fit', 'start'
+			act 'Move away': gt 'havana', 'start'
 		end
 	end
 elseif ShowerIvan = 5 and centr = 2:
@@ -46,7 +46,7 @@ elseif ShowerIvan = 5 and centr = 2:
 	act 'Greet Guang':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak13.jpg"></center>'
-		'You go up to Guang and say hello.' 
+		'You go up to Guang and say hello.'
 		'"Have you brought it?" he asks.'
 		if ricewine = 1:
 			act 'Give him the wine':
@@ -59,8 +59,8 @@ elseif ShowerIvan = 5 and centr = 2:
 				act 'Ask question':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak15.jpg"></center>'
-					'About the European championship, tell me why the coach doesn''t want to talk about it," you ask after taking a deep breath.' 
-					'Guang bites his lip thoughtfully, then begins the story.' 
+					'About the European championship, tell me why the coach doesn''t want to talk about it," you ask after taking a deep breath.'
+					'Guang bites his lip thoughtfully, then begins the story.'
 					'"The stories are true, your coach really was on the national team. And they did make it to the European championships."'
 					'With bated breath, you listen to the story.'
 					act 'Play on':
@@ -76,7 +76,7 @@ elseif ShowerIvan = 5 and centr = 2:
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak17.jpg"></center>'
 								'"He almost ended up in jail, but the officials decided to avoid a scandal and just kicked Mikhail off of the team," Guang concluded his story.'
 								$OpenInnerThought+'"Now I understand why coach shies away from me whenever we start to get close,"'+$CloseInnerThought+'you think to yourself.'
-								act 'Move away':gt 'fit', 'start'
+								act 'Move away': gt 'havana', 'start'
 							end
 						end
 					end
@@ -84,7 +84,7 @@ elseif ShowerIvan = 5 and centr = 2:
 			end
 		else
 			'"Why are you here then?" he asks as he walks away from you.'
-			act 'Move away':gt 'fit', 'start'
+			act 'Move away': gt 'havana', 'start'
 		end
 	end
 end

+ 135 - 133
locations/albina_chat.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'chat':
 	menu_off = 1
 	gs 'stat'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	act 'Stop talking': gt 'albina_chat', 'chat_exit'
 	act 'Make small talk': gt'albina_chat','small_talk2'
@@ -22,12 +22,12 @@ end
 
 if $ARGS[0] = 'small_talk':
 	act 'Stop talking': gt 'albina_chat', 'chat_exit'
-	act 'Keep talking': gt'albina_chat','small_talk2'
+	act 'Keep talking': gt 'albina_chat','small_talk2'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 end
 
 if $ARGS[0] = 'small_talk2':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You chat about a variety of things, including school, music, clothes and what''s been going on in Pavlovsk lately.'
 	*nl
@@ -58,9 +58,9 @@ if $ARGS[0] = 'small_talk2':
 end
 
 if $ARGS[0] = 'topic_menu':
-	act'Talk about people':
+	act 'Talk about people':
 		cla
-		act'Talk about something else':cla & gs 'albina_chat','topic_menu'
+		act 'Talk about something else': cla & gs 'albina_chat','topic_menu'
 		gs 'albina_chat','maid_conversation'
 		gs 'albina_chat','bella_conversation'
 		gs 'albina_chat','lazar_conversation'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'topic_menu':
 	
 	act'Talk about life':
 		cla
-		act'Talk about something else':cla & gs 'albina_chat','topic_menu'
+		act 'Talk about something else': cla & gs 'albina_chat','topic_menu'
 		gs 'albina_chat','fun_talk'
 		gs 'albina_chat','exercise_talk'
 		!!gs 'albina_chat','lazar_conversation'
@@ -81,7 +81,7 @@ if $ARGS[0] = 'topic_menu':
 end
 
 if $ARGS[0] = 'job_talk1':
-	'"What do you do for money <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on Mama forever. Don''t tell me that everything you had came from Starlets?"'
+	'"What do you do for money, <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyway. But that''s dried up now and I can''t rely on Mama forever. Don''t tell me that everything you had came from Starlets?"'
 	act 'My mom':
 		cla & *nl
 		'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
@@ -125,7 +125,7 @@ if $ARGS[0] = 'stripper_talk1':
 		cla & *nl
 		'"I... do some strip dancing in the city," you admit, blushing hard.'
 		if age < 18:
-			'"You''re a stripper?" Her jaw drops. "How? You''re underage!"'
+			'Her jaw drops. "You''re a stripper?! How?! You''re underage!"'
 			if $start_type['group'] = 'gopnik':
 				'"I''ve had a fake passport for years," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
 			else
@@ -136,8 +136,8 @@ if $ARGS[0] = 'stripper_talk1':
 				gs 'albina_chat','small_talk'
 			end
 		else
-			'"You''re a stripper?" Her jaw drops and you laugh nervously.'
-			'"Y-Yeah. I needed money and it''s... an easy job," you reply.'
+			'Her jaw drops. "You''re a stripper?!"'
+			'You laugh nervously. "Y-Yeah. I needed money and it''s... an easy job," you reply.'
 			'"Say no more. I''ve always thought about doing it myself, I just don''t know what Mama would say about it..."'
 			gs 'albina_chat','small_talk'
 		end
@@ -147,14 +147,15 @@ if $ARGS[0] = 'stripper_talk1':
 		cla & *nl
 		'"I do some strip dancing in the city," you say casually.'
 		if age < 18:
-			'"You''re a stripper?" she exclaims, her jaw dropping. "How? You''re underage!"'
+			'"You''re a stripper?" she exclaims, her jaw dropping. "How?! You''re underage!"'
 			if $start_type['group'] = 'gopnik':
-				'"I''ve had a fake passport for years, Albina," you say, rolling your eyes. "How do you think I got all my booze?"'
+				'"I''ve had a fake passport for years," you say, rolling your eyes. "How do you think I got all my booze?"'
 			else
-				'"I got a fake passport," you admit with a shrug. "It wasn''t easy but it gets me past any doors that have an 18+ requirement."'
-				'"Maybe I''ll come visit you at work one night," Albina grins.'
+				'"I got a fake passport," you admit with a shrug. "It wasn''t easy, but it gets me past any doors that have an 18+ requirement."'
+				'"Maybe I''ll come visit you at work one night," she grins.'
 				'You gasp. "You would not!"'
-				'She smiles even wider. "I would so!" She raises her arms in defence as you hit her with a pillow.'
+				'She smiles even wider. "I would so!"'
+				'She raises her arms in defence as you hit her with a pillow.'
 				gs 'albina_chat','small_talk'
 			end
 		else
@@ -169,18 +170,18 @@ if $ARGS[0] = 'stripper_talk1':
 		cla & *nl
 		'"I do some strip dancing in the city," you admit, letting a smug smile creep onto your lips.'
 		if age < 18:
-			'"You''re a stripper?!" she exclaims, her jaw dropping. "How? You''re underage!"'
+			'"You''re a stripper?!" she exclaims, her jaw dropping. "How?! You''re underage!"'
 			if $start_type['group'] = 'gopnik':
 				'"I''ve had a fake passport for years," you grin. "Easiest way to get booze. Now it helps me with other things too."'
 			else
-				'"I got a fake passport. Expensive sumbitch, but it gets me into 18+ areas."'
+				'"I got a fake passport. Expensive, but it gets me into 18+ areas."'
 				'She grins. "Maybe I''ll come visit you at work one night..."'
 				'"I''m not giving you a free show," you smirk.'
 				'She smiles even wider. "Don''t worry, I''d happily pay to watch you shake that ass!"' 
 				gs 'albina_chat','small_talk'
 			end
 		else
-			'"You''re a stripper??" Albina asks excitedly.'
+			'"You''re a stripper?!" she asks excitedly.'
 			'"Why not? It''s easy money and it''s fun," you reply.'
 			'"I''ve always wondered what it would be like, but I don''t know what Mama would say about it..."'
 			gs 'albina_chat','small_talk'
@@ -192,7 +193,7 @@ if $ARGS[0] = 'pornstar_talk1':
 	if $pfname ! '':
 		act 'Embarrassed':
 			$AlbinaQW['porn_talk'] = 'embarrassed'
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Actually I..." you mumble, a blush already heating up your face. "I''ve been uhh... starring in some... <i>adult films</i>...?"'
 			'"Ew! You''re doing porn?! Seriously?!" She grimaces at you in disgust.'
@@ -201,10 +202,10 @@ if $ARGS[0] = 'pornstar_talk1':
 		
 		act 'Casual':
 			$AlbinaQW['porn_talk'] = 'casual'
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"I''ve been starring in pornos," you say with a casual shrug of your shoulders.'
-			'Albina''s jaw drops and she gives you a look of utter revulsion.'
+			'Her jaw drops and she gives you a look of utter revulsion.'
 			'"Ew! You''re doing porn?! Seriously?!"'
 			
 			!!'"Ew! You''re doing porn?! Seriously?! ' + iif(AlbinaQW['StarletsWhore'] > 0, 'After everything you and I went through, you let yourself get talked into being fucked on camera just for some extra cash?" She gives you a grimace of disgust before continuing on ranting. ', 'After everything I protected you from, you let yourself get talked into being fucked on camera just for some extra cash?" She gives you a grimace of disgust before continuing on ranting. ') + '"I can''t <i>imagine</i> doing porn, especially with all the underage porn of me floating around out there with my dad''s creepazoid child-fucker friends. Like I''d want to add to their collection any more. I can''t believe you''d stoop to doing something so disgusting <<$pcs_firstname>>."'
@@ -213,10 +214,10 @@ if $ARGS[0] = 'pornstar_talk1':
 		
 		act 'Happy':
 			$AlbinaQW['porn_talk'] = 'happy'
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Actually I..." you say, a smile tugging at the corners of your mouth. "I''ve been shooting some porn."'
-			'Albina''s jaw drops and she gives you a look of utter revulsion.'
+			'Her jaw drops and she gives you a look of utter revulsion.'
 			'"Ew! You''re doing porn?! Seriously?!"'
 			gs 'albina_chat','pornstar_talk2'
 		end
@@ -225,9 +226,9 @@ end
 
 if $ARGS[0] = 'albina_porn_rant1':
 	if AlbinaQW['StarletsWhore'] > 0:
-		'"After everything you and I went through, you let yourself get talked into being fucked on camera just for some cash?" she sneers back. "I can''t believe you''d stoop to doing something so disgusting <<$pcs_firstname>>."'
+		'"After everything you and I went through, you let yourself get talked into being fucked on camera just for some cash?" she sneers back. "I can''t believe you''d stoop to doing something so disgusting, <<$pcs_firstname>>."'
 	else
-		'"After everything I protected you from, you let yourself get talked into being fucked on camera just for some cash?" she sneers back. "I can''t believe you''d stoop to doing something so disgusting <<$pcs_firstname>>."'
+		'"After everything I protected you from, you let yourself get talked into being fucked on camera just for some cash?" she sneers back. "I can''t believe you''d stoop to doing something so disgusting, <<$pcs_firstname>>."'
 	end
 end
 
@@ -274,7 +275,7 @@ if $ARGS[0] = 'pornstar_talk2.2':
 		cla & *nl
 		'"It''s not my first choice of job," you admit, a sharp arrow of shame piercing your chest at your friend''s judgemental tone. "But I really need the money right now..."'
 		gs 'albina_chat','albina_porn_rant1'
-		'Albina takes a breath to continue her diatribe and seeing the expression on your face suddenly stops.'
+		'Albina takes a breath to continue her diatribe, seeing the expression on your face, she suddenly stops.'
 		'"Sorry..." she mumbles, looking away in shame. "I didn''t mean to be so harsh. I... I think I was taking this a little too personally. With everything that happened... I guess I just have a problem with sex and money. Mama would probably say I was projecting."'
 		'She gives you a sad smile.'
 		act 'Forgive her':
@@ -343,7 +344,7 @@ end
 if $ARGS[0] = 'pornstar_talk3.2':
 	act 'Get mad':
 		AlbinaQW['porn_fight'] = 1
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 		'"Well <i>so-rry</i> that I was born into a poor family that lives on an estate, barely scraping by week to week, instead of getting to live in a mansion with a pool, a walk-in closet, and a maid!" you snap back at her. "<i>Excuse me</i> if I have to resort to sex work because I don''t have a credit card to just buy all the slutty thongs I want without a second thought and every single piece of clothing in my wardrobe has to be bought without a single fucking ruble of help!"'
 		'Albina''s eyes fill with rage and she opens her mouth like she''s about to say something before it dies in her throat. Her mouth closes slowly and she looks away, seeming ashamed. She chews on her lip for a few seconds while avoiding eye contact with you.'
@@ -505,13 +506,13 @@ if $ARGS[0] = 'commando_talk':
 	if pcs_traits['commando_lvl'] > 0:
 		'"So you really never wear underwear?" Albina asks. Her glance at your thighs tells you the thought is turning her on at least a little. But the look in her eyes seems to show a certain amount of genuine curiosity.'
 		if pcs_traits['commando_lvl'] >= 2:
-			act'Never':
+			act 'Never':
 				cla & *nl
 				'"Nope. Never," you answer.'
 				'"I have to ask... Why?"'
 				gs 'albina_chat','commando_reply'
 			end
-			act'Only when I have to':
+			act 'Only when I have to':
 				cla & *nl
 				'"Only when I have to," you sigh, as if the very thought of putting on panties is a chore.'
 				'"I have to ask... Why?"'
@@ -519,7 +520,7 @@ if $ARGS[0] = 'commando_talk':
 			end
 		end
 		if pcs_traits['commando_lvl'] < 3:
-			act'Not <i>never</i>':
+			act 'Not <i>never</i>':
 				cla & *nl
 				'"Not <i>never</i>," you smile wryly. ' + iif(pcs_traits['commando_lvl'] = 2, '"Just when I feel like it."', '"Just sometimes."')
 				'"I have to ask... Why?"'
@@ -528,7 +529,7 @@ if $ARGS[0] = 'commando_talk':
 		end
 		
 		if stat['commando_streak'] > 14:
-			act'Not in weeks':
+			act 'Not in weeks':
 				cla & *nl
 				'"Haven''t in weeks," you tell her.'
 				'"I have to ask... Why?"'
@@ -544,8 +545,8 @@ if $ARGS[0] = 'commando_talk':
 			'"Seriously! I wear panties!"'
 			'"Prove it."'
 			if $pantyworntype = 'none':
-				act'Uhh...':
-					cla & *clr
+				act 'Uhh...':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 					'"Uhh..." Your face flushes with heat.'
 					'"HA! I knew it!" she shouts gleefully.'
@@ -554,8 +555,8 @@ if $ARGS[0] = 'commando_talk':
 					gs 'albina_chat','small_talk'
 				end
 				
-				act'Show her (you''re not wearing any)':
-					cla & *clr
+				act 'Show her (you''re not wearing any)':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 					if PCloSkirt > 0:
 						'With a wry smirk, you sit up crosslegged on the bed and hike your skirt, giving Albina a straight view right up your pussy, its lips spread with your legs.'
@@ -567,8 +568,8 @@ if $ARGS[0] = 'commando_talk':
 					gs 'albina_chat','small_talk'
 				end
 			else
-				act'Show her':
-					cla & *clr
+				act 'Show her':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 					'"Fine, look."'
 					if CloSkirtShortness > 0:
@@ -651,14 +652,14 @@ if $ARGS[0] = 'commando_reply':
 		end
 		'"Hmmm... Just one thing though..."'
 		'"What''s that?" you ask.'
-		'"Starlets was only on three times a week." Albina''s eyes twinkle and a smile tugs at the corner of her lips. "It doesn''t explain why you skipped the panties on the other four days..."'
+		'"Starlets was only on three times a week..." Her eyes twinkle and a smile tugs at the corner of her lips. "It doesn''t explain why you skipped the panties on the other four days..."'
 		gs 'albina_chat','small_talk'
 	end
 end
 
 if $ARGS[0] = 'pube_talk':
 	act 'Ask about her pubes':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"I can''t help but notice when we''re in the locker room that you keep your pussy clean," you say. "Do you shave every day?"'
 		if AlbinaQW['shower_caught'] = 0:
@@ -687,17 +688,17 @@ if $ARGS[0] = 'pube_talk2':
 	!!'"What about you? Do you shave?"'
 	if $pube_style['word'] = 'shaved':
 		!! clean shaven
-		'"What about you? I seem to notice a distinctive baldness down there yourself," Albina grins.'
+		'"What about you? I seem to notice a distinctive baldness down there yourself," she grins.'
 		act 'I hate bush too':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Yeah," you nod. "I hate bush too. It''s itchy and scratchy and just makes me feel gross down there. I much prefer being cleanshaven."'
-			'"Fuck yeah!" Albina cheers, high-fiving you. "Smooth pussy for life!"'
+			'"Fuck yeah!" she cheers, high-fiving you. "Smooth pussy for life!"'
 			gs 'albina_chat','small_talk'
 		end
 		
 		act 'It''s stylish':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Bush is so unfashionable," you say while rolling your eyes. "So 20th century. It''s <<year>> for goodness'' sake! Who the hell still has bush?"'
 			'"Pfft-! You''re just like Katja," she snickers. "But I won''t complain that you see it my way either. Smooth pussy revolution!" she cheers, high-fiving you.'
@@ -705,7 +706,7 @@ if $ARGS[0] = 'pube_talk2':
 		end
 		
 		act 'Boys like it':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			if stat['think_virgin'] = 0:
 				'"Yeah. Boys like it that way," you say with a shrug. "I don''t really care one way or the other, but as long as it keeps letting me get laid, I''ll keep shaving."'
@@ -731,9 +732,9 @@ if $ARGS[0] = 'pube_talk2':
 		!! stubbly
 		'"What about you? You were looking pretty stubbly in the locker room the other day," she remarks with a raised eyebrow. "Forget to shave?"'
 		act 'I really need to':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-			'"Yeah, I really need to," you sigh. "I normally do but I''ve been busy lately and haven''t had time to take care of it."'
+			'"Yeah, I really need to," you sigh. "I normally do, but I''ve been busy lately and haven''t had time to take care of it."'
 			'You wrinkle your nose in discomfort and Albina gives a grimace back to match.'
 			'"Ew. I can''t even wait a day. If I feel stubble, the wax comes out <i>that night</i>."'
 			gs 'albina_chat','small_talk'
@@ -743,7 +744,7 @@ if $ARGS[0] = 'pube_talk2':
 		
 		if pubestyle = 11:
 			act 'Only once it gets bad (lazy)':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"I''m too lazy to keep it clean all the time," you shrug. "I''ll get to it eventually."'
 				'"Doesn''t it bother you?" she grimaces back at you.'
@@ -755,16 +756,16 @@ if $ARGS[0] = 'pube_talk2':
 	elseif pcs_pubes <= 15:
 		!! small patch
 		'"What about you?" she remarks with a raised eyebrow. "The locker room makes it pretty obvious <i>you</i> aren''t waxing. You really like having that little patch of hair down there?"'
-		act'It''s cute':
+		act 'It''s cute':
 			cla & *nl
 			'"I think it''s cute!" you smile back. "Don''t you?"'
-			'"I prefer ''hot'' over cute," Albina smirks back. "And nothing''s hotter than a smooth pussy."'
+			'"I prefer ''hot'' over cute," she smirks back. "And nothing''s hotter than a smooth pussy."'
 			gs 'albina_chat','small_talk'
 		end
 		
-		act'Shaving makes me feel young':
+		act 'Shaving makes me feel young':
 			cla & *nl
-			'"I''ve tried going clean shaven before but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. Now I always keep a little hair down there."'
+			'"I''ve tried going clean shaven before, but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. Now I always keep a little hair down there."'
 			'"That''s old fashioned thinking," she insists. "Plenty of women go full Brazilian and it doesn''t make them any girlier. You need to get with the times. It''s <<year>>, bitch!"'
 			gs 'albina_chat','small_talk'
 		end
@@ -772,23 +773,23 @@ if $ARGS[0] = 'pube_talk2':
 		!! trimmed/styled bush
 		'"What about you?" she remarks with a raised eyebrow. "The locker room makes it pretty obvious <i>you</i> aren''t waxing. How can you stand having all that hair down there?"'
 		
-		act'It''s classy':
+		act 'It''s classy':
 			cla & *nl
 			'"I think it''s classy," you smile back wryly. "A more refined, mature look."'
-			'"''Classy and mature'' is pretty much the exact opposite of what I want," Albina guffaws. "I want ''hot and dirty.'' Smooth pussy fits that bill."'
+			'"''Classy and mature'' is pretty much the exact opposite of what I want," she guffaws. "I want ''hot and dirty.'' Smooth pussy fits that bill."'
 			gs 'albina_chat','small_talk'
 		end
 		
-		act'Shaving makes me feel young':
+		act 'Shaving makes me feel young':
 			cla & *nl
-			'"I''ve tried going clean shaven before but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. I''ll keep some bush down there like a woman."'
+			'"I''ve tried going clean shaven before, but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. I''ll keep some bush down there like a woman."'
 			'"That''s old fashioned thinking," she insists. "Plenty of women go full Brazilian. You need to get with the times. It''s <<year>>, bitch!"'
 			gs 'albina_chat','small_talk'
 		end
 	elseif pcs_pubes <= 30:
 		!! full bush
-		'"Ugh, how can you stand having all that hair down there?" she says, a disgusted look on her face as she turns to glance down at the pubic hair covering your pussy. "It feels like I''m putting my head on a fucking hamster!"'
-		gs 'albina_wine_event','shave_answer5'
+		'"Ugh, how can you stand having all that hair down there?" she says, a disgusted look on her face as she turns to glance down at the pubic hair covering your pussy. "Your pussy looks like a fucking hamster!"'
+		
 	else
 		!! untamed jungle
 		'"What about you?" she remarks with a raised eyebrow. "The locker room makes it pretty obvious <i>you</i> aren''t waxing. I mean, do you shave at all?!"'
@@ -798,14 +799,14 @@ end
 
 if $ARGS[0] = 'grow_pubes_chat1':
 	act 'Growing it out':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"I''m actually growing it out right now," you say.'
 		gs 'albina_chat','grow_pubes_chat2'
 	end
 	
 	act 'Thinking about growing it out':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"I''ve actually been thinking about growing it out lately," you say.'
 		gs 'albina_chat','grow_pubes_chat2'
@@ -813,8 +814,8 @@ if $ARGS[0] = 'grow_pubes_chat1':
 end
 
 if $ARGS[0] = 'grow_pubes_chat2':
-	'"Ew." Albina wrinkles her nose in disgust. "What the fuck would you do that for?"'
-	act'Change of pace':
+	'"Ew." She wrinkles her nose in disgust. "What the fuck would you do that for?"'
+	act 'Change of pace':
 		cla & *nl
 		'"No reason," you shrug back. "Change of pace I guess. Might feel nice having some hair down there again."'
 		'"That''s like saying you want to drink piss instead of lemonade for a ''change of pace,''" she replies, shaking her head in disgust. "Gross."'
@@ -838,14 +839,14 @@ if $ARGS[0] = 'grow_pubes_chat2':
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Makes me feel young':
+	act 'Makes me feel young':
 		cla & *nl
 		'"It makes me feel like a little girl," you say, wrinkling your nose. "Everything all smooth down there... Ugh. It makes me feel like I''m back in primary school. I''m tired of it. I want to feel like a woman instead of a girl, thank you very much."'
 		'"That''s old fashioned thinking," she insists. "Plenty of women go full Brazilian. You need to get with the times. It''s <<year>>, bitch!"'
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Tired of pleasing guys':
+	act 'Tired of pleasing guys':
 		cla & *nl
 		'"I''ve never enjoyed having a shaved pussy. I only ever did it because guys liked it," you sigh. "I''m tired of conforming what I do with <i>my body</i> just to please boys. I''m going bush and I''m gonna like it."'
 		'"I guess I can''t blame you for that," she says with a rueful smile.'
@@ -861,7 +862,7 @@ if $ARGS[0] = 'pube_explain_chat1':
 end
 
 if $ARGS[0] = 'tell_about_generic_boyfriend':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'She grins at you. "Right, so who are you dating again?"'
 	'"<<$ARGS[1]>>..." you reply.'
@@ -873,7 +874,7 @@ if $ARGS[0] = 'tell_about_generic_boyfriend':
 end
 
 if $ARGS[0] = 'telling_marrige_dreams':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You sigh in a way only those who are in love can. "Hopefully <<$ARGS[1]>> and I can get married soon."'
 	'She gives you a somewhat skeptical look, then shrugs. "Best of luck with that, I guess. I''m happy just hooking up for casual sex. Relationships can suck it."'
@@ -884,7 +885,7 @@ end
 if $ARGS[0] = 'maid_conversation':
 	if AlbinaQW['Maid'] <= daystart:
 		act 'The new maid':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Have you seen the new maid, Milena, yet? She''s a little older but just as, if not more, attractive than the last one, but my father isn''t here to charm her into sucking his dick. Not that it would work anyway. She bats for the other team, if you know what I mean..." she says with a wink. "Mama says I shouldn''t disturb her when she''s doing her work, but we like chatting with each other about pretty much everything. That''s when I found out about her girlfriend."'
 			'You laugh. "Disappointed that you can''t get in her pants?"'
@@ -899,7 +900,7 @@ end
 
 if $ARGS[0] = 'bella_conversation':
 	act 'Ask about Bella':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"So are you friends with Bella? You seem to talk a lot," you ask.'
 		'"Why? You jealous?" she laughs with a mock curious gaze. "I''m just kidding. We run in the same social circles and have known each other for a long time. She''ll never admit it, but yeah, we are sort of like friends. She and Vicky were the only girls I could trust growing up, even if Bella is a bit of a bitch. She''s invited me to hang with the people she calls her friends, but these are guys and girls who are <i>way</i> older than her and I didn''t get a good feeling from them, so I chose to keep my distance. They throw awesome parties though, if Bella decides you''re ''mature enough'' for her to invite you."'
@@ -914,7 +915,7 @@ if $ARGS[0] = 'lazar_conversation':
 	if AlbinaQW['Lazar_Sex'] = 1:
 		act 'Ask her about Lazar':
 			AlbinaQW['Lazar_Sex'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			if AlbinaQW['Lazar_Threesome'] >= 1:
 				'"What''s the deal with you and Lazar?" you ask her.'
@@ -940,7 +941,7 @@ end
 
 if $ARGS[0] = 'lover_conversation':
 	act 'No':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head. "Not really, no..."'
 		'She shakes her head and smiles. "Don''t worry, not everyone''s interested in dating."' 
@@ -950,7 +951,7 @@ if $ARGS[0] = 'lover_conversation':
 	
 	if arrsize('$fuckbuddy') = 1:
 		act 'I have a fuckbuddy':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Pretty much the same deal as you," you smile. "I keep it casual with a fuckbuddy. We booty call each other whenever we want to get off."'
 			'"Better that way, isn''t it?" she smirks. "Romance is overrated. Let''s not kid ourselves. We''re all in it for the fucking."'
@@ -959,7 +960,7 @@ if $ARGS[0] = 'lover_conversation':
 		end
 	elseif arrsize('$fuckbuddy') < 7:
 		act 'A few fuckbuddies':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Pretty much the same deal as you," you smile. "I keep it casual with a few fuckbuddies I have stashed around the way. They booty call me whenever they want to hook up."'
 			'"Better that way, isn''t it?" she smirks. "Romance is overrated. Let''s not kid ourselves. Even couples are just looking for an excuse to fuck."'
@@ -968,7 +969,7 @@ if $ARGS[0] = 'lover_conversation':
 		end
 	else
 		act 'A lot of fuckbuddies':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Pretty much the same deal as you," you smile. "I have a bunch of guys I keep it casual with. They booty call me whenever they want to hook up."'
 			'"A bunch?" She raises an eyebrow. "How much is ''a bunch''?"'
@@ -978,7 +979,7 @@ if $ARGS[0] = 'lover_conversation':
 			act 'Change the subject': gt 'albina_chat', 'chat'
 			act 'Accept your sluttiness':
 				cla & *nl
-				'"Uh, yes?" You give Albina a nonchalant shrug. "I like sex. I''m going to have as much of it as I want. If that makes me a slut then so be it."'
+				'"Uh, yes?" You give her a nonchalant shrug. "I like sex. I''m going to have as much of it as I want. If that makes me a slut then so be it."'
 				act 'Stop talking': gt 'albina_chat', 'chat_exit'
 				act 'Change the subject': gt 'albina_chat', 'chat'
 			end
@@ -987,7 +988,7 @@ if $ARGS[0] = 'lover_conversation':
 	
 	if stat['hookup'] > 0:
 		act 'I hook up with random guys':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You know how guys try to pick you up around town?" you ask and Albina rolls her eyes.'
 			'"Duh. I can''t go a day without some pervert catcalling me about my ass and how fuckable it looks." She gives you a sly smile. "But just because they''re right doesn''t make it any less gross."'
@@ -1000,7 +1001,7 @@ if $ARGS[0] = 'lover_conversation':
 				cla & *nl
 				'"It''s pretty hit or miss," you admit. "But when it''s good, it''s great. I can put up with a few bad lays and tiny dicks for that. Hit enough quantity, you''ll get quality."'
 				'"You really are a slut!" she guffaws loudly.'
-				'"Take it back you bitch!" you laugh back.'
+				'"Take it back, you bitch!" you laugh back.'
 				act 'Stop talking': gt 'albina_chat', 'chat_exit'
 				act 'Change the subject': gt 'albina_chat', 'chat'
 			end
@@ -1018,7 +1019,7 @@ if $ARGS[0] = 'lover_conversation':
 	
 	if Rex_Love = 1 or artemQW['bf'] = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or pcs_lover > pcs_girlfriends:
 		act 'I have a boyfriend':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'She grins at you. "Right, so who are you dating again?"'
 			gs 'albina_chat', 'lover_niko_talk'
@@ -1043,7 +1044,7 @@ if $ARGS[0] = 'lover_niko_talk':
 		act 'Niko':
 			cla
 			'"Niko," you tell her.'
-			'Albina gives you a concerned look. "<<$pcs_nickname>>, he''s bad news. He isn''t what he seems, so just... Just be careful with him, okay?"'
+			'She gives you a concerned look. "<<$pcs_nickname>>, he''s bad news. He isn''t what he seems, so just... Just be careful with him, okay?"'
 			'"What do you mean?" you ask curiously, but she just dimisses the question and changes the subject.'
 			act 'Stop talking': gt 'albina_chat', 'chat_exit'
 			act 'Change the subject': gt 'albina_chat', 'chat'
@@ -1076,7 +1077,8 @@ if $ARGS[0] = 'lover_vitek_talk':
 		act 'Vitek':
 			cla
 			'"Vitek," you reply.'
-			'She is taken aback in surprise. "Really <<$pcs_nickname>>, <i>really</i>? Of all the boys in school, you go for the wannabe tough guy with tiny dick syndrome? With the amount of steriods he''s probably jacked up on, I''d be surprised if his dick hasn''t shrivelled back up inside him yet." You''re about to speak, but she scoffs in disgust and quickly changes the subject.'
+			'She''s taken aback in surprise. "Really <<$pcs_nickname>>, <i>really</i>? Of all the boys in school, you go for the wannabe tough guy with tiny dick syndrome? With the amount of steriods he''s probably jacked up on, I''d be surprised if his dick hasn''t shrivelled back up inside him yet!"'
+			'You''re about to speak, but she scoffs in disgust and quickly changes the subject.'
 			act 'Stop talking': gt 'albina_chat', 'chat_exit'
 			act 'Change the subject': gt 'albina_chat', 'chat'
 		end
@@ -1091,7 +1093,7 @@ if $ARGS[0] = 'lover_artem_talk':
 			'"Artem? Geeky little Artem?" She stops and seems to consider it. "Well, I guess he is kind of cute... I bet you have him wrapped around your little finger and he does whatever you want, right?" she says with a sly smile.'
 			'You shake your head. "He''s sweet, and really nice to me."'
 			'She laughs, seemingly amused by your words. "Yeah, I''m sure he is ''nice'' and ''sweet''. Does he rock your world though?" she asks with a grin.'
-			'You disregard her comment. "There''s more to life than sex you know!" The amused look on her face tells you she isn''t buying it. "Okay fine, he''s pretty good at it... Good enough anyway."'
+			'You disregard her comment. "There''s more to life than sex you know!" The amused look on her face tells you she isn''t buying it, though. "Okay fine, he''s pretty good at it... Good enough anyway."'
 			'She again laughs at your comment. "I''m sure that feedback will be well received! Whatever, he''s a nerd who''s getting some pussy. That makes him the alpha of that pack of losers," she says while shrugging her shoulders.' 
 			act 'Stop talking': gt 'albina_chat', 'chat_exit'
 			act 'Change the subject': gt 'albina_chat', 'chat'
@@ -1117,7 +1119,7 @@ end
 if $ARGS[0] = 'lover_kolka_talk':
 	if brotherSex > 0:
 		act 'Kolka':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			if albina['kolka_know'] = 0:
 				'"Well..." you say. "I''ve been doing stuff with Kolka lately."'
@@ -1201,18 +1203,18 @@ if $ARGS[0] = 'zoya_conversation':
 	if AlbinaQW['Mom_Future'] = 0:
 		act 'Ask about her mother':
 			AlbinaQW['Mom_Future'] = 1
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'You''re not sure how you should ask this, but you''re curious about her mother. "I don''t mean to pry, but what''s the story with your mother?"'
 			'Albina glances at you, but relents. "My mother is fascinated by the human mind and wanted to become a psychiatrist, so she ended up doing modelling, a lot of it nude and erotic, to earn enough money to go to university. She met my... my father through a mutual friend and they started dating and eventually got married. She ended becoming his trophy wife that he paraded around at every social event."'
 			act 'Continue':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"It made her uncomfortable and after she ended up pregnant with me, things just got worse. My father never wanted children, so they argued constantly after I was born. She ended up divorcing him when I was 8 years old after she found out about the 18 year old gold digging stripper whore who was sucking his dick every chance she got. She stormed out on him and never looked back. Being forced to leave me behind broke her heart and she''s still feeling guilty about it, so please don''t mention anything about it to her."' 
 				'"Anyway, she went to Moscow and finally got into university, where she earned her degree before she moved back here and got her dream job working at a hospital in the city, right under his nose. She''s looking into getting me into uni myself," she says with a warm smile and a twinkle in her eye. You''ve never seen her look so... happy before.'
 				'She turns to you. "So what about you? What do you want to do after school?" she asks warmly.'
 				act 'I don''t know':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 					'"I''m not sure, but I guess I have a few options," you admit.'
 					'She nods. "Well, you should decide before you end up stuck in this shithole town or working some shitty job in the city. Although being a stripper <i>does</i> pay well...." she says with a smirk.'
@@ -1221,7 +1223,7 @@ if $ARGS[0] = 'zoya_conversation':
 					act 'Change the subject': gt 'albina_chat', 'chat'
 				end
 				act 'Go to the university':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 					'You get a little excited. "I''m planning to attend university as well. At least now I''ll know someone there."'
 					'"Maybe we could get dorm rooms next to each other?" she says and you both smile.'
@@ -1246,21 +1248,21 @@ end
 
 if $ARGS[0] = 'clothing_conversation':
 	!!act 'Ask where she buys her clothes': (This currently doesn't lead anywhere and will confuse players, so I'm commenting it out until I write the follow up event. - Veng)
-		!!cla & *clr
+		!!*clr & cla
 		!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		!!'You look around and notice her expensive looking clothes hanging up in her huge wall-to-wall closet. Even the underwear you''ve seen her wearing looks fancy. You''re curious about where she gets her clothes since it''s obvious she doesn''t get them locally. Not even the expensive stores in the city mall sell some of the things you see. "Where do you buy your clothes? Online?"'
 		!!'"Pretty much. I buy what I like the look of when I''m shopping in the city, but most of my clothes are personally imported from Europe and America."'
 		!!'You wish you could afford such nice clothes, but admit to yourself that buying imported stuff is way out of your price range. Albina notices you thinking to yourself and smiles. "Don''t look so glum <<$pcs_nickname>>. Mon Cheri, the boutique in the mall, has a ton of stuff you can buy. Tell you what, I''m going there at the weekend. Come by and we can go together, yeah?"'
 		!!act 'Accept':
 			!!AlbinaQW['Go_Shopping'] = 1
-			!!cla & *clr
+			!!*clr & cla
 			!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			!!'You accept her offer and she tells you to come to her house on Saturday at noon. "Make a note somewhere and don''t forget!" she suggests.'
 			!!act 'Change the subject': gt 'albina_chat', 'chat'
 			!!act 'Stop talking': gt 'albina_chat', 'chat_exit'
 		!!end
 		!!act 'Turn her down':
-			!!cla & *clr
+			!!*clr & cla
 			!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			!!'You turn down her offer. "Sorry Albina, but I already have plans for Saturday." She just shrugs it off and changes the subject.'
 			!!act 'Change the subject': gt 'albina_chat', 'chat'
@@ -1270,14 +1272,14 @@ if $ARGS[0] = 'clothing_conversation':
 end
 
 if $ARGS[0] = 'fun_talk':
-	act'Talk about life':
-		cla & *clr
+	act 'Talk about life':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"You do anything fun lately?" you ask.'
 		if rand(1,3) = 1:
-			'"Hmm... Lazar?" Albina grins.'
+			'"Hmm... Lazar?" she grins.'
 		elseif rand(1,2) = 1:
-			'"I went shopping in the city recently," Albina says. "Got a lot of nice stuff. And a lot of cheap thongs. You should come with me sometime," she adds with a smirk. "I''d love to dress you down. I mean- up. Dress you up."'
+			'"I went shopping in the city recently," she says. "Got a lot of nice stuff. And a lot of cheap thongs. You should come with me sometime," she adds with a smirk. "I''d love to dress you down. I mean- up. Dress you up."'
 		else
 			if month >= 11 or month <= 3:
 				!! winter
@@ -1292,47 +1294,47 @@ if $ARGS[0] = 'fun_talk':
 end
 
 if $ARGS[0] = 'exercise_talk':
-	act'How does she keep fit?':
-		cla & *clr
+	act 'How does you keep fit?':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'"What''s your workout schedule like?" you ask Albina. "Do you just dance or do you do other things too?"'
-		'"Dancing is my main exercise but I try to get in a full body workout on the same day," she says. "I''ve got a home gym here so I''ll usually hit it in the afternoon. Lots of squats for my ass," she smirks. "And a good amount of cardio so I won''t get tired during shows. But I''ll only work out three or four times a week at most. Rest days are important or I''ll get hurt and that means no more dancing. Sometimes I''ll just dance and skip the gym. Especially if I hit the pole. You''d be surprised how much strength it takes. Though I do stretches nearly every day. Keeps me nice and flexible."'
+		'"What''s your workout schedule like?" you ask. "Do you just dance or do you do other things too?"'
+		'"Dancing is my main exercise, but I try to get in a full body workout on the same day," she says. "I''ve got a home gym here so I''ll usually hit it in the afternoon. Lots of squats for my ass," she smirks. "And a good amount of cardio so I won''t get tired during shows. But I''ll only work out three or four times a week at most. Rest days are important or I''ll get hurt and that means no more dancing. Sometimes I''ll just dance and skip the gym, especially if I hit the pole. You''d be surprised how much strength it takes, but I do stretches nearly every day to keep me nice and flexible."'
 		'She adds the last part with a sly look of implication."'
-		'"What about you?" Albina asks. "You keeping fit these days?"'
+		'"What about you?" she asks. "You keeping fit these days?"'
 		gs 'albina_chat','exercise_reply'
 	end
 end
 
 if $ARGS[0] = 'exercise_reply':
-	act'Not since Starlets':
-		cla & *clr
+	act 'Not since Starlets':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"Not really," you shrug. "Not since you shut down Starlets. It was good when I had a goal to work towards, but I just can''t keep it up for the sake of fitness."'
-		'"You really ought to try though," Albina nudges you pointedly. "It''s good for your brain. It keeps you young and sexy," she adds with a smirk.'
+		'"You really ought to try though." She nudges you pointedly. "It''s good for your brain. It keeps you young and sexy," she adds with a smirk.'
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Few times a week':
-		cla & *clr
+	act 'A few times a week':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"Same as you more or less," you reply. "A few times a week, not more than that."'
-		'"It''s the best way to do it," Albina nods.'
+		'"It''s the best way to do it," she nods.'
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Every day':
-		cla & *clr
+	act 'Every day':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'"I workout pretty much every day," you tell her. "It''s part of my routine. I like the consistency and I love seeing the progress I''m making."'
-		'"Don''t hurt yourself," Albina replies, looking annoyed. "You''re at least hitting different muscle groups, right?"'
-		act'No':
+		'"I work out pretty much every day," you tell her. "It''s part of my routine. I like the consistency and I love seeing the progress I''m making."'
+		'"Don''t hurt yourself," she replies, looking annoyed. "You''re at least hitting different muscle groups, right?"'
+		act 'No':
 			cla & *nl
 			'"Not really," you admit. "I just do everything."'
 			'"You can''t do that!" she says. "If you work everything every day, it''s only a matter of time before an injury happens!"'
 			gs 'albina_chat','small_talk'
 		end
 		
-		act'Yes':
+		act 'Yes':
 			cla & *nl
 			'"Yeah, I try to do something different every day," you tell her.'
 			'"At least you''re doing that much," she says with a small smile, looking relieved.'
@@ -1340,11 +1342,11 @@ if $ARGS[0] = 'exercise_reply':
 		end
 	end
 	
-	act'Every morning':
-		cla & *clr
+	act 'Every morning':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'"I workout every morning," you reply. "On the weekends, whenever I wake up. On weekdays, just before school."'
-		'"You really ought to program in some rest days," Albina replies, looking annoyed. "You''ll hurt yourself keeping that up."'
+		'"I work out every morning," you reply. "On the weekends, whenever I wake up. On weekdays, just before school."'
+		'"You really ought to program in some rest days," she replies, looking annoyed. "You''ll hurt yourself keeping that up."'
 		'"It''s part of my routine this way," you shrug. "I just roll out of bed and get to it."'
 		'"I guess," she huffs.'
 		gs 'albina_chat','small_talk'
@@ -1352,49 +1354,49 @@ if $ARGS[0] = 'exercise_reply':
 end
 
 if $ARGS[0] = 'diet_talk':
-	act'Ask what she eats':
-		cla & *clr
+	act 'Ask what she eats':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"What''s your diet like?" you ask.'
-		'"I burn a lot of calories dancing, so I don''t watch my intake <i>too</i> much," Albina tells you. "But I try to keep a healthy balance. Mostly chicken for protein, a good variety of veggies, minimize carbs. I like seeing my abs in the mirror," she smirks.'
+		'"I burn a lot of calories dancing, so I don''t watch my intake <i>too</i> much," she tells you. "But I try to keep a healthy balance. Mostly chicken for protein, a good variety of veggies, minimize carbs. I like seeing my abs in the mirror," she smirks.'
 		gs 'albina_chat','small_talk'
 	end
 end
 
 if $ARGS[0] = 'pajama_talk':
-	act'Ask what she wears to bed':
-		cla & *clr
+	act 'Ask what she wears to bed':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/sleep1.jpg"></center>'
-		'"I almost always sleep naked," Albina smirks. "I love the silky smooth feeling of my sheets. It feels wrong to wear even panties under the covers and deprive myself of that lovely softness. And because I''m on the pill, I don''t even need to worry about getting my period and staining the sheets. I can just snuggle in and sleep comfortably."'
-		act'You sleep naked too':
+		'"I almost always sleep naked," she smirks. "I love the silky smooth feeling of my sheets. It feels wrong to wear even panties under the covers and deprive myself of that lovely softness. And because I''m on the pill, I don''t even need to worry about getting my period and staining the sheets. I can just snuggle in and sleep comfortably."'
+		act 'I sleep naked too':
 			cla
-			act'Same reason':
+			act 'Same reason':
 				cla & *nl
 				'"I sleep naked too," you tell her. "There''s nothing quite like sheets on bare skin, is there?"'
-				'"You naughty girl," she replies jokingly. "I bet you shower naked too, you slut."'
+				'"You naughty girl," she replies jokingly. "I bet you shower naked too, you slut!"'
 				gs 'albina_chat','small_talk'
 			end
 			
-			act'It gets hot':
+			act 'It gets hot':
 				cla & *nl
 				'"I sleep naked too," you tell her. "It gets too hot for me if I''m wearing clothes under the covers."'
-				'"Hot and bothered?" she grins back jokingly. "Look at you, getting turned on by your own nudity, you naughty girl."'
+				'"Hot and bothered?" she grins back jokingly. "Look at you, getting turned on by your own nudity, you naughty girl!"'
 				gs 'albina_chat','small_talk'
 			end
 		end
 		
-		act'You wear panties':
+		act 'I wear panties':
 			cla
-			act'Same reason':
+			act 'Same reason':
 				cla & *nl
 				'"I like how it feels too," you tell her. "But I still wear panties to bed."'
 				'"Prude," she replies jokingly. "I bet you turn off the lights when you masturbate too."'
 				gs 'albina_chat','small_talk'
 			end
 			
-			act'It gets hot':
+			act 'It gets hot':
 				cla & *nl
-				'"I still wear panties," you tell her. "But it''s too hot for me under the covers if I put on anything more than that."'
+				'"I still wear panties," you tell her. "It''s too hot for me under the covers if I put on anything more than that."'
 				'"Full nude makes you too ''hot?''" she grins back, bouncing her eyebrows suggestively.'
 				gs 'albina_chat','small_talk'
 			end
@@ -1402,31 +1404,31 @@ if $ARGS[0] = 'pajama_talk':
 		
 		!!{act'Panties and bra':
 			cla
-			act'Same reason':
+			act 'Same reason':
 				cla & *nl
 				'"I like how it feels too," you tell her. "But I still wear panties to bed."'
 				'"Prude," she replies jokingly. "I bet you turn off the lights when you masturbate too."'
 				gs 'albina_chat','small_talk'
 			end
 			
-			act'It gets hot':
+			act 'It gets hot':
 				cla & *nl
-				'"I still wear panties," you tell her. "But it''s too hot for me under the covers if I put on anything more than that."'
+				'"I still wear panties," you tell her. "It''s too hot for me under the covers if I put on anything more than that."'
 				'"Full nude makes you too ''hot?''" she grins back, bouncing her eyebrows suggestively.'
 				gs 'albina_chat','small_talk'
 			end
 		end}
 		
-		act'Panties and a top (no bra)':
+		act 'Panties and a top (no bra)':
 			cla
-			act'It''s comfy':
+			act 'It''s comfy':
 				cla & *nl
 				'"I sleep fully covered," you tell her. "I skip the bra, but I still wear panties and a shirt. I think it''s comfy."'
 				'"You don''t know what you''re missing out on," she grins back. "Try losing the shirt sometime. You won''t go back."'
 				gs 'albina_chat','small_talk'
 			end
 			
-			act'Sleeping nude is weird':
+			act 'Sleeping nude is weird':
 				cla & *nl
 				'"I sleep fully covered," you say, giving her a look. "Sleeping naked is <i>weird</i>."'
 				'"Prude," she replies jokingly. "I bet you turn off the lights when you masturbate too."'

+ 59 - 59
locations/albina_chat2.qsrc

@@ -7,8 +7,8 @@ if $ARGS[0] = 'first_model_talk1':
 			AlbinaQW['know_model'] = daystart
 			cla & *nl
 			if fame['pav_modelling'] >= 400 and stat['school_knows_model'] = 0:
-				'"I... Do some modelling in the city..." you admit slowly. Albina''s eyes go wide.'
-				'"Holy shit! The rumors are true!" she shouts gleefully, suddenly punching you in the arm.'
+				'"I... Do some modelling in the city..." you admit slowly.'
+				'Her eyes go wide. "Holy shit! The rumors are true!" she shouts gleefully, suddenly punching you in the arm.'
 				'"Ow! What rumors?" you ask in sudden bewilderment.'
 				'"The ones about a model that looks like you!" she grins. "I figured they had to be bullshit, but this means it really is you! Why would you hide that from me?"'
 			else
@@ -17,7 +17,7 @@ if $ARGS[0] = 'first_model_talk1':
 			end
 			if age < 18:
 				'"It''s not..." you say hesitantly. "Strictly speaking... Legal..."'
-				'Albina''s eyes narrow. "Why? What kind of modelling are you doing?" she asks suspiciously.'
+				'Her eyes narrow. "Why? What kind of modelling are you doing?" she asks suspiciously.'
 				gs 'albina_chat2','first_model_talk_shy1'
 				gs 'albina_chat2','first_model_talk2'
 				gs 'albina_chat2','first_model_talk_proud2'
@@ -36,7 +36,7 @@ end
 
 if $ARGS[0] = 'first_model_talk_proud2':
 	act 'Tell her (proud)':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		if $model['type'] = 'catalog':
 			'"Catalogue modelling!" you say with bubbly excitement. "The kind that you see on websites to show what''s for sale or in magazines with a company''s stock. It''s not much right now, but it''s a foot in the door!"'
@@ -94,7 +94,7 @@ end
 
 if $ARGS[0] = 'first_model_talk2':
 	act 'Tell her (nonchalant)':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		if $model['type'] = 'catalog':
 			'"Just some catalogue modelling," you say nonchalantly. "You know, the kind that you see on websites to show what''s for sale. No big deal."'
@@ -176,12 +176,12 @@ end
 !!not done
 if $ARGS[0] = 'first_model_talk4':
 	if modelfoto['nude'] > 0:
-		'"You''re naked in these?" Albina''s eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re naked in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	elseif modelfoto['topless'] > 0:
-		'"You''re topless in these?" Albina''s eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re topless in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	end
 	act 'Stop her':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"No!" you squeal, grabbing her by the arm to stop her. Albina back looks at you, bewildered.'
 		AlbinaQW['model_no_look'] = 1
@@ -197,11 +197,11 @@ if $ARGS[0] = 'first_model_talk4':
 	if $model['nickname'] = $pcs_firstname or $model['nickname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname:
 		act 'It''s not my name (lie)':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
-			'She stops and turns to look at you with a frown. You snicker internally but manage to maintain a straight face, hoping she won''t see through your bluff.'
+			'She stops and turns to look at you with a frown. You snicker internally, but manage to maintain a straight face, hoping she won''t see through your bluff.'
 			*nl
 			'"Fuck!" she pouts. "Tell me what to search!"'
 			'"Nope! You''re never finding those pics," you reply smugly, enjoying the feeling of pulling one over on her.'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'first_model_talk4':
 		end
 		
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches and quickly finds your profile. "You didn''t even change your name?" she snickers.'
 			act 'It seemed wrong':
@@ -236,7 +236,7 @@ if $ARGS[0] = 'first_model_talk4':
 	else
 		act 'It''s not my name':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -247,7 +247,7 @@ if $ARGS[0] = 'first_model_talk4':
 		end
 			
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches for you using your real name, but can''t find it because you used a pseudonym.'
 			'"Why can''t I find you?!" she grumbles in frustration.'
@@ -275,9 +275,9 @@ if $ARGS[0] = 'first_model_talk_tell':
 end
 
 if $ARGS[0] = 'first_model_talk_nude1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/1.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/2.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/3.jpg"></center>'
-	'Albina''s eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
+	'Her eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
 	act 'Embarrassed':
 		cla & *nl
 		'You thought you weren''t embarrassed by this line of talk, but it''s hard not to be when the actual pictures are right in front of you, especially when Albina expands them to full screen and takes advantage of the high definition to zoom <i>very</i> far in. A warm blush spreads through your cheeks.'
@@ -352,8 +352,8 @@ if $ARGS[0] = 'first_model_talk_nude2':
 	if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
 		gs 'albina_chat2','first_model_talk_nude_pubes_shaved'
 	else
-		act'Continue':
-			cla & *clr
+		act 'Continue':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina starts saving the images to her hard drive and rapidly clicking through other websites, bookmarking them.'
 			'"What are you doing?" you ask, confused.'
@@ -426,16 +426,16 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			'You sit in silence for a few moments before Albina turns back towards you tentatively.'
 			'"Do you regret it?"'
 			act 'No':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-				'"No." You give Albina a smile. "Whatever the underhanded reason they got me to do it, once it was done, I didn''t regret it."'
+				'"No." You give her a smile. "Whatever the underhanded reason they got me to do it, once it was done, I didn''t regret it."'
 				'"Well... you <i>are</i> pretty hot in them aren''t you?" she says, encouraged by your response.'
 				'"Only ''pretty hot''?" you tease back and she laughs aloud.'
 				gs 'albina_chat','small_talk'
 			end
 			
 			act 'Not anymore':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"Not anymore," you shake your head. "I <i>did</i> regret it for a while, but after some time, I got used to the idea. I''m happy I did it."'
 				'"Well... you <i>are</i> pretty hot in them aren''t you?" she says, encouraged by your response.'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			
 			
 			act 'Yes (thought I wanted it)':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"I do," you say solemnly. "I thought it would be sexy, feel empowering. But once it started, I just felt... I realized I didn''t want it anymore. But I couldn''t take it back. And now those pictures of me are out there. On the internet or in a magazine and... I wish I could take it all back."'
 				'Albina leans her head against your shoulder, saying nothing as the two of you sit in silence for a few minutes.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			end
 			
 			act 'Yes (felt pressured)':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"I do," you say, solemnly. "I just wanted to get them off my back and I crossed a line that... I can''t uncross now. I should''ve stood my ground..."'
 				'Albina leans her head against your shoulder, saying nothing as the two of you sit in silence for a few minutes.'
@@ -513,7 +513,7 @@ end
 
 if $ARGS[0] = 'first_model_talk_shy1':
 	act 'Tell her (embarrassed)':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		if $model['type'] = 'catalog':
 			'"Nothing bad!" you say hurriedly, holding your hands up in defense. "Just some stuff for catalogues. You know, the kind of stuff you see on G&M websites and stuff like that."'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			'You sit in silence for a few seconds before Albina turns back towards you tentatively.'
 			'"Do you regret it?"'
 			act 'No':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"Actually... No." You give Albina a shy smile. "I''m actually really glad that I did it, but it''s still kind of embarrassing to tell you about it."'
 				'"Well, don''t be," she says, her eyes lighting up with your good humor. "You''re hot as fuck naked!"'
@@ -662,7 +662,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			end
 			
 			act 'Yes (thought I wanted it)':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"I do," you say solemnly. "I thought it would be sexy, feel empowering. But once it started, I just felt... I realized I didn''t want it anymore. But I couldn''t take it back. And now those pictures of me are out there. On the internet or in a magazine and... I wish I could take it all back."'
 				'Albina leans her head against your shoulder, saying nothing as the two of you sit in silence for a few more minutes.'
@@ -670,7 +670,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			end
 			
 			act 'Yes (felt pressured)':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"I do," you say, solemnly. "I just wanted to get them off my back and I crossed a line that... I can''t uncross now. I should''ve stood my ground."'
 				'Albina leans her head against your shoulder, saying nothing as the two of you sit in silence for a few more minutes.'
@@ -682,14 +682,14 @@ end
 
 if $ARGS[0] = 'first_model_talk_shy4':
 	if $model['type'] = 'glamour':
-		'"You''re naked in these?" Albina''s eyes go wide.'
+		'Her eyes go wide. "You''re naked in these?!"'
 		'"I didn''t say I was naked!" you protest.'
 		'"Yeah yeah, who cares," she says, completely ignoring you while reaching for her laptop. "Your tits are out, that''s what matters. I <i>gotta</i> see these pics!"'
 	else
-		'"You''re naked in these?" Albina''s eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re naked in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	end
 	act 'Stop her':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"No!" you squeal, grabbing her by the arm to stop her. Albina looks at you, bewildered.'
 		act 'Beg her':
@@ -706,7 +706,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 	if $model['nickname'] = $pcs_firstname or $model['nickname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname:
 		act'It''s not my name (lie)':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -718,7 +718,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 		end
 		
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches and quickly finds your profile. "You didn''t even change your name?" she snickers.'
 			act 'Blush':
@@ -750,7 +750,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 	else
 		act 'It''s not my name':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -762,7 +762,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 		end
 	
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches for you using your real name, but can''t find it because you used a pseudonym.'
 			'"Why can''t I find it?!" she grumbles in frustration.'
@@ -785,9 +785,9 @@ if $ARGS[0] = 'first_model_talk_shy4':
 end
 
 if $ARGS[0] = 'first_model_talk_nude_shy1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/1.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/2.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/3.jpg"></center>'
-	'Albina''s eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
+	'Her eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
 	act 'Embarrassed':
 		cla & *nl
 		'You blush furiously as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features."'
@@ -827,7 +827,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy2':
 		gs 'albina_chat2','first_model_talk_nude_shy_pubes_shaved'
 	else
 		act 'Continue':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina starts saving the images to her hard drive and rapidly clicking through other websites, bookmarking them.'
 			'"What are you doing?" you ask, bewildered.'
@@ -860,7 +860,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy_pubes_shaved':
 			AlbinaQW['model_shave'] = 2
 			cla & *nl
 			'"They made me do it," you mumble shyly. "This is my nude debut and the studio''s policy is that models have to go cleanshaven for their first nude set. I didn''t want to do it, but they refused to do the shoot unless I did."'
-			'Albina''s grin fades and takes on a more somber expression as she scrolls through the pictures of you with new eyes.'
+			'Her grin fades and takes on a more somber expression as she scrolls through the pictures of you with new eyes.'
 			if AlbinaQW['shave_story'] = 1:
 				'"I told you about why I started shaving, didn''t I?" she asks referring to that story she told you while you were both drunk after the pool. "What you said reminds me of that."'
 				'She shuts the lid on her laptop and pushes it away. "I''m sorry <<$pcs_nickname>>," she says tenderly. "Maybe we should talk about something else?"'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy_pubes_shaved':
 end
 
 if $ARGS[0] = 'recurrent_model_talk1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'"What''s it like working as a model?" Albina asks, looking curious.'
 	act 'It''s whatever':
@@ -890,8 +890,8 @@ if $ARGS[0] = 'recurrent_model_talk2':
 end
 
 if $ARGS[0] = 'recurrent_porn_talk1':
-	!! Albina tries to be conversational and friendly about your job as a pornstar which she disagrees with
-	cla & *clr
+	!! Albina tries to be conversational and friendly about your job as a porn star, which she disagrees with.
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'"So..." Albina starts hesitantly, nervously drumming her fingers. "How''s... the uhh... <i>porn stuff</i> going...?"'
 	act 'Answer uncomfortably':
@@ -903,7 +903,7 @@ if $ARGS[0] = 'recurrent_porn_talk1':
 	
 	act 'Answer casually':
 		cla & *nl
-		'"It''s going fine," you shrug casually. Albina nods but it''s obvious that she can''t even look at you while talking about this subject.'
+		'"It''s going fine," you shrug casually. Albina nods, but it''s obvious that she can''t even look at you while talking about this subject.'
 		'"What have you, uhm, filmed lately...?" she asks.'
 		gs 'albina_chat2','recurrent_porn_talk_casual'
 	end
@@ -922,57 +922,57 @@ if $ARGS[0] = 'porn_history_check':
 end
 
 if $ARGS[0] = 'recurrent_porn_talk_uncomfortable':
-	act'Nothing':
+	act 'Nothing':
 		cla & *nl
 		'"Nothing really..." You give her an embarrassed smile. "I haven''t really shot anything, er, new, recently..."'
-		'"Oh. That''s uh... good?" Albina visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+		'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Don''t go into detail':
+	act 'Don''t go into detail':
 		cla & *nl
 		'"Oh, you know, just a film here or there," you say casually.'
 	end
 	
 	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
-		act'Gangbang scene':
+		act 'Gangbang scene':
 			cla & *nl
 			'"I... uhh... I got gangbanged a little while ago? They, er... double penetrated me..." You give her an embarrassed smile and you feel your face turn bright red as hers visibly pales.'
-			'"Oh. That''s uh... good?" Albina visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+			'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
 			gs 'albina_chat','small_talk'
 		end
 	end
 	
 	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
-		act'Gangbang scene':
+		act 'Gangbang scene':
 			cla & *nl
 			'"I... uhh... I got gangbanged a little while ago? They, er... double penetrated me..." You give her an embarrassed smile and you feel your face turn bright red as hers visibly pales.'
-			'"Oh. That''s uh... good?" Albina visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+			'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
 			gs 'albina_chat','small_talk'
 		end
 	end
 end
 
 if $ARGS[0] = 'recurrent_porn_talk_casual':
-	act'Nothing':
+	act 'Nothing':
 		cla & *nl
 		'"Nothing really." You shrug again. "I haven''t gotten to work for the studios very much recently."'
-		'"Oh. That''s uh... good?" Albina visibly cringes at her own remark. Seeing you''re not going to get anywhere on this line of conversation, you take the initiative and change the subject.'
+		'"Oh. That''s uh... good?" She visibly cringes at her own remark. Seeing you''re not going to get anywhere on this line of conversation, you take the initiative and change the subject.'
 		gs 'albina_chat','small_talk'
 	end
 	
-	act'Don''t go into detail':
+	act 'Don''t go into detail':
 		cla & *nl
 		'"Oh, you know, just a film here or there," you say casually. "The usual sucking and fucking on camera. Nothing special."'
 		'"'
 	end
 	
 	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
-		act'Gangbang scene':
+		act 'Gangbang scene':
 			cla & *nl
 			'"I got gangbanged a little while ago," you say as casually as if you were saying you had a banana with your lunch. "Fucked me in all three holes simultaneously."'
-			'Your friend visibly pales but soldiers on through the conversation nonetheless.'
-			'"That''s uh... good?" Albina visibly cringes at her own remark. Seeing you''re not going to get anywhere on this topic, you take the initiative and change the subject.'
+			'Your friend visibly pales, but soldiers on through the conversation nonetheless.'
+			'"That''s uh... good?" She visibly cringes at her own remark. Seeing you''re not going to get anywhere on this topic, you take the initiative and change the subject.'
 			gs 'albina_chat','small_talk'
 		end
 	end
@@ -981,7 +981,7 @@ end
 
 if $ARGS[0] = 'recurrent_porn_talk2':
 	!! Route 2: Albina asks Sveta if she really thinks the money is worth shooting porn
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'"<<$pcs_nickname>>..." Albina says slowly. "I need to ask you... Do you really think shooting porn is worth the money?"'
 	
@@ -994,17 +994,17 @@ if $ARGS[0] = 'recurrent_porn_talk2_menu':
 	act '"It''s soul destroying"':
 		cla & *nl
 		'You turn away from your friend, unable to look her in the eyes.'
-		'"I don''t know," you mumble in shame. "Every time I finish a shoot I want to throw up. Every time a guy comes on my face I feel filthy and no amount of washing up makes me feel clean. When the producers tell me my videos are going live, I''m terrified that someone I know will see it. It''s tearing me apart from the inside out..."'
+		'"I don''t know," you mumble in shame. "Every time I finish a shoot I want to throw up. Every time a guy cums on my face, I feel filthy and no amount of washing up makes me feel clean. When the producers tell me my videos are going live, I''m terrified that someone I know will see it. It''s tearing me apart from the inside out..."'
 		'"Then quit."'
-		'Turning back to face Albina, you see she is practically begging you with just those two words.'
+		'Turning back to face Albina, you see she''s practically begging you with just those two words.'
 		gs 'albina_chat2','recurrent_porn_talk2_need_money'
 	end
 	
-	act'Conflicted':
+	act 'Conflicted':
 		cla & *nl
 		'"It''s not a perfect job," you admit uncomfortably. "But it''s not that bad either. All things considered, it''s worth what it pays. I <i>need</i> the money right now."'
 		'"But you could do something else for money too," she replies, practically pleading with you. "It doesn''t have to be something that exposes your most intimate things all over the internet forever."'
-		'"And what would I do Albina?" you ask. "Be a secretary? Or a nurse? Or a reporter? That''s all future. I need a uni degree for that. Or should I break my back working shit jobs around Pav, cleaning toilets and sweeping hallways, and changing cum-stained sheets in the hotel? I''m not doing that. Those are worse than getting paid to fuck on camera."'
+		'"And what would I do?" you ask. "Be a secretary? Or a nurse? Or a reporter? That''s all future. I need a uni degree for that. Or should I break my back working shit jobs around Pav, cleaning toilets and sweeping hallways, and changing cum-stained sheets in the hotel? I''m not doing that. Those are worse than getting paid to fuck on camera."'
 		gs 'albina_chat2','recurrent_porn_talk2_end'
 	end
 end

Dosya farkı çok büyük olduğundan ihmal edildi
+ 278 - 191
locations/albina_house_events.qsrc


+ 78 - 78
locations/albina_mother_events.qsrc

@@ -4,11 +4,11 @@ menu_off = 1
 
 if $ARGS[0] = 'zoya_chat_menu':
 	
-	act'Make small talk':gs 'albina_mother_events', 'zoya_small_talk'
+	act'Make small talk': gs 'albina_mother_events', 'zoya_small_talk'
 end
 
 if $ARGS[0] = 'zoya_small_talk':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
 	if rand(1,5) = 1:
 		'"Thank you for coming over by the way," Zoya smiles at you warmly. "I''m not just being polite. After everything Albina''s been through, I''m glad she has a friend like you to rely on. She needs it."'
@@ -21,20 +21,20 @@ if $ARGS[0] = 'zoya_meet':
 	!!First time visiting on your own after she shows you where she lives
 	AlbinaQW['visiting'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
-	'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s beautiful and well-dressed. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
+	'As you walk up the long driveway to the front door, you notice a sleek and expensive looking car you''ve never seen before parked in front of the house. When you knock, the door opens to reveal a beautiful, well-dressed woman you estimate to be in her late 30s. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
 	*nl
 	'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
 	'The woman holds her hand for you to shake, and you do so tentatively. "I''m sorry, and you are...?"'
-	'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> You think, shocked by the introduction.'
+	'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenkoa." <i>Albina''s mother??</i> You think, shocked by the introduction.'
 	'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname, and you''re unsure what to do.'
 	'"Doctor, actually," she says, smirking wryly. "But you can just call me Zoya."'
 	'"Oh no! I could-"'
 	'"I insist," she smiles warmly. "Would you like to come inside?"'
 	act 'Continue':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
-		'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
-		'She gives a parting smile and closes the door behind her.'
+		'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I''ll just have to leave that to my daughter. If you''re a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
+		'She gives a parting smile and closes the door behind her. You hear the car starting up outside before it roars away.'
 		act 'Continue': gt 'albinahome', 'bedroom'
 	end
 end
@@ -42,28 +42,29 @@ end
 if $ARGS[0] = 'zoya_sunbathing_solo': 
 !! (if summer)
 	minut += 2
-	gs'stat'
-	'You walk up the long driveway to Albina''s house, reaching it a couple of minutes later. Upon knocking on the door, it''s opened by the maid. "Hello. Ms. Zoya said to tell you she is out back by the pool if you need anything."'
+	gs 'stat'
+	'You walk up the long driveway to Albina''s house, reaching it a few minutes later. Upon knocking on the door, it''s opened by the maid.'
+	'"Hello. Ms. Zoya said to tell you she''s out back by the pool if you need anything."'
 
 	if AlbinaQW['pool'] = 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
-		'Heading out the back door, you find Zoya in the middle of the pool, laying back with her eyes closed on a floatie. She''s topless and looks very relaxed, moving only for a moment to adjust her bikini bottom and you catch the briefest glimpse of her pussy lips as she does. Perhaps hearing you close the door, she cracks open an eye to look at you as you approach.'
+		'Heading out the back door, you find Zoya in the middle of the pool, laying back with her eyes closed on a floatie. She''s topless and looks very relaxed, moving only for a moment to adjust her bikini bottom, allowing you to catch the briefest glimpse of her pussy lips as she does. Perhaps hearing you close the door, she cracks open an eye to look at you as you approach.'
 		'"Ahh, <<$pcs_firstname>>. Milena told me you arrived," she says, carefully sitting up on her elbows, the floatie wobbling beneath her.'
-		'"I hope I''m not intruding." you reply politely.'
+		'"I hope I''m not intruding?" you reply politely.'
 		'"No no, not at all. Were you looking for Albina? I think she''s out right now, but you''re welcome to make yourself at home until she comes back."'
 		AlbinaQW['pool'] = 1
 		minut += 6
 		gs 'stat'
 
 		act 'Check her out':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
 			AlbinaQW['check_out_zoya'] = 1
-			'"Okay, thanks Zoya."'
+			'"Okay. Thanks, Zoya."'
 			'Your gaze wanders up and down her body. Zoya looks incredible for her age, especially given that she wasn''t a teen parent like your own mother. Her skin is wonderfully tanned, unmarred by any white lines, clearly due to her topless sunbathing habits. Her breasts are exceptionally full, large and with a beautiful symmetrical roundness to them. Not to mention her flat, toned stomach and long shapely legs. Though mostly obscured by the floatie, her thick thighs give you a pretty good idea of where Albina got her ass from.'
 			*nl
 			'"<i>Ahem</i>."'
-			'You blink and realize that Zoya is looking sternly at you, seemingly annoyed. "It''s rude to stare at someone''s body like that <<$pcs_firstname>>."'
+			'You blink and realize that Zoya is looking sternly at you, seemingly annoyed. "It''s rude to stare at someone''s body like that, <<$pcs_firstname>>."'
 			'"Oh, sorry..." you gulp.'
 			'"Perhaps you should wait for Albina inside?"'
 			'"Yeahhhh... I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya to see her lay her head back on the floatie and close her eyes again.'
@@ -75,30 +76,30 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
 		'Heading out the back door, you find Zoya sunbathing in the pool again. Reacting to some kind of sound you made, she opens her eyes and sits up to look at you.'
-		'"Hello again <<$pcs_firstname>>. Waiting for Albina again?"'
+		'"Hello again, <<$pcs_firstname>>. Waiting for Albina again?"'
 		'"Mhmm," you respond with a nod.'
 		'"Well, as always, make yourself at home until she comes back."'
 		minut += 6
 		gs 'stat'
 
 		act 'Check her out':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
-			'"Okay, thanks Zoya."'
+			'"Okay. Thanks, Zoya."'
 			if AlbinaQW['check_out_zoya'] > 0:
 				'You can''t help but ogle her body again. Those big tanned tits, those long toned legs... You vaguely imagine what it would be like to bury your head into her breasts or feel her thighs squeeze your head during climax. A tingling sensation runs through your crotch at the thought.'
 				*nl
 				'"Ahem."'
-				'You blink and realize that Zoya is glaring at you. "I believe we talked about this before <<$pcs_firstname>>...'
+				'You blink and realize that Zoya is glaring at you. "I believe we talked about this before, <<$pcs_firstname>>...'
 				'"Oh, uhh..." you gulp.'
 				'"You should go and wait for Albina inside."'
 				'"Umm, yeah.. I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya before you go.'
-				'<i>That body... Damn!</i>'
+				'<i>That body... Damn</i>!'
 			else
 				'Your gaze wanders up and down her body. Zoya looks incredible for her age, especially given that she wasn''t a teen parent like your own mother. Her skin is wonderfully tanned, unmarred by any white lines, clearly due to her topless sunbathing habits. Her breasts are exceptionally full, large and with a beautiful symmetrical roundness to them. Not to mention her flat, toned stomach and long shapely legs. Though mostly obscured by the floatie, her thick thighs give you a pretty good idea of where Albina got her ass from.'
 				*nl
 				'"Ahem."'
-				'You blink and realize that Zoya is looking sternly at you, seemingly a bit annoyed. "It''s rude to stare at someone''s body like that <<$pcs_firstname>>."'
+				'You blink and realize that Zoya is looking sternly at you, seemingly a bit annoyed. "It''s rude to stare at someone''s body like that, <<$pcs_firstname>>."'
 				'"Oh, sorry..." you gulp.'
 				'"Perhaps you should wait for Albina inside?"'
 				'"Yeahhhh... I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya to see her lay her head back on the floatie and close her eyes again.'
@@ -111,7 +112,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	end
 
 	act 'Make small talk until Albina returns':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
 		'"So," you begin, sitting down next to the pool to be closer to eye level. "How have you been?"'
 		'The two of you chat about various things like school and her work until Milena interrupts to tell you Albina has just come home. Ending on that note, you wave goodbye and head back in to see Albina.'
@@ -122,9 +123,9 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	end
 
 	act 'Go inside':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
-		'"Okay, thanks Zoya. I''ll let you get back to your sunbathing."'
+		'"Okay. Thanks, Zoya. I''ll let you get back to your sunbathing."'
 		'You wave goodbye and head back into the house, thinking about how to pass the time until Albina returns.'
 		minut += 6
 		gs 'stat'
@@ -137,51 +138,51 @@ end
 if $ARGS[0] = 'zoya_sunbathing_albina':
 	AlbinaQW['mother_daughter_sunbathe'] = daystart
 	minut += 2
-	gs'stat'
-	cla & *clr
+	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya1.jpg"></center>'
 	'Stepping out through the back doors of the house, you find Albina and Zoya both lying topless upon the poolside deck chairs, cocktail glasses filled with fruity looking liquids at elbowside tables beside them next to various oils and lotions. Zoya notices you first, casually rolling away from you and onto her belly, her dark hair shifting to let you see her marvelously toned back.'
-	act'Walk up':
-		cla & *clr
+	act 'Approach them':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
 		'Only once you get closer does Albina notice you, making no move to cover herself as her lips give way to a sly smile.'
 		'"Hey <<$pcs_nickname>>," she says. "Did Milena let you in?"'
 		'"Yeah," you nod.'
-		'"Mama and I were just tanning ourselves," Albina smirks, casually picking up one of the bottles on the tables and drizzling a line of oil across her stomach. It sparkles in the sunlight as she rubs it in with her hands, clearly defining the muscles of her core. Her hands move up to her breasts, rubbing it in there as well. She massages and knead with almost groping motions. Her fingers squeeze from the base of her mounds all the way up to her nipples, rolling them between them and forefinger, only releasing after gentle tugs.'
+		'"Mama and I were just tanning ourselves," she smirks, casually picking up one of the bottles on the tables and drizzling a line of oil across her stomach. It sparkles in the sunlight as she rubs it in with her hands, clearly defining the muscles of her core. Her hands move up to her breasts, rubbing it in there as well. She massages and knead with almost groping motions. Her fingers squeeze from the base of her mounds all the way up to her nipples, rolling them between them and forefinger, only releasing after gentle tugs.'
 		*nl
 		'You can''t help but stare as she does this until your eyes flicker to her face and only then do you realize:'
 		'She''s doing this on purpose!'
-		act'Interrupted':
-			cla & *clr
+		act 'Interrupted':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
-			'"Stop being a tease, Albina," Zoya sighs, rolling her eyes from the other chair.'
-			'"Why? Because I''m letting my friend see me topless?" Albina snorts. "It''s nothing she hasn''t seen before. We shower together all the time at school. Besides, you''re topless too, Mama."'
-			'"It''s called <i>modesty</i>, young lady," she snorts in return. "You could stand to have some. It was time for my back anyways. And it''s time you went inside. You''ve been out here long enough. Go rinse off before you get skin cancer."'
-			'"Yes, Mama," Albina sighs and gets up.'
-			act'Continue':
-				cla & *clr
+			'"Why must you act like that, Albina?" Zoya sighs, rolling her eyes from the other chair.'
+			'Albina snorts. "Why not? It''s nothing <<$pcs_nickname>> hasn''t seen before. We shower together all the time at school. Besides, you''re topless too, Mama."'
+			'"It''s called <i>modesty</i>, young lady!" Zoya snorts in return. "You could stand to have some. It was time for my back anyway. And it''s time you went inside. You''ve been out here long enough. Go rinse off before you get skin cancer."'
+			'Albina sighs and gets up. "Yes, Mama..."'
+			act 'Continue':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/bottoms_off.jpg"></center>'
-				'Albina drains her cocktail glass in one gulp and then shamelessly pulls down her bikini bottoms to stand completely nude on the deck. Her mother gives her an eyeful but you see her physically bite her tongue as Albina pads her way back through the house, you following along behind her.'
+				'Albina drains her cocktail glass in one gulp and then shamelessly pulls down her bikini bottom to stand completely nude on the deck. Her mother gives her an eyeful, but you see her physically bite her tongue as Albina pads her way back through the house, you following along behind her.'
 				*nl
-				'"I need to take a shower," she says, casually twirling her bottoms around one finger before carelessly letting it fall to the floor with a <i>splat</i>. She stops just in the hall outside her room and gives you a playful smile. "Care to join me?"'
+				'"I need to take a shower," she says, casually twirling her bottoms around one finger before carelessly letting them fall to the floor. She stops in the hall outside her room and gives you a playful smile. "Care to join me?"'
 				gs 'albina_house_events', 'albina_shower_talk_start'
 			end
 		end
 	end
 end
 
-
 if $ARGS[0] = 'Doing yoga with Albina':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/yoga.jpg"></center>'
-	'You enter the house and hear Albina calling you from a nearby room. You enter the home gym and find Albina and Zoya doing some yoga. You get a great view of their round asses and toned legs stretching their skintight yoga pants. You''re not sure where to look as they finish their routine. "I''d love to stay and chat <<$pcs_nickname>>, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you with Albina.'
+	'You enter the house and hear Albina calling you from a nearby room. You enter the home gym and find Albina and Zoya doing some yoga. You get a great view of their round asses and toned legs stretching their skintight yoga pants and aren''t sure where to look as they finish their routine.'
+	'"I''d love to stay and chat, but I need to shower and get some paperwork done for work," Zoya says and excuses herself from the room, leaving you with Albina.'
 	'"Come on <<$pcs_nickname>>, I gotta get changed."'
 	minut += 6
 	gs 'stat'
 
 	act 'Go with her':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
-		'You follow Albina to her room where she strips from her clothes and tosses them aside without a care.'
+		'You follow Albina to her room, where she strips from her clothes and tosses them aside without a care.'
 		'"I need to take a shower and wash all this sweat off. Care to join me?" she asks with a playful smile.'
 		minut += 6
 		gs 'stat'
@@ -190,24 +191,23 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 
 	act 'Just talk':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/showering.jpg"></center>'
-		'"No thanks. But I wouldn''t mind talking while you do."'
-		'"Suit yourself," she shrugs. Albina heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
+		'"No thanks, but I wouldn''t mind talking while you do."'
+		'"Suit yourself," she shrugs and heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
 		'"So you and your mother work out together?"'
-		'"When we can," her voice echos back off the glass and tile. "Sometimes I''m busy, sometimes she''s busy. She says I should always try and keep myself in shape and use yoga to calm myself and my mind. Says it''ll ''do me a world of good'', whatever the hell that means." The tap squeaks off and Albina steps out of the shower, grabbing a towel to dry herself off.'
+		'"When we can," her voice echoing back off the glass and tile. "Sometimes I''m busy, sometimes she''s busy. She says I should always try and keep myself in shape and use yoga to calm myself and my mind. Says it''ll ''do me a world of good'', whatever the hell that means." The tap squeaks off and Albina steps out of the shower, grabbing a towel to dry herself off.'
 		'You follow her into her room and sit down on her bed, continuing to chat while she gets dressed.'
-
 		minut += 6
 		gs 'stat'
 
 		act 'Continue': gt 'albinahome', 'bedroom'
 	end
 	act 'I''ll just wait':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
 		'"No thanks. I''ll just wait until you''re done."'
-		'"Suit yourself I guess," Albina shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
+		'"Suit yourself I guess," she shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
 		minut += 6
 		gs 'stat'
 
@@ -215,9 +215,9 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 
 	act 'Tell her you''ll wait':
-		cla & *clr
+		*clr & cla
 		minut += 10
-		gs'stat'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
 		'"That''s okay, I''ll just wait down here until you''re done."'
 		'"Whatever. Suit yourself I guess." She swaggers up the stairs while you sit down on her couch and pull out your phone to pass the time. About ten minutes later, Albina comes back down with damp hair and a new outfit.'
@@ -228,7 +228,6 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 end
 
-
 if $ARGS[0] = 'albina_shower':
 	CLOSE ALL & PLAY 'sound/dush.mp3',30
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/4.jpg"></center>'
@@ -238,7 +237,7 @@ if $ARGS[0] = 'albina_shower':
 	gs 'stat'
 
 	act 'Continue':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/5.jpg"></center>'
 		'You squeeze more of the scented gel into your hands and start ''cleaning'' her ass, rubbing, squeezing and smacking her cheeks as you kiss her neck. She reaches back and starts passionately kissing you as you continue.'
 		gs 'arousal', 'foreplay_give', 3, 'lesbian'
@@ -252,42 +251,42 @@ if $ARGS[0] = 'albina_shower':
 		end
 
 		act 'Continue':
-			cla & *clr
+			*clr & cla
 			'<center><video autoplay loop src="images/shared/sex/lesbian/shower_kiss1.mp4"></video></center>'
-			'Your hand finds its way between her legs but before you can go any further, she suddenly turns and pushes you up against the shower wall before moving in and locking lips with you. You passionately make out under the steamy water, fondling each other''s wet bodies for a few seconds before she breaks the kiss and moves away from you. "I need a release <<$pcs_nickname>>. Maybe you can help me with that?"'
+			'Your hand finds its way between her legs, but before you can go any further, she suddenly turns and pushes you up against the shower wall before moving in and locking lips with you. You passionately make out under the steamy water, fondling each other''s wet bodies for a few seconds before she breaks the kiss and moves away from you. "I need a release <<$pcs_nickname>>. Maybe you can help me with that?"'
 			gs 'arousal', 'kiss', 3, 'lesbian'
 			gs 'stat'
 
 			act 'Finger her pussy':
-				cla & *clr
+				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/lesbian/shower_finger1.mp4"></video></center>'
 				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself. A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.' 
-				'"Ohhh <<$pcs_nickname>>, that... that was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
+				'"Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 				'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
 				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
 				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
 				gs 'stat'
 
 				act 'Eat her ass':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/6.jpg"></center>'
 					'You firmly squeeze her ass in your hand before pushing her down onto all fours. She looks back and gives you a knowing smile as you kneel down next to her and spread her ass. She moans and giggles as you start rimming her asshole before grabbing you by the hair and holding you tightly against her, forcing your face between her ass cheeks as you continue pleasuring her backdoor. She soon relaxes enough for you to start pushing the tip of your tongue against her hole and it eventually penetrates. You start tongue fucking her ass in addition to rimming it, all to Albina''s immense pleasure. She reaches back and starts fondling her clit, her grip on your hair tightening as she approaches orgasm. Hearing her moans getting louder and her breathing more ragged, you start going even faster, pushing your tongue as deep as you can into her ass before Albina suddenly lets out a pleasured shriek as her pussy starts squirting juices. She lets go of your hair and you continue eating her ass as she rides through her orgasm. Once she recovers, she pulls herself up and the two of you sit in the shower making out for a few minutes before Albina breaks the kiss and smiles at you.' 
 					'"Ohhh <<$pcs_nickname>>, that... that was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 					'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
 					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
-
 					gs 'arousal', 'rimming_give', 5, 'lesbian'
 					gs 'stat'
+					
 					act 'Get your ass eaten':
-						cla & *clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/7.jpg"></center>'
 						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.' 
 						'You moan loudly in pleasure as you feel your orgasm building within you and Albina, apparently sensing this, grabs your hips and starts eating your ass with even more lustful desire.'
 						'"Don''t stop, I''m gonna cum!" you cry out as Albina goes even faster, rimming your asshole with reckless abandon before suddenly pinching your engorged clit, causing a powerful orgasm to wash over you. Once it passes, you flop out on the bed as Albina smiles at you in satisfaction. Once you recover, you both get dressed.'
-						
 						gs 'arousal', 'rimming', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 						gs 'stat'
+						
 						act 'Finish':
 							CLOSE ALL
 							gs'arousal','end'
@@ -304,9 +303,8 @@ end
 
 if $ARGS[0] = 'workout_solo':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyaworkout.jpg"></center>'
-	'Approaching the gym, you hear someone inside. You peer in and find Zoya doing squats. Her technique looks flawless and you get a great view of her voluptuous ass and her heavily toned legs visibly flexing beneath the skintight yoga pants covering them. Noticing your reflection in the mirror, she turns her head over her shoulder to smile at you while continuing to squat. "Hello <<$pcs_firstname>>, it''s nice to see you. What can I do for you?"
-	You enter the room and chat with Zoya for a few minutes as she finishes her work out. "I''d love to stay and chat, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you alone to decide what to do.'
-
+	'Approaching the gym, you hear someone inside and peer in to find Zoya doing squats. Her technique looks flawless and you get a great view of her voluptuous ass and her heavily toned legs visibly flexing beneath the skintight yoga pants covering them. Noticing your reflection in the mirror, she turns her head over her shoulder to smile at you while continuing to squat. "Hello <<$pcs_firstname>>, it''s nice to see you. What can I do for you?"
+	You enter the room and chat with Zoya for a few minutes as she finishes her workout. "I''d love to stay and chat, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you alone to decide what to do.'
 	minut += 6
 	gs 'stat'
 
@@ -346,7 +344,8 @@ if $ARGS[0] = 'peep1':
 		act 'Take a peek':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyashower.jpg"></center>'
-			'Your curiousity gets the better of you and you crack open the door to the ensuite and peek inside. Zoya is unaware of your presence and continues showering. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass. You continue watching for a few seconds before deciding you shouldn''t push your luck and get caught. You quietly slip back out into the hallway just as you hear the water stop running.'
+			'Your curiousity gets the better of you and you crack open the door to the ensuite and peek inside. Zoya is unaware of your presence and continues showering. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
+			'You continue watching for a few seconds before deciding you shouldn''t push your luck and get caught. You quietly slip back out into the hallway just as you hear the water stop running.'
 			act 'Continue' : gt 'albinahome', 'hallway'
 		end
 	end
@@ -365,7 +364,8 @@ if $ARGS[0] = 'peep2':
 	act 'Peek':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping.jpg"></center>'
-		'Your curiousity gets the better of you and you peek through the gap in the door. Peering into the room, you can see a naked Zoya, her back turned to you as she prepares to get dressed. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass. She turns around and you duck out of view, but she doesn''t react and you peer back in. This time, you get a good view of her large breasts and the neatly trimmed tuft of pubic hair sitting atop her pussy, the only hair on her otherwise silky smooth body.'
+		'Your curiousity gets the better of you and you peek through the gap in the door. Peering into the room, you can see a naked Zoya, her back turned to you as she prepares to get dressed. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
+		'She suddenly turns around and you duck out of view, but she doesn''t react and you peer back in. This time, you get a good view of her large breasts and the neatly trimmed tuft of pubic hair sitting atop her pussy, the only hair on her otherwise silky smooth body.'
 		minut += 6
 		gs 'stat'
 
@@ -382,21 +382,21 @@ if $ARGS[0] = 'peep2':
 
 			if week = 3 or week = 6:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
-				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as the maid walks up the stairs doing her rounds. She seems a little surprised to see you.
-				"Are you okay, Miss <<$pcs_firstname>>?" she asks, noticing the flushed appearance on your face.
-				"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her employer.
-				You awkwardly laugh and she seems even more confused. "I''m just... I''m fine. I promise."
-				The maid gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.' 
+				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as the maid walks up the stairs doing her rounds. She seems a little surprised to see you.'
+				'"Are you okay, Miss <<$pcs_firstname>>?" she asks, noticing the flushed appearance on your face.'
+				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her employer.'
+				'You awkwardly laugh and she seems even more confused. "I''m just... I''m fine. I promise."'
+				'She gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.' 
 				'"Is everything okay out here, Milena?" The maid silently nods and continues on her duties, giving you a disapproving glare as she enters Zoya''s bedroom. You avoid eye contact with Zoya as you hastily walk past her and return to Albina.'
 			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
-				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as Albina arrives. She has an inquisitive look on her face.
-				"<<$pcs_nickname>>, what are you doing?" she asks, noticing the flushed appearance on your face.
-				"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her mother.
-				Albina raises a brow. "You didn''t clog the toilet did you?"
-				You awkwardly laugh and she seems even more confused. "No! I''m just... I''m fine. I promise."
-				Albina gives you an awkward glare, but her mother walks out into the hallway before she can push you further.
-				"Is everything okay out here girls?" Albina silently nods and motions for you to follow her. You avoid eye contact with Zoya as you walk past her.'
+				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as Albina arrives. She has an inquisitive look on her face.'
+				'"<<$pcs_nickname>>, what are you doing?" she asks, noticing the flushed appearance on your face.'
+				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her mother.'
+				'Albina raises a brow. "You didn''t clog the toilet, did you?"'
+				'You awkwardly laugh and she seems even more confused. "No! I''m just... I''m fine. I promise."'
+				'She gives you an awkward glare, but her mother walks out into the hallway before she can push you further.'
+				'"Is everything okay out here, girls?" Albina silently nods and motions for you to follow her. You avoid eye contact with Zoya as you walk past her.'
 			end
 			
 			gs 'stat'

Dosya farkı çok büyük olduğundan ihmal edildi
+ 190 - 194
locations/albina_sex_chat.qsrc


Dosya farkı çok büyük olduğundan ihmal edildi
+ 350 - 187
locations/albina_sex_scenes.qsrc


+ 14 - 14
locations/albina_starlets.qsrc

@@ -43,20 +43,20 @@ if $ARGS[0] = 'albina1':
 			'She looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>? You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance!" she says scornfully before forcing you to sit on the bench.'
 			'Turning to the other girls, she motions for one of them to turn the music on.'
 
-			act 'Watch': 
+			act 'Watch':
 			   *clr & cla
 			   gs 'stat'
 			   '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			   'The music starts playing and you instantly realize your mistake in trying to compare yourself to Albina. She flawlessly performs a number of dance moves you could never even hope to do, all with a smug smile on her face directed at you.'
 			   'She finishes her performance as the music ends and you sheepishly avoid eye contact with her as she walks up to you, breathless.'
-			   '"Not so loud-mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your humble ass back to the amateur corner where you belong?"' 
+			   '"Not so loud-mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your humble ass back to the amateur corner where you belong?"'
 			   if grupTipe = 4:
 					'"A junkie like you will never dance with <i>us</i>!"'
 				else
 					'"If I liked you better, then I <i>might</i> have taken an interest in improving your horrible dancing."'
 				end
 			   'The other girls laugh at you as you retreat from the mocking insults being directed at you.'
-			   
+
 			   act 'Leave': gt 'gdksport', 'start'
 			end
 		end
@@ -104,15 +104,15 @@ if $ARGS[0] = 'albina2':
 			'Her arrogance annoys you. "I can dance just as well as you or any of these girls!" you scornfully reply.'
 			'She looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>?! You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance!" she says scornfully before forcing you to sit on the bench.'
 			'Turning to the other girls, she motions for one of them to turn the music on.'
-            
-			act 'Watch': 
+
+			act 'Watch':
 			   *clr & cla
 			   gs 'stat'
 			   '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			   'The music starts playing and you instantly realize your mistake in trying to compare yourself to Albina. She flawlessly performs a number of dance moves that you could never even hope to do, all with a smug smile on her face directed at you.'
 			   'She finishes her performance as the music ends and you sheepishly avoid eye contact with her as she walks up to you, breathless.'
 			   '"Not so loud mouthed now are you?" she gleefully remarks with a laugh. "I''m in a good mood today. I want to see you dance. Get your ass up and prove you''re as good as you claim."'
-			   
+
 			   act 'Continue': gt 'albina_starlets', 'albina4'
 			end
 		end
@@ -178,11 +178,11 @@ if $ARGS[0] = 'albina4':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				if hotcat < 6:
+				if pcs_hotcat < 6:
 					'"Well? Am I good enough to join?" you ask.'
-					'She just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, appearance is everything to the Starlets, so try improving your looks first and then get back to us."' 
+					'She just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, appearance is everything to the Starlets, so try improving your looks first and then get back to us."'
 					'She turns and leaves with the rest of the troupe, her comments leaving you feeling slightly insulted.'
-				elseif hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
+				elseif pcs_hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
 					'"Well? Am I good enough to join?" you ask.'
 					'She thinks about it and looks at the other girls; some nod, others shrug.'
 					'Finally, she answers. "Okay, we''ll take a shot. Maybe you''ll learn something by training with <i>actual</i> dancers. We practice every day except Tuesday and Thursday, so don''t be late."'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'starlets':
 	end
 
 	AlbinaQW['ShowTriggerCount'] += 1
-	
+
 	act 'Leave': gt 'gdksport', 'start'
 
 	if AlbinaQW['ShowTriggerCount'] >= 6:
@@ -350,7 +350,7 @@ if $ARGS[0] = 'starlets':
 								'You see a well groomed man in a modest suit approach Albina and start talking to her.'
 							elseif AlbinaQW['StarletCustomer'] = 7:
 								AlbinaQW['StarletCustomerCount'] = 12
-								'You see an older man with greying hair wearing an expensive shirt with the sleeves rolled up to his elbows talking to Albina.' 
+								'You see an older man with greying hair wearing an expensive shirt with the sleeves rolled up to his elbows talking to Albina.'
 								AlbinaQW['StarletPay'] = rand (6,9)
 							elseif AlbinaQW['StarletCustomer'] = 8:
 								AlbinaQW['StarletCustomerCount'] = 1
@@ -451,12 +451,12 @@ if $ARGS[0] = 'parkrally':
 	'She directs you to follow her, saying her father had someone drop off special outfits for you to wear. As you walk into the changing room, a box sits on the bench.'
 	'Albina pulls a lycra leotard out and her fist clenches around it as she sees how skimpy it is, but resigns herself and hands them out to the reluctant girls.'
 	*nl
-	'You undress and slide the outfit on.' 
+	'You undress and slide the outfit on.'
 	if tits = 4:
 		'It''s skin tight and your large breasts are just about able to fit, your nipples poking through the thin fabric as you try to adjust the outfit into a comfortable state. The back isn''t much better...'
 	elseif tits > 4:
 		'It''s skin tight and strains against your bust, your enormous breasts in danger of falling out as your nipples clearly poke through the thin fabric. The back isn''t much better...'
-	else	
+	else
 		'It''s skin tight and your nipples poke through the thin fabric as you adjust the straps. The back isn''t much better...'
 	end
 	*nl
@@ -494,7 +494,7 @@ end
 
 if $ARGS[0] = 'StarletsEnd':
 	cla
-	'You enter the locker room and immediately see the disapproving looks on the girls faces. Albina walks over to you and, looking severely disappointed, shakes her head. "Why <<$pcs_nickname>>? You used to be cool, but now you''ve gone and done this to yourself. I''m sorry, but I just can''t have someone like you being associated with us anymore."' 
+	'You enter the locker room and immediately see the disapproving looks on the girls faces. Albina walks over to you and, looking severely disappointed, shakes her head. "Why <<$pcs_nickname>>? You used to be cool, but now you''ve gone and done this to yourself. I''m sorry, but I just can''t have someone like you being associated with us anymore."'
 	'She motions to the door and you walk out in shame as tears well up in your eyes.'
 	starlets_practice = 0
 	minut += 2

+ 23 - 22
locations/albina_wine_event.qsrc

@@ -24,14 +24,15 @@ if $ARGS[0] = 'wine_invite':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 					'You head downstairs towards the front door, passing by the kitchen along the way. True to her word, Albina is on the couch, still naked and already red faced pouring what is definitely not her first glass of wine.'
-					'"Bye Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
+					'"Bye, Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
 					act 'Leave': gt 'pav_residential'
 				end
 			end
 		else
 			cla & *nl
 			'You shake your head. "After getting drunk and chewed out by your mom last time? No thanks. I already get enough from my <<$npc_nickname[''A29'']>> back home."'
-			'"Ugh! You''re such a pussy, <<$pcs_nickname>>!" she replies while rolling her eyes. "Fine, you go shower. <i>I''m</i> getting drunk again." She pads off into the kitchen, leaving you and a trail of wet footprints behind.'
+			'"Ugh! You''re such a pussy, <<$pcs_nickname>>!" she replies while rolling her eyes. "Fine, you go shower. <i>I''m</i> getting drunk again."'
+			'She pads off into the kitchen, leaving you and a trail of wet footprints behind.'
 		end
 		act 'Go and shower':
 			*clr & cla
@@ -43,7 +44,7 @@ if $ARGS[0] = 'wine_invite':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 				'You head downstairs towards the front door, passing by the kitchen along the way. True to her word, Albina is on the couch, still naked and already red faced pouring what is definitely not her first glass of wine.'
-				'"Bye Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
+				'"Bye, Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
 				act 'Leave': gt 'pav_residential'
 			end
 		end
@@ -53,7 +54,7 @@ if $ARGS[0] = 'wine_invite':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 			'Watching Albina walk away, a twinge of regret flashes through your stomach. After a moment''s hesitation, you follow after, entering the kitchen right as she''s pulling a wine bottle out of a cabinet.'
 			*nl
-			'"Well, well..." she says, letting her surprise fade into a smug smirk. "Feeling left out are we?"'
+			'"Well, well..." she says, letting her surprise fade into a smug smirk. "Feeling left out, are we?"'
 			'"Maybe a little," you admit.'
 			'"Well lucky for you, you came just in time." She grabs a pair of glasses and bumps the cabinet closed with her ass before making her way over to you and pulling you to the couch. You wait awkwardly while she opens the bottle before she plops down next to you and hands you a glass.'
 			*nl
@@ -69,8 +70,8 @@ if $ARGS[0] = 'wine_invite':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 		if AlbinaQW['wine'] = 0:
 			'"Sure, that sounds nice. Should I just get dressed and meet you back-"'
-			'"Fuck that," Albina cuts you off and drags you to the kitchen. "It''s better if you drink it right after coming out."'
-			'She puts you down on a couch and saunters over to the wine cabinet, shaking her naked ass along the way, and plucks out two glasses and a bottle. You wait awkwardly while she opens the bottle before she plops down next to you and hands you a glass.'
+			'"Fuck that," she replies, cutting you off and dragging you to the kitchen. "It''s better if you drink it right after coming out."'
+			'She puts you down on a couch and saunters over to the wine cabinet, shaking her naked ass along the way, and plucks out two glasses and a bottle. You wait awkwardly while she opens the bottle before she sits down next to you and hands you a glass.'
 			'"Cheers!" she says with a grin, clinking her glass against yours and downing half the thing in one gulp. You take a more reserved sip, but you feel warmth spread through your chest almost immediately.'
 			*nl
 			'<i>Wow, that <b>is</b> really nice,</i> you think, taking another sip.'
@@ -83,7 +84,7 @@ if $ARGS[0] = 'wine_invite':
 		act 'Drink': gt 'albina_wine_event','start'
 	end
 !!{	if AlbinaQW['wine'] > 0:
-		act'I can''t get drunk right now':
+		act 'I can''t get drunk right now':
 			cla & *nl
 			'You shake your head. "No thanks, I can''t get drunk right now. I have things to do."'
 		end
@@ -102,7 +103,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 	if AlbinaQW['wine'] = 0:
-		'A short while later, you find yourself feeling very warm, fuzzy, and <i>very</i> dizzy, halfway through your second glass. Albina is already sipping from her third glass, head laid on your lap after opening a second bottle. The flush in her cheeks and the slur of her voice tells you she''s totally drunk. And judging by the change in conversation and the wetness between her thighs, it seems Albina is a <i>horny</i> drunk.'
+		'A short while later, you find yourself feeling very warm, fuzzy, and <i>very</i> dizzy, halfway through your second glass. Albina is already sipping from her third glass, head laid on your lap after opening a second bottle. The flush in her cheeks and the slur of her voice tells you she''s totally drunk. And judging by the change in conversation and the wetness between her thighs, it seems she''s a <i>horny</i> drunk.'
 		*nl
 		'"<<$pcs_nickname>>!" Albina shouts, interrupting your thoughts. "I''m fucking talking to you!"'
 		'You blink in confusion.'
@@ -206,7 +207,7 @@ end
 
 if $ARGS[0] = 'pussy_taste':
 	'"I love the taste of my own pussy," Albina abruptly says out loud. "Is that weird?"'
-	act'Super weird':
+	act 'Super weird':
 		cla & *nl
 		'"That''s super fucking weird," you slur back.'
 		'"Bullshit!" she shouts even louder than before. "You can''t tell me you don''t like the taste of ''ur own brand. I know you do, you filthy slut!"'
@@ -309,7 +310,7 @@ if $ARGS[0] = 'dominate_albina':
 		'"First, I''d bend you over my lap," you smile gently, running your fingers through her hair. Something in your voice makes her eyes go wide. She glances to the side as if realizing that her head is exactly where you said you''d bend her over.'
 		'"Then, I''d sit you up so your ass is nice and high," you continue. "And then I''d <i>spank you within an inch of your life.</i>" You keep your easy tone, but give Albina a hard stare and her breath hitches. "I''d keep going until your ass is red and swollen. Let my fingers trail over your pussy, edging you until you <i>beg</i> me to let you cum. And then, <i>I won''t.</i>"'
 		*nl
-		'Albina''s face flushes red and she swallows reflexively. Looking down her body, you see her nipples are rock-hard and her thighs are practically dripping with girl cum.'
+		'Her face flushes red and she swallows reflexively. Looking down her body, you see her nipples are rock-hard and her thighs are practically dripping with girl cum.'
 		'"That..." she gulps. "Would be a pretty good way of doing it..."'
 		*nl
 		'She tears herself away from your gaze and buries her face in her wine glass, taking big desperate gulps.'
@@ -347,21 +348,21 @@ if $ARGS[0] = 'dominate_albina':
 	act 'Grab you by the hair and fuck your ass':
 		cla & *nl
 		'"Well, first thing I would get a nice, <i>big</i>, strapon," you smirk. Albina bites her lip, unconsciously rubbing her thighs together while she waits for your next words. "And then I''d grab you by the hair, nice and tight, and shove it right up your ass!"'
-		'"<i>Fuck!</i> That''s good!" Albina moans, her hand snaking between her legs and shamelessly rubbing her pussy. "Have you been watching me and Lazar or something? That''s <i>just</i> how I like it," she says, a twinkle in her eye as her fingers come back up wet and sticky. She maintains eye contact as she runs her tongue across them, licking up her own juices.'
+		'"<i>Fuck!</i> That''s good!" she moans, her hand snaking between her legs and shamelessly rubbing her pussy. "Have you been watching me and Lazar or something? That''s <i>just</i> how I like it," she says, a twinkle in her eye as her fingers come back up wet and sticky. She maintains eye contact as she runs her tongue across them, licking up her own juices.'
 		gs 'albina_wine_event','wine_chat2'
 	end
 	
 	act 'Tie you down':
 		cla & *nl
 		'"I''d get some rope and tie you to your own bed," you grin. "And then... I think I''d do whatever I want to you."'
-		'You let imagination take over for you and it seems to work. Albina''s cheeks immediately flush and her breath grows heavy. Her nipples harden and her thighs rub together as moisture glistens between them.'
+		'You let imagination take over for you and it seems to work. Her cheeks immediately flush and her breath grows heavy. Her nipples harden and her thighs rub together as moisture glistens between them.'
 		'"That," she gulps. "Sounds like a pretty good way of doing it..."'
 		gs 'albina_wine_event','wine_chat2'
 	end
 end
 
 if $ARGS[0] = 'masturbation_talk':
-	'"How often do you masturbate <<$pcs_nickname>>?" Albina asks loudly, without even a shred of shame or decency.'
+	'"How often do you masturbate, <<$pcs_nickname>>?" Albina asks loudly, without even a shred of shame or decency.'
 	act 'Embarrassed':
 		cla & *nl
 		'"Albina! That''s..." you stammer and trail off. You suddenly can''t look at her anymore and your face grows hot for reasons you try to rationalize is just the wine.'
@@ -550,11 +551,11 @@ if $ARGS[0] = 'porn_talk':
 				'"Something about the taboo nature of it I guess," you shrug. "That it''s so forbidden. I don''t know, it''s just fucking hot."'
 				'"Well I think it''s <i>fucking gross</i>." She makes a gagging face.'
 			else
-				'"<i><b>OH!</b></i>" Albina abuptly sits up in your lap. "Ew! Ew! Ew! Ew!"'
+				'"<i><b>OH!</b></i>" She abuptly sits up in your lap. "Ew! Ew! Ew! Ew!"'
 				'"What? Why are yo-"'
 				'"I shouldn''t have asked. I should have known with what you told me before," she says, making gagging noises. "I can''t believe you- no! Never mind! We''re not talking about this anymore!"'
 				'"But you-"'
-				'"Not-! Discussing-!" Albina cuts you off in a way that prevents further argument.'
+				'"Not-! Discussing-!" She cuts you off in a way that prevents further argument.'
 			end
 			gs 'albina_wine_event','wine_chat2'
 		end
@@ -597,7 +598,7 @@ if $ARGS[0] = 'porn_talk':
 				*nl
 				'"I... I broke... I begged him to make it stop. I apologized, told him I was sorry for being a delinquent daughter, that I would never do it again. And he... he just let them keep going. They kept raping me until I passed out. I don''t even know if they stopped after that..."'
 				*nl
-				'Albina lets her hair fall over her face, but you can see her shoulder shaking with silent sobs.'
+				'She lets her hair fall over her face, but you can see her shoulder shaking with silent sobs.'
 				act 'Comfort her':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
@@ -627,7 +628,7 @@ if $ARGS[0] = 'tell_raped':
 			*nl
 			if stat['rape_count'] = 1:
 				if pav_swimpool['rape'] = 1 or pav_swimpool['virgin_rape'] = 1:
-					'"At the swimming pool in town. I was have a late evening swim when some old man attacked me right there in the water."'
+					'"At the swimming pool in town. I was having a late evening swim when some creepy old man attacked me right there in the water."'
 				end
 				
 				if memory['city_res_rape'] = 1 or memory['city_center_rape'] = 1:
@@ -888,7 +889,7 @@ if $ARGS[0] = 'wine_chat2':
 		end
 	end}
 	
-	act'Your mom is is very pretty':
+	act 'Your mom is is very pretty':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 		'With Albina right on your lap, you find your thoughts drifting to her mother. Her hair, her facial structure, she really is her mother''s daughter. It''s easy to tell where she got her good looks from.'
@@ -929,7 +930,7 @@ if $ARGS[0] = 'wine_chat2':
 					gs 'stat'
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
-					'Despite her supposed acceptance, it''s easy to tell that Albina is trying to be stoic, covering up for the still-open wounds inside her. Taking her head in your arms, you pull her close against your chest. She stiffens at your touch, but slowly loosens up, closing her eyes and nuzzling her face into your breasts. The two of you sit like this for a few minutes and when you finally release her, a real smile is spread across her face.'
+					'Despite her supposed acceptance, it''s easy to tell that she''s trying to be stoic, covering up for the still-open wounds inside her. Taking her head in your arms, you pull her close against your chest. She stiffens at your touch, but slowly loosens up, closing her eyes and nuzzling her face into your breasts. The two of you sit like this for a few minutes and when you finally release her, a real smile is spread across her face.'
 					*nl
 					'No further words are necessary between you.'
 					act 'Continue': gt 'albina_wine_event','wine_chat1'
@@ -944,7 +945,7 @@ if $ARGS[0] = 'wine_chat2':
 						'"Can''t be loved?" you ask. "Not even by me?"'
 						'You stare into her eyes tenderly and see years of hurt and pain welling up inside them, but also a glimmer of hope staring back at you.'
 						*nl
-						'Albina doesn''t say anything, but her breathing grows heavy and hot against your skin. Her thighs rub together and you can see she''s already soaking wet.'
+						'She doesn''t say anything, but her breathing grows heavy and hot against your skin. Her thighs rub together and you can see she''s already soaking wet.'
 						act 'Kiss her': gt 'albina_wine_event','kiss1'
 					end
 				end
@@ -1479,7 +1480,7 @@ if $ARGS[0] = 'caught':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 		'"What the hell do you think you''re doing, young lady?!" Zoya asks before grabbing Albina by the ear and yanking her to her feet. "Drunk in the middle of the day?! And while <i>naked</i>?!"'
-		'"Ow! Ow ow ow ow ow!" Albina whines in pain while standing on her tiptoes trying to escape her mother''s grasp. "We''re just having some fun! Lay off Mama!"'
+		'"Ow! Ow ow ow ow ow!" Albina whines in pain while standing on her tiptoes trying to escape her mother''s grasp. "We''re just having some fun! Lay off, Mama!"'
 		'Zoya ignores her pleas. "I thought even you had better sense than this, Albina!"'
 		'"What are you gonna do? <i>Spank me</i>?" Albina glares back rebelliously. "Don''t be such a bitch!"'
 		'"What did you just say to me?!" Zoya sputters before she drags Albina off towards the stairs, howls of pain following. "I am your <i>mother</i>! I will not tolerate such disrespect!"' 
@@ -1488,7 +1489,7 @@ if $ARGS[0] = 'caught':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 			'You stumble around, drunkenly finding your clothes as shouts of pain and anger echo down from above until a door slams and they finally cease. Zoya then comes huffing down the stairs.'
-			'"I can''t believe that girl sometimes..." she mutters to herself. "Damn you Boris. Grooming my daughter into a shameless slut..."'
+			'"I can''t believe that girl sometimes..." she mutters to herself. "Damn you, Boris! Grooming my daughter into a shameless slut..."'
 			*nl
 			'Once she gets to the bottom of the stairs, she straightens her skirt and grabs you by the hand.'
 			'"Come, I''m taking you home."'

+ 25 - 24
locations/albinahome.qsrc

@@ -5,7 +5,7 @@
 !! 23 - 07 ... no reply
 
 if $ARGS[0] = 'door_bell':
-	act 'Leave':gt 'pav_residential'
+	act 'Leave': gt 'pav_residential'
 	
     if hour = 23 or hour < 7:
 		'There are better times for a house call than right now.'
@@ -30,7 +30,7 @@ if $ARGS[0] = 'door_bell':
 			'The gate buzzes and you hear the click of the latch unlocking.'
 			act 'Walk up the driveway': gt 'albinahome', 'maid_greet'
 		else	
-			'"I''m terribly sorry but Miss Barlovskaya is not available right now. You might try again later."'
+			'"I''m terribly sorry, but Miss Barlovskaya is not available right now. You might try again later."'
 			'The line goes <i>click</i> and the gate remains closed.'
 		end
 	end
@@ -77,11 +77,11 @@ if $ARGS[0] = 'hallway':
 		minut += 3
 		gt 'pav_residential'
 	end
-	act 'Go to Albina''s bedroom':gt 'albinahome', 'bedroom'
-!!	act 'Go to Zoya''s bedroom':gt 'albinahome', 'zoya_room'
-	act 'Go to the bathroom':gt 'albinahome', 'downstairs_bathroom'
-	act 'Go to the kitchen':gt 'albinahome', 'kitchen'
-	act 'Go to the pool':gt 'albinahome', 'pool_side'
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the kitchen': gt 'albinahome', 'kitchen'
+	act 'Go to the pool': gt 'albinahome', 'pool_side'
 end
 
 if $ARGS[0] = 'downstairs_bathroom':
@@ -201,7 +201,7 @@ if $ARGS[0] = 'albina_bathroom':
 	*nl
 	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
 	!! add a dildo?
-	act 'Return to Albina''s room':gt 'albina_chat', 'chat_exit'
+	act 'Return to Albina''s room': gt 'albina_chat', 'chat_exit'
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -241,10 +241,10 @@ if $ARGS[0] = 'kitchen':
 	'Albina''s kitchen.'
 	gs 'kit_din'
 	act 'Back to the hall': gt 'albinahome', 'hallway'
-	act 'Go to Albina''s bedroom':gt 'albinahome', 'bedroom'
-!!	act 'Go to Zoya''s bedroom':gt 'albinahome', 'zoya_room'
-	act 'Go to the bathroom':gt 'albinahome', 'downstairs_bathroom'
-	act 'Go to the pool':gt 'albinahome', 'pool_side'
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the pool': gt 'albinahome', 'pool_side'
 end
 
 if $ARGS[0] = 'pool_side':
@@ -273,10 +273,10 @@ if $ARGS[0] = 'pool_side':
 	end
 	'Albina''s pool.'
 	act 'Back to the hall': gt 'albinahome', 'hallway'
-	act 'Go to Albina''s bedroom':gt 'albinahome', 'bedroom'
-!!	act 'Go to Zoya''s bedroom':gt 'albinahome', 'zoya_room'
-	act 'Go to the bathroom':gt 'albinahome', 'downstairs_bathroom'
-	act 'Go to the kitchen':gt 'albinahome', 'kitchen'
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the kitchen': gt 'albinahome', 'kitchen'
 end
 
 if $ARGS[0] = 'dancing':
@@ -320,7 +320,8 @@ if $ARGS[0] = 'stripping':
 	if pcs_danc >= 40:
 		gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 		gs 'stat'
-		'"Okay, we need some space. Follow me." She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
+		'"Okay, we need some space. Follow me."'
+		'She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
 
 		if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
 	else
@@ -329,7 +330,7 @@ if $ARGS[0] = 'stripping':
 		'A 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 first.'
 	end
 	gs 'albinahome', 'post_workout_shower'
-	act 'Rest':gt 'albinahome', 'bedroom'
+	act 'Rest': gt 'albinahome', 'bedroom'
 end
 
 if $ARGS[0] = 'poledancing':
@@ -344,10 +345,10 @@ if $ARGS[0] = 'poledancing':
 		'Albina leads you to the home gym, where she teaches various acrobatic moves on the pole. The two of you greatly enjoy yourselves.'
 		if pcs_dancpol >= 100: 'You didn''t learn anything new since you already know everything she can teach you.'
 		gs 'albinahome', 'post_workout_shower'
-		act 'Rest':gt 'albinahome', 'bedroom'
+		act 'Rest': gt 'albinahome', 'bedroom'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
-		'You try your best to follow Albina''s instructions but end up smacking your head on the pole instead and falling to the floor.'
-		'You are flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? You''re still too weak for pole dancing, so we need to develop your strength instead."'
+		'You try your best to follow Albina''s instructions, but end up smacking your head on the pole instead and falling to the floor.'
+		'You''re flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? It looks like you''re still too weak for pole dancing, so we need to develop your strength instead."'
 		'You nod at her, and she pulls you to your feet before checking your head. "It might bruise, but otherwise, you look fine."'
 		act 'Develop strength (2:00)':
 			*clr & cla
@@ -357,7 +358,7 @@ if $ARGS[0] = 'poledancing':
 			'Albina shows you how to develop your strength using various exercises.'
 			'You wonder if these exercises are how she has such a great-looking ass.'
 			gs 'albinahome', 'post_workout_shower'
-			act 'Rest':gt 'albinahome', 'bedroom'
+			act 'Rest': gt 'albinahome', 'bedroom'
 		end
 	else
 		gs 'stat'
@@ -369,14 +370,14 @@ if $ARGS[0] = 'poledancing':
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
-			if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
+			if pcs_dancero >= 100: 'You don''t learn anything new since you already know everything she can teach you.'
 		else
 			gs 'exercise', 'tier3', 120, 'agil', 'danc'
 			gs 'stat'
 			'A 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 first.'
 		end
 		gs 'albinahome', 'post_workout_shower'
-		act 'Rest':gt 'albinahome', 'bedroom'
+		act 'Rest': gt 'albinahome', 'bedroom'
 	end
 end
 

+ 9 - 8
locations/anush_bedroom.qsrc

@@ -56,6 +56,7 @@ if $ARGS[0] = 'anushroom':
 	menu_off = 0
 	$locclass = 'bedr'
 	CLOSE ALL
+	killvar '$returnLoc'
 	$track_loop = ''
 	music_loop = 1
 	*clr & cla
@@ -106,7 +107,7 @@ if $ARGS[0] = 'nushdresser':
 		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside it. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another one is stuffed full of bras, while the final one seems to be her panty drawer, which also contains several of her dildos. You notice her watching you snoop and close the drawers.'
 		act 'Find something else to look at':gt 'anush_bedroom','anushroom'
 	else
-		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another is stuffed full of bras. The final drawer appears to be her panty drawer, which also contains several of her dildos. With no one around, you do a little digging and find a little box. Inside it is a baggy of white power, several small bags of different kinds of pills, a baggy of pot and some rolling papers.' 
+		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another is stuffed full of bras. The final drawer appears to be her panty drawer, which also contains several of her dildos. With no one around, you do a little digging and find a little box. Inside it is a baggy of white power, several small bags of different kinds of pills, a baggy of pot and some rolling papers.'
 		'You also find some papers shoved along the side of the drawer. They appear to be some of her recent tests and homework assignments. You''re surprised to discover that she''s getting good grades; these are easily good enough for her to attend most universities. Despite fucking around during class, she takes her coursework seriously.'
 		act 'Find something else to look at':gt 'anush_bedroom','anushroom'
 	end
@@ -143,7 +144,7 @@ if $ARGS[0] = 'nushcloset':
 					act 'Try on more clothes': gt 'anush_bedroom', 'more_clothes'
 				else
 					'"Wow, you have so many outfits. Can I try some on?" you ask her.'
-					'Anushka smiles and nods. "Sure, let''s do it." She gets up to join you at the closet and pulls out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly since you''re taller than her, but other than that, they fit you pretty well and look good on you.' 
+					'Anushka smiles and nods. "Sure, let''s do it." She gets up to join you at the closet and pulls out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly since you''re taller than her, but other than that, they fit you pretty well and look good on you.'
 					'As you check yourself out in the mirror on the door, she steps up next to you, showing both of your reflections. "Looking good, <<$pcs_nickname>>."'
 					act 'Try on more clothes': gt 'anush_bedroom', 'more_clothes'
 				end
@@ -507,7 +508,7 @@ if $ARGS[0] = 'computer':
 							AnushkaLoc = 2
 							'You''re so caught up in what you''re doing that you don''t hear the door opening or someone walking in behind you. You practically jump out of the chair in shock when you feel a pair of arms wrap around your shoulders and start fondling your breasts. You turn around to see... Anushka rolling with laughter.'
 							'You give her a dirty look, making her laugh even more. "You almost scared me to death! That really wasn''t funny!" There is very little real heat in your voice as you''re so embarrassed to have been caught masturbating. "Sorry about—" you start to say, but she waves you to stop.'
-							if hotcat >= 6:
+							if pcs_hotcat >= 6:
 								'"It''s fine. I don''t care if you masturbate in my room while you wait for me. If you''re that horny, I could always help you out with it..." she says while licking her upper lip.'
 								act 'No thanks':
 									*clr & cla
@@ -629,7 +630,7 @@ if $ARGS[0] = 'guitar':
 			act 'Keep checking out the guitars': gt 'anush_bedroom','guitar'
 		end
 
-		if anushkaQW['guitar_play'] = 0: 
+		if anushkaQW['guitar_play'] = 0:
 			act 'Would you play me something?':
 				cla
 				'"I''ve heard you''re pretty good. Would you mind playing me something?" you ask.'
@@ -638,7 +639,7 @@ if $ARGS[0] = 'guitar':
 				act 'Wait for her': gt 'anush_bedroom', 'nush_guitar'
 			end
 		elseif anushkaQW['guitar_play'] >= 1:
-			act 'Would you play something again?': 
+			act 'Would you play something again?':
 				cla
 				'"Would you play me another song?" you ask and Anushka smiles.'
 				*nl
@@ -740,7 +741,7 @@ if $ARGS[0] = 'nush_guitar':
 	gs 'stat'
 	if anushkaQW['guitar_day'] ! daystart:
 		anushkaQW['guitar_day'] = daystart
-		if anushkaQW['guitar_play'] = 0: 
+		if anushkaQW['guitar_play'] = 0:
 			*clr & cla
 			music_loop = 0
 			PLAY 'sound/nushunplugged0.mp3', 100
@@ -797,7 +798,7 @@ if $ARGS[0] = 'nush_guitar':
 				'She turns silent, making you think she was being evasive and knew precisely what you meant before she sighs. "Rad thinks I was a good girl playing a bad girl and that he corrupted me and made me fall in love with him and life. So to him, the song was always about that. He saw himself as the seductive charmer that drew me in."'
 				'She shrugs. "I suppose there''s a tiny bit of truth to that, but I was already well on my way to being a wild rocker chick by that point. He might have sped me into who I always was going to be, but he didn''t make me." She stops, but you know there''s more to it. You''re not sure she wants to talk about it though.'
 				act 'Let it go': gt 'anush_bedroom','anushroom'
-				act 'Press it': 
+				act 'Press it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 					'You nod. "So he wasn''t right, not in the way he thinks?"'
@@ -885,7 +886,7 @@ if $ARGS[0] = 'nush_guitar':
 				'You can tell by her expression she was expecting you to ask this or something like it. "A few weeks ago, it came on while I was listening to the radio. It just... encapsulated how I was feeling that day."'
 				'Knowing what you do and what you''ve heard, you can guess who was making her feel that way. You know she hates talking about her and Radomir, but maybe it wasn''t him... Still, should you push the issue or just drop it? You can tell she isn''t thrilled talking about it.'
 				act 'Let it go': gt 'anush_bedroom','anushroom'
-				act 'Press it': 
+				act 'Press it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 					'You nod. "We all have those days, but what, or who, was making you feel that way that day?" you ask.'

+ 1 - 1
locations/anush_bedroom_city.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'anushroom':
 	music_loop = 1
 	*clr & cla
 	minut += 1
-	killvar '$returnLoc'
+	$returnLoc = '_city'
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom.jpg"></center>'

Dosya farkı çok büyük olduğundan ihmal edildi
+ 242 - 236
locations/anushapt.qsrc


+ 159 - 140
locations/anushapt_city.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'home':
 	minut += 1
 	bonusZ = 0
 	gs 'shortgs', 'setloc', 'anushapt_city', $ARGS[0]
-	$location_type = 'private'	
+	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'
 !!! Probably we should have an init call here that sets all the locations, depending on time. Then those locations get updated when other locations are entered.
@@ -103,13 +103,13 @@ if $ARGS[0] = 'home':
 !!Arkadi is home Mon-Tues and Thurs from 18:00 for rest of night, Sun all day
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
-	'You walk up the stairs to the top floor where Anushka, Radomir, Valentin, and Arkadi, are now renting a three bedroom apartment.'
+	'You walk up the stairs to the top floor where Anushka, Radomir, Valentin and Arkadi are renting a three bedroom apartment.'
 !!make sure I did all the day and times right below
 	if hour >= 23:
-		'It''s too late in the day to visit Anushka, Radomir, Valentin, or Arkadi.'
+		'It''s too late in the day to visit Anushka, Radomir, Valentin or Arkadi.'
 		act 'Move away from the door': gt 'city_island'
 	elseif hour < 8:
-		'It''s too early in the day to visit Anushka, Radomir, Valentin, or Arkadi.'
+		'It''s too early in the day to visit Anushka, Radomir, Valentin or Arkadi.'
 		act 'Move away from the door': gt 'city_island'
 	!elseif week = 1 and hour >= 18 and hour < 23:
 	!elseif locat['A144'] and locat['A156'] >= 0 and locat['A144'] and locat['A156'] < 8:
@@ -126,16 +126,16 @@ if $ARGS[0] = 'home':
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 				if npc_rel['A156'] >= 60:
 					'Arkadi answers the door. "What''s up?"'
-					'You give him one of your big smiles. "Nothing much. Thought I would stop by and hang out."'
-					'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You give him one of your big smiles. "Nothing much. Just thought I''d stop by and hang out."'
+					'He nods. "Nush is in her room if you''re looking for her, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				elseif npc_rel['A156'] <= 20:
 					'Arkadi answers the door. "What the fuck do you want?"'
-					'You give him a careful smile. "Nothing much. Thought I would stop by and hang out."'
-					'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise you can fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You give him a careful smile. "Nothing much. Just thought I''d stop by and hang out."'
+					'He gives you a look of disgust. "Nush is in her room if you''re looking for her. Otherwise you can fuck off," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				else
 					'Arkadi answers the door. "What''s up?"'
-					'You smile at him. "Nothing much. Thought I would stop by and hang out."'
-					'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+					'He nods. "Nush is in her room if you''re looking for her," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				end
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'home':
 	!elseif (week = 2 or week = 4) and hour >= 18 and hour < 23:
 		*clr & cla
 		!! Anushka is at work
-		
+
 		!! Arkadi or Valentin
 		locat['A156'] = 1
 		locat['A158'] = 1
@@ -169,21 +169,22 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile at him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You carefully smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is at work, so fuck off." He says as he closes the door in your face.'
+				'You carefully smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is at work, so fuck off," he says as he closes the door in your face.'
 				act 'Leave': gt 'city_island'
 			else
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out here?" You ask him.'
-				'He shrugs as he walks away from the door, "Whatever." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out here?"'
+				'He shrugs as he walks away from the door. "Whatever."'
+				'He leaves you to decide if you want to enter as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -191,20 +192,20 @@ if $ARGS[0] = 'home':
 			locat['A158'] = 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile at him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to enter as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is at work." He says just before closing the door in your face again.'
+				'Valentin answers the door. "Nush is at work," he says just before closing the door in your face again.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'He shrugs as he walks away from the door. "Sure, come in."'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -222,27 +223,27 @@ if $ARGS[0] = 'home':
 !		act 'Enter': gt 'anush_bedroom_city','anushroom'
 	!elseif day <= 7 and week = 6 and hour >= 8 and hour < 16:
 	elseif locat['A144'] = 11:
-	!! Amushka in the studio. Only happens on the first Saturday of the month, otherwise it goes to the Saturday elseif code below
+	!! Anushka in the studio. Only happens on the first Saturday of the month, otherwise it goes to the Saturday elseif code below
 		*clr & cla
 		minut += 1
 		!Force Valentin to be in the hallway for now. Need to get a better solution in schedule.
 		locat['A158'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 		if npc_rel['A158'] >= 60:
-			'Valentin answers the door. "Hey girl what you up to?"'
-			'You smile at him. "Nothing much Valentin. Thought I would stop by and hang out."'
-			'He nods a bit. "Nush is at the modeling studio. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+			'Valentin answers the door. "Hey girl, what you up to?"'
+			'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+			'He nods. "Nush is at the modeling studio, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
 		elseif npc_rel['A158'] <= 20:
-			'Valentin answers the door. "Nush is at the modeling studio." He says just before closing the door in your face.'
+			'Valentin answers the door. "Nush is at the modeling studio," he says just before closing the door in your face.'
 			act 'Leave': gt 'city_island'
 		else
 			'Valentin answers the door. "Hey girl, what you up to?"'
-			'You smile to him. "Nothing much thought I would stop by and hang out."'
-			'He nods a bit. "Nush is at the modeling studio."'
-			'"OK well is it cool if I just hang out?" you ask him.'
-			'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+			'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+			'He nods. "Nush is at the modeling studio."'
+			'"Okay. Is it cool if I just hang out?"'
+			'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
 		end
@@ -262,19 +263,19 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 			if npc_rel['A158'] >= 60:
 				'Valentin answers the door. "Hey girl, what you up to?"'
-				'You smile at him. "Nothing much, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout as well." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You''re welcome to hang out as well," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is in her room." He says as he turns and walks away before you can say anything in return.'
+				'Valentin answers the door. "Nush is in her room," he says as he turns and walks away before you can say anything in return.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -290,16 +291,16 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile at him. "Nothing much, thought I would stop by and hang out."'
-				'He nods. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You smile to him. "Nothing much. Just thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise, just fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is in her room if you''re looking for her. Otherwise, just fuck off," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			else
-				'Arkadi answers the door. "Whats up?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Arkadi answers the door. "What''s up?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			end
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
@@ -310,20 +311,20 @@ if $ARGS[0] = 'home':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You are welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is in her room." He says as he turns and walks away before you can say anything in return.'
+				'Valentin answers the door. "Nush is in her room," he says as he turns and walks away before you can say anything in return.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -338,21 +339,21 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says with a smile as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says with a smile as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is at work, so fuck off." He says as he closes the door in your face.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is at work, so fuck off," he says as he closes the door in your face.'
 				act 'Leave': gt 'city_island'
 			else
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Whatever man." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Whatever," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -360,9 +361,9 @@ if $ARGS[0] = 'home':
 			locat['A158'] = 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile at him. "Nothing much, thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
@@ -370,10 +371,10 @@ if $ARGS[0] = 'home':
 				act 'Leave': gt 'city_island'
 			else
 				'Valentin answers the door. "Hey girl, what you up to?"'
-				'You smile to him. "Nothing much really, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK, well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -387,16 +388,16 @@ end
 if $ARGS[0] = 'hallway':
 	*clr & cla
 	menu_off = 0
-	if sound = 0:play 'sound/korr.mp3',30
+	if sound = 0: play 'sound/korr.mp3',30
 	gs 'shortgs', 'setloc', 'anushapt_city', $ARGS[0]
-	$location_type = 'indoors'	
+	$location_type = 'indoors'
 	killvar '$locclass'
 	minut += 1
 	gs 'stat'
 	gs 'anushapt_city_schedule'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/hallway.jpg"></center>'
-	'This is the entrance hall to the apartment. It''s devoid of any furniture, the walls and floor are completely bare. The only thing you can see is a single row of coat hooks by the door which is mostly empty. Other than that the hall just has a series of doors leading to the other rooms in the apartment.'
+	'This is the entrance hall to the apartment. It''s devoid of any furniture and the walls and floor are completely bare. The only thing you can see is a single row of coat hooks by the door, which is mostly empty. Other than that the hall, just has a series of doors leading to the other rooms in the apartment.'
 	act '<b>Leave the apartment</b>': gt 'city_island'
 	act 'Anushka''s room': gt 'anush_bedroom_city','anushroom'
 	act 'Radomir''s room': gt 'anushapt_city','rad_room'
@@ -416,7 +417,7 @@ if $ARGS[0] = 'bathroom':
 	gs 'stat'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/bathroom.jpg"></center>'
-	'The bathroom is fairly clean. It is larger than most apartment bathrooms you have seen. It has a very green style, white floor tiles, with dark green lower wall tiles, and lighter green ones above. The one thing you notice right away is the toilet set is up, which is not a surprise really with three guys living here.'
+	'The bathroom is fairly clean and larger than most apartment bathrooms you''ve seen. It has white floor tiles with dark green lower wall tiles and lighter green ones above. The one thing you notice right away is the toilet set is up, which is not a surprise with three guys living here.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
@@ -439,7 +440,7 @@ if $ARGS[0] = 'bathroom':
 			act 'Uhm excuse me?':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
-				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head, but you look out at him in consternation.'
+				'You pull the shower curtain tight against your body to make sure there''s nothing for him to see other than your head, but you look out at him in consternation.'
 				'He looks up at you when you question him. It takes him a moment to realize who you are and he quickly zips up his pants. "Shit sorry... I thought you were my wife." He turns away and hurries for the door. "I''ll just be going... Sorry again." he says as he pulls the door closed. Unsure about what to think, you just decide to finish your shower.'
 				act 'Get out of the shower': gt 'anushapt_city','bathroom'
 			end
@@ -517,47 +518,55 @@ if $ARGS[0] = 'livingroom':
 !!note to self expand these interactions in the future.
 	if week = 1 and hour >= 18 and hour < 23:
 		locat['A156'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner you see a drum set. There are speakers, amps, guitars, bass guitars and a variety of other musical electronics as well along side the two walls not occupied by the TV or the couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned more often than once a month. The TV is on and Arkadi is playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Arkadi is sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
-		act 'Join Arkadi':
+		act 'Join him':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A156', 'like'
 			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
-			'You take a seat next to Arkadi as he plays a video game. After a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. The two of you have a good time playing games for awhile, but after a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
-			act 'Leave the livingroom':gt 'anushapt_city', 'hallway'
+			'You take a seat next to Arkadi. After a few minutes, he switches to a two player game and you pick up the other controller and start playing with him. The two of you have a good time playing games for a while, but you eventually get bored and he seems to have no interest in switching games, so you get up and decide to look around the rest of the apartment.'
+			act 'Leave the livingroom': gt 'anushapt_city', 'hallway'
 		end
-!!check I did these week/hour times correct 
+!!check I did these week/hour times correct
 	!! Tuesday or Thursday 18-23 or Sunday 8-23
 	elseif (week = 2 or week = 4 and hour >= 18 and hour < 23) or (week = 7 and hour >= 8 and hour < 23):
 		locat['A156'] = 5
 		locat['A158'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. The TV is on while Arkadi and Valentin are playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Arkadi and Valentin are sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
-		act 'Join Arkadi and Valentin':
+		act 'Join themn':
 			*clr & cla
-			! Arkadi
 			gs 'npc_relationship', 'modify', 'A156', 'like'
-! Also increase for 158/Valentin?
-			!minut += 30
+			gs 'npc_relationship', 'modify', 'A158', 'like'
+			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_2boys' + rand(1,2) + '.jpg"></center>'
-			'You take a seat between the boys and watch as they play games together. Valentin asks you how things have been going and generally makes pleasant conversation with you as he plays. Arkadi mostly ignores you except when you ask him something. He seems very intent on winning his game against Valentin and has no time for talking. After a while you start to get bored just making small talk with Valentin while he is distracted and watching them play games. Eventually you excuse yourself and leave the room, they barely even notice you leave.'
-			act 'Leave the livingroom': minut += 30 & gt 'anushapt_city', 'hallway'
+			'You take a seat between the boys and watch as they play the game. Valentin asks you how things have been going and generally makes pleasant conversation with you as he plays, while Arkadi mostly ignores you. He seems very intent on winning his game against Valentin and has no time for talking.'
+			'After a while, you get bored and eventually excuse yourself, but they barely even notice you leaving.'
+			act 'Leave the living room': gt 'anushapt_city', 'hallway'
 		end
 	elseif week = 6 and hour >= 8 and hour < 20:
 		locat['A158'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. The TV is on and Valentin is playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Valentin is sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
 		act 'Join him':
 			*clr & cla
-			gs 'npc_relationship', 'modify', 'A156', 'like'
+			gs 'npc_relationship', 'modify', 'A158', 'like'
 			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
-			'You take a seat next to Valentin as he plays video games, after a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. As the two of you play, he asks how things are going for you and politely chats while you play. After a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
+			'You take a seat next to Valentin. After a few minutes, he switches to a two player game and you pick up the other controller and start playing with him. As the two of you play, he asks how things are going and politely chats while you play.'
+			'You eventually get bored and he seems to have no interest in switching games, so you get up and decide to look around the rest of the apartment.'
 			act 'Leave the room': gt 'anushapt_city', 'hallway'
 		end
 	else
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. Looks like no one is here right now.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. No one is here right now.'
 		act 'Leave the room': gt 'anushapt_city', 'hallway'
 	end
 end
@@ -577,8 +586,9 @@ if $ARGS[0] = 'kitchen':
 	gs 'kit_din'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/kitchen.jpg"></center>'
-	'The first thing that stands out about the room is one corner is more of a curve where the cabinets are. Along the back wall is one narrow window, next to it the cabinets start and go all the way up along one wall, leaving two walls covered in cabinets, a stove, sink, and refrigerator. Most of the counter space is filled with small appliances, cups, and varies other items. A few dirty dishes are in the sink, while a few others someone washed and put in the dish rack. Against the wall opposite the cabinets not to far from a window is a small table with four chairs. It is also covered in bags of chips, papers, and other things. You wouldn''t exactly call the kitchen dirty but it isn''t exactly clean either. Mostly it is just really messy and haphazard.'
-	act 'Leave':gt 'anushapt_city','hallway'
+	'The first thing that stands out about the room is that one corner is more of a curve where the cabinets are. Along the back wall is one narrow window where the cabinets start and go all the way up along one wall, leaving two walls covered in cabinets, a stove, sink and refrigerator. Most of the counter space is filled with small appliances, cups, and various other items and a few dirty dishes are in the sink.'
+	'Against the wall opposite the cabinets is a small table with four chairs, which is covered in bags of chips, papers and other things. You wouldn''t call the kitchen dirty, but it isn''t exactly clean either.'
+	act 'Leave': gt 'anushapt_city','hallway'
 	act 'Look in the fridge': gt 'anushapt_city', 'fridge'
 	dynamic $fill_bottle
 	dynamic $driwater
@@ -621,7 +631,7 @@ if $ARGS[0] = 'fridge':
 		$anush_sup = ''
 	end
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/fridge.jpg"></center>'
-	'You open the fridge and see some left overs of different kinds, a couple of fifth''s of vodka, about two dozen beers, milk, juice, yogurt, some soda''s, and some fresh vegetables. The vegetables and yogurt has to be Anushka''s, you can''t see the boys eating that. Though you have a bit of a hard time seeing her eating healthy. Though maybe that is why she is always so skinny.'
+	'You open the fridge and see some leftovers of different kinds, some vodka, about two dozen beers, milk, juice, yogurt, some sodas and some fresh vegetables. The vegetables and yogurt have to be Anushka''s, even though you have a bit of a hard time seeing her eating healthy.'
 	act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 	if anushbeer_count > 0:
 		act 'Have a beer':
@@ -646,7 +656,7 @@ if $ARGS[0] = 'fridge':
 			anushvodka_count -= 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(1,2)+'.jpg"></center>'
-			'You pour some vodka in a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
+			'You pour some vodka into a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
 			act 'Put the bottle back in the fridge': gt 'anushapt_city', 'fridge'
 			act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 			act 'Drink more vodka':
@@ -710,7 +720,7 @@ if $ARGS[0] = 'fridge':
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
-			'You get out a plate of fresh vegetables from the fridge and put them on a plate. You take a seat and eat them, when you are done you rinse your plate off in the sink.'
+			'You grab a plate of fresh vegetables from the fridge and put them on a plate before you take a seat and eat them. When you''re done, you rinse your plate off in the sink.'
 			act 'Continue': gt 'anushapt_city', 'fridge'
 			act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 		end
@@ -741,7 +751,7 @@ if $ARGS[0] = 'snack':
 	'She gets up and heads to the kitchen with you, the two of you talking and laughing the whole way.'
 	'As you walk into the kitchen, Anushka points to a refrigerator. "Grab some drinks out of the fridge and anything else good."'
 	'While you are doing that, she grabs a couple of snack cakes and chips from the cabinets, and once you both have your spoils from your raid on the kitchen, you head back to her room.'
-	act 'Back to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+	act 'Back to her room': locat['A144'] = 2 & gt 'anush_bedroom_city','anushroom'
 end
 
 !!Radomir is home Mon-Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
@@ -761,74 +771,81 @@ if $ARGS[0] = 'rad_room':
 		tempRad = rand(0,4)
 		if tempRad = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/door.jpg"></center>'
-			'Just as you walk up to the door, you hear sounds coming from the other side. As you lean in close to the door, you can make out the soft moans and cries of a girl, with a louder Radomir''s voice partially drowning them out. "Yeah! That''s right bitch, take my cock." Followed my a loud feminine "Ahhh!" "Fuck yeah! You love my big cock pounding your tight little ass, don''t you slut!" If she replies you can''t hear it, it sounds like they are both having fun, so perhaps you should leave them alone.'
+			'Just as you walk up to the door, you hear sounds coming from the other side. As you lean in close to the door, you can make out the soft moans and cries of a girl, with a louder Radomir''s voice partially drowning them out. "Yeah, that''s right bitch! Take my cock! You love my big cock pounding your tight little ass, don''t you slut?!"'
+			'You can''t hear a reply, but it sounds like they''re both having fun, so you should leave them alone.'
 ! Add some arousal from voyeur?
 			act 'Leave his room': gt 'anushapt_city', 'hallway'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-			'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv. Currently Radomir is sitting at the desk working on his laptop.'
+			'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
+			'Radomir is sitting at the desk, working on his laptop.'
 			act 'Leave his room': gt 'anushapt_city', 'hallway'
 			act 'Say hi':
 				*clr & cla
 				'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-				'You walk into his room, crossing it over near him, as you say. "Hi, you busy?"'
+				'You walk into his room. "Hi. You busy?"'
 !!note to self to expand this in the future
 				if npc_rel['A154'] >= 60:
 					minut += 10
-					'Radomir glances over to you. "Hey girl what you up to?"'
-					'You smile to him. "Nothing much thought I would stop by and see what you was doing."'
-					'He nods a bit. "Just working on a new song is all."'
-					'The two of you talk about music for a bit but he keeps getting distracted by working on the song. After a bit you decide to leave him to it.'
+					'He glances over at you. "Hey girl, what you up to?"'
+					'You smile at him. "Nothing much. Just thought I''d stop by and see what you were doing."'
+					'He nods. "Just working on a new song is all."'
+					'The two of you talk about music, but he keeps getting distracted by working on the song. After a while, you decide to leave him to it.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				elseif npc_rel['A154'] <= 20:
 					minut += 1
-					'He glances over at you and immediately has a look of anger on his face. "What the fuck are you doing? Get the fuck out of my room." He says, as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
+					'He glances over at you and immediately has a look of anger on his face.'
+					'"What the fuck are you doing? Get the fuck out of my room!" he says as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				else
 					minut += 5
-					'Radomir glances up at you and then back at his computer. "Yeah, I''m busy."'
-					'"Oh sorry, can I ask what you are doing?" You ask him trying to strike up more of a conversation.'
-					'He sighs and looks over at you. "I''m working on a new song, now if you don''t mind I would like to be left alone." After that he just ignores you, after a couple of minutes of being ignore you just leave.'
+					'He glances up at you and then back at his computer. "Yeah, I''m busy."'
+					'"Can I ask what you''re doing?" you ask, trying to strike up more of a conversation.'
+					'He sighs and looks over at you. "I''m working on a new song. Now if you don''t mind, I''d like to be left alone."'
+					'He returns his focus to his laptop and ignores you, so you decide to leave.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				end
 			end
 		killvar 'tempRad'
 		end
-	! Saturday timed 
+	! Saturday timed
 	! and Sunday all day if that should be
 	elseif week = 7 or (week = 6 and hour >= 8 and hour < 20):
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv. Currently Radomir is sitting at the desk working on his laptop.'
+		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
+		'Radomir is sitting at the desk, working on his laptop.'
 		act 'Leave his room': gt 'anushapt_city','hallway'
 		act 'Say hi':
 			*clr & cla
 			'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-			'You walk into his room, crossing it over near him, as you say. "Hi, you busy?"'
+			'You walk into his room. "Hi. You busy?"'
 !!note to self to expand this in the future
 			if npc_rel['A154'] >= 60:
 				minut += 10
-				'Radomir glances over to you. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and see what you was doing."'
-				'He nods a bit. "Just working on a new song is all."'
-				'The two of you talk about music for a bit but he keeps getting distracted by working on the song. After a bit you decide to leave him to it.'
+				'He glances over at you. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and see what you were doing."'
+				'He nods. "Just working on a new song is all."'
+				'The two of you talk about music, but he keeps getting distracted by working on the song. After a while, you decide to leave him to it.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			elseif npc_rel['A154'] <= 20:
 				minut += 1
-				'He glances over at you and immediately has a look of anger on his face. "What the fuck are you doing? Get the fuck out of my room." He says, as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
+				'He glances over at you and immediately has a look of anger on his face.'
+				'"What the fuck are you doing? Get the fuck out of my room!" he says as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			else
 				minut += 5
-				'Radomir glances up at you and then back at his computer. "Yeah, I''m busy."'
-				'"Oh sorry, can I ask what you are doing?" You ask him trying to strike up more of a conversation.'
-				'He sighs and looks over at you. "I''m working on a new song, now if you don''t mind I would like to be left alone." After that he just ignores you, after a couple of minutes of being ignore you just leave.'
+				'He glances up at you and then back at his computer. "Yeah, I''m busy."'
+				'"Can I ask what you are doing?" you ask, trying to strike up more of a conversation.'
+				'He sighs and looks over at you. "I''m working on a new song. Now if you don''t mind, I''d like to be left alone."'
+				'He returns his focus to his laptop and ignores you, so you decide to leave.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv.'
+		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
 		'Since nobody''s here, you should probably leave, but you could take a look around if you''re curious.'
 		act 'Leave his room': gt 'anushapt_city','hallway'
 		act 'Look around':
@@ -836,7 +853,7 @@ if $ARGS[0] = 'rad_room':
 			minut += 10
 			'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_nightstand.jpg"></center>'
-			'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. His computer is password connected so you can''t use it. The only thing of note is some condoms and other stuff in one of the night stands.'
+			'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. His computer is password protected, so you can''t use it. The only thing of note is some condoms and other stuff in one of the night stands.'
 			act 'Leave his room': gt 'anushapt_city','hallway'
 		end
 	end
@@ -853,14 +870,15 @@ if $ARGS[0] = 'ark_val_room':
 	gs 'anushapt_city_schedule'
 	'<center><b><font color = maroon>Arkadi and Valentin''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/ark_val_room.jpg"></center>'
-	'The room is pretty small, obviously the smallest bedroom in the apartment. In each corner opposite the door is a bed, both are a mess and neither looks like they have ever been made. The walls and even the ceiling is covered in posters along with a few records. Most of the posters are of varies bands, but a few are of scantly or completely naked girls, along with one rather larger star wars poster on the ceiling. Between the beds along the back wall is two night stands, one by each bed. Both are pretty cluttered looking with a single window just between the night stands. Other than that the room is pretty empty but the beds almost completely fill the room, there is a small closest near the door and two dressers along the same wall as the drawer.'
+	'The room is pretty small, the smallest bedroom in the apartment. In each corner opposite the door is a bed; both are a mess and neither looks like they''ve ever been made. The walls and even the ceiling are covered in posters along with a few records. Most of the posters are of various bands, but a few are of scantly or completely naked girls, along with one rather larg Star Wars poster on the ceiling.'
+	'Between the beds along the back wall are two night stands, one by each bed. Both are pretty cluttered looking, with a single window just between the night stands. Other a closet near the door, the room is otherwise pretty empty.'
 	act 'Leave': gt 'anushapt_city','hallway'
 	act 'Look around':
 		*clr & cla
 		minut += 10
 		'<center><b><font color = maroon>Arkadi and Valentin''s room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/ark_val_room.jpg"></center>'
-		'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. The room is too disorganized for you to find much. Beyond guys clothes, along with a pile on the floor of which you can''t tell if they are clean or not, nothing stands out, other than you find a few joints and condoms in the nightstands.'
+		'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. The room is too disorganized for you to find much. Beyond clothes, nothing stands out other than a few joints and condoms in the nightstands.'
 		act 'Leave': gt 'anushapt_city', 'hallway'
 	end
 end
@@ -877,10 +895,9 @@ if $ARGS[0] = 'nushlivroom':
 	locat['A144'] = 5
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living_room.jpg"></center>'
-	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch but in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it has been dusted in months or the floor has been recently swept. You walk over and sit down next to Anushka.'
-	*nl
-	'You notice that you don''t hear anything else. "Where''s everyone else?" you ask her.'
-	'She shrugs a bit. "I think they all went out to see a movie, so I have the place all to myself for a change."'
+	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table with several empty beer bottles and cups spread across it. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it''s far from clean. You walk over and sit down next to Anushka.'
+	'You notice that you don''t hear anything else. "Where''s everyone else?"'
+	'She shrugs. "I think they all went out to see a movie, so I have the place to myself."'
 	act 'Watch the show with her':
 		*clr & cla
 		gs 'stat'
@@ -889,22 +906,23 @@ if $ARGS[0] = 'nushlivroom':
 		gs 'anushapt_city_schedule'
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
-		'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-		act 'Follow Anushka to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+		'The two of you chat while watching some cheesy American action movie, so you barely pay attention to it. In fact, it ends and something else comes on that you don''t even remember. After a few hours though, you hear keys in the lock of the door.'
+		'"Shit, they''re home already. Come on, let''s go," she says as she gets up and heads to her room.'
+		act 'Follow Anushka to her room': locat['A144'] = 2 & gt 'anush_bedroom_city','anushroom'
 	end
 	if strapnumber > 0:
 		act 'Pull out your strap-on':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap1.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'Anushka arches her eyebrows when you pull the strap-on out of your purse, then bites her lower lip. "Just what are you planning to do with that?"'
 				'You give her a grin. "I was thinking about fucking you with it, or maybe having you fuck me with it? With nobody home, it would be a crime to waste the freedom it gives us."'
-				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I will fuck your tight little asshole until you scream for me."'
+				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I''ll fuck your tight little asshole until you scream for me."'
 				act 'Fuck her': gt 'anushkaev1', 'couch_strapon_give', 'city'
 				act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get', 'city'
 			else
-				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice." she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
+				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice," she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
 				act 'Watch the show with her':
 					*clr & cla
 					gs 'stat'
@@ -913,8 +931,9 @@ if $ARGS[0] = 'nushlivroom':
 					gs 'anushapt_city_schedule'
 					'<center><b><font color = maroon>Living room</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
-					'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on, let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-					act 'Follow Anushka to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+					'The two of you chat while watching some cheesy American action movie, so you barely pay attention to it. In fact, it ends and something else comes on that you don''t even remember. After a few hours though, you hear keys in the lock of the door.'
+					'"Shit, they''re home already. Come on, let''s go," she says as she gets up and heads to her room.'
+					act 'Follow Anushka to her room': locat['A144' ] = 2 & gt 'anush_bedroom_city','anushroom'
 				end
 			end
 		end

+ 162 - 159
locations/anushaptbr.qsrc

@@ -15,8 +15,8 @@ if $ARGS[0] = 'brotherroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'	
-	act 'Leave': gt 'anushapt', 'hallway'	
+	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'
+	act 'Leave': gt 'anushapt', 'hallway'
 	if AnushkaLoc = 3 and maksimQW['QWstage'] = 0:
 		maksimQW['QWstage'] = 1
 		menu_off = 1
@@ -119,7 +119,7 @@ if $ARGS[0] = 'brotherroom':
 						'"But dad! She cheated again!" Timofey pleads with him.'
 						'"But dad nothing. Weren''t you supposed to be studying?" Eduard asks.'
 						*nl
-						'"Y-Yes..." both brothers answer.' 
+						'"Y-Yes..." both brothers answer.'
 						'"Well get to it!" he says to them, then turns to you and Anushka. "You two get out of their room and stop tormenting your brothers, Nush!" He holds the door open until you both leave, then pulls it shut hard.'
 						'Anushka starts to respond, but Eduard interrupts her. "I don''t care! Leave them alone so they can study. Take your friend to your room." With that, he turns and goes back to the living room.'
 					else
@@ -141,7 +141,7 @@ if $ARGS[0] = 'brotherroom':
 						'The door closes before you can hear any more, leaving you unable to make out anything beyond muffled sounds.'
 					end
 					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
-				end	
+				end
 			end
 		end
 	elseif AnushkaLoc ! 3:
@@ -187,13 +187,13 @@ if $ARGS[0] = 'brotherroom':
 							'"No, because he''s a pussy magnet! He can get any girl he wants!" he says while giving you his best seductive grin. It''s laughable at best.'
 							*nl
 							'"That was way too much information for me. I think it''s time for me to head out. I''m feeling a bit nauseous." You see a disappointed look on Maksim''s face.'
-							'As you''re walking out, Maksim turns to his brother. "Bitches are a ruble a dozen, just like Radomir said!"' 
+							'As you''re walking out, Maksim turns to his brother. "Bitches are a ruble a dozen, just like Radomir said!"'
 							'As you close the door, you hear Timofey agreeing. It''s very likely that he has no idea what he''s agreeing with, though.'
 							act 'Leave': gt 'anushapt', 'hallway'
 						end
-					end	
+					end
 				end
-			end	
+			end
 		elseif brotherroom = 2 and maksimQW['QWstage'] = 2:
 			gs 'stat'
 			maksimQW['QWstage'] = 3
@@ -228,7 +228,7 @@ if $ARGS[0] = 'brotherroom':
 						'Giving up on reasoning with him, you shrug and turn to the magazine. As you flip through the pages, you realize the boy has some kinky tastes and wonder who might have bought something like this for him. Whoever it was, you figure there''s no harm in him looking at pictures, so when you reach the end, you throw the magazine back onto his bed. "I won''t tell anyone your secret, but try to be nice to each other at least."'
 						act 'Leave': gt 'anushapt', 'hallway'
 					end
-				end	
+				end
 			end
 		elseif brotherroom = 3 and maksimQW['QWstage'] >= 3:
 			maksimQW['QWstage'] = 4
@@ -283,7 +283,7 @@ if $ARGS[0] = 'brotherroom':
 						end
 						act 'Deal': gt 'anushaptbr', 'race_maksim_result'
 						if pcs_inhib > 30: act 'Deal (Go easy on Maksim)': gt 'anushaptbr', 'race_maksim_result', 1
-					end	
+					end
 				end
 			end
 		else
@@ -294,7 +294,7 @@ if $ARGS[0] = 'brotherroom':
 		end
 		killvar 'brotherroom'
 	end
-end 
+end
 
 
 if $ARGS[0] = 'race_maksim_result':
@@ -337,15 +337,15 @@ if $ARGS[0] = 'race_maksim_result':
 		'You smile, knowing he only switched games because he couldn''t win. "Well?"'
 		'He glances at you. "Well what?"'
 		'You smile at him. "You said you would tell me a secret about your sister, so what is it?"'
-		if maksimQW['secret1'] = 0 and hotcat >= 6 and npc_rel['A144'] >= 50:
+		if maksimQW['secret1'] = 0 and pcs_hotcat >= 6 and npc_rel['A144'] >= 50:
 			maksimQW['secret1'] = 1
-			'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."' 
+			'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."'
 			'You just shake your head. You should have known he wouldn''t actually tell you anything you didn''t already know.'
 		elseif maksimQW['secret2'] = 0:
 			maksimQW['secret2'] = 1
 			'He looks around for a few seconds. "She keeps a bunch of drugs in her dresser."'
 			'You smile. "How would you know that? Have you been going through her panty drawer?" you ask in a teasing tone.'
-			'He turns bright red. "NO! Shut up and get out of my room!"' 
+			'He turns bright red. "NO! Shut up and get out of my room!"'
 			'You sigh and get up, leaving his room before he throws a fit.'
 		else
 			'He sighs and tells you about some nonsense thing she did as a kid that no one would care about, once again learning nothing worth knowing. You don''t know why you keep playing against him. You just shake your head and leave.'
@@ -390,66 +390,67 @@ if $ARGS[0] = 'rematch':
 			'Both of them get excited. "Your friend better be great. We''ve been practicing really hard and we''ll definitely beat you this time!"'
 			'Anushka quickly questions him while smiling. "You really think you can beat us this time?"'
 			'The boys nod at each other. "We''re sure!"'
-			act 'Sit down and play':
+		end
+		act 'Sit down and play':
+			*clr & cla
+			maksimQW['nush_games'] = 2
+			minut += 15
+			gs 'exp_gain', 'gaming', rand(1, 3)
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+			'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
+			act 'Finish':
 				*clr & cla
-				maksimQW['nush_games'] = 2
 				minut += 15
-				gs 'exp_gain', 'gaming', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-				'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
-				act 'Finish':
-					*clr & cla
+				if pcs_gaming <= 20:
+					maksimQW['nush_games_win'] = 1
+					'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
+					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
+					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+				elseif pcs_gaming <= 40:
+					maksimQW['nush_games_win'] = 2
 					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						maksimQW['nush_games_win'] = 1
-						'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
-						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
-						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-					elseif pcs_gaming <= 40:
-						maksimQW['nush_games_win'] = 2
-						minut += 15
-						'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
-						'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
-						'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
-						*nl
-						'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
-						'Anushka just laughs. "Well, whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
-						'"SHUT UP!" Maksim yells in response.'
-						'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
-						'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
-						*nl
-						'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
-						'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
-					else
-						maksimQW['nush_games_win'] = 3
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again!" she says in a teasing tone, then sticks her tongue out at him.'
-						'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
-						*nl
-						'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "Good, then don''t... Get out!"'
-						'Anushka sounds exasperated. "Fine, I won''t, you little brat!"'
-						*nl
-						'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
-				end	
+					'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
+					'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
+					'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
+					*nl
+					'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
+					'Anushka just laughs. "Well, whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
+					'"SHUT UP!" Maksim yells in response.'
+					'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
+					'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
+					*nl
+					'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
+					'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
+				else
+					maksimQW['nush_games_win'] = 3
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again!" she says in a teasing tone, then sticks her tongue out at him.'
+					'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
+					*nl
+					'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "Good, then don''t... Get out!"'
+					'Anushka sounds exasperated. "Fine, I won''t, you little brat!"'
+					*nl
+					'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
+
 	elseif maksimQW['nush_games'] = 2:
 		'The two of you walk down the hall and enter her brothers'' room. As you do you hear moaning sounds, you have heard enough porn to recognize that sound. Maksim looks up with huge wide eyes like he was caught in the middle of something. He slams a small laptop closed and the sounds stop as he turns bright red, you notice Timofey is nowhere to be found. Anushka just stops a moment, she obviously knows the sounds as well as she says. "Just what was you doing you little pervert?"'
 		*nl
@@ -491,65 +492,66 @@ if $ARGS[0] = 'rematch':
 			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
 			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
 			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
-			'Maksim looks mad. "Just shut up and play!"' 
+			'Maksim looks mad. "Just shut up and play!"'
 			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
-			act 'Play':
+		end
+		act 'Play':
+			*clr & cla
+			gs 'exp_gain', 'gaming', rand(1,3)
+			minut += 15
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+			'"Come on guys, let''s just have fun!" you tell them.'
+			'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+			act 'Finish':
 				*clr & cla
-				gs 'exp_gain', 'gaming', rand(1,3)
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-				'"Come on guys, let''s just have fun!" you tell them.'
-				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
-				act 'Finish':
-					*clr & cla
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back-to-back matches. Both brothers jump up and do some weird little victory dance. "Haha, go suck a dick that''s all your good at!" Maksim taunts as he looks directly at Anushka.'
-						'Anushka reaches out and grabs him by the shirt. "Shut your fucking mouth, I am so sick of your fucking shit." She looks visibly angry this time.'
-						'Maksim actually goes a little white, like he is actually afraid of her, while Timofey jumps up and grabs Anushka''s arm. "Stop... stop fighting, he didn''t mean it."'
-						*nl
-						'Anushka turns to look at Timofey and you see the anger melt away from her as she lets go of Marksim. "Ok for you." Then she kisses him on the top of his head much to his dismay, unable to get away from her until she finishes.'
-						'"EEEWWW stop it!" Timofey whines while Maksim laughs at him. Then he gives Maksim a dirty look while he is laughing. "Why do you both have to always be so mean."'
-						'Anushka rolls her eyes. "I wasn''t being mean."'
-						'Maksim decides to taunt his brother more. "Now you got all her sex cooties from all the guys she lets fuck her."'
-						*nl
-						'Timofey looks more distressed and then leaves the room. Anushka gives Maksim a dirty look. "Why do you always have to be such an asshole."'
-						'"Fuck you, get out!" Maksim says as Anushka just shakes her head in obvious disgust at her brother and then leaves the room.'
-						'You follow her, she catches up to Timofey as he is going into the bathroom. "Hey I don''t have cooties, stop listening to him."'
-						'He looks at her like she is stupid. "All girls have cooties, I need to wash them off." Then he goes into the bathroom closing the door.'
-						'Anushka just shakes her head and laughs. "God boys are so stupid, in a few years he will be chasing girls." Then the two of you go back to her room.'
-					elseif pcs_gaming <= 40:
-						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "Why are you so bad, if you didn''t suck so much we would have won."'
-						'Timofey shakes his head. "No, you suck and you''re why we lost. You always have to try and be the hero and try and win on your own, instead of sticking with me."'
-						'"I leave you because you suck and slow me down!" Maksim yells.'
-						'Before you can even react, Anushka tells him. "You want dad to come back in here?"'
-						'Maksim pushes Anushka. "Get out of my room. Get out!"'
-						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here."' 
-						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
-					else
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
-						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
-						*nl
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
-						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				if pcs_gaming <= 20:
+					'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back-to-back matches. Both brothers jump up and do some weird little victory dance. "Haha, go suck a dick that''s all your good at!" Maksim taunts as he looks directly at Anushka.'
+					'Anushka reaches out and grabs him by the shirt. "Shut your fucking mouth, I am so sick of your fucking shit." She looks visibly angry this time.'
+					'Maksim actually goes a little white, like he is actually afraid of her, while Timofey jumps up and grabs Anushka''s arm. "Stop... stop fighting, he didn''t mean it."'
+					*nl
+					'Anushka turns to look at Timofey and you see the anger melt away from her as she lets go of Marksim. "Ok for you." Then she kisses him on the top of his head much to his dismay, unable to get away from her until she finishes.'
+					'"EEEWWW stop it!" Timofey whines while Maksim laughs at him. Then he gives Maksim a dirty look while he is laughing. "Why do you both have to always be so mean."'
+					'Anushka rolls her eyes. "I wasn''t being mean."'
+					'Maksim decides to taunt his brother more. "Now you got all her sex cooties from all the guys she lets fuck her."'
+					*nl
+					'Timofey looks more distressed and then leaves the room. Anushka gives Maksim a dirty look. "Why do you always have to be such an asshole."'
+					'"Fuck you, get out!" Maksim says as Anushka just shakes her head in obvious disgust at her brother and then leaves the room.'
+					'You follow her, she catches up to Timofey as he is going into the bathroom. "Hey I don''t have cooties, stop listening to him."'
+					'He looks at her like she is stupid. "All girls have cooties, I need to wash them off." Then he goes into the bathroom closing the door.'
+					'Anushka just shakes her head and laughs. "God boys are so stupid, in a few years he will be chasing girls." Then the two of you go back to her room.'
+				elseif pcs_gaming <= 40 and pcs_gaming > 20:
+					'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "Why are you so bad, if you didn''t suck so much we would have won."'
+					'Timofey shakes his head. "No, you suck and you''re why we lost. You always have to try and be the hero and try and win on your own, instead of sticking with me."'
+					'"I leave you because you suck and slow me down!" Maksim yells.'
+					'Before you can even react, Anushka tells him. "You want dad to come back in here?"'
+					'Maksim pushes Anushka. "Get out of my room. Get out!"'
+					'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here."'
+					'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+				else
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+					'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+					*nl
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+					'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
+
 	elseif maksimQW['nush_games'] = 4:
 		'The two of you walk down the hall and enter her brothers'' room. As you do you only see Timofey on his bed reading a comic, he looks up at the two of you but doesn''t say anything. "Where''s your brother?" Anushka asks.'
 		'Timofey shrugs. "I don''t know, he ran off outside with his friends, they wouldn''t let me play with them." He says sadly.'
@@ -568,7 +570,7 @@ if $ARGS[0] = 'rematch':
 				'They are both way better at the game than you are, you are pretty sure Anushka is better than Timofey because each time he messes up. She suddenly messes up to and seems unable to get going again until he passes her. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
 				'He smiles again and nods. "Ok but I won''t take it easy on you."'
 				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
-			elseif pcs_gaming <= 40:
+			elseif pcs_gaming <= 40 and pcs_gaming > 20:
 				'You are about as good as Timofey, you think Anushka is better than you both though. You notice each time he makes a mistake and you get in the lead she gets by him too suddenly, not long after she always manages to crash into you, letting Timofey get back ahead of both of you. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
 				'He smiles again and nods. "Ok but I won''t take it easy on you."'
 				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
@@ -603,56 +605,57 @@ if $ARGS[0] = 'rematch':
 			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
 			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
 			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
-			'Maksim looks mad. "Just shut up and play!"' 
+			'Maksim looks mad. "Just shut up and play!"'
 			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
-			act 'Play':
+		end
+		act 'Play':
+			*clr & cla
+			gs 'exp_gain', 'gaming', rand(1,3)
+			minut += 15
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+			'"Come on guys, let''s just have fun!" you tell them.'
+			'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+			act 'Finish':
 				*clr & cla
-				gs 'exp_gain', 'gaming', rand(1,3)
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-				'"Come on guys, let''s just have fun!" you tell them.'
-				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
-				act 'Finish':
-					*clr & cla
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, see told you girls suck at video games!" Maksim taunts.'
-						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
-						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-					elseif pcs_gaming <= 40:
-						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
-						'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
-						'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
-						'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
-						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."' 
-						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
-					else
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
-						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
-						*nl
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
-						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				if pcs_gaming <= 20:
+					'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, see told you girls suck at video games!" Maksim taunts.'
+					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
+					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+				elseif pcs_gaming <= 40 and pcs_gaming > 20:
+					'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
+					'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
+					'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
+					'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
+					'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."'
+					'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+				else
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+					'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+					*nl
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+					'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
 	end
 end
 
+
 --- anushaptbr ---------------------------------

+ 30 - 30
locations/anushka.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'plan':
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-	'Valentin sits across from you while Anushka takes the seat next to you. She slides her arm around your shoulders and pulls you close to her. "<<$pcs_nickname>>, we need your help with a plan."' 
+	'Valentin sits across from you while Anushka takes the seat next to you. She slides her arm around your shoulders and pulls you close to her. "<<$pcs_nickname>>, we need your help with a plan."'
 	'"What plan?" you ask. You look from her to Valentin, then back. Anushka''s answer comes so fast that you''re certain she was waiting for that exact question. "We want to drug Mr <<$rand_teacher>>... You know, so we can go have fun." You''re almost certain you misheard her, but she casually ignores your shocked expression and explains the part she expects you to play. "I''ll go up and distract him. When I do, we need you to drop these in his drink." She places several pills in your hand.'
 	*nl
 	'You look at the pills, turning them uncertainly in your fingers before looking up at them again. "What exactly will these do to him?"'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'plan':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 	act 'Agree':
 		*clr & cla
 		npc_rel['A144'] += 1
@@ -71,9 +71,9 @@ if $ARGS[0] = 'plan':
 					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
-					'You shake your head, denying the offered drink. He snorts and she rolls her eyes before pulling out a joint and lighting it up. Before long, the two of them are ignoring you while having a smoke and a drink together. It doesn''t take long for the two of them to start making out next to you and you watch in fascination as he starts pulling his pants down.' 
+					'You shake your head, denying the offered drink. He snorts and she rolls her eyes before pulling out a joint and lighting it up. Before long, the two of them are ignoring you while having a smoke and a drink together. It doesn''t take long for the two of them to start making out next to you and you watch in fascination as he starts pulling his pants down.'
 					gs 'stat'
-					if hotcat >= 6:
+					if pcs_hotcat >= 6:
 						'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'
 						gs 'willpower', 'bj', 'resist'
 						if will_cost <= pcs_willpwr:
@@ -92,7 +92,7 @@ if $ARGS[0] = 'plan':
 							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>'
-						end	
+						end
 						act 'Suck him':
 							*clr & cla
 							npc_rel['A144'] += 1
@@ -111,7 +111,7 @@ if $ARGS[0] = 'plan':
 				end
 			else
 				act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act 'Take a drink':
 				*clr & cla
 				npc_rel['A144'] += 1
@@ -123,8 +123,8 @@ if $ARGS[0] = 'plan':
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/detcbj.jpg"></center>'
 				'You take the offered drink and take a swig as well. You immediately regret it because you choke and cough from the burning liquid. This results in them both laughing. Whatever is in the flask is much stronger than you expected. Anushka soon takes out a joint and lights it up before passing it around. After only a few drinks each, the flask is empty, and the joint doesn''t last much longer. With the flask empty and the joint smoked to ashes, you''re feeling pretty buzzed and watch in dazed fascination as Valentin pulls his pants down.'
-				if hotcat >= 6:
-					'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'			
+				if pcs_hotcat >= 6:
+					'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'
 					gs 'willpower', 'bj', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Pull away (<<will_cost>> Willpower)':
@@ -161,7 +161,7 @@ if $ARGS[0] = 'plan':
 			end
 		end
 	end
-end					
+end
 
 if $ARGS[0] = 'Her turn':
 	*clr & cla
@@ -205,12 +205,12 @@ if $ARGS[0] = 'Her turn':
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/detccum.jpg"></center>'
 					'As Anushka''s orgasm finishes, you hear Valentin pant and grunt as her ass squeezes and twitches around his cock. You know he''s getting close and it seems Anushka does as well. She quickly climbs off him and kneels down in front of him, pulling you down as well so you can join her. She grabs his dick and rapidly starts jerking it. A few seconds later, a stream of cum spurts out and hits you in the face. The next spurt she aims at her own face followed by your tits, then her own tits. She spreads his spunk between the two of you, coating both of your tits and faces with his sticky cum.'
-					'When he''s finished, she diligently licks you clean and you return the favor. When all the cum has been collected, she gives you a deep and passionate kiss, both of you making sure to share the cum you licked up together. With that done, the three of you get dressed. As Valentin unlocks the lounge door, he gives you a smirk. "Okay, I admit it. You''re not as much of a killjoy as I thought, <<$pcs_nickname>>. Nush was right; you''re a pretty cool chick. Not to mention you really know how to suck cock." You give Anushka a sideways glance and find her grinning at you.' 
+					'When he''s finished, she diligently licks you clean and you return the favor. When all the cum has been collected, she gives you a deep and passionate kiss, both of you making sure to share the cum you licked up together. With that done, the three of you get dressed. As Valentin unlocks the lounge door, he gives you a smirk. "Okay, I admit it. You''re not as much of a killjoy as I thought, <<$pcs_nickname>>. Nush was right; you''re a pretty cool chick. Not to mention you really know how to suck cock." You give Anushka a sideways glance and find her grinning at you.'
 					gs 'arousal', 'kiss', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					'Going back to the library, you see that the teacher is still out like a light and all the other students are gone. There''s less than an hour of detention left, so the three of you leave the school. Once outside, you each go your separate ways.'
-					
+
 					act 'Go home': gt 'gschool_grounds', 'main'
 				end
 			end
@@ -314,7 +314,7 @@ if $ARGS[0] = 'wedgie fight':
 						'You quickly gather up your clothes and get dressed again. As the two of you head out, Anushka turns to you. "Hey <<$pcs_nickname>>, you want to come by my place?"'
 						act 'Can''t':
 							*clr & cla
-							'You shake your head. "Sorry Nush, I have some things I need to do. Maybe some other time."' 
+							'You shake your head. "Sorry Nush, I have some things I need to do. Maybe some other time."'
 							'She shrugs. "Sure. Whatever..." she replies noncommittally.  '
 							act 'Leave': gt 'gschool_grounds', 'main'
 						end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'temptation':
 				end
 			else
 				act 'I would like to, but... (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	end
 end
@@ -449,7 +449,7 @@ if $ARGS[0] = 'naked':
 				end
 			else
 				act 'Decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	end
 end
@@ -459,7 +459,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 	'You''re waiting for the janitor to pass.'
-	
+
 	if anushLimitedQuestions > 0:
 		if anushTalkedofDolls = 0:
 			act 'Make small talk':
@@ -488,7 +488,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 				end
 			end
 		end
-		
+
 		act 'Ask about her reputation':
 			*clr & cla
 			anushLimitedQuestions -= 1
@@ -504,7 +504,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'She shakes her head. "Nope, not even in the slightest. Half of it isn''t even true anyway, and the stuff that is shouldn''t be an issue. If I feel like fucking someone, then I do. Just because I like it." she shrugs slightly before continuing. "While I party a lot and screw around, that''s not what makes me, <b>me</b>. All that is just small parts of me. I do what I want, and that makes <b>me</b> happy. Those who understand that are my friends. The rest... Well, fuck''em."'
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 		end
-		
+
 		act 'Ask about her getting naked':
 			*clr & cla
 			anushLimitedQuestions -= 1
@@ -517,7 +517,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'Looking at her naked like this, you just have to ask. "So what''s the deal with always getting naked? I mean I know of a few times, and if even half the gossip is true, this is a pretty normal state for you." You add a bit of friendly ribbing to your tone.'
 			'Snorting, she seems to think about it before shrugging. "Honestly, I don''t know. I''m proud of my body and not ashamed of it. I don''t see why it should be a big thing anyway. Plus, I like the thrill that you get from doing something that''s a little taboo, where you can get caught, I just love it! Like knowing the janitor is going to be passing by this room shortly, maybe coming in and catching us without a stitch on..." She bites her lower lip and looks mildly turned on. "I just love the thrill of almost getting caught... or actually getting caught."'
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
-		end		
+		end
 
 		act 'Ask about the band':
 			*clr & cla
@@ -540,7 +540,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			end
 			!!ToDo: A flag probably needs to be set here to keep track of Nush having Sveta''s number.
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
-		end	
+		end
 
 		act 'Ask if she has a boyfriend':
 			*clr & cla
@@ -548,7 +548,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 			'You know that she''s seeing some guys and girls, so it''s not really a secret. You''re not sure if you should even ask, but you''re curious. "Do you have a boyfriend? Or a girlfriend?"'
-			'She shakes her head. "Nope, not really looking right now. I''m young and carefree. I plan to, as they say, sow my wild oats while I can. I''m not against the idea mind you. If that right person came along and just blew me away, then I would likely consider it." She pauses for a second and gives you a wicked grin. "Why do you ask? Are you wanting to fill that <i>slot?</i>"' 
+			'She shakes her head. "Nope, not really looking right now. I''m young and carefree. I plan to, as they say, sow my wild oats while I can. I''m not against the idea mind you. If that right person came along and just blew me away, then I would likely consider it." She pauses for a second and gives you a wicked grin. "Why do you ask? Are you wanting to fill that <i>slot?</i>"'
 			'The way she says it makes you blush. She leaves no doubt about what she means and makes it sound so dirty, yet so exciting at the same time.'
 			act 'Maybe':
 				*clr & cla
@@ -598,7 +598,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 								'You nod, accepting her apology of sorts, and you both let the topic drop.'
 								act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 							else
-								if hotcat >= 6:
+								if pcs_hotcat >= 6:
 									'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 									'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
 									'She snorts. "Yeah sure he is... Uh-huh. Be honest <<$pcs_nickname>>, it''s because he has a really big dick, isn''t it?" she asks with a grin while pretending to hold a really big imaginary dick between her legs.'
@@ -650,7 +650,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 						act 'Vitek':
 							cla
 							'"Vitek," you tell her.'
-							'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."' 
+							'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."'
 							'She notices your facial expression from her bad mouthing your boyfriend, so she holds up her hand. "Hey, it''s your life, so do what you want, but doesn''t it feel like you''re dating Lena at the same time because of how much she talks about how great he is? At least, when she isn''t bitching about him ruining her sex life. You would think she wants to suck his dick or something," she says with a smirk. You just roll your eyes and she lets it drop.'
 							act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 						end
@@ -661,7 +661,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 							'"Artem," you tell her.'
 							'She arches a slender brow slightly. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute, and I bet you have him totally pussy whipped to do whatever you want. Yeah ok, I can see the appeal." she says with a giggle.'
 							'You shake your head at her comment. "He''s sweet and really nice to me."'
-							if hotcat >= 6:
+							if pcs_hotcat >= 6:
 								'She snorts. "Yeah, I''m sure he is, but the real question is - Is he any good at fucking?"'
 								'You roll your eyes at her. "There''s more to life than just sex you know!" Seeing the look on her face you add, "Okay yeah, he''s pretty good at it... Good enough anyway."'
 								'She grins. "Oh ''good enough'', huh? I''m sure that''s a ringing endorsement that strokes his ego," she says while pretending to stroke her imaginary dick. "Hmm, well maybe I should find out for myself. Do you think he''d be up for a threesome?" she asks as she winks and makes a kissy face at you.'
@@ -723,13 +723,13 @@ if $ARGS[0] = 'chatwhilewaiting':
 					Killvar 'i'
 				end
 			end
-		end	
+		end
 
 		if anushAskedofAlyona = 0:
 			act 'Ask about Alyona':
 				*clr & cla
 				anushLimitedQuestions -= 1
-				anushAskedofAlyona = 1		
+				anushAskedofAlyona = 1
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 				'You''ve heard some messed up things about Alyona, so you''re curious about her friendship with Anushka. "You''re friends with Alyona, right?" you ask and she nods. "How''s she doing?"'
@@ -747,14 +747,14 @@ if $ARGS[0] = 'chatwhilewaiting':
 					'Knowing you''ve pushed things as far as you dare, you change the subject.'
 					act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 				end
-			end		
+			end
 		end
-		
+
 		if anushAskedGrad = 0:
 			act 'Ask what she plans to do after graduation':
 				*clr & cla
 				anushLimitedQuestions -= 1
-				anushAskedGrad = 1	
+				anushAskedGrad = 1
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 				'Curious about her plans for the future, you decide to ask what she plans to do once school is over. "Once we graduate, what do you plan to do? Are you going to focus on the band more?"'
@@ -788,8 +788,8 @@ if $ARGS[0] = 'chatwhilewaiting':
 				if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushka'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
 				i +=1
 				if i < ARRSIZE('lover'): jump 'marrid_looop'
-				Killvar 'i'		
-			end		
+				Killvar 'i'
+			end
 		end
 	elseif anushLimitedQuestions <= 0:
 		act 'You hear that?':

+ 12 - 12
locations/anushkachat.qsrc

@@ -321,7 +321,7 @@ if $ARGS[0] = 'chat':
 			if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
 			i +=1
 			if i < ARRSIZE('lover'): jump 'marrid_looop'
-			killvar 'i'			
+			killvar 'i'
 		else
 			act 'Get married':
 				*clr & cla
@@ -436,7 +436,7 @@ if $ARGS[0] = 'chat':
 			end
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You look at her as you sit side by side. Maybe for too long, or maybe she just senses it, since she turns her head to look at you. Her face is not that far from yours and you can''t help it; she''s so damn pretty! You lean over to give her a kiss, a kiss she fully returns. The two of you kiss for a bit, but you are not sure she wants to do more yet or not. Perhaps you should press on or maybe you should wait and try some other time for more.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
@@ -454,7 +454,7 @@ if $ARGS[0] = 'chat':
 						act 'Stop making out':
 							*clr & cla
 							gs 'npc_relationship', 'modify', 'A144', 'hate'
-							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"' 
+							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
 							'She frowns. "Yeah, whatever." You don''t blame her for her reaction since you did just give her the girl equivalent of blue balls.'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -590,7 +590,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Convince her (<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 'Drop it':
 					*clr & cla
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom','anushroom'
 				act 'Keep talking': gt 'anushkachat', 'chat'
 			else
-				if hotcat >= 6:
+				if pcs_hotcat >= 6:
 					'"Fedor," you tell her.'
 					'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 					'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
@@ -751,7 +751,7 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Vitek':
 			cla
 			'"Vitek," you tell her.'
-			'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."' 
+			'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."'
 			'She notices your facial expression from her bad mouthing your boyfriend, so she holds up her hand. "Hey, it''s your life, so do what you want, but doesn''t it feel like you''re dating Lena at the same time because of how much she talks about how great he is? At least, when she isn''t bitching about him ruining her sex life. You would think she wants to suck his dick or something," she says with a smirk. You just roll your eyes and she lets it drop.'
 			act 'Stop talking': gt 'anush_bedroom','anushroom'
 			act 'Keep talking': gt 'anushkachat', 'chat'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'"Artem," you tell her.'
 				'She arches a slender brow. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute and I bet you have him totally pussy whipped to do whatever you want. Yeah okay, I can see the appeal," she says with a giggle.'
 				'You shake your head at her comment. "He''s sweet and really nice to me."'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*nl
 	'"Who?" she asks as she cocks her head slightly.'
 	'You shake your head slightly. "You''ve never met him. I just met him."'
-	'She smiles. "Just some guy you met, huh?"' 
+	'She smiles. "Just some guy you met, huh?"'
 	'You laugh, then tell her about him.'
 	act 'Stop talking': gt 'anush_bedroom','anushroom'
 	act 'Keep talking': gt 'anushkachat', 'chat'
@@ -1166,13 +1166,13 @@ if $ARGS[0] = 'photoshoot':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	if anushkaQW['photoshoot'] = 1:
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'	
+		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'
 		'You grin back. "That sounds great, lead on." She giggles and leads you down the hall to the window. She opens it and you both crawl outside onto the fire escape.'
 		act 'Start photoshoot': gt 'anushkachat', 'photoshoot1'
 	else
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before shrugging. "No, not really."'	
-		act 'Go back to her room': 
+		'She thinks for a second before shrugging. "No, not really."'
+		act 'Go back to her room':
 			*clr & cla
 			minut +=5
 			gs 'stat'
@@ -1279,7 +1279,7 @@ if $ARGS[0] = 'photoshoot1':
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Go back to her room': 
+										act 'Go back to her room':
 											*clr & cla
 											minut +=5
 											gs 'stat'

+ 10 - 10
locations/anushkachat_city.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'chat':
 			end
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You look at her as you sit side by side. Maybe for too long, or maybe she just senses it, since she turns her head to look at you. Her face is not that far from yours and you can''t help it; she''s so damn pretty! You lean over to give her a kiss, a kiss she fully returns. The two of you kiss for a bit, but you are not sure she wants to do more yet or not. Perhaps you should press on or maybe you should wait and try some other time for more.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'chat':
 						act 'Stop making out':
 							*clr & cla
 							gs 'npc_relationship', 'modify', 'A144', 'hate'
-							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"' 
+							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
 							'She frowns. "Yeah, whatever." You don''t blame her for her reaction since you did just give her the girl equivalent of blue balls.'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Convince her (<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 'Drop it':
 					*clr & cla
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -646,7 +646,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 				act 'Keep talking': gt 'anushkachat_city', 'chat'
 			else
-				if hotcat >= 6:
+				if pcs_hotcat >= 6:
 					'"Fedor," you tell her.'
 					'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 					'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'"Artem," you tell her.'
 				'She arches a slender brow. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute and I bet you have him totally pussy whipped to do whatever you want. Yeah okay, I can see the appeal," she says with a giggle.'
 				'You shake your head at her comment. "He''s sweet and really nice to me."'
@@ -784,7 +784,7 @@ if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*nl
 	'"Who?" she asks as she cocks her head slightly.'
 	'You shake your head slightly. "You''ve never met him. I just met him."'
-	'She smiles. "Just some guy you met, huh?"' 
+	'She smiles. "Just some guy you met, huh?"'
 	'You laugh, then tell her about him.'
 	act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 	act 'Keep talking': gt 'anushkachat_city', 'chat'
@@ -1082,13 +1082,13 @@ if $ARGS[0] = 'photoshoot':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	if anushkaQW['photoshoot'] = 1:
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'	
+		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'
 		'You grin back. "That sounds great, lead on." She giggles and leads you down the hall to the window. She opens it and you both crawl outside onto the fire escape.'
 		act 'Start photoshoot': gt 'anushkachat_city', 'photoshoot1'
 	else
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before shrugging. "No, not really."'	
-		act 'Go back to her room': 
+		'She thinks for a second before shrugging. "No, not really."'
+		act 'Go back to her room':
 			*clr & cla
 			minut +=5
 			gs 'stat'
@@ -1195,7 +1195,7 @@ if $ARGS[0] = 'photoshoot1':
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Go back to her room': 
+										act 'Go back to her room':
 											*clr & cla
 											minut +=5
 											gs 'stat'

+ 12 - 12
locations/anushkaev1.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'strapon1':
 	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/strapon.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if anushkaQW['dom_nush'] >= 100:
 			'You pull out the strap-on harness and hold it up. "Yeah, I like this... I''m going to use it to fuck you like the little slut you are."'
@@ -911,7 +911,7 @@ if $ARGS[0] = 'domnush_doggy':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush4.jpg"></center>'
-	'You crawl up behind her and rub the tip of the dildo against her wet slit. With just a slight movement of your hips, the cock easily slides into her wet pussy, eliciting a soft moan of pleasure. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.' 
+	'You crawl up behind her and rub the tip of the dildo against her wet slit. With just a slight movement of your hips, the cock easily slides into her wet pussy, eliciting a soft moan of pleasure. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.'
 	'While hanging onto her hips, you pull nearly all the way out of her and slam it back as far as it will go before you start fucking her as hard and rough as you can. You could keep fucking her pussy, but you can''t help but notice her asshole just looks like it''s begging for a big cock to rip it up.'
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'domnush_doggy_magic':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush4.jpg"></center>'
-	'You crawl up behind her and rub the tip of your dick against her wet slit. With just a slight movement of your hips, your cock easily slides into her tight warm wet pussy, eliciting a soft moan of pleasure, from you both. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.' 
+	'You crawl up behind her and rub the tip of your dick against her wet slit. With just a slight movement of your hips, your cock easily slides into her tight warm wet pussy, eliciting a soft moan of pleasure, from you both. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.'
 	'While hanging onto her hips, you pull nearly all the way out of her and slam it back as far as it will go before you start fucking her as hard and rough as you can. You could keep fucking her pussy, but you can''t help but notice her asshole just looks like it''s begging for a big cock to rip it up and you just so happen to be magically endowed with a big cock.'
 	gs 'arousal', 'magicd_vaginal', 5, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -999,7 +999,7 @@ if $ARGS[0] = 'domnush_fuckass1':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
-	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip the fake cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion of the dildo, but then feel it give way and your fake wet cock slides into her ass.' 
+	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip the fake cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion of the dildo, but then feel it give way and your fake wet cock slides into her ass.'
 	'She cries out in a mix of surprise, pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass.'
 	gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'domnush_fuckass_magic1':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
-	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip your cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion your dick, but then feel it give way and your wet cock slides into her ass.' 
+	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip your cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion your dick, but then feel it give way and your wet cock slides into her ass.'
 	'She cries out in a mix of surprise, pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass, making you moan in pleasure.'
 	gs 'arousal', 'magicd_anal', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1153,7 +1153,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 	*nl
 	'You add a little extra to the tip, then put a little on your fingers and rub it against her asshole. "Like you don''t let any guy just shove his cock up your ass anytime he wants! I know you''re a little butt slut and love it." Once her asshole is lubed up, you hold the dildo with one hand while placing another on her hip and guiding the dildo to her asshole.'
 	*nl
-	'Her ass resists the invasion of your fake cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.' 
+	'Her ass resists the invasion of your fake cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.'
 	'You shove your hips forward and feel her asshole give way as your fake cock slides into her ass. She hisses in a mix of pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass.'
 	gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed_magic':
 	'You decide it will be more fun for both of you if you use plenty of lube. You squirt a generous amount onto your dick and stroke it several times, working the lube the length of the shaft. She looks back over her shoulder at you and notices what you''re doing. "What, straight in my ass? You''re not going to at least get me going and fuck my pussy first? Or at least lick me or finger bang me first?"'
 	'You add a little extra to the tip, then put a little on your fingers and rub it against her asshole. "Like you don''t let any guy just shove his cock up your ass anytime he wants! I know you''re a little butt slut and love it." Once her asshole is lubed up, you hold your dick with one hand while placing another on her hip and guiding yoru cock to her asshole.'
 	*nl
-	'Her ass resists the invasion of your cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.' 
+	'Her ass resists the invasion of your cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.'
 	'You shove your hips forward and feel her asshole give way as your cock slides into her well lubed ass, once it is in, it slides pretty easily with all the lube the rest of the way in. She hisses in a mix of pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of your dick balls deep into her ass.'
 	gs 'arousal', 'magicd_anal', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 			end
 		else
 			act 'Fuck her ass raw (<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 'Use lube':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush7.jpg"></center>'
@@ -1475,7 +1475,7 @@ if $ARGS[0] = 'couch_strapon_give':
 		act 'Eat her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap5.jpg"></center>'
-			'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kissing your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.' 
+			'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kissing your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.'
 			'You then stop, step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 			gs 'arousal', 'cuni_give', 3, 'lesbian'
 			gs 'stat'
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'couch_strapon_give':
 							act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass_magic'
 						end
 					else
-						'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kiss your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.' 
+						'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kiss your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.'
 						'You then stop and step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 						gs 'arousal', 'cuni_give', 3, 'lesbian'
 						gs 'stat'
@@ -1786,7 +1786,7 @@ if $ARGS[0] = 'buttplug':
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/buttplug.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		'You pull out the butt plug and hold it up. "Yeah, I like this."'
 		'Her eyes widen ever so slightly. "Just what do you plan to do with that?"'
 		'You grin at her. "I was planning on sticking it up your ass."'
@@ -2009,7 +2009,7 @@ if $ARGS[0] = 'bedstrapongetanal':
 	'She smiles at you. "I''m going to fuck you like a whore."'
 	'You laugh and help her get into the harness. "Can you just fuck my ass?" you ask her without really asking. She nods ever so slightly and grins at the request.'
 	'Once she has the harness firmly in place, she pushes you down on your stomach. "Spread your ass cheeks," she commands and you do as she says.'
-	'You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole as well. "That''s right slut, give me that ass!" she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass.' 
+	'You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole as well. "That''s right slut, give me that ass!" she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass.'
 	'You groan slightly in pain and she stops to let you adjust to it before she slowly starts ass fucking you. The more you moan, the deeper and faster she starts to fuck you.'
 	anushkaQW['dom_nush'] -= 1
 	gs 'arousal', 'anal_strap', 3, 'lesbian', 'lube'

+ 8 - 8
locations/anushkaev2.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'wait_nushrad':
 	*clr & cla
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		'You only take a few steps from the door when it opens and turn like you were just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, why don''t you join us next time? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind either since her ass could use a break. She finds me a bit too big, but what can a guy do?" he asks rhetorically with a laugh.'
 		act 'Say nothing':
 			*clr & cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'rad3some':
 	menu_off = 1
 	AnushkaLoc = 2
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		radomirQW['had_sex'] += 1
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A154'] = 0:npc_sex['A154'] = 1 & boy += 1
@@ -538,7 +538,7 @@ if $ARGS[0] = 'val3some':
 	menu_off = 1
 	AnushkaLoc = 2
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A158'] = 0:npc_sex['A158'] = 1 & boy += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin1.jpg"></center>'
@@ -903,7 +903,7 @@ if $ARGS[0] = 'mar3some':
 	AnushkaLoc = 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin3.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A146'] = 0:npc_sex['A146'] = 1 & boy += 1
 		'You walk in, confident in joining them, and close the door. You manage to walk all the way over to the bed before Anushka finally notices you and gives you a slight wave as she keeps sucking Marcus'' dick. Perhaps hearing you or noticing her wave, Marcus turns his head and notices you, quickly stepping away and using his hands to cover himself up. As he does, he backs into the bed and ends up falling onto it. He gives you and Anushka a very confused and awkward look. "I... Uh... I mean..." he stammers, not sure what to say.'
@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'disco_emptyroom':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	
+
 	if spellKnown['penisenvy'] = 1:
 		'<center><img <<$set_imgh>> src="images/pc/activities/misc/strapon_under_dress.jpg"></center>'
 		'You find an unlocked door and tell her to go inside. "Head in, I''ll join you in a minute." You quickly walk to the women''s restroom, enter one of the stalls and slide the strap-on harness on under your skirt so the dildo hangs between your legs. The strap-on in place, you head back to the room where you left Anushka.'
@@ -1307,7 +1307,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon':
 	gs 'stat'
 	if strapnumber >= 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-		'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+		'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 		'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 		act 'Go back to the disco': gt 'pav_disco'
 		act 'Leave': gt 'pav_commcenter'
@@ -1441,7 +1441,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon_magic':
 		act 'Show her the strapon':
 			if strapnumber >= 5:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-				'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+				'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 				'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 				act 'Go back to the disco': gt 'pav_disco'
 				act 'Leave': gt 'pav_commcenter'
@@ -1458,7 +1458,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon_magic':
 		*clr & cla
 		if strapnumber >= 5:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-			'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+			'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 			'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 			act 'Go back to the disco': gt 'pav_disco'
 			act 'Leave': gt 'pav_commcenter'

+ 9 - 8
locations/anushkamaksim.qsrc

@@ -121,8 +121,8 @@ if $ARGS[0] = 'maksim_blackmail':
 			gs 'stat'
 			minut += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'"Fuck off, you little shit!" you snarl and he blinks in surprise, eliciting a smirk from you. He obviously expected you to agree without question.'
-			'Anger washes over him. "Fine bitch! I''ll just go and show her!"'
+			'"Fuck off, you little shit!" you snarl and he blinks in surprise, eliciting a smirk from you. He clearly expected you to agree without question.'
+			'Anger washes over him. "Fine then, bitch! I''ll just go and show her!"'
 			'You smirk at him. "Go right ahead, I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 			'He sneers at you and pauses before angrily walking away.'
 
@@ -141,7 +141,7 @@ if $ARGS[0] = 'hallway_flash_tits':
 	gs 'fame', 'pav', 'sex', 1
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hallflashtits.jpg"></center>'
-	'You sigh as you pull your clothes aside and show him your bare breasts. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+	'You sigh as you pull your clothes aside and show him your bare breasts. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 	'You quickly pull your shirt back down. "You said show you."'
 	'"Fine," he sneers before stepping out of your way. "Go on then."'
 	gs 'arousal', 'flashlite', 1, 'humiliation', 'sub'
@@ -159,12 +159,12 @@ if $ARGS[0] = 'hallway_flash_pussy':
 	inhib_exp += rand(1,3)
 	if PCLoSkirt > 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_dress.jpg"></center>'
-		'You sigh as you lift your skirt to show him your naked pussy. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You sigh as you lift your skirt to show him your naked pussy. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 		'You quickly pull your skirt back down. "You said show you."'
 		'"Fine," he sneers before stepping out of your way. "Go on then."'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_pants.jpg"></center>'
-		'You sigh as you pull your pants down to show off your naked pussy to him. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You sigh as you pull your pants down to show off your naked pussy to him. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 		'You quickly pull your pants back up. "You said show you."'
 		'"Fine," he sneers before stepping out of your way. "Go on then."'
 	end
@@ -182,9 +182,10 @@ if $ARGS[0] = 'maksim_room_naked':
 	gs 'fame', 'pav', 'sex', 1
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/strip_naked.jpg"></center>'
-	'You follow him to his room and just as he said Timofey is not there. Maksim sits on his bed looking at you with a huge grin. "Well go on, strip. Slow and sexy."' 
-	'You sigh loudly but then do as he says. You slowly start stripping out of your clothes, while he leers at you. Once you are finally naked, you stand there for a minute or two. "Ok you seen enough."'
-	'"Fine," he sneers. "You can go then." You quickly get dressed and once you are you leave his room.'
+	'You follow him to his room and, just as he said, Timofey isn''t here. Maksim sits on his bed looking at you with a huge grin. "Well go on, strip. Slow and sexy."' 
+	'You sigh loudly, but do as he says. You slowly start stripping out of your clothes as he leers at you. Once you''re naked, you stand still for a few minutes and he continues to leer at you before you start grabbing your clothes. "You''ve seen enough."'
+	'"Fine," he sneers. "You can go then."'
+	'You quickly get dressed and leave his room.'
 	gs 'arousal', 'flash', 5, 'humiliation', 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'

+ 22 - 22
locations/artem_date_events.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'firstdate':
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	end
-end 
+end
 
 if $ARGS[0] = 'artem_date':
 	*clr & cla
@@ -83,21 +83,21 @@ if $ARGS[0] = 'artem_date':
 	gt 'artem_date_events', 'firstdate'
 !{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
-	
+
 	elseif artem_date = 2:
-	
+
 	elseif artem_date = 3:
-	
+
 	else
 		repeat_date = rand(1,3)
 		if repeat_date = 1:
-		
+
 		elseif repeat_date = 2:
-		
+
 		elseif repeat_date = 3:
-		
+
 		else
-		
+
 		end
 	end}
 end
@@ -116,7 +116,7 @@ if $ARGS[0] = 'artemGopSkver':
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
 			'You give them a look of disdain showing you''re not impressed. "Mind your own fucking business," you reply and Artem tenses up beside you.'
 			'The leader laughs. "Come on, don''t be like that. Dump this loser and have some fun with us, girl."'
-			'You push your way past him and flip them the bird. Fortunately, other than throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.' 
+			'You push your way past him and flip them the bird. Fortunately, other than throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.'
 			*nl
 			'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks. I can''t believe you said that!"'
 			'You smile back at him. "They respect strength and attitude. Don''t take their shit and they will respect you for it, just be willing to back it up if you have to. Anyway, I had fun too."'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'stand_up':
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-				'Once you make it away from them, Artem relaxes a little. Artem walks you back home.' 
+				'Once you make it away from them, Artem relaxes a little. Artem walks you back home.'
 				'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
 				'You smile back at him. "Yeah, it was a little scary, but I had fun too."'
 				'He smiles widely. "Great! Maybe we can do it again some time?"'
@@ -265,15 +265,15 @@ if $ARGS[0] = 'stand_up':
 				pcs_mood -= 20
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip2.jpg"></center>'
-				if hotcat <= 4:
-					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. The leader walks up to you with a scowl. "Fuck, you''re even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing before they all walk away laughing. You quickly get dressed as Artem struggles to his feet and wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.' 
+				if pcs_hotcat <= 4:
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. The leader walks up to you with a scowl. "Fuck, you''re even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing before they all walk away laughing. You quickly get dressed as Artem struggles to his feet and wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.'
 					'Once you get him home, you help him to bed. "You didn''t have to do that."'
 					'You smile at him. "I couldn''t let them hurt you like that."'
 					'He frowns. "I would have healed! Anyway, I could use some rest, so see you later okay?" He rolls over, obviously not wanting to talk anymore, so you get up and leave.'
 					gs 'stat'
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				else
-					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. They all gather round you as the leader grins. "Not bad, <<$pcs_nickname>>. You''ve got nice tits, just a shame that you''re wasting them on him. Now you''re going to suck all us off. If you do a good job, we''ll let you go."' 
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. They all gather round you as the leader grins. "Not bad, <<$pcs_nickname>>. You''ve got nice tits, just a shame that you''re wasting them on him. Now you''re going to suck all us off. If you do a good job, we''ll let you go."'
 					'Trying to fight them all would most likely result in you getting the shit beat out of you and raped. Maybe you can make a run for it if you distract them first?'
 					act 'Get down on your knees': gt 'artem_date_events', 'blow_bang'
 					gs 'willpower', 'misc', 'self', 'hard'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'stand_up':
 											'After catching your breath and not seeing Artem anywhere, you run the rest of the way home. You don''t stop for anyone or anything until you''re safely inside your apartment.'
 											act 'Home': gt 'korrPar'
 										end
-										act 'Wait for Artem': 
+										act 'Wait for Artem':
 											*clr & cla
 											artemQW['waited'] = 1
 											minut += 60
@@ -349,14 +349,14 @@ if $ARGS[0] = 'stand_up':
 											'He smiles. "Yeah? Well maybe our next date won''t be so exciting. The pain meds are kicking in and I could really use some sleep, so I''ll see you later, okay?" You get up and leave him to rest.'
 											act 'Leave': gt 'pod_ezd', 'etaj_1'
 										end
-										act 'Call the police': 
+										act 'Call the police':
 											*clr & cla
 											minut += 60
 											artemQW['called_police'] = 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
 											'Once you''re safe, you pull out your phone and call the police, telling them that the gopniks are assaulting Artem and tried to attack you as well. After you give them all the details you can, you hang up. Almost half an hour later, a police car pulls up at the entrance of the park and two officers get out. You hurry over to them and try and get them to hurry, but they write down your information and ask you several questions. They won''t be hurried and each time you try, they just tell you to calm down and answer their questions. In frustration, you finally answer all their questions while they write it all down.'
-											'By the time they finish, you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you."' 
+											'By the time they finish, you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you."'
 											'Before you can help him, the police walk over and help Artem over to their car before they start asking him questions. They tell you go home, warning you that this is no place for a young lady such as yourself.'
 											act 'Home': gt 'korrPar'
 										end
@@ -492,10 +492,10 @@ if $ARGS[0] = 'fight_gang':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
 	'You glare at them. "Fuck you, I''ll kill any of you that touch me."'
 	'They all laugh as one of them reaches out to grab you. You quickly punch him in the stomach, which causes him to step back, surprised you''re actually willing to fight back. Seeing this, Artem gets up. "Leave her alone!" It was a chivalrous effort, but one in vain. He never even makes it onto his feet before two of the gopniks start beating him and he goes down in a heap, where they start kicking him as the rest come for you.'
-!!fight code goes here, it is 6 adult men vs Sveta. I don''t see any way she could win, but I wanted to give the players the option, plus with magic that could change things. Below I am doing a version of if she wins and if she loses. 
+!!fight code goes here, it is 6 adult men vs Sveta. I don''t see any way she could win, but I wanted to give the players the option, plus with magic that could change things. Below I am doing a version of if she wins and if she loses.
 	if win = 1:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others way, then taking your shots in their confusion. It takes a while and they get in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. They all turn tail and flee, leaving you huffing and puffing, still naked. You check on Artem, who''s barely conscious, before you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.' 
+		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others way, then taking your shots in their confusion. It takes a while and they get in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. They all turn tail and flee, leaving you huffing and puffing, still naked. You check on Artem, who''s barely conscious, before you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.'
 		'Once you get him home, you help him to bed. "I can''t believe you won!"'
 		'You laugh. "I can''t either, but I couldn''t let them hurt you like that."'
 		'He shakes his head and seems to have mixed feelings on the subject. "Thanks anyway, but I could use some rest. See you later, okay?" He rolls over, so you get up and leave.'
@@ -517,7 +517,7 @@ if $ARGS[0] = 'gang_rape':
 	gs 'fame', 'pav', 'sex', 10
 	rape += 1
 	gang += 1
-	
+
 	!! Destroying clothing
 	$clothingworntype = 'nude'
 	KILLVAR '$lastwornclothingtype'
@@ -528,11 +528,11 @@ if $ARGS[0] = 'gang_rape':
 	if $braworntype ! 'none':
 		gs 'bras', 'dispose'
 	end
-	
+
 	gs 'artem_date_events', 'generatgopniks'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/stripped.jpg"></center>'
-	'They lift you off the ground, one covering your mouth as they drag you off deeper into the park far away from any of the paths. You see two others are dragging the unconscious Artem along. You eventually arrive in a clearing with a dirty old mattress laying on the ground, where they start ripping your clothes off. Artem is dumped nearby and the two gopniks go to stand watch as you hear your clothes ripping and tearing, which they seem to be doing intentionally. They keep ripping and tearing at your clothes until you''re completely naked.' 
+	'They lift you off the ground, one covering your mouth as they drag you off deeper into the park far away from any of the paths. You see two others are dragging the unconscious Artem along. You eventually arrive in a clearing with a dirty old mattress laying on the ground, where they start ripping your clothes off. Artem is dumped nearby and the two gopniks go to stand watch as you hear your clothes ripping and tearing, which they seem to be doing intentionally. They keep ripping and tearing at your clothes until you''re completely naked.'
 	gs 'arousal', 'flash', 5, 'gangbang', 'rape', 'rough'
 	gs 'stat'
 	act 'Continue':
@@ -636,7 +636,7 @@ if $ARGS[0] = 'gang_rape':
 										'When you get to just outside the apartment complex, he stops. "Maybe we should call the police?" he asks, but you shake your head. You know they wouldn''t care and would just blame you, then everyone would know. He sighs. "At least go to the hospital?" he asks in a pleading voice.'
 										*nl
 										'You shake your head again. You don''t want anyone to know, you just want to go to your room and curl up in your bed. "Just take me home, Artem!"'
-										'He sighs and nods before walking you inside and up the stairs to your door. When you get there, he finally says something. "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."' 
+										'He sighs and nods before walking you inside and up the stairs to your door. When you get there, he finally says something. "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."'
 										'You don''t know what to say, so you just nod and go into your apartment.'
 										gs 'arousal', 'end'
 										gs 'stat'

+ 18 - 18
locations/artem_dorm.qsrc

@@ -28,7 +28,7 @@
 !! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
 !! artemQW['nush3some_again'] = 2 have convinced Artem
 !! artemQW['nush3some_again'] = 3 have convinced Anushka
-!! artemQW['nush3some_again'] = 4 opens up repeating threesomes 
+!! artemQW['nush3some_again'] = 4 opens up repeating threesomes
 !! artemQW['nush3some'] >= 3 had threesome with Nush more than once
 !! artemQW['nush3some'] = -1 blocks future 3somes
 !! artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and it blocks it going forward
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon">Artem''s Dorm Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/artemroom/artem_dorm_room.jpg"></center>'
-	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.' 
+	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.'
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		'Above his bed is a small <a href="exec:gt ''artem_dorm'',''bookshelf''">bookshelf</a> full of books, and the wall is plastered with sci-fi, fantasy, anime and super hero posters. At the foot of his bed is a small desk with a <a href="exec:gt ''artem_dorm'',''computer''">laptop</a> on it. Artem is sitting on a couch facing a TV sitting against the wall.'
 	elseif $locat['A2'] = 'dormroom_asleep':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 	else
 		'Artem is getting ready to leave, so you better do the same.'
 	end
-	
+
 	act 'Leave Artem''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		act 'Talk to Artem': gt 'artem_dorm', 'chat'
@@ -76,8 +76,8 @@ if $ARGS[0] = 'bookshelf':
 			minut += 2
 			artemQW['artfall'] += 1
 			artem_borrowed_book = 1
-			artembook = 5
-!!need code to add a book for Sveta to read other than the ones she can buy.			
+			BookVars['artem_pages'] = rand(400, 600)
+!!need code to add a book for Sveta to read other than the ones she can buy.
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this to read?"'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
-			artembook = 0
+			BookVars['artem_pages'] = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
@@ -112,7 +112,7 @@ if $ARGS[0] = 'bookshelf':
 				else
 					'"It was a bit bland and just bored me in the end. I could guess the outcome right at the start, and it turned out I was right."'
 				end
-				'Artem looks crushed at your answer.'				
+				'Artem looks crushed at your answer.'
 				act 'Look at more books': gt 'artem_dorm','bookshelf'
 				act 'Find something else to look at':gt 'artem_dorm', 'start'
 			end
@@ -180,7 +180,7 @@ if $ARGS[0] = 'chat':
 					'He pulls you in close and you''re soon passionately making out, the kisses full of eager lust and urgent need. You feel yourself getting more aroused as he scoots back against the wall and pulls you onto his lap. You can feel the hard bulge in his pants as you straddle him.'
 					gs 'arousal', 'foreplay', 2
 					gs 'stat'
-					act 'Stop making out': 
+					act 'Stop making out':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A2', 'dislike'
 						'<center><h4><font color="maroon">Artem''s Dorm Room</font></h4></center>'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "Do you want to go for a walk on the quad?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			artemQW['artfall'] -= 4
 			gs 'npc_relationship', 'modify', 'A2', 'hate'
@@ -283,7 +283,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "Would you like to go out on a date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -342,7 +342,7 @@ if $ARGS[0] = 'chat':
 				end
 			else
 				act 'Tell him to stop it (<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 'Enjoy his touch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
@@ -365,7 +365,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 		act 'Reject the flowers':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "Would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -466,7 +466,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -742,9 +742,9 @@ if $ARGS[0] = 'chat':
 					act 'Have sex': gt 'artem_sex_uni', 'sex'
 				end
 			end
-		end			
+		end
 	end
-end	
+end
 
 if $ARGS[0] = 'artemgirlfriend':
 	act 'Tell him to stop':
@@ -760,7 +760,7 @@ if $ARGS[0] = 'artemgirlfriend':
 	act 'Enjoy his touch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-		'You return his kiss as his hands keep roaming over you body, but paying particular attention to your breasts and ass. He walks backwards, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.' 
+		'You return his kiss as his hands keep roaming over you body, but paying particular attention to your breasts and ass. He walks backwards, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.'
 		'You can feel quite the hard bulge in his pants as you keep making out. After a few seconds, he takes one of your hands and pulls it down to his crotch.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -781,7 +781,7 @@ if $ARGS[0] = 'artemgirlfriend':
 			end
 		else
 			act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 end
 

+ 3 - 3
locations/artem_nush_sex.qsrc

@@ -25,19 +25,19 @@ if $ARGS[0] = 'anushka_3some1':
 		*nl
 		'He lets go of her and sits down between the two of you before he gives you a look and smiles. You give him a proud smile. "Now both of you strip and make out while I watch," he orders.'
 		'Anushka doesn''t say anything as she starts stripping down to her underwear. You do the same and the two of you are soon making out while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	elseif artemQW['rough_anal_nush'] = 1:
 		'As he turns around, he nods and gives her a confident smile. "I promised myself that if I ever got another chance to fuck you, that I was going to fuck your ass raw."'
 		'She looks up at him and bites her lower lip. "That''s a bold claim."'
 		'He confidently walks over and forces himself between the two of you. "It''ll be a fact soon enough. Now I want both of you to strip and make out while I watch."'
 		'Anushka doesn''t say anything as she starts stripping down to her underwear. You do the same and the two of you are soon making out while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	else
 		'As he turns around, he nods and gives her a confident smile. "That''s right, and I''m not going to hold back on you this time."'
 		'She looks around the room and you can see her smirking. "Promises, promises..."'
 		'He takes a deep breath before he walks over and sits between the two of you. "I think the two of you should strip and makeout while I watch."'
 		'Anushka grins at his comment. "Well look at you, all bossy and confident. I like it." She starts stripping down to her underwear and you do the same. The two of you are soon making out as you strip while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	end
 end
 

+ 3 - 6
locations/artem_sex.qsrc

@@ -788,10 +788,8 @@ if $ARGS[0] = 'anushka_3some_doggy':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 					'"Don''t slow down, baby. Tear that ass up and show her who owns it!" you tell him as you grab hold of her hips to stop her from pulling away, as you go back to licking her pussy.'
 					'You feel his hands reach up and firmly grab her by the hips, one hand reaching up to hold her by the shoulder as he slides his dick nearly entirely out of her before slamming it back in and hammering her balls deep. You can feel her trying to pull away, but he holds her firm. "That''s right bitch, tonight your ass is mine!"'
-
 					'Her moans start turning into grunts, but he''s not done. "Who''s the pussy assed bitch now!?"'
 					'When she doesn''t respond, he reaches up and grabs her by the hair before turning her head until she''s looking back over her shoulder at him. "I asked you a question, bitch! Answer it!" You''re a little shocked that you''ve brought this side out of him, but are also feeling a little proud.'
-
 					gs 'arousal', 'cuni_give', 2, 'lesbian', 'dom'
 					gs 'stat'
 					act 'Let this play out':
@@ -802,7 +800,6 @@ if $ARGS[0] = 'anushka_3some_doggy':
 						'You can hear her grunts turning back into moans as well, not to mention her already soaking wet pussy is soaking your face even more, she is getting off this big time. Your thoughts are interrupted as she answers him. "OOOHHH... I... am..." Her reply is breathless.'
 						'You can hear the excitement in his voice, it seems he is really starting to get into this. "You are what?"'
 						'"OH... OH... I''m.... the pussy.... assed bitch." She struggles to get out from the hard fucking Artem is giving her, but her ever increasing soaking pussy tells you she''s loving it.'
-
 						*nl
 						'"That''s right. I own your ass and I''m going to tear it up because there''s nothing you can do about it!"'
 						'You have to admit that you wern''t expecting him to be this assertive as she grips your leg tightly. "Oh fuck... Oh fuck... Not... So hard." She''s starting to resist, but is still enjoying being used.'
@@ -929,7 +926,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 	elseif artemQW['rough_anal_nush'] = 2:
 		'"I must admit, I was expecting this to be lackluster at best, but you surprised me, Artem. You were better than I expected." She looks directly at you and bites her lower lip. "You trained your nerd pretty well. I might be tempted to try again one day."'
 		'You grin at her comment. "I told you he was a great lover."'
-		'She just laughs. "Sure, he''s a great ''lover''," She makes it sound like it''s a bad thing. "But he''s still not a great fuck, at least not yet."'
+		'She just laughs. "Sure, he''s a great ''lover''." She makes it sound like it''s a bad thing. "But he''s still not a great fuck, at least not yet."'
 		'You''re pretty sure she''s just teasing him on purpose and doesn''t really mean it, but you doubt Artem will understand that.'
 		act 'Defend Artem':
 			*clr & cla
@@ -940,7 +937,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 			'"Ha!" you say in a scolding tone. "He did great. He tore your slutty ass up." You then turn to Artem. "You were great. Nush is just being a bitch."'
 			'She just laughs. "He was pretty good, but not great, and we both know it. Hell, look at him. Even he knows it." You glance over at Artem and his shoulders slump and his grin fades.'
-			'As she''s about to leave his room, he glances at you before looking back to her, then straightens up his shoulders. He seems more confident all of a sudden.'
+			'As she''s about to leave his room, he glances at you before looking back at her, then straightens up his shoulders. He seems more confident all of a sudden.'
 			*nl
 			'"That might be true. I might not be, as you put it, a great fuck, but what''s also true is that I bent you over and tore your ass up, showing you no mercy, and you couldn''t do anything about it. You just meekly and submissively took it, from a lowly nerd like me, while I made you my bitch."'
 			'She lifts her eyebrows in surprise. She starts to retort, but before she can, he continues. "When we see each other at school, we''ll both know that I totally made you my bitch, and nothing will ever change that."'
@@ -988,7 +985,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 								minut += 10
 								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 								'"So does that mean you want to do this again?" you ask.'
-								'He nods. "Hell yes! Next time I''m going to totally own her!" Then he looks at you and blushes a bit. "I mean I''d like to, if you want to, of course."'
+								'He nods. "Hell yes! Next time I''m going to totally own her!" Then he looks at you and blushes. "I mean I''d like to, if you want to, of course."'
 								'You grin at how he can be so dominant one moment, but care about your feelings the next. "You made sure she said say yes already, so why waste that? I''ll let you know when I''m ready to invite her again." You also want to talk to Anushka about this now.'
 								'He nods. "Of course, just let me know." The two of you then talk for a while before he stops. "My mom will be home soon and I need to get started on my homework."'
 								act 'Leave': gt 'pod_ezd', 'etaj_1'

+ 48 - 48
locations/artemhome.qsrc

@@ -24,7 +24,7 @@
 !! artemQW['nush3some'] >= 2 had threesome with Nush
 !! artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
 !! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
-!! artemQW['nush3some_again'] = 2 have convinced Artem 
+!! artemQW['nush3some_again'] = 2 have convinced Artem
 !! artemQW['nush3some_again'] = 3 have convinced Anushka
 !! artemQW['nush3some_again'] = 4 opens up repeating threesomes
 !! artemQW['nush3some'] >= 3 had threesome with Nush more than once
@@ -50,15 +50,15 @@ if $ARGS[0] = 'home':
 	if sound = 0: PLAY 'sound/korr.mp3',30
 	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$location_type = 'private'
-	gs 'themes', 'indoors'		
+	gs 'themes', 'indoors'
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
 	gs 'stat'
-	
-	
+
+
 !! Artem''s location. He is out on Wednesday from 15-22.
 	if week = 3 and hour >= 15 and hour < 22:
 		ArtemLoc = 0
@@ -75,7 +75,7 @@ if $ARGS[0] = 'home':
 	else
 		ArtemParentsLoc = 0
 	end
-	
+
 !! Checking who opens the door
 	if ArtemLoc ! 0 and ArtemParentsLoc = 5:
 		DoorOpenedBy = rand(0,1)
@@ -99,7 +99,7 @@ if $ARGS[0] = 'home':
 		if artemQW['artemlove'] = 1:
 			'You hope that it''s Artem who will answer.'
 		end
-		
+
 		if DoorOpenedBy = 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'home':
 					'"I''m Glinina, Artem''s mother. Who are you?"'
 					'"<<$pcs_nickname>>," you answer, but don''t elaborate further.'
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
-						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
+						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."'
 						'She closes the door in your face without another word.'
 					else
 						'She keeps up her smile. "Is he going to tutor you, dear?"'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'home':
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 						'"Who should I tell him is here?"'
 						'"I''m <<$pcs_nickname>>."'
-						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
+						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."'
 						'She closes the door in your face without another word.'
 					else
 						'She seems pleased. "You must be one of Artem''s little friends. I''m Glinina, Artem''s mother. What''s your name, dear?"'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'home':
 					end
 				end
 			end
-		else	
+		else
 			'You stand in the hallway, but it appears that nobody is home.'
 		end
 	end
@@ -197,7 +197,7 @@ if $ARGS[0] = 'hallway':
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	*clr & cla
 	minut += 1
-	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]	
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/hall.jpg"></center>'
@@ -227,7 +227,7 @@ if $ARGS[0] = 'bathroom':
 	if ArtemLoc ! 3:
 		menu_off = 0
 		*clr & cla
-		minut += 1		
+		minut += 1
 		gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 		$location_type = 'bathroom'
 		gs 'stat'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'artemroom':
-	menu_off = 0	
+	menu_off = 0
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
@@ -293,13 +293,13 @@ if $ARGS[0] = 'artemroom':
 	else
 		'The room is very clean and neat. Right next to the window is a bed, with a small night stand next to it. Against the opposite wall is a small computer desk and a chair, with a laptop on it. Next to the desk is a dresser. On the other side of the desk is a bookshelf with a fairly large collection of books.'
 	end
-	if $clothingworntype = 'nude': 
+	if $clothingworntype = 'nude':
 		act 'Dress yourself': gs 'shortgs','dress' & gt 'artemhome','artemroom'
 	end
 	if $clothingworntype ! 'nude':
 		act 'Leave Artem''s room': gt 'artemhome','hallway'
 	end
-	
+
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -318,7 +318,7 @@ if $ARGS[0] = 'artemroom':
 				act 'Talk with him': gt 'artemhome', 'chat'
 			end
 		end
-	
+
 		if ArtemLoc = 2:
 			'Artem is sitting watching you with a friendly smile.'
 			act 'Let''s go to the living room': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'artemroom':
 			if lernHome > 0:
 				act 'Do homework with Artem': gt 'artem_events','learn'
 			end
-			!! Nutluck needs to say at which point this should be enabled. Set it to artemQW['artfall'] > 5 for now		
+			!! Nutluck needs to say at which point this should be enabled. Set it to artemQW['artfall'] > 5 for now
 			if artemQW['artfall'] > 5 and artkissing ! daystart:
 				gs 'willpower', 'misc', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -350,7 +350,7 @@ if $ARGS[0] = 'artemroom':
 							'He pulls you in close and you''re soon passionately making out, the kisses full of eager lust and urgent need. You feel yourself getting more aroused as he scoots back against the wall and pulls you onto his lap. You can feel the hard bulge in his pants as you straddle him.'
 							gs 'arousal', 'foreplay', 3
 							gs 'stat'
-							act 'Stop making out': 
+							act 'Stop making out':
 								*clr & cla
 								gs 'npc_relationship', 'modify', 'A2', 'dislike'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'artemroom':
 										act 'Strip to your panties': gt 'artem_events','artemdryhump1'
 										gs 'willpower', 'exhib', 'resist'
 										if will_cost <= pcs_willpwr:
-											act 'Refuse to strip (<<will_cost>> Willpower)': 
+											act 'Refuse to strip (<<will_cost>> Willpower)':
 												gs 'willpower', 'pay', 'resist'
 												gt 'artem_events','artemdryhump'
 											end
@@ -386,7 +386,7 @@ if $ARGS[0] = 'artemroom':
 									act 'Strip': gt 'artem_events','artemdryhump2'
 									gs 'willpower', 'exhib', 'resist'
 									if will_cost <= pcs_willpwr:
-										act 'Refuse to strip (<<will_cost>> Willpower)': 
+										act 'Refuse to strip (<<will_cost>> Willpower)':
 											gs 'willpower', 'pay', 'resist'
 											gt 'artem_events','artemdryhump'
 										end
@@ -490,8 +490,8 @@ if $ARGS[0] = 'bookshelf':
 			gs 'stat'
 			artemQW['artfall'] += 1
 			artem_borrowed_book = 1
-			artembook = 5
-			!!Need code to add a book for Sveta to read other than the ones she can buy.			
+			BookVars['artem_pages'] = rand(400, 600)
+			!!Need code to add a book for Sveta to read other than the ones she can buy.
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this?"'
@@ -506,7 +506,7 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
-			artembook = 0
+			BookVars['artem_pages'] = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'bookshelf':
 				else
 					'"It was a bit too bland for me. I could guess the outcome right at the start, and it turned out I was right," you reply.'
 				end
-				'Artem looks crushed at your answer.'				
+				'Artem looks crushed at your answer.'
 				act 'Look at more books': gt 'artemhome','bookshelf'
 				act 'Find something else to look at': gt 'artemhome','artemroom'
 			end
@@ -591,7 +591,7 @@ if $ARGS[0] = 'snack':
 	'While you''re doing that, he grabs some drinks from the fridge before you head back to his room.'
 	act 'Back to his room': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 end
-	
+
 if $ARGS[0] = 'livingroom':
 	menu_off = 0
 	CLOSE ALL
@@ -644,7 +644,7 @@ if $ARGS[0] = 'livingroom':
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
-			else 
+			else
 				'As the two of you walk into the living room, Artem''s father jumps around, as if you startled him.'
 				'"Sorry, we didn''t mean to scare you!" you say.'
 				'He waves your fears away. "Don''t worry about it. I''m just happy to see Artem spending time with a nice girl like yourself."'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'livingroom':
 								act 'Leave': gt 'artemhome','hallway'
 							end
 						end
-					else 
+					else
 						'You greet Masharin and he gives you a friendly nod back. "Hello <<$pcs_firstname>>, welcome back. Are you and Artem studying?"'
 						'"Hello, Mr. Chebotarev. Yes, Artem suggested that we could study in his room," you politely reply.'
 						'He chuckles. "There''s no need to be so formal, <<$pcs_firstname>>. Call me Masharin. So how is the studying going?"'
@@ -780,7 +780,7 @@ if $ARGS[0] = 'livingroom':
 							'You stretch, showing off your curves a little before turning and leaving the Chebotarevs looking at you in disbelief.'
 							act 'Leave': gt 'artemhome','hallway'
 						end
-					else 
+					else
 						'"Excuse me," you whisper, "I don''t want to bother you, but I needed a break and heard you watching TV..."'
 						'Glinina slowly turns around. "You''re not bother at all, <<$pcs_firstname>>. We were just watching the news. You can join us if you want."'
 						act 'Yes':
@@ -829,7 +829,7 @@ if $ARGS[0] = 'livingroom':
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				end
 			end
-			act 'Play': 
+			act 'Play':
 				*clr & cla
 				ArtemLoc = 5
 				gs 'npc_relationship', 'modify', 'A2', 'like'
@@ -922,7 +922,7 @@ if $ARGS[0] = 'kitchen':
 						!! The dialogue above was obviously a first meeting one. If you want to add extra dialogue it should go here
 						act 'Leave': gt 'artemhome','hallway'
 					end
-				else 
+				else
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 					if artemQW['metArtemMom'] = 0:
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'fridge':
 	'You open the fridge and see:<<$artem_tea>><<$artem_water>><<$artem_sup>><<$artem_lefto>><<$artem_sanw>>'
 	act 'Close the refrigerator': gt 'artemhome', 'kitchen'
 	if artemlefto_count > 0:
-		act 'Eat some leftovers': 
+		act 'Eat some leftovers':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1030,7 +1030,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemtea_count >= 0:
-		act 'Have some tea': 
+		act 'Have some tea':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemwater_count >= 0:
-		act 'Have some water': 
+		act 'Have some water':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemsup_count >= 0:
-		act 'Have some soup': 
+		act 'Have some soup':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1099,7 +1099,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemsanw_count >= 0:
-		act 'Make a sandwich': 
+		act 'Make a sandwich':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1122,8 +1122,8 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	end
-end 
-	
+end
+
 if $ARGS[0] = 'artemparents':
 	menu_off = 0
 	CLOSE ALL
@@ -1294,7 +1294,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			artemQW['artfall'] -= 4
 			gs 'npc_relationship', 'modify', 'A2', 'hate'
@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'chat':
 				end
 			else
 				act 'Tell him to stop (<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 'Enjoy his touch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
@@ -1401,7 +1401,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 		act 'Reject the flowers':
@@ -1426,7 +1426,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1512,7 +1512,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1568,7 +1568,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Keep talking': gt 'artemhome', 'chat'
 			end
-			
+
 			!! Checking who Sveta is dating
 			if Rex_Love = 1:
 				$boyfriend_temp = 'Rex'
@@ -1607,7 +1607,7 @@ if $ARGS[0] = 'chat':
 				end
 			end
 		end
-		
+
 		act 'What have you been up to?':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'like'
@@ -1862,9 +1862,9 @@ if $ARGS[0] = 'chat':
 					act 'Have sex': gt 'artem_sex', 'sex'
 				end
 			end
-		end			
+		end
 	end
-end	
+end
 
 if $ARGS[0] = 'askedstrip':
 	act 'Agree to strip': gt 'artemhome', 'stripagree', 0
@@ -1935,7 +1935,7 @@ if $ARGS[0] = 'artemgirlfriend':
 	act 'Enjoy his touch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-		'You return his kiss as his hands keep roaming over your body, but paying particular attention to your breasts and ass. He walks backward, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.' 
+		'You return his kiss as his hands keep roaming over your body, but paying particular attention to your breasts and ass. He walks backward, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.'
 		'You can feel quite the hard bulge in his pants as you keep making out. After a few seconds, he takes one of your hands and pulls it down to his crotch.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -1958,7 +1958,7 @@ if $ARGS[0] = 'artemgirlfriend':
 			end
 		else
 			act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 end
 

+ 6 - 6
locations/arturQW.qsrc

@@ -1,7 +1,7 @@
 # arturQW
 if $ARGS[0] = 'arturQW_1':
 	menu_off = 1
-	if arturTimes >= 5 and fame['pav_slut'] >= 150 and hotcat >= 7:
+	if arturTimes >= 5 and fame['pav_slut'] >= 150 and pcs_hotcat >= 7:
 		*clr & cla
 		minut += 2
 		gs 'stat'
@@ -21,7 +21,7 @@ if $ARGS[0] = 'arturQW_1':
 			'"Well, if you''re really going to pay that well, then I can hardly refuse." You say smiling at the handsome Armenian.'
 			'My beauty, I will not only pay you that well, but I will treat you like the treasure you are." He assures you.'
 			'Excitedly Arthur comes over and gives your ass a hard squeeze, his fingers sinking into your plump flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek. "Now that the business is settled, let''s go eat barbecue, drink Chacha brandy!" He declares happily.'
-			
+
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -43,7 +43,7 @@ if $ARGS[0] = 'arturQW_1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 			'You smile sadly at him. "Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I simply don''t have any free time as it is.'
 			'"As you like beautiful." He responds somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze, his fingers sinking into your soft flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek.'
-			
+
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -62,7 +62,7 @@ if $ARGS[0] = 'arturQW_1':
 		gs 'stat'
 
 		'Arthur smiles kindly and hands you a tangerine. "Come to eat barbecue, drink Chacha brandy!"'
-		
+
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_5.jpg"></center>'
 		'You smile at him, a mix of joy and lust. "Well, Arthur, that changes everything, I would love to keep the books for you."'
 		'"Yes! I knew you would." The Armenian exclaims happily. "Come my beauty, let''s go eat barbecue and drink Chaha brandy." He says as he roughly grabs your ass, palming your soft cheeks with his thick, muscular hands.'
-		
+
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -123,7 +123,7 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 		'"Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I don''t have any free time as it is. It''s just too much." You say, sad to have to turn down such a generous opportunity.'
 		'"As you like beautiful." He said somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze.'
-		
+
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':

+ 1 - 4
locations/audition_reflections.qsrc

@@ -964,7 +964,6 @@ if $ARGS[0] = 'horny':
 			else
 				'Concentrating on that flavor, you reach under your skirt and plunge your fingers into your pussy, frantically trying to fill the space that was occupied with cock moments ago. It''s blazing hot and when you draw your fingers back to your face, they''re totally wet, your juices hanging in thick strings between them.'
 			end
-		end	
 		else
 			'<<$boydesc>>'' cock in your pussy. The pulsing you felt. The cum spilling out inside. You shudder.'
 			if $pantyworntype ! 'none':
@@ -1033,9 +1032,7 @@ if $ARGS[0] = 'horny':
 	pcs_horny += 50
 	'... <i>horny.</i> '
 	*nl
-	if $actress_last_reflect = 'horny':
-	
-	else
+	if $actress_last_reflect ! 'horny':
 		$actress_last_reflect = 'horny'
 		if blah = 0:
 		elseif actress['cast_couch'] >= 10:

+ 18 - 17
locations/auditions_minor1.qsrc

@@ -3,7 +3,8 @@
 
 if $ARGS[0] = 'general_dialogue':
 	if audition['requirement'] = 0 or audition['requirement'] = '':audition['requirement'] = rand(40,70)
-	gs 'boygirl', 0, 'A Male', rand(30,50)
+	gs 'npcgeneratec', 0, 'A Male', rand(30,50)
+	gs 'boyStat', $npclastgenerated
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'You enter the room and see a man sitting at a desk with papers in front of him.'
@@ -100,7 +101,7 @@ if $ARGS[0] = 'general_dialogue_fail':
 	end
 	gs 'auditions_minor1','casting_couch'
 end
-	
+
 if $ARGS[0] = 'casting_couch':
 	gs 'willpower','misc','self','easy'
 	if will_cost > pcs_willpwr:
@@ -123,7 +124,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Huh-? I... I, uhh..."'
 				gs 'willpower','misc','resist','easy'
 				act 'Run away (<<will_cost>> Willpower)': gt 'auditions', 'audition_escape'
-				
+
 				act'"Uhmm... Umm......"':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/sex/grab/kotovpr.mp4"></video></center>'
@@ -131,12 +132,12 @@ if $ARGS[0] = 'casting_couch':
 					'You yelp as you feel <<$boydesc[0]>>''s hand take a huge grab of your ass.'
 					'"I can get you this part," he whispers in your ear. "But what are you willing to do to make that happen?" <<$boydesc[0]>> moves his hand to your shoulder and begins to push you down towards the floor.'
 					act 'Run away (<<will_cost>> Willpower)': gt 'auditions', 'audition_escape'
-					
+
 					act'Don''t resist':gt 'audition_sex1', 'reluctant_bj1'
-					
+
 					act 'Kneel down and blow him': gt 'audition_sex2', 'neutral_bj1'
 				end
-				
+
 				act'"I''ll do anything" (neutral)':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -201,7 +202,7 @@ if $ARGS[0] = 'casting_couch':
 										'"Well let''s see that ass and then we''ll decide if you get the role."'
 										act 'Take off your clothes': gt 'auditions', 'neutral_anal1'
 									end
-									
+
 									act'Give in':
 										cla & *nl
 										'"Okay," you whisper, closing your eyes and taking a deep breath. "Okay. I''ll let you fuck me... If you promise to give me the role."'
@@ -277,7 +278,7 @@ if $ARGS[0] = 'casting_couch':
 										'"Well let''s see that ass and then we''ll decide if you get the role."'
 										act 'Take off your clothes': gt 'auditions', 'neutral_anal1'
 									end
-									
+
 									act'Give in':
 										audition['virgin'] = 1
 										cla & *nl
@@ -335,7 +336,7 @@ if $ARGS[0] = 'casting_couch':
 								gs 'underwear', 'remove'
 								gs 'stat'
 								'"By the way, I''m a virgin," you say hoping to entice him for a more favorable audition, bending over and spreading your pussy lips to show him the proof.'
-								if rand(1,2) = 1:									
+								if rand(1,2) = 1:
 									'"So?" You feel a hovering presence above your hands, a little too high for where he should be to line up with your pussy. "I was going to assfuck you."  And you gasp when his cock immediately starts pushing into your asshole.'
 									act 'Get assfucked': gt 'audition_sex3', 'slutty_assfuck2'
 								else
@@ -401,7 +402,7 @@ if $ARGS[0] = 'casting_couch':
 			end
 		end
 	end
-	
+
 	gs 'willpower','prostitution','self'
 	if will_cost > pcs_willpwr:
 		act'Slut up and offer sexual favors for the role (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -421,7 +422,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Let''s see how good you are first," he responds while pushing you down to your knees.'
 				act 'Kneel down': gt 'audition_sex3', 'slutty_bj1'
 			end
-			
+
 			act'"I''ll fuck you for it"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -429,7 +430,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Then you''d have to be naked," he says tugging at your clothes.'
 				act 'Strip down': gt 'audition_sex3', 'slutty_fuck'
 			end
-			
+
 			act'"I''ll let you fuck my ass"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -439,7 +440,7 @@ if $ARGS[0] = 'casting_couch':
 			end
 		end
 	end
-	
+
 !!	if $pantyworntype = 'none' and CloSkirtShortness > 0:
 !!		if pcs_inhib < 40:gs 'willpower','prostitution','self'
 !!		act'Flash your pussy':
@@ -452,7 +453,7 @@ end
 if $ARGS[0] = 'unique':
 	!! this is to leave room for the possibility of having more files than just this one
 	if $audition['role'] = 'Slutty Club Girl':gt 'auditions_minor1', 'SluttyClubGirl'
-	
+
 end
 
 if $ARGS[0] = 'SluttyClubGirl':
@@ -503,7 +504,7 @@ if $ARGS[0] = 'SluttyClubGirl':
 				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
-				act 'Flash your tits (<<will_cost>> Willpower)':gt 'auditions_minor1', 'minor1_flash'				
+				act 'Flash your tits (<<will_cost>> Willpower)':gt 'auditions_minor1', 'minor1_flash'
 			else
 				act 'Flash your tits (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You''re too shy to show him your breasts.</font>'
 			end
@@ -569,7 +570,7 @@ if $ARGS[0] = 'minor1_skip_flash':
 			'"How was that?"'
 			act 'Finish the audition': gt 'auditions_minor1', 'minor1_result'
 		end
-		
+
 		act'Just flash him':
 			cla & *clr
 			audition['flash'] = 1
@@ -601,7 +602,7 @@ if $ARGS[0] = 'minor1_skip_flash':
 		'"How was that?"'
 		act 'Finish the audition': gt 'auditions_minor1', 'minor1_result'
 	end
-	
+
 	act'Just flash him':
 		cla & *clr
 		audition['flash'] = 1

+ 2 - 2
locations/bed2.qsrc

@@ -64,10 +64,10 @@ if $ARGS[0] = 'main':
 	act 'Get out of bed': gt 'bed_get_out', 'start'
 	act 'Take a nap (1:00)': gs 'sleep_simple', 'nap_bed'
 
-	gs 'events', 'read'
+	gs 'library_functions', 'set_home_read_acts'
 
 	if $loc ! 'bedrPar' or locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
-		if mc_inventory['mag_porn'] > 0: gs 'events', 'read_porn'
+		gs 'library_functions', 'set_read_porn_act'
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and (fame['pav_slut'] >= 150 or (fame['pav_slut'] >= 50 and pcs_inhib >= 60))):
 			act 'Masturbate':
 				InSleep = 0

+ 2 - 2
locations/bedr.qsrc

@@ -17,7 +17,7 @@ if rembedr = 0:
 	*nl
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
-	
+
 	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 
 	*nl
@@ -203,7 +203,7 @@ if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if mc_inventory['mag_porn'] > 0:
 	'You hide a porn magazine under your mattress.'
-	gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 end
 gs 'subkid'
 

+ 1 - 1
locations/bedr2x.qsrc

@@ -193,7 +193,7 @@ if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if mc_inventory['mag_porn'] > 0:
 	'You have hidden a porn magazine under your mattress.'
-	gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 end
 
 gs 'subkid'

+ 5 - 2
locations/bedrPar.qsrc

@@ -197,6 +197,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			gt 'korrPar'
 		end
 
+		!!allows quick change to and from default school and sports clothing
+		gs 'wardrobe', 'default_clothing_options'
+
 		if func('homes_properties', 'can_live_here'):
 			act 'Relax on your bed': gt 'bed', 'start'
 			act 'Open wardrobe': gt 'wardrobe', 'start'
@@ -207,7 +210,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			sis_watch = 0
 
 			if locat['Anya_inroom'] = 0 or sisboytrio > 0:
-				if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
+				gs 'library_functions', 'set_read_porn_act'
 				if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
 					act 'Send Rex a text message': gt 'rex_events','sms'
 				end
@@ -219,7 +222,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				 if mc_inventory['card'] > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 			end
 
-			gs 'events', 'read'
+			gs 'library_functions', 'set_home_read_acts'
 
 			if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry is 30.'
 

+ 0 - 49
locations/beg.qsrc

@@ -1,49 +0,0 @@
-# beg
-if $ARGS[0] = 'start':
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	'<center><img <<$set_imgh>> src="images/pc/activities/exercises/gym/fit1.jpg"></center>'
-	'You are stretching and warming up before your practice run. From where you are you can see your coach, Igor Yurisovich, talking to other athletes.'
-
-	act 'Do a couple of practice races':
-		cla
-		*clr
-		abonement -= 1
-		pcs_mood += 2
-		gs 'exercise', 'tier2', 30, 'run'
-		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/gym/fit5.jpg"></center>'
-		'You spend half an hour practicing 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before.'
-
-		! WD: Argument is 'dressing_room'
-		act 'Go to the dressing room':gt 'fit', 'dressing_room'
-	end
-end
-
-if runnerQW['joined_team'] > 0:
-	act 'Go to your coach':
-		cla
-		'Igor Yurisovich is your coach, a man with a rough voice who never seems to gets tired of motivational one-liners. "The only one who can keep you from winning is you" is his current favorite.'
-
-		if pcs_run < 50:
-			'Despite looking occupied with the other trainees, Igor Yurisovich not only watched your practice runs but timed them as well. He doesn''t look too happy, though - not that he ever does.'
-			'"You have to train harder, girl. With a time like this, you would come in dead last. Hell, you wouldn''t even qualify for the main race! If you want to be better, you have to watch your diet, maybe go to the banya after training, but most importantly: Practice, practice, practice!"'
-
-			act 'Leave':gt 'beg', 'start'
-		elseif pcs_run >= 50 and runnerQW['champ_gold'] = 0:
-			'Despite looking occupied with the other trainees, Igor Yurisovich not only watched your practice runs but timed them as well. And while you''re pretty sure he is physically incapable of looking excited or even content, you think that he looks a little less grim than usual as he looks at you.'
-			'"You''re doing fine, girl. Better than fine; you could have a great future in athletics if you play your cards right. If you keep working hard, you might even have it in you to become European champion, perhaps more. But remember, girl, the key to victory is your spirit: If you have the right mindset, you can do anything."'
-			
-			act 'Leave':gt 'beg', 'start'
-		else
-			'Igor Yurisovich eagerly watches your practice runs and times them as well. Despite his grim demeanour, he nods approvingly at your times and even gives you a hug when you set a PB.'
-			'"You''re doing great, <<$pcs_nickname>>. We''re all so proud of you here and I really can''t give you much more advice except to tell you to keep pushing and making us proud."'
-			
-			act 'Leave':gt 'beg', 'start'
-		end
-	end
-end
-
---- beg ---------------------------------
-

+ 24 - 10
locations/blackmailer.qsrc

@@ -53,23 +53,26 @@ if $ARGS[0] = 'init_blackmail':
 	$blackmailQW['init_flashregion'] = $region
 	blackmailQW['total_material'] = 1
 
+	*nl
 	if strpos($loc, 'park') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'in a park'
-		'A flash of light briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
+		'<b>A flash of light</b> briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
 	elseif strpos($loc, 'church') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'in a church'
-		'The flash of a camera illuminates the inside of the church, but the source eludes you.'
+		'<b>The flash of a camera</b> illuminates the inside of the church, but the source eludes you.'
 	elseif strpos($loc, 'fuelstation') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'while washing cars'
-		'You briefly think a car turned on its headlights before you realize it was the flash of a camera, the source of which is already gone.'
+		'You briefly think a <b>car turned on its headlights</b> before you realize it was the flash of a camera, the source of which is already gone.'
 	else
 		$blackmailQW['init_flashloc_desc'] = ''
-		'You think you notice the flash of a camera from the corner of your eye, but its source is already out of view.'
+		'You think you notice the <b>flash of a camera</b> from the corner of your eye, but its source is already out of view.'
 	end
+	*nl
 	if exhibitionist_lvl > 0:
 		gs 'arousal', 'flashlite', -5
 		gs 'arousal', 'end'
 	end
+	wait 500
 end
 
 
@@ -237,6 +240,7 @@ if $ARGS[0] = 'photo_dream1':
 	end
 	gs 'arousal', 'end'
 
+	'<center><b><font color="maroon">Dream</font></b></center>'
 	'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 	$temp_dream_text = 'You dream about getting caught while flashing your '
 	$temp_dream_text += $blackmailQW['init_flashaction']
@@ -259,17 +263,20 @@ elseif $ARGS[0] = 'photo_dream2':
 	gs 'arousal', 'end'
 
 	if motherKnowWhore = 0 and npc_rel['A29'] > 0:
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You dream that your <<$npc_nickname[''A29'']>> is sitting at the kitchen table, looking somber, almost defeated, reading what seems to be a letter.'
 
 		act 'Ask your <<$npc_nickname[''A29'']>> what''s wrong':
 			*clr & cla
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mum_gyno2.jpg"></center>'
 			'You walk up to her and ask "What''s wrong <<$npc_nickname[''A29'']>>?"'
 			'She drops the letter and see that it is accompanied by a picture.'
 
 			act 'Look at the picture':
 				*clr & cla
+				'<center><b><font color="maroon">Dream</font></b></center>'
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 				$temp_dream_text = 'You get a clear look at the picture depicting you flashing your '
 				$temp_dream_text += $blackmailQW['init_flashaction']
@@ -282,6 +289,7 @@ elseif $ARGS[0] = 'photo_dream2':
 
 				act 'Listen to your mother':
 					*clr & cla
+					'<center><b><font color="maroon">Dream</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/spank.jpg"></center>'
 					'"Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day and it turns out you''re a whore who gets off on showing her <<$blackmailQW[''init_flashaction'']>> to strangers!"'
 					'Suddenly her expression steels, her mind made up. "You can still be saved. I will turn you away from this errant path, you will not shame this family even if I have to beat the sin out of you."'
@@ -292,15 +300,17 @@ elseif $ARGS[0] = 'photo_dream2':
 
 					act 'Brace yourself':
 						*clr & cla
+						'<center><b><font color="maroon">Dream</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'
 						'Bracing yourself for the pain that never comes, the dream shifts. You are left on the outside looking in, the house a mess, your <<$npc_nickname[''A29'']>> crying, <<$npc_nickname[''A34'']>> and your <<$npc_nickname[''A28'']>> nowhere to be seen.'
 						'The lingering feelings of a happy family quickly fading.'
-						gs 'dream_events', 'event_end'
+						act 'Continue': gs 'dream_events', 'event_end'
 					end
 				end
 			end
 		end
 	elseif $start_type['loc'] = 'sg' and gruptipe ! 5:
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/locker.jpg"></center>'
 		'You dream that it''s the end of a long school day, a tired track back to your lockers, the drab hallways, the monotonous marching of time.'
 		'Opening your locker to take your stuff, ready for the same walk home, you yelp in surprise as hundreds of polaroids flow out of your opened locker. Similar shouts of surprise happen all around you as even more polaroids burst from their lockers too.'
@@ -308,6 +318,7 @@ elseif $ARGS[0] = 'photo_dream2':
 
 		act 'Grab a polaroid':
 			*clr & cla
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 			$temp_dream_text = 'You grab one of the pictures and see yourself flashing your '
 			$temp_dream_text += $blackmailQW['init_flashaction']
@@ -317,10 +328,10 @@ elseif $ARGS[0] = 'photo_dream2':
 			killvar '$temp_dream_text'
 			'The laughter around you grows, you are surrounded by a sea of people holding your picture and laughing at you.'
 			'Wading through the ocean of polaroids, you are ever confronted with the fact that you have lost the respect of your former friends.'
-
-			gs 'dream_events', 'event_end'
+			act 'Continue': gs 'dream_events', 'event_end'
 		end
 	else
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You dream that you''re walking through Pavlovsk on a beautiful, windless, cloudless, sunny afternoon, the soft hum of cars, people, wind, and birds fills your ears as the simmering heat of the sun caresses your skin.'
 		'Snippets of conversations happening around you press against the edges of your mind.'
@@ -328,11 +339,13 @@ elseif $ARGS[0] = 'photo_dream2':
 		'You can''t really under stand what''s being said as the harsh wind rips the words from the air, but from the way that they''re looking at the newspaper you guess that''s what they''re talking about.'
 
 		act 'Head to the post office to satiate your curriosity':
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn.jpg"></center>'
 			'You hurry to the post office to get a copy of your own, the wind howling in your ears. The cold sends shivers down you spine as the rain beats relentless in your face.'
 			'When you finally arive you see the postmaster, an older man, look at you strangly. Deafening thunder shakes the building, rain drums loudly against the windows as lightning flashes outside.'
 
 			act 'Buy a newspaper':
+				'<center><b><font color="maroon">Dream</font></b></center>'
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 				$temp_dream_text = 'The postmaster distandly hands you a newspaper, and on the front cover you see a picture of yourself flashing your '
 				$temp_dream_text += $blackmailQW['init_flashaction']
@@ -342,7 +355,7 @@ elseif $ARGS[0] = 'photo_dream2':
 				killvar '$temp_dream_text'
 				'"I didn''t know that you were such a whore!", "That''s really her, what a slut!", "Maybe she''ll let us fuck her too!"'
 				'You run outside into the raging storm, the insults piercing through, chasing you.'
-				gs 'dream_events', 'event_end'
+				act 'Continue': gs 'dream_events', 'event_end'
 			end
 		end
 	end
@@ -522,7 +535,7 @@ end
 
 
 if $ARGS[0] = 'set_police_act':
-	if blackmailQW['stage'] >= 3 and blackmailQW['escape'] = 0:
+	if blackmailQW['stage'] >= 4 and blackmailQW['escape'] = 0:
 		act 'Report that you''re being blackmailed':
 			menu_off = 1
 			minut += 5
@@ -664,6 +677,7 @@ end
 
 if $ARGS[0] = 'post_office1':
 	blackmailQW['stage'] = 10
+	blackmailQW['package'] = 1
 	mail['city'] -= 1
 
 	'<center><img src="images/locations/shared/postoffice/worker.jpg"></center>'
@@ -986,7 +1000,7 @@ end
 
 
 
-
+	!!    ----- PARK -----    !!
 
 if $ARGS[0] = 'park_repeat':
 	'<center><img src="images/locations/shared/park/bench_6.jpg"></center>'

+ 0 - 388
locations/boygirl.qsrc

@@ -1,388 +0,0 @@
-# boygirl
-
-!!'<<$boydesc>> <<$boybody>> <<$boybod>> <<$boyface>>. <<$boydesc>> <<$boyClo>>'
-
-!! For a boy:	gs 'boygirl', 0, 'A Male',  age, region
-!! For a girl:	gs 'boygirl', 1, 'A Woman', age, region
-if $ARGS[0] = '':
-	!! Random age
-	if ARGS[2] = 0: ARGS[2] = rand(18, 35)
-
-	!! Random Name
-	if $ARGS[1] = '':
-		if ARGS[2] <= 25:
-			$ARGS[1] = iif(ARGS[0] = 0, 'A Male', 'A Girl')
-		else
-			$ARGS[1] = iif(ARGS[0] = 0, 'A Male', 'A Woman')
-		end
-	end
-
-	!! Determine region
-	if ARGS[3] = 0:
-		if $region = 'pav':
-			ARGS[3] = 1
-		elseif $region = 'city':
-			ARGS[3] = rand(3, 4)
-		end
-	end
-
-	!! {The NPC generator is now the primary system of creating new characters.}
-	gs 'npcgeneratec', ARGS[0], $ARGS[1], ARGS[2], ARGS[3]
-	gs 'boyStat', $npclastgenerated
-	gs 'boygirl', 'details'
-end
-
-if $ARGS[0] = 'boy' or $ARGS[0] = 'm':
-	gs 'boygirl', 0, $ARGS[1], ARGS[2], ARGS[3]
-elseif $ARGS[0] = 'girl' or $ARGS[0] = 'f':
-	gs 'boygirl', 1, $ARGS[1], ARGS[2], ARGS[3]
-end
-
-if $ARGS[0] = 'details':
-	!Select Photos
-	loverGenderTmp = npc_gender[$npclastgenerated]
-	silaVag = npc_sexskill[$npclastgenerated]
-	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
-	$boydesc = $npc_usedname[$npclastgenerated]
-	hairBoy = npc_haircol[$npclastgenerated]
-	titBoy = npc_bust[$npclastgenerated]
-	vneshBoy = npc_apprnc[$npclastgenerated]
-	!!appearance
-	gs 'boygirl', 'set_boybody'
-
-	!!Variables responsible for any features like
-	!!security, is responsible for the money and requirements
-	gs 'boygirl', 'set_finance'
-
-	gs 'boygirl', 'set_preferences'
-end
-
-
-if $ARGS[0] = 'set_boybody':
-	boybodyrand = rand(1, 3)
-	if boybodyrand = 1:
-		$boybody = 'short'
-		$boybody_pref = 'a short'
-	elseif boybodyrand = 2:
-		$boybody = 'average'
-		$boybody_pref = 'an average'
-	else
-		$boybody = 'tall'
-		$boybody_pref = 'a tall'
-	end
-
-	boybodrand = rand(1, 4)
-	boyfacerand = rand(1, 3)
-
-	if npc_gender[$npclastgenerated] = 0:
-		if boybodrand = 1:
-			$boybod = 'thin'
-			$boybod_pref = 'a thin'
-		elseif boybodrand = 2:
-			$boybod = 'athletic'
-			$boybod_pref = 'an athletic'
-		elseif boybodrand = 3:
-			$boybod = 'chunky'
-			$boybod_pref = 'a chunky'
-		else
-			$boybod = 'fat'
-			$boybod_pref = 'a fat'
-		end
-
-		if boyfacerand = 1: 
-			$boyface = 'black'
-		elseif boyfacerand = 2:
-			$boyface = 'brown'
-		else 
-			$boyface = 'blond'
-		end
-
-	else
-		if boybodrand = 1 and boybodyrand = 1:
-			$boybod = 'petite'
-			$boybod_pref = 'a petite'
-		elseif boybodrand = 1 and boybodyrand = 2:
-			$boybod = 'slender'
-			$boybod_pref = 'a slender'
-		elseif boybodrand = 2:
-			$boybod = 'toned'
-			$boybod_pref = 'a toned'
-		elseif boybodrand = 3:
-			$boybod = 'average'
-			$boybod_pref = 'an average'
-		else
-			$boybod = 'chubby'
-			$boybod_pref = 'a chubby'
-		end
-
-		if boyfacerand = 1: 
-			$boyface = 'black'
-		elseif boyfacerand = 2:
-			$boyface = 'brunette'
-		else 
-			$boyface = 'blond'
-		end
-	end
-end
-
-if $ARGS[0] = 'set_finance':
-	harakBoy = rand(0, 2)
-	finance = npc_finance[$npclastgenerated]
-	if npc_finance[$npclastgenerated] = 0:
-		!!Gopnik beggar or a hard worker
-		!!check in appearance Primary
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(0, 8)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(0, 16)
-		else 
-			npc_apprnc[$npclastgenerated] = rand(0, 32)
-		end
-
-		$boyClo = 'wearing a tracksuit.'
-	elseif npc_finance[$npclastgenerated] = 1:
-		!!middle_peasant
-		!!check in appearance
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(0, 16)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(0, 24)
-		else
-			npc_apprnc[$npclastgenerated] = rand(0, 32)
-		end
-
-		$boyClo = iif(npc_gender[$npclastgenerated] = 0, 'wearing jeans and a sweater.', 'wearing jeans and a blouse.')
-	elseif npc_finance[$npclastgenerated] = 2:
-		!!middle_peasant
-		!!check in appearance
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(16, 32)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(24, 32)
-		else
-			npc_apprnc[$npclastgenerated] = rand(32, 40)
-		end
-
-		$boyClo = iif(npc_gender[$npclastgenerated] = 0, 'wearing an expensive suit.', 'wearing an expensive dress.')
-	end
-end
-
-
-
-if $ARGS[0] = 'set_preferences':
-	!!requirements of the figure, chest size, hair color.
-	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
-	figurBoy = rand(0, 2)
-
-	!character 0 - soft, 1 - norm,  2 - aggressor
-	temp_rand = rand(0, 100)
-	if temp_rand < 80:
-		izvrat = 0
-	elseif temp_rand < 90 and npc_gender[$npclastgenerated] = 1:
-		izvrat = 0
-	else
-		izvrat = 1
-	end
-
-	!! trying to make the preference section
-	!! Variables here are clotTypePrefTmp, clotQualPrefTmp, clotTopPrefTmp, bottShorPrefTmp, clotThinPrefTmp, bimbPrefTmp, pierPrefTmp, tattPrefTmp, lipsPrefTmp, bodyPrefTmp, makePrefTmp, IQPrefTmp.
-
-	!!This is for clothing type preference
-	!! If you notice how rare it is to get a preference that is intentional
-	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
-	clotTypePrefTmp = 0
-	if rand(0, 4) = 4:
-		if izvrat = 1 and rand(0, 1 + npc_finance[$npclastgenerated] mod 2) = 0:
-			clotTypePrefTmp = 4
-		elseif npc_finance[$npclastgenerated] = 0:
-			clotTypePrefTmp = rand(1, 2)
-		elseif npc_finance[$npclastgenerated] = 1:
-			clotTypePrefTmp = rand(1, 3)
-		elseif npc_finance[$npclastgenerated] = 2:
-			clotTypePrefTmp = rand(2, 3)
-		end
-	end
-
-
-
-	!!This is for the quality of clothing
-	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
-	clotQualPrefTmp = 0
-	if rand(0, 5) = 0:
-		if npc_finance[$npclastgenerated] = 0:
-			clotQualPrefTmp = 1
-		elseif npc_finance[$npclastgenerated] = 1:
-			clotQualPrefTmp = rand(1, 2)
-			temp_rand = rand(0, 1)
-			if temp_rand = 0 and clotTypePrefTmp ! 3:
-				clotQualPrefTmp = 1
-			elseif temp_rand = 1 and clotTypePrefTmp ! 1:
-				clotQualPrefTmp = 2
-			end
-		elseif npc_finance[$npclastgenerated] = 2:
-			temp_rand = rand(0, 2)
-			if temp_rand = 2 and clotTypePrefTmp ! 1:
-				clotQualPrefTmp = 2
-			end
-		end
-	end
-
-
-	!!This is for the clothing top cut for the clothing
-
-
-	!!Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
-	!! 0 - no preference, 1 - 1 to 2 or neckline to moderate, 2 - 3 to 4 or heavy to severe, 3 - 5 to 7 or buldging to outpouring 
-	!! The breast size must be adjusted either when the action is being calculeted or we can base it on their ideal breast size :npc_bust[$npclastgenerated] + 0/3 depending on the players breast size
-
-
-	!!0 - no preference, 1 - 1 neckline , 2 - 2 or moderate, 3 - 3 to 4 or heavy to severe
-	!! It doesn''t matter if your poor or rich, everyone loves tits.
-
-	slutConstant = 0
-	if izvrat = 1 and rand(0, 1 + npc_gender[$npclastgenerated]) = 0: slutConstant = 1
-
-	clotTopPrefTmp = 0
-	if rand(0, 2) = 0:
-		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
-		if temp_rand < 2 and clotTypePrefTmp ! 4:
-			clotTopPrefTmp = 1 + slutConstant
-		elseif temp_rand < 4 and clotTypePrefTmp ! 4:
-			clotTopPrefTmp = 2 + slutConstant
-		elseif temp_rand >= 4 and clotTypePrefTmp ! 3:
-			clotTopPrefTmp = 3
-		end
-
-		if clotTopPrefTmp ! 0 and npc_bust[$npclastgenerated] = 2:
-			if clotPref ! 3:
-				clotTopPrefTmp += 1
-			end
-		end
-	end
-
-
-	!! This is for pants and skirt shortness and will be grouped together as such.
-	!! 0 - no preference, 1 - 1 to 2 units or ankle to calf length, 2 - 3 to 4 units or knee to miniskirt, 3 - 5 units to 6 or slut to hoe.
-
-	bottShorPrefTmp = 0
-	if rand(0, 2) = 0:
-		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
-		if temp_rand < 2 and clotTypePrefTmp ! 4:
-			bottShorPrefTmp = 1
-		elseif temp_rand < 4:
-			bottShorPrefTmp = 2
-		elseif temp_rand >= 4:
-			bottShorPrefTmp = 3
-		end
-
-		if slutConstant = 1 and rand(0, 1) = 0 and clotTypePrefTmp = 4:
-			bottShorPrefTmp = 3
-		end
-	end
-
-
-	!! This is for clothes thinness.
-	!! 0 - no preference, 1 - 0 to 2 (Conservative), 2 - 3 to 4 (Moderate), 3 - 4 to 6 (really thin)
-	!! I see the moderate to really thin overlapping. Its intentional.
-
-	clotThinPrefTmp = 0
-	if rand(0, 2) = 2:
-		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
-		if temp_rand < 2:
-			clotThinPrefTmp = 1 + slutConstant
-		elseif temp_rand < 4:
-			clotThinPrefTmp = 2 + slutConstant
-		elseif temp_rand > 4 and clotTypePrefTmp ! 3:
-			clotThinPrefTmp = 3
-		end
-	end
-
-
-	!!This is to find out if they want you to wear bimbo clothing
-	!! 0 - no preference, 1 - Prefers bimbo clothing.
-
-	bimbPrefTmp = 0
-	if rand(0, 2 + 8 * npc_gender[$npclastgenerated]) = 0 and clotTypePrefTmp ! 3: bimbPrefTmp = 1
-
-
-	!!This is to find out if they want you to wear piercings.
-	!! 0 - no preference, 1 - 0 to 2 piercings, 2 - 3 to 5 piercings, 3 - 6 or more piercings.
-
-	pierPrefTmp = 0
-	if rand(0, 3) = 3:
-		temp_rand = rand(0, 2)
-		if temp_rand = 0:
-			pierPrefTmp = 1 + slutConstant
-		elseif temp_rand = 1:
-			pierPrefTmp = 2 + slutConstant
-		elseif temp_rand = 2:
-			pierPrefTmp = 3
-		end
-	end
-
-
-	!!This is to find out if they want you to have tattoos.
-	!! 0 - no preference, 1 - 0 to 2 tattoos, 2 - 3 to 5 tattoos, 3 - 6 or more tattoos.
-
-	tattPrefTmp = 0
-	if rand(0, 3) = 0: tattPrefTmp = rand(1, 3)
-
-
-	!!This is to find out how big they want your lips.
-	!! 0 - no preference, 1 - 2 to 3 units (average) , 2 - 4 units (THIC lips)
-
-	lipsPrefTmp = 0
-	if rand(0, 2 + npc_gender[$npclastgenerated]) = 0:
-		temp_rand = rand(0, 2)
-		if temp_rand = 0:
-			lipsPrefTmp = 1 + slutConstant
-		elseif temp_rand = 2:
-			lipsPrefTmp = 2
-		end
-	end
-
-
-	!!This is to find out how big they want YOU.
-	!! 0 - no preference, 1 - 1 to 3 units (Skinny) , 2 - 3 to 6 units (Average), 3 - 6 + units (THIC)
-	!! Notice how this one overlaps. I believe that it should because changing ones weight is very hard.
-
-	bodyPrefTmp = 0
-	if rand(0, 3) = 0: bodyPrefTmp = rand(1, 3)
-
-
-	!!This is to find out how much makeup they want you to wear.
-	!! 0 - no preference, 1 - 1 (light makeup) , 2 - 2 (moderate makeup), 3 - 3(heavy makeup)
-	!! Plan to make a way for you to set what you makeup you want to wear at your bedside and giving into his wishes would automatically change the automated setting.
-
-	makePrefTmp = 0
-	if rand(0, 1) = 0:
-		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
-		if temp_rand < 2:
-			makePrefTmp = 1 + slutConstant 
-		elseif temp_rand < 4:
-			makePrefTmp = 2 + slutConstant
-		elseif temp_rand >= 4 and clotTypePrefTmp ! 3:
-			makePrefTmp = 3
-		end
-	end
-
-
-	!! This is to see if they like a ditz, average, or a smartypants
-	!!0 - no preference, 1 - 1 to 30 intelligence, 2 - 30 to 85 intelligence, 3 - 85 + intelligence. 
-
-	IQPrefTmp = 0
-	if rand(0, 4) = 0:
-		if npc_gender[$npclastgenerated] = 0:
-			IQPrefTmp = rand(1, 3)
-		else
-			!! IQPrefTmp is capped at 3. With old code: rand(1, 2) + rand(1, 2) + rand(0,1) => 1/8 chance for 2 else 3 (or more)
-			IQPrefTmp = min(rand(2, 9), 3)
-		end
-	end
-
-	killvar 'temp_rand'
-end
-
-
---- boygirl ---------------------------------
-

+ 1 - 1
locations/bras.qsrc

@@ -566,7 +566,7 @@ if $ARGS[0] = 'wear2':
 	$braworntype = $ARGS[1]
 	brawornnumber = ARGS[2]
 
-	gs 'underwear_attributes', $ARGS[1], ARGS[2]
+	gs 'underwear_attributes', $ARGS[1] + '_bras', ARGS[2]
 
 	dynamic '<<$ARGS[1]>>_brasS[<<ARGS[2]>>] = 0'
 

+ 1 - 1
locations/bus.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'pushkin':
 	*nl
 	gs 'transport_functions', 'set_bus_wait_time', 'pushkin'
 
-	act 'Walk to pushkin (0:05)': minut += 5 & gt 'pushkin', ''
+	act 'Walk to pushkin (0:02)': minut += 2 & gt 'pushkin', ''
 
 	if temp_transportVars['bus_wait_pavlovsk'] <= 60 or temp_transportVars['bus_wait_gadukino'] <= 60:
 		'The next bus in the direction of Pavlovsk ' + iif(temp_transportVars['bus_wait_pavlovsk'] = 0, 'is leaving now!', 'leaves in <<temp_transportVars[''bus_wait_pavlovsk'']>> minutes.')

+ 87 - 87
locations/cardgame_durak.qsrc

@@ -20,22 +20,22 @@ if $ARGS[0] = 'start':
 		gs 'boyStat', 'A11','2'
 
 		!!selecting PC starting clothing and setting the image set (cgd_cs)
-		if PCloSkirt > 0: 
-			$cgd_clothes = ' shirt, skirt, socks, bra, panties' 
+		if PCloSkirt > 0:
+			$cgd_clothes = ' shirt, skirt, socks, bra, panties'
 			cgd_cs = rand(1,5)
 
 		elseif PCloPants > 2:
 			if rand(0,1) = 0:
-				$cgd_clothes = ' shirt, pants, socks, bra, panties' 
+				$cgd_clothes = ' shirt, pants, socks, bra, panties'
 				cgd_cs = rand(6,7)
 
 			else
-				$cgd_clothes = ' shirt, jeans, socks, bra, panties' 
+				$cgd_clothes = ' shirt, jeans, socks, bra, panties'
 				cgd_cs = rand(8,14)
 			end
 
 		else
-			$cgd_clothes = ' shirt, shorts, socks, bra, panties' 
+			$cgd_clothes = ' shirt, shorts, socks, bra, panties'
 			cgd_cs = rand(15,20)
 		end
 
@@ -87,26 +87,26 @@ if $ARGS[0] = 'card_game_durak_play':
 	'<center><b>You''re playing strip poker with the guys. The game will continue until one of you is completely naked.</b></center>'
 	'<table width="100%" cellspacing="0" cellpadding="5"><td width="200" valign="top"><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/<<cgd_cs>>-<<6-(3+len($cgd_clothes))/7>>.jpg"></td><td valign="top">'
 	'<br><<$cgdp_pc_state>><br><<$cgdp_A11_state>><br><<$cgdp_A10_state>><br><<$cgdp_A9_state>><br>'
-	
+
 	killvar '$cgdp_pc_state'
 	killvar '$cgdp_A11_state'
 	killvar '$cgdp_A10_state'
 	killvar '$cgdp_A9_state'
-	
+
 	!!Sveta won
 	if $cgd_clothes = '':
 		gt 'cardgame_durak', 'card_game_lost'
-	
+
 	!One of the Boys lost.
 	elseif $cgd_clothes['A11'] = '' or $cgd_clothes['A10'] = '' or $cgd_clothes['A9'] = '':
-		if $cgd_clothes['A11'] = '': 
+		if $cgd_clothes['A11'] = '':
 			gs 'boyStat', 'A11'
 			$loss_npc_img = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/vasya.jpg"></center>'
 
-		elseif $cgd_clothes['A10'] = '': 
+		elseif $cgd_clothes['A10'] = '':
 			gs 'boyStat', 'A10'
 			$loss_npc_img = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dan/dan.jpg"></center>'
-		
+
 		!!if $cgd_clothes['A9'] = '':
 		else
 			gs 'boyStat', 'A9'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'card_game_durak_play':
 		$loss_npc_name = $boydesc
 
 		gt 'cardgame_durak', 'card_game_won'
-	
+
 	!!=====================!!
 	!!The game is still on.!!
 	!!=====================!!
@@ -124,20 +124,20 @@ if $ARGS[0] = 'card_game_durak_play':
 	else
 		temp_alko = min(alko, 11)
 		temp_durak_trying = ARGS[1] * RAND(10, 20)
-		
+
 		!!win chance = 50 - 2 * drunkness + trying
 		temp_durak_win_chance = 50 - 2 * temp_alko + temp_durak_trying
-		
+
 		!!draw chance = 20 - drunkness
-		temp_durak_not_lose_chance = temp_durak_win_chance + 20 - temp_alko 
-		
+		temp_durak_not_lose_chance = temp_durak_win_chance + 20 - temp_alko
+
 		!!lose chance = 30 + 3 * drunkness - trying
-		
+
 		killvar 'temp_alko'
 		killvar 'temp_durak_trying'
-		
+
 		temp_durak_result = RAND(1, 100)
-		
+
 		!==================!
 		!You won the round.!
 		!==================!
@@ -161,7 +161,7 @@ if $ARGS[0] = 'card_game_durak_play':
 			end
 
 			'<img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/card3.jpg">'
-			
+
 			if alko > 10:
 				'You are absolutely wasted and barely manage to win the round due to a fantastic set of cards.'
 
@@ -182,7 +182,7 @@ if $ARGS[0] = 'card_game_durak_play':
 		!====================!
 		elseif temp_durak_result <= temp_durak_not_lose_chance:
 			card_game_durak_draw += 1
-			
+
 			'<img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/card1.jpg">'
 
 			if alko > 10:
@@ -235,7 +235,7 @@ if $ARGS[0] = 'card_game_durak_play':
 
 			'You slowly undress for the guys, removing your<<$clo_str>>'
 		end
-		
+
 		killvar 'temp_durak_win_chance'
 		killvar 'temp_durak_not_lose_chance'
 		killvar 'temp_durak_result'
@@ -243,11 +243,13 @@ if $ARGS[0] = 'card_game_durak_play':
 		if $cgd_clothes ! '' and $cgd_clothes['A11'] ! '' and $cgd_clothes['A10'] ! '' and $cgd_clothes['A9'] ! '':
 			act 'Deal and take it easy': gt 'cardgame_durak', 'card_game_durak_play', -1
 			act 'Deal': gt 'cardgame_durak', 'card_game_durak_play', 0
-			
+
 			!! Willpower cost = (easy if alko < 4, medium if 4 <= alko <6, and hard if 6 <= alko)
 			$temp_will_difficulty = iif(alko < 6, iif(alko < 4, 'easy', 'medium'), 'hard')
 			gs 'willpower', 'misc', 'self', $temp_will_difficulty
-			if will_cost <= pcs_willpwr:
+			if pcs_willpwr < will_cost:
+				act 'Deal and try your hardest to win (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			else
 				act 'Deal and try your hardest to win (<<will_cost>> Willpower)':
 					gs 'willpower', 'misc', 'self', $temp_will_difficulty
 					gs 'willpower', 'pay', 'self'
@@ -255,11 +257,8 @@ if $ARGS[0] = 'card_game_durak_play':
 
 					gt 'cardgame_durak', 'card_game_durak_play', 1
 				end
+			end
 
-			else
-				act 'Deal and try your hardest to win (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
-			
 			killvar '$temp_will_difficulty'
 
 		!! The game is over
@@ -267,7 +266,7 @@ if $ARGS[0] = 'card_game_durak_play':
 			act 'Finish the game': gt 'cardgame_durak', 'card_game_durak_play'
 		end
 	end
-	
+
 	'</td></tr></table>'
 end
 
@@ -287,41 +286,35 @@ if $ARGS[0] = 'card_game_lost':
 	'<b>The game is over! You have no clothes left, you lose!</b>'
 	'Winner: <b><<$boydesc>>.</b>'
 	'You will have to carry out his wish.'
-	
-	if fame['pav_slut'] < 150 or kotovLoveQW > 0: 
+
+
+	if func('cardgame_durak', 'get_mod_fame') < 250 or kotovLoveQW > 0:
 		act 'Continue': gt 'cardgame_durak', 'card_game_nosex'
 
 	!!fame['pav_slut'] >= 150 and kotovLoveQW <= 0
 	else
 		if cg_clother_cum < 5:
-			if rand(1,100) <= 90:
-				if rand(1,100) <= 33: 
-					act 'Continue': gt 'cardgame_durak', 'card_game_group_sex'
-
-				else
-					act 'Continue': gt 'cardgame_durak', 'card_game_rough_sex'
-				end
-
+			temp_rand = rand(0, 99)
+			if temp_rand < 30:
+				act 'Continue': gt 'cardgame_durak', 'card_game_group_sex'
+			elseif temp_rand < 90:
+				act 'Continue': gt 'cardgame_durak', 'card_game_rough_sex'
 			else
 				act 'Continue': gt 'cardgame_durak', 'card_game_nosex'
 			end
-
 		else
-			if rand(1,100) <= 70:
-				if rand(1,100) <= 33: 
-					act 'Continue': gt 'cardgame_durak', 'card_game_group_sex'
-
-				else
-					act 'Continue': gt 'cardgame_durak', 'card_game_rough_sex'
-				end
-
-			elseif rand(1,100) <= 33:
+			temp_rand = rand(0, 299)
+			if temp_rand < 70:
+				act 'Continue': gt 'cardgame_durak', 'card_game_group_sex'
+			elseif temp_rand < 210:
+				act 'Continue': gt 'cardgame_durak', 'card_game_rough_sex'
+			elseif temp_rand < 240:
 				act 'Continue': gt 'cardgame_durak', 'card_game_casual_sex'
-
 			else
 				act 'Continue': gt 'cardgame_durak', 'card_game_nosex'
 			end
 		end
+		killvar 'temp_rand'
 	end
 end
 
@@ -401,7 +394,7 @@ if $ARGS[0] = 'card_game_group_sex':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/sex/gsex/ev1_1.jpg"></center>'
 	'"Now that you''ve lost... how about we all get naked, and then see what we will do with you?" <<$boydesc>> says with a grin, as he takes the remainder of his clothes off. The other guys nod eagerly, and begin to undress as well.'
 
-	act 'Continue': 
+	act 'Continue':
 		*clr & cla
 		gs 'arousal', 'foreplay', 3, 'gangbang'
 		gs 'stat'
@@ -411,7 +404,7 @@ if $ARGS[0] = 'card_game_group_sex':
 		'"But, that''s not fair..." you mutter weakly. "You won, they did not. Only you get a wish!'
 		'"Exactly! I get a wish, and you have to do what I want. My wish is to share your body with my friends", <<$boydesc>> tells you, while he plays with your boobs. "Now stop complaining and get on your back."'
 
-		act 'Continue': 
+		act 'Continue':
 			*clr & cla
 			gs 'arousal', 'bj',              5, 'dick[1]', 'gangbang'
 			gs 'arousal', 'bj',              5, 'dick[2]', 'gangbang'
@@ -434,7 +427,7 @@ if $ARGS[0] = 'card_game_group_sex':
 				'For a moment you feel ashamed, your orgasm was very obvious to the guys and was met with loud cheers. Then you relax and just give in, why should you feel bad about them making you feel great?'
 			end
 
-			act 'Continue': 
+			act 'Continue':
 				*clr & cla
 				gs 'arousal', 'bj',      5,'dick[1]', 'gangbang'
 				gs 'arousal', 'vaginal',-5,'dick[2]', 'gangbang'
@@ -445,7 +438,7 @@ if $ARGS[0] = 'card_game_group_sex':
 				'Then the guys pull you up, and put you down on your hands and knees. Dan immediately moves behind you, claiming he gets to fuck you first. Vasily and Vitek shrug and take place near your head, expecting you to give them blowjobs while Dan slips his cock inside your eager cunt and begins to thrust his hips against yours.'
 				'Dan''s dick feels great inside you, and you''re not afraid to show the guys that you''re enjoying it. You moan excitedly and eagerly switch from Vasily''s to Vitek''s cock and back, trying to please all of them.'
 
-				act 'Continue': 
+				act 'Continue':
 					*clr & cla
 					gs 'arousal', 'hj',       5, 'dick[1]', 'gangbang'
 					gs 'arousal', 'vaginal', -5, 'dick[2]', 'gangbang'
@@ -457,7 +450,7 @@ if $ARGS[0] = 'card_game_group_sex':
 					'However, Dan can no longer hold back and begins to vigorously slam his hips into yours, making your butt cheeks bounce whenever he bottoms out in you.'
 					'You fully surrender to him and can''t really focus on the blowjob you''re giving any more, only making some weak attempts to lick Vitek''s and Shulga''s cocks to make sure they don''t feel left out entirely.'
 
-					act 'Continue': 
+					act 'Continue':
 						*clr & cla
 						gs 'arousal', 'vaginal', 5, 'dick[2]', 'gangbang'
 						gs 'arousal', 'bj',     -5, 'dick[3]', 'deepthroat'
@@ -468,7 +461,7 @@ if $ARGS[0] = 'card_game_group_sex':
 						'With his dick all the way down your throat, you can''t do much but convulsively swallow, and try to pull away from him. He realizes you''re having trouble deepthroating him, and pulls away from you.'
 						'You gasp loudly once you can breathe again, and sob and retch for a while... with Dan still fucking you all the same. You can tell Vitek feels bad for pushing you too hard, and you give him a grateful look when he lets go of your head and lets you take over again. You carefully lick and kiss the head of his penis for a moment, as your way of thanking him.'
 
-						act 'Continue': 
+						act 'Continue':
 							*clr & cla
 							minut += 5
 							gs 'cum_call', 'face',    $boy[2], 1, '', '', 30
@@ -528,7 +521,7 @@ if $ARGS[0] = 'card_game_rough_sex':
 			'You bite your lip and move back in position, hoping he will take it easy on you. All you can do at this point is relax, hopefully that will make it easier.'
 		end
 
-		'Unfortunately for you, <<$boydesc>> is not very careful and just crams the head of his cock in.' 
+		'Unfortunately for you, <<$boydesc>> is not very careful and just crams the head of his cock in.'
 		'You groan and scream and cry, hoping the pain will subside soon while <<$boydesc>> begins to fuck your ass. He''s not even particularly rough with you, but it still stings a lot. You''re not even sure why he insists on doing this... when you look back you occasionally see him wince too. If this is not comfortable for either of you, why does he insist on going on?'
 		'After a few minutes of you obediently enduring the ass fucking you''re receiving, it doesn''t hurt that much any more. There''s still a little discomfort, but you''re able to ignore that and even gain some pleasure out of it.'
 		'Then <<$boydesc>> shoots his load inside your ass, and says with a grin: "Who''s next? If we want her to be a good little butt slut for us in the future, she''s going to need more training! Stretch that hole, guys!"'
@@ -586,9 +579,9 @@ end
 if $ARGS[0] = 'card_game_casual_sex':
 	minut +=5
 	gs 'stat'
-	if $boy = 'A11': 
+	if $boy = 'A11':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/vasya.jpg"></center>'
-	elseif $boy = 'A10': 
+	elseif $boy = 'A10':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dan/dan.jpg"></center>'
 	elseif $boy = 'A9':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vitek/vitek.jpg"></center>'
@@ -600,7 +593,7 @@ if $ARGS[0] = 'card_game_casual_sex':
 	'"What the fucking kind of shit is that! I''ve not forced you to fuck anyone..."'
 	'"You''re a bitch, for coming up with all that rubbish you made us do and now you will have to pay for it. So stop your bitching, you lost, so pay up!"'
 	'You have no choice, you lost and now have to pay up the debt by fulfilling his wish.'
-	
+
 	act 'Further':
 		*clr & cla
 		guy += 1
@@ -643,7 +636,7 @@ if $ARGS[0] = 'card_game_casual_sex':
 			'The boys are nearby all the time and record everything on a mobile phone.'
 			gs 'arousal', 'end'
 
-			act 'Leave': gt 'vasilyhome', 'livingroom' 
+			act 'Leave': gt 'vasilyhome', 'livingroom'
 		end
 	end
 end
@@ -666,71 +659,72 @@ if $ARGS[0] = 'card_game_won':
 	!!Choices begin here.!!
 	!!===================!!
 
+	temp_fame = func('cardgame_durak', 'get_mod_fame')
+
+
 	!!Expose a random girl
 	act 'Make <<$loss_npc_name>> expose a random girl': gt 'cardgame_durak', 'card_game_won_expose_girl'
-	
+
 	!!Expose himself to a random girl
 	gs 'willpower', 'exhib', 'force', 'easy'
-	if will_cost <= pcs_willpwr:
+	if pcs_willpwr < will_cost:
+		act 'Make <<$loss_npc_name>> expose himself to a random girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	else
 		act 'Make <<$loss_npc_name>> expose himself to a random girl (<<will_cost>> Willpower)':
 			gs 'willpower', 'exhib', 'force', 'easy'
 			gs 'willpower', 'pay',   'force'
 			gs 'stat'
 			gt 'cardgame_durak', 'card_game_won_expose_penis'
 		end
-
-	else
-		act 'Make <<$loss_npc_name>> expose himself to a random girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
 	!!Mildy slutty, cum on a random girl.
-	if fame['pav_slut'] >= 50:
+	if temp_fame >= 50:
 		!!Cum on a random girl
 		gs 'willpower', 'mast', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
+		if pcs_willpwr < will_cost:
+			act 'Make <<$loss_npc_name>> cum on a random girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		else
 			act 'Make <<$loss_npc_name>> cum on a random girl (<<will_cost>> Willpower)':
 				gs 'willpower', 'mast', 'force', 'easy'
 				gs 'willpower', 'pay',  'force'
 				gs 'stat'
 				gt 'cardgame_durak', 'card_game_won_cum_on_girl'
 			end
-
-		else
-			act 'Make <<$loss_npc_name>> cum on a random girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
-	
+
 	!!More slutty, lick your pussy.
-	if fame['pav_slut'] >= 100:
+	if temp_fame >= 100:
 		gs 'willpower', 'cuni', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
+		if pcs_willpwr < will_cost:
+			act 'Make <<$loss_npc_name>> lick your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		else
 			act 'Make <<$loss_npc_name>> lick your pussy (<<will_cost>> Willpower)':
 				gs 'willpower', 'cuni', 'force', 'easy'
 				gs 'willpower', 'pay',  'force'
 				gs 'stat'
 				gt 'cardgame_durak', 'card_game_won_lick_my_pussy'
 			end
-
-		else
-			act 'Make <<$loss_npc_name>> lick your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
-	
+
 	!!Very Slutty, fuck your ass.
-	if fame['pav_slut'] >= 150:
+	if temp_fame >= 150:
 		gs 'willpower', 'anal', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
+		if pcs_willpwr < will_cost:
+			act 'Make <<$loss_npc_name>> fuck your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		else
 			act 'Make <<$loss_npc_name>> fuck your ass (<<will_cost>> Willpower)':
 				gs 'willpower', 'anal', 'force', 'easy'
 				gs 'willpower', 'pay',  'force'
 				gs 'stat'
 				gt 'cardgame_durak', 'card_game_won_fuck_my_ass'
 			end
-
-		else
-			act 'Make <<$loss_npc_name>> fuck your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
+
+	killvar 'temp_fame'
 end
 
 
@@ -802,7 +796,7 @@ end
 !!When the years won, make a wish (turnip fame['pav_slut'] >= 50) (cum on the victim)
 if $ARGS[0] = 'card_game_won_cum_on_girl':
 	minut += 5
-	cg_clother_cum += 1 
+	cg_clother_cum += 1
 	gs 'stat'
 
 	'<<$loss_npc_img>>'
@@ -825,7 +819,7 @@ if $ARGS[0] = 'card_game_won_cum_on_girl':
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/street_event/bj' + rand(1,2) + '.mp4"></video></center>'
 		'When you lick <<$loss_npc_name>> close to his orgasm, he runs to his victim.'
 
-		act 'Continue': 
+		act 'Continue':
 			*clr & cla
 			minut +=5
 			gs 'stat'
@@ -950,5 +944,11 @@ if $ARGS[0] = 'card_game_won_fuck_my_ass':
 end
 
 
---- cardgame_durak ---------------------------------
 
+
+if $ARGS[0] = 'get_mod_fame':
+	result = fame['pav_slut'] + card_game_durak_nude + cg_clother_cum + npc_sex['A9'] + npc_sex['A10'] + npc_sex['A11'] + vasily['drunk_sex']
+end
+
+
+--- cardgame_durak ---------------------------------

+ 5 - 5
locations/changingroom.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'view_swim_list':
 
 	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0 and ARRSIZE('nerdvana_swimsuit') = 0 and ARRSIZE('nerdvana_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
-	elseif $loc = 'fit' or $loc = 'bass' or $loc = 'pav_pool' or $loc_arg = 'kathansaunasw1' or $loc_arg = 'kathansaunasw2' or temper >= 15:
+	elseif $loc = 'havana' or $loc = 'havana_pool' or $loc = 'pav_pool' or $loc_arg = 'kathansaunasw1' or $loc_arg = 'kathansaunasw2' or temper >= 15:
 		if PCloswimwear = 0 and $clothingworntype ! 'nude':
 			$lastwornclothingtype['swim'] = $clothingworntype
 			lastwornclothingnumber['swim'] = clothingwornnumber
@@ -107,7 +107,7 @@ if $ARGS[0] = 'view_swim_list':
 
 		*nl
 
-		if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis': 
+		if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis':
 			'<center>You are wearing swimwear.</center>'
 		end
 
@@ -116,7 +116,7 @@ if $ARGS[0] = 'view_swim_list':
 	end
 
 	act 'Leave':gt $loc, $loc_arg
-	
+
 	if PCloswimwear = 1:
 		act 'Put your regular clothes back on':
 			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
@@ -178,7 +178,7 @@ if $ARGS[0] = 'view_swim_item':
 	'<<$RESULT>>'
 
 	act 'Return':gt 'changingroom', 'view_swim_list'
-	
+
 	!! if the clothing is worn out
 	if dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'view_swim_item':
 			else
 				act 'Put it on (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		
+
 		elseif ARGS[3] = 2:
 			'You don''t feel daring enough to wear swimwear this revealing, but if you want to go into the water, you''re going to have to brave it.'
 			act 'Wear':

+ 22 - 24
locations/cikl.qsrc

@@ -679,7 +679,7 @@ else
 end
 
 !!ugly duckling start becoming a swan
-if uglyduck_flag = 1 and hotcat >= 5:
+if uglyduck_flag = 1 and pcs_hotcat >= 5:
 	killvar 'uglyduck_flag'
 	gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 0, 0
 	grupvalue[1] += 100
@@ -814,30 +814,28 @@ if mid($start_type, 1, 2) = 'sg':
 		if kanikuli = 0 and week < 6:
 			if week = 1:
 				!!The start and end values for i have to be changed if more female schoolgirl npcs are added to the game
-				i = 11
-
+				cikl_i = 12
+				cikl_max_i = 145
 				:hotcat_calc_jump
-				i += 1
-
-				if hotcat_rating['A<<i>>'] = 0 and i < 145: jump 'hotcat_calc_jump'
-
-				switch_rand = rand(1,100)
-
-				if hotcat_movement['A<<i>>'] = 0 and switch_rand < 21:
-					hotcat_rating['A<<i>>'] -= 1
-					hotcat_movement['A<<i>>'] -= 1
-				elseif hotcat_movement['A<<i>>'] = 0 and switch_rand > 80:
-					hotcat_rating['A<<i>>'] += 1
-					hotcat_movement['A<<i>>'] += 1
-				elseif hotcat_movement['A<<i>>'] = 1 and switch_rand > 40:
-					hotcat_rating['A<<i>>'] -= 1
-					hotcat_movement['A<<i>>'] -= 1
-				elseif hotcat_movement['A<<i>>'] = -1 and switch_rand > 40:
-					hotcat_rating['A<<i>>'] += 1
-					hotcat_movement['A<<i>>'] += 1
-				end
-				if i < 145: jump 'hotcat_calc_jump'
-				killvar 'i'
+					if npc_hotcat['A<<cikl_i>>'] ! 0:
+						switch_rand = rand(0, 99)
+						if hotcat_movement['A<<cikl_i>>'] = 0:
+							if switch_rand < 20:
+								npc_hotcat['A<<cikl_i>>'] -= 1
+								hotcat_movement['A<<cikl_i>>'] -= 1
+							elseif switch_rand < 40:
+								npc_hotcat['A<<cikl_i>>'] += 1
+								hotcat_movement['A<<cikl_i>>'] += 1
+							end
+						elseif switch_rand >= 40:
+							npc_hotcat['A<<cikl_i>>'] -= hotcat_movement['A<<cikl_i>>']
+							hotcat_movement['A<<cikl_i>>'] = 0
+						end
+					end
+					cikl_i += 1
+				if cikl_i < cikl_max_i: jump 'hotcat_calc_jump'
+				killvar 'cikl_i'
+				killvar 'cikl_max_i'
 				killvar 'switch_rand'
 			end
 

+ 29 - 29
locations/city_apt_building.qsrc

@@ -210,7 +210,7 @@ if $ARGS[0] = 'roof':
 				act 'Get Up':gt 'city_apt_building', 'roof'
 			end
 		end
-		
+
 		if PCloswimwear = 1:
 			act 'Sunbathe (1:00)':
 				*clr & cla
@@ -272,11 +272,11 @@ if $ARGS[0] = 'lift':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator3_'+rand(1,2)+'.jpg"></center>'
 		'When the elevator door opens, you see a young man standing it with his limp dick hanging out. He has a huge smile on his face.'
-		if hotcat >= 6:
+		if pcs_hotcat >= 6:
 			'He looks you over and his smile turns into a grin, obviously liking what he sees. "Get in here and go down, so I can go up." He then laughs at his own joke.'
 			'You''re too baffled to do anything and just stand there staring at him before he speaks up. "Come on, don''t be shy! Get that tight little body over here and wrap those beautiful lips around my cock."'
 			'When you still don''t move, he frowns and pushes one of the buttons. "Whatever!" You stand there as the door closes and the elevator moves away from you.'
-		elseif hotcat >= 4:
+		elseif pcs_hotcat >= 4:
 			'He looks you over. "You''ll do. Get in here and go down, so I can go up." He then laughs at his own joke.'
 			'You''re too baffled to do anything and just stand there staring at him before he speaks up. "Well come on, it isn''t going to suck itself."'
 			'When you still don''t move, he frowns and pushes one of the buttons. "Whatever, a fugly chick like you should be thankful I even offered!" You just stand there as the door closes and the elevator moves away from you.'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'lift':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator6.jpg"></center>'
 		'When the elevator door opens, you see the couple from your floor inside. You''ve seen them around the building before. They are partially undressed and making out, seemingly looking like they''re about to have sex.'
-		if hotcat >= 6:
+		if pcs_hotcat >= 6:
 			'She looks at you and gives you an inviting smile, then motions at you with her hand. "You can join us if you want."'
 			'Her talking makes him finally look over at you and he smiles as well. "Yeah, come join us."'
 			'You''re too baffled to do anything and just stand there staring at them before he speaks up. "Sorry, but we''re full in here." This makes her laugh as he pushes one of the buttons and the doors close.'
@@ -344,9 +344,9 @@ if $ARGS[0] = 'floor1_events':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor1_gop.jpg"></center>'
 	'A large group of gopniks are blocking the stairs up to the first floor. You''ve seen several of them in the building and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous, especially in large groups. You could try and walk past them, or just leave.'
-	act 'Leave': 
+	act 'Leave':
 		if $ARGS[1] = 'from_second_floor':
-			minut += 1 
+			minut += 1
 			gt 'city_apt_building','floor_2'
 		elseif $ARGS[1] = 'from_lift':
 			*clr & cla
@@ -359,7 +359,7 @@ if $ARGS[0] = 'floor1_events':
 			act 'Push button: Floor 3': gt 'city_apt_building','floor_3', 'from_lift'
 			act 'Push button: Floor 4': gt 'city_apt_building','floor_4'
 			act 'Push button: Floor 5': gt 'city_apt_building','floor_5'
-		else	
+		else
 			minut += 1
 			gt 'city_residential', 'start'
 		end
@@ -368,12 +368,12 @@ if $ARGS[0] = 'floor1_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor1_gop.jpg"></center>'
-		if hotcat >= 6:
-			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.' 
+		if pcs_hotcat >= 6:
+			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.'
 			'"Hey sweetheart, have a seat and drink with us."'
-			'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"' 
-			'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."' 
-			'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.' 
+			'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"'
+			'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."'
+			'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.'
 			'You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
 			gs 'arousal', 'foreplay', 3, 'humiliation'
 			gs 'arousal', 'end'
@@ -382,9 +382,9 @@ if $ARGS[0] = 'floor1_events':
 			minut += 2
 			pcs_mood -= 15
 			gs 'stat'
-			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.' 
-			'"Watch where you''re stepping, you fat cow!"' 
-			'"Anyone else smell rotten fish?"' 
+			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.'
+			'"Watch where you''re stepping, you fat cow!"'
+			'"Anyone else smell rotten fish?"'
 			'At one point, you think one of them might do something, but you make it past them unharmed. However, you''re a little upset at the comments made towards you.'
 		end
 		act 'Leave the building': minut += 1 & gt 'city_residential', 'start'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'floor3_events':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_drunk.jpg"></center>'
 		'A young woman appears to be passed out on the landing, her belongings sitting on the stairs near her. You have no idea how long she''s been here.'
 		act 'Ignore her and continue': gt 'city_apt_building', 'floor_3'
-		act 'Help her': 
+		act 'Help her':
 			*clr & cla
 			minut += 5
 			pcs_mood += 10
@@ -528,9 +528,9 @@ if $ARGS[0] = 'floor3_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_gop.jpg"></center>'
 		'In the stairwell between the floors is a large group of gopniks. You''ve seen several of them in the building, and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous especially in large groups. You could try and walk past them, or just leave.'
-		act 'Leave': 
+		act 'Leave':
 			if $ARGS[1]= 'from_second_floor':
-				minut += 1 
+				minut += 1
 				gt 'city_apt_building','floor_2'
 			elseif $ARGS[1] = 'from_lift':
 				*clr & cla
@@ -552,12 +552,12 @@ if $ARGS[0] = 'floor3_events':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_gop.jpg"></center>'
-			if hotcat >= 6:
-				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.' 
+			if pcs_hotcat >= 6:
+				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.'
 				'"Hey sweetheart, have a seat and drink with us."'
-				'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"' 
-				'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."' 
-				'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.' 
+				'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"'
+				'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."'
+				'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.'
 				'You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
 				gs 'arousal', 'foreplay', 3, 'humiliation'
 				gs 'arousal', 'end'
@@ -566,9 +566,9 @@ if $ARGS[0] = 'floor3_events':
 				minut += 2
 				pcs_mood -= 15
 				gs 'stat'
-				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.' 
-				'"Watch where you''re stepping, you fat cow!"' 
-				'"Anyone else smell rotten fish?"' 
+				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.'
+				'"Watch where you''re stepping, you fat cow!"'
+				'"Anyone else smell rotten fish?"'
 				'At one point, you think one of them might do something, but you make it past them unharmed. However, you''re a little upset at the comments made towards you.'
 			end
 			act 'Go down to the second floor': minut +=1 & gt 'city_apt_building','floor_2'
@@ -636,7 +636,7 @@ if $ARGS[0] = 'floor3_events':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor3_fuck.jpg"></center>'
-		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the stairs, you see a woman in the stairwell on her back, but you can''t really make her out, other than her bare legs spread wide. A man is thrusting between her legs with his pants pulled down.' 
+		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the stairs, you see a woman in the stairwell on her back, but you can''t really make her out, other than her bare legs spread wide. A man is thrusting between her legs with his pants pulled down.'
 		'Another man appears to be passed out, or sleeping, next to the two having sex. You''re unsure what the story is here, but you figure it''s likely a good one and that the sleeping man will likely not enjoy the story as much as everyone else, if he ever learns of it.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
@@ -668,7 +668,7 @@ if $ARGS[0] = 'floor4_events':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_drunk.jpg"></center>'
 		'A young woman appears to be passed out on the stairs, her belongings sitting on the stairs near her. You have no idea how long she''s been here.'
 		act 'Ignore her and continue': gt 'city_apt_building', 'floor_4'
-		act 'Help her': 
+		act 'Help her':
 			*clr & cla
 			minut += 5
 			pcs_mood += 10
@@ -853,7 +853,7 @@ if $ARGS[0] = 'floor5_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_bdsm.jpg"></center>'
-		'Two young women are in the hallway. One is blonde and is wearing boots and a skirt, while naked from the waist up. The other, a brunette, is completely naked with her hands tied behind her back. You watch as the blonde puts a large collar around the other one''s neck and attaches a leash to it. With the leash in place, she steps back, unbinds the brunette''s hands and slaps her on the ass. She drops to the floor on all-fours and the blonde starts walking, holding onto the leash as the brunette follows behind like a dog. The blonde smiles at you and waves while the brunette never says a word as they move past you.' 
+		'Two young women are in the hallway. One is blonde and is wearing boots and a skirt, while naked from the waist up. The other, a brunette, is completely naked with her hands tied behind her back. You watch as the blonde puts a large collar around the other one''s neck and attaches a leash to it. With the leash in place, she steps back, unbinds the brunette''s hands and slaps her on the ass. She drops to the floor on all-fours and the blonde starts walking, holding onto the leash as the brunette follows behind like a dog. The blonde smiles at you and waves while the brunette never says a word as they move past you.'
 		'After taking a second to reflect on what you just seen, you continue on your way.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'

+ 2 - 2
locations/st_petersburg_canals.qsrc → locations/city_canals.qsrc

@@ -1,6 +1,6 @@
-# st_petersburg_canals
+# city_canals
 
 !! Author: Hooded Silence
 !! Date and meeting spot at the St Petersburg Canals
 
---- st_petersburg_canals ---------------------------------
+--- city_canals ---------------------------------

+ 1 - 5
locations/city_center.qsrc

@@ -108,9 +108,6 @@ act 'Walk to the train station (0:05)': minut += 5 & gt 'city_train', 'start'
 if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 end
-
-act 'Wait': gs 'obj_din', 'wait'
-
 gs 'taxi'
 
 if hour >= 4 and hour < 23:
@@ -133,7 +130,7 @@ if hour = 8 and minut >= 30:
 	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
 elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''city_mall''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:gt ''havana'', ''start''">Havana Fitness Center</a>'
 else
 	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
@@ -272,4 +269,3 @@ gs 'camera', 'check_location'
 gs 'booty_call', 'home_links'
 
 --- city_center ---------------------------------
-

+ 16 - 16
locations/city_coffee_hole.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0]= 'inner':
 				'You see a familiar face sitting at one of the tables, <a href="exec:gt ''city_coffee_hole'',''kendra''">Kendra.</a>'
 			elseif kendraslave >= 1:
 				'You see a familiar face sitting at one of the tables, your mistress <a href="exec:gt ''city_coffee_hole'',''kendra''">Kendra.</a>'
-			elseif hotcat >= 5:
+			elseif pcs_hotcat >= 5:
 				'As you look around, you see a beautiful young <a href="exec:gt ''city_coffee_hole'',''kendra''">black woman</a> sitting at one of the tables. She notices you and gives you a quick once-over before smiling and leaning back. She seems to be watching you with an inviting smile to join her.'
 			else
 				'As you look around, you see a beautiful young black woman sitting at one of the tables. She notices you and gives you a quick once-over before returning to what she was doing. After a few minutes, she finishes her drink before getting up and leaving.'
@@ -67,12 +67,12 @@ if $ARGS[0]= 'inner':
 		elseif temprand = 5:
 			if DjibrilQW['meet'] = 1:
 				'You see a familiar face sitting at one of the tables, Olu''s nephew <a href="exec:gt ''city_coffee_hole'',''djibril''">Djibril.</a>'
-			elseif hotcat >= 5:
+			elseif pcs_hotcat >= 5:
 				'As you look around, you see an attractive young <a href="exec:gt ''city_coffee_hole'',''djibril''">black man</a> sitting at one of the tables. When he notices you looking at him, he gives you a friendly smile and a wave. It seems he is the friendly sort and seems to be interested in you.'
 			else
 				'As you look around, you see an attractive young black man sitting at one of the tables. He notices you and gives you a quick once-over before returning to what he is doing. After a few minutes, he finishes his drink before getting up and leaving.'
 			end
-		else 
+		else
 			'As you look around, you don''t see anyone you recognize hanging out today.'
 		end
 	end
@@ -149,7 +149,7 @@ if $args[0]= 'counter':
 	gs 'stat'
 	if locat['A144'] = 9:
 		gt 'city_coffee_hole','anushka_work'
-	else 
+	else
 		temprand = rand(1,2)
 		if temprand = 1:
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
@@ -187,7 +187,7 @@ if $args[0]= 'anushka_work':
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
 				'"Hey, I''ve been meaning to ask. Which dorm are you in? Maybe I can stop by and visit some time?" you ask.'
-				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."'
 				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 			if anushkaQW['photoshoot'] >= 1 and hour = 22:
@@ -224,7 +224,7 @@ if $args[0]= 'anushka_work':
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
 				'"Nice. Which dorm are you in by the way? Maybe I can stop by and visit some time?" you ask.'
-				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."'
 				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
@@ -273,7 +273,7 @@ if $ARGS[0] = 'photo_shoot':
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose4.jpg"></center>'
-				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."' 
+				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."'
 				'She tosses it aside, and you take a few more snaps of her. "Now the top." She pulls off the top and throws it on a nearby table. "Now the shorts."'
 				act 'Keep taking photos':
 					*clr & cla
@@ -321,12 +321,12 @@ if $ARGS[0] = 'photo_shoot':
 										'She sits in various poses, some fully exposed and others not, before you finally think you have the perfect final image. She''s leaning back on her elbows with her legs together, pointing up in the air. The angle you pick doesn''t show off much of her naked body, yet is still erotic, and she looks so happy and alive. It seems especially fitting with the Coffee Hole sign behind her; it''s the perfect image to end this photo session.'
 										*nl
 										'With the image taken, you lower the camera. "Thanks, Nush, that was amazing. This place made for an amazing place to take photos in. You can get dressed now."'
-										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."' 
+										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."'
 										'You review the photos on your camera as she gets dressed again. "Well, I should really finish cleaning up so I can go home and get some sleep before classes tomorrow."'
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Head out': 
+										act 'Head out':
 											*clr & cla
 											minut +=5
 											gs 'stat'
@@ -360,12 +360,12 @@ if $ARGS[0]= 'lazar':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if fame['pav_slut'] > 300:
-		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."' 
+		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."'
 		'How he says it leaves no doubt about what he means by fun. Even moving to a new city won''t let get away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
 	else
 		if npc_rel['A149'] >= 60:
 			lazarQW['city_invite'] = 1
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You notice Lazar sitting at a table. "What''s up, hottie? You enjoying the city?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
 			else
 				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
@@ -373,7 +373,7 @@ if $ARGS[0]= 'lazar':
 		elseif npc_rel['A149'] <= 20:
 			'You notice Lazar sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." He heads outside and walks away.'
 		else
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You notice Lazar sitting at a table. "Hey, good looking. What have you been up to?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
 			else
 				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
@@ -479,7 +479,7 @@ if $ARGS[0]= 'kendra':
 	elseif kendraslave >= 1:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
 		'As you walk over to her, she invites you to sit down. "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
-	elseif hotcat >= 5:
+	elseif pcs_hotcat >= 5:
 		'As you walk over to her, she invites you to sit down and you take a seat opposite her. "You''re a pretty little thing. What''s your name?" she asks.'
 		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says confidently.'
@@ -540,12 +540,12 @@ if $ARGS[0]= 'djibril':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	if DjibrilQW['invite'] = 1:
-		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'
 	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
 		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
-		
-	elseif hotcat >= 5:
+
+	elseif pcs_hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'
 		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people just call me <<$pcs_nickname>>."'

+ 6 - 6
locations/city_house_res_bedr.qsrc

@@ -10,22 +10,22 @@ if $ARGS[0] = 'bedro':
 	$locM_arg = 'bedro'
 	$location_type = 'private'
 	$locclass = 'bedr'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
 	gs 'music_actions', 'clear_restrictions'
-	
+
 	*clr & cla
 	'<center><b><font color="maroon">Bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_bedroom.jpg"></center>'
-	
+
 	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
 
 	act 'Relax on your bed': gt 'bed', 'start'
 
-	if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
-	
+	gs 'library_functions', 'set_read_porn_act'
+
 	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 	gs 'music_actions', 'start'
 	*nl
@@ -36,7 +36,7 @@ if $ARGS[0] = 'bedro':
 	*nl
 	'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	gs 'prostitution_functions', 'prostitute_outfit_at_home'
 end
 
 --- city_house_res_bedr ---------------------------------

+ 0 - 4
locations/city_industrial.qsrc

@@ -52,9 +52,6 @@ if $ARGS[0] = '':
 		!! We've got an event today, check it's location:
 		gs 'emp_functions', 'disp_evt', 3
 	end
-
-	act 'Wait':gs 'obj_din', 'wait'
-
 	gs 'taxi'
 
 	if car > 0:
@@ -141,4 +138,3 @@ end
 
 
 --- city_industrial ---------------------------------
-

+ 1 - 5
locations/city_island.qsrc

@@ -51,9 +51,6 @@ if car > 0 and cardrive = 25: 'Your <a href="exec:GS ''carF'', ''start''"><<$car
 if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': gt 'metro', 'start'
 end
-
-act 'Wait': gs 'obj_din', 'wait'
-
 gs 'taxi'
 gs 'camera', 'check_location'
 
@@ -83,7 +80,7 @@ if anushkaCityQW['first_visit'] > 0:
 	'Anushka lives in <a href="exec:minut += 1 & gt ''anushapt_city'', ''home''">a shared apartment</a> around the corner.'
 end
 
-act 'Go to the university campus': 
+act 'Go to the university campus':
 	minut += 1
 	gt 'uni_grounds', 'main'
 end
@@ -103,4 +100,3 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
 end
 
 --- city_island ---------------------------------
-

+ 52 - 52
locations/city_jorahouse.qsrc

@@ -388,7 +388,7 @@ if $ARGS[0] = 'ev 18':
 	act 'Continue':
 		cla
 		*clr
-		
+
 		'Semyon cums all over your face'
 		picrand = rand(18, 20)
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof18.jpg"></center>'
@@ -409,7 +409,7 @@ if $ARGS[0] = 'ev19':
 	klofQW += 2
 	money += 200
 	spafinloc = 11
-	
+
 	pcs_vag += 1
 	if jorasemyon = 1:
 		gs 'cum_call', 'mouth', 'A44', 1
@@ -485,7 +485,7 @@ if $ARGS[0] = 'ev22':
 	'The boss looks closely at you and says, "Come to me, looks like you''re ready to make some more money."'
 
 	act 'Go to the boss''s room':gt 'city_jorahouse', 'ev23'
-	
+
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Go home (<<will_cost>> Willpower)':
@@ -495,7 +495,7 @@ if $ARGS[0] = 'ev22':
 		end
 	else
 		act '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	
+	end
 end
 
 if $ARGS[0] = 'ev23':
@@ -506,7 +506,7 @@ if $ARGS[0] = 'ev23':
 	'"Well, Well, take off your clothes and show yourself." Says the boss.'
 
 	act 'Show yourself':gt 'city_jorahouse', 'ev24'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -516,7 +516,7 @@ if $ARGS[0] = 'ev23':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev24':
@@ -527,7 +527,7 @@ if $ARGS[0] = 'ev24':
 	'"Show your breasts" Orders the boss.'
 
 	act 'Show your breasts':gt 'city_jorahouse', 'ev25'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -537,7 +537,7 @@ if $ARGS[0] = 'ev24':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev25':
@@ -549,7 +549,7 @@ if $ARGS[0] = 'ev25':
 	gs 'arousal', 'flashlite', 5, 'sub'
 	gs 'stat'
 	act 'Show your ass':gt 'city_jorahouse', 'ev26'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -560,7 +560,7 @@ if $ARGS[0] = 'ev25':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev26':
@@ -572,7 +572,7 @@ if $ARGS[0] = 'ev26':
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	act 'Remove your dress':gt 'city_jorahouse', 'ev27'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -583,7 +583,7 @@ if $ARGS[0] = 'ev26':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev27':
@@ -594,7 +594,7 @@ if $ARGS[0] = 'ev27':
 	'"Spreads your legs!" You receive an order.'
 
 	act 'Spread your legs':gt 'city_jorahouse', 'ev28'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -605,7 +605,7 @@ if $ARGS[0] = 'ev27':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev28':
@@ -617,7 +617,7 @@ if $ARGS[0] = 'ev28':
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
 	act 'Seduce the boss':gt 'city_jorahouse', 'ev29'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -628,7 +628,7 @@ if $ARGS[0] = 'ev28':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev29':
@@ -639,7 +639,7 @@ if $ARGS[0] = 'ev29':
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	act 'Give him a better view':gt 'city_jorahouse', 'ev30'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -650,7 +650,7 @@ if $ARGS[0] = 'ev29':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev30':
@@ -661,7 +661,7 @@ if $ARGS[0] = 'ev30':
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	act 'Lick the boss''s cock':gt 'city_jorahouse', 'ev31'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -672,7 +672,7 @@ if $ARGS[0] = 'ev30':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev31':
@@ -683,7 +683,7 @@ if $ARGS[0] = 'ev31':
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
 	act 'Suck it':gt 'city_jorahouse', 'ev32'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -694,7 +694,7 @@ if $ARGS[0] = 'ev31':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev32':
@@ -706,7 +706,7 @@ if $ARGS[0] = 'ev32':
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
 	act 'Spread your legs':gt 'city_jorahouse', 'ev33'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -717,7 +717,7 @@ if $ARGS[0] = 'ev32':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev33':
@@ -729,7 +729,7 @@ if $ARGS[0] = 'ev33':
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	act 'Let him fuck your pussy':gt 'city_jorahouse', 'ev34'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -740,7 +740,7 @@ if $ARGS[0] = 'ev33':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev34':
@@ -765,7 +765,7 @@ if $ARGS[0] = 'ev34':
 	'"Now I try your ass."'
 	killvar'horand'
 	act 'Let him fuck your ass':gt 'city_jorahouse', 'ev35'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -776,7 +776,7 @@ if $ARGS[0] = 'ev34':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev35':
@@ -853,7 +853,7 @@ if $ARGS[0] = 'ev39':
 	'"Serve both my boys only your pussy, both at the same time." Orders the boss.'
 
 	act 'Obediently serve the boys':gt 'city_jorahouse', 'ev40'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -864,7 +864,7 @@ if $ARGS[0] = 'ev39':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev40':
@@ -914,7 +914,7 @@ if $ARGS[0] = 'ev42':
 	'He motions to you and says, "Come on baby, swim."'
 
 	act 'Go swimming':gt 'city_jorahouse', 'ev43'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> Willpower)':
@@ -928,7 +928,7 @@ if $ARGS[0] = 'ev42':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev43':
@@ -939,7 +939,7 @@ if $ARGS[0] = 'ev43':
 	'Jora finds you a spot by the pool and tells you, "Lie down <<$pcs_nickname>> wait until more people gather." He goes for a swim.'
 
 	act 'Lie down beside the pool':gt 'city_jorahouse', 'ev44'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> Willpower)':
@@ -953,7 +953,7 @@ if $ARGS[0] = 'ev43':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev44':
@@ -979,7 +979,7 @@ if $ARGS[0] = 'ev44':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev45':
@@ -999,7 +999,7 @@ if $ARGS[0] = 'ev45':
 	act 'Remove hands':gt 'city_jorahouse', 'ev46'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'ev45':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev46':
@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'ev47':
 	act 'Get out of the water':gt 'city_jorahouse', 'ev48'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'ev47':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev48':
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'ev48':
 	act 'Spread your legs':gt 'city_jorahouse', 'ev49'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1093,7 +1093,7 @@ if $ARGS[0] = 'ev48':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev49':
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'ev49':
 	act 'Spread your lips':gt 'city_jorahouse', 'ev50'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1122,7 +1122,7 @@ if $ARGS[0] = 'ev49':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev50':
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'ev50':
 	act 'Caressing your pussy':gt 'city_jorahouse', 'ev51'
 	gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'ev50':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev51':
@@ -1161,7 +1161,7 @@ if $ARGS[0] = 'ev51':
 	act 'Cum':gt 'city_jorahouse', 'ev52'
 	gs 'arousal', 'clit_finger', 5, 'exhibitionism', 'sub', 'masturbate'
 	gs 'stat'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get out of here (<<will_cost>> Willpower)':
@@ -1175,7 +1175,7 @@ if $ARGS[0] = 'ev51':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev52':
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'ev52':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev53':
@@ -1237,7 +1237,7 @@ if $ARGS[0] = 'ev54':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev55':
@@ -1276,7 +1276,7 @@ if $ARGS[0] = 'ev56':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev57':
@@ -1343,7 +1343,7 @@ if $ARGS[0] = 'ev61':
 		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>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ev62':
@@ -1456,7 +1456,7 @@ if $ARGS[0] = 'ev65':
 	gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
 	gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 	gs 'stat'
-	act 'Return to dressing room':gt 'fit', 'dressing_room'
+	act 'Return to dressing room': gt 'havana', 'dressing_room'
 end
 
 !!Jesus, what hueta, I cried tears of blood

+ 46 - 46
locations/city_lake.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 	end
 
 	gs 'stat'
-	
+
 	'<center><h2>Lake</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 	else
 		'You can see the winding path leading to the railway station in the industrial region. You should get dressed into your clothes if you want to go there.'
 	end
-	
+
 	if hour >= 8 and hour <= 17:
 		'There is a branch of the swimwear chain <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> here'
 	else
@@ -89,9 +89,9 @@ if $ARGS[0] = 'start':
 
 				walkrand = rand(0, 100)
 
-				if walkrand >= 60 and walkrand < 70 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and hotcat >= 7:
+				if walkrand >= 60 and walkrand < 70 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and pcs_hotcat >= 7:
 					act 'Continue': gt 'city_lake', 'bonfire'
-				elseif walkrand >= 70 and walkrand < 80 and temp >= 20 and daystage = 3 and hour >= 10 and hour <= 19 and hotcat >= 7:
+				elseif walkrand >= 70 and walkrand < 80 and temp >= 20 and daystage = 3 and hour >= 10 and hour <= 19 and pcs_hotcat >= 7:
 					act 'Continue': gt 'city_lake', 'volleyball_day'
 				elseif walkrand >= 80 and walkrand < 90:
 					act 'Continue': gt 'city_lake', 'walklake1'
@@ -146,12 +146,12 @@ if $ARGS[0] = 'start':
 					end
 
 					evrand = rand(0, 100)
-					
-					if evrand <= 90 and evrand > 80 and temp >=20 and daystage = 3 and hour >= 19 and hour <= 21 and hotcat >= 7:
+
+					if evrand <= 90 and evrand > 80 and temp >=20 and daystage = 3 and hour >= 19 and hour <= 21 and pcs_hotcat >= 7:
 						act 'Continue': gt 'city_lake', 'volleyball_intro_nite'
-					elseif evrand <= 80 and evrand > 60 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and hotcat >= 7:
+					elseif evrand <= 80 and evrand > 60 and temp >= 8 and daystage = 3 and hour >= 19 and hour <= 3 and pcs_hotcat >= 7:
 						act 'Continue': gt 'city_lake', 'bonfire'
-                    elseif evrand <= 60 and evrand > 40 and temp >= 20 and daystage = 2 and hour >= 10 and hour <= 19 and hotcat >= 7: 
+                    elseif evrand <= 60 and evrand > 40 and temp >= 20 and daystage = 2 and hour >= 10 and hour <= 19 and pcs_hotcat >= 7:
 						act 'Continue': gt 'city_lake', 'volleyball_intro_day'
 					elseif evrand <= 40 and andrei > 30:
 						act 'Continue': gt 'city_lake', 'Andrei intro'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'start':
 						act 'Continue': gt 'city_lake', 'vlake2'
                     else
 						act 'Get up':gt 'city_lake', 'start'
-                    end 
+                    end
 				end
 			end
 		end
@@ -366,7 +366,7 @@ end
 if $ARGS[0] = 'hut':
 	cla & *clr
 	$location_type = 'event_outdoors'
-	$menu_loc = 'city_lake'	
+	$menu_loc = 'city_lake'
 	$menu_arg = 'gidro'
 	menu_off = 0
 	minut += 1
@@ -425,15 +425,15 @@ if $ARGS[0] = 'walklake1':
 
 			act 'Leave':gt 'city_lake', 'start'
 
-			if hotcat <= 4:
+			if pcs_hotcat <= 4:
 				'The man frowns. "You look terrible. You really should look after yourself better." he says with a hint of disappointment.'
-			elseif hotcat >= 5 and hotcat < 9:
+			elseif pcs_hotcat <= 8:
 				'The man grins. "Looking good..."'
-			elseif hotcat >= 9:
+			else
 				'The man nods. "I don''t often see women as beautiful as you around here."'
 			end
 
-			if hotcat > 4:
+			if pcs_hotcat > 4:
 				act 'What do you want?':
 					cla & *clr
 					minut += 2
@@ -482,7 +482,7 @@ if $ARGS[0] = 'walklake1':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 				'"Money first!" you tell him and he grins. "If you''re going to make money whoring, then you better be prepared to be humiliated!" He takes the money out and hands it to you imposingly.'
-				
+
 				gs 'willpower', 'misc', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Leave (<<will_cost>> Willpower)':
@@ -492,7 +492,7 @@ if $ARGS[0] = 'walklake1':
 					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>'
-				end	
+				end
 
 				act 'Take the money':
 					cla & *clr
@@ -510,7 +510,7 @@ if $ARGS[0] = 'walklake1':
 						cla & *clr
 						gs 'cum_call', 'face', 'A177', 1
 						gs 'cum_call', 'mouth', 'A177', 1
-						
+
 						gs 'arousal', 'bj', 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
@@ -547,7 +547,7 @@ if $ARGS[0] = 'walklake1':
 					cla & *clr
 					gs 'cum_call', 'face', 'A177', 1
 					gs 'cum_call', 'mouth_swallow', 'A177', 1
-					
+
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -609,7 +609,7 @@ if $ARGS[0] = 'dinribak':
 			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>'
-		end	
+		end
 
 		act 'Money first':
 			cla & *clr
@@ -618,7 +618,7 @@ if $ARGS[0] = 'dinribak':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 			'"Money up front!" you hesitantly blurt out.'
 			'The man laughs. "Well, that solves that one then! Take your money whore, and then you won''t need to play games pretending to be a schoolgirl virgin." The guy takes the money and hands it to you imposingly.'
-			
+
 			gs 'willpower', 'misc', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Change your mind and leave (<<will_cost>> Willpower)':
@@ -628,7 +628,7 @@ if $ARGS[0] = 'dinribak':
 				end
 			else
 				act 'Change your mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 
 			act 'Take the money':
 				cla & *clr
@@ -649,7 +649,7 @@ if $ARGS[0] = 'dinribak':
 					gs 'cum_call', 'face', 'A177', 1
 					gs 'cum_call', 'mouth', 'A177', 1
 					gs 'arousal', 'bj', 5
-					
+
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
 					'He starts to cum on your face. A spurt of his cum flies into your mouth and you choke at the taste.'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'dinribak':
 			end
 		else
 			act 'Feign compliance then run (<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 'Kneel in front of him':
 			cla & *clr
@@ -707,7 +707,7 @@ if $ARGS[0] = 'dinribak':
 				gs 'cum_call', 'face', 'A177', 1
 				gs 'cum_call', 'mouth_swallow', 'A177', 1
 				gs 'arousal', 'bj', 5
-				
+
 				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/cum.jpg"></center>'
@@ -886,8 +886,8 @@ if $ARGS[0] = 'stasValera2a':
 		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>'
-	end	
-		
+	end
+
 	act 'Remain silent':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/tits1.jpg"></center>'
@@ -931,7 +931,7 @@ if $ARGS[0] = 'stasValera3':
 		end
 	else
 		act 'What are you doing? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -948,7 +948,7 @@ if $ARGS[0] = 'stasValera3':
 		end
 	else
 		act 'Feebly protest (<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 'Be silent':
 		cla & *clr
@@ -1034,20 +1034,20 @@ if $ARGS[0] = 'stasValera4':
 							minut +=2
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-							'"I''m flattered, but I don''t live nearby." you reply and Stasik nods. "I see. Maybe we''ll meet here again another time?" 
+							'"I''m flattered, but I don''t live nearby." you reply and Stasik nods. "I see. Maybe we''ll meet here again another time?"
 							"Maybe." you reply with a smile as you start walking back to the beach.'
 							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
-	
+
 					if car > 0 and cardrive = 4:
 						act 'Tell them that your car parked close by':
 							cla & *clr
 							minut += 2
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-							'"Thanks, but my car is nearby." you reply and Stasik nods. "I see. Maybe we''ll meet here again another time?" 
-							"Maybe." you reply with a smile and start to walk toward your car.' 
+							'"Thanks, but my car is nearby." you reply and Stasik nods. "I see. Maybe we''ll meet here again another time?"
+							"Maybe." you reply with a smile and start to walk toward your car.'
 							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'vlake1':
 		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>'
-	end	
+	end
 
 	act 'Flirt with them':
 		*clr & cla
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'vlake1':
 			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>'
-		end	
+		end
 
 		act 'Relax and enjoy it':
 			*clr & cla
@@ -1193,7 +1193,7 @@ if $ARGS[0] = 'vlake2':
 		end
 	else
 		act 'Ignore them (<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 'Wave at them':
 		*clr & cla
@@ -1209,7 +1209,7 @@ if $ARGS[0] = 'vlake2':
 			end
 		else
 			act 'Push them away (<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 'Kneel':
 			*clr & cla
@@ -1251,7 +1251,7 @@ if $ARGS[0] = 'vlake2':
 							gs 'npcgeneratec', 0, 'a stranger at the lake', rand(18,45)
 							gs 'boyStat', $npclastgenerated
 							gs 'cum_call', 'face', 'a stranger at the lake'
-							
+
 							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake7.jpg"></center>'
@@ -1292,7 +1292,7 @@ if $ARGS[0] = 'andrey1':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	act 'Go with him':
 		*clr & cla
@@ -1373,7 +1373,7 @@ if $ARGS[0] = 'kater1':
 		end
 	else
 		act 'Take the jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	act 'Spread your legs':
 		*clr & cla
@@ -1443,7 +1443,7 @@ if $ARGS[0] = 'kater1cum':
 	gs 'cum_call', 'mouth_swallow', 'a rescuer at the lake'
 	gs 'cum_call', 'face', 'a rescuer at the lake'
 	gs 'cum_call', 'breasts', 'a rescuer at the lake'
-	
+
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater9.jpg"></center>'
@@ -1567,7 +1567,7 @@ if $ARGS[0] = 'kater3':
 		end
 	else
 		act 'Take the jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	act 'Spread your legs':
 		*clr & cla
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'kater3':
 			gs 'arousal', 'vaginal', 5, 'group'
 			gs 'arousal', 'bj', -5, 'group'
 			gs 'stat'
-			
+
 			act 'Further':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/6.jpg"></center>'
@@ -1748,7 +1748,7 @@ if $ARGS[0] = 'horse2':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	act 'Go with them':
 		*clr & cla
@@ -1792,7 +1792,7 @@ if $ARGS[0] = 'horse2':
 						act 'Change position':
 							*clr & cla
 							gs 'cum_call', 'face', 'Horse rider'
-							
+
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse7.jpg"></center>'
 							'You climb off them and kneel down in front of them. They stand on either side of you as they jerk their cocks. One immediately groans as his cum splashes over your face.'
@@ -1923,9 +1923,9 @@ if $ARGS[0] = 'bonfire':
 		'You enjoy the next couple of hours with Gregor and his friends, laughing, flirting and dancing.'
 		'You finally succeed in roasting a marshmellow and enjoy a tasty smore as the party winds down.'
 		'"We need to do this again sometime," Gregor says as he hands you your towel and beach bag.'
-		'You smile and say "Definately, I am looking forward to it."' 
+		'You smile and say "Definately, I am looking forward to it."'
 		'You wave goodbye and head off the beach."'
-		act 'Leave':gt 'city_lake', 'start'	
+		act 'Leave':gt 'city_lake', 'start'
 	end
 	act 'Decline':
 		cla

+ 1 - 1
locations/city_library.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'read':
 	end
 
 	act 'Go back': gt 'city_library'
-	gs 'library_functions', 'set_read_acts'
+	gs 'library_functions', 'set_library_read_acts'
 end
 
 if $ARGS[0] = 'loan':

+ 8 - 8
locations/city_mansion_residence_1.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'yfoyer':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
-	
+
 	gs 'courtletter'
 
 	act 'Walk outside':
@@ -79,11 +79,11 @@ if $ARGS[0] = 'ybedroom':
 	$locM_arg = 'ybedroom'
 	$location_type = 'private'
 	$locclass = 'bedr'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
-	
+
 	*clr & cla
 	'<center><b><font color="maroon">Bedroom</font></b></center>'
 	if ymanrem[4] = 2:
@@ -94,12 +94,12 @@ if $ARGS[0] = 'ybedroom':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
-	
+
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 	act 'Relax on your bed': gt 'bed', 'start'
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
-	if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
@@ -125,11 +125,11 @@ if $ARGS[0] = 'ybathroom':
 	$menu_arg = 'ybathroom'
 	$location_type = 'bathroom'
 	$bathtype = 'glass shower and tub'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
-	
+
 	*clr & cla
 	'<center><b><font color="maroon">Bathroom</font></b></center>'
 	if ymanrem[5] = 2:
@@ -144,7 +144,7 @@ if $ARGS[0] = 'ybathroom':
 
 	if ymanrem[5] = 2:
 		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
-		
+
 		gs 'selfplay', 'suction_dildo'
 		*nl
 		gs 'din_van', 'private'

+ 1 - 1
locations/city_mansion_residence_2.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'ylibrary':
 	if ymanrem[10] = 2:
 		'A huge collection of books are neatly placed on the bookshelves.'
 
-		gs 'library_functions', 'set_read_acts'
+		gs 'library_functions', 'set_library_read_acts'
 	end
 end
 

+ 1 - 41
locations/city_market.qsrc

@@ -111,47 +111,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 
 		'You wlak up to the stall and inspect what''s on sale. You see a fantasy book, a science fiction book and various romance novels. They all cost 350 <b>₽</b> each.'
 
-		if money >= 350:
-			act 'Buy the fantasy book':
-				*clr & cla
-				minut += 15
-				money -= 350
-				f_book += 1
-				gs 'stat'
-
-				'You buy the fantasy book for 350 <b>₽</b>.'
-
-				act 'Leave': gt 'city_market', 'start'
-			end
-		end
-
-		if money >= 350:
-			act 'Buy the science fiction book':
-				*clr & cla
-				minut += 15
-				money -= 350
-				f_book += 1
-				gs 'stat'
-
-				'You buy the science fiction book 350 <b>₽</b>.'
-
-				act 'Leave':gt 'city_market', 'start'
-			end
-		end
-
-		if money >= 350:
-			act 'Buy a romance novel':
-				*clr & cla
-				minut += 15
-				money -= 350
-				w_book += 1
-				gs 'stat'
-
-				'You buy a romance novel for 350 <b>₽</b>.'
-
-				act 'Leave':gt 'city_market', 'start'
-			end
-		end
+		gs 'library_functions', 'set_book_buy_acts'
 
 		act 'Leave': gt 'city_market', 'start'
 	end

+ 2 - 2
locations/city_musicstore.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'musicshop':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 				if npc_rel['A154'] >= 60:
-					if hotcat >= 6:
+					if pcs_hotcat >= 6:
 						'He gives you a smile when he sees you. "Come to hang out with me on my break? Maybe we can have a little fun?" he asks with a wink.'
 						'You smile. "No, I just came to look around and maybe do a little shopping."'
 						'He smiles and starts telling you about a variety of instruments. He seems to really know his stuff.'
@@ -48,7 +48,7 @@ if $ARGS[0] = 'musicshop':
 				elseif npc_rel['A154'] <= 20:
 					'He visibly sighs when he sees you and does his best to ignore you, though he answers any questions about instruments that you ask with the barest amount of information.'
 				else
-					if hotcat >= 6:
+					if pcs_hotcat >= 6:
 						'Radomir is talking about the band''s latest gig as you approach. He looks your body up and down when he sees you. "Nice to see all the working out is paying off. Looking good."'
 						'You smile. "Thanks, but I just came to look around and maybe do a little shopping."'
 						'He nods and starts telling you about a variety of instruments. He seems to really know his stuff.'

+ 27 - 24
locations/city_nightclub.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'inside':
 	'The nightclub is huge. The first floor consists of the dance floor surrounding the main bar. Along the upper level walkway are some <a href="exec:gt ''city_nightclub'', ''private_rooms''">private booths</a> and some smaller bars.'
 	'The music is loud and the bass is thumping. You see a laser show going on over at the stage, while on the poorly-lit dance floor, people are dancing like there''s no tomorrow.'
 
-	if hour >= 18 and hotcat >= 6 and clubwork = 0 and clubno = 0 and rand (0,10) = 0:
+	if hour >= 18 and pcs_hotcat >= 6 and clubwork = 0 and clubno = 0 and rand (0,10) = 0:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
@@ -142,7 +142,7 @@ if $ARGS[0] = 'inside':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 			'You search the club for a few minutes before finding the promoter.'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'He asks you if you''ve changed your mind and want to do some work for him.'
 				act 'No': clubno = 1 & gt 'city_nightclub', 'inside'
 				act 'Yes':
@@ -191,7 +191,7 @@ if $ARGS[0] = 'dance':
 	'The club is filled to the brim with people, most of whom are on the dance floor having a great time.'
 	gs 'katja_nightclub', 'activity', 'dance_floor'
 	act 'Leave the dance floor': gt 'city_nightclub', 'inside'
-	
+
 	if hour <= 3 or hour >= 18:
 		act 'Dance (0:15)':
 			*clr & cla
@@ -203,13 +203,15 @@ if $ARGS[0] = 'dance':
 			gs 'exp_gain', 'danc', 1
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			pcs_mood += 10
-			if rand(4,20) <= hotcat: clrand = rand(0,10)
+			if rand(4, 20) <= pcs_hotcat: clrand = rand(0,10)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club4.jpg"></center>'
 			'The dance floor is full of people and you''re packed in so tightly that it''s hard to keep track of who you might potentially be dancing with. You don''t let it bother you as everyone is forced to dance this closely together.'
 			if clrand > 0:
 				if clrand < 5:
 					gs 'arousal', 'foreplay', 1
-					gs 'boygirl', 0
+					gs 'npcgeneratec', 0
+					gs 'boyStat', $npclastgenerated
+
 					'As you''re dancing, you feel someone groping your ass. You turn around and see <<$boybody_pref>>, <<$boybod>> guy with <<$boyface>> hair. He''s <<$boyClo>>'
 					act 'Stop dancing': gt 'city_nightclub', 'inside'
 					act 'Dance with him': gt 'city_nightclub', 'dance_guy'
@@ -357,21 +359,21 @@ if $ARGS[0] = 'dance_couple':
 		'"Why don''t you take the lead?" the woman asks as she starts undressing. You have them start on the couch, with the man sitting while she kneels beside him and gives him a blowjob. You raptly watch the two lovers, getting more and more excited by the display.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
-		
+
 		act 'Further':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/vip2.jpg"></center>'
 			'He turns her around and starts fucking her from behind. Deciding you''ve waited long enough, you undress and slide your wet pussy in front of her face. She immediately starts licking you in all the right places.'
 			gs 'arousal', 'cuni', 10, 'dom'
 			gs 'stat'
-		
+
 			act 'Further':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/vip3.jpg"></center>'
 				'She pulls out a double-sided dildo and inserts one end into your greedy hole before she starts sucking on the other. You''re surprised by how good she is at pleasuring you this way.'
 				gs 'arousal', 'vaginal_dildo', 10, 'dom'
 				gs 'stat'
-			
+
 				act 'Further':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/vip4.jpg"></center>'
@@ -379,7 +381,7 @@ if $ARGS[0] = 'dance_couple':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'vaginal_dildo', 10, 'dom'
 					gs 'stat'
-				
+
 					act 'Further':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/vip5.jpg"></center>'
@@ -392,10 +394,10 @@ if $ARGS[0] = 'dance_couple':
 
 							act 'Finish':
 								gs 'arousal', 'end'
-								gs 'stat'							
+								gs 'stat'
 								gt 'city_nightclub', 'private_rooms'
 							end
-							
+
 							act 'Lick her breasts':
 								cla & *clr
 								spafinloc = 12
@@ -436,11 +438,11 @@ if $ARGS[0] = 'bar':
 		killvar 'barsexrand'
 	end
 
-	act 'Order from the menu': 
+	act 'Order from the menu':
 		menu_off = 1
 		gs 'food_menu'
 	end
-	
+
 	act 'Go back': gt 'city_nightclub', 'inside'
 
 	if alko >= 7:
@@ -452,7 +454,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club1.jpg"></center>'
 			'You''re so drunk that you can barely remember where you live.'
-			
+
 			act 'Try to go home': gt 'city_residential'
 		elseif temp = 7:
 			gs 'stat'
@@ -466,7 +468,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'bj', 10, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': gt 'city_center'
 		elseif temp = 8:
 			pcs_horny += 5
@@ -474,7 +476,7 @@ if $ARGS[0] = 'bar':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club5.jpg"></center>'
 			'The last thing you remember is how you tried to pose as a waitress.'
 			'You''re too drunk to continue partying and security has to escort you out.'
-			
+
 			act 'Leave': gt 'city_center'
 		elseif temp = 9:
 			gs 'stat'
@@ -484,7 +486,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'erotic_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': gt 'city_center'
 		elseif temp = 10:
 			gs 'stat'
@@ -494,7 +496,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'erotic', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': gt 'city_center'
 		elseif temp = 11:
 			gs 'stat'
@@ -656,8 +658,9 @@ if $ARGS[0] = 'sex':
 	*clr & cla
 	menu_off = 1
 	gs 'dinSex', 'std_trigger_oral'
-	gs 'boygirl', 0
+	gs 'npcgeneratec', 0
 	dick = rand(10, 18)
+	gs 'boyStat', $npclastgenerated
 	gs 'stat'
 	'<center><b><font color="maroon">toilet stall</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex.jpg"></center>'
@@ -756,16 +759,16 @@ if $ARGS[0] = 'bar0':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/bar0.jpg"></center>'
 	'As you sit at the bar, a woman walks up and starts chatting with you.'
 	'During the conversation, you get the feeling that she''s flirting with you, but before you can react, her hands start wandering over your body.'
-	
+
 	act 'Move away from her': gt 'city_nightclub', 'bar'
-	
+
 	act 'Kiss her':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/bar1.jpg"></center>'
 		'Her flirting works on you. You move closer and start kissing her. At first, it feels strange kissing a random woman, but it doesn''t take long for it to move from awkward to passionate.'
 		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
-		
+
 		act 'Move away from her': gt 'city_nightclub', 'bar'
 		act 'Tell her to meet you in the restroom': gt 'city_nightclub', 'lezbsort'
 	end
@@ -831,7 +834,7 @@ end
 
 if $ARGS[0] = 'private_rooms':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
-	'Upstairs overlooking the dance floor is a walkway which has a number of private booths where thick curtains can be used for privacy.' 
+	'Upstairs overlooking the dance floor is a walkway which has a number of private booths where thick curtains can be used for privacy.'
 	'Security guards are on watch, making sure that people who have paid for them won''t be disturbed.'
 	'There''s also some smaller bars, some with their own dance floors, located up here.'
 
@@ -879,7 +882,7 @@ if $ARGS[0] = 'work':
 			end
 		end
 	elseif clubr = 1:
-		'"Okay <<$pcs_nickname>>, I want you to go around the club getting people to try and hopefully switch to these drinks. You can''t go wrong here, just smile and give out free drinks."' 
+		'"Okay <<$pcs_nickname>>, I want you to go around the club getting people to try and hopefully switch to these drinks. You can''t go wrong here, just smile and give out free drinks."'
 		'"No need to hold back since the suppliers are paying. I''ll see you back here in an hour."'
 		act 'Get to work':
 			*clr & cla

+ 0 - 3
locations/city_redlight.qsrc

@@ -54,9 +54,6 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
-
-	act 'Wait': gs 'obj_din', 'wait'
-
 	gs 'taxi'
 
 	if car > 0:

+ 0 - 4
locations/city_residential.qsrc

@@ -98,9 +98,6 @@ if evt_chk = 1:
 	!! We've got an event today, check it's location:
 	gs 'emp_functions', 'disp_evt', 3
 end
-
-act 'Wait':gs 'obj_din', 'wait'
-
 gs 'taxi'
 
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$loc = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
@@ -202,4 +199,3 @@ end
 gs 'booty_call', 'home_links'
 
 --- city_residential ---------------------------------
-

+ 2 - 2
locations/city_sauna.qsrc

@@ -173,7 +173,7 @@ if $ARGS[0] = 'saunaroom':
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		
+
 	end
 
 	if workDolg <= 0 and SaunaWhore > 0:
@@ -192,7 +192,7 @@ if $ARGS[0] = 'saunaroom':
 		dynamic $vitamin
 	end
 
-	gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 
 	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 

+ 1 - 2
locations/clothing.qsrc

@@ -2056,9 +2056,8 @@ if $ARGS[0] = 'quick_buy':
 	if CloStyle = 2:h = 10
 	if CloStyle = 5:h = 20
 	h += (3 * CloQuality)
-	dynamic '<<$ARGS[4]>> -= price'
+	if price > 0: dynamic '<<$ARGS[4]>> -= price'
 	gs 'clothing', 'view_clothing_item_buy', 'skip', $ARGS[1], ARGS[2], ARGS[3]
 end
 
 --- clothing ---------------------------------
-

+ 3 - 5
locations/core_library.qsrc

@@ -4,7 +4,6 @@
 !! Version: .01 - initial release
 !! Version: .02 - refactoring to streamline content start, new standardised locations function for kitchen and bathroom test code
 !! Author: Hooded Silence
-!!
 
 !! Ballet School Initiator - This class is to act as a gateway to the various locations for the ballet school
 
@@ -38,13 +37,12 @@ if $ARGS[0] = 'init':
 				end
 			end
 			!! Dance job?
-
 		end
 
 		if $loc = 'pav_commcenter':
 			if month = 7 and day = 3 and (hour >= 16 and hour < 17) and mod_ballet['letter'] = 1:
 				! Pre-flight - travel to school dorms
-				act 'Get on the bus': gt 'pushkin_ballet_res', 'start'
+				act '<b>Travel to the ballet school</b>': gt 'pushkin_ballet_res', 'start'
 			end
 		end
 
@@ -75,6 +73,7 @@ if $ARGS[0] = 'corridor':
 	music_loop = 0
 	menu_off = 0
 	CLOSE ALL
+	gs 'themes', 'indoors'
 	if $location_type = 'private':
 	elseif $location_type = 'public':
 	end
@@ -105,7 +104,6 @@ if $ARGS[0] = 'bathroom':
 		'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	elseif $location_type = 'communal':
-
 	end
 !! Default facilities
 	dynamic $basin
@@ -162,7 +160,7 @@ if $ARGS[0] = 'bedroom':
 	end
 	act 'Relax on your bed': gt 'bed', 'start'
 	act 'Open wardrobe': gt 'wardrobe', 'start'
-	gs 'events', 'read'
+	gs 'library_functions', 'set_home_read_acts'
 	gs 'exercise', 'start'
 end
 --- core_library ---------------------------------

+ 1 - 1
locations/courtletter.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'letter':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/openletter.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/mail/letter_open.jpg"></center>'
 
 	!! Handling the various different letters.
 	if $policeQW_courtletter_subjects[0] = 'fine':

+ 0 - 94
locations/crossfit_north_box.qsrc

@@ -1,94 +0,0 @@
-# crossfit_north_box
-menu_off = 0
-gs 'shortgs', 'setloc', 'crossfit_north_box', $ARGS[0]
-$sexloc = 'crossfit_north_box'
-$location_type = 'public_indoors'
-$crossfit_north_image_dir = 'images/locations/city/citycenter/gym/crossfit/'
-
-if $ARGS[0] = 'box':
-	
-	act 'Leave': gt 'fit', 'dressing_room'
-	
-	if crossfit_random_choice < daystart OR $todays_crossfit_wod = '':
-		gs 'crossfit_north_wod', 'setup_wod'
-		$todays_crossfit_wod = $crossfit_wods[rand(0, ARRSIZE('$crossfit_wods') - 1)]
-		crossfit_random_choice = daystart
-	end
-
-	if $previous_record_holder ! ''  and pcs_lover < 3 and last_crossfit_workout < daystart:
-		gt 'crossfit_north_girlmeet', 'start'
-	end
-
-	'<center><b><font color="maroon">Crossfit North St. Petersburg</font></b></center>'
-	'<center><img <<$set_imgh>> src="<<$crossfit_north_image_dir>>start.jpg"></center>'
-	'This crossfit box might not look like it, but is said to be one of the best ones in the region.'
-	'Today''s exercise is <<$todays_crossfit_wod>>.'
-	'It consists of:'
-	gs 'crossfit_north_wod', $todays_crossfit_wod
-
-	if crossfit_first = 1:
-		act 'Check personal records':
-			cla
-			menu_off = 1
-			gt 'crossfit_north_record', 'view_records'
-		end
-	end
-
-	if pcs_energy >= 20 and pcs_stam >= stammax / 5:
-		act 'Start the exercise':
-			menu_off = 1
-			if last_crossfit_workout = daystart:
-				msg'<b><font color = red>You already did this workout today. That''s enough for one day.</font></b>'
-			else
-				*clr & cla
-				last_crossfit_workout = daystart
-				crossfit_first = 1
-				abonement -= 1
-				'You start with the workout.'
-				gs 'crossfit_north_wod', $todays_crossfit_wod
-				gs 'exercise', 'tier4', 20, 'stren', 'vital', 'agil'
-				'<center><video autoplay loop src="<<$crossfit_north_image_dir>><<$wod_video[$todays_crossfit_wod]>>.mp4"></video></center>'
-				current_wod_score = max(1,(100 - ((100 * pcs_health * (rand(40,100) + pcs_sleep  + pcs_vital + pcs_agil + pcs_stren))/ (healthmax * 500))))
-				cla
-				act 'Check your score':
-					cla
-					$resultstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod,  current_wod_score)
-					'You successfully finish the workout <<$pcs_nickname>> in <<$resultstring>>'
-					if personal_wod_record[$todays_crossfit_wod] = 0:
-						personal_wod_record[$todays_crossfit_wod] = current_wod_score
-					elseif current_wod_score < personal_wod_record[$todays_crossfit_wod]:
-						'This is a new personal record!'
-						personal_wod_record[$todays_crossfit_wod] = current_wod_score
-					end
-					if box_wod_record[$todays_crossfit_wod] = 0:
-						box_wod_record[$todays_crossfit_wod] = current_wod_score
-						$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
-					elseif current_wod_score < box_wod_record[$todays_crossfit_wod]:
-						'Not only that, it''s also a new best record for the whole box!'
-						$prevrecordstring = func('crossfit_north_record', 'recordstring', $todays_crossfit_wod, box_wod_record[$todays_crossfit_wod])
-						if $box_wod_record_holder[$todays_crossfit_wod] ! $pcs_nickname:
-							$previous_record_holder = $box_wod_record_holder[$todays_crossfit_wod]
-							'You beat <<$previous_record_holder>>''s record of <<$prevrecordstring>>'
-						else
-							'You beat your own old box record of <<$prevrecordstring>>'
-						end
-						killvar '$prevrecordstring'
-						box_wod_record[$todays_crossfit_wod] = current_wod_score
-						$box_wod_record_holder[$todays_crossfit_wod] = $pcs_nickname
-					end
-					killvar 'current_wod_score'
-					act 'Finish and go to the changing room':
-						gt 'fit', 'dressing_room'
-					end
-				end
-			end
-		end
-	elseif pcs_stam >= stammax / 5:
-		act 'Start the exercise': '<br><font color="red">You feel too hungry to do this exercise now.</font>'
-	else
-		act 'Start the exercise': '<br><font color="red">You are to exhausted to do this. Recover your stamina before trying to do this exercise.</font>'
-	end
-end
-
---- crossfit_north_box ---------------------------------
-

+ 0 - 54
locations/crossfit_north_girlmeet.qsrc

@@ -1,54 +0,0 @@
-# crossfit_north_girlmeet
-!2021/05/02
-if $ARGS[0] = 'start':
-	menu_off = 1
-	!! generate a girlfriend
-	gs 'boygirl', 1
-	$boydesc = $previous_record_holder
-	$boyClo = 'wearing workout clothes'
-	killvar '$previous_record_holder'
-	*clr & cla
-	minut += 5
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
-	'As you enter the crossfit box, you notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair. 
-	She is <<$boyClo>>'
-	'As she notices you, she greets you "Hi. My name is <<$boydesc>>. I heard you beat my old record, very impressive!"'
-	act 'Thank her':
-		cla
-		'You reply: "Oh thank you. That is a tough workout and your score was not easy to beat."'
-		act 'Ask her if she comes around often':
-			cla
-			'"Do you visit this box often?", you ask.'
-			'She replies: "Yeah, I am here two or three times a week."'
-			'<<$boydesc>> looks at you and asks: "I just got finished with my workout for today, would you like to hang out afterwards?"'
-			act 'Agree to a date':
-				cla
-				'"Sure, sounds like fun, I would love to."'
-				'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
-				gs 'dateF', 'date_choice'
-			end
-			act 'Decline':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
-				'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
-				'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t know if I had a chance but you can''t blame me for trying."'
-				'The two of you say goodbye to each other.'
-				act 'Return': gt $loc, $loc_arg
-			end
-		end
-		act 'Say goodbye':
-			cla
-			'You check your watch and tell her: "Sorry, I got to run now, see you around!"'
-			act 'Leave': gt $loc, $loc_arg
-		end
-	end
-	act 'Pretend you''re busy':
-		cla
-		'You check your watch and pack your things, ignoring the girl.'
-		act 'Leave': gt $loc, $loc_arg
-	end
-end
-
-
---- crossfit_north_girlmeet ---------------------------------

+ 0 - 85
locations/crossfit_north_record.qsrc

@@ -1,85 +0,0 @@
-# crossfit_north_record
-
-menu_off = 1
-
-if $ARGS[0] = 'view_records':
-	*clr & cla
-	gs 'crossfit_north_record', 'update_box_records'
-
-	'<center><img <<$set_imgh>> src="<<$crossfit_north_image_dir>>records.jpg"></center>'
-	'You look at the board outlining the personal records'
-	'<center><table border=1><tr><th>Workout</th><th>Personal Best</th><th>Box Record (Women)</th><th>Box Record Holder</th></tr>'
-	record_table_counter = 0
-	:recordloop
-	if record_table_counter < ARRSIZE('$crossfit_wods'):
-		$crossfit_wod = $crossfit_wods[record_table_counter]
-		'<tr><td><<$crossfit_wod>></td><td>' & func('crossfit_north_record', 'recordstring', $crossfit_wod, personal_wod_record[$crossfit_wod]) & '</td><td>' & func('crossfit_north_record', 'recordstring', $crossfit_wod, box_wod_record[$crossfit_wod])  & '</td><td> <<$box_wod_record_holder[$crossfit_wod]>></td></tr>'
-		record_table_counter += 1
-		jump 'recordloop'
-	end
-	'</table></center>'
-	killvar 'record_table_counter'
-	killvar '$crossfit_wod'
-	act 'Go back':
-		gt $loc, $loc_arg
-	end
-end
-
-if $ARGS[0] = 'recordstring':
-	if ARGS[2] = 0:
-		$result = 'No score yet'
-	else
-		wod_score = wod_min_score[$ARGS[1]] + (wod_max_score[$ARGS[1]] - wod_min_score[$ARGS[1]]) * ARGS[2] / 100
-		if $wod_type[$ARGS[1]] = 'for_time':
-			$result = '<<wod_score/60>> minutes and <<wod_score - (wod_score/60)*60>> seconds'
-		end
-		if $wod_type[$ARGS[1]] = 'for_rounds':
-			$result = '<<wod_score/100>> rounds and <<wod_score - (wod_score/100)*100>>% of the last one'
-		end
-	end
-end
-
-if $ARGS[0] = 'update_box_records':
-	if last_box_record_update = 0 or last_box_record_update + 30 < daystart:
-		number_of_box_record_updates = 30
-	else
-		number_of_box_record_updates = daystart - last_box_record_update
-	end
-	last_box_record_update = daystart
-	current_record_update_count = 0
-
-	:recordupdateloop
-	if current_record_update_count < number_of_box_record_updates:
-		gs 'crossfit_north_record', 'box_records'
-		current_record_update_count += 1
-		jump 'recordupdateloop'
-	end
-	killvar 'current_record_update_count'
-	killvar 'number_of_box_record_updates'
-end
-
-if $ARGS[0] = 'box_records':
-	crossfit_record_it = 0
-	:recordgeneratorloop
-	if crossfit_record_it < ARRSIZE('$crossfit_wods'):
-
-		$crossfit_wod = $crossfit_wods[crossfit_record_it]
-		new_record_wod_time = max(1,(100 - (100 * (rand(40,100) + rand(0,100) + rand(0,100) + rand(0,100)) / 400)))
-
-		if box_wod_record[$crossfit_wod] = 0 or box_wod_record[$crossfit_wod] > new_record_wod_time:
-			box_wod_record[$crossfit_wod] = new_record_wod_time
-			!! record holder changes only in 1/3rd of the cases from previous holder, or if sveta is record holder
-			if rand(1,3) = 1 OR $box_wod_record_holder[$crossfit_wod] = '' OR $box_wod_record_holder[$crossfit_wod] = $pcs_nickname:
-				gs 'npcrnamefile', 'rusFemale'
-				$box_wod_record_holder[$crossfit_wod] = $npctempgn[1]
-			end
-		end
-		crossfit_record_it += 1
-		jump 'recordgeneratorloop'
-	end
-	killvar 'crossfit_record_it'
-	killvar 'new_record_wod_time'
-	killvar '$crossfit_wod'
-end
-
---- crossfit_north_record ---------------------------------

+ 0 - 72
locations/crossfit_north_wod.qsrc

@@ -1,72 +0,0 @@
-# crossfit_north_wod
-
-!! set up wods
-if $ARGS[0] = 'setup_wod':
-	killvar '$crossfit_wods'
-	killvar 'wod_min_score'
-	killvar 'wod_max_score'
-	killvar '$wod_type'
-	killvar '$wod_video'
-	gs 'crossfit_north_wod', 'add_wod', 'Fran', 120, 600, 'for_time', 'pullup'
-	gs 'crossfit_north_wod', 'add_wod', 'Nancy', 600, 1200, 'for_time', 'ohs'
-	gs 'crossfit_north_wod', 'add_wod', 'Isabel', 90, 600, 'for_time', 'snatch'
-	gs 'crossfit_north_wod', 'add_wod', 'Open 17.1', 600, 1200, 'for_time', 'dumbbell_snatch'
-	gs 'crossfit_north_wod', 'add_wod', 'Open 16.1', 1300, 100, 'for_rounds', 'overhead_lunge'
-	gs 'crossfit_north_wod', 'add_wod', 'Karen', 300, 720, 'for_time', 'wallball'
-end
-
-if $ARGS[0] = 'Fran':
-	'- Thruster 65 lbs'
-	'- Pull-ups'
-	'21-15-9 repetitions each, for time'
-end
-
-if $ARGS[0] = 'Nancy':
-	'- 400 meter run'
-	'- Overhead squat 65 lbs x 15'
-	'5 rounds for time'
-end
-
-if $ARGS[0] = 'Isabel':
-	'- Snatch 95 pounds'
-	'30 repetitions for time'
-end
-
-if $ARGS[0] = 'Open 17.1':
-	' - 10 dumbbell snatches'
-	' - 15 burpee box jump-overs'
-	' - 20 dumbbell snatches'
-	' - 15 burpee box jump-overs'
-	' - 30 dumbbell snatches'
-	' - 15 burpee box jump-overs'
-	' - 40 dumbbell snatches'
-	' - 15 burpee box jump-overs'
-	' - 50 dumbbell snatches'
-	' - 15 burpee box jump-overs'
-	'For time'
-end
-
-if $ARGS[0] = 'Open 16.1':
-	' - 25-ft. overhead walking lunge'
-	' - 8 burpees'
-	' - 25-ft. overhead walking lunge'
-	' - 8 chest-to-bar pull-ups'
-	'Complete as many rounds and reps as possible in 20 minutes'
-end
-
-
-if $ARGS[0] = 'Karen':
-	'- 150 wallball shots'
-	'For time'
-end
-
-if $ARGS[0] = 'add_wod':	
-	$crossfit_wods[] = $ARGS[1]
-	wod_min_score[$ARGS[1]] = ARGS[2]
-	wod_max_score[$ARGS[1]] = ARGS[3]
-	$wod_type[$ARGS[1]] = $ARGS[4]
-	$wod_video[$ARGS[1]] = $ARGS[5]
-end
-
---- crossfit_north_wod ---------------------------------
-

+ 0 - 85
locations/danceclass.qsrc

@@ -1,85 +0,0 @@
-# danceclass
-
-menu_off = 1
-*clr & cla
-minut += 5
-gs 'stat'
-gs 'themes', 'indoors'
-'<center><b><font color="maroon">Dance Studio</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/danceclass.jpg"></center>'
-'A big, open room with good lighting and huge mirrors, perfect for improving your dance skills.'
-
-if pcs_energy >= 10 and pcs_stam >= stammax / 5:
-	act 'Modern dance class (0:30)':
-		*clr & cla
-		gs 'exercise', 'tier2', 30, 'agil', 'stren', 'danc'
-		abonement -= 1
-		if pcs_inhib < 40:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
-
-		if pcs_danc < 100:'You study modern dance, which is very popular in the clubs.'
-		if pcs_danc >= 100:'The day has finally come, you''ve been working hard, and you realize that you''ve learned everything you can from this class.'
-
-		act 'Leave':gt 'fit', 'dressing_room'
-	end
-
-	act 'Burlesque class (0:30)':
-		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil', 'stren', 'danc', 'dancero'
-		abonement -= 1
-		if pcs_inhib < 60:inhib_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
-
-		if pcs_danc >= 50:
-			gs 'exercise', 'tier2', 0, 'dancero'
-			'You study the art of burlesque, imaging yourself stripping to the music.'
-
-			if pcs_dancero >= 100:'You''ve finally managed to master the art of burlesque, there is no need taking this class anymore.'
-		else
-			gs 'exercise', 'tier2', 0, 'danc'
-			'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
-		end
-
-		act 'Leave':gt 'fit', 'dressing_room'
-	end
-
-	if pcs_stren >=40 or needstrength = 0:
-		act 'Pole dance class (0:30)':
-			*clr & cla
-			gs 'exercise', 'tier2', 0, 'agil', 'stren', 'dancpol'
-			abonement -= 1
-			if pcs_inhib < 60:inhib_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
-
-			if pcs_dancero >= 50 and pcs_stren >= 40:
-				gs 'exercise', 'tier2', 0, 'dancpol'
-				'You study various acrobatics on the pole.'
-
-				if pcs_dancpol >= 100:'You''ve already mastered the art of pole dancing, there is nothing more left to teach you.'
-			else
-				'It doesn''t look sensual enough and you bang your head pretty hard on the pole. This is far harder than it looks. It would help if you improved your modern dancing skills or the burlesque one, but you did learn a little.'
-
-				if pcs_stren < 40:'The instructor tries to be patient with you, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
-			end
-
-			act 'Leave':gt 'fit', 'dressing_room'
-		end
-	else
-		act 'Modern dance class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
-		act 'Burlesque class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
-		if pcs_stren >=40 or needstrength = 0:
-			act 'Pole dance class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
-		end
-	end
-elseif pcs_stam >= stammax / 5:
-	*nl
-	'You are so hungry you can''t even bring yourself to look at the activities available.'
-else
-	'You are to exhausted you can''t even bring yourself to look at the activities available. Recover your stamina before trying to dance.'
-end
-
-act 'Leave':gt 'fit', 'dressing_room'
-
-
---- danceclass ---------------------------------
-

+ 3 - 2
locations/dateF.qsrc

@@ -18,7 +18,8 @@ if $ARGS[0] = 'start':
 	$location_type = 'event_outdoors'
 	*clr & cla
 	!! generate a girl
-	gs 'boygirl', 1, '', rand(18, 35)
+	gs 'npcgeneratec', 1, '', rand(18, 35)
+	gs 'boyStat', $npclastgenerated
 
 
 	act 'Ignore her and hurry away':gt $loc, $loc_arg
@@ -153,7 +154,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	!!3 - unattractive or average Sveta
-	elseif hotcat < 6:
+	elseif pcs_hotcat < 6:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 		'You notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she reaches out her hand for a handshake. "Hi. My name is <<$boydesc>>."'

+ 13 - 12
locations/dateM.qsrc

@@ -2,7 +2,7 @@
 !2021/05/02
 !!boy walks up to Sveta and talks to her.
 !!1) Sveta in a school uniform
-!!2) Gopnik Sveta 
+!!2) Gopnik Sveta
 !!3) unattractive or average Sveta
 !!4) Attractive Sveta
 !!After that have him ask her out, this should depend on the weather, location and time.
@@ -17,7 +17,8 @@ if $ARGS[0] = 'start':
 	$location_type = 'event_outdoors'
 	*clr & cla
 	!! generate a boy
-	gs 'boygirl', 0, '', rand(18, 35)
+	gs 'npcgeneratec', 0, '', rand(18, 35)
+	gs 'boyStat', $npclastgenerated
 
 	act 'Ignore him and hurry away':gt $loc, $loc_arg
 !!1) Sveta in a school uniform
@@ -184,7 +185,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	!!3 - unattractive or average Sveta
-	elseif hotcat < 6:
+	elseif pcs_hotcat < 6:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 !!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 !!		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$npc_firstname[$boy]>>."'
@@ -247,14 +248,14 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	!!4) Attractive Sveta 
+	!!4) Attractive Sveta
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 !!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 !!		'He walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
 		'A man approaches, smiling confidently at you.'
 		'"Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
-		
+
 		act 'Excuse me?':
 			*clr & cla
 			minut += 5
@@ -332,7 +333,7 @@ if $args[0] = 'decline':
 	act 'Continue': gt $loc, $loc_arg
 	!!this goes back to what ever street it started on
 end
-				
+
 if $args[0] = 'date_choice':
 	if sunWeather = 1:
 		!!if good weather, day/night, go to park is an option
@@ -359,7 +360,7 @@ if $ARGS[0] = 'datepark':
 	'"Since it''s such a beautiful day today, let''s go for a walk in the park." you suggest.'
 	'"Sounds great. Lets go." <<$npc_firstname[$boy]>> walks with you towards the park.'
 	'The two of you walk in the park for a while causally talking, getting knowing each other. After a while he suggests sitting down.'
-	!!Jump to park 
+	!!Jump to park
 	act 'Watch people':
 		*clr & cla
 		minut += 45
@@ -447,8 +448,8 @@ if $ARGS[0] = 'datepark':
 											'Both of you fall down to the ground, breathing heavily, trying to come to your senses. After a while you into his eyes and start laughing.'
 											'"That was great <<$pcs_nickname>>. We''ll have to do this again." You get up and clean yourself, straightening out your clothes the best you can. "Shall we head back?" you ask.'
 											act 'Walk back':gt 'dateM', 'walk_back'
-										end	
-									end		
+										end
+									end
 								end
 							end
 						end
@@ -635,8 +636,8 @@ if $ARGS[0] = 'datecinema':
 							act 'Sorry': gt 'dateM', 'cinema_sorry'
 						end
 					end
-				end	
-			end	
+				end
+			end
 		end
 	end
 end
@@ -933,7 +934,7 @@ if $ARGS[0] = 'bartalk':
 									end
 								end
 							end
-						end	
+						end
 					end
 				end
 			end

+ 5 - 5
locations/dimaEv.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'firstvisitsex':
 				*clr & cla
 				spafinloc = 11
 				gs 'cum_manage'
-				
+
 				if maxdra = 1: maxdra = 2
 				dimasexday = daystart
 				gs 'stat'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'firstvisitsex':
 					*clr & cla
 					spafinloc = 11
 					gs 'cum_manage'
-					
+
 					dimasexday = daystart
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/sitcum.jpg"></center>'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'dimkaplays':
 	gs 'stat'
 	dimarudorient = 1
 	'Dimka takes some white powder from his desk and a small straw. "Here, sniff this." He offers with a cocky smile, "It''s really cool! Excellent for relaxing!" Knowing the blackmail he has on you, you know you don''t really have a choice. So you do as he commands.'
-	
+
 	gs 'willpower', 'drugs', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -361,7 +361,7 @@ if $ARGS[0] = 'dimkaplays':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	act 'Snort':
 		*clr & cla
 		minut += 15
@@ -622,7 +622,7 @@ if $ARGS[0] = 'Dimka_warning':
 		dimkawarn += 1
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/package1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/mail/package_receive2.jpg"></center>'
 		'You go into the hallway and see a package on the cabinet near the mirror. Curious, you look to see who it is from and see that it is addressed to your mother. You feel horror wash over you as you recognize the handwriting as well as the "Private" written on the box as being Dimka''s.'
 		'Grabbing the package, you take it into the bathroom and carefully open it, trying not to damage the wrapping. Fortunately, Dimka only used very small pieces of tape to seal the box so you were able to open it. As you feared, the box contains copies of the pictures from the video, only this time your face is blacked out as is the background, making it impossible to tell who it is in the picture. You rip up the pictures into very small pieces and flush them down the toilet. Taking some sample shampoo bottles you got at the market the other day, you put them in the box and reseal it.'
 		'Taking the resealed package, you put it back on the cabinet before returning to the corridor.'

+ 3 - 3
locations/dimaHome.qsrc

@@ -122,14 +122,14 @@ if $ARGS[0] = 'study':
 	if ((hour >= 18 and week <= 5) or (hour >= 9 and week => 6)) and rand(0,1) = 0:
 		if met_DimkaDad = 0:
 			'You see Dimka''s father Leonid sitting behind a beautiful polished large wooden desk. He is well dressed and not bad looking, for an older guy. He seems to be working on something, you don''t think he has noticed you yet.'
-			if hotcat > 6:
+			if pcs_hotcat > 6:
 				gt 'dimaHome', 'study1'
 			else
 				gt 'dimaHome', 'study2'
 			end
 		elseif met_DimkaDad = 1:
 			'You see Dimka''s father Leonid sitting behind a beautiful polished large wooden desk. He is well dressed and not bad looking, for an older guy. He seems to be working on something, you don''t think he has noticed you yet.'
-			if hotcat > 6:
+			if pcs_hotcat > 6:
 				gt 'dimaHome', 'study3'
 			else
 				gt 'dimaHome', 'study4'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'dimka_chat':
 			*clr & cla
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
-			if hotcat > 6:
+			if pcs_hotcat > 6:
 				'You decide to ask him about his dad after having meet him. "I think your dad was coming on to me."'
 				'He gives you a dark, hate-filled look for a moment but then shrugs a bit. You get the sense that the look wasn''t directed at you. "I am sure he was just messing with you." His tone indicates this area of conversation is over.'
 			else

+ 6 - 6
locations/dimaRevenge.qsrc

@@ -2,7 +2,7 @@
 !2021/05/08
 
 menu_off = 1
-!!needs fighting added to certain areas 
+!!needs fighting added to certain areas
 !! dimaRevChoice = stores the option selected from bathroom scene.
 !! ARGS[0] - day
 !! $ARGS[1] - time of day i.e. morning
@@ -576,12 +576,12 @@ if dimaRevChoice = 2:
 		$dimaRevenge['Fedor Involved'] = ' and Fedor '
 	else
 		$dimaRevenge['Fedor Involved'] = ' '
-	end	
+	end
 	if fedorKozlovQW >= 0:
 		$dimaRevenge['Fedor Involved 2'] = 'Fedor'
 	else
 		$dimaRevenge['Fedor Involved 2'] = 'Svyatoslav'
-	end	
+	end
 	if ARGS[0] = 4:
 		if $ARGS[1] = 'day4jockbefore':
 			!!fourth day before class!!
@@ -885,7 +885,7 @@ if dimaRevChoice = 4:
 			end
 		end
 	end
-	
+
 	if ARGS[0] = 6:
 		if dimaDisco = 1:
 			dimaRevenge += 1
@@ -907,7 +907,7 @@ if dimaRevChoice = 4:
 				'Alyona is sitting by twenty bottles of Zhiguljovskoje, guarding them from anyone who tries to take one. You can''t believe she bought all that just for herself, the other half of them seem to have been handed out. As you think that, Alyona sees you staring at her and offers you a bottle which you gladly accept.'
 				*nl
 				'"Aww, Alyona has a girlfriend," Vasily snickers. He is already drunk. You know that when Vasily is wasted he usually ends up unconscious either from passing out or fom his mouth getting him into trouble. Radomir''s band finishes their song and grab some beers. Anushka comes over to you and Alyona. Alyona offers her a bottle as well. Anushka accepts it from her with one hand and grabs Alyona''s head with the other and brings her into a deep kiss, causing the boys in the room to cheer. Alyona is unable to resist her and melts into her arms. Anushka eyes you while she kisses Alyona as if inviting you to join.'
-				if hotcat >= 6:
+				if pcs_hotcat >= 6:
 					act 'Join in':
 						*clr & cla
 						npc_rel['A143'] += 5
@@ -1208,7 +1208,7 @@ if dimaRevChoice = 6:
 								act 'Do a strip tease':
 									*clr & cla
 									minut += 15
-!!if high erotic dancing skill!! this was never coded 
+!!if high erotic dancing skill!! this was never coded
 									'<center><b><font color="maroon">Home</font></b></center>'
 									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/striptease1.mp4"></video></center>'
 									'You decide to give him a show as you sway your hips back and forth making sure to give him a good view of yor backside like you know he likes. His member stands at attention in no time at all. He can''t resist your ass. As you get into it you shed your outer clothes and continue to gyrate your hips to his enjoyment. You remove your bra in a quick graceful move and take off your panties and flick them at his face. When he picks them off his face you are already on the bed in front of him giving him the best view yet.'

+ 2 - 8
locations/divan.qsrc

@@ -34,8 +34,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/shared/home/divan.jpg"></center>'
 	'You lie down on the sofa.'
 
-	act 'wait':gs 'obj_din', 'wait'
-
 	if mc_inventory['tech_tv'] >= 1 or mc_inventory['plasma_tv'] >= 1 and $loc ! 'dachain':
 		act 'Watch TV':
 			cla
@@ -43,16 +41,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-	gs 'events', 'read'
+	gs 'library_functions', 'set_home_read_acts'
 
 	if pcs_horny >= 75:
 		act 'Masturbate (0:15)':dynamic $divmastr
 	end
 
-	act 'Get off the couch':
-		cla
-		gt 'divan', 'fin'
-	end
+	act 'Get off the couch': gt 'divan', 'fin'
 end
 
 if $ARGS[0] = 'fin':
@@ -61,4 +56,3 @@ if $ARGS[0] = 'fin':
 end
 
 --- divan ---------------------------------
-

+ 4 - 4
locations/djibril.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'djibril_playgames':
 	minut += 60
 	npc_rel['A82'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-	'You walk over and take a seat on the couch before picking up one of the controllers. "Sure, let''s play." He grins and turns the PlayStation on before joining you on the couch and grabbing the other controller.' 
+	'You walk over and take a seat on the couch before picking up one of the controllers. "Sure, let''s play." He grins and turns the PlayStation on before joining you on the couch and grabbing the other controller.'
 	'It''s a game about football that you''ve played it before, but not too often. He''s a much better player than you, but you don''t mind as the two of you laugh and talk as you play. After an hour, he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
 	'You nod and put the controller down before gathering up your stuff. "Sure, I''d like that. Well, have fun studying." He laughs before escorting you to the door.'
 	act 'Leave': gt 'uni_dorm', 'eighth_floor'
@@ -175,7 +175,7 @@ if $ARGS[0] = 'djibril_chat':
 		gs 'npc_relationship', 'modify', 'A82', 'like'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
-		if npc_sex['A82'] = 0 and hotcat >= 5 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
+		if npc_sex['A82'] = 0 and pcs_hotcat >= 5 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 			DjibrilQW['seduce'] = daystart
 			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it is a pleasant conversation. He eventually gets up and pulls you up with him before he starts kissing you.'
 			act 'Return the kiss':
@@ -272,7 +272,7 @@ if $ARGS[0] = 'djibril_chat':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		'"Tell me about your uncle," you say.'
-		'He talks about how he met Luda and went with her back to Russia. He also talks about how Olu was always about taking risks and was never willing to settle with what he had, always wanting more out of life. He mentions how his uncle inspired him to come and study here and how he''s glad he did.' 
+		'He talks about how he met Luda and went with her back to Russia. He also talks about how Olu was always about taking risks and was never willing to settle with what he had, always wanting more out of life. He mentions how his uncle inspired him to come and study here and how he''s glad he did.'
 		'He goes on to tell a few funny stories about Olu when he was younger and Djibril was still just a boy.'
 		act 'Keep talking': gt 'djibril', 'djibril_chat'
 		act 'Stop talking and leave': gt 'uni_dorm', 'eighth_floor'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'djibril_chat':
 		*clr & cla
 		npc_rel['A82'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/couch_kiss.jpg"></center>'
-		if hotcat >= 5:
+		if pcs_hotcat >= 5:
 			'As the two of you sit side by side, you lean over and kiss him. He stiffens in surprise at first, but quickly returns the kiss as he puts a hand around your back and pulls you in tighter. After a few seconds, he starts encouraging you to slide off the couch.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'

+ 39 - 39
locations/djibrilev1.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'djibrilgb':
 			'The guys on either side of you move closer as you sense the lust from them from the way they act, the tone of their voice, how they look at you, and how their hands constantly graze your legs and brush against you body. Djibril then gets up and walks over. He stands in front of you and offers you his hand. "Stand up."'
 		else
 			'The guys on either side of you move closer and their hands begin to paw at you, squeezing your thigh, brushing your hair back or running a finger across your cheek. One of them even cups your breast and gives it a squeeze. Djibril then gets up and walks over. He stands in front of you and offers you his hand. "Stand up." You remember from last time where this leads.'
-		end	
+		end
 		act 'Stand up':
 			*clr & cla
 			minut += 2
@@ -57,7 +57,7 @@ if $ARGS[0] = 'djibrilgb':
 				'You take his hand and he pulls you up. "You''re very pretty, like all Russian girls. Now you will you make us feel good, like the other Russian girls do." As he states that, you feel one of his hands on top of your head. He pushes down on your head and you end up sinking to your knees, noticing that they have all stood up and surrounded you with their dicks out. "Go on, grab it. You know you want to." one of them says.'
 			else
 				'You take his hand and he pulls you up. "You ready to make us all feel good again?" he asks and you quickly get down on your knees as they all surround you with their dicks out. "Come on, slut. What are you waiting for? Start stroking our cocks."'
-			end	
+			end
 			gs 'willpower', 'gangbang', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Change your mind and leave (<<will_cost>> Willpower)':
@@ -71,7 +71,7 @@ if $ARGS[0] = 'djibrilgb':
 						'You shake your head and quickly stand up before pushing out from between them. "Sorry, I can''t do this," you say as you rush for the door. You can hear them grumbling, but none of them try and stop you as you leave.'
 					else
 						'You shake your head and quickly stand up before pushing out from between them. "Sorry, I can''t do this. Maybe some other time..." you mumble as you hurriedly head for the door. You hear Djibril speak up. "Come on, you can''t leave us like this!" You mutter another apology and can hear the rest grumbling, but none of them try and stop you as you leave.'
-					end	
+					end
 					act 'Leave': gt 'uni_dorm', 'eighth_floor'
 				end
 			else
@@ -190,7 +190,7 @@ if $ARGS[0] = 'djibrilgb':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'gangbang_anal':
 	menu_off = 1
 	*clr & cla
@@ -222,7 +222,7 @@ if $ARGS[0] = 'gangbang_cum':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbangcum.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbangcum.jpg"></center>'
 	'While kneeling in the middle of them, you jerk two of them off at a time, switching cocks every few seconds. Soon, one of them reaches climax and his cum starts splattering across your face and into your mouth. The rest soon start cumming as well; most of it ends up covering your face and neck while some ends up in your mouth, which you quickly swallow.'
 	gs 'arousal', 'hj', 5, 'gangbang', 'sub'
 	gs 'arousal', 'hj', -5, 'gangbang', 'sub'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'gangbang_dress':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang_leave.jpg"></center>'
 			'With your face cleaned up, you take a final look around to make sure you didn''t leave anything behind as you think about what just happened. You can''t help but smile about it as you head out the door and make your way out of the dorm.'
-		end	
+		end
 		act 'Leave': gt 'uni_dorm', 'eighth_floor'
 	end
 end
@@ -290,7 +290,7 @@ if $ARGS[0] = 'sveta_sex1':
 		'You open your mouth as wide as you can and take his huge cock into your mouth before you start bobbing your head back and forth, sucking his dick and taking it as deep as you can into your mouth. He lets out a soft moan of pleasure and you feel yourself starting to get wet.'
 		gs 'arousal', 'bj', 5
 		gs 'stat'
-		act 'Tell him to fuck you': 
+		act 'Tell him to fuck you':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_bj2.jpg"></center>'
@@ -354,14 +354,14 @@ if $ARGS[0] = 'sveta_sex1_bj_cum':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'sveta_sex1_anal':
 	menu_off = 1
 	*clr & cla
 	npc_sex['A82'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_undress.jpg"></center>'
-	'You nod at him with a smile. "Okay, you can fuck my ass if you want." You start to strip, and he helps you undress. Once you''re fully naked, he bends you over his couch before walking over to his nightstand and pulling out a bottle of lube. He lubes up his massive dick as he walks back over before you feel him squirt some lube onto your asshole.' 
+	'You nod at him with a smile. "Okay, you can fuck my ass if you want." You start to strip, and he helps you undress. Once you''re fully naked, he bends you over his couch before walking over to his nightstand and pulling out a bottle of lube. He lubes up his massive dick as he walks back over before you feel him squirt some lube onto your asshole.'
 	'He uses his fingers to work it into your ass and loosen you up a little before he tosses the bottle aside and scoots up behind you. You feel the large head of his cock pressing against your asshole.'
 	gs 'arousal', 'foreplay', 2
 	gs 'stat'
@@ -444,7 +444,7 @@ if $ARGS[0] = 'djibril_sveta_anya1':
 		'You wrap your lips around his dick and start bobbing your head up and down, sucking him off while he fondles your sister and she keeps kissing him. After a few minutes, you slide off the couch onto your knees to make it easier to give him a blowjob. You glance up to see they''ve stopped kissing and Anya is watching you suck his dick.'
 		gs 'arousal', 'bj', 5, 'group'
 		gs 'stat'
-		act 'Share his dick': 
+		act 'Share his dick':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/djibril_anya3.jpg"></center>'
@@ -474,7 +474,7 @@ if $ARGS[0] = 'djibril_sveta_anya1':
 						gs 'arousal', 'vaginal_finger_give', 5, 'group', 'lesbian'
 						gs 'arousal', 'vaginal', -5, 'group'
 						gs 'stat'
-						act 'Eat her out': 
+						act 'Eat her out':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/djibril_anya7.jpg"></center>'
@@ -509,12 +509,12 @@ if $ARGS[0] = 'djibril_sveta_anya1':
 											gs 'boyStat', 'A82'
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/djibril_anya11.jpg"></center>'
-											'A few minutes go by before Djibirl grabs you and lifts you up before throwing you on the couch on your back. He grabs a bottle of lube out of his end table and pulls your legs apart before lubing up your asshole.' 
+											'A few minutes go by before Djibirl grabs you and lifts you up before throwing you on the couch on your back. He grabs a bottle of lube out of his end table and pulls your legs apart before lubing up your asshole.'
 											'Once he''s worked the lube in, he moves up between your legs and slides his slick <<dick>>cm <<$dick_girth>> cock into your asshole. You cry out in a mix of pain and pleasure as he stretches you out. Anya kneels beside the couch and starts rubbing your clit and fingering your pussy as he fucks your ass.'
 											gs 'arousal', 'anal', 5, 'group'
 											gs 'arousal', 'vaginal_finger', 5, 'group', 'lesbian'
 											gs 'stat'
-											act 'Hard anal': 
+											act 'Hard anal':
 												*clr & cla
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/djibril_anya12.jpg"></center>'
@@ -559,7 +559,7 @@ if $ARGS[0] = 'djibril_sveta_anya_gangbang1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/anya_gangbang1.jpg"></center>'
 	'You grin at her before looking at Djibril. "Okay, call your friends."'
-	'He grins wide and pulls out his phone to send some texts. A few minutes later, he stops and looks up at you. "A few of them are on their way over. They should be here any minu..." He doesn''t finish his sentence before there''s a knock at the door. He gets up and opens it to let in a trio of other African men.' 
+	'He grins wide and pulls out his phone to send some texts. A few minutes later, he stops and looks up at you. "A few of them are on their way over. They should be here any minu..." He doesn''t finish his sentence before there''s a knock at the door. He gets up and opens it to let in a trio of other African men.'
 	'They''re looking at you and Anya with lustful hunger in their eyes as Djibirl introduces you to them. You''ve met one of them before, but the other two are new to you. "This is <<$pcs_nickname>> and her sister Anya."'
 	*nl
 	'The three of them crowd around you and Anya. "So this is the girl you told us about?" one of them asks and the one you know nods. They laugh and say something in a language you don''t understand.'
@@ -576,7 +576,7 @@ if $ARGS[0] = 'djibril_sveta_anya_gangbang1':
 		gs 'arousal', 'bj', 5, 'gangbang'
 		gs 'arousal', 'hj', -5, 'gangbang'
 		gs 'stat'
-		act 'Suck some more cock': 
+		act 'Suck some more cock':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/anya_gangbang3.jpg"></center>'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'djibril_sveta_anya_gangbang1':
 						'After several minutes, they place you on the ground again. Your legs feel weak, but you manage to sit on one of the beds. Perhaps because of this, all four gather around Anya and all four of them take turns fucking her holes. You think she''s enjoying it, but it''s hard to tell with her mouth being full of cock.'
 						gs 'arousal', 'voyeur_sex', 5, 'gangbang'
 						gs 'stat'
-						act 'Facial': 
+						act 'Facial':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anya/anya_gangbang7.jpg"></center>'
@@ -668,11 +668,11 @@ if $ARGS[0] = 'djibril_nush':
 	if DjibrilQW['nush_inv'] = 2:
 		'After a brief pause, you add "Or if you want, he can call over some of his friends and share us with them. Or him and his friends could fuck you until you can''t walk. What do you think?" you ask as you glance at Djibril, who seems happy with any of the options.'
 	end
-	if hotcat >= 6 and DjibrilQW['nush_inv'] = 2:
+	if pcs_hotcat >= 6 and DjibrilQW['nush_inv'] = 2:
 		temp = rand(1,8)
 		if temp = 1:
 			'She looks him over lustfully, then glances at you. "I want all the dick to myself. Is that okay with you?" she asks.'
-			'You can''t help but feel a little disappointed, but you nod in response. "Sure, of course."' 
+			'You can''t help but feel a little disappointed, but you nod in response. "Sure, of course."'
 			'She grins at Djibirl. "I want all the dicks. Call your friends," she says as she pats his thigh.'
 			act 'Stay and watch':gt 'djibrilev1', 'djibril_nush_gangbang1'
 			act 'Excuse yourself':
@@ -680,7 +680,7 @@ if $ARGS[0] = 'djibril_nush':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You stand up. "I''ll leave you guys to it then."'
-				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
@@ -697,7 +697,7 @@ if $ARGS[0] = 'djibril_nush':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You stand up. "I''ll leave you guys to it then."'
-				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
@@ -706,7 +706,7 @@ if $ARGS[0] = 'djibril_nush':
 			'You nod and Djibril pours each of you a glass of wine.'
 			act 'Just the three of you':gt 'djibrilev1', 'djibril_sveta_nush1'
 		end
-	elseif hotcat >= 6 and DjibrilQW['nush_inv'] = 1:
+	elseif pcs_hotcat >= 6 and DjibrilQW['nush_inv'] = 1:
 		if rand(1,3) = 1:
 			'You glance at Djibril, who seems happy with any of the options.'
 			'She looks him over lustfully before glancing at you. "I want him all to myself. Is that okay with you?" she asks.'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'djibril_nush':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You stand up. "I''ll leave you guys to it then."'
-				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
@@ -726,10 +726,10 @@ if $ARGS[0] = 'djibril_nush':
 			'You nod and Djibril pours each of you a glass of wine.'
 			act 'Just the three of you':gt 'djibrilev1', 'djibril_sveta_nush1'
 		end
-	elseif hotcat <= 5 and DjibrilQW['nush_inv'] = 2:
+	elseif pcs_hotcat <= 5 and DjibrilQW['nush_inv'] = 2:
 		if rand(1,4) = 1:
 			'She looks him over lustfully, then glances at you. "I want all the dick to myself. Is that okay with you?" she asks.'
-			'You can''t help but feel a little disappointed, but you nod in response. "Sure, of course."' 
+			'You can''t help but feel a little disappointed, but you nod in response. "Sure, of course."'
 			'She grins at Djibirl. "I want all the dicks. Call your friends," she says as she pats his thigh.'
 			act 'Stay and watch':gt 'djibrilev1', 'djibril_nush_gangbang1'
 			act 'Excuse yourself':
@@ -737,7 +737,7 @@ if $ARGS[0] = 'djibril_nush':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You stand up. "I''ll leave you guys to it then."'
-				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
@@ -751,7 +751,7 @@ if $ARGS[0] = 'djibril_nush':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You stand up. "I''ll leave you guys to it then."'
-				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
@@ -766,7 +766,7 @@ if $ARGS[0] = 'djibril_nush':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 			'You stand up. "I''ll leave you guys to it then."'
-			'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
+			'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."'
 			'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 			act 'Leave': gt 'uni_dorm', 'eighth_floor'
 		end
@@ -780,7 +780,7 @@ if $ARGS[0] = 'djibril_sveta_nush1':
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some2.jpg"></center>'
 	'As you sit and chat while drinking a glass of wine, Djibril gets a little bold and points at his crotch. "So which one of you beautiful girls is going to suck my dick?"'
 	'Anushka glances at you and giggles, obviously finding his antics amusing instead of crude. You glance at him and can''t help but grin. "Pull out your dick first! We can''t suck it in your pants," you point out to him and he grins and wastes no time unbuttoning his pants and pulling out his semi hard cock.'
-	act 'Push her head to his lap': 
+	act 'Push her head to his lap':
 		*clr & cla
 		gs 'fame', 'city', 'sex', 1
 		gs 'stat'
@@ -819,7 +819,7 @@ if $ARGS[0] = 'djibril_sveta_nush1':
 					'Djibril encourages Anushka to stand up and bend over so she can keep sucking his dick as you kneel on the couch next to her and push her dress up over her hips and pull her panties aside. You lean over and start licking her slit, her pussy already soaking wet as you work your tongue inside her. You can hear her moaning around his dick as you do. After a few minutes, Djibirl has you stop. "Get on the couch, spread your legs and show me that pretty pussy of yours."'
 					gs 'arousal', 'cuni_give', 3, 'group', 'lesbian', 'sub'
 					gs 'stat'
-					act 'Get eaten out': 
+					act 'Get eaten out':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some7.jpg"></center>'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'djibril_sveta_nush1':
 									'You feel the tip of his dick sliding against your wet clit before he pushes his <<dick>>cm <<$dick_girth>> cock inside you. He starts off slowly fucking you, letting you get used to his size, but as you moan more loudly, he starts fucking you a little faster. Just as it''s really starting to feel good, he suddenly pulls out of you.'
 									gs 'arousal', 'vaginal', 3, 'group'
 									gs 'stat'
-									act 'Nush''s turn': 
+									act 'Nush''s turn':
 										*clr & cla
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some11.jpg"></center>'
@@ -887,7 +887,7 @@ if $ARGS[0] = 'djibril_sveta_nush1':
 													gs 'arousal', 'anal', 3, 'group', 'lube', 'rough'
 													gs 'arousal', 'foreplay', -3, 'group'
 													gs 'stat'
-													act 'He''s cumming': 
+													act 'He''s cumming':
 														*clr & cla
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some15.jpg"></center>'
@@ -951,7 +951,7 @@ if $ARGS[0] = 'djibril_nush1':
 		'She turns as he pushes her down and gets on her knees in front of him. She starts sucking his dick while using her hands to pull his pants and underwear off. He places his hand on the back of her head and starts forcing her to deepthroat him. You can hear her gagging, but she doesn''t seem to be struggling or resisting.'
 		gs 'arousal', 'voyeur_sex', 5, 'rough'
 		gs 'stat'
-		act 'Watch Anushka get fucked': 
+		act 'Watch Anushka get fucked':
 			*clr & cla
 			gs 'boyStat', 'A82'
 			gs 'stat'
@@ -997,7 +997,7 @@ if $ARGS[0] = 'djibril_nush1':
 						'He glances over at you. "She asked you to fuck her. Now pound that little asshole hard and deep until your balls are bouncing off her pussy!" you tell him.'
 						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
-						act 'Anal pounding': 
+						act 'Anal pounding':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_djibril7.jpg"></center>'
@@ -1016,7 +1016,7 @@ if $ARGS[0] = 'djibril_nush1':
 								'He laughs a bit. "Works for me, I love fucking you hard and rough."'
 								'Once her face is clean, she starts getting dressed and lets out a small sigh. "My ass is going to be sore tomorrow though." She glances at you and winks. "But it was totally worth it."'
 								*nl
-								'Once she''s fully dressed, she smiles at the two of you. "Thanks for the fun, but I should get going. See you later, <<$pcs_nickname>>."' 
+								'Once she''s fully dressed, she smiles at the two of you. "Thanks for the fun, but I should get going. See you later, <<$pcs_nickname>>."'
 								'She walks out the door as Djibril glances over at you. "I don''t want to be rude, but I''ve got some homework I need to do."'
 								'You get up and nod. "It''s okay, I should get going too," you tell him and head for the door.'
 								gs 'arousal', 'voyeur_sex', 5
@@ -1051,7 +1051,7 @@ if $ARGS[0] = 'djibril_sveta_nush_gangbang1':
 		gs 'arousal', 'bj', 3, 'gangbang'
 		gs 'arousal', 'hj', -3, 'gangbang'
 		gs 'stat'
-		act 'Suck more dicks': 
+		act 'Suck more dicks':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_sveta_gangbang3.jpg"></center>'
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'djibril_sveta_nush_gangbang1':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_sveta_gangbang5.jpg"></center>'
-					'The one fucking Anushka in the ass turns towards you and tells his friend to swap. You''re lifted off the dick in your ass, as is Anushka. The one under her scoots over under you and you''re lowered back down, his dick sliding into your asshole. One of the other guys slides under Anushka as she''s lowered down, his dick sliding up her ass as another one sticks his dick in her pussy. The one that was fucking her pussy moves around behind the couch and sticks his dick in her mouth. After a few minutes, one of the guys speaks up. "Come on, I want to fuck one of them in the ass."' 
+					'The one fucking Anushka in the ass turns towards you and tells his friend to swap. You''re lifted off the dick in your ass, as is Anushka. The one under her scoots over under you and you''re lowered back down, his dick sliding into your asshole. One of the other guys slides under Anushka as she''s lowered down, his dick sliding up her ass as another one sticks his dick in her pussy. The one that was fucking her pussy moves around behind the couch and sticks his dick in her mouth. After a few minutes, one of the guys speaks up. "Come on, I want to fuck one of them in the ass."'
 					'Another one chimes in. "Let''s pull a train on their asses." There are murmurs of agreement and they seem to like that idea.'
 					gs 'arousal', 'anal', 3, 'gangbang'
 					gs 'arousal', 'clit_finger', -3, 'gangbang'
@@ -1087,7 +1087,7 @@ if $ARGS[0] = 'djibril_sveta_nush_gangbang1':
 						gs 'arousal', 'anal', 3, 'gangbang'
 						gs 'arousal', 'anal', 3, 'gangbang'
 						gs 'stat'
-						act 'Anal train': 
+						act 'Anal train':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_sveta_gangbang7.jpg"></center>'
@@ -1155,7 +1155,7 @@ if $ARGS[0] = 'djibril_nush_gangbang1':
 		'Lebogang stands up and pulls her up into a kiss as Djibril stands up as well. After a few seconds, he grabs her waist and pulls her over to him to start kissing her as Lebogang crowds up behind her. Ermias keeps watching, but you notice the growing bulge in his pants. You can''t really blame him; you can feel yourself getting wet watching this.'
 		gs 'arousal', 'voyeur', 2, 'gangbang'
 		gs 'stat'
-		act 'She loves it rough': 
+		act 'She loves it rough':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_gangbang3.jpg"></center>'
@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'djibril_nush_gangbang1':
 						'Ermias sits down on the couch. "Bring her over, I want to fuck her." Lebogang and Djibril pull her up by her hands and carry her to the couch, placing her in Ermias'' lap. As they lower her down, Ermias lines his <<dick>>cm <<$dick_girth>> dick up so it slides into her pussy. She moans loudly for a moment, but then Djibril shoves his monster dick back in her mouth as Lebogang grabs one of her hands and pulls it up to his dick, which she starts stroking.'
 						gs 'arousal', 'voyeur_sex', 5, 'gangbang'
 						gs 'stat'
-						act 'They take turns': 
+						act 'They take turns':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_gangbang7.jpg"></center>'

+ 0 - 205
locations/enderKik.qsrc

@@ -1,205 +0,0 @@
-# enderKik
-if pcs_health < 10:pcs_health = 10
-killvar'damage'
-
-if profi = 1:
-	profi = 0
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_speaker.jpg"></center>'
-	'The referee calls you over. It''s time for the announcement...'
-
-	act 'Go to the middle for the announcement':
-		if $ARGS[0] = 'win':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win.jpg"></center>'
-			'The referee raises your arm. Congratulations! You''ve won!'
-			KikWinPro += 1
-			rikudo += 5
-		end
-
-		if $ARGS[0] = 'winKO':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win_ko.jpg"></center>'
-			'The referee raises your arm. Congratulations! You''ve won by knockout!'
-
-			KikWinPro += 1
-			KikWinProKO += 1
-			rikudo += 10
-		end
-
-		if $ARGS[0] = 'loss':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss.jpg"></center>'
-			'The referee raises your opponent''s arm. You''ve lost.'
-			KikLossPro += 1
-		end
-
-		if $ARGS[0] = 'lossKO':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss_ko.jpg"></center>'
-			'All of a sudden, the room starts getting darker and darker...'
-			KikLossPro += 1
-			KikLossProKO += 1
-		end
-
-		if $ARGS[0] = 'draw':
-			cla
-			*clr
-			'The referee raises both of your arms. It''s a draw!'
-			KikDrawPro += 1
-		end
-
-	! WD: Argument is 'dressing room'
-	act 'Leave the ring':gt 'fit', 'dressing_room'
-	end
-
-
-
-elseif kickbox['amateur'] = 1:
-	kickbox['amateur'] = 0
-
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_speaker.jpg"></center>'
-	'The referee calls you over. It''s time for the announcement...'
-
-	act 'Goto the center of the ring for the announcement':
-		if $ARGS[0] = 'win':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win.jpg"></center>'
-			'The referee raises your arm. Congratulations! You''ve won!'
-
-			if kickbox['opponent'] = 0: 
-				gs 'fame', 'city', 'kickboxing', rand(4,6)
-			elseif kickbox['opponent'] = 1: 
-				gs 'fame', 'city', 'kickboxing', rand(5,9)
-			elseif kickbox['opponent'] = 2:
-				gs 'fame', 'city', 'kickboxing', rand(6,9)
-			elseif kickbox['opponent'] = 3: 
-				gs 'fame', 'city', 'kickboxing', rand(6,10)
-			elseif kickbox['opponent'] = 4: 
-				gs 'fame', 'city', 'kickboxing', rand(7,10)
-			else 
-				gs 'fame', 'city', 'kickboxing', rand(7,13)
-			end	
-			kickbox['amateurWin'] += 1
-			kickbox['amateur'] = 0
-			kickbox['advancement'] += 1
-			money += 500 + kickbox['money']
-			rikudo += 5
-			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
-			gs 'razrKik'
-		end
-
-		if $ARGS[0] = 'winKO':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win_ko.jpg"></center>'
-			'The referee raises your arm. Congratulations! You''ve won by knockout!'
-
-			gs 'fame', 'city', 'kickboxing', rand(4,6)
-			if kickbox['opponent'] = 0: 
-				gs 'fame', 'city', 'kickboxing', rand(4,6)
-			elseif kickbox['opponent'] = 1: 
-				gs 'fame', 'city', 'kickboxing', rand(5,9)
-			elseif kickbox['opponent'] = 2:
-				gs 'fame', 'city', 'kickboxing', rand(6,9)
-			elseif kickbox['opponent'] = 3: 
-				gs 'fame', 'city', 'kickboxing', rand(6,10)
-			elseif kickbox['opponent'] = 4: 
-				gs 'fame', 'city', 'kickboxing', rand(7,10)
-			else 
-				gs 'fame', 'city', 'kickboxing', rand(7,13)
-			end
-			kickbox['amateurWin'] += 1
-			kickbox['amateurWinKO'] += 1
-			kickbox['advancement'] += 1
-			kickbox['amateur'] = 0
-			money += 500 + kickbox['money']
-			rikudo += 10
-			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
-			gs 'razrKik'
-		end
-
-		if $ARGS[0] = 'loss':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss.jpg"></center>'
-			'The referee raises your opponent''s arm. You''ve lost.'
-			kickbox['amateurLoss'] += 1
-			if kickbox['advancement'] > 0:kickbox['advancement'] -= 1
-		end
-
-		if $ARGS[0] = 'lossKO':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss_ko.jpg"></center>'
-			'All of a sudden, the room starts getting darker and darker...'
-			kickbox['amateurLoss'] += 1
-			kickbox['amateurLossKO'] += 1
-			if kickbox['advancement'] > 0:kickbox['advancement'] -= 1
-		end
-
-		if $ARGS[0] = 'draw':
-			cla
-			*clr
-			'The referee raises both of your arms. It''s a draw!'
-			kickbox['amateurDraw'] += 1
-		end
-
-		! WD: Argument is 'dressing_room'
-		act 'Leave the ring':gt 'fit', 'dressing_room'
-	end
-
-
-elseif sparing = 1:
-	sparing = 0
-
-	if $ARGS[0] = 'win':
-		cla
-		*clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_rival.jpg"></center>'
-		'The fight is over and your rival comes over to you and says "Nice hustle in the ring."'
-		'You nod and she turns around and heads to the dressing room.'
-	end
-
-	if $ARGS[0] = 'winKO':
-		cla
-		*clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win_ko.jpg"></center>'
-		'The fight is over. You can hear some of the people quietly comment that you didn''t have to knock her out...'
-	end
-
-	if $ARGS[0] = 'loss':
-		cla
-		*clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_rival.jpg"></center>'
-		'The fight is over and your rival comes over to you and smugly says "Keep practicing."'
-		'You nod and she turns around and heads to the dressing room.'
-	end
-
-	if $ARGS[0] = 'lossKO':
-		cla
-		*clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss_ko.jpg"></center>'
-		'Before you know it, you''re laying on the floor and the room starts getting darker and darker...'
-	end
-
-	if $ARGS[0] = 'draw':
-		cla
-		*clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_rival.jpg"></center>'
-		'The fight is over and your rival comes over to you and says "That was pretty close, good fight."'
-		'You nod and she turns around and heads to the dressing room.'
-	end
-
-	! WD: Argument is 'dressing_room'
-	act 'Leave the ring':gt 'fit', 'dressing_room'
-
-end
-
-
---- enderKik ---------------------------------
-

+ 2 - 219
locations/events.qsrc

@@ -17,226 +17,9 @@ if $ARGS[0] = 'street_cum':
 	end
 end
 
-if $ARGS[0] = 'read':
-	act 'Read a book':
-		*clr & cla
-		gs 'stat'
-		if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-			'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_nude.jpg"></center>'
-		elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-			'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_underwear.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
-		end
-
-		if f_book <= 0 and fantasybook <= 0 and w_book = 0 and womanbook = 0 and artem_borrowed_book = 0 and artembook <= 0:'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
-
-		if f_book > 0:
-			if fantasybook <= 0:
-				if $lib_book_loaned = 'a fantasy novel' and lib_book_read = 0:
-					lib_book_read = 1
-				end
-				fantasybook = 5
-				f_book -= 1
-			end
-
-			'You still have <<f_book>> unread fantasy novels.'
-		end
-
-		if fantasybook > 0:
-			act 'Read fantasy book. There are <<fantasybook * 100>> pages left (1:00)':
-				*clr & cla
-				menu_off = 1
-				fantasybook -= 1
-				if fantasybook = 0:
-					totalbook += 1
-					if lib_book_read = 1 and $lib_book_loaned = 'a fantasy novel': lib_book_read = 2
-				end
-
-				gs 'library_functions', 'read_book'
-				gs 'stat'
-
-				if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_nude.jpg"></center>'
-				elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_underwear.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
-				end
-
-				if pcs_nerd > 0:
-					pcs_mood = 100
-
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
-					'For an hour you enthusiastically read the book, completely immersed in the authors world.'
-				else
-					pcs_mood += 10
-					'For an hour you read the book.'
-				end
-
-				act 'Close the book':gt $loc, $loc_arg
-			end
-		end
-
-		if w_book > 0:
-			if womanbook <= 0:womanbook = 5 & w_book -= 1
-
-			'You still have <<w_book>> unread women''s novels.'
-		end
-
-		if womanbook > 0:
-			act 'Read Women''s Novel. There are <<womanbook * 100>> pages left (1:00)':
-				*clr & cla
-				menu_off = 1
-				womanbook -= 1
-				if womanbook = 0: totalbook += 1
-
-				gs 'library_functions', 'read_book'
-				gs 'stat'
-
-				if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_nude.jpg"></center>'
-				elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_underwear.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
-				end
-
-				if pcs_nerd > 0:
-					pcs_mood = 100
-					pcs_horny += 10
-
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
-
-					'For an hour you enthusiastically read the book, completely immersed in the story.'
-				else
-					pcs_mood += 10
-					pcs_horny += 3
-					'For an hour you read the book.'
-				end
-
-				act 'Close the book':gt $loc, $loc_arg
-			end
-		end
-
-		if artembook > 0:
-			act 'Read the book your borrowed from Artem. There are <<artembook * 100>> pages left (1:00) ':
-				*clr & cla
-				menu_off = 1
-				artembook -= 1
-				if artembook = 0:totalbook += 1
-
-				gs 'library_functions', 'read_book'
-				gs 'stat'
-
-				if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_nude.jpg"></center>'
-				elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_underwear.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
-				end
+if $ARGS[0] = 'read': gs 'library_functions', 'set_home_read_acts'
+if $ARGS[0] = 'read_porn': gs 'library_functions', 'set_read_porn_act'
 
-				if pcs_nerd > 0:
-					pcs_mood = 100
-
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
-					'For an hour you enthusiastically read the book, completely immersed in the authors world.'
-				else
-					pcs_mood += 10
-					'For an hour you read the book.'
-				end
-
-				act 'Close the book':gt $loc, $loc_arg
-			end
-
-		end
-
-		if tractatus > 0:
-			act 'Study Aleksei''s magical discourse on unarmed combat. You feel that there are <<tractatus>> uses left (0:15) ':
-				if pcs_mana <= 400:
-					msg'	The text makes no sense! You don''t have enough mana to trigger it''s magic, so is better if you rest to recover.'&gt $loc, $loc_arg
-				end
-
-				*clr & cla
-				tractatus -= 1
-				if tractatus = 0:totalbook += 1
-				pcs_mood += 10
-				pcs_mana -= 400
-				gs 'exp_gain', 'def', rand(7,10)
-				gs 'exp_gain', 'jab', rand(7,10)
-				gs 'exp_gain', 'kick', rand(7,10)
-				gs 'exp_gain', 'punch', rand(7,10)
-				minut += 15
-				gs 'stat'
-				if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_nude.jpg"></center>'
-				elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_underwear.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
-				end
-
-				'As you read the strange text, the words blur and suddenly you are <i>inspired</i>. Your mind fill with new ideas and revelations, the defects in your combat form polished and the knows at how inflict the maximum level of pain at the minimal cost... sharpened.'
-
-				act 'Close the book':gt $loc, $loc_arg
-			end
-
-		end
-
-		act ' Close the book':gt $loc, $loc_arg
-	end
-
-	if mc_inventory['mag_cooking'] = 0 and mc_inventory['mag_fashion'] = 0 and mc_inventory['mag_computer'] = 0 and mc_inventory['mag_biography'] = 0 and mc_inventory['mag_knitting'] = 0 and mc_inventory['mag_fitness'] = 0:
-		'You have no magazines to read.'
-	else
-		act 'Read a magazine':
-			*clr & cla
-			gs 'stat'
-			if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-				'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_magazine_nude.jpg"></center>'
-			elseif $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype ! 'none':
-				'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_magazine_topless.jpg"></center>'
-			elseif $clothingworntype = 'nude' and $braworntype ! 'none' and $pantyworntype ! 'none':
-				'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_magazine_underwear.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_magazine_dressed.jpg"></center>'
-			end
-
-			gs 'library_functions', 'set_magazine_acts'
-
-			act 'Return': gt $loc, $loc_arg
-		end
-	end
-end
-
-if $ARGS[0] = 'read_porn':
-	act 'Read the porn magazine':
-		if blizoruk = 500 or glassqw = 1:
-			glassqw = 1
-			msg '	The text blurs across the page, it seems you have poor eyesight. Probably from all the porn. Maybe you should visit an ophthalmologist?'
-			gt $loc, $loc_arg
-		end
-		*clr & cla
-
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/magazines/porn.jpg"></center>'
-
-		if mc_inventory['mag_porn'] = 1:
-			'<font color="magenta">Boring</font>, you''ve memorized this magazine by heart, you think that is time to buy a new one.'
-		else
-			mc_inventory['mag_porn'] -= 1
-			pcs_horny += 10
-			minut += 5
-			gs 'stat'
-			'You flip through the porno magazine, reading the stories and looking at the pictures. A small excitement begins to cover your body.'
-		end
-
-		act 'Put away':gt $loc, $loc_arg
-	end
-end
 
 if $ARGS[0] = 'snkayf':
 	snkz = RAND(1,6)

+ 403 - 403
locations/father.qsrc

@@ -16,15 +16,15 @@ $location_type = 'event'
 $fatherRep = {
 *pl
 if npc_rel['A28'] < 20:
-    'You and your stepfather can''t stand each other, and spend as little time in the same room as possible.'
+	'You and your stepfather can''t stand each other, and spend as little time in the same room as possible.'
 elseif npc_rel['A28'] < 40:
-    'You and your stepfather don''t get along very well.'
+	'You and your stepfather don''t get along very well.'
 elseif npc_rel['A28'] < 60:
-    'You have a normal relationship with your stepfather.'
+	'You have a normal relationship with your stepfather.'
 elseif npc_rel['A28'] < 80:
-    'You have a good relationship with your stepfather.'
+	'You have a good relationship with your stepfather.'
 else
-    'You have a great relationship with your stepfather.'
+	'You have a great relationship with your stepfather.'
 end
 *pl
 }
@@ -41,114 +41,114 @@ end
 !--------------------------------father comments on appearance changes------------------------------------------------
 ! hair color
 if hcolfronce = 0:
-    hcolfatherremember = pcs_haircol
-    hcolfronce = 1
+	hcolfatherremember = pcs_haircol
+	hcolfronce = 1
 end
 if hcolfatherremember ! pcs_haircol:
 
-    if pcs_haircol = nathcol: 
-            $texthcol = 'Or, rather, un-dyed your hair. So you decided to go back to your natural color?'
-    elseif pcs_haircol = 0:
-        $texthcol = 'So you decided to go with black hair?'
-    elseif pcs_haircol = 1:
-        $texthcol = 'So you decided to become a brunette?'
-    elseif pcs_haircol = 2:
-        $texthcol = 'So you decided to become a brazen redhead?'
-    elseif pcs_haircol = 3:
-        $texthcol = 'So you decided to become a blonde?'
-    end
-    
-    'Your stepfather does a double take of you as he notices your hair. "Oh <<$pcs_nickname>>, I see you dyed your hair! <<$texthcol>>" It looks good on you. He takes one last look at your new hair and goes back to watching T.V.'
-    hcolfatherremember = pcs_haircol
+	if pcs_haircol = nathcol:
+			$texthcol = 'Or, rather, un-dyed your hair. So you decided to go back to your natural color?'
+	elseif pcs_haircol = 0:
+		$texthcol = 'So you decided to go with black hair?'
+	elseif pcs_haircol = 1:
+		$texthcol = 'So you decided to become a brunette?'
+	elseif pcs_haircol = 2:
+		$texthcol = 'So you decided to become a brazen redhead?'
+	elseif pcs_haircol = 3:
+		$texthcol = 'So you decided to become a blonde?'
+	end
+
+	'Your stepfather does a double take of you as he notices your hair. "Oh <<$pcs_nickname>>, I see you dyed your hair! <<$texthcol>>" It looks good on you. He takes one last look at your new hair and goes back to watching T.V.'
+	hcolfatherremember = pcs_haircol
 end
 
 ! tongue piercing
 if pirsA > 0 and pirsA < 10000 and pirsAfather = 0 and pirsadaytalk ! daystart:
-    pirseerand = rand(1,100)
-    pirsadaytalk = daystart
-    if pirseerand >= 75:
-        'Your stepfather looks at your mouth with a curious look as you greet him. "<<$pcs_nickname>>, do you have something shiny in your mouth?"'
-        act'"No"':
-            cla
-            'You shake your head: "Umm, no! No I don''t!"'
-            'You quickly turn away before he can get a good look at your tongue piercing.'
-            act 'Move away':gt $loc, $loc_arg
-        end
-        
-        act'"Yes, would you like to see it?"':
-            *clr & cla
-            pirsAfather = 1
-            gs'stat'
-            '<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg" ></center>'
-            'You open your mouth and stick out your tongue and wiggle it at him showing him your piercing.'
-            if TouchedByFather = 0:'Your stepfather shakes his head: "<<$pcs_nickname>>, tongue piercings are only for lewd women who use their mouth to please men."'
-            if TouchedByFather > 0:'Your stepfather grins: "Nice, I bet you could make someone feel really good with that..."'
-            act 'Move away':gt $loc, $loc_arg
-        end
-        exit
-    end
+	pirseerand = rand(1,100)
+	pirsadaytalk = daystart
+	if pirseerand >= 75:
+		'Your stepfather looks at your mouth with a curious look as you greet him. "<<$pcs_nickname>>, do you have something shiny in your mouth?"'
+		act'"No"':
+			cla
+			'You shake your head: "Umm, no! No I don''t!"'
+			'You quickly turn away before he can get a good look at your tongue piercing.'
+			act 'Move away':gt $loc, $loc_arg
+		end
+
+		act'"Yes, would you like to see it?"':
+			*clr & cla
+			pirsAfather = 1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg" ></center>'
+			'You open your mouth and stick out your tongue and wiggle it at him showing him your piercing.'
+			if TouchedByFather = 0:'Your stepfather shakes his head: "<<$pcs_nickname>>, tongue piercings are only for lewd women who use their mouth to please men."'
+			if TouchedByFather > 0:'Your stepfather grins: "Nice, I bet you could make someone feel really good with that..."'
+			act 'Move away':gt $loc, $loc_arg
+		end
+		exit
+	end
 end
 
 ! lip piercing
 if pirsB > 0 and pirsB < 10000 and pirsBfather = 0 and pirsbdaytalk ! daystart:
-    pirsadbytalk = daystart
-    'Your stepfather takes a long look at your mouth, specifically at your new piercing. He seems confused and asks: "Why did you get that?"'
-    act '"Don''t you like it? I thought it looked kind of cute."':
-        *clr & cla
-        pirsBfather = 1
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg" ></center>'
-        'You shrug. "I don''t know... I just like the way lip rings look, so I got one. Don''t you think it looks cute?"'
-        if TouchedByFather = 0:'Your stepfather shakes his head: "Kids these days, always adding new holes to themselves..."'
-
-        if TouchedByFather > 0:'Your stepfather grins: "I must admit, it does look sexy on you."'
-        act 'Move away':gt 'father'
-    end
-    exit
+	pirsadbytalk = daystart
+	'Your stepfather takes a long look at your mouth, specifically at your new piercing. He seems confused and asks: "Why did you get that?"'
+	act '"Don''t you like it? I thought it looked kind of cute."':
+		*clr & cla
+		pirsBfather = 1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg" ></center>'
+		'You shrug. "I don''t know... I just like the way lip rings look, so I got one. Don''t you think it looks cute?"'
+		if TouchedByFather = 0:'Your stepfather shakes his head: "Kids these days, always adding new holes to themselves..."'
+
+		if TouchedByFather > 0:'Your stepfather grins: "I must admit, it does look sexy on you."'
+		act 'Move away':gt 'father'
+	end
+	exit
 end
 
 ! earrings
 if pirsC > 0 and pirsC < 10000 and pirsCfather=0:
-    pirsCfather = 1
-    'Your stepfather looks at your ears, noting your earrings: "I see you got your ears pierced, Your earrings are very cute."'
+	pirsCfather = 1
+	'Your stepfather looks at your ears, noting your earrings: "I see you got your ears pierced, Your earrings are very cute."'
 end
 
 ! nose ring
 if pirsD > 0 and pirsD < 10000 and pirsDfather=0:
-    pirsDfather = 1
-    'Your stepfather looks a bit shocked at your nose ring: "Jesus, <<$pcs_nickname>>, what is- why?! I understand putting a ring in a bull''s nose to lead them by, but on a person? There''s no reason to do that!"'
+	pirsDfather = 1
+	'Your stepfather looks a bit shocked at your nose ring: "Jesus, <<$pcs_nickname>>, what is- why?! I understand putting a ring in a bull''s nose to lead them by, but on a person? There''s no reason to do that!"'
 end
 
 ! eyebrow piercing
 if pirsE > 0 and pirsE < 10000 and pirsEfather=0:
-    pirsEfather=1
-    'Your stepfather looks surprised when he sees your eyebrow piercing: "<<$pcs_nickname>>, why would you want that thing in your eyebrow?" He shakes his head in exasperation. "Kids these days..."'
+	pirsEfather=1
+	'Your stepfather looks surprised when he sees your eyebrow piercing: "<<$pcs_nickname>>, why would you want that thing in your eyebrow?" He shakes his head in exasperation. "Kids these days..."'
 end
 
 ! lip tattoo
 if tatlip>0 and fatherTatLip=0 and npc_rel['A28']>=60:
-    act 'Show him your lip tattoo':
-        *clr & cla
-        fatherTatLip = 1
-        minut += 1
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg" ></center>'
-        if tatlip = 2: $textFatherTatLip = 'A tattoo on the inside of your lip?! That must''ve hurt like hell... it is cute, though.'
-        if tatlip ! 2: $textFatherTatLip = 'That''s crazy! Why would you get something like that written on you, much less there?! No one would even think of doing that when I was your age.'
-        'You pull your lip down, showing your stepfather the tattoo on the inside of your lip. Your stepfather looks surprised: "<<$textFatherTatLip>>"'
-        act 'Move away':gt $loc, $loc_arg
-    end
+	act 'Show him your lip tattoo':
+		*clr & cla
+		fatherTatLip = 1
+		minut += 1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg" ></center>'
+		if tatlip = 2: $textFatherTatLip = 'A tattoo on the inside of your lip?! That must''ve hurt like hell... it is cute, though.'
+		if tatlip ! 2: $textFatherTatLip = 'That''s crazy! Why would you get something like that written on you, much less there?! No one would even think of doing that when I was your age.'
+		'You pull your lip down, showing your stepfather the tattoo on the inside of your lip. Your stepfather looks surprised: "<<$textFatherTatLip>>"'
+		act 'Move away':gt $loc, $loc_arg
+	end
 end
 
 if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
-    'Your stepfather looks at your belly with a surprised look on his face. He shakes his head in disappointment before looking back at you.: "<<$pcs_nickname>>, you''re pregnant?"'
-    if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope the baby is not mine... i''m so disappointed in you "<<$pcs_nickname>>"'
-    npc_pregtalk['A28'] = 1
-    
+	'Your stepfather looks at your belly with a surprised look on his face. He shakes his head in disappointment before looking back at you.: "<<$pcs_nickname>>, you''re pregnant?"'
+	if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope the baby is not mine... i''m so disappointed in you "<<$pcs_nickname>>"'
+	npc_pregtalk['A28'] = 1
+
 elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
-    'Your stepfather looks at your belly with a surprised look on his face. He shakes his head in disappointment before looking back at you.: "<<$pcs_nickname>>, you''re pregnant?"'
-    if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope that the baby is not mine... i''m so disappointed in you "<<$pcs_nickname>>"'
-    npc_pregtalk['A28'] = 1
+	'Your stepfather looks at your belly with a surprised look on his face. He shakes his head in disappointment before looking back at you.: "<<$pcs_nickname>>, you''re pregnant?"'
+	if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope that the baby is not mine... i''m so disappointed in you "<<$pcs_nickname>>"'
+	npc_pregtalk['A28'] = 1
 end
 
 !!----------------------------------------end reaction block---------------------------------------------
@@ -161,45 +161,45 @@ if week < 6 and ((hour = 8 and minut > 30) or hour >= 9) and hour < 17:
 end
 
 if hour >= 22:
-    '"Alright <<$pcs_nickname>>. It''s getting late, I need to get to bed. See you tomorrow."'
-    cla
-    act '<B>Continue</B>':gt $loc, $loc_arg
-    exit
+	'"Alright <<$pcs_nickname>>. It''s getting late, I need to get to bed. See you tomorrow."'
+	cla
+	act '<B>Continue</B>':gt $loc, $loc_arg
+	exit
 end
 
 act 'Chat':
-    *clr & cla
-    minut += rand(10,15)
-    npc_rel['A28'] += 1
-    gs 'stat'
-    '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+	*clr & cla
+	minut += rand(10,15)
+	npc_rel['A28'] += 1
+	gs 'stat'
+	'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
 	if $loc = 'sitrPar':
 		'Your stepfather is sitting on the couch in the living room, he is watching TV. You decide to join him for a while and sit down next to him.'
 	else
 		'Your stepfather is sitting by the dinner table eating and reading the newspaper.'
 	end
 
-    dynamic $fatherRep
-
-    act 'Move away':gt 'father'
-
-    if npc_rel['A28'] < 20:
-        gs 'dinfather', 'father 1'
-        exit
-    elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
-        gs 'dinfather', 'father 2'
-        exit
-    elseif npc_rel['A28'] >= 40:
-        if pcs_apprnc + (npc_rel['A28']/10) <= 60:
-            gs 'dinfather', 'father 3'
-            exit
-        end
-        if pcs_apprnc + (npc_rel['A28']/10)>60:
-            gs 'dinfather', 'father 4'
-            exit
-        end
-    end
+	dynamic $fatherRep
+
+	act 'Move away':gt 'father'
+
+	if npc_rel['A28'] < 20:
+		gs 'dinfather', 'father 1'
+		exit
+	elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
+		gs 'dinfather', 'father 2'
+		exit
+	elseif npc_rel['A28'] >= 40:
+		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
+			gs 'dinfather', 'father 3'
+			exit
+		end
+		if pcs_apprnc + (npc_rel['A28']/10)>60:
+			gs 'dinfather', 'father 4'
+			exit
+		end
+	end
 end
 
 if (hour > 10 and week < 6) or week >= 6:
@@ -278,201 +278,201 @@ if (hour > 10 and week < 6) or week >= 6:
 		end
 	end
 
-    act 'Ask about him and your mother':
-        *clr & cla
+	act 'Ask about him and your mother':
+		*clr & cla
 		menu_off = 1
-        minut += 5
-        gs 'stat'
-        '<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-        'You ask your stepfather how he met your mother. Your stepfather scratches his slightly balding head and replies: "I used to work as a taxi driver back then, drove your mother to places from time to time and we got along very well. Natasha is a strong and independant woman, raising you and Anya all by herself after she left your father. I didn''t know him very well, I''ve only met him a couple of times. All I know is that his name is Mikhail Kuznetsov, and that he moved to a different city soon after he and your mother divorced."'
+		minut += 5
+		gs 'stat'
+		'<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+		'You ask your stepfather how he met your mother. Your stepfather scratches his slightly balding head and replies: "I used to work as a taxi driver back then, drove your mother to places from time to time and we got along very well. Natasha is a strong and independant woman, raising you and Anya all by herself after she left your father. I didn''t know him very well, I''ve only met him a couple of times. All I know is that his name is Mikhail Kuznetsov, and that he moved to a different city soon after he and your mother divorced."'
 
-        act 'Move away':gt 'father'
-    end
+		act 'Move away':gt 'father'
+	end
 
-    act 'Ask about his work':
-        *clr & cla
+	act 'Ask about his work':
+		*clr & cla
 		menu_off = 1
-        minut += 5
-        gs 'stat'
-        '<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-        'You ask your stepfather about his work. Your stepfather reaches for his aching joints, with a grimace on his face. "I used to be a taxi driver. It was hard work though, often working many hours a day, and it could be dangerous too. With some money we saved up I bought a Gazelle pickup truck, and now I drive that selling goods and making deliveries. As you know I have two garages; one for our Volga, and the other one for the Gazelle."'
+		minut += 5
+		gs 'stat'
+		'<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+		'You ask your stepfather about his work. Your stepfather reaches for his aching joints, with a grimace on his face. "I used to be a taxi driver. It was hard work though, often working many hours a day, and it could be dangerous too. With some money we saved up I bought a Gazelle pickup truck, and now I drive that selling goods and making deliveries. As you know I have two garages; one for our Volga, and the other one for the Gazelle."'
 
-        act 'Move away':gt 'father'
-    end
+		act 'Move away':gt 'father'
+	end
 
-    if motherKnowSpravka = 1 and npc_sex['A28']=0 and SchoolAtestat = 0:
-        cla
+	if motherKnowSpravka = 1 and npc_sex['A28']=0 and SchoolAtestat = 0:
+		cla
 		menu_off = 1
-        npc_rel['A28'] = 0
-        motherKnowSpravka = 2
-        'Your stepfather angrily walked up to you: "Damnit <<$pcs_nickname>>, your mother told me you''re sexually active already! You''re still so young! I know I can''t stop you, but at least have some decency and don''t bring them to our house." His facial expression then softens, and he adds in a milder voice: "And please... be careful, okay?" You can tell your stepfather is very disappointed in you.'
-
-        act 'Move away':gt 'father'
-        exit
-    end
-
-    if alko > 1 and alkoday ! daystart:
-        alkoday = daystart
-        npc_rel['A28'] -= 1
-        'Your stepfather notices the sharp smell of booze on you and looks disappointed. "<<$pcs_nickname>>, you smell like alcohol, what are you getting yourself into? You''re too young to drink that!"'
-    end
-
-    if TorgVokzalTimes>0 and YouCanGar = 0 and SchoolAtestat = 0:
-        act 'Ask him permission to store things in his garage':
-            *clr & cla
+		npc_rel['A28'] = 0
+		motherKnowSpravka = 2
+		'Your stepfather angrily walked up to you: "Damnit <<$pcs_nickname>>, your mother told me you''re sexually active already! You''re still so young! I know I can''t stop you, but at least have some decency and don''t bring them to our house." His facial expression then softens, and he adds in a milder voice: "And please... be careful, okay?" You can tell your stepfather is very disappointed in you.'
+
+		act 'Move away':gt 'father'
+		exit
+	end
+
+	if alko > 1 and alkoday ! daystart:
+		alkoday = daystart
+		npc_rel['A28'] -= 1
+		'Your stepfather notices the sharp smell of booze on you and looks disappointed. "<<$pcs_nickname>>, you smell like alcohol, what are you getting yourself into? You''re too young to drink that!"'
+	end
+
+	if TorgVokzalTimes>0 and YouCanGar = 0 and SchoolAtestat = 0:
+		act 'Ask him permission to store things in his garage':
+			*clr & cla
 			menu_off = 1
-            minut += 5
-            gs'stat'
-            '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg" ></center>'
-            'You ask your stepfather if it is okay for you to store some things in his garage.'
-            if npc_rel['A28'] >= 60 or TouchedByFather = 1:
-                YouCanGar = 1
-                'Your stepfather reluctantly agrees to let you store some things in his garage. You can hide some of your trinkets there now.'
-            else
-                'Your stepfather shook his head and said "Sorry <<$pcs_nickname>>. The garage already has more stuff in it than I would like, there''s simply no room."'
-            end
-			act 'Move away':gt 'father'			
-        end
-    end
-
-    act 'Ask him what he thinks of your outfit':
-        *clr & cla
+			minut += 5
+			gs'stat'
+			'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg" ></center>'
+			'You ask your stepfather if it is okay for you to store some things in his garage.'
+			if npc_rel['A28'] >= 60 or TouchedByFather = 1:
+				YouCanGar = 1
+				'Your stepfather reluctantly agrees to let you store some things in his garage. You can hide some of your trinkets there now.'
+			else
+				'Your stepfather shook his head and said "Sorry <<$pcs_nickname>>. The garage already has more stuff in it than I would like, there''s simply no room."'
+			end
+			act 'Move away':gt 'father'
+		end
+	end
+
+	act 'Ask him what he thinks of your outfit':
+		*clr & cla
 		menu_off = 1
-        minut += rand(10,15)
-        gs 'stat'
-        '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-        'Your stepfather is sitting on the couch, watching TV. You sat next to him on the sofa.'
-
-        dynamic $fatherRep
-        act 'Move away':gt 'father'
-
-        ''
-        if npc_rel['A28'] <= 40 or (pcs_apprnc + (npc_rel['A28']/10)) <= 60:
-            'You ask your stepfather what he thinks of your outfit. It looks like he''s not in the mood to indulge you, and impatiently waves you away with his hand: "Don''t bother me <<$pcs_nickname>>, I''m busy."'
-        else
-            'You move slightly closer towards your stepfather, flirtatiously smile at him and ask him what he thinks of your outfit.'
-            if pcs_hairbsh <= 0:
-                pcs_mood -= 5
-                'You notice your stepfather keeps glancing at your disheveled hair with a disapproving look on his face. "Silly me, I should really take better care of my hair!" you think to yourself.'
-            end
-
-            if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60:FatherMolest = rand(1,8)
-            if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = rand(1,4)
-            if npc_rel['A28'] >= 80:FatherMolest = rand(1,2)
-
-            if FatherMolest = 1 and locat['Kolka_athome'] = 0:
-                pcs_horny += rand(1,5)
-                gs 'stat'
-                'He seems happy to oblige, and asks you to twirl your body so he can look at your outfit from all angles. The approving nod and hungry look in his eyes that follow, show that he would like to do more than just watch.'
-                if pcs_horny >= 50 or TouchedByFather = 1:
-                    act 'Sway your hips back and forth':
-                        *clr & cla
-                        gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
-                        gs 'arousal', 'end'
-                        gs 'stat'
-                        'In the heat of the moment you gently start to sway your hips back and forth, without even realizing it. When you realize what you''re doing, you stare your stepfather in the eye for a second with a mischievous smile on your lips. You then turn your back to him and keep swaying your ass seductively.'
-
-                        if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-
-                        if fatherLust >= 2:
-                            pcs_horny -= rand(1,5)
-                            gs 'stat'
-                            if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim47.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
-                            if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim48.jpg"></center>' & 'You avoid his gaze while you keep swaying your ass back and forth, slowly pulling your clothes away so he can see you''re not wearing any underwear. He sighs wistfully and tries to look away, saying in a stern voice: "<<$pcs_nickname>>, this is not fair, you know I am not made of stone. Don''t show me your bare ass like that." Realizing he wants no more part of your little show, you leave.'
-                        elseif fatherLust=1:
-                            if $pantyworntype ! 'none':
-                                '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim49.jpg"></center>'
-                                'As you slowly sway your ass for his viewing pleasure, you notice your stepfather focusing sharply on your ass crack. It takes a few seconds for you to figure out why, but then you remember one of his fetishes: he likes it when girls don''t wear underwear. You bet you could really turn him on if you took them off.'
-                                if pcs_horny >=  90:
-                                    act 'Give him your panties':
-                                        *clr & cla
-                                        gs 'stat'
-                                        gs 'panties', 'dispose'
-                                        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim50.jpg"></center>'
-                                        'Wanting to see just how riled up you can get your stepfather, you bend over and slowly pull your panties down. "Is this better, Daddy?" you sweetly ask him, and your stepfather panics while you run your hands over your naked ass, gently kneading your ass cheeks. "<<$pcs_nickname>>, please don''t do that! Someone could come in at any second! What do you think your mother would do to you AND me if she saw this!?" he whispers, as he moves to you and frantically tries to cover you up. You sweetly smile at him and whisper: "Relax daddy, we''re fine! Here, for later," as you stuff your panties in his pocket.'
-                                        act 'Move away':gt $loc, $loc_arg
-                                    end
-                                end
-                            elseif $pantyworntype = 'none':
-                                TouchedByFather = 1
+		minut += rand(10,15)
+		gs 'stat'
+		'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+		'Your stepfather is sitting on the couch, watching TV. You sat next to him on the sofa.'
+
+		dynamic $fatherRep
+		act 'Move away':gt 'father'
+
+		''
+		if npc_rel['A28'] <= 40 or (pcs_apprnc + (npc_rel['A28']/10)) <= 60:
+			'You ask your stepfather what he thinks of your outfit. It looks like he''s not in the mood to indulge you, and impatiently waves you away with his hand: "Don''t bother me <<$pcs_nickname>>, I''m busy."'
+		else
+			'You move slightly closer towards your stepfather, flirtatiously smile at him and ask him what he thinks of your outfit.'
+			if pcs_hairbsh <= 0:
+				pcs_mood -= 5
+				'You notice your stepfather keeps glancing at your disheveled hair with a disapproving look on his face. "Silly me, I should really take better care of my hair!" you think to yourself.'
+			end
+
+			if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60:FatherMolest = rand(1,8)
+			if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = rand(1,4)
+			if npc_rel['A28'] >= 80:FatherMolest = rand(1,2)
+
+			if FatherMolest = 1 and locat['Kolka_athome'] = 0:
+				pcs_horny += rand(1,5)
+				gs 'stat'
+				'He seems happy to oblige, and asks you to twirl your body so he can look at your outfit from all angles. The approving nod and hungry look in his eyes that follow, show that he would like to do more than just watch.'
+				if pcs_horny >= 50 or TouchedByFather = 1:
+					act 'Sway your hips back and forth':
+						*clr & cla
+						gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
+						gs 'arousal', 'end'
+						gs 'stat'
+						'In the heat of the moment you gently start to sway your hips back and forth, without even realizing it. When you realize what you''re doing, you stare your stepfather in the eye for a second with a mischievous smile on your lips. You then turn your back to him and keep swaying your ass seductively.'
+
+						if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+						if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+						if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+						if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+
+						if fatherLust >= 2:
+							pcs_horny -= rand(1,5)
+							gs 'stat'
+							if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim47.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
+							if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim48.jpg"></center>' & 'You avoid his gaze while you keep swaying your ass back and forth, slowly pulling your clothes away so he can see you''re not wearing any underwear. He sighs wistfully and tries to look away, saying in a stern voice: "<<$pcs_nickname>>, this is not fair, you know I am not made of stone. Don''t show me your bare ass like that." Realizing he wants no more part of your little show, you leave.'
+						elseif fatherLust=1:
+							if $pantyworntype ! 'none':
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim49.jpg"></center>'
+								'As you slowly sway your ass for his viewing pleasure, you notice your stepfather focusing sharply on your ass crack. It takes a few seconds for you to figure out why, but then you remember one of his fetishes: he likes it when girls don''t wear underwear. You bet you could really turn him on if you took them off.'
+								if pcs_horny >=  90:
+									act 'Give him your panties':
+										*clr & cla
+										gs 'stat'
+										gs 'panties', 'dispose'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim50.jpg"></center>'
+										'Wanting to see just how riled up you can get your stepfather, you bend over and slowly pull your panties down. "Is this better, Daddy?" you sweetly ask him, and your stepfather panics while you run your hands over your naked ass, gently kneading your ass cheeks. "<<$pcs_nickname>>, please don''t do that! Someone could come in at any second! What do you think your mother would do to you AND me if she saw this!?" he whispers, as he moves to you and frantically tries to cover you up. You sweetly smile at him and whisper: "Relax daddy, we''re fine! Here, for later," as you stuff your panties in his pocket.'
+										act 'Move away':gt $loc, $loc_arg
+									end
+								end
+							elseif $pantyworntype = 'none':
+								TouchedByFather = 1
 								'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim51.mp4"></video></center>' & 'As you sway your ass in front of your stepfather, you notice his eyes fixating on your ass crack. "What''s this <<$pcs_nickname>>, no panties?" He pushes you down onto your hands and knees and roughly kneads your ass cheeks, pulling them apart. Looks like he is done being teased, and turned the tables on you. He lowers his hands to your upper thighs and pulls your pussy wide open. The wet sheen on your pussy lips gives away how much you enjoy his treatment, and you do your best to stifle your moans so no one else in the house will hear. Thoroughly enjoying the stimulations he is giving you, you can feel your pussy moisten more and more.'
-                            end
-                        end
-                        act 'Move away':gt $loc, $loc_arg
-                    end
-                    if fatherLust = 1:'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he is, at least, pleasantly surprised by your request.'
-                end
-
-                if pcs_horny >= 90 or TouchedByFather = 1:
-                    if $clothingworntype ! 'nude':
-                        act 'Let him touch your clothes':
-                            *clr & cla
-                            gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
-                            gs 'arousal', 'end'
-                            gs 'stat'
-                            'You innocently offer him to have a feel at the fabric, pretending you''re really interested to know what he thinks of your the quality of your clothing. Your stepfather looks at you with a slightly puzzled look on his face. "Go on, touch it, it''s so nice and soft!" you encourage him, and you take his hand and pull it towards you.'
-
-                            if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-
-                            if fatherLust >= 2:
-                                pcs_horny -= rand(1,5)
-                                gs 'stat'
-                                '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim41.jpg"></center>'
-                                'Your stepfather clearly doesn''t want to, and is slightly embarrassed by the whole situation. He quickly pulls his hand away and tells you to go straighten your clothes.'
-                            end
-                            if fatherLust = 1:
-                                TouchedByFather = 1
-                                if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim42.jpg"></center>' & 'Your stepfather smiles and eagerly reaches for your ass, kneading it rougher than you had anticipated. A bit startled at his roughness you squeak out a soft "Oh!" as he gives it a few slaps. He then sits back on the couch, amused at your embarrassed expression and red face. "You''re right, <<$pcs_nickname>>... it''s very soft indeed. Very nice."'
-                                if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Judging from your stepfather''s flustered face, he is more than happy to oblige. He grabs you and bends you over the rear of the couch. You can''t see what he''s doing, but immediately feel his hand brushing against your wet pussy. He slides a finger in and pumps it in and out for a little while, filling the room with squishy noises. You let out a needy moan and feel a tinge of regret when he pulls his hand away and helps you back up. "Daddy, you didn''t even touch my clothes!" you pout. He simply gives you a wink and then returns his attention to the TV.'
-                            end
-                            act 'Move away':gt $loc, $loc_arg
-                        end
-
-                        act 'Adjust your clothes':
-                            *clr & cla
-                            gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
-                            gs 'arousal', 'end'
-                            gs 'stat'
-                            'Encouraged by your stepfather''s reaction, you put your hands on your breasts and pretend you''re straightening your clothes. You run your fingers down to your stomach and groin while plucking at the fabric, giving him one hell of a show. He can''t take his eyes off your body and you can tell your actions make him want you more than ever.'
-
-                            if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-
-                            if fatherLust >= 2:
-                                pcs_horny -= rand(1,5)
-                                gs 'stat'
-                                if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim45.jpg"></center>' & 'Your stepfather realizes you''re going too far, and interrupts you by clearing his throat loudly. He tells you to go away, making you feel rather uncomfortable.'
-                                if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim46.jpg"></center>' & 'Deciding to take your teasing to the next level, you pull your clothes to the side and show him your bare pussy. Your stepfather realizes you''re taking it too far, and sends you off: "<<$pcs_nickname>>, stop that. And go put on some underwear, that''s no way for a lady to behave."'
-                            end
-
-                            if fatherLust = 1:
-                                if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim43.jpg"></center>' & 'You run your hands over your shoulders and slide the straps off to the side, pretending it is an accident. "Oh no, I can be so clumsy sometimes!" you exclaim, while taking way longer than you need to put them back where they need to be. All the while your stepfather''s eyes are glued to your <<$titsize>> breasts, and his face turns beet red.'
-                                if $pantyworntype = 'none' and daystage < 5:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the sun. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
+							end
+						end
+						act 'Move away':gt $loc, $loc_arg
+					end
+					if fatherLust = 1:'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he is, at least, pleasantly surprised by your request.'
+				end
+
+				if pcs_horny >= 90 or TouchedByFather = 1:
+					if $clothingworntype ! 'nude':
+						act 'Let him touch your clothes':
+							*clr & cla
+							gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
+							gs 'arousal', 'end'
+							gs 'stat'
+							'You innocently offer him to have a feel at the fabric, pretending you''re really interested to know what he thinks of your the quality of your clothing. Your stepfather looks at you with a slightly puzzled look on his face. "Go on, touch it, it''s so nice and soft!" you encourage him, and you take his hand and pull it towards you.'
+
+							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+
+							if fatherLust >= 2:
+								pcs_horny -= rand(1,5)
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim41.jpg"></center>'
+								'Your stepfather clearly doesn''t want to, and is slightly embarrassed by the whole situation. He quickly pulls his hand away and tells you to go straighten your clothes.'
+							end
+							if fatherLust = 1:
+								TouchedByFather = 1
+								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim42.jpg"></center>' & 'Your stepfather smiles and eagerly reaches for your ass, kneading it rougher than you had anticipated. A bit startled at his roughness you squeak out a soft "Oh!" as he gives it a few slaps. He then sits back on the couch, amused at your embarrassed expression and red face. "You''re right, <<$pcs_nickname>>... it''s very soft indeed. Very nice."'
+								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Judging from your stepfather''s flustered face, he is more than happy to oblige. He grabs you and bends you over the rear of the couch. You can''t see what he''s doing, but immediately feel his hand brushing against your wet pussy. He slides a finger in and pumps it in and out for a little while, filling the room with squishy noises. You let out a needy moan and feel a tinge of regret when he pulls his hand away and helps you back up. "Daddy, you didn''t even touch my clothes!" you pout. He simply gives you a wink and then returns his attention to the TV.'
+							end
+							act 'Move away':gt $loc, $loc_arg
+						end
+
+						act 'Adjust your clothes':
+							*clr & cla
+							gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
+							gs 'arousal', 'end'
+							gs 'stat'
+							'Encouraged by your stepfather''s reaction, you put your hands on your breasts and pretend you''re straightening your clothes. You run your fingers down to your stomach and groin while plucking at the fabric, giving him one hell of a show. He can''t take his eyes off your body and you can tell your actions make him want you more than ever.'
+
+							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+
+							if fatherLust >= 2:
+								pcs_horny -= rand(1,5)
+								gs 'stat'
+								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim45.jpg"></center>' & 'Your stepfather realizes you''re going too far, and interrupts you by clearing his throat loudly. He tells you to go away, making you feel rather uncomfortable.'
+								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim46.jpg"></center>' & 'Deciding to take your teasing to the next level, you pull your clothes to the side and show him your bare pussy. Your stepfather realizes you''re taking it too far, and sends you off: "<<$pcs_nickname>>, stop that. And go put on some underwear, that''s no way for a lady to behave."'
+							end
+
+							if fatherLust = 1:
+								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim43.jpg"></center>' & 'You run your hands over your shoulders and slide the straps off to the side, pretending it is an accident. "Oh no, I can be so clumsy sometimes!" you exclaim, while taking way longer than you need to put them back where they need to be. All the while your stepfather''s eyes are glued to your <<$titsize>> breasts, and his face turns beet red.'
+								if $pantyworntype = 'none' and daystage < 5:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the sun. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
 								if $pantyworntype = 'none' and daystage >= 5:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the streetlights. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
-                            end
-                            act 'Move away':gt $loc, $loc_arg
-                        end
-                    end
-                end
-            else
-                'You twirl on the spot, showing off your outfit from all sides.'
-                cla
-                act 'Move away':gt 'father'
-            end
-        end
-    end
+							end
+							act 'Move away':gt $loc, $loc_arg
+						end
+					end
+				end
+			else
+				'You twirl on the spot, showing off your outfit from all sides.'
+				cla
+				act 'Move away':gt 'father'
+			end
+		end
+	end
 
 	if locat['Stepdad'] = 10:
 		act 'Watch TV together':
@@ -508,135 +508,135 @@ if (hour > 10 and week < 6) or week >= 6:
 end
 
 if locat['Stepdad'] = 10 and locat['Mom_athome'] = 0 and locat['Kolka_athome'] = 0 and TouchedByFather = 1 and (pcs_horny >= 50 or npc_sex['A28'] ! 0):
-    act 'Seduce him':
+	act 'Seduce him':
 		menu_off = 1
-        if npc_rel['A28'] < 20:
-            'Your stepfather seems to misunderstand your advances.'
-            gs 'dinfather', 'father 1'
-            exit
-        elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
-            'Your stepfather seems to misunderstand your advances.'        
-            gs 'dinfather', 'father 2'
-            exit
-        elseif npc_rel['A28'] >= 40:
-            if pcs_apprnc + (npc_rel['A28']/10) <= 60:
-                'Your stepfather clears his throat and changes the subject.'
-                gs 'dinfather', 'father 3'
-                exit
-            end
-            if pcs_apprnc + (npc_rel['A28']/10) > 60:
-                *clr & cla
-                gs 'stat'
-                minut+=30
-                npc_rel['A28']+=20
-                if analplugIN = 1:
-                    gs 'fathersex', 'fatherbend_1'
-                else
-                    if $pantyworntype ! 'none':
-                        gs 'fathersex', 'fatherbend_2'
-                    else
-                        gs 'fathersex', 'fatherbend_3'
-                    end
-                end
-            end
-        end
-    end
+		if npc_rel['A28'] < 20:
+			'Your stepfather seems to misunderstand your advances.'
+			gs 'dinfather', 'father 1'
+			exit
+		elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
+			'Your stepfather seems to misunderstand your advances.'
+			gs 'dinfather', 'father 2'
+			exit
+		elseif npc_rel['A28'] >= 40:
+			if pcs_apprnc + (npc_rel['A28']/10) <= 60:
+				'Your stepfather clears his throat and changes the subject.'
+				gs 'dinfather', 'father 3'
+				exit
+			end
+			if pcs_apprnc + (npc_rel['A28']/10) > 60:
+				*clr & cla
+				gs 'stat'
+				minut+=30
+				npc_rel['A28']+=20
+				if analplugIN = 1:
+					gs 'fathersex', 'fatherbend_1'
+				else
+					if $pantyworntype ! 'none':
+						gs 'fathersex', 'fatherbend_2'
+					else
+						gs 'fathersex', 'fatherbend_3'
+					end
+				end
+			end
+		end
+	end
 end
 
 ! WD: Fix old nude variable
 if $clothingworntype = 'nude':
 	menu_off = 1
-    if tatvag > 0 and Putsawtatvag = 0 and $pantyworntype = 'none':
-        if npc_rel['A28'] >= 70:
-            'With your naked body on display, your pubic tattoo catches your stepfather''s eye. "Wow, that is one hard to miss tattoo. Obviously you didn''t get that one just for yourself", he says as he moves towards you and has a closer look.'
-            npc_rel['A28'] += 1
-            Putsawtatvag = 1
-            act 'Move away':gt $loc, $loc_arg
-            exit
-        else
-            '"Damn tattoo, I can''t believe you would soil your body like that." Your stepfather obviously doesn''t like the tattoo you have in your pubic area. '
-            npc_rel['A28'] -= 1
-            Putsawtatvag = 1
-            act 'Move away':gt $loc, $loc_arg
-            exit
-        end
-    end
-    if pirsF > 0 and pirsF < 10000 and PutsawpirsF = 0:
-        if npc_sex['A28'] = 0:
-            if npc_rel['A28'] >= 60:
-                '"Hey, those look nice on you!" your stepfather says, nodding at your nipple piercings. He seems to like them.'
-                npc_rel['A28'] += 3
-                PutsawpirsF = 1
-                act 'Move away':gt $loc, $loc_arg
-                exit
-            else
-                '"Why would you do that... you should probably take those out", your stepfather says as he shakes his head, pointing at the piercings in your nipples.'
-                npc_rel['A28'] -= 1
-                act 'Move away':gt $loc, $loc_arg
-                exit
-            end
-        else
-            if hour >= 18 and hour < 21:
-                '"Hey, those look nice on you!" your stepfather says, nodding at your nipple piercings. He seems to like them.'
-                npc_rel['A28'] += 3
-                PutsawpirsF = 1
-                act 'Move away':gt $loc, $loc_arg
-                exit
-            else
-                '"Wow, those are sexy!" your stepfather says, as he reaches out and touches your nipple piercings. You can''t help but let out an involuntary groan. He admires them for a moment, rubbing his fingers on your nipples and lightly tugging at them before he lets you go.'
-                npc_rel['A28'] += 3
-                PutsawpirsF = 1
-                pcs_horny += 10
-                act 'Move away':gt $loc, $loc_arg
-                exit
-            end
-        end
-    end
-
-    'Your stepfather stares at your naked body, you can''t help but notice the admiring look on his face mixed with the torment of him knowing that he should know better. "<<$pcs_nickname>>, have you no shame? You shouldn''t be flaunting your naked body like that, you have no idea what kind of effect it has on men!"'
+	if tatvag > 0 and Putsawtatvag = 0 and $pantyworntype = 'none':
+		if npc_rel['A28'] >= 70:
+			'With your naked body on display, your pubic tattoo catches your stepfather''s eye. "Wow, that is one hard to miss tattoo. Obviously you didn''t get that one just for yourself", he says as he moves towards you and has a closer look.'
+			npc_rel['A28'] += 1
+			Putsawtatvag = 1
+			act 'Move away':gt $loc, $loc_arg
+			exit
+		else
+			'"Damn tattoo, I can''t believe you would soil your body like that." Your stepfather obviously doesn''t like the tattoo you have in your pubic area. '
+			npc_rel['A28'] -= 1
+			Putsawtatvag = 1
+			act 'Move away':gt $loc, $loc_arg
+			exit
+		end
+	end
+	if pirsF > 0 and pirsF < 10000 and PutsawpirsF = 0:
+		if npc_sex['A28'] = 0:
+			if npc_rel['A28'] >= 60:
+				'"Hey, those look nice on you!" your stepfather says, nodding at your nipple piercings. He seems to like them.'
+				npc_rel['A28'] += 3
+				PutsawpirsF = 1
+				act 'Move away':gt $loc, $loc_arg
+				exit
+			else
+				'"Why would you do that... you should probably take those out", your stepfather says as he shakes his head, pointing at the piercings in your nipples.'
+				npc_rel['A28'] -= 1
+				act 'Move away':gt $loc, $loc_arg
+				exit
+			end
+		else
+			if hour >= 18 and hour < 21:
+				'"Hey, those look nice on you!" your stepfather says, nodding at your nipple piercings. He seems to like them.'
+				npc_rel['A28'] += 3
+				PutsawpirsF = 1
+				act 'Move away':gt $loc, $loc_arg
+				exit
+			else
+				'"Wow, those are sexy!" your stepfather says, as he reaches out and touches your nipple piercings. You can''t help but let out an involuntary groan. He admires them for a moment, rubbing his fingers on your nipples and lightly tugging at them before he lets you go.'
+				npc_rel['A28'] += 3
+				PutsawpirsF = 1
+				pcs_horny += 10
+				act 'Move away':gt $loc, $loc_arg
+				exit
+			end
+		end
+	end
+
+	'Your stepfather stares at your naked body, you can''t help but notice the admiring look on his face mixed with the torment of him knowing that he should know better. "<<$pcs_nickname>>, have you no shame? You shouldn''t be flaunting your naked body like that, you have no idea what kind of effect it has on men!"'
 	if locat['Mom_athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home. Who knows what she''ll do when she sees you walking around like this!"'
 	if npc_sex['A28'] = 0:
-        if npc_rel['A28'] >= 40 or hotcat > 5:
-            '"You look fantastic," he says, reluctantly turning his face away from you. <<$mother_go_text>>'
+		if npc_rel['A28'] >= 40 or pcs_hotcat > 5:
+			'"You look fantastic," he says, reluctantly turning his face away from you. <<$mother_go_text>>'
 			npc_rel['A28'] += 1
-        else
-            'He decisively turns his face away from you, avoiding the looks of your naked body. "Don''t be such a whore <<$pcs_nickname>>, go put some clothes on right now."'
-            npc_rel['A28'] -= 1
-        end
-    else
-        'His eyes never stop looking at your naked body, you can tell he''s very much impressed by your beauty as you walk around the room. <<$mother_go_text>>'
+		else
+			'He decisively turns his face away from you, avoiding the looks of your naked body. "Don''t be such a whore <<$pcs_nickname>>, go put some clothes on right now."'
+			npc_rel['A28'] -= 1
+		end
+	else
+		'His eyes never stop looking at your naked body, you can tell he''s very much impressed by your beauty as you walk around the room. <<$mother_go_text>>'
 	end
 	act 'Move away':gt 'bedrPar'
 end
 
 if npc_sex['A28'] ! 0 and pirsG > 0 and pirsG < 10000 and PutsawpirsG = 0 and (hour <= 18 or hour > 21):
-    act 'Show off your pubic piercing':
-        *clr & cla
-		menu_off = 1        
-        minut += 5		
-        pcs_horny += 15
+	act 'Show off your pubic piercing':
+		*clr & cla
+		menu_off = 1
+		minut += 5
+		pcs_horny += 15
 		gs'stat'
-        PutsawpirsG = 1
-        '<center><img <<$set_imgh>> src="images/pc/body/piercings/g<<pirsG>>.jpg" ></center>'
-        'Moving closer to your stepfather, you tease him by showing him your pussy. He doesn''t know you have a pubic piercing yet, and you plan on showing it off today. As you absently rub your fingers across your labia, the glint of metal catches his eye and he pushes your hand away before you get a chance to tell him about it. "Well well, what do we have here?" he mutters, gently rubbing his fingers over the shiny new piercing. "<<$pcs_nickname>>, you are such a horny devil... I love it, we''re going to have a lot of fun with this." He spends the next few minutes rubbing and tugging on your new piercing, making lewd comments the whole time. After that he reluctantly lets you go, leaving you hornier than before.'
-        act 'Move away':gt $loc, $loc_arg
-    end
+		PutsawpirsG = 1
+		'<center><img <<$set_imgh>> src="images/pc/body/piercings/g<<pirsG>>.jpg" ></center>'
+		'Moving closer to your stepfather, you tease him by showing him your pussy. He doesn''t know you have a pubic piercing yet, and you plan on showing it off today. As you absently rub your fingers across your labia, the glint of metal catches his eye and he pushes your hand away before you get a chance to tell him about it. "Well well, what do we have here?" he mutters, gently rubbing his fingers over the shiny new piercing. "<<$pcs_nickname>>, you are such a horny devil... I love it, we''re going to have a lot of fun with this." He spends the next few minutes rubbing and tugging on your new piercing, making lewd comments the whole time. After that he reluctantly lets you go, leaving you hornier than before.'
+		act 'Move away':gt $loc, $loc_arg
+	end
 end
 
 if npc_sex['A28']!0:fatherwantssex = rand(1,2)
 
 if $clothingworntype = 'nude': fatherwantssex = 1
 if npc_sex['A28'] ! 0 and fatherwantssex = 1 and locat['Mom_athome'] = 0 and locat['Kolka_athome'] = 0 and npc_rel['A28'] > 60:
-    *clr & cla
+	*clr & cla
 	menu_off = 1
-    gs 'stat'
-    '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-    ! WD: Fix old nude variable
-    if $clothingworntype = 'nude': 'You give your stepfather a lewd smile. "I figured my clothes would only get in the way Daddy, so I took them off for you."'
-    'No words are neccessary, your stepfather simply unbuttons his pants revealing his stiff cock. "<<$pcs_nickname>>, help your old man out will you?"'
-    act 'Change your mind and leave':gt $loc, $loc_arg
-    act 'Get down on your knees': gs 'fathersex', 'fatherblow4'
+	gs 'stat'
+	'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+	! WD: Fix old nude variable
+	if $clothingworntype = 'nude': 'You give your stepfather a lewd smile. "I figured my clothes would only get in the way Daddy, so I took them off for you."'
+	'No words are neccessary, your stepfather simply unbuttons his pants revealing his stiff cock. "<<$pcs_nickname>>, help your old man out will you?"'
+	act 'Change your mind and leave':gt $loc, $loc_arg
+	act 'Get down on your knees': gs 'fathersex', 'fatherblow4'
 end
 
 --- father ---------------------------------

+ 5 - 14
locations/food.qsrc

@@ -944,7 +944,6 @@ end
 !! ------------ just the stats, no descriptions or extra stuff with cost -----------------------
 
 if $ARGS[0] = 'only_cost_snack':
-	*clr & cla
 	gs 'stat'
 	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
@@ -962,7 +961,6 @@ if $ARGS[0] = 'only_cost_snack':
 end
 
 if $ARGS[0] = 'only_cost_light_snack':
-	*clr & cla
 	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 20
@@ -979,7 +977,6 @@ if $ARGS[0] = 'only_cost_light_snack':
 end
 
 if $ARGS[0] = 'only_stats_fast_food':
-	*clr & cla
 	pcs_health += pcs_health/10
 	pcs_mood += 20
 	fat += 14
@@ -991,7 +988,6 @@ if $ARGS[0] = 'only_stats_fast_food':
 end
 
 if $ARGS[0] = 'only_stats_small_meal':
-	*clr & cla
 	pcs_health += pcs_health/5
 	pcs_mood += 10
 	fat += 4
@@ -1003,7 +999,6 @@ if $ARGS[0] = 'only_stats_small_meal':
 end
 
 if $ARGS[0] = 'only_stats_medium_meal':
-	*clr & cla
 	pcs_health += pcs_health/10
 	pcs_mood += 15
 	fat += 7
@@ -1015,7 +1010,6 @@ if $ARGS[0] = 'only_stats_medium_meal':
 end
 
 if $ARGS[0] = 'only_stats_large_meal':
-	*clr & cla
 	pcs_health += pcs_health/15
 	pcs_mood += 20
 	fat += 14
@@ -1027,7 +1021,6 @@ if $ARGS[0] = 'only_stats_large_meal':
 end
 
 if $ARGS[0] = 'only_stats_bagged_meal':
-	*clr & cla
 	pcs_health += pcs_health/8
 	pcs_mood += 5
 	fat += 5
@@ -1039,7 +1032,6 @@ if $ARGS[0] = 'only_stats_bagged_meal':
 end
 
 if $ARGS[0] = 'only_stats_healthy_meal':
-	*clr & cla
 	pcs_health += pcs_health/5
 	pcs_mood += 5
 	fat += 1
@@ -1051,7 +1043,6 @@ if $ARGS[0] = 'only_stats_healthy_meal':
 end
 
 if $ARGS[0] = 'only_cost_pirosh':
-	*clr & cla
 	frost = 0
 	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
@@ -1069,7 +1060,7 @@ if $ARGS[0] = 'only_cost_pirosh':
 	gs 'food', 'aftermeal'
 	killvar '$_eat'
 	if $loc = 'uni_cafe': uni_lunch_bought = 1
-	
+
 	*nl
 	'Added to your order'
 	gt 'food_menu'
@@ -1093,7 +1084,7 @@ if $ARGS[0] = 'only_cost_golub':
 	gs 'food', 'aftermeal'
 	killvar '$_eat'
 	if $loc = 'uni_cafe': uni_lunch_bought = 1
-	
+
 	*nl
 	'Added to your order'
 	gt 'food_menu'
@@ -1117,7 +1108,7 @@ if $ARGS[0] = 'only_cost_pozhar':
 	gs 'food', 'aftermeal'
 	killvar '$_eat'
 	if $loc = 'uni_cafe': uni_lunch_bought = 1
-	
+
 	*nl
 	'Added to your order'
 	gt 'food_menu'
@@ -1141,7 +1132,7 @@ if $ARGS[0] = 'only_cost_reuben':
 	gs 'food', 'aftermeal'
 	killvar '$_eat'
 	if $loc = 'uni_cafe': uni_lunch_bought = 1
-	
+
 	*nl
 	'Added to your order'
 	gt 'food_menu'
@@ -1165,7 +1156,7 @@ if $ARGS[0] = 'only_cost_bliny':
 	gs 'food', 'aftermeal'
 	killvar '$_eat'
 	if $loc = 'uni_cafe': uni_lunch_bought = 1
-	
+
 	*nl
 	'Added to your order'
 	gt 'food_menu'

+ 22 - 12
locations/food_menu.qsrc

@@ -610,27 +610,37 @@ food_loop = 0
 
 	$_str += '<tr>'
 !!  column 1 - food
-	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_eat['<<food_loop>>,name'] + '</td>'
-	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= _eat['<<food_loop>>,price']:
-		$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + iif(_eat['<<food_loop>>,price'] ! 0, str(_eat['<<food_loop>>,price']),'Free') + '</a>'
+	if $_eat['<<food_loop>>,name'] = '':
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center"></td>'
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right"></td>'
 	else
-		$_str += str(_eat['<<food_loop>>,price'])
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_eat['<<food_loop>>,name'] + '</td>'
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
+		if money >= _eat['<<food_loop>>,price']:
+			$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + iif(_eat['<<food_loop>>,price'] ! 0, str(_eat['<<food_loop>>,price']),'Free') + '</a>'
+		else
+			$_str += str(_eat['<<food_loop>>,price'])
+		end
+		$_str += iif(_eat['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 	end
-	$_str += iif(_eat['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 !!  separator
 	$_str += '<td bgcolor=<<$bcolor>> border="0" width="50" cellpadding="0" cellspacing="0"></td>'
 
 !!  column 2 - drinks
-	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_drink['<<food_loop>>,name'] + '</td>'
-	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= _drink['<<food_loop>>,price']:
-		$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + iif(_drink['<<food_loop>>,price'] ! 0, str(_drink['<<food_loop>>,price']),'Free') + '</a>'
+	if $_drink['<<food_loop>>,name'] = '':
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center"></td>'
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right"></td>'
 	else
-		$_str += str(_drink['<<food_loop>>,price'])
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_drink['<<food_loop>>,name'] + '</td>'
+		$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
+		if money >= _drink['<<food_loop>>,price']:
+			$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + iif(_drink['<<food_loop>>,price'] ! 0, str(_drink['<<food_loop>>,price']),'Free') + '</a>'
+		else
+			$_str += str(_drink['<<food_loop>>,price'])
+		end
+		$_str += iif(_drink['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 	end
-	$_str += iif(_drink['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 	$_str += '</tr>'
 	food_loop += 1

+ 19 - 19
locations/foto.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 			if pcs_inhib < 20:
 				studio_inhib = 1
 				'You squirm with discomfort as you drop the last of your clothing and stand completely naked. You feel cold, your skin tingling with discomfort and your hands immediately covering yourself up as you look around shivering in self-consciousness. You really don''t like being naked like this, especially in front of strangers, but rules are rules. What are you supposed to do about <i>this??</i>'
-				
+
 			elseif pcs_inhib < 30 and studio_inhib = 1:
 				studio_inhib = 2
 				'You take a deep breath as you pull off the last of your clothing and shove it in your locker. You can''t help but notice your hardening nipples in response to the cool air and rub your arm in discomfort. You''re getting a little more used to this "dress code" policy, but you still don''t like it.'
@@ -169,7 +169,7 @@ end
 
 if $ARGS[0] = 'studio':
 	if hour < 3:gt 'foto', 'studio_closing'
-	
+
 	$loc_arg = 'studio'
 	$menu_loc = 'foto'
 	$menu_arg = 'studio'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'studio':
 			killvar '$tmp'
 		end
 	end
-	
+
 	if model['status'] = 1:
 		act 'Leave studio':
 			*clr & cla
@@ -557,7 +557,7 @@ if $ARGS[0] = 'manager_talk':
 	'You approach the manager''s desk.'
 	'"Something I can help you with <<$model[''firstname'']>>?"'
 	act 'Back to the studio': gt 'foto', 'studio'
-	
+
 	act'Change your model name':
 		modelfoto['change_name'] += 1
 		cla & *nl
@@ -565,7 +565,7 @@ if $ARGS[0] = 'manager_talk':
 		'"Okay, what do you want to be called instead?" he replies, pulling up your profile on a computer.'
 		act 'Call me...': gt 'foto', 'model_name3'
 	end
-	
+
 	act'Change how you''re paid':
 		cla & *nl
 		'"I want to change how I get paid," you say.'
@@ -829,7 +829,7 @@ if $ARGS[0] = 'interview2':
 					'You nod in understanding.'
 				end
 				act'Continue':
-					if pcs_bmi < 25 or hotcat >= 6:
+					if pcs_bmi < 25 or pcs_hotcat >= 6:
 						gt 'foto', 'job_offer'
 					else
 						gt 'foto', 'job_decline'
@@ -844,7 +844,7 @@ if $ARGS[0] = 'interview2':
 				'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$pc_desc[''lip size'']>>lip, your <<$titsize>> breasts, your <<$pc_desc[''skin'']>> <<$pcs_tan>> skin, your thighs, even your <<$pc_desc[''pubes'']>> pussy...'
 				'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 				act'Continue':
-					if pcs_bmi < 25 or hotcat >= 6:
+					if pcs_bmi < 25 or pcs_hotcat >= 6:
 						gt 'foto', 'job_offer'
 					else
 						gt 'foto', 'job_decline'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'interview2':
 			'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 			'You blush furiously at the attention, both his and the other models.'
 			act'Continue':
-				if pcs_bmi < 25 or hotcat >= 6:
+				if pcs_bmi < 25 or pcs_hotcat >= 6:
 					gt 'foto', 'job_offer'
 				else
 					gt 'foto', 'job_decline'
@@ -1166,9 +1166,9 @@ if $ARGS[0] = 'model_name2':
 		'"Fine by me," he replies, glancing between his screen and your passport to make sure he copies it down correctly.'
 		act 'Continue': gs 'foto', 'model_profile'
 	end
-	
+
 	act'Use a fake name': gt 'foto', 'model_name3'
-	
+
 	if model['ask_model_name'] = 0:
 		act'Why would I?':
 			cla & *clr
@@ -1214,11 +1214,11 @@ if $ARGS[0] = 'model_profile':
 		$model['likes1'] = input("Write one thing you like. <br>Examples: reading, rainy days, sleeping")
 		$model['likes2'] = input("Write another thing you like.")
 		$model['likes3'] = input("Write one last thing thing you like.")
-	
+
 		$model['dislikes1'] = input("Write one thing you dislike. <br>Example: dieting, rude boys, chores")
 		$model['dislikes2'] = input("Write another thing you dislike.")
 		$model['dislikes3'] = input("Write one last thing thing you dislike.")
-		
+
 		act 'Continue': gt 'foto', 'pay_type'
 	end
 end
@@ -1234,7 +1234,7 @@ if $ARGS[0] = 'pay_type':
 		'"I want to be paid in cash."'
 		act 'Continue': gt 'foto', 'gave_passport'
 	end
-	
+
 	if bankAccount = 1:
 		act'Direct deposit':
 			$model['pay_method'] = 'direct_deposit'
@@ -1277,7 +1277,7 @@ if $ARGS[0] = 'wandering_models':
 				if anastasia_in = 1:'<a href="exec:gt ''model_anastasia'',''anastasia1''">unknown model</a>'
 			end
 		end
-		
+
 		if emily['busy_cooldown_day'] ! daystart or emily['busy_cooldown'] <= hour:
 			if emily['status'] >= 2:
 				if emily_in = 1:'<a href="exec:gt ''model_emily1'',''emily_1''">Emily</a>'
@@ -1285,7 +1285,7 @@ if $ARGS[0] = 'wandering_models':
 				if emily_in = 1:'<a href="exec:gt ''model_emily1'',''emily_1''">unknown model</a>'
 			end
 		end
-		
+
 		if jeff['busy_cooldown_day'] ! daystart or jeff['busy_cooldown'] <= hour:
 			if jeff['status'] > 0:
 				if jeff_in = 1:'<a href="exec:gt ''model_jeff1'',''jeff_1''">Jeff</a>'
@@ -1293,9 +1293,9 @@ if $ARGS[0] = 'wandering_models':
 				if jeff_in = 1:'<a href="exec:gt ''model_jeff1'',''jeff_1''">unknown model</a>'
 			end
 		end
-		
+
 		if krystal['porn_card_day'] > 0 and hour < krystal['porn_card_hour'] and krystal['porn_card_day'] = daystart: krystal_in = 0
-		
+
 		if krystal['busy_cooldown_day'] ! daystart or krystal['busy_cooldown'] <= hour:
 			if krystal['status'] > 0:
 				if krystal_in = 1:'<a href="exec:gt ''model_krystal'',''krystal1''">Krystal</a>'
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'wandering_models':
 				if krystal_in = 1:'<a href="exec:gt ''model_krystal'',''krystal1''">unknown model</a>'
 			end
 		end
-		
+
 		if (mari['busy_cooldown_day'] ! daystart or mari['busy_cooldown'] <= hour) and mari['weekend_gone'] < daystart:
 			if mari['status'] > 0:
 				if mari_in = 1:'<a href="exec:gt ''model_mari'',''mari_1''">Mari</a>'
@@ -1311,7 +1311,7 @@ if $ARGS[0] = 'wandering_models':
 				if mari_in = 1:'<a href="exec:gt ''model_mari'',''mari_1''">unknown model</a>'
 			end
 		end
-		
+
 		if locat['A144'] = 11:'<a href="exec:gt ''foto_models2'',''anushka_1''">Anushka</a>'
 	else
 		'The studio is fairly empty. Most of the other models have gone home for the night.'

+ 107 - 107
locations/foto_models2.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'emily_1':
 			end
 			act 'Leave': gt 'foto', 'studio'
 		end
-		
+
 		act'"What did you just say to me?!"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/turnback.jpg"></center>'
@@ -50,32 +50,32 @@ if $ARGS[0] = 'emily_1':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/pornwalk1.mp4"></video></center>'
 				'As you watch her walk away, you''re deeply offended by what just happened but you know that fighting will only make things worse. For now, you''ll just keep your cool and maybe work things out later.'
-				
+
 				act 'Leave': gt 'foto', 'studio'
-				
+
 				act'Watch her work':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/emily_r/modelling/nude1.mp4"></video></center>'
 					'Despite her rude attitude, the moment she steps on set, she acts perfectly professional, taking directions and adjusting poses flawlessly. She knows how to work her assets in just the right ways. She must be really set on being a pro.'
 					act 'Leave': gt 'foto', 'studio'
-				end		
+				end
 			end
-			
+
 			act'"Bitch!"':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/pornwalk1.mp4"></video></center>'
 				'"Bitch!" you shout at her as she walks away.'
 				'She gives you the finger over her shoulder and doesn''t even give you another look as she walks away to her set. This Emily chick pisses you off...'
 				act 'Leave': gt 'foto', 'studio'
-				
+
 				act'Watch her work':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/emily_r/modelling/nude1.mp4"></video></center>'
 					'You hate to admit it but she''s actually really good at this. She''s incredibly professional, taking directions from the photographer flawlessly. Ugh! Why do girls like her have to have everything?!'
 					act 'Leave': gt 'foto', 'studio'
-				end				
+				end
 			end
-			
+
 			act'"Cunt!"':
 				emily['hate'] += 1
 				*clr & cla
@@ -89,7 +89,7 @@ if $ARGS[0] = 'emily_1':
 					'Seething anger burns behind her eyes as she continues to leer at you. "Now listen here you fucking slut, I''m going to be the next big thing in this town and you better remember it. You''ve seen the photo albums in the main hall? I''m Emily. That''s right. I''m number three. And someday soon I''m going to be number one. And no matter how hard you try, no matter how hard you work, no matter how hot you think you are, my name is <i>always</i> going to be above yours. Now make like the whore you are and <b>fuck off.</b>"'
 					'With that, she turns around and walks onto a nearby set, where she loudly complains to the photographer. "Hey, I know I''m late. There was some fucking slut of a newbie who doesn''t know her fucking place around here. Let''s get started."'
 					act 'Leave': gt 'foto', 'studio'
-				
+
 					act'Watch her work':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/emily_r/modelling/nude1.mp4"></video></center>'
@@ -113,21 +113,21 @@ if $ARGS[0] = 'emily_2':
 		'Unable to control the impulse, your eyes flick to her shapely breasts before going back into the stare. Even though it was only a fraction of a second, she saw you do it and immediately pounces on you for it.'
 		act'Continue':
 			*clr & cla
-			if tits <= 4: 
+			if tits <= 4:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/5.jpg"></center>'
 				'"What''s the matter, slut? Jealous?" she says with a smirk, obviously lording the size and shape of her tits over you and your <<$titsize>> breasts.'
 				act'Grind your teeth in jealousy':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/4.jpg"></center>'
-					'You say nothing and clench your jaw, grinding your teeth together. This girl pisses you off more than anything in the world and it definitely doesn''t help that she''s right about you wishing you had bigger breasts. You cross your arms over your chest and look away, hiding your breasts from her gaze and trying your best not to blush in embarrassment.' 
+					'You say nothing and clench your jaw, grinding your teeth together. This girl pisses you off more than anything in the world and it definitely doesn''t help that she''s right about you wishing you had bigger breasts. You cross your arms over your chest and look away, hiding your breasts from her gaze and trying your best not to blush in embarrassment.'
 					'"Whatever..." you mutter.'
 					'"Aww..." she says in mock pity. "It''s okay. Some boys like smaller, flatter girls like you." She leans over to whisper in your ear, "But they all <i>wish</i> they were with a woman like me..." She pats you on the head. "Maybe if you drink your milk you can ''level up'' one day. Or you can use all your whore money to buy some implants!" She cackles to herself as she walks off.'
 					'<i><b>This. Fucking. Bitch!</b></i>'
 					act 'Leave': gt 'foto', 'studio'
 				end
-				
+
 				act 'Try to resolve things': gt 'foto_models2', 'emily_resolve'
-				
+
 				act'Call her "cow tits"':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/3.jpg"></center>'
@@ -136,11 +136,11 @@ if $ARGS[0] = 'emily_2':
 					'"<i>Excuuuuuuuse me?!</i>"'
 					'Your words seem to catch her off guard and she steps back as though she''s genuinely offended. Sensing you have the upper hand, you push your breasts up with your hands. "Maybe they''re not as big, but at least they''re cute, perky and don''t get waved around like fake cow udders."'
 					'"H-how dare you!" Emily begins to stammer in fury. "My breasts are completely natural and I have <i>never</i> used plastic surgery for anything! I''m naturally this gorgeous!"'
-					'"Is that the line you give to the boys that tease you at the club?" you say, giving her the same smirk she first gave you as you walk by. "At least I don''t look like a bimbo bitch!" you call over your shoulder without turning leaving her behind with what you imagine to be a jaw dropped look on her face.' 
+					'"Is that the line you give to the boys that tease you at the club?" you say, giving her the same smirk she first gave you as you walk by. "At least I don''t look like a bimbo bitch!" you call over your shoulder without turning leaving her behind with what you imagine to be a jaw dropped look on her face.'
 					'Pettiness never felt so good...'
 					act 'Leave': gt 'foto', 'studio'
 				end
-				
+
 			elseif tits = 4:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/1.jpg"></center>'
 				'"What''s the matter, slut? Jealous? Wish you had a pair like mine?"'
@@ -154,9 +154,9 @@ if $ARGS[0] = 'emily_2':
 					'<i><b>This. Fucking. Bitch!</b></i>'
 					act 'Leave': gt 'foto', 'studio'
 				end
-				
+
 				act 'Try to resolve things': gt 'foto_models2', 'emily_resolve'
-					
+
 				act'"Why? So they can distract from your ass ugly face?"':
 					emily['hate'] += 1
 					*clr & cla
@@ -165,14 +165,14 @@ if $ARGS[0] = 'emily_2':
 					'"<i>Excuuuuuuuse me?!</i>"'
 					'Your words seem to catch her off guard and she steps back as though she''s genuinely offended. Sensing you have the upper hand, you push your advantage. "Oh yeah, I bet when the boys come by your house they all bring a paper bag to put over that face of yours. They love using your tits to get off, they just don''t want to see your face while they do it!"'
 					'"H-how dare you!" Emily begins to stammer in fury. "I-! You-!"'
-					'"I don''t have time for this," you interrupt her. "Let me know if any of them manage to cum without a blindfold. I''ll take them to the doctor to get them some glasses!" Her jaw drops as you saunter past feeling good about yourself.' 
+					'"I don''t have time for this," you interrupt her. "Let me know if any of them manage to cum without a blindfold. I''ll take them to the doctor to get them some glasses!" Her jaw drops as you saunter past feeling good about yourself.'
 					act 'Leave': gt 'foto', 'studio'
 				end
-			
+
 			elseif tits >= 5:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/1.jpg"></center>'
 				'"What''s the matter, whore? Wish you didn''t have such fat cow tits?" she says with fake concern and pushing out her chest, obviously trying to talk down your larger <<$titsize>> breasts.'
-				
+
 				act'"What''s wrong with having big breasts?"':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/2.jpg"></center>'
@@ -181,9 +181,9 @@ if $ARGS[0] = 'emily_2':
 					'<i><b>This. Fucking. Bitch!</b></i>'
 					act 'Leave': gt 'foto', 'studio'
 				end
-				
+
 				act 'Try to resolve things': gt 'foto_models2', 'emily_resolve'
-				
+
 				act'Insults are just the mark of a jealous bitch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/3.jpg"></center>'
@@ -237,7 +237,7 @@ if $ARGS[0] = 'emily_2':
 				act 'Leave': gt 'foto', 'studio'
 			end
 		end
-	end	
+	end
 end
 
 
@@ -280,7 +280,7 @@ if $ARGS[0] = 'emily_modelling':
 			'Looking around for Emily, you find her on set in the middle of a lingerie shoot with another model you feel like you''ve seen around. The two of them sit on the ground together taking cues from each other and the photographers as they go through poses. The other woman doesn''t seem to notice but Emily seems really bitter, like she''s annoyed to be working with her. You wonder what that''s about as you watch for a few more minutes before walking away.'
 		end
 	end
-		
+
 	act 'Leave': gt 'foto', 'studio'
 end
 
@@ -308,7 +308,7 @@ if $ARGS[0] = 'emily_warning':
 			'She walks away without another word, leaving just as abruptly as she appeared.'
 			act 'Leave': gt 'foto', 'studio'
 		end
-		
+
 		act'Why would I do that?':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/5.jpg"></center>'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'emily_chat':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/5.jpg"></center>'
 	'Looking around for Emily, you find her standing around on an empty set, seemingly waiting between shoots for something.'
 	'"Oh. It''s you. What do you want?"'
-	
+
 	act'Stop talking':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/turnback.jpg"></center>'
@@ -352,7 +352,7 @@ if $ARGS[0] = 'emily_chat':
 				'"Okay..." you say, not sure what else to do about her rotten attitude.'
 				act 'Keep chatting': gt 'foto_models2', 'emily_chat'
 			end
-			
+
 			act'Suck up to her':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/2.jpg"></center>'
@@ -374,7 +374,7 @@ if $ARGS[0] = 'emily_chat':
 			end
 		end
 	end
-	
+
 	act'Ask why she wanted to become a model':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/1.jpg"></center>'
@@ -402,7 +402,7 @@ if $ARGS[0] = 'emily_chat':
 		'You wait for her to say something else but it looks like she really isn''t interested in talking to you.'
 		act 'Keep chatting': gt 'foto_models2', 'emily_chat'
 	end
-	
+
 !!	act 'Talk about sex': gt'foto_models2',''
 end
 
@@ -496,7 +496,7 @@ if $ARGS[0] = 'jeff_2':
 					act 'Leave': gt 'foto','studio'
 				end
 			end
-			
+
 			act'"An escort service?"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/7.jpg"></center>'
@@ -515,7 +515,7 @@ if $ARGS[0] = 'jeff_2':
 					act 'Leave': gt 'foto','studio'
 				end
 			end
-			
+
 			if anastasiasex = 0:
 				act'"Think you could hook me up as an escort?"':
 					*clr & cla
@@ -685,7 +685,7 @@ if $ARGS[0] = 'jeff_chat':
 			end
 		end
 	end
-	
+
 	act 'Talk about sex': gt 'foto_models2', 'jeff_sex_talk'
 
 	if jeff['grope'] > 3:
@@ -716,9 +716,9 @@ if $ARGS[0] = 'jeff_sex_talk':
 		'"Okay! Okay! See you later hot stuff!" she says, giving you a big hug so your breasts mush together before skipping off on her own.'
 		act 'Leave': gt 'foto','studio'
 	end
-	
+
 	act 'Talk about something else': gt 'foto_models2', 'jeff_chat'
-	
+
 	act'"What''s your favorite position?"':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/13.jpg"></center>'
@@ -727,7 +727,7 @@ if $ARGS[0] = 'jeff_sex_talk':
 		'She goes on continuing to name positions for a while.'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
+
 	act'"What''s your favorite sexual experience?"':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/22.jpg"></center>'
@@ -736,36 +736,36 @@ if $ARGS[0] = 'jeff_sex_talk':
 		'"Oh yeah, I fuck any professor I think I can get away with. Really easy way to bump up your grades. Older guys always have their specific fetishes and my bio professor has a bit of an oral fixation with nipples. The first time we hooked up, I came three times before he even put it in me! That man has a mouth that was made to suck on titties!"'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
+
 	act'"Do you have a boyfriend?"':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/22.jpg"></center>'
 		'"Boyfriend? Nah, I''m too young to get tied down by a man. Not literally though. That used to happen a lot."'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
+
 	act'"Do you like girls?"':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/11.jpg"></center>'
 		'"Like? Or ''like'' like? Or like in bed? Hmm. I guess I''d say... Yes, no I swing both ways, and yes! Girls are fun, more fun than guys, but only a dick can satisfy that urge you get for a good pounding. But guys don''t have boobs, and boobs are the best part about girls!"'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
+
 	act'"What''s your sex life at home like?"':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/11.jpg"></center>'
 		'"Well, I''m still at uni so there''s definitely a lot of boys around campus, but I never bring anybody home cause I don''t want them to know where I live. I try to hook up with strangers at the nightclub instead! It''s always really fun trying to sneak out the morning after. I wonder if when they wake up and can''t find a trace of me that they think they might have fucked a ghost!"'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
-	
+
+
 	act'How do you feel about blowjobs?':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/21.jpg"></center>'
 		'"I don''t mind giving head. Blowjobs are fine. I prefer getting eaten out though. That''s why any time a boy asks for a blowjob I ask him if he wants to 69 instead. Even better are 69''s with girls though. Ever tried it before?" She asks her question innocently but her eyes twinkle mischeviously at you.'
 		act 'Continue': gt 'foto_models2', 'jeff_sex_talk'
 	end
-	
+
 	act'Have you ever been in an orgy?':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/20.jpg"></center>'
@@ -784,9 +784,9 @@ if $ARGS[0] = 'jeff_sex_advice':
 		'"Okay! Okay! See you later hot stuff!" she says, giving you a big hug so your breasts mush together before skipping off on her own.'
 		act 'Leave': gt 'foto','studio'
 	end
-	
+
 	act 'Talk about something else': gt 'foto_models2', 'jeff_chat'
-	
+
 	act'Advice about blowjobs':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/23.jpg"></center>'
@@ -869,7 +869,7 @@ if $ARGS[0] = 'anushka_1':
 			'She glances in your direction. "Hey bitch! Yeah, I am. You too?"'
 			'You nod your head. "Yeah, I was just walking around and seeing what''s what."'
 			'She nods. "If you want to get your makeup done, then grab Terekhova, she''s the best. But you have to wait until she finishes mine," she says in a teasing tone as Terekhova smiles.'
-		end	
+		end
 		act 'Talk':
 			*clr & cla
 			minut += 15
@@ -882,10 +882,10 @@ if $ARGS[0] = 'anushka_1':
 			else
 				'You ask her about the recent modeling shoots she''s done and what''s going on in her life in general.'
 				'She answers your questions, but seems mostly focused on watching Terekhova do her makeup. She doesn''t ask you about things going on in your life before Terekhova starts giving the two of you some makeup tips. The three of you are soon talking about modeling, fashion and boys while Anushka gets her makeup done.'
-			end	
-			
+			end
+
 			act 'Leave': gt 'foto','studio'
-			
+
 			act 'Keep talking':
 				*clr & cla
 				minut += 15
@@ -938,11 +938,11 @@ if $ARGS[0] = 'anushka_1':
 			'You arrive just in time to see Anushka finish a photo shoot. She''s completely naked with a huge grin on her face. She seems to really enjoy modeling, or maybe she''s just enjoying being naked in front of everyone. It''s hard to tell with her.'
 			act 'Leave': gt 'foto','studio'
 			act 'Go talk to her': gt 'foto_models2', 'nush_chat'
-		end	
-	end	
+		end
+	end
 	act 'Leave': gt 'foto','studio'
 end
-		
+
 if $ARGS[0] = 'nush_chat':
 	*clr & cla
 	gs 'stat'
@@ -1051,7 +1051,7 @@ if $ARGS[0] = 'nush_chat1':
 						'"And then?" you prompt her.'
 						'She shrugs. "Afterwards, while we''re just laying there basking in the afterglow, they tell me how much they enjoyed having me there and I said I liked it as well. Then Ben asked if I wanted to come back and he could invite over a friend or two. Krystal then says they were going to have a party and invited me. Turns out they''re swingers and have a ton of sex party orgies."'
 						'"Did you go?" you ask.'
-						if hotcat >= 6 and npc_rel['A144'] >= 50 and anushkaQW['sex']  >= 1:
+						if pcs_hotcat >= 6 and npc_rel['A144'] >= 50 and anushkaQW['sex']  >= 1:
 							'She shakes her head. "Not yet. I''ve been busy and couldn''t make it to the city on the days they''re doing it, but I plan to. Why, do you want to join in?"'
 							'You''re surprised by the question. "I don''t know, I would have to think about it..."'
 							'She shrugs. "Well, not my place to invite you. If you''re interested, go talk to Krystal about it."'
@@ -1105,14 +1105,14 @@ if $ARGS[0] = 'nush_chat1':
 				'She nods her head. "Yeah, since the start of the summer before our final year of school. Why?"'
 			end
 			'"I was just wondering what you thought about Jeff?" you ask.'
-			'She snorts and shakes her head. "Nice girl, if a bit overly friendly. She reminds me of an overgrown puppy that''s constantly jumping on you, wanting attention. She acts like a complete ditz, but I don''t know if she''s really that stupid or just acts that way."' 
+			'She snorts and shakes her head. "Nice girl, if a bit overly friendly. She reminds me of an overgrown puppy that''s constantly jumping on you, wanting attention. She acts like a complete ditz, but I don''t know if she''s really that stupid or just acts that way."'
 			'She then shrugs. "I guess she can''t be as big of a ditz as she acts since she goes to the university. Oh, and she''s a hugger. The girl is all touchy-feely, in a friendly eager puppy kind of way. That is, if puppies were constantly grabbing your tits every chance they got," she says in an amused tone.'
 			gs 'arousal', 'voyeur', 5
 			gs 'stat'
 			act 'Leave':gs 'arousal', 'end' & gt 'foto','studio'
 			act 'Keep chatting': gt 'foto_models2', 'nush_chat1'
 		end
-	end	
+	end
 
 !!	if nush_chat['ask_miranda'] = 0:
 !!		act 'Ask about Miranda':
@@ -1159,7 +1159,7 @@ if $ARGS[0] = 'nush_chat1':
 !!		end
 !!	end
 
-	
+
 !!	if nush_chat['ask_mila'] = 0:
 !!		act 'Ask about Mila':
 !!			*clr & cla
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'nush_chat1':
 !!			gs 'stat'
 !!			act 'Leave': gs 'arousal', 'end' & gt 'foto','studio'
 !!			act 'Keep chatting': gt 'foto_models2', 'nush_chat1'
-!!		end	
+!!		end
 !!	end
 
 	if nush_chat['ask_mari'] = 0:
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'nush_chat1':
 			act 'Keep chatting': gt 'foto_models2', 'nush_chat1'
 		end
 	end
-	
+
 !!	if nush_chat['ask_olga'] = 0:
 !!		act 'Ask about Olga':
 !!			*clr & cla
@@ -1245,7 +1245,7 @@ if $ARGS[0] = 'nush_chat1':
 !!			act 'Keep chatting': gt 'foto_models2', 'nush_chat1'
 !!		end
 !!	end
-	
+
 	act 'Ask how she likes modeling':
 		*clr & cla
 		gs 'stat'
@@ -1289,7 +1289,7 @@ if $ARGS[0] = 'nush_photoshoot1':
 	minut += 15
 	if anushkaQW['model'] > 6:
 		anushkaQW['model'] = 6
-	else	
+	else
 		anushkaQW['model'] += 1
 	end
 	gs 'stat'
@@ -1319,7 +1319,7 @@ if $ARGS[0] = 'nush_photoshoot1':
 				gs 'stat'
 				'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set1/pose4.jpg"></center>'
-				'"Nice, now lose the top."' 
+				'"Nice, now lose the top."'
 				'She slowly removes the top while he takes pictures and starts posing in the white skirt with the red and black bra on. He takes photos of her from every direction.'
 				act 'Leave': gt 'foto','studio'
 				act 'Keep watching':
@@ -1327,7 +1327,7 @@ if $ARGS[0] = 'nush_photoshoot1':
 					gs 'stat'
 					'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set1/pose5.jpg"></center>'
-					'"Good, now lose the bra and smile. Tease the camera like it''s your lover."' 
+					'"Good, now lose the bra and smile. Tease the camera like it''s your lover."'
 					'She takes off her top and performs several different poses before getting down on all fours while looking at the camera on the day bed. He squats down to take several photos of her.'
 					gs 'arousal', 'voyeur', 15
 					gs 'stat'
@@ -1337,9 +1337,9 @@ if $ARGS[0] = 'nush_photoshoot1':
 						gs 'stat'
 						'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set1/pose6.jpg"></center>'
-						'"Now get up on your knees and pull up that skirt."' 
-						'She gets up and pulls the skirt up, showing off her shaved pussy.' 
-						'"That''s it. Now spread your legs just a bit more. That''s it."' 
+						'"Now get up on your knees and pull up that skirt."'
+						'She gets up and pulls the skirt up, showing off her shaved pussy.'
+						'"That''s it. Now spread your legs just a bit more. That''s it."'
 						'She follows his directions and poses in a few different ways as he moves around taking pictures.'
 						gs 'arousal', 'voyeur', 15
 						gs 'stat'
@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'nush_photoshoot1':
 							gs 'stat'
 							'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set1/pose7.jpg"></center>'
-							'"Alright, now I want you to lay down and relax. Be a little playful."' 
+							'"Alright, now I want you to lay down and relax. Be a little playful."'
 							'She lays down and does what he asks as he moves around taking her photo from above from several different angles.'
 							gs 'arousal', 'voyeur', 15
 							gs 'stat'
@@ -1360,8 +1360,8 @@ if $ARGS[0] = 'nush_photoshoot1':
 								'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set1/pose8.jpg"></center>'
 								'"Now spread those legs... Wider... That''s it. Play with your boobs now."'
-								'She spreads her legs wide, showing off everything and grabs one of her breasts while staring at the camera, trying to tease and seduce the viewer.' 
-								'After a few more minutes, he finally stops and steps back. "Okay, that should do it, you can go. Nice work, Nush."' 
+								'She spreads her legs wide, showing off everything and grabs one of her breasts while staring at the camera, trying to tease and seduce the viewer.'
+								'After a few more minutes, he finally stops and steps back. "Okay, that should do it, you can go. Nice work, Nush."'
 								'She smiles and pulls off the skirt and heels, now completely naked as she take the clothes she was just wearing back to wardrobe.'
 								gs 'arousal', 'voyeur', 15
 								gs 'stat'
@@ -1381,7 +1381,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 	minut += 15
 	if anushkaQW['model'] > 6:
 		anushkaQW['model'] = 6
-	else	
+	else
 		anushkaQW['model'] += 1
 	end
 	gs 'stat'
@@ -1395,7 +1395,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 		gs 'stat'
 		'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose2.jpg"></center>'
-		'"Okay, turn around and spread you legs."' 
+		'"Okay, turn around and spread you legs."'
 		'She does as the photographer tells her, even going a step further and grabbing the bottom of her ass cheeks and spreading them, showing off her bikini bottoms from behind.'
 		act 'Leave': gt 'foto','studio'
 		act 'Keep watching':
@@ -1403,7 +1403,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 			gs 'stat'
 			'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose3.jpg"></center>'
-			'"Now face me and tease pulling the top aside. That''s it. A bit more... Now show your nipples."' 
+			'"Now face me and tease pulling the top aside. That''s it. A bit more... Now show your nipples."'
 			'She makes poses at each of the commands, slowly pulling the top apart, teasingly showing her breasts until she pulls it apart enough that her nipples are visible.'
 			gs 'arousal', 'voyeur', 15
 			gs 'stat'
@@ -1413,7 +1413,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 				gs 'stat'
 				'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose4.jpg"></center>'
-				'"Alright, now lose the top and tease the camera with that skirt."' 
+				'"Alright, now lose the top and tease the camera with that skirt."'
 				'She removes the top and tosses it aside. Unbuttoning and zipping down the jeans-turned-into-micro-skirt, she pulls and twists on them until they''re not covering much of her bikini bottoms anymore. She seems to really be enjoying herself.'
 				gs 'arousal', 'voyeur', 15
 				gs 'stat'
@@ -1423,7 +1423,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 					gs 'stat'
 					'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose5.jpg"></center>'
-					'"Perfect, now lose the skirt and tease us with those bottoms."' 
+					'"Perfect, now lose the skirt and tease us with those bottoms."'
 					'She lets go of the former jeans and they fall off onto the floor as she pulls the bikini bottoms to one side, then back to the other, followed by down. She comes close to showing her pussy each time, but is always just a little shy of showing it.'
 					gs 'arousal', 'voyeur', 15
 					gs 'stat'
@@ -1433,7 +1433,7 @@ if $ARGS[0] = 'nush_photoshoot2':
 						gs 'stat'
 						'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose6.jpg"></center>'
-						'"Lose the bottoms and give me a look like you want the camera. Make love to it."' 
+						'"Lose the bottoms and give me a look like you want the camera. Make love to it."'
 						'She loses the bottoms and makes several poses, settling on putting one foot on a small table and spreading her legs while running her hands up and down her body.'
 						gs 'arousal', 'voyeur', 15
 						gs 'stat'
@@ -1443,9 +1443,9 @@ if $ARGS[0] = 'nush_photoshoot2':
 							gs 'stat'
 							'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set2/pose7.jpg"></center>'
-							'"Get on the couch for me."' 
-							'She does so, making several poses before he instructs her further.' 
-							'"Okay, get on all fours. No, no. Face your ass towards the arm of the couch... Yeah, that''s it, put your feet up on the arm of the couch and look back at me. Perfect."' 
+							'"Get on the couch for me."'
+							'She does so, making several poses before he instructs her further.'
+							'"Okay, get on all fours. No, no. Face your ass towards the arm of the couch... Yeah, that''s it, put your feet up on the arm of the couch and look back at me. Perfect."'
 							'She gets in the position he requested which gives a nice view of her... well, everything. He moves around taking pictures of her from several angles before he finally seems satisfied and she gathers up the discarded clothing and carries them over to the wardrobe rack to drop them off.'
 							gs 'arousal', 'voyeur', 15
 							gs 'stat'
@@ -1464,7 +1464,7 @@ if $ARGS[0] = 'nush_photoshoot3':
 	minut += 15
 	if anushkaQW['model'] > 6:
 		anushkaQW['model'] = 6
-	else	
+	else
 		anushkaQW['model'] += 1
 	end
 	gs 'stat'
@@ -1478,7 +1478,7 @@ if $ARGS[0] = 'nush_photoshoot3':
 		gs 'stat'
 		'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose2.jpg"></center>'
-		'"Pull the skirt up for me and tease the camera."' 
+		'"Pull the skirt up for me and tease the camera."'
 		'Anushka sets the skull aside and pulls up the front of the skirt, showing off the white underskirt, white stockings and green high-heeled ankle boots that match the skirt.'
 		act 'Leave': gt 'foto','studio'
 		act 'Keep watching':
@@ -1487,9 +1487,9 @@ if $ARGS[0] = 'nush_photoshoot3':
 			gs 'stat'
 			'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose3.jpg"></center>'
-			'"Take off the skirt and underskirt."' 
-			'Anushka removes both and stands in several poses for the photographer.' 
-			'"Now pull the tails of the top aside so we can get a good view of those panties."' 
+			'"Take off the skirt and underskirt."'
+			'Anushka removes both and stands in several poses for the photographer.'
+			'"Now pull the tails of the top aside so we can get a good view of those panties."'
 			'She does as she''s told, showing off the green panties that match the rest of the outfit.'
 			act 'Leave': gt 'foto','studio'
 			act 'Keep watching':
@@ -1497,8 +1497,8 @@ if $ARGS[0] = 'nush_photoshoot3':
 				gs 'stat'
 				'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose4.jpg"></center>'
-				'The photographer moves around taking pictures from several directions.' 
-				'"Okay, pull the panties down, but not all the way."' 
+				'The photographer moves around taking pictures from several directions.'
+				'"Okay, pull the panties down, but not all the way."'
 				'She pulls them down just enough for her pussy to be on display as he moves around taking more photos of her, asking her to change how she stands a few times.'
 				gs 'arousal', 'voyeur', 15
 				gs 'stat'
@@ -1508,8 +1508,8 @@ if $ARGS[0] = 'nush_photoshoot3':
 					gs 'stat'
 					'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose5.jpg"></center>'
-					'"Take off the panties and pick up the skull and hold it in your hand while looking at it."' 
-					'She does several poses like that for him. "Good, good. Now sit in the chair and spreads your legs while looking at the skull."' 
+					'"Take off the panties and pick up the skull and hold it in your hand while looking at it."'
+					'She does several poses like that for him. "Good, good. Now sit in the chair and spreads your legs while looking at the skull."'
 					'She does so, showing off her cleanly-shaved pussy for all to see as he keeps taking photos.'
 					gs 'arousal', 'voyeur', 15
 					gs 'stat'
@@ -1519,7 +1519,7 @@ if $ARGS[0] = 'nush_photoshoot3':
 						gs 'stat'
 						'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose6.jpg"></center>'
-						'"Now turn and face the chair, lean forward and put your hands on the chair."' 
+						'"Now turn and face the chair, lean forward and put your hands on the chair."'
 						'She does as he asks as he moves over and pushes the tails so they hang in front of her hips, showing off her naked ass. He then steps back and takes some photos. "Okay, stand with your feet apart... A bit further... That''s it. Just like that."'
 						'He squats down to take several photos of her from behind and off to the side.'
 						gs 'arousal', 'voyeur', 15
@@ -1530,7 +1530,7 @@ if $ARGS[0] = 'nush_photoshoot3':
 							gs 'stat'
 							'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose7.jpg"></center>'
-							'"Now take off the top for me."' 
+							'"Now take off the top for me."'
 							'With the top removed, she''s left wearing only the red wig, green boots, white stockings and matching white bra. She stands in several poses while he moves around her, taking photos from every direction.'
 							gs 'arousal', 'voyeur', 15
 							gs 'stat'
@@ -1540,7 +1540,7 @@ if $ARGS[0] = 'nush_photoshoot3':
 								gs 'stat'
 								'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set3/pose8.jpg"></center>'
-								'"Take off the bra and look at the camera like you want to make love to it."' 
+								'"Take off the bra and look at the camera like you want to make love to it."'
 								'She removes the bra and gives the camera hungry looks as he moves around taking photos, while she turns her gaze to always be looking at the camera.'
 								'Satisfied, he ends the shoot and Anushka gathers up the discarded clothing and carries them over to the wardrobe rack and drops them off, taking a minute to remove the boots, stockings, wig and necklace as well.'
 								gs 'arousal', 'voyeur', 15
@@ -1561,7 +1561,7 @@ if $ARGS[0] = 'nush_photoshoot4':
 	minut += 15
 	if anushkaQW['model'] > 6:
 		anushkaQW['model'] = 6
-	else	
+	else
 		anushkaQW['model'] += 1
 	end
 	gs 'stat'
@@ -1575,7 +1575,7 @@ if $ARGS[0] = 'nush_photoshoot4':
 		gs 'stat'
 		'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose2.jpg"></center>'
-		'"Pull up that skirt for me and just tease those panties."' 
+		'"Pull up that skirt for me and just tease those panties."'
 		'She does as he says and seems to love doing it. Underneath the skirt is a pair of black panties. She moves around a lot, swooshing the skirt and pulling it up at times.'
 		act 'Leave': gt 'foto','studio'
 		act 'Keep watching':
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'nush_photoshoot4':
 			gs 'stat'
 			'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose3.jpg"></center>'
-			'"Now turn around and bend over for me. Let''s see that cute little ass."' 
+			'"Now turn around and bend over for me. Let''s see that cute little ass."'
 			'She turns around and bends all the way over, the short skirt riding up and showing off her thong clad ass. She looks back at the camera and wiggles her ass as he takes several photos from different angles.'
 			act 'Leave': gt 'foto','studio'
 			act 'Keep watching':
@@ -1601,7 +1601,7 @@ if $ARGS[0] = 'nush_photoshoot4':
 					gs 'stat'
 					'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose5.jpg"></center>'
-					'"Alright, get up for me and lose the top."' 
+					'"Alright, get up for me and lose the top."'
 					'She stands back up and pulls off the top, showing off her perky breasts in all of their glory. She stands in a variety of poses as he moves around taking photos.'
 					gs 'arousal', 'voyeur', 15
 					gs 'stat'
@@ -1611,7 +1611,7 @@ if $ARGS[0] = 'nush_photoshoot4':
 						gs 'stat'
 						'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose6.jpg"></center>'
-						'"Okay, pull up the skirt now."' 
+						'"Okay, pull up the skirt now."'
 						'She not only pulls up the skirt, but starts pulling her panties to the side slightly, teasing the viewer even more with flashes of her pussy.'
 						gs 'arousal', 'voyeur', 15
 						gs 'stat'
@@ -1621,8 +1621,8 @@ if $ARGS[0] = 'nush_photoshoot4':
 							gs 'stat'
 							'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose7.jpg"></center>'
-							'"Get down on the floor and crawl for me."' 
-							'She gets down and crawls around trying to look sexy while he takes photos of her coming towards him, away and from the side. "Alright, now lose the skirt."' 
+							'"Get down on the floor and crawl for me."'
+							'She gets down and crawls around trying to look sexy while he takes photos of her coming towards him, away and from the side. "Alright, now lose the skirt."'
 							'She takes off the skirt and tosses it aside as he takes photos from the same angles again, this time without the skirt hiding anything.'
 							gs 'arousal', 'voyeur', 15
 							gs 'stat'
@@ -1632,10 +1632,10 @@ if $ARGS[0] = 'nush_photoshoot4':
 								gs 'stat'
 								'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set4/pose8.jpg"></center>'
-								'"Get up and lose the underwear."' 
-								'She stands up and slides her panties off, showing a trimmed bush. "I can''t believe you wanted me to grow this out. How it that sexy?"' 
-								'He sighs. "Just shut up and look pretty, I know what I''m doing."' 
-								'She shuts up, but doesn''t look happy about it. She quickly hides her displeasure and goes back to posing.' 
+								'"Get up and lose the underwear."'
+								'She stands up and slides her panties off, showing a trimmed bush. "I can''t believe you wanted me to grow this out. How it that sexy?"'
+								'He sighs. "Just shut up and look pretty, I know what I''m doing."'
+								'She shuts up, but doesn''t look happy about it. She quickly hides her displeasure and goes back to posing.'
 								'After a few more minutes, he finishes the shoot with a dismissive wave of his hand. Anushka gathers up the discarded clothing and carries them over to the wardrobe rack to drop them off. She takes a minute to remove the heels, stockings and hair extensions as well.'
 								gs 'arousal', 'voyeur', 15
 								gs 'stat'
@@ -1655,7 +1655,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 	minut += 15
 	if anushkaQW['model'] > 6:
 		anushkaQW['model'] = 6
-	else	
+	else
 		anushkaQW['model'] += 1
 	end
 	gs 'stat'
@@ -1669,7 +1669,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 		gs 'stat'
 		'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose2.jpg"></center>'
-		'"Turn around for me."' 
+		'"Turn around for me."'
 		'She turns around and you hear the squeak of the latex rubbing against itself as she moves around. He takes a few photos of her backside encased in the very tight latex.'
 		act 'Leave': gt 'foto','studio'
 		act 'Keep watching':
@@ -1678,7 +1678,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 			gs 'stat'
 			'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose3.jpg"></center>'
-			'"Alright, unzip it most of the way down and then tug on the collar, like you feel it''s uncomfortable."' 
+			'"Alright, unzip it most of the way down and then tug on the collar, like you feel it''s uncomfortable."'
 			'She unzips the front down to her navel, showing of her cleavage as she tugs and pulls at the pink collar around her neck, looking like she''s resenting being collared.'
 			act 'Leave': gt 'foto','studio'
 			act 'Keep watching':
@@ -1686,7 +1686,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 				gs 'stat'
 				'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose4.jpg"></center>'
-				'"Pull the sides apart so we can see your breasts."' 
+				'"Pull the sides apart so we can see your breasts."'
 				'She does as he says and makes several more poses, the suit making noise every time she moves.'
 				gs 'arousal', 'voyeur', 15
 				gs 'stat'
@@ -1696,7 +1696,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 					gs 'stat'
 					'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose5.jpg"></center>'
-					'"I didn''t tell you to stop tugging at that collar. Come on, work with me here!"' 
+					'"I didn''t tell you to stop tugging at that collar. Come on, work with me here!"'
 					'Looking a little annoyed, she starts tugging and pulling on the collar again, hiding any annoyance she''s feeling towards the photographer.'
 					gs 'arousal', 'voyeur', 15
 					gs 'stat'
@@ -1709,7 +1709,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 						'"Okay, pull down the suit now."'
 						'She shrugs it off her shoulders, but it takes a few seconds as the latex clings to her skin, and she pulls the suit down almost enough to show off her pussy. You notice she has neatly trimmed pubic hair again. The photographer notices as well. "I thought I told you to let it grow out?"'
 						'She looks down at her pubic hair. "I did," she replies while rubbing the hair. "What do you call this?"'
-						'He gives her an annoyed look. "I said to let it grow out, not to trim it."' 
+						'He gives her an annoyed look. "I said to let it grow out, not to trim it."'
 						'She has a disgusted look on her face, but doesn''t back talk him. After a moment of silence, he sighs and goes back to taking photographs of her.'
 						gs 'arousal', 'voyeur', 15
 						gs 'stat'
@@ -1719,7 +1719,7 @@ if $ARGS[0] = 'nush_photoshoot5':
 							gs 'stat'
 							'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose7.jpg"></center>'
-							'"Let''s go, take it the rest of the way off."' 
+							'"Let''s go, take it the rest of the way off."'
 							'She pushes and pulls, struggling to get the skin tight latex body suit off. She finally gets it off and tosses it aside, before posing now completely naked, other than the pink high heels and pink collar around her neck. She stands in a variety of poses while he takes photographs.'
 							gs 'arousal', 'voyeur', 15
 							gs 'stat'
@@ -1729,8 +1729,8 @@ if $ARGS[0] = 'nush_photoshoot5':
 								gs 'stat'
 								'<center><b><font color="maroon">Anushka Photoshoot</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/set5/pose8.jpg"></center>'
-								'"Pull at the collar again," he says in an annoyed voice.' 
-								'She starts tugging at the collar again while looking directly at the camera as if it''s her master and she''s fruitlessly trying to resist being owned by the viewer.' 
+								'"Pull at the collar again," he says in an annoyed voice.'
+								'She starts tugging at the collar again while looking directly at the camera as if it''s her master and she''s fruitlessly trying to resist being owned by the viewer.'
 								'After several more minutes, he finishes the shoot and sends her off with a dismissive wave of his hand. Anushka gathers up the discarded clothing and carries them over to the wardrobe rack to drops them off, taking a minute to remove the heels, collar and hair extensions as well.'
 								gs 'arousal', 'voyeur', 15
 								gs 'stat'

+ 57 - 56
locations/foto_shoot.qsrc

@@ -33,18 +33,18 @@ if $ARGS[0] = 'model':
 		'<center><b><font color="maroon">Manager</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
-		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work."'
+		'"Sure, no problem <<$model[''lastname'']>>, just let us know when you''re ready to work."'
 		act 'Leave': gt 'foto','studio'
 	end
-	
+
 	act'Actually I''d like to practice':gt 'foto_practice', 'start'
-		
+
 	act'"I''d like to do a catalog shoot"':
 		cla & *clr
 		if modelfoto['shoots'] >= 10 and pcs_mdlng > 20 and modelfoto['fashion'] < 1:gt 'foto_events', 'fashion_persuasion'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Alright, what kind of shoot? Clothing or swimsuits?"'
-		
+
 		act 'Look at something else':gt 'foto_shoot','model'
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
@@ -77,14 +77,14 @@ if $ARGS[0] = 'model':
 			modelpayfin = 450
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
-			
+
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
 			*nl
 			'You receive 450 <b>₽</b> for the job.'
 			act 'Finish':gt 'foto', 'end'
 		end
 	end
-	
+
 	act'"I''d like to do a fashion shoot"':
 		if pcs_mdlng < 20:
 			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
@@ -108,7 +108,7 @@ if $ARGS[0] = 'model':
 				if pcs_inhib < 20:
 					'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 					act 'Look at something else':gt 'foto_shoot','model'
-					
+
 					if pcs_mdlng > 20:
 						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 					else
@@ -135,7 +135,7 @@ if $ARGS[0] = 'model':
 				if pcs_inhib < 25:
 					'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 					act 'Look at something else':gt 'foto_shoot','model'
-					
+
 					if pcs_mdlng > 20:
 						gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 					else
@@ -145,7 +145,7 @@ if $ARGS[0] = 'model':
 						*nl
 						'Or you could just force yourself do it anyways...'
 						act 'Agree (2:00) (<<will_cost>> Willpower)':gt 'foto_shoot', 'lingerie'
-					end	
+					end
 				else
 					cla
 					act 'Look at something else':gt 'foto_shoot','model'
@@ -163,7 +163,7 @@ if $ARGS[0] = 'model':
 			gt'foto_shoot', 'glamour_shoot'
 		end
 	end
-	
+
 	act'"I''d like to do a nude shoot"':
 		if pcs_inhib < 30 and modelfoto['nude'] < 1:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'model':
 			gt'foto_shoot', 'nude_shoot'
 		end
 	end
-	
+
 	if Fit['FMR'] = 1:
 		 act '"I''d like to do a fitness shoot"':gt 'foto_shoot', 'fitness_shoot'
 	end
@@ -233,11 +233,11 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['sexy'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other glamour options':gt 'foto_shoot', 'glamour_shoot'
-			
+
 			if pcs_inhib > 20:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -247,7 +247,7 @@ if $ARGS[0] = 'glamour_shoot':
 				*nl
 				'Or you could just force yourself do it anyways...'
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt 'foto_shoot', 'sexy'
-			end	
+			end
 		else
 			cla
 			act 'Look at something else':gt 'foto_shoot','model'
@@ -264,12 +264,12 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['transparent'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-			
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other glamour options':gt 'foto_shoot', 'glamour_shoot'
-			
+
 			if pcs_inhib > 40:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -279,7 +279,7 @@ if $ARGS[0] = 'glamour_shoot':
 				*nl
 				'Or you could just force yourself do it anyways...'
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt 'foto_shoot', 'transparent'
-			end	
+			end
 		else
 			cla
 			act 'Not for me':gt 'foto','studio'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'glamour_shoot':
 			act 'Agree (2:00)':gt 'foto_shoot', 'transparent'
 		end
 	end
-	
+
 	act 'Transparent Lingerie':
 		$modelfoto['shoot_type'] = 'trans_ling'
 		*clr & cla
@@ -296,12 +296,12 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['trans_ling'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-			
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other glamour options':gt 'foto_shoot', 'glamour_shoot'
-			
+
 			if pcs_inhib > 40:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -311,7 +311,7 @@ if $ARGS[0] = 'glamour_shoot':
 				*nl
 				'Or you could just force yourself do it anyways...'
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt 'foto_shoot', 'trans_ling'
-			end	
+			end
 		else
 			cla
 			act 'Not for me':gt 'foto','studio'
@@ -328,12 +328,12 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['topless'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-			
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other glamour options':gt 'foto_shoot', 'glamour_shoot'
-			
+
 			if pcs_inhib > 45:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -347,7 +347,7 @@ if $ARGS[0] = 'glamour_shoot':
 		else
 			cla
 			act 'Look at something else':gt 'foto_shoot','model'
-			
+
 			act 'Agree (2:00)':gt 'foto_shoot', 'topless'
 		end
 	end
@@ -360,12 +360,12 @@ end
 !! ----------------------------------------------------------------------------------------------------
 
 if $ARGS[0] = 'nude_shoot':
-	
+
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"Alright, we can do that. What kind of nude shoot?"'
-	
+
 	act 'Limited nude':
 		$modelfoto['shoot_type'] = 'taste_nude'
 		*clr & cla
@@ -374,12 +374,12 @@ if $ARGS[0] = 'nude_shoot':
 			if modelfoto['tastenude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
-			end		
-			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+			end
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other nude options':gt 'foto_shoot', 'nude_shoot'
-			
+
 			if pcs_inhib > 35:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -393,13 +393,13 @@ if $ARGS[0] = 'nude_shoot':
 		else
 			cla
 			act 'Look at something else':gt 'foto_shoot','model'
-			
+
 			act 'Agree (2:00)':gt 'foto_shoot', 'tasteful'
 		end
 	end
-	
+
 	act 'Exposed breasts nude':
-		
+
 		$modelfoto['shoot_type'] = 'top_nude'
 		*clr & cla
 		if modelfoto['toplessnude'] >= 3 and modelfoto['pussy'] < 1:gt 'foto_events', 'nude_persuasion'
@@ -407,12 +407,12 @@ if $ARGS[0] = 'nude_shoot':
 			if modelfoto['toplessnude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-			
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other nude options':gt 'foto_shoot', 'nude_shoot'
-			
+
 			if pcs_inhib > 50:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -426,11 +426,11 @@ if $ARGS[0] = 'nude_shoot':
 		else
 			cla
 			act 'Look at something else':gt 'foto_shoot','model'
-			
+
 			act 'Agree (2:00)':gt 'foto_shoot', 'topless_nude'
 		end
 	end
-	
+
 	act 'Full exposure':
 		$modelfoto['shoot_type'] = 'full_nude'
 		if modelfoto['fullnude'] = 0:
@@ -447,10 +447,10 @@ if $ARGS[0] = 'nude_shoot':
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-		
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other nude options':gt 'foto_shoot', 'nude_shoot'
-			
+
 			if pcs_inhib > 55:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -468,7 +468,7 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Agree (2:00)':gt 'foto_shoot', 'nude'
 		end
 	end
-	
+
 	act 'Erotic':
 		$modelfoto['shoot_type'] = 'erotic'
 		*clr & cla
@@ -478,12 +478,12 @@ if $ARGS[0] = 'nude_shoot':
 			elseif modelfoto['erotic'] >= 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
-				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
+				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 			end
-			
+
 			act 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other nude options':gt 'foto_shoot', 'nude_shoot'
-			
+
 			if pcs_inhib > 60:
 				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
 			else
@@ -519,7 +519,7 @@ if $ARGS[0] = 'fitness_shoot':
 
 		act 'Agree (2:00)':gt 'foto_shoot', 'sportswear'
 	end
-	
+
 	act 'Sports underwear':
 		if pcs_inhib < 20:
 			msg' You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
@@ -530,7 +530,7 @@ if $ARGS[0] = 'fitness_shoot':
 			act 'Agree (2:00)':gt 'foto_shoot', 'sports_underwear'
 		end
 	end
-            
+
 	act 'Artistic nude':
 		if pcs_inhib < 45:
 			msg' You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
@@ -680,7 +680,7 @@ if $ARGS[0] = 'trans_ling':
 	modelfoto['nip'] += 1
 	modelfoto['lingerie'] += 1
 	gs 'exp_gain', 'mdlng', rand(8,10)
-	if pcs_inhib < 45: 
+	if pcs_inhib < 45:
 		gs 'willpower','pay','self'
 		inhib_exp += rand(1,3)
 	end
@@ -710,6 +710,7 @@ if $ARGS[0] = 'topless':
 	modelpayfin = 700 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
 	modelfoto['nip'] += 1
 	modelfoto['topless'] += 1
+	modelfoto['glamour'] += 1
 	gs 'exp_gain', 'mdlng', rand(6,10)
 	if pcs_inhib < 50:
 		gs 'willpower','pay','self'
@@ -737,7 +738,7 @@ if $ARGS[0] = 'tasteful':
 	modelfoto['tastenude'] += 1
 	modelfoto['nude'] += 1
 	gs 'exp_gain', 'mdlng', rand(9,10)
-	if pcs_inhib < 40: 
+	if pcs_inhib < 40:
 		gs 'willpower','pay','self'
 		inhib_exp += rand(1,2)
 	end
@@ -771,7 +772,7 @@ if $ARGS[0] = 'topless_nude':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,79)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
 	*nl
-	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'			
+	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 	if pcs_mdlng >= 40 and commercial = 0:
 		act 'Leave':gt 'foto_events', 'commercial'
 	else
@@ -857,7 +858,7 @@ if $ARGS[0] = 'erotic':
 	if pcs_inhib < 60:inhib_exp += 6
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,19)>>.jpg"></center>'
 	if $pantyworntype ! 'none':
-	
+
 	else
 		'Already naked, you step onto the set and begin the shoot immediately.'
 	end
@@ -893,7 +894,7 @@ if $ARGS[0] = 'sportswear':
 	*nl
 	'Modeling sportwear, is slighty different from other jobs. First, you are taken to the near-by Havanna Fitness Center, as the studio doesn''t have all the necessary props to do it. Second, you must look "dynamic", and that means do some warm-ups, and add some oil, to give that "sweaty" and "sporty" look. After that, you are ready to pose the next two hours for the photographer.'
 	*nl
-	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'    
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
 	if pcs_mdlng >= 40 and commercial = 0:
 		act 'Leave':gt 'foto_events', 'commercial'
 	else
@@ -939,7 +940,7 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	gs 'exp_gain', 'mdlng', rand(4,5)
 	gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += 2
-	gs 'stat'	
+	gs 'stat'
 	temp_bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
 	if temp_bs_class / 100 >= 2 and (temp_bs_class mod 100) >= 8:
 		*clr & cla
@@ -955,7 +956,7 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	*nl
 	'You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, are less provocative, than artistic, as they must show your body in movement so they can appear in sports-related advertisements, articles, and magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 	act 'Leave':gt 'foto', 'end'
-end	
+end
 
 !!	act 'Variety shoot':
 !!		if pcs_inhib < 60:

+ 1 - 1
locations/gad_gpbarn.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'barn_room':
 	'A small rustic loft space converted from your grandparents barn. A pair of sleeping pallets of dubious comfort is laid out for guests. The room walls are whitewashed with some clothes lines to dry your clothes with some farming tools. It''s not much to look at but it''s somewhere you can call home and have some privacy.'
 
 	!! Activities - basic only. There is no internet so laptop is consigned to grandparents only. Room is too small for exercise, use yard or forest meadow.
-	gs 'events', 'read'
+	gs 'library_functions', 'set_home_read_acts'
 	act 'Relax on your bed': gt 'bed', 'start'
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'

+ 47 - 0
locations/gad_gpchores.qsrc

@@ -0,0 +1,47 @@
+# gad_gpchores
+!! Modified date:  June, 2024
+!! Version: .1 - initial initial release
+!! Author: Hooded Silence
+!!
+!! Task initiator for the grandparents chores whilst Sveta is staying with grandparents.
+
+if $ARGS[0] =  'init':
+    if gp_chores['active'] > 1
+        gt 'gad_gpchores', 'active'
+    end
+    gs 'gp_chores', 'convo'
+end
+
+if $ARGS[0] = 'active':
+end
+
+!! Conversations
+if $ARGS[0] = 'convo':
+    if gp_chores = 0:
+        'You approach your <relation> to ask if they have any jobs for you today.'
+        if gp_chores['mood'] < 0:
+            gp_chores['bonus'] = 0
+            'You are lazy {mc}, i am not sure if you can be trusted to do your share.'
+        elseif gp_chores['mood'] < 10:
+            'Your <relation gives you a hard stare, you are nothing about a layabout. Get out of my sight!'
+        elseif gp_chores['mood'] > 10:
+            gp_chores['bonus'] = 10
+            'You have been so helpful {mc}, it is wonderful to have you with us. Here''s a something little extra for you. '
+        elseif gp_chores['mood'] > 20:
+            gp_chores['bonus'] = 20
+            'Your <relation> face lights up when they see you. You have been such a hardworking girl, you''re mother will be so proud of how diligant you become. Here have a little extra cash for your efforts.'
+
+            !! potential for helping in village with high rep?
+        elseif gp_chores['mood']
+
+    end
+    if gp_chores['active'] = -1:
+        gp_chores['failed'] += 1
+        gp_chores['mood'] -= 1
+    end
+    if gp_chores['active'] = 5:
+        gp_chores['completed'] += 1
+        gp_chores['mood'] += 1
+    end
+end
+--- gad_gpchores ---------------------------------

+ 4 - 1
locations/gad_gphouse.qsrc

@@ -43,14 +43,17 @@ if $ARGS[0] = 'setup':
 	!! gs $loc, 'boniface'
 	!! gs 'gad_gp_chores', 'start'
 	!! gs 'locat', 'A60'
+	gs 'miroslava_schedule'
 	gs 'gp_elene_schedule'
 	gs 'gp_zlatek_schedule'
+
+	!! Job Tracker
+	!! gs 'gad_gpchores', 'init'
 	if gp_debug = 1:
     !! test tracker
 		$locat['elene']
 		$locat['zlatek']
 	end
-
 end
 
 !! leave location - reset vars and other housekeeping functions

+ 49 - 12
locations/gad_gpyard.qsrc

@@ -146,9 +146,30 @@ if $ARGS[0] = 'root_cellar':
 		'Your grandparents'' root cellar is empty.'
 	end
 	'Even though your grandparents allow you to store extra mushrooms and berries you pick, they reserve the right to use them, too, so you aren''t surprised if any go missing.'
-	if boletus_stored > 0: 'You currently are storing <b><<boletus_stored>></b> kg of raw mushrooms.'
-	if bilberry_stored > 0: 'You currently are storing <b><<bilberry_stored>></b> kg of raw berries.'
+	if boletus_stored + bilberry_stored > 0:
+		$temp_text = 'You currently are storing '
+		if boletus_stored > 0:
+			$temp_text += '<b><<boletus_stored>></b> kg of raw mushrooms'
+			if bilberry_stored > 0: $temp_text += ' and '
+		end
+		if bilberry_stored > 0: $temp_text += '<b><<bilberry_stored>></b> kg of raw berries'
+		$temp_text += '.'
+		'<<$temp_text>>'
+		killvar '$temp_text'
+	end
+	if boletus_stored + bilberry_stored >= 20:
+		'You can''t store anymore mushrooms and berries.'
+	else
+		'You can still store <b><<20 - boletus_stored - bilberry_stored>></b> kg of mushrooms and berries.'
+	end
+	if fish_stored > 0: 'You currently are storing <b><<fish_stored>></b> kg of preserved fish.'
+	if fish_stored >= 10:
+		'You can''t store anymore preserved fish.'
+	else
+		'You can still store <b><<10 - fish_stored>></b> kg of preserved fish.'
+	end
 	*nl
+
 	if boletus + boletus_cooked + bilberry >= 5:
 		'Your basket is full and you cannot carry more.'
 	elseif boletus + boletus_cooked + bilberry > 0:
@@ -156,6 +177,7 @@ if $ARGS[0] = 'root_cellar':
 	else
 		'Your basket is empty.'
 	end
+
 	if boletus > 0: 'You currently are carrying <b><<boletus>></b> kg of raw mushrooms.'
 	if boletus_cooked > 0: 'You currently are carrying <b><<boletus_cooked>></b> kg of cooked mushrooms.'
 	if bilberry > 0: 'You currently are carrying <b><<bilberry>></b> kg of raw berries.'
@@ -164,16 +186,15 @@ if $ARGS[0] = 'root_cellar':
 	if (boletus_stored + bilberry_stored < 20) and (boletus > 0 or bilberry > 0):
 		act 'Store as many raw mushrooms and berries that will fit (Max 20 kgs):':
 			:store_bb_loop
-			if boletus > 0:
-				boletus_stored += 1
-				boletus -= 1
-				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
-			end
-			if bilberry > 0:
-				bilberry_stored += 1
-				bilberry -= 1
-				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
-			end
+				if boletus > 0 and boletus_stored + bilberry_stored < 20:
+					boletus_stored += 1
+					boletus -= 1
+				end
+				if bilberry > 0 and boletus_stored + bilberry_stored < 20:
+					bilberry_stored += 1
+					bilberry -= 1
+				end
+			if boletus_stored + bilberry_stored < 20 and boletus + bilberry > 0: jump 'store_bb_loop'
 			gt 'gad_gpyard', 'root_cellar'
 		end
 		if boletus > 0:
@@ -191,6 +212,22 @@ if $ARGS[0] = 'root_cellar':
 			end
 		end
 	end
+	if boletus_stored + bilberry_stored <= 10:
+		if mc_inventory['mushrooms'] > 0 and boletus_stored + bilberry_stored <= 10:
+			act 'Store 10 kg of bought mushrooms':
+				mc_inventory['mushrooms'] -= 1
+				boletus_stored += 10
+				gt 'gad_gpyard', 'root_cellar'
+			end
+		end
+		if mc_inventory['berries'] > 0 and boletus_stored + bilberry_stored <= 10:
+			act 'Store 10 kg of bought berries':
+				mc_inventory['berries'] -= 1
+				bilberry_stored += 10
+				gt 'gad_gpyard', 'root_cellar'
+			end
+		end
+	end
 	if (boletus_stored > 0 or bilberry_stored > 0) and (boletus + boletus_cooked + bilberry < 5):
 		act 'Retrieve as many raw mushrooms and berries as you can carry (Max 5 kgs)':
 			:retrieve_bb_loop

+ 485 - 0
locations/gad_market.qsrc

@@ -0,0 +1,485 @@
+# gad_market
+
+if $ARGS[0] = 'start':
+	$region = 'gad'
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'gad_market', 'start'
+	$location_type = 'public_outdoors'
+	CLOSE ALL
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
+		else
+			PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
+		end
+	end
+	gs 'stat'
+
+	'<center><h2>Farmers Market</h2></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/farmersmarket.jpg"></center>'
+	'A small and modest farmers market, a few small shops fill the space.'
+	*nl
+
+	if hour < 8 or hour > 20:
+		gs 'gad_market', 'close'
+		exit
+	end
+
+	'On one side you spot a stand where' + iif(hunters_were_met = 1, ' the hunters are ', ' ') + 'selling <a href="exec:minut += 1 & gt ''gad_market'', ''hunter_stand''">dried goods</a>.'
+	act 'Browse the <<iif(hunters_were_met = 1, ''hunters'', ''dried food'')>> stand': minut += 1 & gt 'gad_market', 'hunter_stand'
+
+	'You spot a stand filled with <a href="exec:minut += 1 & gt ''gad_market'', ''clothing_stand''">cheap clothing</a>.'
+	act 'Browse the clothing stand': minut += 1 & gt 'gad_market', 'clothing_stand'
+
+	if gad_stand = 1:
+		if hour <= 20:
+			act 'Go to your own stand (0:01)': minut += 1 & gt 'gad_market', 'your_stand'
+		end
+
+		act 'Breakdown your stand (0:30)': gt 'gad_market', 'breakdown_stand'
+		act '<font color="red">Return</font>': *nl '<font color="red">You can''t leave while your stand is still open.</font>'
+	else
+		if hour < 18 and (boletus_stored + bilberry_stored + fish_stored) > 0:
+			act 'Setup your own stand (1:00)': gt 'gad_market', 'build_stand'
+		elseif hour >= 18:
+			*nl
+			'It''s too late to build your stand'
+		else
+			*nl
+			'You have nothing to sell.'
+		end
+		act 'Return': gt 'gad_market', 'leave'
+	end
+end
+
+
+!----- Shops -----
+
+if $ARGS[0] = 'hunter_stand':
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'gad_market', 'hunter_stand'
+	$loc_s = 'gad_market'
+	$args_s = 'hunter_stand'
+	gs 'stat'
+
+	if hour < 8 or hour > 20:
+		'The shop is currently closed.'
+
+		act 'Leave': gt 'gad_market', 'clothing_stand'
+		exit
+	end
+
+
+	'A small stand selling dried meat'
+
+	if hunters_were_met = 1: act 'Talk to one of the hunters': gt 'gad_market', 'hunter_talk'
+
+	act 'Browse the stand': gt 'gad_market', 'hunter_cart'
+	act 'Stop browsing': gt 'gad_market', 'start'
+end
+
+if $ARGS[0] = 'hunter_cart':
+	menu_off = 1
+	gs 'shortgs', 'setloc', 'gad_market', 'hunter_cart'
+	$loc_s = 'gad_market'
+	$args_s = 'hunter_cart'
+	gs 'stat'
+
+	if hour < 8 or hour > 20:
+		'The shop is currently closed.'
+
+		act 'Leave': gt 'gad_market', 'hunter_stand'
+		exit
+	end
+
+	gs 'item_cart', 'shoppping_aisle', 'gad_market_hunter'
+	gs 'stat'
+	gs 'themes', 'outdoors'
+
+	act 'Exit shopping cart': $backimage = '' & gt 'gad_market', 'hunter_stand'
+	act 'Leave the stand': minut += 1 & gt 'gad_market', 'start'
+end
+
+if $ARGS[0] = 'clothing_stand':
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'gad_market', 'clothing_stand'
+	$loc_s = 'gad_market'
+	$args_s = 'clothing_stand'
+
+	'A small stand selling cheap clothes'
+
+	if hour < 8 or hour > 20:
+		'The shop is currently closed.'
+
+		act 'Leave': gt 'gad_market', 'clothing_stand'
+		exit
+	end
+
+
+	act 'Browse the clothes': gt 'gad_market', 'clothing_cart'
+	act 'Browse the swimsuits': gt 'gad_market', 'swimsuit_cart'
+	act 'Stop browsing': gt 'gad_market', 'start'
+end
+
+if $ARGS[0] = 'clothing_cart':
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'gad_market', 'clothing_cart'
+	$loc_s = 'gad_market'
+	$args_s = 'clothing_cart'
+	gs 'stat'
+
+	'<center><b><font color="maroon">Clothes</font></b></center>'
+	'You inspect what cheap clothing the stall has to offer.'
+
+	if hour < 8 or hour > 20:
+		'The shop is currently closed.'
+
+		act 'Leave': gt 'gad_market', 'clothing_stand'
+		exit
+	end
+
+	act 'Return': minut += 5 & gt 'gad_market', 'clothing_stand'
+
+	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'totals', 'market_outfits'
+
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+		i = 1 + clothingstock mod 4
+		:loopmarket_outfits
+			if market_outfits[i] = 0:
+				gs 'clothing_attributes', 'market_outfits', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''gad_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+				end
+			end
+			!! Only half of the market outfits are ever sold here.
+			i += 8
+		if i <= total: jump 'loopmarket_outfits'
+		clo_i += 1
+	if (clothingfilter['quality'] = 0 and clo_i <= 7) or (clothingfilter['inhibition'] = 0 and clo_i <= 50):
+		jump 'loopmarket_outfits_filter'
+	end
+end
+
+if $ARGS[0] = 'marketclo':
+	if market_outfits[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'gad_market', 'clothing_cart'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'market_outfits', i, 750, 'shop'
+end
+
+if $ARGS[0] = 'swimsuit_cart':
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'gad_market', 'swimsuit_cart'
+	$loc_s = 'gad_market'
+	$args_s = 'swimsuit_cart'
+	gs 'stat'
+
+	'<center><b><font color="maroon">Swimsuits</font></b></center>'
+	'You inspect what cheap swimsuits the stall has to offer.'
+
+	if hour < 8 or hour > 20:
+		'The shop is currently closed.'
+
+		act 'Leave': gt 'gad_market', 'clothing_stand'
+		exit
+	end
+
+	act 'Return': minut += 5 & gt 'gad_market', 'clothing_stand'
+
+	gs 'clothing_QV', 'shop_filter_header'
+
+	!!To filter just this set
+	clo_i = 0
+	:loopgad_swim_filter
+		if (Clothingstock / 4) mod 2 = 0:
+			i = 4
+			if scandalicious_swimsuit[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_swimsuit', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+			i = 6
+			if scandalicious_bikinis[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_bikinis', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+			i = 7
+			if scandalicious_bikinis[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_bikinis', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+		else
+			i = 15
+			if scandalicious_swimsuit[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_swimsuit', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+			i = 22
+			if scandalicious_swimsuit[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_swimsuit', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+			i = 60
+			if scandalicious_bikinis[i] = 0:
+				gs 'clothing_attributes', 'scandalicious_bikinis', i
+				gs 'clothing_QV', 'shop_filter'
+
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''gad_market'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg"	 height="250" /></a>'
+				end
+			end
+		end
+		clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
+		jump 'loopgad_swim_filter'
+	end
+end
+
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 1750, 'shop'
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit', i, 1750, 'shop'
+
+
+
+if $ARGS[0] = 'build_stand':
+	menu_off = 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'It takes you roughly an hour to setup your stand.'
+
+	act 'Continue':
+		minut += rand(40, 60)
+		gad_stand = 1
+		gt 'gad_market', 'your_stand'
+	end
+end
+
+if $ARGS[0] = 'breakdown_stand':
+	menu_off = 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'It takes you roughly half an hour to break down your stand.'
+
+	act 'Continue':
+		minut += rand(20, 30)
+		gad_stand = 0
+		gt 'gad_market', 'start'
+	end
+end
+
+
+if $ARGS[0] = 'your_stand':
+	gs 'shortgs', 'setloc', 'gad_market', 'your_stand'
+	gs 'stat'
+
+	'<center><b><font color="maroon">Your Stand</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gad_market', 'see_stored'
+
+	act 'Try and sell your wares': gt 'gad_market', 'sell_wares'
+	act 'Go back': gt 'gad_market', 'start'
+end
+
+if $ARGS[0] = 'sell_wares':
+	menu_off = 1
+	gs 'stat'
+
+	if hour < 8 or hour > 20:
+		'The market is closed, you should break down your stand.'
+		act 'Break down your stand': gt 'gad_market', 'breakdown_stand'
+		exit
+	end
+
+
+	temp_rand = rand(0, 249)
+	if temp_rand >= pcs_chrsm + pcs_persuas:
+		if rand(0, 2) > 0:
+			gt 'gad_market', 'sell_talk'
+		else
+			gt 'gad_market', 'sell_nobody'
+		end
+	else
+		temp_rand = rand(0, 6)
+		if temp_rand < 2 and boletus_stored > 0:
+			gt 'gad_market', 'sell_mushrooms'
+		elseif temp_rand >= 2 and temp_rand < 4 and bilberry_stored > 0:
+			gt 'gad_market', 'sell_berries'
+		elseif temp_rand >= 4 and temp_rand < 6 and fish_stored > 0:
+			gt 'gad_market', 'sell_fish'
+		else
+			gt 'gad_market', 'sell_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'sell_nobody':
+	minut += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gad_market', 'see_stored'
+
+
+	'You wait 10 minutes, but nobody seems interested in what you have to sell'
+	act 'Continue trying to sell your wares': gt 'gad_market', 'sell_wares'
+	act 'Stop selling  your wares': gt 'gad_market', 'your_stand'
+
+
+elseif $ARGS[0] = 'sell_mushrooms':
+	minut += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gad_market', 'see_stored'
+	'Somebody wants to buy a kg of mushrooms!'
+
+	act 'Sell them 1 kg of stored mushrooms':
+		*clr & cla
+		money += 20
+		boletus_stored -= 1
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		gs 'gad_market', 'see_stored'
+		'You sell 1 kg of stored mushrooms'
+
+		act 'Continue trying to sell your wares': gt 'gad_market', 'sell_wares'
+		act 'Stop selling  your wares': gt 'gad_market', 'your_stand'
+	end
+
+
+elseif $ARGS[0] = 'sell_berries':
+	minut += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+
+	gs 'gad_market', 'see_stored'
+
+
+	'Somebody wants to buy a kg of berries!'
+	act 'Sell them 1 kg of stored berries':
+		*clr & cla
+		money += 20
+		bilberry_stored -= 1
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		gs 'gad_market', 'see_stored'
+		'You sell 1 kg of stored berries'
+
+		act 'Continue trying to sell your wares': gt 'gad_market', 'sell_wares'
+		act 'Stop selling  your wares': gt 'gad_market', 'your_stand'
+	end
+
+elseif $ARGS[0] = 'sell_fish':
+	minut += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gad_market', 'see_stored'
+	'Somebody wants to buy a kg of preserved fish!'
+
+	act 'Sell them 1 kg of preserved fish':
+		*clr & cla
+		money += 20
+		fish_stored -= 1
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		gs 'gad_market', 'see_stored'
+		'You sell 1 kg of preserved fish'
+
+		act 'Continue trying to sell your wares': gt 'gad_market', 'sell_wares'
+		act 'Stop selling  your wares': gt 'gad_market', 'your_stand'
+	end
+
+elseif $ARGS[0] = 'sell_talk':
+	minut += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gad_market', 'see_stored'
+	'A couple of people walk up to your stand and you spend tem minutes making some small-talk.'
+
+	act 'Continue trying to sell your wares': gt 'gad_market', 'sell_wares'
+	act 'Stop selling  your wares': gt 'gad_market', 'your_stand'
+end
+
+if $ARGS[0] = 'see_stored':
+	if boletus_stored > 0:	'You currently are storing <b><<boletus_stored>></b> kg of raw mushrooms.'
+	if bilberry_stored > 0:	'You currently are storing <b><<bilberry_stored>></b> kg of raw berries.'
+	if fish_stored > 0:		'You currently are storing <b><<fish_stored>></b> kg of preserved fish.'
+	if boletus_stored + bilberry_stored + fish_stored = 0: 'You currently have nothing that you can sell'
+end
+
+
+
+
+
+if $ARGS[0] = 'hunter_talk':
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> scr="images/system/image_needed.png"></center>'
+	'You talk to the hunters.'
+
+	act 'Return': gt 'gad_market', 'hunter_stand'
+end
+
+
+
+if $ARGS[0] = 'close':
+	menu_off = 1
+	gs 'stat'
+
+	if gad_stand = 1:
+		'The market is closing, you should break down your stand.'
+		act 'Break down your stand': gt 'gad_market', 'breakdown_stand'
+	else
+		'The market is closing and so you head back to the main street.'
+		act 'Return': gt 'gad_market', 'leave'
+	end
+end
+
+if $ARGS[0] = 'leave':
+	minut += 5
+	killvar 'temp_rand'
+	gt 'gadukino'
+end
+
+--- gad_market ---------------------------------

+ 1 - 1
locations/gad_miroslava_home.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'mirabrother':
 
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big65.jpg"></center>'
 		'You ask Mira''s brother for a ride on his motorcycle.'
-		if hotcat < 5:
+		if pcs_hotcat < 5:
 			if npc_rel['A60'] > 20:
 				'He looks you up and down, checking you out and says, "Some other time."'
 			else

+ 7 - 7
locations/gad_prostitutes.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		'It is not a good time of day for prostitution. Try coming back later in the evening.'
 	else
 		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
-		if locat['A60'] = 80 and MiraVars['pimp'] = 1 and (npc_QW['A63'] >= 11 or GadBoy['river_gang'] = 2): 
+		if locat['A60'] = 80 and MiraVars['pimp'] = 1 and (npc_QW['A63'] >= 11 or GadBoy['river_gang'] = 2):
 			gs 'gad_prostitutes', 'mira_rebels'
 		else
 			if locat['A60'] = 80:
@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 
 				! event to become miras pimp if not the boys slut, not the village whore
 				if MiraVars['pimp'] = 0 and npc_QW['A63'] < 11 and GadBoy['river_gang'] = 0: gt 'gad_prostitutes', 'pimp_mira'
-				
+
 				! events to prostitute just Mira
 				act 'Watch Mira prostitute herself': gt 'gad_prostitutes', 'just_mira'
 
@@ -93,7 +93,7 @@ end
 if $ARGS[0] = 'mira_rebels':
 	*clr & cla
 	MiraVars['pimp'] = 2
-	gs 'prostitution_functions', 'set_gadukion_prostitute'	
+	gs 'prostitution_functions', 'set_gadukion_prostitute'
  	minut += 5
 	gs 'stat'
 
@@ -280,11 +280,11 @@ if $ARGS[0] = 'work_alone':
 
 	!! TODO: Should find some video that is more roadside - evening, morning, different weather, etc.
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'
-	
+
 	!! TODO: Need to rewrite this to reflect the Gadukino location
-	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<pcs_hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
-	!! TODO: The enema thing should be aligned with the rest of the game. 
+	!! TODO: The enema thing should be aligned with the rest of the game.
 	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. So you should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period; most men will pay less for vaginal sex during that time of the month.'
 	if prostitute['cum_dressed'] = 1: '<br>You have visible cum stains on you. Most clients won''t like that and will offer less money.'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'work_alone':
 	!! NOTE:  This is where the working/negotiationg part begins in the original file. Moved to a separate file.
 	!! This call just displays the explanation and the "config" of the negotiations on the page.
 	gs 'prostitution_car_negotiation', 'general_description'
-end 
+end
 
 !!------ Random events and scenes, from police raids to robbery, etc. ----------------------------------------------------
 !!-- TODO: Any random event should go here.

+ 105 - 50
locations/gad_river.qsrc

@@ -159,10 +159,11 @@ if $ARGS[0] = 'fishers':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverfishers.jpg"></center>'
 
-	if fishersday ! daystart:
+	if fishersday = daystart:
+		act 'Leave': gt 'gad_river', 'start'
+	else
 		act 'Greet':
-			cla
-			*clr
+			*clr & cla
 			fishersday = daystart
 			minut += 3
 			if fishersQW < 3:fishersQW += 1
@@ -173,8 +174,7 @@ if $ARGS[0] = 'fishers':
 
 			if fishersQW >= 3:
 				act 'Chat':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					if fishersQW = 3:fishersQW = 4
 					gs 'stat'
@@ -187,8 +187,7 @@ if $ARGS[0] = 'fishers':
 			end
 			if fishersQW = 4:
 				act 'Ask to borrow a fishing rod':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					fishersQW = 5
 					gs 'stat'
@@ -198,11 +197,9 @@ if $ARGS[0] = 'fishers':
 
 					act 'Fishing': gt 'gad_river', 'fishing'
 				end
-			end
-			if fishersQW = 5:
+			elseif fishersQW = 5:
 				act 'Fishing with them':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					gs 'stat'
 
@@ -215,8 +212,6 @@ if $ARGS[0] = 'fishers':
 
 			act 'Leave': gt 'gad_river', 'start'
 		end
-	else
-		act 'Leave': gt 'gad_river', 'start'
 	end
 end
 
@@ -244,8 +239,7 @@ if $ARGS[0] = 'fishing':
 			'You throw out the lure and watch the bobber for signs of a nibble.'
 
 			if temp_rand < rand(1, 5):
-				cla
-				*clr
+				*clr & cla
 				minut += 1
 				gs 'stat'
 
@@ -285,17 +279,17 @@ if $ARGS[0] = 'fishing':
 			killvar 'temp_rand'
 		end
 		act 'Finish':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 			'You''re tired, so you return the fishing rod to uncle Stepan.'
-			if fish > 0:
+			if fish = 0:
+				act 'Leave': gt $loc, $loc_arg
+			else
 				act 'Release your catch':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
 					fish = 0
 					gs 'stat'
@@ -305,9 +299,9 @@ if $ARGS[0] = 'fishing':
 
 					act 'Leave': gt $loc, $loc_arg
 				end
+				!{
 				act 'Give the fish to Uncle Stepan':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
 					fish = 0
 					gs 'stat'
@@ -317,36 +311,65 @@ if $ARGS[0] = 'fishing':
 
 					act 'Leave': gt $loc, $loc_arg
 				end
+				}
 				act 'Bring a fish to Boniface':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
 					fish -= 1
-					pcs_mood += rand(15,40)
+					pcs_mood += rand(15, 40)
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
 					'As soon as you enter the house, Boniface immediately jumps to the floor and twines around your feet. Then, the furry beast starts loudly yowling and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish, and within a few minutes, all that remains is a pile of fish bones.'
-					if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
-
+					!if fish > 0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+					if fish > 0:
+						'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather.'
+						if fish_stored >= 10:
+							'He sighs heavily, then takes the fish outside to preserve them. Since you can''t store anymore fish in the root celler, your grandfather decide to give the remaining <<fish>> away.'
+						elseif fish_stored + fish > 10:
+							fish -= (10 - fish_stored)
+							'He sighs heavily, then takes the fish outside to preserve and store them, filling up the remaining space. He decides to give the remaining <<fish>> fish away.'
+						else
+							fish_stored += fish
+							'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to preserve and store them in the root celler.'
+							if fish_stored < 10:
+								'There''s still space for <<10 - fish_stored>> kg of preserved fish.'
+							else
+								'There''s no more space for preserved fish in the root celler.'
+							end
+						end
+						fish = 0
+					end
 					act 'Finish': gt 'gad_gphouse', 'start'
 				end
 				act 'Give the fish to your grandmother':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
-					'You try to give the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
-
+					!'You try to give the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+					'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather.'
+					if fish_stored >= 10:
+						'He sighs heavily, then takes the fish outside to preserve them. Since you can''t store anymore fish in the root celler, your grandfather decide to give the remaining <<fish>> away.'
+					elseif fish_stored + fish > 10:
+						fish -= (10 - fish_stored)
+						'He sighs heavily, then takes the fish outside to preserve and store them, filling up the remaining space. He decides to give the remaining <<fish>> fish away.'
+					else
+						fish_stored += fish
+						'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to preserve and store them in the root celler.'
+						if fish_stored < 10:
+							'There''s still space for <<10 - fish_stored>> kg of preserved fish.'
+						else
+							'There''s no more space for preserved fish in the root celler.'
+						end
+					end
+					fish = 0
 					act 'Finish': gt 'gad_gphouse', 'start'
 				end
-			else
-				act 'Leave': gt $loc, $loc_arg
 			end
 		end
 	else
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		pcs_mood -= rand(5,10)
 		gs 'stat'
@@ -354,10 +377,11 @@ if $ARGS[0] = 'fishing':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 		'Uncle Stepan says, "It''s time to head home, young lady." You reluctantly return his fishing rod, knowing that''s it for today.'
 
-		if fish > 0:
+		if fish = 0:
+			act 'Leave': gt $loc, $loc_arg
+		else
 			act 'Release your catch':
-				cla
-				*clr
+				*clr & cla
 				minut += 5
 				fish = 0
 				gs 'stat'
@@ -367,9 +391,9 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave': gt $loc, $loc_arg
 			end
+			!{
 			act 'Give to Uncle Stepan':
-				cla
-				*clr
+				*clr & cla
 				minut += 5
 				fish = 0
 				gs 'stat'
@@ -379,10 +403,10 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave': gt $loc, $loc_arg
 			end
+			}
 			if grandmaQW['block'] = 0:
 				act 'Bring a fish to Boniface':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
 					fish -= 1
 					pcs_mood += rand(15,40)
@@ -390,22 +414,53 @@ if $ARGS[0] = 'fishing':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
 					'As soon as you enter the house, Boniface immediately jumps to the floor and twines around your feet. Then, the furry beast starts loudly yowling and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish, and within a few minutes, all that remains is a pile of fish bones.'
-					if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
-
+					!if fish > 0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+					if fish > 0:
+						'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather.'
+						if fish_stored >= 10:
+							'He sighs heavily, then takes the fish outside to preserve them. Since you can''t store anymore fish in the root celler, your grandfather decide to give the remaining <<fish>> away.'
+						elseif fish_stored + fish > 10:
+							fish -= (10 - fish_stored)
+							'He sighs heavily, then takes the fish outside to preserve and store them, filling up the remaining space. He decides to give the remaining <<fish>> fish away.'
+						else
+							fish_stored += fish
+							'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to preserve and store them in the root celler.'
+							if fish_stored < 10:
+								'There''s still space for <<10 - fish_stored>> kg of preserved fish.'
+							else
+								'There''s no more space for preserved fish in the root celler.'
+							end
+						end
+						fish = 0
+					end
 					act 'Finish': gt 'gad_gphouse', 'start'
 				end
 				act 'Give the fish to your grandmother':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
-					'You try to give the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+					gs 'stat'
 
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
+					!'You try to give the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+					'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather.'
+					if fish_stored >= 10:
+						'He sighs heavily, then takes the fish outside to preserve them. Since you can''t store anymore fish in the root celler, your grandfather decide to give the remaining <<fish>> away.'
+					elseif fish_stored + fish > 10:
+						fish -= (10 - fish_stored)
+						'He sighs heavily, then takes the fish outside to preserve and store them, filling up the remaining space. He decides to give the remaining <<fish>> fish away.'
+					else
+						fish_stored += fish
+						'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and points at your grandfather. He sighs heavily, then takes the fish outside to preserve and store them in the root celler.'
+						if fish_stored < 10:
+							'There''s still space for <<10 - fish_stored>> kg of preserved fish.'
+						else
+							'There''s no more space for preserved fish in the root celler.'
+						end
+					end
+					fish = 0
 					act 'Finish': gt 'gad_gphouse', 'start'
 				end
 			end
-		else
-			act 'Leave': gt $loc, $loc_arg
 		end
 	end
 end

+ 1 - 1
locations/gadukino.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = '':
 			'One of the buildings facing the square has a sign saying, General Store. A sign on the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
 
-		if (week = 4 or week = 7) and hour >= 6 and hour <= 20: act 'Go to the nearby farmers market': gt 'gad_sundaymarket', 'start'
+		if (week = 4 or week = 7) and hour >= 6 and hour <= 20: act 'Go to the nearby farmers market': gt 'gad_market', 'start'
 
 		act 'Walk to the forest road (0:10)': minut += 10 & gt 'gad_road', 'start'
 		act 'Walk to the highway (0:15)': minut += 15 & nroad = 10 & gt 'road'

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