77 Commits 9996fb3f55 ... 3e5eed75f1

Author SHA1 Message Date
  bgkjdgbizgblzdgbr 3e5eed75f1 [changed] running in the feilds in Gad now uses the prober gosub for exercisse. 1 day ago
  Kevin_Smarts 81063d912f Merge remote-tracking branch 'Anjuna/master' 2 days ago
  Vengeance_11 661397ac48 You can now go to pool cafe while still wearing swimwear 2 days ago
  Vengeance_11 925cce0ca8 Added ability to dance with Albina at school party 2 days ago
  Vengeance_11 44ffc492d2 Big round of proofreading 2 days ago
  anjuna krokus 099e32d708 [changed] spaces to tabs 3 days ago
  anjuna krokus 02a1aa4406 [added] $npcCondom variable set through `npcStat`. Requested by HornGuy6 3 days ago
  Kevin_Smarts 5a27485a61 [fixed] Orgasm message displaying in wrong place and not required as there is suitable text in the file already. Spotted by Kel [TFS] 3 days ago
  Kevin_Smarts fa1b3dd4d3 [fixed] Missing colon spotted by Chimrod 3 days ago
  hornguy6 2ba7116dcf [fixed] blocked off incomplete content 3 days ago
  bgkjdgbizgblzdgbr 95fe57d240 [changed] Made it such that you can start eating breakfast alone as soon as the family stop eating. 4 days ago
  Kevin_Smarts 616d8e9f72 Merge remote-tracking branch 'Lokplart/master' 4 days ago
  anjuna krokus cd194a3941 [fixed] Using the "tits and ass ignore body weight" cheat, those now immediately revert to your genetic norm 4 days ago
  anjuna krokus 683ff458aa [fixed] KBI should work as expected. Reported by TheUnspeakable. 4 days ago
  f95Lok 19cad97e29 Merge remote-tracking branch 'kevin/master' 5 days ago
  Kevin_Smarts dfc9adf35d Merge remote-tracking branch 'origin/master' 5 days ago
  bgkjdgbizgblzdgbr 72406faefa [fixed] Somebody forgot to remove the old act when the restructured the file. 5 days ago
  bgkjdgbizgblzdgbr f9d7ce1270 [fixed] arrsize takes strings as argument. 5 days ago
  Awesome e8867d6440 [Fixed] Disco error 5 days ago
  Awesome 09ad5c8481 [Fixed] Typo 6 days ago
  bgkjdgbizgblzdgbr 3694a98db3 [changed] Now it will not show you don't have enough willpower if the reason you can't Kiss NUsh is that you have already done it theis day. 6 days ago
  Kevin_Smarts 20d4297913 Merge remote-tracking branch 'Anjuna/master' 6 days ago
  Kevin_Smarts f3b1b2de6f Merge remote-tracking branch 'Awesome/master' 6 days ago
  Kevin_Smarts 6a6edced29 Merge remote-tracking branch 'Hornguy6/master' 6 days ago
  Kevin_Smarts 2ff78d54b7 Merge remote-tracking branch 'Lokplart/master' 6 days ago
  anjuna krokus 701ffe5b4b [fixed] typos. Reported by Dibutello 1 week ago
  anjuna krokus e9c1d3c0ba [fixed] bathroom in aphrodite is actually a bathroom 1 week ago
  Kevin_Smarts 8009df89ea Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 week ago
  anjuna krokus e4b3cd40d4 [fixed] Mother nickname not properly set in the SGTG intro 1 week ago
  Awesome faf8d656ee [Fixed] Missing `cla` 1 week ago
  Awesome e7904472fa Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 week ago
  hornguy6 7379ce3923 [fixed] wrong topcut 1 week ago
  hornguy6 a4d76cfa49 [fixed] put apostrophes around the placeholder to stop error messages 1 week ago
  hornguy6 0e33dc1c17 [changed] Pavlovsk disco dancing update and changeover from $boy to $npcID 1 week ago
  hornguy6 7b73d85b79 [changed] large update to sex_ev files including format fixing, changeover from $boy to $npcID, reference to fertility cycle checks as strings, and content reorganization and adjustment 1 week ago
  hornguy6 9ba009c1ce [added] fertility cycle as a string 1 week ago
  anjuna krokus 8f33f65076 Merge remote-tracking branch 'master/master' 1 week ago
  bgkjdgbizgblzdgbr 02a168c9c4 [added] Forgot to add the follwo up talk after Katja Artem sex, this is a quick fix a proper one hve to be written when I have time. 1 week ago
  Awesome f5d9226fa0 [Fixed] Payment method not set in shortgs payments 1 week ago
  bgkjdgbizgblzdgbr ae39722861 [fixed] Wrong name of goto. 1 week ago
  bgkjdgbizgblzdgbr 5d3e13fa6b [fixid] fairyday and fairyday[0] is the same varaibel so when fairyday['skin_increase'] is set ifrst it is fairyday[0] and hence fairyday. 1 week ago
  anjuna krokus 1f5cb41796 [fixed] fixed my woopsy 1 week ago
  anjuna krokus d867fa36dd [fixed] Added a failsafe to prevent bad npcgeneratec calls 1 week ago
  anjuna krokus aa9bad6484 [fixed] wrong npcgeneratec call 1 week ago
  anjuna krokus 43f06ee76a [fixed] incorrect npgeneratec call 1 week ago
  bgkjdgbizgblzdgbr d84b637702 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 week ago
  bgkjdgbizgblzdgbr 65439b284f [fixed] Code mistakes not couhgt by the analyser. Reported by Chimrod. 1 week ago
  Vengeance_11 5812c9ee58 Proofreading 1 week ago
  f95Lok 246b2848a7 Merge remote-tracking branch 'kevin/master' 1 week ago
  f95Lok e64f74e36a [?] removing leftover comment 1 week ago
  bgkjdgbizgblzdgbr 9edb95d2e2 [added] The first Artem Katja thresome. 1 week ago
  f95Lok 8aaa17fb79 [fixed] wrong clothing variables were being checked 1 week ago
  f95Lok 7c7addcc97 Merge remote-tracking branch 'kevin/master' 1 week ago
  Kevin_Smarts 7c1446317c Merge remote-tracking branch 'Lokplart/master' 1 week ago
  f95Lok 533369a65f [added] implemented dolls discount from Anushka quest 1 week ago
  f95Lok 3d2f0ef982 [added] generalized discount functionality through the display loop functions 1 week ago
  Kevin_Smarts 028c100e19 Merge remote-tracking branch 'Hooded_Silence/master' 1 week ago
  Kevin_Smarts 86554e06a3 Merge remote-tracking branch 'Lokplart/master' 1 week ago
  Myles Croft (Hooded Silence) 8137bb1ea1 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 week ago
  Myles Croft (Hooded Silence) 5806717883 [Double or Nothing Edition] Some quick fixes to stop double vision when firing gym events. 1 week ago
  f95Lok 226f23dfff [changed] arguments order for view_clothing_item to be in line with all other view_type_item functions 1 week ago
  f95Lok 79d1973ea1 [changed] edited 'pirsingsalon' to use the generalized display loops 1 week ago
  f95Lok 5c91e55206 [fixed] minor bugs in the newly implemented functions 1 week ago
  f95Lok 4702a33ffd [changed] renamed one attribute file to match with function arguments 1 week ago
  f95Lok cb43097084 [added] 'display_func_managed' function to 'shop_utils' 1 week ago
  f95Lok 5bcd3e7039 [added] 'view_item' and 'buy' functions to 'tattoo_management' and 'piercing_management' 1 week ago
  f95Lok 679da80089 [changed] renamed one attribute file to match with function arguments 1 week ago
  f95Lok a21805a12c [changed] renamed attribute files to match with function arguments 1 week ago
  f95Lok 9bfbde9fd2 [changed] renamed one attribute file to match with function arguments 1 week ago
  f95Lok e11c649589 [changed] renamed one attribute file to match with function arguments 1 week ago
  bgkjdgbizgblzdgbr d6444a401c [changed] Anuska in the city should behave like Anuska in Pav regarding the lastes changes 1 week ago
  f95Lok ca32473bb6 [added] updated qproj 1 week ago
  f95Lok 5172f1733e Merge remote-tracking branch 'kevin/master' 1 week ago
  f95Lok 75e40c4d62 [added] attribute files for tattoos and piercings 1 week ago
  Myles Croft (Hooded Silence) 2cb6d3a087 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 week ago
  Myles Croft (Hooded Silence) 81c0c853ff [Bug fix] clear unnecessary image when at Vasily home door. 1 week ago
  Awesome 516882da9d [Fixed] Glamour spell running out caused massive appearance drop 1 week ago
100 changed files with 11397 additions and 8053 deletions
  1. 34 0
      glife.qproj
  2. 1 0
      locations/AppearanceSystem.qsrc
  3. 530 638
      locations/KatjaHomeTalk.qsrc
  4. 10 10
      locations/MagEncounterFairy.qsrc
  5. 1 1
      locations/_attributes_cats_dress.qsrc
  6. 13 0
      locations/_attributes_piercing_brow.qsrc
  7. 101 0
      locations/_attributes_piercing_ears.qsrc
  8. 33 0
      locations/_attributes_piercing_lip.qsrc
  9. 21 0
      locations/_attributes_piercing_navel.qsrc
  10. 33 0
      locations/_attributes_piercing_nipples.qsrc
  11. 33 0
      locations/_attributes_piercing_nose.qsrc
  12. 45 0
      locations/_attributes_piercing_pussy.qsrc
  13. 21 0
      locations/_attributes_piercing_tongue.qsrc
  14. 80 0
      locations/_attributes_tattoo_ankle.qsrc
  15. 242 0
      locations/_attributes_tattoo_arm.qsrc
  16. 80 0
      locations/_attributes_tattoo_ass.qsrc
  17. 188 0
      locations/_attributes_tattoo_back.qsrc
  18. 68 0
      locations/_attributes_tattoo_belly.qsrc
  19. 38 0
      locations/_attributes_tattoo_breasts.qsrc
  20. 50 0
      locations/_attributes_tattoo_chest.qsrc
  21. 29 0
      locations/_attributes_tattoo_face.qsrc
  22. 32 0
      locations/_attributes_tattoo_hand.qsrc
  23. 146 0
      locations/_attributes_tattoo_leg.qsrc
  24. 32 0
      locations/_attributes_tattoo_lip.qsrc
  25. 95 0
      locations/_attributes_tattoo_neck.qsrc
  26. 164 0
      locations/_attributes_tattoo_pubic.qsrc
  27. 80 0
      locations/_attributes_tattoo_shoulder.qsrc
  28. 74 0
      locations/_attributes_tattoo_side.qsrc
  29. 101 0
      locations/_attributes_tattoo_tramp.qsrc
  30. 71 0
      locations/_attributes_tattoo_under.qsrc
  31. 158 0
      locations/_attributes_tattoo_wrist.qsrc
  32. 1 3
      locations/anush_bedroom_city.qsrc
  33. 1 1
      locations/anushapt_city.qsrc
  34. 1 1
      locations/anushkachat.qsrc
  35. 12 10
      locations/anushkachat_city.qsrc
  36. 2 0
      locations/artem_events.qsrc
  37. 884 0
      locations/artem_katja_sex.qsrc
  38. 64 106
      locations/bank.qsrc
  39. 97 93
      locations/body.qsrc
  40. 3 1
      locations/bras.qsrc
  41. 1 3
      locations/cikl.qsrc
  42. 50 48
      locations/clothing.qsrc
  43. 2 1
      locations/coats.qsrc
  44. 4 4
      locations/din_van.qsrc
  45. 48 27
      locations/djibril.qsrc
  46. 2 0
      locations/drugs.qsrc
  47. 3 0
      locations/femcyc.qsrc
  48. 67 76
      locations/foto.qsrc
  49. 3 11
      locations/gad_field.qsrc
  50. 2 2
      locations/gad_market.qsrc
  51. 1 1
      locations/gschool_detention.qsrc
  52. 9 1
      locations/gschool_lessonsev1.qsrc
  53. 10 13
      locations/intro_sg_tg.qsrc
  54. 60 49
      locations/katja_dorm.qsrc
  55. 1 1
      locations/katja_meynold_schedule.qsrc
  56. 3 3
      locations/katja_pantyquest.qsrc
  57. 6 1
      locations/katja_procedural.qsrc
  58. 569 0
      locations/katja_sex_talk.qsrc
  59. 74 74
      locations/komp_camgirl.qsrc
  60. 1 1
      locations/kuhrPar.qsrc
  61. 243 204
      locations/ludahome.qsrc
  62. 11 10
      locations/newspaper_pages.qsrc
  63. 6 0
      locations/npcStat.qsrc
  64. 2 0
      locations/npcStat_clean.qsrc
  65. 4 6
      locations/npc_set_preference.qsrc
  66. 2 1
      locations/npcgeneratec.qsrc
  67. 2 2
      locations/npcstatic5.qsrc
  68. 56 16
      locations/nyp_school.qsrc
  69. 277 213
      locations/olu.qsrc
  70. 221 184
      locations/olutaxi.qsrc
  71. 3 1
      locations/panties.qsrc
  72. 565 458
      locations/pav_disco.qsrc
  73. 145 262
      locations/pav_disco_sex.qsrc
  74. 3 2
      locations/pav_hotelReception.qsrc
  75. 1 0
      locations/pav_parkev.qsrc
  76. 168 178
      locations/pav_pharmacy.qsrc
  77. 20 11
      locations/pav_pool.qsrc
  78. 45 47
      locations/pav_pool_events.qsrc
  79. 1 1
      locations/phone_selfies.qsrc
  80. 8 0
      locations/piercing_attributes.qsrc
  81. 71 0
      locations/piercing_management.qsrc
  82. 116 1649
      locations/pirsingsalon.qsrc
  83. 2 1
      locations/purses.qsrc
  84. 484 208
      locations/selfplay.qsrc
  85. 264 263
      locations/sex_ev_after.qsrc
  86. 328 205
      locations/sex_ev_boy_pillow_talk.qsrc
  87. 226 226
      locations/sex_ev_condoms.qsrc
  88. 429 212
      locations/sex_ev_cowgirl.qsrc
  89. 342 233
      locations/sex_ev_cum.qsrc
  90. 402 205
      locations/sex_ev_doggy.qsrc
  91. 265 262
      locations/sex_ev_dress_talking.qsrc
  92. 215 193
      locations/sex_ev_events.qsrc
  93. 259 259
      locations/sex_ev_favorite_part.qsrc
  94. 219 219
      locations/sex_ev_foreplay.qsrc
  95. 20 22
      locations/sex_ev_foreplay_desc.qsrc
  96. 139 139
      locations/sex_ev_hookup_leave.qsrc
  97. 294 271
      locations/sex_ev_leave.qsrc
  98. 391 195
      locations/sex_ev_miss.qsrc
  99. 262 244
      locations/sex_ev_morning.qsrc
  100. 301 271
      locations/sex_ev_pillow_talk.qsrc

+ 34 - 0
glife.qproj

@@ -255,6 +255,38 @@
 		<Location name="$attributes_danilovich_purses"/>
 		<Location name="$attributes_moncheri_purses"/>
 	</Folder>
+	<Folder name="Piercings">
+		<Location name="$attributes_piercing_ears"/>
+		<Location name="$attributes_piercing_nose"/>
+		<Location name="$attributes_piercing_brow"/>
+		<Location name="$attributes_piercing_lip"/>
+		<Location name="$attributes_piercing_tongue"/>
+		<Location name="$attributes_piercing_navel"/>
+		<Location name="$attributes_piercing_nipples"/>
+		<Location name="$attributes_piercing_pussy"/>
+		<Location name="piercing_attributes"/>
+	</Folder>
+	<Folder name="Tattoos">
+		<Location name="$attributes_tattoo_ankle"/>
+		<Location name="$attributes_tattoo_arm"/>
+		<Location name="$attributes_tattoo_ass"/>
+		<Location name="$attributes_tattoo_back"/>
+		<Location name="$attributes_tattoo_belly"/>
+		<Location name="$attributes_tattoo_breasts"/>
+		<Location name="$attributes_tattoo_chest"/>
+		<Location name="$attributes_tattoo_face"/>
+		<Location name="$attributes_tattoo_hand"/>
+		<Location name="$attributes_tattoo_leg"/>
+		<Location name="$attributes_tattoo_lip"/>
+		<Location name="$attributes_tattoo_neck"/>
+		<Location name="$attributes_tattoo_pubic"/>
+		<Location name="$attributes_tattoo_shoulder"/>
+		<Location name="$attributes_tattoo_side"/>
+		<Location name="$attributes_tattoo_tramp"/>
+		<Location name="$attributes_tattoo_under"/>
+		<Location name="$attributes_tattoo_wrist"/>
+		<Location name="tattoo_attributes"/>
+	</Folder>
 	<Folder name="Accessories">
 		<Location name="sewing"/>
 		<Location name="camera"/>
@@ -569,6 +601,7 @@
 		<Location name="artem_date_events"/>
 		<Location name="artem_sex"/>
 		<Location name="artem_nush_sex"/>
+		<Location name="artem_katja_sex"/>
 		<Location name="artem_dorm"/>
 		<Location name="artem_date_events_uni"/>
 		<Location name="artem_sex_uni"/>
@@ -586,6 +619,7 @@
 		<Location name="katja_lake"/>
 		<Location name="katjaEvDin"/>
 		<Location name="KatjaHomeTalk"/>
+		<Location name="katja_sex_talk"/>
 		<Location name="katja_sex"/>
 		<Location name="Katja_Tanga"/>
 		<Location name="katja_pantyquest"/>

+ 1 - 0
locations/AppearanceSystem.qsrc

@@ -34,6 +34,7 @@ if $args[0] = 'UpdateBaseAppearance':
 
 	! Calculte base appearance
 	pcs_apprncbase = skinBonus + bodyShapeBonus + attributeBonus - visibleAgePenalty - teethPenalty + supnatvnesh
+	if glamouractive = 1: pcs_apprncbase += 150
 
 end
 

+ 530 - 638
locations/KatjaHomeTalk.qsrc

@@ -58,74 +58,92 @@ if $ARGS[0] = '':
 				gt 'KatjaHomeTalk',  'katja_uni_tell'
 
 			else
-				if katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60 and katjaQW['sex_clossedness'] = 0:
-					!!If Katja have had sex with both marcus and Ivan and have been corrupted enough. Then she will when she is horny ask about trying sex with other boys. 
-					gt 'KatjaHomeTalk', 'random_park_sex_talk'
-			
-				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_pussy'] > 0: 
-					!!If Katja have has had her first time with Marcus she will discuss this the next time the player talks to her at home
-					gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
-			
-				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1 and katjaQW['sex_clossedness'] = 0: 
-					!!If Marcus have agreed to be katja''s first, the player will tell this to Katja the next time the talk at home
-					gt 'KatjaHomeTalk', 'Marcus_answer_talk'
-			
-				elseif katjaQW['QWstage'] < 4 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_sex']) >= 2 and npc_sex['A14'] > 0 and katjaQW['anal_quest'] ! 1 and katjaQW['sex_clossedness'] = 0 and katjaQW['pussy_sex'] = 0:
-					!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arrange her first time with a boy.
-					gt 'KatjaHomeTalk', 'sex_with_boy_ask'
-			
+				if katjaQW['knows_artem_is_boyfreind'] = 0 and artemQW['bf'] = 1:
+					!!Katja have heard that Artem is the boyfriend of the player character and wants to discuss that 
+					gt 'KatjaHomeTalk', 'Artem_talk'
+	
+				elseif  katjaQW['knows_artem_is_boyfreind'] = 1 and artemQW['artembrokenheart'] = 1:
+					!!Katja have heard that Artem and the player character have broke up 
+					gt 'KatjaHomeTalk', 'Artem_break_up_talk'
+
 				else
-					if katjaQW['slut'] >= 60 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_anal']) >= 2 and npc_sex['A14'] > 0 and katjaQW['anal_quest'] = 0 and katjaQW['QWstage'] ! 4 and katjaQW['sex_clossedness'] = 0 and katjaQW['anal_sex'] = 0: 
-						!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arrange her first time with a boy.
-						gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
+					if katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60 and katjaQW['sex_clossedness'] = 0:
+						!!If Katja have had sex with both marcus and Ivan and have been corrupted enough. Then she will when she is horny ask about trying sex with other boys. 
+						gt 'KatjaHomeTalk', 'random_park_sex_talk'
+				
+					elseif katjaQW['QWstage'] = 5 and katjaQW['pussy_sex'] = 0:
+						if katjaQW['Artem_pussy'] > 0:
+							!!If Katja have has had her first time with Artem she will discuss this the next time the player talks to her at home
+							gt 'KatjaHomeTalk', 'first_boy_sex_Artem_follow_up'
+						elseif katjaQW['marcus_pussy'] > 0: 
+							!!If Katja have has had her first time with Marcus she will discuss this the next time the player talks to her at home
+							gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
+						end
+
+					elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1 and katjaQW['sex_clossedness'] < 2: 
+						!!If Marcus have agreed to be katja''s first, the player will tell this to Katja the next time the talk at home
+						gt 'KatjaHomeTalk', 'Marcus_answer_talk'
 				
+					elseif katjaQW['QWstage'] < 4 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_sex']) >= 2 and npc_sex['A14'] > 0 and katjaQW['boy_block'] = 0 and katjaQW['anal_quest'] ! 1 and katjaQW['sex_clossedness'] = 0 and katjaQW['pussy_sex'] = 0:
+						!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arrange her first time with a boy.
+						gt 'KatjaHomeTalk', 'sex_with_boy_ask'
+					elseif katjaQW['QWstage'] < 4 and katjaQW['knows_artem_is_boyfreind'] = 1 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40:
+						!!if Katja have been corrupted enough and knows Artem is the player characters boyfriend she will ask for a threesome with him
+						gt 'KatjaHomeTalk', 'sex_with_Artem_ask'
+
 					else
-						if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:
-							if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and rand(0,6) =0 and katjaQW['Marcus_day'] ! daystart and katjaQW['sex_clossedness'] = 0:
-								!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home. She will also only ask for a threesoem 1 out of 7 time she ask you for sex.
-								katjaQW['Marcus_day'] = daystart
-								gt 'katjaHomeTalk', 'marcus_kiss' 
-						
-							elseif katjaQW['QWstage'] > 2:
-								!!The standard start of her sex scenes at home. Happens if the marcus ask do not trigger and Katja have kissed the player.
-								gt 'KatjaHomeTalk', 'hornykiss'
-						
-							else
-								!!This only triggers if the player have never kissed Katja.
-								gt 'KatjaHomeTalk', 'tender_kiss'
-							end
+						if katjaQW['slut'] >= 60 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_anal']) >= 2 and npc_sex['A14'] > 0 and katjaQW['boy_block'] = 0 and katjaQW['anal_quest'] = 0 and katjaQW['QWstage'] ! 4 and katjaQW['sex_clossedness'] = 0 and katjaQW['anal_sex'] = 0: 
+							!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arrange her first time with a boy.
+							gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
 					
-						else 
-							if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
-								!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
-								if kid > 0:
-									cla
-									gs 'stat'
-									minut += 5
-									KatjaConflict = 1
-									KatConCheck = daystart
-									'"You''re pregnant again?" Her face turns red and her expression is far angrier than you''ve ever seen her. "After everything, you still didn''t trust me enough to tell me?" she screams at you. "I thought there was something special between us." Tears begin rolling down her cheeks. "Just leave me alone, I don''t even want to see you right now."'
+						else
+							if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:
+								if katjaQW['QWstage'] >= 6 and week < 6 and katjaQW['boy_block'] = 0 and (locat['Vicky'] ! 8 and locat['Vicky'] ! 9 and locat['Vicky'] ! 12 and locat['Vicky'] ! 13) and rand(0,6) =0 and katjaQW['Marcus_day'] ! daystart and katjaQW['sex_clossedness'] = 0 and katjaQW['marcus_pussy'] > 0:
+									!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home. She will also only ask for a threesoem 1 out of 7 time she ask you for sex.
+									katjaQW['Marcus_day'] = daystart
+									gt 'katjaHomeTalk', 'marcus_kiss' 
+							
+								elseif katjaQW['QWstage'] > 2:
+									!!The standard start of her sex scenes at home. Happens if the marcus ask do not trigger and Katja have kissed the player.
+									gt 'KatjaHomeTalk', 'hornykiss'
 							
-								elseif knowKatjaPreg = 1:
-									cla
-									gs 'stat'
-									minut += 5
-									KatjaConflict = 1
-									KatConCheck = daystart
-									'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
-
 								else
-									cla
-									*nl
-									minut += 5
-									KatjaConflict = 1
-									KatConCheck = daystart
-									'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
-								end							
+									!!This only triggers if the player have never kissed Katja.
+									gt 'KatjaHomeTalk', 'tender_kiss'
+								end
 						
-							else
-								!!If no events triggers they you go to the part where the player can choose things to do with Katja.
-								gt 'katjaHomeTalk', 'chat' 
+							else 
+								if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
+									!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
+									if kid > 0:
+										cla
+										gs 'stat'
+										minut += 5
+										KatjaConflict = 1
+										KatConCheck = daystart
+										'"You''re pregnant again?" Her face turns red and her expression is far angrier than you''ve ever seen her. "After everything, you still didn''t trust me enough to tell me?" she screams at you. "I thought there was something special between us." Tears begin rolling down her cheeks. "Just leave me alone, I don''t even want to see you right now."'
+								
+									elseif knowKatjaPreg = 1:
+										cla
+										gs 'stat'
+										minut += 5
+										KatjaConflict = 1
+										KatConCheck = daystart
+										'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
+
+									else
+										cla
+										*nl
+										minut += 5
+										KatjaConflict = 1
+										KatConCheck = daystart
+										'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
+									end							
+							
+								else
+									!!If no events triggers they you go to the part where the player can choose things to do with Katja.
+									gt 'katjaHomeTalk', 'chat' 
+								end
 							end
 						end
 					end
@@ -232,7 +250,7 @@ if $ARGS[0] = 'chat':
 					!!If Katja is horny she will talk about sex, else she will talk about normal stuff. The more corrupted she is the less horny she need to be to talk about sex.
 					'Katja talks about school lessons, cosmetics, the latest fashion trends and other things she considers very important.'
 				else
-					gs 'KatjaHomeTalk', 'Sextalk'
+					gs 'katja_sex_talk', 'Sextalk'
 				end
 				act 'Continue':gt 'KatjaHomeTalk'
 
@@ -261,10 +279,21 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
-	if katjaQW['QWstage'] = 4 and katjaQW['marcus_pussy'] = 0 and katjaQW['sex_clossedness'] = 0: act 'Tell her you''ll find a boy for her to have sex with': gt 'KatjaHomeTalk', 'boy_discussion'
-	!!If Katja asked your help in finding a boy to try sex with and you said no. You have the choice to reverse that decision.
+	if katjaQW['QWstage'] = 4 and katjaQW['marcus_pussy'] = 0 and katjaQW['sex_clossedness'] = 0: 
+		!!If Katja asked your help in finding a boy to try sex with and you said no. You have the choice to reverse that decision.
+		if katjaQW['knows_artem_is_boyfreind'] = 1 and katjaQW['boy_block'] = 1:
+			act 'Tell her you want to set her up for sex with Artem': gt 'KatjaHomeTalk', 'artem_sex_discussion'
+		else
+			act 'Tell her you''ll find a boy for her to have sex with': gt 'KatjaHomeTalk', 'boy_discussion'
+		end
+	end
+
+	if katjaQW['QWstage'] >= 6 and katjaQW['Artem_pussy'] = 0 and katjaQW['knows_artem_is_boyfreind'] = 1 and katjaQW['boy_block'] = 1 and katjaQW['sex_clossedness'] = 0: 
+		!!A sexual active Katja has asked the player for having sex with Artem, but player did not agree originally
+		act 'Tell her you want to set her up for sex with Artem': gt 'KatjaHomeTalk', 'artem_sex_discussion'
+	end
 
-	if katjaQW['anal_quest'] = 1 and katjaQW['sex_clossedness'] = 0: act 'Tell her you''ll find a boy for her to try anal with': gt 'KatjaHomeTalk', 'anal_discussion'
+	if katjaQW['anal_quest'] = 1 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0: act 'Tell her you''ll find a boy for her to try anal with': gt 'KatjaHomeTalk', 'anal_discussion'
 	!!If Katja asked your help in finding a boy to try anal sex with and you said no. You have the choice to reverse that decision.
 
 	if katjaQW['slut'] >= 50 and katjaQW['horny'] >= 80 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] < 2:
@@ -272,7 +301,7 @@ if $ARGS[0] = 'chat':
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 	end
 
-	if katjaQW['QWstage'] >= 7 and katjaQW['birth_control_start_day'] < daystart and katjaQW['birth_control_start_day'] > 0 and katjaQW['horny'] > 60 and katjaQW['sex_clossedness'] = 0:
+	if katjaQW['QWstage'] >= 7 and katjaQW['birth_control_start_day'] < daystart and katjaQW['birth_control_start_day'] > 0 and katjaQW['horny'] > 60 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
 		!!If you have gotten to the last stage of Katja''s questline, you can suggest to go to the park to look for boys if Katja is horny.
 		act 'Look for boys in the park':
 			gt 'KatjaHomeTalk', 'go_to_park'
@@ -280,7 +309,7 @@ if $ARGS[0] = 'chat':
 	end
 			
 
-	if katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 2 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and (katjaQW['horny']+katjaQW['slut']) > 100 and katjaQW['sex_clossedness'] = 0:
+	if katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 2 and week < 6 and (locat['Vicky'] ! 8 and locat['Vicky'] ! 9 and locat['Vicky'] ! 12 and locat['Vicky'] ! 13) and (katjaQW['horny']+katjaQW['slut']) > 100 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
 	!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home. This is the lead in to the Marcus threesome if it is the first time.
 		act 'Suggest that you call Marcus':
 			*clr & cla
@@ -294,7 +323,7 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
-	if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and katjaQW['horny'] > 80 and katjaQW['Marcus_day'] ! daystart and katjaQW['sex_clossedness'] = 0:
+	if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] ! 8 and locat['Vicky'] ! 9 and locat['Vicky'] ! 12 and locat['Vicky'] ! 13) and katjaQW['horny'] > 80 and katjaQW['Marcus_day'] ! daystart and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['marcus_pussy'] > 0:
 	!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home. This is the lead in to the Marcus threesome if it have allready been fone at least one time.
 		act 'Suggest that you call Marcus':
 			*clr & cla
@@ -422,7 +451,7 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
-	if katjaQW['boy_block'] = 1:
+	if katjaQW['boy_block'] = 1 and katjaQW['knows_artem_is_boyfreind'] ! 1:
 		act 'Tell Katja, that you have decided that boys are fun after all <br><font color="red">(Katja will start asking about sex with boys again)</font>': gt 'KatjaHomeTalk',  'boy_yes'
 	end
 
@@ -770,574 +799,14 @@ if $ARGS[0] = 'homework':
 	minut += 30
 	npc_rel['A14'] += 2
 	gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A14'
-	lern += rand(2, 4)
-	gs 'exp_gain', 'intel', rand(0, 1) + rand(0, drugVars['mentats_dose'])
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the material.'
-
-	act 'Finish': gt 'KatjaHomeTalk'
-	act 'Leave the room': gt 'mey_home', 'start'
-end
-
-if $ARGS[0] = 'Sextalk':
-	'After talking for some time Katja looks at you thoughtfully while her head is turning completely red.'
-	if katjaQW['boy_block'] = 1:
-		kattalkrand = rand(3, 4)
-	else
-		kattalkrand = rand(0, 4)
-	end
-
-	if kattalkrand = 0:
-		if stat['bj'] > 0:
-			gs 'KatjaHomeTalk', 'bj_talk1'
-		else
-			if katjaQW['knows_BJ'] > 0:
-				'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
-			else
-				'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
-			end
-			act 'You''ve never given a blowjob':
-				*clr & cla
-				minut += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja that you have never given a blowjob to a guy. She admits that she hasn''t either. "Vicky talks about how good it is all the time, but I don''t know. Guys usually smell bad and I''m sure it would taste awful."'
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		end
-
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
-
-	elseif kattalkrand = 1:
-		if katjaQW['knows_sex'] > 0:
-			'"<<$pcs_nickname>>, tell me. Have you ever fucked someone?"'
-		else
-			'"<<$pcs_nickname>>, have you ever had sex with a guy?"'
-		end
-
-		if stat['vaginal'] > 0:
-			act 'Talk about sex':
-				*clr & cla
-				minut += 3
-				katjaQW['horny'] += 5
-				katjaQW['knows_sex'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja about the times you''ve had sex and how it felt. She blushes and bites her lip.'
-				if katjaQW['pussy_sex'] > 0:
-					if npc_sex['A14'] > 0: katjaQW['QWstage'] = 6
-					'Katja also tells you a story of how she had sex with a boy she picked up as a one-night stand.'
-				end
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		else
-			act 'No':
-				*clr & cla
-				minut += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				if katjaQW['pussy_sex'] = 0:
-					'You tell Katja that you''ve never had sex with a guy, and she admits that she''s also still a virgin. "That probably makes us the only non-nerds who haven''t had sex! Vicky does it all the time with Vanya. She won''t shut up about it!"'
-				else
-					if npc_sex['A14'] > 0: katjaQW['QWstage'] = 6
-					'You tell Katja that you''ve never had sex with a guy, and she is very surprised. "What you have never had sex with a guy? Even I have had that. I thought I was the last girl from school to lose my virginity. Vicky definitely make it seems like I was abnormal not finding somebody to fuck in school. She wouldn''t stop pushing to find a guy. It was so annoying."'
-				end
-
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		end
-
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
-
-	elseif kattalkrand = 2:
-		if katjaQW['knows_anal'] > 0:
-			'"<<$pcs_nickname>>, what''s anal sex like?"'
-		else
-			'"<<$pcs_nickname>>, have you ever had a guy stick it in your ass?"'
-		end
-
-		if stat['anal'] > 0:
-			act 'Talk about anal':
-				*clr & cla
-				minut += 3
-				katjaQW['horny'] += 5
-				katjaQW['knows_anal'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja about the times you''ve had anal sex and what it feels like. She blushes and bites her lip.'
-				if katjaQW['anal_sex'] > 0:
-					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
-					'Katja also tells you a story of anal sex she had with a boy a boy you don''t know she picked up one night se went out.'
-				end
-
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		else
-			act 'You''ve never had anal sex':
-				*clr & cla
-				minut += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				if katjaQW['anal_sex'] = 0:
-					'You tell Katja that you''ve never had anal sex. She says that she heard that a lot of girls in your class do, some more than others.'
-				else
-					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
-					'You tell Katja that you''ve never had anal sex. "You havn''t?" she asks rhetorically "It''s actually quite good. You should try it."'
-				end
-
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		end
-
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
-
-	elseif kattalkrand = 3:
-		if katjaQW['knows_cuni'] > 0 or npc_sex['A14'] > 0:
-			'"<<$pcs_nickname>>, tell me how you lick pussy."'
-		else
-			'"<<$pcs_nickname>>, have you gone down on a girl?"'
-		end
-
-		if stat['cuni_give'] > 0:
-			act 'Talk about licking pussy':
-				*clr & cla
-				minut += 3
-				katjaQW['horny'] += 5
-				katjaQW['knows_cuni'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja about the times you''ve gone down on another girl and how it feels. She blushes and bites her lip.'
-				
-				if katjaQW['horny'] > 50 and katjaQW['slut'] >= 40 and rand(-30,30) < katjaQW['dom'] and npc_sex['A14'] > 0:
-					'Katja asks you to show her how you lick pussy.'
-
-					act 'Show her':
-						*clr & cla
-						katjaQW['horny'] = 0
-						katjaQW['slut'] += 1
-						katjaQW['dom'] += 2
-						if npc_sex['A14'] = 0: npc_sex['A14'] = 1 & girl += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
-						'You''re a little confused at first before you notice her pulling her panties off. Once she has them off, she opens her legs wide. "Go on, <<$pcs_nickname>>. Show me how you do it, please."'
-						'You pause, more in surprise than anything, but her glistening wet pussy is enough to convince you. You lean forward place your face between her legs and start licking.'
-						'You suck on her clit and slip your tongue inside of her, working her pussy for all you''re worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm, she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you are licking her, leaving your face coated in her juices.'
-						'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once her orgasm passes, you lick her clean of all her pussy juices, making sure not to miss a single spot. When you look up at Katja, she has a confident smile on her face. "Well aren''t you just a good little girl?" She then kisses you deeply before you start to lean back and spread your legs, but she''s already shaking her head.'
-						'"Sorry <<$pcs_nickname>>, maybe next time. We need to finish our homework," she says sweetly. You pause before nodding in understanding. You watch the new confident look intensify on her face as she smiles and the two of you finish your homework.'
-
-						gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
-						gs 'arousal', 'end'
-						gs 'stat'
-
-						act 'Continue talking':
-							if $loc = 'katja_dorm':
-								gt 'katja_dorm', 'talk'
-							else
-								gt 'KatjaHomeTalk'
-							end
-						end
-					end
-					act 'Ignore her':
-						minut += 5
-						if $loc = 'katja_dorm':
-							gt 'katja_dorm', 'talk'
-						else
-							gt 'KatjaHomeTalk'
-						end
-					end
-				else
-					act 'Continue talking':
-						minut += 5
-						if $loc = 'katja_dorm':
-							gt 'katja_dorm', 'talk'
-						else
-							gt 'KatjaHomeTalk'
-						end
-					end
-				end
-			end
-		else
-			act 'No':
-				*clr & cla
-				minut += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				if katjaQW['simultanous_girls'] > 0:
-					'"I''ve never gone down on a girl before," you say and Katja looks quite surprised. "Never? Is it something that you have thought about?" she asks in a curious tone.'
-					act 'I''ve thought about it':
-						cla
-						minut += 3
-						katjaQW['horny'] += 20
-						'"I''ve thought about it, alright it''s just the situation never came up" you tell Katja. "So it is something you want to try" Katja asks.'
-						if katjaQW['horny'] >= 50 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 20:
-							'"So what would you do if that situation was to come up. For example right now?" Katja asks in a seductive voice.'
-							act 'See what Katja does': gt 'katjaHomeTalk', 'hornykiss'
-							act 'Stop her from doing anything':
-								cla
-								gs 'npc_relationship', 'modify', 'A14', 'dislike'
-								'"It would definitely not happen right now. Rigth?" you say a little unsure of how Katja will react.'
-								'"Of course not. Nothing happens here you don''t want to," she says clearly looking disappointed. She quickly changes the subject.'
-								act 'Continue talking':
-									minut += 5
-									if $loc = 'katja_dorm':
-										gt 'katja_dorm', 'talk'
-									else
-										gt 'KatjaHomeTalk'
-									end
-								end							
-							end
-						else
-							'"Well. I think that you should find a chance to try it. It is quite good" Katja says with a wink, but then changes the subject.'
-							act 'Continue talking':
-								minut += 5
-								if $loc = 'katja_dorm':
-									gt 'katja_dorm', 'talk'
-								else
-									gt 'KatjaHomeTalk'
-								end
-							end
-						end
-					end
-					act 'I''m not into girls':
-						cla
-						minut += 3
-						gs 'npc_relationship', 'modify', 'A14', 'dislike'
-						gs 'stat'
-						'"I''m not into girls" you tell Katja. "Really?" Katja says surprised "Too bad for you. You are really missing out on something. Making love to girls is really something, they are '+iif(katjaQW['knows_sex'] +katjaQW['knows_BJ'] + katjaQW['knows_anal'] > 0, 'much more tender than boys', 'so tender')+'."'
-						'"I really think that you should give it a thought" she continues seemingly a little disappointed in your response. She then changes the subject.'
-						act 'Continue talking':
-							minut += 5
-							if $loc = 'katja_dorm':
-								gt 'katja_dorm', 'talk'
-							else
-								gt 'KatjaHomeTalk'
-							end
-						end
-					end
-				else
-					'You tell Katja that you''ve never gone down on a girl. She seems a little surprised and you get the feeling that this was not what she wanted to hear.'
-				end
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		end
-	elseif kattalkrand = 4:
-		if katjaQW['knows_masturbation'] > 0:
-			'"<<$pcs_nickname>>, tell me how you masturbate."'
-		else
-			'"<<$pcs_nickname>>, do you masturbate?"'
-		end
-
-		if stat['mast'] > 0:
-			act 'Talk about masturbation':
-				*clr & cla
-				minut += 3
-				katjaQW['horny'] += 5
-				katjaQW['knows_masturbation'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja how you masturbate in the bathroom and she blushes and bites her lip.'
-
-				if katjaQW['masturbates'] = 0:
-					act 'Continue talking':
-						minut += 5
-						if $loc = 'katja_dorm':
-							gt 'katja_dorm', 'talk'
-						else
-							gt 'KatjaHomeTalk'
-						end
-					end
-				else
-					act 'Katja responds':
-						*clr & cla
-						minut += 5
-						katjaQW['horny'] += 10
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/mastr.jpg"></center>'
-						'Katja tells you she also masturbates, right here in this room, fondling herself between her legs.'
-
-						act 'Continue talking':
-							minut += 5
-							if $loc = 'katja_dorm':
-								gt 'katja_dorm', 'talk'
-							else
-								gt 'KatjaHomeTalk'
-							end
-						end
-					end
-				end
-			end
-
-			if stat['self_fisting'] > 0:
-				act 'Tell her how you pushed your hand into your pussy':
-					*clr & cla
-					minut += 3
-					katjaQW['horny'] += 10
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-					'You tell Katja how you '+iif(stat['self_fisting'] = 1, 'once', 'sometimes')+' put your whole fist into your pussy, and how it felt doing it.'
-					'Katja looks '+iif(katjaQW['knows_self_fisting'] = 0, 'completely shocked, but', 'excited, and')+' her head turns even redder as she bites her lip.'
-
-					if katjaQW['knows_self_fisting'] = 0: katjaQW['knows_self_fisting'] = 1
-
-					act 'Continue talking':
-						if katjaQW['fisted_vag'] = 0 and npc_vag['A14'] > 3 and katjaQW['slut'] >= 70 and katjaQW['horny'] >= 50 and npc_sex['A14'] > 0:
-							gt 'katjaHomeTalk', 'fisting_ask'
-						else
-							minut += 5
-							if $loc = 'katja_dorm':
-								gt 'katja_dorm', 'talk'
-							else
-								gt 'KatjaHomeTalk'
-							end
-						end
-					end
-				end
-			end
-
-			if stat['self_fisting_anal'] > 0:
-				act 'Tell her how you fisted your ass':
-					*clr & cla
-					minut += 3
-					katjaQW['horny'] += 10
-
-					if katjaQW['knows_self_fisting_anal'] = 0: katjaQW['knows_self_fisting_anal'] = 1
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-					'You tell Katja how you masturbate anally and even managed to stretch it so much that you could shove your fist into it.'
-					'She blushes and bites her lip.'
-
-					act 'Continue talking':
-						minut += 5
-						if $loc = 'katja_dorm':
-							gt 'katja_dorm', 'talk'
-						else
-							gt 'KatjaHomeTalk'
-						end
-					end
-				end
-			end
-		else
-			act 'You''ve never masturbated':
-				*clr & cla
-				minut += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				if katjaQW['masturbates'] > 0:
-					'"What!!" Katja says surprised. "You never masturbated. Why? I thought that everybody does it, even I do it and I''m usually the last to do anything" she continues'
-					'You then try to explain why you have never masturbated.'
-				else
-					'You tell Katja that you''ve never masturbated. She seems surprised at your answer.'
-				end
-				act 'Continue talking':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-		end
-	end
-
-	act 'Refuse to talk about such topics':
-		cla
-		minut += 1
-		gs 'stat'
-		'You refuse to talk about such topics with her and she looks down in confusion and mumbles. "Sorry, <<$pcs_nickname>>, I didn''t mean to pry."'
-
-		act 'Continue talking':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'bj_talk1':
-	minut += 3
-	if katjaQW['knows_BJ'] > 0:
-		'"<<$pcs_nickname>>!" she says, a sparkle in her eye. "Tell me what it''s like to suck dick again."'
-	elseif katjaQW['knows_BJ']= 0:
-		'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
-	end
-
-	if stat['bj'] > 0:
-		if katjaQW['knows_BJ'] = 0:
-			act 'No (lie)':
-				cla & *clr
-				minut += 3		
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'"No," you shake your head before shamelessly lying through your teeth. "I''ve never given a blowjob before."'
-				'"Oh." She sits back, looking disappointed for some reason.'
-				act 'Continue':
-					minut += 5
-					if $loc = 'katja_dorm':
-						gt 'katja_dorm', 'talk'
-					else
-						gt 'KatjaHomeTalk'
-					end
-				end
-			end
-			act'Yes':
-				minut += 3
-				cla & *clr
-				katjaQW['horny'] += 5
-				katjaQW['knows_BJ'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'"Yeah. I''ve given a few," you admit.'
-				'"What''s it like?" Katja asks, eyes wide with excitement.'
-				gs 'KatjaHomeTalk', 'bj_talk2'
-			end
-		elseif stat['bj'] > 0:
-			minut += 3
-			katjaQW['horny'] += 5
-			gs 'KatjaHomeTalk', 'bj_talk2'
-		end
-	else
-		act 'No':
-			cla & *clr
-			minut += 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'"No," you shake your head. "I''ve never given a blowjob before."'
-			'"Oh." She sits back, looking disappointed for some reason. "Guess we''re both clueless then, huh?"'
-			act 'Continue':
-				minut += 5
-				if $loc = 'katja_dorm':
-					gt 'katja_dorm', 'talk'
-				else
-					gt 'KatjaHomeTalk'
-				end
-			end
-		end
-		!!act'I''ve given a few (lie)':
-	end
-end
-
-if $ARGS[0] = 'bj_talk2':
-	act'It tastes funny':
-		cla & *nl
-		'"It tastes funny," you wrinkle your nose. "It''s like, kinda salty? But also sort of... musty? I don''t think I mind the act itself that much, but dick has a weird flavor."'
-		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
-		act 'Continue':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end
-	
-	act'It''s fun':
-		cla & *nl
-		katjaQW['horny'] += 5
-		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
-		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
-		act 'Continue':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end
-	
-	act'It''s whatever':
-		cla & *nl
-		'"I don''t mind doing it but I don''t love it either," you say. "Dick doesn''t really taste like anything if it''s clean. Kinda salty if it isn''t. I don''t know. It''s whatever I guess."'
-		'You shrug.'
-		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
-		act 'Continue':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end
-	
-	act'It''s boring':
-		cla & *nl
-		'"It''s boring," you roll your eyes. "You have to keep sucking the whole time and after a while, my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you."'
-		'Katja seems taken aback, looking almost worried. You guess you just shattered some impressions she had about giving head.'
-		act 'Continue':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end
-	
-	act'It turns me on':
-		cla & *nl
-		katjaQW['horny'] += 5
-		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
-		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
-		act 'Continue':
-			minut += 5
-			if $loc = 'katja_dorm':
-				gt 'katja_dorm', 'talk'
-			else
-				gt 'KatjaHomeTalk'
-			end
-		end
-	end	
+	lern += rand(2, 4)
+	gs 'exp_gain', 'intel', rand(0, 1) + rand(0, drugVars['mentats_dose'])
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the material.'
+
+	act 'Finish': gt 'KatjaHomeTalk'
+	act 'Leave the room': gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = 'hornykiss':
@@ -1902,7 +1371,7 @@ if $ARGS[0] = 'Marcus_answer_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'You tell Katja that you''ve talked with Marcus and he agreed. She looks at you excitedly. "So when do we do it?"'
 	'"He agreed to come over when I call him, so we can call him right now, or wait for another time," you answer.'
-	if week < 6 and  (locat['Vicky'] = 10 or locat['Vicky'] = 11) and (katjaQW['horny']+katjaQW['slut']) > 100:
+	if week < 6 and (locat['Vicky'] ! 8 and locat['Vicky'] ! 9 and locat['Vicky'] ! 12 and locat['Vicky'] ! 13) and (katjaQW['horny']+katjaQW['slut']) > 100:
 		'"Okay. Let''s call him right now!" she squeals, her face completely red.'
 		act 'Call Marcus': gt 'katja_sex', 'marcus_wait'
 	elseif (katjaQW['horny'] + katjaQW['slut']) <= 100:
@@ -1940,6 +1409,30 @@ if $ARGS[0] = 'first_boy_sex_follow_up':
 	end
 end	
 
+if $ARGS[0] = 'first_boy_sex_Artem_follow_up':
+	*clr & cla
+	katjaQW['QWstage'] = 6
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'Katja gives you a big hug. "Thank you! The experience with Artem was great!" she says with a huge grin.'
+	if npc_vag['A14'] + 5 < npc_dick['A2']:
+		'"It didn''t hurt too much?" you ask.' 
+		'"It hurt, that was why I couldn''t take it any longer. But it was fun and I think it''ll hurt less the next time," she answers.' 
+		'"So you want to have sex with a boy again?" you reply.'
+	else
+		'"It did look like you had fun," you say.' 
+		'"I definitely had fun, I thought it would hurt, but I didn''t feel any pain," she answers.' 
+		'"Might be all the times I used my dildo on you," you reply.'
+	end
+	'"We should definitely do this again sometime," she finishes.' 
+	'"We''ll see if the opportunity comes up again," you answer.'
+	act 'Talk about something else': gt 'KatjaHomeTalk'
+	if katjaQW['birth_control_start_day'] = 0:
+		act 'Tell her that she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
+	end
+end	
+
 if $ARGS[0] = 'anal_sex_with_boy_ask':
 	*clr & cla
 	minut += 5
@@ -2128,5 +1621,404 @@ if $ARGS[0] = 'go_to_park':
 	gt 'placer'
 end
 
+if $ARGS[0] = 'Artem_talk':
+	katjaQW['knows_artem_is_boyfreind'] = 1
+	minut += 3
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'"So i''ve heard from Lizveta that you are dating Artem. Is that true?" Katja almost jumps at you with the question.  "Wait, Lizvetta is already spreading rumors about that. How does she knows it?" you say.'
+	'"So it''s true, of course Lizvetta knows, you need to be extremely careful to keep something like that from her" Katja responds.'
+	if katjaQw['boy_block'] = 1:
+		gs 'npc_relationship', 'A14', 'dislike'
+		'"But you told me you do not like boys? Who come you are suddenly dating one?" Katja ask clearly a little hurt.'
+		act 'Tell her it was something that surprised you too':
+			cla
+			'"I''m surprised about this too. I thought that I was only attracted to girls, but then hanging out with Artem changed something. He was so cute when he asked me for a data that I could not says no." you explain.'
+			'"Then he was very romantic on the dates and I fell for him. Turns out that boys can be gentle in bed after all." you continue.'
+		end
+		act 'Tell her that Artem is different':
+			cla
+			'"Artem is not like the other boys, he is gentle mare like one of us girls" you try to explain to Katja "He still have a dick between his legs I assume" Katja says in a very direct tone.'
+			'"Yes he does, and I found out it is not the dick itself that discusted me, it is actaully quite nice to play with. It is the ash holes most dicks are attached to the repulses me" you answer and the last comment gets a small laugh out of Katja.'
+		end
+		act 'Tell her that you lied':
+			cla
+			'"I''m sorry Katja, but I was not completely honest. I do like boys, I just didn''t want to ruin what we have together by having to talk about boys" you explain.'
+			'"You should have trusted me, told me the real reason, then I would of course not have asked you about boys" she says. "I''m really sorry" you repeat.'
+			act 'Katja continues': gt 'KatjaHomeTalk', 'Artem_talk2'
+		end
+	else
+		'"You could have told me you were planning to date him, so I didn''t have to hear it through Lizvetta" Katja say in a mock hurt voice.' 
+		'"I didn''t want to say anything before I was certain, and now you did not even give me the chance to tell you before umping on me with questions" you answer.'
+		act 'Katja continues': gt 'KatjaHomeTalk', 'Artem_talk2'
+	end
+end
+
+if $ARGS[0] = 'Artem_talk2':
+	minut += 7
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	if (katjaQW['QWstage'] >= 4 or katjaQW['slut'] >= 50 or katjaQW['pussy_sex'] > 0) and npc_sex['A14'] > 0:
+		'"Never mind, the important question is how is he in bed? Is he a good lower? Does he make you cum?" Katja bombards you with question about Artem''s sexual skills.'
+		'After telling her everything about you and Artem''s sex life  for several minutes Katja finally comes to the question that is really occupying her mind.'
+		if katjaQW['QWstage'] >= 6:
+			if katjaQw['boy_block'] = 0:
+				'"So. I assume that this will end us having sex with other boys" Katja says "But what about us, will it also mean that we can''t play together anymore" she asks'
+				'"Yes I wont have sex with other boys behind his back, but I''m sure he does not mind me having some fun with girls" you answers.'
+			else
+				'"Does this mean that we can''t play together anymore" she asks. "I''m sure he does not mind me having som fun with girls" you answers.'
+			end
+			'She then after a moment of hesitation continues "So do you think he is up for a hot redhead joining the two of you in bed?"'
+		else
+			'"Does this mean that we can''t play together anymore" she asks. "I''m sure he does not mind me having some fun with girls" you answers.'
+			if katjaQW['pussy_sex'] > 0:
+				if katjaQW['QWstage'] < 6: katjaQW['QWstage'] = 6
+				'She then after a moment of hesitation continues "So do you think he is up for a hot redhead joining the two of you in bed?"'
+			else
+				if katjaQW['QWstage'] >= 4:
+					'She then after a moment of hesitation continues "What about me trying to have sex with a boy? I understand that having Marcus join us wont be an option anymore, but do you think you could set it up such that Artem is my first boy?"'
+				else
+					'She then after a  very long moment of hesitation continues "I''m somewhat jealous. Now you are having sex with a boy. It is.... it is something I would also like to try...."'
+					'She is getting very red in her head and after a long paus she ask "Do you... Do you think.... Do you think that I could join you and have Artem be my first boy?"'
+				end
+			end
+		end
+		act 'Agree to set up a threesome with Artem': katjaQw['boy_block'] = 1 & gt 'KatjaHomeTalk', 'artem_threesome_planning'
+		act 'Tell Katja that you don''t want to share Artem':
+			*clr & cla
+			if katjaQW['QWstage'] = 5: katjaQW['QWstage'] = 4
+			katjaQw['boy_block'] = 1
+			minut += 2
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"I''m sorry, but I want to keep him for myself. I know that maybe selfish, but I don''t think that I''m ready to share my boyfriend with other girls." you tell Katja.'
+			'"No. Problem I understand that" Katja says with a small hint of disappointment "Let me know if you change your mind"'
+			act 'Talk about something else':
+				if $loc = 'katja_dorm':
+					gt 'katja_dorm', 'talk'
+				else
+					gt 'KatjaHomeTalk'
+				end
+			end
+			if $loc = 'katja_dorm':
+				act 'Stop talking': gt 'katja_dorm', 'start'
+			else
+				act 'Leave the room': gt 'mey_home', 'start'
+			end	
+		end
+	else
+		katjaQw['boy_block'] = 1
+		'"Does this mean that we can''t play together anymore" she asks. "I''m sure he does not mind me having some fun with girls" you answers.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end	
+	end
+end
+
+if $ARGS[0] = 'artem_sex_discussion':
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	if katjaQW['QWstage'] >= 6:
+		'"I remember that you asked if you could join me an Artem in a threesome, and I have decided that it would be fine if you still want to" you tell Katja.'
+	else
+		'"So. I know that you have wanted to try to have sex with a boy for a while, and I have decided that you could join me and Artem in a threesome if you like" you tell Katja.'
+	end
+	'Katja''s face lights up like it was Christmas, and can barely contain her excitement. "Yes I would very much like this, when do we do it?" sha ask.'
+	act 'Tell Katja you plan': gt 'KatjaHomeTalk', 'artem_threesome_planning'
+end
+
+
+if $ARGS[0] = 'artem_threesome_planning':
+	minut += 4
+	katjaQW['hormy'] += rand(5,20)
+	artemQW['katja_threesome']  = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'"Okay. I think it would be best if we surprise him, that is that you seduce him while I''m there" you tell Katja.'
+	if katjaQW['QWstage'] < 5 and katjaQW['pussy_sex'] = 0:
+		'"How do I do that? I have never seduced a boy before" Katja says. "Just try to act slutty around him, make him look at your nice body, You will know you got him if he can''t look away, boys are easy" you explain.'
+		'"Okay" Katja say not completely convinced "But I can''t do that at a public place."'
+	else
+		'"Sure I can act slutty and get him in my claws" Katja says "but it need to be a private place, I don''t think he is the type of guy who wont freeze up when hit on in public."'
+	end
+	'"Yeah, it need to be just the 3 of us, else he will just panic. My place is no good and his parents are hom most of the time I''m there" you answer.'
+	'"Maybe we could do it here? Tamara works until late and Vicky usually hangs out with Vanya elsewhere when she she is not at cheearleading practice, so the afternoons here are free." Katja says.'
+	'"That a good idea", you say "but how do we get him to come here without expecting something?" you ask. "I don''t know, are there any activities we could do together that he  could join..... maybe we could do homework together+"  Katja suggest.'
+	'"Yes that it is, next time I''m going home from school with Artem you''lll come and interrupt us, claiming that I promised you to do homework together. I''ll then suggest that we do it together. That way he wont expect anything" you say exited.'
+	'"That''s brilliant" Katja says. "I just have to work on my seduction skills. Looking forward to it."'
+	if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
+	act 'Talk about something else':
+		if $loc = 'katja_dorm':
+			gt 'katja_dorm', 'talk'
+		else
+			gt 'KatjaHomeTalk'
+		end
+	end
+	if $loc = 'katja_dorm':
+		act 'Stop talking': gt 'katja_dorm', 'start'
+	else
+		act 'Leave the room': gt 'mey_home', 'start'
+	end
+end
+
+if $ARGS[0] = 'Artem_break_up_talk':
+	katjaQW['knows_artem_is_boyfreind'] = 2
+	minut += 2
+	katjaQW['hormy'] += rand(5,20)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'"So how are you and Artem?" Katja ask in a tone that indicates she know you have broken up.'
+	act '"I''m heartbroken"':
+		cla & *nl
+		minut += 6
+		katjaQW['hormy'] = min(20,katjaQW['hormy'])
+		if katjaQW['marcus_pussy'] > 0: katjaQW['Marcus_day'] = daystart
+		gs 'stat'
+		'"We''re..." you start but a lump in your throat cause you to immediately choke up. Tears blur your vision and you turn away while rubbing your wrist across your eyes, face flushing with embarrassment, shame, and sadness all at once.'
+		'"We broke up," you manage to force out, still not looking at Katja. "I... I think this might be the worst thing that''s ever happened to me. I ruined everything. I miss him every day and..." You finally turn to face her. "I think it broke my heart..."'
+		'"Come here you poor thing" Katja says and moves close and hugs you.'
+		*nl
+		'For a couple of minutes you just sit there slightly crying into Katja''s bosom. She gently reassures you that things will be better soon, and you will always have her to lean on in hard times.'
+		'After some time you stop crying and you clear your eyes and you get back to discussing other stuff.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+
+	act 'Tell you are angry about how treated you':
+		cla & *nl
+		minut += 3
+		'"I know we''re young and maybe we don''t know enough to know what love is but there was something more than just friendship or kissing there. I really thought I had found that special person I could spend the rest of my life with but he''s just a jerk like the rest of them. I can''t believe a dork like him broke my heart and worse still I don''t think he gives two shits about doing it. Fuck" You tell Katja'
+		'"Shit I''m so sorry to hear that. Nobody should treat you bad. Comer here" Katja says and open her arms and pulls you in for a hug.'
+		'"I really thought Artem would be different. But turns out that even a nerd turns into one ot the idiots that call them selves the cool boys, when he gets the attention of pretty women." she tells you while wou are still in her embrace.'
+		'"Don''t vory, you can find much better boys than him. If that''s what you want+" Katja says after she has let go of her hug. You can''t quite place what she means by her last comment.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+	act 'Tell her that you decided that you could do better':
+		cla & *nl
+		minut += 2
+		katjaQW['hormy'] -= rand(10,20)
+		if katjaQW['marcus_pussy'] > 0: katjaQW['Marcus_day'] = daystart
+		gs 'npc_relationship', 'modify', 'A14', 'dislike'
+		gs 'stat'
+		'"Artem is a sweatheart and there might not be anyone nicer I could have gone out with, but I always felt like I was just settling for the easy choice. I''m a pretty girl, I could be dating anyone in that school and I''m going with him? I hate to hurt him like I did when I ended it but I was always out of his league and it constantly felt like everyone knew it. And sure I could just ignore them but he knew it too and that I couldn''t ignore. I hope he finds a nice homely girl who will make him happy. I really do, he deserves to be happy" you tell Katja.'
+		'She looks a little shocked and takes a while before answering. "So looks and status is all? I didn''t know that I was friends with Bella. Wonder when I wont live up to your standards" Katja says sounding quite disapproving.'
+		'"It''s not like that Katja, nobody can compare with you. I''m not leaving you. It''s just with boys, I think that I need to try something more, something exiting and Artem is not that" you assure Katja.' 
+		'She does not look completely convinced by let it go and you turn to discuss other things.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+
+	act 'Tell her you are sad because it had to end':
+		cla & *nl
+		minut += 6
+		katjaQW['hormy'] = min(40,katjaQW['hormy'])
+		gs 'stat'
+		'"We''re... not together anymore," you admit, feeling a pang in your chest. "Looking back, I don''t think there was any real way to make it last. We weren''t good for each other. But that doesn''t mean I''m happy about breaking up. I miss him. And I miss the good times we had together. And I''m sad that we probably won''t have anything like that together again."'
+		'"I''m truly sorry to hear that. I understand you. Come here" Katja say and open her arms for you.  You lay you head on her bosom and she hugs her while she continue. "There will be others. I understand it feels like you never will experince love like that again. But I can promise you that you will. We are still young and beautiful. The world is still open for us. Give it time and everything will be alright."'
+		'You stay in her warm embrace for a couple of minutes before getting you self together and you start discussing other matters.' 
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+
+	act 'Tell her that it was for the best ending it':
+		cla & *nl
+		minut += 3
+		gs 'stat'
+		'"We''re not together anymore," you sigh. "But it''s probably for the best."'
+		'Katja''s looks at you with both concern and skepticism, the latter seemingly a worry that you''re just trying to fool yourself.'
+		'"Really," you add quickly, trying to quell her thoughts. "We weren''t good for each other. If I really think about it, I can''t imagine a future where the two of us stayed together forever. It was always going to end with us breaking up. Better to do it now before it gets too painful and too much time is wasted for the both of us."'
+		'"Okay....." Katja says still not sounding really convinced. "As long as you are fine with it I suppose it was for the best. I did like Artem though. But there are other boys out there. '+iif(katjaQW['QWstage'] >= 6, 'Maybe even other we could trhy together?', 'You will be fine')+'" she ends in a more cheerful note.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end	
+	
+	act 'Tell her you got bored of Artem':
+		cla & *nl
+		minut += 3
+		'"Honestly?" you say. "I got bored. He''s so... <i>plain.</i> I want a boy who can bring me excitement. At first, just knowing he liked me back was enough to bring that thrill. But the more we were together, the more all he would do is play video games and study and read. Talk about boring."'
+		'"Well reading and studying is not Boring!" Katja says a little hurt, "But I can understand that if it is all you do then yes it is a boring life. No parties? No dancing? Life without those do suck" she continues in a lighter mode.'
+		if katjaQW['QWstage'] >= 6:
+			katjaQW['hormy'] += rand(10,30)
+			'"Well there are plenty of other hot guys to fool around with, so I can definitely understand settling with one is boring. We are still smoking hot, we will find other goys to amuse us" she says sounding a little aroused.'
+		else
+			katjaQW['hormy'] += rand(5,15)
+			'"There ara plenty of other guys around, so'+iif(pcs_hotcat > 6, ' with your gorgeous looks ', ' ')+'you will find somebody else" Katja continues. You can''t quite get her tone. Is it a hint of jealousy you detect, and if so. Jealous of who? You or the boys she is mentions.'
+		end
+		gs 'stat'
+		act 'Talk about something else':
+			if katjaQW['horny'] > rand(70,100):
+				if katjaQW['QWstage'] > 2:
+					gt 'KatjaHomeTalk', 'hornykiss'
+				else
+					gt 'KatjaHomeTalk', 'tender_kiss'
+				end
+			else
+				if $loc = 'katja_dorm':
+					gt 'katja_dorm', 'talk'
+				else
+					gt 'KatjaHomeTalk'
+				end
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+
+	act 'Tell her you felt Artem was holding you back':
+		cla & *nl
+		minut +=3
+		'"He was holding me back," you roll your eyes. "I can do so much better than him. He''s not exciting, he doesn''t have any ambition, he just plays video games and reads all day. I want someone better. I want someone who makes <i>me</i> better. Artem would''ve been nothing but dead weight for me."'
+		'"Well reading isn''t boring. But I can understand that if it is all you do together then it''s no fun. No parties? No dancing? Life without those do suck" Katja says '
+		if katjaQW['QWstage'] >= 6:
+			katjaQW['hormy'] += rand(10,30)
+			'"Well there are plenty of other hot guys to fool around with, so I can definitely understand you want to move on. We are still smoking hot, we will find other goys to amuse us" she says sounding a little aroused.'
+		else
+			katjaQW['hormy'] += rand(5,15)
+			'"There ara plenty of other guys around, so'+iif(pcs_hotcat > 6, ' with your gorgeous looks ', ' ')+'you will find somebody else" Katja continues. You can''t quite get her tone. Is it a hint of jealousy you detect, and if so. Jealous of who? You or the boys she is mentions.'
+		end
+		gs 'stat'
+		act 'Talk about something else':
+			if katjaQW['horny'] > rand(70,100):
+				if katjaQW['QWstage'] > 2:
+					gt 'KatjaHomeTalk', 'hornykiss'
+				else
+					gt 'KatjaHomeTalk', 'tender_kiss'
+				end
+			else
+				if $loc = 'katja_dorm':
+					gt 'katja_dorm', 'talk'
+				else
+					gt 'KatjaHomeTalk'
+				end
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end		
+	end
+
+	act 'Tell you are glad you ditched the sorry looser':
+		cla & *nl
+		minut += 6
+		katjaQW['hormy'] = -rand(20,30)
+		if katjaQW['marcus_pussy'] > 0: katjaQW['Marcus_day'] = daystart
+		gs 'npc_relationship', 'modify', 'A14', 'hate'
+		gs 'stat'
+		'"Artem! I ditched that sorry *loser, I don''t understand why i kept that nerd around for so long. Totally beneath my standards" you tell her.'
+		'Katja looks at you completely shocked "Okay so I''m talking to Bella or Lena. That is no way to describe a nice guy like Artem.. You are channeling the worst girls in school. Sure if you needed to break up with him fine, but don''t make it his fault when I can clearly her that it is yours" she say sounding quite angry.'
+		'"That''s not what I meant, it just that Artem does not live up to the the standards I have for ..." you try to explain but before you can finish Katja interrupts you. "So when will I fal to live up to the standards of the Princess of Pavlovsk? You are sounding like the stupid bitches at school" she almost shout at you.'
+		'You get the feeling that nothing you can say right now will make her see your side, so to just say "I''m sorry". Katja doesn''t says anything and for a couple of minutes she just ignores you, before returning to talk about other things.'
+		act 'Talk about something else':
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end
+	end
+
+	act 'You cheated on him':
+		cla & *nl
+		minut += 3
+		katjaQW['hormy'] += rand(5,15)
+		'"The truth is... I cheated on him," you confess. Katja gasps in shock and you continue on. "I''m not sure why it was. Maybe it was just the thrill. Maybe I was bored of him. Maybe I just wanted an excuse to break up. Maybe I just like hurting people. Or maybe I''m just a slut. I don''t know. But I slept with another guy and he found out about it. That''s why we broke up."'
+		'"I see. Well if you promised him to be faithful, then it''s clearly fault, and he is right to break up with you" Katja says which hurtts a little, but you don''t feel that she is mad at you.'
+		'"I don''t care how many boys you sleep with" She continues '+iif(katjaQW['QWstage'] >= 6, '"as long as you share some with me"', '"it gives you good strories to tell me"')+' she says in a very low voice.'
+		'You can''t quite get her tone. Is it a hint of jealousy you detect, and if so. Jealous of who? You or the boys she is mentions.'
+		act 'Talk about something else':
+			if katjaQW['horny'] > rand(70,100):
+				if katjaQW['QWstage'] > 2:
+					gt 'KatjaHomeTalk', 'hornykiss'
+				else
+					gt 'KatjaHomeTalk', 'tender_kiss'
+				end
+			else
+				if $loc = 'katja_dorm':
+					gt 'katja_dorm', 'talk'
+				else
+					gt 'KatjaHomeTalk'
+				end
+			end
+		end
+		if $loc = 'katja_dorm':
+			act 'Stop talking': gt 'katja_dorm', 'start'
+		else
+			act 'Leave the room': gt 'mey_home', 'start'
+		end		
+	end
+
+end
+
 --- KatjaHomeTalk ---------------------------------
 

+ 10 - 10
locations/MagEncounterFairy.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 	knowsfairy = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
-	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
+	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?"'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	act 'Chat with the fairy':
 		cla
@@ -44,9 +44,9 @@ if $ARGS[0] = 'fairy_chat_no1':
 		pcs_mood += 15
 		gs 'stat'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
-		if fairyday['skin_increase'] <= 10:
+		if fairyQW['skin_increase'] <= 10:
 			pcs_skin += 10
-			fairyday['skin_increase'] += 1
+			fairyQW['skin_increase'] += 1
 			pcs_horny += 10
 			gs 'stat'
 			'The fairy bids you farewell. Just as she flies off, she returns fluttering in front of your face.'
@@ -104,12 +104,12 @@ if $ARGS[0] = 'fairy_chat':
 		pcs_mood += 15
 		gs 'stat'
 		gs 'MagEncounterFairy', 'fairychattopic'
-		if fairyday['skin_increase'] <= 10 and fairyday ! daystart and fairyshoo = 0:
+		if fairyQW['skin_increase'] <= 10 and fairyQW['day'] ! daystart and fairyshoo = 0:
 			cla
 			pcs_skin += 10
 			if pcs_skin > 1000: pcs_skin = 1000
-			fairyday['skin_increase'] += 1
-			fairyday = daystart
+			fairyQW['skin_increase'] += 1
+			fairyQW['day'] = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
 			wait 725
@@ -118,12 +118,12 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you could still look lovelier.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel your skin start tingling, again, as if brushed by a feather.'
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday['skin_increase'] > 10 and fairyday < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
+		elseif fairyQW['skin_increase'] > 10 and fairyQW['day'] < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
 			!Sets the Succubus setup dream
 			cla
 			succubusQW = 1
 			pcs_horny = 100
-			fairyday = daystart
+			fairyQW['day'] = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
 			wait 725
@@ -132,8 +132,8 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you''re almost a magical creature now.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.'
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday ! daystart and (pcs_nips < 80 or clit_size < 80):
-			fairyday = daystart
+		elseif fairyQW['day'] ! daystart and (pcs_nips < 80 or clit_size < 80):
+			fairyQW['day'] = daystart
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
 				cla

+ 1 - 1
locations/_attributes_cats_dress.qsrc

@@ -21,7 +21,7 @@ elseif ARGS[1] = 2:
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 1
+	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloPrice = 3000

+ 13 - 0
locations/_attributes_piercing_brow.qsrc

@@ -0,0 +1,13 @@
+# $attributes_piercing_brow
+
+if ARGS[0] = 1:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 2:
+	PirFirst = 5000
+	PirPrice = 2000
+
+end
+
+--- $attributes_piercing_brow ---------------------------------

+ 101 - 0
locations/_attributes_piercing_ears.qsrc

@@ -0,0 +1,101 @@
+# $attributes_piercing_ears
+
+if ARGS[0] = 1:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 2:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 3:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 4:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 5:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 6:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 7:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 8:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 9:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 10:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 11:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 12:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 13:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 14:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 15:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 16:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 17:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 18:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 19:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 20:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 21:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 22:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 23:
+	PirFirst = 3000
+	PirPrice = 1000
+
+elseif ARGS[0] = 24:
+	PirFirst = 3000
+	PirPrice = 1000
+
+end
+
+--- $attributes_piercing_ears ---------------------------------

+ 33 - 0
locations/_attributes_piercing_lip.qsrc

@@ -0,0 +1,33 @@
+# $attributes_piercing_lip
+
+if ARGS[0] = 1:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 2:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 3:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 4:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 5:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 6:
+	PirFirst = 6000
+	PirPrice = 3000
+
+elseif ARGS[0] = 7:
+	PirFirst = 6000
+	PirPrice = 3000
+
+end
+
+--- $attributes_piercing_lip ---------------------------------

+ 21 - 0
locations/_attributes_piercing_navel.qsrc

@@ -0,0 +1,21 @@
+# $attributes_piercing_navel
+
+if ARGS[0] = 1:
+	PirFirst = 8000
+	PirPrice = 5000
+
+elseif ARGS[0] = 2:
+	PirFirst = 8000
+	PirPrice = 5000
+
+elseif ARGS[0] = 3:
+	PirFirst = 8000
+	PirPrice = 5000
+
+elseif ARGS[0] = 4:
+	PirFirst = 8000
+	PirPrice = 5000
+
+end
+
+--- $attributes_piercing_navel ---------------------------------

+ 33 - 0
locations/_attributes_piercing_nipples.qsrc

@@ -0,0 +1,33 @@
+# $attributes_piercing_nipples
+
+if ARGS[0] = 1:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 2:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 3:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 4:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 5:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 6:
+	PirFirst = 10000
+	PirPrice = 6000
+
+elseif ARGS[0] = 7:
+	PirFirst = 10000
+	PirPrice = 6000
+
+end
+
+--- $attributes_piercing_nipples ---------------------------------

+ 33 - 0
locations/_attributes_piercing_nose.qsrc

@@ -0,0 +1,33 @@
+# $attributes_piercing_nose
+
+if ARGS[0] = 1:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 2:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 3:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 4:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 5:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 6:
+	PirFirst = 5000
+	PirPrice = 2000
+
+elseif ARGS[0] = 7:
+	PirFirst = 5000
+	PirPrice = 2000
+
+end
+
+--- $attributes_piercing_nose ---------------------------------

+ 45 - 0
locations/_attributes_piercing_pussy.qsrc

@@ -0,0 +1,45 @@
+# $attributes_piercing_pussy
+
+if ARGS[0] = 1:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 2:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 3:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 4:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 5:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 6:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 7:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 8:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 9:
+	PirFirst = 25000
+	PirPrice = 10000
+
+elseif ARGS[0] = 10:
+	PirFirst = 25000
+	PirPrice = 10000
+
+end
+
+--- $attributes_piercing_pussy ---------------------------------

+ 21 - 0
locations/_attributes_piercing_tongue.qsrc

@@ -0,0 +1,21 @@
+# $attributes_piercing_tongue
+
+if ARGS[0] = 1:
+	PirFirst = 7000
+	PirPrice = 4000
+
+elseif ARGS[0] = 2:
+	PirFirst = 7000
+	PirPrice = 4000
+
+elseif ARGS[0] = 3:
+	PirFirst = 7000
+	PirPrice = 4000
+
+elseif ARGS[0] = 4:
+	PirFirst = 7000
+	PirPrice = 4000
+
+end
+
+--- $attributes_piercing_tongue ---------------------------------

+ 80 - 0
locations/_attributes_tattoo_ankle.qsrc

@@ -0,0 +1,80 @@
+# $attributes_tattoo_ankle
+
+if ARGS[0] = 1:
+	TatPrice = 8000
+
+elseif ARGS[0] = 2:
+	TatPrice = 8000
+
+elseif ARGS[0] = 3:
+	TatPrice = 8000
+
+elseif ARGS[0] = 4:
+	TatPrice = 8000
+
+elseif ARGS[0] = 5:
+	TatPrice = 8000
+
+elseif ARGS[0] = 6:
+	TatPrice = 8000
+
+elseif ARGS[0] = 7:
+	TatPrice = 8000
+
+elseif ARGS[0] = 8:
+	TatPrice = 8000
+
+elseif ARGS[0] = 9:
+	TatPrice = 8000
+
+elseif ARGS[0] = 10:
+	TatPrice = 8000
+
+elseif ARGS[0] = 11:
+	TatPrice = 8000
+
+elseif ARGS[0] = 12:
+	TatPrice = 8000
+
+elseif ARGS[0] = 13:
+	TatPrice = 8000
+
+elseif ARGS[0] = 14:
+	TatPrice = 8000
+
+elseif ARGS[0] = 15:
+	TatPrice = 8000
+
+elseif ARGS[0] = 16:
+	TatPrice = 8000
+
+elseif ARGS[0] = 17:
+	TatPrice = 8000
+
+elseif ARGS[0] = 18:
+	TatPrice = 8000
+
+elseif ARGS[0] = 19:
+	TatPrice = 8000
+
+elseif ARGS[0] = 20:
+	TatPrice = 8000
+
+elseif ARGS[0] = 21:
+	TatPrice = 8000
+
+elseif ARGS[0] = 22:
+	TatPrice = 8000
+
+elseif ARGS[0] = 23:
+	TatPrice = 8000
+
+elseif ARGS[0] = 24:
+	TatPrice = 8000
+
+elseif ARGS[0] = 25:
+	TatPrice = 8000
+
+end
+
+--- $attributes_tattoo_ankle ---------------------------------

+ 242 - 0
locations/_attributes_tattoo_arm.qsrc

@@ -0,0 +1,242 @@
+# $attributes_tattoo_arm
+
+if ARGS[0] = 1:
+	TatPrice = 8000
+
+elseif ARGS[0] = 2:
+	TatPrice = 8000
+
+elseif ARGS[0] = 3:
+	TatPrice = 8000
+
+elseif ARGS[0] = 4:
+	TatPrice = 8000
+
+elseif ARGS[0] = 5:
+	TatPrice = 8000
+
+elseif ARGS[0] = 6:
+	TatPrice = 8000
+
+elseif ARGS[0] = 7:
+	TatPrice = 8000
+
+elseif ARGS[0] = 8:
+	TatPrice = 8000
+
+elseif ARGS[0] = 9:
+	TatPrice = 8000
+
+elseif ARGS[0] = 10:
+	TatPrice = 8000
+
+elseif ARGS[0] = 11:
+	TatPrice = 8000
+
+elseif ARGS[0] = 12:
+	TatPrice = 8000
+
+elseif ARGS[0] = 13:
+	TatPrice = 8000
+
+elseif ARGS[0] = 14:
+	TatPrice = 8000
+
+elseif ARGS[0] = 15:
+	TatPrice = 8000
+
+elseif ARGS[0] = 16:
+	TatPrice = 8000
+
+elseif ARGS[0] = 17:
+	TatPrice = 8000
+
+elseif ARGS[0] = 18:
+	TatPrice = 8000
+
+elseif ARGS[0] = 19:
+	TatPrice = 8000
+
+elseif ARGS[0] = 20:
+	TatPrice = 8000
+
+elseif ARGS[0] = 21:
+	TatPrice = 8000
+
+elseif ARGS[0] = 22:
+	TatPrice = 8000
+
+elseif ARGS[0] = 23:
+	TatPrice = 8000
+
+elseif ARGS[0] = 24:
+	TatPrice = 8000
+
+elseif ARGS[0] = 25:
+	TatPrice = 8000
+
+elseif ARGS[0] = 26:
+	TatPrice = 8000
+
+elseif ARGS[0] = 27:
+	TatPrice = 8000
+
+elseif ARGS[0] = 28:
+	TatPrice = 8000
+
+elseif ARGS[0] = 29:
+	TatPrice = 8000
+
+elseif ARGS[0] = 30:
+	TatPrice = 8000
+
+elseif ARGS[0] = 31:
+	TatPrice = 8000
+
+elseif ARGS[0] = 32:
+	TatPrice = 8000
+
+elseif ARGS[0] = 33:
+	TatPrice = 8000
+
+elseif ARGS[0] = 34:
+	TatPrice = 8000
+
+elseif ARGS[0] = 35:
+	TatPrice = 8000
+
+elseif ARGS[0] = 36:
+	TatPrice = 8000
+
+elseif ARGS[0] = 37:
+	TatPrice = 8000
+
+elseif ARGS[0] = 38:
+	TatPrice = 8000
+
+elseif ARGS[0] = 39:
+	TatPrice = 8000
+
+elseif ARGS[0] = 40:
+	TatPrice = 8000
+
+elseif ARGS[0] = 41:
+	TatPrice = 8000
+
+elseif ARGS[0] = 42:
+	TatPrice = 8000
+
+elseif ARGS[0] = 43:
+	TatPrice = 8000
+
+elseif ARGS[0] = 44:
+	TatPrice = 8000
+
+elseif ARGS[0] = 45:
+	TatPrice = 8000
+
+elseif ARGS[0] = 46:
+	TatPrice = 8000
+
+elseif ARGS[0] = 47:
+	TatPrice = 8000
+
+elseif ARGS[0] = 48:
+	TatPrice = 8000
+
+elseif ARGS[0] = 49:
+	TatPrice = 8000
+
+elseif ARGS[0] = 40:
+	TatPrice = 8000
+
+elseif ARGS[0] = 51:
+	TatPrice = 8000
+
+elseif ARGS[0] = 52:
+	TatPrice = 8000
+
+elseif ARGS[0] = 53:
+	TatPrice = 8000
+
+elseif ARGS[0] = 54:
+	TatPrice = 8000
+
+elseif ARGS[0] = 55:
+	TatPrice = 8000
+
+elseif ARGS[0] = 56:
+	TatPrice = 8000
+
+elseif ARGS[0] = 57:
+	TatPrice = 8000
+
+elseif ARGS[0] = 58:
+	TatPrice = 8000
+
+elseif ARGS[0] = 59:
+	TatPrice = 8000
+
+elseif ARGS[0] = 60:
+	TatPrice = 8000
+
+elseif ARGS[0] = 61:
+	TatPrice = 8000
+
+elseif ARGS[0] = 62:
+	TatPrice = 8000
+
+elseif ARGS[0] = 63:
+	TatPrice = 8000
+
+elseif ARGS[0] = 64:
+	TatPrice = 8000
+
+elseif ARGS[0] = 65:
+	TatPrice = 8000
+
+elseif ARGS[0] = 66:
+	TatPrice = 8000
+
+elseif ARGS[0] = 67:
+	TatPrice = 8000
+
+elseif ARGS[0] = 68:
+	TatPrice = 8000
+
+elseif ARGS[0] = 69:
+	TatPrice = 8000
+
+elseif ARGS[0] = 70:
+	TatPrice = 8000
+
+elseif ARGS[0] = 71:
+	TatPrice = 8000
+
+elseif ARGS[0] = 72:
+	TatPrice = 8000
+
+elseif ARGS[0] = 73:
+	TatPrice = 8000
+
+elseif ARGS[0] = 74:
+	TatPrice = 8000
+
+elseif ARGS[0] = 75:
+	TatPrice = 8000
+
+elseif ARGS[0] = 76:
+	TatPrice = 8000
+
+elseif ARGS[0] = 77:
+	TatPrice = 8000
+
+elseif ARGS[0] = 78:
+	TatPrice = 8000
+
+elseif ARGS[0] = 79:
+	TatPrice = 8000
+
+end
+
+--- $attributes_tattoo_arm ---------------------------------

+ 80 - 0
locations/_attributes_tattoo_ass.qsrc

@@ -0,0 +1,80 @@
+# $attributes_tattoo_ass
+
+if ARGS[0] = 1:
+	TatPrice = 10000
+
+elseif ARGS[0] = 2:
+	TatPrice = 10000
+
+elseif ARGS[0] = 3:
+	TatPrice = 10000
+
+elseif ARGS[0] = 4:
+	TatPrice = 10000
+
+elseif ARGS[0] = 5:
+	TatPrice = 10000
+
+elseif ARGS[0] = 6:
+	TatPrice = 10000
+
+elseif ARGS[0] = 7:
+	TatPrice = 10000
+
+elseif ARGS[0] = 8:
+	TatPrice = 10000
+
+elseif ARGS[0] = 9:
+	TatPrice = 10000
+
+elseif ARGS[0] = 10:
+	TatPrice = 10000
+
+elseif ARGS[0] = 11:
+	TatPrice = 10000
+
+elseif ARGS[0] = 12:
+	TatPrice = 10000
+
+elseif ARGS[0] = 13:
+	TatPrice = 10000
+
+elseif ARGS[0] = 14:
+	TatPrice = 10000
+
+elseif ARGS[0] = 15:
+	TatPrice = 10000
+
+elseif ARGS[0] = 16:
+	TatPrice = 10000
+
+elseif ARGS[0] = 17:
+	TatPrice = 10000
+
+elseif ARGS[0] = 18:
+	TatPrice = 10000
+
+elseif ARGS[0] = 19:
+	TatPrice = 10000
+
+elseif ARGS[0] = 20:
+	TatPrice = 10000
+
+elseif ARGS[0] = 21:
+	TatPrice = 10000
+
+elseif ARGS[0] = 22:
+	TatPrice = 10000
+
+elseif ARGS[0] = 23:
+	TatPrice = 10000
+
+elseif ARGS[0] = 24:
+	TatPrice = 10000
+
+elseif ARGS[0] = 25:
+	TatPrice = 10000
+
+end
+
+--- $attributes_tattoo_ass ---------------------------------

+ 188 - 0
locations/_attributes_tattoo_back.qsrc

@@ -0,0 +1,188 @@
+# $attributes_tattoo_back
+
+if ARGS[0] = 1:
+	TatPrice = 10000
+
+elseif ARGS[0] = 2:
+	TatPrice = 10000
+
+elseif ARGS[0] = 3:
+	TatPrice = 10000
+
+elseif ARGS[0] = 4:
+	TatPrice = 10000
+
+elseif ARGS[0] = 5:
+	TatPrice = 10000
+
+elseif ARGS[0] = 6:
+	TatPrice = 10000
+
+elseif ARGS[0] = 7:
+	TatPrice = 10000
+
+elseif ARGS[0] = 8:
+	TatPrice = 10000
+
+elseif ARGS[0] = 9:
+	TatPrice = 10000
+
+elseif ARGS[0] = 10:
+	TatPrice = 10000
+
+elseif ARGS[0] = 11:
+	TatPrice = 10000
+
+elseif ARGS[0] = 12:
+	TatPrice = 10000
+
+elseif ARGS[0] = 13:
+	TatPrice = 10000
+
+elseif ARGS[0] = 14:
+	TatPrice = 10000
+
+elseif ARGS[0] = 15:
+	TatPrice = 10000
+
+elseif ARGS[0] = 16:
+	TatPrice = 10000
+
+elseif ARGS[0] = 17:
+	TatPrice = 10000
+
+elseif ARGS[0] = 18:
+	TatPrice = 10000
+
+elseif ARGS[0] = 19:
+	TatPrice = 10000
+
+elseif ARGS[0] = 20:
+	TatPrice = 10000
+
+elseif ARGS[0] = 21:
+	TatPrice = 10000
+
+elseif ARGS[0] = 22:
+	TatPrice = 10000
+
+elseif ARGS[0] = 23:
+	TatPrice = 10000
+
+elseif ARGS[0] = 24:
+	TatPrice = 10000
+
+elseif ARGS[0] = 25:
+	TatPrice = 10000
+
+elseif ARGS[0] = 26:
+	TatPrice = 10000
+
+elseif ARGS[0] = 27:
+	TatPrice = 10000
+
+elseif ARGS[0] = 28:
+	TatPrice = 10000
+
+elseif ARGS[0] = 29:
+	TatPrice = 10000
+
+elseif ARGS[0] = 30:
+	TatPrice = 10000
+
+elseif ARGS[0] = 31:
+	TatPrice = 10000
+
+elseif ARGS[0] = 32:
+	TatPrice = 10000
+
+elseif ARGS[0] = 33:
+	TatPrice = 10000
+
+elseif ARGS[0] = 34:
+	TatPrice = 10000
+
+elseif ARGS[0] = 35:
+	TatPrice = 10000
+
+elseif ARGS[0] = 36:
+	TatPrice = 10000
+
+elseif ARGS[0] = 37:
+	TatPrice = 10000
+
+elseif ARGS[0] = 38:
+	TatPrice = 10000
+
+elseif ARGS[0] = 39:
+	TatPrice = 10000
+
+elseif ARGS[0] = 40:
+	TatPrice = 10000
+
+elseif ARGS[0] = 41:
+	TatPrice = 10000
+
+elseif ARGS[0] = 42:
+	TatPrice = 10000
+
+elseif ARGS[0] = 43:
+	TatPrice = 10000
+
+elseif ARGS[0] = 44:
+	TatPrice = 10000
+
+elseif ARGS[0] = 45:
+	TatPrice = 10000
+
+elseif ARGS[0] = 46:
+	TatPrice = 10000
+
+elseif ARGS[0] = 47:
+	TatPrice = 10000
+
+elseif ARGS[0] = 48:
+	TatPrice = 10000
+
+elseif ARGS[0] = 49:
+	TatPrice = 10000
+
+elseif ARGS[0] = 40:
+	TatPrice = 10000
+
+elseif ARGS[0] = 51:
+	TatPrice = 10000
+
+elseif ARGS[0] = 52:
+	TatPrice = 10000
+
+elseif ARGS[0] = 53:
+	TatPrice = 10000
+
+elseif ARGS[0] = 54:
+	TatPrice = 10000
+
+elseif ARGS[0] = 55:
+	TatPrice = 10000
+
+elseif ARGS[0] = 56:
+	TatPrice = 10000
+
+elseif ARGS[0] = 57:
+	TatPrice = 10000
+
+elseif ARGS[0] = 58:
+	TatPrice = 10000
+
+elseif ARGS[0] = 59:
+	TatPrice = 10000
+
+elseif ARGS[0] = 60:
+	TatPrice = 10000
+
+elseif ARGS[0] = 61:
+	TatPrice = 10000
+
+end
+
+--- $attributes_tattoo_back ---------------------------------

+ 68 - 0
locations/_attributes_tattoo_belly.qsrc

@@ -0,0 +1,68 @@
+# $attributes_tattoo_belly
+
+if ARGS[0] = 1:
+	TatPrice = 10000
+
+elseif ARGS[0] = 2:
+	TatPrice = 10000
+
+elseif ARGS[0] = 3:
+	TatPrice = 10000
+
+elseif ARGS[0] = 4:
+	TatPrice = 10000
+
+elseif ARGS[0] = 5:
+	TatPrice = 10000
+
+elseif ARGS[0] = 6:
+	TatPrice = 10000
+
+elseif ARGS[0] = 7:
+	TatPrice = 10000
+
+elseif ARGS[0] = 8:
+	TatPrice = 10000
+
+elseif ARGS[0] = 9:
+	TatPrice = 10000
+
+elseif ARGS[0] = 10:
+	TatPrice = 10000
+
+elseif ARGS[0] = 11:
+	TatPrice = 10000
+
+elseif ARGS[0] = 12:
+	TatPrice = 10000
+
+elseif ARGS[0] = 13:
+	TatPrice = 10000
+
+elseif ARGS[0] = 14:
+	TatPrice = 10000
+
+elseif ARGS[0] = 15:
+	TatPrice = 10000
+
+elseif ARGS[0] = 16:
+	TatPrice = 10000
+
+elseif ARGS[0] = 17:
+	TatPrice = 10000
+
+elseif ARGS[0] = 18:
+	TatPrice = 10000
+
+elseif ARGS[0] = 19:
+	TatPrice = 10000
+
+elseif ARGS[0] = 20:
+	TatPrice = 10000
+
+elseif ARGS[0] = 21:
+	TatPrice = 10000
+
+end
+
+--- $attributes_tattoo_belly ---------------------------------

+ 38 - 0
locations/_attributes_tattoo_breasts.qsrc

@@ -0,0 +1,38 @@
+# $attributes_tattoo_breasts
+
+if ARGS[0] = 1:
+	TatPrice = 15000
+
+elseif ARGS[0] = 2:
+	TatPrice = 15000
+
+elseif ARGS[0] = 3:
+	TatPrice = 15000
+
+elseif ARGS[0] = 4:
+	TatPrice = 15000
+
+elseif ARGS[0] = 5:
+	TatPrice = 15000
+
+elseif ARGS[0] = 6:
+	TatPrice = 15000
+
+elseif ARGS[0] = 7:
+	TatPrice = 15000
+
+elseif ARGS[0] = 8:
+	TatPrice = 15000
+
+elseif ARGS[0] = 9:
+	TatPrice = 15000
+
+elseif ARGS[0] = 10:
+	TatPrice = 15000
+
+elseif ARGS[0] = 11:
+	TatPrice = 15000
+
+end
+
+--- $attributes_tattoo_breasts ---------------------------------

+ 50 - 0
locations/_attributes_tattoo_chest.qsrc

@@ -0,0 +1,50 @@
+# $attributes_tattoo_chest
+
+if ARGS[0] = 1:
+	TatPrice = 12000
+
+elseif ARGS[0] = 2:
+	TatPrice = 12000
+
+elseif ARGS[0] = 3:
+	TatPrice = 12000
+
+elseif ARGS[0] = 4:
+	TatPrice = 12000
+
+elseif ARGS[0] = 5:
+	TatPrice = 12000
+
+elseif ARGS[0] = 6:
+	TatPrice = 12000
+
+elseif ARGS[0] = 7:
+	TatPrice = 12000
+
+elseif ARGS[0] = 8:
+	TatPrice = 12000
+
+elseif ARGS[0] = 9:
+	TatPrice = 12000
+
+elseif ARGS[0] = 10:
+	TatPrice = 12000
+
+elseif ARGS[0] = 11:
+	TatPrice = 12000
+
+elseif ARGS[0] = 12:
+	TatPrice = 12000
+
+elseif ARGS[0] = 13:
+	TatPrice = 12000
+
+elseif ARGS[0] = 14:
+	TatPrice = 12000
+
+elseif ARGS[0] = 15:
+	TatPrice = 12000
+
+end
+
+--- $attributes_tattoo_chest ---------------------------------

+ 29 - 0
locations/_attributes_tattoo_face.qsrc

@@ -0,0 +1,29 @@
+# $attributes_tattoo_face
+
+if ARGS[0] = 1:
+	TatPrice = 10000
+
+elseif ARGS[0] = 2:
+	TatPrice = 10000
+
+elseif ARGS[0] = 3:
+	TatPrice = 10000
+
+elseif ARGS[0] = 4:
+	TatPrice = 10000
+
+elseif ARGS[0] = 5:
+	TatPrice = 10000
+
+elseif ARGS[0] = 6:
+	TatPrice = 10000
+
+elseif ARGS[0] = 7:
+	TatPrice = 10000
+
+elseif ARGS[0] = 8:
+	TatPrice = 10000
+
+end
+
+--- $attributes_tattoo_face ---------------------------------

+ 32 - 0
locations/_attributes_tattoo_hand.qsrc

@@ -0,0 +1,32 @@
+# $attributes_tattoo_hand
+
+if ARGS[0] = 1:
+	TatPrice = 7000
+
+elseif ARGS[0] = 2:
+	TatPrice = 7000
+
+elseif ARGS[0] = 3:
+	TatPrice = 7000
+
+elseif ARGS[0] = 4:
+	TatPrice = 7000
+
+elseif ARGS[0] = 5:
+	TatPrice = 7000
+
+elseif ARGS[0] = 6:
+	TatPrice = 7000
+
+elseif ARGS[0] = 7:
+	TatPrice = 7000
+
+elseif ARGS[0] = 8:
+	TatPrice = 7000
+
+elseif ARGS[0] = 9:
+	TatPrice = 7000
+
+end
+
+--- $attributes_tattoo_hand ---------------------------------

+ 146 - 0
locations/_attributes_tattoo_leg.qsrc

@@ -0,0 +1,146 @@
+# $attributes_tattoo_leg
+
+if ARGS[0] = 1:
+	TatPrice = 10000
+
+elseif ARGS[0] = 2:
+	TatPrice = 10000
+
+elseif ARGS[0] = 3:
+	TatPrice = 10000
+
+elseif ARGS[0] = 4:
+	TatPrice = 10000
+
+elseif ARGS[0] = 5:
+	TatPrice = 10000
+
+elseif ARGS[0] = 6:
+	TatPrice = 10000
+
+elseif ARGS[0] = 7:
+	TatPrice = 10000
+
+elseif ARGS[0] = 8:
+	TatPrice = 10000
+
+elseif ARGS[0] = 9:
+	TatPrice = 10000
+
+elseif ARGS[0] = 10:
+	TatPrice = 10000
+
+elseif ARGS[0] = 11:
+	TatPrice = 10000
+
+elseif ARGS[0] = 12:
+	TatPrice = 10000
+
+elseif ARGS[0] = 13:
+	TatPrice = 10000
+
+elseif ARGS[0] = 14:
+	TatPrice = 10000
+
+elseif ARGS[0] = 15:
+	TatPrice = 10000
+
+elseif ARGS[0] = 16:
+	TatPrice = 10000
+
+elseif ARGS[0] = 17:
+	TatPrice = 10000
+
+elseif ARGS[0] = 18:
+	TatPrice = 10000
+
+elseif ARGS[0] = 19:
+	TatPrice = 10000
+
+elseif ARGS[0] = 20:
+	TatPrice = 10000
+
+elseif ARGS[0] = 21:
+	TatPrice = 10000
+
+elseif ARGS[0] = 22:
+	TatPrice = 10000
+
+elseif ARGS[0] = 23:
+	TatPrice = 10000
+
+elseif ARGS[0] = 24:
+	TatPrice = 10000
+
+elseif ARGS[0] = 25:
+	TatPrice = 10000
+
+elseif ARGS[0] = 26:
+	TatPrice = 10000
+
+elseif ARGS[0] = 27:
+	TatPrice = 10000
+
+elseif ARGS[0] = 28:
+	TatPrice = 10000
+
+elseif ARGS[0] = 29:
+	TatPrice = 10000
+
+elseif ARGS[0] = 30:
+	TatPrice = 10000
+
+elseif ARGS[0] = 31:
+	TatPrice = 10000
+
+elseif ARGS[0] = 32:
+	TatPrice = 10000
+
+elseif ARGS[0] = 33:
+	TatPrice = 10000
+
+elseif ARGS[0] = 34:
+	TatPrice = 10000
+
+elseif ARGS[0] = 35:
+	TatPrice = 10000
+
+elseif ARGS[0] = 36:
+	TatPrice = 10000
+
+elseif ARGS[0] = 37:
+	TatPrice = 10000
+
+elseif ARGS[0] = 38:
+	TatPrice = 10000
+
+elseif ARGS[0] = 39:
+	TatPrice = 10000
+
+elseif ARGS[0] = 40:
+	TatPrice = 10000
+
+elseif ARGS[0] = 41:
+	TatPrice = 10000
+
+elseif ARGS[0] = 42:
+	TatPrice = 10000
+
+elseif ARGS[0] = 43:
+	TatPrice = 10000
+
+elseif ARGS[0] = 44:
+	TatPrice = 10000
+
+elseif ARGS[0] = 45:
+	TatPrice = 10000
+
+elseif ARGS[0] = 46:
+	TatPrice = 10000
+
+elseif ARGS[0] = 47:
+	TatPrice = 10000
+
+end
+
+--- $attributes_tattoo_leg ---------------------------------

+ 32 - 0
locations/_attributes_tattoo_lip.qsrc

@@ -0,0 +1,32 @@
+# $attributes_tattoo_lip
+
+if ARGS[0] = 1:
+	TatPrice = 5000
+
+elseif ARGS[0] = 2:
+	TatPrice = 5000
+
+elseif ARGS[0] = 3:
+	TatPrice = 5000
+
+elseif ARGS[0] = 4:
+	TatPrice = 5000
+
+elseif ARGS[0] = 5:
+	TatPrice = 5000
+
+elseif ARGS[0] = 6:
+	TatPrice = 5000
+
+elseif ARGS[0] = 7:
+	TatPrice = 5000
+
+elseif ARGS[0] = 8:
+	TatPrice = 5000
+
+elseif ARGS[0] = 9:
+	TatPrice = 5000
+
+end
+
+--- $attributes_tattoo_lip ---------------------------------

+ 95 - 0
locations/_attributes_tattoo_neck.qsrc

@@ -0,0 +1,95 @@
+# $attributes_tattoo_neck
+
+if ARGS[0] = 1:
+	TatPrice = 8000
+
+elseif ARGS[0] = 2:
+	TatPrice = 8000
+
+elseif ARGS[0] = 3:
+	TatPrice = 8000
+
+elseif ARGS[0] = 4:
+	TatPrice = 8000
+
+elseif ARGS[0] = 5:
+	TatPrice = 8000
+
+elseif ARGS[0] = 6:
+	TatPrice = 8000
+
+elseif ARGS[0] = 7:
+	TatPrice = 8000
+
+elseif ARGS[0] = 8:
+	TatPrice = 8000
+
+elseif ARGS[0] = 9:
+	TatPrice = 8000
+
+elseif ARGS[0] = 10:
+	TatPrice = 8000
+
+elseif ARGS[0] = 11:
+	TatPrice = 8000
+
+elseif ARGS[0] = 12:
+	TatPrice = 8000
+
+elseif ARGS[0] = 13:
+	TatPrice = 8000
+
+elseif ARGS[0] = 14:
+	TatPrice = 8000
+
+elseif ARGS[0] = 15:
+	TatPrice = 8000
+
+elseif ARGS[0] = 16:
+	TatPrice = 8000
+
+elseif ARGS[0] = 17:
+	TatPrice = 8000
+
+elseif ARGS[0] = 18:
+	TatPrice = 8000
+
+elseif ARGS[0] = 19:
+	TatPrice = 8000
+
+elseif ARGS[0] = 20:
+	TatPrice = 8000
+
+elseif ARGS[0] = 21:
+	TatPrice = 8000
+
+elseif ARGS[0] = 22:
+	TatPrice = 8000
+
+elseif ARGS[0] = 23:
+	TatPrice = 8000
+
+elseif ARGS[0] = 24:
+	TatPrice = 8000
+
+elseif ARGS[0] = 25:
+	TatPrice = 8000
+
+elseif ARGS[0] = 26:
+	TatPrice = 8000
+
+elseif ARGS[0] = 27:
+	TatPrice = 8000
+
+elseif ARGS[0] = 28:
+	TatPrice = 8000
+
+elseif ARGS[0] = 29:
+	TatPrice = 8000
+
+elseif ARGS[0] = 30:
+	TatPrice = 8000
+
+end
+
+--- $attributes_tattoo_neck ---------------------------------

+ 164 - 0
locations/_attributes_tattoo_pubic.qsrc

@@ -0,0 +1,164 @@
+# $attributes_tattoo_pubic
+
+if ARGS[0] = 1:
+	TatPrice = 20000
+
+elseif ARGS[0] = 2:
+	TatPrice = 20000
+
+elseif ARGS[0] = 3:
+	TatPrice = 20000
+
+elseif ARGS[0] = 4:
+	TatPrice = 20000
+
+elseif ARGS[0] = 5:
+	TatPrice = 20000
+
+elseif ARGS[0] = 6:
+	TatPrice = 20000
+
+elseif ARGS[0] = 7:
+	TatPrice = 20000
+
+elseif ARGS[0] = 8:
+	TatPrice = 20000
+
+elseif ARGS[0] = 9:
+	TatPrice = 20000
+
+elseif ARGS[0] = 10:
+	TatPrice = 20000
+
+elseif ARGS[0] = 11:
+	TatPrice = 20000
+
+elseif ARGS[0] = 12:
+	TatPrice = 20000
+
+elseif ARGS[0] = 13:
+	TatPrice = 20000
+
+elseif ARGS[0] = 14:
+	TatPrice = 20000
+
+elseif ARGS[0] = 15:
+	TatPrice = 20000
+
+elseif ARGS[0] = 16:
+	TatPrice = 20000
+
+elseif ARGS[0] = 17:
+	TatPrice = 20000
+
+elseif ARGS[0] = 18:
+	TatPrice = 20000
+
+elseif ARGS[0] = 19:
+	TatPrice = 20000
+
+elseif ARGS[0] = 20:
+	TatPrice = 20000
+
+elseif ARGS[0] = 21:
+	TatPrice = 20000
+
+elseif ARGS[0] = 22:
+	TatPrice = 20000
+
+elseif ARGS[0] = 23:
+	TatPrice = 20000
+
+elseif ARGS[0] = 24:
+	TatPrice = 20000
+
+elseif ARGS[0] = 25:
+	TatPrice = 20000
+
+elseif ARGS[0] = 26:
+	TatPrice = 20000
+
+elseif ARGS[0] = 27:
+	TatPrice = 20000
+
+elseif ARGS[0] = 28:
+	TatPrice = 20000
+
+elseif ARGS[0] = 29:
+	TatPrice = 20000
+
+elseif ARGS[0] = 30:
+	TatPrice = 20000
+
+elseif ARGS[0] = 31:
+	TatPrice = 20000
+
+elseif ARGS[0] = 32:
+	TatPrice = 20000
+
+elseif ARGS[0] = 33:
+	TatPrice = 20000
+
+elseif ARGS[0] = 34:
+	TatPrice = 20000
+
+elseif ARGS[0] = 35:
+	TatPrice = 20000
+
+elseif ARGS[0] = 36:
+	TatPrice = 20000
+
+elseif ARGS[0] = 37:
+	TatPrice = 20000
+
+elseif ARGS[0] = 38:
+	TatPrice = 20000
+
+elseif ARGS[0] = 39:
+	TatPrice = 20000
+
+elseif ARGS[0] = 40:
+	TatPrice = 20000
+
+elseif ARGS[0] = 41:
+	TatPrice = 20000
+
+elseif ARGS[0] = 42:
+	TatPrice = 20000
+
+elseif ARGS[0] = 43:
+	TatPrice = 20000
+
+elseif ARGS[0] = 44:
+	TatPrice = 20000
+
+elseif ARGS[0] = 45:
+	TatPrice = 20000
+
+elseif ARGS[0] = 46:
+	TatPrice = 20000
+
+elseif ARGS[0] = 47:
+	TatPrice = 20000
+
+elseif ARGS[0] = 48:
+	TatPrice = 20000
+
+elseif ARGS[0] = 49:
+	TatPrice = 20000
+
+elseif ARGS[0] = 40:
+	TatPrice = 20000
+
+elseif ARGS[0] = 51:
+	TatPrice = 20000
+
+elseif ARGS[0] = 52:
+	TatPrice = 20000
+
+elseif ARGS[0] = 53:
+	TatPrice = 20000
+
+end
+
+--- $attributes_tattoo_pubic ---------------------------------

+ 80 - 0
locations/_attributes_tattoo_shoulder.qsrc

@@ -0,0 +1,80 @@
+# $attributes_tattoo_shoulder
+
+if ARGS[0] = 1:
+	TatPrice = 8000
+
+elseif ARGS[0] = 2:
+	TatPrice = 8000
+
+elseif ARGS[0] = 3:
+	TatPrice = 8000
+
+elseif ARGS[0] = 4:
+	TatPrice = 8000
+
+elseif ARGS[0] = 5:
+	TatPrice = 8000
+
+elseif ARGS[0] = 6:
+	TatPrice = 8000
+
+elseif ARGS[0] = 7:
+	TatPrice = 8000
+
+elseif ARGS[0] = 8:
+	TatPrice = 8000
+
+elseif ARGS[0] = 9:
+	TatPrice = 8000
+
+elseif ARGS[0] = 10:
+	TatPrice = 8000
+
+elseif ARGS[0] = 11:
+	TatPrice = 8000
+
+elseif ARGS[0] = 12:
+	TatPrice = 8000
+
+elseif ARGS[0] = 13:
+	TatPrice = 8000
+
+elseif ARGS[0] = 14:
+	TatPrice = 8000
+
+elseif ARGS[0] = 15:
+	TatPrice = 8000
+
+elseif ARGS[0] = 16:
+	TatPrice = 8000
+
+elseif ARGS[0] = 17:
+	TatPrice = 8000
+
+elseif ARGS[0] = 18:
+	TatPrice = 8000
+
+elseif ARGS[0] = 19:
+	TatPrice = 8000
+
+elseif ARGS[0] = 20:
+	TatPrice = 8000
+
+elseif ARGS[0] = 21:
+	TatPrice = 8000
+
+elseif ARGS[0] = 22:
+	TatPrice = 8000
+
+elseif ARGS[0] = 23:
+	TatPrice = 8000
+
+elseif ARGS[0] = 24:
+	TatPrice = 8000
+
+elseif ARGS[0] = 25:
+	TatPrice = 8000
+
+end
+
+--- $attributes_tattoo_shoulder ---------------------------------

+ 74 - 0
locations/_attributes_tattoo_side.qsrc

@@ -0,0 +1,74 @@
+# $attributes_tattoo_side
+
+if ARGS[0] = 1:
+	TatPrice = 12000
+
+elseif ARGS[0] = 2:
+	TatPrice = 12000
+
+elseif ARGS[0] = 3:
+	TatPrice = 12000
+
+elseif ARGS[0] = 4:
+	TatPrice = 12000
+
+elseif ARGS[0] = 5:
+	TatPrice = 12000
+
+elseif ARGS[0] = 6:
+	TatPrice = 12000
+
+elseif ARGS[0] = 7:
+	TatPrice = 12000
+
+elseif ARGS[0] = 8:
+	TatPrice = 12000
+
+elseif ARGS[0] = 9:
+	TatPrice = 12000
+
+elseif ARGS[0] = 10:
+	TatPrice = 12000
+
+elseif ARGS[0] = 11:
+	TatPrice = 12000
+
+elseif ARGS[0] = 12:
+	TatPrice = 12000
+
+elseif ARGS[0] = 13:
+	TatPrice = 12000
+
+elseif ARGS[0] = 14:
+	TatPrice = 12000
+
+elseif ARGS[0] = 15:
+	TatPrice = 12000
+
+elseif ARGS[0] = 16:
+	TatPrice = 12000
+
+elseif ARGS[0] = 17:
+	TatPrice = 12000
+
+elseif ARGS[0] = 18:
+	TatPrice = 12000
+
+elseif ARGS[0] = 19:
+	TatPrice = 12000
+
+elseif ARGS[0] = 20:
+	TatPrice = 12000
+
+elseif ARGS[0] = 21:
+	TatPrice = 12000
+
+elseif ARGS[0] = 22:
+	TatPrice = 12000
+
+elseif ARGS[0] = 23:
+	TatPrice = 12000
+
+end
+
+--- $attributes_tattoo_side ---------------------------------

+ 101 - 0
locations/_attributes_tattoo_tramp.qsrc

@@ -0,0 +1,101 @@
+# $attributes_tattoo_tramp
+
+if ARGS[0] = 1:
+	TatPrice = 12000
+
+elseif ARGS[0] = 2:
+	TatPrice = 12000
+
+elseif ARGS[0] = 3:
+	TatPrice = 12000
+
+elseif ARGS[0] = 4:
+	TatPrice = 12000
+
+elseif ARGS[0] = 5:
+	TatPrice = 12000
+
+elseif ARGS[0] = 6:
+	TatPrice = 12000
+
+elseif ARGS[0] = 7:
+	TatPrice = 12000
+
+elseif ARGS[0] = 8:
+	TatPrice = 12000
+
+elseif ARGS[0] = 9:
+	TatPrice = 12000
+
+elseif ARGS[0] = 10:
+	TatPrice = 12000
+
+elseif ARGS[0] = 11:
+	TatPrice = 12000
+
+elseif ARGS[0] = 12:
+	TatPrice = 12000
+
+elseif ARGS[0] = 13:
+	TatPrice = 12000
+
+elseif ARGS[0] = 14:
+	TatPrice = 12000
+
+elseif ARGS[0] = 15:
+	TatPrice = 12000
+
+elseif ARGS[0] = 16:
+	TatPrice = 12000
+
+elseif ARGS[0] = 17:
+	TatPrice = 12000
+
+elseif ARGS[0] = 18:
+	TatPrice = 12000
+
+elseif ARGS[0] = 19:
+	TatPrice = 12000
+
+elseif ARGS[0] = 20:
+	TatPrice = 12000
+
+elseif ARGS[0] = 21:
+	TatPrice = 12000
+
+elseif ARGS[0] = 22:
+	TatPrice = 12000
+
+elseif ARGS[0] = 23:
+	TatPrice = 12000
+
+elseif ARGS[0] = 24:
+	TatPrice = 12000
+
+elseif ARGS[0] = 25:
+	TatPrice = 12000
+
+elseif ARGS[0] = 26:
+	TatPrice = 12000
+
+elseif ARGS[0] = 27:
+	TatPrice = 12000
+
+elseif ARGS[0] = 28:
+	TatPrice = 12000
+
+elseif ARGS[0] = 29:
+	TatPrice = 12000
+
+elseif ARGS[0] = 30:
+	TatPrice = 12000
+
+elseif ARGS[0] = 31:
+	TatPrice = 12000
+
+elseif ARGS[0] = 32:
+	TatPrice = 12000
+
+end
+
+--- $attributes_tattoo_tramp ---------------------------------

+ 71 - 0
locations/_attributes_tattoo_under.qsrc

@@ -0,0 +1,71 @@
+# $attributes_tattoo_under
+
+if ARGS[0] = 1:
+	TatPrice = 12000
+
+elseif ARGS[0] = 2:
+	TatPrice = 12000
+
+elseif ARGS[0] = 3:
+	TatPrice = 12000
+
+elseif ARGS[0] = 4:
+	TatPrice = 12000
+
+elseif ARGS[0] = 5:
+	TatPrice = 12000
+
+elseif ARGS[0] = 6:
+	TatPrice = 12000
+
+elseif ARGS[0] = 7:
+	TatPrice = 12000
+
+elseif ARGS[0] = 8:
+	TatPrice = 12000
+
+elseif ARGS[0] = 9:
+	TatPrice = 12000
+
+elseif ARGS[0] = 10:
+	TatPrice = 12000
+
+elseif ARGS[0] = 11:
+	TatPrice = 12000
+
+elseif ARGS[0] = 12:
+	TatPrice = 12000
+
+elseif ARGS[0] = 13:
+	TatPrice = 12000
+
+elseif ARGS[0] = 14:
+	TatPrice = 12000
+
+elseif ARGS[0] = 15:
+	TatPrice = 12000
+
+elseif ARGS[0] = 16:
+	TatPrice = 12000
+
+elseif ARGS[0] = 17:
+	TatPrice = 12000
+
+elseif ARGS[0] = 18:
+	TatPrice = 12000
+
+elseif ARGS[0] = 19:
+	TatPrice = 12000
+
+elseif ARGS[0] = 20:
+	TatPrice = 12000
+
+elseif ARGS[0] = 21:
+	TatPrice = 12000
+
+elseif ARGS[0] = 22:
+	TatPrice = 12000
+
+end
+
+--- $attributes_tattoo_under ---------------------------------

+ 158 - 0
locations/_attributes_tattoo_wrist.qsrc

@@ -0,0 +1,158 @@
+# $attributes_tattoo_wrist
+
+if ARGS[0] = 1:
+	TatPrice = 7000
+
+elseif ARGS[0] = 2:
+	TatPrice = 7000
+
+elseif ARGS[0] = 3:
+	TatPrice = 7000
+
+elseif ARGS[0] = 4:
+	TatPrice = 7000
+
+elseif ARGS[0] = 5:
+	TatPrice = 7000
+
+elseif ARGS[0] = 6:
+	TatPrice = 7000
+
+elseif ARGS[0] = 7:
+	TatPrice = 7000
+
+elseif ARGS[0] = 8:
+	TatPrice = 7000
+
+elseif ARGS[0] = 9:
+	TatPrice = 7000
+
+elseif ARGS[0] = 10:
+	TatPrice = 7000
+
+elseif ARGS[0] = 11:
+	TatPrice = 7000
+
+elseif ARGS[0] = 12:
+	TatPrice = 7000
+
+elseif ARGS[0] = 13:
+	TatPrice = 7000
+
+elseif ARGS[0] = 14:
+	TatPrice = 7000
+
+elseif ARGS[0] = 15:
+	TatPrice = 7000
+
+elseif ARGS[0] = 16:
+	TatPrice = 7000
+
+elseif ARGS[0] = 17:
+	TatPrice = 7000
+
+elseif ARGS[0] = 18:
+	TatPrice = 7000
+
+elseif ARGS[0] = 19:
+	TatPrice = 7000
+
+elseif ARGS[0] = 20:
+	TatPrice = 7000
+
+elseif ARGS[0] = 21:
+	TatPrice = 7000
+
+elseif ARGS[0] = 22:
+	TatPrice = 7000
+
+elseif ARGS[0] = 23:
+	TatPrice = 7000
+
+elseif ARGS[0] = 24:
+	TatPrice = 7000
+
+elseif ARGS[0] = 25:
+	TatPrice = 7000
+
+elseif ARGS[0] = 26:
+	TatPrice = 7000
+
+elseif ARGS[0] = 27:
+	TatPrice = 7000
+
+elseif ARGS[0] = 28:
+	TatPrice = 7000
+
+elseif ARGS[0] = 29:
+	TatPrice = 7000
+
+elseif ARGS[0] = 30:
+	TatPrice = 7000
+
+elseif ARGS[0] = 31:
+	TatPrice = 7000
+
+elseif ARGS[0] = 32:
+	TatPrice = 7000
+
+elseif ARGS[0] = 33:
+	TatPrice = 7000
+
+elseif ARGS[0] = 34:
+	TatPrice = 7000
+
+elseif ARGS[0] = 35:
+	TatPrice = 7000
+
+elseif ARGS[0] = 36:
+	TatPrice = 7000
+
+elseif ARGS[0] = 37:
+	TatPrice = 7000
+
+elseif ARGS[0] = 38:
+	TatPrice = 7000
+
+elseif ARGS[0] = 39:
+	TatPrice = 7000
+
+elseif ARGS[0] = 40:
+	TatPrice = 7000
+
+elseif ARGS[0] = 41:
+	TatPrice = 7000
+
+elseif ARGS[0] = 42:
+	TatPrice = 7000
+
+elseif ARGS[0] = 43:
+	TatPrice = 7000
+
+elseif ARGS[0] = 44:
+	TatPrice = 7000
+
+elseif ARGS[0] = 45:
+	TatPrice = 7000
+
+elseif ARGS[0] = 46:
+	TatPrice = 7000
+
+elseif ARGS[0] = 47:
+	TatPrice = 7000
+
+elseif ARGS[0] = 48:
+	TatPrice = 7000
+
+elseif ARGS[0] = 49:
+	TatPrice = 7000
+
+elseif ARGS[0] = 40:
+	TatPrice = 7000
+
+elseif ARGS[0] = 51:
+	TatPrice = 7000
+
+end
+
+--- $attributes_tattoo_wrist ---------------------------------

+ 1 - 3
locations/anush_bedroom_city.qsrc

@@ -237,8 +237,6 @@ if $ARGS[0] = 'night_stand':
 			'You blush slightly and shake your head before closing the drawer, which just causes her to smirk in amusement.'
 			act 'Close the drawer':gt 'anush_bedroom_city','anushroom'
 		end
-!!this goes to anushkaev1 can you do what ever code is needed so both here and her pav apartment lead to it and then they go back to the correct location afterwards? That will save us from making a new sex folder with just a lot of repeat of the same content.
-!HM: done
 		act 'Strap-on': $returnLoc = '_city' & gt 'anushkaev1', 'strapon1'
 		act 'Butt plug': $returnLoc = '_city' & gt 'anushkaev1', 'buttplug'
 		act 'Joint':
@@ -691,7 +689,7 @@ if $ARGS[0] = 'nush_guitar':
 			'She reaches over and grabs the acoustic guitar. "Sure, I''ll play you something else. This one I learned shortly after seeing the uncensored music video for it." She strums the guitar and checks to ensure it''s still in tune. "It''s ''Heaven Knows'' by The Pretty Reckless."'
 			'She starts playing and singing the new song, playing and singing just as well as before. When she ends her piece, you clap your hands and praise her. "Another great song. You really are good at this."'
 			*nl
-			'Thanks. I still remember the first time I watch the music video for this." She bites her lower lip, clearly getting a little turned on thinking about it. "When Taylor pulled off her robe and flashed her naked body... Oh man, that was so fucking hot. I can''t lie; I''ve rubbed one out more times than I care to remember thinking about that scene while staring at that poster," she says while indicating The Pretty Reckless poster on her wall.'
+			'"Thanks. I still remember the first time I watch the music video for this." She bites her lower lip, clearly getting a little turned on thinking about it. "When Taylor pulled off her robe and flashed her naked body... Oh man, that was so fucking hot. I can''t lie; I''ve rubbed one out more times than I care to remember thinking about that scene while staring at that poster," she says while indicating The Pretty Reckless poster on her wall.'
 			'You giggle and glance at the poster. You could see Anushka rubbing one out while looking at the poster. Thinking about her rubbing one out, laying on the bed she''s now on, is starting to make you a little horny. You shake your head to banish the thought and change the subject while she puts the guitar back in its place, talking about her future music career.'
 			act 'Continue':gt 'anush_bedroom_city','anushroom'
 		elseif anushkaQW['guitar_play'] = 5:

+ 1 - 1
locations/anushapt_city.qsrc

@@ -910,7 +910,7 @@ if $ARGS[0] = 'nushlivroom':
 		'"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:
+	if strapnumber > 0 and npc_sex['A144'] > 0:
 		act 'Pull out your strap-on':
 			*clr & cla
 			gs 'stat'

+ 1 - 1
locations/anushkachat.qsrc

@@ -497,7 +497,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop kissing and talk more': gt 'anushkachat', 'chat'
 			end
 		end
-	else
+	elseif anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if photographyEv = 2 and portfolio_people[5] = 0:

+ 12 - 10
locations/anushkachat_city.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = 'chat':
 			act 'Tell her about Djibril': gt 'anushkachat_city', 'tell_about_djibril1'
 		end
 	end
-	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0:
+	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 		act 'Invite to see Djibril': gt 'anushkachat_city', 'invite_djibril'
 	end
 	if DjibrilQW['nush_inv'] = 1 and DjibrilQW['tell'] = 1 and DjibrilQW['african_gangbang'] = 1:
@@ -329,8 +329,9 @@ if $ARGS[0] = 'chat':
 		'The way she says it makes you blush. She leaves no doubt about what she means and she makes it sound so dirty while being exciting at the same time.'
 		act 'Maybe':
 			*clr & cla
-			minut += 5
-			anushkaQW['sveta_love'] += 1
+			minut += 4
+			if anushkaQW['kiss_day'] ! daystart: anushkaQW['kiss_day'] = daystart & anushkaQW['kiss'] += 1
+			gs 'arousal', 'kiss', 1, 'lesbian'
 			gs 'npc_relationship', 'modify', 'A144', 'like'
 			'<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>'
@@ -390,7 +391,7 @@ if $ARGS[0] = 'chat':
 		end
 	end
 	gs 'willpower', 'misc', 'self', 'easy'
-	if will_cost <= pcs_willpwr:
+	if will_cost <= pcs_willpwr and anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<<will_cost>> Willpower)':
 			*clr & cla
 			gs 'willpower', 'pay', 'self'
@@ -401,6 +402,7 @@ if $ARGS[0] = 'chat':
 			else
 				anushkaQW['kiss'] += 1
 			end
+			anushkaQW['kiss_day'] = daystart
 			'<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 pcs_hotcat >= 6:
@@ -455,7 +457,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop kissing and talk more': gt 'anushkachat_city', 'chat'
 			end
 		end
-	else
+	elseif anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if photographyEv = 2 and portfolio_people[5] = 0:
@@ -646,7 +648,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 				act 'Keep talking': gt 'anushkachat_city', 'chat'
 			else
-				if pcs_hotcat >= 6:
+				if pcs_hotcat >= 6 and npc_sex['A144'] > 0:
 					'"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 +707,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if pcs_hotcat >= 6:
+			if pcs_hotcat >= 6 and npc_sex['A144'] > 0:
 				'"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."'
@@ -936,7 +938,7 @@ if $ARGS[0] = 'tell_about_djibril':
 				'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to come with you to his dorm room one time?'
 				act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 				act 'Talk about something else': gt 'anushkachat_city', 'chat'
-				if DjibrilQW['nush_inv'] = 0:
+				if DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 					act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril'
 				end
 			end
@@ -996,7 +998,7 @@ if $ARGS[0] = 'tell_about_djibril1':
 				'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to come with you to his dorm room one time?'
 				act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 				act 'Talk about something else': gt 'anushkachat_city', 'chat'
-				if DjibrilQW['nush_inv'] = 0:
+				if DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 					act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril'
 				end
 			end
@@ -1062,7 +1064,7 @@ if $ARGS[0] = 'tell_about_djibril_gangbang':
 		'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to join in next time?'
 		act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 		act 'Talk about something else': gt 'anushkachat_city', 'chat'
-		act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
+		if npc_sex['A144'] > 0: act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
 	end
 end
 

+ 2 - 0
locations/artem_events.qsrc

@@ -24,6 +24,8 @@ if $ARGS[0] = 'start':
 	ArtemBeInHome = 1
 	*clr & cla
 	menu_off = 1
+	!! If Katja and the player have planned a threesome with Artem and Vicky is not home this send you to the start of the threesome event
+	if artemQW['katja_threesome']  = 1 and locat['Vicky'] ! 8 and locat['Vicky'] ! 9 and locat['Vicky'] ! 12 and locat['Vicky'] ! 13: gt 'artem_katja_sex', 'going_home_together'
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 	if kotovLoveQW > 0 and artemVitokQW = 0:

+ 884 - 0
locations/artem_katja_sex.qsrc

@@ -0,0 +1,884 @@
+# artem_katja_sex
+!2024/09/29
+
+!! artemQW['confidence'] = 0 - Artem has never had sex with a girl or has, but didn''t think he did well
+!! artemQW['confidence'] = 1 - Artem has had sex with a girl, but didn''t think he satisfied her
+!! artemQW['confidence'] = 5 - Artem thinks he''s doing okay with sex with a single girl, maybe he''s even have had several girls at once and he''s not sure he satisfied them both. Still not very sure on himself and awkward around girls he doesn''t know well.
+!! artemQW['confidence'] = 10 - Artem thinks he knows how to satisfy women and isn''t nervous in sexual situations with a single girl anymore, but still nervous with more than one girl at a time. He is now comfortable around girls he doesn''t know well
+!! artemQW['confidence'] = 15 - Artem knows he''s good in bed. No longer nervous with threesomes or more, and doesn''t have a problem with taking charge anymore.
+!! artemQW['confidence'] = 20 - Artem is turning into a true lover boy, flirting freely with girls he just met. Better be careful it doesn''t go to his head!
+
+if $ARGS[0] = 'going_home_together':
+	menu_off = 1	
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+	'You walk across the school courtyard to meet up with Artem, who gives you a friendly nod as you approach. "You ready to go?"'
+	'You smile. "Let''s go study!"'
+	'Just as you''re about to leave, Katja approaches you. "I thought we were going to do homework together today, <<$pcs_nickname>>?" she asks.'
+	if artemQW['confidence'] < 10:
+		'Artem turns to you. "Oh..." he says before he looks at Katja, then back to you. "It''s okay, you guys can go study. I''ll see you later?"'
+		'You can tell he''s nervous since he''s avoiding eye contact with Katja, who winks at you to signal that she''s ready to put your plan into motion.'
+	else
+		'Artem turns to you. "Is that true, <<$pcs_nickname>>?"'
+		'He''s avoiding eye contact with Katja, who winks at you to signal that she''s ready to put your plan into motion.'
+	end
+	act 'Continue with the plan': 
+		*clr & cla
+		minut +=2
+		gs 'npc_relationship', 'modify', 'A2', 'like'
+		gs 'npc_relationship', 'modify', 'A2', 'love'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'You feign surprise. "I completely forgot about that! Why don''t we all just do our homework together?"'
+		'"Okay, we can do that," Katja replies a little too quickly, leaving you fearing that Artem will suspect that he''s being set up, but he just looks confused.'
+		'"Come on, Artem," you say encouragingly. "Katja is really good at the English pronunciation that you''re struggling with. I''m sure studying with her will be a big help!"'
+		if artemQW['confidence'] < 10:
+			'He still hesitates and you''re afraid that you''ve came on too thick, but after a moment''s hesitation, he relents. "Okay, let''s study together, but I don''t have enough table space in my room."'
+		else
+			'He still hesitates and you''re afraid that you''ve came on too thick, but after a moment''s hesitation, he smiles. "Sure, that sounds good, but I don''t have enough table space in my room."'
+		end
+		'"That''s no problem. My place will be empty for the next few hours, so we can work in my kitchen," Katja smiles.'
+		*nl
+		if artemQW['confidence'] < 10:
+			'You walk to the Meynold house mostly in silence. Artem is clearly still not very confident around women he doesn''t know very well.'
+			if katjaQW['QWstage'] = 5:
+				'Katja has also gone quiet, despite her earlier enthusiasm. You think the fact that she''s about to have sex with a boy for the first time is suddenly getting to her.'
+			else
+				'Katja tries to get him to talk, but it doesn''t really help.'
+			end
+		elseif artemQW['confidence'] < 20:
+			if katjaQW['QWstage'] = 5:
+				'You walk to the Meynold house with Artem trying to make casual conversation with Katja, but she only responds in short sentences.'
+				'You think the fact that she''s about to have sex with a boy for the first time is suddenly getting to her.'
+			else
+				'You walk to the Meynold house with Artem and Katja quickly falling into conversation.'
+			end
+		else
+			'You walk to the Meynold house with Artem clearly trying to '+iif(artemQW['threesome'] = 1, 'flirt with Katja.', 'impress Katja.')
+			if katjaQW['QWstage'] = 5:
+				'Katja doesn''t really respond to him. You think the fact that she''s about to have sex with a boy for the first time is suddenly getting to her.'
+			elseif katjaQW['QWstage'] >= 7:
+				'Katja responds in kind, flirting overtly with him. You''re almost afraid that she''ll drag him into the bushes to jump him immediately.'
+			else
+				'Katja appreciates the attention and responds well to his advances.'
+			end			
+		end
+		act 'Start doing your homework': gt 'artem_katja_sex', 'first_time_start'
+	end
+	act 'Go with Katja':
+		*clr & cla
+		minut +=2
+		gs 'npc_relationship', 'modify', 'A2', 'dislike'
+		gs 'npc_relationship', 'modify', 'A14', 'dislike'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'"I''m sorry, but I did promise to do homework with her today. We can hang out another time. I might come over when I''ve finished our homework," you tell Artem.'
+		'He looks a little down. "Well if you promised her, then you should keep it. See you later, <<pcs_nickname>>," he says and starts walking home alone.'
+		*nl
+		'"Why did you send him away?" Katja asks. "I thought the plan was to seduce him into a threesome?"'
+		'"Not today. Maybe next time," you reply. "Let''s go to your house."'
+		act 'Go do your homework with Katja': gt 'katjaEV','1'
+	end
+	act 'Go with Artem':
+		*clr & cla
+		minut +=2
+		gs 'npc_relationship', 'modify', 'A2', 'like'
+		gs 'npc_relationship', 'modify', 'A14', 'hate'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+		'"I''m pretty sure you remember wrong. I told you I would be hanging out with my boyfriend today. We''ll just have to do homework at some other time," you tell Katja.'
+		'Katja looks stunned by your reply, but then quickly gets her act together. "Well then. See you another time," she says with a clear hint of disappointment before she leaves you and Artem alone.'
+		*nl
+		'"What was that about?" Artem asks, a little concerned.'
+		'"It''s nothing. She''ll be fine tomorrow," you reassure him. "Let''s go."'
+		act 'Go to Artem''s home': ArtemLoc = 2 & minut += 5 & gt 'artemhome', 'artemroom'
+	end
+end
+
+if $ARGS[0] = 'first_time_start':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_1.jpg"></center>'
+	minut += 30
+	lern += rand(2,4)
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'exp_gain', 'prcptn', rand(0,1)
+	if lernHome >= 1:
+		gs 'grades', 'homework', 'school', 'yes', 1, 3, 80
+	end
+	gs 'stat'
+	'When you arrive at the Meynold house, Katja lets you in and shows you to the kitchen.'
+	if katjaQW['QWstage'] = 5:
+		if artemQW['confidence'] < 10:
+			'You all start working on your homework, but Katja and Artem are clearly uncomfortable with the situation, so it''s mostly just you you that drives the conversation.'
+			'Since both Katja and Artem like to study, some of the tension disappears as you get further into the details of the homework, and since they''re both excellent students, you get a lot of good work done despite the situation.'
+		elseif artemQW['confidence'] < 20:
+			'You start working on your homework, but Katja is clearly uncomfortable with the situation. Artem, on the other hand, treats Katja like she was one of the nerd girls.'
+			'While that makes it more awkward for Katja, some of the tension disappears as you get further into the details of the homework, and since they''re both excellent students, you get a lot of good work done despite the situation.'
+		else
+			'You start working on your homework, but Katja is clearly uncomfortable with the situation. Artem, on the other hand, acts likes doing homework with girls is something he does every day. It''s clear that he''s trying to flirt with Katja while you study.'
+			'While that makes it more awkward for Katja, some of the tension disappears as you get further into the details of the homework, and since they''re both excellent students, you get a lot of good work done despite the situation.'
+		end
+	else
+		if artemQW['confidence'] < 10:
+			'You start working on your homework, but Artem is clearly uncomfortable with the situation. Even when Katja tries to be normal about the situation, he barely says anything and keeps looking down at his homework when he answers her questions.'
+			'Since Artem really likes to study, some of the tension disappears as you get further into the details of the homework, and since they''re both excellent students, you get a lot of good work done despite the situation.'
+		elseif artemQW['confidence'] < 20:
+			'You start working on your homework and Katja and Artem quickly get into the flow of things. The studying session is soon no different than when the nerds study together at the library,'
+			'Since they''re both excellent students, you get a lot of good work done.'
+		else
+			'You start working on your homework. Artem acts likes doing homework with girls is something he does every day. He overtly flirts with Katja, who returns in kind.'
+			'This does create some sexual tension, but it subsides as you get further into the details of the homework. Since they''re both excellent students, you get a lot of good work done despite the situation.'
+		end
+	end
+	*nl
+	'As you''re close to finishing up, Katja gives you a look which is clearly her asking for confirmation to start seducing Artem.'
+	act 'Start the seduction': gt 'artem_katja_sex', 'first_time_seduction'
+	act 'Call it of':
+		*clr & cla
+		minut += 5
+		gs 'npc_relationship', 'modify', 'A14', 'hate'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_1.jpg"></center>'
+		'You shake your head at Katja, who looks frustrated, but gets back to her homework without much enthusiasm.'
+		*nl
+		'After a few minutes, you finish up and you and Artem pack up your stuff and head out.'
+		'Before you leave, Katja drags you to the side. "I thought we were going to do more?" she whispers.''
+		"Not today. Maybe anther time," you reply and quickly leave a quite angry Katja behind.'
+		act 'Go to Artem''s home': gt 'artem_katja_sex', 'first_time_aborted_walking_home'
+	end
+end
+
+if $ARGS[0] = 'first_time_aborted_walking_home':
+	minut += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/going_home_with_artem.jpg"></center>'
+	if artemQW['confidence'] < 10:
+		'The two of you walk home, Artem seemingly oblivious to what was going on as he talks about the homework. You think to yourself that maybe that''s for the best.'
+	elseif artemQW['confidence'] < 20:
+		if artemQW['threesome'] = 1:
+			'The two of you walk home as Artem talks about studying before he turns to you. "Do you think Katja might be interested?"'
+			'You know exactly what he''s thinking, but you decide to play dumb. "Interested in what?"'
+			'He suddenly blushes. "You know... The three of us... Spending time together..."'
+			'You can''t help but snicker a little. "I''ll think about it and talk to her about it."'
+			'He just nods and the two of you make casual conversation the rest of the way to the building.'
+		else
+			'The two of you walk home, Artem seemingly oblivious to what was going on as he talks about the homework. To your surprise, he suddenly mentions how much he enjoyed studying with Katja and suggests that the three of you could do it again some time.'
+		end
+	else
+		if artemQW['threesome'] = 1:
+			'The two of you walk home as Artem talks about studying before he turns to you. "You think Katja might be interested?" he asks abruptly.'
+			'You know exactly what he''s thinking, but you decide to play dumb. "Interested in what?"'
+			'He smiles, knowing what you''re doing. "You know... A threesome. I think it would be fun and she looks like she could use a little nerd dick in her," he says with a laugh.'
+			'You playfully slap his shoulder. "I''ll think about it and talk to her about it."'
+			'He just nods and the two of you make casual conversation the rest of the way to the building.'
+		else
+			'The two of you walk home, Artem seemingly oblivious to what was going on as he talks about the homework. To your surprise, he suddenly mentions how much he enjoyed studying with Katja, as well as how cute she was looking today, and suggests the three of you could do it again some time.'
+		end
+	end
+	'The two of you finally get back to your apartment building, where Artem bids you farewell before heading into his apartment.'
+	act 'Alone': gt 'pod_ezd', 'etaj_1'
+end
+
+if $ARGS[0] = 'first_time_seduction':
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_2.jpg"></center>'
+	if $pantyworntype ! 'none':
+		'You give a nod to Katja and move behind Artem. Katja then drops drops her pen on the floor, pretending it was an accident.'
+		'"Oops! I better pick that up," she says before crawling under the table. WHile Artem is distracted by Katja, you quickly remove your panties.'
+	else
+		'You give a nod to Katja and she drops drops her pen on the floor, pretending it was an accident. "Oops! I better pick that up," she says before crawling under the table.'
+	end
+	'Katja pretends she can''t find her pen and crawls between Artem''s legs. He of course looks down to see what''s going on.'
+	'Katja times it perfectly so when she looks up at him, his eyes fall on her perky breasts, which she deliberately pushes forward so that her low cut shirt exposes a lot of cleavage.'
+	'Artem can''t take his eyes off her breasts, '+iif(artemQW['confidence'] < 10, 'and turns completely red in the face', ' but seems to be able to keep his composure.')
+	'A beam of pride appears on Katja''s face. "Like what you see?" she asks seductively while pushing her breasts up further using her hands.'
+	'You sit on the table and mirror Katja''s move.'
+	act 'See Artem''s response':
+		*clr & cla
+		gs 'arousal', 'foreplay', 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_3.jpg"></center>'
+		if artemQW['threesome'] = 0:
+			if artemQW['confidence'] < 10:
+				'Artem looks completely out of it and has no idea how to react. He looks like he''s on the verge of panicking, so you to try to calm him down.'
+				'"It''s okay, Artem! Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
+				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you tell Katja to unzip his pants.', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"') 
+			elseif artemQW['confidence'] < 15:
+				'Artem doesn''t seem to know how to react to the situation, so he looks at you for an explanation.'
+				'"It''s okay, Artem! Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
+				'He stammers "Yes. I do like what I see..." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+			elseif artemQW['confidence'] < 20:
+				'Artem looks at you to see your reaction, and when you smile back seductively, he grins. "I do like what I see, but are you sure about this, <<pcs_nickname>>?"'
+				'"Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
+				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+			else
+				'Artem briefly looks at you to see your reaction, and when you just smiles back seductively, he grins. "I very much like what I see. This is a great view and I''m sure that things can only get better, but I''m a little surprised that <<pcs_nickname>> wants to share me with you."'
+				'"Katja is my friend and I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. How could her deny her that?" you answer.'
+				'"Why don''t you get my cock out and play with it?" Artem continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."') 
+			end
+		else
+			if artemQW['confidence'] < 10:
+				'Artem looks very embarrassed and doesn''t seem to have any idea how to react, so you decide to try to calm him down.'
+				'"It''s okay, Artem! Katja is my friend and as you know I like to share with my friends. I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
+				'He seems to calm down a little and '+iif( katjaQW['QWstage'] = 5, ' you turn to Katja. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Why don''t I take your nice cock out and give it some attention?"') 
+			elseif artemQW['confidence'] < 15:
+				'Artem is still not confident enough to take control of the situation, so he looks at you to see what to do.'
+				'"It''s okay, Artem. Katja is my friend and you know I like to share with my friends. I told her how amazing you are in bed, and she wanted to also experience that. So just relax and enjoy the experience."'
+				'He looks back down at Katja. "Yes. I do like what I see." '+iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+			elseif artemQW['confidence'] < 20:
+				'Artem looks at you to see your reaction, and when you smile back seductively, he grins. "I do like what I see. Are you are you going to share all your friends with me, <<pcs_nickname>>?"'
+				'"I like to share," you shrug. "I told her how amazing you are in bed, and she wanted to experience that. So just relax and enjoy the experience."'
+				iif( katjaQW['QWstage'] = 5, 'You notice Katja''s hesitation. "Why don''t you get his cock out and play with it?"', 'Katja smiles. "Thanks for the compliment, Artem. Why don''t I reward it by taking your nice cock out and giving it some attention?"') 
+			else
+				'Artem briefly looks at you to see your reaction, and when you smile back seductively, he grins. "I very much like what I see. This is a great view and I''m sure that things can only get better. I look forward to you sharing me with the rest of your friends, <<pcs_nickname>>."'
+				'"I like to share," you shrug. "I told her how amazing you are in bed, and she wanted to experience that. How could her deny her that?" you reply.'
+				'"Why don''t you get my cock out and play with it, Katja?" he continues. '+iif( katjaQW['QWstage'] = 5, 'Katja looks a little surprised by his assertiveness. "Yes, it''s time to give it some attention."', 'Katja smiles. "Your cock definitely deserves some attention for that nice compliment."') 
+			end
+		end
+		'While Katja opens his pants and slowly pulls out his cock, you sit up on the table with your legs spread so that your naked pussy is in from of Artem''s face.'
+		act 'Licking':
+			*clr & cla
+			minut += 2
+			gs 'boystat', 'A2'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_4.jpg"></center>'
+			if katjaQW['QWstage'] = 5:
+				'Katja pulls Artem''s semi-hard cock out of his pants and takes it in her hands. "Wow, so this is what a real cock feels like. So warm, but somewhat soft. Oh!" Katja suddenly stops what she''s saying as Artem''s cock becomes rock hard in her hands.'
+				'She then starts to stroke it a little, clearly showing her lack of experience. "Why don''t you try to lick it?" '+iif(artemQW['confidence'] < 15, ' you say.', 'Artem says.')
+				'"Okay..." Katja responds and sticks out her tongue to start licking Artem''s shaft. "It doesn''t taste bad," she says. "Time to see if I can take everything..."'
+				if 2*npc_throat['A14'] < dick: 
+					npc_throat['A14'] += 1
+					'Katja tries to get Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but can''t manage to get much more than the head inside before she starts sucking on it.'
+				elseif npc_throat['A14'] < dick: 
+					npc_throat['A14'] += 1
+					'Katja tries to get all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but is clearly having problems with her gag reflex when it hits her throat. However, she quickly gets into a rhythm that matches what she can take, only occasionally having to stop when she tries to take too much.'
+					if artemQW['confidence'] > 14:
+						KatjaQW['horny'] += rand(5,10)
+						'"You really haven''t sucked a cock before? That''s hard to believe with how good you''re doing," Artem says encouragingly.'
+						'"Thanks. I''ve practiced a lot with plastic ones," Katja smiles back.'
+					end
+				else
+					'Katja takes all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth and down her throat without gagging. She then quickly gets into a rhythm where she moves from almost only sucking the tip to getting all the way to the base of his cock.'
+					if artemQW['confidence'] > 14:
+						KatjaQW['horny'] += rand(10,15)
+						'"Wow. You really haven''t sucked a cock before?" Artem moans. "I don''t believe that. You''re sucking like a pro!"'
+						'"Thanks. I''ve practiced a lot with plastic ones," Katja smiles back.'
+					end
+				end
+			else
+				'Katja pulls Artem''s semi-hard cock out of his pants and takes it in her hands. "This is a nice cock you have. I''m looking forward to playing with it. I can see that it''s also looking forward to be played with..." Katja says seductively as Artem''s cock becomes rock hard in her grasp.'
+				'She gives it a few strokes before slowly running her tongue up the shaft. "Tastes great! Time to see if I can take everything..."'
+				if npc_throat['A14'] < 2*dick: 
+					npc_throat['A14'] += 1
+					'Katja tries to get Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but can''t manage to get much more than the head inside before she starts sucking on it.'
+				elseif npc_throat['A14'] < dick: 
+					npc_throat['A14'] += 1
+					'Katja tries to get all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth, but is clearly having problems with her gag reflex when it hits her throat. However, she quickly gets into a rhythm that matches what she can take, only occasionally having to stop when she tries to take too much.'
+				else
+					'Katja takes all of Artem''s <<$dick_girth>> <<dick>> cm long dick into her mouth and down her throat without gagging. She then quickly gets into a rhythm where she moves from almost only sucking the tip to getting all the way to the base of his cock.'
+					if artemQW['confidence'] > 14:
+						KatjaQW['horny'] += rand(10,15)
+						'"Wow, you''re great! You''re sucking my cock like a pro!" Artem grins.'
+						'"Thanks. I''ve had some practice," Katja replies with a wink.'
+					end
+				end
+			end
+			'Not wanting to be left out, you tell Artem to go down on you and he immediately obeys, moving down on his knees to start licking your pussy.'
+			gs 'arousal', 'cuni', 3
+			gs 'stat'
+			act 'Share his cock':
+				*clr & cla
+				gs 'arousal', 'bj', 2
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_5.jpg"></center>'				
+				'After a few minutes, Artem''s licking becomes less enthusiastic, and you notice the awkward position he''s in. "Okay, time for me to taste that cock."'
+				'Both Artem and Katja stop and you get off the table. "Sit back and relax," you tell Artem as you get down on your knees next to Katja.'
+				'The two of you then take turns licking his extremely hard dick.'
+				if pcs_cupsize > 15:
+					act 'Show Katja how a titjob is done': gt 'artem_katja_sex', 'first_time_titjob'
+				end
+				act 'Get to pussy fucking': gt 'artem_katja_sex', 'first_time_pussy'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'first_time_titjob':
+	minut += 1
+	gs 'arousal', 'titjob', 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_5a.jpg"></center>'
+	'"I want to show you something, but we need to get rid of the rest of our clothes."'
+	'You and Katja quickly strip out of your clothes before getting back down on you knees again. "Make sure his cock is very wet," you tell her and she starts giving him a sloppy blowjob.'
+	'While she does that, you spit on your breasts. "Okay, that''s enough. Let me show you how a titjob is done."'
+	'Katja moves aside and you scoot up and wrap your breasts around Artem''s dick, use your hands to push them together and envelope his cock.'
+	'When you''re sure you have a tight grip, you start moving your breasts up and down Artem''s shaft.'
+	act 'Katja''s turn':
+		*clr & cla
+		gs 'arousal', 'bj', 1
+		gs 'arousal', 'foreplay_give', 2
+		katjaQW['horny'] += rand(5,10)
+		katjaQW['titjob'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_5b.jpg"></center>'
+		'Katja looks very excited as you pleasure Artem with your breasts. After a few minutes, she speaks up. "I wanna try that."'
+		'You stop and remove your breasts from Artem''s cock. "Okay, but first you need to make your boobs slippery. I''ll lube up Artem while you do that."'
+		'Katja start lubing up her breasts with her spit while you give Artem another sloppy blowjob.'
+		*nl
+		'"Katja then takes his cock between her breasts. "Remember to squeeze tight," you tell her and she does as she''s told as you get behind her and help her wrap her breasts around his cock.'
+		'"Okay start moving," you say when you''re sure her grip is tight and she starts grinding her breasts along his dick.'
+		'You continue for a few minutes, with Artem clearly enjoying what you''re doing.'
+		if artemQW['confidence'] < 10:
+			'However, you can see that he''s getting closer to cumming. "I think that''s enough, else we won''t have any cock for our pussies."'
+		else
+			'"This is the best view ever, but if you continue then I''ll cum all over you before we even get to any fucking!" he smirks.'
+		end
+		act 'Get to pussy fucking': gt 'artem_katja_sex', 'first_time_pussy'
+	end
+end
+
+if $ARGS[0] = 'first_time_pussy':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_6.jpg"></center>'
+	'You get up from the floor and move to a chair, placing both knees on it and sticking your ass in the air while supporting yourself on the table.'
+	'"Come on, Artem! Show Katja how you take me doggystyle!" you grin and he quickly moves in behind you.'
+	'Katja moves close and starts licking your breasts as Artem starts pounding you from behind.' 
+	gs 'arousal', 'vaginal', 3
+	gs 'arousal', 'foreplay', -2
+	gs 'stat'
+	if katjaQW['QWstage'] = 5:
+		act 'Katja tries her first cock':	
+			*clr & cla
+			gs 'arousal', 'foreplay_give', 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_7.jpg"></center>'
+			'After letting Artem fuck you for a few minutes, you decide that it''s time for Katja''s turn, who is growing extremely excited watching you.'
+			'"It''s time for her to try her first cock, Artem..."'
+			if artemQW['confidence'] < 15:
+				'Artem pulls out of you, but clearly isn''t ready to take the initative and just stands there looking lost.'
+				'"Come on Katja, take my place" you say and get down on the floor next to the chair.'
+				'She does as she''s told, but clearly looking  '+iif(npc_vag['A14'] = 0, 'very', 'a little')+' nervous. "Don''t worry, Katja. Artem will be very careful, won''t you?" you say, looking at Artem to make sure he understands.'
+				if artemQW['confidence'] < 10:
+					if npc_vag['A14'] = 0:
+						katjaQW['horny'] -= rand(10,20)
+						katjaQW['slut'] -= 5
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets the resistance of her hymen.'
+						'It''s clear that he''s not going to pop her cherry by himself. "Are you ready, Katja?" you ask and she just nods. "Do it then, Artem. Push through her hymen."'
+						'He pushes forward in one sharp thrust and Katja lets out a shriek of pain. "I''m sorry!" Artem says in a panic.''
+						'"Don''t be, I was expecting that. Just stay still for a moment," Katja replies through a forced smile.'
+					elseif 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets some resistance because of how tight she is.'
+						'"It''s okay to push further," Katja reassures him and he pushes forward, causing Katja to let out a shriek of pain.'
+						'"I''m sorry!" Artem says in a panic.'
+						'"Don''t be. Just stay still for a moment," Katja replies through a forced smile.'
+					else
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, only stopping when he his cock is completely buried inside her.'
+					end
+					*nl
+					'Katja smiles. "It''s okay. You can start to move."'
+					if artemQW['artem_dom'] > 4:
+						'Artem starts slowly moving in and out of Katja, but soon starts to pick up speed as he gets rougher and rougher.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(10,20)
+							katjaQW['slut'] -= 5
+							'What starts out as small moans from Katja turns into sounds of pain as Artem starts to pound her like a cheap slut.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Katja starts with small moans, but as he picks up his speed they get higher and higher.'
+						end
+					else
+						'Artem starts slowly moving in and out of Katja, and does not seem to pick up speed.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(5,10)
+							'Since you can see that Katja is clearly feeling some pain from this, you let him continue very slowly. This makes Katja''s pain seem to go away, and by the end she''s moaning quietly.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Since Katja doesn''t seem to be feeling any satisfaction, you encourage Artem to go faster. He does what you say and is soon pounding her, causing her to moan loudly.'
+						end
+					end
+				else
+					if npc_vag['A14'] = 0:
+						katjaQW['horny'] -= rand(10,15)
+						katjaQW['slut'] -= 5
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets the resistance of her hymen.'
+						'"Are you ready, Katja?" he asks and she just nods. Not being completely sure on her answer, Artem hesitates a little.'
+						'"Do it, Artem. Push through her hymen," you say encouragingly.'
+						*nl
+						'"Here it comes, Katja," he says as he pushes forward, causing Katja to let out a shriek of pain.'
+						'"I''m sorry!" he says in a panic.'
+						'"Don''t be, I was expecting that. Just stay still for a moment," Katja replies through a forced smile.'
+					elseif 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets some resistance because of how tight she is.'
+						'"Is it okay?" he asks and Katja nods.'
+						'"Yeah, it''s okay. You can push further."'
+						*nl
+						'He does so and Katja let out a shriek of pain.'
+						"I''m sorry!" he says in a panic.'
+						'"Don''t be. Just stay still for a moment," Katja replies through a forced smile.'
+					else
+						'Artem just nods and slowly moves in behind Katja. "Here it comes, Katja."'
+						'He very slowly enters her and only stops when his cock is completely buried inside her.'
+					end
+					*nl
+					'"Is it okay to move now, Katja?" Artem asks after a few seconds.'
+					'"Yes, you can start to move now," she replies and he starts to move in and out.'
+					if artemQW['artem_dom'] > 4:
+						'Artem starts slowly to move in and out of Katja, but soon starts to pick up speed as he gets rougher and rougher.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(10,15)
+							katjaQW['slut'] -= 5
+							'What starts out as small moans from Katja turns into sounds of pain as Artem starts to pound her like a cheap slut.'
+							'He notice this after a little while and apologizes before slowing down almost too much.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Katja starts with small moans, but as he picks up speed they get higher and higher.'
+						end
+					else
+						'Artem starts slowly to move in and out of Katja, but starts to pick up some speed.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(0,5)
+							'This makes Katja feel some pain which Artem quickly notices. "Sorry, I''ll be more careful" he says and slows down.'
+							'This makes Katja''s pain seem to go away, and by the end she''s moaning quietly.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'As he goes faster, Katja''s moans becomes louder, causing Artem to pick up more speed.'
+							'By the end, he''s pounding her hard as she moans very loudly.'
+						end
+					end
+				end
+			else
+				'Artem pulls out of you. "Come and take <<$pcs_nickname>>''s place, Katja. I''ll show you a great first time". You get down on the floor next to the chair to give Katja some space.' 
+				'She does as she''s told, but clearly looking  '+iif(npc_vag['A14'] = 0, 'very', 'a little')+' nervous.'
+				'"Don''t worry, Katja. Artem will be very careful, won''t you?" you say while looking at Artem.'
+				'"You''re in good hands, Katja!" he quickly replies. I''ll do anything so that it feels pleasant and not painful."'
+				if artemQW['artem_dom'] > 4:
+					'He then moves behind her and places his cock at the entrance of her pussy. "Are you ready to get fucked and become a woman?" he asks in an almost too confident tone.'
+					if npc_vag['A14'] = 0:
+						katjaQW['horny'] -= rand(10,15)
+						katjaQW['slut'] -= 7
+						'"Losing my hymen has nothing to do with if I''m a woman or not! What cave did you crawl out of?" she asks in a sharp voice. Artem is clearly taken aback by her outburst and freezes.'
+						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
+						'"Sorry, it''s just stupid tough talk that guys do. I shouldn''t have said it," Artem replies.'
+						*nl
+						'"Okay. Apology accepted. You can go ahead," Katja smiles.'
+						'He slowly pushes his cock into her and stops when he hits her hymen. "I''m going to push though your hymen now. It might cause a little pain. Are you ready"' 
+						'Katja looks at you and steels herself. "I''m ready..."'
+						'Artem then pushes his cock as far in as he can in one smooth move and Katja lets out a small shriek of pain.'
+						*nl
+						'"I''ll stay still so you can get used to it. Let me know when you''re ready for me to move," Artem says.'
+					elseif 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						katjaQW['slut'] -= 5
+						'"I''ve been fucked before by <<$pcs_nickname>> and having sex has nothing to do with if I''m a woman or not! What cave did you crawl out of?" she asks in a sharp voice. Artem is clearly taken aback by her outburst and freezes.'
+						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
+						'"Sorry, it''s just stupid tough talk that guys do. I shouldn''t have said it." Artem replies.'
+						*nl
+						'"Okay. Apology accepted. You can go ahead," Katja smiles.'
+						'He slowly pushes his cock into her and is very careful when he can feel the resistance of her tight pussy, but he manages to push it all the way to the base without causing her any pain.'
+						'He then stops. "I''m all the way in, Katja. Let me know when you''re ready for me to move."'
+					else
+						katjaQW['slut'] -= 2
+						'"I''ve been fucked before by <<$pcs_nickname>> and having sex has nothing to do with if I''m a woman or not! What cave did you crawl out of?" she says in a sharp voice. Artem is clearly taken aback by her outburst and freezes.'
+						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
+						'"Sorry, it''s just stupid tough talk that guys do. I shouldn''t have said it." Artem replies.'
+						*nl
+						'"Okay. Apology accepted. You can go ahead," Katja smiles.'
+						'He slowly pushes his cock into her and is very careful when he can feel the resistance of her tight pussy, but he manages to push it all the way to the base without causing her any pain.'
+						'He then stops. "I''m all the way in, Katja. Let me know when you''re ready for me to move."'
+					end
+					*nl
+					katjaQW['horny'] += rand(5,10)
+					'After a few seconds, Katja nods. "Okay, you can start to move."'
+					'He starts fucking her and gradually goes faster and rougher, but never so rough that it becomes painful for Katja, who starts to moan loudly.'
+				else
+					'Artem moves in behind Katja and places his cock at the entrance of her pussy. "Are you ready to feel a big cock in your tight pussy, Katja?" he asks, seeming very confident of his sex skill.'
+					if npc_vag['A14'] = 0:
+						katjaQW['horny'] -= rand(5,10)
+						katjaQW['slut'] -= 5
+						'"Please be careful Artem, I''ve never had anything bigger than a finger in there," Katja says nervously.'
+						'"I promise I''ll be as gentle as I can. I probably can''t avoid causing you a little pain, but I''ll try to make it as quick as possible," Artem answers.'
+						'He slowly pushes his cock into her and stops when he hits her hymen. After a moment he says "I''m going to push though your hymen now. It might cause a little pain. Are you ready" Artem asks.' 
+						'Katja looks at you and steels herself. "I''m ready."'
+						'Artem pushes his cock as far in as he can in one smooth move and Katja lets out a small shriek of pain.'
+						'"I''ll stay still for now so you can get used to it. Let me know when you''re ready for me to move," Artem says.'
+					elseif 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(0,5)
+						'"Please be careful, Artem. I''ve been fucked by <<$pcs_nickname>> before, but your cock seems very big," Katja says nervously.'
+						'"I promise I''ll be as gentle as I can. You won''t feel any pain," Artem answers.'
+						'He slowly pushes his cock into her and is very careful when he can feel the resistance of her tight pussy, but he manages to push it all the way to the base without causing her any pain.'
+						'He then stops. "I''m all the way in, Katja. Let me know when you''re ready for me to move."'
+					else
+						'"I''ve been fucked by <<$pcs_nickname>> before, so your cock doesn''t scare me," Katja says.'
+						'Artem slowly pushes his cock into her and manages to push it all the way to the base without causing her any pain.'
+						'He then stops. "I''m now all the way in, Katja. Let me know when you''re ready for me to move."'
+					end
+					*nl
+					katjaQW['horny'] += rand(5,10)
+					'After a few seconds, Katja nods. "Okay, you can start to move."'
+					'He nods in return and starts fucking her fast and hard, but never so rough that it becomes painful for Katja, who soon starts to moan loudly.'
+				end
+			end
+			act 'Change of position': gt 'artem_katja_sex', 'first_time_next'
+		end
+	else
+		act 'Katja''s turn':
+			*clr & cla
+			gs 'arousal', 'foreplay_give', 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_7.jpg"></center>'
+			'Artem pounds you for some time as Katja watches in excitment. "Time for me to try Artem''s cock..." she grins.'
+			if artemQW['confidence'] < 15:
+				'Artem pulls out of you, but clearly isn''t ready to take the initative and just stands there looking lost while Katja takes your place and you get down on the floor next to the chair.'
+				'"Come on Artem, fuck her tight wet pussy!" you say to make him take some initiative.'
+				if artemQW['confidence'] < 10:
+					if 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets some resistance because of how tight she is.'
+						'"Come on, Artem!" Katja says impatiently. "You can fuck me. Push it all the way in!"'
+						'He nods and thrusts forwards, causing Katja to let out a shriek of pain.'
+						'"I''m sorry!" he says in a panic.'
+						'"Don''t be. Just stay still for a moment," Katja replies.'
+					else
+						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, only stopping when his cock is completely buried inside her.'
+					end
+					*nl
+					'After a few seconds, Katja looks back at him expectantly. "Come on, Artem! Fuck me!"'
+					if artemQW['artem_dom'] > 4:
+						'Artem starts slowly to move in and out of Katja, but soon starts to pick up speed and gets rougher and rougher.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(10,20)
+							katjaQW['slut'] -= 5
+							'What starts out as small moans from Katja turns into sounds of pain as Artem starts to pound her like a cheap slut.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Katja starts with small moans, but as he picks up his speed they get higher and higher.'
+						end
+					else
+						'Artem starts slowly to move in and out of Katja, and does not seem to pick up speed.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(0,5)
+							'Katja is clearly feeling some pain from this and asks him to slow down, which he does. This makes Katja''s pain seem to go away, and by the end she''s moaning quietly.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Since Katja doesn''t seem to feel any pain but clearly also not much satisfaction, you tell Artem to fuck her harder. He does what you say and is soon pounding her as she starts to moan loudly.'
+						end
+					end
+				else
+					if 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'Artem doesn''t say anything just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets some resistance because of how tight she is.'
+						'"Is it okay?" he asks and Katja nods.'
+						'"Yeah, it''s okay. You can push further."'
+						*nl
+						'He nods and pushes forwards, causing Katja to let out a shriek of pain.'
+						'"I''m sorry!" he says in a panic.'
+						'"Don''t be. Just stay still for a moment," Katja replies through a forced smile.'
+					else
+						'Artem just nods and slowly moves in behind Katja. "Here it comes, Katja."'
+						'He very slowly enters her and only stops when his cock is completely buried inside her.'
+					end
+					*nl
+					'After a few seconds, Katja looks back at him expectantly. "Come on, Artem! Fuck me!"'
+					if artemQW['artem_dom'] > 4:
+						'Artem starts to slowly move in and out of Katja, but soon starts to pick up speed as he gets rougher and rougher.'
+						if npc_vag['A14'] < dick:
+							katjaQW['horny'] -= rand(5,10)
+							'What starts out as small moans from Katja turns into sounds of pain as Artem starts to pound her like a cheap slut. He notices this and apologizes before slowing down almost too much.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'Katja starts with small moans, but as he picks up his speed they get higher and higher.'
+						end
+					else
+						'Artem starts slowly to move in and out of Katja, but starts to pick up some speed.'
+						if npc_vag['A14'] < dick:
+							'This makes Katja feel some pain, which Artem quickly notices and slows down. This makes Katja''s pain seem to go away, and by the end she''s moaning quietly.'
+						else
+							katjaQW['horny'] += rand(5,10)
+							'As he goes faster, Katja''s moans becomes louder and Artem picks up even more speed. By the end, he''s pounding her hard as she moans very loudly.'
+						end
+					end
+				end
+			else
+				'Artem pulls out of you. "Come and take <<$pcs_nickname>>''s place, Katja. I want to try your tight pussy."'
+				'You get down on the floor next to the chair to give Katja space.' 
+				'"Great. '+iif( katjaQW['slut']  > 80 , 'My extremely wet pussy need to be filled by something hard,', 'Let''s get to it,')+'" she says and takes your place on the chair.'
+				if artemQW['artem_dom'] > 4:
+					'Artem moves behind Katja and places his cock at the entrance of her pussy. "Okay bitch, get ready to be pounded like a cheap whore!" he says, sounding like he''s in a bad porn movie, and Katja reacts very harshly.'
+					'"What the fuck, Artem?! Why the hell do you think that any girl wants to fuck a pig that says things like that?! What cave did you crawl out of?" she asks in a sharp voice. Artem is clearly taken aback by her outburst and freezes.'
+					if artemQW['nush3some'] >= 3:
+						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
+						'"Sorry Katja, I thought you might like it." He pauses a moment before continuing. "It''s just that Nush likes it when I talk like that. so I thought you would too. Sorry..."' 
+						'Katja still looks annoyed, but also very horny. "Just because a girl that opens her legs for everybody thinks it''s fine to look down on women doesn''t make it so."'
+						*nl
+						'Artem starts to reply, but Katja quickly cuts in. "Just stop talking and fuck me already."'
+					else
+						'"He didn''t mean anything by it, Katja. It''s just stupid talk that goes around in the boys world. Isn''t it, Artem?" you quickly chime in to try and defuse the tension.'
+						'"Sorry, it''s just tough talk that guys do. I shouldn''t have said it," Artem answers.'
+						'Katja still looks annoyed, but also very horny. "Okay. Apology accepted. You can go ahead."'
+					end
+					if 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'He slowly pushes his cock into her and is very careful when he can feel the great resistance of her tight pussy, but he manages to push it all the way to the base without causing her any pain.'
+					else
+						'He slowly pushes his cock into her and manages to push it all the way to the base without causing her any pain.'
+					end
+					*nl
+					katjaQW['horny'] += rand(5,10)
+					'He then starts to pick up speed and gets rougher and rougher, but never so rough that it becomes painful for Katja, who starts to moan loudly.'
+				else
+					'Artem moves behind Katja and places his cock at the entrance of her pussy. "Are you ready to feel a big cock in your tight pussy, Katja?" he asks, seeming very confident of his sex skill.'
+					if 2*npc_vag['A14'] < dick:
+						katjaQW['horny'] -= rand(5,10)
+						'"Please be careful, Artem. I''ve been fucked before, but your cock seem very big," Katja says somewhat nervously.'
+						'"I promise that I''ll be as gentle as I can and you won''t feel any pain" he answers.'
+						'He slowly pushes his cock into her and is very careful when he can feel the great resistance of her tight pussy, but he manages to push it all the way to the base without causing her any pain.'
+					else
+						'"Come on Artem, give me that big hard cock of yours!" Katja says excitedly.'
+						'He pushes his cock into her and manages to push it all the way to the base without causing her any pain.'
+					end
+					*nl
+					katjaQW['horny'] -= rand(10,15)
+					'He then starts to pick up speed and fucks her fast and hard, but never so rough that it becomes painful for Katja, who starts to moan loudly.'
+				end
+			end
+			act 'Change of position': gt 'artem_katja_sex', 'first_time_next'
+		end
+	end
+end
+
+if $ARGS[0] = 'artem_katja_sex', 'first_time_next':
+	if artemQW['confidence'] < 10:
+		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
+			gt 'artem_katja_sex', 'first_time_katja_titjob'
+		else
+			gt 'artem_katja_sex', 'first_time_ride'
+		end
+	else
+		gt 'artem_katja_sex', 'first_time_on_table'
+	end
+end
+
+if $ARGS[0] = 'first_time_on_table':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_8.jpg"></center>'
+	'"My pussy needs a break," Katja says and Artem pulls out.'
+	'"Get your ass on the table <<$pcs_nickname>>," he orders. "Time for you to get fucked some more."'
+	'You take a pillow and lie down on your back on the table, your ass hanging over the edge as Artem thrusts his cock into you and starts to pound you.'
+	'Katja doesn''t want to be completely left out, so she crawls up on the table and starts to lick your breasts.'
+	gs 'arousal', 'vaginal', 3
+	gs 'arousal', 'foreplay', -2
+	gs 'stat'
+	act 'Katja''s turn again':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_9.jpg"></center>'
+		katjaQW['horny'] += rand(10,15)
+		'After pounding you for a few minutes, Artem stops and looks at Katja. "Are you ready for some more cock?"'
+		'She nods and Artem pulls out of you, allowing Katja to take your place. He starts to fuck her again, this time completely aware of how to treat her so she only feels pleasure.'
+		'Not wanting to be left out, you start to suck on Katja''s breast.'
+		gs 'arousal', 'foreplay', 3
+		gs 'stat'	
+		act 'Change position again':
+			if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
+				gt 'artem_katja_sex', 'first_time_katja_titjob'
+			else
+				gt 'artem_katja_sex', 'first_time_ride'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'first_time_katja_titjob':
+	gs 'arousal', 'foreplay_give', 3
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_10a.jpg"></center>'
+	'"Let''s change position," Katja says.'
+	'"Great, because I''m getting tired!" Artem answers with a smile.'
+	'"Why don''t you lie down and we''ll take care of you?" you suggest.'
+	*nl
+	'He pulls out of Katja and lies on his back on the floor as you and Katja get on your knees next to him. Katja looks like she has an idea.'
+	if katjaQW['titjob'] = 0:
+		'"So I''ve heard of this thing called a titjob and I want to try it," she says. "Give his cock a few licks so it''s slippery, <<$pcs_nickname>>."'
+		'You do that while she spits between her breasts to lube them up. She then moves between Artem''s legs and leans forward to wrap her breasts around his dick. He let out a loud moan as she uses her hands to push her breasts together for a tight grip.'
+		'You move in close to watch as she starts sliding breasts up and down along his shaft. It''s clear that this is her first time doing this since her rhythm isn''t perfect and his dick slips out from between her breasts a few times, but Artem does seem to enjoy it.'
+	else
+		'"I wanna give you a titjob Artem," Katja says. "Give his cock a few licks so it''s very slippery, <<$pcs_nickname>>."'
+		'You do that while she spits between her breasts to lube them up. She then moves between Artem''s legs and leans forward to wrap her breasts around his dick. He let out a loud moan as she uses her hands to push her breasts together for a tight grip.'
+		'You move in close to watch as she starts sliding breasts up and down along his shaft.
+		if katjaQW['titjob'] < 5:
+			'She clearly has some experience since her rhythm is pretty good, but his dick does slip out from between her breasts a few times. Artem, however, seems to be enjoying it a lot.'
+		else
+			'She clearly knows what she''s doing. Her rhythm is perfect and she keeps his cock wrapped tightly in the grip of her breasts. Artem looks very satisfied.'
+		end
+	end
+	katjaQW['titjob'] += 1
+	'After a few minutes, Katja stops. "Okay, that''s enough," she says as she releases his cock from her grip.'
+	if pcs_cupsize > 15:
+		act 'Give Artem a titjob':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_10b.jpg"></center>'
+			'"Let me take over," you tell Katja and she moves aside and let you take her place between Artem''s legs.'
+			'You then use your spit to make your breasts slippery before leaning down and wrapping them tightly around Artem''s cock.'
+			'You start sliding your breasts up and down along Artem''s hard rod while Katja gets down next to you and helps you make your movements smooth.'
+			'Artem starts moaning loudly. "Pleas stop <<$pcs_nickname>>, else you''ll make me cum before I can fuck your pussies one more time."'
+			'You do as he says and let go of his cock.'
+			gs 'arousal', 'titjob', 2
+			gs 'stat'
+			act 'Ride Artem': gt 'artem_katja_sex', 'first_time_ride', 1
+		end
+	end
+	act 'Ride Artem': gt 'artem_katja_sex', 'first_time_ride', 1
+end
+
+if $ARGS[0] = 'first_time_ride':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_11.jpg"></center>'
+	if $ARGS[1] = 1:
+		'"You go first," Katja says and you climb onto his still extremely hard cock.'
+	else
+		'"Let''s change position," Katja says, "Great, because I''m getting tired!" Artem answers with a smile.' 
+		'"Why don''t you lie down and we''ll take care of you?" you suggest.'
+		'He pulls out of Katja and lies on his back on the floor before you climb onto his still extremely hard cock.'
+	end
+	'You start to ride him while Katja sits next to you, one hand playing with your breast as the other teases her wet pussy.'
+	gs 'arousal', 'foreplay', -3
+	gs 'arousal', 'vaginal', 3
+	gs 'stat'
+	'After a short while, Artem stops you. "I want to fuck Katja''s tight little pussy one more time before I cum."'
+	act 'Katja''s turn to ride Artem': 	
+		*clr & cla
+		gs 'arousal', 'foreplay_give', 3
+		gs 'stat'
+		katjaQW['horny'] += rand(10,20)
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_12.jpg"></center>'
+		'You let Artem''s cock slide out of you and climb off of him as Katja takes your place '+iif(katjaQW['QWstage'] = 5, '"Why don''t you ride him with your back to him in what is it called? Reverse cowgirl?" you tell Katja and she does what you say.', '"I''m gonna ride you real good, Artem," Katja says as she sits on his dick in the reverse cowgirl position.')
+		'You then grab her ass cheeks and help her ride Artem hard.'
+		if katjaQW['horny'] >= 100:
+			katjaQW['horny'] = 0
+			if katjaQW['QWstage'] = 5:
+				katjaQW['simultanous_boys'] = 1	
+				if npc_vag['A14'] = 0:
+					katjaQW['slut'] += 10
+					if artemQW['confidence'] < 7:
+						artemQW['confidence'] += 4
+					elseif artemQW['confidence'] < 12:
+						artemQW['confidence'] += 3
+					elseif artemQW['confidence'] < 19:
+						artemQW['confidence'] += 2			
+					end
+				else
+					katjaQW['slut'] += 7
+					if artemQW['confidence'] < 14:
+						artemQW['confidence'] += 2
+					elseif artemQW['confidence'] < 20:
+						artemQW['confidence'] += 1			
+					end					
+				end
+			else
+				katjaQW['slut'] += 5
+				if artemQW['confidence'] < 9:
+					artemQW['confidence'] += 2 
+				elseif artemQW['confidence'] < 20:
+					artemQW['confidence'] += 1 			
+				end	
+			end
+			'Katja''s moans get louder and louder, and after riding him for a few minutes she lets out a huge scream which leaves no doubt that she had an orgasm.' 
+			'"I''m cumming!" Artems cries out and she quickly climbs off of him.'
+		else
+			if katjaQW['horny'] = 0: katjaQW['horny'] = 30
+			if katjaQW['QWstage'] = 5:
+				katjaQW['simultanous_boys'] = 1
+				if npc_vag['A14'] = 0:
+					katjaQW['slut'] += 5
+					if artemQW['confidence'] < 9:
+						artemQW['confidence'] += 2
+					elseif artemQW['confidence'] < 15:
+						artemQW['confidence'] += 1			
+					end
+				else
+					katjaQW['slut'] += 3
+					if artemQW['confidence'] < 10:
+						artemQW['confidence'] += 1
+					end					
+				end
+			else
+				katjaQW['slut'] += 2
+				if artemQW['confidence'] < 10:
+					artemQW['confidence'] += 1
+				end		
+			end
+			'Katja''s moans get louder and louder, but after riding him for a few minutes, Artem cries out that he''s about to cum and she quickly climbs off of him.'
+		end
+		if artemQW['threesome'] = 0: artemQW['threesome'] = 1
+		katjaQW['Artem_pussy'] = 1
+		artemQW['katja_threesome'] = 2
+		act 'Artem cums':
+			*clr & cla
+			gs 'arousal', 'end'
+			gs 'cum_call', 'face', 'A2', 1
+			gs 'stat'
+			minut += 3
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/first_time_13.jpg"></center>'
+			'You and Katja quickly get on your knees in front of Artem just before his cum splatters over your faces. You guide his cock such that most of his cum ends up in Katja''s mouth.'
+			'She doesn''t swallow and his cum is sooning running out of her mouth and down his cock. When he finishes, you all start to clean up.'
+			if artemQW['confidence'] < 15:
+				'Artem looks at you and Katja. "That was really good. I feel completely satisfied. I hope I was good for you too, Katja?"'
+			else
+				'Artem looks at you and Katja. "That was fantastic! You''re great at handling a cock, Katja!"'
+			end
+			if katjaQW['horny'] = 0:
+				if katjaQW['QWstage'] = 5:
+					if npc_vag['A14'] = 0:
+						'"That was fantastic! I was quite nervous since I hadn''t taken anything big in my pussy before, but you managed not only to make my first time not too painful, you also gave me a fantastic orgasm. I could not have wished for my first time to be better," Katja replies.'
+					else
+						'"That was great. You managed not only to make my first time with a boy very good, but you also gave me a fantastic orgasm. I could not have wished for a better experience," Katja says.'
+					end
+				else
+					'"That was great. You''re a great lover Artem, '+iif(katjaQW['simultanous_boys'] = 1, 'not that I have that much much experience.', ' and I have some experience')+' with men," Katja says.'
+				end
+			else
+				'"It was good..." Katja says, but you can see that she''s not completely satisfied. You choose not to bring it up.'
+			end
+			'You finish getting dressed up and collect your homework before you and Artem say goodbye to Katja and head home.' 
+			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+			if 2*npc_vag['A14'] < dick: npc_vag['A14'] += 1
+			act 'Walk home': minut +=10 & gt 'artem_katja_sex', 'first_time_walking_home'
+		end
+	end
+end
+
+if $ARGS[0] = 'first_time_walking_home':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/katja/going_home_with_artem.jpg"></center>'
+	'As the two of you walk home, Artem talks about how much fun he had with you and Katja. While he doesn''t get into details, he does wax on about how much he enjoyed having a threesome with her, thanking you several times for the nice surprise.'
+	if artemQW['confidence'] >= 15:
+		if artemQW['nush3some'] >= 3:
+			'As you''re nearing your building, he looks over at you and smiles. "So you think she would be up for it again? I''d love to do it again."'
+			'You can see he''s about to ask something more. "You know what would be even more fun? If Nush wanted to join in as well."'
+			*nl
+			'You''re surprised when it hits you that he''s asking for a three girl foursome. "Really?"'
+			'He shrugs a little with a confident smile. "Yeah... I mean why not?"'
+			'You smile at him. "I''ll think about it and if... if I decide to, I''ll talk to them about it and let you know."'
+			'He nods, but you can tell he was just hoping for you to say yes.'
+		else
+			'As you''re nearing your building, he looks over at you and smiles. "So you think she would be up for it again? I''d love to do it again."'
+			'You smile at him. "I''ll think about it and if... if I decide to, I''ll talk to her about it and let you know."'
+			'He nods, but you can tell he was just hoping for you to say yes.'
+		end
+	else
+		if artemQW['nush3some'] >= 3:
+			'As you''re nearing your building, he looks over at you shyly and blushes bright red. "I had a lot of fun... I wouldn''t mind doing it again... if you ... and her want too that is..." He stammers the last part, clearly wanting to, but also equally afraid of making you or Katja mad for even suggesting it.'
+			'You can see he''s about to ask something more and wait for him to finally work up the nerve to ask. "You think... Maybe... Her... and Nush... Might be interested in ... You know...?"'
+			*nl
+			'You''re surprised when it hits you he''s asking for a three girl foursome. "Really?"'
+			'He blushes and looks down at his feet. "I mean... I don''t know... Maybe if you guys... Wanted to that is..."'
+			'You smile at him. "I''ll think about it and if... if I decide to, I''ll talk to them about it and let you know."'
+			'He smiles and seems happy with the answer.'
+		else
+			'As you''re nearing your building, he looks over at you shyly and blushes bright red. "I had a lot of fun... I wouldn''t mind doing it again... if you ... and her want too that is." He stammers the last part, clearly wanting to, but also equally afraid of making you or Katja mad for even suggesting it.'
+			'You smile at him. "I''ll think about it and if... if I decide to, I''ll talk to her about it and let you know."'
+			'He smiles and seems happy with the answer.'
+		end
+	end
+	'The two of you finally get back to your apartment building, where Artem bids you farewwell before heading into his apartment.'
+	act 'Alone': gt 'pod_ezd', 'etaj_1'
+end
+
+--- artem_katja_sex ---------------------------------
+

+ 64 - 106
locations/bank.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 				bankAccount = 1
 				karta = 5000
 				bankDebtLimit = 5000
-				'You are led to on open office and a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account'
+				'You''re led to an open office where a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account.'
 				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
 				gs 'stat'
 
@@ -53,12 +53,12 @@ if $ARGS[0] = 'start':
 					karta += kartaIN
 					money -= kartaIN
 
-					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
+					'<br>You deposit <<kartaIN>> <b>₽</b>. Your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
 				end
 				killvar 'kartaIN'
 				gs 'stat'
 
-				act 'Walk away':gt 'bank', 'start'
+				act 'Walk away': gt 'bank', 'start'
 			end
 		end
 
@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 				killvar 'kartaOUT'
 				gs 'stat'
 
-				act 'Walk away':gt 'bank', 'start'
+				act 'Walk away': gt 'bank', 'start'
 			end
 
 			if bankDebtLimitRaised = 0 and karta >= 15000:
@@ -92,9 +92,8 @@ if $ARGS[0] = 'start':
 					if $region = 'city':
 						gt 'bank', 'loan_officer', 'start'
 					else
-						'You approach the teller and say, “Hello, I''d like to talk to someone about increasing my credit limit.”'
-						*nl
-						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there.”'
+						'You approach the teller. "Hello. I''d like to talk to someone about increasing my credit limit."'
+						'The teller nods. "Unfortunately, our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there."'
 						delact 'See about increasing your credit limit'
 					end
 				end
@@ -118,7 +117,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			BurgerQW['BankTask'] = 2
 			gs 'stat'
-			'You went to the office and showed the required documents to the manager.'
+			'You enter the office and show the required documents to the manager.'
 
 			act 'Leave': minut += 5 & gt 'bank', 'leave'
 		end
@@ -132,54 +131,49 @@ if $ARGS[0] = 'loan_officer':
 		menu_off = 1
 		minut += 15
 		gs 'stat'
-
-		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/001.jpg"></center>'
 		'You speak to the teller, who tells you to have a seat in the waiting room.'
-		'After waiting about 15 minutes, you are called back to an office, where a handsome young executive awaits.'
-		'Standing, he extends his hand and says, "Hello, Miss <<$pcs_lastname>>, my name is Filip Karpenko. I''m the Loan Officer here at VTB Bank. How can I help you today?"'
+		'After waiting about 15 minutes, you''re called back to an office where a handsome young executive awaits.'
+		'He extends his hand. "Hello, Miss <<$pcs_lastname>>, I''m Filip Karpenko, the Loan Officer here at VTB Bank. How can I help you today?"'
 
-		act 'I''d like to talk about increasing my credit limit, please.':
+		act 'Talk about increasing your credit limit':
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/002.jpg"></center>'
-			'Karpenko nods and asks, "How large a loan were you thinking of taking out?"'
-			'Marshaling your nerve and trying to appear confident, you say, "I was thinking of maybe... 50.000 rubles?"'
+			'Karpenko nods. "How large a loan were you thinking of taking out?"'
+			'You try to appear confident. "I was thinking of maybe... 50,000 <b>₽</b>?"'
 			*nl
-			'"Let me just review your information for a moment," Karpenko says, typing into his computer.'
-			'He reads what appears on his monitor, a ghost of a frown appearing on his face. Suddenly you feel rather foolish for asking for so much money when you''re a young girl not even established in the world yet!'
+			'"Let me just review your information for a moment," he replies and starts typing into his computer.'
+			'He reads what appears on his monitor, a ghost of a frown appearing on his face as you suddenly feel rather foolish for asking for so much money.'
 			*nl
-			'You shift in your chair, and the next couple of minutes seem very long indeed before Karpenko finally looks up from his screen and says, "I''m sorry, but you seem to have very little in the way of assets or collateral, and you''re very young to be taking out such a significant loan. I''m afraid the bank can''t take a risk on this proposition at this time."'
+			'You shift in your chair and the next few minutes seem to drag in before Karpenko finally looks up from his screen. "I''m sorry, but you seem to have very little in the way of assets or collateral, and you''re very young to be taking out such a significant loan. I''m afraid the bank can''t take a risk on this proposition at this time."'
 			gs 'stat'
 
-			act 'Isn''t there some way you could reconsider, Mr. Karpenko?':
+			act 'Try and seduce him':
 				*clr & cla
-				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/003.jpg"></center>'
-				'"I''m sorry, Miss <<$pcs_lastname>>, but my decision is final," Karpenko says firmly.'
+				'"I''m sorry, Miss <<$pcs_lastname>>, but my decision is final," he says firmly.'
 				*nl
-				'You rise from your chair, but you don''t turn and walk away. Instead you approach the loan officer and lean in, giving him an excellent view of your cleavage.'
-				'"It''s true I don''t have any real collateral" you tell him in a soft, sultry voice, "but that doesn''t mean I don''t have something you want. I think if we put our minds to it, we can come up with conditions that benefit us both."'
+				'You rise from your chair, but you don''t turn and walk away. Instead, you approach him and lean in, giving him an excellent view of your cleavage.'
+				'"It''s true I don''t have any real collateral," you tell him in a soft, sultry voice. "but that doesn''t mean I don''t have something you want. If we put our minds to it, we can come up with conditions that benefit us both..."'
 				*nl
-				'Karpenko stares at your breasts as they strain against your top, then looks into your eyes. "I suppose there may be some way we can work out a deal, if you''re willing to be... cooperative."'
+				'Karpenko stares at your breasts, then looks into your eyes. "I suppose there may be some way we can work out a deal, if you''re willing to be... cooperative."'
 
 				gs 'bank', 'loan_officer', 'sex_start'
 			end
 
-			act 'Sadly rise and head for the door':
+			act 'Leave':
 				*clr & cla
-				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/004.jpg"></center>'
 				'"Wait, Miss <<$pcs_lastname>>," Karpenko says as you turn away. "You seem like a trustworthy young lady. There may be a way I can arrange this loan if you''re willing to be... cooperative."'
 				*nl
-				'You''re young, but even so there''s little doubt about what sort of cooperation he''s talking about – the way his eyes are undressing you as you stand before him makes his intentions quite plain.'
+				'You''re young, but even so there''s little doubt about what sort of cooperation he''s implying. The way his eyes are undressing you as you stand before him makes his intentions quite plain.'
 				'He wants you to use your body as collateral! Is that really something you would consider? Is the loan really worth that much to you?'
 
 				gs 'bank', 'loan_officer', 'sex_start'
 			end
 		end
 
-		act 'Actually, I''ve changed my mind. Sorry to bother you.':
+		act 'Change your mind':
 			minut += 3
 			gt 'bank', 'start'
 		end
@@ -190,7 +184,7 @@ if $ARGS[0] = 'loan_officer':
 		if pcs_inhib >= 35 and stat['vaginal'] ! 0:
 			gs 'willpower', 'sex', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
-				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<<will_cost>> Willpower)':
+				act 'Co-operate (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -203,41 +197,29 @@ if $ARGS[0] = 'loan_officer':
 					$npc_notes[$npclastgenerated] = 'A young Loan Officer for VTB Bank'
 					gs 'npcpreservec', $npclastgenerated
 					$boy = $npclastsaved
-
-					'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/005.jpg"></center>'
 					'"Time to put your mouth where my money is, girl," Karpenko says with a grin that''s just a little unnerving. You start to get the sense that you might just be in for more than you bargained for with this man, but it''s too late to back out now.'
-					*nl
 					'Affecting your sultriest walk and your hungriest gaze, you approach him as he rises from his chair. You open your mouth to say some sophisticated-sounding banter, but Karpenko cuts you off by grabbing your waist and pulling you toward him, stopping your speech by filling your mouth with his probing tongue.'
-					*nl
-					'You gasp involuntarily at his forceful approach, but after a moment you regain some sense of composure. You know what you have to do, so you might as well do it. And who knows? You might actually like it too. You begin kissing him back, alternately probing his mouth and sucking his tongue like a miniature cock.'
-					*nl
-
+					'You gasp involuntarily at his forceful approach, but after a moment you regain some sense of composure. You begin kissing him back, alternately probing his mouth and sucking his tongue like a miniature cock.'
 					gs 'arousal', 'kiss', 10, 'sub'
 					gs 'stat'
 
-					act 'Get his cock ready to fuck you':
+					act 'Get his cock ready':
 						*clr & cla
-						'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/007.jpg"></center>'
-						'After a few moments of tangling tongues, Karpenko sits down in his chair with a nasty grin and says, "You came in here to beg for a loan, didn''t you? I think sluts beg best on their knees with their mouths full."'
-						*nl
-						'"Yes, sir," you murmur as you sink to your knees and crawl under the table to go between his legs. Fifty thousand rubles is a lot of money, and if Karpenko wants you to perform like a submissive whore for it, then that''s exactly what you''ll do. And if your pussy is getting a little wet at this treatment, well, you can''t be blamed for that. It is rather thrilling!'
-						*nl
-						'His cock is already hard in his pants as you undo his zipper and fish it out. You pause only for a moment to admire the tool – at 21 thick, glorious centimeters, it is worthy of a little admiration – before putting your skilled mouth to work. You run your tongue up the thick vein on the underside, feeling his heat and tasting his salty flavor, until you come to his flaring mushroom head. Your eyes lock with his as you swirl your tongue around the glans before you swallow him into your throat. You spend the next several minutes on your knees and he spends the next several minutes loving your attentions.'
+						'After a few minutes, Karpenko sits on his chair with a nasty grin. "You came in here to beg for a loan, didn''t you? I think sluts beg best on their knees with their mouths full."'
+						'"Yes, sir," you murmur as you sink to your knees and crawl under the table.'
+						'His cock is already hard in his pants as you undo his zipper and fish it out. You pause only for a moment to admire the tool – at 21 thick, glorious centimeters, it''s worthy of a little admiration – before putting your skilled mouth to work. You run your tongue up the thick vein on the underside, feeling his heat and tasting his salty flavor until you come to his flaring head. Your eyes lock with his as you swirl your tongue around the glans before you swallow him into your throat.'
 						*nl
-						'Finally your efforts bear fruit as Karpenko says, "Let''s move over to the sofa. Time to put that pussy of yours to work!"'
-
+						'Finally your efforts bear fruit. "Let''s move over to the sofa. Time to put that pussy of yours to work!"'
 						gs 'arousal', 'bj', 15, 'sub'
 						gs 'stat'
 
 						act 'Lie on your side':
 							*clr & cla
-							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
-							'Karpenko leads you to the leather-covered sofa in his room and lies down on it, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you lose yourself in the pleasure and find yourself pushing back into him to take every millimeter into you.'
-							*nl
-
+							'Karpenko leads you to the leather-covered sofa and lies down on it, pulling you in to spoon with him. You barely get settled before he turns your head and starts kissing you. A few minutes later, he pushes his cock into your pussy.'
+							'In a single, swift movement, he has buried himself in you, his thick length making you gasp into his mouth as he starts to fuck you, his hips pushing forward into your ass. Before long, you lose yourself in the pleasure and find yourself pushing back into him.'
 							gs 'arousal', 'kiss', -5, 'sub'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'stat'
@@ -246,37 +228,28 @@ if $ARGS[0] = 'loan_officer':
 								*clr & cla
 								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
-								'With a growled, “I want you on top, you sweet little whore,” Karpenko pulls his dick out of you and rolls to his back. You swing atop him, and he holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
-								*nl
-								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
-								*nl
-
+								'"I want you on top, you sweet little whore," he growls as pulls his dick out of you and rolls onto his back. You swing atop him, and he holds your hips as you reach between your legs and grasp his cock. Both of you gasp in unison as you settle down on it and feel it fill your pussy once again. You take it all inside you and then, eyes closed, begin to ride him.'
+								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him, putting friction on your clit as you take him to the hilt.'
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'stat'
 
-								act 'Taking it like a bitch': gt 'bank', 'loan_officer', 'sex_finish'
+								act 'Take it': gt 'bank', 'loan_officer', 'sex_finish'
 							end
 						end
 
 						act 'Get on top':
 							*clr & cla
-							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
-							'Karpenko leads you to the plush leather sofa and lies down on his back, and you waste no time climbing atop him. He holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
-							*nl
-							'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
-							*nl
-
+							'Karpenko leads you to the plush leather sofa and lies down on his back. You waste no time climbing atop him and he holds your hips as you reach between your legs and grasp his cock. Both of you gasp in unison as you settle down on it and feel it fill your pussy once again. You take it all inside you and then, eyes closed, begin to ride him.'
+								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him, putting friction on your clit as you take him to the hilt.'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'stat'
 
 							act 'Spoon-fucking':
 								*clr & cla
-								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
-								'"On your side now," Karpenko tells you gruffly. You clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you find yourself pushing back into him to take every millimeter into you.'
-								*nl
-
+								'"On your side now," Karpenko tells you gruffly and you clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and starts kissing you. A few minutes later, he pushes his cock into your pussy.'
+								'In a single, swift movement, he has buried himself in you, his thick length making you gasp into his mouth as he starts to fuck you, his hips pushing forward into your ass. Before long, you lose yourself in the pleasure and find yourself pushing back into him.'
 								gs 'arousal', 'kiss', -5
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'stat'
@@ -287,21 +260,19 @@ if $ARGS[0] = 'loan_officer':
 					end
 				end
 			else
-				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Co-operate(<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 'No, sleeping with a man for money is not something you''re willing to do!':
+		act 'Refuse':
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/006.jpg"></center>'
-			'"I''m sorry, Mr. Karpenko," you say as you pull away, "but I really can''t do this after all I''m just not that sort of girl. I''m sorry to waste your time."'
+			'"I''m sorry," you say as you pull away, "I''m just not that sort of girl. Sorry to waste your time."'
 			'You turn and head for the door, but Karpenko''s voice stops you before you reach it. "Wait a moment, Miss <<$pcs_lastname>>. Before you go, I want you to know that this offer remains open. If you change your mind, you can return at any time and we can arrange the loan you desire."'
-			'"I... will keep that in mind," you mutter as you throw open the door and run back to the safety of the lobby.'
-			*nl
+			'"I''ll... Keep that in mind," you mutter as you throw the door open and run back to the safety of the lobby.'
 			gs 'stat'
 
-			act 'Flee the room':
+			act 'Flee':
 				minut += 10
 				gt 'bank', 'start'
 			end
@@ -309,41 +280,28 @@ if $ARGS[0] = 'loan_officer':
 
 	elseif $ARGS[1] = 'sex_finish':
 		*clr & cla
-		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/010.jpg"></center>'
-		'After several long, wonderful minutes of railing you hard, Karpenko swats your ass loudly and says, "I want to fuck you from behind now. Bend over the table."'
-		*nl
-		'He''s ordering you around like a whore he paid for, but the whole thing is quite thrilling – and he really knows how to use that big dick he''s swinging! You almost jump off the couch and run to the table, bending over and swinging one leg up onto the surface to brace yourself. An instant later Karepenko''s hands are on your upturned ass and then his cock is back inside you – and this time he''s not holding back a bit! He thrusts so fiercely that your whole body shakes every time his hips collide with your ass, and your pussy sucks fiercely at his rod as it hammers in and out.'
-		*nl
-		'You''re trying to be quiet – it would be mortifying if anyone outside this room heard you being screwed like a cheap prostitute! – but he is too forceful and too skilled, and soon you are giving a loud, moaning gasp with every thrust, too lost in the bliss he is giving you to care a damn what happens after he''s done with you. You don''t even know how long that state lasts, lost in pleasure as you are, but you suddenly become aware that he has given you one last particularly deep thrust and is now still as his cock leaps and jumps inside you.'
-		*nl
-
+		'After several minutes, Karpenko smacks your ass. "I want to fuck you from behind now. Bend over the table."'
+		'You slide off the couch and move to bend over, swinging one leg up onto the surface to brace yourself. An instant later, Karepenko''s hands are on your ass and his cock is back inside you. He thrusts so fiercely that your whole body shakes every time his hips collide with your ass and your pussy clenches tightly around him as he hammers in and out.'
+		'You''re trying to be quiet, but he''s too forceful and you''re soon letting out loud, moaning gasps with every thrust, too lost in the bliss he''s giving you to care what happens. You don''t know how long this lasts, lost in pleasure as you are, but you suddenly become aware that he has given you one last particularly deep thrust and suddenly feel his cock twitching inside you.'
 		gs 'arousal', 'vaginal', 15, 'sub'
 		gs 'stat'
 
 		act 'What did you do?!':
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/011.jpg"></center>'
-			'Sudden panic surges in you chest and dispels the pleasure-cobwebs in an instant as you demand, "Did you just come inside me?!?"'
-			*nl
-			'Karpenko steps back and a flood of his spunk pours out of your pussy to run down your thighs, but you have no delusions that all of it came out. With a smug grin he grabs a tissue from his desk and starts wiping his dick off, saying, "You just got a loan of 50.000 rubles. Did you really think I would authorize that sort of loan to a girl like you and not finish inside?"'
-			*nl
+			'Sudden panic surges in your chest and dispels the pleasure in an instant. "Did you just cum inside me?!?"'
+			'Karpenko steps back and you feel his cum dribbling out of your pussy and down your thigh as he pants loudly. "You just got a loan of 50,000 <b>₽</b>. Did you really think I would authorize that sort of loan to a girl like you and not finish inside?"'
 			'"But I could get pregnant!" you object.'
 			*nl
-			'"You can afford a hell of a lot of morning after pills," he says with a shrug as he tucks his cock away and sits back at his desk. "Remember, you will need to pay this loan back like any other, and don''t think you can come back for another loan like it in the future. Now, if you''ll excuse me, I have work to do. I trust you can see yourself out."'
-			*nl
-			'Feeling humiliated but richer, you adjust your clothing and open the office door to step out into the hallway. The first thing you see is a cluster of three female bank employees looking at you, and you can see from their smirks and how they whisper to each other that they know exactly what you were up to with the loan officer. Cheeks burning with shame, you hurry away.'
-			*nl
-
+			'"You can afford a hell of a lot of morning after pills," he says with a shrug as he tucks his cock away and sits back at his desk. "Remember, you''ll need to pay this loan back like any other, and don''t think you can come back for another loan like it in the future. Now, if you''ll excuse me, I have work to do. I trust you can see yourself out."'
+			'Feeling humiliated, you adjust your clothing and open the office door to step out into the hallway. The first thing you see is a cluster of three female bank employees looking at you, and you can see from their smirks and how they whisper to each other that they know exactly what you were up to with the loan officer. Cheeks burning with shame, you hurry away.'
 			gs 'cum_call', '', $boy, 1, '', '', 110
 			gs 'cuminsidereact', 'Mr. Karpenko'
 			gs 'fame', 'city', 'sex', 3
 			gs 'arousal', 'end'
-
 			bankDebtLimit += 45000
 			money += 45000
-
 			bankDebtLimitRaised = 1
 			minut += 30
 			gs 'stat'
@@ -500,10 +458,10 @@ if $ARGS[0] = 'cikl':
 		if mey_vika['mey_vika_qw'] >= 35 and mey_tamara['qw_end'] = 0:
 			if mey_tamara['help_count'] < 10:
 				karta += 10000
-				'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+				'<b><font color=green>Aunt Tamara gave you 10,000 rubles for your efforts</font></b>'
 			else
 				karta += 15000
-				'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+				'<b><font color=green>Aunt Tamara gave you 15,000 rubles for your efforts</font></b>'
 			end
 			mey_tamara['help_count'] = 0
 		end
@@ -537,7 +495,7 @@ if $ARGS[0] = 'cikl':
 			karta += pay
 			smenaSalon = 0
 			nopaysalon = 1
-			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in a beauty salon.</font></b>'
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in the beauty salon.</font></b>'
 		end
 
 		if tanwork = 1 and nopaytanwork = 0:
@@ -588,28 +546,28 @@ if $ARGS[0] = 'cikl':
 		if func('homes_properties', 'get_owned_homes_count') > 0 and electroday = 0:
 			gs 'housing', 'util'
 			if bankAccount = 1 and karta - bankDebtLimit >= elektro:
-				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities has been automatically deducted from your bank account.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					karta -= elektro * hcount_util
 				end
 			elseif bankAccount = 1 and karta >= elektro:
-				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					karta -= elektro * hcount_util
 				end
 			elseif bankAccount = 0 and money >= elektro:
-				'<b><font color="red">You currently do not have a bank account setup for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				'<b><font color="red">You currently do not have a bank account set up for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					money -= elektro * hcount_util
 				end
 			else
-				'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
+				'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b> for automatic utilities payment.</font></b>'
 			end
 		end
 
@@ -617,15 +575,15 @@ if $ARGS[0] = 'cikl':
 		if kabel > 0 and kabelday = 0:
 			gs 'housing', 'cable'
 			if bankAccount = 1 and karta - bankDebtLimit >= (300 * hcount_cable):
-				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account for your cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
 			elseif bankAccount = 1 and karta >= (300 * hcount_cable):
-				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility for your cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
 			elseif bankAccount = 0 and money >= (300 * hcount_cable):
-				'<b><font color="red">You currently do not have a bank account setup for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				'<b><font color="red">You currently do not have a bank account set up for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
 				kabelday = 1
 				money -= 300 * hcount_cable
 			else

+ 97 - 93
locations/body.qsrc

@@ -487,9 +487,6 @@ if $ARGS[0] = 'Update_daily_body_other':
 			end
 		end
 	end
-
-	gs 'drugs', 'breastcream', 'cikl'
-	gs 'drugs', 'steroids', 'cikl'
 end
 
 
@@ -591,9 +588,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 	end
 
 
-	if salobustdo = 0 and cheatVars['body_staticAssets'] = 0:
-		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
-
+	if salobustdo = 0:
 		!!===============    MAGIC    ===============!!
 		if magikDostup = 0 and magf2bdo = 1 and daystart > pcs_mass['magic_day'] and pcs_mana >= manamax / 2:
 			bodyVars['bust_magic'] += 1
@@ -605,115 +600,124 @@ if $ARGS[0] = 'Redistribute_Mass':
 			pcs_mana -= max(100, 2000 / pcs_magik)
 		end
 
-		!!===============    Low Weight    ===============!!
-		if pcs_mass['body'] < 10:
-			temp_diff = min(pcs_mass['bust'], 3)
-			pcs_mass['bust'] -= temp_diff
-			pcs_mass['body'] += temp_diff
-
-			temp_diff = min(pcs_mass['butt'], 3)
-			pcs_mass['butt'] -= temp_diff
-			pcs_mass['body'] += temp_diff
+		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
+		if cheatVars['body_staticAssets'] ! 0:
+			pcs_mass['bust'] = pcs_mass['bust_gen']
+			pcs_mass['bust_message'] = pcs_mass['bust_gen']
 
+			pcs_mass['butt'] = pcs_mass['butt_gen']
+			pcs_mass['butt_message'] = pcs_mass['butt_gen']
 		else
-			temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
-			temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
-
-			!!===============    Bust    ===============!!
-			temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
-
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
-				temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
-				pcs_mass['bust'] += temp_diff
-				pcs_mass['body'] -= temp_diff
+			!!===============    Low Weight    ===============!!
+			if pcs_mass['body'] < 10:
+				temp_diff = min(pcs_mass['bust'], 3)
+				pcs_mass['bust'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
-				!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+				temp_diff = min(pcs_mass['butt'], 3)
+				pcs_mass['butt'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-				!!-----------    Growth    -----------!!
-			elseif temp_mass_bust > pcs_mass['bust']:
-				pcs_mass['bust'] += 1
-				pcs_mass['body'] -= 1
+			else
+				temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+				temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+
+				!!===============    Bust    ===============!!
+				temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
+
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
+					temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
+					pcs_mass['bust'] += temp_diff
+					pcs_mass['body'] -= temp_diff
+
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
+					!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+
+					!!-----------    Growth    -----------!!
+				elseif temp_mass_bust > pcs_mass['bust']:
+					pcs_mass['bust'] += 1
+					pcs_mass['body'] -= 1
+
+					!!-----------    Shrink    -----------!!
+				elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
+					pcs_mass['bust'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-				!!-----------    Shrink    -----------!!
-			elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
-				pcs_mass['bust'] -= 1
-				pcs_mass['body'] += 1
-			end
 
+				!!===============    Ass    ===============!!
+				temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
 
-			!!===============    Ass    ===============!!
-			temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
+					temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
+					pcs_mass['butt'] += temp_diff
+					pcs_mass['body'] -= temp_diff
 
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
-				temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
-				pcs_mass['butt'] += temp_diff
-				pcs_mass['body'] -= temp_diff
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
+					!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
 
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
-				!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+					!!-----------    Rest    -----------!!
+				elseif temp_mass_ass > pcs_mass['butt']:
+					pcs_mass['butt'] += 1
+					pcs_mass['body'] -= 1
 
-				!!-----------    Rest    -----------!!
-			elseif temp_mass_ass > pcs_mass['butt']:
-				pcs_mass['butt'] += 1
-				pcs_mass['body'] -= 1
+				elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
+					pcs_mass['butt'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-			elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
-				pcs_mass['butt'] -= 1
-				pcs_mass['body'] += 1
+				killvar 'temp_total_mass'
+				killvar 'temp_tot_gen_mass'
+				killvar 'temp_mass_bust'
+				killvar 'temp_mass_ass'
+				killvar 'temp_diff'
 			end
 
-			killvar 'temp_total_mass'
-			killvar 'temp_tot_gen_mass'
-			killvar 'temp_mass_bust'
-			killvar 'temp_mass_ass'
-			killvar 'temp_diff'
-		end
-
-		if bodyresetflag ! 0:
-			pcs_mass['bust_message'] = pcs_mass['bust']
-			pcs_mass['butt_message'] = pcs_mass['butt']
-		else
-			if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+			if bodyresetflag ! 0:
 				pcs_mass['bust_message'] = pcs_mass['bust']
+				pcs_mass['butt_message'] = pcs_mass['butt']
+			else
+				if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem fuller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem fuller</b>'
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
 
-				else
-					'<b>Your breasts seem fuller</b>'
-				end
+					else
+						'<b>Your breasts seem fuller</b>'
+					end
 
-			elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
-				pcs_mass['bust_message'] = pcs_mass['bust']
-
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
+				elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem to be getting smaller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
 
-				else
-					'<b>Your breasts seem to be getting smaller</b>'
-				end
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem to be getting smaller</b>'
 
-			else
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seems fuller</b>'
+					else
+						'<b>Your breasts seem to be getting smaller</b>'
+					end
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seem to be getting smaller</b>'
+				else
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seems fuller</b>'
+
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seem to be getting smaller</b>'
+					end
 				end
 			end
 		end

+ 3 - 1
locations/bras.qsrc

@@ -208,6 +208,7 @@ if $ARGS[0] = 'view_bra_item':
 	!! ARGS 1 = action type (wardrobe, bathroom, shop)
 	!! ARGS 2 - bra type
 	!! ARGS 3 - bra index
+	!! ARGS 4 - price modifier (0-100, taken as %) {OPTIONAL}
 
 	cla
 	'<center><img src="<<FUNC(''$bra_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -224,7 +225,7 @@ if $ARGS[0] = 'view_bra_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = BraPrice
+			price = BraPrice + (BraPrice * ARGS[4]) / 100
 			'Price: <<BraPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
@@ -253,6 +254,7 @@ if $ARGS[0] = 'view_bra_item':
 				else
 					'You do not own the matching panties, you can buy this bra and them as a set.'
 					price_set = BraPrice*18/10
+					price_set += (price_set * ARGS[4]) / 100
 					'Price for set: <<price_set>> <b>₽</b>'
 					if money >= price_set:
 						act 'Buy set (cash)':

+ 1 - 3
locations/cikl.qsrc

@@ -931,9 +931,7 @@ mosal_time = totminut
 killvar 'last_pee'
 
 !!Drugs reduction
-gs 'drugs', 'cocaine', 'cikl'
-gs 'drugs', 'mentats', 'cikl'
-gs 'drugs', 'aphrodisiac', 'cikl'
+gs 'drugs', 'cikl'
 
 gs 'gad_gpyard', 'cikl'
 

+ 50 - 48
locations/clothing.qsrc

@@ -102,7 +102,7 @@ $clothing_list_line = {
 	else
 		clothing_temp = 100 & !clothing widdefault to 100
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[1]>>'', <<ARGS[2]>>, ''<<$ARGS[0]>>''"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
 	killvar 'clothing_temp'
 	$swimwear_description = ''
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
@@ -1468,27 +1468,28 @@ end
 
 if $ARGS[0] = 'view_clothing_item':
 	!! ARGS 0 - view_clothing_item
-	!! ARGS 1 - clothing type
-	!! ARGS 2 - clothing index
-	!! ARGS 3 = action type (wardrobe, shop, sell, resize)
+	!! ARGS 1 - action type (wardrobe, shop, sell, resize)
+	!! ARGS 2 - clothing type
+	!! ARGS 3 - clothing index
+	!! ARGS 4 - price modifier (0-100, taken as %) {OPTIONAL}
 
 	$swimwear_description = ''
 
 	cla
-	'<center><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>"></center>'
-	gs 'clothing_attributes', $ARGS[1], ARGS[2]
+	'<center><img src="<<FUNC(''$clothing_image'', $ARGS[2], ARGS[3])>>"></center>'
+	gs 'clothing_attributes', $ARGS[2], ARGS[3]
 
-	$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
-	$RESULT += '<<ARGS[2]>>'
+	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
+	$RESULT += '<<ARGS[3]>>'
 	'<<$RESULT>>'
-	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
+	if $ARGS[2] = 'misc_outfits' and ARGS[3] = 1:
 		'A hessian sack the hunters gave you.'
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
 		'<<$description>>'
-		if hypnoClothes > 0 and (CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _
-		or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 3) _
-		or ($ARGS[1] = 'danilovich_outfits' and CloThinness >= 5)):
+		if hypnoClothes > 0 and (CloThinness >= 6 or $ARGS[2] = 'salacious_outfits' or $ARGS[2] = 'salacious_dress' _
+		or (($ARGS[2] = 'eroto_outfits' or $ARGS[2] = 'eroto_dress' or $ARGS[2] = 'eroto_strip') and CloThinness >= 3) _
+		or ($ARGS[2] = 'danilovich_outfits' and CloThinness >= 5)):
 			nl & '<I>You have a strange feeling about this outfit. You <b>really</b> want to wear it.</i>'
 		end
 	else
@@ -1520,28 +1521,29 @@ if $ARGS[0] = 'view_clothing_item':
 		'This is sport clothing.'
 	end
 
-	if $ARGS[3] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
+	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'gm_school' or ARGS[3] ! 6):
 		$RESULT = '(strength '
-		dynamic '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]'
-		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
+		dynamic '$RESULT += <<$ARGS[2]>>_h[<<ARGS[3]>>]'
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT += ', hip size '
-			dynamic '$RESULT += <<$ARGS[1]>>_b[<<ARGS[2]>>]'
+			dynamic '$RESULT += <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 		end
 		$RESULT += ')'
 		'<<$RESULT>>'
 	end
 
-	if $ARGS[3] = 'shop':
-		if dyneval('RESULT = <<$ARGS[1]>>[<<ARGS[2]>>]') = 1:
+	if $ARGS[1] = 'shop':
+		if dyneval('RESULT = <<$ARGS[2]>>[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			if $ARGS[1] = 'coat' and ARGS[2] = 5:
+			if $ARGS[2] = 'coat' and ARGS[3] = 5:
 				price = CloPrice
 			else
-				price = (CloPrice * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
+				price = (CloPrice * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 				price = price / 50 * 50
 			end
+			price += (ClorPrice * ARGS[4]) / 100
 			'Price: <<price>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if CloInhibit > pcs_inhib:
@@ -1556,7 +1558,7 @@ if $ARGS[0] = 'view_clothing_item':
 						if CloStyle = 5:h = 20
 						h += (3 * CloQuality)
 						money -= price
-						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[1], $ARGS[2], ARGS[3]
 					end
 				end
 				if karta >= Price:
@@ -1566,17 +1568,17 @@ if $ARGS[0] = 'view_clothing_item':
 						if CloStyle = 5:h = 20
 						h += (3 * CloQuality)
 						karta -= price
-						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[1], $ARGS[2], ARGS[3]
 					end
 				end
 			end
 		end
-	elseif $ARGS[3] = 'wardrobe':
+	elseif $ARGS[1] = 'wardrobe':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
+		if $ARGS[2] ! 'gm_school' or ARGS[3] ! 6:
 			!! if the clothing is worn out
-			if dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0:
+			if dyneval('RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]') <= 0:
 				'This item is worn and is not suitable for further wear.'
 				if pcs_sewng >= 60 and mc_inventory['sewing_fabric'] > 0:
 					cla
@@ -1587,7 +1589,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
-							dynamic $ARGS[1] + '_h[<<ARGS[2]>>] += 30'
+							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
 							'You spend 30 minutes fixing the outfit.'
 							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1596,7 +1598,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] += 3
 							minut += 30
-							dynamic $ARGS[1] + '[<<ARGS[2]>>] = 0'
+							dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
 							'Despite your skill with a needle, this outfit has proved beyond repair. All that is left of it is only good for your cloth pile.'
 							act 'Return': gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1609,9 +1611,9 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 
 			!! if the clothing is a type that checks for hip size
-			if $ARGS[1] ! 'danilovich_outfits' and CloStyle ! 5:
+			if $ARGS[2] ! 'danilovich_outfits' and CloStyle ! 5:
 				!! if the hipsize is too far from your hipsize
-				dynamic 'RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]'
+				dynamic 'RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 				if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
 					if RESULT < pcs_hips:
 						'This item is too small for you to wear.'
@@ -1626,7 +1628,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
-							dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
+							dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 							'You spend 30 minutes resizing the outfit.'
 							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 						end
@@ -1637,7 +1639,7 @@ if $ARGS[0] = 'view_clothing_item':
 							act 'Resize item':
 								minut += 15
 								money -= 500
-								dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
+								dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 								*nl
 								'You hand the clothing over to the tailor who takes it into the back. Fifteen minutes later, he presents your clothing back to you, adjusted to fit you perfectly.'
 								act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1652,73 +1654,73 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 		end
 
-		if $ARGS[1] ! 'danilovich_swimsuit' and $ARGS[1] ! 'scandalicious_bikinis' and $ARGS[1] ! 'scandalicious_swimsuit' and $ARGS[1] ! 'allure_bikinis' and $ARGS[1] ! 'allure_bikinis':
+		if $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis':
 
 			if CloInhibit > pcs_inhib:
 				'You don''t feel daring enough to wear an outfit this revealing.'
-			elseif ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1 :
+			elseif ARRPOS('$CloLosTyp', $ARGS[2]) ! -1 and ARRPOS('CloLosNum',ARGS[3]) ! -1 :
 				'You lost these clothes somewhere, maybe you can find them again?.'
 			else
 				act 'Wear':
-					gs 'clothing', 'wear', $ARGS[1], ARGS[2]
+					gs 'clothing', 'wear', $ARGS[2], ARGS[3]
 
 					gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 				end
 			end
 		end
-	elseif $ARGS[3] = 'store' or $ARGS[3] = 'unwanted':
+	elseif $ARGS[1] = 'store' or $ARGS[1] = 'unwanted':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'coat':
+		if $ARGS[2] ! 'coat':
 			act 'Move back to wardrobe':
-				dynamic $ARGS[1] + '_s[<<ARGS[2]>>] = 0'
+				dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		end
 
-	elseif $ARGS[3] = 'sell':
-		$ward_list_page = $ARGS[3]
+	elseif $ARGS[1] = 'sell':
+		$ward_list_page = $ARGS[1]
 		act 'Keep item':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
 		!! value is based on the strength remaining
-		dynamic 'RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]'
+		dynamic 'RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]'
 		if RESULT > 45:
 			'You can sell this item for 500 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 500
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		elseif RESULT > 30:
 			'You can sell this item for 300 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 300
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		elseif RESULT > 0:
 			'You can sell this item for 100 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 100
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		else
 			'This item is too worn to have any sale value.'
 			act 'Throw it away':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		end
-	elseif $ARGS[3] = 'resize':
+	elseif $ARGS[1] = 'resize':
 		act 'Leave item alone':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
-			if dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') ! pcs_hips and money >= 500:
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+			if dyneval('RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]') ! pcs_hips and money >= 500:
 				'You can have this resized for 500 <b>₽</b>.'
 				act 'Resize':
 					money -= 500
-					dynamic '<<$ARGS[1]>>_b[<<ARGS[2]>>] = pcs_hips'
+					dynamic '<<$ARGS[2]>>_b[<<ARGS[3]>>] = pcs_hips'
 					gt 'clothing', 'view_clothing_list', 'resize'
 				end
 			end

+ 2 - 1
locations/coats.qsrc

@@ -144,6 +144,7 @@ if $ARGS[0] = 'view_coat_item':
 	!! ARGS 1 = action type (draw, shop)
 	!! ARGS 2 - coat type
 	!! ARGS 3 - coat index
+	!! ARGS 4 - price modifier (0-100, taken as %) {OPTIONAL}
 
 	cla
 	'<center><img src="<<FUNC(''$coat_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -156,7 +157,7 @@ if $ARGS[0] = 'view_coat_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = CoatPrice
+			price = CoatPrice + (CoatPrice * ARGS[4]) / 100
 			'Price: <<CoatPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:

+ 4 - 4
locations/din_van.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'shower':
 
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
-			'In your absentmindedness, you have forgotton to close the door.'
+			'In your absentmindedness, you have forgotten to close the door.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
 			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 		end
@@ -1185,14 +1185,14 @@ if $ARGS[0] = 'private':
 	end
 
 	if mc_inventory['hair_extensioncream'] > 0:
-		'<a href="exec:gs ''drugs'', ''hair_extensioncream'' & gt $loc, $loc_arg">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
+		'<a href="exec:gs ''drugs'', ''hair_extensioncream''">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
 	end
 	if mc_inventory['butt_injection'] > 0:
-		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
+		'<a href="exec:gs ''drugs'', ''butt_injection''">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
 	end
 
 	if mc_inventory['breastcream'] > 0:
-		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
+		'<a href="exec:gs ''drugs'', ''breastcream''">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
 	gs 'piercing_management', 'set_manage_string'

+ 48 - 27
locations/djibril.qsrc

@@ -25,7 +25,8 @@ if $ARGS[0] = 'djibril_room':
 			*clr & cla
 			minut += 10
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'He grins and grabs his phone before sending a few text messages. Once he finishes, he sits in the reclining chair. "They should be here shortly." They arrive within a few minutes and take a seat on the couch with you.'
+			'He grins and grabs his phone before sending a few text messages. Once he finishes, he sits in the reclining chair. "They should be here shortly."'
+			'They arrive within a few minutes and take a seat on the couch with you.'
 			act 'Continue': gt 'djibrilev1', 'djibrilgb'
 		end
 		if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -40,7 +41,8 @@ if $ARGS[0] = 'djibril_room':
 		end
 	elseif npc_sex['A82'] >= 1 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 		DjibrilQW['seduce'] = daystart
-		'As you enter, he pulls you over towards the couch. "I want you, I want you right now." Before you can respond, he pulls you into a kiss.'
+		'As you enter, he pulls you over towards the couch. "I want you, I want you right now."'
+		'Before you can respond, he pulls you into a kiss.'
 		gs 'arousal', 'kiss', 3
 		gs 'stat'
 		act 'Return the kiss':
@@ -55,7 +57,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Umm... What would you like to do instead then?" he asks.'
+				'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+				'"Umm... What would you like to do instead then?" he asks.'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -64,7 +67,8 @@ if $ARGS[0] = 'djibril_room':
 					*clr & cla
 					npc_rel['A82'] -= 1
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+					'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+					'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 					act 'Leave': gt 'uni_dorm', 'eighth_floor'
 				end
 				if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -83,7 +87,8 @@ if $ARGS[0] = 'djibril_room':
 			*clr & cla
 			npc_rel['A82'] -= 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+			'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+			'"Um... What would you like to do instead then?" he asks.'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -92,7 +97,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 			if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -125,7 +131,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		else
@@ -136,7 +143,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -155,7 +163,8 @@ if $ARGS[0] = 'djibril_playgames':
 	'<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.'
 	'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.'
+	'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'
 end
 
@@ -177,7 +186,8 @@ if $ARGS[0] = 'djibril_chat':
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		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.'
+			'You talk about a wide range of topics. How he''s enjoying school, any pretty girls that have caught his eye, things he''s done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it''s a pleasant conversation.' 
+			'He eventually gets up and pulls you up with him before he starts kissing you.'
 			act 'Return the kiss':
 				*clr & cla
 				npc_rel['A82'] += 1
@@ -189,7 +199,8 @@ if $ARGS[0] = 'djibril_chat':
 				act 'Break free':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+					'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+					'"Um... What would you like to do instead then?" he asks.'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -197,7 +208,8 @@ if $ARGS[0] = 'djibril_chat':
 					act 'I should get going':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-						'You look over at the clock. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+						'You look over at the clock. "I should really get going, sorry to have bothered you."'
+						'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
 						act 'Leave': gt 'uni_dorm', 'eighth_floor'
 					end
 				end
@@ -205,7 +217,8 @@ if $ARGS[0] = 'djibril_chat':
 			act 'Stop the kiss':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+				'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+				'"Um... What would you like to do instead then?" he asks.'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -213,12 +226,13 @@ if $ARGS[0] = 'djibril_chat':
 				act 'I should get going':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+					'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+					'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 					act 'Leave': gt 'uni_dorm', 'eighth_floor'
 				end
 			end
 		else
-			'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.'
+			'You talk about a wide range of topics. How he''s enjoying school, any pretty girls that have caught his eye, things he''s 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.'
 			act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 		end
@@ -251,8 +265,8 @@ if $ARGS[0] = 'djibril_chat':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		'"So what do you think about Russia?"'
-		'He seems to ponder the question for a second. "I like it. It can be hard with the racism sometimes, but most people are okay. There are some curious girls as well if you know what I mean and I''m only to happy to satisfy their curiosity," he says with a laugh.'
-		'You ask him about what people have said or done and he tells you some truly awful stories not just about what he has experienced, but what has happened to some of the other Africans he knows who are living in the city. After some time, he seems to want to change the subject.'
+		'He seems to ponder the question for a second. "I like it. It can be hard with the racism sometimes, but most people are okay. There are some curious girls as well, if you know what I mean, and I''m only to happy to satisfy their curiosity," he says with a laugh.'
+		'You ask him about what people have said or done and he tells you some truly awful stories, and not just about what he''s experienced. He also tells you some stories involving some of the other Africans he knows who are living in the city. After some time, he seems to want to change the subject.'
 		act 'Do you miss your family?':
 			*clr & cla
 			minut += 3
@@ -272,8 +286,8 @@ 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 goes on to tell a few funny stories about Olu when he was younger and Djibril was still just a boy.'
+		'He talks about how he met Luda, but also mentions how Olu was always 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 just a boy.'
 		act 'Keep talking': gt 'djibril', 'djibril_chat'
 		act 'Stop talking and leave': gt 'uni_dorm', 'eighth_floor'
 	end
@@ -286,9 +300,10 @@ if $ARGS[0] = 'djibril_chat':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 			'"Do you know Kendra? She lives on this floor." you ask.'
 			'He shakes his head a little. "Yeah, I know her, but not too well. We''ve gone to a few parties together and we have several friends in common, but I don''t know her really well. Why do you ask?"'
-			'You shrug a little. "I met her the other day and she''s... different, to say the least. I was just curious if you guys knew each other since you live in the same dorm."'
+			'You shrug a little. "I met her the other day and she''s... different, to say the least. I was just curious if you guys knew each other since you live on the same floor."'
 			*nl
-			'He laughs a little. "Different... That''s one way to put. I would say she''s fucking crazy, and not in the fun way. She''s very dominating to most people, but some seem to like it." He raises a brow, obviously wondering if you fall into that group. You continue talking about her, but he obviously doesn''t know her too well or doesn''t want to give details about what he does know.'
+			'He laughs a little. "Different... That''s one way to put it. I''d say she''s fucking crazy, and not in the fun way. She''s very dominating to most people, but some seem to like it." He raises a brow, obviously wondering if you fall into that group.'
+			'You continue talking about her, but he obviously doesn''t know her too well or doesn''t want to give details about what he does know.'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 			act 'Stop talking and leave': gt 'uni_dorm', 'eighth_floor'
 		end
@@ -298,14 +313,16 @@ if $ARGS[0] = 'djibril_chat':
 		npc_rel['A82'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/couch_kiss.jpg"></center>'
 		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.'
+			'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'
 			act 'Slide off the couch': gt 'djibrilev1', 'sveta_sex1'
 		else
 			'As the two of you sit side by side, you lean over and kiss him. He stiffens in surprise before he pulls away from you and stands up. "Uh... I should really get my homework done..."'
 			'You frown a little as you nod. "Okay. I''ll leave you in peace."'
-			'He smiles at you and walks you to the door. "Thanks, see you around." You walk out into the hall and he shuts the door behind you.'
+			'He smiles at you and walks you to the door. "Thanks, see you around."'
+			'You walk out into the hall and he shuts the door behind you.'
 			gs 'arousal', 'kiss', 3
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -352,7 +369,8 @@ if $ARGS[0] = 'textanya':
 			act 'I should go':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -360,7 +378,8 @@ if $ARGS[0] = 'textanya':
 			*clr & cla
 			npc_rel['A82'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter. After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
+			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter.'
+			'After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'
 			act 'Drop to your knees': gt 'djibrilev1', 'sveta_sex1'
@@ -404,7 +423,8 @@ if $ARGS[0] = 'textnush':
 			act 'I should go':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -412,7 +432,8 @@ if $ARGS[0] = 'textnush':
 			*clr & cla
 			npc_rel['A82'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter. After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
+			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter.'
+			'After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'
 			act 'Drop to your knees': gt 'djibrilev1', 'sveta_sex1'

+ 2 - 0
locations/drugs.qsrc

@@ -24,6 +24,8 @@ if $ARGS[0] = 'cikl':
 	gs 'drugs', 'aphrodisiac', 'cikl'
 	gs 'drugs', 'hair_extensioncream', 'cikl'
 	gs 'drugs', 'butt_injection', 'cikl'
+	gs 'drugs', 'breastcream', 'cikl'
+	gs 'drugs', 'steroids', 'cikl'
 elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'smoke', 'hourly_events'
 	gs 'drugs', 'joint', 'hourly_events'

+ 3 - 0
locations/femcyc.qsrc

@@ -469,10 +469,13 @@ if $ARGS[0] = '':
 
 	if cycle > 3:
 		stat['safe_day'] = 1
+		$stat['preg_risk'] = 'safe'
 	elseif cycle = 0 or cycle = 3:
 		stat['probably_safe_day'] = 1
+		$stat['preg_risk'] = 'prob_safe'
 	else
 		stat['dangerous_day'] = 1
+		$stat['preg_risk'] = 'danger'
 	end
 
 

+ 67 - 76
locations/foto.qsrc

@@ -1,17 +1,12 @@
 # foto
 !!2021/04/15
 if $ARGS[0] = 'start':
-	$loc = 'foto'
-	$loc_arg = 'start'
-
+	*clr & cla
 	close all
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'start'
 	$location_type = 'indoors'
 	if model['status'] = 0:gt 'foto', 'studio'
-	*clr & cla
-
-	$menu_loc = 'foto'
-	$menu_arg = 'start'
-	menu_off = 0
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if studio_strip = 0:
@@ -24,7 +19,7 @@ if $ARGS[0] = 'start':
 	foto['documentary'] = rand(1,100)
 	act 'Leave': gt'city_center'
 	act'Strip down':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 		studio_strip += 1
@@ -94,7 +89,7 @@ if $ARGS[0] = 'start':
 				lastwornpantynumber['foto'] = pantywornnumber
 				$lastwornbratype['foto'] = $braworntype
 				lastwornbranumber['foto'] = brawornnumber
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				inhib_exp += 2
 				if studio_strip_talk = 0:
@@ -129,7 +124,7 @@ if $ARGS[0] = 'start':
 					lastwornbranumber['foto'] = brawornnumber
 				end
 				gs 'stat'
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip3.mp4"></video></center>'
 				inhib_exp += 1
@@ -170,14 +165,14 @@ end
 if $ARGS[0] = 'studio':
 	if hour < 3:gt 'foto', 'studio_closing'
 
-	$loc_arg = 'studio'
-	$menu_loc = 'foto'
-	$menu_arg = 'studio'
+	*clr & cla
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'studio'
+	$location_type = 'indoors'
 	practice_session = 0
-	*clr & cla
 	killvar '$modelopt'
 
+
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -313,14 +308,11 @@ if $ARGS[0] = 'studio':
 end
 
 if $ARGS[0] = 'bathroom':
-	$loc_arg = 'bathroom'
-	$menu_loc = 'foto'
-	$menu_arg = 'bathroom'
-	$locM = 'foto'
-	$locM_arg = 'bathroom'
+	*clr & cla
 	menu_off = 0
-	gs'stat'
-	cla & *clr
+	gs 'shortgs', 'setloc', 'foto', 'bathroom'
+	$location_type = 'bathroom'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models<<rand(1,2)>>.jpg"></center>'
 	'A gaggle of models crowd the <a href="exec:gt ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
 	*nl
@@ -341,34 +333,36 @@ if $ARGS[0] = 'bathroom':
 		end
 	end
 	if AlexandriaQW = 1:
-	    act'Listen to the gossip':
-	        *clr & cla
+		act'Listen to the gossip':
+			*clr & cla
 			AlexandriaQW = 2
 			gs 'stat'
-           	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
-            'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
-            '"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
-            '"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
-            '"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
-            '"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
-            '"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
-            '"You mean the props room?"'
-            'Okay, that''s a clue! Maybe you should search the props room?'
-            act 'Continue': gt 'foto', 'bathroom'
-        end
-    else
-	    act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
+			'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
+			'"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
+			'"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
+			'"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
+			'"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
+			'"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
+			'"You mean the props room?"'
+			'Okay, that''s a clue! Maybe you should search the props room?'
+			act 'Continue': gt 'foto', 'bathroom'
+		end
+	else
+		act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
 	end
 	if AlexandriaQW = 2:
-	    act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
+		act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
 	end
 end
 
 if $ARGS[0] = 'showers':
-	$loc_arg = 'showers'
-	gs'stat'
-	cla & *clr
+	*clr & cla
 	menu_off = 1
+	gs 'shortgs', 'setloc', 'foto', 'showers'
+	$location_type = 'bathroom'
+	gs 'stat'
+
 	krystal['shower_sex'] = rand(1,7)
 	if krystal['shower_sex'] = 7 and krystal['status'] >= 3:gt 'model_krystal','krystalshower'
 
@@ -380,10 +374,11 @@ if $ARGS[0] = 'showers':
 
 	act 'Go to the studio floor':pcs_shave['free_razor'] = 0 & gt 'foto', 'studio'
 
-	if mc_inventory['shampoo'] > 0:
+	if mc_inventory['shampoo'] <= 0:
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	else
 		act 'Take a shower (0:15)':
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			pcs_horny += 1
 			pcs_hairbsh = 0
@@ -395,8 +390,7 @@ if $ARGS[0] = 'showers':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if pcs_horny >= 40:
 				act 'Use the showerhead on your pussy':
-					cla
-					*clr
+					*clr & cla
 					$orgasm_or = 'no'
 					gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 					$orgasm_or = 'no'
@@ -455,8 +449,6 @@ if $ARGS[0] = 'showers':
 			dynamic $brit
 			act 'Get out of the shower':gt 'foto', 'showers'
 		end
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	'<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	if mesec > 0 and isprok = 0:
@@ -493,14 +485,11 @@ if $ARGS[0] = 'showers':
 end
 
 if $ARGS[0] = 'makeup':
-	gs'stat'
 	*clr & cla
-	$locM = 'foto'
-	$locM_arg = 'makeup'
-	$loc_arg = 'makeup'
-	$menu_loc = 'foto'
-	$menu_arg = 'makeup'
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'makeup'
+	$location_type = 'indoors'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'The backstage area where you and the other girls put on your makeup.'
 	act 'Back to the studio': gt 'foto', 'studio'
@@ -521,7 +510,7 @@ if $ARGS[0] = 'makeup':
 		act'Do your own makeup': menu_off = 1 & gt 'mirror', 'start'
 
 		act'Go to the makeup artists (0:30)':
-			cla & *clr
+			*clr & cla
 			menu_off = 1
 			minut += 30
 			pcs_hairbsh = 1
@@ -552,7 +541,10 @@ end
 
 
 if $ARGS[0] = 'manager_talk':
+	*clr & cla
+	menu_off = 1
 	minut += 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'You approach the manager''s desk.'
 	'"Something I can help you with <<$model[''firstname'']>>?"'
@@ -627,7 +619,7 @@ end
 
 if $ARGS[0] = 'hiring_ask':
 	act 'Ask about working as a glamor model':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		minut += 1
 		gs 'stat'
@@ -713,7 +705,7 @@ if $ARGS[0] = 'hiring_ask':
 end
 
 if $ARGS[0] = 'interview':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if anushkaQW['model_referral'] = 1:	'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
@@ -739,7 +731,7 @@ if $ARGS[0] = 'interview':
 end
 
 if $ARGS[0] = 'interview2':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	if pcs_inhib > 40:
 		gs 'willpower', 'skill', 'pcs_inhib', 'easy'
@@ -889,7 +881,7 @@ if $ARGS[0] = 'job_decline':
 	if foto_weight >= 25:
 		'"I''m sorry," he says shaking his head. "You did lose weight, I''ll give you that, but it''s not quite enough for our requirements. But you''ve made progress. Give it a few more weeks of effort and come back again. We can still use you if you''re within the limit."'
 		act'Sigh':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You sigh in disappointment as you pick your clothes back up and start to get dressed again. Still more weight to lose? Now what are you going to do? Keep trying or give up?'
 			gs 'clothing', 'wear_last_worn'
@@ -902,7 +894,7 @@ if $ARGS[0] = 'job_decline':
 		'The man''s words sting heavily at your confidence and you cover yourself in shame by instinct. He still continues to eye you up and down and you squirm as his gaze roams your breasts, stomach, and pussy.'
 		'"That being said, I can still see that you have some potential. So go running, start working out. If you lose some weight, I could see you getting another shot at working here in the future."'
 		act'React solemnly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You glumly pick your clothes up off the floor and get dressed before leaving. As you do, you stop at the door and look back in.'
 			'<i>Is this it for me? Am I ever going to be able to lose enough weight to work here?</i>'
@@ -915,7 +907,7 @@ if $ARGS[0] = 'job_decline':
 		end
 
 		act'React determinedly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You nod at him, feeling a bit dejected but more determined than ever. You get dressed with purpose and head to the door. As you do, you think to yourself...'
 			'<i>I will be able to do this! I''ll get in shape and I''ll work here one day! I''m not going to lose my shot at this!</i>'
@@ -1029,7 +1021,7 @@ if $ARGS[0] = 'job_offer':
 	elseif age_truth = 1:
 		if fotofit ! 1:
 			act '"Oh. Okay..."':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'You put your clothes back on, slightly annoyed as you get ready to leave. If he knew you were underage, why did he have you strip in the first place?!'
 				gs 'clothing', 'wear_last_worn'
@@ -1040,7 +1032,7 @@ if $ARGS[0] = 'job_offer':
 		end
 
 		act 'Plead':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			fakepassport = 2
 			fotofakepassport = 2
@@ -1150,7 +1142,7 @@ end
 
 
 if $ARGS[0] = 'model_name1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"A few more things to fill out your profile. Did you want to have a model name or a pseudonym? Or would you prefer to use your real name?"'
 	gs 'foto', 'model_name2'
@@ -1171,7 +1163,7 @@ if $ARGS[0] = 'model_name2':
 
 	if model['ask_model_name'] = 0:
 		act'Why would I?':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'"Why would I want to use a fake name?" you ask. "Is there a reason I should?"'
 			'"Not <i>should</i>," he explains. "But some girls like to have a little distance from their personal lives. Or they use it to sound more professional or to stand out more. A name like ''Elena Ivanova'' isn''t exactly uncommon."'
@@ -1184,7 +1176,7 @@ if $ARGS[0] = 'model_name3':
 	$model['firstname'] = input("What is the first name of your model persona?")
 	$model['nickname'] = input("What is the shortened version or nickname of your model persona?")
 	$model['lastname'] = input("What is the last name of your model persona?")
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"<<$model[''firstname'']>>..." he mutters, slowly typing. "<<$model[''lastname'']>>... Okay, there. Is this correct?"'
 	'He turns the screen around so you can see what he wrote.'
@@ -1224,7 +1216,7 @@ if $ARGS[0] = 'model_profile':
 end
 
 if $ARGS[0] = 'pay_type':
-	cla & *clr
+	*clr & cla
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"One last question. How do you want to be paid? Cash on the spot or direct deposit into your bank account?"'
@@ -1349,8 +1341,7 @@ if $ARGS[0] = 'microcamera_ask':
 end
 
 if $ARGS[0] = 'blackm':
-	*clr
-	cla
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 
@@ -1494,19 +1485,19 @@ if $ARGS[0] = 'underwear':
 end
 
 if $ARGS[0] = 'cikl':
-	if modelfoto['erotic']  >= 10 or (modelfoto['erotic'] > modelfoto['fashion']  and modelfoto['erotic']  > modelfoto['fitness']  and modelfoto['erotic']  > modelfoto['glamour']  and modelfoto['erotic']  > modelfoto['lingerie']  and modelfoto['erotic']  > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
+	if modelfoto['erotic'] >= 10 or (modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
 		$model['type'] = 'erotic'
-	elseif modelfoto['nude']  > modelfoto['fashion']  and modelfoto['nude']  > modelfoto['fitness']  and modelfoto['nude']  > modelfoto['glamour']  and modelfoto['nude']  > modelfoto['lingerie']  and modelfoto['nude']  > modelfoto['catalog'] :
+	elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog'] :
 		$model['type'] = 'artistic nude'
-	elseif modelfoto['fitness']  > modelfoto['fashion']  and modelfoto['fitness']  > modelfoto['nude']  and modelfoto['fitness']  > modelfoto['glamour']  and modelfoto['fitness']  > modelfoto['lingerie']  and modelfoto['fitness']  > modelfoto['catalog'] :
+	elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog'] :
 		$model['type'] = 'fitness'
-	elseif modelfoto['glamour']  > modelfoto['fashion']  and modelfoto['glamour']  > modelfoto['nude']  and modelfoto['glamour']  > modelfoto['fitness']  and modelfoto['glamour']  > modelfoto['lingerie']  and modelfoto['glamour']  > modelfoto['catalog'] :
+	elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog'] :
 		$model['type'] = 'glamour'
-	elseif modelfoto['lingerie']  > modelfoto['fashion']  and modelfoto['lingerie']  > modelfoto['nude']  and modelfoto['lingerie']  > modelfoto['fitness']  and modelfoto['lingerie']  > modelfoto['glamour']  and modelfoto['lingerie']  > modelfoto['catalog'] :
+	elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog'] :
 		$model['type'] = 'lingerie'
-	elseif modelfoto['fashion']  > modelfoto['lingerie']  and modelfoto['fashion']  > modelfoto['nude']  and modelfoto['fashion']  > modelfoto['fitness']  and modelfoto['fashion']  > modelfoto['glamour']  and modelfoto['fashion']  > modelfoto['catalog'] :
+	elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog'] :
 		$model['type'] = 'fashion'
-	elseif modelfoto['catalog']  > 0:
+	elseif modelfoto['catalog'] > 0:
 		$model['type'] = 'catalog'
 	end
 !!	if model = 1 and week = 1 and model['job_reset'] ! daystart: model_job_week = 0 & model['job_reset'] = daystart

+ 3 - 11
locations/gad_field.qsrc

@@ -371,18 +371,10 @@ if $ARGS[0] = 'set_nomira_acts':
 				'Since the cows are all behaving, you spend some time jogging around the field.'
 
 				frost = 0
-				minut += 60
-				fat -= 5
-				gs 'exp_gain', 'run', 1
-				gs 'sweat', 'add', 10
-				pcs_mood += 5
-				pcs_stam -= 8
+				gs 'exercise', 'tier1', 60, 'run'
 				if temper >= 25 and sunWeather = 1:
-					pcs_hydra -= 24
-					gs 'sweat', 'add', 12
-				else
-					pcs_hydra -= 18
-					gs 'sweat', 'add', 10
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 2
 				end
 				gs 'stat'
 

+ 2 - 2
locations/gad_market.qsrc

@@ -238,8 +238,8 @@ if $ARGS[0] = 'swimsuit_cart':
 	end
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 'shop'
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit', i, 'shop'
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_bikinis', i
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_swimsuit', i
 
 
 

+ 1 - 1
locations/gschool_detention.qsrc

@@ -279,7 +279,7 @@ if $ARGS[0] = 'upskirt1':
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
-	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotton her panties today because her pussy is now on full display for anyone to see.'
+	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotten her panties today because her pussy is now on full display for anyone to see.'
 	gs 'arousal', 'erotic', 5
 	gs 'arousal', 'end'
 	gs 'stat'

+ 9 - 1
locations/gschool_lessonsev1.qsrc

@@ -40,15 +40,18 @@ if $ARGS[0] = 'fiz_rand':
 			'You''re training with some free weights today. As you do your routine, you notice that the class has grown awfully quiet and glance over to see most of them gawking at Albina, who has bent over while also working out with weights and is showing off her toned bubble butt to everyone watching. She soon straightens back up and gives all of them a dirty look.'
 		end
 	elseif fizperand = 6:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/gymfight.jpg"></center>'
 		'You hear a commotion from the other side of the room and look over to see Dan and Roman shoving each other. Roman shoves Dan again and it quickly starts escalating. A few punches are thrown and the two of them are soon down on the ground fighting. The coach rushes over and quickly pulls them apart before sending them to the principal.'
 	elseif fizperand = 7:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/tinydick.jpg"></center>'
 		'During a break in gym class, you and several other girls are talking when Igor wanders over and tries to chat you all up. You find his efforts amusing at best and you can tell they aren''t working on the other girls either, yet he seems to think he''s oozing cool and keeps chatting up the lot of you before Vitek suddenly rushes up behind him, grabs his shorts and yanks them down to his ankles.'
 		'Unfortunately for Igor, his underwear went with the shorts and now he''s standing half naked in front of a bunch of girls. What''s worse is that now everyone can see how tiny his dick is, making you and the others gasp and giggle, several girls even pointing and laughing loudly. The whole class is soon in stitches as Igor desperately tries to pull up his shorts and fails, all while cursing at Vitek and calling him all kinds of names. You almost feel sorry for him; not only is he a terrible flirt, but the whole class has seen his tiny dick.'
 	elseif fizperand = 8 and $pantyworntype ! 'none':
 		gt 'gschool_lessonsev1', 'fiz8'
 	elseif fizperand = 9:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight; he''s certainly very well endowed.'
 		'It takes him a while to notice the girls giggling at him and even longer to figure out why. Once he does, he makes a show of tucking his dick away by adjusting his shorts, all with a huge smile on his face.'
@@ -57,21 +60,27 @@ if $ARGS[0] = 'fiz_rand':
 	elseif fizperand = 10 and pcs_hotcat >= 5 and fame['pav_slut'] >= 150:
 		gt 'gschool_lessonsev1', 'fiz10'
 	elseif fizperand = 11:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
 		'During class, Lina notices Ivan watching Lariska and moves up behind her before pushing her forward at the shoulders, making her bend over. She proceeds to pretend to hump Lariska, obviously trying to mimic Ivan''s voice and speech. "Oh Lariska, I want to fuck your ass!" This causes several of the other students to laugh, even Ivan, but it''s quickly broken up by Mr. Nikolaevich.'
 	elseif fizperand = 12:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/doublebutt.jpg"></center>'
 		'During class, Lina and Lariska are whispering and giggling about something. After some time, they pull down the back of their shorts to flash their panty-clad asses at several of the more popular jock boys.'
 	elseif fizperand = 13:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/dry3some.jpg"></center>'
 		'Near the end of class, some girls are chatting when they notice some boys looking their way and start horsing around. One buries her face in her friend''s breasts as the third pretends to hump her. After a few seconds, once several guys are watching, they stop and laugh as they move away.'
 	elseif fizperand = 14:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hardon.jpg"></center>'
 		'At the end of class, everyone is allowed to do their own thing so long as they''re doing something physical. You see Fedor using the bench press and notice that he''s sporting a serious hardon, with several of the other girls having noticed as well and giggling about it.'
 	elseif fizperand = 15:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/stretchhump.jpg"></center>'
 		'Lina is on the floor doing the splits when Lariska comes up behind her and lays on top of her, pretending to hump her. Lina laughs before they break it up.'
 	elseif fizperand = 16:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/teaseboys' + rand(1,2) + '.jpg"></center>'
 		'Lena and Lera notice several of the boys watching them and start teasing them by pretending to make out in front of them. Knowing them, they''re likely doing it for more than the laughs.'
 	else
@@ -2006,4 +2015,3 @@ if $ARGS[0] = 'russian':
 end
 
 --- gschool_lessonsev1 ---------------------------------
-

+ 10 - 13
locations/intro_sg_tg.qsrc

@@ -119,12 +119,16 @@ if $ARGS[0] = 'intro_4':
 	'You did the best you could to repress any resentment towards <<$pcs_nickname>> about how little she appreciated what she had.'
 
 	act 'When she talks about her mother, she calls her ...':
-
-		$npc_nickname['A29'] = '<<$npc_nickname[''A29'']>>'
-		$temp_nickname = $npc_nickname['A29']
-
-		$npc_nickname['A29'] = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+		gs 'npcstatic1'
+		gs 'npcstatic2'
+		gs 'npcstatic3'
+		gs 'npcstatic4'
+		gs 'npcstatic5'
+		gs 'npcstatic6'
+
+		$temp_nickname = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+		if $temp_nickname = '': $temp_nickname = $npc_nickname['A29']
+		$npc_nickname['A29'] = $temp_nickname
 		killvar '$temp_nickname'
 
 		gt 'intro_sg_tg', 'intro_5'
@@ -167,13 +171,6 @@ if $ARGS[0] = 'settings':
 
 	ml_update_1 = 1
 
-	gs 'npcstatic1'
-	gs 'npcstatic2'
-	gs 'npcstatic3'
-	gs 'npcstatic4'
-	gs 'npcstatic5'
-	gs 'npcstatic6'
-
 	!! default friendship is 30 for all  npcs
 	gs 'npc_relationship', 'default'
 	!! changes the values for family members and old friends

+ 60 - 49
locations/katja_dorm.qsrc

@@ -126,60 +126,71 @@ if $ARGS[0] = 'talk':
 			act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 		end
 	else
-		if (katjaQW['lazer_pussy_talk'] = 0 or (katjaQW['lazer_pussy_talk'] = 2 and katjaQW['knows_sex'] = 1 and rand(0,4) = 0)) and katjaQW['lazer_pussy'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and katjaQW['lazar_uni_meet'] = 1 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
-			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have sex with him, provided they have not already done so before.
-			gt 'Katja_dorm', 'lazar_pussy_talk'
+		!!if katjaQW['knows_artem_is_boyfreind'] = 0 and artemQW['bf'] = 1:
+		!!			!!Katja have heard that Artem is the boyfriend of the player character and wants to discuss that . Not implemented yet since the uni content for Aremt and Katja is not done. The break up talk is still there so you can get on with Katja if you start dating Artem in school and break up in uni.
+		!!			gt 'KatjaHomeTalk', 'Artem_talk'
+	
+		!!elseif  katjaQW['knows_artem_is_boyfreind'] = 1 and artemQW['artembrokenheart'] = 1:
+		if  katjaQW['knows_artem_is_boyfreind'] = 1 and artemQW['artembrokenheart'] = 1:
+			!!Katja have heard that Artem and the player character have broke up 
+			gt 'KatjaHomeTalk', 'Artem_break_up_talk'
+
 		else
-			if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
-				!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
-				gt 'Katja_dorm', 'lazar_anal_talk'
+			if (katjaQW['lazer_pussy_talk'] = 0 or (katjaQW['lazer_pussy_talk'] = 2 and katjaQW['knows_sex'] = 1 and rand(0,4) = 0)) and katjaQW['lazer_pussy'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and katjaQW['lazar_uni_meet'] = 1 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
+				!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have sex with him, provided they have not already done so before.
+				gt 'Katja_dorm', 'lazar_pussy_talk'
 			else
-				if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and katjaQW['boy_block'] = 0 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:
-					if katjaQW['lazer_anal'] + katjaQW['lazer_pussy'] >= 2 and katjaQW['lazar_day'] ! daystart and rand(0,6) = 0 and katjaQW['sex_clossedness'] = 0:
-						!! Katja want to have a threesome with Lazar
-						gt 'katja_dorm', 'lazar_kiss'
-					elseif katjaQW['QWstage'] > 2:
-						!!The standard start of her sex scenes at home.
-						gt 'KatjaHomeTalk', 'hornykiss'
-					else
-						!!This only triggers if the player have never kissed Katja.
-						gt 'KatjaHomeTalk', 'tender_kiss'
-					end
+				if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
+					!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
+					gt 'Katja_dorm', 'lazar_anal_talk'
 				else
-					if katjaQW['coke_day_ask'] ! daystart and katjaQW['coke_day'] ! daystart and rand(6,12) <=  katjaQW['coke_stage']:
-						!! Katja want to do cocaine
-						gt 'katja_dorm',  'cocain_offer'
+					if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and katjaQW['boy_block'] = 0 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:
+						if katjaQW['lazer_anal'] + katjaQW['lazer_pussy'] >= 2 and katjaQW['lazar_day'] ! daystart and rand(0,6) = 0 and katjaQW['sex_clossedness'] = 0:
+							!! Katja want to have a threesome with Lazar
+							gt 'katja_dorm', 'lazar_kiss'
+						elseif katjaQW['QWstage'] > 2:
+							!!The standard start of her sex scenes at home.
+							gt 'KatjaHomeTalk', 'hornykiss'
+						else
+							!!This only triggers if the player have never kissed Katja.
+							gt 'KatjaHomeTalk', 'tender_kiss'
+						end
 					else
-						if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
-							!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
-							if kid > 0:
-								cla
-								gs 'stat'
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"You''re pregnant again?" Her face turns red, and she glares at you with an intensity you''ve never seen before. "After everything, you still didn''t trust me enough to tell me?"'
-								'You try to speak up, but she folds her arms and turns her back to you.'
-								'"I thought there was something special between us..." Something wet glistens on her cheek, which she wipes away dismissively. "Get out. I don''t want to see you right now."'
-							elseif knowKatjaPreg = 1:
-								cla
-								gs 'stat'
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"Are you pregnant?" Katja looks at you, betrayal in her eyes. "Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
+						if katjaQW['coke_day_ask'] ! daystart and katjaQW['coke_day'] ! daystart and rand(6,12) <=  katjaQW['coke_stage']:
+							!! Katja want to do cocaine
+							gt 'katja_dorm',  'cocain_offer'
+						else
+							if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
+								!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
+								if kid > 0:
+									cla
+									gs 'stat'
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"You''re pregnant again?" Her face turns red, and she glares at you with an intensity you''ve never seen before. "After everything, you still didn''t trust me enough to tell me?"'
+									'You try to speak up, but she folds her arms and turns her back to you.'
+									'"I thought there was something special between us..." Something wet glistens on her cheek, which she wipes away dismissively. "Get out. I don''t want to see you right now."'
+								elseif knowKatjaPreg = 1:
+									cla
+									gs 'stat'
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"Are you pregnant?" Katja looks at you, betrayal in her eyes. "Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
+								else
+									cla
+									*nl
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
+								end
+								act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 							else
-								cla
-								*nl
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
+								!!If no events triggers they you go to the part where the player can choose things to do with Katja.
+								gt 'katja_dorm', 'chat'
 							end
-							act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
-						else
-							!!If no events triggers they you go to the part where the player can choose things to do with Katja.
-							gt 'katja_dorm', 'chat'
 						end
 					end
 				end
@@ -231,7 +242,7 @@ if $ARGS[0] = 'chat':
 			'Katja talks about her university subjects, cosmetics, the latest fashion trends and other things she considers very important.'
 			act 'Continue': gt 'katja_dorm', 'talk'
 		else
-			gs 'KatjaHomeTalk', 'Sextalk'
+			gs 'katja_sex_talk', 'Sextalk'
 		end
 	end
 

+ 1 - 1
locations/katja_meynold_schedule.qsrc

@@ -54,7 +54,7 @@
 !! locat['katja'] = 51 Dormroom - Getting ready to see a movie
 !! locat['katja'] = 52 Dormroom - watching a movie
 !! locat['katja'] = 53 At city nightclub.
-!! locat['katja'] = 54 Gone home with a guy and/girl (possible together with the player character), used to make sure she wont return to the location she left.
+!! locat['katja'] = 54 Gone home with a guy and/or girl (possible together with the player character), used to make sure she wont return to the location she left.
 
 locat['katja'] = 0
 

+ 3 - 3
locations/katja_pantyquest.qsrc

@@ -11,7 +11,7 @@
 
 if $ARGS[0] = 'kitchen':
 	katjaQW['kitchen_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'kitchen', 1
 	if (katjaQW['pantiesQWstage'] < 3 or (katjaQW['pantiesQWstage'] = 3 and katjaQW['slut'] < 65)) and katjaQW['take_of_panties_day'] ! daystart:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting1.jpg"></center>'
@@ -315,7 +315,7 @@ end
 
 if $ARGS[0] = 'uni_hallway':
 	katjaQW['uni_hallway_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway.jpg"></center>'
 	'You walk up to the redhead, who is sitting comfortably on a chair. She notices you and smiles.'
@@ -517,7 +517,7 @@ end
 
 if $ARGS[0] = 'uni_exit':
 	katjaQW['uni_hallway_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit.jpg"></center>'
 	'You walk up to Katja, who is standing next to one of the side doors to the outside. As you approach, she looks to you and smiles.'

+ 6 - 1
locations/katja_procedural.qsrc

@@ -76,7 +76,8 @@
 !! npc_ass['A14'] The capacity for Katja to take a dick (or dildo) in her ass. (KatjaAnus)
 !! katjaQW['pussy_sex'] = 1 Katja have had pussy sex with guy where the player character wasn''t present.
 !! katjaQW['anal_sex'] = 1 Katja have had anal sex with guy where the player character wasn''t present.
-!! katjaQW['deepthroat'] Number of time Katja have deepthroated
+!! katjaQW['deepthroat'] Number of times Katja have deepthroated
+!! katjaQW['titjob'] Number of times Katja have given a titjob to a guy
 !! katjaQW['dp'] the number of times Katja have been double penetrated.
 !! katjaQW['creampie'] number of creampies Katja have received
 !!  katjaQW['bondage_sex']  number of times Katja and the player character have had sex where the player character was bound and/or blindfolded.
@@ -93,6 +94,10 @@
 !! katjaQW['marcus_disco'] = 1 Katja and the player character have had a threesome with Marcus at the community center disco.
 !! katjaQW['lazar_pussy'] = 1 Katja has taken Lazar''s cock in her pussy.
 !! katjaQW['lazar_anal'] = 1 Katja has taken Lazar''s cock in her ass.
+!! katjaQW['Artem_pussy'] = 1 Katja has taken Artem''s cock in her pussy.
+
+!!katjaQW['knows_artem_is_boyfreind'] = 1 Katja knows that Artem is the player characters boyfriend and will not ask for sex with other boys (What actually prevents from sex with outer boys is done by setting katjaQW['boy_block'] = 1)
+!!katjaQW['knows_artem_is_boyfreind'] = 2 Katja knows the player characters has broken up with Artem and will again ask for sex with other boys.
 
 !! katjaQW['lazar_pussy_talk'] = 1 Katja and the player character have talked about having sex with Lazar.
 !! katjaQW['lazar_anal_talk'] = 1 Katja and the player character have talked about having anal sex with Lazar.

+ 569 - 0
locations/katja_sex_talk.qsrc

@@ -0,0 +1,569 @@
+# katja_sex_talk
+!2024/11/08
+
+!!This files have the content for talking with Katja about sex, used to be part of KatjaHomeTalk but that file grew to large.
+
+if $ARGS[0] = 'Sextalk':
+	'After talking for some time, Katja looks at you thoughtfully as her face turns completely red.'
+	if katjaQW['boy_block'] = 1:
+		kattalkrand = rand(3,4)
+	else
+		kattalkrand = rand(0,4)
+	end
+
+	if kattalkrand = 0:
+		if stat['bj'] > 0:
+			gs 'katja_sex_talk', 'bj_talk1'
+		else
+			if katjaQW['knows_BJ'] > 0:
+				'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
+			else
+				'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+			end
+			act 'You''ve never given a blowjob':
+				*clr & cla
+				minut += 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you''ve never given a blowjob to a guy. She admits that she hasn''t either.'
+				'"Vicky talks about how good it is all the time, but I don''t know. Guys usually smell bad and I''m sure it would taste awful."'
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		end
+
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+
+	elseif kattalkrand = 1:
+		if katjaQW['knows_sex'] > 0:
+			'"Tell me, <<$pcs_nickname>>. Have you ever fucked someone?"'
+		else
+			'"<<$pcs_nickname>>, have you ever had sex with a guy?"'
+		end
+
+		if stat['vaginal'] > 0:
+			act 'Talk about sex':
+				*clr & cla
+				minut += 3
+				katjaQW['horny'] += 5
+				katjaQW['knows_sex'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja about the times you''ve had sex and how it felt. She blushes and bites her lip.'
+				if katjaQW['pussy_sex'] > 0:
+					if npc_sex['A14'] > 0: katjaQW['QWstage'] = 6
+					'Katja also tells you a story of how she had sex with a boy she picked up as a one-night stand.'
+				end
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		else
+			act 'No':
+				*clr & cla
+				minut += 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				if katjaQW['pussy_sex'] = 0:
+					'You tell Katja that you''ve never had sex with a guy, and she admits that she''s also still a virgin.'
+					'"That probably makes us the only non-nerds who haven''t had sex! Vicky does it all the time with Vanya and won''t shut up about it!"'
+				else
+					if npc_sex['A14'] > 0: katjaQW['QWstage'] = 6
+					'You tell Katja that you''ve never had sex with a guy, and she''s very surprised.'
+					'"You''ve never had sex with a guy?! Even I''ve done that! I thought I was the last girl from school to lose my virginity. Vicky definitely make it seems like I was abnormal not finding somebody to fuck in school. She wouldn''t stop pushing to find a guy. It was so annoying!"'
+				end
+
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		end
+
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+
+	elseif kattalkrand = 2:
+		if katjaQW['knows_anal'] > 0:
+			'"<<$pcs_nickname>>, what''s anal sex like?"'
+		else
+			'"<<$pcs_nickname>>, have you ever had a guy stick it in your ass?"'
+		end
+
+		if stat['anal'] > 0:
+			act 'Talk about anal':
+				*clr & cla
+				minut += 3
+				katjaQW['horny'] += 5
+				katjaQW['knows_anal'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja about the times you''ve had anal sex and what it feels like. She blushes and bites her lip.'
+				if katjaQW['anal_sex'] > 0:
+					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
+					'Katja also tells you a story of anal sex she had with a boy you don''t know who she picked up as a one night stand.'
+				end
+
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		else
+			act 'You''ve never had anal sex':
+				*clr & cla
+				minut += 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				if katjaQW['anal_sex'] = 0:
+					'You tell Katja that you''ve never had anal sex. She says that she heard that a lot of girls in your class do, some more than others.'
+				else
+					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
+					'You tell Katja that you''ve never had anal sex.'
+					'"You haven''t?" she asks rhetorically "It''s actually quite good. You should try it."'
+				end
+
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		end
+
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+
+	elseif kattalkrand = 3:
+		if katjaQW['knows_cuni'] > 0 or npc_sex['A14'] > 0:
+			'"<<$pcs_nickname>>, tell me how you lick pussy."'
+		else
+			'"<<$pcs_nickname>>, have you gone down on a girl?"'
+		end
+
+		if stat['cuni_give'] > 0:
+			act 'Talk about licking pussy':
+				*clr & cla
+				minut += 3
+				katjaQW['horny'] += 5
+				katjaQW['knows_cuni'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja about the times you''ve gone down on another girl and how it feels. She blushes and bites her lip.'
+				
+				if katjaQW['horny'] > 50 and katjaQW['slut'] >= 40 and rand(-30,30) < katjaQW['dom'] and npc_sex['A14'] > 0:
+					'Katja asks you to show her how you lick pussy.'
+
+					act 'Show her':
+						*clr & cla
+						katjaQW['horny'] = 0
+						katjaQW['slut'] += 1
+						katjaQW['dom'] += 2
+						if npc_sex['A14'] = 0: npc_sex['A14'] = 1 & girl += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
+						'You''re a little confused at first before you notice her pulling her panties off. Once she has them off, she opens her legs wide. "Go on, <<$pcs_nickname>>. Show me how you do it, please."'
+						'You pause, more in surprise than anything, but her glistening wet pussy is enough to convince you. You lean forward place your face between her legs and start licking.'
+						'You suck on her clit and slip your tongue inside her, working her pussy for all you''re worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm, she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you''re licking her, leaving your face coated in her juices.'
+						'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once her orgasm passes, you lick her clean of all her pussy juices, making sure not to miss a single spot. When you look up at Katja, she has a confident smile on her face. "Well aren''t you just a good little girl?" She then kisses you deeply before you start to lean back and spread your legs, but she''s already shaking her head.'
+						'"Sorry <<$pcs_nickname>>, maybe next time. We need to finish our homework," she says sweetly. You pause before nodding in understanding. You watch the new confident look intensify on her face as she smiles and the two of you finish your homework.'
+						gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Continue talking':
+							if $loc = 'katja_dorm':
+								gt 'katja_dorm', 'talk'
+							else
+								gt 'KatjaHomeTalk'
+							end
+						end
+					end
+					act 'Ignore her':
+						minut += 5
+						if $loc = 'katja_dorm':
+							gt 'katja_dorm', 'talk'
+						else
+							gt 'KatjaHomeTalk'
+						end
+					end
+				else
+					act 'Continue talking':
+						minut += 5
+						if $loc = 'katja_dorm':
+							gt 'katja_dorm', 'talk'
+						else
+							gt 'KatjaHomeTalk'
+						end
+					end
+				end
+			end
+		else
+			act 'No':
+				*clr & cla
+				minut += 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				if katjaQW['simultanous_girls'] > 0:
+					'"I''ve never gone down on a girl before," you say and Katja looks quite surprised.'
+					'"Never? Is it something that you''ve ever thought about?" she asks in a curious tone.'
+					act 'I''ve thought about it':
+						cla
+						minut += 3
+						katjaQW['horny'] += 20
+						'"I''ve thought about it, it''s just that the situation never came up," you reply.'
+						'"So it''s something you want to try" she asks.'
+						if katjaQW['horny'] >= 50 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 20:
+							'"So what would you do if that situation was to come up. For example right now?" she asks in a seductive voice.'
+							act 'See what she does': gt 'katjaHomeTalk', 'hornykiss'
+							act 'Stop her from doing anything':
+								cla
+								gs 'npc_relationship', 'modify', 'A14', 'dislike'
+								'"It would definitely not happen right now. Right?" you say, a little unsure of how Katja will react.'
+								'"Of course not. Nothing happens here you don''t want to," she says, clearly looking disappointed before she quickly changes the subject.'
+								act 'Continue talking':
+									minut += 5
+									if $loc = 'katja_dorm':
+										gt 'katja_dorm', 'talk'
+									else
+										gt 'KatjaHomeTalk'
+									end
+								end							
+							end
+						else
+							'"Well, I think you should find a chance to try it. It''s quite good," she says with a wink, but then changes the subject.'
+							act 'Continue talking':
+								minut += 5
+								if $loc = 'katja_dorm':
+									gt 'katja_dorm', 'talk'
+								else
+									gt 'KatjaHomeTalk'
+								end
+							end
+						end
+					end
+					act 'I''m not into girls':
+						cla
+						minut += 3
+						gs 'npc_relationship', 'modify', 'A14', 'dislike'
+						gs 'stat'
+						'"I''m not into girls," you reply.' 
+						'"Really?" Katja says in surprise. "Too bad. You''re really missing out on something. Making love to girls is really something. They''re '+iif(katjaQW['knows_sex'] +katjaQW['knows_BJ'] + katjaQW['knows_anal'] > 0, 'much more tender than boys', 'so tender')+'."'
+						'"I really think that you should give it a thought," she continues, seemingly a little disappointed in your response. She then changes the subject.'
+						act 'Continue talking':
+							minut += 5
+							if $loc = 'katja_dorm':
+								gt 'katja_dorm', 'talk'
+							else
+								gt 'KatjaHomeTalk'
+							end
+						end
+					end
+				else
+					'You tell Katja that you''ve never gone down on a girl. She seems a little surprised and you get the feeling that this was not what she wanted to hear.'
+				end
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		end
+	elseif kattalkrand = 4:
+		if katjaQW['knows_masturbation'] > 0:
+			'"Tell me how you masturbate, <<$pcs_nickname>>."'
+		else
+			'"Do you masturbate, <<$pcs_nickname>>?"'
+		end
+
+		if stat['mast'] > 0:
+			act 'Talk about masturbation':
+				*clr & cla
+				minut += 3
+				katjaQW['horny'] += 5
+				katjaQW['knows_masturbation'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja how you masturbate in the bathroom and she blushes and bites her lip.'
+
+				if katjaQW['masturbates'] = 0:
+					act 'Continue talking':
+						minut += 5
+						if $loc = 'katja_dorm':
+							gt 'katja_dorm', 'talk'
+						else
+							gt 'KatjaHomeTalk'
+						end
+					end
+				else
+					act 'Katja responds':
+						*clr & cla
+						minut += 5
+						katjaQW['horny'] += 10
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/mastr.jpg"></center>'
+						'Katja tells you she also masturbates, right here in this room, fondling herself between her legs.'
+
+						act 'Continue talking':
+							minut += 5
+							if $loc = 'katja_dorm':
+								gt 'katja_dorm', 'talk'
+							else
+								gt 'KatjaHomeTalk'
+							end
+						end
+					end
+				end
+			end
+
+			if stat['self_fisting'] > 0:
+				act 'Tell her how you pushed your hand into your pussy':
+					*clr & cla
+					minut += 3
+					katjaQW['horny'] += 10
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You tell Katja how you '+iif(stat['self_fisting'] = 1, 'once', 'sometimes')+' put your whole fist into your pussy, and how it felt doing it.'
+					'Katja looks '+iif(katjaQW['knows_self_fisting'] = 0, 'completely shocked, but', 'excited, and')+' her face turns even redder as she bites her lip.'
+
+					if katjaQW['knows_self_fisting'] = 0: katjaQW['knows_self_fisting'] = 1
+
+					act 'Continue talking':
+						if katjaQW['fisted_vag'] = 0 and npc_vag['A14'] > 3 and katjaQW['slut'] >= 70 and katjaQW['horny'] >= 50 and npc_sex['A14'] > 0:
+							gt 'katjaHomeTalk', 'fisting_ask'
+						else
+							minut += 5
+							if $loc = 'katja_dorm':
+								gt 'katja_dorm', 'talk'
+							else
+								gt 'KatjaHomeTalk'
+							end
+						end
+					end
+				end
+			end
+
+			if stat['self_fisting_anal'] > 0:
+				act 'Tell her how you fisted your ass':
+					*clr & cla
+					minut += 3
+					katjaQW['horny'] += 10
+					if katjaQW['knows_self_fisting_anal'] = 0: katjaQW['knows_self_fisting_anal'] = 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You tell Katja how you masturbate anally and even managed to stretch it so much that you could shove your fist into it.'
+					'She blushes and bites her lip.'
+
+					act 'Continue talking':
+						minut += 5
+						if $loc = 'katja_dorm':
+							gt 'katja_dorm', 'talk'
+						else
+							gt 'KatjaHomeTalk'
+						end
+					end
+				end
+			end
+		else
+			act 'You''ve never masturbated':
+				*clr & cla
+				minut += 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				if katjaQW['masturbates'] > 0:
+					'"What?!" she splutters. "You''ve never masturbated?! Why?! I thought that everybody did it. Even I do it and I''m usually the last to do anything!"'
+					'You try to explain why you''ve never masturbated.'
+				else
+					'You tell Katja that you''ve never masturbated. She seems surprised at your answer.'
+				end
+				act 'Continue talking':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+		end
+	end
+
+	act 'Refuse to talk about such topics':
+		cla
+		minut += 1
+		gs 'stat'
+		'You refuse to talk about such topics with her and she looks down in confusion and mumbles. "Sorry, <<$pcs_nickname>>. I didn''t mean to pry."'
+
+		act 'Continue talking':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'bj_talk1':
+	minut += 3
+	if katjaQW['knows_BJ'] > 0:
+		'"<<$pcs_nickname>>!" she says, a sparkle in her eye. "Tell me what it''s like to suck dick again."'
+	elseif katjaQW['knows_BJ']= 0:
+		'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+	end
+
+	if stat['bj'] > 0:
+		if katjaQW['knows_BJ'] = 0:
+			act 'No (lie)':
+				cla & *clr
+				minut += 3		
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"No," you shake your head before shamelessly lying through your teeth. "I''ve never given a blowjob before."'
+				'"Oh." She sits back, looking disappointed for some reason.'
+				act 'Continue':
+					minut += 5
+					if $loc = 'katja_dorm':
+						gt 'katja_dorm', 'talk'
+					else
+						gt 'KatjaHomeTalk'
+					end
+				end
+			end
+			act 'Yes':
+				minut += 3
+				cla & *clr
+				katjaQW['horny'] += 5
+				katjaQW['knows_BJ'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Yeah, I''ve given a few," you admit.'
+				'"What''s it like?" she asks, eyes wide with excitement.'
+				gs 'katja_sex_talk', 'bj_talk2'
+			end
+		elseif stat['bj'] > 0:
+			minut += 3
+			katjaQW['horny'] += 5
+			gs 'katja_sex_talk', 'bj_talk2'
+		end
+	else
+		act 'No':
+			cla & *clr
+			minut += 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"No," you shake your head. "I''ve never given a blowjob before."'
+			'"Oh." She sits back, looking disappointed for some reason. "Guess we''re both clueless then, huh?"'
+			act 'Continue':
+				minut += 5
+				if $loc = 'katja_dorm':
+					gt 'katja_dorm', 'talk'
+				else
+					gt 'KatjaHomeTalk'
+				end
+			end
+		end
+		!!act 'I''ve given a few (lie)':
+	end
+end
+
+if $ARGS[0] = 'bj_talk2':
+	act 'It tastes funny':
+		cla & *nl
+		'You wrinkle your nose. "It tastes funny. It''s like, kinda salty? But also sort of... musty? I don''t think I mind the act itself that much, but dick has a weird flavor."'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end
+	
+	act 'It''s fun':
+		cla & *nl
+		katjaQW['horny'] += 5
+		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
+		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
+		act 'Continue':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end
+	
+	act 'It''s whatever':
+		cla & *nl
+		'You shrug. "I don''t mind doing it, but I don''t love it either," you say. "Dick doesn''t really taste like anything if it''s clean. Kinda salty if it isn''t. I don''t know. It''s whatever I guess."'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end
+	
+	act 'It''s boring':
+		cla & *nl
+		'You roll your eyes. "It''s boring. You have to keep sucking the whole time and after a while, my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you."'
+		'Katja seems taken aback, looking almost worried. You guess you just shattered some impressions she had about giving head.'
+		act 'Continue':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end
+	
+	act 'It turns me on':
+		cla & *nl
+		katjaQW['horny'] += 5
+		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
+		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
+		act 'Continue':
+			minut += 5
+			if $loc = 'katja_dorm':
+				gt 'katja_dorm', 'talk'
+			else
+				gt 'KatjaHomeTalk'
+			end
+		end
+	end	
+end
+
+--- katja_sex_talk ---------------------------------
+

+ 74 - 74
locations/komp_camgirl.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 			gs 'arousal', 'end'
 			gs 'stat'
 			gt 'Komp','browse'
-		end	
+		end
 	end
 end
 
@@ -126,9 +126,9 @@ if $ARGS[0] = 'waitclients':
 	else
 		img_source = 6
 	end
-	
+
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore' + img_source + '.jpg"></center>'
-	
+
 	if camclients = 0:
 		'You take a moment of rest, unfortunately, you currently have no viewers.'
 	else
@@ -183,7 +183,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 
 			mfcclients += rand(-1,1)
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your bra (<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 backmfc = 1 and clientask >= 81 and clientask < 91:
 		*clr & cla
@@ -216,7 +216,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients -= 1
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -257,7 +257,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 
 			mfcclients += rand(-1,1)
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse to take off your panties (<<will_cost>> Willpower)':
@@ -280,7 +280,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your panties (<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 topmfc = 0 and clientask >= 95 and clientask < 99:
 		menu_off = 1
@@ -291,7 +291,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients = 0
 
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -345,7 +345,7 @@ if $ARGS[0] = 'waitclients':
 			end
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Ignore him (<<will_cost>> Willpower)':
@@ -365,7 +365,7 @@ if $ARGS[0] = 'waitclients':
 		act 'Show him your vagina':
 			*clr & cla
 			mfcclients = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -400,7 +400,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 0 and pcs_ass >= 30 and webpopular >= 50 and clientask = 80:
 		menu_off = 1
@@ -411,7 +411,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'waitclients':
 					'Oh no! Your face turns a deep red... you''re so ashamed right now! You try to calm the chat down, but the vulgar comments just keep coming and coming.'
 					'At least the viewer who promised to donate did, so you''re a few tokens richer.'
 
-					gs 'arousal', 'porn', -5 
+					gs 'arousal', 'porn', -5
 					gs 'stat'
 
 				else
@@ -460,7 +460,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 
 	if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
@@ -486,7 +486,7 @@ if $ARGS[0] = 'waitclients':
 		*clr & cla
 		gt 'kompMFCtwo', 86
 	end
-	
+
 	if webpopular >= 50 and pcs_vag + pcs_ass > 0 and alko >= 4 and clientask = 85:
 		menu_off = 1
 		*clr & cla
@@ -540,7 +540,7 @@ if $ARGS[0] = 'waitclients':
 		act 'Dance':
 			menu_off = 1
 			*clr & cla
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'stat'
 			if topmfc = 1 and backmfc = 1:
@@ -562,7 +562,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and backmfc = 1 and clientask < 74:
 		act 'Perform a striptease':
@@ -581,11 +581,11 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and clientask < 74:
 		act 'Take off your bra':
-			menu_off = 1 
+			menu_off = 1
 			*clr & cla
 			topmfc = 0
 			minut += 5
@@ -614,7 +614,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
-            gs 'komp_camgirl', 'views'
+			gs 'komp_camgirl', 'views'
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
 
@@ -761,78 +761,78 @@ if $ARGS[0] = 'IncreaseFame':
 	gs 'komp_camgirl', 'UpdateCamBonus'
 	FameIncMin = CamBonus / 30
 	FameIncMax = CamBonus / 15
-    fame['city_social'] += rand(FameIncMin, FameIncMax)
-    fame['city_sexind'] += rand(FameIncMin, FameIncMax)
+	fame['city_social'] += rand(FameIncMin, FameIncMax)
+	fame['city_sexind'] += rand(FameIncMin, FameIncMax)
 	webpopular = (fame['city_sexind'] + fame['city_social']) / 5
 	killvar 'FameIncMin'
 	killvar 'FameIncMax'
 end
 
 if $ARGS[0] = 'danceviewer':
-    gs 'komp_camgirl', 'IncreaseFame'
-    minClient = (pcs_dancero/30) + (webpopular / 50) + (CamBonus/30)
-    maxClient = (pcs_dancero/10) + (webpopular / 50) + (CamBonus/20)
-    camclients += rand(minClient, maxClient)
+	gs 'komp_camgirl', 'IncreaseFame'
+	minClient = (pcs_dancero/30) + (webpopular / 50) + (CamBonus/30)
+	maxClient = (pcs_dancero/10) + (webpopular / 50) + (CamBonus/20)
+	camclients += rand(minClient, maxClient)
 	if rand(1,3) = 1:
-        maxRegview = (camclients + CamBonus) / 200
-    end
-    regview += rand(0, maxRegview)
+		maxRegview = (camclients + CamBonus) / 200
+	end
+	regview += rand(0, maxRegview)
 end
 
 if $ARGS[0] = 'views':
-    gs 'komp_camgirl', 'IncreaseFame'
-    maxClient = (CamBonus / 10) - (mfcclients*2)
-    minClient = (CamBonus / 15) - (mfcclients*2)
-    camclients += rand(minClient, maxClient)
-    if rand(1,3) = 1:
-        maxRegview = (camclients + CamBonus) / 200
-    end
-    regview += rand(0, maxRegview)
+	gs 'komp_camgirl', 'IncreaseFame'
+	maxClient = (CamBonus / 10) - (mfcclients*2)
+	minClient = (CamBonus / 15) - (mfcclients*2)
+	camclients += rand(minClient, maxClient)
+	if rand(1,3) = 1:
+		maxRegview = (camclients + CamBonus) / 200
+	end
+	regview += rand(0, maxRegview)
 end
 
 if $ARGS[0] = 'UpdateCamBonus':
-    CamBonus = (pcs_apprnc + webpopular + (fame['city_sexind']/2)+ pcs_exhib + (fame['city_performer']/2) + (fame['city_social']/2) + (regview/2) + (pcs_mood*2)) / 12
-    if topmfc = 0: CamBonus += 10
-    if backmfc = 0: CamBonus += 15
+	CamBonus = (pcs_apprnc + webpopular + (fame['city_sexind']/2)+ pcs_exhib + (fame['city_performer']/2) + (fame['city_social']/2) + (regview/2) + (pcs_mood*2)) / 12
+	if topmfc = 0: CamBonus += 10
+	if backmfc = 0: CamBonus += 15
 end
 
 if $ARGS[0] = 'donate':
-    gs 'komp_camgirl', 'UpdateCamBonus'
-    minChance = CamBonus / 4
-    chancetips = rand(minChance, 100)
-    minTokens = (CamBonus + camclients) / 50
-    maxTokens = (CamBonus + camclients) / 20
-    chance = 100 - minTokens
-    if chancetips >= chance:
-        tokens_made = rand(minTokens, maxTokens)
+	gs 'komp_camgirl', 'UpdateCamBonus'
+	minChance = CamBonus / 4
+	chancetips = rand(minChance, 100)
+	minTokens = (CamBonus + camclients) / 50
+	maxTokens = (CamBonus + camclients) / 20
+	chance = 100 - minTokens
+	if chancetips >= chance:
+		tokens_made = rand(minTokens, maxTokens)
 		if tokens_made  >= 1:'<font color="green">+<<tokens_made>>Tokens</font>'
 		tokens += tokens_made
-    end
-    tokenpay = tokens * 2
+	end
+	tokenpay = tokens * 2
 end
 
 if $ARGS[0] = 'clientrequest':
-    if topmfc = 1 and backmfc = 1:
-        if pcs_apprnc < 100:
-            clientask = rand(20, 100)
-        else
-            clientask = rand(30, 100)
-        end
-    end
-    if (topmfc = 0 and backmfc = 1) or (topmfc = 1 and backmfc = 0):
-        if pcs_apprnc < 100:
-            clientask = rand(30, 100)
-        else
-            clientask = rand(35, 100)
-        end
-    end
-    if topmfc = 0 and backmfc = 0:
-        if pcs_apprnc < 100:
-            clientask = rand(35, 100)
-        else
-            clientask = rand(45, 100)
-        end
-    end
+	if topmfc = 1 and backmfc = 1:
+		if pcs_apprnc < 100:
+			clientask = rand(20, 100)
+		else
+			clientask = rand(30, 100)
+		end
+	end
+	if (topmfc = 0 and backmfc = 1) or (topmfc = 1 and backmfc = 0):
+		if pcs_apprnc < 100:
+			clientask = rand(30, 100)
+		else
+			clientask = rand(35, 100)
+		end
+	end
+	if topmfc = 0 and backmfc = 0:
+		if pcs_apprnc < 100:
+			clientask = rand(35, 100)
+		else
+			clientask = rand(45, 100)
+		end
+	end
 end
 
 

+ 1 - 1
locations/kuhrPar.qsrc

@@ -192,7 +192,7 @@ if func('homes_properties', 'can_live_here'):
 			end
 		end
 	else
-		if (hour = 8 or (hour = 7 and locat['Fam_inGad'] = 1)) and breakfast_day ! daystart:
+		if (hour = 8 or (hour = 7 and (minut > 15 or locat['Fam_inGad'] = 1))) and breakfast_day ! daystart:
 			act 'Eat breakfast alone (0:20)':
 				*clr & cla
 				menu_off = 1

File diff suppressed because it is too large
+ 243 - 204
locations/ludahome.qsrc


+ 11 - 10
locations/newspaper_pages.qsrc

@@ -67,26 +67,27 @@ end
 	!!=======================================================!!
 
 if $ARGS[0] = 'generic_0':
-	'<center>Mysterious lights over pushkin</center>'
+	'<center>Mysterious lights over Pushkin</center>'
 	*nl
-	'Last night there was several reports of floating lights over Pushkin lake, authorities have dismissed it as light bouncing off the water into low mist. However eye witness reports and photographs discredit the official report.'
+	'Last night saw several reports of floating lights over Pushkin lake. Authorities have dismissed eyewitness reports and photographs as light bouncing off the water into low mist.'
 	'Read more on page 4.'
 end
 
 if $ARGS[0] = 'generic_1':
 	'<center>Missing cosmonaut found living in cave in Vladivostok</center>'
 	*nl
-	'Former cosmonaut Valentin Vitalyevich Lebedev (82) had been reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science which Valentin started and is the director of. He was found in a cave with only basic amenities and a small supply of food. When asked why he was there he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
+	'Former cosmonaut Valentin Vitalyevich Lebedev (82), who was reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science (of which he is the director) was found in a cave with only basic amenities and a small supply of food.'
+	'When asked why he was there, he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
 end
 
 if $ARGS[0] = 'generic_2':
 	'<center>Help advance medical research today</center>'
 	*nl
-	'A St. Petersburg based medical clinic is offering significant payments to those that are willing to take part in their medical trials. We have interviewed various participants.'
+	'A St. Petersburg based medical clinic is offering significant payments to those who are willing to take part in their medical trials. We have interviewed various participants.'
 	'"All I had to do was swallow a pill and report back a week later. Took me less than 10 minutes and haven''t regretted it!"'
-	'"The staff is very friendly and helpful. My hair grew 20 cm, and even got paid for it! That''s a steal if you ask me."'
+	'"The staff are very friendly and helpful. My hair grew 20 cm and I got paid for it! That''s a steal if you ask me."'
 	'[Redacted]'
-	'"I''ve taken part in multiple trials now, and I haven''t had any complaints! Best decision of my life to take part."'
+	'"I''ve taken part in multiple trials now, and I haven''t had any complaints! Best decision of my life!"'
 	*nl
 	'Signup for a medical trial today, and help build a brighter future!'
 
@@ -106,14 +107,14 @@ end
 if $ARGS[0] = 'Gad_missing':
 	'<center>More missing people in Gadukino</center>'
 	*nl
-	'Today <<$NewspaperVars[''gad_missing_name'']>> name, <<NewspaperVars[''gad_missing_age'']>> has been reported missing in Gadukino. They was last seen four days ago foraging in the forest. This makes this the <<NewspaperVars[''gad_missing_counter'']>> person that has gone missing in recent months and the authorities are at a loss in trying to locate to what has happened to them.'
+	'<<$NewspaperVars[''gad_missing_name'']>>, <<NewspaperVars[''gad_missing_age'']>>, has been reported missing in Gadukino. Last seen four days ago while foraging in the forest, they are the <<NewspaperVars[''gad_missing_counter'']>> person who has disappeared from the village in recent months and authorities are at a loss in trying to locate them.'
 end
 
 if $ARGS[0] = 'boris_arrested':
-	'<center>Mayor Election Scandal</center>'
+	'<center>Mayoral Candidate Disgraced</center>'
 	*nl
-	'In a shocking turn of events the Mayoral candidate Boris Barlovsky has been arrested and is under investigation for numerous offences including running an escort services in Pavlosk.'
-	'We can exclusively reveal the full scandal on page 3.'
+	'In a turn of events that has shocked many, mayoral candidate Boris Barlovsky has been arrested following an extensive investigation carried out by FSB agents. The once popular Pavlovsk businessman (57) was charged with bribery, fraud and embezzlement among a string of other offences.'
+	'Read the exclusive story on page 3.'
 end
 
 

+ 6 - 0
locations/npcStat.qsrc

@@ -95,6 +95,8 @@ else
 	npcStatVars['age'] = rand(18, 35)
 end
 
+$npcStatVars['condom'] = $ARGS[2]
+
 
 !! ----- AGE --------------------------------------------------
 
@@ -472,6 +474,8 @@ if $ARGS[1] ! '' and npcStat_i > 0:
 		$npcBuild_pref<<npcStat_i>>		= $npcStatVars['build_desc_pref']
 		$npcRelat<<npcStat_i>>			= $npcStatVars['relat']
 
+		$npcCondom<<npcStat_i>>			= $npcStatVars['condom']
+
 		$xe<<npcStat_i>>				= $npcStatVars['xe']
 		$xec<<npcStat_i>>				= $npcStatVars['xec']
 		$xem<<npcStat_i>>				= $npcStatVars['xem']
@@ -519,6 +523,8 @@ else
 	$npcBuild_pref[npcStat_i]	= $npcStatVars['build_desc_pref']
 	$npcRelat[npcStat_i]		= $npcStatVars['relat']
 
+	$npcCondom[npcStat_i]		= $npcStatVars['condom']
+
 	$xe[npcStat_i]				= $npcStatVars['xe']
 	$xec[npcStat_i]				= $npcStatVars['xec']
 	$xem[npcStat_i]				= $npcStatVars['xem']

+ 2 - 0
locations/npcStat_clean.qsrc

@@ -23,6 +23,7 @@ if npcStat_clean_i > 1 and npcStatCalled[npcStat_clean_i] < daystart - 2:
 	killvar '$npcBuild',		npcStat_clean_i
 	killvar '$npcBuild_pref',	npcStat_clean_i
 	killvar '$npcRelat',		npcStat_clean_i
+	killvar '$npcCondom',		npcStat_clean_i
 
 	killvar '$xe',				npcStat_clean_i
 	killvar '$xec',				npcStat_clean_i
@@ -65,6 +66,7 @@ npcStat_clean_i = 1
 			killvar '$npcBuild<<npcStat_clean_i>>'
 			killvar '$npcBuild_pref<<npcStat_clean_i>>'
 			killvar '$npcRelat<<npcStat_clean_i>>'
+			killvar '$npcCondom<<npcStat_clean_i>>'
 
 			killvar '$xe<<npcStat_clean_i>>'
 			killvar '$xec<<npcStat_clean_i>>'

+ 4 - 6
locations/npc_set_preference.qsrc

@@ -65,7 +65,7 @@ if isnum(mid($ARGS[0], 2)):
 	if temp_set_preference_trait_value ! 0:
 		if arrsize('$npc_pref_traits') = 0:
 			!!replace(..., '	', '') is there to remove the tabs from the string.
-			$npc_preferences[$ARGS[0]] = replace({killvar '$npc_pref_traits'
+			$npc_preferences[$ARGS[0]] = $replace({killvar '$npc_pref_traits'
 				killvar 'npc_pref_values'
 				$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 				npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
@@ -83,7 +83,7 @@ if isnum(mid($ARGS[0], 2)):
 			else
 				!!We have checked that the npc has no preference for the trait.
 				!!We add the preference to the npc.
-				$npc_preferences[$ARGS[0]] += replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
+				$npc_preferences[$ARGS[0]] += $replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 					npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
 				}, '	', '')
 			end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'rebuild_preferences':
 
 
 	!!Overwrite the $npc_pref....[$ARGS[1]] strings with the rebuild string.
-	$npc_preferences[$ARGS[1]] = replace($temp_npc_preferences,    '	', '')
+	$npc_preferences[$ARGS[1]] = $replace($temp_npc_preferences,    '	', '')
 
 	killvar '$temp_npc_preferences'
 	killvar 'rebuild_preferences_index'
@@ -356,6 +356,4 @@ end
 !!				stats_strength_manly
 
 
-
-
---- npc_set_preference ---------------------------------
+--- npc_set_preference ---------------------------------

+ 2 - 1
locations/npcgeneratec.qsrc

@@ -4,8 +4,9 @@
 !! You can also set their approx. home location
 !! All data produced is random so if you need a specific value you will have to overwrite it
 
+if $ARGS[0] = '' or isnum($ARGS[0]):
+	if $ARGS[0] ! '': ARGS[0] = val($ARGS[0])
 
-if $ARGS[0] = '':
 	!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
 	!! npcgeneratec is 1
 	!! npcpreservec is 2

+ 2 - 2
locations/npcstatic5.qsrc

@@ -855,7 +855,7 @@ $npc_firstname['A<<npctemp>>'] = 'Lebogang'
 $npc_nickname['A<<npctemp>>'] = 'Lebo'
 $npc_lastname['A<<npctemp>>'] = 'Kayode'
 $npc_usedname['A<<npctemp>>'] = 'Lebogang'
-$npc_notes['A<<npctemp>>'] = 'Djibril''s closet friend in Russia. They both live on the same floor in the same dorm and he also attends the University. He is also from Africa.'
+$npc_notes['A<<npctemp>>'] = 'Djibril''s best friend, who is also from Africa. He also attends the university, living on the same floor of the dorm.'
 npc_dob['A<<npctemp>>'] = 0
 npc_gender['A<<npctemp>>'] = 0
 
@@ -863,7 +863,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'uni_type', 'other'
 
 $npc_thdick['A<<npctemp>>'] = 'thick'
-npc_dick['A<<npctemp>>'] = 19
+npc_dick['A<<npctemp>>'] = 22
 npc_sexskill['A<<npctemp>>'] = 3
 npc_intel['A<<npctemp>>'] = 48
 

+ 56 - 16
locations/nyp_school.qsrc

@@ -197,7 +197,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				InvitationToDimkaNYparty = 1
 				'Everyone then slowly makes their way out of the school.'
@@ -206,7 +207,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif IgorQW['Love'] > 0:
-		'As you''re hanging out an chatting with the girls, Igor walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
+		'As you''re hanging out and chatting with the girls, Igor walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
 		act 'Don''t dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -228,7 +229,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -237,7 +239,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif Marcus_sextype > 0:
-		'As you''re hanging out an chatting with the girls, Marcus walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
+		'As you''re hanging out and chatting with the girls, Marcus walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
 		act 'Don''t dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -259,7 +261,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -268,7 +271,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif npc_sex['A14'] > 0:
-		'As you''re hanging out and chatting with the girls chatting, Katja strikes up a conversation with you. After a few seconds, a song comes on and Katja becomes excited. "I love this song!" she squeals as she turns to you and grabs you by the hand. "Dance with me, <<$pcs_nickname>>!"'
+		'As you''re hanging out and chatting with the girls, Katja strikes up a conversation with you. After a few seconds, a song comes on and Katja becomes excited. "I love this song!" she squeals as she turns to you and grabs you by the hand. "Dance with me, <<$pcs_nickname>>!"'
 
 		act 'Don''t dance with her':
 			*clr & cla
@@ -292,7 +295,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -300,6 +304,41 @@ if $ARGS[0] = 'cool jocks':
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
 		end
+	elseif AlbinaQW['Friends'] = 2:
+		'As you''re hanging out and chatting with the girls, Albina strikes up a conversation with you. After a few seconds, she grabs your hand and starts pulling you along. "Come and dance with me, <<$pcs_nickname>>!"'
+		
+		act 'Don''t dance with her':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
+			'You shake your head and pull yourself free from her grasp. "I don''t feel like it right now. Maybe later?"'
+			'She pouts. "Aww, you''re no fun, <$pcs_nickname>>! If you change your mind, then come join us."'
+			'A few of the other girls join her on the dance floor and they all start dancing together. 'You watch them for a while before turning back to engage in conversation with the other girls.'
+
+			act 'Hang out until the party ends': gt 'nyp_school', 'end'
+		end
+		
+		act 'Dance with her':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa6.jpg"></center>'
+			'"Of course," you smile. "I''d love to dance!"'
+			'She giggles happily as she drags you onto the dance floor. Albina seems to be in a bit of a buzz and dances very erotically, which gets some of the guys hooting and hollering. You''re taken aback when Albina suddenly starts making out with you, much to the joy of the guys watching.'
+			'She then breaks the kiss and smiles at you before going back to dancing. You really enjoy dancing in front of everyone with Albina.'
+			act 'Dance until the party ends':
+				*clr & cla
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
+				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
+				*nl
+				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
+				'Everyone then slowly makes their way out of the school.'
+				InvitationToDimkaNYparty = 1
+			
+				act 'Leave': gt 'gschool_grounds', 'main'
+			end
+			
 !!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
 	else
 		*clr
@@ -864,7 +903,7 @@ if $ARGS[0] = 'outcast':
 	end
 	if npc_grupTipe['A25'] = 5:
 		!if Sonia is an outcast too
-		cla & *clr
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -873,7 +912,7 @@ if $ARGS[0] = 'outcast':
 		'"Ohhh, what is this I hear? <<$pcs_nickname>> and Sonia exchanging tips on how to suck a cock properly?" Vitek says to the others as they laugh.'
 		'The two of you throw a quick look at each other, afraid of what might happen next.'
 		act 'What do you want?':
-			cla & *clr
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -882,7 +921,7 @@ if $ARGS[0] = 'outcast':
 			'Vitek patiently waits for you to finish before he grabs you by the neck and forces you down towards his crotch. "I think this one is ready for a good old fashioned fuck session. Who''s in?" he asks the others.'
 			'You grunt and moan as you try to break free, but he''s too strong and easily holds you down.'
 			act 'Let go of me':
-				cla & *clr
+				*clr & cla
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -891,7 +930,7 @@ if $ARGS[0] = 'outcast':
 				'Sonia, teary eyed, nods. "I''ll do whatever you want! Just leave her be!"'
 				'"See? Even the whores take care of each other," he grins at his friends. "This gives me an idea. The two of you can give us a little warm-up show and after that, we''ll decide among ourselves who gets who."'
 				act 'Accept your punishment':
-					cla & *clr
+					*clr & cla
 					minut += 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -934,7 +973,7 @@ if $ARGS[0] = 'outcast':
 			end
 		end
 	else
-		cla & *clr
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -942,7 +981,7 @@ if $ARGS[0] = 'outcast':
 		'"We haven''t played with <<$pcs_nickname>> for a while. Let''s go and fuck around with her," you overhear Lena tell Vitek. He nods and before you know it, the majority of the gopniks stand in front of you.'
 		'"Hi <<$pcs_nickname>>! Sucked many cocks today?" Lena asks as the others laugh. "She''s truly a good piece of ass. Who here hasn''t fucked her yet? I''m sure she''ll be willing to please you."'
 		act 'Leave me alone':
-			cla & *clr
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -951,7 +990,7 @@ if $ARGS[0] = 'outcast':
 			'Once again, she turns towards the crowd. "Come on, who here hasn''t fucked <<$pcs_nickname>> yet? Any takers? Doesn''t matter if you''re male or female, I''m sure <<$pcs_nickname>> is up to it."'
 			'Vitek steps up to you, grabs you by the neck and forces you down to his crotch while the others laugh loudly. "See! I told you she was willing!"'
 			act 'Let go of me':
-				cla & *clr
+				*clr & cla
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -960,7 +999,7 @@ if $ARGS[0] = 'outcast':
 				'You just want it to be over with as you quietly answer. "N-No I didn''t!"'
 				'You can hear the whispers from the others. "Did you hear that? She just admitted to getting fucked by Vitek..."'
 				act 'Plead':
-					cla & *clr
+					*clr & cla
 					minut += 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -985,7 +1024,8 @@ if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 	'Time seems to have flown by as the music suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
-	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+	'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 	if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 	'Everyone then slowly makes their way out of the school.'
 	InvitationToDimkaNYparty = 1

File diff suppressed because it is too large
+ 277 - 213
locations/olu.qsrc


+ 221 - 184
locations/olutaxi.qsrc

@@ -8,58 +8,60 @@ if $ARGS[0] = 'station':
 	if DjibrilQW['taxi'] = 1:
 		DjibrilQW['taxi'] = 0
 		if DjibrilQW['meet'] = 1:
-			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down.'
-			'Djibril smiles to you and he looks a lot like his uncle when he does that. "Hello again <<$pcs_nickname>>."'
-			'You can''t help but smile back to him. "Hello Djibril."'
-			'Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+			'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+			'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down.'
+			'Djibril smiles at you. He looks a lot like his uncle when he does that. "Hello again, <<$pcs_nickname>>."'
+			'You can''t help but smile back at him. "Hello, Djibril."'
 		else
 			DjibrilQW['meet'] = 1
-			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. Then he adds. "This is my nephew Djibril, he goes to the University in Saint Petersburg." Djibril smiles to you and he looks a lot like his uncle when he does that.'
-			'You can''t help but smile back to him. "Hello Djibril."'
-			'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good, he doesn''t have much of a accent at all. Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+			'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+			'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down. "This is my nephew, Djibril. He goes to the university in the city."'
+			'Djibril smiles at you. He looks a lot like his uncle when he does that.'
+			'You can''t help but smile back at him. "Hello, Djibril."'
+			'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good and he doesn''t have much of an accent at all.'
 		end
-		act 'Tell Olu good luck':
+		act 'Wish Olu good luck':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You nod to them. "Ok well good luck, I will let you get back to work and nice meeting you Djibril."'
-			'You get up and he says. "Thank you and you have a good day as well."'
-			'While Djibril says. "It was nice meeting you as well." With that you walk away and let Olu get back to work.'
-			act 'Leave': gt'pav_train_hall'
+			'You nod at them. "Well, good luck! I''ll let you get back to work now. Nice meeting you, Djibril."'
+			'You get up and he smiles at you. "Thank you. You have a good day as well."'
+			'"It was nice meeting you as well," Djibril says before you walk away and let Olu get back to work.'
+			act 'Leave': gt 'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You hesitate a moment before saying. "Can you maybe give me a ride?"'
-			'Olu glances over and smiles. "Of course, follow me." With that he gets up and walks out of the train station, down the stairs and down the street a bit before turning down a alleyway, Djibril follows along behind you.'
+			'You hesitate a moment before asking. "Can you give me a ride?"'
+			'Olu glances over and smiles. "Of course, follow me."'
+			'He gets up and walks out of the train station before heading down the street and turning down an alleyway. Djibril follows along behind you.'
 			act 'Follow him':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
+				'As you walk into the alleyway, you see the van he''s converted into a taxi.'
 				if first_taxi = 0:
 					first_taxi = 1
-					'You wonder why he parked here. "Why is your van parked here?" You ask him'
-					'He stops at the van and unlocks it as he answers you. "Police write me tickets if I park in front of the station, so I leave it here and then run down and drive it up to pick up people at the front."'
-					'You shake your head. "That''s terrible, they shouldn''t harass you like that."'
-					'Djibril agrees "She is right uncle, it is worse here than in the city."'
-					'He shrugs a bit as he gets in, he waits for you to get in as well before answering. "It ok, it be what it be. Now where you need go?" Djibril gets into the back seat.'
+					'"Why is your van parked here?" you ask.'
+					'He stops at the van and unlocks it as he answers you. "Police write tickets when I park at station, so I leave it here and then run and drive it up to pick up people at front."'
+					'You shake your head. "That''s terrible! They shouldn''t harass you like that."'
+					'Djibril agrees. "She''s right, uncle. It''s worse here than in the city."'
+					'He shrugs as he gets in. He waits for you and Djibril to get in before answering. "It okay. It be what it be. Now where you need go?"'
 				else
-					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
-					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?" As Djibril climbs into the back seat.'
+					'You shake your head in disgust, knowing he has to park his van in the alleyway to stop the local police from harassing him.'
+					'He unlocks the van and gets in. Once you and Djibril climb inside, he turns to you. "Where you need go?"'
 				end
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_drive.jpg"></center>'
-					'Olu starts up the van and pulls it out of the alleyway, out onto the street. Olu is listening to some music you have never heard before, you don''t even know what they are saying. It doesn''t take to long before you arrive at your destination. Olu pulls over to the curb and stops his van. "We are here, you be careful now, yes."'
-					'You wave to Djibril as well. "It was nice meeting you."'
+					'Olu starts up the van and drives out onto the street, listening to some music in a language you don''t understand. It doesn''t take too long before you arrive at your destination, where Olu pulls over to the curb and stops. "We are here. You be careful now, yes?"'
+					'You turn to Djibril. "It was nice meeting you."'
 					'Djibril smiles in return. "It was nice meeting you as well."'
-					'You smile to Olu. "I will and thanks for the ride."'
-					'Olu returns the smile. "Any time, goodbye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
+					'You smile at Olu. "I will. Thanks for the ride."'
+					'Olu returns the smile. "Any time, goodbye."'
+					'Once you close the door and he''s sure you''re safely on the sidewalk, he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'pushkin'
 				end
@@ -68,69 +70,76 @@ if $ARGS[0] = 'station':
 		act 'Talk to them':
 			*clr & cla
 			minut += 30
-			npc_rel['A55'] +=1
-			npc_rel['A82'] +=1
+			npc_rel['A55'] += 1
+			npc_rel['A82'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			if OluQW['sex'] = 1:
-				'You ask. "Mind if i sit and talk with you guys for a while?"'
-				'Olu scoot over to make room for you. "No of course not."'
-				'You take a seat and soon the three of you are talking. They ask you about school, Djibril talks about the University and living in the city. They talk about some of the funny or odd things to them at least they have seen since living in Russia and you tell them about a variety of things. All and all you have a good conversation with them. Only occasionally interrupted as Olu gets up to try and get a fare. Djibril seems to be paying you more and more attention the longer you talk. Olu seems to take notice as well and finally says. "If the two of you would like to talk in private with out a adult around. You can go talk in my taxi." Djibril seems to like the idea but waits for you to answer.'
+				'"Mind if I sit and talk with you guys for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start chatting. They ask you about school while Djibril talks about the university and living in the city. They then talk about some of the funny or odd things they''ve seen since moving in Russia.'
+				'All and all you have a good conversation with them, only occasionally interrupted as Olu gets up to try and get a fare. Djibril seems to be paying more and more attention to you the longer you talk, which Olu seems to notice. "If the two of you would like to talk private without adult, you can go talk in my taxi."'
+				'Djibril seems to like the idea, but waits for you to answer.'
 				act 'Accept': gt 'olutaxi', 'djibril_taxi_sex'
 				act 'Decline':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-					'You shake your head no. "Maybe some other time."'
-					'Olu nods and smiles. "Ok." Then they go back to just talking to you about a variety of topics, but Olu also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi. Djibril tells you bye as well and follows his uncle and the man outside.'
-					act 'Leave': gt'pav_train_hall'
+					'You shake your head. "Maybe some other time."'
+					'Olu nods and smiles and you go back to talking about a variety of topics while Olu keeps trying to find a fare. After a while, he finally finds one and waves goodbye to you as he leads the well dressed man outside to his taxi. Djibril also bids you farewell and follows his uncle and the man outside.'
+					act 'Leave': gt 'pav_train_hall'
 				end
 			else
-				'You ask. "Mind if i sit and talk with you guys for a while?"'
-				'Olu scoot over to make room for you. "No of course not."'
-				'You take a seat and soon the three of you are talking. They ask you about school, Djibril talks about the University and living in the city. They talk about some of the funny or odd things to them at least they have seen since living in Russia and you tell them about a variety of things. All and all you have a good conversation with them. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and Djibril tell you buy. Djibril helps the people with some luggage, you guess they are tourist, while Olu rushes out to go pull the taxi around. They both wave bye to you as they depart.'
-				act 'Leave': gt'pav_train_hall'
+				'"Mind if I sit and talk with you guys for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start chatting. They ask you about school while Djibril talks about the university and living in the city. They then talk about some of the funny or odd things they''ve seen since moving in Russia.'
+				'All and all you have a good conversation with them, only occasionally interrupted as Olu gets up to try and get a fare. Someone finally takes him up on his offer and he and Djibril bid you farewell. Djibril helps them with some luggage while Olu rushes out to pull the taxi around. They both wave goodbye to you as they depart.'
+				act 'Leave': gt 'pav_train_hall'
 			end
 		end
 	else
-		'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-		'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. You can''t help but smile back to him. Maybe he has time to talk, or perhaps you should let him work. Maybe he would even give you a ride locally and save you from walking.'
-		act 'Tell him good luck':
+		'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+		'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down. You can''t help but smile back at him. Maybe he has time to talk, or perhaps you should let him work. Maybe he would even give you a ride locally and save you from walking?'
+		act 'Wish him good luck':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You nod to him. "Ok well good luck, I will let you get back to work." You get up and he says. "Thank you and you have a good day as well." With that you walk away and let him get back to work.'
-			act 'Leave': gt'pav_train_hall'
+			'You get up and nod at him. "Well good luck, I''ll let you get back to work."'
+			'He smiles. "Thank you. Have a good day."' 
+			'With that, you walk away and let him get back to work.'
+			act 'Leave': gt 'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You hesitate a moment before saying. "Can you maybe give me a ride?"'
-			'He glances over and smiles. "Of course, follow me." With that he gets up and walks out of the train station, down the stairs and down the street a bit before turning down a alleyway.'
+			'You hesitate a moment before asking. "Can you give me a ride?"'
+			'He glances over and smiles. "Of course, follow me."'
+			'He gets up and walks out of the train station before heading down the street and turning down an alleyway.'
 			act 'Follow him':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
+				'As you walk into the alleyway, you see the van he''s converted into a taxi.'
 				if first_taxi = 0:
 					first_taxi = 1
-					'You wonder why he parked here. "Why is your van parked here?" You ask him'
-					'He stops at the van and unlocks it as he answers you. "Police write me tickets if I park in front of the station, so I leave it here and then run down and drive it up to pick up people at the front."'
-					'You shake your head. "That''s terrible, they shouldn''t harass you like that."'
-					'He shrugs a bit as he gets in, he waits for you to get in as well before answering. "It ok, it be what it be. Now where you need go?"'
+					'"Why is your van parked here?" you ask.'
+					'He stops at the van and unlocks it as he answers you. "Police write tickets when I park at station, so I leave it here and then run down and drive it up to pick up people at front."'
+					'You shake your head. "That''s terrible! They shouldn''t harass you like that."'
+					'He shrugs as he gets in, but waits for you to get in as well before answering. "It okay, it be what it be. Now where you need go?"'
 				else
-					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
-					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?"'
+					'You shake your head in disgust, knowing he has to park his van in the alleyway to stop the local police from harassing him.'
+					'He unlocks the van and gets in it. Once you climb inside, he turns to you. "Where you need go?"'
 				end
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_drive.jpg"></center>'
-					'He starts up the van and pulls it out of the alleyway, out onto the street. He is listening to some music you have never heard before, you don''t even know what they are saying. It doesn''t take to long before you arrive at your destination. He pulls over to the curb and stops his van. "We are here, you be careful now, yes."'
-					'You smile to him. "I will and thanks for the ride."'
-					'He returns the smile. "Any time, goodbye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
+					'Olu starts up the van and drives out onto the street, listening to some music in a language you don''t understand. It doesn''t take too long before you arrive at your destination, where Olu pulls over to the curb and stops. "We are here. You be careful now, yes?"'
+					'You smile at him. "I will. Thanks for the ride."'
+					'He returns the smile. "Any time, goodbye."'
+					'Once you close the door and he''s sure you''re safely on the sidewalk, he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'pushkin'
 				end
@@ -138,29 +147,32 @@ if $ARGS[0] = 'station':
 		end
 		act 'Mind if we talk?':
 			*clr & cla
-			npc_rel['A55'] +=1
+			npc_rel['A55'] += 1
 			minut += 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			if OluQW['sex'] = 1:
-				'You ask. "Mind if I sit and talk with you, for a while?"'
-				'Olu scoots over to make room for you. "No of course not."'
-				'You take a seat and soon the two of you are talking. He asks you about school and boys you like. He tells you about some of the funny or odd things to him at least he has seen since living in Russia and you tell him about a variety of things. All and all you have a good conversation with him. Only occasionally interrupted as Olu gets up to try and get a fare. After a bit he stops even getting up and seems a lot more interested in just talking to you. Finally he glances at the doors and says. "Would you like to go talk in my taxi? It is parked out of the way where no one would see." You can tell by the lust in his eyes as he looks at you and the tone of his voice what he really wants to go do in his taxi, but maybe it would be fun.'
+				'"Mind if I sit and talk with you?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start talking. He asks you about school and tells you about some of the funny or odd things he''s seen since moving to Russia while you tell him about a variety of things.'
+				'All and all you have a good conversation with him, only occasionally interrupted as Olu gets up to try and get a fare. After a while, he stops trying and seems a lot more interested in just talking to you before he finally glances at the doors. "Would you like to go talk in my taxi? It is parked out of the way where no one would see."'
+				'You can tell by the lust in his eyes and the tone of his voice what he really wants to do in his taxi...'
 				act 'Accept': gt 'olutaxi', 'olu_taxi_sex'
 				act 'Decline':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-					'You shake your head no. "Maybe some other time."'
-					'He nods and smiles. "Ok." Then he goes back to just talking to you about a variety of topics, but he also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi.'
-					act 'Leave': gt'pav_train_hall'
+					'You shake your head. "Maybe some other time."'
+					'He nods and smiles before he goes back to talking to you about a variety of topics, but he also goes back up to trying to find a fare. After a while, he finally finds one and waves goodbye to you as he leads the well dressed man outside to his taxi.'
+					act 'Leave': gt 'pav_train_hall'
 				end
 			else
-				'You ask. "Mind if I sit and talk with you, for a while?"'
-				'Olu scoots over to make room for you. "No of course not."'
-				'You take a seat and soon the two of you are talking. He asks you about school and boys you like. He tells you about some of the funny or odd things to him at least he has seen since living in Russia and you tell him about a variety of things. All and all you have a good conversation with him. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and helps them with there luggage, they are tourist if you had to guess. He waves bye to you as he helps them carry their luggage outside.'
-				act 'Leave': gt'pav_train_hall'
+				'"Mind if I sit and talk with you for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start talking. He asks you about school and tells you about some of the funny or odd things he''s seen since moving to Russia while you tell him about a variety of things.'
+				'All and all you have a good conversation with him, only occasionally interrupted as Olu gets up to try and get a fare. Someone finally takes him up on his offer and he waves goodbye to you as he helps them carry their luggage outside.'
+				act 'Leave': gt 'pav_train_hall'
 			end
 		end
 	end
@@ -172,10 +184,11 @@ if $ARGS[0] = 'djibril_taxi_sex':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-	'You agree to go talk in private you are fairly sure what he has in mind though already. Djibril gets up and Olu gives him the keys, he then leads you out of the train station and down the street into the alleyway, at the end of the alley you see Olu''s van parked. As you walk up to it, he unlocks the side door and climbs in the back of it, waiting for you to climb in after him. You close the door behind you, he starts by asking you some questions about your school, what you do for fun, making general small talk. You find out he goes to the University in the city, this is his first year there. After a bit you ask him what he thinks about Russia and if he likes it here.'
+	'You''re fairly certain what he has in mind, but agree anyway. Djibril gets up and Olu gives him the keys before he leads you out of the train station and down the street into the alleyway, where you see Olu''s van parked.'
+	'As you walk up to it, he unlocks the side door and climbs into the back, waiting for you to climb in after him. You close the door behind you and he starts making general small talk. You find out he goes to the university in the city and that this is his first year there.'
 	*nl
-	'"What do you think of the city and living in Russia in general?"'
-	'He shurgs a bit. "In some ways it is better than home and in other ways it is worse, there is a fair amount of racism. Especially if you go to some of the smaller towns like here." He pauses a moment but before you can say anything he speaks again. "But the Russian girls more than make up for it." He says as he leans close and then starts kissing you.'
+	'"So what do you think of the city and living in Russia in general?" you ask.'
+	'He shurgs. "In some ways, it''s better than home and in other ways it''s worse. There''s a fair amount of racism, especially if you go to some of the smaller towns like here." He pauses, but before you can say anything he speaks again. "But the Russian girls more than make up for it..." he says as he leans close and starts kissing you.'
 	gs 'willpower', 'kiss', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Stop him (<<will_cost>> Willpower)':
@@ -185,48 +198,52 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			DjibrilQW['invite'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-			'You pull away from him, but he follows you still kissing you while one hand cups one of your breasts. You put both your hands against his chest and push him hard enough he pulls back. He looks at you looking confused, he obviously thought this is what you wanted. "Sorry I thought this is what you wanted."'
-			'You shake your head no. "No I just wanted to talk is all, get to know you. Maybe some other time."'
+			'You pull away from him, but he keeps kissing you while one hand cups one of your breasts. You put both your hands against his chest and push him hard enough that he pulls back. He looks at you in confusion. "Sorry, I thought this is what you wanted."'
+			'You shake your head. "No, I just wanted to talk and get to know you. Maybe some other time."'
 			*nl
-			'He nods but seems to have lost a lot of interest, the two of you talk for a bit but he seems a bit distracted. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he starts to walk off and then stops. "If you want come see me at the University dorms if you are ever in the city." He tells you which dorm building and room is his, then tells you bye as he heads back towards the train station.'
-			act 'Leave':minut += 3 & gt 'pav_train_hall'
+			'He nods, but seems to have lost a lot of interest. The two of you continue chatting, but he seems a bit distracted and says he should get the keys back to his uncle so he can work. "If you want, come see me at the university dorms if you''re ever in the city."'
+			'He tells you which dorm building and room is his, then says goodbye as he heads back to the train station.'
+			act 'Leave': minut += 3 & gt 'pav_train_hall'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Makeout':
+	act 'Make out':
 		*clr & cla
-		npc_rel['A82'] +=1
+		npc_rel['A82'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi1.jpg"></center>'
-		'You start kissing him back. As the two of you kiss, he pulls you over into his lap. You straddle his lap facing him as the two of you keep kissing. His hands start to roam around your body. He squeezes your boobs and butt at times, rubs your back, arms or thighs at other times. Eventually his hands start to go under your clothes as well and he starts trying to remove your clothing.'
+		'You start kissing him back and he pulls you over into his lap, the two of you continuing to make out as his hands start roaming over your body. Eventually, he starts trying to remove your clothes.'
 		gs 'arousal', 'foreplay', 3
 		gs 'stat'
 		gs 'willpower', 'foreplay', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A82'] -=1
+				npc_rel['A82'] -= 1
 				gs 'willpower', 'pay', 'resist'
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-				'You pull his hands away from your clothes, to keep him from undressing you. You roll off his lap back onto the seat to put some space between the two of you. He looks at you looking confused, he obviously thought this is what you wanted. "Why did you stop? what''s wrong?."'
-				'You sigh. "Nothing, I liked making out with you. I just didn''t want to go any further at least not yet."'
-				'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. The two of you talk for a bit but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
+				'You pull his hands away from you before rolling off his lap and back onto the seat to put some space between the two of you. He looks at you in confusion. "Why did you stop? What''s wrong?"'
+				'You sigh. "Nothing. I liked making out with you, I just didn''t want to go any further. At least not yet."'
+				'He nods, but you can tell he''s frustrated. The two of you go back to chatting, but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. "I should get the keys back to my uncle so he can work."'
+				'He says goodbye before he heads back to the train station.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train_hall'
+				act 'Leave': minut += 3 & gt 'pav_train_hall'
 			end
 		else
 			act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Undress':
 			*clr & cla
-			npc_rel['A82'] +=1
+			npc_rel['A82'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi2.jpg"></center>'
-			'You don''t stop him from removing your clothes, you remove his shirt as you make out. The two of you keep kissing and making out as he undresses you, you can feel beneath your crotch the bulge in his pants growing and getting harder with each item of clothing he removes from you. Once your breasts are exposed he kisses, licks and sucks on your nipples. With your ass bare he grabs your cheeks and squeezes the tight and pulls them apart, spreading them wide as he does. He works his way up for your breasts to your neck and finally your ears, kissing and nibbling as he goes. Once he reaches your ear he whispers to you. "I want to fuck you." As he said that you feel his hands go between your legs, as he starts to unbutton his pants.'
+			'You don''t stop him and start undressing each other as you make out. You can feel the bulge in his pants growing and getting harder with each item of clothing he removes from you. Once your breasts are exposed, he licks and sucks on your nipples.'
+			'He then works his way up your neck and whispers in your ear. "I want to fuck you..."'
+			'You feel his hands go between your legs as he starts to unbutton his pants.'
 			gs 'arousal', 'flashlite', 5
 			gs 'arousal', 'foreplay', -5
 			gs 'stat'
@@ -235,32 +252,33 @@ if $ARGS[0] = 'djibril_taxi_sex':
 				act 'Stop him (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
-					npc_rel['A82'] -=1
+					npc_rel['A82'] -= 1
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-					'You roll off his lap back onto the seat to put some space between the two of you and you start grabbing your discarded clothes and getting dressed again. He looks at you looking confused, he obviously thought this is what you wanted. "Why did you stop? what''s wrong?."'
-					'You shake your head. "Nothing, I liked making out with you. I just... I can''t this is too much too soon, sorry."'
-					'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. Once you are dressed you open the door and climb out. "Sorry." You tell him as you get out and walk away. He gets out behind and closes the door as you walk away.'
+					'You roll off his lap back onto the seat to put some space between the two of you before you start grabbing your discarded clothes and getting dressed again. He looks at you in confusion. "Why did you stop? What''s wrong?"'
+					'You shake your head. "Nothing. I liked making out with you, I just... I can''t. This is too much too soon."'
+					'He nods, but you can tell he''s frustrated. Once you''re dressed, you open the door and climb out. He gets out behind you and closes the door as you walk away.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Blow him':
 				*clr & cla
-				npc_rel['A82'] +=1
+				npc_rel['A82'] += 1
 				npc_sex['A82'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi3.jpg"></center>'
-				'You climb off him as he pulls down his pants and underwear, his massive cock springs free. He is not as big as his uncle but he is not a lot smaller either, huge cocks must run in the family. You grab ahold of it and can''t even wrap your fingers all the way around it, you start jerking him off then you lean over and start sucking on the head of his dick. You slowly work your mouth lower, his monstrous dick causes your jaws to stretch as you take him into your mouth. He moans as you suck his cock and jerk it off with one hand. He reaches over your body with one arm and starts rubbing and fingering your pussy.'
+				'You climb off him as he pulls down his pants and underwear, his massive cock springing free. He''s not as big as his uncle, but he''s not that much smaller either. You grab hold of it and can''t even wrap your fingers all the way around it as you start jerking him off. You then lean over and start sucking on the head as you slowly work your mouth lower, his monstrous dick causing your jaw to stretch as you take him into your mouth.'
+				'He moans as you suck his cock and jerk it off with one hand, reaches over to start teasing your pussy.'
 				*nl
 				if stat['think_virgin'] = 1:
-					'His fingers probe your virgin pussy carefully, careful not to break your hymen.'
-					'He alternates between rubbing your clit and fingering your pussy, as you start getting aroused and wet, he starts pulling his wet fingers out of your pussy and rubbing them on your asshole, after several times of that he starts to finger your asshole as well, it seems he shares another thing with his uncle as well, love of anal sex.'
-				end
+					'His fingers gently probe your virgin pussy, careful not to break your hymen.'
+				end	
+				'He alternates between rubbing your clit and fingering your pussy. As you start getting wet, he pulls his fingers out of your pussy and starts rubbing them on your asshole before he starts fingering your backdoor as well.'
 				gs 'arousal', 'bj', 5
 				gs 'arousal', 'hj', -5
 				gs 'arousal', 'vaginal_finger', -5
@@ -272,7 +290,8 @@ if $ARGS[0] = 'djibril_taxi_sex':
 						gs 'boyStat', 'A82'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi4.jpg"></center>'
-						'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls your by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside. He steps up between your lower legs, you feel the tip of his cock rubbing against your wet slit, then he pushes it in slowly. You feel your pussy stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking you.'
+						'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs.'
+						'You feel the tip of his huge cock rubbing against your wet slit before he slowly pushes it in. You feel your pussy stretching and filling as he pushes his <<dick>>cm <<$dick_girth>> dick inside you, moaning loudly as he pushes himself deep. He wastes no time before he starts fucking you.'
 						gs 'arousal', 'vaginal', 5, 'rough'
 						gs 'stat'
 						act 'Pussy pounding':
@@ -280,14 +299,15 @@ if $ARGS[0] = 'djibril_taxi_sex':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi5.jpg"></center>'
 							if analplugin = 1:
-								'He pulls nearly the full length of his shaft after you, before burying himself balls deep in your twat. His balls slap against your clit with every thrust, you can''t help but loudly moan and sometimes gasp a bit as he thrusts inside of you. He might not be as big as his uncle but he is way rougher about it. After several more minutes of fucking you hard and deep, he pulls all the way out of you, leaving you with a sudden empty feeling. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
+								'He pulls nearly the full length of his shaft out of you before burying himself balls deep. You can''t help but loudly moan and sometimes gasp as he thrusts himself inside you. He might not be as big as his uncle, but he''s way rougher.'
+								'After several minutes, he pulls all the way out of you, suddenly leaving you feeling very empty. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
 								if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-								'He grabs your butt cheeks with both hands and spreads them wide and then spits in your gaping asshole.'
+								'He grabs your ass cheeks with both hands and spreads them wide before he spits on your gaping asshole.'
 							else
-								'He pulls nearly the full length of his shaft after you, before burying himself balls deep in your twat. His balls slap against your clit with every thrust, you can''t help but loudly moan and sometimes gasp a bit as he thrusts inside of you. He might not be as big as his uncle but he is way rougher about it. After several more minutes of fucking you hard and deep, he pulls all the way out of you, leaving you with a sudden empty feeling.'
-								*nl
-								if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-								'He grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole.'
+								'He pulls nearly the full length of his shaft out of you before burying himself balls deep. You can''t help but loudly moan and sometimes gasp as he thrusts himself inside you. He might not be as big as his uncle, but he''s way rougher.'
+								'After several minutes, he pulls all the way out of you, suddenly leaving you feeling very empty.'
+								if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+								'He grabs your ass cheeks with both hands and spreads them wide before spitting on your asshole.'
 							end
 							gs 'arousal', 'vaginal', 5, 'rough'
 							gs 'stat'
@@ -307,21 +327,23 @@ if $ARGS[0] = 'djibril_just_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi6.jpg"></center>'
 	if analplugin = 1:
-		'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours in the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls you by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
+		'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
 		*nl
-		if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-		'He grabs your butt cheeks with both hands and spreads them wide and then spits into your gaping asshole. Moments later you feel the slick head of his dick pressed against your gaping anus. His dick slides in fairly easily into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+		'He grabs your ass cheeks with both hands and spreads them wide before spitting on your gaping asshole. Moments later, you feel the slick head of his dick pressing against your gaping asshole. His dick slides in fairly easily and you feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you.'
+		'You moan and groan loudly as he pushes himself deep inside you. He wastes no time and starts roughly fucking your asshole.'
 	else
-		'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours in the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls you by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside.'
+		'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs.'
 		*nl
-		if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-		'He steps up between your lower legs and grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole. Moments later you feel the slick head of his dick pressed against your anus. The tip of his dick presses against your asshole until it finally painfully parts and lets his dick slide in, you gasp in pain. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+		'He steps up between your lower legs and grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole. He then presses his dick against your asshole until it painfully parts and lets his dick slide in, causing you to gasp in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you.'
+		'You moan and groan loudly as he pushes himself deep inside you. He wastes no time and starts roughly fucking your asshole.' 
 	end
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'arousal', 'auto_lube', 'anal'
 	gs 'stat'
 	act 'Get butt fucked': gt 'olutaxi', 'djibril_taxi_sex_anal1'
-	act 'Take Selfie': gt 'olutaxi', 'djibril_selfie_anal'
+	act 'Take selfie': gt 'olutaxi', 'djibril_selfie_anal'
 end
 
 if $ARGS[0] = 'djibril_taxi_sex_anal':
@@ -331,14 +353,14 @@ if $ARGS[0] = 'djibril_taxi_sex_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi6.jpg"></center>'
 	if analplugin = 1:
-		'Moments later you feel the slick head of his dick pressed against your gaping anus. His dick slides in fairly easy into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		'Moments later, you feel the slick head of his dick pressing against your gaping anus. His dick slides in fairly easy into your gaping hole, your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. You moan and groan loudly as he pushes himself deep inside you. He wastes no time before he starts roughly fucking your asshole.'
 	else
-		'Moments later you feel the slick head of his dick pressed against your anus. The tip of his dick presses against your asshole until it finally painfully parts and lets his dick slide in, you gasp in pain. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		'Moments later, you feel the slick head of his dick pressing against your anus until it painfully parts and lets his dick slide in, causig you to gasp in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. You moan and groan loudly as he pushes himself deep inside you. He wastes no time before he starts roughly fucking your asshole.'
 	end
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'stat'
 	act 'Get butt fucked': gt 'olutaxi', 'djibril_taxi_sex_anal1'
-	act 'Take Selfie': gt 'olutaxi', 'djibril_selfie_anal'
+	act 'Take selfie': gt 'olutaxi', 'djibril_selfie_anal'
 end
 
 if $ARGS[0] = 'djibril_selfie_anal':
@@ -347,7 +369,8 @@ if $ARGS[0] = 'djibril_selfie_anal':
 	djibrilphoto[1] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/phone/djibril/1.jpg"></center>'
-	'As Djibril very large black dick violates your ass, you grab your phone out of your purse. You try to focus but the hard pounding your ass is receiving makes that difficult. You finally manage to get the phone up in front of your face and you take a selfie, you take several more. Djibril seems unaware of maybe he just doesn''t care that you are taking selfies while he ploughs your ass. You take a look at the selfies you took, yep all of them show your mixture of pain and pleasure from the ass pounding you are taking. You pick the one you like the most and save it, while deleting the rest.'
+	'As Djibril violates your ass, you grab your phone out of your purse. You try to focus, but the hard pounding your ass is receiving makes that difficult. You finally manage to get the phone up in front of your face and take several selfies. Djibril is either unaware or just doesn''t care.'
+	'You take a look at the selfies you took before you pick the one you like the most and save it while deleting the rest.'
 	gs 'arousal', 'anal', 2, 'exhibitionism'
 	gs 'arousal', 'auto_lube', 'anal'
 	gs 'stat'
@@ -359,24 +382,26 @@ if $ARGS[0] = 'djibril_taxi_sex_anal1':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi7.jpg"></center>'
-	'He reaches up and grabs your hip, getting a really firm grip on you, he starts to pick up his efforts and really hammer away at your asshole, he starts grunting and panting soon after. You don''t think he is going to last much longer, yet he keeps going for a couple of more minutes. Until he finally pulls out of your ass. As he does he pushes you down on your side.'
+	'He reaches up and grabs your hip, getting a really firm grip on you as he starts to pick up the pace and really hammer away at your asshole. He starts grunting and panting soon after and you don''t think he''s going to last much longer, yet he keeps going until he finally pulls out of you and pushes you down on your side.'
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'stat'
-	act 'Cum prize':
+	act 'Continue':
 		*clr & cla
 		DjibrilQW['invite'] = 1
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi8.jpg"></center>'
-		'He crawls inside, kneeling next to where you lay on your side on the seat, with your butt facing the front. He starts jerking off and soon you feel his cum splattering all over you butt cheek. Spurt after spurt coats your butt, until finally they stop and he groans loudly one last time. He then leans down and kisses you, then whispers in your ear. "That was amazing I can''t wait to do that again." After that he steps back outside and grabs his clothes and starts dressing in the alleyway.'
+		'He crawls inside and kneels next to you before he starts jerking off and you soon feel his cum splattering all over your ass. Spurt after spurt coats you until they finally stop and he groans loudly one last time. He then leans down and kisses you before he whispers in your ear. "That was amazing! I can''t wait to do that again."'
+		'He then steps back outside, grabs his clothes and starts dressing in the alleyway.'
 		*nl
-		'You use a tissue in the back of the van to clean his cum off your butt as best you can before you start getting dressed again. He is done dressing long before you are and he just stands there with a big grin, again reminding you of his uncle as he watches you finished getting dressed. Once you are full dresses you climb out of the van, he closes the door and locks it again. "Well I should get these keys back to my uncle so he can work again. I hope to see you again, come see me at the dorms at the University some time."'
-		'You smile to him. "Maybe I will." Then he heads back to the train station and you head back to the street.'
+		'You use a tissue in the back of the van to clean his cum off you as best you can before you start getting dressed. He''s done dressing long before you and just stands with a big grin on his face, again reminding you of his uncle as he watches you finished getting dressed.'
+		'Once you''re fully dressed, you climb out of the van and he closes the door and locks it. "I should get these keys back to my uncle so he can work again. Come see me at the university dorms some time."'
+		'You smile at him and nod before he heads back to the train station and you head back to the street.'
 		gs 'arousal', 'anal', 2, 'rough'
 		gs 'cum_call', 'butt', 'A82'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train_hall'
+		act 'Leave': minut += 3 & gt 'pav_train_hall'
 	end
 end
 
@@ -384,11 +409,12 @@ if $ARGS[0] = 'olu_taxi_sex':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	npc_rel['A55'] +=1
+	npc_rel['A55'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_chat.jpg"></center>'
-	'You think a moment and figure why not, you could use a good fucking and Olu is always good for that. "Sure let''s go." You tell him.'
-	'He grins as he gets up and leads you out of the station, down the street and around the corner into the alley he parks his taxi. Once you get to the taxi he unlocks the side door and lets you get in first. Once you are inside he gets in after you and closes the door, taking a seat next to you. He promptly pulls your leg over his and rests his other hand on your inner thigh and starts to rub your leg slowly up towards your crotch. After he seems content that you are turned on he starts unbuttoning his pants.'
+	'You think about it before nodding. "Sure. Let''s go."'
+	'He grins as he gets up and leads you out of the station, down the street and around the corner into the alleyway where he parks his taxi. He unlocks the side door and you both climb inside before he closes the door. He promptly rests his hand on your inner thigh and starts rubbing your leg, slowly working up towards your crotch.' 
+	'Content that you''re aroused, he starts unbuttoning his pants.'
 	gs 'arousal', 'foreplay', 2
 	gs 'stat'
 	act 'Change your mind':
@@ -396,40 +422,41 @@ if $ARGS[0] = 'olu_taxi_sex':
 		minut += 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-		'You pull his hand way from your crotch and close your legs. "Sorry, I can''t, I thought i did but I can''t"'
-		'He looks confused and then concerned. "Everything ok?"'
-		'You nod. "Yeah it''s fine, I just can''t not today. I should really go." You say as you move past him to the door and open it. After you climb out he climbs out after you and closes the door.'
-		'He locks the van back up. "Ok maybe another day then."'
-		'You nod to him. "Sure maybe another day." Then you walk off.'
+		'You pull his hand way and close your legs. "Sorry, I can''t! I thought I did, but I can''t."'
+		'He looks confused, then concerned. "Everything okay?"'
+		'You nod. "Yeah, it''s fine, I just can''t. I should really go," you reply as you climb over him and open the door.'
+		'He climbs out after you and closes the door before locking it. "Okay. Maybe another day then."'
+		'"Sure," you nod before walking away.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train_hall'
+		act 'Leave': minut += 3 & gt 'pav_train_hall'
 	end
 	act 'Blow him':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi1.jpg"></center>'
-		'He pulls his dick out which is already getting hard. Next he starts alternating between taking your clothes off and his clothes, you help him undress yourself and him. Once he is naked and you are mostly naked, he kneels on the seat and pulls your head over towards his crotch. You turn and get down on all fours on the seat, opening your mouth you take his large cock into it. Your jaws stretch as wide as they can in an effort to accommodate his massive dick. With one hand you start playing with his balls as you bob your head back and forth on his dick.'
+		'You help each other undress, his cock slowly growing hard as he kneels on the seat and pulls you over. Your jaw stretches as wide as it can to accommodate his massive dick as you start bobbing your head back and forth as you fondle his balls with your hand.'
 		gs 'arousal', 'bj', 5
 		gs 'stat'
-		act 'Keep sucking him':
+		act 'Keep sucking':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi3.jpg"></center>'
-			'You try and take as much of his cock into your mouth as you can but you can only get about a third of the way down his shaft before you start to gag on it. He moans in pleasure anyway from your efforts to take more of him into your mouth. He starts to rub his hand up and down your spine gentle caressing you as you suck on his dick. You can tell he is wanting to fuck you, as his hands start roaming your body more and more, he hasn''t yet tried to force your to turn around but you know it is coming.'
+			'You try and take as much of his cock into your mouth as you can, but you can only get about a third of the way down his shaft before you start to gag on it.'
+			'He moans in pleasure anyway as he starts to rub his hand up and down your spine, gently caressing you as you suck on his dick. You can tell he''s eager to fuck you as his hands start roaming your body.'
 			gs 'arousal', 'bj', 5
 			gs 'stat'
-			if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
+			if stat['think_virgin'] = 0: act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
 			act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
 
 			gs 'willpower', 'bj', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Just a BJ (<<will_cost>> Willpower)':
+				act 'Just a blowjob (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-					'You decide you don''t feel like fucking today and just want to suck him off. So you climb off the seat and squat in the floor instead and keep sucking his dick, so as not to tempt him to try and turn you around. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
+					'You don''t feel like it today, so you climb off the seat and squat on the floor as you keep sucking his dick. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'stat'
 					act 'Suck him off':
@@ -437,20 +464,21 @@ if $ARGS[0] = 'olu_taxi_sex':
 						minut += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-						'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+						'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+						'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 						*nl
-						'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-						'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-						'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+						'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+						'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+						'He nods and the two of you head off in separate directions.'
 						gs 'arousal', 'bj', 5
 						gs 'cum_call', 'mouth', 'A55'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':minut += 3 & gt 'pav_train_hall'
+						act 'Leave': minut += 3 & gt 'pav_train_hall'
 					end
 				end
 			else
-				act 'Just a BJ (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Just 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', 'cuni', 'force', 'easy'
@@ -460,10 +488,11 @@ if $ARGS[0] = 'olu_taxi_sex':
 				gs 'willpower', 'pay', 'force'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi2.jpg"></center>'
-				'You stop sucking his dick and instead lay back on the seat and spread your legs wide, exposing your glistening wet pussy to him. He understands what you want, without you even having to ask. He kneels down on the floor, leaning forward, placing his head between your legs, he begins to lick, kiss and suck on your clit. He alternates between that and sliding his tongue between your pussy lips to tongue fuck you as best he can. You feel yourself getting wetter and wetter from his ministrations. Eventually he uses a hand to rub your clit as well, you can tell by his movements he is about to try and fuck you.'
+				'You stop sucking his dick and sit back on the seat and spread your legs wide, exposing your glistening wet pussy to him. He understands what you want without you even having to ask and kneels on the floor before leaning forward and placing his head between your legs.'
+				'He starts alternating between sucking on your clit and sliding his tongue between your pussy lips to tongue fuck you as best he can. You feel yourself getting wet as he starts using a hand to rub your clit as well. You can tell that he''s now eager to fuck you.'
 				gs 'arousal', 'cuni', 5
 				gs 'stat'
-				if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
+				if stat['think_virgin'] = 0: act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
 				act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
 				gs 'willpower', 'bj', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -472,7 +501,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-						'You decide you don''t feel like fucking today and just want to suck him off. Before he can raise up and climb between your legs, you pull away from him enough he stops licking your twat. You get off the seat and squat in the floor, encouraging him to get back up. Once he kneels back on the seat you lean forward and start sucking his dick again. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
+						'You don''t feel like it today, so you pull away from him and squat on the floor while encouraging him to get back up. Once he sits back on the seat, you lean forward and start sucking his dick again, forcing yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 						gs 'arousal', 'bj', 5
 						gs 'stat'
 						act 'Swallow his cum':
@@ -480,16 +509,17 @@ if $ARGS[0] = 'olu_taxi_sex':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-							'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+							'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+							'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 							*nl
-							'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-							'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-							'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+							'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+							'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+							'He nods and the two of you head off in separate directions.'
 							gs 'arousal', 'bj', 5
 							gs 'cum_call', 'mouth', 'A55'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':minut += 3 & gt 'pav_train_hall'
+							act 'Leave': minut += 3 & gt 'pav_train_hall'
 						end
 					end
 				else
@@ -508,7 +538,8 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 	gs 'boyStat', 'A55'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi6.jpg"></center>'
-	'As you lay on your back on the seat, with your legs spread. Olu kneels between your legs and rubs the tip of his dick against your wet slit, he rubs it back and forth until the head of his cock and your pussy lips are nice and wet. Then he slow pushes his <<dick>>cm <<$dick_girth>> dick inside of you, you feel your twat stretching as his monstrous cock invades your body. It leaves you feeling completely full, he starts fucking you slow and steady at first. Not going too deep, but slowly starting to work himself just a little deeper with each stroke.'
+	'As you lay back on the seat with your legs spread, Olu kneels between your legs and rubs the tip of his dick against your wet slit before he slowly pushes his <<dick>>cm <<$dick_girth>> dick inside you.'
+	'You feel your pussy stretching as his monstrous cock invades your body, leaving you feeling completely full as he starts fucking you, slowly working himself just a little deeper with each thrust.'
 	gs 'arousal', 'vaginal', 5
 	gs 'stat'
 	act 'Get fucked':
@@ -516,9 +547,11 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi7.jpg"></center>'
 		if analplugin = 1:
-			'He starts fucking you deeper and faster, he goes as deep into as you can take. When you show signs of discomfort he backs off a little, but eventually as he starts getting into it again he starts to go deeper and harder again. You can''t help but moan loudly as he dick stretches and fills your pussy in every way. As you get used to his length and girth it steadily feels better and better, until it starts feeling amazing. Which only encourages him to fuck you harder and deeper. Several minutes goes by, before he pulls out of you. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again, you can feel the head of his dick rubbing against your gaping anus, you know he wants to fuck you in the butt now.'
+			'He starts fucking you deeper and faster, going as deep you can take. When you show signs of discomfort, he backs off a little, but eventually starts getting into it and starts going deeper and harder again. You can''t help but moan loudly as his dick stretches and fills your pussy, which only encourages him to fuck you harder and deeper.'
+			'Several minutes goes by before he pulls out of you and you feel him grab your buttplug and pull it out, leaving your ass feeling empty, craving to be filled again before you feel the head of his dick rubbing against your gaping asshole.'
 		else
-			'He starts fucking you deeper and faster, he goes as deep into as you can take. When you show signs of discomfort he backs off a little, but eventually as he starts getting into it again he starts to go deeper and harder again. You can''t help but moan loudly as he dick stretches and fills your pussy in every way. As you get used to his length and girth it steadily feels better and better, until it starts feeling amazing. Which only encourages him to fuck you harder and deeper. Several minutes goes by, before he pulls out of you. Moments later you can feel the head of his dick rubbing against your anus, you know he wants to fuck you in the butt now.'
+			'He starts fucking you deeper and faster, going as deep you can take. When you show signs of discomfort, he backs off a little, but eventually starts getting into it and starts going deeper and harder again. You can''t help but moan loudly as his dick stretches and fills your pussy, which only encourages him to fuck you harder and deeper.'
+			'Several minutes goes by before he pulls out of you. Seconds later, you feel the head of his dick rubbing against your asshole.'
 		end
 		gs 'arousal', 'vaginal', 5
 		gs 'stat'
@@ -527,8 +560,9 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 			gs 'boyStat', 'A55'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi8.jpg"></center>'
-			if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-			'You just lay there letting him rub the tip of his dick against your asshole, he makes sure it and his dick is nice and slick. Once he is sure of that he gently pushes his <<dick>>cm <<$dick_girth>> cock up your butthole. It stretches until it feels like it can''t stretch anymore and then he is inside you slowly fucking your butt. You moan and groan in a mixture of pleasure and pain, he is slow and easy giving you time to get used to him. As you do though and your moans of pleasure get louder he starts fucking you a little deeper and a little faster.'
+			if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+			'You just lay there letting him rub the tip of his dick against your asshole before he gently pushes his <<dick>>cm <<$dick_girth>> cock up your ass. It stretches you wide as he slowly starts fucking your ass.'
+			'You moan and groan in a mix of pleasure and pain as he gently thrusts, but starts fucking you a little deeper and a little faster as your moans of pleasure get louder.'
 			gs 'arousal', 'anal', 5
 			gs 'arousal', 'auto_lube', 'anal'
 			gs 'stat'
@@ -536,37 +570,38 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi9.jpg"></center>'
-				'As he fucks your butt you start rubbing your clit to add to the pleasure you are feeling. He looks down at you as he loams over you, plowing your ass, as he does he stares right into your eyes and you feel a bit of a connection with him as you stare back into his eyes and the pleasure starts to really build up in you.'
+				'You start rubbing your clit to add to the pleasure you''re feeling. He looks down at you as he loams over you and stares right into your eyes. You feel a bit of a connection with him as you stare back and the pleasure starts to really build up in you.'
 				gs 'arousal', 'anal', 5
 				gs 'arousal', 'vaginal_finger', -5
 				gs 'stat'
-				act 'Cum prize':
+				act 'Continue':
 					*clr & cla
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi13.jpg"></center>'
-					'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, you grab his dick with one hand and start jerking it off. Opening your mouth you aim his dick at your face and before long, large spurts of his cum hits you in the face, some of it goes into your mouth, by the time the spurts of sperm stop you have a lot in your mouth and covering your face. As his dick starts to go limp in your hand you swallow the cum in your mouth. After that you both start getting dressed again.'
+					'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, grabbing his dick in your hand and jerking him off. Opening your mouth, large spurts of his cum hits you in the face while others shoot into your mouth. As his dick starts to go limp in your hand, you swallow the cum in your mouth.'
+					'He starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 					*nl
-					'He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-					'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-					'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+					'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+					'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+					'He nods and the two of you head off in separate directions.'
 					gs 'arousal', 'hj', 2
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end
 		gs 'willpower', 'bj', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Just a BJ (<<will_cost>> Willpower)':
+			act 'Just a blowjob (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-				'You decide you don''t feel like getting butt fucked today and just want to suck him off instead. So when he pulls his dick out of you, you climb off the seat, and squat in the floor instead. He gets up on his knees obviously knowing you want to suck his dick again. You start sucking on his dick and you can taste your own pussy juices on his cock. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his dick.'
+				'You don''t feel like getting butt fucked today. When he pulls out of you, you climb off the seat and squat on the floor instead. He gets up on his knees and you start sucking his dick, forcing yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 				gs 'arousal', 'bj', 5, 'deepthroat'
 				gs 'stat'
 				act 'Suck him off':
@@ -574,20 +609,21 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-					'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+					'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+					'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 					*nl
-					'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he wait for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-					'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-					'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+					'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+					'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+					'He nods and the two of you head off in separate directions.'
 					gs 'arousal', 'bj', 5
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		else
-			act 'Just a BJ (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Just 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
 end
@@ -598,20 +634,20 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi10.jpg"></center>'
 	if analplugin = 1:
-		'He grabs you in his strong hands and spins you around, still on your hands and knees but facing away from him. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again, you can feel the head of his dick rubbing against your gaping anus. He pushes your head down until it rests on the seat along with your knees.'
+		'He grabs you in his strong hands and spins you around before you feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again as you feel the head of his dick rubbing against your gaping ashole.'
 		if mc_inventory['lubricant'] > 0:
-			'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
+			'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
 		else
-			'With his other hand he rubs your wet twat, until his fingers are nice and wet with your pussy juices and then he uses that to get your asshole and his dick nice and slick.'
-			'His dick slides fairly easy into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. He starts slowly fucking your butt, not too deep, just slow easy short strokes. As your moans turn to pleasure he picks up the pace a little and goes a little deeper, but still fairly gentle letting you get used to his massive cock.'
+			'He rubs your pussy with his hand until his fingers are wet with your pussy juices, which he uses as lube.'
+			'His dick easily slides into your gaping hole and you feel your ass stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. He starts slowly fucking your ass, being careful not to go too fast or too deep. As your moans grow louder, he picks up the pace a little and goes a little deeper, letting you get used to his massive cock.'
 		end
 	else
-		'He grabs you in his strong hands and spins you around, still on your hands and knees but facing away from him. You can feel the head of his dick rubbing against your gaping anus. He pushes your head down until it rests on the seat along with your knees.'
+		'He grabs you in his strong hands and spins you around before you feel the head of his dick rubbing against your asshole.'
 		if mc_inventory['lubricant'] > 0:
-			'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
+			'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
 		else
-			'With his other hand he rubs your wet twat, until his fingers are nice and wet with your pussy juices and then he uses that to get your asshole and his dick nice and slick.'
-			'The head of his cock presses against your anus, the pressure building until it painfully pops into your ass, causing you to hiss in pain. He stops moving at once until he feels you relax, the he starts to slowly fuck your butt. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. He doesn''t go too deep, just slow easy short strokes. As your moans turn from pain to pleasure he picks up the pace a little and goes a little deeper, but still fairly gentle letting you get used to his massive cock.'
+			'He rubs your pussy with his hand until his fingers are wet with your pussy juices, which he uses as lube.'
+			'The head of his cock presses against your asshole, the pressure building until it painfully pops into your ass, causing you to hiss in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. He starts slowly fucking your ass, being careful not to go too fast or too deep. As your moans grow louder, he picks up the pace a little and goes a little deeper, letting you get used to his massive cock.'
 		end
 	end
 	gs 'arousal', 'anal', 5
@@ -621,32 +657,33 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi11.jpg"></center>'
-		'He leans over you and starts fucking you a bit harder, a bit faster and a bit deeper. He takes a firm grip on your hip with his large powerful hand and holds you in place rather well, so you can''t really pull away form him or his giant cock as he pumps it into your asshole. You briefly wonder if anyone might look down the alleyway and see in through the windows and guess what is happening or maybe walk down to take a closer look, but soon you find it harder and harder to focus on anything but the dick splitting your ass.'
+		'He leans over you and starts fucking you a little harder and a little deeper. He takes a firm grip on your hip with his large powerful hand and holds you in place, so you can''t pull away from him or his giant cock as he thrusts it into your asshole. You briefly wonder if anyone might look down the alleyway and see what''s happening, but soon you find it harder and harder to focus on anything but the dick splitting your ass.'
 		gs 'arousal', 'anal', 5
 		gs 'stat'
 		act 'Pound that ass':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi12.jpg"></center>'
-			'As he starts to grunt he picks up the speed and starts fucking your butt harder and faster, forcing himself deep and deeper up your ass. He doesn''t slown down or back off until he notices your moans start to turn from moans of pleasure back to groans of pain. Then he backs off a little and finds the sweet spot, to go as deep as he can with out hurting you and as fast as you can handle and still moan in pleasure.'
+			'He picks up the speed and starts fucking your ass harder and faster, forcing himself deeper up your ass. He doesn''t slow down until he notices you groaning in pain, backing off a little and finding the sweet spot, going as deep and as fast as he can without hurting you.'
 			gs 'arousal', 'anal', 5
 			gs 'stat'
-			act 'Cum prize':
+			act 'Continue':
 				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi13.jpg"></center>'
-				'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, you grab his dick with one hand and start jerking it off. Opening your mouth you aim his dick at your face and before long, large spurts of his cum hits you in the face, some of it goes into your mouth, by the time the spurts of sperm stop you have a lot in your mouth and covering your face. As his dick starts to go limp in your hand you swallow the cum in your mouth. After that you both start getting dressed again.'
+				'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, grabbing his dick in your hand and jerking him off. Opening your mouth, large spurts of his cum hits you in the face while others shoot into your mouth. As his dick starts to go limp in your hand, you swallow the cum in your mouth.'
+				'He starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 				*nl
-				'He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-				'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-				'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+				'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+				'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+				'He nods and the two of you head off in separate directions.'
 				gs 'arousal', 'hj', 2
 				gs 'cum_call', 'mouth', 'A55'
 				gs 'cum_call', 'face', 'A55'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train_hall'
+				act 'Leave': minut += 3 & gt 'pav_train_hall'
 			end
 		end
 	end

+ 3 - 1
locations/panties.qsrc

@@ -209,6 +209,7 @@ if $ARGS[0] = 'view_panty_item':
 	!! ARGS 1 = action type (draw, shop)
 	!! ARGS 2 - panty type
 	!! ARGS 3 - panty index
+	!! ARGS 4 - price modifier (0-100, taken as %) {OPTIONAL}
 	
 	cla
 	'<center><img src="<<FUNC(''$panty_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -225,7 +226,7 @@ if $ARGS[0] = 'view_panty_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = PanPrice
+			price = PanPrice + (PanPrice * ARGS[4]) / 100
 			'Price: <<PanPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
@@ -254,6 +255,7 @@ if $ARGS[0] = 'view_panty_item':
 				else
 					'You do not own the matching bra, you can buy it and these panties together as a set.'
 					price_set = PanPrice*18/10
+					price_set += (price_set * ARGS[4]) / 100
 					'Price for set: <<price_set>> <b>₽</b>'
 					if money >= price_set:
 						act 'Buy set (cash)':

File diff suppressed because it is too large
+ 565 - 458
locations/pav_disco.qsrc


File diff suppressed because it is too large
+ 145 - 262
locations/pav_disco_sex.qsrc


+ 3 - 2
locations/pav_hotelReception.qsrc

@@ -586,9 +586,10 @@ if $ARGS[0] = 'pavgenprosmf':
 	pavproscount += 1
 	guy += 1
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
-	gs'stat'
-	gs 'npcgeneratec', '0', '', rand(18,40)
+	gs 'stat'
+	gs 'npcgeneratec', 0, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated
+
 	'The customer introduces himself as <<$boydesc>>.'
 	'Then you both get undressed and you start doing your job.'
 	picrand = rand(0, 14)

+ 1 - 0
locations/pav_parkev.qsrc

@@ -619,6 +619,7 @@ if $ARGS[0] = 'gopgirls':
 	'Lena, Lera, Alyona and Anushka are sitting at a picnic table, drinking beers and smoking cigarettes and weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away':gt 'pav_park', 'deeper_park'
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys, mind if I join you?"'
 		if grupTipe = 5:
 			'Lena and Lera give you a look of disgust. "Get lost, loser!" Alyona ignores you, and Anushka sighs, but you can''t tell if the sigh is directed at you or the other girls.'

File diff suppressed because it is too large
+ 168 - 178
locations/pav_pharmacy.qsrc


+ 20 - 11
locations/pav_pool.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'Pavlovsk''s public swimming pool is rather dated, but still serves it''s purpose quite well.'
-		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs you 60 <b>₽</b>.'
+		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs them 60 <b>₽</b>.'
 		if SchoolAtestat = 0:
 			pav_swimpool['entrancefee'] = 60
 		else
@@ -54,11 +54,20 @@ if $ARGS[0] = 'entrance':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 	'You''re currently inside the entrance to the swimming pool.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
+	'From here, you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
 	*nl
-	'There is a sign by the store''s entrance that reads: "If closed, I''m working in the pool. Be back soon." It seems like the store clerk is also the janitor.'
-
-	act 'Leave': gt 'pav_pool', 'building'
+	'There''s a sign by the store''s entrance that reads: "If closed, I''m working in the pool. Be back soon." It seems like the store clerk is also the janitor.'
+	act 'Leave':
+		if PCloswimwear = 1:
+			cla
+			'You need to change out of your swimwear if you want to leave!'
+			act 'Return': gt 'pav_pool', 'entrance'
+		else
+			minut += 2
+			gs 'stat'
+			gt 'pav_pool', 'building'
+		end
+	end
 end
 
 if $ARGS[0] = 'store':
@@ -149,8 +158,8 @@ if $ARGS[0] = 'lockerfemale':
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/lockers.jpg"></center>'
-	'The changing rooms are old and murky. They are uncomfortable, cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
+	'The changing rooms are old, murky and uncomfortable. They''re also very cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
+	'From here, you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
 
 	if func('changingroom','count_swim_item') > 0 or $clothingworntype = 'nude':
 		act 'Change your clothes':
@@ -191,7 +200,7 @@ if $ARGS[0] = 'lockerfemale':
 	if $clothingworntype <> 'nude': act 'Strip all clothing': gs 'clothing', 'strip_all' & gt 'pav_pool', 'lockerfemale'
 
 	act 'Leave':
-		if PCloswimwear = 1 or $clothingworntype = 'nude':
+		if $clothingworntype = 'nude':
 			cla
 			'You need to get dressed first!'
 			act 'Return': gt 'pav_pool', 'lockerfemale'
@@ -304,13 +313,13 @@ if $ARGS[0]= 'cafeteria':
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteria<<rand(1,2)>>.jpg"></center>'
 	'The cafeteria doesn''t have a lot on the menu and only offers some basic snacks.'
-	'Two girls are currently ordering from the cashier.'
+	'Two girls in bikinis are currently ordering from the cashier.'
 
 	act 'Order':
 		*clr & cla
 		minut += 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteriaturn.jpg"></center>'
-		'It''s finally your turn and you sit on one of the stools while you order.'
+		'It''s finally your turn and you take a seat on one of the stools.'
 
 		if money < 100:
 			'You don''t have enough money to buy a snack.'
@@ -396,7 +405,7 @@ if $ARGS[0] = 'pool':
 	end
 
 	'The pool is rather old, but still has a certain charm to it. The wall to wall windows allow for a nice atmosphere during the day and there is an upper balcony where people often watch from above.'
-	'From here you can access the female locker room.'
+	'From here, you can access the female locker room.'
 	if hour >= 8 and hour < 21:
 		act 'Climb into the pool':
 			*clr & cla

+ 45 - 47
locations/pav_pool_events.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'store_simsuit_buy':
 				'Your purse is empty. "Well, I don''t have anything..."'
 			end
 			*nl
-			'"I have a....suggestion. If you let me see you naked, then I''ll give it to you, free of charge..." he says with a perverted smile.'
+			'"I have a.... suggestion. If you let me see you naked, then I''ll give it to you, free of charge..." he says with a perverted smile.'
 			'You look at him perplexed, but he just keeps smiling at you.'
 			gs 'willpower', 'humiliation', 'self'
 			if will_cost > pcs_willpwr:
@@ -193,10 +193,10 @@ if $ARGS[0] = 'locker_clothed_to_nude':
 	minut += 3
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your clothes off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -217,10 +217,10 @@ if $ARGS[0] = 'locker_swim_to_nude':
 	!!stage = 1
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your swimwear off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -240,10 +240,10 @@ if $ARGS[0] = 'locker_nude_to_clothed':
 	minut += 5
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you change back into your clothes, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -263,10 +263,10 @@ if $ARGS[0] = 'locker_nude_to_swim':
 	menu_off = 1
 	minut += 2
 
-	if rand(0, 9)=0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you put your swimwear on, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -287,12 +287,12 @@ if $ARGS[0] = 'locker_clothed_to_swim':
 	minut += 5
 	gs 'stat'
 
-	temp_rand = rand(0, 9)
+	temp_rand = rand(0,9)
 	! Clothed to nude
 	if temp_rand = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your clothes off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -303,7 +303,7 @@ if $ARGS[0] = 'locker_clothed_to_swim':
 	elseif temp_rand = 1:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you put your swimwear on, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -324,12 +324,12 @@ if $ARGS[0] = 'locker_swim_to_clothed':
 	minut += 6
 	gs 'stat'
 
-	temp_rand = rand(0, 9)
+	temp_rand = rand(0,9)
 	! Swim to nude
 	if temp_rand = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your swimwear off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -341,7 +341,7 @@ if $ARGS[0] = 'locker_swim_to_clothed':
 	elseif temp_rand = 1:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you change back into your clothes, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -382,7 +382,7 @@ end
 
 if $ARGS[0]= 'relaxedswim':
 	minut += 15
-	if pcs_sweat > 10: pcs_sweat = 10 + rand(0, 4)
+	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/relaxedswim2.jpg"></center>'
 	act 'Continue': gt 'pav_pool', 'poolwater'
@@ -394,7 +394,7 @@ if $ARGS[0]= 'relaxedswim':
 		'The pool is mostly used by families with children and older people at this time. It''s still quiet enough for you to enjoy your swim undisturbed.'
 		pcs_mood += 5
 		temp_rand = rand(1,10)
-		if     temp_rand = 1:
+		if temp_rand = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'kidsplash'
 
@@ -428,7 +428,7 @@ if $ARGS[0]= 'relaxedswim':
 		end
 	elseif hour >= 18 and hour < 21:
 		'Given how late in the evening it is, only a few adults are in the water, so you enjoy your swim undisturbed.'
-		if rand(1, 15) = 1:
+		if rand(1,15) = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -444,13 +444,13 @@ if $ARGS[0]= 'exerciseswim':
 	if hour >= 8 and hour < 10:
 		'The pool is almost empty, so you enjoy your swim a lot.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 	elseif hour >= 10 and hour < 12:
 		'The pool is mostly used by families with children and older people at this time. You enjoy your swim mostly undisturbed.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 	elseif hour >= 12 and hour < 18:
@@ -479,7 +479,7 @@ if $ARGS[0]= 'exerciseswim':
 	elseif hour >= 18 and hour < 21:
 		'Given how late it is, only a few adults are in the water, so you enjoy your swim undisturbed.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 		if rand(1, 15) = 1:
@@ -516,7 +516,7 @@ if $ARGS[0]= 'dive':
 	elseif hour >= 18 and hour < 21:
 		'Given how late it is, only a few adults are in the water. You enjoy diving and seeing other people underwater with you from time to time.'
 		pcs_mood += 5
-		if rand(1, 15) = 1:
+		if rand(1,15) = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -600,7 +600,7 @@ if $ARGS[0]= 'relaxedwater':
 	elseif hour >= 18 and hour < 21:
 		'Given how late in the evening it is, only a few adults are in the pool, so you enjoy lying in the water mostly undisturbed.'
 		pcs_mood += 5
-		if rand(1, 15) = 1 and pav_swimpool['rape_event'] = 0 and hour > 20:
+		if rand(1,15) = 1 and pav_swimpool['rape_event'] = 0 and hour > 20:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -628,7 +628,7 @@ if $ARGS[0]= 'feetwater':
 	elseif hour >= 12 and hour < 18:
 		'The pool is crowded with all kinds of people and sitting here is proving not to be as relaxing as you hoped. You get splashed with water from time to time.'
 		pcs_mood -= 1
-		temp_rand = rand(1, 10)
+		temp_rand = rand(1,10)
 		if temp_rand = 1:
 			'Some children push you from behind and you fall into the water as they run away snickering loudly.'
 			minut += 3
@@ -666,7 +666,7 @@ end
 if $ARGS[0] = 'watertoplost':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
 	gs 'pav_pool_events', 'timedesc'
-	'You are topless in the water, a fact you''re trying to hide.'
+	'You''re topless in the water, a fact you''re trying to hide.'
 
 	if (hour >= 8 and hour < 12) or (hour >= 18 and hour < 21):
 		'You see the few people scattered around the pool looking at you from time to time.'
@@ -711,8 +711,7 @@ if $ARGS[0]= 'WTL_nothinghappens':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
 	gs 'pav_pool_events', 'timedesc'
-	'You wait around topless in the water for a while. You have to avoid some people from time to time, but you''re left alone.'
-	'You notice several people staring at you, but nobody disturbs you.'
+	'You wait around topless in the water for a while. You notice several people staring at you and have to avoid others from time to time, but nobody disturbs you.'
 	act 'Continue': gt 'pav_pool_events', 'watertoplost'
 end
 
@@ -805,15 +804,14 @@ if $ARGS[0]= 'WTL_boystole':
 		gs 'stat'
 		pav_swimpool['boystole'] = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/exposebreasts.jpg"></center>'
-
 		if tits <= 2:
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'He immediately surfaces with a disappointed look on his face. "I wanted to see some tits! That fat kid over there has bigger tits than you!"'
-			'He returns your bikini top and swims away. You quickly put it back on before anyone sees you, feeling a little hurt by his comments.'
+			'He tosses your bikini top at you before swimming away in frustration. You quickly put it back on before anyone sees you, feeling a little hurt by his comments.'
 		elseif tits <= 5:
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'He surfaces after a short while with a smile on his face. "Nice tits!"'
-			'He returns your bikini top and swims away. You quickly put it back on before anyone sees you.'
+			'He returns your bikini top and happily swims away. You quickly put it back on before anyone sees you.'
 		else
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'After what feels like an eternity, he finally surfaces with a huge grin on his face. "Your tits are fucking huge! They''re bigger than my head!"'
@@ -870,7 +868,8 @@ end
 if $ARGS[0] = 'approachbehind':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/approachbehindhard.jpg"></center>'
 	'You''re at the edge of the pool with your back towards the water when you suddenly feel something hard pressing against your ass. As you turn around, you notice a fat older man resting his stomach against your back with what feels like his hard dick pressing against your ass.'
-	'You turn around with a look of shocked disgust on your face and he backs off. "Sorry, I fell..." he says with a grin as he leaves.'
+	'You turn around with a look of shocked disgust on your face and he backs off.'
+	'"Sorry, I fell..." he says with a grin as he leaves.'
 	pcs_mood -= 2
 	act 'Continue': gt 'pav_pool', 'poolwater'
 end
@@ -974,7 +973,7 @@ if $ARGS[0] = 'sideflirt':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 						'You slide out of his hands, climb out of the pool and make a dash for the locker room without looking back.'
-						'"Oh come on, I''m sure you would have enjoyed it!" he shouts at you as you flee.'
+						'"Oh come on!" he shouts at you as you flee.'
 						act 'Continue': gt 'pav_pool', 'lockerfemale'
 					end
 				end
@@ -986,7 +985,7 @@ if $ARGS[0] = 'sideflirt':
 						gs 'willpower', 'pay', 'self'
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/kisswater.jpg"></center>'
-						'You decide to accept the kiss. Your lips welcome each other and soon both your tongues entangle each other in a long deep kiss while he holds your face with both hands.'
+						'You decide to accept the kiss. Your lips welcome each other and soon both your tongues entangle each other in a long deep kiss as he holds your face with both hands.'
 						pav_swimpool['kiss_event'] = 1
 						act 'Continue': gt 'pav_pool_events', 'edge_kiss'
 					end
@@ -1010,12 +1009,12 @@ if $ARGS[0] = 'edge_kiss':
 		'He seems to takes your active involvement as permission for more and you feel his hand slide into your bikini bottom as his tongue continues exploring your mouth.'
 		'He starts massaging your clit as he continues making out with you. You start becoming incredibly aroused from the pleasure.'
 	elseif pav_swimpool['kiss_event'] = 2:
-		'Thanks to your submissiviness, he starts to take your body for granted; his hand slides into your bikini bottom as his tongue continues exploring your mouth.'
+		'Thanks to your submissiveness, he starts to take your body for granted; his hand slides into your bikini bottom as his tongue continues exploring your mouth.'
 		'He starts massaging your clit as he continues to make out with you. You remain frozen in place, still unsure about what''s happening.'
 	end
 
-	temp_rand = rand(1,3)
-	if temp_rand = 1:
+	temp_rand = rand(0,2)
+	if temp_rand = 0:
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/waterleave.jpg"></center>'
@@ -1023,14 +1022,14 @@ if $ARGS[0] = 'edge_kiss':
 			'You fix your bikini bottom before climbing out of the pool and heading for the locker room. It''s getting late and you don''t really want to be here anymore.'
 			act 'Continue': gt 'pav_pool', 'lockerfemale'
 		end
-	elseif temp_rand = 2:
+	elseif temp_rand = 1:
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/blowforced.jpg"></center>'
 			'After a short while, he breaks the kiss. "Take a deep breath, you''ll need it!"'
 			'You barely manage to take a quick gulp of air before he shoves you under the water, where you''re greeted by the sight of his hard dick throbbing in front of you.'
 			if pav_swimpool['kiss_event'] = 1:
-				'He shoves his dick into your mouth and starts thrusting with great determination. You get the hint and start passionately sucking his dick.'
+				'He shoves his dick into your mouth and starts thrusting with great determination. You get the hint and start sucking his dick.'
 			elseif pav_swimpool['kiss_event'] = 2:
 				'He shoves his dick into your mouth and starts thrusting with great determination. You make efforts to break free from his grip as he fucks your unwilling mouth.'
 			end
@@ -1038,7 +1037,6 @@ if $ARGS[0] = 'edge_kiss':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cummouth.jpg"></center>'
-
 				gs 'arousal', 'bj', -3, 'rough', 'sub'
 				$orgasm_or = 'no'
 				gs 'cum_call', 'mouth', 'pool stranger', 0
@@ -1091,7 +1089,7 @@ if $ARGS[0] = 'edge_kiss':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 				'You break the kiss and quickly push yourself away from him before pulling your bikini bottom back up. "What the fuck, asshole?! I''m not some cheap whore for you to fuck!" you shout at him angrily.'
-				'"Don''t tease guys if you''re going to be such a fucking prude about it! Whatever, bitch..." he scoffs before swimming away.'
+				'"Don''t tease guys if you''re going to be such a fucking prude about it then! Whatever, bitch..." he scoffs before swimming away.'
 				'Deciding it''s time to leave, you climb out of the pool and run to the locker room.'
 				gs 'stat'
 				act 'Continue': gt 'pav_pool', 'lockerfemale'
@@ -1142,7 +1140,7 @@ if $ARGS[0] = 'late_assault':
 					*clr & cla
 					minut += 2
 					gs 'stat'
-					'Your elbow makes contact with his nose and he reels back in pain, letting you go. You quickly make your way out of the pool before he can grab you again and run to the locker room without looking back. You can hear him loudly cursing about how you''ve broken his nose.'
+					'You jab your arm back and your elbow makes contact with his nose, causing him to reel back in pain and let you go. You quickly make your way out of the pool before he can grab you again and run to the locker room without looking back. You can hear him loudly cursing about how you''ve broken his nose.'
 					act 'Continue': gt 'pav_pool', 'lockerfemale'
 				end
 			end
@@ -1172,27 +1170,27 @@ if $ARGS[0] = 'late_assault':
 
 				act 'Continue':
 					*clr & cla
-					gs 'stat'
 					minut += 5
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault2.jpg"></center>'
 					'He starts violently thrusting in and out of your pussy, holding you by your hair and using it as a handle to apply more force. Your only thought is hoping this will end soon...'
 
 					act 'Continue':
 						*clr & cla
-						minut += 5
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault3.jpg"></center>'
 						'After a few minutes, he pulls you on top of him, slides you down onto his dick and resumes roughly fucking you.'
-						'Your attention wanders around the pool. To your dismay, it''s completely empty and you realize that nobody is coming to help you. Your thoughts are interrupted when your assailant suddenly groans and you feel a warmth spilling into your pussy. He''s cumming inside you!'
+						'Your attention wanders around the pool. To your dismay, it''s completely empty and you realize that nobody is coming to help you. Your thoughts are then interrupted when your assailant suddenly groans and you feel a warmth spilling into your pussy. He''s cumming inside you!'
 						'It might be shock, but you somehow manage to ignore the fact that you''re being filled with a stranger''s cum and instead concentrate on the eerie sounds of the deserted pool.'
 						gs 'arousal', 'vaginal', 10, 'rape'
 						gs 'cum_call', '', 'pool rapist', 0, '', 15000, 60
 						gs 'arousal', 'end'
+						minut += 5
 						gs 'stat'
 
 						act 'Continue':
 							*clr & cla
-							gs 'stat'
 							minut += 5
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault4.jpg"></center>'
 							'When he finishes emptying his load inside you, he pulls out and immediately plugs your pussy with his fingers before leaning in and whispering into your ear.'
 							'"Just making sure it stays in there. I want you to get pregnant with my baby so you can always remember what happened here. Don''t think about telling anyone either, because nobody will believe a slutty little bitch like you."'
@@ -1202,9 +1200,9 @@ if $ARGS[0] = 'late_assault':
 							elseif pav_swimpool['virgin_rape'] = 1:
 								'You start sobbing as your emotions overwhelm you. That man defiled your womanhood and wants you to get pregnant from it! You clutch your stomach. That''s likely to happen given that you''re not on birth control. "What am I going to do?!" you think to yourself as a sharp pain suddenly shoots through your sore and tender pussy. You can''t find your bikini bottom, so you slowly climb out of the pool and make your way to the locker room, trying not to think about what happened.'
 							elseif birth_control['think_safe'] = 1:
-								'You place a hand on your stomach. Even though you can feel his sperm inside you, you''re on birth control and so shouldn''t need to worry about getting pregnant. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
+								'You place a hand on your stomach, even though you''re on birth control and shouldn''t need to worry about getting pregnant. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
 							else
-								'You place a hand on your stomach and hold in your sobs. You can feel his sperm inside you and hope that his words about you getting pregnant don''t come true. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
+								'You place a hand on your stomach and hold in your sobs, hoping that his words about you getting pregnant don''t come true. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
 							end
 							act 'Continue': gt 'pav_pool', 'lockerfemale'
 						end

+ 1 - 1
locations/phone_selfies.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = 'open_camera':
 	!! Flashing selfie
 	if $clothingworntype ! 'nude' and $phone_loc <> '':
 		if Enable_Android = 1:
-			locIndex = arrpos('$selfieLoc', $phone_loc,1)
+			locIndex = arrpos('$selfieLoc', $phone_loc, 1)
 		else
 			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
 		end

+ 8 - 0
locations/piercing_attributes.qsrc

@@ -0,0 +1,8 @@
+# piercing_attributes
+
+PirFirst = 0
+PirPrice = 0
+
+gs '$attributes_piercing_<<$ARGS[0]>>', ARGS[1]
+
+--- piercing_attributes ---------------------------------

+ 71 - 0
locations/piercing_management.qsrc

@@ -114,7 +114,78 @@ if $ARGS[0] = 'count':
 end
 
 
+! [1] - payment method
+! [2] - slot
+! [3] - index
+if $ARGS[0] = 'buy':
+	if pcs_piercings[$ARGS[2]] = 0:
+		*clr
+		'<center><img src="<<func(''piercing_management'', ''<<$ARGS[2]>>_image'', ARGS[3])>>"></center>'
+		'The tattooist disinfects the area, pierces your <<$ARGS[2]>> and inserts your chosen piercing.'
+	else
+		'You buy the piercing.'
+	end
+
+	if $ARGS[1] = 'money': 
+		money -= price 
+	else 
+		karta -= price
+	end
+
+	gs 'piercing_management', 'add', $ARGS[2], ARGS[3]
+	gs 'piercing_management', 'count'
+	gs 'stat'
 
+	act 'Return': gt $loc, $loc_arg
+end
+
+
+! [1] - action type
+! [2] - slot
+! [3] - index
+! [4] - price modifier (0-100, taken as a %)
+if $ARGS[0] = 'view_item':
+	msg 'in item'
+	gs 'piercing_attributes', $ARGS[2], ARGS[3]
+
+	'<center><img src="<<func(''piercing_management'', ''<<$ARGS[2]>>_image'', ARGS[3])>>"></center>'
+
+	if $ARGS[1] = 'shop':
+		if pcs_piercings['<<$ARGS[2]>>_<<ARGS[3]>>_owned'] = 1:
+			'You already own this piercing.'
+			act 'Return': gt $loc, $loc_arg
+
+		else
+			price = PirPrice + (PirPrice * ARGS[4]) / 100
+			if pcs_piercings[$ARGS[2]] = 0:
+				price += PirFirst
+				if max(money, karta) < price:
+					'You cannot afford to get your <<$ARGS[2]>> pierced with this piercing.'
+				else
+					if money >= price:
+						act 'Get your <<$ARGS[2]>> pierced and buy this piercing for for <<price>> <b>₽</b> (cash)': gt 'piercing_management', 'buy', 'money', $ARGS[2], ARGS[3]
+					end
+					if karta >= price:
+						act 'Get your <<$ARGS[2]>> pierced and buy this piercing for for <<price>> <b>₽</b> (card)': gt 'piercing_management', 'buy', 'karta', $ARGS[2], ARGS[3]
+					end
+				end
+
+			else
+				if max(money, karta) < price:
+					'You don''t have enough money for this piercing.'
+				else
+					if money >= price:
+						act 'Buy this piercing for <<price>> <b>₽</b> (cash)': gt 'piercing_management', 'buy', 'money', $ARGS[2], ARGS[3]
+					end
+					if karta >= price:
+						act 'Buy this piercing for <<price>> <b>₽</b> (card)': gt 'piercing_management', 'buy', 'karta', $ARGS[2], ARGS[3]
+					end
+				end
+			end
+			act 'Return': gt $loc, $loc_arg
+		end
+	end
+end
 
 
 

+ 116 - 1649
locations/pirsingsalon.qsrc

@@ -74,9 +74,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['ears'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_ears''">Ear - 3,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_ears''">Ear - 3,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_ears''">Ear - 1,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_ears''">Ear - 1,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -90,9 +90,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['nose'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_nose''">Nose - 5,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_nose''">Nose - 5,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_nose''">Nose - 2,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_nose''">Nose - 2,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -106,9 +106,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['brow'] = 0:
-		$temp_table +=			'<a href="exec: gt ''pirsingsalon'', ''piercing_brow''">Eyebrow - 5,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_brow''">Eyebrow - 5,000 <b>₽</b></a>'
 	else
-		$temp_table +=			'<a href="exec: gt ''pirsingsalon'', ''piercing_brow''">Eyebrow - 2,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_brow''">Eyebrow - 2,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -122,9 +122,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['lip'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_lip''">Lip - 6,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_lip''">Lip - 6,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_lip''">Lip - 3,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_lip''">Lip - 3,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -138,9 +138,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['tongue'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_tongue''">Tongue - 7,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_tongue''">Tongue - 7,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_tongue''">Tongue - 4,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_tongue''">Tongue - 4,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -154,9 +154,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['navel'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_navel''">Navel - 8,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_navel''">Navel - 8,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_navel''">Navel - 5,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_navel''">Navel - 5,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -170,9 +170,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['nipples'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_nipples''">Nipple - 10,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_nipples''">Nipple - 10,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_nipples''">Nipple - 6,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_nipples''">Nipple - 6,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -186,9 +186,9 @@ if $ARGS[0] = 'shop_menu':
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
 	if pcs_piercings['pussy'] = 0:
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_pussy''">Pussy - 25,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 0 & gt ''pirsingsalon'', ''piercing_pussy''">Pussy - 25,000 <b>₽</b></a>'
 	else
-		$temp_table +=		'<a href="exec: gt ''pirsingsalon'', ''piercing_pussy''">Pussy - 10,000 <b>₽</b></a>'
+		$temp_table +=		'<a href="exec: salon_temp_state = 1 & gt ''pirsingsalon'', ''piercing_pussy''">Pussy - 10,000 <b>₽</b></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -222,749 +222,148 @@ end
 	!!----- Ears --------------------------------------------------
 
 if $ARGS[0] = 'piercing_ears':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_ears'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'ears')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:loopears_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''piercing_ears2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''ears_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'loopears_pir'
-end
-
-if $ARGS[0] = 'piercing_ears2':
-	'<center><img src="<<func(''piercing_management'', ''ears_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['ears_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_ears'
-
-	elseif pcs_piercings['ears'] = 0:
-		if max(money, karta) < 3000:
-			'You cannot afford to get your ears pierced with this piercing.'
-		else
-			if money >= 3000:
-				dynamic "
-					act 'Get your ears pierced with these earrings for 3,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_ears3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 3000:
-				dynamic "
-					act 'Get your ears pierced with these earrings for 3,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_ears3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 1000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 1000:
-				dynamic "
-					act 'Buy this piercing for 1,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_ears3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 1000:
-				dynamic "
-					act 'Buy this piercing for 1,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_ears3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_ears'
-end
-
-if $ARGS[0] = 'piercing_ears3':
-	if pcs_piercings['ears'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['ears'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 2000 else karta -= 2000
-
-		'<center><img src="<<func(''piercing_management'', ''ears_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your ears and inserts your chosen earrings.'
-
+		salon_temp_state = 1
 		gs 'pain', 1, 'ears', 'pierce'
-
-	else
-		'You buy the piercing.'
 	end
 
-	if $ARGS[2] = 'money': money -= 1000 else karta -= 1000
-	gs 'piercing_management', 'add', 'ears', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'ears', 1, 'ears_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Nose --------------------------------------------------
 
 if $ARGS[0] = 'piercing_nose':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_nose'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'nose')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:loopnose_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_nose2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''nose_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'loopnose_pir'
-end
-
-if $ARGS[0] = 'piercing_nose2':
-	'<center><img src="<<func(''piercing_management'', ''nose_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['nose_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_nose'
-
-	elseif pcs_piercings['nose'] = 0:
-		if max(money, karta) < 5000:
-			'You cannot afford to get your nose pierced with this piercing.'
-		else
-			if money >= 5000:
-				dynamic "
-					act 'Get your nose pierced with these earrings for 5,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_nose3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 5000:
-				dynamic "
-					act 'Get your nose pierced with these earrings for 5,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_nose3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 2000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 2000:
-				dynamic "
-					act 'Buy this piercing for 2,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_nose3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 2000:
-				dynamic "
-					act 'Buy this piercing for 2,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_nose3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_nose'
-end
-
-if $ARGS[0] = 'piercing_nose3':
-	if pcs_piercings['nose'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['nose'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-
-		'<center><img src="<<func(''piercing_management'', ''nose_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your nose and inserts your chosen piercing.'
-
-		gs 'pain', 2, 'nose', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'nose', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 2000 else karta -= 2000
-	gs 'piercing_management', 'add', 'nose', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'nose', 1, 'nose_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Brow --------------------------------------------------
 
 if $ARGS[0] = 'piercing_brow':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_brow'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'brow')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:loopbrow_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_brow2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''brow_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'loopbrow_pir'
-end
-
-if $ARGS[0] = 'piercing_brow2':
-	'<center><img src="<<func(''piercing_management'', ''brow_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['brow_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_brow'
-
-	elseif pcs_piercings['brow'] = 0:
-		if max(money, karta) < 5000:
-			'You cannot afford to get your brow pierced with this piercing.'
-		else
-			if money >= 5000:
-				dynamic "
-					act 'Get your brow pierced with these earrings for 5,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_brow3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 5000:
-				dynamic "
-					act 'Get your brow pierced with these earrings for 5,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_brow3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 2000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 2000:
-				dynamic "
-					act 'Buy this piercing for 2,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_brow3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 2000:
-				dynamic "
-					act 'Buy this piercing for 2,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_brow3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return':gt 'pirsingsalon', 'piercing_brow'
-end
-
-if $ARGS[0] = 'piercing_brow3':
-	if pcs_piercings['brow'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['brow'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-
-		'<center><img src="<<func(''piercing_management'', ''brow_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your brow and inserts your chosen piercing.'
-
-		gs 'pain', 3, 'eyebrows', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'eyebrows', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 2000 else karta -= 2000
-	gs 'piercing_management', 'add', 'brow', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'brow', 1, 'brow_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Lip --------------------------------------------------
 
 if $ARGS[0] = 'piercing_lip':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_lip'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'lip')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	ps_i = 1
-	:looplip_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_lip2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''lip_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'looplip_pir'
-end
-
-if $ARGS[0] = 'piercing_lip2':
-	'<center><img src="<<func(''piercing_management'', ''lip_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['lip_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_lip'
-
-	elseif pcs_piercings['lip'] = 0:
-		if max(money, karta) < 6000:
-			'You cannot afford to get your lip pierced with this piercing.'
-		else
-			if money >= 6000:
-				dynamic "
-					act 'Get your lip pierced with this piercing for 6,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_lip3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 6000:
-				dynamic "
-					act 'Get your lip pierced with this piercing for 6,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_lip3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 3000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 3000:
-				dynamic "
-					act 'Buy this piercing for 3,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_lip3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 3000:
-				dynamic "
-					act 'Buy this piercing for 3,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_lip3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_lip'
-end
-
-if $ARGS[0] = 'piercing_lip3':
-	if pcs_piercings['lip'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['lip'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-
-		'<center><img src="images/locations/city/industrial/salon/pirsing2.jpg"></center>'
-		'The tattooist disinfects the area, pierces your lip and inserts your chosen piercing.'
-
-		gs 'pain', 2, 'lips', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'lips', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-	gs 'piercing_management', 'add', 'lip', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'lip', 1, 'lip_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Tongue --------------------------------------------------
 
 if $ARGS[0] = 'piercing_tongue':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_tongue'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'tongue')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:looptongue_pir
-		*pl '<a href="exec: gt ''pirsingsalon'', ''piercing_tongue2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''tongue_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'looptongue_pir'
-end
-
-if $ARGS[0] = 'piercing_tongue2':
-	menu_off = 1
-	gs 'stat'
-
-	'<center><img src="<<func(''piercing_management'', ''tongue_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['tongue_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_tongue'
-
-	elseif pcs_piercings['tongue'] = 0:
-		if max(money, karta) < 7000:
-			'You cannot afford to get your tongue pierced with this piercing.'
-		else
-			if money >= 7000:
-				dynamic "
-					act 'Get your tongue pierced with this piercing for 7,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_tongue3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 7000:
-				dynamic "
-					act 'Get your tongue pierced with this piercing for 7,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_tongue3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 4000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 4000:
-				dynamic "
-					act 'Buy this piercing for 4,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_tongue3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 4000:
-				dynamic "
-					act 'Buy this piercing for 4,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_tongue3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_tongue'
-end
-
-if $ARGS[0] = 'piercing_tongue3':
-	if pcs_piercings['tongue'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['tongue'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-
-		'<center><img src="images/locations/city/industrial/salon/pirsing.jpg"></center>'
-		'The tattooist disinfects the area, pierces your tongue and inserts your chosen piercing.'
-
-		gs 'pain', 5, 'tongue', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'tongue', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 4000 else karta -= 4000
-	gs 'piercing_management', 'add', 'tongue', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'tongue', 1, 'tongue_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Navel --------------------------------------------------
 
 if $ARGS[0] = 'piercing_navel':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_navel'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'navel')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:loopbelly_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_navel2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''navel_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'loopbelly_pir'
-end
-
-if $ARGS[0] = 'piercing_navel2':
-	'<center><img src="<<func(''piercing_management'', ''navel_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['navel_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_navel'
-
-	elseif pcs_piercings['navel'] = 0:
-		if max(money, karta) < 8000:
-			'You cannot afford to get your belly button pierced with this piercing.'
-		else
-			if money >= 8000:
-				dynamic "
-					act 'Get your belly button pierced with these earrings for 8,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_navel3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 8000:
-				dynamic "
-					act 'Get your belly button pierced with these earrings for 8,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_navel3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 5000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 5000:
-				dynamic "
-					act 'Buy this piercing for 5,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_navel3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 5000:
-				dynamic "
-					act 'Buy this piercing for 5,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_navel3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_navel'
-end
-
-if $ARGS[0] = 'piercing_navel3':
-	if pcs_piercings['navel'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['navel'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 3000 else karta -= 3000
-
-		'<center><img src="<<func(''piercing_management'', ''navel_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your belly button and inserts your chosen piercing.'
+		salon_temp_state = 1
 		gs 'pain', 1, 'tummy', 'pierce'
-
-	else
-		'You buy the piercing.'
 	end
 
-	if $ARGS[2] = 'money': money -= 5000 else karta -= 5000
-	gs 'piercing_management', 'add', 'navel', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'navel', 1, 'navel_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Nipples --------------------------------------------------
 
 if $ARGS[0] = 'piercing_nipples':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_nipples'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'nipples')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:loopnip_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_nipples2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''nipples_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'loopnip_pir'
-end
-
-if $ARGS[0] = 'piercing_nipples2':
-	'<center><img src="<<func(''piercing_management'', ''nipples_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['nipples_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_brow'
-
-	elseif pcs_piercings['nipples'] = 0:
-		if max(money, karta) < 10000:
-			'You cannot afford to get your nipples pierced with this piercing.'
-		else
-			if money >= 10000:
-				dynamic "
-					act 'Get your nipples pierced with these earrings for 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_nipples3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 10000:
-				dynamic "
-					act 'Get your nipples pierced with these earrings for 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_nipples3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 6000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 6000:
-				dynamic "
-					act 'Buy this piercing for 6,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_nipples3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 6000:
-				dynamic "
-					act 'Buy this piercing for 6,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_nipples3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_nipples'
-end
-
-if $ARGS[0] = 'piercing_nipples3':
-	if pcs_piercings['nipples'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['nipples'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 4000 else karta -= 4000
-
-		'<center><img src="<<func(''piercing_management'', ''nipples_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your nipples and inserts your chosen piercings.'
-		gs 'pain', 7, 'nipples', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'nipples', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 6000 else karta -= 6000
-	gs 'piercing_management', 'add', 'nipples', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'nipples', 1, 'nipples_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Pussy --------------------------------------------------
 
 if $ARGS[0] = 'piercing_pussy':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'piercing_pussy'
 	menu_off = 1
 	gs 'stat'
 
-	ps_total = func('piercing_management', 'totals', 'pussy')
-	
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-	
-	ps_i = 1
-	:looppubic_pir
-		*p '<a href="exec: gt ''pirsingsalon'', ''piercing_pussy2'', <<ps_i>>"><img height="250" src="<<func(''piercing_management'', ''pussy_image'', ps_i)>>"></a>'
-		ps_i += step
-	if ps_i <= ps_total: jump 'looppubic_pir'
-end
-
-if $ARGS[0] = 'piercing_pussy2':
-	'<center><img src="<<func(''piercing_management'', ''pussy_image'', ARGS[1])>>"></center>'
-
-	if pcs_piercings['pussy_<<ARGS[1]>>_owned'] = 1:
-		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_brow'
-
-	elseif pcs_piercings['pussy'] = 0:
-		if max(money, karta) < 25000:
-			'You cannot afford to get your pussy pierced with this piercing.'
-		else
-			if money >= 25000:
-				dynamic "
-					act 'Get your pussy pierced with these earrings for 25,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_pussy3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 25000:
-				dynamic "
-					act 'Get your pussy pierced with these earrings for 25,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_pussy3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-
-	else
-		if max(money, karta) < 10000:
-			'You don''t have enough money for this piercing.'
-		else
-			if money >= 10000:
-				dynamic "
-					act 'Buy this piercing for 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'piercing_pussy3', <<ARGS[1]>>, 'money'
-				"
-			end
-			if karta >= 10000:
-				dynamic "
-					act 'Buy this piercing for 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'piercing_pussy3', <<ARGS[1]>>, 'karta'
-				"
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'piercing_pussy'
-end
-
-if $ARGS[0] = 'piercing_pussy3':
-	if pcs_piercings['pussy'] = 0:
-		*clr
+	if salon_temp_state = 0 and pcs_piercings['pussy'] ! 0:
 		minut += 30
-		if $ARGS[2] = 'money': money -= 15000 else karta -= 15000
-
-		'<center><img src="<<func(''piercing_management'', ''pussy_image'', ARGS[1])>>"></center>'
-		'The tattooist disinfects the area, pierces your pussy and inserts your chosen piercing.'
-		gs 'pain', 9, 'pubic', 'pierce'
-
-	else
-		'You buy the piercing.'
+		salon_temp_state = 1
+		gs 'pain', 1, 'pubic', 'pierce'
 	end
 
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'piercing_management', 'add', 'pussy', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'piercing_management', 'pussy', 1, 'pussy_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': killvar 'salon_temp_state' & gt 'pirsingsalon', 'start'
 end
 
 
-
-
 	!!========================================================================!!
 	!!                                                                        !!
 	!!                                TATTOOS                                 !!
@@ -975,1149 +374,217 @@ end
 	!!----- Ankle --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_ankle':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_ankle'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['ankle'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'ankle')
-		ps_i = 1
-		:looptatfoot
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_ankle2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''ankle_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatfoot'
-		*nl
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'ankle', 1, 'ankle_image', 'shop'
 
-	else
-		'<center><img src="<<func(''tattoo_management'', ''ankle_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_ankle2':
-	'<center><img src="<<func(''tattoo_management'', ''ankle_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 8000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_ankle3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_ankle3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_ankle'
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_ankle3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 8000 else karta -= 8000
-	gs 'tattoo_management', 'add', 'ankle', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Arm --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_arm':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_arm'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['arm'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'arm')
-		ps_i = 1
-		:looptatarm
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_arm2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''arm_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatarm'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''arm_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_arm2':
-	'<center><img src="<<func(''tattoo_management'', ''arm_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 8000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_arm3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_arm3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_arm'
-end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'arm', 1, 'arm_image', 'shop'
 
-if $ARGS[0] = 'tattoo_arm3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 8000 else karta -= 8000
-	gs 'tattoo_management', 'add', 'arm', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Ass --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_ass':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_ass'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['ass'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'ass')
-		ps_i = 1
-		:looptatass
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_ass2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''ass_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatass'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''ass_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_ass2':
-	'<center><img src="<<func(''tattoo_management'', ''ass_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 10000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_ass3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_ass3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'ass', 1, 'ass_image', 'shop'
 
-	act 'Return': gt 'pirsingsalon', 'tattoo_ass'
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_ass3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'tattoo_management', 'add', 'ass', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Back --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_back':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_back'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['back'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'back')
-		ps_i = 1
-		:looptatback
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_back2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''back_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatback'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''back_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_back2':
-	'<center><img src="<<func(''tattoo_management'', ''back_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 10000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_back3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_back3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'back', 1, 'back_image', 'shop'
 
-	act 'Return': gt 'pirsingsalon', 'tattoo_back'
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_back3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'tattoo_management', 'add', 'back', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Belly --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_belly':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_belly'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['belly'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'belly')
-		ps_i = 1
-		:looptatbelly
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_belly2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''belly_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatbelly'
-		*nl
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''belly_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_belly2':
-	'<center><img src="<<func(''tattoo_management'', ''belly_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 10000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_belly3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_belly3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_belly'
-end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'belly', 1, 'belly_image', 'shop'
 
-if $ARGS[0] = 'tattoo_belly3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'tattoo_management', 'add', 'belly', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Breast --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_breast':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_breast'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['breast'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'breast')
-		ps_i = 1
-		:looptatbreast
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_breast2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''breast_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatbreast'
-		*nl
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''breast_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_breast2':
-	'<center><img src="<<func(''tattoo_management'', ''breast_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 15000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 15000:
-			dynamic "
-				act 'Get this tattoo 15,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_breast3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 15000:
-			dynamic "
-				act 'Get this tattoo 15,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_breast3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_breast'
-end
-
-if $ARGS[0] = 'tattoo_breast3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 15000 else karta -= 15000
-	gs 'tattoo_management', 'add', 'breast', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'breast', 1, 'breast_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Chest --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_chest':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_chest'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'chest', 1, 'chest_image', 'shop'
 
-	if pcs_tattoos['chest'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'chest')
-		ps_i = 1
-		:looptatchest
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_chest2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''chest_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatchest'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''chest_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_chest2':
-	'<center><img src="<<func(''tattoo_management'', ''chest_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 12000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_chest3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_chest3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_chest'
-end
-
-if $ARGS[0] = 'tattoo_chest3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
-	gs 'tattoo_management', 'add', 'chest', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Face --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_face':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_face'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'face', 1, 'face_image', 'shop'
 
-	if pcs_tattoos['face'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'face')
-		ps_i = 1
-		:looptatface
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_face2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''face_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatface'
-		*nl
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''face_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_face2':
-	'<center><img src="<<func(''tattoo_management'', ''face_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 10000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_face3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_face3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_face'
-end
-
-if $ARGS[0] = 'tattoo_face3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'tattoo_management', 'add', 'face', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Hand --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_hand':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_hand'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['hand'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'hand')
-		ps_i = 1
-		:looptathand
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_hand2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''hand_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptathand'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''hand_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_hand2':
-	'<center><img src="<<func(''tattoo_management'', ''hand_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 7000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 7000:
-			dynamic "
-				act 'Get this tattoo 7,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_hand3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 7000:
-			dynamic "
-				act 'Get this tattoo 7,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_hand3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_hand'
-end
-
-if $ARGS[0] = 'tattoo_hand3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 7000 else karta -= 7000
-	gs 'tattoo_management', 'add', 'hand', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'hand', 1, 'hand_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Leg --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_leg':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_leg'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['leg'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'leg')
-		ps_i = 1
-		:looptatleg
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_leg2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''leg_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatleg'
-		*nl
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''leg_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_leg2':
-	'<center><img src="<<func(''tattoo_management'', ''leg_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 10000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_leg3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 10000:
-			dynamic "
-				act 'Get this tattoo 10,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_leg3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'leg', 1, 'leg_image', 'shop'
 
-	act 'Return': gt 'pirsingsalon', 'tattoo_leg'
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_leg3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 10000 else karta -= 10000
-	gs 'tattoo_management', 'add', 'leg', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Lip --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_lip':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_lip'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['lip'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'lip')
-		ps_i = 1
-		:looptatlip
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_lip2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''lip_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatlip'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'lip', 1, 'lip_image', 'shop'
 
-	else
-		'<center><img src="<<func(''tattoo_management'', ''lip_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_lip2':
-	'<center><img src="<<func(''tattoo_management'', ''lip_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 5000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 5000:
-			dynamic "
-				act 'Get this tattoo 5,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_lip3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 5000:
-			dynamic "
-				act 'Get this tattoo 5,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_lip3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_lip'
-end
-
-if $ARGS[0] = 'tattoo_lip3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 5000 else karta -= 5000
-	gs 'tattoo_management', 'add', 'lip', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Neck --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_neck':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_neck'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['neck'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'neck')
-		ps_i = 1
-		:looptatneck
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_neck2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''neck_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatneck'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''neck_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_neck2':
-	'<center><img src="<<func(''tattoo_management'', ''neck_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 8000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_neck3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_neck3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_neck'
-end
-
-if $ARGS[0] = 'tattoo_neck3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 8000 else karta -= 8000
-	gs 'tattoo_management', 'add', 'neck', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'neck', 1, 'neck_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Pussy --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_pussy':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_pussy'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['pussy'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'pussy')
-		ps_i = 1
-		:looptatvag
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_pussy2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''pussy_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatvag'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''pussy_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_pussy2':
-	'<center><img src="<<func(''tattoo_management'', ''pussy_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 20000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 20000:
-			dynamic "
-				act 'Get this tattoo 20,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_pussy3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 20000:
-			dynamic "
-				act 'Get this tattoo 20,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_pussy3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_pussy'
-end
-
-if $ARGS[0] = 'tattoo_pussy3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 20000 else karta -= 20000
-	gs 'tattoo_management', 'add', 'pussy', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'pussy', 1, 'pussy_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- shoulder --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_shoulder':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_shoulder'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'shoulder', 1, 'shoulder_image', 'shop'
 
-	if pcs_tattoos['shoulder'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'shoulder')
-		ps_i = 1
-		:looptatlech
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_shoulder2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''shoulder_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatlech'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''shoulder_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_shoulder2':
-	'<center><img src="<<func(''tattoo_management'', ''shoulder_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 8000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_shoulder3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 8000:
-			dynamic "
-				act 'Get this tattoo 8,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_shoulder3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_shoulder'
-end
-
-if $ARGS[0] = 'tattoo_shoulder3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 8000 else karta -= 8000
-	gs 'tattoo_management', 'add', 'shoulder', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Side --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_side':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_side'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['side'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'side')
-		ps_i = 1
-		:looptatside
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_side2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''side_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatside'
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''side_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_side2':
-	'<center><img src="<<func(''tattoo_management'', ''side_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 12000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_side3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_side3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_side'
-end
-
-if $ARGS[0] = 'tattoo_side3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
-	gs 'tattoo_management', 'add', 'side', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'side', 1, 'side_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Tramp --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_tramp':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_tramp'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['tramp'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'tramp')
-		ps_i = 1
-		:looptatupb
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_tramp2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''tramp_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatupb'
-		*nl
-
-	else
-		'<center><img src="<<func(''tattoo_management'', ''tramp_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
-end
-
-if $ARGS[0] = 'tattoo_tramp2':
-	'<center><img src="<<func(''tattoo_management'', ''tramp_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 12000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_tramp3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_tramp3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_tramp'
-end
-
-if $ARGS[0] = 'tattoo_tramp3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
-	gs 'tattoo_management', 'add', 'tramp', ARGS[1]
-	gs 'stat'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'tramp', 1, 'tramp_image', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-
 	!!----- Under --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_under':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_under'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['under'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'under')
-		ps_i = 1
-		:looptatunder
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_under2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''under_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatunder'
-		*nl
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'under', 1, 'under_image', 'shop'
 
-	else
-		'<center><img src="<<func(''tattoo_management'', ''under_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_under2':
-	'<center><img src="<<func(''tattoo_management'', ''under_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 12000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_under3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 12000:
-			dynamic "
-				act 'Get this tattoo 12,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_under3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_under'
-end
-
-if $ARGS[0] = 'tattoo_under3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
-	gs 'tattoo_management', 'add', 'under', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
 	!!----- Wrist --------------------------------------------------
 
 if $ARGS[0] = 'tattoo_wrist':
+	gs 'shortgs', 'setloc', 'pirsingsalon', 'tattoo_wrist'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-		step = 1
-	end
-
-	if pcs_tattoos['wrist'] <= 0:
-		ps_total = func('tattoo_management', 'totals', 'wrist')
-		ps_i = 1
-		:looptatwrist
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_wrist2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''wrist_image'', ps_i)>>"></a>'
-			ps_i += step
-		if ps_i <= ps_total: jump 'looptatwrist'
+	gs 'shop_utils', 'display_func_managed', 'tattoo_management', 'wrist', 1, 'wrist_image', 'shop'
 
-	else
-		'<center><img src="<<func(''tattoo_management'', ''wrist_image'')>>"></center>'
-		'You already have this tattoo here.'
-	end
+	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'tattoo_wrist2':
-	'<center><img src="<<func(''tattoo_management'', ''wrist_image'', ARGS[1])>>"></center>'
-
-	if max(money, karta) < 7000:
-		'You cannot afford this tattoo.'
-	else
-		if money >= 7000:
-			dynamic "
-				act 'Get this tattoo 7,000 <b>₽</b> (cash)': xgt 'pirsingsalon', 'tattoo_wrist3', <<ARGS[1]>>, 'money'
-			"
-		end
-		if karta >= 7000:
-			dynamic "
-				act 'Get this tattoo 7,000 <b>₽</b> (card)': xgt 'pirsingsalon', 'tattoo_wrist3', <<ARGS[1]>>, 'karta'
-			"
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'tattoo_wrist'
-end
-
-if $ARGS[0] = 'tattoo_wrist3':
-	minut += 60
-	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
-	gs 'tattoo_management', 'add', 'wrist', ARGS[1]
-	gs 'stat'
-
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-	else
-		act 'Return': gt 'pirsingsalon', 'start'
-	end
-end
-
-
-
-! Cleanup
-
-killvar 'ps_i'
-killvar 'ps_total'
-
-
 --- pirsingsalon ---------------------------------

+ 2 - 1
locations/purses.qsrc

@@ -149,6 +149,7 @@ if $ARGS[0] = 'view_purse_item':
 	!! ARGS 1 = action type (home, shop)
 	!! ARGS 2 - purse type
 	!! ARGS 3 - purse index
+	!! ARGS 4 - price modifier (0-100, taken as %) {OPTIONAL}
 
 	cla
 	'<center><img src="<<FUNC(''$purse_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -161,7 +162,7 @@ if $ARGS[0] = 'view_purse_item':
 			'You already own this purse.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = PursePrice
+			price = PursePrice + (PursePrice * ARGS[4]) / 100
 			'Price: <<PursePrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:

File diff suppressed because it is too large
+ 484 - 208
locations/selfplay.qsrc


File diff suppressed because it is too large
+ 264 - 263
locations/sex_ev_after.qsrc


File diff suppressed because it is too large
+ 328 - 205
locations/sex_ev_boy_pillow_talk.qsrc


File diff suppressed because it is too large
+ 226 - 226
locations/sex_ev_condoms.qsrc


File diff suppressed because it is too large
+ 429 - 212
locations/sex_ev_cowgirl.qsrc


File diff suppressed because it is too large
+ 342 - 233
locations/sex_ev_cum.qsrc


File diff suppressed because it is too large
+ 402 - 205
locations/sex_ev_doggy.qsrc


File diff suppressed because it is too large
+ 265 - 262
locations/sex_ev_dress_talking.qsrc


+ 215 - 193
locations/sex_ev_events.qsrc

@@ -2,174 +2,177 @@
 !! for special events
 
 if $ARGS[0] = 'sex_film_code':
-	if sex_ev['phone_film'] = 0 and npc_sex_filmer[$boy] = 1 and rand(1,20) < npc_sexdrive[$boy]: gt 'sex_ev_events', 'sex_film1'
+	if sex_ev['phone_film'] = 0 and npc_sex_filmer[$npcID] = 1 and rand(1,20) < npc_sexdrive[$npcID]:
+		!! i = arrsize('$sex_video') + 1
+		gt 'sex_ev_events', 'sex_film1'
+	end
 end
 
 if $ARGS[0] = 'sex_film1':
 	sex_ev['phone_film'] = 1
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/hard5.mp4"></video></center>'
-	'You''re panting in time with <<$npc_firstname[$boy]>>''s thrusts on top of you when you suddenly become aware of a glow coming from above you. <<$npc_firstname[$boy]>> has his phone out. And it''s pointed directly at you.'
+	'You''re panting in time with <<$npc_firstname[$npcID]>>''s thrusts on top of you when you suddenly become aware of a glow coming from above you. <<$npc_firstname[$npcID]>> has his phone out. And it''s pointed directly at you.'
 	gs 'sex_ev_events', 'sex_film_protest'
 	gs 'sex_ev_events', 'sex_film_accept'
 end
 
 if $ARGS[0] = 'sex_film_protest':
-	act'Cover your face':
+	act 'Cover your face':
 		cla
-		act'Shy':
+		act 'Shy':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-			'"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!" you protest weakly. A flush of total embarrassment burns through your cheeks and you hold your hand up in a futile attempt to block the view of your quickly reddening face.'
-			if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-				'"Smile for the camera," <<$npc_firstname[$boy]>> grins, still fucking you as he holds the camera right up to you.'
+			'"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!" you protest weakly. A flush of total embarrassment burns through your cheeks and you hold your hand up in a futile attempt to block the view of your quickly reddening face.'
+			if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+				'"Smile for the camera," <<$npc_firstname[$npcID]>> grins, still fucking you as he holds the camera right up to you.'
 			else
-				'"Fuck, you look so hot," <<$npc_firstname[$boy]>> grins, still fucking you as he holds the camera right up to you.'
+				'"Fuck, you look so hot," <<$npc_firstname[$npcID]>> grins, still fucking you as he holds the camera right up to you.'
 			end
-			
-			act'Let him film you (reluctant)':
+
+			act 'Let him film you (reluctant)':
 				sex_ev['phone_film'] = 2
-				$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-				if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-					$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Smile for the camera."'
+				$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+				if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+					$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Smile for the camera."'
 				else
-					$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Fuck, you look so hot."'
+					$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Fuck, you look so hot."'
 				end
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'With great reluctance, you silence your protests and let <<$npc_firstname[$boy]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
+				'With great reluctance, you silence your protests and let <<$npc_firstname[$npcID]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whine as cold panic fills your chest.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"You''ll delete it later, right?" you ask.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!! $sex_video_dialogue[] = 'Please~! Mmph~! I don''t want to be filmed~!'
-					!! $sex_video_author[] = $boy
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!! $sex_ev['video_dialogue'] = 'Please~! Mmph~! I don''t want to be filmed~!'
+					!! $sex_ev['video_author'] = $boy
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Smile for the camera."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Smile for the camera."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
 					else
-						$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Fuck, you look so hot."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Fuck, you look so hot."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
 					end
-					
-					$sex_video_author[] = $boy
+
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whimper again, feeling cold panic fill your chest.'
-					'"Come on, don''t be like that," <<$npc_firstname[$boy]>> says, ignoring your pleas. "This is great. You look so sexy."'
+					'"Come on, don''t be like that," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "This is great. You look so sexy."'
 					*nl
 					'Your weak protests do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
 				end
 				gs 'sex_ev_events', 'sex_film_end'
 			end
-			
+
 			gs 'sex_ev_events', 'sex_film_force_stop'
 		end
-		
-		act'Annoyed':
+
+		act 'Annoyed':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'"Ungh~! Hmph~! Hey! What do you think you''re doing?" you grunt as he pushes the camera towards your face and you immediately try to cover up with your hand.'
-			'"Don''t worry, you look great," <<$npc_firstname[$boy]>> grins, still fucking you as he films.'
-			act'Let him film you (reluctant)':
-				$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."'
+			'"Don''t worry, you look great," <<$npc_firstname[$npcID]>> grins, still fucking you as he films.'
+			act 'Let him film you (reluctant)':
+				$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."'
 				sex_ev['phone_film'] = 2
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'With great reluctance, you silence your protests and let <<$npc_firstname[$boy]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
+				'With great reluctance, you silence your protests and let <<$npc_firstname[$npcID]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Seriously~! Nngh~! Stop it~!" you complain loudly, feeling hot with self consciousness and annoyance.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!!$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"'
-					!! $sex_video_author[] = $boy
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"'
+					!! $sex_ev['video_author'] = $boy
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_video_author[] = $boy
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Seriously~! Nngh~! Stop it~!" you keep protesting, face hot with self consciousness and annoyance.'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"You''re so hot when you''re mad."'
-						'"You''re so hot when you''re mad," <<$npc_firstname[$boy]>> says, grin growing wider while ignoring your pleas.'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"You''re so hot when you''re mad."'
+						'"You''re so hot when you''re mad," <<$npc_firstname[$npcID]>> says, grin growing wider while ignoring your pleas.'
 					else
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
-						'"Come on, don''t be that way," <<$npc_firstname[$boy]>> says, ignoring your pleas. "You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
+						'"Come on, don''t be that way," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "You look so sexy. This is hot."'
 					end
 					*nl
-					'Your irritation with <<$npc_firstname[$boy]>> do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
+					'Your irritation with <<$npc_firstname[$npcID]>> do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
 				end
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			gs 'sex_ev_events', 'sex_film_force_stop'
 		end
-		
-		act'Angry':
+
+		act 'Angry':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'"Ungh~! Hmph~! Hey! What the fuck!" you scream as you realize what he''s doing and immediately try to cover up with your hand.'
-			'"Don''t worry, you look great," <<$npc_firstname[$boy]>> grins, still fucking you as he films.'
-			act'Let him film you (reluctant)':
+			'"Don''t worry, you look great," <<$npc_firstname[$npcID]>> grins, still fucking you as he films.'
+			act 'Let him film you (reluctant)':
 				sex_ev['phone_film'] = 2
-				$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-				$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."'
-				$sex_video_author[] = $boy
+				$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+				$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."'
+				$sex_ev['video_author'] = $boy
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'You let <<$npc_firstname[$boy]>> film you getting fucked by him, fuming in silence, occasionally turning to cover your face just to spite him.'
+				'You let <<$npc_firstname[$npcID]>> film you getting fucked by him, fuming in silence, occasionally turning to cover your face just to spite him.'
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!!$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck! Fuck off~! Put that thing away~!"'
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck! Fuck off~! Put that thing away~!"'
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_video_author[] = $boy
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"You''re so hot when you''re mad."'
-						'"You''re so hot when you''re mad," <<$npc_firstname[$boy]>> says, grin growing wider while ignoring your pleas.'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"You''re so hot when you''re mad."'
+						'"You''re so hot when you''re mad," <<$npc_firstname[$npcID]>> says, grin growing wider while ignoring your pleas.'
 					else
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
-						'"Come on, don''t be that way," <<$npc_firstname[$boy]>> says, ignoring your pleas. "You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
+						'"Come on, don''t be that way," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "You look so sexy. This is hot."'
 					end
 					*nl
 					'He takes a decently long video of you getting railed, screaming in rage the whole time, before he finally puts the phone away.'
@@ -190,23 +193,23 @@ if $ARGS[0] = 'sex_film_force_stop':
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss1.jpg"></center>'
-			'"Seriously, knock it off!" you snap, practically slapping the phone out of his hand as you grab it. You stop the recording and immediately hit the gallery button to delete the video. "Asshole..." you mutter as you toss the phone far away from the bed as well, all without removing <<$npc_firstname[$boy]>> from inside you.'
-			act'"Way to kill the mood"':
+			'"Seriously, knock it off!" you snap, practically slapping the phone out of his hand as you grab it. You stop the recording and immediately hit the gallery button to delete the video. "Asshole..." you mutter as you toss the phone far away from the bed as well, all without removing <<$npc_firstname[$npcID]>> from inside you.'
+			act '"Way to kill the mood"':
 				cla & *clr
 				$sex_ev['bed_room']
 				sex_ev['cock_inserted'] = 0
-				'"Way to kill the mood, asshole," you scowl at <<$npc_firstname[$boy]>> as you push him off and out of you. "I''m done here."'
-				gs'sex_ev_after', 'quit2'
+				'"Way to kill the mood, asshole," you scowl at <<$npc_firstname[$npcID]>> as you push him off and out of you. "I''m done here."'
+				gs 'sex_ev_after', 'quit2'
 			end
-			
-			act'Keep going':
+
+			act 'Keep going':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/4.jpg"></center>'
-				'"Finally," you sigh in relief. "Don''t do that again. Now get back to fucking me already."'
-				gs'sex_ev_sex', 'fuck_continue'
+				'"Finally," you sigh in relief, finally able to concentrate on the sex. "Don''t do that again."'
+				gs 'sex_ev_sex', 'fuck_continue'
 			end
-			
-			gs'sex_ev_after', 'quit'
+
+			gs 'sex_ev_after', 'quit'
 		end
 	else
 		act 'Make him put the phone away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -214,42 +217,42 @@ if $ARGS[0] = 'sex_film_force_stop':
 end
 
 if $ARGS[0] = 'sex_film_accept':
-	act'Let him film':
+	act 'Let him film':
 		sex_ev['phone_film'] = 2
 		!!if pcs_traits['exhibitionism'] > 0:
 		if Exhibitionist_lvl > 0: gs 'arousal', 'vaginal', -5, 'no_orgasm_msg', 'exhibitionism'
 		cla
-		act'Blush':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Mmph~! Mmph~! Mmm~! Nnn~!"<br>"You''re so fucking hot."'
-			$sex_video_author[] = $boy
+		act 'Blush':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Mmph~! Mmph~! Mmm~! Nnn~!"<br>"You''re so fucking hot."'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			'Your cheeks flush with warmth as you realize what <<$npc_firstname[$boy]>>''s doing and turn your face in embarrassment but don''t make any complaints.'
+			'Your cheeks flush with warmth as you realize what <<$npc_firstname[$npcID]>>''s doing and turn your face in embarrassment but don''t make any complaints.'
 			'"Mmph~! Mmph~! Mmm~! Nnn~!" Each pump of his cock inside you forces sheepish squeaks from your lips as you get caught between self-consciousness and pleasure.'
-			'"You''re so fucking hot,"  <<$npc_firstname[$boy]>> grins, continuing to fuck and film at the same time.'
+			'"You''re so fucking hot,"  <<$npc_firstname[$npcID]>> grins, continuing to fuck and film at the same time.'
 			*nl
 			'After a few minutes, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
-		
-		act'Ignore the camera':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Hah~! Haa~! Ah~! Haa~!"<br>"You''re so fucking hot."'
-			$sex_video_author[] = $boy
+
+		act 'Ignore the camera':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Hah~! Haa~! Ah~! Haa~!"<br>"You''re so fucking hot."'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			'"Hah~! Haa~! Ah~! Haa~!" You ignore the camera completely, focusing on <<$npc_firstname[$boy]>>''s cock pumping inside you and just try to stay the moment, letting moans escape your lips as they come. If he wants to film it, he can do what he wants.'
-			'"You''re so fucking hot,"  <<$npc_firstname[$boy]>> grins, continuing to fuck and film at the same time.'
+			'"Hah~! Haa~! Ah~! Haa~!" You ignore the camera completely, focusing on <<$npc_firstname[$npcID]>>''s cock pumping inside you and just try to stay the moment, letting moans escape your lips as they come. If he wants to film it, he can do what he wants.'
+			'"You''re so fucking hot,"  <<$npc_firstname[$npcID]>> grins, continuing to fuck and film at the same time.'
 			*nl
 			'After a few minutes, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
-		
-		act'Put on a show':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodI''mgonnacome~!"<br>"Yeah you like that?"<br>"Don''t stop~! Don''t stop~!"'
-			$sex_video_author[] = $boy
+
+		act 'Put on a show':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodI''mgonnacome~!"<br>"Yeah you like that?"<br>"Don''t stop~! Don''t stop~!"'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
 			'"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodImgonnacome~!"'
@@ -258,24 +261,32 @@ if $ARGS[0] = 'sex_film_accept':
 			else
 				'Unable to resist putting on a show, you turn on the moaning and the dirty talk. You shake your tits and arch your back with pleasure you aren''t really feeling.'
 			end
-			'"Yeah you like that?"  <<$npc_firstname[$boy]>> grins'
+			'"Yeah you like that?"  <<$npc_firstname[$npcID]>> grins'
 			'"Don''t stop~! Don''t stop~!" you moan back.'
 			'Seeming extra excited by what you''re doing and makes sure to capture every moment of it, sending the lens up and down your body from where he fucks your pussy back up to your flushed face.'
 			*nl
 			'After a few minutes of filming, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
-		
+
 		!!{if sex_ev['prostituion_flag'] > 0:
-			act'This costs extra':
-				
+			act 'This costs extra':
+
 			end
 		end}
 	end
 end
 
 if $ARGS[0] = 'sex_film_end':
-	if (npc_abusive[$boy] = 1 or rand(1,3) = 1) and npc_caretaker[$boy] > 1 and sex_ev['phone_film'] ! -1:gs 'fame', 'sex', $region, 5
+	if (npc_abusive[$npcID] = 1 or rand(1,3) = 1) and npc_caretaker[$npcID] > 1 and sex_ev['phone_film'] ! -1:
+		gs 'fame', 'sex', $region, 5
+	end
+	if sex_ev['phone_film'] ! -1:
+		i = arrsize('$sex_video') + 1
+		$sex_video[i] = $sex_ev['video_media']
+		$sex_video_author[i] = $sex_ev['video_author']
+		$sex_video_dialogue[i] = $sex_ev['video_dialogue']
+	end
 	gs 'sex_ev_cum', 'fuck_cum'
 end
 
@@ -283,67 +294,67 @@ if $ARGS[0] = 'offer_ciga1':
 	*nl
 	'"You want one?" he asks, holding the open packet towards you.'
 	if smoker > 20:
-		gs 'willpower', 'drugs', 'self', 'medium'
+		gs 'willpower', 'drugs ', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
-			act'Trying to quit (<<will_cost>> Willpower)':
+			act 'Trying to quit (<<will_cost>> Willpower)':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'"I''m trying to quit," you reply ruefully.'
-				'<<$npc_firstname[$boy]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long pull before exhaling a cloud of smoke in deep satisfaction'
+				'<<$npc_firstname[$npcID]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long pull before exhaling a cloud of smoke in deep satisfaction'
 				gs 'sex_ev_after', 'after_sex2'
 			end
 		else
 			act 'Trying to quit (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	else
-		act'No thanks':
+		act 'No thanks':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 			'"No thanks," you reply politely. "I''m good."'
-			'<<$npc_firstname[$boy]>> nods and pulls one out for himself instead and lights up.'
+			'<<$npc_firstname[$npcID]>> nods and pulls one out for himself instead and lights up.'
 			gs 'sex_ev_after', 'after_sex2'
 		end
 	end
-	
-	act'Yes please':
+
+	act 'Yes please':
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"Sure," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"Sure," you smile. <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
-	
-	act'Love one':
+
+	act 'Love one':
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"I''d love one," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"I''d love one," you smile. <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
-	
-	act'Read my mind':
+
+	act 'Read my mind':
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"You read my mind," you grin as <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"You read my mind," you grin as <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
-	
+
 	if smoker = 0:
-		act'I don''t smoke':
+		act 'I don''t smoke':
 			cla & *clr
-			if stat['cigarettes_smoked'] > 20 and npc_caretaker[$boy] = 1:
+			if stat['cigarettes_smoked'] > 20 and npc_caretaker[$npcID] = 1:
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 				'"No thanks," you reply politely. "I don''t smoke anymore."'
-				if npc_caretaker[$boy] = 1:
-					'"Oh, sorry. I didn''t realize," <<$npc_firstname[$boy]>> blinks. "I just won''t then. Don''t want to tempt you."'
-					act'How sweet':
+				if npc_caretaker[$npcID] = 1:
+					'"Oh, sorry. I didn''t realize," <<$npc_firstname[$npcID]>> blinks. "I just won''t then. Don''t want to tempt you."'
+					act 'How sweet':
 						cla & *nl
 						'A swell of affection warms your chest as he puts away his pack. It''s so sweet how thoughtful he is!'
 						gs 'sex_ev_after', 'after_sex2'
 					end
-					
-					act'It''s okay ':
+
+					act 'It''s okay ':
 						gs 'npc_relationship', 'modify', $boy, 'like'
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
@@ -361,7 +372,7 @@ if $ARGS[0] = 'offer_ciga1':
 			else
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'"No thanks. I don''t smoke," you tell him.'
-				'<<$npc_firstname[$boy]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long drag before exhaling a cloud of smoke in deep satisfaction'
+				'<<$npc_firstname[$npcID]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long drag before exhaling a cloud of smoke in deep satisfaction'
 				gs 'sex_ev_after', 'after_sex2'
 			end
 		end
@@ -374,92 +385,102 @@ if $ARGS[0] = 'sneak_phone':
 end
 
 if $ARGS[0] = 'rummage_drawers_link':
-	if sex_ev['drawer_rummage'] = 0 and $sex_ev['loc'] ! 'pc_home' and $sex_ev['loc'] ! 'house_party':
+	if sex_ev['drawer_rummage'] = 0 and $sex_ev['loc'] ! 'pc_home' and sex_ev['action_restricted'] = 0:
 		if  $sex_ev['loc'] = 'hotel_room':
-			'<<$npc_firstname[$boy]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of the hotel room <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
+			'<<$npc_firstname[$npcID]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of the hotel room <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
 		else
-			'<<$npc_firstname[$boy]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of his <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
+			'<<$npc_firstname[$npcID]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of his <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
 		end
 	end
 end
 
 if $ARGS[0] = 'rummage_drawers_start':
 	cla
-	act'Go back':gs 'sex_ev_after', 'after_sex2_w_picture'
-	act'Rummage through his dresser':gt 'sex_ev_events', 'rummage_drawers1'
+	act 'Go back':gs 'sex_ev_after', 'after_sex2_w_picture'
+	act 'Rummage through his dresser':gt 'sex_ev_events', 'rummage_drawers1'
 end
 
 if $ARGS[0] = 'rummage_drawers1':
 	sex_ev['drawer_rummage'] = 1
 	cla & *clr
 	'<center><video autoplay loop src="images/pc/activities/misc/open_drawers1.mp4"></video></center>'
-	!! if $npc_occupation[$boy] = 'drug_dealer': find drugs
-	act'Close the drawer':gs'sex_ev_events', 'rummage_drawers_end_route'
-	
+	!! if $npc_occupation[$npcID] = 'drug_dealer': find drugs
+	act 'Close the drawer':gs 'sex_ev_events', 'rummage_drawers_end_route'
+
 	if rand(1,3) = 1:
-		'You rummage through <<$npc_firstname[$boy]>>''s drawers. You don''t find anything of interest.'
-	!!{elseif npc_criminal[$boy] > 0:
-		'Your eyes go wide as you pull back on <<$npc_firstname[$boy]>>''s drawers and find a handgun inside.'
-		act'What is this???':gt'sex_ev_events', 'gun_ev_confront1'
+		if $sex_ev['loc'] ! 'hotel_room':
+			if npc_neat[$npcID] > 0:
+				'Rummaging through <<$npc_firstname[$npcID]>>''s drawers, you find rows of socks and underwear, all neatly folded. Seems he''s very organized...'
+			elseif npc_messy[$npcID] > 0:
+				'Rummaging through <<$npc_firstname[$npcID]>>''s drawers, you find a jumble of socks and underwear, all mixed in with each other like meat in a pasta. Seems like he''s not very organized...'
+			else
+				'You rummage through <<$npc_firstname[$npcID]>>''s drawers and find some clothes. Nothing interesting.'
+			end
+		else
+			'You rummage through <<$npc_firstname[$npcID]>>''s drawers. You don''t find anything of interest.'
+		end
+	!!{elseif npc_criminal[$npcID] > 0:
+		'Your eyes go wide as you pull back on <<$npc_firstname[$npcID]>>''s drawers and find a handgun inside.'
+		act 'What is this???':gt 'sex_ev_events', 'gun_ev_confront1'
 		if sveta_is_cop = 1:
-			act'Take note of the serial number':gt'sex_ev_events', 'gun_ev_serial1'
+			act 'Take note of the serial number':gt 'sex_ev_events', 'gun_ev_serial1'
 		end}
 	else
 		sex_ev['boy_money'] = rand(3,9)
-		if npc_finance[$boy] = 1: sex_ev['boy_money'] += rand(1,5)
-		if npc_finance[$boy] = 2: sex_ev['boy_money'] = sex_ev['boy_money'] * 2
-		'You rummage through <<$npc_firstname[$boy]>>''s drawers. You find <<sex_ev[''boy_money''] * 100>> <b>₽</b> in various notes, along with some of his other things.'
-		act'Steal it':
+		if npc_finance[$npcID] = 1: sex_ev['boy_money'] += rand(1,5)
+		if npc_finance[$npcID] = 2: sex_ev['boy_money'] = sex_ev['boy_money'] * 2
+		'You rummage through <<$npc_firstname[$npcID]>>''s drawers. You find <<sex_ev[''boy_money''] * 100>> <b>₽</b> in various notes, along with some of his other things.'
+		act 'Steal it':
 			cla & *clr
 			$sex_ev['bed_room']
 			sex_ev['stole_money'] = 1
 			if sex_ev['boy_in_shower'] = 1:
-				gs'sex_ev_events', 'rummage_drawers_shower_route'
+				gs 'sex_ev_events', 'rummage_drawers_shower_route'
 			else
-				gs'sex_ev_events', 'rummage_drawers_sleeping_route'
+				gs 'sex_ev_events', 'rummage_drawers_sleeping_route'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'rummage_drawers_sleeping_route':
-	'You take another cautious glance at <<$npc_firstname[$boy]>> but he is still slumbering away. You decide to take your chance and grab the money, carefully close the drawer with minimal noise, and quietly stuff your stolen goods into your purse.'
-	act'Continue':gs'sex_ev_events', 'rummage_drawers_end_route'
+	'You take another cautious glance at <<$npc_firstname[$npcID]>> but he is still slumbering away. You decide to take your chance and grab the money, carefully close the drawer with minimal noise, and quietly stuff your stolen goods into your purse.'
+	act 'Continue':gs 'sex_ev_events', 'rummage_drawers_end_route'
 end
 
 if $ARGS[0] = 'rummage_drawers_shower_route':
 	if rand(1,2) = 1:
-		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
+		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
 			'You take a wary glance at the bathroom door. Right as you do, you hear the water shut off. Realizing there''s only seconds, you take your chance and grab the cash out of the drawer and running back to your things to stuff it into your bag.'
 		else
-			'You take a wary glance at the door. Seems like <<$npc_firstname[$boy]>> is still showering so it should be safe. But right as you pick up the cash, you hear footsteps in the hall. Panic shoots through you as you run back to stuff it into your bag.'
+			'You take a wary glance at the door. Seems like <<$npc_firstname[$npcID]>> is still showering so it should be safe. But right as you pick up the cash, you hear footsteps in the hall. Panic shoots through you as you run back to stuff it into your bag.'
 		end
-		act'Hide the money!':gs'sex_ev_events', 'rummage_drawers_end_route'
+		act 'Hide the money!':gs 'sex_ev_events', 'rummage_drawers_end_route'
 	else
-		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
+		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
 			'You take a wary glance at the bathroom door. The water''s still running. It doesn''t seem like he''s going to come out any time soon. You decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
 		else
-			'You take a wary glance at the door. You don''t hear <<$npc_firstname[$boy]>> coming so you decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
+			'You take a wary glance at the door. You don''t hear <<$npc_firstname[$npcID]>> coming so you decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
 		end
-		act'Wait for <<$npc_firstname[$boy]>> to finish':
+		act 'Wait for <<$npc_firstname[$npcID]>> to finish':
 			cla & *clr
 			$sex_ev['bed_room']
-			if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
-				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before you hear the water shut off and <<$npc_firstname[$boy]>> comes out with wet hair and a towel wrapped around his waist.'
+			if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
+				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before you hear the water shut off and <<$npc_firstname[$npcID]>> comes out with wet hair and a towel wrapped around his waist.'
 			else
-				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before <<$npc_firstname[$boy]>> comes strolling back into the bedroom with wet hair and a towel wrapped around his waist.'
+				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before <<$npc_firstname[$npcID]>> comes strolling back into the bedroom with wet hair and a towel wrapped around his waist.'
 			end
-			gs'sex_ev_shower', 'boy_shower_finish_acts'
+			gs 'sex_ev_shower', 'boy_shower_finish_acts'
 		end
-		act'Join him in the shower':gt'sex_ev_shower', 'shower_join1'
+		act 'Join him in the shower':gt 'sex_ev_shower', 'shower_join1'
 	end
 end
 
 if $ARGS[0] = 'rummage_drawers_end_route':
 	if sex_ev['boy_in_shower'] = 1:
-		gs'sex_ev_events', 'rummage_drawers_shower_end'
+		gs 'sex_ev_events', 'rummage_drawers_shower_end'
 	else
-		gs'sex_ev_after', 'after_sex2_w_picture'
+		gs 'sex_ev_after', 'after_sex2_w_picture'
 	end
 end
 
@@ -469,37 +490,38 @@ if $ARGS[0] = 'rummage_drawers_shower_end':
 	!! if rand(1,3) = 1: he catches you
 	if sex_ev['stole_money'] = 1:
 		money += sex_ev['boy_money'] * 100
-		'You finish hiding the money in your bag just as <<$npc_firstname[$boy]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
+		'You finish hiding the money in your bag just as <<$npc_firstname[$npcID]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
 	else
-		'You finish closing the drawer and step away just as <<$npc_firstname[$boy]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
+		'You finish closing the drawer and step away just as <<$npc_firstname[$npcID]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
 	end
-	gs'sex_ev_shower', 'boy_shower_finish_acts'
+	gs 'sex_ev_shower', 'boy_shower_finish_acts'
 end
 
 
 if $ARGS[0] = 'boy_timecheck':
-	if hour >= npc_work_start[$boy] - 1 and hour < npc_work_end[$boy] and rand(1,5) = 1:
+	if hour >= npc_work_start[$npcID] - 1 and hour < npc_work_end[$npcID] and rand(1,5) = 1:
 		sex_ev['npc_late'] = 1
-		gs'sex_ev_events', 'boy_gotta_go'
+		gs 'sex_ev_events', 'boy_gotta_go'
 	end
 end
 
 if $ARGS[0] = 'boy_gotta_go':
 	cla
-	act'Continue':
+	act 'Continue':
 		cla & *clr
 		$sex_ev['bed_room']
-		'<<$npc_firstname[$boy]>> checks the time.'
+		'<<$npc_firstname[$npcID]>> checks the time.'
 		if sex_ev['boy_shower'] = 1:
-			'"Shit, I gotta go," he says, dropping his towel and reaching for his clothes. ' + iif(hour >= npc_work_start[$boy], '"I''m late for work."', '"I''m gonna be late for work."')
+			'"Shit, I gotta go," he says, dropping his towel and reaching for his clothes. ' + iif(hour >= npc_work_start[$npcID], '"I''m late for work."', '"I''m gonna be late for work."')
 		else
-			'"Shit, I gotta go," he says, hauling himself out of bed. ' + iif(hour >= npc_work_start[$boy], '"I''m late for work."', '"I''m gonna be late for work."')
+			'"Shit, I gotta go," he says, hauling himself out of bed. ' + iif(hour >= npc_work_start[$npcID], '"I''m late for work."', '"I''m gonna be late for work."')
 		end
-		gs'sex_ev_events', 'boy_gotta_go2'
+		gs 'sex_ev_events', 'boy_gotta_go2'
 	end
 end
 
 if $ARGS[0] = 'boy_gotta_go2':
+	sex_ev['breakfast_finished'] = -1
 	cla
 	if $sex_ev['loc'] ! 'pc_home':
 		'"Should I get dressed too then?" you ask.'
@@ -507,37 +529,37 @@ if $ARGS[0] = 'boy_gotta_go2':
 	if $sex_ev['loc'] = 'hotel_room':
 		sex_ev['hotel_days'] = rand(1,3)
 		if sex_ev['hotel_days'] = 1:
-			'"No need to rush. The room is booked until tomorrow," <<$npc_firstname[$boy]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
+			'"No need to rush. The room is booked until tomorrow," <<$npc_firstname[$npcID]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
 		else
-			'"No need to rush. The room is booked for a few more days," <<$npc_firstname[$boy]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
+			'"No need to rush. The room is booked for a few more days," <<$npc_firstname[$npcID]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
 		end
 		*nl
-		'With that, <<$npc_firstname[$boy]>> finishes getting dressed and heads out the door, leaving you in the hotel room all to yourself.'
-		if $npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0: money += npc_sugar_daddy_price[$boy]
-		act'Continue':gs'sex_ev_leave', 'exit'
+		'With that, <<$npc_firstname[$npcID]>> finishes getting dressed and heads out the door, leaving you in the hotel room all to yourself.'
+		if $npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0: money += npc_sugar_daddy_price[$npcID]
+		act 'Continue':gs 'sex_ev_leave', 'exit'
 	elseif $sex_ev['loc'] = 'npc_home':
-		if npc_lover_keys[$boy] = 1:
+		if npc_lover_keys[$npcID] = 1:
 			'"No, it''s fine. You have a key right? Just lock up when you leave," he says, quickly getting dressed.'
 		else
 			'"Yeah, I need you to leave so I can lock up."'
-			'You hurry to get dressed beside <<$npc_firstname[$boy]>>.'
-			gs'sex_ev_leave', 'dress_loop_end'
-			gs'sex_ev_leave', 'leaving_dialogue_choices'
+			'You hurry to get dressed beside <<$npc_firstname[$npcID]>>.'
+			gs 'sex_ev_leave', 'dress_loop_end'
+			gs 'sex_ev_leave', 'leaving_dialogue_choices'
 		end
 	end
 end
 
 if $ARGS[0] = 'sugar_daddy_gift':
-	npc_sugar_gifts[$boy] += 1
+	npc_sugar_gifts[$npcID] += 1
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
-	'"I got you something," <<$npc_firstname[$boy]>> smiles.'
-	act'Surprise':
+	'"I got you something," <<$npc_firstname[$npcID]>> smiles.'
+	act 'Surprise':
 		cla & *nl
 		'"For me?" you ask in bewilderment.'
 	end
-	if npc_sugar_gifts[$boy] > 1:
-	
+	if npc_sugar_gifts[$npcID] > 1:
+
 	end
 end
 

File diff suppressed because it is too large
+ 259 - 259
locations/sex_ev_favorite_part.qsrc


File diff suppressed because it is too large
+ 219 - 219
locations/sex_ev_foreplay.qsrc


+ 20 - 22
locations/sex_ev_foreplay_desc.qsrc

@@ -1,66 +1,64 @@
 # sex_ev_foreplay_desc
 
 if $ARGS[0] = 'generous_initiative_bed1_desc':
-	if (rand(0,1) = 1 or npc_pussyeater[$boy] = 1) and sex_ev['sensitive_cuni'] ! 1:
+	if (rand(0,1) = 1 or npc_pussyeater[$npcID] = 1) and sex_ev['sensitive_cuni'] ! 1:
 		if $sex_ev['loc'] = 'player home':
 			if sex_ev['start_shower'] = 1:
-				'You drag <<$npc_firstname[$boy]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.'
+				'You drag <<$npc_firstname[$npcID]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			end
 		elseif $sex_ev['loc'] = 'npc_home':
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 			end
 		elseif $sex_ev['loc'] = 'hotel_room':
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 			end
 		else
-			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 		end
 	else
 		!! nipple play
 		if $sex_ev['loc'] = 'player home':
 			if sex_ev['start_shower'] = 1:
-				'You drag <<$npc_firstname[$boy]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'You drag <<$npc_firstname[$npcID]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 		elseif $sex_ev['loc'] = 'npc_home':
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.'
+				'<<$npc_firstname[$npcID]>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 		elseif $sex_ev['loc'] = 'hotel_room':
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.'
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 		else
-			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 		end
 	end
 end
 
 if $ARGS[0] = 'kuni_deny1':
-	if $npc_rel_type[$boy] = 'boyfriend':
+	if $npc_rel_type[$npcID] = 'lover':
 		'"That''s... I''m not really comfortable with guys... down there..." you stammer. "It''s kinda personal..."'
-	elseif $npc_rel_type[$boy] = 'girlfriend':
-
 	else
 		'"That''s... I..." you stammer. "I don''t let guys go down on me unless I''m really comfortable with them. It''s a personal thing..."'
 	end
 end
 
 if $ARGS[0] = 'kuni_deny2':
-	if $npc_rel_type[$boy] = 'boyfriend' or $npc_rel_type[$boy] = 'girlfriend':
+	if $npc_rel_type[$npcID] = 'lover':
 		'"Woah!" you say, snapping your legs closed. "Sorry... I''m still not ready for that..."'
 	else
 		'"Nuh uh," you say, snapping your legs closed. "I''m still not ready for that."'
@@ -69,12 +67,12 @@ end
 
 if $ARGS[0] = 'transition1_desc':
 	if $sex_ev['loc'] = 'player home':
-		'You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	elseif $sex_ev['loc'] = 'npc_home':
 !!		$sex_ev['bed_room']
-		'You pant tiredly, laying back on <<$npc_firstname[$boy]>>''s bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on <<$npc_firstname[$npcID]>>''s bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	else
-		'You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	end
 end
 

+ 139 - 139
locations/sex_ev_hookup_leave.qsrc

@@ -10,16 +10,16 @@ if $ARGS[0] = 'gotta_go':
 
 	if rand(1,20) < sex_ev['cum_count'] + sex_ev['extra_cum']: sex_ev['continuation'] = 1
 	if sex_ev['leaving'] = 0:
-		act'I should go':
+		act 'I should go':
 			sex_ev['leaving'] = 1
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			if sex_ev['angry_after'] = 1 or sex_ev['annoyed'] > 0:
-				'"I have to go," you say flatly, reaching down for your clothes without looking at <<$npc_firstname[$boy]>>.'
+				'"I have to go," you say flatly, reaching down for your clothes without looking at <<$npc_firstname[$npcID]>>.'
 			elseif sex_ev['sleepover'] = 1:
 				'"This has been nice," you say, <<$sex_ev[''dress_describe'']>>. "But I really should go."'
 			elseif sex_ev['get_up'] = 0:
-				'As nice as this is, you really can''t stay and you heave yourself up and away from <<$npc_firstname[$boy]>>, getting up from the bed and moving over to where your discarded clothes were thrown.'
+				'As nice as this is, you really can''t stay and you heave yourself up and away from <<$npc_firstname[$npcID]>>, getting up from the bed and moving over to where your discarded clothes were thrown.'
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
 			else
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'gotta_go':
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 		end
 		if sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
-			act'Thanks for the <<$sex_ev[''fun'']>>':
+			act 'Thanks for the <<$sex_ev[''fun'']>>':
 				sex_ev['leaving'] = 1
 				cla & *clr
 				gs 'sex_ev_leave', 'dress_loop'
@@ -43,13 +43,13 @@ if $ARGS[0] = 'gotta_go':
 			end
 		end
 	else
-		act'Prepare to leave':
+		act 'Prepare to leave':
 			cla & *clr
 			$sex_ev['bed_room']
-			if sex_ev['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and sex_ev['boy_asleep'] ! 0:
-				gs'sex_ev_leave', 'sneak_out1'
+			if sex_ev['sleepover'] = 1 and npc_latesleeper[$npcID] = 1 and sex_ev['boy_asleep'] ! 0:
+				gs 'sex_ev_leave', 'sneak_out1'
 			else
-				gs'sex_ev_leave', 'leaving_dialogue'
+				gs 'sex_ev_leave', 'leaving_dialogue'
 			end
 		end
 	end
@@ -58,18 +58,18 @@ end
 if $ARGS[0] = 'hookup_continuation':
 	if $sex_ev['type'] = 'hookup':
 		sex_ev['continuation'] = rand(-1,1)
-		if rand(1,10) > 5 and (hour > 20 or hour < 4) and npc_caretaker[$boy] > 0 and npc_girlfriend[$boy] = 0 and sex_ev['cant_stay'] = 0 and sex_ev['sleepover'] ! 1:
-			'"You know, it''s kinda late." <<$npc_firstname[$boy]>> sits up in bed. "You don''t have to go right now. Did you want to maybe... spend the night?"'
+		if rand(1,10) > 5 and (hour > 20 or hour < 4) and npc_caretaker[$npcID] > 0 and npc_girlfriend[$npcID] = 0 and sex_ev['cant_stay'] = 0 and sex_ev['sleepover'] ! 1:
+			'"You know, it''s kinda late." <<$npc_firstname[$npcID]>> sits up in bed. "You don''t have to go right now. Did you want to maybe... spend the night?"'
 			gs 'sex_ev_hookup_leave', 'spend_the_night'
 		else
 			if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 				sex_ev['hookup_continuation_check'] = 1
 				cla
-				if npc_finance[$boy] = 2 and $npc_rel_goal[$boy] ! 'serious' and (rand(-1,2) - npc_selfish[$boy] > 0 or sex_ev['prostitution'] = 1):
+				if npc_finance[$npcID] = 2 and npc_goal[$npcID] < 3 and (rand(-1,2) - npc_selfish[$npcID] > 0 or sex_ev['prostitution'] = 1):
 					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
-				elseif $npc_rel_goal[$boy] = 'sex':
+				elseif npc_goal[$npcID] = 1:
 					gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
-				elseif $npc_rel_goal[$boy] ! '':
+				elseif npc_goal[$npcID] > 1:
 					gs 'sex_ev_hookup_leave', 'npc_date_request'
 				end
 				gs 'sex_ev_leave', 'dressing_finish'
@@ -101,12 +101,12 @@ if $ARGS[0] = 'hookup_continuation':
 		sex_ev['continuation'] = rand(-1,1)
 		if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 
-			if npc_finance[$boy] = 2 and $npc_rel_goal[$boy] ! 'serious' and (rand(-1,2) - npc_selfish[$boy] > 0 or sex_ev['prostitution'] = 1) and $npc_rel_type[$boy] ! 'sugar_daddy':
+			if npc_finance[$npcID] = 2 and npc_goal[$npcID] < 3 and (rand(-1,2) - npc_selfish[$npcID] > 0 or sex_ev['prostitution'] = 1) and $npc_rel_type[$npcID] ! 'sugar_daddy':
 				cla
 				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
-	!!		elseif $npc_rel_goal[$boy] = 'sex' and $npc_rel_type[$boy] ! 'fuckbuddy' and $npc_rel_type[$boy] ! 'sugar_daddy':
+	!!		elseif npc_goal[$npcID] = 1 and $npc_rel_type[$npcID] ! 'fuckbuddy' and $npc_rel_type[$npcID] ! 'sugar_daddy':
 	!!			gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
-	!!		elseif $npc_rel_goal[$boy] ! '' and $npc_rel_type[$boy] ! 'fuckbuddy' and $npc_rel_type[$boy] ! 'sugar_daddy'::
+	!!		elseif npc_goal[$npcID] > 1 and $npc_rel_type[$npcID] ! 'fuckbuddy' and $npc_rel_type[$npcID] ! 'sugar_daddy'::
 	!!			gs 'sex_ev_hookup_leave', 'npc_date_request'
 			end
 	!!		gs 'sex_ev_leave', 'dressing_finish'
@@ -115,7 +115,7 @@ if $ARGS[0] = 'hookup_continuation':
 end
 
 if $ARGS[0] = 'spend_the_night':
-	act'No thanks':
+	act 'No thanks':
 		sex_ev['cant_stay'] = 1
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
@@ -123,10 +123,10 @@ if $ARGS[0] = 'spend_the_night':
 		gs 'sex_ev_hookup_leave', 'hookup_continuation'
 	end
 
-	act'Well...':
+	act 'Well...':
 		cla & *nl
 		'"Well..." you pause for a moment, considering. You <i>could</i> stay over tonight. Maybe you don''t <i>have</i> to go...'
-		act'No, I shouldn''t':
+		act 'No, I shouldn''t':
 			sex_ev['cant_stay'] = 1
 			cla & *clr
 			$sex_ev['bed_room']
@@ -134,23 +134,23 @@ if $ARGS[0] = 'spend_the_night':
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 		end
 
-		act'I guess I could...':
+		act 'I guess I could...':
 			cla & *clr
 			$sex_ev['bed_room']
 			'"... I guess I could..." you relent, dropping the clothes you were holding.'
-			act'Undress and get into bed with him':
+			act 'Undress and get into bed with him':
 				if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 				if $braworntype ! 'none':gs 'bras', 'remove'
 				if $pantyworntype ! 'none':gs 'panties', 'remove'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
-				'You slip back into bed and cuddle up with <<$npc_firstname[$boy]>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'
+				'You slip back into bed and cuddle up with <<$npc_firstname[$npcID]>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'
 				gs 'sex_ev_after', 'sleep'
 			end
 		end
 	end
 
-	act'I really need to go':
+	act 'I really need to go':
 		sex_ev['cant_stay'] = 1
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'spend_the_night':
 end
 
 if $ARGS[0] = 'pc_fuckbuddy_request':
-	act'We should hook up again later':
+	act 'We should hook up again later':
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		if sex_ev['cant_stay'] = 1:
@@ -168,17 +168,17 @@ if $ARGS[0] = 'pc_fuckbuddy_request':
 		else
 			'"This was fun. We should hook up again some time," you say, <<$sex_ev[''dress_describe'']>>.'
 		end
-		act'Continue':
+		act 'Continue':
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			if rand(1,3) = 1:
-				'"Nah, this was a one time thing," <<$npc_firstname[$boy]>> replies. "I never fuck the same girl twice."'
+				'"Nah, this was a one time thing," <<$npc_firstname[$npcID]>> replies. "I never fuck the same girl twice."'
 				'You pause for a moment and give him a look.'
 				'"Seriously?"'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'<i>Free access to pussy and you''re just gonna turn it down? Whatever...</i> you think to yourself, <<$sex_ev[''dress_describe'']>>.'
 				*nl
-				'Once you''re finished dressing, you grab your things and leave. <<$npc_firstname[$boy]>> doesn''t say a word as you close the door behind you.'
+				'Once you''re finished dressing, you grab your things and leave. <<$npc_firstname[$npcID]>> doesn''t say a word as you close the door behind you.'
 			else
 				gs 'sex_ev_leave', 'fuckbuddy_add'
 				'"What, like fuckbuddies?"'
@@ -188,28 +188,28 @@ if $ARGS[0] = 'pc_fuckbuddy_request':
 				*nl
 				gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
 			end
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 	end
 end
 
 if $ARGS[0] = 'pc_date_request':
-	act'Maybe I could see you again sometime?':
+	act 'Maybe I could see you again sometime?':
 		cla & *clr
-		gs'sex_ev_leave', 'dress_loop'
+		gs 'sex_ev_leave', 'dress_loop'
 		'"Maybe I could see you again? For like, dinner? Or a movie? Or something?" you say, <<$sex_ev[''dress_describe'']>>.'
-		act'Continue':
+		act 'Continue':
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			if rand(1,3) = 1:
-				'"Nah, this was a one time thing," <<$npc_firstname[$boy]>> replies. "I never fuck the same girl twice."'
+				'"Nah, this was a one time thing," <<$npc_firstname[$npcID]>> replies. "I never fuck the same girl twice."'
 				'You pause for a moment and give him a look.'
 				'"Seriously?"'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'<i>Wow... You can really pick em, huh <<$pcs_nickname>>?</i> you think to yourself  <<$sex_ev[''dress_describe'']>>. <i>Ugh. Whatever...</i>'
 				*nl
-				'Once you''re done, you grab your things and leave. <<$npc_firstname[$boy]>> doesn''t say a word as you close the door behind you.'
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				'Once you''re done, you grab your things and leave. <<$npc_firstname[$npcID]>> doesn''t say a word as you close the door behind you.'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			else
 				!! set dating flag
 				'"You mean like a date?"'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'pc_date_request':
 				else
 					'That bit of business done, you cheerfully wave him goodbye and head out the door.'
 				end
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			end
 		end
 	end
@@ -249,13 +249,13 @@ if $ARGS[0] = 'npc_fuckbuddy_request':
 			'"Cool. Maybe we can hook up again sometime?"'
 		end
 	end
-	act'You mean like fuckbuddies?':
+	act 'You mean like fuckbuddies?':
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		'"Like what?" you ask back, <<$sex_ev[''dress_describe'']>>. "Friends with benefits? Fuckbuddies? Booty callers? No strings attached?"'
 		'"Yeah, just like that. No strings attached."'
 		gs 'sex_ev_hookup_leave', 'just_a_hookup'
-		act'Sure':
+		act 'Sure':
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'fuckbuddy_add'
@@ -276,7 +276,7 @@ if $ARGS[0] = 'npc_fuckbuddy_request':
 			else
 				'Your little exchange done, you wave him goodbye and head out the door.'
 			end
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 		gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
@@ -286,7 +286,7 @@ end
 if $ARGS[0] = 'npc_date_request':
 	'"Well... Maybe I could see you again sometime? Not just sex, but like really see you, you know? Take you out on a date or something? Dinner? See a movie?"'
 	gs 'sex_ev_hookup_leave', 'just_a_hookup'
-	act'Sure':
+	act 'Sure':
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'lover_add'
@@ -307,49 +307,49 @@ if $ARGS[0] = 'npc_date_request':
 		else
 			'Your little exchange done, you wave him goodbye and head out the door.'
 		end
-		act'Leave':gt 'sex_ev_leave', 'exit'
+		act 'Leave':gt 'sex_ev_leave', 'exit'
 	end
-	act'I''m not up for anything serious':
+	act 'I''m not up for anything serious':
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		'"I''m not looking for anything serious right now," you say, more than a little awkwardly as you''re <<$sex_ev[''dress_describe'']>>.'
-		act'Sorry':
+		act 'Sorry':
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Sorry..."'
-			'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you <<$sex_ev[''dress_describe'']>>.'
-			'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you <<$sex_ev[''dress_describe'']>>.'
+			'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 
-		act'If we were fuckbuddies...':
+		act 'If we were fuckbuddies...':
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			'"If it were something purely physical, like fuckbuddies or something," you say, <<$sex_ev[''dress_describe'']>>. "I wouldn''t mind getting together for some fun, but I''m not interested in a boyfriend."'
-			if rand(1,10) > 7 and $npc_rel_goal[$boy] ! 'serious':
+			if rand(1,10) > 7 and npc_goal[$npcID] ! 3:
 				gs 'sex_ev_leave', 'fuckbuddy_add'
-				'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$boy]>> doesn''t really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.'
+				'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$npcID]>> doesn''t really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.'
 				'"So uhh, yeah... Call me sometime?"'
-				iif($sex_ev['loc'] = 'house_party', 'With a shrug and an awkward wave goodbye, you head out back out into the party.', 'With a shrug and an awkward wave goodbye, you head out the door and out of <<$npc_firstname[$boy]>>''s apartment.')
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				iif($sex_ev['loc'] = 'house_party', 'With a shrug and an awkward wave goodbye, you head out back out into the party.', 'With a shrug and an awkward wave goodbye, you head out the door and out of <<$npc_firstname[$npcID]>>''s apartment.')
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			else
 				'"No," he shakes his head. "I don''t want to get led on by you if you''re only interested in a fuck and not anything real. Guess this is just a one night stand."'
-				act'It''s to be expected':
+				act 'It''s to be expected':
 					cla & *clr
 					gs 'sex_ev_leave', 'dress_loop'
 					'You nod to yourself, continuing <<$sex_ev[''dress_describe'']>>. It''s to be expected from a guy like him. But if he wants something more, you just can''t give it to him. You''re only after pleasure, you don''t want to get tangled up in a relationship.'
 					*nl
-					iif($sex_ev['loc'] = 'house_party', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$boy]>> and head out back out into the party.', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$boy]>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.')
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					iif($sex_ev['loc'] = 'house_party', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$npcID]>> and head out back out into the party.', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$npcID]>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.')
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 
-				act'Taken aback':
+				act 'Taken aback':
 					cla & *clr
 					gs 'sex_ev_leave', 'dress_loop'
 					'You blink in surprise, stopping halfway through <<$sex_ev[''dress_describe'']>>. That response really wasn''t what you saw coming. After all, what guy just gives up free access to sex?'
 					*nl
-					iif($sex_ev['loc'] = 'house_party', '"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and head out back out into the party.', '"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards out the door.')
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					iif($sex_ev['loc'] = 'house_party', '"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and head out back out into the party.', '"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and wave goodbye, quickly striding towards out the door.')
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 			end
 		end
@@ -359,20 +359,20 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_offer':
 	sex_ev['sugar_daddy_offer'] = rand(10,20)
 	if sex_ev['thank_for_fun'] = 1:
-		'"Did you really enjoy it? Or are you just saying that?" <<$npc_firstname[$boy]>> asks.'
-		act'Just saying (honest)':
+		'"Did you really enjoy it? Or are you just saying that?" <<$npc_firstname[$npcID]>> asks.'
+		act 'Just saying (honest)':
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Just saying it," you shrug, <<$sex_ev[''dress_describe'']>>. "If I''m being honest, this wasn''t anything special. But I thought I''d try to be polite."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 		end
 
-		act'Just saying (teasing)':
+		act 'Just saying (teasing)':
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Just saying," you say, <<$sex_ev[''dress_describe'']>> with a teasing smirk. "I was trying to be nice."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 		end
 
-		act'You mean it':
+		act 'You mean it':
 			gs 'sex_ev_leave', 'dress_loop'
 			'"No really," you smirk, <<$sex_ev[''dress_describe'']>>. "It was a good time."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
@@ -383,94 +383,94 @@ if $ARGS[0] = 'npc_sugar_daddy_offer':
 end
 
 if $ARGS[0] = 'npc_sugar_daddy_offer2':
-	'"How about we do this again?" <<$npc_firstname[$boy]>> says.'
+	'"How about we do this again?" <<$npc_firstname[$npcID]>> says.'
 	'"Do what?" you ask back, <<$sex_ev[''dress_describe'']>>.'
 	if sex_ev['prostitution'] > 0:
 		'"This," he says again, gesturing vaguely around the room. "You can keep me company and I can get you some... compensation."'
 	else
 		'"This," he says again, gesturing vaguely around the room. "And maybe for your time and your company I could find you some... compensation."'
 	end
-	act'Not a hooker':
+	act 'Not a hooker':
 		gs 'sex_ev_leave', 'dress_loop'
 		'"I''m not a hooker," you say, <<$sex_ev[''dress_describe'']>>.'
-		'"I didn''t say you were," <<$npc_firstname[$boy]>> snickers back. "Don''t think of it that way. Think of it more like... a sugar daddy relationship. Will you let me be your daddy?"'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+		'"I didn''t say you were," <<$npc_firstname[$npcID]>> snickers back. "Don''t think of it that way. Think of it more like... a sugar daddy relationship. Will you let me be your daddy?"'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
 	end
-	gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+	gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
 	gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 	gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
 end
 
 if $ARGS[0] = 'npc_sugar_daddy_refuse':
-	act'Refuse him':
+	act 'Refuse him':
 		cla
-		act'Nice try but no':
+		act 'Nice try but no':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			iif($sex_ev['loc'] = 'house_party', '"Nice try but no," you grimace and pick up the rest of your things and head back out into the party.', '"Nice try but no," you grimace and pick up the rest of your things and head out the door.')
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 
-		act'Not that kind of girl':
+		act 'Not that kind of girl':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I''m not that kind of girl," you sneer.'
 			'"The missing money from my wallet would disagree," he chuckles back.'
 			'Filled with disgust, you pick up the rest of your things and head out the door.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 
-		act'"You''re disgusting"':
+		act '"You''re disgusting"':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"You''re disgusting," you sneer.'
 			'"Hey, what''s the point of money if you don''t spend it?" he chuckles back.'
 			'Filled with revulsion, you pick up the rest of your things and head out the door.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 
-		act'"You can''t afford me"':
+		act '"You can''t afford me"':
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Please," you scoff, <<$sex_ev[''dress_describe'']>>. "You can''t afford me."'
 			'"So you say, but your loss in the end I suppose," he smirks back.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 	end
 end
 
 if $ARGS[0] = 'npc_sugar_daddy_how_much':
-	act'How much?':
+	act 'How much?':
 		gs 'sex_ev_leave', 'dress_loop'
 		'"Depends," you muse, <<$sex_ev[''dress_describe'']>>. "How much are we talking?"'
 		'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a date?"'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 	end
 end
 
 if $ARGS[0] = 'npc_sugar_daddy_accept':
-	act'Accept':
+	act 'Accept':
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"That sounds... mutually beneficial," you say, slowly <<$sex_ev[''dress_describe'']>>.'
-		'"I''ll look forward to the next time you come over then," <<$npc_firstname[$boy]>> smirks. "Give me your number so I can tell you when to come over.'
+		'"I''ll look forward to the next time you come over then," <<$npc_firstname[$npcID]>> smirks. "Give me your number so I can tell you when to come over.'
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	end
 end
 
 if $ARGS[0] = 'npc_sugar_daddy_haggle':
-	act'Haggle':
+	act 'Haggle':
 		:invalid_counter_offer
 		sex_ev['sugar_daddy_counteroffer'] = input ("Pick a number between 10 and 50. The number will be multiplied by 100. (10 will be 1000, 25 will be 2500, 50 will be 5000)")
 		if sex_ev['sugar_daddy_counteroffer'] > 50 or sex_ev['sugar_daddy_counteroffer'] < 10 :
 			msg 'Invalid input. Pick a number between 10 and 50.'
 			jump 'invalid_counter_offer'
 		else
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle2'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle2'
 		end
 	end
 end
@@ -478,40 +478,40 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_haggle2':
 	gs 'sex_ev_leave', 'dress_loop'
 	if sex_ev['sugar_daddy_counteroffer'] = sex_ev['sugar_daddy_offer']:
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 	elseif sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer']:
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		'"Why don''t we say <<sex_ev[''sugar_daddy_counteroffer''] * 100>>? I''d feel bad if I took too much," you smirk, <<$sex_ev[''dress_describe'']>>.'
-		'"Hey if you''re willing to put out for less, I won''t complain," <<$npc_firstname[$boy]>> grins back. "Give me your number so I can tell you when to come over.'
+		'"Hey if you''re willing to put out for less, I won''t complain," <<$npc_firstname[$npcID]>> grins back. "Give me your number so I can tell you when to come over.'
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	elseif sex_ev['sugar_daddy_counteroffer'] > 25:
 		if sex_ev['haggle_fail'] = 1:
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
 		else
 			'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>.'
-			'"You greedy bitch," <<$npc_firstname[$boy]>> snickers back. "You''re not worth that much. Come on, try again."'
+			'"You greedy bitch," <<$npc_firstname[$npcID]>> snickers back. "You''re not worth that much. Come on, try again."'
 			sex_ev['haggle_fail'] = 1
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 		end
-	elseif rand(1,pcs_persuas) > npc_willpower[$boy] or sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer'] + 2:
+	elseif rand(1,pcs_persuas) > npc_willpower[$npcID] or sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer'] + 2:
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		'"Why don''t we say... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>. "That seems worth my time."'
-		'"You drive a hard bargain baby girl," <<$npc_firstname[$boy]>> grins back. "But I think I can work with that. Give me your number so I can tell you when to come over.'
+		'"You drive a hard bargain baby girl," <<$npc_firstname[$npcID]>> grins back. "But I think I can work with that. Give me your number so I can tell you when to come over.'
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	else
 		if sex_ev['haggle_fail'] = 1:
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
 		else
 			sex_ev['sugar_daddy_offer'] += rand(1,2)
 			'"How about... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you ask, <<$sex_ev[''dress_describe'']>>.'
-			'"Seems a little steep," <<$npc_firstname[$boy]>> frowns. "Why don''t we try <<sex_ev[''sugar_daddy_offer''] * 100>>?'
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+			'"Seems a little steep," <<$npc_firstname[$npcID]>> frowns. "Why don''t we try <<sex_ev[''sugar_daddy_offer''] * 100>>?'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 		end
 	end
 end
@@ -519,16 +519,16 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_haggle_fail':
 	'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you try again, <<$sex_ev[''dress_describe'']>>.'
 	if sex_ev['sugar_daddy_counteroffer'] > 25:
-		'"Who do you think you are?" <<$npc_firstname[$boy]>> scoffs. "I could fuck a supermodel for that kind of money. You know what? Forget it. I don''t need another gold digger in my life."'
+		'"Who do you think you are?" <<$npc_firstname[$npcID]>> scoffs. "I could fuck a supermodel for that kind of money. You know what? Forget it. I don''t need another gold digger in my life."'
 	else
-		'"Still too rich for my blood," <<$npc_firstname[$boy]>> says with a shake of his head. "You know what? Forget it. I don''t need another gold digger in my life."'
+		'"Still too rich for my blood," <<$npc_firstname[$npcID]>> says with a shake of his head. "You know what? Forget it. I don''t need another gold digger in my life."'
 	end
 	if sex_ev['dress_end'] = 1:
 		'Everything becomes very awkward very quickly and you take that as your cue to grab your things and hurry out the door.'
 	else
 		'Everything becomes very awkward very quickly and you take that as your cue to finish getting dressed in a hurry and head out the door.'
 	end
-	act'Leave':gt 'sex_ev_leave', 'exit'
+	act 'Leave':gt 'sex_ev_leave', 'exit'
 end
 
 if $ARGS[0] = 'fuckbuddy_text':
@@ -559,7 +559,7 @@ if $ARGS[0] = 'just_a_hookup':
 	else
 		$sex_ev['just_a'] = 'random hookup'
 	end
-	act'This was a <<$sex_ev[''just_a'']>>':
+	act 'This was a <<$sex_ev[''just_a'']>>':
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		'"No," you shake your head, <<$sex_ev[''dress_describe'']>>. "This was just a <<$sex_ev[''just_a'']>>. I''m not looking for anything lasting."'
@@ -567,111 +567,111 @@ if $ARGS[0] = 'just_a_hookup':
 			'"Whatever, your loss," he shrugs.'
 			'"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
 		elseif sex_ev['continuation'] = 2:
-			'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-			'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+			'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+			'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
 		end
-		act'Leave':gt 'sex_ev_leave', 'exit'
+		act 'Leave':gt 'sex_ev_leave', 'exit'
 	end
 end
 
 if $ARGS[0] = 'have_a_boyfriend':
-	if stat['boyfriends_current'] > 0:
-		act'I have a boyfriend':
-			npc_know_girlfriend[$boy] = 0
+	if pcs_lover - pcs_girlfriends > 0:
+		act 'I have a boyfriend':
+			npc_know_girlfriend[$npcID] = 0
 			gs 'sex_ev_leave', 'dress_loop'
 			'"I have a boyfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			if sex_ev['sugar_daddy_offer'] > 0:
-				'"So?" <<$npc_firstname[$boy]>> grins shamelessly. "Does that change the value of the money?"'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
-				act'So long as you know':
+				'"So?" <<$npc_firstname[$npcID]>> grins shamelessly. "Does that change the value of the money?"'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+				act 'So long as you know':
 					cla & *clr
 					$sex_ev['bed_room']
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
-					gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 				end
-			elseif npc_fidelity[$boy] <= 5:
-				if npc_girlfriend[$boy] = 1 and $npc_rel_goal[$boy] = 'sex':
+			elseif npc_fidelity[$npcID] <= 5:
+				if npc_girlfriend[$npcID] = 1 and npc_goal[$npcID] = 1:
 					'"So? I have a girlfriend," he grins shamelessly. "Doesn''t mean we can''t keep fucking."'
-					act'No way':
+					act 'No way':
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 						'"Yeah, no," you grimace. "That''s a kind of drama I <i>don''t</i> want to deal with.'
 						'And with that, you pick up the rest of your things and head out the door.'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
-					act'So long as you know':
+					act 'So long as you know':
 						cla & *clr
 						gs 'sex_ev_leave', 'dress_loop'
 						gs 'sex_ev_leave', 'fuckbuddy_add'
 						'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 						*nl
 						gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
 				else
 					'"Whatever, your loss," he shrugs. "Looks like I''m a better lay than him anyways."'
 					'"Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 			else
-				'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-				'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+				'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'have_a_girlfriend':
-	if stat['girlfriends_current'] > 0:
-		act'I have a girlfriend':
-			npc_know_girlfriend[$boy] = 1
+	if pcs_girlfriends > 0:
+		act 'I have a girlfriend':
+			npc_know_girlfriend[$npcID] = 1
 			gs 'sex_ev_leave', 'dress_loop'
 			'"I have a girlfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			if sex_ev['sugar_daddy_offer'] > 0:
-				'"So?" <<$npc_firstname[$boy]>> grins shamelessly. "Does that change the value of the money?"'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
-				act'So long as you know':
+				'"So?" <<$npc_firstname[$npcID]>> grins shamelessly. "Does that change the value of the money?"'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+				act 'So long as you know':
 					cla & *clr
 					$sex_ev['bed_room']
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
-					gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 				end
 			else
-				if npc_fidelity[$boy] <= 5:
-					if npc_girlfriend[$boy] = 1 and $npc_rel_goal[$boy] = 'sex':
+				if npc_fidelity[$npcID] <= 5:
+					if npc_girlfriend[$npcID] = 1 and npc_goal[$npcID] = 1:
 						'"Hey, me too!" he grins shamelessly.'
-						act'No way':
+						act 'No way':
 							cla & *clr
 							'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 							'"Nice try but no," you grimace, and pick up the rest of your things and head out the door.'
-							act'Leave':gt 'sex_ev_leave', 'exit'
+							act 'Leave':gt 'sex_ev_leave', 'exit'
 						end
 
-						act'So long as you know':
+						act 'So long as you know':
 							cla & *clr
 							$sex_ev['bed_room']
 							gs 'sex_ev_leave', 'fuckbuddy_add'
 							'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 							*nl
 							gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
-							act'Leave':gt 'sex_ev_leave', 'exit'
+							act 'Leave':gt 'sex_ev_leave', 'exit'
 						end
 					else
 						'"Whatever, your loss," he shrugs. "Bi girls always come back when they start missing dick."'
 						'"That''s what strapons are for," you roll your eyes, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
 				else
-					'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-					'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+					'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 			end
 		end

File diff suppressed because it is too large
+ 294 - 271
locations/sex_ev_leave.qsrc


File diff suppressed because it is too large
+ 391 - 195
locations/sex_ev_miss.qsrc


File diff suppressed because it is too large
+ 262 - 244
locations/sex_ev_morning.qsrc


File diff suppressed because it is too large
+ 301 - 271
locations/sex_ev_pillow_talk.qsrc


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