Преглед на файлове

Merge remote-tracking branch 'Kevin-upstream/master'

netuttki преди 7 месеца
родител
ревизия
542292e4c9
променени са 100 файла, в които са добавени 5182 реда и са изтрити 4532 реда
  1. 21 6
      glife.qproj
  2. 6 12
      locations/AppearanceSystem.qsrc
  3. 1 1
      locations/BDsex.qsrc
  4. 1 1
      locations/BelSex.qsrc
  5. 159 159
      locations/Cheatmenu_din.qsrc
  6. 1 1
      locations/FedorEv4_sex.qsrc
  7. 1 1
      locations/JuliaMilHome.qsrc
  8. 50 50
      locations/KatjaHomeTalk.qsrc
  9. 11 8
      locations/Katja_Tanga.qsrc
  10. 3 3
      locations/Katlake.qsrc
  11. 23 1252
      locations/Komp.qsrc
  12. 1 1
      locations/LBZhouse.qsrc
  13. 4 3
      locations/LariskaHome.qsrc
  14. 2 2
      locations/LariskaSex.qsrc
  15. 1 0
      locations/Voltrener.qsrc
  16. 2 2
      locations/VoltrenerSexShower.qsrc
  17. 1 1
      locations/Zvereva_house_events.qsrc
  18. 1 1
      locations/abduction.qsrc
  19. 214 0
      locations/alarmclock.qsrc
  20. 2 2
      locations/albina_starlets.qsrc
  21. 218 216
      locations/albina_wine_event.qsrc
  22. 1 1
      locations/anushapt.qsrc
  23. 1 1
      locations/autosalonF.qsrc
  24. 45 45
      locations/autotraidF.qsrc
  25. 2 1
      locations/avtonorm.qsrc
  26. 1 1
      locations/backwater.qsrc
  27. 82 59
      locations/bdsm_mansion.qsrc
  28. 13 390
      locations/bed.qsrc
  29. 73 52
      locations/bed2.qsrc
  30. 532 0
      locations/bed_events.qsrc
  31. 41 0
      locations/bed_get_out.qsrc
  32. 134 0
      locations/bed_get_out_events.qsrc
  33. 5 4
      locations/bedr.qsrc
  34. 1 1
      locations/bedr2x.qsrc
  35. 3 3
      locations/bedrPar.qsrc
  36. 1 1
      locations/bedrPar2.qsrc
  37. 7 4
      locations/begin.qsrc
  38. 4 3
      locations/booty_call.qsrc
  39. 1 1
      locations/booty_call_sms.qsrc
  40. 95 0
      locations/boy_updater.qsrc
  41. 3 3
      locations/brothel.qsrc
  42. 1 1
      locations/brother_shower_sex.qsrc
  43. 1 1
      locations/brother_voyeur_sex.qsrc
  44. 0 232
      locations/budilnik.qsrc
  45. 3 3
      locations/buklinik_event.qsrc
  46. 1 1
      locations/carF.qsrc
  47. 79 24
      locations/cikl.qsrc
  48. 0 1
      locations/city_clinic.qsrc
  49. 1 1
      locations/city_house_res_misc.qsrc
  50. 1 1
      locations/city_irinaroom.qsrc
  51. 47 75
      locations/city_library.qsrc
  52. 1 1
      locations/city_mansion_residence_1.qsrc
  53. 5 0
      locations/city_residential.qsrc
  54. 8 32
      locations/city_sauna.qsrc
  55. 1 0
      locations/counter.qsrc
  56. 235 0
      locations/courtletter.qsrc
  57. 77 42
      locations/din_bad.qsrc
  58. 293 286
      locations/din_van.qsrc
  59. 340 174
      locations/dream_events.qsrc
  60. 31 0
      locations/femcyc.qsrc
  61. 157 113
      locations/fertility.qsrc
  62. 1 1
      locations/fit.qsrc
  63. 2 2
      locations/foto.qsrc
  64. 8 13
      locations/foto_shoot.qsrc
  65. 7 6
      locations/gadbana.qsrc
  66. 1 1
      locations/gadhouse.qsrc
  67. 0 1
      locations/gadprostitutes.qsrc
  68. 19 3
      locations/gameover.qsrc
  69. 2 2
      locations/gdksport.qsrc
  70. 1 1
      locations/gopnew.qsrc
  71. 4 4
      locations/gschool_boys_bathroom.qsrc
  72. 24 22
      locations/gschool_jock_chats.qsrc
  73. 10 22
      locations/gschool_lessonsev3.qsrc
  74. 4 4
      locations/gschool_sex.qsrc
  75. 8 8
      locations/home_activity.qsrc
  76. 5 0
      locations/hourly_events.qsrc
  77. 2 2
      locations/husbSex.qsrc
  78. 3 3
      locations/intro_customization.qsrc
  79. 1 1
      locations/intro_initialization.qsrc
  80. 1 1
      locations/intro_initialization_city.qsrc
  81. 1 0
      locations/intro_sg_select.qsrc
  82. 2 2
      locations/intro_uni.qsrc
  83. 18 2
      locations/item_cart.qsrc
  84. 23 0
      locations/item_stock_db.qsrc
  85. 26 2
      locations/journal.qsrc
  86. 22 1
      locations/journal_quests.qsrc
  87. 89 89
      locations/katjaEv.qsrc
  88. 10 10
      locations/katjaEvDin.qsrc
  89. 18 16
      locations/katja_chat.qsrc
  90. 35 35
      locations/katja_city.qsrc
  91. 488 34
      locations/katja_city_sex.qsrc
  92. 29 29
      locations/katja_dorm.qsrc
  93. 88 88
      locations/katja_lake.qsrc
  94. 296 551
      locations/katja_nightclub.qsrc
  95. 583 14
      locations/katja_nightclub_sex.qsrc
  96. 15 15
      locations/katja_party.qsrc
  97. 132 132
      locations/katja_procedural.qsrc
  98. 38 37
      locations/katja_sex.qsrc
  99. 68 52
      locations/katja_uni.qsrc
  100. 48 46
      locations/katja_uni_sex.qsrc

+ 21 - 6
glife.qproj

@@ -29,6 +29,7 @@
 		<Location name="mod_setting"/>
 		<Location name="$difficulty"/>
 		<Location name="UnitAppearance"/>
+		<Location name="notification"/>
 	</Folder>
 	<Folder name="Stats">
 		<Location name="DNA"/>
@@ -67,7 +68,6 @@
 		<Location name="beverage"/>
 		<Location name="food_menu"/>
 		<Location name="schedule"/>
-		<Location name="sleep"/>
 		<Location name="willpower"/>
 		<Location name="drugs"/>
 		<Location name="npc_relationship"/>
@@ -79,6 +79,16 @@
 		<Location name="grades"/>
 		<Location name="internet_mobile"/>
 	</Folder>
+	<Folder name="Sleep">
+		<Location name="pre_sleep"/>
+		<Location name="pre_sleep_events"/>
+		<Location name="dream_events"/>
+		<Location name="sleep"/>
+		<Location name="sleep_simple"/>
+		<Location name="sleep_events"/>
+		<Location name="wakeup"/>
+		<Location name="wakeup_events"/>
+	</Folder>
 	<Folder name="Body">
 		<Location name="AppearanceSystem"/>
 		<Location name="body"/>
@@ -285,6 +295,7 @@
 		<Location name="npcstatic4"/>
 		<Location name="npcstatic5"/>
 		<Location name="npcstatic6"/>
+		<Location name="npc_standard_preferences"/>
 		<Location name="fight_npcdata"/>
 		<Location name="npc"/>
 		<Location name="saveupdater"/>
@@ -305,11 +316,14 @@
 	</Folder>
 	<Folder name="Furniture">
 		<Location name="bed"/>
+		<Location name="bed_events"/>
 		<Location name="bed2"/>
-		<Location name="dreams"/>
-		<Location name="budilnik"/>
+		<Location name="bed_get_out"/>
+		<Location name="bed_get_out_events"/>
+		<Location name="alarmclock"/>
 		<Location name="divan"/>
 		<Location name="Komp"/>
+		<Location name="komp_camgirl"/>
 		<Location name="kompMFC"/>
 		<Location name="kompMFCtwo"/>
 		<Location name="kompMFCanal"/>
@@ -647,9 +661,9 @@
 	</Folder>
 	<Folder name="Home-Shared_appartment">
 		<Location name="pav_shared_apt"/>
-		<Location name="pav_shared_gp"/>
-		<Location name="pav_shared_nd"/>
-		<Location name="pav_shared_sp"/>
+		<Location name="pav_shared_nestor"/>
+		<Location name="pav_shared_oleg"/>
+		<Location name="pav_shared_yakov"/>
 	</Folder>
 	<Folder name="Community center">
 		<Location name="pav_commcenter"/>
@@ -835,6 +849,7 @@
 	<Folder name="Crime and Punishment">
 		<Location name="police_station"/>
 		<Location name="sentence"/>
+		<Location name="courtletter"/>
 		<Location name="shoplifting"/>
 	</Folder>
 	<Folder name="Mansion">

+ 6 - 12
locations/AppearanceSystem.qsrc

@@ -9,18 +9,12 @@ if $ARGS[0] = '':
     }
 	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 
-	!STD check. STD will make appearance automatically -10
-	if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:
-		pcs_apprnc = -10
-		hotcat = -1
-	else
-		clothingBonus = func($this, 'CalcClothingBonus')
-		accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
-		groomingBonus = func($this, 'CalcGroomingBonus')
-		groomingPenalty = func($this, 'CalcGroomingPenalty')
-		pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
-		Hotcat = func($this, 'ConvertToHotcat')
-	end
+	clothingBonus = func($this, 'CalcClothingBonus')
+	accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
+	groomingBonus = func($this, 'CalcGroomingBonus')
+	groomingPenalty = func($this, 'CalcGroomingPenalty')
+	pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
+	Hotcat = func($this, 'ConvertToHotcat')
 
 	killvar 'clothingBonus'
 	killvar 'accessoriesBonus'

+ 1 - 1
locations/BDsex.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
-		mc_inventory['noshampoo'] =  1
+		noshampoo =  1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You go into the bathroom and turn on the shower, lathering body and washing as well as you can.'

+ 1 - 1
locations/BelSex.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'shower':
 	'<<$boydesc>> is finally done with you. He looks at you all pleased as you get up and head off to the bathroom to take a quick shower and freshen up.'
 	act 'Take a 15 minute shower':
 		cls
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		minut += 15
 		gs 'fame', 'pav', 'prostitute', 1

+ 159 - 159
locations/Cheatmenu_din.qsrc

@@ -359,13 +359,13 @@ $cheatmenu['cheat_NoLactation'] = {
 }
 
 $cheatmenu['Vibrator'] = {
-	if cheatVib = 0:
-		cheatVib = 1
-		bedvibrator = 1
+	if sleepVars['cheatVib'] = 0:
+		sleepVars['cheatVib'] = 1
+		sleepVars['bedVibrator'] = 1
 		dynamic $cheatmenu['permanent']
-	elseif cheatVib = 1:
-		cheatVib = 0
-		bedvibrator = 0
+	elseif sleepVars['cheatVib'] = 1:
+		sleepVars['cheatVib'] = 0
+		sleepVars['bedVibrator'] = 0
 		dynamic $cheatmenu['permanent']
 	end
 }
@@ -514,66 +514,66 @@ $cheatmenu['permanent'] = {
 	gs'stat'
 	*clr & cla
 	gs 'obj_din', 'cheattabs'
-	if cheatWork = 0:$cheatWork = 'Currently OFF'
-	if cheatWork = 1:$cheatWork = 'Currently ON'
-	if cheatWillpower = 0:$cheatWillpower = 'Currently OFF'
-	if cheatWillpower = 1:$cheatWillpower = 'Currently ON'
-	if cheatHapri = 0:$cheatHapri = 'Currently OFF'
-	if cheatHapri = 1:$cheatHapri = 'Currently ON'
-	if cheatKlisma = 1:$cheatKlisma = 'Currently OFF'
-	if cheatKlisma = 0:$cheatKlisma = 'Currently ON'
-	if cheatNomakeup = 0:$cheatNomakeup = 'Currently OFF'
-	if cheatNomakeup = 1:$cheatNomakeup = 'Currently ON'
-	if cheatNoSweat = 0:$cheatNoSweat = 'Currently OFF'
-	if cheatNoSweat = 1:$cheatNoSweat = 'Currently ON'
-	if cheatNoEat = 0:$cheatNoEat = 'Currently OFF'
-	if cheatNoEat = 1:$cheatNoEat = 'Currently ON'
-	if cheatNoDrink = 0:$cheatNoDrink = 'Currently OFF'
-	if cheatNoDrink = 1:$cheatNoDrink = 'Currently ON'
-	if cheatNoSleep = 0:$cheatNoSleep = 'Currently OFF'
-	if cheatNoSleep = 1:$cheatNoSleep = 'Currently ON'
-	if cheatNoMood = 0:$cheatNoMood = 'Currently OFF'
-	if cheatNoMood = 1:$cheatNoMood = 'Currently ON'
-	if cheatNoFat = 0:$cheatNoFat = 'Currently OFF'
-	if cheatNoFat = 1:$cheatNoFat = 'Currently ON'
-	if cheatHealth = 0:$cheatHealth = 'Enabled'
-	if cheatHealth = 1:$cheatHealth = 'Disabled'
-	if cheatPee = 0:$cheatPee = 'Enabled'
-	if cheatPee = 1:$cheatPee = 'Disabled'
-	if NarkImmune = 0:$NarkImmune = 'Currently OFF'
-	if NarkImmune = 1:$NarkImmune = 'Currently ON'
-	if InfWillpwer = 0:$InfWillpwer = 'Currently OFF'
-	if InfWillpwer = 1:$InfWillpwer = 'Currently ON'
-	if cheatSlut = 0:$cheatSlut = 'Enabled'
-	if cheatSlut = 1:$cheatSlut = 'Disabled'
-	if cheatHorny = 0:$cheatHorny = 'Currently OFF'
-	if cheatHorny = 1:$cheatHorny = 'Currently ON'
-	if bedvibrator = 0:$cheatVib = 'Currently OFF'
-	if bedvibrator = 1:$cheatVib = 'Currently ON'
-	if fight_cheat = 0:$fight_cheat = 'Currently OFF'
-	if fight_cheat = 1:$fight_cheat = 'Currently ON'
-	if autocombat_cheat = 0:$autocombat_cheat = 'Currently OFF'
-	if autocombat_cheat = 1:$autocombat_cheat = 'Currently ON'
-	if cheat_NoPregnancy = 0:$cheat_NoPregnancy = 'Enabled'
-	if cheat_NoPregnancy = 1:$cheat_NoPregnancy = 'Disabled'
-	if cheat_NoLactation = 0:$cheat_NoLactation = 'Enabled'
-	if cheat_NoLactation = 1:$cheat_NoLactation = 'Disabled'
-	if cheatBimbo = 0:$cheatBimbo = 'Enabled'
-	if cheatBimbo = 1:$cheatBimbo = 'Disabled'
-	if cheatBimbo2 = 0:$cheatBimbo2 = 'Disabled'
-	if cheatBimbo2 = 1:$cheatBimbo2 = 'Enabled'
-	if cheatBimbo3 = 0:$cheatBimbo3 = 'Disabled'
-	if cheatBimbo3 = 1:$cheatBimbo3 = 'Enabled'
-	if cumeater_cheat = 0:$cheatcumtrait = 'Enabled'
-	if cumeater_cheat = 1:$cheatcumtrait = 'Disabled'
-	if exhib_cheat = 0:$cheatexhib = 'Enabled'
-	if exhib_cheat = 1:$cheatexhib = 'Disabled'
+	if cheatWork = 0: $cheatWork = 'Currently OFF'
+	if cheatWork = 1: $cheatWork = 'Currently ON'
+	if cheatWillpower = 0: $cheatWillpower = 'Currently OFF'
+	if cheatWillpower = 1: $cheatWillpower = 'Currently ON'
+	if cheatHapri = 0: $cheatHapri = 'Currently OFF'
+	if cheatHapri = 1: $cheatHapri = 'Currently ON'
+	if cheatKlisma = 1: $cheatKlisma = 'Currently OFF'
+	if cheatKlisma = 0: $cheatKlisma = 'Currently ON'
+	if cheatNomakeup = 0: $cheatNomakeup = 'Currently OFF'
+	if cheatNomakeup = 1: $cheatNomakeup = 'Currently ON'
+	if cheatNoSweat = 0: $cheatNoSweat = 'Currently OFF'
+	if cheatNoSweat = 1: $cheatNoSweat = 'Currently ON'
+	if cheatNoEat = 0: $cheatNoEat = 'Currently OFF'
+	if cheatNoEat = 1: $cheatNoEat = 'Currently ON'
+	if cheatNoDrink = 0: $cheatNoDrink = 'Currently OFF'
+	if cheatNoDrink = 1: $cheatNoDrink = 'Currently ON'
+	if cheatNoSleep = 0: $cheatNoSleep = 'Currently OFF'
+	if cheatNoSleep = 1: $cheatNoSleep = 'Currently ON'
+	if cheatNoMood = 0: $cheatNoMood = 'Currently OFF'
+	if cheatNoMood = 1: $cheatNoMood = 'Currently ON'
+	if cheatNoFat = 0: $cheatNoFat = 'Currently OFF'
+	if cheatNoFat = 1: $cheatNoFat = 'Currently ON'
+	if cheatHealth = 0: $cheatHealth = 'Enabled'
+	if cheatHealth = 1: $cheatHealth = 'Disabled'
+	if cheatPee = 0: $cheatPee = 'Enabled'
+	if cheatPee = 1: $cheatPee = 'Disabled'
+	if NarkImmune = 0: $NarkImmune = 'Currently OFF'
+	if NarkImmune = 1: $NarkImmune = 'Currently ON'
+	if InfWillpwer = 0: $InfWillpwer = 'Currently OFF'
+	if InfWillpwer = 1: $InfWillpwer = 'Currently ON'
+	if cheatSlut = 0: $cheatSlut = 'Enabled'
+	if cheatSlut = 1: $cheatSlut = 'Disabled'
+	if cheatHorny = 0: $cheatHorny = 'Currently OFF'
+	if cheatHorny = 1: $cheatHorny = 'Currently ON'
+	if sleepVars['bedVibrator'] = 0: $sleepVars['cheatVib'] = 'Currently OFF'
+	if sleepVars['bedVibrator'] = 1: $sleepVars['cheatVib'] = 'Currently ON'
+	if fight_cheat = 0: $fight_cheat = 'Currently OFF'
+	if fight_cheat = 1: $fight_cheat = 'Currently ON'
+	if autocombat_cheat = 0: $autocombat_cheat = 'Currently OFF'
+	if autocombat_cheat = 1: $autocombat_cheat = 'Currently ON'
+	if cheat_NoPregnancy = 0: $cheat_NoPregnancy = 'Enabled'
+	if cheat_NoPregnancy = 1: $cheat_NoPregnancy = 'Disabled'
+	if cheat_NoLactation = 0: $cheat_NoLactation = 'Enabled'
+	if cheat_NoLactation = 1: $cheat_NoLactation = 'Disabled'
+	if cheatBimbo = 0: $cheatBimbo = 'Enabled'
+	if cheatBimbo = 1: $cheatBimbo = 'Disabled'
+	if cheatBimbo2 = 0: $cheatBimbo2 = 'Disabled'
+	if cheatBimbo2 = 1: $cheatBimbo2 = 'Enabled'
+	if cheatBimbo3 = 0: $cheatBimbo3 = 'Disabled'
+	if cheatBimbo3 = 1: $cheatBimbo3 = 'Enabled'
+	if cumeater_cheat = 0: $cheatcumtrait = 'Enabled'
+	if cumeater_cheat = 1: $cheatcumtrait = 'Disabled'
+	if exhib_cheat = 0: $cheatexhib = 'Enabled'
+	if exhib_cheat = 1: $cheatexhib = 'Disabled'
 	if addictive_cheat = 0: $cheataddictive = 'Enabled'
 	if addictive_cheat = 1: $cheataddictive = 'Disabled'
-	if cheatConsole = 0:$cheatConsole = 'Visible'
-	if cheatConsole = 1:$cheatConsole = 'Hidden'
-	if cheatTime = 0:$cheatTime = 'Disabled'
-	if cheatTime = 1:$cheatTime = 'Enabled'
+	if cheatConsole = 0: $cheatConsole = 'Visible'
+	if cheatConsole = 1: $cheatConsole = 'Hidden'
+	if cheatTime = 0: $cheatTime = 'Disabled'
+	if cheatTime = 1: $cheatTime = 'Enabled'
 	if random_bf_gf_cheat = 0: $random_bf_gf_cheat = 'Enabled'
 	if random_bf_gf_cheat = 1: $random_bf_gf_cheat = 'Disabled'
 	if cheat_street_robbers = 0: $cheat_street_robbers = 'Enabled'
@@ -615,7 +615,7 @@ $cheatmenu['permanent'] = {
 
 	*nl
 
-	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$cheatVib>></a>'
+	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$sleepVars[''cheatVib'']>></a>'
 
 	*nl
 
@@ -650,10 +650,10 @@ $cheatmenu['permanent'] = {
 		'Automatic cheat on Tampon: <a href="exec:Enable_auto_tampons =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	*nl
-	if Enable_nodream > 0:
-		'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<Enable_nodream>>%</a>, <a href="exec:Enable_nodream=0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
+	if sleepVars['cheat_nodream_chance'] > 0:
+		'No dream chance: <a href="exec:sleepVars[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<sleepVars[''cheat_nodream_chance'']>>%</a>, <a href="exec:sleepVars[''cheat_nodream_chance'']=0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
 	else
-		'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
+		'No dream chance: <a href="exec:sleepVars[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end & !1.2.3 new function
 	*nl
 	'Hide Console input in objects window: <a href="exec:dynamic $cheatmenu[''consolecheat'']"><<$cheatConsole>></a>'
@@ -776,6 +776,27 @@ $cheatmenu['rename'] = {
 	killvar '$temp_nickname'
 }
 
+$cheatmenu['setLooks'] = {
+	gs 'shortgs', 'setStat', $ARGS[0], ARGS[1]
+	dynamic $cheatmenu['looks']
+}
+
+$cheatmenu['setLooksInput'] = {
+	temp_input = input("Set your <<$ARGS[1]>> level:")
+	gs 'shortgs', 'setStat', $ARGS[0], temp_input
+	dynamic $cheatmenu['looks']
+}
+
+$cheatmenu['printLooksLinks'] = {
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', 100">Max</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 1">+1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 10">+10</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 1">-1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 10">-10</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', 0">Min</a>  '
+	*pl '<a href="exec:dynamic $cheatmenu[''setLooksInput''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''">Set</a>'
+}
+
 $cheatmenu['looks'] = {
 	*clr & cla
 	if pcs_hgt < 100:
@@ -814,6 +835,9 @@ $cheatmenu['looks'] = {
 	'<a href=>You are <<pcs_hgt>> centimetres tall</a>'
 	'<a href="exec:pcs_hgt = input(''Enter <<$pcs_nickname>>s height in centimetres<br><br>(default 170, min 100, max 200, values below 160 and above 180 will cause problems in the calculation of BMI/weight the more you deviate from the default 170)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</a>'
 	*nl
+	*p 'Musculature (<<stren_plus_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'stren_plus', 'Musculature'
+	*p 'Toned Butt (<<butt_tr_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'butt_tr', 'Toned Butt'
+	*nl
 	'You have <<$titsize>> breasts'
 	if tits => 0 and tits < 11:'<a href="exec:silicone += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
 	if silicone => 1:'<a href="exec:silicone -= 5 & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
@@ -1116,87 +1140,48 @@ $cheatmenu['tatoo'] = {
 	if tathand = 0:'You do not have a tattoo on your hand</a>'
 	if tathand >= 1:'<a href="exec:tattCount-=1 & tathand = 0 & dynamic $cheatmenu[''tatoo'']">Remove your hand tattoo</a>'
 	if cosmetic_tattoo = 0:'You do not have the makup tattoo</a>'
-	if cosmetic_tattoo >= 1:'<a href="exec:tattCount-=1 & tathand = 0 & dynamic $cheatmenu[''tatoo'']">Remove your makup tattoo</a>'
-}
-
-$cheatmenu['setStatValue'] = {
-	temp_input = func('shortgs', 'clamp', ARGS[1], 0, 100)
-	if temp_input > 1:
-		temp_xpnxt = (func('_difficulty','getexpadj') * (temp_input - 1) * (temp_input - 1) / 180) + 1
-	end
-	dynamic "
-		<<$ARGS[0]>>_lvl = temp_input
-		<<$ARGS[0]>>_exp = temp_xpnxt
-		<<$ARGS[0]>>_mem = temp_xpnxt
-		<<$ARGS[0]>>_lvlst = <<$ARGS[0]>>_lvl
-		<<$ARGS[0]>>_flr = <<$ARGS[0]>>_lvl / 5
-		if <<$ARGS[0]>> = 'inhib': <<$ARGS[0]>>_flr = <<$ARGS[0]>>_lvl
-	"
-	killvar 'temp_input' & killvar 'temp_xpnxt'
+	if cosmetic_tattoo >= 1:'<a href="exec:cosmetic_tattoo = 0 & dynamic $cheatmenu[''tatoo'']">Remove your makup tattoo</a>'
 }
 
 $cheatmenu['setStat'] = {
-	dynamic $cheatmenu['setStatValue'], '<<$ARGS[0]>>', ARGS[1]
+	gs 'shortgs', 'setStat', $ARGS[0], ARGS[1]
 	dynamic $cheatmenu['stats']
 }
 
 $cheatmenu['setStatInput'] = {
 	temp_input = input("Set your <<$ARGS[1]>> level:")
-	dynamic $cheatmenu['setStatValue'], '<<$ARGS[0]>>', temp_input
+	gs 'shortgs', 'setStat', $ARGS[0], temp_input
 	dynamic $cheatmenu['stats']
 }
 
 $cheatmenu['setStatInputInverted'] = {
 	temp_input = input("Set your <<$ARGS[1]>> level:")
-	dynamic $cheatmenu['setStatValue'], '<<$ARGS[0]>>', (100 - temp_input)
+	gs 'shortgs', 'setStat', $ARGS[0], (100 - temp_input)
 	dynamic $cheatmenu['stats']
 }
 
 $cheatmenu['setAttrs'] = {
 	loop_index = 0
-	!! skip magik, stren_plus and butt_tr
-	loop_index_max = arrsize('$att_name') - 3
-	temp_input = ARGS[0]
-	if temp_input > 1:
-		temp_xpnxt = (func('_difficulty','getexpadj') * (temp_input - 1) * (temp_input - 1) / 180) + 1
-	end
+	!! skip stren_plus and butt_tr
+	loop_index_max = arrsize('$att_name') - 2
 	:set_attrs_loop
-		dynamic "
-			<<$att_name[loop_index]>>_lvl = temp_input
-			<<$att_name[loop_index]>>_exp = temp_xpnxt
-			<<$att_name[loop_index]>>_mem = temp_xpnxt
-			<<$att_name[loop_index]>>_lvlst = <<$att_name[loop_index]>>_lvl
-			<<$att_name[loop_index]>>_flr = <<$att_name[loop_index]>>_lvl / 5
-		"
+		gs 'shortgs', 'setStat', $att_name[loop_index], ARGS[0]
 		loop_index += 1
 		if loop_index < loop_index_max: jump 'set_attrs_loop'
-	killvar 'loop_index' & killvar 'loop_index_max' & killvar 'temp_input' & killvar 'temp_xpnxt'
+	killvar 'loop_index' & killvar 'loop_index_max'
 	dynamic $cheatmenu['stats']
 }
 
 $cheatmenu['setSkills'] = {
 	loop_index = 0
 	loop_index_max = arrsize('$skl_name')
-	temp_input = ARGS[0]
-	if temp_input > 1:
-		temp_xpnxt = (func('_difficulty','getexpadj') * (temp_input - 1) * (temp_input - 1) / 180) + 1
-	end
 	:set_skills_loop
 		!! Inhibition (number 33) isn''t a skill so we''ll skip it
-		if loop_index = 33:
-			loop_index += 1
-			jump 'set_skills_loop'
-		end
-		dynamic "
-			<<$skl_name[loop_index]>>_lvl = temp_input
-			<<$skl_name[loop_index]>>_exp = temp_xpnxt
-			<<$skl_name[loop_index]>>_mem = temp_xpnxt
-			<<$skl_name[loop_index]>>_lvlst = <<$skl_name[loop_index]>>_lvl
-			<<$skl_name[loop_index]>>_flr = <<$skl_name[loop_index]>>_lvl / 5
-		"
+		if loop_index = 33: loop_index += 1 & jump 'set_skills_loop'
+		gs 'shortgs', 'setStat', $skl_name[loop_index], ARGS[0]
 		loop_index += 1
 		if loop_index < loop_index_max: jump 'set_skills_loop'
-	killvar 'loop_index' & killvar 'loop_index_max' & killvar 'temp_input' & killvar 'temp_xpnxt'
+	killvar 'loop_index' & killvar 'loop_index_max'
 	dynamic $cheatmenu['stats']
 }
 
@@ -2088,11 +2073,15 @@ $cheatmenu['setting'] = {
 	'<B>Difficulty Setting</B>'
 	'At the moment it only improves rate of skill gain'
 
-	'Difficulty: Currently at <<func(''_difficulty'',''getdifficulty'')>>'
-	'<ul><li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''easy peasy'') & dynamic $cheatmenu[''setting'']">easy peasy</a></li>'
-	'<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''relaxed'') & dynamic $cheatmenu[''setting'']">relaxed</a></li>'
-	'<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''realistic'') & dynamic $cheatmenu[''setting'']">realistic</a></li>'
-	'<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''hardcore'') & dynamic $cheatmenu[''setting'']">hardcore</a></li></ul>'
+	$temp_diff = func('_difficulty', 'getdifficulty')
+	'Difficulty: Currently at <<$temp_diff>>'
+	'<ul>'
+	'<li>set to ' + iif($temp_diff = 'easy peasy', 'easy peasy', '<a href="exec:FUNC(''_difficulty'',''setdifficulty'',''easy peasy'') & dynamic $cheatmenu[''setting'']">easy peasy</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'relaxed', 'relaxed', '<a href="exec:FUNC(''_difficulty'',''setdifficulty'',''relaxed'') & dynamic $cheatmenu[''setting'']">relaxed</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'realistic', 'realistic', '<a href="exec:FUNC(''_difficulty'',''setdifficulty'',''realistic'') & dynamic $cheatmenu[''setting'']">realistic</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'hardcore', 'hardcore', '<a href="exec:FUNC(''_difficulty'',''setdifficulty'',''hardcore'') & dynamic $cheatmenu[''setting'']">hardcore</a>') + '</li>'
+	'</ul>'
+	killvar '$temp_diff'
 	'</tr></table></b></center>'
 }
 
@@ -2155,6 +2144,12 @@ $cheatmenu['display'] = {
 	else
 		'Android Mode: Currently OFF - <a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
 	end
+	*nl
+	if loadg_show_debug = 0:
+		'Show Debug window on save load: Currently OFF - <a href="exec:loadg_show_debug = 1 & showobjs 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
+	else
+		'Show Debug window on save load: Currently ON - <a href="exec:loadg_show_debug = 0 & showobjs 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
+	end
 	'</tr></table></b></center>'
 }
 
@@ -2354,42 +2349,42 @@ $cheatmenu['theme'] = {
 }
 
 $cheatmenu['pain'] = {
-	if pain['head'] < 0:pain['head'] = 0
-	if pain['hair'] < 0:pain['hair'] = 0
-	if pain['ears'] < 0:pain['ears'] = 0
-	if pain['eyebrows'] < 0:pain['eyebrows'] = 0
-	if pain['eyes'] < 0:pain['eyes'] = 0
-	if pain['cheeks'] < 0:pain['cheeks'] = 0
-	if pain['nose'] < 0:pain['nose'] = 0
-	if pain['mouth'] < 0:pain['mouth'] = 0
-	if pain['lips'] < 0:pain['lips'] = 0
-	if pain['tongue'] < 0:pain['tongue'] = 0
-	if pain['throat'] < 0:pain['throat'] = 0
-	if pain['neck'] < 0:pain['neck'] = 0
-	if pain['back'] < 0:pain['back'] = 0
-	if pain['asscheeks'] < 0:pain['asscheeks'] = 0
-	if pain['asshole'] < 0:pain['asshole'] = 0
-	if pain['hips'] < 0:pain['hips'] = 0
-	if pain['thighs'] < 0:pain['thighs'] = 0
-	if pain['legL'] < 0:pain['legL'] = 0
-	if pain['legR'] < 0:pain['legR'] = 0
-	if pain['feet'] < 0:pain['feet'] = 0
-	if pain['toes'] < 0:pain['toes'] = 0
-	if pain['shoulders'] < 0:pain['shoulders'] = 0
-	if pain['armL'] < 0:pain['armL'] = 0
-	if pain['armR'] < 0:pain['armR'] = 0
-	if pain['hands'] < 0:pain['hands'] = 0
-	if pain['fingers'] < 0:pain['fingers'] = 0
-	if pain['chest'] < 0:pain['chest'] = 0
-	if pain['breasts'] < 0:pain['breasts'] = 0
-	if pain['nipples'] < 0:pain['nipples'] = 0
-	if pain['ribs'] < 0:pain['ribs'] = 0
-	if pain['tummy'] < 0:pain['tummy'] = 0
-	if pain['pubic'] < 0:pain['pubic'] = 0
-	if pain['vaginal'] < 0:pain['vaginal'] = 0
-	if pain['clitoris'] < 0:pain['clitoris'] = 0
-	if pain['urethra'] < 0:pain['urethra'] = 0
-	if pain['cervix'] < 0:pain['cervix'] = 0
+	if pain['head'] < 0: pain['head'] = 0
+	if pain['hair'] < 0: pain['hair'] = 0
+	if pain['ears'] < 0: pain['ears'] = 0
+	if pain['eyebrows'] < 0: pain['eyebrows'] = 0
+	if pain['eyes'] < 0: pain['eyes'] = 0
+	if pain['cheeks'] < 0: pain['cheeks'] = 0
+	if pain['nose'] < 0: pain['nose'] = 0
+	if pain['mouth'] < 0: pain['mouth'] = 0
+	if pain['lips'] < 0: pain['lips'] = 0
+	if pain['tongue'] < 0: pain['tongue'] = 0
+	if pain['throat'] < 0: pain['throat'] = 0
+	if pain['neck'] < 0: pain['neck'] = 0
+	if pain['back'] < 0: pain['back'] = 0
+	if pain['asscheeks'] < 0: pain['asscheeks'] = 0
+	if pain['asshole'] < 0: pain['asshole'] = 0
+	if pain['hips'] < 0: pain['hips'] = 0
+	if pain['thighs'] < 0: pain['thighs'] = 0
+	if pain['legL'] < 0: pain['legL'] = 0
+	if pain['legR'] < 0: pain['legR'] = 0
+	if pain['feet'] < 0: pain['feet'] = 0
+	if pain['toes'] < 0: pain['toes'] = 0
+	if pain['shoulders'] < 0: pain['shoulders'] = 0
+	if pain['armL'] < 0: pain['armL'] = 0
+	if pain['armR'] < 0: pain['armR'] = 0
+	if pain['hands'] < 0: pain['hands'] = 0
+	if pain['fingers'] < 0: pain['fingers'] = 0
+	if pain['chest'] < 0: pain['chest'] = 0
+	if pain['breasts'] < 0: pain['breasts'] = 0
+	if pain['nipples'] < 0: pain['nipples'] = 0
+	if pain['ribs'] < 0: pain['ribs'] = 0
+	if pain['tummy'] < 0: pain['tummy'] = 0
+	if pain['pubic'] < 0: pain['pubic'] = 0
+	if pain['vaginal'] < 0: pain['vaginal'] = 0
+	if pain['clitoris'] < 0: pain['clitoris'] = 0
+	if pain['urethra'] < 0: pain['urethra'] = 0
+	if pain['cervix'] < 0: pain['cervix'] = 0
 	*clr & cla
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
@@ -2436,6 +2431,11 @@ $cheatmenu['pain'] = {
 	'pain[urethra] = <<pain[''urethra'']>> <a href="exec:pain[''urethra''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''urethra''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[cervix] = <<pain[''cervix'']>> <a href="exec:pain[''cervix''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''cervix''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'</td></tr></table></center>'
+	*nl
+	'You may still have pain from gaping or having been spanked, you can clear these using "Cure all ailments." in "Cheat Menu - Character State Changes"'
+	'You currently have vaginal gaping of <<vgape>>'
+	'You currently have anal gaping of <<agape>>'
+	'You currently have spanked level <<spanked>>'	
 }
 
 $cheatmenu['DNA'] = {

+ 1 - 1
locations/FedorEv4_sex.qsrc

@@ -1837,7 +1837,7 @@ if $ARGS[0] = 'Shower 2':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible until you can hear Fedor enter the room and you peek out of the curtain to see him taking a piss and as soon as he notices you, he gives you a wink with a mischievous grin on his face.'
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'bathroom':
 	act 'Take a shower':
 		menu_off = 1
 		minut += 10
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		

+ 50 - 50
locations/KatjaHomeTalk.qsrc

@@ -386,7 +386,7 @@ if $ARGS[0] = 'chat':
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'Katja''s face lights up. "Congratulations! This is even more exciting than last time! Every time you tell me youre pregnant, I feel even better about my own pregnancy. Hell, that''s probably the reason you keep getting pregnant, isn''t it?" She giggles while looking at you affectionately.'
+				'Katja''s face lights up. "Congratulations! This is even more exciting than last time! Every time you tell me you''re pregnant, I feel even better about my own pregnancy. Hell, that''s probably the reason you keep getting pregnant, isn''t it?" She giggles while looking at you affectionately.'
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows1'
 			end		
 
@@ -411,7 +411,7 @@ if $ARGS[0] = 'chat':
 	end
 
 	if npc_pregtalk['A14'] = 0 and KatjaConflict = 1 and KatConCheck ! daystart :
-	!!If you did not tell katja that you are pregnant and she found out anyway. You can try to apologize. Different version if it is your fisrt child or not.
+	!!If you did not tell katja that you are pregnant and she found out anyway. You can try to apologize. Different version if it is your first child or not.
 		if kid = 0:
 			act 'Apologize':
 				cla & *clr
@@ -439,7 +439,7 @@ if $ARGS[0] = 'chat':
 	end
 
 	if katjaQW['boy_block'] = 1:
-		act 'Tell Katja you are have decided that boys are fun after all <br><font color="red">(Katja will start asking about sex with boys boys again)</font>': gt 'KatjaHomeTalk',  'boy_yes'
+		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
 
 	if mey_vika['key'] = 1:
@@ -459,7 +459,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Have a shower alone':
 			cla & *clr
-			mc_inventory['noshampoo'] = 1
+			noshampoo = 1
 			dynamic $showerdin
 			minut += 15
 			pcs_hairbsh = 1
@@ -478,7 +478,7 @@ if $ARGS[0] = 'shower':
 
 		act 'Bathe together':
 			cla & *clr
-			mc_inventory['noshampoo'] = 1
+			noshampoo = 1
 			dynamic $showerdin
 			pcs_hairbsh = 1
 			pcs_makeup = 1
@@ -539,7 +539,7 @@ if $ARGS[0] = 'shower':
 			end
 		end
 	else
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pcs_hairbsh = 1
@@ -668,7 +668,7 @@ if $ARGS[0] = 'katjaknows1':
 				'You tell Katja that <<$wombthfath>> got you pregnant again.'
 				'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
 				'"God, you''re the hottest bitch I know. I didn''t think I could be any more in love with you." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-				'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t let this distract from my wanting you to become his breeding bitch. I want him to keep you pregnant. I need something to masturbate about when youre not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
+				'After a few minutes, she breaks the kiss and keeps her lips inches from yours. "Don''t let this distract from my wanting you to become his breeding bitch. I want him to keep you pregnant. I need something to masturbate about when you''re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
 			else
 				'You tell Katja that <<$wombthfath>> got you pregnant again.'
 				'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
@@ -678,8 +678,8 @@ if $ARGS[0] = 'katjaknows1':
 			if katjaQW['slut'] >= 60:
 				'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
 				'Her eyes widen. "Wow, your family must be really close," she giggles.'
-				'"Shit, ''which of your family members did you like being knocked up by the most?'' might be the hottest question anyone has ever made me think of. Just when I started thinking I couldn''t love you any more." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-				'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t think I''ll forget the image of you being passed around your family like a good little slut. I need something to masturbate about when you''re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
+				'"Shit, ''which of your family members did you like being knocked up by the most?'' might be the hottest question anyone has ever made me think of. Just when I started thinking I couldn''t love you anymore." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+				'After a few minutes, she breaks the kiss and keeps her lips inches from yours. "Don''t think I''ll forget the image of you being passed around your family like a good little slut. I need something to masturbate about when you''re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
 			else
 				'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
 				'Her eyes widen. "wow, your family must be really close," she giggles.'
@@ -698,7 +698,7 @@ if $ARGS[0] = 'katjaknows1':
 				'"I hope you''ll include me next time."'
 			else
 				if npc_rel['A14'] >= 40:
-					'You tell Katja that you don''t know you the father is.'
+					'You tell Katja that you don''t know who the father is.'
 					'"Seems like you had a little too much fun then," she chuckles.'
 				else
 					'You tell Katja that you prefer not to say who the father is.'
@@ -858,7 +858,7 @@ if $ARGS[0] = 'Sextalk':
 				'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 have she had sex with a boy a boy you don''t know she picked up one night se went out.'
+					'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
@@ -876,10 +876,10 @@ if $ARGS[0] = 'Sextalk':
 				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!"'
+					'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 loose 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."'
+					'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':
@@ -935,7 +935,7 @@ if $ARGS[0] = 'Sextalk':
 					'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 ask rhetorically "It''s actually quit good. You should try it."'
+					'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':
@@ -980,10 +980,10 @@ if $ARGS[0] = 'Sextalk':
 						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 and place your face between her legs and start licking.'
+						'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 see that new confident look intensify on her face as she smiles and the two of you finish your homework.'
+						'"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'
@@ -1023,12 +1023,12 @@ if $ARGS[0] = 'Sextalk':
 				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" you say and Katja looks quite surprised. "Never? Is it something that you have thought about?" she ask in a curious tone.'
+					'"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 ask.'
+						'"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'
@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'Sextalk':
 								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.'
+								'"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':
@@ -1063,8 +1063,8 @@ if $ARGS[0] = 'Sextalk':
 						minut += 3
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'stat'
-						'"I''m not into girls" you tell Katja. "Really?" Katja says surprised "To bad for you. You are really missing out on something. Making love to girls are rally 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 responds. she then changes the subject.'
+						'"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':
@@ -1192,7 +1192,7 @@ if $ARGS[0] = 'Sextalk':
 				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 and I''m usually the last to do anything" she continues'
+					'"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.'
@@ -1229,7 +1229,7 @@ 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 sucking dick again."'
+		'"<<$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
@@ -1336,7 +1336,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	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.'
+		'"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
@@ -1396,7 +1396,7 @@ if $ARGS[0] = 'hornykiss':
 						KatjaQW['dom'] -= 2
 						katjaQW['horny'] -= 10
 						gs 'stat'
-						'You wrap your hands around her face and bring you lips to Katja''s.'
+						'You wrap your hands around her face and bring your lips to Katja''s.'
 
 						!!if pcs_dom < KatjaQW['dom']:
 							!!'Katja firmly takes your hands and removes them from her face, allowing you to understand, that she does not intend to kiss you.'
@@ -1523,7 +1523,7 @@ if $ARGS[0] = 'marcus_kiss':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-	'Katja almost jumps you and gives you a kiss. Afterwards, she looks at you a little hesitantly. "You know, having Marcus over is quite fun, so why don''t we call him right now?"'
+	'Katja almost jumps you and gives you a kiss. Afterward, she looks at you a little hesitantly. "You know, having Marcus over is quite fun, so why don''t we call him right now?"'
 	act 'Agree':  gt 'katja_sex', 'marcus_wait'
 	act 'You''re not in the mood': katjaQW['horny'] -= 20 & gt 'KatjaHomeTalk'
 end
@@ -1552,8 +1552,8 @@ if $ARGS[0] = 'TamVal':
 		'Taking her hand, you force Katja to sit by your side and embrace the redhead, mostly to stop her from driving you crazy.'
 		'"There there Katja. Just stop and breathe."'
 		'She takes your advice, and takes a big gulp of air. That seemed to quieten her down, deflating and returning her to a more "normal" mindstate. Even at that, she is troubled.'
-		'"Sorry <<$pcs_nickname>>, it''s just that a lot of things suddenly made sense. Look, Valentina lived here some time ago here. I don''t know all the history, but she left her mother to live in the city and ended up in some kind of trouble. Mom welcomed her to our home, and... remember how she clung to my mom? Valentina was always that way and seemed jealous of Vicky and me and now I''m thinking..."'
-		'"That maybe your mother and Valentina were, or are, lovers? That troubles you? You don''t like that?"'
+		'"Sorry <<$pcs_nickname>>, it''s just that a lot of things suddenly made sense. Look, Valentina lived here some time ago. I don''t know all the history, but she left her mother to live in the city and ended up in some kind of trouble. Mom welcomed her to our home, and... remember how she clung to my mom? Valentina was always that way and seemed jealous of Vicky and me and now I''m thinking..."'
+		'"That your mother and Valentina could have been, or are, lovers? Does that trouble you? You don''t like that?"'
 		'Katja looks at you with a mix of emotions in her face. Confusion, surprise, doubt, fear. She opens and closes her mouth, looks at you, blushes and says something surprising...'
 		'"I don''t know... maybe? I never thought about something like that. Ehm... <<$pcs_nickname>>... what would you think, if I... I mean... ehm... behaved like Valentina and... tried to kiss you?"'
 
@@ -1569,7 +1569,7 @@ if $ARGS[0] = 'TamVal':
 				'At your ballsy question, Katja answers in one of the most logical ways. The blush in the already agitated girl''s cheeks extends, encompassing her face, neck and you assume her body. She looks like a pressure cooker about to explode. The next part is less logical, as she opens her mouth and tries to talk, but coughs. After licking her lips, she answers in a raspy and unsure voice.'
 				'"Yes?"'
 				'You lean against her and give her a little kiss on the lips. She doesn''t react, so you continue, grabbing at her face, cheeks and neck. Her hands raise against your chest, but she doesn''t try to push you away. In fact, she begins to kiss you back.'
-				'This escalates into an awkward make out, as the inexperienced girl shyly tries to follow your lead, biting you on more than one occasion. More and more, your lips and eventually tongues mix, arousing the two of you in an ever-increasing loop, but it all stops when Katja gives a surprised "Epp!" and moves away from you.'
+				'This escalates into an awkward make-out, as the inexperienced girl shyly tries to follow your lead, biting you on more than one occasion. More and more, your lips and eventually tongues mix, arousing the two of you in an ever-increasing loop, but it all stops when Katja gives a surprised "Eep!" and moves away from you.'
 				'It seems that one of your hands had somehow reached below her clothes and, well, began to play with one of her tits. Now the two of you are looking at the transgressive hand in confusion. Biting her lips, she looks around nervously and tries to fix her ruffled clothes.'
 				'"That was... woah. Hmmm... Something <<$pcs_nickname>>"'
 
@@ -1599,9 +1599,9 @@ if $ARGS[0] = 'TamVal':
 
 				'Katja''s eyes open wide and, for a moment, you have the sensation that somehow you have fucked this, but she doesn''t say or do anything. She just sits by your side and looks intensely at your face.'
 				'"Yes"'
-				'You practically didn''t hear Katja''s whispered word before she leans against you and softly kisses your lips. It barely touches your skin and you think that is the end until her hands reach towards you and grab your clothes, holding you in place.'
+				'You practically don''t hear Katja''s whispered word before she leans against you and softly kisses your lips. It barely touches your skin and you think that is the end until her hands reach towards you and grab your clothes, holding you in place.'
 				'She begins kissing you slowly... experimentally. Little kisses all over your lips, with a surprising intensity in Katja''s eyes. Soon, things escalate as her tongue tries to pry open your mouth. You aren''t going to lie, she isn''t good at this, and more than one time, she bites you maybe a little too hard but. You. Don''t. Care.'
-				'You end up laying down on Katja''s bed with her all over you. The make out session quickly escalates and you find yourself gasping for oxygen as Katja tries to reach your tonsils with her tongue (and bites you again). A part of your aroused mind barely registers that the redhead is reaching under your clothes, towards your bust and... She stops?!'
+				'You end up laying down on Katja''s bed with her all over you. The make-out session quickly escalates and you find yourself gasping for oxygen as Katja tries to reach your tonsils with her tongue (and bites you again). A part of your aroused mind barely registers that the redhead is reaching under your clothes, towards your bust and... She stops?!'
 				'A confused "Hu?" escapes your lips as you try to understand what just happened. Katja has retreated to the bed''s headboard. Biting her lips, she looks around nervously and tries to fix her ruffled clothes.'
 				'"That was. Woah. Hm. Something <<$pcs_nickname>>"'
 
@@ -1645,7 +1645,7 @@ if $ARGS[0] = 'TamVal':
 				'"Jajaja! That is easy Katja! I''ll show you things that your "mama" never taught you!"'
 				'You smile as Katja, the cutest human tomato, stares back at you with exploding eyes. She then jumps from the bed and screams at you, half angrily, half embarrassed.'
 				'"<<$pcs_nickname>>! I wasn''t joking! This is a hard moment for me!"'
-				'You can''t stop smiling at her cuteness, but the truth is that Katja''s childishness is getting boring. Her mother has a worshiping toygirl at her beck and call, Vicky has acquired the munch-eating services of a rock-hard-abs jock. Well, Katja can have a fucking superhuman succubus! What is she thinking?! End up as the only virgin in your class? Time to change that.'
+				'You can''t stop smiling at her cuteness, but the truth is that Katja''s childishness is getting boring. Her mother has a worshiping toygirl at her beck and call, and Vicky has acquired the munch-eating services of a rock-hard-abs jock. Well, Katja can have a fucking superhuman succubus! What is she thinking?! End up as the only virgin in your class? Time to change that.'
 				'"Ok Katja, time for a lesson. Let''s get naked."'
 				'You begin to take away your clothes as a flabbergasted Katja stops in her tracks and tries to process what you just said.'
 				'"Eh... what? <<$pcs_nickname>>, is this a joke?"'
@@ -1680,10 +1680,10 @@ if $ARGS[0] = 'TamVal':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/SL2.jpg"></center>'
 							'Even through the silky fabric, you can sense her lower labia engorging with blood. Hot and wet, she is ready for your first "lesson"'
 							'"We are going to do it slowly, don''t get nervous."'
-							'Katja leans against you and closes her eyes. With a hand, you pull away the last obstacle towards her cunt and with the other, caress her lips. Katja just moans at your teasing, her hips moving unwittingly in the quest for more pleasure.'
+							'Katja leans against you and closes her eyes. With one hand, you pull away the last obstacle towards her cunt and with the other, caress her lips. Katja just moans at your teasing, her hips moving unwittingly in the quest for more pleasure.'
 							'You continue touching her, helping the excited clitoris to reach beyond its little prison, and putting it under your assault. Little by little, you feel Katja''s hotness and wetness permeate her pussy, making it easy for you to insert your fingers into the tightly closed slit'
 							'"Oh?"'
-							'That is the only word that escapes Katja''s mouth as your index and middle fingers travel through her more secret of places. The aroused flesh barely resists your intrusion as the fingertips reach an intact barrier that obediently parts before your assault. You move your fingers in a scissorlike motion.'
+							'That is the only word that escapes Katja''s mouth as your index and middle fingers travel through her most secret place. The aroused flesh barely resists your intrusion as the fingertips reach an intact barrier that obediently parts before your assault. You move your fingers in a scissorlike motion.'
 							'"Ouch!"'
 							'You retire the hand and raise it so the no-longer little girl can see it. Between your fingers, covered in her slickness, a pinkish hue can be appreciated.'
 							gs 'stat'
@@ -1692,9 +1692,9 @@ if $ARGS[0] = 'TamVal':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/SL3.jpg"></center>'
 								'Katja looks dumbfounded at your hand. Her inexperience makes it difficult for the redhead to understand what just happened. Suddenly, her eyes open in realization and you kiss her while congratulating the woman between your arms.'
-								'"Congratulations Ekaterina Meynold! You are now a grown up woman! And grown ups get gifts."'
+								'"Congratulations Ekaterina Meynold! You are now a grown-up woman! And grown-ups get gifts."'
 								'Too shocked and aroused, Katja lets you lie her on the bed, take away her panties, and go down on her. She has lost any reservation to be heard, and her moans fill the room. Your assault on her pussy, united to the arousal your touch has brought, makes her happily thrash all over the bed.'
-								'You feel it when Katja raises her hips and a long guttural grunt escape her lips. She orgasms, and in that instant, a sympathetic link triggers, letting her energy flow towards you. Katja moans again and again as your feeding triggers orgasm after orgasm.'
+								'You feel it when Katja raises her hips and a long guttural grunt escapes her lips. She orgasms, and in that instant, a sympathetic link triggers, letting her energy flow towards you. Katja moans again and again as your feeding triggers orgasm after orgasm.'
 								'Finally, exhausted, Katja lies on the bed, cuddling against you. For the next few minutes she doesn''t say anything, and in fact, seems to be on the brink of dozing off. You begin to pick up your clothes. It is probably best if you leave now.'
 								gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 								gs 'arousal', 'cuni_give', 10, 'lesbian'
@@ -1745,7 +1745,7 @@ if $ARGS[0] = 'TamVal_2':
 			'She is asking you without concern, and for a moment, you don''t know what to say, but finally decide to answer.'
 			'"She is troubled about the fact that Valentina and you are in a... well... romantic relationship."'
 			'Tamara seems to think about your answer, and finally gives a somewhat exasperated sigh.'
-			'"It''s seems I must talk with this girl. Well, thanks <<$pcs_nickname>>... Hm... A moment, what do you think my relationship with Valentina is?"'
+			'"It seems like I must talk with this girl. Well, thanks <<$pcs_nickname>>... Hm... A moment, what do you think my relationship with Valentina is?"'
 			'Ok, that is, without a doubt, a loaded question. Licking your lips, you try to give a more or less educated answer.'
 			'"Sincerely? I don''t know, but she seemed... Ehm..."'
 			'"Too clingy? Yes indeed <<$pcs_nickname>>. Valentina isn''t the first girl I have helped to get back on her feet, but she is without a doubt the most "grateful"... Sigh... Well... A pleasure, but I must talk with my daughter."'
@@ -1758,7 +1758,7 @@ if $ARGS[0] = 'TamVal_2':
 			'She is asking you without concern, and for a moment, you don''t know what to say, but finally decide to answer.'
 			'"She is troubled about the fact that Valentina and you are in a... well... romantic relationship."'
 			'Tamara seems to think about your answer, and finally gives a somewhat exasperated sigh.'
-			'"It''s seems I must talk with this girl. Well, thanks <<$pcs_nickname>>... Hm... A moment, what do you think my relationship with Valentina is?"'
+			'"It seems like I must talk with this girl. Well, thanks <<$pcs_nickname>>... Hm... A moment, what do you think my relationship with Valentina is?"'
 			'Ok, that is, without a doubt, a loaded question. Licking your lips, you try to give a more or less educated answer.'
 			'"Sincerely? I don''t know, but she seemed... Ehm..."'
 			'"Too clingy? Yes indeed <<$pcs_nickname>>. Valentina isn''t the first girl I have helped to get back on her feet, but she is without a doubt the most "grateful"... Sigh... Well... A pleasure, but I must talk with my daughter."'
@@ -1781,20 +1781,20 @@ if $ARGS[0] = 'boy_discussion':
 	if  Marcus_sextype > 0:
 		katjaQW['horny'] += 20
 		'"I sometimes have sex with Marcus, and I can tell you he is really into Russian girls. I''m sure that he would love to pop the cherry of a Russian beauty like you."'
-		'"Marcus is very good looking.... If you think he would be willing to have sex with a girl like me..." Katja trails off, starting to sound nervous again.'
+		'"Marcus is very good-looking... If you think he would be willing to have sex with a girl like me..." Katja trails off, starting to sound nervous again.'
 		'"I''m sure that he would love to have sex with you. As any man who isn''t gay would," you answer. Katja''s face brightens up and she moves towards you for a kiss.'
 		act 'Kiss her back': gt 'katjaEvDin', 'kiss'
 	else
 		katjaQW['horny'] += 10
 		'"Do you have any boy in mind?" you ask.' 
-		'"I don''t know. Lazar is hot, but I have the feeling that he would just consider us a check on his list, and not be able to keep his mouth shut," she answers before pondering. "Maybe Marcus? He''s very good looking, and I haven''t heard of him spreading rumors. Most of the others don''t listen to what he says anyway because he''s black and from America. Do you think he will be a good first time?" she asks.' 
+		'"I don''t know. Lazar is hot, but I have the feeling that he would just consider us a check on his list, and not be able to keep his mouth shut," she answers before pondering. "Maybe Marcus? He''s very good-looking, and I haven''t heard of him spreading rumors. Most of the others don''t listen to what he says anyway because he''s black and from America. Do you think he will be a good first time?" she asks.' 
 		'"I don''t know, I''ve never had sex with him," you answer. "Maybe you could try that..."' 
 		'Katja looks at you pleading with her big eyes. "Please <<$pcs_nickname>>. I really want my first time to be good, so could you please test him for me?"'
 		*nl
 		'"Marcus is hot, but how would we approach him?" you ask.' 
 		'"Try to dance with him at the disco, and get close to him. He really seems to like the girls there, and since you''re the hottest there, I''m sure he''ll like it. Especially if you lead him on like you know how to do," she says in her most flattering voice.'
 		'You smile. "Okay, I''ll try to dance with him at the disco, and see if I can test him for you."'
-		'"You are the bestest friend!" she says with a huge smile and give you a tight hug.'
+		'"You are the bestest friend!" she says with a huge smile and gives you a tight hug.'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 		if mey_vika['key'] = 1:
 			act 'Leave the room': gt 'mey_home', 'start'
@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'anal_discussion':
 	else
 		katjaQW['horny'] += 10
 		'"Do you have any boy in mind?" you ask.' 
-		'"Well, Ivan seems to be quite interested in our kissing at school. The other girls say that he''s really into anal sex. He''s also very hot," she answers. "So maybe you could try him out to see if it doesn''t hurt to much with him? I don''t want my first time to be too painful."'
+		'"Well, Ivan seems to be quite interested in our kissing at school. The other girls say that he''s really into anal sex. He''s also very hot," she answers. "So maybe you could try him out to see if it doesn''t hurt too much with him? I don''t want my first time to be too painful."'
 		'"Yeah, Ivan is hot. I need to find a way to approach him about it though," you reply.' 
 		'"He trains in the gym at the community center in the late afternoon. You might have luck talking with him there. I''ve also heard a rumor that he sometimes uses the women''s shower there," she tells you.'
 		'You smile. "Okay, I''ll try to see if he''s up for something there and try him out for you."'
@@ -1986,7 +1986,7 @@ if $ARGS[0] = 'first_boy_sex_follow_up':
 		'"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 some time," she finishes.' 
+	'"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:
@@ -2042,7 +2042,7 @@ if $ARGS[0] = 'uni_tell':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['know_katja_uni'] = 0:
-		'You tell Katja that you have enrolled at the university to study to become a teacher. She replies that she also plans to do the same, and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
+		'You tell Katja that you have enrolled at the university to study to become a teacher. She replies that she also plans to do the same and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
 	else
 		'You tell Katja that you have also enrolled to study teaching at the university. She replies that it will be fun studying at the university together before you spend the next few minutes talking excitedly about what you know about the program.'
 	end
@@ -2064,12 +2064,12 @@ if $ARGS[0] = 'katja_uni_tell':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['know_going_to_teaching_degree'] = 0:
-		'Katja excitedly tells you that she has been accepted into the university to study teaching. She then tells you about how great the program is. She also tells you that she are going to move into room 26 at the university dorm in the beginning August.' 
+		'Katja excitedly tells you that she has been accepted into the university to study teaching. She then tells you about how great the program is. She also tells you that she is going to move into room 26 at the university dorm at the beginning of August.' 
 		if university['student'] = 1 and $university['enrolled_in'] = 'teaching_studies':
 			act 'Tell Katja that you''re going to the university': gt 'KatjaHomeTalk', 'uni_tell'
 		end	
 	else
-		'Katja excitedly tells you that she has also been accepted into the university to study teaching, and that it will be fun studying at the university together. She also tells you that she are going to move into room 26 at the university dorm in the beginning August. You then spend the next few minutes talking excitedly about what you know about the program.'
+		'Katja excitedly tells you that she has also been accepted into the university to study teaching and that it will be fun studying at the university together. She also tells you that she is going to move into room 26 at the university dorm at the beginning of August. You then spend the next few minutes talking excitedly about what you know about the program.'
 	end
 	if $loc = 'mey_home':
 		act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -2116,7 +2116,7 @@ if $ARGS[0] = 'boy_yes':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"So I told you earlier that I had no interest in boys?" you say.' 
 	'"Yes I remember," she replies.' 
-	'"Turns out I was wrong. I am in fact starting find boys attractive," you say.' 
+	'"Turns out I was wrong. I am in fact starting to find boys attractive," you say.' 
 	'"So have you already done something with a boy? Tell me everything! What is it you find attractive about boys? Who is the hottest guy in school?" Katja starts bombarding you with questions.' 
 	'"Slow down. This is also something new for me. But we can talk about boys if you want to," you say as you see Katja''s face getting more red.'
 	act 'Talk about something else':
@@ -2144,15 +2144,15 @@ if $ARGS[0] = 'fisting_ask':
 	'"Not a lot," you answer. "When you''re in control, you can make sure that the pain is not too much."' 
 	'She looks thoughtful again. "I don''t think I could do that to myself," she says.' 
 	'"That''s okay. It''s not for everybody," you say.' 
-	'"But it does sounds so hot!" she says. "Maybe... you could..." her voice trails off. After a moment, she continues. "Maybe you could show me..."' 
+	'"But it does sound so hot!" she says. "Maybe... you could..." her voice trails off. After a moment, she continues. "Maybe you could show me..."' 
 	'"You want me to fist myself here in front of you?" you ask.' 
 	'"No, I want you... to..." her voice falters again.' 
-	'"You want me fist you?" you ask. She doesn''t say anything, but slowly nods. "Right now?" Again she doesn''t say anything, but nods."'
+	'"You want me to fist you?" you ask. She doesn''t say anything, but slowly nods. "Right now?" Again she doesn''t say anything, but nods."'
 	act 'Show Katja how fisting is done': gt 'katja_sex', 'first_fisting'
 	act 'Say you will do it another time':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-		'You tell Katja that you are not in the mood right now, but you might do it anther time if she asks.'
+		'You tell Katja that you are not in the mood right now, but you might do it another time if she asks.'
 		if $loc = 'katja_dorm':
 			act 'Stop talking': gt 'katja_dorm', 'start'
 		elseif mey_vika['key'] = 1:

+ 11 - 8
locations/Katja_Tanga.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'secretroom':
 	*clr & cla
 	if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 & ! Flag sex with Kate at the school
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga4_4.jpg"></center>'
-	'You hurry down the hall hand in hand with Katja towards the storage room she told you about as each of you try to pull up the other''s skirt. Once at the door, she pulls out a key and unlocks it. You grab and squeeze her ass as she does before she pushes the door open and turns towards you. You both immediately start kissing and fondling each other, barely avoiding tumbling into the room before you manage to close the door and lock it.'
+	'You hurry down the hall hand in hand with Katja towards the storage room she told you about as each of you tries to pull up the other''s skirt. Once at the door, she pulls out a key and unlocks it. You grab and squeeze her ass as she does before she pushes the door open and turns towards you. You both immediately start kissing and fondling each other, barely avoiding tumbling into the room before you manage to close the door and lock it.'
 	act 'Bare her breasts':
 		*clr & cla
 		gs 'arousal', 'foreplay', -5, 'lesbian'
@@ -19,7 +19,7 @@ if $ARGS[0] = 'secretroom':
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_10.jpg"></center>'
-			'After a few minutes of teasing her nipples, you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gentle push her down on her back. Once she''s comfortable, you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure she squeezes her breasts firmly in her hands.'
+			'After a few minutes of teasing her nipples, you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gently push her down on her back. Once she''s comfortable, you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure as she squeezes her breasts firmly in her hands.'
 			!!The requirements here are to make sure you own a dildo and that neither you or Katja has a hymen, since the scene does not acount for that possibility.
 			if (mc_inventory['dildo_normal'] = 1 or mc_inventory['dildo_small'] = 1 or mc_inventory['dildo_big'] = 1 or mc_inventory['dildo_large'] = 1 or mc_inventory['dildo_huge'] = 1 or mc_inventory['dildo_enormous'] = 1 or mc_inventory['dildo_gigantic'] = 1) and stat['think_virgin'] = 0 and npc_vag['A14'] > 0:
 				act 'Get dildo':
@@ -56,11 +56,14 @@ if $ARGS[0] = 'secretroom':
 						gs 'stat'
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_9.jpg"></center>'
-						'Katja begins moaning louder and bucking her hips against your fingers. You pull the dildo out of her mouth and your fingers out of her pussy before rolling her onto her stomach and sliding the wet dildo into her soaking wet pussy. You bury your face between hr ass cheeks and lick her asshole as you start thrusting the dildo as deep as it will go. Her moans of pleasure get ever louder and she begins to arch her hips up, trying to take even more of the dildo into herself, but there is no more to give. Instead, you stick your tongue in her ass and begin to tongue fuck her ass. This casuses her to moan even louder and before long she starts bucking her hips as her body spasms in an intense orgasm as she cums.'
+						'Katja begins moaning louder and bucking her hips against your fingers. You pull the dildo out of her mouth and your fingers out of her pussy before rolling her onto her stomach and sliding the wet dildo into her soaking wet pussy.'
+						'You bury your face between her ass cheeks and lick her asshole as you start thrusting the dildo as deep as it will go. Her moans of pleasure get ever louder and she begins to arch her hips up, trying to take even more of the dildo into herself, but there is no more to give.'
+						'Instead, you stick your tongue in her ass and begin to tongue fuck her ass. This causes her to moan even louder and before long she starts bucking her hips as her body spasms in an intense orgasm as she cums.'
 						act'Use dildo':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_7.jpg"></center>'
-							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you. As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
+							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you.'
+							'As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
 							$orgasm_txt = 'You can''t take it and quickly orgasm. Your pussy overflows with your juices and you feel them running down your stomach as the intense orgasm rocks your body.'
 							$orgasm_or = 'custom'
 							gs 'arousal', 'anal_finger', -5, 'lesbian'
@@ -174,7 +177,7 @@ if $ARGS[0] = 'school3':
 		else
 			katjaQW['horny'] += 10
 			if katjaQW['school_sex'] = 1: katjaQW['slut'] +=1
-			'Blushing, Katja pulls away from you and buttons her shirt back up, looking around to see if anyone had seen you. "<<$pcs_nickname>>, are you crazy?! Someone could have seen us! What would they say?!"'
+			'Blushing, Katja pulls away from you and buttons her shirt back up, looking around to see if anyone has seen you. "<<$pcs_nickname>>, are you crazy?! Someone could have seen us! What would they say?!"'
 		end
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end
@@ -186,10 +189,10 @@ if $ARGS[0] = 'school4':
 	katjaQW['slut'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_1.jpg"></center>'
 	if katjaQW['pantiesQWstage'] = 4:
-		'Katja quickly lifts her skirt, showing you her thong clad ass. "You''re back to wearing panties again?" you cry. 
+		'Katja quickly lifts her skirt, showing you her thong-clad ass. "You''re back to wearing panties again?" you cry. 
 		Katja hisses at you. "So? It''s not like you haven''t seen everything before."'
 	else
-		'Katja quickly lifts her skirt, showing her thong clad ass. "Still wearing panties, huh?" you ask and Katja hisses at you. "So? It''s not like you haven''t seen everything before."'
+		'Katja quickly lifts her skirt, showing her thong-clad ass. "Still wearing panties, huh?" you ask and Katja hisses at you. "So? It''s not like you haven''t seen everything before."'
 	end
 	act 'Denied':
 		*clr & cla
@@ -291,7 +294,7 @@ if $ARGS[0] = 'dance':
 				katjaQW['horny'] += 10
 				katjaQW['slut'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_1.jpg"></center>'
-				'Katja resolutely lifts her dress up to her neck, showing not only her panties, but her bare breasts. She smiles as she pulls her dress back down. "Now show me your tits."'
+				'Katja resolutely lifts her dress up to her neck, showing not only her panties but also her bare breasts. She smiles as she pulls her dress back down. "Now show me your tits."'
 				if pcs_horny > 70 or alko > 1:
 					act 'Show your tits':
 						*clr & cla

+ 3 - 3
locations/Katlake.qsrc

@@ -3,7 +3,7 @@
 cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/kat.jpg"></center>'
-'The warm rays of sun on your naked body feel nice, but at the same time... you have nothing to do! You get bored just lying there and kill the time by looking around you, examining the other beach-goers.'
+'The warm rays of sun on your naked body feel nice, but at the same time... you have nothing to do! You get bored just lying there and try to kill time by looking around you, examining the other beach-goers.'
 'After a few minutes, a beautiful girl lies down near you. She''s truly gorgeous, and you can''t help but stare in her direction every once in a while.'
 
 act 'Ignore her':gt 'Nudelake'
@@ -30,7 +30,7 @@ if $ARGS[0] = 'znakomstvo':
 		katday = daystart
 		'"Erm... hello!" you say, a bit shyly.'
 		'The girl wrinkles her nose when she sees you, but says nothing. She keeps giving you a cold stare that indicates that she wants nothing to do with you.'
-		'"Damn, that didn''t go well", you think to yourself while you walk away, a bit disheartened. You look at her again from a distance, and notice how perfect she looks. She must spend a lot of time on trying to look good every day... maybe that''s why she didn''t like you?'
+		'"Damn, that didn''t go well", you think to yourself while you walk away, a bit disheartened. You look at her again from a distance and notice how perfect she looks. She must spend a lot of time trying to look good every day... maybe that''s why she didn''t like you?'
 
 		act 'Continue sunbathing until the hour is over':gt 'Nudelake'
 	else
@@ -44,7 +44,7 @@ if $ARGS[0] = 'znakomstvo':
 		minut += 30
 		'"Erm... hello!" you say, a bit shyly.'
 		'The girl takes off her sunglasses and examines your body, top to bottom. Her face breaks out into a small smile and she says: "Hey, you!"'
-		'She keeps looking at you with that gorgeous smile of her and waits for you to continue. Damn, she expects you to continue!'
+		'She keeps looking at you with that gorgeous smile of hers and waits for you to continue. Damn, she expects you to continue!'
 		'You frantically try to think of something to say, and blush when you can''t think of anything.'
 		'Her smile widens when she sees how nervous you are, and she decides to help you out: "I''m Katja, but my friends call me Kat! What''s your name?"'
 		'"<<$pcs_nickname>>", you exhale with relief. Feeling a lot more at ease, you have a nice conversation with her for another half hour while you enjoy the warmth of the sun together.'

+ 23 - 1252
locations/Komp.qsrc

@@ -51,7 +51,6 @@ if $ARGS[0] = 'start':
 	end
 end
 
-
 if $ARGS[0] = 'browse':
 	*clr & cla
 	gs 'stat'
@@ -76,7 +75,7 @@ if $ARGS[0] = 'browse':
 		
 		if  camwhore = 1 and access['nocamshow'] = 0 and mc_inventory['tech_webcam'] = 1: 
 			'Since MyFreeCams will cover the cost, you can still log on to do a cam show.'
-			act 'Go to MyFreeCams.org': gt 'komp', 'mfc'
+			act 'Go to MyFreeCams.org': gt 'komp_camgirl', 'start'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
@@ -92,7 +91,7 @@ if $ARGS[0] = 'browse':
 
 		if hour < 20 and hour > 7:
 			if $clothingworntype = 'nude':
-				'You need to be dressed before searching jobs.'
+				'You need to be dressed before searching for jobs.'
 			else
 				act 'Look for a job online': gt 'komp', 'rabota'
 			end
@@ -108,7 +107,7 @@ if $ARGS[0] = 'browse':
 		!!if bankAccount > 0: act 'Visit your bank, maybe to purchase more online time': gt 'komp', 'bank'
 		if shantfoto > 0: act 'Find the girl you took photos of in the park on "Assbook"': gt 'komp', 'foto'
 		if gor_dorm = 7: act 'Read letter from Eugene': gt 'etoexhib', 'pos91'
-		if camwhore = 1 and access['nocamshow'] = 0 and mc_inventory['tech_webcam'] = 1: act 'Go to MyFreeCams.org': gt 'komp', 'mfc'
+		if camwhore = 1 and access['nocamshow'] = 0 and mc_inventory['tech_webcam'] = 1: act 'Go to MyFreeCams.org': gt 'komp_camgirl', 'start'
 		if (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'): act 'Spend time studying': gt 'komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end
@@ -120,7 +119,7 @@ if $ARGS[0] = 'sale':
 	
 	!! IMPORTANT: What happens if an activity takes more time than the minutes Sveta has? We just say "You tried, but could not finish"?
 	if access['metered'] and subscription[$subs] < 15:
-		'You check the website, but realise that <<subscription[$subs]>> minutes won''t be enough to fill out all the forms.'
+		'You check the website, but realize that <<subscription[$subs]>> minutes won''t be enough to fill out all the forms.'
 	else
 		minut += 30
 		elektro += 3
@@ -184,7 +183,7 @@ if $ARGS[0] = 'porno':
 			gs 'internet_mobile', 'use_internet', $subs, 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/porno.jpg"></center>'
-			'You find a video you think you''d enjoy, and spend some time watching it. Wow, that girl is so lucky...'
+			'You find a video you think you''d enjoy and spend some time watching it. Wow, that girl is so lucky...'
 
 			gs 'arousal', 'porn', 30
 			minut -= 30
@@ -224,7 +223,7 @@ if $ARGS[0] = 'masturbate':
 
 		if pcs_horny >= 100:
 			$orgasm_or = 'yes'
-			$orgasm_txt = 'Suddenly your muscles tighten and you cum powerfully, while you stifle your moans so your neighbours won''t find out. Afterwards, you have goosebumps all over your skin. That was just what you needed!'
+			$orgasm_txt = 'Suddenly your muscles tighten and you cum powerfully, while you stifle your moans so your neighbors won''t find out. Afterward, you have goosebumps all over your skin. That was just what you needed!'
 			gs 'arousal', 'clit_finger', -1, 'masturbate'
 			gs 'stat'
 		end
@@ -285,7 +284,7 @@ if $ARGS[0] = 'znak':
 				gs 'boy'
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 0
-				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
+				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he will call you!'
 
 				act 'Leave this website': gt 'komp', 'browse'
 			end
@@ -295,7 +294,7 @@ if $ARGS[0] = 'znak':
 				gs 'boy'
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 1
-				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
+				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he will call you!'
 
 				act 'Leave this website': gt 'komp', 'browse'
 			end
@@ -305,7 +304,7 @@ if $ARGS[0] = 'znak':
 				gs 'boy'
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 2
-				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
+				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he will call you!'
 
 				act 'Leave this website': gt 'komp', 'browse'
 			end
@@ -331,7 +330,7 @@ if $ARGS[0] = 'kabtv':
 			cla
 			kabel = 0
 			karta -= 300
-			msg 'Your subscription has been cancelled and you can no longer watch the extra channels. The cable firm charges a one-time fee of 300 <b>₽</b> for disconnecting you.'
+			msg 'Your subscription has been canceled and you can no longer watch the extra channels. The cable firm charges a one-time fee of 300 <b>₽</b> for disconnecting you.'
 			gt 'komp', 'browse'
 		end
 	elseif kabel = 0 and mc_inventory['tech_tv'] >= 1 and mc_inventory['plasma_tv'] = 0:
@@ -374,7 +373,7 @@ if $ARGS[0] = 'foto':
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You''re currently on Russia''s biggest social network site, "Assbook". Almost everyone has an account here, probably including the girl you took that photo of the other day!'
-		'"Maybe if I can find her, I can blackmail her", you think to yourself. "This photo is very raunchy, after all... I bet she would hate to see it published, if she''s important!"'
+		'"Maybe if I can find her, I can blackmail her", you think to yourself. "This photo is very raunchy, after all... I bet she would hate to see it published if she''s important!"'
 		'You can''t help but rub your pussy every now and then while you look at it. You''ll probably keep a copy of this for yourself, either way!'
 
 		if shantfoto > 0:
@@ -404,9 +403,9 @@ if $ARGS[0] = 'foto':
 
 					if gerofotorand >= 5 and gerofotorand <= 30:
 						shantsr += 1
-						'When you click through her profile, you estimate she''s an unknown middle class girl. Still, she has a lot of friends and the outfits she''s wearing in her photos look stylish... she has money to spend.'
+						'When you click through her profile, you estimate she''s an unknown middle-class girl. Still, she has a lot of friends and the outfits she''s wearing in her photos look stylish... she has money to spend.'
 						'"Why not make her spend some of it on me?" you laugh to yourself, and begin to write a private message.'
-						'You send her a copy of the photo with the private message, and tell her to transfer a very modest amount of 5,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to her entire friends list (which you secured before sending the message), the money needs to be on your bank account within 48 hours.'
+						'You send her a copy of the photo with the private message and tell her to transfer a very modest amount of 5,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to her entire friends list (which you secured before sending the message), the money needs to be on your bank account within 48 hours.'
 
 						act 'Go back to the "Assbook" main page': gt 'komp', 'foto'
 					end
@@ -445,11 +444,11 @@ if $ARGS[0] = 'rabota':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 
 		if komprabota = 0 and gorodokkomp = 0:
-			'You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."'
+			'You find a job vacancy, on a legit-looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."'
 			'The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.'
 
 			if pcs_apprnc < 120:
-				'You consider it for a moment, but decide against it. You''re probably not pretty enough to be an underwear model.'
+				'You consider it for a moment but decide against it. You''re probably not pretty enough to be an underwear model.'
 			elseif pcs_apprnc >= 120:
 				act 'Accept the job and go there': gt 'qjob', 'var1'
 			end
@@ -458,7 +457,7 @@ if $ARGS[0] = 'rabota':
 
 			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota = 1 and gorodokkomp = 0:
-			'You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."'
+			'You find a job vacancy, on a legit-looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."'
 			'The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.'
 
 			if pcs_apprnc < 120:
@@ -471,11 +470,11 @@ if $ARGS[0] = 'rabota':
 
 			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota > 1 and komprabota < 5 and gorodokkomp = 0:
-			'You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Good looking female model, posing for artwork. Must be able to stand still in one pose for a long time. Pay: 1000 <b>₽</b> cash."'
+			'You find a job vacancy, on a legit-looking website. It reads: "Wanted! <b>URGENTLY!</b> Good-looking female model, posing for artwork. Must be able to stand still in one pose for a long time. Pay: 1000 <b>₽</b> cash."'
 			'The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.'
 
 			if pcs_apprnc < 60:
-				'You consider it for a moment, but decide against it. You''re probably not pretty enough to be a model.'
+				'You consider it for a moment but decide against it. You''re probably not pretty enough to be a model.'
 			elseif pcs_apprnc >= 60:
 				act 'Accept the job and go there': gt 'qjob', 'var3'
 			end
@@ -484,7 +483,7 @@ if $ARGS[0] = 'rabota':
 
 			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota > 4 and komprabota < 8 and camwhore = 0:
-			'You find a job vacancy, on a legit looking website. It reads: "Wanted! Webcam models. Flexible working hours. Click for more info."'
+			'You find a job vacancy, on a legit-looking website. It reads: "Wanted! Webcam models. Flexible working hours. Click for more info."'
 			act 'Gather more information':
 				*clr & cla
 				minut += 5
@@ -549,7 +548,7 @@ if $ARGS[0] = 'study':
 	gs 'exp_gain', 'compskl', 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'
-	'You spend an hour on the IEM website, reading news articles and educational blogs. You feel a bit smarter afterwards.'
+	'You spend an hour on the IEM website, reading news articles and educational blogs. You already feel a bit smarter.'
 
 	act 'Leave this website': gt'komp','browse'
 end
@@ -566,7 +565,7 @@ if $ARGS[0] = 'agent' :
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/agent.jpg"></center>'
 	*nl
 	'You''re currently at the website of the largest real estate agency in the area, Kirsanova Real Estate Agency.'
-	'<br>The website shows they have apartments available for rent or purchase in various areas, both in and out of the city. Renting or purchase requires you visit the agency in the city center to fill an application and collect the keys. Rent on all properties is deducted every month on the 25th.'
+	'<br>The website shows they have apartments available for rent or purchase in various areas, both in and out of the city. Renting or purchasing requires you to visit the agency in the city center to fill out an application and collect the keys. Rent on all properties is deducted every month on the 25th.'
 	*nl
 	'<b>Property listing</b>:'
 	if func('homes_properties', 'is_property_of_status', 'rented', 'city_apartment') :
@@ -583,7 +582,7 @@ if $ARGS[0] = 'agent' :
 			end
 		end
 	elseif func('homes_properties', 'has_access', 'city_apartment') = 0:
-		'There is an apartment in St. Petersburg residental area available, for rent or puchase.'
+		'There is an apartment in St. Petersburg residential area available, for rent or purchase.'
 		'Rent is: <<func(''homes_properties'', ''get_rent_amount'', ''city_apartment'')>><b>₽</b> per month. Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''city_apartment'')>> <b>₽</b>.'
 		*nl
 	end
@@ -615,7 +614,7 @@ if $ARGS[0] = 'agent' :
 	end
 
 	if func('homes_properties', 'has_access', 'matryona_mansion') = 0:
-		'There is a plot in the suburbs available for puchase, with planning permission for a mansion.'
+		'There is a plot in the suburbs available for purchase, with planning permission for a mansion.'
 		'Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''matryona_mansion'')>> <b>₽</b>.'
 		*nl
 	end
@@ -623,1234 +622,6 @@ if $ARGS[0] = 'agent' :
 	act 'Leave this website': gt 'komp','browse'
 end
 
-if $ARGS[0] = 'mfc':
-	gs 'family_schedule'
-	if mesec > 0:
-		*clr & cla
-		minut += 2
-		topmfc = 1
-		backmfc = 1
-		tokens = 0
-		camclients = 0
-		gs 'internet_mobile', 'use_internet', $subs, 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
-		'It''s that time of the month! You feel sick to your stomach and the cramps hurt pretty badly from time to time... you''re in no condition to earn money showing off your body.'
-		act 'Leave this website': gt 'komp','browse'
-	elseif access['nocamshow'] = 1:
-		*clr & cla
-		minut += 2
-		topmfc = 1
-		backmfc = 1
-		tokens = 0
-		camclients = 0
-		gs 'internet_mobile', 'use_internet', $subs, 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
-		'<<$access[''nocamshow'']>>'
-		act 'Leave this website': gt 'komp','browse'
-	else
-		act 'Go to your MFC homepage':
-			*clr & cla
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore3.jpg"></center>'
-			'You enter your own chatroom on the website. You currently have <<camclients>> viewers.'
-
-			act 'Continue': gt 'komp','startpagemfc'
-		end
-		act 'Leave this website':
-			*clr & cla
-			minut += 2
-			topmfc = 1
-			backmfc = 1
-			tokens = 0
-			camclients = 0
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			gs 'stat'
-			gt 'komp','browse'
-		end	
-	end
-end
-
-if $ARGS[0] = 'startpagemfc':
-	if vgape > 10 or agape > 10:
-		*clr & cla
-		gs 'stat'
-		'While you sit in your chair, you can''t help but wince every time you move. You want to put up a show, but it hurts too much. And besides... you doubt your viewers would want to see you in your current state! You should heal up a bit before trying again.'
-		act 'Collect your earnings and leave':
-			karta += tokens * 2
-			tokens = 0
-			gt 'komp','mfc'
-		end
-	else
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore3.jpg"></center>'
-		'You casually chat with the <<camclients>> visitors currently in your chatroom. Once you turn on your webcam, things will probably get busier.'
-		act 'Turn on your webcam': gt 'komp','waitclients'
-		act 'Collect your earnings and leave':
-			karta += tokens * 2
-			tokens = 0
-			gt 'komp','mfc'
-		end
-	end
-end
-
-if $ARGS[0] = 'waitclients':
-	gs 'family_schedule'
-	*clr & cla
-	rnd_minut = rand(1,4)
-	minut += rnd_minut
-	gs 'internet_mobile', 'use_internet', $subs, rnd_minut
-	if mfccum > 0: mfcdaycum = daystart
-
-	mfcclients += 1
-	$menu_loc = 'komp'
-	$menu_arg = 'waitclients'
-	menu_off = 0
-
-	if topmfc = 1 and backmfc = 1:
-		if pcs_apprnc < 100:
-			if webpopular < 15:
-				if mfcclients > 5:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(1,3)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 3:
-					camclients -= rand(3,5)
-				else
-					camclients += rand(3,5)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 3:
-					camclients -= rand(4,8)
-				else
-					camclients += rand(4,8)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 3:
-					camclients -= rand(5,15)
-				else
-					camclients += rand(5,15)
-				end
-			end
-			chancetips = rand(0,100)
-			clientask = rand(20,100)
-			if chancetips >= 95 and camclients >= 250:
-				if webpopular >= 50:
-					tokens += rand(10,30)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		else
-			if webpopular < 15:
-				if mfcclients > 5:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(3,5)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 5:
-					camclients -= rand(3,5)
-				else
-					camclients += rand(5,8)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 5:
-					camclients -= rand(5,8)
-				else
-					camclients += rand(5,12)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 5:
-					camclients -= rand(8,12)
-				else
-					camclients += rand(8,15)
-				end
-			end
-			chancetips = rand(5,100)
-			clientask = rand(30,100)
-			if chancetips >= 95 and camclients >= 200:
-				if webpopular >= 50:
-					tokens += rand(10,40)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		end
-	elseif topmfc = 0 and backmfc = 1:
-		if pcs_apprnc < 100:
-			if webpopular < 15:
-				if mfcclients > 3:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(1,3)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 3:
-					camclients -= rand(1,5)
-				else
-					camclients += rand(1,5)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 3:
-					camclients -= rand(5,10)
-				else
-					camclients += rand(5,10)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 3:
-					camclients -= rand(6,15)
-				else
-					camclients += rand(6,15)
-				end
-			end
-			chancetips = rand(5,90)
-			clientask = rand(30,100)
-			if chancetips >= 85 and camclients >= 230:
-				if webpopular >= 50:
-					tokens += rand(10,35)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		else
-			if webpopular < 15:
-				if mfcclients > 5:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(3,6)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 5:
-					camclients -= rand(3,6)
-				else
-					camclients += rand(5,10)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 5:
-					camclients -= rand(6,10)
-				else
-					camclients += rand(7,12)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 5:
-					camclients -= rand(7,12)
-				else
-					camclients += rand(10,15)
-				end
-			end
-			chancetips = rand(10,90)
-			clientask = rand(35,100)
-			if chancetips >= 85 and camclients >= 200:
-				if webpopular >= 50:
-					tokens += rand(15,35)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		end
-	elseif topmfc = 1 and backmfc = 0:
-		if pcs_apprnc < 100:
-			if webpopular < 15:
-				if mfcclients > 3:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(1,3)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 3:
-					camclients -= rand(2,5)
-				else
-					camclients += rand(2,5)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 3:
-					camclients -= rand(5,15)
-				else
-					camclients += rand(5,15)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 3:
-					camclients -= rand(5,20)
-				else
-					camclients += rand(5,20)
-				end
-			end
-			chancetips = rand(10,80)
-			clientask = rand(30,100)
-			if chancetips >= 75 and camclients >= 200:
-				if webpopular >= 50:
-					tokens += rand(10,40)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		else
-			if webpopular < 15:
-				if mfcclients > 5:
-					camclients -= rand(1,3)
-				else
-					camclients += rand(4,7)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 5:
-					camclients -= rand(4,8)
-				else
-					camclients += rand(5,12)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 5:
-					camclients -= rand(5,12)
-				else
-					camclients += rand(9,15)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 5:
-					camclients -= rand(8,15)
-				else
-					camclients += rand(15,20)
-				end
-			end
-			chancetips = rand(15,80)
-			clientask = rand(35,100)
-			if chancetips >= 75 and camclients >= 170:
-				if webpopular >= 50:
-					tokens += rand(15,45)
-				else
-					tokens += rand(1,20)
-				end
-			end
-		end
-	else
-		if pcs_apprnc < 100:
-			if webpopular < 15:
-				if mfcclients > 3:
-					camclients -= rand(1,4)
-				else
-					camclients += rand(1,4)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 3:
-					camclients -= rand(3,10)
-				else
-					camclients += rand(3,10)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 3:
-					camclients -= rand(10,20)
-				else
-					camclients += rand(10,20)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 3:
-					camclients -= rand(10,30)
-				else
-					camclients += rand(10,30)
-				end
-			end
-			chancetips = rand(15,50)
-			clientask = rand(35,100)
-			if chancetips >= 45 and camclients >= 150:
-				if webpopular >= 50:
-					tokens += rand(20,50)
-				else
-					tokens += rand(5,25)
-				end
-			end
-		else
-			if webpopular < 15:
-				if mfcclients > 5:
-					camclients -= rand(1,4)
-				else
-					camclients += rand(3,8)
-				end
-			elseif webpopular >= 15 and webpopular < 35:
-				if mfcclients > 5:
-					camclients -= rand(3,8)
-				else
-					camclients += rand(3,15)
-				end
-			elseif webpopular >= 35 and webpopular < 75:
-				if mfcclients > 5:
-					camclients -= rand(5,12)
-				else
-					camclients += rand(10,20)
-				end
-			elseif webpopular >= 75:
-				if mfcclients > 5:
-					camclients -= rand(8,18)
-				else
-					camclients += rand(10,30)
-				end
-			end
-			chancetips = rand(20,50)
-			clientask = rand(45,100)
-			if chancetips >= 45 and camclients >= 100:
-				if webpopular >= 50:
-					tokens += rand(30,50)
-				else
-					tokens += rand(10,30)
-				end
-			end
-	 	end
-	end
-	if camclients <= 0:camclients = 0
-	gs 'stat'
-
-	if topmfc = 1 and backmfc = 1:
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore3.jpg"></center>'
-	elseif topmfc = 0 and backmfc = 1:
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore4.jpg"></center>'
-	elseif topmfc = 1 and backmfc = 0:
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore5.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore6.jpg"></center>'
-	end
-
-	tokenpay = tokens * 2
-	'You take a moment of rest, and just chat casually with your <<camclients>> visitors.'
-	'You have earned <<tokens>> tokens so far this session, which amounts to <<tokenpay>> <b>₽</b>.'
-
-	act 'Wait for more visitors': gt 'komp','waitclients'
-
-	if topmfc = 1 and clientask >= 91:
-		*clr & cla
-		gs 'stat'
-		menu_off = 1
-		'One of your visitors really wants to see your boobs! He''s willing to leave you some tokens as a tip, if you take off your bra right now...'
-		act 'Remove your bra':
-			*clr & cla
-			webpopular += 1
-			topmfc = 0
-			mfcclients -= 1
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(10,25)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(15,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(25,50)
-			elseif webpopular >= 75:
-				tokens += rand(50,150)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore7.jpg"></center>'
-			'You stand up and lean forward, so your boobs are in full view of the camera. You slowly take off your bra and give the camera a sweet smile.'
-			'While you sit back down and toss your bra to the ground, you hear the donation sound several times. Your visitors enjoyed that!'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		act 'Tease instead':
-			*clr & cla
-			webpopular += rand(-1,1)
-			mfcclients += rand (-1,1)
-			minut += 5
-			gs 'internet_mobile', 'use_internet', $subs, 5
-			if webpopular < 15:
-				tokens += rand(0,10)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(0,15)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(5,30)
-			elseif webpopular >= 75:
-				tokens += rand(25,50)
-			end
-			gs 'stat'
-
-			'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/tits2.mp4"></video></center>'
-			'Not quite prepared to reveal your breasts you play with them trough your shirt hoping that will appease the crowd.'
-
-			gs 'arousal', 'porn', 5, 'exhibitionism'
-			minut -= 5
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		act 'Give them a brief look':
-			*clr & cla
-			webpopular += rand(-1,1)
-			mfcclients += rand(-1,1)
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(0,15)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(0,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(5,40)
-			elseif webpopular >= 75:
-				tokens += rand(25,75)
-			end
-			gs 'stat'
-
-			'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/undress4.mp4"></video></center>'
-			'You playfully lift your top hoping a short viewing will sate them for the time being and encourage them to stay for more.'
-
-			gs 'arousal', 'porn', 2
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Refuse to take off your bra (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','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
-	if backmfc = 1 and clientask >= 81 and clientask < 91:
-		*clr & cla
-		menu_off = 1
-		'One of the visitors asks you to remove your panties, and show your bare pussy to the camera. A second visitor chimes in, adding some extra tokens to the offer.'
-		act 'Take off your panties':
-			*clr & cla
-			mfcclients -= 1
-			webpopular += 1
-			backmfc = 0
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(10,25)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(15,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(25,50)
-			elseif webpopular >= 75:
-				tokens += rand(50,150)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore8.jpg"></center>'
-			'You make a show of pointing the camera at your groin, and slowly push your panties down your legs. The chat explodes for a moment, with several visitors complimenting your body, and a few more making lewd comments on what they would do to you if they were with you right now.'
-			'As promised, you receive some tokens.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		act 'Tease instead':
-			*clr & cla
-			webpopular += rand(-1,1)
-			mfcclients += rand(-1,1)
-			minut += 4
-			gs 'internet_mobile', 'use_internet', $subs, 4
-			if webpopular < 15:
-				tokens += rand(0,15)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(0,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(5,40)
-			elseif webpopular >= 75:
-				tokens += rand(25,75)
-			end
-			gs 'stat'
-
-			if topmfc = 1:
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/undress2.mp4"></video></center>'
-				'Deciding to stay clothed a little longer you feel that you won''t be able to satisfy the crowd without showing at least some skin.'
-				'Standing up you start to dancing flashing your tits and ass to cam.'
-			end
-			if topmfc = 0:
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show5.mp4"></video></center>'
-				'Lowering your panties to emphasize your butt you shake it briefly in an effort to appease the crowd'
-			end
-			gs 'arousal', 'porn', 4, 'exhibitionism'
-			minut -= 4
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		act 'Give them a brief look':
-			*clr & cla
-			webpopular += rand(-1,1)
-			mfcclients += rand(-1,1)
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(0,15)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(0,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(5,40)
-			elseif webpopular >= 75:
-				tokens += rand(25,75)
-			end
-			gs 'stat'
-
-			'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show1.mp4"></video></center>'
-			'You push your panties to the side and bend over to give a short preview of what''s to come before quickly covering up again and hoping it was enough to keep viewers interested.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -=2
-			gs 'stat'
-			
-			act 'Continue': gt 'komp','waitclients'
-		end
-		
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Refuse to take off your panties (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','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
-	if topmfc = 0 and clientask >= 95 and clientask < 99:
-		menu_off = 1
-		*clr & cla
-		'One of the visitors types: "Play with those titties, girl! I''ll pay!"'
-		act 'Play with your boobs':
-			*clr & cla
-			mfcclients = 0
-			webpopular += rand(hotcat/2 -2,hotcat/2)
-			backmfc = 0
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(15,25)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(20,30)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(50,100)
-			elseif webpopular >= 75:
-				tokens += rand(50,150)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore10.jpg"></center>'
-			'You adjust your camera and lie down on your bed, and start to knead your tits and pinch your nipples playfully. When you hear the donation sound, you smile sweetly at the camera and thank the person who donated personally, immediately prompting a second visitor to donate as well.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Refuse to play with your boobs (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','waitclients'
-			end
-		else
-			act 'Refuse to play with your boobs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-	end
-	if backmfc = 0 and clientask = 99:
-		menu_off = 1
-		*clr & cla
-		'"Let''s see that sweet cunt of yours again, whore!" one of your visitors says.'
-		'He''s kinda rude about it, but then again... he''s willing to pay.'
-		act 'Do it':
-			*clr & cla
-			mfcclients = 0
-			webpopular += rand(hotcat/2 -2,hotcat/2)
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if webpopular < 15:
-				tokens += rand(20,25)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(25,50)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(50,100)
-			elseif webpopular >= 75:
-				tokens += rand(100,150)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore12.jpg"></center>'
-			'You lie down comfortably and put your hand between your legs, gently rubbing your labia with your fingers. You put some effort into showing how wet you are already, which is met with some enthusiastic chatter.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			if pcs_horny >= 100:
-				mfccum += 1
-				pcs_mood = 100
-				gs 'stat'
-				$orgasm_or = 'custom'
-				$orgasm_txt = 'You groan despite yourself, and realize you''re about to have an orgasm on camera! Deciding it''s too late to stop, you flick your fingers over your clit several more times and moan loudly as your whole body begins to tremble. When you look at the chat again, you see a mixture of compliments and lewd comments on your show. Either way: they loved it!'
-			end
-			act 'Continue': gt 'komp','waitclients'
-		end
-		
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Ignore him (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','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
-	if backmfc = 0 and clientask = 100:
-		menu_off = 1
-		*clr & cla
-		'One of the visitors asks very politely: "Uh, hi! Could you please show me your vagina up close?"'
-		act 'Show him your vagina':
-			*clr & cla
-			mfcclients = 0
-			webpopular += rand(hotcat/2 -2,hotcat/2)
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2			
-			if webpopular < 15:
-				tokens += rand(10,25)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(15,25)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(25,50)
-			elseif webpopular >= 75:
-				tokens += rand(50,150)
-			end
-			gs 'stat'
-			if analplugIN = 1:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore19.jpg"></center>'
-			elseif pcs_vag = 0:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore18.jpg"></center>'
-			elseif pcs_vag <= 10:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore13.jpg"></center>'
-			elseif pcs_vag <= 15:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore14.jpg"></center>'
-			elseif pcs_vag <= 25:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore15.jpg"></center>'
-			elseif pcs_vag <= 35:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore16.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore17.jpg"></center>'
-			end
-			'Aww, what a sweetheart! You smile at the camera and do what your client wants. He delivers on his promise as well, sending some tokens your way. The rest of the chat is thanking him too, everyone wanted to see that!'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Ignore him (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','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
-	if backmfc = 0 and pcs_ass >= 30 and webpopular >= 50 and clientask = 80:
-		menu_off = 1
-		*clr & cla
-		'One of the visitors makes several comments on how badly he wants to fuck your ass, and then offers you tokens to show your anus to him...'
-		act 'Show them your battered sphincter':
-			*clr & cla
-			mfcclients = 0
-			webpopular += rand(hotcat/2-1,1+hotcat/2)
-			backmfc = 0
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			if pcs_apprnc > 100:
-				tokens += rand(50,100)
-			else
-				tokens += rand(40,75)
-			end
-			if webpopular < 15:
-				tokens += rand(25,50)
-			elseif webpopular >= 15 and webpopular < 35:
-				tokens += rand(50,100)
-			elseif webpopular >= 35 and webpopular < 75:
-				tokens += rand(100,150)
-			elseif webpopular >= 75:
-				tokens += rand(100,200)
-			end
-			gs 'stat'
-			if analplugIN = 0:
-				if cumsumass > 39:
-					'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore74.jpg"></center>'
-					'You turn your back to the camera and pull your ass cheeks aside, showing everyone your battered anus. When you push softly, you suddenly hear the chat exploding.'
-					'"Oh my god, is that sperm!?" someone wonders.'
-					'"Definitely! What a whore!" someone else adds.'
-					'"I''d love to add my load to that!" a third one laughs.'
-					'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 visitor who promised to donate did, so you''re a few tokens richer.'
-
-					gs 'arousal', 'porn', 2, 'exhibitionism'
-					minut -= 2 
-					gs 'stat'
-
-				else
-					'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore20,<<rand(0,7)>>.jpg"></center>'
-					'You bite your lip for a second, trying to think of a way to get out of his request. Then, you sigh and show them your rectum. It''s obviously quite used to having objects shoved in, something your audience notices immediately.'
-					'Then your greed overcomes you. They already know... you might as well earn some money by showing them properly, right?'
-					'You pull your ass cheeks aside, giving them a good view of your worn out anus.'
-
-					gs 'arousal', 'porn', 2, 'exhibitionism'
-					minut -= 2
-					gs 'stat'
-
-				end
-			else
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore21.jpg"></center>'
-				'You smile to yourself, he''s going to love what you have in store for him!'
-				'"I''m sorry", you tell him, explicitly mentioning his username as well. "I can''t right now..."'
-				'Then you turn around, and show him the large plug you currently have shoved inside you. You wiggle your ass seductively at the camera, and hear the donation sound mere seconds later.'
-
-				gs 'arousal', 'porn', 2, 'exhibitionism'
-				minut -= 2
-				gs 'stat'
-
-			end
-			act 'Continue': gt 'komp','waitclients'
-		end
-		gs 'willpower', 'exhib', 'resist', 'hard'
-		if will_cost <= pcs_willpwr:
-			act 'Ignore him (<<will_cost>> Willpower)':
-				*clr & cla
-				webpopular -= 1
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				gt 'komp','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
-
-	if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 89
-	end
-
-	if webpopular < 50 and clientask = 88:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 88
-	end
-
-	if webpopular >= 50 and pcs_vag >= 35 and clientask = 87:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 87
-	end
-
-	if webpopular >= 35 and pcs_vag >= 25 and alko >= 4 and clientask = 86:
-		menu_off = 1
-		*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
-		gt 'kompMFCtwo', 85
-	end
-
-	if backmfc = 0 and webpopular >= 25 and pcs_vag + pcs_ass >= 30 and alko >= 4 and clientask = 84:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 84
-	end
-
-	if backmfc = 0 and pcs_vag > 20 and clientask = 83:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 83
-	end
-
-	if webpopular > 25 and backmfc = 0 and sub > 25 and pcs_vag > 10 and mc_inventory['equipped_condoms'] > 0 and clientask = 82:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 82
-	end
-
-	if backmfc = 0 and webpopular >= 50 and pcs_ass > 25 and clientask = 81:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCtwo', 81
-	end
-
-	if backmfc = 0 and clientask < 80 and clientask >= 77:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCanal'
-	end
-
-	if clientask < 77 and clientask >= 74:
-		menu_off = 1
-		*clr & cla
-		gt 'kompMFCoral'
-	end
-
-	if backmfc = 0 and clientask => 90 and clientask < 95:
-		menu_off = 1
-		*clr & cla
-		'One of the visitors asks: "Do you have a vibrator or dildo? I want you to put up a little show..."'
-		gt 'kompMFC'
-	end
-
-	if clientask < 74:
-		act 'Dance':
-			menu_off = 1
-			*clr & cla
-			minut += 5	
-			gs 'internet_mobile', 'use_internet', $subs, 5
-			gs 'stat'
-			if topmfc = 1 and backmfc = 1:
-				if webpopular < 15:
-					camclients += rand(pcs_dancero - 60,pcs_dancero - 55)
-				elseif webpopular >= 15 and webpopular < 35:
-					camclients += rand(pcs_dancero - 55,pcs_dancero - 45)
-				elseif webpopular >= 35 and webpopular < 75:
-					camclients += rand(pcs_dancero - 50,pcs_dancero - 42)
-				elseif webpopular >= 75:
-					camclients += rand(pcs_dancero - 40,pcs_dancero - 25)
-				end
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip4.mp4"></video></center>'
-				'Turning on some music you dance eroticiy hoping to entice some viewers.'
-			end
-			if topmfc = 0 and backmfc = 1:
-				if webpopular < 15:
-					camclients += rand(pcs_dancero - 55,pcs_dancero - 45)
-				elseif webpopular >= 15 and webpopular < 35:
-					camclients += rand(pcs_dancero - 50,pcs_dancero - 40)
-				elseif webpopular >= 35 and webpopular < 75:
-					camclients += rand(pcs_dancero - 45,pcs_dancero - 35)
-				elseif webpopular >= 75:
-					camclients += rand(pcs_dancero - 40,pcs_dancero - 25)
-				end
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip7.mp4"></video></center>'
-				'Turning on some music you dance eroticly hoping to entice some viewers.'
-			end
-			if topmfc = 1 and backmfc = 0:
-				if webpopular < 15:
-					camclients += rand(pcs_dancero - 55,pcs_dancero - 45)
-				elseif webpopular >= 15 and webpopular < 35:
-					camclients += rand(pcs_dancero - 50,pcs_dancero - 40)
-				elseif webpopular >= 35 and webpopular < 75:
-					camclients += rand(pcs_dancero - 45,pcs_dancero - 35)
-				elseif webpopular >= 75:
-					camclients += rand(pcs_dancero - 40,pcs_dancero - 25)
-				end
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip6.mp4"></video></center>'
-				'Turning on some music you dance eroticly hoping to entice some viewers.'
-			end
-			if topmfc = 0 and backmfc = 0:
-				if webpopular < 15:
-					camclients += rand(pcs_dancero - 50,pcs_dancero - 40)
-				elseif webpopular >= 15 and webpopular < 35:
-					camclients += rand(pcs_dancero - 45,pcs_dancero - 35)
-				elseif webpopular >= 35 and webpopular < 75:
-					camclients += rand(pcs_dancero - 40,pcs_dancero - 25)
-				elseif webpopular >= 75:
-					camclients += rand(pcs_dancero - 30,pcs_dancero - 10)
-				end
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip5.mp4"></video></center>'
-				'Turning on some music you dance eroticly hoping to entice some viewers.'
-			end	
-			gs 'exp_gain', 'dancero', 1
-			gs 'arousal', 'porn', 5
-			minut -= 5
-			gs 'stat'
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end	
-
-	if topmfc = 1 and backmfc = 1 and clientask < 74:
-		act 'Perform a striptease':
-			menu_off = 1
-			*clr & cla
-			gs 'stat'
-			minut += 3
-			gs 'internet_mobile', 'use_internet', $subs, 3
-			if webpopular < 15:
-				camclients += rand(pcs_dancero - 50,pcs_dancero - 40)
-			elseif webpopular >= 15 and webpopular < 35:
-				camclients += rand(pcs_dancero - 45,pcs_dancero - 35)
-			elseif webpopular >= 35 and webpopular < 75:
-				camclients += rand(pcs_dancero - 40,pcs_dancero - 25)
-			elseif webpopular >= 75:
-				camclients += rand(pcs_dancero - 30,pcs_dancero - 10)
-			end
-			'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/striptease4.mp4"></video></center>'
-			'You decide that making a show of stripping yourself might encourage some attention.  Repositioning your cam, you stand up and dance as you remove your underwear.'
-			gs 'exp_gain', 'dancero', 1
-			topmfc = 0
-			backmfc = 0
-			gs 'arousal', 'porn', 3
-			minut -= 3
-			gs 'stat'
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end	
-
-	if topmfc = 1 and clientask < 74:
-		act 'Take off your bra':
-			menu_off = 1 
-			*clr & cla
-			topmfc = 0
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-
-			gs 'stat'
-
-			if backmfc = 1:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore4.jpg"></center>'
-			end
-			if backmfc = 0:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore5.jpg"></center>'
-			end
-			'Even though no one requested you to do so, you figure showing off your nice boobs might get some more viewers into the channel. You slowly take off your bra and wiggle your breasts seductively at the camera.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end
-
-	if topmfc = 0 and clientask < 74:
-		act 'Idly play with your boobs':
-			menu_off = 1
-			*clr & cla
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-
-			if webpopular < 15:
-				camclients += rand(3,6)
-			elseif webpopular >= 15 and webpopular < 35:
-				camclients += rand(5,10)
-			elseif webpopular >= 35 and webpopular < 75:
-				camclients += rand(10,20)
-			elseif webpopular >= 75:
-				camclients += rand(15,35)
-			end
-			if alko >= 4:
-				gs 'pain', 2, 'slap', 'breasts'
-			end
-			chancetips = rand(0,100)
-			if chancetips >= 85:
-				tokens += rand(2,10)
-			end
-			gs 'stat'
-			if alko >= 4:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore80.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore9.jpg"></center>'
-			end
-			'You chat with your visitors for a little while, but begin to play with your boobs absent-mindedly in a slow moment. It feels quite nice! You knead your boobs and play with them more and more intently, almost completely forgetting about the camera.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end
-
-	if backmfc = 1 and clientask < 74:
-		act 'Take off your panties':
-			menu_off = 1
-			*clr & cla
-			backmfc = 0
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-			gs 'stat'
-			if topmfc = 1:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore5.jpg"></center>'
-			end
-			if topmfc = 0:
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore6.jpg"></center>'
-			end
-			'You know that the fewer clothes you have on, the more visitors will be inclined to check out your channel. You slowly take off your panties in front of the camera, rewarding the viewers already in your channel to a free show when you expose your naked pussy to them.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end
-	if backmfc = 0 and clientask < 74:
-		act 'Play with your pussy':
-			menu_off = 1
-			*clr & cla
-			minut += 4
-			gs 'internet_mobile', 'use_internet', $subs, 4
-			if webpopular < 15:
-				camclients += rand(5,10)
-			elseif webpopular >= 15 and webpopular < 35:
-				camclients += rand(10,15)
-			elseif webpopular >= 35 and webpopular < 75:
-				camclients += rand(10,30)
-			elseif webpopular >= 75:
-				camclients += rand(15,40)
-			end
-			chancetips = rand(0,100)
-			if chancetips >= 75:
-				tokens += rand(10,15)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore11.jpg"></center>'
-			'You get bored during a slow moment in the chat, and begin to play with your pussy without giving it another thought.'
-			'"How does that feel, girl?" one of your visitors asks. "I bet you love fingering yourself, with a bunch of strangers watching you!" another adds.'
-			'Giving them a defensive smile, you shrug and reply with one hand, while you keep rubbing your clit slowly with the other.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			gs 'arousal', 'vaginal_finger', 2, 'exhibitionism'
-			minut -= 4
-			gs 'stat'
-
-			if pcs_horny >= 100:
-				webpopular -= 1
-				mfccum += 1
-				pcs_mood = 100
-				gs 'stat'
-				'Oh crap! You misjudged your endurance, and suddenly squirm and gasp in front of the camera. You''re having an orgasm!'
-				'When it subsides, you look at your current viewer count. Damn... you just came in front of <<camclients>> users, completely free of charge!'
-
-				$orgasm_or = 'yes'
-				gs 'stat'
-			end
-			act 'Continue': gt 'komp','waitclients'
-		end
-	end
-	if backmfc = 0 and clientask < 74:
-		act'Play with your ass':
-			menu_off = 1
-			*clr & 
-			minut += 4
-			gs 'internet_mobile', 'use_internet', $subs, 4
-			if webpopular < 15:
-				camclients += rand(5,10)
-			elseif webpopular >= 15 and webpopular < 35:
-				camclients += rand(10,15)
-			elseif webpopular >= 35 and webpopular < 75:
-				camclients += rand(10,30)
-			elseif webpopular >= 75:
-				camclients += rand(15,40)
-			end
-			if pcs_ass < 10:analplay += 1
-			mfcclients -= 1
-			minut += 2
-			pcs_horny += rand(5,10)
-			chancetips = rand(0,100)
-			if chancetips >= 60:
-				tokens += rand(10,20)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore45.jpg"></center>'
-			'You put two fingers in your mouth and generously cover them in saliva, and then turn your back to the camera. Much to the appreciation of your viewers, you give them a short preview of what an anal show would look like from you. You finger your anus for the camera for a little while, giving your viewers a happy smile the whole time.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			gs 'arousal', 'anal_finger', 2, 'exhibitionism'
-			minut -= 4
-			gs 'stat'
-
-			if pcs_horny >= 100:
-				webpopular -= 1
-				mfccum += 1
-				pcs_mood = 100
-				gs 'stat'
-				$orgasm_or = 'yes'
-				$orgasm_txt = 'It feels too good to stop! Before you know it, your fingers are repeatedly penetrating your ass and you moan excitedly, barely keeping yourself from screaming. You just had an anal orgasm in front of <<camclients>> users, completely free of charge! Oops...'
-				gs 'stat'
-			end
-			act'Continue': gt'komp','waitclients'
-		end
-	end
-	if topmfc = 0 and pain['nippleR'] < 10 and pain['nippleL'] < 10 and clientask < 74:
-		act'Pinch your nipples hard':
-			menu_off = 1
-			*clr & cla
-			minut += 2
-			gs 'internet_mobile', 'use_internet', $subs, 2
-
-			if webpopular < 15:
-				camclients += rand(5,10)
-			elseif webpopular >= 15 and webpopular < 35:
-				camclients += rand(10,15)
-			elseif webpopular >= 35 and webpopular < 75:
-				camclients += rand(10,30)
-			elseif webpopular >= 75:
-				camclients += rand(15,40)
-			end
-			mfcclients -= 1
-			gs 'pain', 2, 'pinch', 'nipples'
-			chancetips = rand(0,100)
-			if chancetips >= 75:
-				tokens += rand(20,40)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore80.jpg"></center>'
-			'You''re getting too turned on, and need to slow yourself down a little!'
-			'You tightly pinch your nipples and pull hard on them. It hurts a lot, and the sharp pain lowers your excitement by quite a lot. Nevertheless, your viewers enjoy the free show and have no idea you actually did that for your own good.'
-
-			gs 'arousal', 'porn', 2, 'exhibitionism'
-			minut -= 2
-			gs 'stat'
-
-			act'Continue': gt'komp','waitclients'
-		end
-	end
-	if locat['Anya_inroom'] = 1 and $loc = 'bedrPar':
-		*clr & cla
-		topmfc = 1
-		backmfc = 1
-		karta += tokens * 2
-		tokens = 0
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
-		'Suddenly you hear the handle of your door creak, and an annoyed voice shouting: "<<$pcs_nickname>>, what the hell!? Why is the door locked? Let me in!"'
-		'Oh crap, it''s your sister! "Sorry everyone, show''s over!" you whisper to the camera, and you close the stream and hide the website. You quickly put your clothes back on and open your door, trying to avoid the scrutinizing gaze of your sister.'
-		'When she''s no longer paying attention to you, you open the site again and find yourself in the main lobby of MyFreeCams. You''re a bit bummed that you couldn''t get more out of that session, but cash in your earnings.'
-		gs 'internet_mobile', 'add_limitation', 'noporn', 'You can''t watch porn with your sister in the room'
-		gs 'internet_mobile', 'add_limitation', 'nocamshow', 'You can''t do a camshow with your sister in the room'
-		act 'Continue': gt 'komp','mfc'
-	else
-		act 'Turn off the webcam': gt 'komp','startpagemfc'
-	end
-end
-
 if $ARGS[0] = 'bank':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/online_bank.jpg"></center>'
 	if karta + bankDebtLimit >= 10:

+ 1 - 1
locations/LBZhouse.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'Shower':
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You grab your stuff and walk over to the bathroom to have a shower. You carefully run the faucet, checking the water temperature before washing yourself off, enjoying the warm water hitting your body.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_hairbsh = 1

+ 4 - 3
locations/LariskaHome.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'bathroom_join_2':
 	'You quickly strip your clothing off, and gently tap on the shower door. Startled, she turns to see you standing there, before smiling shyly and opening the door for you.'
 	
 	act 'Finish the shower':
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pcs_horny += 10
@@ -403,7 +403,7 @@ if $ARGS[0] = 'bathroom_join_3':
 		gs 'arousal', 'end'
 		'As your body comes down from its high, she stands back up and kisses you some more. You taste yourself on her lips, you taste great! Eventually you break away to continue the shower.'
 		act 'Finish your shower':
-			mc_inventory['noshampoo'] = 1
+			noshampoo = 1
 			dynamic $showerdin
 			minut += 5
 			pcs_horny += 10
@@ -480,7 +480,8 @@ if $ARGS[0] = 'lariska_bedroom':
 	else
 		'Her bed sits directly on the floor, without space underneath.'
 	end
-	'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">phone alarm</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+
+	'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">phone alarm</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl
 	if locat['Lariska'] = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'
 	if locat['Lariska'] = 2:'<a href="exec:gt ''LariskaHome'', ''lariska_dressing_1''">Lariska</a> is getting dressed right now.'

+ 2 - 2
locations/LariskaSex.qsrc

@@ -25,10 +25,10 @@ if $ARGS[0] = 'undressed2':
 	if lariskalove >= 12:
 		act 'Play with dildos': gt 'LariskaSex', 'dildo1'
 	end
-	if lariskalove >= 18 and strapon > 0:
+	if lariskalove >= 18 and mc_inventory['strapon'] > 0:
 		act 'Wear your Strap-On': gt 'LariskaSex', 'bj_give_1'
 	end
-	if lariskalove >= 18 and strapon > 0:
+	if lariskalove >= 18 and mc_inventory['strapon'] > 0:
 		act 'Lariska wears the Strap-on': gt 'LariskaSex', 'bj_1'
 	end
 	act 'Get dressed': 

+ 1 - 0
locations/Voltrener.qsrc

@@ -165,6 +165,7 @@ if $ARGS[0] = 'talk':
 						gs 'stat'
 						grupvalue[2] += 5
 						volleysostav = 2
+						trener_Speak = 8
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 						'You happily accept, "Oh Mikhail! Thank you so much, I won''t let you down." The coach grins at you and nods his head in confirmation.'
 						'"Okay, welcome to the team <<$pcs_lastname>>. Remember, tournament matches are on Saturdays. Don''t forget to show up!"'

+ 2 - 2
locations/VoltrenerSexShower.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = '3':
 					'You can see from the look in his eyes that he''s been at the wine, and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 					gs 'stat'
 					act 'Wash your ass':
-						mc_inventory['noshampoo'] = 1
+						noshampoo = 1
 						dynamic $showerdin
 						gt 'gdksport', 'start'
 					end
@@ -151,7 +151,7 @@ if $ARGS[0] = '3':
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wash your ass':
-					mc_inventory['noshampoo'] = 1
+					noshampoo = 1
 					dynamic $showerdin
 					gt 'gdksport', 'start'
 				end

+ 1 - 1
locations/Zvereva_house_events.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'chris_shower':
 		'When she sees you, she opens the door and says "Get in here, I need my back washed."'
 		'You step inside, lather your hands in soap, and start washing her.'
 
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		pcs_horny += 10
 		pcs_hairbsh = 1

+ 1 - 1
locations/abduction.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'abdFood':
 		menu_off = 1
 		minut += 15
 		pcs_horny += 1
-		mc_inventory['noshampoo'] = 1 
+		noshampoo = 1 
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'

+ 214 - 0
locations/alarmclock.qsrc

@@ -0,0 +1,214 @@
+# alarmclock
+
+if $ARGS[0] = 'start':
+	menu_off = 1
+
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/bed2.jpg"></center>'
+	'<center>Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.</center>'
+	*nl
+
+	if numbud = 4: '<center><b><<bud1>><<bud2>>:<<bud3>><<bud4>></b></center>'
+	if numbud = 3: '<center><b><<bud1>><<bud2>>:<<bud3>></b><<bud4>></center>'
+	if numbud = 2: '<center><b><<bud1>><<bud2>></b>:<<bud3>><<bud4>></center>'
+	if numbud = 1: '<center><b><<bud1>></b><<bud2>>:<<bud3>><<bud4>></center>'
+	if numbud = 0: '<center><<bud1>><<bud2>> : <<bud3>><<bud4>></center>'
+
+	'<center><b><a href="exec:gt ''alarmclock'', ''clear''">Clear</a>'
+	'<center><b><a href="exec:gt ''alarmclock'', ''1''">1</a> <a href="exec:gt ''alarmclock'', ''2''">2</a> <a href="exec:gt ''alarmclock'', ''3''">3</a></b></center>'
+	'<center><b><a href="exec:gt ''alarmclock'', ''4''">4</a> <a href="exec:gt ''alarmclock'', ''5''">5</a> <a href="exec:gt ''alarmclock'', ''6''">6</a></b></center>'
+	'<center><b><a href="exec:gt ''alarmclock'', ''7''">7</a> <a href="exec:gt ''alarmclock'', ''8''">8</a> <a href="exec:gt ''alarmclock'', ''9''">9</a></b></center>'
+	'<center><b><a href="exec:gt ''alarmclock'', ''0''">0</a></b></center>'
+
+	'<center><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Reset''">Reset weekday alarm</a> <a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Time''">Set</a> weekday alarm to this time</b></center>'
+	'<center><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>></center>'
+
+	'<center><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Reset''">Reset weekend alarm</a> <a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Time''">Set</a> weekend alarm to this time</b></center>'
+	'<center><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></center>'
+
+	if mid($start_type,1,2) = 'sg' and alarmVars['alarm_holiday'] = 0:
+		'<center><b>Use weekend alarm for holidays - <a href="exec: alarmVars[''alarm_holiday''] = 1 & gt ''alarmclock'', ''start''">OFF</a></b></center>'
+	elseif mid($start_type,1,2) = 'sg' and alarmVars['alarm_holiday'] = 1:
+		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarmVars[''alarm_holiday''] = 0 & gt ''alarmclock'', ''start''">ON</a></b></center>'
+	end
+
+	*nl
+	if alarmVars['alarmOn'] = 0:
+		'<center>Your alarm is currently turned <a href="exec: alarmVars[''alarmOn''] = 1 & gt ''alarmclock'', ''start''"><b>OFF</a></b></center>'
+	else
+		'<center>Your alarm is currently turned <a href="exec: alarmVars[''alarmOn''] = 0 & gt ''alarmclock'', ''start''"><b>ON</b></a></center>'
+		'<center>The alarm is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend.</center>'
+	end
+	act 'Clear time display':
+		bud1 = 0
+		bud2 = 0
+		bud3 = 0
+		bud4 = 0
+		numbud = 0
+		gt 'alarmclock', 'fin'
+	end
+	act 'Finish':
+		bud1 = 0
+		bud2 = 0
+		bud3 = 0
+		bud4 = 0
+		numbud = 0
+		gt 'alarmclock', 'fin'
+	end
+end
+
+if $ARGS[0] = 'alarm_display':
+	!! func('alarmclock', 'alarm_display', hour, minutes)
+	$result = '<b><<$mid(100 + ARGS[1], 2, 2)>>:<<$mid(100 + ARGS[2], 2, 2)>></b>'
+end
+
+if $ARGS[0] = 'clear':
+	cla
+	bud1 = 0
+	bud2 = 0
+	bud3 = 0
+	bud4 = 0
+	numbud = 0
+	gt 'alarmclock', 'fin'
+end
+
+if $ARGS[0] = 'Time':
+	alarmVars['alarmOn'] = 1
+
+	if bud_weekend = 1:
+		alarmVars['timerEndH'] = bud1 * 10 + bud2
+		alarmVars['timerEndM'] = bud3 * 10 + bud4
+
+		if alarmVars['timerEndH'] > 23: alarmVars['timerEndH'] = 0
+		if alarmVars['timerEndM'] > 60: alarmVars['timerEndM'] = 0
+	else
+		alarmVars['timerH'] = bud1 * 10 + bud2
+		alarmVars['timerM'] = bud3 * 10 + bud4
+
+		if alarmVars['timerH'] > 23: alarmVars['timerH'] = 0
+		if alarmVars['timerM'] > 60: alarmVars['timerM'] = 0
+	end
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '1':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 1 & numbud = 4
+	if numbud = 2: bud3 = 1 & numbud = 3
+	if numbud = 1: bud2 = 1 & numbud = 2
+	if numbud = 0: bud1 = 1 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '2':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 2 & numbud = 4
+	if numbud = 2: bud3 = 2 & numbud = 3
+	if numbud = 1: bud2 = 2 & numbud = 2
+	if numbud = 0: bud1 = 2 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '3':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 3 & numbud = 4
+	if numbud = 2: bud3 = 3 & numbud = 3
+	if numbud = 1: bud2 = 3 & numbud = 2
+	if numbud = 0: bud1 = 3 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '4':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 4 & numbud = 4
+	if numbud = 2: bud3 = 4 & numbud = 3
+	if numbud = 1: bud2 = 4 & numbud = 2
+	if numbud = 0: bud1 = 4 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '5':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 5 & numbud = 4
+	if numbud = 2: bud3 = 5 & numbud = 3
+	if numbud = 1: bud2 = 5 & numbud = 2
+	if numbud = 0: bud1 = 5 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '6':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 6 & numbud = 4
+	if numbud = 2: bud3 = 6 & numbud = 3
+	if numbud = 1: bud2 = 6 & numbud = 2
+	if numbud = 0: bud1 = 6 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '7':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 7 & numbud = 4
+	if numbud = 2: bud3 = 7 & numbud = 3
+	if numbud = 1: bud2 = 7 & numbud = 2
+	if numbud = 0: bud1 = 7 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '8':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 8 & numbud = 4
+	if numbud = 2: bud3 = 8 & numbud = 3
+	if numbud = 1: bud2 = 8 & numbud = 2
+	if numbud = 0: bud1 = 8 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '9':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 9 & numbud = 4
+	if numbud = 2: bud3 = 9 & numbud = 3
+	if numbud = 1: bud2 = 9 & numbud = 2
+	if numbud = 0: bud1 = 9 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = '0':
+	!!if numbud = 4:end
+	if numbud = 3: bud4 = 0 & numbud = 4
+	if numbud = 2: bud3 = 0 & numbud = 3
+	if numbud = 1: bud2 = 0 & numbud = 2
+	if numbud = 0: bud1 = 0 & numbud = 1
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = 'Reset':
+	if bud_weekend = 1:
+		alarmVars['timerEndH'] = 0
+		alarmVars['timerEndM'] = 0
+	else
+		alarmVars['timerH'] = 0
+		alarmVars['timerM'] = 0
+	end
+	bud1 = 0
+	bud2 = 0
+	bud3 = 0
+	bud4 = 0
+	numbud = 0
+
+	gt 'alarmclock', 'start'
+end
+
+if $ARGS[0] = 'fin': gt $loc, $loc_arg
+
+--- alarmclock ---------------------------------

+ 2 - 2
locations/albina_starlets.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'starlets':
 					'The performance goes smoothly and you and the other Starlets leave the stage, where Albina distributes the money while everyone takes turns using the single shower in the dressing room.'
 					act 'Shower':
 						*clr & cla
-						mc_inventory['noshampoo'] =  1
+						noshampoo =  1
 						dynamic $showerdin
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
@@ -467,7 +467,7 @@ if $ARGS[0] = 'parkrally':
 		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
-		mc_inventory['noshampoo'] =  1
+		noshampoo =  1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'

Файловите разлики са ограничени, защото са твърде много
+ 218 - 216
locations/albina_wine_event.qsrc


+ 1 - 1
locations/anushapt.qsrc

@@ -566,7 +566,7 @@ if $ARGS[0] = 'snack':
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
-	snacktime = rand(11)
+	snacktime = rand(0, 11)
 	if snacktime <= 3:
 		gs 'stat'
 		'<center><b><font color = maroon>Kitchen</font></b></center>'

+ 1 - 1
locations/autosalonF.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> 7,000,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> 5,366,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> 5,000,000 <b>₽</b> </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> Price: 5,500,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> 5,500,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XJ</a>.</TD><TD> - </TD><TD> 6,500,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S-Class</a>.</TD><TD> - </TD><TD> 7,600,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental GT</a>.</TD><TD> - </TD><TD> 13,000,000 <b>₽</b> </TD>'

+ 45 - 45
locations/autotraidF.qsrc

@@ -106,50 +106,52 @@ if $ARGS[0] = 'car':
 			killvar 'car'
 			car = 0
 		end
-		act 'Inspect a 2107':gt 'autotraidF', 'inspect', '2107', 1, 200, 1, 3
+		if used_car['1_condition'] ! -1 and used_car['1_price'] ! -1: act 'Inspect a 2107': gt 'autotraidF', 'inspect', '2107', 1, 200, 1, 3
 
-		act 'Inspect another 2107 (Broken Engine)':
-			cla
-			*clr
-			menu_off = 1
-			'<center><b>2107 (Broken engine)</b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car.jpg"></center>'
-			!! caching offers, resets on monday (via cikl)
-			if used_car['wrek_condition'] = 0 and used_car['wrek_price'] = 0:
-				used_car['wrek_condition'] = rand(10, 200)
-				used_car['wrek_price'] = rand(10000, 50000)
-			end
-			'The car is basically a wreck. It doesn''t even start. When you ask the salesman how much it costs, he tells you "<<used_car[''wrek_price'']>> <b>₽</b>" without hesitation.'
-
-			act 'Look around some more':gt 'autotraidf', 'car'
-
-			if car = 0 and prava = 1 and money >= used_car['wrek_price']:
-				act 'Buy it for <<used_car[''wrek_price'']>><b>₽</b>':
-					cla
-					money -= used_car['wrek_price']
-					$car = '2107'
-					car = 1
-					benz = 3
-					cardrive = 9
-					car['new_condition'] = 200
-					car['current_condition'] = used_car['wrek_condition']
-					wrek = 1
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''wrek_price'']>> <b>₽</b> in cash, and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
-					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
-					gs 'shortgs', 'remove_array_element', 'used_car', 'wrek_condition'
-					gs 'shortgs', 'remove_array_element', 'used_car', 'wrek_price'
-					act 'Leave': minut += 5 & gt 'city_industrial'
+		if used_car['wrek_condition'] ! -1 and used_car['wrek_price'] ! -1:
+			act 'Inspect another 2107 (Broken Engine)':
+				cla
+				*clr
+				menu_off = 1
+				'<center><b>2107 (Broken engine)</b></center>'
+				'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car.jpg"></center>'
+				!! caching offers, resets on monday (via cikl)
+				if used_car['wrek_condition'] = 0 and used_car['wrek_price'] = 0:
+					used_car['wrek_condition'] = rand(10, 200)
+					used_car['wrek_price'] = rand(10000, 50000)
+				end
+				'The car is basically a wreck. It doesn''t even start. When you ask the salesman how much it costs, he tells you "<<used_car[''wrek_price'']>> <b>₽</b>" without hesitation.'
+
+				act 'Look around some more':gt 'autotraidf', 'car'
+
+				if car = 0 and prava = 1 and money >= used_car['wrek_price']:
+					act 'Buy it for <<used_car[''wrek_price'']>><b>₽</b>':
+						cla
+						money -= used_car['wrek_price']
+						$car = '2107'
+						car = 1
+						benz = 3
+						cardrive = 9
+						car['new_condition'] = 200
+						car['current_condition'] = used_car['wrek_condition']
+						wrek = 1
+						'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''wrek_price'']>> <b>₽</b> in cash, and the car is yours.' 
+						'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
+						'If you want to get the car to a garage, you''ll have to go there and have it towed.'
+						used_car['wrek_condition'] = -1
+						used_car['wrek_price'] = -1
+						act 'Leave': minut += 5 & gt 'city_industrial'
+					end
 				end
 			end
 		end
 
-		act 'Inspect a VAZ 2115':gt 'autotraidF', 'inspect', 'VAZ 2115', 2, 300, 1, 3
-		act 'Inspect a VAZ 2113':gt 'autotraidF', 'inspect', 'VAZ 2113', 3, 290, 1, 3
-		act 'Inspect a VAZ 2114':gt 'autotraidF', 'inspect', 'VAZ 2114', 4, 300, 1, 3
-		act 'Inspect a VAZ 2110':gt 'autotraidF', 'inspect', 'VAZ 2110', 5, 350, 1, 3
-		act 'Inspect a GAZ 3102':gt 'autotraidF', 'inspect', '3102 GAS', 11, 1000, 2, 5
-		act 'Inspect a 3110':gt 'autotraidF', 'inspect', '3110', 13, 800, 2, 5
+		if used_car['2_condition'] ! -1 and used_car['2_price'] ! -1: act 'Inspect a VAZ 2115': gt 'autotraidF', 'inspect', 'VAZ 2115', 2, 300, 1, 3
+		if used_car['3_condition'] ! -1 and used_car['3_price'] ! -1: act 'Inspect a VAZ 2113': gt 'autotraidF', 'inspect', 'VAZ 2113', 3, 290, 1, 3
+		if used_car['4_condition'] ! -1 and used_car['4_price'] ! -1: act 'Inspect a VAZ 2114': gt 'autotraidF', 'inspect', 'VAZ 2114', 4, 300, 1, 3
+		if used_car['5_condition'] ! -1 and used_car['5_price'] ! -1: act 'Inspect a VAZ 2110': gt 'autotraidF', 'inspect', 'VAZ 2110', 5, 350, 1, 3
+		if used_car['11_condition'] ! -1 and used_car['11_price'] ! -1: act 'Inspect a GAZ 3102': gt 'autotraidF', 'inspect', 'GAZ 3102', 11, 1000, 2, 5
+		if used_car['12_condition'] ! -1 and used_car['12_price'] ! -1: act 'Inspect a GAZ 3110': gt 'autotraidF', 'inspect', 'GAZ 3110', 12, 800, 2, 5
 	end
 end
 
@@ -164,8 +166,6 @@ if $ARGS[0] = 'inspect':
 	autotraidF_benz = ARGS[5]
 
 	'<center><b><<$autotraidF_carname>></b></center>'
-	!! currently theres no car1.jpg, only car.jpg, either we need logic (which was removed btw)
-	!! or we need an actual car1.jpg image
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car<<autotraidF_carnum>>.jpg"></center>'
 
 	!! caching offers, resets on monday (via cikl)
@@ -199,13 +199,13 @@ if $ARGS[0] = 'inspect':
 			wrek = 0
 			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b> in cash, and the car is yours.' 
 			'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
+			used_car['<<autotraidF_carnum>>_condition'] = -1
+			used_car['<<autotraidF_carnum>>_price'] = -1
+			gs 'shortgs', 'remove_array_element', 'car', 'potential_new_condition'
+			gs 'shortgs', 'remove_array_element', '$used_car', '<<autotraidF_carnum>>_condition'
 			killvar '$autotraidF_carname'
 			killvar 'autotraidF_carnum'
 			killvar 'autotraidF_benz'
-			gs 'shortgs', 'remove_array_element', 'car', 'potential_new_condition'
-			gs 'shortgs', 'remove_array_element', 'used_car', '<<autotraidF_carnum>>_condition'
-			gs 'shortgs', 'remove_array_element', '$used_car', '<<autotraidF_carnum>>_condition'
-			gs 'shortgs', 'remove_array_element', 'used_car', '<<autotraidF_carnum>>_price'
 			act 'Leave': minut += 5 & gt 'city_industrial'
 		end
 	end

+ 2 - 1
locations/avtonorm.qsrc

@@ -10,7 +10,8 @@ if car = 8:normhour = 20
 if car = 9:normhour = 15
 if car = 10:normhour = 18
 if car = 11:normhour = 15
-if car = 13:normhour = 15
+if car = 12:normhour = 15
+if car = 13:normhour = 50
 if car >= 95:normhour = 50
 
 if wrek = 0:

+ 1 - 1
locations/backwater.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'alone':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
 			*nl 'You washed in the creek.'
 			menu_off = 1
-			mc_inventory['noshampoo'] = 1
+			noshampoo = 1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0

+ 82 - 59
locations/bdsm_mansion.qsrc

@@ -24,21 +24,31 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/club.jpg"></center>'
 	if BDSMtaxi = 1 and BDSMmeet = 0:
-		'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. From the booth comes a guard, you show him the business card. Without saying anything, he opens the gate and points you in the direction. You walk to a marble tiled walkway past the neatly clipped shrubs and flower beds. An other guard meets you, and leads you into the mansion through an inconspicuous side door.'
-		act 'Enter club':gt 'bdsm_mansion', 'in'
-	elseif BDSMClubIn = 1 and BDSMday ! daystart:
-		if BDSMpayDay < daystart - 30 and $BDSMrole = 's':
-			act 'Enter the club':gt 'bdsm_mansion', 's_start'
-		elseif BDSMpayDay < daystart - 30 and $BDSMrole = 'd':
-			act 'Enter the club':gt 'bdsm_mansion', 'd_start'
+		if hour < 16 and hour > 2:
+			'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. You attempt to enter the secret club but the guard tells you it is closed. You show your card and he tells you to come back after 16:00.'
+			act 'Leave':gt 'city_suburbs', 'start'
 		else
-			act 'Enter the club':BDSMday = daystart & gt 'bdsm_hallway', 'foyer'
+			'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. From the booth comes a guard, you show him the business card. Without saying anything, he opens the gate and points you in the direction. You walk to a marble tiled walkway past the neatly clipped shrubs and flower beds. An other guard meets you, and leads you into the mansion through an inconspicuous side door.'
+			act 'Enter club':gt 'bdsm_mansion', 'in'
 		end
-	elseif BDSMmeet = 1 and BDSMday ! daystart:
-		if money < 10000:
-			'You go to the Club entrance but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		elseif $clothingworntype ! 'gm_maid' or PCloStyle2 ! 1:
-			'You are not wearing a maid uniform and security refuse you entry.'
+	elseif BDSMday = daystart and hour > 16 or hour < 2:
+		act 'Return to the club':gt 'bdsm_mansion', 'start'
+	elseif BDSMClubIn = 1:
+		if hour < 16 and hour > 2:
+			'You are standing outside the BDSM club but it is closed until 16:00.'
+			act 'Leave':gt 'city_suburbs', 'start'
+		else
+			'You are standing outside the BDSM club which is currently open.'
+			act 'Leave':gt 'city_suburbs', 'start'
+			if $BDSMrole ! '':
+				act 'Enter the club':gt 'bdsm_mansion', 'start'
+			else
+				act 'Enter the club':BDSMday = daystart & gt 'bdsm_hallway', 'foyer'
+			end
+		end
+	elseif BDSMmeet = 1:
+		if $BDSMrole = 's' and ($clothingworntype ! 'gm_maid' or PCloStyle2 ! 1):
+			'You are not wearing a maid uniform or suitable fetish wear and security refuse you entry.'
 		else
 			if $BDSMrole = 's':
 				gt 'BDSM_training', 'start'
@@ -46,12 +56,8 @@ if $ARGS[0] = 'start':
 				gt 'BDSM_training', 'd_start'
 			end
 		end
-	elseif BDSMmeet > 1 and BDSMmeet < 4 and BDSMday ! daystart:
-		if BDSMpayDay >= daystart - 30 or money >= 10000:
-			gt 'BDSM_training', 'start'
-		else
-			'You are in a Club but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		end
+	elseif BDSMmeet < 4:
+		gt 'BDSM_training', 'start'
 	end
 
 	gs 'taxi'
@@ -102,18 +108,18 @@ if $ARGS[0] = 'in':
 			'"Yes, Mistress."'
 			'The woman nods. "Undress!"'
 			'"But..."'
-			'"Undress, now! Or I''ll knock you out!" Mistress has her hand on the table.'
+			'"Undress, now! Or I''ll have security do it for you!" Mistress has her hand on the table, her finger hovering over a small red button which you have to assume will summon the security guard.'
 			'You look to the man you were just talking to, but he just stands there, expressionless. You undress.'
 			'"Sign!"'
 			'You sign the document. The man places the paper in a folder.'
 			'"Listen carefully..."'
-			'She explains to you, that the club costs 20,000 <b>₽</b> per 30 days access, with a 10,000 ruble registration fee. For slaves there is a means for discount, if the slave is well behaved and earns enough merits, the membership will be automatically extended.'
+			'She explains to you, that the club costs 30,000 <b>₽</b> registration, a slave has free entry but must comply with any requests made of them. Failure to do so can result in your registration being revoked. If the slave is well behaved there may be additional tasks they can carry out to earn some more money.'
 			'Untrained slaves are not allowed in the Mansion, you will require training. You''ll have to report to me for that, I''m going to enjoy it.'
 			'"Come back when you are ready for training. Be clean, have an enema. You must own a maid outfit, so you will be wearing it. Everything clear?'
 			'"But... what if I don''t have a maid outfit?..." You whisper.'
-			'"Find a branch of G & M and buy one, and don''t forget to bring the first installment of 10 thousand <b>₽</b>. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
+			'"Find a branch of G & M and buy one, and don''t forget to bring the 30 thousand <b>₽</b> registration fee. We are not a charitable organization. But the main thing – do not talk. We have important clients and don''t need advertising so do not tell anyone about us. Everything clear?"'
 			'"Clear... Mistress..."'
-			'As you are leaving, you think, where will you get the money for the down payment.'
+			'As you are leaving you think, <<$OpenInnerThought>>"Where will I get the money for the down payment."<<$CloseInnerThought>>'
 			act 'Leave':gt 'bdsm_mansion', 'start'
 		end
 		gs 'willpower', 'misc', 'resist', 'hard'
@@ -128,13 +134,18 @@ if $ARGS[0] = 'in':
 				!'<center><img <<$set_imgh>> src="images/bdsm_club/<<$BDSMrole>><<BDSMmeet>>_2.jpg"></center>'
 				'The woman sighs disappointedly.'
 				'"Pity, we are short on subs."'
-				'"There is a registration fee of 10,000 <b>₽</b>. You should wear an expensive or formal clothing."'
+				'"There is a registration fee of 30,000 <b>₽</b>, then there is a monthly fee of 15,000 <b>₽</b> with your first month free. You should wear nice clothing, don''t want to get mistaken for staff or a sub."'
 				'"That seems reasonable" You reply.'
-				'"If you find a submissive and come together, then they can earn you tips."'
-				'"Before you can get started, you will have some orientation under the guidance of an experienced mistress." She points at herself, "The cost of this is covered by your registration fee. If you are satisfied, sign this document."'
-				'You sign the document. The man places the paper in a folder.'
-				'As you are leaving, you think, where will you get the money for the registration fee and if you can persuade someone to come here as a sub.'
-				act 'Leave':gt 'bdsm_mansion', 'start'
+				'"If you find a submissive and come together, then they can earn you tips. Alternatively if you want to change things up then you could visit as a sub, for that there is no need to have your monthly fee paid but you must be dressed as a maid or in submissive fetish wear. You would need to do the sub training with me too." She licks her lips as she says this.'
+				act 'Thanks but not my thing':
+					'"Of course, I am simply presenting the option"'
+					gs 'bdsm_mansion', 'in2'
+				end
+				act 'We''ll see':
+					'She smiles and her hand goes to her thigh, clearly she finds being a Dom arousing.'
+					'"Any time you want sub training you just let me know."'
+					gs 'bdsm_mansion', 'in2'
+				end
 			end
 		else
 			act 'Dominant (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -142,43 +153,50 @@ if $ARGS[0] = 'in':
 	end
 end
 
-if $ARGS[0] = 's_start':
-	*clr & cla
-	$menu_loc = 'bdsm_mansion'
-	$menu_arg = 's_start'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
-	'You enter the club and Mistress Elektra is sitting at her desk overseeing admissions.'
-	if money > 10000:
-		BDSMpayDay = daystart
-		BDSMday = daystart
-		money -= 10000
-		'You pay for another 30 days access to the club.'
-		act 'Enter the club':gt 'bdsm_hallway', 'foyer'
-	else
-		'You cannot afford the 10,000 rubes required to extend your club membership.'
-		act 'Leave':gt 'bdsm_mansion', 'start'
-	end
+if $ARGS[0] = 'in2':
+	'"Before you can enter the club there are rules and guidelines that even our Doms must follow, so you will have some orientation under the guidance of an experienced mistress." She points at herself, "The cost of this is covered by your registration fee. If you are satisfied, sign this document."'
+	'You sign the document. The man places the paper in a folder.'
+	'As you are leaving, you think, <<$OpenInnerThought>>"Where will I get the money for the registration fee and how can I persuade someone to come here as a sub."<<$CloseInnerThought>>'
+	act 'Leave':gt 'bdsm_mansion', 'start'
 end
 
-if $ARGS[0] = 'd_start':
+if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'bdsm_mansion'
-	$menu_arg = 'd_start'
+	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
-	'Elektra is sitting at the admissions desk and greets you informally.'
-	if money > 10000:
-		BDSMpayDay = daystart
-		BDSMday = daystart
-		money -= 10000
-		'You pay for another 30 days access to the club'
+	if week = 2 or week = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/anna.jpg"></center>'
+		'You enter the club and Anna is sitting at her desk overseeing admissions.'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
+		'You enter the club and Mistress Elektra is sitting at her desk overseeing admissions.'
+	end
+	if $BDSMrole = 's' or BDSMpayDay < daystart + 30:
 		act 'Enter the club':gt 'bdsm_hallway', 'foyer'
 	else
-		'You cannot afford the 10,000 rubes required to extend your club membership.'
 		act 'Leave':gt 'bdsm_mansion', 'start'
+		if money < 10000 and karta  > 10000:
+			'You cannot afford the 10,000 rubes required to extend your club membership.'
+		else
+			if money > 10000:
+				act 'Pay 10,000 <b>₽</b> to extend your membership and enter the club':
+					BDSMpayDay = daystart
+					BDSMday = daystart
+					money -= 10000
+					gt 'bdsm_hallway', 'foyer'
+				end
+			end
+			if karta > 10000:
+				act 'Pay 10,000 <b>₽</b> to extend your membership and enter the club':
+					BDSMpayDay = daystart
+					BDSMday = daystart
+					money -= 10000
+					gt 'bdsm_hallway', 'foyer'
+				end
+			end
+		end
 	end
 end
 
@@ -189,8 +207,13 @@ if $ARGS[0] = 'reception':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
-	'You go to the reception, Mistress Elektra is sitting at her desk looking a little bored.'
+	if week = 2 or week = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/anna.jpg"></center>'
+		'You go to the reception, Anna is sitting at her desk filling paperwork.'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
+		'You go to the reception, Mistress Elektra is sitting at her desk looking a little bored.'
+	end
 	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
 	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 end

+ 13 - 390
locations/bed.qsrc

@@ -1,400 +1,23 @@
 # bed
-if $ARGS[0] = 'start':
-	*clr & cla
-	menu_off = 1
-	shour = 24 - hour
-	gs 'stat'
+$sleep_loc = 'bed'
+menu_off = 1
 
-	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and $loc = 'nichBedroomServant':gt 'bed', 'rab'
-	if hour > 22 and rand(0, 200) = 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husband = 0:gt 'bed', 'vor'
+!! Prepare to lie down, move to events related to entering the bed.
 
-	gt 'bed2'
-end
-
-if $ARGS[0] = 'mast':
-	*clr & cla
+if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
-	if pcs_inhib < 30:inhib_exp += rand(1,3)
-	pcs_mood += 15
-	pcs_vag += 1
-
-	if husband > 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husbandrink ! 10:
-		if mc_inventory['dildo_small'] > 0:
-			if week > 5 or (week < 6 and hour > 16):
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m21.jpg"></center>'
-				'You bend over and start fucking your pussy with your dildo.'
-				gs 'arousal', 'vaginal_dildo', 15
-				gs 'stat'
-
-				if hour > 22 or hour < 7:'<<$husName>> looks at you, a little dumbfounded.'
-				if hour >= 7 and hour <= 22:'Once you get into it, <<$husName>> enters the room.'
-				if harakHusb = 0:
-					'"What are you doing?" he asks.'
-					'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
-					'"How often do you do this?" he asks.'
-					'"Quite often, sometimes in my ass. you want to see?" you ask.'
-					if izvratH = 0:
-						husband -= 1
-						'"I''ll wait outside the door until you''re done," he says and leaves. You continue to satisfy yourself rapidly, and soon finish.'
-						$orgasm_or = 'yes'
-						gs 'arousal', 'clit_finger', 5, 'masturbate'
-						gs 'arousal', 'end'
-						gs 'stat'
-
-						act 'Finish':gt 'bed', 'start'
-					elseif izvratH = 1:
-						'"Oh. I don''t know..." he stammers.'
-						'"Come on," you encourage him.'
-
-						act 'Show him':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
-							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as the dildo disappears into your ass.'
-							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
-							'"Can I join?" he asks, a little embarrassed.'
-							gs 'arousal', 'anal_dildo', 5, 'masturbate'
-							gs 'stat'
-
-							act 'Invite':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m23.jpg"></center>'
-								'<<$husName>> gets his dick out and starts masturbating. It''s not what you expected and you feel a little sad that he isn''t fucking you as you start to masturbate.'
-								'You watch your husband masturbate as he watches you, his face covered in pleasure, before you scream and fall on the table, having experienced an orgasm.'
-								'<<$husName>> is still masturbating, looking at you stretched out on the table before you take the dildo out of your ass and start lick it while looking into his eyes.'
-								'The spectacle has him immediately cum all over the floor before you walk over to him and kiss him on the lips. He passionately kisses you back.'
-								gs 'arousal', 'anal_dildo', 5, 'masturbate'
-								$orgasm_or = 'custom'
-								gs 'arousal', 'end'
-								gs 'stat'
-						
-								act 'Finish':gt 'bed', 'start'
-							end
-						end
-					end
-				elseif harakHusb = 1:
-					'"Are you trying to tell me that I''m not enough to satisfy you?" He asks.'
-					'"I''m sorry dear, but I really need this, and you''ve been busy," you reply without stopping.'
-					'"Well then, show me everything now that you know I''ll watch," he says.'
-					'"Want to see me do it in the ass too?" you offer.'
-
-					if izvratH = 0:
-						husband += 1
-						husbizvradd += 1
-						'"No, I think this is enough," he says as he sits on a chair and starts watching you. You continue to satisfy yourself rapidly and soon finish in front of him.'
-						$orgasm_or = 'yes'
-						gs 'arousal', 'clit_finger', 5, 'masturbate'
-						gs 'arousal', 'end'
-						gs 'stat'
-						'<<$husName>> stands up and playfully claps. "Bravo! Encore?" he laughs.'
-						'"Anything for such a lovely audience, but first an intermission," you laugh and <<$husName>> helps you down from the table.'
-
-						act 'Finish': gt 'bed', 'start'
-					elseif izvratH = 1:
-						husband += 1
-						'"Well then, I think you better show me," he says.'
-						'"As you wish," you reply.'
-
-						act 'Show':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
-							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as you slide the dildo in and out of your ass.'
-							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
-							'"I don''t just want something, I''ll do something!" he replies, unbuttoning his pants and brings his cock to your mouth.'
-							gs 'arousal', 'anal_dildo', 5
-							gs 'stat'
-
-							act 'Suck him':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
-								'You take his flaccid penis in your mouth and start sucking while continuing to drive the dildo into your ass.'
-								'When his cock has finally hardened, <<$husName>> stops you. "Now I''ll take this hole."'
-								gs 'arousal', 'clit_finger', 5
-								gs 'arousal', 'bj', -5
-								gs 'stat'
-						
-								act 'Get fucked in the ass':
-									picrand = 89
-									gt 'sex', 'anal'
-								end
-							end
-						end
-					elseif harakHusb = 2:
-						'"Itchy hole?" he asks.'
-						'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
-
-						if izvratH = 0:
-							husband += 1
-							husbizvradd += 1
-							'"You should have said something. Now open your mouth," he says while pulling out his cock and forcefully pushing it into your mouth.'
-							'He holds you by the hair and fucks your mouth, telling you not to stop masturbating before he tires of your mouth. "Enough of this rubber shit! I''m going to fuck you."'
-							gs 'arousal', 'vaginal_dildo', 10
-							gs 'arousal', 'bj', -10
-							gs 'stat'
-						
-							act 'Spread your legs ':
-								picrand = 89
-								gt 'sex', 'vag'
-							end
-						elseif izvratH = 1:
-							husband += 1
-							'"You''re going to insert this stupid toy into your pussy, ass and mouth. You''ll pulverize them for as long as I like," he says while sitting down to watch.'
-							'You quickly and submissively do as you''re told.'
-							gs 'arousal', 'vaginal_dildo', 5
-							gs 'arousal', 'anal_dildo', -5
-							gs 'stat'
-
-							act 'Offer your mouth':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
-								'Still using the dildo on your pussy and ass, you offer <<$husName>> your mouth. He gets up and walks over to you.'
-								'You take his flaccid penis and start sucking until his cock is finally hard and he stops you. "Now I''ll fuck your ass."'
-								gs 'arousal', 'vaginal_dildo', 5
-								gs 'arousal', 'anal_dildo', 5
-								gs 'arousal', 'bj', -10
-								gs 'stat'
-								
-								act 'Offer your ass':
-									picrand = 89
-									gt 'sex', 'anal'
-								end
-							end
-						end
-					end
-				end
-			else
-				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
-				'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
-				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
-				'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
-				$orgasm_or = 'custom'
-				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
-				gs 'arousal', 'end'
-				
-				act 'Breathe':gt 'bed', 'start'
-			end
-		elseif week > 5 or week < 6 and hour > 16:
-			'You feel the need for something inside you and think that your husband would be a better option.'
-		else
-			gt 'selfplay', 'start'
-		end
-	else
-		gt 'selfplay', 'start'
-	end
-end
-
-if $ARGS[0] = 'fin':
-	if STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0: gt 'bedr'
-	if $loc = 'uni_dorm': gt 'uni_dorm', 'dorm_room'
-	if $loc = 'nichBedroomServant': gt 'nichBedroomServant'
-end
-
-if $ARGS[0] = 'rab':
-	cla
-	*clr
-	menu_off = 1
-	minut += 120
-	houserabday = daystart
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r0.jpg"></center>'
-	'Once you get into bed, your mistress comes into the room. "What, my bitch is going to sleep?" she snaps from the doorway.'
-	'"Yes..." you meekly reply.'
-	'"Yes, who?" she continues.'
-	'"Yes, mistress..." you reply and sit on the bed. She''s drunk and barely able to stand on her feet as she drinks wine from the bottle, spilling quite a bit of it on the floor.'
-	'"That''s better, but today you have to be punished." She lifts up her skirt and out pops the strap-on. "Suck it," she commands.'
-
-	act 'Suck it':
-		*clr & cla
-		
-		if analplugIN = 1:analplugIN = 0
-		if pcs_makeup ! 1 and cosmetic_tattoo = 0:pcs_makeup = 0
-
-		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r1.jpg"></center>'
-		'You take the strap-on in your mouth and start sucking her off without much enthusiasm. Mistress, though she''s drunk, notices that you''re not trying and starts to thrust along with your movements, driving it deeper into your mouth and causing you to gag.'
-		'"Oh, damn stubborn bitch! Lie down on the bed. Quickly." She forcefully pushes you on the bed.'
-		gs 'arousal', 'bj', 5, 'sub', 'lesbian'
-		gs 'stat'
-		
-		act 'Lie down':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
-			'You lay down on the bed and she climbs on top of you and kneels over your face. She makes you open your mouth and forcefully shoves the strap-on in. You try to pull away, but her hands hold your head firmly. She continues to violate your mouth, hardly allowing you to catch a breath of air while she thrust it deeper and deeper, eventually sliding it down your throat, cutting off your breath completely. When you start to lose consciousness, she finally takes it out, allowing you to roll onto your side, wheezing and sniffling.'
-			'"And now for the punishment. Get up, bitch!" she demands.'
-			gs 'arousal', 'bj', 5, 'sub', 'lesbian', 'rough'
-			gs 'stat'
-		
-			act 'Get up':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r3.jpg"></center>'
-				'You get up on all fours on the bed. "You''re wet," she says and wipes your saliva on your ass with the strap-on, "You need to be punished, not pleasured. Spread your ass."'
-				'You reach back with your hands and try to relax your ass, but you don''t succeed before the pain pierces your body as she forces the strap-on into your anus, not giving your ass the time to get used to it before she starts fucking you at a crazy pace. You grab the blankets with your hands and teeth as tears pour from your eyes and you whine, but she still continues. Growing tired, she lowers the pace. "Well, does it hurt?" she asks.'
-				'"Yes mistress, it hurts a lot!" you gasp through your tears.'
-				'"Well, let''s see how this feels," she says and starts pouring wine from her bottle onto the strap-on and your ass.'
-				'"Thank you, mistress!" you say while she starts gaining momentum again. The wine starts to dry on your skin and hurts so much that you start screaming from the pain. After what feels like an eternity, she tires out, removes the strap-on and leaves the room without saying a word. You collapse on the bed and fall asleep.'
-				gs 'arousal', 'anal_strap', 5, 'sub', 'lesbian', 'rough'
-				gs 'arousal', 'end'
-				gs 'stat'
-		
-				act 'Sleep': gt 'bed2'
-			end
-		end
-	end
-
-	gs 'willpower', 'sex', 'resist', 'medium'
-	if will_cost <= pcs_willpwr:
-		act 'Refuse (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'pay', 'resist'
-			gs 'stat'
-			lesbian += 1
-			orgasm += 1
-			houserab = 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r4.jpg"></center>'
-			'"No!" you reply.'
-			'"You will suck now or things will get very bad for you!" she asserts.'
-			'"No!" you answer again.'
-			'"All right, you asked for it!" she screams and swings a fist, trying to hit you. You easily dodge the punch and kick her in the stomach.'
-			'"Bitch!" she moans while doubling over. You''ve suffered enough and jump out of bed, grabbing her head in your hands and kneeing her in the face.'
-			'She flies into the corner, but you don''t calm down. Remembering the taste of her dirty boots and sneakers, you storm up to her and start pushing a sneaker into her mouth.'
-			*nl
-			'When you can''t shove it in any further, you throw the sneaker aside, grab her hair and throw her onto the bed.'
-			'You jump on the bed, straddle her face and push your pussy against her mouth. "Eat me, bitch!" you yell as she tries to push you away.'
-			'You have her head held tight between your thighs, however, and continue yelling. You soon feel her tongue on your pussy and start moving your hips, grinding on her face and increasing the pace.'
-			'She doesn''t resist and tries to stick it in your pussy. You start enjoying her submissive nature and get more excited thinking about your dominant actions.'
-			'You''ve even thought about something to do with her strap-on and enjoying this thought when you orgasm. You wipe your crotch in her face and finish, leaving her whole face covered in your juices.'
-			*nl
-			'She quietly gets out of bed, straightens her clothes and leaves the room. "Animal." You should be careful; who knows what she will do to you in return.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'cuni', 20, 'dom', 'rough'
-			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Breathe': gt 'bed', 'start'
-		end
-	else
-		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-end
-
-if $ARGS[0] = 'vor':
-	*clr & cla
-	menu_off = 1
-	if rex['owned'] = 1:
-		if dog_bravery = 0:
-			dog_bravery = rand(1,100)
-		end
-
-		if dog_bravery >= 50:
-			minut += 10
-			'You''re lying in bed when you suddenly hear a commotion out in the hallway. You get up to check it out and as you arrive, you see <<$rex[''name'']>> chase two masked men outside. You can hear loud swearing as they run down the stairs.'
-			'You call your dog''s name and he comes back from the stairway looking calm.'
-
-			act 'Hug him':
-				cla
-				'You kneel down and hug <<$rex[''name'']>>, your heart pounding at the thought of what could have happened if he wasn''t here.'
-
-				act 'Check the lock':
-					cla
-					'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
-					act 'Lock the door': gt 'korr'
-				end
-			end
-
-			act 'Check the lock':
-				cla
-				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
-				act 'Lock the door': gt 'korr'
-			end
-		else
-			'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men. <<$rex[''name'']>> is shivering in the corner.'
-			act 'Scream': gt 'bed', 'vor2'
-		end
-	else
-		'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door, you see two masked men.'
-		act 'Scream': gt 'bed', 'vor2'
-	end
-end
-
-if $ARGS[0] = 'vor2':
-	menu_off = 1
-	minut += 60
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g0.jpg"></center>'
-	'You don''t even have time to open your mouth to scream when a knife is at your throat. "Scream and I''ll cut you, bitch!" one of them croaks.'
-	'They tie your hands and one goes to search your apartment while the second guards you. He sits down and studies you, then starts running his knife across your body.'
-	'"You scared?" he asks. Thinking that it''s better to keep silent, you say nothing and look at the floor. "So you <i>are</i> scared..."'
-	'He starts feeling you up and you try to pull away, but the knife is back at your throat. "Sit still or the knife might slip. Fatally..." he croaks and continues feeling you up.'
-	'The other intruder finally returns. "Time we got out of here," he says. "Unless we give this juicy little morsel a treat," he adds as he sits next to you.'
-
-	if pcs_apprnc >= 120:
-		guy += 2
-		rape += 1
-		'"Hey, sweet cheeks. Something tells me you like to fuck," the first one says.'
-
-		act 'Plead':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g1.jpg"></center>'
-			'You''re struck with fear. "Kneel down and open your mouth, whore. If we so much as feel a tooth, I''ll cut your throat from ear to ear!" the second one says while pulling his cock out.'
-			'You start pleading with them, but they just push you to your knees and he jabs his dick against your lips. You reluctantly open your mouth and his cock slides into your mouth.'
-			'His hands clench your head and he starts fucking your face before they start taking turns with you.'
-			'"Get her on all fours," one of them eventually commands.'
-			gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
-			gs 'stat'
-			
-			act 'Get up':
-				*clr & cla
-				orgasm += 1
-				gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
-				$boy[0] = $npclastgenerated
-				$boydesc[0] = $npc_usedname[$npclastgenerated]
-				gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
-				$boy[1] = $npclastgenerated
-				$boydesc[1] = $npc_usedname[$npclastgenerated]
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g2.jpg"></center>'
-				'You stand up and bend over as one of them stands behind you and stuffs his dick into your pussy.'
-				'"Open your mouth!" the second guy growls and he inserts his dick into your mouth. They proceed to rape you from both sides before they untie your hands and get off you. "Let''s see what she can do with her hands free," one of them says.'
-				$orgasm_or = 'yes'
-				gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
-				gs 'arousal', 'vaginal', 15, 'rough', 'sub', 'group', 'bound'
-				minut -= 15
-				gs 'stat'
-			
-				act 'Continue': picrand = 38 & xgt 'sexdvoe', 'var'
-			end
-		end
-	elseif pcs_apprnc < 120:
-		'"Gag her," one of them orders and the second one doesn''t argue as he takes some of your clothes and stuffs them in your mouth. "If you try to leave in the next half hour, you''re dead," he says and they leave.'
-		'You don''t wait half an hour before you start trying to break free. Fortunately, they really didn''t know how to tie a knot and you''re soon free.'
+	shour = 24 - hour
+	gs 'stat'
 
-		act 'Assess the damage': gt 'bed', 'vorend'
-	end
+	gs 'bed', 'mod_triggers'
+	gt 'bed_events', 'start'
 end
 
-if $ARGS[0] = 'vorend':
-	*clr & cla
-	menu_off = 1
-	if remsitr = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr.jpg"></center>'
-	if remsitr = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
-
-	'Relieved that it''s over, you check your apartment to see what''s missing.'
-
-	if stolmoney > 0:
-		'They took <<stolmoney>> <b>₽</b> from your living room table.'
-		stolmoney = 0
-	end
-
-	if money > 0:
-		'They took the <<money>> <b>₽</b> that you had on you.'
-		money = 0
-	end
-
-	if mc_inventory['tech_computer'] = 1:
-		'They took your computer.'
-		mc_inventory['tech_computer'] = 0
-	end
-
-	gs 'stat'
-	act 'Finish': gt 'sitr'
+if $ARGS[0] = 'mod_triggers':
+	!! This location is here to allow mods to hook into the system.
+	!! Either check for: if $sleep_loc = 'bed' and $$ARGS[0] = 'mod_triggers'
+	!!
+	!! This is NOT for events!!
 end
 
 --- bed ---------------------------------

+ 73 - 52
locations/bed2.qsrc

@@ -1,11 +1,18 @@
 # bed2
-!2020/10/14/Gwen
-if $ARGS[0] = '':
-	cla & *clr
+$sleep_loc = 'bed2'
+menu_off = 0
+
+!! Lying in bed hub. From here PC can take various actions, including going to sleep.
+!!
+!! Moved here from bed_events
+!! Going to sleep: move to pre_sleep_events
+
+if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
 	$menu_loc = 'bed2'
-	$menu_arg = ''
-	menu_off = 0
 	$alarmloc = 'bed2'
+	$menu_arg = 'start'
+	$alarmarg = 'start'
+
 	if clo_flag['bed'] = 1:
 		clo_flag['bed'] = 0
 		gs 'clothing', 'wear', $lastwornclothingtype['bed'], lastwornclothingnumber['bed']
@@ -13,78 +20,92 @@ if $ARGS[0] = '':
 		gs 'bras', 'wear', $lastwornbratype['bed'], lastwornbranumber['bed']
 	end
 	gs 'stat'
+
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	*nl
-	
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''bed2''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''bed2''">ON</a>.')
-	
+	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''start''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''start''">ON</a>.')
 	*nl
-	if hypnoPanty <= 0:
-		if bedPanty = 0:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:bedPanty = 1 & gs ''stat'' & & gt ''bed2''">AS IS</a>.'
-		elseif bedPanty = 1:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:bedPanty = 2 & gs ''stat'' & gt ''bed2''">YES</a>.'
-		elseif bedPanty = 2:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:bedPanty = 0 & gs ''stat'' & gt ''bed2''">NO</a>.'
-		end
-	end
+	gs 'bed2', 'wear_panties_decider'
 	*nl
+	gs 'bed2', 'wear_buttplug_decider'
+	gs 'bed2', 'wear_vibe_decider'
 
-	if mc_inventory['buttplug'] = 1 :
-		if bedAnal = 0:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:bedAnal = 1 & gs ''stat'' & gt ''bed2''">NO</a>.'
-		elseif bedAnal = 1:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:bedAnal = 0 & gs ''stat'' & gt ''bed2''">YES</a>.'
-		end
-	end
-
-	if mc_inventory['vibe'] = 1 and cheatVib = 1:
-		if bedVibrator = 0:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 1 & gs ''stat'' & gt ''bed2''">NO</a>.'
-		elseif bedVibrator = 1:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 0 & gs ''stat'' & gt ''bed2''">YES</a>.'
-		end
-	end
 
-	if pcs_makeup ! 1 and cosmetic_tattoo = 0:*nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
+	if pcs_makeup ! 1 and cosmetic_tattoo = 0: *nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
 
 	if pcs_sleep <= 80:
 		if $clothingworntype = 'nude':
-			$sleep_txt = 'Go to bed'
+			act 'Go to bed': gs 'shortgs', 'auto_save' & gt 'pre_sleep_events'
 		else
-			$sleep_txt = 'Undress and go to bed'
+			act 'Undress and go to bed': gs 'shortgs', 'auto_save' & gt 'pre_sleep_events'
 		end
-		gs 'sleep', 'full'
 	end
-	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $loc_arg
-	gs 'sleep', 'nap_bed'
+
+	act 'Get out of bed': gt 'bed_get_out', 'start'
+	gs 'sleep_simple', 'nap_bed'
 	gs 'events', 'read'
 
-	if $loc = 'bedrPar':
-		if locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
-			if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
-			if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
-				act 'Masturbate':
-					InSleep = 0
-					gt 'selfplay', 'start'
-				end
-			end
-		end
-	else
-		if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
-		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
+	if $loc ! 'bedrPar' or locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
+		if mc_inventory['mag_porn'] > 0: gs 'events', 'read_porn'
+		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and (fame['pav_slut'] >= 150 or (fame['pav_slut'] >= 50 and pcs_inhib >= 60))):
 			act 'Masturbate':
 				InSleep = 0
 				gt 'selfplay', 'start'
 			end
 		end
 	end
+
+	gs 'bed2', 'mod_triggers'
 end
 
+if $ARGS[0] = 'mod_triggers':
+	!! This location is here to allow mods to hook into the system.
+	!! Either check for: if $sleep_loc = 'bed2' and $ARGS[0] = 'mod_triggers'
+	!!
+	!! This is NOT for events!!
+end
 
---- bed2 ---------------------------------
 
+if $ARGS[0] = 'wear_panties_decider':
+	if hypnoPanty <= 0:
+		if sleepVars['bedPanty'] = 0:
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">AS IS</a>.'
+		elseif sleepVars['bedPanty'] = 1:
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
+		elseif sleepVars['bedPanty'] = 2:
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
+		end
+	end
+end
+
+if $ARGS[0] = 'wear_buttplug_decider':
+	if mc_inventory['buttplug'] = 1:
+		if sleepVars['bedAnal'] = 0:
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
+		elseif sleepVars['bedAnal'] = 1:
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
+		end
+	end
+end
+
+if $ARGS[0] = 'wear_vibe_decider':
+	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
+		if sleepVars['bedVibrator'] = 0:
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
+		elseif sleepVars['bedVibrator'] = 1:
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
+		end
+	end
+end
+
+if $ARGS[0] = 'fin':
+	if strpos('bedr,bedr2x,korr,korr2x',$loc) > 0: gt 'bedr'
+	if $loc = 'uni_dorm': gt 'uni_dorm', 'dorm_room'
+	if $loc = 'nichBedroomServant': gt 'nichBedroomServant'
+end
+
+--- bed2 ---------------------------------

+ 532 - 0
locations/bed_events.qsrc

@@ -0,0 +1,532 @@
+# bed_events
+$sleep_loc = 'bed_events'
+menu_off = 1
+
+!! Bed events trigger after going to lie down on the bed, but before actually lying down in bed (and getting to choose to sleep, get out, read a book, etc)
+!!
+!! Moved here from bed.
+!! When done, move to bed2
+
+	!!=====================================!!
+	!!                                     !!
+	!!          Event handlers             !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	menu_off = 1
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+
+	if sleepVars['events_active'] = 1:
+		sleepVars['events_done'] = 0
+
+		if (hour > 22 or hour < 3) and rand(0, 50) = 0 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and $loc = 'nichBedroomServant':
+			$sleep_events[] = 'gs ''bed_events'', ''rab'' '
+		end
+		if (hour > 22 or hour < 3) and rand(0, 200) = 0 and strpos('bedr,bedr2x,korr,korr2x',$loc) > 0 and husband = 0:
+			$sleep_events[] = 'gs ''bed_events'', ''vor'' '
+		end
+
+		gt 'bed_events', 'mod_events'
+	end
+
+	gt 'bed_events', 'continue'
+end
+
+if $ARGS[0] = 'mod_events':
+	!! This location is here to allow mods to hook into the system.
+	!! Either check for: if $sleep_loc = 'bed_events' and $ARGS[0] = 'mod_events'
+	!!
+	!! You can add events as: $sleep_events[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!! A random event will be chosen from amongst the added ones.
+	!! If an event MUST trigger (due to quest timing), add it tp $sleep_events_priority[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!!
+	!! If the event does not break the sleep cycle (merely interupts it) it needs to end with gs 'bed_events', 'event_end'
+	!! If the event removed Sveta from her location (aka her sleep is cut short and/or she leaves her bed), you must call gs 'bed_events', 'exit' before exiting the location
+	!!     Example: Act: 'Leave': gs 'bed_events', 'exit' & gt $new_loc, $new_log_arg
+	!!
+	!! This is to cleanup all necessary variables.
+	!!
+	!! DO NOT DIRECTLY GOTO/GOSUB OUTOF THIS LOCATION. ALWAYS ADD IT TO THE QUEUEs!!!!
+	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
+
+	gt 'bed_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'event_handler':
+	if sleepVars['events_done'] < 1:
+		if arrsize('$sleep_events_priority') > 0:
+			gt 'bed_events', 'event_handler2', 'priority'
+		elseif arrsize('$sleep_events') > 0:
+			gt 'bed_events', 'event_handler2'
+		end
+	end
+
+	gt 'bed_events', 'continue'
+end
+
+if $ARGS[0] = 'event_handler2':
+	sleepVars['events_done'] += 1
+	
+	if $ARGS[1] = 'priority':
+		temp_slev_id = rand(0, arrsize('$sleep_events_priority')-1)
+		$temp_sleep_event_chosen = $sleep_events_priority[temp_slev_id]
+		killvar '$sleep_events_priority', temp_slev_id
+	else
+		temp_slev_id = rand(0, arrsize('$sleep_events')-1)
+		$temp_sleep_event_chosen = $sleep_events[temp_slev_id]
+		killvar '$sleep_events', temp_slev_id
+	end
+
+	killvar 'temp_slev_id'
+	dynamic $temp_sleep_event_chosen
+end
+
+
+if $ARGS[0] = 'event_end':
+
+!!	if arrsize('$sleep_events_priority') > 0:
+!!		gt 'bed_events', 'event_handler2', 'priority'
+!!	end
+
+	gt 'bed_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'exit':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+end
+
+if $ARGS[0] = 'continue':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+
+	gt 'bed2', 'start'
+end
+
+
+
+
+	!!=====================================!!
+	!!                                     !!
+	!!              Events                 !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'rab':
+	menu_off = 1
+	minut += 120
+	houserabday = daystart
+
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r0.jpg"></center>'
+	'Once you get into bed, your mistress comes into the room. "What, my bitch is going to sleep?" she snaps from the doorway.'
+	'"Yes..." you meekly reply.'
+	'"Yes, who?" she continues.'
+	'"Yes, mistress..." you reply and sit on the bed. She''s drunk and barely able to stand on her feet as she drinks wine from the bottle, spilling quite a bit of it on the floor.'
+	'"That''s better, but today you have to be punished." She lifts up her skirt and out pops the strap-on. "Suck it," she commands.'
+
+	act 'Suck it':
+		*clr & cla
+
+		if analplugIN = 1: analplugIN = 0
+		if pcs_makeup ! 1 and cosmetic_tattoo = 0: pcs_makeup = 0
+
+		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r1.jpg"></center>'
+		'You take the strap-on in your mouth and start sucking her off without much enthusiasm. Mistress, though she''s drunk, notices that you''re not trying and starts to thrust along with your movements, driving it deeper into your mouth and causing you to gag.'
+		'"Oh, damn stubborn bitch! Lie down on the bed. Quickly." She forcefully pushes you on the bed.'
+
+		gs 'arousal', 'bj', 5, 'sub', 'lesbian'
+		gs 'stat'
+		
+		act 'Lie down':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
+			'You lay down on the bed and she climbs on top of you and kneels over your face. She makes you open your mouth and forcefully shoves the strap-on in. You try to pull away, but her hands hold your head firmly. She continues to violate your mouth, hardly allowing you to catch a breath of air while she thrust it deeper and deeper, eventually sliding it down your throat, cutting off your breath completely. When you start to lose consciousness, she finally takes it out, allowing you to roll onto your side, wheezing and sniffling.'
+			'"And now for the punishment. Get up, bitch!" she demands.'
+
+			gs 'arousal', 'bj', 5, 'sub', 'lesbian', 'rough'
+			gs 'stat'
+		
+			act 'Get up':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r3.jpg"></center>'
+				'You get up on all fours on the bed. "You''re wet," she says and wipes your saliva on your ass with the strap-on, "You need to be punished, not pleasured. Spread your ass."'
+				'You reach back with your hands and try to relax your ass, but you don''t succeed before the pain pierces your body as she forces the strap-on into your anus, not giving your ass the time to get used to it before she starts fucking you at a crazy pace. You grab the blankets with your hands and teeth as tears pour from your eyes and you whine, but she still continues. Growing tired, she lowers the pace. "Well, does it hurt?" she asks.'
+				'"Yes mistress, it hurts a lot!" you gasp through your tears.'
+				'"Well, let''s see how this feels," she says and starts pouring wine from her bottle onto the strap-on and your ass.'
+				'"Thank you, mistress!" you say while she starts gaining momentum again. The wine starts to dry on your skin and hurts so much that you start screaming from the pain. After what feels like an eternity, she tires out, removes the strap-on and leaves the room without saying a word. You collapse on the bed and fall asleep.'
+
+				gs 'arousal', 'anal_strap', 5, 'sub', 'lesbian', 'rough'
+				gs 'arousal', 'end'
+				gs 'stat'
+
+				act 'Sleep': gs 'bed_events', 'event_end'
+			end
+		end
+	end
+
+	gs 'willpower', 'sex', 'resist', 'medium'
+	if pcs_willpwr < will_cost:
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	else
+		act 'Refuse (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			lesbian += 1
+			orgasm += 1
+			houserab = 2
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r4.jpg"></center>'
+			'"No!" you reply.'
+			'"You will suck now or things will get very bad for you!" she asserts.'
+			'"No!" you answer again.'
+			'"All right, you asked for it!" she screams and swings a fist, trying to hit you. You easily dodge the punch and kick her in the stomach.'
+			'"Bitch!" she moans while doubling over. You''ve suffered enough and jump out of bed, grabbing her head in your hands and kneeing her in the face.'
+			'She flies into the corner, but you don''t calm down. Remembering the taste of her dirty boots and sneakers, you storm up to her and start pushing a sneaker into her mouth.'
+			*nl
+			'When you can''t shove it in any further, you throw the sneaker aside, grab her hair and throw her onto the bed.'
+			'You jump on the bed, straddle her face and push your pussy against her mouth. "Eat me, bitch!" you yell as she tries to push you away.'
+			'You have her head held tight between your thighs, however, and continue yelling. You soon feel her tongue on your pussy and start moving your hips, grinding on her face and increasing the pace.'
+			'She doesn''t resist and tries to stick it in your pussy. You start enjoying her submissive nature and get more excited thinking about your dominant actions.'
+			'You''ve even thought about something to do with her strap-on and enjoying this thought when you orgasm. You wipe your crotch in her face and finish, leaving her whole face covered in your juices.'
+			*nl
+			'She quietly gets out of bed, straightens her clothes and leaves the room. "Animal." You should be careful; who knows what she will do to you in return.'
+
+			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 20, 'dom', 'rough'
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			act 'Breathe': gs 'bed_events', 'event_end'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'vor':
+	menu_off = 1
+	if rex['owned'] = 0:
+		'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door, you see two masked men.'
+		act 'Scream': gt 'bed_events', 'vor2'
+
+	else
+		if dog_bravery = 0: 
+			dog_bravery = rand(1,100)
+		end
+
+		if dog_bravery < 50:
+			'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men. <<$rex[''name'']>> is shivering in the corner.'
+			act 'Scream': gt 'bed_events', 'vor2'
+		else
+			minut += 10
+			'You''re lying in bed when you suddenly hear a commotion out in the hallway. You get up to check it out and as you arrive, you see <<$rex[''name'']>> chase two masked men outside. You can hear loud swearing as they run down the stairs.'
+			'You call your dog''s name and he comes back from the stairway looking calm.'
+
+			act 'Hug him':
+				'You kneel down and hug <<$rex[''name'']>>, your heart pounding at the thought of what could have happened if he wasn''t here.'
+				delact 'Hug him'
+			end
+
+			act 'Check the lock':
+				cla
+				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
+				act 'Lock the door': 
+					gs 'bed_events', 'exit'
+					gt 'korr'
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'vor2':
+	menu_off = 1
+	minut += 60
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g0.jpg"></center>'
+	'You don''t even have time to open your mouth to scream when a knife is at your throat. "Scream and I''ll cut you, bitch!" one of them croaks.'
+	'They tie your hands and one goes to search your apartment while the second guards you. He sits down and studies you, then starts running his knife across your body.'
+	'"You scared?" he asks. Thinking that it''s better to keep silent, you say nothing and look at the floor. "So you <i>are</i> scared..."'
+	'He starts feeling you up and you try to pull away, but the knife is back at your throat. "Sit still or the knife might slip. Fatally..." he croaks and continues feeling you up.'
+	'The other intruder finally returns. "Time we got out of here," he says. "Unless we give this juicy little morsel a treat," he adds as he sits next to you.'
+
+	if pcs_apprnc < 120:
+		'"Gag her," one of them orders and the second one doesn''t argue as he takes some of your clothes and stuffs them in your mouth. "If you try to leave in the next half hour, you''re dead," he says and they leave.'
+		'You don''t wait half an hour before you start trying to break free. Fortunately, they really didn''t know how to tie a knot and you''re soon free.'
+
+		act 'Assess the damage': gt 'bed_events', 'vorend'
+
+	else
+		guy += 2
+		rape += 1
+		'"Hey, sweet cheeks. Something tells me you like to fuck," the first one says.'
+
+		act 'Plead':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g1.jpg"></center>'
+			'You''re struck with fear. "Kneel down and open your mouth, whore. If we so much as feel a tooth, I''ll cut your throat from ear to ear!" the second one says while pulling his cock out.'
+			'You start pleading with them, but they just push you to your knees and he jabs his dick against your lips. You reluctantly open your mouth and his cock slides into your mouth.'
+			'His hands clench your head and he starts fucking your face before they start taking turns with you.'
+			'"Get her on all fours," one of them eventually commands.'
+
+			gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
+			gs 'stat'
+			
+			act 'Get up':
+				*clr & cla
+				orgasm += 1
+				gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
+				$boy[0] = $npclastgenerated
+				$boydesc[0] = $npc_usedname[$npclastgenerated]
+
+				gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
+				$boy[1] = $npclastgenerated
+				$boydesc[1] = $npc_usedname[$npclastgenerated]
+
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g2.jpg"></center>'
+				'You stand up and bend over as one of them stands behind you and stuffs his dick into your pussy.'
+				'"Open your mouth!" the second guy growls and he inserts his dick into your mouth. They proceed to rape you from both sides before they untie your hands and get off you. "Let''s see what she can do with her hands free," one of them says.'
+
+				$orgasm_or = 'yes'
+				gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
+				gs 'arousal', 'vaginal', 15, 'rough', 'sub', 'group', 'bound'
+				minut -= 15
+				gs 'stat'
+			
+				act 'Continue': 
+					picrand = 38
+					gs 'bed_events', 'exit'
+					xgt 'sexdvoe', 'var'
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'vorend':
+	*clr & cla
+	menu_off = 1
+	if remsitr = 0: '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr.jpg"></center>'
+	if remsitr = 1: '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
+
+	'Relieved that it''s over, you check your apartment to see what''s missing.'
+
+	if stolmoney > 0:
+		'They took <<stolmoney>> <b>₽</b> from your living room table.'
+		stolmoney = 0
+	end
+
+	if money > 0:
+		'They took the <<money>> <b>₽</b> that you had on you.'
+		money = 0
+	end
+
+	if mc_inventory['tech_computer'] = 1:
+		'They took your computer.'
+		mc_inventory['tech_computer'] = 0
+	end
+
+	gs 'stat'
+	act 'Finish': gs 'bed_events', 'event_end'
+end
+
+
+if $ARGS[0] = 'mast':
+	menu_off = 1
+	if pcs_inhib < 30: inhib_exp += rand(1,3)
+	pcs_mood += 15
+	pcs_vag += 1
+
+	if husband = 0 or strpos('bedr,bedr2x,korr,korr2x',$loc) <= 0 or husbandrink = 10:
+		gt 'selfplay', 'start'
+	else
+		if mc_inventory['dildo_small'] = 0:
+			if week > 5 or week < 6 and hour > 16:
+				'You feel the need for something inside you and think that your husband would be a better option.'
+			else
+				gt 'selfplay', 'start'
+			end
+		else
+			if week <= 5 and hour <= 15:
+				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
+				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+				'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+				'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
+				$orgasm_or = 'custom'
+				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
+				gs 'arousal', 'end'
+				
+				act 'Breathe': gs 'bed_events', 'event_end'
+
+			else
+				'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m21.jpg"></center>'
+				'You bend over and start fucking your pussy with your dildo.'
+				gs 'arousal', 'vaginal_dildo', 15
+				gs 'stat'
+
+				if hour > 22 or hour < 7:'<<$husName>> looks at you, a little dumbfounded.'
+				if hour >= 7 and hour <= 22:'Once you get into it, <<$husName>> enters the room.'
+				if harakHusb = 0:
+					'"What are you doing?" he asks.'
+					'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
+					'"How often do you do this?" he asks.'
+					'"Quite often, sometimes in my ass. you want to see?" you ask.'
+					if izvratH = 0:
+						husband -= 1
+						'"I''ll wait outside the door until you''re done," he says and leaves. You continue to satisfy yourself rapidly, and soon finish.'
+						$orgasm_or = 'yes'
+						gs 'arousal', 'clit_finger', 5, 'masturbate'
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Finish': gs 'bed_events', 'event_end'
+
+					elseif izvratH = 1:
+						'"Oh. I don''t know..." he stammers.'
+						'"Come on," you encourage him.'
+
+						act 'Show him':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
+							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as the dildo disappears into your ass.'
+							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
+							'"Can I join?" he asks, a little embarrassed.'
+							gs 'arousal', 'anal_dildo', 5, 'masturbate'
+							gs 'stat'
+
+							act 'Invite':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m23.jpg"></center>'
+								'<<$husName>> gets his dick out and starts masturbating. It''s not what you expected and you feel a little sad that he isn''t fucking you as you start to masturbate.'
+								'You watch your husband masturbate as he watches you, his face covered in pleasure, before you scream and fall on the table, having experienced an orgasm.'
+								'<<$husName>> is still masturbating, looking at you stretched out on the table before you take the dildo out of your ass and start lick it while looking into his eyes.'
+								'The spectacle has him immediately cum all over the floor before you walk over to him and kiss him on the lips. He passionately kisses you back.'
+								gs 'arousal', 'anal_dildo', 5, 'masturbate'
+								$orgasm_or = 'custom'
+								gs 'arousal', 'end'
+								gs 'stat'
+						
+								act 'Finish': gs 'bed_events', 'event_end'
+							end
+						end
+					end
+
+				elseif harakHusb = 1:
+					'"Are you trying to tell me that I''m not enough to satisfy you?" He asks.'
+					'"I''m sorry dear, but I really need this, and you''ve been busy," you reply without stopping.'
+					'"Well then, show me everything now that you know I''ll watch," he says.'
+					'"Want to see me do it in the ass too?" you offer.'
+
+					if izvratH = 0:
+						husband += 1
+						husbizvradd += 1
+						'"No, I think this is enough," he says as he sits on a chair and starts watching you. You continue to satisfy yourself rapidly and soon finish in front of him.'
+						$orgasm_or = 'yes'
+						gs 'arousal', 'clit_finger', 5, 'masturbate'
+						gs 'arousal', 'end'
+						gs 'stat'
+						'<<$husName>> stands up and playfully claps. "Bravo! Encore?" he laughs.'
+						'"Anything for such a lovely audience, but first an intermission," you laugh and <<$husName>> helps you down from the table.'
+
+						act 'Finish': gs 'bed_events', 'event_end'
+
+					elseif izvratH = 1:
+						husband += 1
+						'"Well then, I think you better show me," he says.'
+						'"As you wish," you reply.'
+
+						act 'Show':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
+							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as you slide the dildo in and out of your ass.'
+							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
+							'"I don''t just want something, I''ll do something!" he replies, unbuttoning his pants and brings his cock to your mouth.'
+							gs 'arousal', 'anal_dildo', 5
+							gs 'stat'
+
+							act 'Suck him':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
+								'You take his flaccid penis in your mouth and start sucking while continuing to drive the dildo into your ass.'
+								'When his cock has finally hardened, <<$husName>> stops you. "Now I''ll take this hole."'
+								gs 'arousal', 'clit_finger', 5
+								gs 'arousal', 'bj', -5
+								gs 'stat'
+
+								act 'Get fucked in the ass':
+									picrand = 89
+									gs 'bed_events', 'exit'
+									gt 'sex', 'anal'
+								end
+							end
+						end
+
+					else
+						'"Itchy hole?" he asks.'
+						'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
+
+						if izvratH = 0:
+							husband += 1
+							husbizvradd += 1
+							'"You should have said something. Now open your mouth," he says while pulling out his cock and forcefully pushing it into your mouth.'
+							'He holds you by the hair and fucks your mouth, telling you not to stop masturbating before he tires of your mouth. "Enough of this rubber shit! I''m going to fuck you."'
+							gs 'arousal', 'vaginal_dildo', 10
+							gs 'arousal', 'bj', -10
+							gs 'stat'
+						
+							act 'Spread your legs ':
+								picrand = 89
+								gs 'bed_events', 'exit'
+								gt 'sex', 'vag'
+							end
+
+						else
+							husband += 1
+							'"You''re going to insert this stupid toy into your pussy, ass and mouth. You''ll pulverize them for as long as I like," he says while sitting down to watch.'
+							'You quickly and submissively do as you''re told.'
+							gs 'arousal', 'vaginal_dildo', 5
+							gs 'arousal', 'anal_dildo', -5
+							gs 'stat'
+
+							act 'Offer your mouth':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
+								'Still using the dildo on your pussy and ass, you offer <<$husName>> your mouth. He gets up and walks over to you.'
+								'You take his flaccid penis and start sucking until his cock is finally hard and he stops you. "Now I''ll fuck your ass."'
+								gs 'arousal', 'vaginal_dildo', 5
+								gs 'arousal', 'anal_dildo', 5
+								gs 'arousal', 'bj', -10
+								gs 'stat'
+								
+								act 'Offer your ass':
+									picrand = 89
+									gs 'bed_events', 'exit'
+									gt 'sex', 'anal'
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+--- bed_events ---------------------------------

+ 41 - 0
locations/bed_get_out.qsrc

@@ -0,0 +1,41 @@
+# bed_get_out
+$sleep_loc = 'bed_get_out'
+menu_off = 1
+
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	minut -= 1
+	InSleep = 0
+	slept_in = 0
+	strip_here = 0
+	SleepHorny = 0
+	!! to fudge the first hour wake up sleep loss.
+
+	gs 'bed_get_out', 'mod_triggers'
+
+	xgt 'bed_get_out_events', 'start'
+end
+
+if $ARGS[0] = 'mod_triggers':
+	!! This location is here to allow mods to hook into the system.
+	!! Check for: if $sleep_loc = 'bed_get_out' and $ARGS[0] = 'mod_triggers'
+	!!
+	!! This is NOT for events!!
+end
+
+
+if $ARGS[0] = 'end':
+	menu_off = 0
+	killvar '$sleep_loc'
+	if fullmorrout = 1:
+		if $loc = 'bedrPar':
+			gt 'vanrPar'
+		elseif $loc = 'bedr':
+			gt 'vanr'
+		end
+	end
+
+	gt $loc, $loc_arg
+end
+
+--- bed_get_out ---------------------------------

+ 134 - 0
locations/bed_get_out_events.qsrc

@@ -0,0 +1,134 @@
+# bed_get_out_events
+$sleep_loc = 'bed_get_out_events'
+menu_off = 1
+
+!! wakeup events trigger during when waking up
+!!
+!! Moved here from wakeup
+!! When done: Move to bed2
+
+	!!=====================================!!
+	!!                                     !!
+	!!          Event handlers             !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	menu_off = 1
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+
+	if sleepVars['events_active'] = 1:
+		sleepVars['events_done'] = 0
+		
+		if vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
+			$sleep_events[] = 'gt ''bed_get_out_events'', ''vomit'' '
+		end
+
+		xgt 'bed_get_out_events', 'mod_events'
+	end
+	
+	xgt 'bed_get_out_events', 'continue'
+end
+
+if $ARGS[0] = 'mod_events':
+	!! This location is here to allow mods to hook into the system.
+	!! Either check for: if $sleep_loc = 'bed_get_out_events' and $ARGS[0] = 'mod_events'
+	!!
+	!! You can add events as: $sleep_events[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!! A random event will be chosen from amongst the added ones.
+	!! If an event MUST trigger (due to quest timing), add it tp $sleep_events_priority[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!!
+	!! If the event does not break the sleep cycle (merely interupts it) it needs to end with gs 'bed_get_out_events', 'event_end'
+	!! If the event removed Sveta from her location (aka her sleep is cut short and/or she leaves her bed), you must call gs 'bed_get_out_events', 'exit'
+	!!
+	!! This is to cleanup all necessary variables.
+	!!
+	!! DO NOT DIRECTLY GOTO/GOSUB OUTOF THIS LOCATION. ALWAYS ADD IT TO THE QUEUEs!!!!
+	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
+
+	xgt 'bed_get_out_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'event_handler':
+	if sleepVars['events_done'] < 1:
+		if arrsize('$sleep_events_priority') > 0:
+			xgt 'bed_get_out_events', 'event_handler2', 'priority'
+		elseif arrsize('$sleep_events') > 0:
+			xgt 'bed_get_out_events', 'event_handler2'
+		end
+	end
+
+	gs 'bed_get_out_events', 'continue'
+end
+
+if $ARGS[0] = 'event_handler2':
+	sleepVars['events_done'] += 1
+
+	if $ARGS[1] = 'priority':
+		temp_slev_id = rand(0, arrsize('$sleep_events_priority')-1)
+		$temp_sleep_event_chosen = $sleep_events_priority[temp_slev_id]
+		killvar '$sleep_events_priority', temp_slev_id
+	else
+		temp_slev_id = rand(0, arrsize('$sleep_events')-1)
+		$temp_sleep_event_chosen = $sleep_events[temp_slev_id]
+		killvar '$sleep_events', temp_slev_id
+	end
+
+	killvar 'temp_slev_id'
+	dynamic $temp_sleep_event_chosen
+end
+
+
+if $ARGS[0] = 'event_end':
+	killvar '$temp_sleep_event_chosen'
+
+!!	if arrsize('$sleep_events_priority') > 0:
+!!		xgt 'bed_get_out_events', 'event_handler2', 'priority'
+!!	end
+
+	xgt 'bed_get_out_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'exit':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+end
+
+if $ARGS[0] = 'continue':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+
+	xgt 'bed_get_out', 'end'
+end
+
+
+
+
+	!!=====================================!!
+	!!                                     !!
+	!!              Events                 !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'vomit':
+	gs 'bed_get_out_events', 'exit'
+
+	gt 'home_activity', 'vomiting_exit'
+end
+
+
+
+--- bed_get_out_events ---------------------------------

+ 5 - 4
locations/bedr.qsrc

@@ -17,7 +17,8 @@ if rembedr = 0:
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
 	
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+
 	*nl
 	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. The windows are closed with faded, heavy curtains.'
 else
@@ -25,10 +26,10 @@ else
 	*nl
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
-	if budilnikOn = 0:
-		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
+	if alarmOn = 0:
+		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 1 & gt ''<<$loc>>''">off</a>.'
 	else
-		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
+		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. Against the wall stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'

+ 1 - 1
locations/bedr2x.qsrc

@@ -22,7 +22,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
-'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl

+ 3 - 3
locations/bedrPar.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
-			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(mc_inventory['strapon'] = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''start''">desk</a> is next to it'+iif(mc_inventory['strapon'] = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
 		else
 			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
 		end
@@ -136,7 +136,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 
 		if $home['current'] = 'parents_home':
-			'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+			'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 
 			if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
@@ -362,7 +362,7 @@ if $ARGS[0] = 'intro':
 						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" she says before she storms out of the room without giving you a chance to respond.'
-						act 'I understand...':gt 'budilnik', 'start'
+						act 'I understand...':gt 'alarmclock', 'start'
 					end
 				end
 			end

+ 1 - 1
locations/bedrPar2.qsrc

@@ -115,7 +115,7 @@ end
 if $ARGS[0] = 'momtoy_play':
 	*clr & cla
 	menu_off = 1
-	dildo = 1
+	mc_inventory['dildo_small'] = 1
 	dildohand = 10
 	selfmomtoyplay = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'

+ 7 - 4
locations/begin.qsrc

@@ -3,10 +3,13 @@
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
 	$loc = 'begin'
-	timerEnd = 8
-	timerEndM = 0
-	timer = 6
-	timerM = 30
+	alarmVars['timerEndH'] = 8
+	alarmVars['timerEndM'] = 0
+	alarmVars['timerH'] = 6
+	alarmVars['timerM'] = 30
+	sleepVars['events_active'] = 1
+	sleepVars['dreams_active'] = 1
+
 	settingmode = 0
 	$checkimg = {
 		if $ARGS[0]=$ARGS[1]:

+ 4 - 3
locations/booty_call.qsrc

@@ -21,13 +21,14 @@ if $ARGS[0] = 'scheduler2':
 			if npc_sugar_daddy_timer[$FuckBuddy[i]] - (npc_rel[$FuckBuddy[i]] / 10) > daystart:
 				npc_no_booty_call[$FuckBuddy[i]] = daystart
 				
-			elseif npc_booty_call_date[$FuckBuddy[i]] ! daystart and (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call_date[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
+			elseif (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 				sugar_daddy_call[$FuckBuddy[i]] = 1
 				gs 'booty_call', 'scheduler3'
-				
+			else
+				npc_no_booty_call[$FuckBuddy[i]] = daystart
 			end
 		else
-			if npc_booty_call_date[$FuckBuddy[i]] ! daystart and (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call_date[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
+			if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 				gs 'booty_call', 'scheduler3'
 			else
 				npc_no_booty_call[$FuckBuddy[i]] = daystart

+ 1 - 1
locations/booty_call_sms.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'sugar_daddy_booty_call':
 	$VF['1a'] = 'what were you thinking about?'
 	
 	!! boy response 1 option 1
-	if ($home['current'] = 'parents_home' or $home['current'] = 'meynold_household' or $home['current'] = 'shared_apartment') and npc_residence[$ARGS[1]] >= 3:
+	if ($home['current'] ! 'city_apartment' and $home['current'] ! 'niko_apartment' and $home['current'] ! 'university_dorm' and $home['current'] ! 'city_house' and $home['current'] ! 'maid_bedroom') and npc_residence[$ARGS[1]] >= 3:
 		$VM['2a'] = 'i booked a hotel room in Pav. why dont you come by?'
 	else
 		$VM['2a'] = 'i want to see you. why dont you come by my apartment?'

+ 95 - 0
locations/boy_updater.qsrc

@@ -87,4 +87,99 @@ if $ARGS[0] = 'humor_update':
 	end
 end
 
+
+if $ARGS[0] = 'schedule_update':
+	if npc_start_free_time[$boy] = 0:
+		if npc_finance[$boy] = 0:
+			if rand(1,3) = 1:
+				npc_start_free_time[$boy] = 8
+				npc_end_free_time[$boy] = 12
+				
+				npc_work_start[$boy] = 13
+				npc_work_end[$boy] = 21
+				
+			elseif rand(1,2) = 1:
+				npc_start_free_time[$boy] = 15
+				npc_end_free_time[$boy] = 20
+				
+				npc_work_start[$boy] = 6
+				npc_work_end[$boy] = 14
+			else
+				npc_start_free_time[$boy] = 18
+				npc_end_free_time[$boy] = 22
+				
+				npc_work_start[$boy] = 9
+				npc_work_end[$boy] = 17
+			end
+			npc_day_off[$boy] = rand(1,7)
+		elseif npc_finance[$boy] = 1:
+			if rand(1,2) = 1:
+				npc_start_free_time[$boy] = 8
+				npc_end_free_time[$boy] = 12
+				
+				npc_work_start[$boy] = 13
+				npc_work_end[$boy] = 21
+			else
+				npc_start_free_time[$boy] = 18
+				npc_end_free_time[$boy] = 22
+				
+				npc_work_start[$boy] = 9
+				npc_work_end[$boy] = 17
+			end
+		elseif npc_finance[$boy] = 2:
+			if rand(1,2) = 1:
+				npc_start_free_time[$boy] = 8
+				npc_end_free_time[$boy] = 12
+				
+				npc_work_start[$boy] = 13
+				npc_work_end[$boy] = 21
+			else
+				npc_start_free_time[$boy] = 18
+				npc_end_free_time[$boy] = 22
+				
+				npc_work_start[$boy] = 9
+				npc_work_end[$boy] = 17
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'unique_NPC_stat_seed':
+	if $boy = 'A11':
+		
+	end
+end
+
+
+if $ARGS[0] = 'vasily_seed':
+	if npc_sex_ev_seeded['A11'] ! 1:
+		npc_sex_ev_seeded['A11'] = 1
+		$npc_rel_type['A11'] = 'fuckbuddy'
+		$npc_apt_bedroom['A11'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vasily_room.jpg"></center>'
+		$npc_apt_kitchen['A11'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh.jpg"></center>'
+		$npc_apt_livingroom['A11'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom.jpg"></center>'
+		$npc_apt_bathroom['A11'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna.jpg"></center>'
+		$npc_apt_hall['A11'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/korr.jpg"></center>'
+		$npc_humor['A11'] = 'perverted'
+		npc_smoker['A11'] = 2
+		npc_latesleeper['A11'] = 1
+		npc_risktaker['A11'] = 1
+		npc_messy['A11'] = 1
+		npc_arrogant['A11'] = 1
+!!		npc_selfish['A11'] = 1
+		npc_fav_pos['A11'] = 2
+		$npc_fav_pos['A11'] = 'doggy'
+		npc_sex_speed['A11'] = 2
+		npc_dirty_lover['A11'] = 1
+		npc_cum_pref['A11'] = 1
+		$npc_cum_pref['A11'] = 'creampie'
+		npc_tit_pref['A11'] = 3
+		npc_bush_pref['A11'] = 1
+		$npc_fav_body_part['A11'] = 'tits'
+		npc_sexdrive['A11'] = 4
+		npc_sex_stamina['A11'] = 5
+	end
+end
+
+
 --- boy_updater ---------------------------------

+ 3 - 3
locations/brothel.qsrc

@@ -283,9 +283,9 @@ if $ARGS[0] = 'abducted4':
 	InSleep = 1
 	pain['killer'] = 0
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-		notathomesleep += 1
+		sleepQW['notathomesleep'] += 1
 	else
-		notathomesleep = 0
+		sleepQW['notathomesleep'] = 0
 	end
 	:loopson
 	minut += 1
@@ -543,7 +543,7 @@ if $ARGS[0] = 'brothel_dressingroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'From a box beneath a table you can take some '+iif(mc_inventory['cosmetics'] < 1,'<a href="exec: mc_inventory[''cosmetics''] += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+mc_inventory['cosmetics'] >+') or, '+iif(shampoo < 1,'<a href="exec: mc_inventory[''shampoo''] +=  5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(mc_inventory['lipbalm'] < 1,'<a href="exec: mc_inventory[''lipbalm''] += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+mc_inventory['lipbalm']+'), or '+iif(mc_inventory['razor'] < 1,'<a href="exec: mc_inventory[''razor''] +=  5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+mc_inventory['razor'] +'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'From a box beneath a table you can take some '+iif(mc_inventory['cosmetics'] < 1,'<a href="exec: mc_inventory[''cosmetics''] += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+mc_inventory['cosmetics'] +') or, '+iif(shampoo < 1,'<a href="exec: mc_inventory[''shampoo''] +=  5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(mc_inventory['lipbalm'] < 1,'<a href="exec: mc_inventory[''lipbalm''] += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+mc_inventory['lipbalm']+'), or '+iif(mc_inventory['razor'] < 1,'<a href="exec: mc_inventory[''razor''] +=  5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+mc_inventory['razor'] +'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(mc_inventory['enema_kit'] < 1,'<a href="exec: mc_inventory[''enema_kit''] += 1 & gt ''brothel'', $loc_arg">enema kit</a>','enema kit')+'. A box with some '+iif(mc_inventory['painkillers'] < 1,'<a href="exec:mc_inventory[''painkillers''] += 5 & gt ''brothel'', $loc_arg">painkillers</a>','painkillers')+' (you have '+mc_inventory['painkillers']+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl

+ 1 - 1
locations/brother_shower_sex.qsrc

@@ -1331,7 +1331,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 1 - 1
locations/brother_voyeur_sex.qsrc

@@ -1377,7 +1377,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 0 - 232
locations/budilnik.qsrc

@@ -1,232 +0,0 @@
-# budilnik
-
-menu_off = 1
-
-if $ARGS[0] = 'start':
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/bed2.jpg"></center>'
-	'<center>Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.</center>'
-	*nl
-
-	if numbud = 4:'<center><b><<bud1>><<bud2>>:<<bud3>><<bud4>></b></center>'
-	if numbud = 3:'<center><b><<bud1>><<bud2>>:<<bud3>></b><<bud4>></center>'
-	if numbud = 2:'<center><b><<bud1>><<bud2>></b>:<<bud3>><<bud4>></center>'
-	if numbud = 1:'<center><b><<bud1>></b><<bud2>>:<<bud3>><<bud4>></center>'
-	if numbud = 0:'<center><<bud1>><<bud2>> : <<bud3>><<bud4>></center>'
-
-	'<center><b><a href="exec:gt ''budilnik'', ''clear''">Clear</a>'
-	'<center><b><a href="exec:gt ''budilnik'', ''1''">1</a> <a href="exec:gt ''budilnik'', ''2''">2</a> <a href="exec:gt ''budilnik'', ''3''">3</a></b></center>'
-	'<center><b><a href="exec:gt ''budilnik'', ''4''">4</a> <a href="exec:gt ''budilnik'', ''5''">5</a> <a href="exec:gt ''budilnik'', ''6''">6</a></b></center>'
-	'<center><b><a href="exec:gt ''budilnik'', ''7''">7</a> <a href="exec:gt ''budilnik'', ''8''">8</a> <a href="exec:gt ''budilnik'', ''9''">9</a></b></center>'
-	'<center><b><a href="exec:gt ''budilnik'', ''0''">0</a></b></center>'
-	'<center><b><a href="exec: bud_weekend = 0 & gt ''budilnik'', ''Reset''">Reset weekday alarm</a> <a href="exec: bud_weekend = 0 & gt ''budilnik'', ''Time''">Set</a> weekday alarm to this time</b></center>'
-	'<center><b>Currently set for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' </b></center>'
-	'<center><b><a href="exec:  bud_weekend = 1 & gt ''budilnik'', ''Reset''">Reset weekend alarm</a> <a href="exec: bud_weekend = 1 & gt ''budilnik'', ''Time''">Set</a> weekend alarm to this time</b></center>'
-	'<center><b>Currently set for '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b></center>'
-	if mid($start_type,1,2) = 'sg' and alarm_holiday = 0:
-		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 1 & gt ''budilnik'', ''start''">OFF</a></b></center>'
-	elseif mid($start_type,1,2) = 'sg' and alarm_holiday = 1:
-		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 0 & gt ''budilnik'', ''start''">ON</a></b></center>'
-	end
-
-	
-	*nl
-	if budilnikOn = 0:
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & gt ''budilnik'', ''start''"><b>OFF</a></b></center>'
-	else
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & gt ''budilnik'', ''start''"><b>ON</b></a></center>'
-		'<center>The alarm is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' during the week and to '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+' during the weekend.</center>'		
-	end
-	act 'Clear time display':
-		cla
-		bud1 = 0
-		bud2 = 0
-		bud3 = 0
-		bud4 = 0
-		numbud = 0
-		gt 'budilnik', 'fin'
-	end
-	act 'Finish':
-		cla
-		bud1 = 0
-		bud2 = 0
-		bud3 = 0
-		bud4 = 0
-		numbud = 0
-		gt 'budilnik', 'fin'
-	end
-end
-
-if $ARGS[0] = 'clear':
-	cla
-	bud1 = 0
-	bud2 = 0
-	bud3 = 0
-	bud4 = 0
-	numbud = 0
-	gt 'budilnik', 'fin'
-end
-
-if $ARGS[0] = 'Time':
-	cla
-	budilnikOn = 1
-
-	if bud_weekend = 1:
-		timerEnd = bud1 * 10 + bud2
-		timerEndM = bud3 * 10 + bud4
-
-		if timerEnd > 23:timerEnd = 0
-		if timerEndM > 60:timerEndM = 0
-	else
-		timer = bud1 * 10 + bud2
-		timerM = bud3 * 10 + bud4
-
-		if timer > 23:timer = 0
-		if timerM > 60:timerM = 0
-	end
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '1':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 1 & numbud = 4
-	if numbud = 2:bud3 = 1 & numbud = 3
-	if numbud = 1:bud2 = 1 & numbud = 2
-	if numbud = 0:bud1 = 1 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '2':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 2 & numbud = 4
-	if numbud = 2:bud3 = 2 & numbud = 3
-	if numbud = 1:bud2 = 2 & numbud = 2
-	if numbud = 0:bud1 = 2 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '3':
-	cla
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 3 & numbud = 4
-	if numbud = 2:bud3 = 3 & numbud = 3
-	if numbud = 1:bud2 = 3 & numbud = 2
-	if numbud = 0:bud1 = 3 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '4':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 4 & numbud = 4
-	if numbud = 2:bud3 = 4 & numbud = 3
-	if numbud = 1:bud2 = 4 & numbud = 2
-	if numbud = 0:bud1 = 4 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '5':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 5 & numbud = 4
-	if numbud = 2:bud3 = 5 & numbud = 3
-	if numbud = 1:bud2 = 5 & numbud = 2
-	if numbud = 0:bud1 = 5 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '6':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 6 & numbud = 4
-	if numbud = 2:bud3 = 6 & numbud = 3
-	if numbud = 1:bud2 = 6 & numbud = 2
-	if numbud = 0:bud1 = 6 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '7':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 7 & numbud = 4
-	if numbud = 2:bud3 = 7 & numbud = 3
-	if numbud = 1:bud2 = 7 & numbud = 2
-	if numbud = 0:bud1 = 7 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '8':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 8 & numbud = 4
-	if numbud = 2:bud3 = 8 & numbud = 3
-	if numbud = 1:bud2 = 8 & numbud = 2
-	if numbud = 0:bud1 = 8 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '9':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 9 & numbud = 4
-	if numbud = 2:bud3 = 9 & numbud = 3
-	if numbud = 1:bud2 = 9 & numbud = 2
-	if numbud = 0:bud1 = 9 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = '0':
-	cla
-
-	!!if numbud = 4:end
-	if numbud = 3:bud4 = 0 & numbud = 4
-	if numbud = 2:bud3 = 0 & numbud = 3
-	if numbud = 1:bud2 = 0 & numbud = 2
-	if numbud = 0:bud1 = 0 & numbud = 1
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = 'Reset':
-	cla
-	if bud_weekend = 1:
-		timerEnd = 0
-		timerEndM = 0
-	else
-		timer = 0
-		timerM = 0
-	end
-	bud1 = 0
-	bud2 = 0
-	bud3 = 0
-	bud4 = 0
-	numbud = 0
-
-	gt 'budilnik', 'start'
-end
-
-if $ARGS[0] = 'fin': gt $loc, $loc_arg
-
---- budilnik ---------------------------------
-

+ 3 - 3
locations/buklinik_event.qsrc

@@ -883,7 +883,7 @@ if $ARGS[0] = 'event2':
 															act'Well on this we''re finished':
 																cls
 																nanny_vika = 1
-																mc_inventory['noshampoo'] = 1
+																noshampoo = 1
 																dynamic $showerdin
 																'You take a quick shower and get dressed, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 																if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'event2':
 									cls
 									nanny_vika = 1
 									gs'stat'
-									mc_inventory['noshampoo'] = 1
+									noshampoo = 1
 									dynamic $showerdin
 									'You take a quick shower and dress yourself and Michael, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 									if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'event2':
 									act'Wait For Vika':
 										cls
 										nanny_vika = 1
-										mc_inventory['noshampoo'] = 1
+										noshampoo = 1
 										dynamic $showerdin
 										'You take a quick shower and dress yourself and Michael.'
 										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.<br>'

+ 1 - 1
locations/carF.qsrc

@@ -326,7 +326,7 @@ if $ARGS[0] = 'other':
 			cla
 			benz -= 1
 			car['current_condition'] -= rand(1,3)
-			minut += rand(25-50)
+			minut += rand(25, 50)
 			if cardrive = 1 or cardrive = 2 or cardrive = 8 or cardrive = 11 or cardrive =4 or cardrive = 5  or cardrive = 10 or cardrive = 28 or cardrive = 18:
 				minut += 10
 			end 

+ 79 - 24
locations/cikl.qsrc

@@ -118,6 +118,12 @@ if casting = 1:
 	acting_string2 = rand(10000000,199999999)
 end
 
+!! terminate tour gide job when its off season
+if emp_job_status[1] = 1 and month < 6 and month > 8:
+	if work = 1: work = 0
+	emp_job_status[1]  = 4
+end
+
 dynamic $hypnoDaychange
 
 !!phone reset for bf
@@ -356,31 +362,8 @@ if pcs_tan > 0: pcs_tan -= 1
 if prezikmsg = 2: prezikmsg = 3
 
 
-gs 'fertility', 'birth_control'
-
-
-if tabletkiday < daystart - 5:
-	birth_control['using_bc'] = 0
-end
-
-if birth_control['think_safe'] = 1:
-	stat['forgot_bc_pill'] = 0
-elseif pilldaychk < daystart - 1 and pilldaychk > daystart - 5 and pillcon2 > 0:
-!!	stat['forgot_birth_control_pill'] = 1
-	stat['forget_bc_count'] += 1
-end
-
+gs 'fertility', 'daily_update'
 
-stat['safe_day'] = 0
-stat['probably_safe_day'] = 0
-stat['dangerous_day'] = 0
-if cycle > 3:
-	stat['safe_day'] = 1
-elseif cycle = 0 or cycle = 3:
-	stat['probably_safe_day'] = 1
-else
-	stat['dangerous_day'] = 1
-end
 
 !!------------------------------------------------------------------------------------------------------------
 
@@ -661,6 +644,11 @@ gs 'nerd_game_night', 'cikl'
 !!Keeping Christina hating Sveta
 gs 'Zvereva_events', 'cikl'
 
+!!Albina hates gopniks while at school
+if SchoolAtestat = 0 and grupTipe = 4 and AlbinaQW['Friends'] ! 2:
+	gs 'npc_relationship', 'set', 'A23', '20'
+end
+
 !!if Vitek''s ex he never forgives her
 if kotovLoveQW = -1:
 	gs 'npc_relationship', 'set', 'A9', '0'
@@ -1017,6 +1005,8 @@ gs 'uni_lessons', 'cikl'
 
 !!resetting moisturizer so it can be used in the morning regardless
 moisturiser_time = totminut
+!!same with chaffing cream
+mosal_time = totminut
 
 !!resetting last_pee to counteract time cheat
 !!also, the first thing you do in the morning is visiting your porcelain friend, no?
@@ -1305,5 +1295,70 @@ end
 !!------------- Advance will counter  ------------------------------------------
 if will_counter >= 20: will_counter -= 20 & willpowermax += 1
 
+
+!!-----------------webcam follower loss due to inactivity ------------------------------------------
+if camwhore = 1:
+	if cam_daystart < daystart:
+		if regviewReset < 3:
+			! Calculate follower loss More followers = more loss
+			if regview >= 500:
+				FollowersLost = rand(regview / 100, regview / 50)
+			else
+				FollowersLost = rand(1, 3)
+			end
+			cam_daystart = daystart + 4
+		else
+			if regview >= 300:
+				FollowersLost = rand(regview / 80, regview / 40)
+			else
+				FollowersLost = rand(2, 6)
+			end
+			cam_daystart = daystart + 2
+		end
+		! Increment the reset counter for follower loss
+		regviewReset += 1
+		FollowersLost = func('shortgs', 'clamp', FollowersLost, 0, regview)
+		totFollowersLost += FollowersLost
+		regview -= FollowersLost
+		killvar 'FollowersLost'
+	end
+end
+
+
+!!---------------Keeping track of missing court appearances-----------------------------
+if arrsize('policeQW_courthearing_dates') > 0 and daystart > policeQW_courthearing_dates[0]:
+	policeQW['missed_court_dates'] += 1
+	policeQW['tot_court_dates_missed'] += 1
+	
+	!! Might need code to throw a message with 'You''ve missed your court hearing or something'
+
+	policeQW_courtletter_dates[] = daystart + rand(3, 6)
+	$policeQW_courtletter_subjects[] = 'missed_court_<<$policeQW_courthearing_subjects[0]>>'
+
+	killvar 'policeQW_courthearing_dates', 0
+	killvar 'policeQW_courthearing_subjects', 0
+end
+
+if policeQW['fine_deadline'] > 0:
+	if daystart > policeQW['fine_deadline'] - 8:
+		policeQW_courtletter_dates[] = daystart
+		$policeQW_courtletter_subjects[] = 'fine'
+
+	elseif daystart > policeQW['fine_deadline']:
+		policeQW['missed_fine_deadlines'] += 1
+		policeQW['tot_fines_deadlines_missed'] += 1
+
+		!! Might need code to throw a message with 'you''ve failed to pay your fine on time.'
+
+		policeQW_courtletter_dates[] = daystart + rand(3, 6)
+		$policeQW_courtletter_subjects[] = 'missed_fine'
+	end
+end
+
+
+gs 'shortgs', 'coupled_array_sort', 'policeQW_courtletter_dates', '$policeQW_courtletter_subjects'
+gs 'shortgs', 'coupled_array_sort', 'policeQW_courthearing_dates', '$policeQW_courthearing_subjects'
+
+
 --- cikl ---------------------------------
 

+ 0 - 1
locations/city_clinic.qsrc

@@ -512,7 +512,6 @@ end
 if $ARGS[0] = 'stdcheck':
 	*clr & cla
 	menu_off = 1
-	money -= 1000
 	minut += 60
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/bg28qy97.jpg"></center>'

+ 1 - 1
locations/city_house_res_misc.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'hallw':
 	'<center><b><font color="maroon">Hallway</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_hallway.jpg"></center>'
 	
-	if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
+	gs 'courtletter'
 
 	act 'Go out front':
 		if $clothingworntype ! 'nude':

+ 1 - 1
locations/city_irinaroom.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'first5':
 	'"Could you help me out with my back?" She hands you a loofah, and as you start lathering her body you notice her nipples are erect.'
 	IrinaQW = 10
 	alko += 3
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	pcs_hairbsh = 1
 	pcs_makeup = 1

+ 47 - 75
locations/city_library.qsrc

@@ -53,7 +53,7 @@ if hour >= 8 and hour <= 18:
 		gt 'city_library', 'read'	
 	end
 	
-	act 'Loan a book':
+	act 'Borrow a book':
 		gt 'city_library', 'loan'
 	end
 
@@ -61,9 +61,8 @@ if hour >= 8 and hour <= 18:
 		act 'Read magic books':
 			dynamic $downlibrary['BookStudy'], 'splcstng'
 			gs 'stat'
-
 			'You pick out one of the magic books you can actually read and sit down with it.'
-			'Not only is the subject matter complex and mostly a mystery to you, but the descriptions and explanations are unnecessarily wordy, as if the writer had something to prove.'
+			'You discover that not only is the subject matter complex and mostly a mystery to you, but the descriptions and explanations are unnecessarily wordy, as if the writer had something to prove.'
 			'After about an hour, you decide to take a break from it and instead test your memory. You don''t remember much, but you understand magic a little better than before.'
 
 			! Find Researchable Spells
@@ -98,10 +97,8 @@ if $ARGS[0] = 'read':
 		gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
 		grupvalue[3] += 1
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'
-		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
-
+		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and understand the subject it describes.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -110,10 +107,8 @@ if $ARGS[0] = 'read':
 		pcs_mood = 100
 		grupvalue[3] += 1
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
 		'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
-
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -122,10 +117,8 @@ if $ARGS[0] = 'read':
 		pcs_mood = 100
 		grupvalue[3] += 1
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
 		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
-
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -134,10 +127,8 @@ if $ARGS[0] = 'read':
 		pcs_mood = 100
 		grupvalue[3] += 1
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
-
+		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI and creating monsters with your hunchbacked assistant.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -146,10 +137,8 @@ if $ARGS[0] = 'read':
 		pcs_mood = 100
 		pcs_horny += 20
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
-		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey... several of the scenes are very steamy and you find yourself getting quite aroused.'
-		
+		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey... Several of the scenes are very steamy and you find yourself getting quite aroused.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 	
@@ -171,23 +160,21 @@ if $ARGS[0] = 'read':
 			gs 'exp_gain', 'sprt', rand(3,6)
 			grupvalue[3] += 2
 			gs 'stat'
-
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/tolstoy.jpg"></center>'
-			'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
-			
+			'You read the book for an hour. Tolstoy is certainly a classic writer, but he used a <i>lot</i> of words.'
 			act 'Put the book back': gt 'city_library', 'read'
 		end
 	else
 		act 'Read from the collected works of Leo Tolstoy (1:00) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
-	act 'Go Back': gt 'city_library'
+	act 'Go back': gt 'city_library'
 end
 
 if $ARGS[0] = 'loan':
 	cla
 	if $lib_book_loaned ! '':
-		'You''ve currently loaned a <<$lib_book_loaned>>.'
+		'You''ve currently borrowed a <<$lib_book_loaned>>.'
 		if lib_debt <= 0:
 			temp_loan_days_left = lib_debt / -50
 			'You have <<temp_loan_days_left>> days left before you need to return it.'
@@ -198,10 +185,8 @@ if $ARGS[0] = 'loan':
 		act 'Return your loaned book':
 			if lib_book_read = 0:
 				if $lib_book_loaned = 'fantasy': f_book -= 1
-
 			elseif lib_book_read = 1:
 				if $lib_book_loaned = 'fantasy': fantasybook = 0
-
 			end
 			$lib_book_loaned = ''
 			if lib_debt <= 0: lib_debt = 0
@@ -212,7 +197,7 @@ if $ARGS[0] = 'loan':
 	end
 
 	if lib_debt > 0:
-		'You''ve got an outstanding debt of ₽<<lib_debt>> to the library.'
+		'You owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
 		if pcs_money >= lib_debt:
 			act 'Pay your debt':
 				pcs_money -= lib_debt
@@ -225,80 +210,67 @@ if $ARGS[0] = 'loan':
 	end
 
 	if $lib_book_loaned = '' and lib_debt = 0:
-		!!There''s currently only code for fantasy novels.
-		!'act 'Loan a book on science':
+		!!There''s currently only code for fantasy novels
+		!{act 'Borrow a book on science':
 			*clr & cla
 			menu_off = 1
 			s_book += 1
-			$lib_book_loaned = 'fantasy'
+			$lib_book_loaned = 'a science book'
 			lib_debt = -700
-			
-			!!Picture here?
-			'You find a fantasy novel that caches your interest and bring it to the librarian.'
-			'The librarian notes your name and the title of the book down, then hands it to you.'
-			'"Here You need to return it within 2 weeks, for every day that you''re late, you need to pay a ₽50 fine."'
-			act 'Put the book away': gt 'city_library'
+			!!Picture here
+			'You find a science book that catches your interest and bring it to the librarian, who notes your name and the title of the book down before handing it to you.'
+			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
+			act 'Continue': gt 'city_library'
 		end
-		'
-
-		!'act 'Loan an adventure novel':
+		
+		act 'Borrow an adventure novel':
 			*clr & cla
 			menu_off = 1
 			a_book += 1
-			$lib_book_loaned = 'fantasy'
+			$lib_book_loaned = 'an adventure novel'
 			lib_debt = -700
-			
-			!!Picture here?
-			'You find a fantasy novel that caches your interest and bring it to the librarian.'
-			'The librarian notes your name and the title of the book down, then hands it to you.'
-			'"Here You need to return it within 2 weeks, for every day that you''re late, you need to pay a ₽50 fine."'
-			act 'Put the book away': gt 'city_library'
-		end
-		'
-
-		act 'Loan a fantasy novel':
+			!!Picture here
+			'You find an adventure novel that catches your interest and bring it to the librarian, who notes your name and the title of the book down before handing it to you.'
+			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
+			act 'Continue': gt 'city_library'
+		end}
+		
+		act 'Borrow a fantasy novel':
 			*clr & cla
 			menu_off = 1
 			f_book += 1
-			$lib_book_loaned = 'fantasy'
+			$lib_book_loaned = 'a fantasy novel'
 			lib_debt = -700
-			
-			!!Picture here?
-			'You find a fantasy novel that caches your interest and bring it to the librarian.'
-			'The librarian notes your name and the title of the book down, then hands it to you.'
-			'"Here You need to return it within 2 weeks, for every day that you''re late, you need to pay a ₽50 fine."'
-			act 'Put the book away': gt 'city_library'
+			!!Picture here
+			'You find a fantasy novel that catches your interest and bring it to the librarian, who notes your name and the title of the book down before handing it to you.'
+			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
+			act 'Continue': gt 'city_library'
 		end
-		!'
-		act 'Read a science fiction novel (1:00)':
+		
+		!{act 'Borrow a science fiction novel':
 			*clr & cla
 			menu_off = 1
 			sf_book += 1
-			$lib_book_loaned = 'fantasy'
+			$lib_book_loaned = 'a science fiction novel'
 			lib_debt = -700
-			
-			!!Picture here?
-			'You find a fantasy novel that caches your interest and bring it to the librarian.'
-			'The librarian notes your name and the title of the book down, then hands it to you.'
-			'"Here You need to return it within 2 weeks, for every day that you''re late, you need to pay a ₽50 fine."'
-			act 'Put the book away': gt 'city_library'
+			!!Picture here
+			'You find a fantasy novel that catches your interest and bring it to the librarian, who notes your name and the title of the book down before handing it to you.'
+			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
+			act 'Continue': gt 'city_library'
 		end
-		'
-		!'
-		act 'Read a romance novel (1:00)':
+		
+		act 'Borrow a romance novel':
 			*clr & cla
 			menu_off = 1
 			r_book += 1
-			$lib_book_loaned = 'fantasy'
+			$lib_book_loaned = 'a romance novel'
 			lib_debt = -700
-			
-			!!Picture here?
-			'You find a fantasy novel that caches your interest and bring it to the librarian.'
-			'The librarian notes your name and the title of the book down, then hands it to you.'
-			'"Here You need to return it within 2 weeks, for every day that you''re late, you need to pay a ₽50 fine."'
-			act 'Put the book away': gt 'city_library'
-		end
-		'
+			!!Picture here
+			'You find a romance novel that catches your interest and bring it to the librarian, who notes your name and the title of the book down before handing it to you.'
+			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
+			act 'Continue': gt 'city_library'
+		end}
+	
 		act 'Go back': gt 'city_library'
 	end
 end

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'yfoyer':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
 	
-	if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
+	gs 'courtletter'
 
 	act 'Walk outside':
 		if $clothingworntype ! 'nude':

+ 5 - 0
locations/city_residential.qsrc

@@ -53,6 +53,11 @@ if gopdeath = 1 and vsehsdaladay ! daystart:
 	gt 'gameover'
 end
 
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart:
+	gs 'mother_chats', 'reconciliation_talk'
+exit
+end
+
 if car > 0 and cardrive = 1 or cardrive = 8:
 	if cardrive = 8:
 		'<a href="exec: minut += 10 & gs ''carF'', ''start''">Your <<$car>></a> is in your driveway.'

+ 8 - 32
locations/city_sauna.qsrc

@@ -112,8 +112,8 @@ if $ARGS[0] = 'saunaroom':
 	end
 	*nl
 
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''city_sauna'', ''saunaroom''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''city_sauna'', ''saunaroom''">ON</a>.')
-	
+	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+
 	*nl
 
 	'If you run out of personal hygeine or beauty products, you can ask for more at a cost.'
@@ -202,52 +202,28 @@ if $ARGS[0] = 'saunaroom':
 		else
 			$sleep_txt = 'Undress and go to sleep'
 		end
+
 		if succubusQW = 2:
 			act '<<$sleep_txt>>':
-				$lastwornclothingtype['bed'] = $clothingworntype
-				lastwornclothingnumber['bed'] = clothingwornnumber
-				$lastwornpantytype['bed'] = $pantyworntype
-				lastwornpantynumber['bed'] = pantywornnumber
-				$lastwornbratype['bed'] = $braworntype
-				lastwornbranumber['bed'] = brawornnumber
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				gt 'sleep', 'succhoice'
+				gt 'pre_sleep_events', 'start'
 			end
+
 		else
 			if workDolg > 0 or money >= 850:
 				act '<<$sleep_txt>>':
-					$lastwornclothingtype['bed'] = $clothingworntype
-					lastwornclothingnumber['bed'] = clothingwornnumber
-					$lastwornpantytype['bed'] = $pantyworntype
-					lastwornpantynumber['bed'] = pantywornnumber
-					$lastwornbratype['bed'] = $braworntype
-					lastwornbranumber['bed'] = brawornnumber
 					if workDolg > 0:
 						workDolg += 850
 					elseif workDolg <= 0:
 						money -= 850
 					end
-					if disable_autosave = 0:
-						if mid($start_type,1,4) = 'city':
-							savegame 'autosave_city.sav'
-						elseif mid($start_type,1,3) = 'uni':
-							savegame 'autosave_uni.sav'
-						else
-							savegame 'autosave_sg.sav'
-						end
-					end
-					if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-					if magf2bdo = 2:
-						gt 'sleep', 'magbstchoice'
-					else
-						gt 'sleep', 'sleep'
-					end
+					gt 'pre_sleep_events', 'start'
 				end
-				killvar '$sleep_txt'
 			else
 				'<br>You don''t have enough money to sleep here tonight.'
 			end
 		end
+
+		killvar '$sleep_txt'
 	end
 end
 

+ 1 - 0
locations/counter.qsrc

@@ -1,6 +1,7 @@
 # counter
 
 if music_loop = 1 and $track_loop ! '': play $track_loop, volume
+gs 'notification', 'counter'
 
 --- counter ---------------------------------
 

+ 235 - 0
locations/courtletter.qsrc

@@ -0,0 +1,235 @@
+# courtletter
+
+if $ARGS[0] = '':
+	if arrsize('policeQW_courtletter_dates') > 0 and daystart >= policeQW_courtletter_dates[0]: gt 'courtletter', 'letter'
+end
+
+
+if $ARGS[0] = 'letter':
+	*clr & cla
+	menu_off = 1
+	minut += 5
+
+	killvar 'policeQW_courtletter_dates', 0
+
+	if (policeQW['missed_court_dates'] + policeQW['missed_fine_deadlines']) > 1:
+		if (policeQW['tot_court_dates_missed'] + policeQW['tot_fines_deadlines_missed']) > 30 and policeQW['tot_arrested'] > 10:
+			killvar 'policeQW_courtletter_subjects', 0
+			policeQW['tot_arrested'] += 1
+			if policeQW['arrest_gameover_flag'] = 1:
+				gt 'sentence', 'police_arrest', 2
+			else
+				policeQW['arrest_gameover_flag'] = 1
+				gt 'sentence', 'police_arrest', 1
+			end
+		end
+
+		if (policeQW['missed_court_dates'] + policeQW['missed_fine_deadlines']) > 3:
+			killvar 'policeQW_courtletter_subjects', 0
+			policeQW['tot_arrested'] += 1
+			gt 'sentence', 'police_arrest', 0
+		end
+	end
+
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/openletter.jpg"></center>'
+
+	!! Handling the various different letters.
+	if $policeQW_courtletter_subjects[0] = 'fine':
+
+		if policeQW['courtletter_fine_counter'] < 10:
+			policeQW['courtletter_fine_counter'] += 1
+			pcs_mood -= 100
+			gs 'stat'
+
+			'As you enter your home you notice an envelope from the court. You anxiously look at it and take a deep breath before opening the envelope.'
+
+			if week < 6:
+				'Going through the letter you read that you''ve a week to pay your fine in full.'
+			else
+				'Going through the letter you read that you''ve until Monday, a week from now, to pay your fine in full.'
+			end
+
+			'<i>Failure to pay the fine in full with in a week from now, will have dire consequences for the accused.</i> Your heart drops as you read that line...'
+			'<i>You should mail your fine payment using the enclosed envelope.</i>'
+			'You put the letter back in the envelope and let out a loud sigh...'
+
+			if policeQW['legal_fine'] <= 0:
+				pcs_mood += 90
+				gs 'stat'
+				'You realise that you''ve already paid off your fines and sigh with relief.'
+			else
+				'You put the letter back in the envelope and let out a loud sigh...'
+			end
+
+		else
+			'As you come home you see the familiar envelope from the court. You already know the gist of it, <i>failure to pay your fine will have dire consequences,</i> yadda yadda...'
+			'You glance through the letter seeing the same information once again and as you finish you throw it to the side and continue further on inside your apartment...'
+			if policeQW['legal_fine'] <= 0:
+				'You''ve already paid your fines, why are they even bothering you.'
+			end
+		end
+
+		if policeQW['legal_fine'] > 0:
+			if money < policeQW['legal_fine']:
+				act 'Mail the payment for your legal fine/s (<font color="red"><<policeQW[''legal_fine'']>> <b>₽</b></font>)': '<br><font color="red">You don''t have enough cash to use this action.</font>'
+			else
+				act 'Mail the payment for your legal fine/s (<<policeQW[''legal_fine'']>> <b>₽</b>)':
+					*clr & cla
+					money -= policeQW['legal_fine']
+					policeQW['legal_fine'] = 0
+					policeQW['missed_fine_deadlines'] = 0
+					policeQW['fine_deadline'] = 0
+					policeQW['arrest_gameover_flag'] = 0
+					minut += 5
+					gs 'stat'
+
+					!!Need an image of Sveta putting money in the envelope!!
+					!'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
+					'You put the full amount of your outstanding fine/s in the evelope and seal it. No more than 5 minutes later you''ve posted the letter and are back.'
+					act 'Done': gt $loc, $loc_arg
+				end
+			end
+		end
+
+	elseif $policeQW_courtletter_subjects[0] = 'missed_fine':
+		if policeQW['courtletter_fine_counter'] < 10:
+			policeQW['courtletter_fine_counter'] += 1
+			pcs_mood -= 100
+			gs 'stat'
+
+			'As you enter your home you notice an envelope from the court. You anxiously look at it and take a deep breath before opening the envelope.'
+
+			if policeQW['legal_fine'] <= 0:
+				pcs_mood += 90
+				gs 'stat'
+				'Going through the letter you read that you''ve a week to pay your fine in full, which you already did.'
+				'Happy that you''ve managed to avoid this worry, you put the letter away.'
+			else
+				temp_fine = 250 * rand(5, 10)
+				gs 'sentence', 'add_fine', temp_fine
+				if week < 6:
+					'Going through the letter you read that you''ve failed to pay your fine. The court given you another <<temp_rand>> <b>₽</b> fine and has graciously decided to give you a week to pay your fine in full.'
+				else
+					'Going through the letter you read that you''ve failed to pay your fine. The court given you another <<temp_rand>> <b>₽</b> fine and has graciously decided to give you until Monday, a week from now, to pay your fine in full.'
+				end
+
+				'<i>Failure to pay the fine in full with in a week from now, will have dire consequences for the accused.</i> Your heart drops as you read that line...'
+				'<i>You should mail your fine payment using the enclosed envelope.</i>'
+				'You put the letter back in the envelope and let out a loud sigh...'
+			end
+
+		else
+			if policeQW['legal_fine'] <= 0:
+				'As you come home you see the familiar envelope from the court. You already know the gist of it, <i>failed to pay your fine, failure to pay your fine will have dire consequences,</i> yadda yadda...'
+				'You already paid off your fines and as you finish you throw it to the side and continue further on inside your apartment...'
+
+			else
+				temp_fine = 250 * rand(10, 20)
+				gs 'sentence', 'add_fine', temp_fine
+				'As you come home you see the familiar envelope from the court. You already know the gist of it, <i>failed to pay your fine, additional <<temp_rand>> <b>₽</b> fine, failure to pay your fine will have dire consequences,</i> yadda yadda...'
+				'You glance through the letter seeing the same information once again and as you finish you throw it to the side and continue further on inside your apartment...'
+			end
+		end
+
+		if policeQW['legal_fine'] > 0:
+			if money < policeQW['legal_fine']:
+				act 'Mail the payment for your legal fine/s (<font color="red"><<policeQW[''legal_fine'']>> <b>₽</b></font>)': '<br><font color="red">You don''t have enough cash to use this action.</font>'
+			else
+				act 'Mail the payment for your legal fine/s (<<policeQW[''legal_fine'']>> <b>₽</b>)':
+					*clr & cla
+					money -= policeQW['legal_fine']
+					policeQW['legal_fine'] = 0
+					policeQW['missed_fine_deadlines'] = 0
+					policeQW['fine_deadline'] = 0
+					policeQW['arrest_gameover_flag'] = 0
+					minut += 5
+					gs 'stat'
+
+					!!Need an image of Sveta putting money in the envelope!!
+					!'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
+					'You put the full amount of your outstanding fine/s in the evelope and seal it. No more than 5 minutes later you''ve posted the letter and are back.'
+					act 'Done': gt $loc, $loc_arg
+				end
+			end
+		end
+
+
+	elseif mid('policeQW_courtletter_subjects', 1, 12) = 'missed_court':
+		if week = 6:
+			policeQW_courthearing_dates[] = daystart + 9
+		elseif week = 7:
+			policeQW_courthearing_dates[] = daystart + 8
+		else
+			policeQW_courthearing_dates[] = daystart + 7
+		end
+
+		$policeQW_courthearing_subjects[] = mid($policeQW_courtletter_subjects[0], 14)
+
+		if $policeQW['courtletter_hearing_counter'] < 10:
+			policeQW['courtletter_hearing_counter'] += 1
+			pcs_mood -= 100
+			gs 'stat'
+
+			'As you enter your home you notice an envelope from the court. You anxiously look at it and take a deep breath before opening the envelope.'
+
+			temp_fine = 500 * rand(5, 10)
+			gs 'sentence', 'letter_add_fine', 'missed_court', temp_fine
+			if week < 6:
+				'Going through the letter you read that you''ve missed your court hearing. A new court hearing has been scheduled a week from now and you''ve been fined <<temp_rand>> <b>₽</b>.'
+			else
+				'Going through the letter you read that you''ve missed your court hearing. A new court hearing has been scheduled on Monday, a week from now and you''ve been fined <<temp_rand>> <b>₽</b>.'
+			end
+
+			'<i>Failing to appear in court will have dire consequences for the accused.</i> Your heart drops as you read that line...'
+			'<i>The court is located in the city center. You should arrive at 9:00 as there are a lot of cases and we can''t say when your turn might come up.</i>'
+			'You put the letter back in the envelope and let out a loud sigh...'
+
+		else
+			temp_fine = 500 * rand(10, 20)
+			gs 'sentence', 'letter_add_fine', 'missed_court', temp_fine
+			'As you come home you see the familiar envelope from the court. You already know the gist of it, <i>missed court, <<temp_rand>> <b>₽</b> fine, failure to show up will have dire consequences,</i> yadda yadda...'
+			'You glance through the letter seeing the same information once again and as you finish you throw it to the side and continue further on inside your apartment...'
+		end
+
+	else
+		if week = 6:
+			policeQW_courthearing_dates[] = daystart + 9
+		elseif week = 7:
+			policeQW_courthearing_dates[] = daystart + 8
+		else
+			policeQW_courthearing_dates[] = daystart + 7
+		end
+
+		$policeQW_courthearing_subjects[] = $policeQW_courtletter_subjects[0]
+
+		if $policeQW['courtletter_hearing_counter'] < 10:
+			policeQW['courtletter_hearing_counter'] += 1
+			pcs_mood -= 100
+			gs 'stat'
+
+			'As you enter your home you notice an envelope from the court. You anxiously look at it and take a deep breath before opening the envelope.'
+
+			if week < 6:
+				'Going through the letter you read that you''ve been summoned to appear in court a week from now.'
+			else
+				'Going through the letter you read that you''ve been summoned to appear in court on Monday, a week from now.'
+			end
+
+			'<i>Failing to appear in court will have dire consequences for the accused.</i> Your heart drops as you read that line...'
+			'<i>The court is located in the city center. You should arrive at 9:00 as there are a lot of cases and we can''t say when your turn might come up.</i>'
+			'You put the letter back in the envelope and let out a loud sigh...'
+
+		else
+			'As you come home you see the familiar envelope from the court. You already know the gist of it, <i>failure to show up will have dire consequences,</i> yadda yadda...'
+			'You glance through the letter seeing the same information once again and as you finish you throw it to the side and continue further on inside your apartment...'
+		end
+	end
+
+	act 'Continue': gt $loc, $loc_arg
+	killvar 'temp_fine'
+	killvar 'policeQW_courtletter_subjects', 0
+end
+
+
+
+--- courtletter ---------------------------------

+ 77 - 42
locations/din_bad.qsrc

@@ -362,11 +362,11 @@ $din_Do_Condom_Counts = {
 	elseif ARGS[0] = 4:
 		if preziktype ! 0 and mc_inventory['normal_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
-			mc_inventory['normal_condoms'] -=1
+			mc_inventory['normal_condoms'] -= 1
 			'You use a needle to punch holes in one of the condoms.'
 		elseif preziktype = 0 and mc_inventory['equipped_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
-			mc_inventory['equipped_condoms'] -=1
+			mc_inventory['equipped_condoms'] -= 1
 			'You use a needle to punch holes in one of the condoms.'
 		else
 			'You do not have any condoms to sabotage.'
@@ -425,21 +425,24 @@ $d_tabletkied = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	tabloc = 0
-	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
-	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
-		if (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
-			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
-		elseif (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
-			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
-			'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
+	if thinkpreg = 0 and knowpreg = 0:
+		if tabletkiday < daystart: '<a href="exec:dynamic $d_tabletkieda, 1 & dynamic $d_tabletkied">Take the birth control pill now.</a>'
+
+		if tabletkicheck = 0:
+			if birth_control['remind_hour'] = 0: 
+				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
+			else
+				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
+				'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
+			end
+			'<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
+		elseif tabletkicheck = 1 and therapistFuckedPussyStage < 2:
+			'<a href="exec:dynamic $d_tabletkieda, 3 & dynamic $d_tabletkied">Stop automatically taking your birth control pills.</a>'
 		end
-		'<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
-	elseif tabletkicheck = 1:
-		'<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</a>'
-		if birth_control['remind_hour'] > 0:'<a href="exec:*clr & birth_control[''remind_hour''] = 0 & dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</a>'
 	end
+
 	'<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</a>'
-	if tabletkioddk = 1: '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</a>'
+	if tabletkioddk = 1: '<a href="exec:dynamic $d_tabletkieda, 5 & dynamic $d_tabletkied">Dump the strange pills.</a>'
 	*nl
 	if birth_control['placebo_skip'] = 0:
 		'Skip your <a href="exec:*clr & birth_control[''placebo_skip''] = 1 & dynamic $d_tabletkied">placebo pills.</a>'
@@ -458,26 +461,27 @@ $d_tabletkiedt = {
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
 	*nl
 	tabloc = 1
-	if tabletkiday < daystart and thinkpreg = 0 and knowpreg = 0: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</a>'
-	
-	if tabletkicheck = 0 and thinkpreg = 0 and knowpreg = 0:
-		if (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] = 0: 
-			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
-		elseif (mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0) and birth_control['remind_hour'] > 0: 
-			'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
-			'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
+	if thinkpreg = 0 and knowpreg = 0:
+		if tabletkiday < daystart: '<a href="exec:*clr & dynamic $d_tabletkieda, 1 & dynamic $d_tabletkiedt">Take the birth control pill now.</a>'
+		
+		if tabletkicheck = 0:
+			if birth_control['remind_hour'] = 0: 
+				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
+			else
+				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
+				'<a href="exec:gs ''din_bad'', ''turn_off_bc_reminder''">Turn off your birth control reminder.</a>'
+			end
+			'<a href="exec:*clr & dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
+		elseif tabletkicheck = 1 and therapistFuckedPussyStage < 2:
+			'<a href="exec:*clr & dynamic $d_tabletkieda, 3 & dynamic $d_tabletkiedt">Stop automatically taking your birth control pills.</a>'
 		end
-		'<a href="exec:*clr & dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</a>'
-	elseif tabletkicheck = 1 and therapistFuckedPussyStage < 2:
-		'<a href="exec:*clr & birth_control[''remind_hour''] = 0 & dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</a>'
 	end
 	'<a href="exec:*clr & dynamic $d_tabletkieda, 4">Examine the birth control pills.</a>'
-	if tabletkioddk = 1: '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</a>'
+	if tabletkioddk = 1: '<a href="exec:*clr & dynamic $d_tabletkieda, 5 & dynamic $d_tabletkiedt">Dump the strange pills.</a>'
 	act 'Return':gt 'stol', 'bc'
 }
 
 $d_tabletkieda = {
-	cla
 	if ARGS[0] = 1:
 		tabletkipd += tabletkipt
 		if tabletkiday ! daystart:
@@ -494,8 +498,9 @@ $d_tabletkieda = {
 		'You take your birth control pill.'
 		gs 'stat'
 	elseif ARGS[0] = 2:
+		birth_control['remind_hour'] = 0
+		gs 'din_bad', 'set_auto_bc'
 		'You will do your best to remember to take your birth control pills every day.'
-		tabletkicheck = 1
 		gs 'stat'
 	elseif ARGS[0] = 3:
 		'You will take your birth control pills as you desire.'
@@ -543,6 +548,23 @@ $d_tabletkieda = {
 	end
 }
 
+if $ARGS[0] = 'set_auto_bc':
+	:invalid_auto_bc_loop
+	birth_control['auto_hour'] = input ("When do you want to automatically take your pill? (Pick an hour 1 - 23. If you are asleep during the hour you set, you will not take it.)")
+	if birth_control['auto_hour'] < 1 or birth_control['auto_hour'] > 23:
+		msg 'Invalid input. Pick an hour between 1 and 23.'
+		jump 'invalid_auto_bc_loop'
+	else
+		tabletkicheck = 1
+		msg 'You set a reminder on your phone to take your birth control pill at <<birth_control[''auto_hour'']>>.'
+		if tabloc = 0:
+			dynamic $d_tabletkied
+		else
+			dynamic $d_tabletkiedt
+		end
+	end
+end
+
 if $ARGS[0] = 'set_bc_reminder':
 	:invalid_bc_reminder_loop
 	birth_control['remind_hour'] = input ("When do you want to set your reminder? (Pick an hour 1 - 22. A reminder icon will appear in the stat display during that hour.)")
@@ -551,12 +573,22 @@ if $ARGS[0] = 'set_bc_reminder':
 		jump 'invalid_bc_reminder'
 	else
 		msg 'You set a reminder on your phone to take your birth control pill at <<birth_control[''remind_hour'']>>.'
+		if tabloc = 0:
+			dynamic $d_tabletkied
+		else
+			dynamic $d_tabletkiedt
+		end
 	end
 end
 
 if $ARGS[0] = 'turn_off_bc_reminder':
 	birth_control['remind_hour'] = 0
 	msg 'You turn off your reminder to take your birth control pills.'
+	if tabloc = 0:
+		dynamic $d_tabletkied
+	else
+		dynamic $d_tabletkiedt
+	end
 end
 
 $d_cycreport_choice = {
@@ -755,6 +787,7 @@ $d_cycreport_update = {
 	killvar 'temp'
 	if thinkpreg = 1 or knowpreg = 1: dynamic $d_cycreport_upduedate
 	!! Vagblood in a future update to account for babydamage and miscarrages.
+
 	if mesec > 0 or vagblood > 0:
 		$cycreport_txt = 'You are currently menstruating.'
 	elseif succubusflag = 1:
@@ -817,9 +850,9 @@ $d_cycreport_update = {
 				end
 !!{				if stat['vaginal'] > 0 and  birth_control['think_safe'] ! 1 and stat['safe_day'] = 1:
 					$calendar_method_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>Today is a safe day to have unprotected sex.</font>'
-				elseif stat['vaginal'] > 0 and  birth_control['think_safe'] ! 1 and stat['probably_safe_day'] = 1:
+				elseif stat['vaginal'] > 0 and birth_control['think_safe'] ! 1 and stat['probably_safe_day'] = 1:
 					$calendar_method_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are unlikely to get pregnant if you have unprotected sex today.</font>'
-				elseif stat['vaginal'] > 0 and  birth_control['think_safe'] ! 1 and stat['dangerous_day'] = 1:
+				elseif stat['vaginal'] > 0 and birth_control['think_safe'] ! 1 and stat['dangerous_day'] = 1:
 					$calendar_method_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>Today is a safe day to have unprotected sex.</font>'
 				end}
 			end
@@ -1042,36 +1075,36 @@ $use_bcream = {
 }
 
 if $ARGS[0] = 'takepill':
-
+	birth_control['using_bc'] = 3
 	if mc_inventory['contraceptive_pill'] > 0 and pillsleft[ptype] = 0:
 		tabletkirand = rand(1, mc_inventory['contraceptive_pill'])
 		if tabletkirand <= tabletkiold:
-			mc_inventory['contraceptive_pill'] -=1
-			tabletkiold -=1
+			mc_inventory['contraceptive_pill'] -= 1
+			tabletkiold -= 1
 			ptype = 1
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake:
-			mc_inventory['contraceptive_pill'] -=1
-			tabletkifake -=1
+			mc_inventory['contraceptive_pill'] -= 1
+			tabletkifake -= 1
 			ptype = 2
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej:
-			mc_inventory['contraceptive_pill'] -=1
-			tabletkirej -=1
+			mc_inventory['contraceptive_pill'] -= 1
+			tabletkirej -= 1
 			ptype = 3
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej + tabletkisug:
-			mc_inventory['contraceptive_pill'] -=1
-			tabletkisug -=1
+			mc_inventory['contraceptive_pill'] -= 1
+			tabletkisug -= 1
 			ptype = 4
 			pillsleft[ptype] = 28
 		elseif tabletkirand <= tabletkiold + tabletkifake + tabletkirej + tabletkisug + tabletkifert:
-			mc_inventory['contraceptive_pill'] -=1
-			tabletkifert -=1
+			mc_inventory['contraceptive_pill'] -= 1
+			tabletkifert -= 1
 			ptype = 5
 			pillsleft[ptype] = 28
 		else
-			mc_inventory['contraceptive_pill'] -=1
+			mc_inventory['contraceptive_pill'] -= 1
 			ptype = 0
 			pillsleft[ptype] = 28
 		end
@@ -1109,6 +1142,8 @@ if $ARGS[0] = 'takepill':
 		pillcon2 += ((pillcon2 + 15000) / 25) + 4000
 		if pillcon2 > 40000: pillcon2 = 40000
 		if pillcon > 40000: pillcon = 40000
+
+		gs 'fertility', 'update'
 	end
 end
 

+ 293 - 286
locations/din_van.qsrc

@@ -210,7 +210,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: mc_inventory['noshampoo'] = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: noshampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -310,67 +310,153 @@ $SkinCare = {
 }
 
 $brit = {
-	if shave_menu = 1 and (mc_inventory['razor'] > 1 or pcs_shave['free_razor'] = 1):
-		if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
-			if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if daystart < 10 and $start_type[1] = 'tg':
-					$shave_act = 'Shave your legs and pussy'
-					$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-					$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-				elseif daystart < 30 and $start_type[1] = 'tg':
-					pcs_mood += 10
-					$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-				elseif pubestyle = 1:
-					$shave_act = 'Shave your legs and pussy'
-					if pcs_pubes > 10:
-						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
-						$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+	if lashair ! 1:
+		if shave_menu = 1 and (mc_inventory['razor'] > 1 or pcs_shave['free_razor'] = 1):
+			if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
+				if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
+					if daystart < 10 and $start_type[1] = 'tg':
+						$shave_act = 'Shave your legs and pussy'
+						$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+						$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
+					elseif daystart < 30 and $start_type[1] = 'tg':
+						pcs_mood += 10
+						$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+					elseif pubestyle = 1:
+						$shave_act = 'Shave your legs and pussy'
+						if pcs_pubes > 10:
+							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
+							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+						else
+							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.' 
+							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
+						end
+					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
+						if pcs_pubes >= shave_trigger + 5:
+							$shave_act = 'Shave your legs and pussy'
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+						else
+							$shave_act = 'Shave your legs and trim your bush'
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
+						end
+					elseif pubestyle = 9:
+						$shave_act = 'Shave your legs and maintain your bush'
+						if pcs_pubes >= 26:
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
+						else
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
+						end
+					elseif pubestyle = 10:
+						$shave_act = 'Shave your legs and trim your bush'
+						if pcs_pubes >= 40:
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+						else
+							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
+						end
+					elseif pubestyle = 11:
+						$shave_act = 'Shave your legs and pussy'
+						if pcs_pubes <= 10:
+							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.' 
+							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
+						else
+							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+						end
 					else
-						$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.' 
-						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
+						$shave_act = ''
+					end
+				
+					if $shave_act ! '':
+						act '<<$shave_act>> (0:15)':
+							menu_off = 1
+							*clr & cla
+	!!						if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
+							if $loc ='gadbana':
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
+							elseif pcs_pubes <= 10 and shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+							elseif shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+							elseif shave_length > 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+							else
+								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+							end
+							*nl
+							'<<$shave_txt1>>'
+							*nl
+							'<<$shave_txt2>>'
+							minut += 15
+							pcs_leghair = 0
+							stat['leg_hair_growth_timer'] = totminut
+							pcs_pubes = shave_length
+							stat['pube_growth_timer'] = totminut
+							pcs_horny += 5
+							if pcs_shave['free_razor'] = 1:
+								pcs_shave['free_razor'] = 0
+							else
+								mc_inventory['razor'] -=  2
+							end
+							dynamic $dryOff
+							gs'selfplay','bathtub_dildo_check'
+							gs'selfplay','shower_dildo_check'
+						end
+					end
+				end
+			else
+				'<br>You don''t need to shave.'
+			end
+		end
+		
+
+		if (shave_menu = 2 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs_shave['free_razor'] = 1):
+			if pubestyle > 0 and pcs_pubes >= shave_trigger:
+				if pubestyle = 1:
+					$shave_act = 'Shave your pussy'
+					if pcs_pubes <= 10:
+						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
+						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
+						
+					else
+						$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 					end
 				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
 					if pcs_pubes >= shave_trigger + 5:
-						$shave_act = 'Shave your legs and pussy'
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+						$shave_act = 'Shave your pussy'
+						$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion.'
 					else
-						$shave_act = 'Shave your legs and trim your bush'
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
+						$shave_act = 'Trim your bush'
+						$shave_txt1 = 'You lather up your crotch and spend some time cleaning up the stubble around your pussy until your bush is neatly styled again.'
 					end
 				elseif pubestyle = 9:
-					$shave_act = 'Shave your legs and maintain your bush'
+					$shave_act = 'Trim your bush'
 					if pcs_pubes >= 26:
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
+						$shave_txt1 = 'You spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
 					else
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
+						$shave_txt1 = 'You spend some time maintaining your bush, keeping it short and neat.'
 					end
 				elseif pubestyle = 10:
-					$shave_act = 'Shave your legs and trim your bush'
 					if pcs_pubes >= 40:
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+						$shave_act = 'Trim back your bush'
+						$shave_txt1 = 'You spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
 					else
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
+						$shave_act = 'Trim your bush'
+						$shave_txt1 = 'You spend some time maintaining your bush, trimming back the edges, keeping it neat and tidy.'
 					end
 				elseif pubestyle = 11:
-					$shave_act = 'Shave your legs and pussy'
+					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
-						$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.' 
+						$shave_txt1 = 'As the water of the shower continues to roll down your body, you suddenly realize that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
 					else
-						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+						$shave_txt1 = 'You lather up yourself up and take a razor to the hair growing over your crotch. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 					end
 				else
 					$shave_act = ''
 				end
-			
 				if $shave_act ! '':
-					act '<<$shave_act>> (0:15)':
+					act '<<$shave_act>> (0:10)':
 						menu_off = 1
 						*clr & cla
-!!						if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
-						if $loc ='gadbana':
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-						elseif pcs_pubes <= 10 and shave_length = 2:
+						if pcs_pubes <= 10 and shave_length = 2:
 							'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
 						elseif shave_length = 2:
 							'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
@@ -380,296 +466,212 @@ $brit = {
 							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 						end
 						*nl
-						'<<$shave_txt1>>'
-						*nl
-						'<<$shave_txt2>>'
-						minut += 15
-						pcs_leghair = 0
-						stat['leg_hair_growth_timer'] = totminut
+						minut += 10
 						pcs_pubes = shave_length
 						stat['pube_growth_timer'] = totminut
 						pcs_horny += 5
 						if pcs_shave['free_razor'] = 1:
 							pcs_shave['free_razor'] = 0
 						else
-							mc_inventory['razor'] -=  2
+							mc_inventory['razor'] -= 1
 						end
+						'<<$shave_txt1>>'
+						*nl
+						'<<$shave_txt2>>'
 						dynamic $dryOff
 						gs'selfplay','bathtub_dildo_check'
 						gs'selfplay','shower_dildo_check'
 					end
 				end
 			end
-		else
-			'<br>You don''t need to shave.'
 		end
-	end
-	
-
-	if (shave_menu = 2 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs_shave['free_razor'] = 1):
-		if pubestyle > 0 and pcs_pubes >= shave_trigger:
-			if pubestyle = 1:
-				$shave_act = 'Shave your pussy'
-				if pcs_pubes <= 10:
-					$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
-					$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
-					
-				else
-					$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-				end
-			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-				if pcs_pubes >= shave_trigger + 5:
-					$shave_act = 'Shave your pussy'
-					$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion.'
-				else
-					$shave_act = 'Trim your bush'
-					$shave_txt1 = 'You lather up your crotch and spend some time cleaning up the stubble around your pussy until your bush is neatly styled again.'
-				end
-			elseif pubestyle = 9:
-				$shave_act = 'Trim your bush'
-				if pcs_pubes >= 26:
-					$shave_txt1 = 'You spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
-				else
-					$shave_txt1 = 'You spend some time maintaining your bush, keeping it short and neat.'
-				end
-			elseif pubestyle = 10:
-				if pcs_pubes >= 40:
-					$shave_act = 'Trim back your bush'
-					$shave_txt1 = 'You spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
-				else
-					$shave_act = 'Trim your bush'
-					$shave_txt1 = 'You spend some time maintaining your bush, trimming back the edges, keeping it neat and tidy.'
-				end
-			elseif pubestyle = 11:
-				$shave_act = 'Shave your pussy'
-				if pcs_pubes <= 10:
-					$shave_txt1 = 'As the water of the shower continues to roll down your body, you suddenly realize that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
-					$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
-				else
-					$shave_txt1 = 'You lather up yourself up and take a razor to the hair growing over your crotch. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-				end
-			else
-				$shave_act = ''
-			end
-			if $shave_act ! '':
-				act '<<$shave_act>> (0:10)':
+		
+		if (shave_menu = 3 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1):
+			if pcs_leghair > 3:
+				act 'Shave your legs (0:05)':
 					menu_off = 1
 					*clr & cla
-					if pcs_pubes <= 10 and shave_length = 2:
-						'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-					elseif shave_length = 2:
-						'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-					elseif shave_length > 2:
-						'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					end
-					*nl
-					minut += 10
-					pcs_pubes = shave_length
-					stat['pube_growth_timer'] = totminut
+					minut += 5
+					pcs_leghair = 0
+					stat['leg_hair_growth_timer'] = totminut
 					pcs_horny += 5
+
 					if pcs_shave['free_razor'] = 1:
 						pcs_shave['free_razor'] = 0
 					else
-						mc_inventory['razor'] -= 1
+						mc_inventory['razor'] -= 2
 					end
-					'<<$shave_txt1>>'
+					!!				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 					*nl
-					'<<$shave_txt2>>'
+					if daystart < 10 and $start_type[1] = 'tg':
+						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
+					elseif daystart < 30 and $start_type[1] = 'tg':
+						pcs_mood += 10
+						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+					else
+						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
+					end
 					dynamic $dryOff
 					gs'selfplay','bathtub_dildo_check'
 					gs'selfplay','shower_dildo_check'
 				end
 			end
 		end
-	end
-	
-	if (shave_menu = 3 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1):
-		if pcs_leghair > 3:
-			act 'Shave your legs (0:05)':
-				menu_off = 1
-				*clr & cla
-				minut += 5
-				pcs_leghair = 0
-				stat['leg_hair_growth_timer'] = totminut
-				pcs_horny += 5
-
-				if pcs_shave['free_razor'] = 1:
-					pcs_shave['free_razor'] = 0
-				else
-					mc_inventory['razor'] -= 2
-				end
-!!				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
-				*nl
-				if daystart < 10 and $start_type[1] = 'tg':
-					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-				elseif daystart < 30 and $start_type[1] = 'tg':
-					pcs_mood += 10
-					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-				else
-					'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
-				end
-				dynamic $dryOff
-				gs'selfplay','bathtub_dildo_check'
-				gs'selfplay','shower_dildo_check'
-			end
-		end
-	end
-	
-	if shave_menu > 0 and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1) and (pcs_leghair > 0 or (pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3)):
-		act'Shave early':
-			cla
-			if shave_menu = 1 and pcs_leghair > 0 and pcs_leghair < 4 and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-				if pubestyle = 1:
-					$shave_both_act = 'Shave early - legs and pussy'
-					$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-					$shave_both_act = 'Trim early - legs and bush'
-					$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 9:
-					$shave_both_act = 'Trim early - legs and bush'
-					$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your smooth legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 10:
-					$shave_both_act = 'Trim early - legs and bush'
-					$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 11:
-					$shave_both_act = 'Shave early - legs and pussy'
-					$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-				else
-					$shave_both_act = ''
+		
+		if shave_menu > 0 and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1) and (pcs_leghair > 0 or (pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3)):
+			act'Shave early':
+				cla
+				if shave_menu = 1 and pcs_leghair > 0 and pcs_leghair < 4 and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
+					if pubestyle = 1:
+						$shave_both_act = 'Shave early - legs and pussy'
+						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
+					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
+						$shave_both_act = 'Trim early - legs and bush'
+						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 9:
+						$shave_both_act = 'Trim early - legs and bush'
+						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your smooth legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 10:
+						$shave_both_act = 'Trim early - legs and bush'
+						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 11:
+						$shave_both_act = 'Shave early - legs and pussy'
+						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
+					else
+						$shave_both_act = ''
+					end
+					
+					if $shave_both_act ! '':
+						act '<<$shave_both_act>> (0:10)':
+							menu_off = 1
+							*clr & cla
+							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
+							if $loc ='gadbana':
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
+							elseif pcs_pubes <= 10 and shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+							elseif shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+							elseif shave_length > 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+							else
+								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+							end
+							*nl
+							'<<$shave_txt1>>'
+							*nl
+							'<<$shave_txt2>>'
+							minut += 10
+							pcs_leghair = 0
+							stat['leg_hair_growth_timer'] = totminut
+							pcs_pubes = shave_length
+							stat['pube_growth_timer'] = totminut
+							pcs_horny += 5
+							if pcs_shave['free_razor'] = 1:
+								pcs_shave['free_razor'] = 0
+							else
+								mc_inventory['razor'] -=  2
+							end
+							dynamic $dryOff
+							gs'selfplay','bathtub_dildo_check'
+							gs'selfplay','shower_dildo_check'
+						end
+					end
 				end
 				
-				if $shave_both_act ! '':
-					act '<<$shave_both_act>> (0:10)':
-						menu_off = 1
-						*clr & cla
-						if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-						if $loc ='gadbana':
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-						elseif pcs_pubes <= 10 and shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-						elseif shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-						elseif shave_length > 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-						else
-							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-						end
-						*nl
-						'<<$shave_txt1>>'
-						*nl
-						'<<$shave_txt2>>'
-						minut += 10
-						pcs_leghair = 0
-						stat['leg_hair_growth_timer'] = totminut
-						pcs_pubes = shave_length
-						stat['pube_growth_timer'] = totminut
-						pcs_horny += 5
-						if pcs_shave['free_razor'] = 1:
-							pcs_shave['free_razor'] = 0
-						else
-							mc_inventory['razor'] -=  2
+				if (shave_menu = 2 or shave_menu = 1) and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
+					if pubestyle = 1:
+						$shave_act = 'Shave early - pussy only'
+						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your pussy.'
+					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
+						$shave_act = 'Trim early - pubes only'
+						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your razor, carefully scraping the blade around the edges of your pubes.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 9:
+						$shave_act = 'Trim early - bush only'
+						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 10:
+						$shave_act = 'Trim early - bush only'
+						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
+					elseif pubestyle = 11:
+						$shave_act = 'Shave early - pussy only'
+						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your crotch, grab your razor, and carefully scrape the blade across your still-smooth skin.' 
+						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pussy is perfectly cleanshaven. Satisfied, you rinse off, pleased with the extra smooth feeling between your legs.'
+					else
+						$shave_act = ''
+					end
+						
+					if $shave_act ! '':
+						act '<<$shave_act>> (0:05)':
+							menu_off = 1
+							*clr & cla
+							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
+							if $loc ='gadbana':
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
+							elseif pcs_pubes <= 10 and shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+							elseif shave_length = 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+							elseif shave_length > 2:
+								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+							else
+								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+							end
+							*nl
+							'<<$shave_txt1>>'
+							*nl
+							'<<$shave_txt2>>'
+							minut += 5
+							pcs_leghair = 0
+							stat['leg_hair_growth_timer'] = totminut
+							pcs_pubes = shave_length
+							stat['pube_growth_timer'] = totminut
+							pcs_horny += 5
+							if pcs_shave['free_razor'] = 1:
+								pcs_shave['free_razor'] = 0
+							else
+								mc_inventory['razor'] -=  2
+							end
+							dynamic $dryOff
+							gs'selfplay','bathtub_dildo_check'
+							gs'selfplay','shower_dildo_check'
 						end
-						dynamic $dryOff
-						gs'selfplay','bathtub_dildo_check'
-						gs'selfplay','shower_dildo_check'
 					end
 				end
-			end
-			
-			if (shave_menu = 2 or shave_menu = 1) and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-				if pubestyle = 1:
-					$shave_act = 'Shave early - pussy only'
-					$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your pussy.'
-				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-					$shave_act = 'Trim early - pubes only'
-					$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your razor, carefully scraping the blade around the edges of your pubes.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 9:
-					$shave_act = 'Trim early - bush only'
-					$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 10:
-					$shave_act = 'Trim early - bush only'
-					$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-				elseif pubestyle = 11:
-					$shave_act = 'Shave early - pussy only'
-					$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your crotch, grab your razor, and carefully scrape the blade across your still-smooth skin.' 
-					$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pussy is perfectly cleanshaven. Satisfied, you rinse off, pleased with the extra smooth feeling between your legs.'
-				else
-					$shave_act = ''
-				end
-					
-				if $shave_act ! '':
-					act '<<$shave_act>> (0:05)':
+				
+				if (shave_menu = 3 or shave_menu = 1) and pcs_leghair > 0:
+					act'Shave early - Legs only (0:03)':
 						menu_off = 1
 						*clr & cla
-						if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-						if $loc ='gadbana':
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-						elseif pcs_pubes <= 10 and shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-						elseif shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-						elseif shave_length > 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-						else
-							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-						end
-						*nl
-						'<<$shave_txt1>>'
-						*nl
-						'<<$shave_txt2>>'
-						minut += 5
+						minut += 3
 						pcs_leghair = 0
 						stat['leg_hair_growth_timer'] = totminut
-						pcs_pubes = shave_length
-						stat['pube_growth_timer'] = totminut
 						pcs_horny += 5
 						if pcs_shave['free_razor'] = 1:
 							pcs_shave['free_razor'] = 0
 						else
-							mc_inventory['razor'] -=  2
+							mc_inventory['razor'] -= 1
 						end
+						if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
+						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
+						*nl
+						'Inspecting your legs, it''s not really time to shave them yet, but there''s no reason you can''t just do a quick pass right now and save effort later. You lather your legs up and grab your razor. After spending a few minutes methodically shaving away every last hair, your legs are smooth and clean. The feeling of your silky skin turns you on a little.'
 						dynamic $dryOff
 						gs'selfplay','bathtub_dildo_check'
 						gs'selfplay','shower_dildo_check'
 					end
 				end
 			end
-			
-			if (shave_menu = 3 or shave_menu = 1) and pcs_leghair > 0:
-				act'Shave early - Legs only (0:03)':
-					menu_off = 1
-					*clr & cla
-					minut += 3
-					pcs_leghair = 0
-					stat['leg_hair_growth_timer'] = totminut
-					pcs_horny += 5
-					if pcs_shave['free_razor'] = 1:
-						pcs_shave['free_razor'] = 0
-					else
-						mc_inventory['razor'] -= 1
-					end
-					if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
-					*nl
-					'Inspecting your legs, it''s not really time to shave them yet, but there''s no reason you can''t just do a quick pass right now and save effort later. You lather your legs up and grab your razor. After spending a few minutes methodically shaving away every last hair, your legs are smooth and clean. The feeling of your silky skin turns you on a little.'
-					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
-				end
-			end
 		end
 	end
 }
@@ -1166,10 +1168,13 @@ $palelady = {
 if $ARGS[0] = 'private':
 	menu_off = 0
 
-	if mc_inventory['razor'] > 0:'You have enough razors left for <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-	if mc_inventory['razor'] > 0 and mc_inventory['razor'] <= 2 and razor['warning'] < daystart:
-		razor['warning'] = daystart + 5
-		msg'	You''re about to run out of razors!'
+	if lashair ! 1 and mc_inventory['razor'] > 0:
+		'You have enough razors left for <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		if mc_inventory['razor'] <= 2 and razor['warning'] < daystart:
+			razor['warning'] = daystart + 5
+			msg'	You''re about to run out of razors!'
+			!'	You''re about to run out of razors!'
+		end
 	end
 
 	if mc_inventory['chaffing_cream'] > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mc_inventory[''chaffing_cream'']>></b> applications.'
@@ -1299,13 +1304,15 @@ if $ARGS[0] = 'private':
 	dynamic $palelady
 
 
-	if mc_inventory['chaffing_cream'] > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
+	if mc_inventory['chaffing_cream'] > 0 and mosol > 0 and mosal_time <= totminut:
 		act 'Rub ointment onto your pussy (0:05)':
 			cla
-			mosal_time = (daystart * 100) + hour
+			menu_off = 1
+			mosal_time = totminut + 600
 			minut += 5
 			mc_inventory['chaffing_cream'] -= 1
 			mosol -= 5
+			gs 'stat'
 			'You take a tube of cream and rub it onto your itchy vulva.'
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
@@ -1313,7 +1320,7 @@ if $ARGS[0] = 'private':
 	end
 
 	!For now, the pregnancy reactions use bimbolevel as a chack. Once the pregnancy fetish is added to the game, the check will likely change to that.
-	if mc_inventory['pregnancy_test'] > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
+	if knowpreg ! 1 and mc_inventory['pregnancy_test'] > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test (0:05)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/preg_test.jpg"></center>'

+ 340 - 174
locations/dreams.qsrc → locations/dream_events.qsrc

@@ -1,95 +1,306 @@
-# dreams
-
+# dream_events
+$sleep_loc = 'dream_events'
 menu_off = 1
 
-if $ARGS[0] = 'start':
-	if stepdadqw = 3:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_1.jpg"></center>'
-		'You had a very strange dream: You were blindfolded while having sex with a stranger. When you were done, you removed the blindfold to see your stepfather grinning at you.'
-		pcs_horny = 100
-		stepdadqw += 1
-	elseif canBraidHair = 0 and mid($start_type,1,2) ! 'sg' and pcs_hairlng > 80:
-		canBraidHair = 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
-		'You dream about the time your sister taught you how to braid your hair. It was one of the more memorable sister bonding moments the two of you had not long before you moved out.'
-	elseif succubusQW = 1 or succubusQW = 2:
-		!this is for initial dream and a reoccuring dream if the feeling was ignored
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/succubdream.jpg"></center>'
-		if succubusQW = 1:
-			'You dream of sex with multiple partners, absorbing energy from each of them.'
-		else
-			'You have the same dream of absorbing energy from multiple partners.'
+!! Dream events trigger after deciding to go to sleep, but before any time has advanced.
+!! Note that dreams are supposed to stick on the screen during the sleep cycle. So only use xgt and gs!!
+!!
+!! Moved here from pre_sleep
+!! When done: Move to sleep
+
+	!!=====================================!!
+	!!                                     !!
+	!!          Event handlers             !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	menu_off = 1
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+
+	if sleepVars['dreams_active'] = 1:
+		sleepVars['events_done'] = 0
+
+		if stepdadQW = 3:
+			$sleep_events_priority[] = 'gs ''dream_events'', ''stepdad_dream'' '
 		end
-		succubusQW = 2
-		pcs_horny = 100
-	elseif rand(1,100) > Enable_nodream:
-		!nodream chance cheat
-		if hypnoTime > rand(0,3):
-			haveHypnoDream = 1
-		else
-		haveHypnoDream = 0
+		if canBraidHair = 0 and mid($start_type, 1, 2) ! 'sg' and pcs_hairlng > 80:
+			$sleep_events_priority[] = 'gs ''dream_events'', ''braid_hair_dream'' '
+		end
+		if succubusQW = 1 or succubusQW = 2:
+			!this is for initial dream and a reoccuring dream if the feeling was ignored
+			$sleep_events_priority[] = 'gs ''dream_events'', ''succubus_dream'' '
 		end
-		if pcs_horny > 50:
-			!erotic dream
-			if pcs_vag = 0 and stat['think_virgin'] = 1 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and stat['cuni'] = 0 and girl = 0 and guy = 0:
-				!dreams only for virgin
-				ivrand = rand(1,5)
-			elseif haveHypnoDream = 1:
+
+		if rand(1, 100) <= sleepVars['cheat_nodream_chance']:
+			!nodream chance cheat
+			$sleep_events[] = 'gs ''dream_events'', ''no_dream'' '
+		else
+			if pcs_horny <= 50:
+				$sleep_events[] = 'gs ''dream_events'', ''d_dream_switch'' '
+			elseif rand(0, 3) < hypnoTime:
 				!dreams for hypnotized girls
-				gs 'dreams', 'hypno_dreams'
-			elseif succubusflag = 1:
-				ivsuctmp = 6 + succublvl
-				ivrand = rand(1,ivsuctmp)
+				$sleep_events[] = 'gs ''dream_events'', ''hypno_dream_switch'' '
 			else
-				ivrand = rand(1,6)
-			end
-			if haveHypnoDream = 0:
-				if ivrand = 1:
-					gs 'dreams','d_dreams'
-				elseif ivrand = 2:
-					gs 'dreams','ero_dreams'
-				elseif ivrand = 3:
-					gs 'dreams','sex_dreams'
-				elseif ivrand = 4:
-					gs 'dreams','bj_dreams'
-				elseif ivrand = 5:
-					gs 'dreams','anal_dreams'
-				elseif ivrand = 6:
-					gs 'dreams','gang_dreams'
-				elseif ivrand >= 7 and ivrand <= ivsuctmp:
-					gs 'dreams','succub_dreams'
-				end
+				!erotic dream
+				$sleep_events[] = 'gs ''dream_events'', ''erotic_dream_switch'' '
 			end
-		else
-			gs 'dreams','d_dreams'
 		end
+
+		gt 'dream_events', 'mod_events'
+	end
+
+	xgt 'dream_events', 'continue'
+end
+
+if $ARGS[0] = 'mod_events':
+	!! This location is here to allow mods to hook into the system.
+	!! Either check for: if $sleep_loc = 'dream_events' and $ARGS[0] = 'mod_events'
+	!!
+	!! You can add events as: $sleep_events[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!! A random event will be chosen from amongst the added ones.
+	!! If an event MUST trigger (due to quest timing), add it tp $sleep_events_priority[] = 'gs ''mod_loc'' ''mod_args0'' '
+	!!
+	!! If the event does not break the sleep cycle (merely interupts it) it needs to end with gs 'dream_events', 'event_end'
+	!! If the event removed Sveta from her location (aka her sleep is cut short and/or she leaves her bed), you must call gs 'dream_events', 'exit'
+	!!
+	!! This is to cleanup all necessary variables.
+	!!
+	!! DO NOT DIRECTLY GOTO/GOSUB OUTOF THIS LOCATION. ALWAYS ADD IT TO THE QUEUEs!!!!
+	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
+
+	gt 'dream_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'event_handler':
+	if sleepVars['events_done'] < 1:
+		if arrsize('$sleep_events_priority') > 0:
+			xgt 'dream_events', 'event_handler2', 'priority'
+		elseif arrsize('$sleep_events') > 0:
+			xgt 'dream_events', 'event_handler2'
+		end
+	end
+
+	xgt 'dream_events', 'continue'
+end
+
+if $ARGS[0] = 'event_handler2':
+	sleepVars['events_done'] += 1
+
+	if $ARGS[1] = 'priority':
+		temp_slev_id = rand(0, arrsize('$sleep_events_priority')-1)
+		$temp_sleep_event_chosen = $sleep_events_priority[temp_slev_id]
+		killvar '$sleep_events_priority', temp_slev_id
 	else
-		if $start_type[1] = 'tg':
-			temp = rand(1,10)
-			if temp = 1:
-				'You have hazy dreams about your past.'
-			elseif temp = 2:
-				'You dream about the moon looking at the world with his one bloody eye.'
-			elseif temp = 3:
-				'You dream that you are a man again.'
-			else
-				'You sleep without dreaming.'
-			end
+		temp_slev_id = rand(0, arrsize('$sleep_events')-1)
+		$temp_sleep_event_chosen = $sleep_events[temp_slev_id]
+		killvar '$sleep_events', temp_slev_id
+	end
+
+	killvar 'temp_slev_id'
+	dynamic $temp_sleep_event_chosen
+end
+
+
+if $ARGS[0] = 'event_end':
+	killvar '$temp_sleep_event_chosen'
+
+!!	if arrsize('$sleep_events_priority') > 0:
+!!		gt 'bed_events', 'event_handler2', 'priority'
+!!	end
+
+	xgt 'dream_events', 'event_handler'
+end
+
+
+if $ARGS[0] = 'exit':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+end
+
+if $ARGS[0] = 'continue':
+	sleepVars['events_done'] = 0
+	killvar '$sleep_loc'
+	killvar '$sleep_events'
+	killvar '$sleep_events_priority'
+	killvar 'temp_slev_id'
+	killvar '$temp_sleep_event_chosen'
+
+	xgt 'sleep', 'start'
+end
+
+
+
+
+	!!=====================================!!
+	!!                                     !!
+	!!              Events                 !!
+	!!                                     !!
+	!!=====================================!!
+
+
+if $ARGS[0] = 'stepdad_dream':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_1.jpg"></center>'
+	'You had a very strange dream: You were blindfolded while having sex with a stranger. When you were done, you removed the blindfold to see your stepfather grinning at you.'
+	pcs_horny = 100
+	stepdadQW += 1
+	gs 'dream_events', 'event_end'
+end
+
+if $ARGS[0] = 'braid_hair_dream':
+	canBraidHair = 1
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
+	'You dream about the time your sister taught you how to braid your hair. It was one of the more memorable sister bonding moments the two of you had not long before you moved out.'
+	gs 'dream_events', 'event_end'
+end
+
+if $ARGS[0] = 'succubus_dream':
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/succubdream.jpg"></center>'
+	if succubusQW = 1:
+		'You dream of sex with multiple partners, absorbing energy from each of them.'
+	else
+		'You have the same dream of absorbing energy from multiple partners.'
+	end
+	succubusQW = 2
+	pcs_horny = 100
+	gs 'dream_events', 'event_end'
+end
+
+
+if $ARGS[0] = 'no_dream':
+	if $start_type[1] = 'tg':
+		temp = rand(1,10)
+		if temp = 1:
+			'You have hazy dreams about your past.'
+		elseif temp = 2:
+			'You dream about the moon looking at the world with his one bloody eye.'
+		elseif temp = 3:
+			'You dream that you are a man again.'
 		else
 			'You sleep without dreaming.'
-		end   
+		end
+	else
+		'You sleep without dreaming.'
 	end
-	exit
+	gs 'dream_events', 'event_end'
 end
 
-if $ARGS[0] = 'hypno_dreams':
+
+
+!!----------------------------Erotic Dreams----------------------------------------------------------------!!
+
+if $ARGS[0] = 'erotic_dream_switch':
+	if pcs_horny <= 50:
+		gs 'dream_events', 'd_dream_switch'
+
+	elseif rand(0, 3) < hypnoTime:
+		!dreams for hypnotized girls
+		gs 'dream_events', 'hypno_dream_switch'
+
+	else
+		!erotic dream
+		if pcs_vag = 0 and stat['think_virgin'] = 1 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and stat['cuni'] = 0 and girl = 0 and guy = 0:
+			!dreams only for virgin
+			ivrand = rand(1, 5)
+
+		else
+			ivrand = rand(1, 6 + succublvl)
+		end
+
+		if ivrand = 1:
+			gs 'dream_events', 'd_dream_switch'
+		elseif ivrand = 2:
+			gs 'dream_events', 'ero_dreams'
+		elseif ivrand = 3:
+			gs 'dream_events', 'sex_dreams'
+		elseif ivrand = 4:
+			gs 'dream_events', 'bj_dreams'
+		elseif ivrand = 5:
+			gs 'dream_events', 'anal_dreams'
+		elseif ivrand = 6:
+			gs 'dream_events', 'gang_dreams'
+		else
+			gs 'dream_events', 'succub_dreams'
+		end
+
+		killvar 'ivrand'
+	end
+	gs 'dream_events', 'event_end'
+end
+
+
+if $ARGS[0] = 'd_dream_switch':
+	!! Roll between 1 and 12 if ClownQW = 0 and between 1 and 13 if clownQW = 1.
+	if clownQW = 1:
+		gs 'dream_events', 'd_dreams', rand(1, 13)
+	else
+		gs 'dream_events', 'd_dreams', rand(1, 12)
+	end
+	gs 'dream_events', 'event_end'
+end
+
+if $ARGS[0] = 'hypno_dream_switch':
 	if therapistFuckedPussyStage < 1:
-		ivrand = rand(1,2)
+		gs 'dream_events', 'hypno_dreams', rand(1, 2)
 	else
-		ivrand = rand(1,7)
+		gs 'dream_events', 'hypno_dreams', rand(1, 7)
 	end
-	
-	if ivrand = 1:
+	gs 'dream_events', 'event_end'
+end
+
+if $ARGS[0] = 'd_dreams':
+	!random dreams about nothing
+	if ARGS[1] = 1:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream1.jpg"></center>'
+		'You dream about an old town, standing on the opposite shores of high falls. Between its steeples fly strange creatures.'
+	elseif ARGS[1] = 2:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream2.jpg"></center>'
+		'You dream about a tower, standing on frozen rocks, covered in snow and ice.'
+	elseif ARGS[1] = 3:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream3.jpg"></center>'
+		'You dream about an ice mountain, on top of which stands a strange building, almost like a monastery.'
+	elseif ARGS[1] = 4:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream4.jpg"></center>'
+		'You dream about an unknown girl, running in the pouring rain on a dark and narrow street.'
+	elseif ARGS[1] = 5:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream5.jpg"></center>'
+		'You dream about your smiling mother standing in a room full of old things from the past. Strange. What could it mean?'
+	elseif ARGS[1] = 6:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream6.jpg"></center>'
+		'You dream about a rider, standing by the lake, surrounded by high and steep mountains.'
+	elseif ARGS[1] = 7:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream7.jpg"></center>'
+		'You dream about a scary man with charred skin, holding a strange creature on a chain, ready to fight a white haired middle-aged guy with a sword in his hand. It''s probably time to stop watching TV before bed...'
+	elseif ARGS[1] = 8:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream8.jpg"></center>'
+		'You dream about the white-haired guy again, but he''s noticeably aged and has a thick beard. Next to him stands a beautiful white haired girl. Maybe it''s his daughter?'
+	elseif ARGS[1] = 9:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream9.jpg"></center>'
+		'You dream about standing in a street among other people, looking at a nuclear explosion. It''s really scary!'
+	elseif ARGS[1] = 10:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream10.jpg"></center>'
+		'You dream about a futuristic looking street littered with garbage.'
+	elseif ARGS[1] = 11:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream11.jpg"></center>'
+		'You dream about a beautiful and majestic cathedral on the banks of the river.'
+	elseif ARGS[1] = 12:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream12.jpg"></center>'
+		'You dream about being at a lake in the winter watching a dark figure. He''s standing in a pavilion in the middle of the lake, the pale light of the moon giving the scene an eerie aura.'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream13.jpg"></center>'
+		'You had a nightmare about a scary clown that tries to lure you into the sewers.'
+	end
+end
+
+if $ARGS[0] = 'hypno_dreams':
+	if ARGS[1] = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolSitBlow2.mp4"></video></center>'
 		'You dream that you''re sucking someone''s cock.'
 		if guy = 0:
@@ -97,7 +308,7 @@ if $ARGS[0] = 'hypno_dreams':
 		else
 			'It almost feel real, like you''re actually sucking cock, and it feels good! However, you can''t will yourself to look up and see whose dick you''re sucking.'
 		end
-	elseif ivrand = 2:
+	elseif ARGS[1] = 2:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/throatFuck1.mp4"></video></center>'
 		'You dream that your throat is being fucked hard and deep. It hurts and you can''t breathe, but you just sit still and allow yourself to be used. The man''s balls rythmically slap against your face as he buries his cock into your throat.'
 		if guy = 0:
@@ -105,7 +316,7 @@ if $ARGS[0] = 'hypno_dreams':
 		else
 			'It almost feels real, like you actually have a huge cock down your throat! Your throat hurts, but for some reason you feel like you''re on the edge of an orgasm. You can''t tell who''s fucking you though.'
 		end
-	elseif ivrand = 3:
+	elseif ARGS[1] = 3:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoAnalPiledriver1.mp4"></video></center>'
 		'You dream that you''re being fucked hard in your ass. Your legs are pulled up over your head and you''re desperately stimulating your clit.'
 		if guy = 0:
@@ -113,7 +324,7 @@ if $ARGS[0] = 'hypno_dreams':
 		else
 			'It almost feels real, like you''re actually getting your ass rammed full of cock. It feels great, but you can''t tell who''s fucking you.'
 		end
-	elseif ivrand = 4:
+	elseif ARGS[1] = 4:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoRide4.mp4"></video></center>'
 		
 		if dreamedOfTherapistFucking = 2:
@@ -126,7 +337,7 @@ if $ARGS[0] = 'hypno_dreams':
 				'It almost feels real, like you''re actually riding someone''s huge cock! You can''t will yourself to turn and look at who you''re riding though.'
 			end
 		end
-	elseif ivrand = 5:
+	elseif ARGS[1] = 5:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoFuckCouchKneel1.mp4"></video></center>'
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you''re being fucked hard from behind by your therapist.'
@@ -139,7 +350,7 @@ if $ARGS[0] = 'hypno_dreams':
 				'It almost feels real, like you''re actually getting your pussy rammed full of cock and it feels great! You can''t tell who''s fucking you and you can''t will yourself to look behind you.'
 			end
 		end
-	elseif ivrand = 6:
+	elseif ARGS[1] = 6:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolDoggy3.mp4"></video></center>'
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you are being fucked hard from behind by your therapist as your hands are being held behind your back.'
@@ -152,12 +363,12 @@ if $ARGS[0] = 'hypno_dreams':
 				'It almost feels real, like your actually getting your pussy rammed full of cock and it feels great! You can''t tell who''s fucking you and you can''t will yourself to look behind you.'
 			end
 		end
-	elseif ivrand = 7:
+	else
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack1.mp4"></video></center>'
-		if dreamedOfTherapistFucking <= 0:dreamedOfTherapistFucking = 1
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you''re being fucked hard in the pussy by your therapist. You spread your legs as wide as you can so his cock can go as deep as possible. It feels amazing.'
 		else
+			if dreamedOfTherapistFucking <= 0: dreamedOfTherapistFucking = 1
 			'You dream that you''re being fucked hard in the pussy. You''re spreading and holding your legs as wide as possible so their cock goes as deep as possible.'
 			if guy = 0:
 				'You''ve never had sex before, but it feels amazing! You try to focus and realize... your therapist is fucking you?'
@@ -166,7 +377,9 @@ if $ARGS[0] = 'hypno_dreams':
 			end
 		end
 	end
-	''
+
+	*nl
+
 	if guy = 0:
 		'You wake up feeling strange and excited. Even though you''ve never had sex, the dream felt very real.'
 	elseif pcs_vag > 0 and stat['vaginal'] = 0:
@@ -181,55 +394,6 @@ if $ARGS[0] = 'hypno_dreams':
 	end
 end
 
-if $ARGS[0] = 'd_dreams':
-	!random dreams about nothing
-	if ClownQW = 1:
-		ivrand = rand(1,13)
-	else
-		ivrand = rand(1,12)
-	end
-	if ivrand = 1:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream1.jpg"></center>'
-		'You dream about an old town, standing on the opposite shores of high falls. Between its steeples fly strange creatures.'
-	elseif ivrand = 2:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream2.jpg"></center>'
-		'You dream about a tower, standing on frozen rocks, covered in snow and ice.'
-	elseif ivrand = 3:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream3.jpg"></center>'
-		'You dream about an ice mountain, on top of which stands a strange building, almost like a monastery.'
-	elseif ivrand = 4:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream4.jpg"></center>'
-		'You dream about an unknown girl, running in the pouring rain on a dark and narrow street.'
-	elseif ivrand = 5:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream5.jpg"></center>'
-		'You dream about your smiling mother standing in a room full of old things from the past. Strange. What could it mean?'
-	elseif ivrand = 6:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream6.jpg"></center>'
-		'You dream about a rider, standing by the lake, surrounded by high and steep mountains.'
-	elseif ivrand = 7:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream7.jpg"></center>'
-		'You dream about a scary man with charred skin, holding a strange creature on a chain, ready to fight a white haired middle-aged guy with a sword in his hand. It''s probably time to stop watching TV before bed...'
-	elseif ivrand = 8:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream8.jpg"></center>'
-		'You dream about the white-haired guy again, but he''s noticeably aged and has a thick beard. Next to him stands a beautiful white haired girl. Maybe it''s his daughter?'
-	elseif ivrand = 9:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream9.jpg"></center>'
-		'You dream about standing in a street among other people, looking at a nuclear explosion. It''s really scary!'
-	elseif ivrand = 10:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream10.jpg"></center>'
-		'You dream about a futuristic looking street littered with garbage.'
-	elseif ivrand = 11:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream11.jpg"></center>'
-		'You dream about a beautiful and majestic cathedral on the banks of the river.'
-	elseif ivrand = 12:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream12.jpg"></center>'
-		'You dream about being at a lake in the winter watching a dark figure. He''s standing in a pavilion in the middle of the lake, the pale light of the moon giving the scene an eerie aura.'
-	elseif ivrand = 13:
-		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/dream13.jpg"></center>'
-		'You had a nightmare about a scary clown that tries to lure you into the sewers.'
-	end
-	exit
-end
 
 if $ARGS[0] = 'sex_dreams':
 	!only vaginal sex
@@ -251,6 +415,8 @@ if $ARGS[0] = 'sex_dreams':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex5.jpg"></center>'
 		'You dream that you''re sitting on top of a guy, bouncing up and down on his cock.'
 	end
+	killvar 'ivrand'
+
 	if stat['think_virgin'] = 1:
 		'You wake up feeling strange and excited. Even though you''ve never had sex, the dream felt very real.'
 	elseif pcs_vag > 0 and stat['vaginal'] = 0:
@@ -258,19 +424,18 @@ if $ARGS[0] = 'sex_dreams':
 	else
 		'It seems your <<$vaginatipe>> pussy urgently needs some attention.'
 	end
-	exit
 end
 
 if $ARGS[0] = 'anal_dreams':
 	!only anal sex
-	ivrand = rand(1,2)
-	if ivrand = 1:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/anal1.jpg"></center>'
 		'You dream that you''re bent over as a man rhythmically pumps your ass with his cock while you caress your clit.'
-	elseif ivrand = 2:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/anal2.jpg"></center>'
 		'You dream that you''re laying on your side as a guy fucks your ass. You moan loudly from the sensation.'
 	end
+	
 	if stat['anal'] = 0 and pcs_ass = 0:
 		'You wake up feeling strange and excited. Even though you''ve never had anal sex, the dream felt very real.'
 	elseif stat['anal'] = 0:
@@ -278,30 +443,28 @@ if $ARGS[0] = 'anal_dreams':
 	else
 		'It seems your <<$anustipe>> anus urgently needs some attention.'
 	end
-	exit
 end
 
 if $ARGS[0] = 'bj_dreams':
 	!only Blowjob
-	ivrand = rand(1,2)
-	if ivrand = 1:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/bj1.jpg"></center>'
 		'You dream about sucking a guy''s dick during sunset near the ocean.'
-	elseif ivrand = 2:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/bj2.jpg"></center>'
 		'You have a dream where you''re tied to a staircase, squatting down with your legs wide open sucking and savouring the dick of a guy dressed in an expensive looking suit.'
 	end
+
 	if stat['bj'] = 0:
 		'You''ve never given anyone a blowjob before, but the feeling of the dick in your mouth felt very real. The dream has excited you a little.'
 	else
 		'It seems you subconsciously want to suck a dick...'
 	end
-	exit
 end
 
 if $ARGS[0] = 'ero_dreams':
 	!only erotica
-	ivrand = rand(1,5)
+	ivrand = rand(1, 5)
 	if ivrand = 1:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/ero1.jpg"></center>'
 		'You dream that you''re at a school where all the girls are required to attend lessons naked.'
@@ -318,45 +481,50 @@ if $ARGS[0] = 'ero_dreams':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/ero5.jpg"></center>'
 		'You dream that you''re naked while making out with a stranger.'
 	end
-	exit
+	killvar 'ivrand'
 end
 
 if $ARGS[0] = 'gang_dreams':
 	!only Gangbang
-	ivrand = rand(1,2)
-	if ivrand = 1:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/gang1.jpg"></center>'
 		'You dream about two men fucking you. You''re lying between them sucking one of them while the other is fucking your ass.'
-	elseif ivrand = 2:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/gang2.jpg"></center>'
 		'You dream that you''re in-between two hot guys as one fucks your pussy and the other fucks your ass. Both of them fuck you with force, causing you to moan loudly with pleasure.'
 	end
-	if stat['think_virgin'] = 1 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and gang = 0 and guy = 0 and girl = 0:
-		'You haven''t even had normal sex, least of all a threesome. Even though you''re excited, the dream still scared you a little.'
-	elseif stat['vaginal'] > 0 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and gang = 0:
-		'Even though you''ve had sex, the thought of a gangbang, even in a dream, is a little alarming.'
-	elseif pcs_vag = 0 and stat['vaginal'] = 0 and pcs_ass > 0 and gang = 0 and guy > 0 and girl = 0:
-		'Even though you''re technically still a virgin, the thought of a gangbang, even in a dream, is a little alarming.'
-	elseif pcs_ass = 0 and stat['anal'] = 0 and gang = 0 and guy > 0 and girl = 0:
-		'It seems that, in your dreams, one guy at a time is not enough...'
-	elseif gang > 0 and guy > 0 and girl = 0:
-		'It seems that your experience with swinging with a few guys was not in vain and your subconscious is actively reminding you about it.'
-	elseif gang > 0 and guy = 0 and girl > 0:
-		'It seems that your experience with swinging with several girls was not in vain and your subconscious is actively reminding you about it.'
-	elseif gang > 0 and guy > 0 and girl > 0:
-		'It seems that your experience with swinging was not in vain and your subconscious is actively reminding you about it.'
+
+	if gang = 0:
+		if stat['think_virgin'] = 1 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and guy = 0 and girl = 0:
+			'You haven''t even had normal sex, least of all a threesome. Even though you''re excited, the dream still scared you a little.'
+		elseif stat['vaginal'] > 0 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0:
+			'Even though you''ve had sex, the thought of a gangbang, even in a dream, is a little alarming.'
+		elseif pcs_vag = 0 and stat['vaginal'] = 0 and pcs_ass > 0 and guy > 0 and girl = 0:
+			'Even though you''re technically still a virgin, the thought of a gangbang, even in a dream, is a little alarming.'
+		elseif pcs_ass = 0 and stat['anal'] = 0 and guy > 0 and girl = 0:
+			'It seems that, in your dreams, one guy at a time is not enough...'
+		else
+			'The dream felt very real and left you feeling a little excited.'
+		end
 	else
-		'The dream felt very real and left you feeling a little excited.'
+		if guy > 0 and girl = 0:
+			'It seems that your experience with swinging with a few guys was not in vain and your subconscious is actively reminding you about it.'
+		elseif guy = 0 and girl > 0:
+			'It seems that your experience with swinging with several girls was not in vain and your subconscious is actively reminding you about it.'
+		elseif guy > 0 and girl > 0:
+			'It seems that your experience with swinging was not in vain and your subconscious is actively reminding you about it.'
+		else
+			'The dream felt very real and left you feeling a little excited.'
+		end
 	end
-	exit
 end
 
 if $ARGS[0] = 'succub_dreams':
 !!Succubus dreams
 	if sucpcinfo < 4:
-		ivrand = rand(1,5)
+		ivrand = rand(1, 5)
 	else
-		ivrand = rand (2,5)
+		ivrand = rand (2, 5)
 	end
 
 	if ivrand = 1:
@@ -367,12 +535,10 @@ if $ARGS[0] = 'succub_dreams':
 		else
 			'and that you have become something inhuman!'
 		end
-	end
-	if ivrand = 2:
+	elseif ivrand = 2:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sucrandream2.jpg"></center>'
 		'You dream that you were victorious over Toby and the entire Order of Dawn.'
-	end
-	if ivrand = 3:
+	elseif ivrand = 3:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sucrandream3.jpg"></center>'
 		if succublvl < 3:
 			$sucselftmp = 'a personification of <<$sucself1>> in your core'
@@ -381,13 +547,11 @@ if $ARGS[0] = 'succub_dreams':
 		end
 		'You dream that you''re arguing with <<$sucselftmp>>.'
 		'You don''t know what it''s about, but you think you won...'
-	end
-	if ivrand = 4:
+	elseif ivrand = 4:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sucrandream4.jpg"></center>'
 		'You dream that you''re walking through a crowded convention hall filled with people in costumes.'
 		'You don''t know why you''re here until you see <i>her</i>, then you just <b>know</b>. You''re here for <b>reproduction</b>!'
-	end
-	if ivrand = 5:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sucrandream5.jpg"></center>'
 		'You dream about an encounter with another succubus on <i>your</i> territory!'
 		if succhungry < (0 - 1 - succublvl):
@@ -396,8 +560,10 @@ if $ARGS[0] = 'succub_dreams':
 			'You can''t allow that!'
 		end
 	end
-	exit
+	killvar 'ivrand'
 end
 
---- dreams ---------------------------------
 
+
+
+--- dream_events ---------------------------------

+ 31 - 0
locations/femcyc.qsrc

@@ -461,6 +461,37 @@ if $ARGS[0] = '':
 	elseif cycle = 5:
 		gs 'femcyc', 'preg'
 	end
+	
+	stat['safe_day'] = 0
+	stat['probably_safe_day'] = 0
+	stat['dangerous_day'] = 0
+
+	if cycle = 0 or cycle = 3:
+		stat['safe_day'] = 1
+	elseif cycle = 0 or cycle = 3:
+		stat['probably_safe_day'] = 1
+	else
+		stat['dangerous_day'] = 1
+	end
+
+
+!!	if cycle = 1 or lastmens >= daystart - 7:
+	!! this is using real life calendar method of predicting that if your period is day 1 of your cycle:
+	!! days 1-7 is probably safe for sex
+	!! days 8-19 is considered to be fertile
+	!! day 20 until your period is considered safe
+	!! this is not checking against the actual code of how fertility works in this game because i can''t figure it out. but that''s the risk you take for using the calendar method instead of real birth control :P - hornguy6
+!!	if daylastperiod >= daystart - 7:
+!!		stat['probably_safe_day'] = 1
+!!	elseif daylastperiod >= daystart - 19:
+!!		stat['dangerous_day'] = 1
+!!	else
+!!		stat['safe_day'] = 1
+!!	end
+	
+!!	other variable hornguy was experimenting with
+!!	if lastmens >= daystart - 7:
+!!	elseif lastmens >= daystart - 19:
 
 	dynamic $d_cycreport_update
 end

+ 157 - 113
locations/fertility.qsrc

@@ -1,6 +1,5 @@
 # fertility
 
-if $ARGS[0] = 'birth_control':
 !!------------------------------------------------------------------------------------------------------------
 !!	Birth control
 !!------------------------------------------------------------------------------------------------------------
@@ -10,7 +9,7 @@ if $ARGS[0] = 'birth_control':
 !!	tabletkiap		: Autopill factor affecting the liklihood you took your pill as you should have
 !!	tabletkipt		: Pill Dicipline Take increase
 !!	tabletkipi		: Pill Dicipline Dont take increase
-!!	tabletkicpd		: Current MC Pill Dicipline
+!!	tabletkipd		: Current MC Pill Dicipline
 !!	tabletkichday	: Current day that the Birth Control is being evaluated for
 !!	tabletkicheck	: If the birth control from shot (2) or pill (1)
 !!	mc_inventory['contraceptive_pill']	: How many packages of Birth Control Pills there are
@@ -24,104 +23,28 @@ if $ARGS[0] = 'birth_control':
 !!	pillcon			: The number for the current birth control chemical level.
 !!	pilldays		: The number of consecutive days (you believe) you have taken your pill
 
-	if Luth > (LutH_Max-75) and placebopart <= 0: placebopart = 8
-	placebopart -= 1
-
-	if tabletkishot <= 0: pillcon -= 1000 & pillcon2 -= 1000
-	if pillcon < 0:	pillcon = 0
-	if pillcon2 < 0: pillcon2 = 0
-
-	if tabletkicheck = 2:
-		if tabletkishot ! 0:
-			!!cycle = 1
-			mesec = 0
-			if rand(0,1000) = 1000:
-				EggRH = rand(20,80)
-			else
-				EggRH = 0
-			end
-			FocH = EggRH
-		end
-		if tabletkishot <= 0:
-			pillcon -= 29000
-			pillcon2 -= 29000
-			if tabletkishot < 0: tabletkishot = 0
-		end
-		if shotdays < 2:
-			tabletkicheck = 0
-			'Your birth control shot is no longer protecting you.'
-		elseif shotdays < 10:
-			'Your birth control shot is past due for renewal. The chemicals regulating your fertility cycle are wearing off.'
-		elseif shotdays > 10 and shotdays < 14:
-			'You are due for a birth control shot soon if you do not get one, you might get pregnant.'
-		elseif shotdays = 10:
-			'Your birth control shot is due for renewal tomorrow.'
-		end
-	end
-	!! dropped the decrement out of the above if-statement so that players on pill would still run out of BC shot
-	!! as in for example the case of the therapist forcing you on the pill while you already had the shot.
-	if tabletkishot > 0:tabletkishot -= 1
-	if shotdays > 0:shotdays -=1
-
-	!! birth_control['implant_status']
-	!! 0: No implant
-	!! 3: Implant (more than 30 days left)
-	!! 2: Implant (less than 30 days left)
-	!! 1: Empty implant
-	if $spellTarget['birth_control'] = 'self':
-		pillcon = 40000
-		pillcon2 = 40000
-		spellTime['birth_control'] -= 1
-		if spellTime['birth_control'] > 0 and spellTime['birth_control'] < 30:
-			birth_control['implant_status'] = 2
-			'Your birth control spell will only last for <<spellTime[''birth_control'']>> more'+iif(spellTime['birth_control'] = 1, 'day.', 'days.')
-		elseif spellTime['birth_control'] < 1:
-			$spellTarget['birth_control'] = ''
-			pillcon = 0
-			pillcon2 = 0
-			'Your birth control spell has ended. You''ll need to recast it if you don''t want to get pregnant.'
-		end
-	elseif birth_control['implant_status'] > 1:
-		pcs_skin += rand(0,1)
-		
-		pillcon += ((pillcon + 15000) / 25) + 4000
-		if pillcon > 40000: pillcon = 40000
-		
-		pillcon2 += ((pillcon2 + 15000) / 25) + 4000
-		if pillcon2 > 40000: pillcon2 = 40000
-			
-		birth_control['implant_timer'] -= 1
-		if (birth_control['implant_timer'] - 1090) > 0:
-			gs 'pain', '<<(birth_control[''implant_timer''] - 1090)*2>>', 'armL', 'ache'
-		elseif birth_control['implant_timer'] > 0 and birth_control['implant_timer'] < 30:
-			birth_control['implant_status'] = 2
-			'Your birth control implant is only good for <<birth_control[''implant_timer'']>> more'+iif(birth_control['implant_timer'] = 1, 'day.', 'days.')
-		elseif birth_control['implant_timer'] < 0:
-			birth_control['implant_status'] = 1
-			'You should renew or remove your birth control implant.'
-		end
-	elseif birth_control['implant_status'] = 1:
-		'You should renew or remove your birth control implant.'
-	end
+if $ARGS[0] = 'auto_pill' and tabletkichday < daystart:
+	tabletkichday = daystart
 
 	tabletkipd += tabletkipi
 	tabletkipi = 0
 	tabletkipt = 0
+
 	if tabletkicheck = 1:
+		$temp_img = '<img height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"><br>'
 		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			tabletkicheck = 0
-			'You are out of birth control pills.'
+			gs 'notification', 'add', '<<$temp_img>>You are out of birth control pills.'
 			tabletkipi = -5
+			jump 'auto_pill_break_goto'
 		elseif mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 28:
-			'You have just opened your last package of birth control pills. You need to buy more.'
+			gs 'notification', 'add', '<<$temp_img>>You have just opened your last package of birth control pills. You need to buy more.'
 		elseif mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] <= 5:
-			'You are running out of birth control pills, you only have a few left.'
+			gs 'notification', 'add', '<<$temp_img>>You are running out of birth control pills, you only have a few left.'
 		end
-	end
 
-	if tabletkicheck = 1 and tabletkichday < daystart:
 		birth_control['using_bc'] = 3
-		tabletkichday = daystart
+
 		tabletkimm = (100*(pcs_willpwr / willpowermax)) + pcs_mood
 		if pcs_sleep < 10:
 			tabletkimm -= (100- (pcs_sleep * 10))
@@ -139,13 +62,17 @@ if $ARGS[0] = 'birth_control':
 		if tabletkiap < 300:
 			if tabletkipd > -10:
 				if pcs_willpwr < willpowermax / 4:
-					'You stare at your package of birth control pills, you know you should take one but you can''t quite work up enough effort to care.'
+					!msg 'You stare at your package of birth control pills, you know you should take one but you can''t quite work up enough effort to care.'
+					gs 'notification', 'add', '<<$temp_img>>You stare at your package of birth control pills, you know you should take one but you can''t quite work up enough effort to care.'
 				elseif pcs_mood < 10:
-					'You stare at your package of birth control pills, but you don''t open it.'
+					!msg 'You stare at your package of birth control pills, but you don''t open it.'
+					gs 'notification', 'add', '<<$temp_img>>You stare at your package of birth control pills, but you don''t open it.'
 				elseif pcs_sleep < 10:
-					'You fumble with your birth control pills, trying to get a pill out. You finally give up too tired to manage it.'
+					!msg 'You fumble with your birth control pills, trying to get a pill out. You finally give up too tired to manage it.'
+					gs 'notification', 'add', '<<$temp_img>>You fumble with your birth control pills, trying to get a pill out. You finally give up too tired to manage it.'
 				else
-					'You just realized you forgot to take your birth control pill today.'
+					!msg 'You just realized you forgot to take your birth control pill today.'
+					gs 'notification', 'add', '<<$temp_img>>You just realized you forgot to take your birth control pill today.'
 				end
 			end
 			tabletkipt = 2
@@ -168,27 +95,27 @@ if $ARGS[0] = 'birth_control':
 				end
 
 				if tabletkipd > -10:
-					'You find yourself holding the bottle of birth control pills, you cannot remember if you took one or not.'
+					gs 'notification', 'add', '<<$temp_img>>You find yourself holding the bottle of birth control pills, you cannot remember if you took one or not.'
 				end
 				if tabletkipd > 0:
 					if rand(0,9) = 0:
 						if tabletkipt < 0:
-							'You don''t think you have taken your pill today.'
+							gs 'notification', 'add', '<<$temp_img>>You don''t think you have taken your pill today.'
 						else
 							pilldaychk = daystart
-							'You think you have taken your pill today.'
+							gs 'notification', 'add', '<<$temp_img>>You think you have taken your pill today.'
 						end
 					else
 						if tabletkipt > 0:
-							'You don''t think you have taken your pill today.'
+							gs 'notification', 'add', '<<$temp_img>>You don''t think you have taken your pill today.'
 						else
 							pilldaychk = daystart
-							'You think you have taken your pill today.'
+							gs 'notification', 'add', '<<$temp_img>>You think you have taken your pill today.'
 						end
 					end
 				end
 			else
-				'You take your birth control pill for the day.'
+				gs 'notification', 'add', '<<$temp_img>>You take your birth control pill for the day.'
 				pilldaychk = daystart
 				gs 'din_bad','takepill'
 				if rand(0,7) = 0 and tabletkiday >= (daystart - 1): tabletkipd += 1
@@ -197,40 +124,157 @@ if $ARGS[0] = 'birth_control':
 				tabletkipi = 0
 			end
 		end
-	elseif tabletkicheck = 0:
-		if tabletkiday >= (daystart - 1) and tabletkipt = 0 and rand(0,7) = 0: tabletkipt = 1
-		if pillcon > 0 and tabletkipi = 0 and rand(0,3) = 0 and (tabletkiday + 15) > daystart = 0: tabletkipi = -1
 	end
 
-	if pilldaychk = daystart:
-		pilldays += 1
-		birth_control['using_bc'] = 3
-	else
-		pilldays -= 1
-		birth_control['using_bc'] -= 1
+	if birth_control['using_bc'] > 0:
+		if pilldaychk = daystart:
+			pilldays += 1
+			birth_control['using_bc'] = 3
+		else
+			pilldays -= 1
+			if placebopart <= 0: birth_control['using_bc'] -= 1
+		end
 	end
 
 	if pilldays > 18: pilldays = 18
 	if pilldays < 0: pilldays = 0
 	if birth_control['using_bc'] < 0: pilldays = 0
 
-	if pillcon >= 39000:
+	if tabletkiday < daystart - 5: birth_control['using_bc'] = 0
+	
+	if birth_control['think_safe'] = 1:
+		stat['forgot_bc_pill'] = 0
+	elseif pilldaychk < daystart - 1 and pilldaychk > daystart - 5 and pillcon2 > 0:
+	!!	stat['forgot_birth_control_pill'] = 1
+		stat['forget_bc_count'] += 1
+	end
+
+	gs 'fertility', 'update'
+	:auto_pill_break_goto
+	killvar '$temp_img'
+end
+
+if $ARGS[0] = 'daily_update':
+	!! daily pillcon decrease
+	if tabletkishot <= 0: pillcon -= 1000 & pillcon2 -= 1000
+	if pillcon < 0:	pillcon = 0
+	if pillcon2 < 0: pillcon2 = 0
+
+	!! update pill discipline for manual pill takers
+	if tabletkicheck = 0:
+		if tabletkiday >= (daystart - 1) and tabletkipt = 0 and rand(0,7) = 0: tabletkipt = 1
+		if pillcon > 0 and tabletkipi = 0 and rand(0,3) = 0 and (tabletkiday + 15) > daystart = 0: tabletkipi = -1
+	end
+
+	!! check if the pill today should be placebo
+	!! when conditions are correct Sveta will take the placebo part of her birth control pills to keep periods
+	if Luth > (LutH_Max-75) and birth_control['placebo_skip'] = 0:
+		placebopart = 1
+	else
+		placebopart = 0
+	end
+
+	!! ----- processing BC Shot -----
+	if tabletkicheck = 2:
+		if tabletkishot ! 0:
+			!!cycle = 1
+			mesec = 0
+			if rand(0,1000) = 1000:
+				EggRH = rand(20,80)
+			else
+				EggRH = 0
+			end
+			FocH = EggRH
+		end
+		if tabletkishot <= 0:
+			pillcon -= 29000
+			pillcon2 -= 29000
+			if tabletkishot < 0: tabletkishot = 0
+		end
+		if shotdays < 2:
+			tabletkicheck = 0
+			msg 'Your birth control shot is no longer protecting you.'
+		elseif shotdays < 10:
+			msg 'Your birth control shot is past due for renewal. The chemicals regulating your fertility cycle are wearing off.'
+		elseif shotdays > 10 and shotdays < 14:
+			msg 'You are due for a birth control shot soon if you do not get one, you might get pregnant.'
+		elseif shotdays = 10:
+			msg 'Your birth control shot is due for renewal tomorrow.'
+		end
+	end
+	!! dropped the decrement out of the above if-statement so that players on pill would still run out of BC shot
+	!! as in for example the case of the therapist forcing you on the pill while you already had the shot.
+	if tabletkishot > 0: tabletkishot -= 1
+	if shotdays > 0: shotdays -=1
+
+	!! ----- processing BC spell -----
+	!! birth_control['implant_status']
+	!! 0: No implant
+	!! 3: Implant (more than 30 days left)
+	!! 2: Implant (less than 30 days left)
+	!! 1: Empty implant
+	if $spellTarget['birth_control'] = 'self':
+		pillcon = 40000
+		pillcon2 = 40000
+		spellTime['birth_control'] -= 1
+		if spellTime['birth_control'] > 0 and spellTime['birth_control'] < 30:
+			birth_control['implant_status'] = 2
+			msg 'Your birth control spell will only last for <<spellTime[''birth_control'']>> more'+iif(spellTime['birth_control'] = 1, 'day.', 'days.')
+		elseif spellTime['birth_control'] < 1:
+			$spellTarget['birth_control'] = ''
+			pillcon = 0
+			pillcon2 = 0
+			msg 'Your birth control spell has ended. You''ll need to recast it if you don''t want to get pregnant.'
+		end
+	!! ----- processing BC implant -----
+	elseif birth_control['implant_status'] > 1:
+		pcs_skin += rand(0,1)
+
+		pillcon += ((pillcon + 15000) / 25) + 4000
+		if pillcon > 40000: pillcon = 40000
+
+		pillcon2 += ((pillcon2 + 15000) / 25) + 4000
+		if pillcon2 > 40000: pillcon2 = 40000
+
+		birth_control['implant_timer'] -= 1
+		if (birth_control['implant_timer'] - 1090) > 0:
+			gs 'pain', '<<(birth_control[''implant_timer''] - 1090)*2>>', 'armL', 'ache'
+		elseif birth_control['implant_timer'] > 0 and birth_control['implant_timer'] < 30:
+			birth_control['implant_status'] = 2
+			'Your birth control implant is only good for <<birth_control[''implant_timer'']>> more'+iif(birth_control['implant_timer'] = 1, 'day.', 'days.')
+		elseif birth_control['implant_timer'] < 0:
+			birth_control['implant_status'] = 1
+			msg 'You should renew or remove your birth control implant.'
+		end
+	elseif birth_control['implant_status'] = 1:
+		msg 'You should renew or remove your birth control implant.'
+	end
+
+	!! ----- cycle tracking, tracks last 60 days -----
+	$MenCal[] = $str(cycle)
+	if ArrSize('$MenCal') = 60: killvar '$MenCal', 0
+
+	gs 'fertility', 'update'
+end
+
+if $ARGS[0] = 'update':
+	birth_control['old_pillcon'] = pillcon
+	birth_control['old_pillcon2'] = pillcon2
+
+	if pillcon > 26000:
 		birth_control['safe'] = 1
 	elseif placebopart <= 0:
 		birth_control['safe'] = 0
 	end
-	
-	if pillcon2 >= 39000:
+
+	if pillcon2 > 26000:
 		birth_control['think_safe'] = 1
 	elseif placebopart <= 0:
 		birth_control['think_safe'] = 0
 	end
-	
-
-	$MenCal[] = $str(cycle)
-	if ArrSize('$MenCal') = 60: killvar '$MenCal',0
 end
 
+
 if $ARGS[0] = 'cum_arrcheat':
 !! npc_pregtalk[] 0/1: Does character A# know that you are currently pregnant
 !! pcs_pregtalk 0/1: Has PC been told she is pregnant

+ 1 - 1
locations/fit.qsrc

@@ -226,7 +226,7 @@ if $ARGS[0] = 'fitgirl':
 		*clr & cla
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		mc_inventory['noshampoo'] = 1
+		noshampoo = 1
 		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'

+ 2 - 2
locations/foto.qsrc

@@ -1398,7 +1398,7 @@ if $ARGS[0] = 'blackm':
 								act 'No!':
 									cla
 									*clr
-									mc_inventory['noshampoo'] = 1
+									noshampoo = 1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -1428,7 +1428,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
-										mc_inventory['noshampoo'] = 1
+										noshampoo = 1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

+ 8 - 13
locations/foto_shoot.qsrc

@@ -47,15 +47,12 @@ if $ARGS[0] = 'model':
 		
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
-			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
-			model_job_week += 1
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			model_week = (daystart - week) / 7
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
+			modelpayfin = 450
 			cla & *clr
 			if rand(1,2) = 1:
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
@@ -65,27 +62,25 @@ if $ARGS[0] = 'model':
 				'You spend two hours modelling various dresses for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
 			end
 			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'studio'
+			'You receive 450 <b>₽</b> for the job.'
+			act 'Finish':gt 'foto', 'end'
 		end
 		act'Swimsuits':
+			!!bikinicatalog += 1
 			$modelfoto['shoot_type'] = 'swim_catalog'
-			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
-			model_job_week += 1
 			gs 'exp_gain', 'mdlng', rand(2,5)
 			model_week = (daystart - week) / 7
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
+			modelpayfin = 450
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
-			bikinicatalog += 1
+			
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
 			*nl
-			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'studio'
+			'You receive 450 <b>₽</b> for the job.'
+			act 'Finish':gt 'foto', 'end'
 		end
 	end
 	

+ 7 - 6
locations/gadbana.qsrc

@@ -85,7 +85,7 @@ if mira_guest = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
-					mc_inventory['noshampoo'] = 1
+					noshampoo = 1
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
@@ -123,7 +123,7 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 25
-			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): mc_inventory['noshampoo'] = 1
+			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): noshampoo = 1
 			dynamic $showerdin
 			if frost > 0:frost = 0
 			!!gs 'clothing', 'strip', 'gadbana'
@@ -177,7 +177,7 @@ if mira_guest = 0:
 			end
 		end
 	end
-	if mc_inventory['razor'] > 0:'Your razor will last <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
+	if lashair ! 1 and mc_inventory['razor'] > 0:'Your razor will last <b><<mc_inventory[''razor'']>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
 	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
@@ -233,14 +233,15 @@ if mira_guest = 0:
 	dynamic $toymanage
 	dynamic $enema
 
-	if mc_inventory['chaffing_cream'] > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
+	if mc_inventory['chaffing_cream'] > 0 and mosol > 0 and mosal_time <= totminut:
 		act 'Rub ointment onto your pussy (0:05)':
 			cla
 			menu_off = 1
-			mosal_time = (daystart * 100) + hour
+			mosal_time = totminut + 600
 			minut += 5
 			mc_inventory['chaffing_cream'] -= 1
 			mosol -= 5
+			gs 'stat'
 			'You take a tube of cream and rub it onto your itchy vulva.'
 
 			act 'Finish':gt $loc, $loc_arg
@@ -312,7 +313,7 @@ else
 			gs 'stat'
 			act 'Steam':
 				cls
-				mc_inventory['noshampoo'] = 1
+				noshampoo = 1
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1

+ 1 - 1
locations/gadhouse.qsrc

@@ -1747,7 +1747,7 @@ if $ARGS[0] = 'intro':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						*nl
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparents and ask if they need help!" she shouts. Then, without waiting for your response, she closes the door, and with that, she''s gone.'
-						act 'I understand...':gt 'budilnik', 'start'
+						act 'I understand...':gt 'alarmclock', 'start'
 					end
 				end
 			end

+ 0 - 1
locations/gadprostitutes.qsrc

@@ -299,7 +299,6 @@ if $ARGS[0] = 'work_alone':
 	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	!! TODO: The enema thing should be aligned with the rest of the game. 
-	!! NOTE The enema is called klisma (?) that needs to be cleaned up too.
 	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. So you should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period; most men will pay less for vaginal sex during that time of the month.'
 	if prostitute['cum_dressed'] = 1: '<br>You have visible cum stains on you. Most clients won''t like that and will offer less money.'

+ 19 - 3
locations/gameover.qsrc

@@ -12,6 +12,7 @@ gs 'stat'
 if over = 1:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
 	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
+
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over.jpg"></center>'
 	if $start_type[1] = 'tg':
@@ -25,41 +26,56 @@ elseif over = 2:
 		'Hint:'
 		'When your mood is low, your mind weakens and finally breaks. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV or visiting the psychotherapist.'
 	end
+
 elseif over = 3:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
 	'You die of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
+
 elseif over = 4:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/birth.jpg"></center>'
 	'You die from complications during childbirth.'
+
 elseif over = 5:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/toilet.jpg"></center>'
 	'You try to run, but immediately find yourself in a strange place surrounded by walls with obscene graffiti. you couldn''t move even if you tried. Suddenly, the door opens and some fat guy comes in. He undoes his pants and turns his back to you, his ass hovering in the air just above you. Then you realize, the witch kept her promise and turned you into a toilet at the station.'
 	'So you spend the rest of your days swallowing shit, until 50 years later when the train station is in need of repair and you are just broken up, taken out and thrown in a landfill.'
+
 elseif over = 6:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/stab.jpg"></center>'
 	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys," says a shadowy figure. You look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you see is the ground rushing towards you.'
+
 elseif over = 7:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
 	'The last thing you see is a police baton flying at your face. You are beaten to death, and your early demise wi written up as an accident. You are dragged out by the morgue attendants, and the pathologist notes that you died from a blow to the head. Soon, your body is handed over to your parents...'
+
 elseif over = 8:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/crackwhore8.jpg"></center>'
 	'"At some point, you question your life decisions." You try to understand why you made the choices you did as yet another explosion of cum fills your mouth. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
+
 elseif over = 9:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/overdose.jpg"></center>'
 	'Your last moments are those of bliss, your mind is so hazed by the drugs you don''t even know you are dying. You body is found surrounded by the drugs that ended your life.'
+
 elseif over = 10:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over10.jpg"></center>'
 	'You fall into a quagmire while trying to find a way out of the swamp. It sucks you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
+
 elseif over = 11:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over11.jpg"></center>'
 	'Apparently, you learned nothing from when your mother used to read you the tale of Little Red Riding Hood. Otherwise, you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
+
 elseif over = 12:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over12.jpg"></center>'
 	'Your body is found a few months later by some hunters. No one ever finds out what happened to you.'
+
 elseif over = 13:
-   '<center><img <<$set_imgh>> src="images/system/2_endings/fade.jpg"></center>'
-   'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
-   !! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
+	'<center><img <<$set_imgh>> src="images/system/2_endings/fade.jpg"></center>'
+	'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
+	!! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
+
+elseif over = 14:
+	'<center><img <<$set_imgh>> src="images/system/2_endings/prison.jpg"></center>'
+	'You spend the rest of you life going in and out of prison, wasting whatever potential you might have had.'
 end
 act 'End?':gt 'gameover', 'endscreen'
 

+ 2 - 2
locations/gdksport.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'volley':
 		volpoint = 0
 		volpointv = 0
 
-	'The teams take to the court and start playing.'
+		'The teams take to the court and start playing.'
 
 		!! reserve player or you were caught drinking by the coach and he forbid you from playing
 		if trener_Speak < 8 or seealko = 1:
@@ -580,7 +580,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): mc_inventory['noshampoo'] = 1
+	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noshampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 1 - 1
locations/gopnew.qsrc

@@ -537,7 +537,7 @@ if $ARGS[0] = 'bazar':
 	'Vasan roughly shakes you by the shoulders and says: "Well? What do you say?"'
 
 	! WD: Uninitialised ~ 'magic' use 'magik'
-	if $start_type[1] = 'magic':'You sense a vague evil and powerful magic, that suppresses your own magical powers. You can''t use your spells against the Gopniks.'
+	if $start_type[1] ! 'nomagic':'You sense a vague evil and powerful magic, that suppresses your own magical powers. You can''t use your spells against the Gopniks.'
 	act 'Agree to their demands':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/gopnews.jpg"></center>'

+ 4 - 4
locations/gschool_boys_bathroom.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'boy2_sub':
 				'When he''s finished cleaning up and his uniform is back in place, he heads for the door, but pauses on his way out. "I look forward to next time, but maybe do some exercises to tighten up that pussy, " he says as he walks out the door, leaving you standing there with his cum leaking out of you.'
 				*nl
 				'Luckily for you, no one else enters the bathroom while you clean yourself and get dressed. You leave the bathroom just before the bell rings, hoping no one spots you. You can''t help but wonder if Radomir was serious about those exercises...'
-				mc_inventory['noshampoo'] = 1
+				noshampoo = 1
 				dynamic $showerdin
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'boy3_kiss':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'clit_finger', 5
 				gs 'arousal', 'end'
-				mc_inventory['noshampoo'] = 1
+				noshampoo = 1
 				dynamic $showerdin
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of cum lands on your inner thigh, another lands on your pubic area and a third hits your wet cunt and fingers. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was amazing," he comments and you''re inclined to agree.'
@@ -678,7 +678,7 @@ if $ARGS[0] = 'boy5':
 						gs 'cum_call', 'mouth', $boy
 						gs 'boyStat', 'A3'
 						gs 'cum_call', 'anus', $boy
-						mc_inventory['noshampoo'] = 1
+						noshampoo = 1
 						dynamic $showerdin
 						gs 'stat'
 						'Shortly after this, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a few more times before pulling out and standing up to watch Ivan, who''s still pounding your ass. A few seconds later, Ivan groans loudly and buries his dick deep in your ass. You feel a warmth flood inside you as he starts cumming. When his dick leaves your ass, which gapes after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles. "Fuck, that was great. You''re the best <<$pcs_nickname>>."'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'boy6_sub':
 						act 'Clean up':
 							*clr & cla
 							*nl
-							mc_inventory['noshampoo'] = 1
+							noshampoo = 1
 							dynamic $showerdin
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/gangaftermath.jpg"></center>'

+ 24 - 22
locations/gschool_jock_chats.qsrc

@@ -516,28 +516,30 @@ if $ARGS[0] = 'christina':
 
 	! Natasha quest line:
 
-	if christinaQW['fight'] = 1 and NatbelQW['FriendLover'] = 2:
-		act 'Talk to Christina':
-			NatbelQW['chrispaid'] = 1
-			'You see Christina chatting with Lina as you approach. When Christina notices you, she glares at you and then turns to Lina.'
-			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
-			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
-			'"What about it?" she snaps. "It''s not like it''s any of your business!"'
-			'"Actually, it is. She''s my friend, so I''m telling you to stop so I don''t have to beat your ass in front of everyone again."'
-			'Christina doesn''t answer, so you continue. "So we''re in agreement then? Unless you want to go another round with me? I hope not, because I won''t stop at a simple beating this time!"'
-			'She nods in agreement before storming off. With a grin on your face, you head to your next class.'
-		end
-	elseif christinaQW['blackmail'] = 2 and NatbelQW['FriendLover'] = 2:
-		act 'Talk to Christina':
-			NatbelQW['chrispaid'] = 1
-			'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
-			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
-			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
-			'"What about it?" she snaps. "It''s not like it''s any of your business!"'
-			'"Actually, it is. She''s my friend, so I''m asking you to stop because I don''t want to embarrass you in front of the others."'
-			'"Fucking make me," she scoffs, so you pull out your phone and show her your recording of her blowing the coach.'
-			'She balls her fists in rage. "So we''re in agreement then? Unless you want everyone to see this?" you ask smugly.'
-			'She coldly glares at you before storming off without answering. A satisifed grin on your face, you head to your next class.'
+	if NatbelQW['chrispaid'] <= 5 and NatbelQW['FriendLover'] = 2:
+		if christinaQW['fight'] = 1:
+			act 'Talk to Christina about Natasha':
+				NatbelQW['chrispaid'] = 5
+				'You see Christina chatting with Lina as you approach. When Christina notices you, she glares at you and then turns to Lina.'
+				'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
+				'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
+				'"What about it?" she snaps. "It''s not like it''s any of your business!"'
+				'"Actually, it is. She''s my friend, so I''m telling you to stop so I don''t have to beat your ass in front of everyone again."'
+				'Christina doesn''t answer, so you continue. "So we''re in agreement then? Unless you want to go another round with me? I hope not, because I won''t stop at a simple beating this time!"'
+				'She nods in agreement before storming off. With a grin on your face, you head to your next class.'
+			end
+		elseif christinaQW['blackmail'] = 2:
+			act 'Talk to Christina about Natasha':
+				NatbelQW['chrispaid'] = 5
+				'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
+				'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
+				'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
+				'"What about it?" she snaps. "It''s not like it''s any of your business!"'
+				'"Actually, it is. She''s my friend, so I''m asking you to stop because I don''t want to embarrass you in front of the others."'
+				'"Fucking make me," she scoffs, so you pull out your phone and show her your recording of her blowing the coach.'
+				'She balls her fists in rage. "So we''re in agreement then? Unless you want everyone to see this?" you ask smugly.'
+				'She coldly glares at you before storming off without answering. A satisifed grin on your face, you head to your next class.'
+			end
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'

+ 10 - 22
locations/gschool_lessonsev3.qsrc

@@ -897,15 +897,9 @@ if $ARGS[0] = 'music':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 5:
 			if katjaQW['pantiesQWstage'] >= 5:
-				pcs_horny += 10
-				gs'stat'
-				if rand(1,2) = 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_1.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
-				end
-				'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
-				gs 'arousal', 'erotic_nudity', 2
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/classroom_showing_pussy/classroom_showing_pussy.jpg"></center>'
+				'Katja is sitting with both of her legs on her chair and is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and spread her legs slightly, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
+				gs 'arousal', 'erotic_nudity', -5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1038,7 +1032,7 @@ if $ARGS[0] = 'music':
 				grupvalue[4] -= 1
 				npc_rel['A155'] += 1
 				'You shake your head at Mr. Vasilyev, desperately wanting to turn around and strangle Lavrenti, but you don''t dare with Mr. Vasilyev now keeping an eye on you.'
-				if n_tanga = 3:
+				if katjaQW['pantiesQWstage'] >= 5:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_6.jpg"></center>'
 					'As you sit in the classroom, you hear Katja asking from behind you "<<$pcs_nickname>>, I dropped my pen. Be a dear and pick it up for me please?" You sigh and look under her desk, immediately noticing her bare pussy between her widely spread legs. The little minx is doing it on purpose! A bit flustered, you pick up her pen and hand it back to her. When you do, she gives you an innocent grin and gets back to what she was doing as if nothing happened.'
@@ -1280,9 +1274,7 @@ if $ARGS[0] = 'music':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/music/beltongue.jpg"></center>'
 			'During class, you notice Bella sitting where it really shows off her legs well and you are not the only one to notice. Lavrenti is looking as well and when Bella notices him looking, she gets up, sticks her tongue out at him and walks to the other side of the class to take a seat over there.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-		elseif scooltiperand = 16 and n_tanga = 3:
-			!!is this correct it is the old katja show panty trigger I could find but seems weird to me, so please double check. Just want it to trigger when Katja and Sveta start seeing each other
-			!!Reminder to check this after the katja rework
+		elseif scooltiperand = 16 and katjaQW['take_of_panties_day'] ! daystart and katjaQW['pantiesQWstage'] > 0 and katjaQW['pantiesQWstage'] < 5:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/music/katjapanties.jpg"></center>'
 			'During class, you hear Katja say "Psstt." When you glance in her direction, she is turned in her seat so she is facing you, with her legs slightly spread. When she sees you looking, she pulls up her skirt to show off her panties to you with a grin, then quickly puts her skirt back in place and ignores you for the rest of class.'
@@ -1363,15 +1355,11 @@ if $ARGS[0] = 'art':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			if katjaQW['pantiesQWstage'] >= 5:
-				pcs_horny += 10
-				gs'stat'
-				if rand(1,2) = 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_1.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
-				end
-				'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
-				gs 'arousal', 'erotic_nudity', 2
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/classroom_showing_pussy.jpg"></center>'
+				'Katja is sitting with both of her legs on her chair and is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and spread her legs slightly, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
+				gs 'arousal', 'erotic_nudity', -5
+				gs 'arousal', 'end'
+				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				jump 'art_event_once_more'

+ 4 - 4
locations/gschool_sex.qsrc

@@ -745,7 +745,7 @@ if $ARGS[0] = 'storagesex':
 										minut += 10
 										pcs_mood += 10
 										shower_shave = 0
-										mc_inventory['noshampoo'] = 0
+										noshampoo = 0
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 										'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 										dynamic $showerdin
@@ -802,7 +802,7 @@ if $ARGS[0] = 'storagesex':
 								minut += 10
 								pcs_mood += 10
 								shower_shave = 0
-								mc_inventory['noshampoo'] = 0
+								noshampoo = 0
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 								'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers, where you enjoy the sensation of the hot water on your skin as the steam filling the room gives it an almost sauna-like feel, making you feel very relaxed.'
 								dynamic $showerdin
@@ -849,7 +849,7 @@ if $ARGS[0] = 'storagesex_anal':
 			minut += 10
 			pcs_mood += 10
 			shower_shave = 0
-			mc_inventory['noshampoo'] = 0
+			noshampoo = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/watch.jpg"></center>'
 			'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
 			dynamic $showerdin
@@ -994,7 +994,7 @@ if $ARGS[0] = 'vd_lockerroom':
 					'Vitek laughs at the comment. "No shit! You''re such a dirty little whore!"'
 					'Vitek walks away as Dan reaches over and turns the shower back on. "You better take a shower, you nasty slut!"' 
 					'You can hear the two of them walking out, talking and laughing as they do. The water runs over you, slowly washing their cum away. You get up and clean up, then walk into the locker room to dry off and get dressed.'
-					mc_inventory['noshampoo'] = 1
+					noshampoo = 1
 					dynamic $showerdin
 					gs 'arousal', 'hj', 3
 					gs 'arousal', 'hj', 3

+ 8 - 8
locations/home_activity.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You don''t like the frequency with which this is happening. More and more, the evidence is pointing towards you being pregnant.'
 		*nl
 		'<i>What am I going to do?</i> you think to yourself.'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	act'I better not be pregnant':
@@ -246,7 +246,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Disgust and irritation fill you as you reach out to flush the toilet.'
 		*nl
 		'<i>Oh God,</i> you groan internally. <i>I swear, this better be a stomach bug and not pregnancy. I am not ready for motherhood.</i>'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	act'I can''t wait for this baby':
@@ -255,7 +255,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Even through the pain and the horrid taste on your lips, you can''t help but smile.'
 		*nl
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	act'Baby good, morning sickness bad':
@@ -264,7 +264,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You clutch your head, wincing at the sharp pain that lances through it.'
 		*nl
 		'<i>This baby can not come sooner,</i> you think to yourself. <i>Really looking forward to watching it grow, but <b>really</b> hate this pregnancy stuff.</i>'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 end
 
@@ -273,14 +273,14 @@ if $ARGS[0] = 'preg_scare_react':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>I need to take a pregnancy test right now!</i> you think urgently. <i>I need to figure out what is going on!</i>'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	act'This is really bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>This is really really bad!</i> you think, the blood draining from your face. <i>I don''t want to be a mom! Not now!</i>'
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	act'This is wonderful!':
@@ -291,7 +291,7 @@ if $ARGS[0] = 'preg_scare_react':
 		else
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 		end
-		act'Continue':gt'sleep','end'
+		act'Continue': gt 'bed_get_out', 'start'
 	end
 
 	if stat['think_virgin'] = 1:
@@ -299,7 +299,7 @@ if $ARGS[0] = 'preg_scare_react':
 			cla & *clr
 			$home_activity['vomit_bathroom']
 			'<i>This doesn''t make any sense,</i> you think to yourself, putting your hand on your head, feeling woozy again.'
-			act'Continue':gt'sleep', 'end'
+			act'Continue': gt 'bed_get_out', 'start'
 		end
 	end
 end

+ 5 - 0
locations/hourly_events.qsrc

@@ -318,6 +318,11 @@ if sickstage = 2:
 	end
 end
 
+!!STDs which hurt mod
+if Gerpes >= 3 or Sifilis >= 21 or Triper > 2 and pcs_mood >= 15:
+	pcs_mood -= 5
+end
+
 if perkice > 0: perkice -= 1
 if frost > 0: frost -= 1
 

+ 2 - 2
locations/husbSex.qsrc

@@ -144,7 +144,7 @@ end
 if $ARGS[0] = 'dolgend':
 	cla
 	*clr
-	mc_inventory['noshampoo'] = 1
+	noshampoo = 1
 	dynamic $showerdin
 	gs'stat'
 
@@ -201,7 +201,7 @@ if $ARGS[0] = 'variant':
 		act 'Ask him to lick you':gt'husbsex','kuni'
 	end
 
-	if harakHusb = 0 and izvratH = 1 and strapon > 0:
+	if harakHusb = 0 and izvratH = 1 and mc_inventory['strapon'] > 0:
 		act 'Use a strapon':gt'husbsex','strapon'
 	end
 end

+ 3 - 3
locations/intro_customization.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'modite':
 		end
 		gt 'intro_customization','modite'
 	end
-	act 'Computer (<<komp>>/1)':
+	act 'Computer (<<mc_inventory[''tech_computer'']>>/1)':
 		if mc_inventory['tech_computer'] = 0:
 			mc_inventory['tech_computer'] = 1
 		else 
@@ -179,15 +179,15 @@ if $ARGS[0] = 'modite_cos':
 	'<center><b>Cosmetic items</b></center>'
 	*nl
 	killvar '$table_display'
-	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''cosmetics''] >', 'Cosmetics'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''cosmetics'']', 'Cosmetics'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''razor'']', 'Razors (number of shaves)'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''suncream'']', 'Sunblock'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''scrunchies'']', 'Hair scrunchies'
 	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''kirbygrips'']', 'Hair pins'
+	gs 'intro_customization', 'modrel_setup2', 'mc_inventory[''shampoo'']', 'Shampoo'
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
 	$table_display
 	'</table></center>'
-	!act 'Shampoo (<<mc_inventory['shampoo']>>/100)': gs 'intro_customization','setval3' & mc_inventory['shampoo'] =  nstat & gt 'intro_customization','modite_cos'
 	act 'Return': gt'intro_customization','modite'
 end
 

+ 1 - 1
locations/intro_initialization.qsrc

@@ -85,7 +85,7 @@ pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
 pcs_mana = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 pcs_mood = 100
 pcs_stam = 100
-pcs_makeup['base'] = 1
+makeup['base'] = 1
 
 nathcol = pcs_haircol
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1

+ 1 - 1
locations/intro_initialization_city.qsrc

@@ -96,7 +96,7 @@ pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
 pcs_mana = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 pcs_mood = 100
 pcs_stam = 100
-pcs_makeup['base'] = 1
+makeup['base'] = 1
 
 nathcol = pcs_haircol
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1

+ 1 - 0
locations/intro_sg_select.qsrc

@@ -1024,6 +1024,7 @@ if $ARGS[0] = 'gopnik':
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
 	npc_rel['A18'] = 1
+	npc_rel['A23'] = 20
 	mc_inventory['tampons'] =  20
 	pcs_run = 20
 	pcs_humint = 10

+ 2 - 2
locations/intro_uni.qsrc

@@ -162,9 +162,9 @@ if $ARGS[0] = 'select_electives':
 				'You decide to enroll in the psychology class for the first and second semester of this year.'
 				$university['elective_semester_1_3'] = 'Psychology 101'
 				$university['elective_semester_2_3'] = 'Psychology 102'
-				act 'Consider other elective classes': gt 'uni_admin', 'select_electives'
+				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'
 			end
-			act 'Don''t enroll in the psychology class': gt 'uni_admin', 'select_electives'
+			act 'Don''t enroll in the psychology class': gt 'intro_uni', 'select_electives'
 		end
 	end
 	act 'Don''t enroll in any more elective classes': gt 'intro_uni', 'dorm_intro'

+ 18 - 2
locations/item_cart.qsrc

@@ -1,16 +1,24 @@
 # item_cart
 
 if $ARGS[0] = 'shoppping_aisle':
+	gs 'item_stock_db', 'cleanup'
     $curr_aisle = $ARGS[1]
 	gs 'item_stock_db', $ARGS[1]
 	gs 'item_cart', 'header'
 	'<center><table><<$Headerstring>><TR><border=1>'
 
+	gs 'themes', 'clothing', 1
 	i = 1
 	:loopshopping_cart
-		gs 'themes', 'clothing', 1
+		!! if item is uninitialized (has blank name) - skip it
+		if $item_curr_aisle['<<i>>'] = '': i += 1 & jump 'loopshopping_cart'
 		$item_line = '<TR bgcolor='+$bgcolor+'>'
-		$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>></TD>'
+!!		uncomment if you want items with events to be marked with a * peepoShrug
+!!		if $event_curr_aisle['<<i>>'] ! '':
+!!			$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>> *</TD>'
+!!		else
+			$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>></TD>'
+!!		end
 		dynamic '$cart_tmp = $var_curr_aisle[''<<i>>'']'
 		$item_line += '<TD><<mc_inventory[''<<$cart_tmp>>'']>></TD>'
 		$item_line += '<TD><<quantity_curr_aisle[''<<i>>'']>></TD>'
@@ -63,15 +71,22 @@ end
 if $ARGS[0] = 'add':
 	cart_tally += cost_curr_aisle['<<ARGS[1]>>']
 	cart_curr_quantity['<<ARGS[1]>>'] += 1
+	if $event_curr_aisle['<<ARGS[1]>>'] ! '': dynamic "<<$event_curr_aisle['<<ARGS[1]>>']>>"
 	gt $loc_s, $args_s
 end
 
 if $ARGS[0] = 'add10':
 	cart_tally += cost_curr_aisle['<<ARGS[1]>>']*10
 	cart_curr_quantity['<<ARGS[1]>>'] += 10
+	if $event_curr_aisle['<<ARGS[1]>>'] ! '': dynamic "<<$event_curr_aisle['<<ARGS[1]>>']>>"
 	gt $loc_s, $args_s
 end
 
+if $ARGS[0] = 'simple_add':
+	cart_tally += cost_curr_aisle['<<ARGS[1]>>']*max(1,ARGS[2])
+	cart_curr_quantity['<<ARGS[1]>>'] += 1*max(1,ARGS[2])
+end
+
 if $ARGS[0] = 'cart_total':
 	'<center><table><TD bgcolor='+$bgcolor+'><b>Total cost of items in cart: <<cart_tally>>₽</b></TD></table></center>'
 	'<center><table><TR><border=30>'
@@ -146,6 +161,7 @@ if $ARGS[0] = 'shopping_var_clear':
 	killvar 'cart_quantity'
 	killvar '$cart_tmp'
 	killvar '$cart_tmp1'
+	gs 'item_stock_db', 'cleanup'
 end
 
 

+ 23 - 0
locations/item_stock_db.qsrc

@@ -18,12 +18,18 @@
 	max_curr_aisle['<<item_idx>>'] = 
 	cost_curr_aisle['<<item_idx>>'] = 
 	$img_curr_aisle['<<item_idx>>'] = ''
+	$event_curr_aisle['<<item_idx>>'] = ''
 
 	Category template
 	if $ARGS[0] = '':
 	
 	end
 
+ items can have event links attached to them like this:
+ $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_lube'"
+ if event should be conditional it can be done like this instead:
+ if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_lube'"
+
  possible imagepath?
  would need some changes to the current images but makes it easier to add new items later on.
  also makes C&P easier
@@ -339,6 +345,7 @@ if $ARGS[0] = 'chemist':
 		cost_curr_aisle['<<item_idx>>'] = 500
 		$img_curr_aisle['<<item_idx>>'] = ''
 	end
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_condoms'"
 
 	item_idx = 2
 	if therapistFuckedPussyStage < 2:
@@ -358,6 +365,7 @@ if $ARGS[0] = 'chemist':
 		cost_curr_aisle['<<item_idx>>'] = 0
 		$img_curr_aisle['<<item_idx>>'] = ''
 	end
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_birth_control'"
 
 	item_idx = 3
 	$item_curr_aisle['<<item_idx>>'] = 'Pregnancy test' 
@@ -367,6 +375,7 @@ if $ARGS[0] = 'chemist':
 	max_curr_aisle['<<item_idx>>'] = 0
 	cost_curr_aisle['<<item_idx>>'] = 530
 	$img_curr_aisle['<<item_idx>>'] = '' 
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_preg_test'"
 
 	item_idx = 4
 	$item_curr_aisle['<<item_idx>>'] = 'Morning after pill' 
@@ -376,6 +385,7 @@ if $ARGS[0] = 'chemist':
 	max_curr_aisle['<<item_idx>>'] = 0 
 	cost_curr_aisle['<<item_idx>>'] = 740
 	$img_curr_aisle['<<item_idx>>'] = ''   
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_morning_after'"
 
 	item_idx = 5
 	$item_curr_aisle['<<item_idx>>'] = 'Antibiotics' 
@@ -412,6 +422,7 @@ if $ARGS[0] = 'chemist':
 	max_curr_aisle['<<item_idx>>'] = 0
 	cost_curr_aisle['<<item_idx>>'] = 372
 	$img_curr_aisle['<<item_idx>>'] = ''   
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'ointment'"
 
 	 item_idx = 9
 	$item_curr_aisle['<<item_idx>>'] = 'Lubricant' 
@@ -421,6 +432,7 @@ if $ARGS[0] = 'chemist':
 	max_curr_aisle['<<item_idx>>'] = 0
 	cost_curr_aisle['<<item_idx>>'] = 145
 	$img_curr_aisle['<<item_idx>>'] = ''   
+	if LudaQW['work_hours'] = 1: $event_curr_aisle['<<item_idx>>'] = "gt 'pav_pharmacy', 'buy_lube'"
 
 	item_idx = 10
 	$item_curr_aisle['<<item_idx>>'] = 'Lipbalm' 
@@ -1229,6 +1241,17 @@ if $ARGS[0] = 'prost_shop':
 	end
 end
 
+if $ARGS[0] = 'cleanup':
+	killvar 'item_idx'
+	killvar '$item_curr_aisle'
+	killvar '$var_curr_aisle'
+	killvar '$desc_curr_aisle'
+	killvar 'quantity_curr_aisle'
+	killvar 'max_curr_aisle'
+	killvar 'cost_curr_aisle'
+	killvar '$img_curr_aisle'
+	killvar '$event_curr_aisle'
+end
 
 --- item_stock_db ---------------------------------
 

+ 26 - 2
locations/journal.qsrc

@@ -37,11 +37,12 @@ end
 if $ARGS[0]='journalmenu':
 	*clr & cla
 	gs 'stat'
+	*nl
 	if $start_type[1] ! 'nomagic':
-        $tablebody = '<tr><th><a href="exec:menutrack = 0 & gs ''journal'', ''magictab''">Magic</a></th><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th></tr>'
+        $tablebody = '<tr><th><a href="exec:menutrack = 0 & gs ''journal'', ''magictab''">Magic</a></th><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th><th><a href="exec:menutrack = 7 & gs ''journal'', ''notification_log''">Notifications</a></th></tr>'
     
     else
-        $tablebody ='<tr><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th></tr>'
+        $tablebody ='<tr><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th><th><a href="exec:menutrack = 7 & gs ''journal'', ''notification_log''">Notifications</a></th></tr>'
     ! menu
     end
 	!display the table here.
@@ -479,6 +480,29 @@ if $ARGS[0] = 'notestab':
 !! notes
 end
 
+!!---------------------------------!!
+!!          notifications          !!
+!!---------------------------------!!
+
+
+if $ARGS[0] = 'notification_log':
+	$jumploc = 'notification_log'
+	gs 'journal', 'journalmenu'
+	'<center><h2>Notifications</h2></center>'
+	*nl
+	!! DEBUG
+	!!'<a href="exec: notif_debug_counter += 1 & gs ''notification'', ''add'', ''test message <<notif_debug_counter>>'' & gt ''journal'',''notification_log''">DEBUG</a>'
+	if $notification_log[0] ! '':
+		notification_log_loop_index = arrsize('$notification_log') - 1
+		:notification_log_loop
+		*pl $notification_log[notification_log_loop_index]
+		*nl
+		if notification_log_loop_index > 0: notification_log_loop_index -= 1 & jump 'notification_log_loop'
+	else
+		'Notification log is empty.'
+	end
+end
+
 !! ---- Other Sections ---- 
 
 

+ 22 - 1
locations/journal_quests.qsrc

@@ -294,7 +294,21 @@ if $ARGS[0] = 'start':
 		'<b>Natasha''s paths are being updated, there is new content avaialble but the quest hints will be completed for next release.</b>'
 		*nl
 		!! This might need a note about debt required for most actions to be available, was not sure how to handle that part though.
-		if NatbelQW['QWstage'] >= 11:
+		if NatbelQW['FriendLover'] = 7:
+			'My lover Natasha and I are sexually active.'
+		elseif NatbelQW['FriendLover'] = 6:
+			'I have been on a 2nd shopping trip with Natasha, maybe its time to take our relationship further.'
+		elseif NatbelQW['FriendLover'] = 5:
+			'I have suggested a 2nd shopping trip to my lover, Natasha.'
+		elseif NatbelQW['FriendLover'] = 4:
+			'I took Natasha (my lover) on a shopping trip, maybe she would like to go on another one?'
+		elseif NatbelQW['FriendLover'] = 3:
+			'I have suggested a shopping trip with my lover Natasha.'
+		elseif NatbelQW['FriendLover'] = 2:
+			'Natasha and I are lovers, maybe I could take her on a shopping trip?'
+		elseif NatbelQW['FriendLover'] = 1:
+			'Natasha is a good friend but perhaps she could be more...'
+		elseif NatbelQW['QWstage'] >= 11:
 			'This is the end of Natasha''s quest line, for now.'
 		elseif NatbelQW['QWstage'] = 10:
 			'I should check Natasha''s fridge. I''m sure there''s something I can use to keep corrupting her. It would be a good time to do this when she is in the laundry room.'
@@ -319,6 +333,13 @@ if $ARGS[0] = 'start':
 		else
 			'Natasha seems really smart. I should try to befriend her to help me with my grades. During school breaks seems like a good time to chat her up. It might take a lot of effort for her to trust me though.'
 		end
+		if NatbelQW['disco_invite'] = 1:
+			'She''d probably enjoy going to the disco with you if you ask.'
+		elseif NatbelQW['disco_invite'] = 2:
+			'You have asked her to go to the disco with you so you should visit her place on Friday or Saturday evening.'
+		elseif NatbelQW['disco_invite'] = 3:
+			'You''ve been to the disco with her and she''ll be happy to dance with you there in future.'
+		end
 		*nl
 		*nl
 		'<center><h3>Volleyball</h3></center>'

+ 89 - 89
locations/katjaEv.qsrc

@@ -104,10 +104,10 @@ if $ARGS[0] = '1':
 	if katjaQW['horny'] > 60 and rand (1,3) = 1 and katjaQW['pantiesQWstage'] > 0: 
 		if katjaQW['pantiesQWstage'] >= 5 or katjaQW['take_of_panties_day'] = daystart:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_go_home_no_tanga.jpg"></center>'
-			'You walk through the streets of Pavlovsk together with Katja to her house. You and chatted about all sorts of trivia and have fun. Suddenly Katja stopped and turned around looking at you, giving you a mischievous look and lifting her skirt, showing you her tender pussy, she seems to have forgotten her panties.'
+			'You walk through the streets of Pavlovsk together with Katja to her house. You chatted about all sorts of trivia and had fun. Suddenly Katja stopped and turned around to look at you, giving you a mischievous look and lifting her skirt, showing you her tender pussy, she seems to have forgotten her panties.'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_go_home_tanga.jpg"></center>'
-			'You walk through the streets of Pavlovsk together with Katja to her house. You and chatted about all sorts of trivia and have fun. Suddenly Katja stopped and turned around looking at you, giving you a mischievous look and lifting her skirt, showing you her panties. '
+			'You walk through the streets of Pavlovsk together with Katja to her house. You chatted about all sorts of trivia and had fun. Suddenly Katja stopped and turned around to look at you, giving you a mischievous look and lifting her skirt, showing you her panties. '
 		end
 	else
 		if month=1 or month=2 or month=12 or month=11:
@@ -119,7 +119,7 @@ if $ARGS[0] = '1':
 		'You walk through the streets of Pavlovsk together with Katja to her house. You chat about all sorts of trivia and have fun.'
 	end
 
-	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:'Katja is very interested in how you are doing with your pro-dancing. In her opinion it is a very private team and there have been many rumors about Albina''s team.'
+	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:'Katja is very interested in how you are doing with your pro-dancing. In her opinion, it is a very private team and there have been many rumors about Albina''s team.'
 	if kotovLoveQW > 0:'Katja asks you about your relationship with Victor Kotov, expressing her opinion about it. According to her, Victor is rude and a true gangster.'
 
 	if pirsA > 0 and pirsA < 10000 and katjaQW['know_Pirced_tongue'] = 0:
@@ -130,7 +130,7 @@ if $ARGS[0] = '1':
 
 	if flag_KissEV = 1: flag_KissEV = 2 & '"I liked kissing, even if we had to kiss all the boys too, well, all of them but the jerk that called us lesbians." suddenly said Katja. You only snorted in response.'
 
-	'Finally you get to her house. A detached two story house with attached garages and quite a large garden, giving the impression of neatness and order. Katja shows you to her room.'
+	'Finally you get to her house. A detached two-story house with attached garages and quite a large garden, giving the impression of neatness and order. Katja shows you to her room.'
 
 	act 'Go to Katjas room': gt 'katjaEv', '2'
 end
@@ -158,23 +158,23 @@ if $ARGS[0] = 'kathan':
 		if katjaQW['QWstage'] > 2:
 			if katjaQW['horny'] < 20:
 				'"Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 			elseif katjaQW['horny'] < 40:
 				'Katja looks at you, a naughty twinkle in her eyes."Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 			elseif katjaQW['horny'] < 60:
 				'Katja looks at you, a faint blush on her cheeks and she looks at you mischievously. "Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 			elseif katjaQW['horny'] < 80:
 				'Katja is blushing fairly obviously and looks at you longingly. "Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 			else
-				'Katja is as red as a lobster and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while she talk. "Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+				'Katja is as red as a lobster and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while she talked. "Ok, <<$pcs_nickname>>, Hm... What can we do?"'
+				'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 			end
 		else
 			'"Ok, <<$pcs_nickname>>, Hm... What can we do?"'
-			'Good question. What can a pair of hot teen girls do with a limited (in theory) budget. "Well, Katja, we can..."'
+			'Good question. What can a pair of hot teen girls do with a limited (in theory) budget? "Well, Katja, we can..."'
 		end
 
 		if lernHome > 0 and katjaQW['QWstage'] >= 2: 
@@ -205,7 +205,7 @@ if $ARGS[0] = 'kathan':
 
 			if month >11 or month <4:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT1.jpg"></center>'
-				'Oh my god! Walking around in the Russian winter? Of course not! If you were some preppy Californian bimbo girls, those would be your words, but Katja and you are tough Russian bitches and what do you do? You put on a good pair of boots, a good jacket and jump into the snow-covered streets to look absolutely fabulous in winter wear!'
+				'Oh my god! Walking around in the Russian winter? Of course not! If you were some preppy Californian bimbo girls, those would be your words, but Katja and you are tough Russian bitches and what do you do? You put on a good pair of boots, and a good jacket and jump into the snow-covered streets to look absolutely fabulous in winter wear!'
 				'So that is how you pass your time. Chatting, showing off and demonstrating that the winter can''t stop two hot girls from taking on the world head-on.'
 			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT2.jpg"></center>'
@@ -221,7 +221,7 @@ if $ARGS[0] = 'kathan':
 		'"Hm? Oh! True! Let''s go back."'
 		'You grab Katja''s hand and accompany her to her home.'
 
-		act 'Acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'accompany Katja to her home':minut += 5 & gt 'pav_residential'
 
 	end
 end
@@ -249,14 +249,14 @@ if $ARGS[0] = 'kathan14':
 		'After probing a few more dresses, you leave, having taken photos of this shop''s repertoire so that you know what to buy next time. Time to look for something else to do.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue window shopping':gt 'katjaEv','kathan14'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
 		end
 	elseif random_event <= 10:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS13.jpg"></center>'
-		'After walking pavlovsk''s commercial area from one extreme to the other for half an hour, Katja has found the perfect hats to make you two look even more glamorous. So, modeling with them, there is only a thing to do. Selfie time!'
+		'After walking pavlovsk''s commercial area from one extreme to the other for half an hour, Katja has found the perfect hats to make you two look even more glamorous. So, modeling with them, there is only one thing to do. Selfie time!'
 		'"Ok <<$pcs_nickname>>! Cheeseeeee!"'
 		'You put on a (not entirely false) smile, stand beside the redhead and prepare for the great finale.'
 		'"Cheeseeee!"'
@@ -266,7 +266,7 @@ if $ARGS[0] = 'kathan14':
 		'Sigh. It''s so hard to dress well in this city! Time for you two to give the commercial area another lookout or time to look for something else to do.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue window shopping':gt 'katjaEv','kathan14'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -278,12 +278,12 @@ if $ARGS[0] = 'kathan14':
 		'"Hm... Nope. Too much cleavage. If you wear that, the boys are going to see straight to Moscow!"'
 		'"Well, I saw Sonia wearing one like this the other day."'
 		'"Aja. Let''s see something else, ok <<$pcs_nickname>>?"'
-		'Yep, it takes time and dedication to be a hot girl. Lucky for you, this time you have Ekaterina Meynold, cool-girl extraordinaire, as your aide-de-camp. Without her help, your modeling would have taken hours in place of the meager half hour you have spent in this shop.'
+		'Yep, it takes time and dedication to be a hot girl. Lucky for you, this time you have Ekaterina Meynold, cool-girl extraordinaire, as your aide-de-camp. Without her help, your modeling would have taken hours in place of the meager half-hour you have spent in this shop.'
 		'"Ok, Katja I will try on... Hey, look! Kolka! He can help us!"'
 		'You see your brother walking beside the shop. When he sees you, he panics and flees the scene. Tsk. Boys. There was his opportunity to see two hot girls modeling. Well, time to look for something else to do.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue window shopping':gt 'katjaEv','kathan14'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -319,11 +319,11 @@ if $ARGS[0] = 'kathan14':
 				'"Ok Katja, get ready for a pic!"'
 				'She raises an eyebrow, gives you a conspiratory smile and prepares her phone as you sneak up behind the unsuspecting nerd. Natasha lets out a surprised scream as her butt is exposed, along with her brightly colored thong.'
 				'"Look Katja! Pink!"'
-				'There is a sonorous "click" and Natasha''s buttocks are preserved for the posterity.'
+				'There is a sonorous "click" and Natasha''s buttocks are preserved for posterity.'
 
 				if NatbelQW['QWstage'] >= 8:
 					'"Hey! What are... <<$pcs_nickname>>?!"'
-					'Natasha''s angry retort is cut short of blowing out as she realizes who her assailant was. Standing silently while looking between a snickering Katja and you, she quickly covers her butt. It seems like you have her well trained. Smiling, you bend towards her and whisper into Natasha''s ear.'
+					'Natasha''s angry retort is cut short of blowing out as she realizes who her assailant is. Standing silently while looking between a snickering Katja and you, she quickly covers her butt. It seems like you have her well-trained. Smiling, you bend towards her and whisper into Natasha''s ear.'
 					'"What I am doing? Whatever... I... Want... Slut."'
 					'The nerdy girl just looks at you with big puppy eyes and then obediently looks down. Yes, a well-trained bitch.'
 				else
@@ -333,7 +333,7 @@ if $ARGS[0] = 'kathan14':
 					'The nerdy girl doesn''t say anything. She just continues looking at you angrily. However, as a nerd, Natasha doesn''t have the presence to really seem threatening.'
 				end
 				if hour >= 20:
-					act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+					act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 				else
 					act 'Continue window shopping':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & pcs_mood += 10 & gt 'katjaEv','kathan14'
 					act 'Look for something else to do':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & pcs_mood += 10 & gt 'katjaEv','kathan'
@@ -343,14 +343,14 @@ if $ARGS[0] = 'kathan14':
 				'<center><table><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></td></table></center>'
 				'You aren''t a ninja, and the most flagrant clue to that is the puzzled expression on Natasha''s face as she turns towards you and slaps your extended hands as you try to expose her butt.'
 				'"<<$pcs_nickname>>? Katja? What are you doing?"'
-				'Katja mouths an embarrassed "Oops!" and realization appears on Natasha''s eyes as she peeks into your dumbfounded face. Maybe she isn''t sure what were you planning, but her steps back show a weariness towards the two of you. Now what? You turn towards Katja as her phone goes "click", followed by Katja giggling.'
+				'Katja mouths an embarrassed "Oops!" and realization appears in Natasha''s eyes as she peeks into your dumbfounded face. Maybe she isn''t sure what were you planning, but her steps back show a weariness towards the two of you. Now what? You turn towards Katja as her phone goes "click", followed by Katja giggling.'
 				'"Te-he! Sorry <<$pcs_nickname>>, but you look like Wile E. Coyote!"'
 				'Behind you, Natasha quickly leaves the scene as Katja bursts into laughter.'
 				'"Hahaha! Beep Beep! Hehehe, this is priceless!"'
 				'Rolling your eyes, you grab the giggling redhead''s hand and leave. Time to look for something else to do.'
 
 				if hour >= 20:
-					act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
+					act 'It''s too late, accompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
 				else
 					act 'Continue window shopping':mood -= 10 & gt 'katjaEv','kathan14'
 					act 'Look for something else to do':mood -= 10 & gt 'katjaEv','kathan'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'kathan14':
 					'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
 					'"I can''t hear you slut."'
 					'"I... Ok <<$pcs_nickname>>."'
-					'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
+					'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
 				else
 					'Walking without care to the nerd, Natasha becomes aware of your presence, but before the girl can react, you push Natasha against a stand, cornering the surprised girl.'
 					'"<<$pcs_nickname>>?"'
@@ -407,12 +407,12 @@ if $ARGS[0] = 'kathan14':
 					'She blinks, not knowing how to react and looks around nervously, before lowering her face and whispering.'
 					'"Please <<$pcs_nickname>>, I... don''t like this game..."'
 					'You bend so your mouth is at Natasha''s ear.'
-					'"Oh really? Because I am pretty sure you will love to be... in your knees... between my legs."'
-					'You then take a step back and release the embarrassed girl. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
+					'"Oh really? Because I am pretty sure you will love to be... on your knees... between my legs."'
+					'You then take a step back and release the embarrassed girl. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
 				end
 				
 				if hour >= 20:
-					act 'It''s too late, acompany Katja to her home':npc_rel['A16'] -= 5 & minut += 5 & gt 'pav_residential'
+					act 'It''s too late, accompany Katja to her home':npc_rel['A16'] -= 5 & minut += 5 & gt 'pav_residential'
 				else
 					act 'Continue window shopping':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan14'
 					act 'Look for something else to do':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'kathan14':
 		act 'Invite Natasha to hang around with you':gt 'katjaEv','kathan15'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue window shopping':gt 'katjaEv','kathan14'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'kathan15':
 		'Your group even poses for some photos, but in the end and after a great time together, it is time to look for something else to do.'
 	end
 	if hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue window shopping':gt 'katjaEv','kathan14'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -539,13 +539,13 @@ if $ARGS[0] = 'kathan17':
 	elseif random_event = 5:
 		'"The last time I checked, Bella was the same age as me, so that act about being an "adult" surrounded by "kids"? The sign of a very immature and insecure personality that will lead to her being used by some "adult" and end up with a "kid."'
 	elseif random_event = 6:
-		'"Not counting Julia, you or my sister, I would say that Sonia is by far my closest friend. Maybe i don''t exactly approve some of her, let''s say "friends" ok? But, yes, I think we have a lot in common!"'
+		'"Not counting Julia, you or my sister, I would say that Sonia is by far my closest friend. Maybe I don''t exactly approve of everything about her, let''s say "friends" ok? But, yes, I think we have a lot in common!"'
 	elseif random_event = 7:
 		'"Look, I don''t care what the nerds say, but Stasya is a lot more bitchy than Christina! We are really lucky that she ended with Andrey. Even if their current relationship seems rocky, she has fulfilled everyone''s high school fantasy."'
 	elseif random_event = 8:
-		'"Shut up <<$pcs_nickname>>! Hm?! Oh sorry! It''s just I thought I saw Lizaveta. Phew, false alarm. Look, I appreciate her, but sometimes, she just gets on my nerves! When we talk, it is like sufering a third degree burn."'
+		'"Shut up <<$pcs_nickname>>! Hm?! Oh sorry! It''s just I thought I saw Lizaveta. Phew, false alarm. Look, I appreciate her, but sometimes, she just gets on my nerves! When we talk, it is like suffering a third-degree burn."'
 	elseif random_event = 9:
-		'"I don''t understand all the commotion about Marcus. Yes he is a nice and intelligent individual, plus, I will admit it, he looks great in sportwear, but all that fuss because of his skintone? It''s looking at the trees and ignoring the forest."'
+		'"I don''t understand all the commotion about Marcus. Yes he is a nice and intelligent individual, plus, I will admit it, he looks great in sportswear, but all that fuss because of his skin tone? It''s looking at the trees and ignoring the forest."'
 	elseif random_event = 10:
 		'"If I must choose Andrey is without a doubt, our best candidate for resident "prince charming". Dimka can go and suck a lemon, and noooo. I''m not angry at Dimka''s behavior towards Lavrenti, even if I seem really angry."'
 	elseif random_event = 11:
@@ -555,19 +555,19 @@ if $ARGS[0] = 'kathan17':
 	elseif random_event = 13:
 		'"I don''t know if you saw this film, what''s it called? Captain America? Well, there was this guy Buck? Bully? Bucky! Yes, that was his name! Well Fedor is Ivan''s Bucky!"'
 	elseif random_event = 14:
-		'"It is not a physical thing <<$pcs_nickname>>! Look, I like Slavik''s style, athletic with stone hard abs, what can I say?! I totally dig it! But, don''t misunderstand me, I don''t dislike him. It''s just that there isn''t a "feeling", we don''t seem to "click""'
+		'"It is not a physical thing <<$pcs_nickname>>! Look, I like Slavik''s style, athletic with stone-hard abs, what can I say?! I totally dig it! But, don''t misunderstand me, I don''t dislike him. It''s just that there isn''t a "feeling", we don''t seem to "click""'
 	elseif random_event = 15:
 		'"Oh fuck no! Everybody knows it! I told her! Christina wants Slavik? Ok, fine! She can have him! I just want to be left out of their toxic relationship! Seriously, this is getting ridiculous and the fact that her friends give me the evil eye isn''t helping!"'
 	elseif random_event = 16:
-		'"Ok, she knows how to dress? Yes! Use make up? Yes! Beautiful? Yes! Leadership skills that grant her the respect and admiration of all her friends! Yes! So why doesn''t Albina hang around with us?! I don''t have anything against "cough" most "cough" jocks, but it''s like she doesn''t belong with them."'
+		'"Ok, she knows how to dress? Yes! Use makeup? Yes! Beautiful? Yes! Leadership skills that grant her the respect and admiration of all her friends! Yes! So why doesn''t Albina hang around with us?! I don''t have anything against "cough" most "cough" jocks, but it''s like she doesn''t belong with them."'
 	elseif random_event = 17:
-		'"I have seen her dancing over the ice, it is one of the most beautiful things I have ever saw. Ronnie, is whithout doubt, one of the most talented and driven individuals I will ever meet, but all that comes with a cost. She is rich and beautiful, but the weirdest part? Ronnie doesn''t care! I don''t know if I could live that way."'
+		'"I have seen her dancing over the ice, it is one of the most beautiful things I have ever seen. Ronnie is, without a doubt, one of the most talented and driven individuals I will ever meet, but all that comes with a cost. She is rich and beautiful, but the weirdest part? Ronnie doesn''t care! I don''t know if I could live that way."'
 	elseif random_event = 18:
 		'"Pfff. Lazar? Great biceps! A Greek god in the flesh! I can''t believe I sucked his penis! God he needs to breed all of us so the human race can reach the next stage of evolution! I have heard girls saying these things TO him. Seriously! If somebody strokes more than his ego, there is going to be an explosion!"'
 	elseif random_event = 19:
-		'"He is lucky to be born that big because with the sort of sociopaths in our shool, Erast would be a target. I really, really wish for some good girl to take care of our nice demon or he is going to suffer a lot."'
+		'"He is lucky to be born that big because, with the sort of sociopaths in our school, Erast would be a target. I really, really wish for some good girl to take care of our nice demon or he is going to suffer a lot."'
 	elseif random_event = 20:
-		'"I don''t remember ever seeing Vanya sad, depressed or angry. He has always been this Happy-Go-Lucky hyperactive fellow that tries to make everybody smile. I really envy my sister for being with him, but remember no matter how much he cries, or how much he begs, never, ever give him a Red Bull."'
+		'"I don''t remember ever seeing Vanya sad, depressed or angry. He has always been this Happy-Go-Lucky hyperactive fellow who tries to make everybody smile. I really envy my sister for being with him, but remember no matter how much he cries, or how much he begs, never, ever give him a Red Bull."'
 	elseif random_event = 21:
 		'"Artem is... nice, I guess? I mean I don''t know. I do my own homework and don''t deal a lot with him."'
 	elseif random_event = 22:
@@ -575,34 +575,34 @@ if $ARGS[0] = 'kathan17':
 	elseif random_event = 23:
 		'"Well yes, it doesn''t show up, but Julia and I are old friends. Before high school, we hung around more, but beyond studies, there isn''t much that we can do now that really attracts our mutual interest."'
 	elseif random_event = 24:
-		'"I know that taking into consideration my family and economic situation, it''s hypocrital to say this, but Natasha must get all that nonsense about current fashion or being "cool" out of her head. She is a smart girl. Having a good job after graduation, she will have all her wishes granted."'
+		'"I know that taking into consideration my family and economic situation, it''s hypocritical to say this, but Natasha must get all that nonsense about current fashion or being "cool" out of her head. She is a smart girl. Having a good job after graduation, she will have all her wishes granted."'
 	elseif random_event = 25:
 		'"Zina? Who is Zina?"'
 	elseif random_event = 26:
 		'"Evgeny is... weird. I''m not sure what his problem is, but he is just too centered on chess. Obsessed I will say."'
 	elseif random_event = 27:
-		'"Te-he! Look, there is this little rumour... Jejeje... about Feofan. It seems, that after being send to detention, he met our favorite bully and somehow, well... she deflowered him."'
+		'"Te-he! Look, there is this little rumor... Jejeje... about Feofan. It seems, that after being sent to detention, he met our favorite bully and somehow, well... she deflowered him."'
 	elseif random_event = 28:
 		'"The truth is that Gerasim and I don''t interact too much. He is a pretty good student, but beyond that, there isn''t really any relation."'
 	elseif random_event = 29:
-		'"Look <<$pcs_nickname>>, I don''t like to judge others lifestyles, but Vitek and his gang are just posing. In the end, they will grow up and forget all that "gangsta style" nonsense. At least, those that aren''t outright psychopaths."'
+		'"Look <<$pcs_nickname>>, I don''t like to judge other people''s lifestyles, but Vitek and his gang are just posing. In the end, they will grow up and forget all that "gangsta style" nonsense. At least, those that aren''t outright psychopaths."'
 	elseif random_event = 30:
-		'"So, tell me. What exactly is it between Shulga and you? I ask because he doesn''t look at you, let''s say like a friend, and more like a drolling idiot that want to worship your feet."'
+		'"So, tell me. What exactly is it between Shulga and you? I ask because he doesn''t look at you, let''s say like a friend, and more like a drolling idiot that wants to worship your feet."'
 	elseif random_event = 31:
-		'"Pussy Riot''s music isn''t exactlly my style, but I admit that the band is pretty cool and that is the problem! Anushka is incredibly cool with the capacity to put on clothes ours moms would burn on a stake! Why does she hang around with the gopniks?"'
+		'"Pussy Riot''s music isn''t exactly my style, but I admit that the band is pretty cool and that is the problem! Anushka is incredibly cool with the capacity to put on clothes that our mom would burn on a stake! Why does she hang around with the gopniks?"'
 	elseif random_event = 32:
 		'"I... look <<$pcs_nickname>>, I don''t want to talk about this, but... we failed Lavrenti. He had all the reason in the world to hate us and I don''t know how to fix the situation."'
 	elseif random_event = 33:
 		'"Some men were born lucky. Some men were born very lucky. Lesco? God shat all over him."'
 	elseif random_event = 34:
-		'"Ehm... I don''t know how to say this, but you do you know Ralph Wiggum? From The Simpsons? I can''t stop comparing Petia to him."'
+		'"Ehm... I don''t know how to say this, but do you know Ralph Wiggum? From The Simpsons? I can''t stop comparing Petia to him."'
 	elseif random_event = 35:
 		'"What? Nat? Natalia? Ehm... You know... She is... I mean... I don''t know anything about her!"'
 	end
-	'Yes, rumor-mongering, one of the greatest pleasures in life, entertains you for the next half hour.'
+	'Yes, rumor-mongering, one of the greatest pleasures in life, entertains you for the next half an hour.'
 
 	if hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue walking and talking':gt 'katjaEv','kathan16'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -649,7 +649,7 @@ if $ARGS[0] = 'kathan18':
 			'Slurp... Life is good! With your hard-won slushie, you and Katja stroll Pavlovsk''s streets... Slurp... High on sugar, you two realize how wonderful it is to be so fabulous... Slurp... And show the world all your sugary magnificence with a selfie... Slurp... Time to look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':gt 'katjaEv','kathan16'
 				act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'kathan18':
 			'Damm. They are good! Sigh. Well, time to look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':gt 'katjaEv','kathan16'
 				act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'kathan19':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
 	'"Hey girls! Just a moment! Ending this, and I am with you!"'
-	'Catching your attention is a smiling Lizaveta, your school''s "Gossip Girl" that, as always, is typing away on her phone. It is evident that the girl''s sixth sense for gossiping has pinpointed Lizaveta towards you, and now the always eager for news girl is zeroing in on your position.'
+	'Catching your attention is a smiling Lizaveta, your school''s "Gossip Girl" who, as always, is typing away on her phone. It is evident that the girl''s sixth sense for gossiping has pinpointed Lizaveta towards you, and now the always eager-for-news girl is zeroing in on your position.'
 	'"Hmm <<$pcs_nickname>>, time to look for something else to do?"'
 	'Katja seems somewhat troubled about Lizaveta''s apparition, trapped between the need to know and the knowledge that if you aren''t very careful, anything you tell the spook will end up in everyone''s ears. So, what to do?'
 	act 'Quickly sneak away':
@@ -696,7 +696,7 @@ if $ARGS[0] = 'kathan19':
 		'As Lizaveta hums happily to herself, you grab Katja''s hand and sneak away. The self-absorbed scandalmonger to oblivious to your actions. Time to look for something else to do."'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue walking and talking':gt 'katjaEv','kathan16'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -711,18 +711,18 @@ if $ARGS[0] = 'kathan19':
 
 		if rand(0,70) >= pcs_humint:
 			'"Don''t worry Katja! What''s the worst that could happen?!"'
-			'Katja opens her mouth to answer, but stops and facepalms at your not exactly well-chosen words that have somehow made Lizaveta stop and turn towards you smiling, before she quickly runs towards your sitting place.'
+			'Katja opens her mouth to answer, but stops and facepalms at your not exactly well-chosen words that have somehow made Lizaveta stop and turn towards you smiling before she quickly runs towards your sitting place.'
 			'"<<$pcs_nickname>>! You won''t believe what I just learned, but... you know what, forget about that! I wanted to ask you something!"'
 			'You are taken back by the gossiper''s sudden assault and don''t have time to react to the girl''s burning interest. You must admit certain proudness at her questioning. Obviously, your life must be pretty interesting for her, so decide to satiate that thirst for knowledge.'
 			'"Well, yes, my mother went to see him... Albina? After that she was angry... I dunno, it seemed a good idea..."'
 			'For the next half hour, you and Lizaveta proceed to gossip about basically everything with, curiously, a progressively more silent Katja, but it ends with Lizaveta getting up.'
 			'"Oh! Look at the time! Sorry, Katja! <<$pcs_nickname>>! I must go, you know, some chores to do! So... bye!"'
-			'Lizaveta turns and leaves, but not without taking her phone out to continue the gossiping online, so you turn towards an embarrassed looking Katja.'
+			'Lizaveta turns and leaves, but not without taking her phone out to continue the gossiping online, so you turn towards an embarrassed-looking Katja.'
 			'"<<$pcs_nickname>>! Why did you tell her those things?"'
 			'You stand there trying to process what exactly was said. Nothing special? At your stunned expression, Katja rolls her eyes, grabs your hand and takes you away. Just pray that this doesn''t hurt you, but for the moment, it is time to look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & minut += 5 & gt		 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & minut += 5 & gt		 'pav_residential'
 			else
 				act 'Continue walking and talking':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan16'
 				act 'Look for something else to do':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan'
@@ -731,16 +731,16 @@ if $ARGS[0] = 'kathan19':
 			gs 'exp_gain', 'humint', rand(1,2)
 			gs 'exp_gain', 'persuas', rand(1,2)
 			'"Don''t worry Katja! I know how to handle Lizaveta!"'
-			'Katja rolls her eyes at your boast, but waits for the gossiper to end something that, knowing Lizaveta, can take a while and give you some precious minutes to agree, what can and, more importantly, what CAN''T be said.'
+			'Katja rolls her eyes at your boast, but waits for the gossiper to end something that, knowing Lizaveta, can take a while and give you some precious minutes to agree, on what can and, more importantly, what CAN''T be said.'
 			'"Sorry! Sorry! You won''t believe what I just learned!"'
 			'Lizaveta finally finishes and quickly approaches the two of you with a wolfish smile. Katja gives you a nod and sits away so the new interloper sits between you. The ambush is set and Lizaveta is your prey.'
 			'"Come on Lizaveta! Tell us! Katja and I are dying to know!"'
-			'Spurred by your comment, the rumormonger begin to expose all sorts of juicy information, from the serious to the whimsical. Of course, she tries again and again to obtain information from you, but the chatting girl is easily distracted with the all-powerful "tell us! tell us!" mantra shouted in a duet, combined with carefully edited rumors. In the end, Lizaveta is milked, but doesn''t have information that can hurt you.'
+			'Spurred by your comment, the rumormonger begins to expose all sorts of juicy information, from the serious to the whimsical. Of course, she tries again and again to obtain information from you, but the chatting girl is easily distracted by the all-powerful "tell us! tell us!" mantra shouted in a duet, combined with carefully edited rumors. In the end, Lizaveta is milked, but doesn''t have information that can hurt you.'
 			'"Oh! Look at the time! Sorry, Lizaveta! We must go, Katja''s mom is waiting for us to do some chores!"'
 			'After playing your little game for half an hour, Lizaveta has begun to type on her phone. That is the moment you have been waiting for. To get up, give apologetic excuses and run away. It has been fun, but is time to look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':grupvalue[1] += 5 & grupvalue[2] += 5 & grupvalue[3] += 5 & grupvalue[3] += 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':grupvalue[1] += 5 & grupvalue[2] += 5 & grupvalue[3] += 5 & grupvalue[3] += 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':grupvalue[1] += 5 & grupvalue[2] += 5 & grupvalue[3] += 5 & grupvalue[3] += 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan16'
 				act 'Look for something else to do':grupvalue[1] += 5 & grupvalue[2] += 5 & grupvalue[3] += 5 & grupvalue[3] += 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'kathan19':
 			gs 'exp_gain', 'humint', rand(1,2)
 			gs 'exp_gain', 'persuas', rand(0,1)
 			'"Katja, don''t tell me that you aren''t interested in whatever news Lizaveta wants to tell us."'
-			'Katja looks at you embarrassed, but the little smile in her lips is evident that yes, maybe the infamous Lizaveta Petrov has a really big mouth. But seriously, the gossiping is great, so you both sit and wait patiently until the typing ends and she deigns herself to talk.'
+			'Katja looks at you embarrassed, but the little smile on her lips is evident that yes, maybe the infamous Lizaveta Petrov has a really big mouth. But seriously, the gossiping is great, so you both sit and wait patiently until the typing ends and she deigns herself to talk.'
 			'"Sorry! Sorry! You won''t believe what I just learned!"'
 			'Looking like the cat that just ate the mouse, and knowing that you are eager for some news, Lizaveta quickly sits and begins to talk. As it can''t be otherwise, you eat up all the juicy gossip before adding your own knowledge to this special stew.'
 			'"What? No! We can''t tell Stasya... seriously, I''m surprised that Feofan knows his way around a girl... oh my god! You are such a slut!"'
@@ -757,7 +757,7 @@ if $ARGS[0] = 'kathan19':
 			'"Hm? What am I doing? Hu? What time is it? Shit! Sorry, Katja! <<$pcs_nickname>>! I must go! Bye!"'
 			'Lizaveta stands quickly and says goodbye. It is time to look for something else to do.'
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':gt 'katjaEv','kathan16'
 				act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -822,7 +822,7 @@ if $ARGS[0] = 'kathan20':
 	'This is only a little example of the things boys (and some girls...) say to you and Katja during your half-hour modeling around this city. It''s utterly uplifting, and you giggle, thinking about doing it all over again, but maybe later? It seems that it is time to look for something else to do.'
 
 	if hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue walking and talking':gt 'katjaEv','kathan16'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -872,7 +872,7 @@ if $ARGS[0] = 'kathan21':
 	elseif random_event = 15:
 		'"What? Are you ignoring me? Fortunately, I want your mouth for other things."'
 	elseif random_event = 16:
-		'"Your mouth says NO! Sniff... but my cock say YES!"'
+		'"Your mouth says NO! Sniff... but my cock says YES!"'
 	elseif random_event = 17:
 		'"Deep inside, you are all the same. Cock hungry whores, so let''s skip the foreplay."'
 	elseif random_event = 18:
@@ -883,7 +883,7 @@ if $ARGS[0] = 'kathan21':
 	'This is only a little example of the things boys (and some girls...) say to you and Katja during your half-hour modeling around this city. It''s utterly disgusting! Gallantry is dead! It is better if you look for something else to do.'
 
 	if hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue walking and talking':gt 'katjaEv','kathan16'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -900,25 +900,25 @@ if $ARGS[0] = 'kathan22':
 
 	if rand(0,3) = 3 and katjaQW['slut'] >= 40 and katjaQW['QWstage'] > 2 and npc_rel['A14'] >= 80 and katjaQW['sex_clossedness'] < 2:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT15.jpg"></center>'
-		'It was a dull moment in your conversation when it happened. Suddenly, in a little-travelled street corner, Katja turned towards you and...'
+		'It was a dull moment in your conversation when it happened. Suddenly, on a little-travelled street corner, Katja turned towards you and...'
 		'"Hmf?!"'
 		'You grunt surprised as the redhead forcefully kisses your lips and merges in a warm embrace. Time stops and you can only stand there, reciprocating Katja''s kisses with your own. Some bystander says something... encouraging? Insulting? You are barely aware, but somehow that stops the making out session.'
 		'"Woah! That was... great Katja!"'
 		'She gives you a cheeky smile and grabbing your hand, takes you away to look for something else to do.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home': katjaQW['horny'] += 5 & minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home': katjaQW['horny'] += 5 & minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue walking and talking': katjaQW['horny'] += 5 &  gt 'katjaEv','kathan16'
 			act 'Look for something else to do': katjaQW['horny'] += 5 &  gt 'katjaEv','kathan'
 		end
 	elseif katjaQW['slut'] >= 20 and katjaQW['QWstage'] > 2 and npc_rel['A14'] >= 50 and katjaQW['sex_clossedness'] < 2:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT16.jpg"></center>'
-		'You and Katja stand silently, observing pavlovsk''s landscape without too much to do or say, just chilling in your mutual company. Then, you feel a hand on your waist that soon slides down towards one of your pockets, where it rest snugly.'
-		'Turning to your side, you see Katja blushing, embarrassed at her display of affection until your hand reaches to her pocket. You both stand, relaxing in your mutual company. This situation lasts a while, the two of you oblivious to the world beyond your little happy bubble until some bystander says something... encouraging? Insulting? You are barely aware, but that takes you out of your reverie. It is time to look for something else to do.'
+		'You and Katja stand silently, observing pavlovsk''s landscape without too much to do or say, just chilling in your mutual company. Then, you feel a hand on your waist that soon slides down towards one of your pockets, where it rests snugly.'
+		'Turning to your side, you see Katja blushing, embarrassed at her display of affection until your hand reaches into her pocket. You both stand, relaxing in your mutual company. This situation lasts a while, the two of you oblivious to the world beyond your little happy bubble until some bystander says something... encouraging? Insulting? You are barely aware, but that takes you out of your reverie. It is time to look for something else to do.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':katjaQW['horny'] += 5 & minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':katjaQW['horny'] += 5 & minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue walking and talking':katjaQW['horny'] += 5 & gt 'katjaEv','kathan16'
 			act 'Look for something else to do':katjaQW['horny'] += 5 & gt 'katjaEv','kathan'
@@ -928,7 +928,7 @@ if $ARGS[0] = 'kathan22':
 		'There isn''t much to say. You and Katja just hang around Pavlovsk talking, looking for cuties, showing off, and in general doing friend stuff. It is probably best if you find something interesting to do anyway.'
 
 		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+			act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 		else
 			act 'Continue walking and talking':gt 'katjaEv','kathan16'
 			act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -944,7 +944,7 @@ if $ARGS[0] = 'kathan23':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT17.jpg"></center>'
 	'Your walks take you around Pavlovsk until you hear someone calling you.'
 	'"Hey! Katja! Over here!"'
-	'Turning towards the voice, you see Svyatoslav waving some distance away. Katja groans, grabs your arm and look nervously around for some escape route.'
+	'Turning towards the voice, you see Svyatoslav waving some distance away. Katja groans, grabs your arm and looks around nervously for some escape route.'
 	'"Oh fuck! <<$pcs_nickname>>! Please, you must do something! Just do something!"'
 	'What can you do? Svyatoslav is a jock, so running away is out of the question. Katja isn''t going to outrun him, so what to do?'
 
@@ -975,11 +975,11 @@ if $ARGS[0] = 'kathan23':
 				'You then whine and put on scared eyes for all the people on the street''s enjoyment, and in that instant, the atmosphere changes as around you, the pedestrians instantly form a dislike to the BIG BAD BULLY threatening the SCARED CUTE GIRL'
 				'"Fuck you <<$pcs_nickname>>! Why don''t you go and fuck your therapist? Just leave Katja and I alone for a minute!"'
 				'"Nope!" you angrily answer and grab his arm "And if you don''t follow me, I will begin to scream about how your bullying has made me need one!"'
-				'Taking advantage of your distraction, Katja quickly sneaks away, leaving you with a pissed off Svyatoslav who, not knowing how to get rid of the hold on his arm without embarrassing himself, angrily follows you/is dragged around Pavlovsk for a maddening half hour, until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
+				'Taking advantage of your distraction, Katja quickly sneaks away, leaving you with a pissed-off Svyatoslav who, not knowing how to get rid of the hold on his arm without embarrassing himself, angrily follows you/is dragged around Pavlovsk for a maddening half hour, until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
 			else
-				'You swoop, scoop & split your boobs, letting then show slightly through your cleavage. You are a hot girl and he a hormonal teen. Time to use your "boob magic" to distract the poor chap. He won''t know what hit him!'
-				'"Look Katja! Slavik! What a coincidence to meet him here!"'
-				'As Svyatoslav tries to pass by your side towards Katja, you grab his arm and push your bust against him, making Svyatoslav turns towards your puppy eyes. He freezes, confused at your action, but doesn''t try to disengage. This gives a momentary distraction for Katja to sneak away.'
+				'You swoop, scoop & split your boobs, letting them show slightly through your cleavage. You are a hot girl and he''s a hormonal teen. Time to use your "boob magic" to distract the poor chap. He won''t know what hit him!'
+				'"Look, Katja! Slavik! What a coincidence to meet him here!"'
+				'As Svyatoslav tries to pass by your side towards Katja, you grab his arm and push your bust against him, making Svyatoslav turn towards your puppy eyes. He freezes, confused at your action, but doesn''t try to disengage. This gives a momentary distraction for Katja to sneak away.'
 				'"Hm. <<$pcs_nickname>> I have things to do! Slavik, please take care of her!"'
 				'With that, he tries to follow the redhead, but in the seconds that it takes him to react, you are tangled around his well-toned body and giving him a good view of your puppies.'
 				'"Oh come on Slavik! You are always after Christina or Katja! That is unfair! I''m jealous! Let''s do something fun!"'
@@ -1001,12 +1001,12 @@ if $ARGS[0] = 'kathan23':
 		if random_event <= pcs_prcptn:
 			gs 'exp_gain', 'prcptn', rand(0,1)
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT8.jpg"></center>'
-			'You turns towards him, and make a show of looking for his voice until a van passes between your line of sight. You grab Katja and crouch. People around give you some funny looks, not understanding your action.'
+			'You turn towards him and make a show of looking for his voice until a van passes between your line of sight. You grab Katja and crouch. People around give you some funny looks, not understanding your actions.'
 			'"Come on Katja! Follow me!"'
 			'You both quickly sneak behind a line of cars that covers your escape until you reach a corner from which, hidden, you observe Slavik running towards your last position and looking around, baffled. You then turn tails and run away. It is fun, but it is probably best if you find something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':npc_rel['A14'] += 5 & pcs_mood += 10 & minut += 5 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':npc_rel['A14'] += 5 & pcs_mood += 10 & minut += 5 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':npc_rel['A14'] += 5 & pcs_mood += 10 & gt 'katjaEv','kathan16'
 				act 'Look for something else to do':npc_rel['A14'] += 5 & pcs_mood += 10 & gt 'katjaEv','kathan'
@@ -1015,12 +1015,12 @@ if $ARGS[0] = 'kathan23':
 			'<center><img <<$set_imgh>> src="images/pc/reactions/glare.jpg"></center>'
 			'Grabbing Katja''s hand, you try to look for a distraction, but, sadly, there isn''t one and Svyatoslav takes advantage of that, running towards your position and standing in your way.'
 			'"Hey! Katja! Nice to meet you!"'
-			'Fuck! That is the silent word that crosses between the redhead and you as the jock gets between the two of you and begins to talk to the less than interested Katja, somewhat ignoring your presence.'
+			'Fuck! That is the silent word that crosses between the redhead and you as the jock gets between the two of you and begins to talk to the less-than-interested Katja, somewhat ignoring your presence.'
 			'"So... Katja, I''m going to do this match with Ivan and I want you to be there. After that, we can go to see that film and after..."'
-			'He continues pestering the poor redhead, who can only answer with "Uh? Maybe? Eh?", for the next half hour, stressing you both out as the jock tries to force Katja to go with him on a date. Luckily, after what feels like an enternity, Svyatoslav looks at his watch, realizes that he must do other things and FINALLY says goodbye, leaving you both more than a little unnerved. What''s wrong with this creep? Arghh! Better look for something else to do.'
+			'He continues pestering the poor redhead, who can only answer with "Uh? Maybe? Eh?", for the next half hour, stressing you both out as the jock tries to force Katja to go with him on a date. Luckily, after what feels like an eternity, Svyatoslav looks at his watch, realizes that he must do other things and FINALLY says goodbye, leaving you both more than a little unnerved. What''s wrong with this creep? Arghh! Better look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
 			else
 				act 'Continue walking and talking':mood -= 10 &gt 'katjaEv','kathan16'
 				act 'Look for something else to do':mood -= 10 &gt 'katjaEv','kathan'
@@ -1047,9 +1047,9 @@ if $ARGS[0] = 'discountcosmetics':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
-	'Katja and you, explore the open air market, chating, and in general having a great time, until Katja signall excited towards a stall, before hauling you quicklly towards it.'
+	'Katja and you, explore the open-air market, chatting, and in general having a great time, until Katja excitedly signals towards a stall, before hauling you quickly towards it.'
 	'"<<$pcs_nickname>>! Look it!"'
-	'Looking at the stall, you see what have made her so excited, there are some cosmetics on sale for <<tovpay>> <b>₽</b>, that soon are in her bag.'
+	'Looking at the stall, you see what''s gotten her so excited, there are some cosmetics on sale for <<tovpay>> <b>₽</b>, that soon land in her bag.'
 
 	if money >= tovpay and hour <= 20:
 		act 'Buy the cosmetics (800 <b>₽</b>) and contine window shopping':
@@ -1058,14 +1058,14 @@ if $ARGS[0] = 'discountcosmetics':
 			gt 'katjaEv','kathan14'
 		end
 	elseif money >= tovpay and hour >= 20:
-		act 'It''s too late, buy the cosmetics (800 <b>₽</b>) and, acompany Katja to her home':
+		act 'It''s too late, buy the cosmetics (800 <b>₽</b>) and, accompany Katja to her home':
 			money -= tovpay
 			mc_inventory['cosmetics'] += 50
 			minut += 5
 			gt 'pav_residential'
 		end
 	elseif hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue window shopping':gt 'katjaEv','kathan14'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -1077,9 +1077,9 @@ if $ARGS[0] = 'discountvitamins':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
-	'Katja and you, explore the open air market, chating, and in general having a great time, until Katja signall excited towards a stall, before hauling you quicklly towards it.'
-	'"<<$pcs_nickname>>! Look it!"'
-	'Looking at the stall, you see what have made her so excited, there are some vitamins on sale for <<tovpay>> <b>₽</b>, that soon are in her bag.'
+	'Katja and you, explore the open-air market, chatting, and in general having a great time, until Katja excitedly signals towards a stall, before hauling you quickly towards it.'
+	'"<<$pcs_nickname>>! Look at it!"'
+	'Looking at the stall, you see what has gotten her so excited, there are some vitamins on sale for <<tovpay>> <b>₽</b>, that soon land in her bag.'
 
 	if money >= tovpay and hour <= 20:
 		act 'Buy the vitamins (105 <b>₽</b>) and contine window shopping':
@@ -1088,14 +1088,14 @@ if $ARGS[0] = 'discountvitamins':
 			gt 'katjaEv','kathan14'
 		end
 	elseif money >= tovpay and hour >= 20:
-		act 'It''s too late, buy the vitamins (105 <b>₽</b>) and, acompany Katja to her home':
+		act 'It''s too late, buy the vitamins (105 <b>₽</b>) and, accompany Katja to her home':
 			money -= tovpay
 			mc_inventory['vitamins'] += 20
 			minut += 5
 			gt 'pav_residential'
 		end
 	elseif hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue window shopping':gt 'katjaEv','kathan14'
 		act 'Look for something else to do':gt 'katjaEv','kathan'
@@ -1107,9 +1107,9 @@ if $ARGS[0] = 'discountlipbalm':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
-	'Katja and you, explore the open air market, chating, and in general having a great time, until Katja signall excited towards a stall, before hauling you quicklly towards it.'
+	'Katja and you, explore the open-air market, chatting, and in general having a great time, until Katja excitedly signals towards a stall, before hauling you quickly towards it.'
 	'"<<$pcs_nickname>>! Look it!"'
-	'Looking at the stall, you see what have made her so excited, there are some lip balm on sale for <<tovpay>> <b>₽</b>, that soon are in her bag.'
+	'Looking at the stall, you see what has gotten her so excited, there is lip balm on sale for <<tovpay>> <b>₽</b>, that soon lands in her bag.'
 
 	if money >= tovpay and hour <= 20:
 		act 'Buy the lip balm (100 <b>₽</b>) and contine window shopping':
@@ -1118,7 +1118,7 @@ if $ARGS[0] = 'discountlipbalm':
 			gt 'katjaEv','kathan14'
 		end
 	elseif money >= tovpay and hour >= 20:
-		act 'It''s too late, buy the lip balm (100 <b>₽</b>) and, acompany Katja to her home':
+		act 'It''s too late, buy the lip balm (100 <b>₽</b>) and, accompany Katja to her home':
 			mc_inventory['lipbalm'] += 30
 			money -= tovpay
 			minut += 5
@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'discountlipbalm':
 		end
 
 	elseif hour >= 20:
-		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		act 'It''s too late, accompany Katja to her home':minut += 5 & gt 'pav_residential'
 	else
 		act 'Continue window shopping':gt 'katjaEv','kathan14'
 

+ 10 - 10
locations/katjaEvDin.qsrc

@@ -504,7 +504,7 @@ if $ARGS[0] = 'sex':
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 
-	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and strapon > 0:
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and mc_inventory['strapon'] > 0:
 		act 'Get your strap-on': gt 'KatjaEvDin', 'strapon_start'
 	end
 
@@ -574,8 +574,8 @@ if $ARGS[0] = 'fisting':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting_repeat.jpg"></center>'
 	'After making sure Katja is well lubed and ready, she lays back to spread her legs for you. As she massages her clit with a toy, you slide your fingers in one at a time, working them in, out and around, bringing her pleasure with each thrust. She cries out in orgasm more than once, which makes her more wet and ready.'
-	'With a final push, you tuck your thumb in and curl your hand to slide it all the way in, till her netherlips clench around your wrist. You give her only a few moments rest before twisting and thrusting your hand more vigorously within her pussy. It doesn''t take Katja long before her climax breaks again and she arches her back and attempts to keep her voice down as you continue to move your hand and fingers inside of her, but eventually you slow down and slide your hand out of her.'
-	'Katja tries to catch her breath as she continues to have aftershock orgasms, while you watch her pussy close slowly around something that isn''t there. Eventually you climb up and lay next to her, holding her as she shakes with her final orgasms and kissing her softly until you are ready for something else...'
+	'With a final push, you tuck your thumb in and curl your hand to slide it all the way in, till her netherlips clench around your wrist. You give her only a few moments of rest before twisting and thrusting your hand more vigorously within her pussy. It doesn''t take Katja long before her climax breaks again and she arches her back and attempts to keep her voice down as you continue to move your hand and fingers inside of her, but eventually, you slow down and slide your hand out of her.'
+	'Katja tries to catch her breath as she continues to have aftershock orgasms, while you watch her pussy close slowly around something that isn''t there. Eventually, you climb up and lay next to her, holding her as she shakes with her final orgasms and kissing her softly until you are ready for something else...'
 	gs 'arousal', 'vaginal_fist_give', 5, 'lesbian'
 	gs 'stat'
 
@@ -760,7 +760,7 @@ if $ARGS[0] = 'kuni_dom':
 							gs 'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/sex/school/katstrapfuck.mp4"></video></center>'
 							'You nod your head and Katja pulls you up to your feet by your hair. She grabs you on either side of the head and licks some of the saliva off your chin before slowly moving her tongue up to your mouth. You eagerly open your mouth and she gives you a passionate kiss, forcing her tongue into your mouth and then pushes you onto the bed. "That''s my good little fuck slut, now get on your hands and knees like a good little slut!" You get on all fours as she kneels down behind you and gives your ass a hard smack.'
-							'She holds the dildo with one hand and starts rubbing it against your pussy lips, while using the other to grab your hair again and pull your head back as she slides the dildo into your wet pussy. She barely has the tip all the way in when she pulls back on your hair, forcing you to lean back as she thrusts her hips forward, shoving the dildo the full length of the dildo inside you.'
+							'She holds the dildo with one hand and starts rubbing it against your pussylips while using the other to grab your hair again and pull your head back as she slides the dildo into your wet pussy. She barely has the tip all the way in when she pulls back on your hair, forcing you to lean back as she thrusts her hips forward, shoving the dildo the full length of the dildo inside you.'
 							'Before she even gives you a chance to get used to it, she starts roughly and furiously fucking you. Your moans get louder as the pleasure builds. "Yeah, you love this, don''t you bitch?!" 
 							"Yes, yes please fuck me. Use me!" you moan back and she doubles her efforts before she finally pulls out of you, keeping hold of your hair as she drags you off the bed. She takes you over to her desk and bends you over it.'
 							'"Reach back and pull those ass cheeks apart so I can fuck you in the ass!" she commands. You don''t know if you can resist her, you don''t know if you even want to.'
@@ -788,7 +788,7 @@ if $ARGS[0] = 'kuni_dom':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/katstrapanal.jpg"></center>'
 								'You grab your ass cheeks and pull them apart. Almost at once, you feel the head of the dildo pressing against your asshole. "That''s my good little butt slut. We''ll have you trained in no time."'
-								'With only the lubrication from your pussy, she slides it into your ass. She is gentle at first, working it in slowly as she thrusts in and out at a steady pace, gradually works it deeper and deeper into your ass. Once she has pushed the full length into your ass, she starts to pick up the pace and fuck you harder. You start moaning in a mixture of pleasure and pain.'
+								'With only the lubrication from your pussy, she slides it into your ass. She is gentle at first, working it in slowly as she thrusts in and out at a steady pace, gradually working it deeper and deeper into your ass. Once she has pushed the full length into your ass, she starts to pick up the pace and fuck you harder. You start moaning in a mixture of pleasure and pain.'
 								'She keeps picking up speed and soon the sound of her hips slapping against your ass can be heard over your moaning. She seems to lose herself in the act and stops paying attention to you. You don''t think she would even notice if you orgasmed. After a good few minutes of this, she starts panting as she gets tired.'
 								gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
 								
@@ -800,7 +800,7 @@ if $ARGS[0] = 'kuni_dom':
 								gs 'arousal', 'end'
 								gs 'stat'
 								
-								'Yet she doesn''t slow down her furious pace. Finally unable to keep it up anymore, she collapses on your back. You can feel her sweat on your back and her heavy breathing in your ear as she rests against with the dildo still firmly up your ass.'
+								'Yet she doesn''t slow down her furious pace. Finally unable to keep it up anymore, she collapses on your back. You can feel her sweat on your back and her heavy breathing in your ear as she rests against you with the dildo still firmly up your ass.'
 								'You take the time to rest and relax yourself, coming down from the pounding you just received. A few minutes later, she kisses your back and your neck before climbing off you and pulling the dildo out slowly. Getting up yourself, you see her taking the harness off and tossing it aside. You notice that her thighs are slick with sweat and her own juices. She grabs you by the neck and gives you a passionate, deep and very long kiss. "My god <<$pcs_nickname>>, that was amazing! I hope I didn''t hurt you too much and you enjoyed it as much as I did. No wonder boys fuck us like that, that was amazing!" she says upon breaking the kiss.'
 								'She falls back on her bed, still breathing hard and looking at you with a somewhat possessive look as you lie down next to her. "It was wonderful. I''m glad you enjoyed it too, even if you were a little rough at times." She leans over and gives you another kiss. "Sorry, but that was beyond description. We''re going to have to do that again sometime." The two of you lay quietly for a while, basking in the aftermath. You know something in your relationship has changed and you think for the better. After a while, you get up and get dressed.'
 
@@ -894,7 +894,7 @@ if $ARGS[0] = 'moron':
 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/frenchkiss.jpg"></center>'
 			'Looking at Ivan, then at this idiot, it seems that Ivan didn''t notice him. You sigh. "Is that really necessary? She is my best friend and we want to kiss. You just seem jealous!'
-			'"Lesbians! Lesbians!" He continues to scream like a freak so much that people begin to gather around to find out what''s happening. Ivan steps over next to you and puts his hand on your shoulder, giving the idiot a glare as well. Boosted by Ivan''s support, you continue. "We like boys, just not assholes like you!" With those words, you stand on your tiptoes and, clasping Ivan''s head in your hands, give him a long passionate kiss with lots of tongue.'
+			'"Lesbians! Lesbians!" He continues to scream like a freak so much so that people begin to gather around to find out what''s happening. Ivan steps over next to you and puts his hand on your shoulder, giving the idiot a glare as well. Boosted by Ivan''s support, you continue. "We like boys, just not assholes like you!" With those words, you stand on your tiptoes and, clasping Ivan''s head in your hands, give him a long passionate kiss with lots of tongue.'
 
 			act 'Kiss again':
 				*clr
@@ -905,7 +905,7 @@ if $ARGS[0] = 'moron':
 				'Seeing this, he seems offended. "The redhead doesn''t like guys, I bet." he says with a smirk, hoping Katja will kiss him to prove him wrong.'
 				'"Wrong again loser!" Katja replies and just as you did she starts going around kissing the boys.'
 				if $loc = 'pav_disco':
-					'After kissing the last boy, you turn back and make sure Katja kisses all of them too. You now realise the guys are hoping for more and quickly drag Katja away before you accidentally start an orgy.'
+					'After kissing the last boy, you turn back and make sure Katja kisses all of them too. You now realize the guys are hoping for more and quickly drag Katja away before you accidentally start an orgy.'
 					act 'Return to dance': gt 'pav_disco'
 				else
 					'Just as you kiss the last boy, you turn around to see how Katja is doing with her kissing, but the bell rings and you all rush to class.'
@@ -942,7 +942,7 @@ if $ARGS[0] = 'moron':
 					if knowKatjaPreg = 1:
 						'You snort and look at Katja "Just what you need when you already have one inside."'
 					else
-						'You only snort at Katja''s words, although Ivan does have a fine looking ass...'
+						'You only snort at Katja''s words, although Ivan does have a fine-looking ass...'
 					end
 					if $loc = 'pav_disco':
 						act 'Return to the dance': gt 'pav_disco'
@@ -957,7 +957,7 @@ if $ARGS[0] = 'moron':
 					if knowKatjaPreg = 1:
 						'You snort and look at Katja "Just what you need when you already have one inside."'
 					else
-						'You only snort at Katja''s words, although Ivan does have a fine looking ass...'
+						'You only snort at Katja''s words, although Ivan does have a fine-looking ass...'
 					end
 				end
 				if $loc = 'pav_disco':

+ 18 - 16
locations/katja_chat.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 			'"What are you doing here?" she asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly, as if she''s trying to determine why you approached her.'
+			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly as if she''s trying to determine why you approached her.'
 			'"Hi Katja," you say. "How are you?"'
 			'"I''m good," she replies, and her composure loosens a little.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -124,7 +124,7 @@ if $ARGS[0] = 'uni_cafe':
 			'"What are you doing here?" she asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt 'uni_cafe'
 		else
-			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly, as if she''s trying to determine why you approached her.'
+			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly as if she''s trying to determine why you approached her.'
 			'"Hi Katja," you say. "How are you?"'
 			'"I''m good," she says, and her composure loosens a little.'
 			if uni_lunch_bought = 1:
@@ -216,18 +216,18 @@ if $ARGS[0] = 'chat1':
 	!!end
 
 	if locat['katja'] = 24: 
-		'Katja grabs a magazine lying on the table, opens it and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look perfect on you," she says. It is a lovely dress, but before you can respond, she is already flipping pages to another dress.'
-		'Katja spends the next few minutes showing you clothes that she thinks would suit you or would just like for herself.'
+		'Katja grabs a magazine from the table, opens it, and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look perfect on you," she says. It is a lovely dress, but before you can respond, she''s already flipping through the pages to another dress.'
+		'Katja spends the next few minutes showing you clothes that she thinks would suit you or that she simply likes.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 	elseif locat['katja'] = 25:
-		'Katja suddenly gestures to a tall brunette in a long dress walking by. "Look at her! She is so pretty in that dress. I wish I had that," she says longingly. You''re unsure if she meant she wanted the dress or the girl.'
-		'You spend the next several minutes talking with Katja about the clothes and makeup of the girls who pass you by.'
+		'Katja suddenly points to a tall brunette in a long dress walking by. "Look at her! She looks so pretty in that dress. I wish I had that," she says longingly. You''re not sure if she means she wants the dress or if she admires the girl.'
+		'You spend the next several minutes discussing the clothes and makeup of the girls passing by.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 	elseif locat['katja'] = 44:
-		'This is where Katja really is in her element. She drags you around from window to window, commenting on the clothes, shoes, jewelry, makeup  and more. It''s like following a hurricane, you barely have time to notice that is in the store window before she drags you to the next.'
-		'This goes on for a while, but she does start to slow down and actually pay attention to what you think about the things id comments on.'
+		'This is where Katja truly comes alive. She guides you from window to window, commenting on clothes, shoes, jewelry, makeup, and more. It''s like trying to keep up with a whirlwind; you barely have time to notice what''s in the store window before she rushes you to the next.'
+		'This goes on for a while, but she eventually starts to slow down and pays attention to your thoughts on the things she comments on.'		
 		if katjaQW['QWstage'] >= 2 and katjaQW['shopping_day'] ! daystart:
 			act 'Suggest trying on some clothes': gt 'katja_city', 'clothes_start1'
 		end
@@ -267,6 +267,7 @@ if $ARGS[0] = 'sofia1':
 	'"I doubt it," Katja says. "She''s constantly hanging out with her boyfriend, and I don''t think he wants her to meet other girls. She also returns to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
 	'"You''re not too fond of her boyfriend?" you ask.'
 	'"I don''t know," she says. "There''s something about him that feels a little bit off, but I shouldn''t speak ill of people you don''t even know, so let''s wait until after you meet him."'
+	
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end
 
@@ -346,15 +347,16 @@ if $ARGS[0] = 'coffee_hole_event':
 	!! This is to have random events when you are sitting with Katja
 	if anushkaQW['coffee_hole'] = 1 and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)) and katjaQW['brunch_bought'] = 1:
 		katjaQW['brunch_bought'] = 0
-		'You and Katja spend a few minutes chatting about school, what you''ve both been up to and gossiping about your old school mates while waiting on Anushka to return with the order. Minutes later, Anushka comes back with a tray carrying the order.'
+		'You and Katja spend a few minutes chatting about school, what you''ve both been up to and gossiping about your old schoolmates while waiting for Anushka to return with the order. Minutes later, Anushka comes back with a tray carrying the order.'
 		if npc_rel['A144'] >= 60:
 			'She sets the tray on a nearby empty table before sitting down next to you. "What''s up, bitches?"'
 			'You shake your head at her. "Just hanging out, talking about stuff and catching up on the past."'
 			'Before anyone else can say something, a young man a few tables over turns to look in your direction. "Uh, excuse me miss, can I get..."'
-			'Before he can finish, Anushka turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. You think I only exist to wait on you? Am I not entitled to a small break now and again?" Her over the top tone and body language adds to her rant.'
+			'Before he can finish, Anushka abruptly turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. Do you think I only exist to wait on you? Don''t I deserve a short break now and then?" Her exaggerated tone and body language amplify her frustration.'
 			*nl
-			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous of what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait, it''s okay." He quickly turns back around and Anushka glances at the two of you with an amused look on her face, obviously fighting hard to not start giggling.'
-			'Katja looks shocked by Anushka''s behavior. "You can''t treat customers like that!" she says while looking at you for confirmation.' 
+			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous about what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait. It''s okay." He quickly turns back around, and Anushka glances at the two of you with an amused look on her face, obviously fighting hard not to start giggling.'
+			'Katja looks shocked by Anushka''s behavior. "You can''t treat customers like that!" she says while looking at you for confirmation.'
+			
 			act 'Agree with Katja':
 				*clr & cla
 				gs 'npc_relationship', 'modify', 'A14', 'like'
@@ -386,9 +388,9 @@ if $ARGS[0] = 'coffee_hole_event':
 			'She sets the tray on a nearby empty table and sits down next to Katja. "What''s up, girls?"'
 			'You shake your head at her slightly. "Just hanging out, talking about stuff and catching up on the past."'
 			'Before anyone else can say something a young man a few tables over turns to look in your direction. "Uh, excuse me miss, can I get..."'
-			'Before he can finish, Anushka turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. You think I only exist to wait on you? Am I not entitled to a small break now and again?" Her over the top tone and body language adds to her rant.'
+			'Before he can finish, Anushka abruptly turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. Do you think I only exist to wait on you? Don''t I deserve a short break now and then?" Her exaggerated tone and body language amplify her frustration.'
 			*nl
-			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous of what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait, it''s okay." He quickly turns back around and Anushka glances at the two of you with an amused look on her face, obviously fighting hard to not start giggling.'
+			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous about what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait, it''s okay." He quickly turns back around and Anushka glances at the two of you with an amused look on her face, obviously fighting hard to not start giggling.'
 			'Katja looks shocked by Anushka''s behavior "You can''t treat customers like that!" she says while looking at you for confirmation.' 
 			act 'Agree with Katja':
 				*clr & cla
@@ -415,9 +417,9 @@ if $ARGS[0] = 'coffee_hole_event':
 		katjaQW['coffee_hole_rand'] = rand(0,20)
 		if katjaQW['coffee_hole_rand'] = 1 and npc_rel['A16'] > 30 and npc_rel['A240'] > 30:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole1.jpg"></center>'
-			'While you are chatting with Katja she suddenly smiles and points to the the door so you turn to have a look. You notice that both Natasha and Natalia are just entering.'
+			'While you are chatting with Katja she suddenly smiles and points to the door so you turn to have a look. You notice that both Natasha and Natalia are just entering.'
 			'As the pair of you are still focused on the door you see Natalia poke Natashsa in the arm and point towards your table. They both look over and give you a friendly wave.'
-			'After a brief exchange of words they head over to your table. "Hi girls, fancy seeing you here." Natasha says with a smile.'
+			'After a brief exchange of words, they head over to your table. "Hi girls, fancy seeing you here." Natasha says with a smile.'
 			'Katja responds. "Well we thought we''d come for a coffee before deciding on what to do with the rest of our day."'
 			'Natasha chimes in. "Pretty much the same here, I fancy aome window shopping but Natalia wants to see a film and we can''t decide so went for a coffee to have a chat and make up our minds."'
 			'You join the conversation. "Well the cinema is in the mall so maybe you could do both then you''ll both get to do what you want?"'

+ 35 - 35
locations/katja_city.qsrc

@@ -25,8 +25,8 @@ if $ARGS[0] = 'metro_ride':
 		if katjaQW['drinks'] > rand(10,14):
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/metro_drunk.jpg"></center>'
-			'Katja is so drunk that she doesn''t mange to get to a seat, and just lies down on the floor just inside the train.'
-			'You try to get her up, but she is really persistent that she lies perfectly well on the floor and just need a small nap.'
+			'Katja is so drunk that she doesn''t manage to get to a seat, and just lies down on the floor just inside the train.'
+			'You try to get her up, but she is really persistent that she lies perfectly well on the floor and just needs a small nap.'
 			'You manage to get her to stand up just as you arrive at your station.'
 			act 'Get off the train and leave the metro': gt 'katja_city', 'metro_destination'
 		else
@@ -68,18 +68,18 @@ if $ARGS[0] = 'metro_destination':
 		katjaQW['disco_arrival'] = totminut
 		gs 'stat'
 		gs 'themes', 'indoors'
-		'You exit the metro station and walk to the nightclub, and get in line.'
+		'You exit the metro station walk to the nightclub, and get in line.'
 		if hotcat = 10:
-			'The bouncer almost immediately spots the two of you and lets you in, jumping in from of the long line and you can hear several complaints, but also some whitling and more lewd comments.'
+			'The bouncer almost immediately spots the two of you and lets you in, jumping to the front of the long line and you can hear several complaints, but also some whitling and more lewd comments.'
 		elseif hotcat > 7:
 			minut += 5
-			'The two of you stand stand in line for a Shor while, before the bouncer singles you out, and you get to jump a head  of several people to their complaints.'
+			'The two of you stand in line for a short while, before the bouncer singles you out, and you get to jump ahead of several people much to their complaints.'
 		elseif hotcat > 5:
 			minut += 10
-			'You wait in line for some time, but finally it is your turn to be let in.'
+			'You wait in line for some time, but finally, it is your turn to be let in.'
 		else
 			minut += rand(15,20)
-			'You wait in line for a long time, while several girls are allowed to jump a head of you. BUt finally you are allowed in.'
+			'You wait in line for a long time, while several girls are allowed to jump ahead of you. But finally, you are allowed in.'
 		end
 		if money >= 250:
 			money -= 250
@@ -88,10 +88,10 @@ if $ARGS[0] = 'metro_destination':
 			'Turns out you don''t have enough to pay for the entrance fee, so Katja pays for you telling you that next time you will have to pay.'
 		end
 		if rand(0,1) = 0:
-			'"Let''s start by go dancing" Katja says when you are finally inside the club and start to drag you to the dance floor.'
+			'"Let''s start with a dance," Katja says when you are finally inside the club and starts to drag you to the dance floor.'
 			act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
 		else
-			'"Let''s start by having a drink" Katja says when you are finally inside the club and start to drag you to the bar.'
+			'"Let''s start by having a drink," Katja says when you are finally inside the club and start to drag you to the bar.'
 			act 'Go to the bar': gt 'katja_nightclub', 'bar_arrive'
 		end
 	else
@@ -100,12 +100,12 @@ if $ARGS[0] = 'metro_destination':
 			if katjaQW['drinks'] > rand(8,12):
 				minut += 30
 				gs 'stat'
-				'Katja is so drunk that she can barely walk. So you decide to help her home. It takes quite awhile since she tries to sit down several times refusing to walk further.'
+				'Katja is so drunk that she can barely walk. So you decide to help her home. It takes quite a while since she tries to sit down several times refusing to walk further.'
 				'But you finally manage to get her to her room and in her bed. She goes out immediately and you lever her to sleep.'
 				act 'Go to the hallway': gt 'uni_dorm', 'second_floor'
 			else
 				if katjaQW['horny'] > rand(40,80) and katjaQW['sex_clossedness'] < 2:
-					'You get out at the Metro Station near the university and Katja suggest that you go with her to her room'
+					'You get out at the Metro Station near the university and Katja suggests that you go with her to her room'
 					act 'Go with her to her room': gt 'katja_uni_sex', 'comming_home_from_date'
 					act 'Say you don''t want to and leave her': gt 'city_island'
 				else
@@ -230,7 +230,7 @@ if $ARGS[0] = 'Pussy-Cats':
 					act 'Tell her that you like it':
 						cla
 						gs 'npc_relationship', 'modify', 'A14', 'love'
-						'"This is really nice. As always, your fashion sense sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
+						'"This is really nice. As always, your fashion sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
 						'You look at the price tag and see that it costs <<price>>.'
 						if money > price: 
 							act 'Buy the dress (cash)':
@@ -294,7 +294,7 @@ if $ARGS[0] = 'Pussy-Cats':
 					act 'Tell her that you like it':
 						cla
 						gs 'npc_relationship', 'modify', 'A14', 'love'
-						'"This is really nice. As always, your fashion sense sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
+						'"This is really nice. As always, your fashion sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
 						'You look at the price tag and see that it costs <<price>>.'
 						if money >= price: 
 							act 'Buy the clothes (cash)':
@@ -348,7 +348,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 	elseif katjaQW['slut'] >= 40:
 		'"This is too much," she says. "This isn''t something I can wear anywhere."' 
 		'"But you have to agree that that you look sexy?" you reply.'
-		'"Well yeah, but I can''t see myself wearing it outside here," se+he answers.' 
+		'"Well yeah, but I can''t see myself wearing it outside here," she answers.' 
 	elseif katjaQW['slut'] >= 20:
 		'"What were you thinking, <<$pcs_nickname>>?!" Katja says. "These are clothes for sluts!"'
 		'"Come on, Katja. You look so sexy in it!" you reply.'
@@ -375,7 +375,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 			'"Come on, it''s just me," you answer.'
 			'After a moment''s hesitation, she answers, "Okay."'
 			'She turns around and shows you a sight that barely leaves anything to the imagination as the shorts have crept up her butt crack. "Damn that looks good on you," you say. "Great ass!"'
-			iif(katjaQW['slut'] >= 80, '"Thanks!" Katja says. "These will really make me the center of attention at a party."', '"Don''t say that!" Katja says. "It''s really annoying how they creep up my butt!"')+' She then turns around to face you again.'
+			iif(katjaQW['slut'] >= 80, '"Thanks!" Katja says. "These will really make me the center of attention at a party."', '"Don''t say that!" Katja says. "It''s really annoying how they creep on my butt!"')+' She then turns around to face you again.'
 			act 'Continue':
 				*clr & cla
 				minut += 1
@@ -421,7 +421,7 @@ if $ARGS[0] = 'pussy_cat_outfit1_strip':
 	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_4.jpg"></center>'
-	'Katja starts by moving in a more sensual way while she slowly unbuttons the shirt before letting it fall to the side, revealing her bare breast. She then unbuttons the pants and puts her hands on her sides.'
+	'Katja starts by moving more sensually while she slowly unbuttons the shirt before letting it fall to the side, revealing her bare breast. She then unbuttons the pants and puts her hands on her sides.'
 	if npc_sex['A14'] > 0:
 		if max(katjaQW['horny'],100) > rand(50,150) and katjaQW['slut'] >= 80:
 			act 'Katja makes things more interesting': gt 'katja_city', 'pussy_cat_outfit1_play'
@@ -534,7 +534,7 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 						*nl
 						'After she comes down, she says, "Wow, that was intense!"'
 						'"It was a great show," you tell her.'
-						'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
+						'"Thanks. I think," she says while blushing. "Let me get changed," she says and starts taking off the rest of the shirt.'
 						'She starts to take out the butt plug, but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
 						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg		
@@ -542,7 +542,7 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 					act 'Just watch Katja':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_10.jpg"></center>'		
-						'You intensely watch Katja. She starts really getting into it, and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+						'You intensively watch Katja. She starts really getting into it and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a tremendous orgasm. After that, she simply lies on the chair, recovering her breath.'
 						gs 'arousal', 'foreplay', 3
 						gs 'arousal', 'end'
 						if katjaQW['know_butt_plug'] = 0: katjaQW['know_butt_plug'] = 1
@@ -550,10 +550,10 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 						katjaQW['slut'] += 4
 						gs 'stat'
 						*nl
-						'After she comes down, she says, "Wow, that was intense!"'
-						'"It was a great show," you tell her.'
-						'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
-						'She starts to take out the butt plug, but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+						'After she comes down, she says, "Wow, that was intense!"' 
+						'"It was a fantastic show," you tell her.' 
+						'"Thanks. I guess," she adds while blushing. "Let me get changed," she adds and begins to remove the rest of the shirt.' 
+						'She tries to take out the buttplug, but you stop her. "Keep it in until you get home. It will be a great experience for you," you say. She blushes, but keeps it in and starts putting on her clothes.' 
 						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg		
 					end
@@ -570,7 +570,7 @@ if $ARGS[0] = 'pussy_cat_outfit2':
 	if katjaQW['slut'] >= 40:
 		'"This looks good," she says when she sees herself in the mirror. "It''s a nice dress for a warm summer night," she continues. "I might buy this."'
 	else
-		'"This looks good," she says when she sees herself in the mirror. "But it''s a bit short, and kind of see through. I''m not sure if I''m brave enough to wear this in public," she continues.'
+		'"This looks good," she says when she sees herself in the mirror. "But it''s a bit short, and kind of see-through. I''m not sure if I''m brave enough to wear this in public," she continues.'
 	end
 	act 'Katja starts to change':
 		*clr & cla
@@ -602,7 +602,7 @@ if $ARGS[0] = 'pussy_cat_outfit2':
 					if katjaQW['pantiesQWstage'] < 4: katjaQW['pantiesQWstage'] += 1
 					'It''s clear from Katja''s reddening face that she is embarrassed by you seeing her without panties.'
 					'"Don''t say anything," she says. "It''s just that all my panties are in the laundry," she says, not sounding very truthful. "I normally never go without panties."'
-					iif($panties_worn = 'nude', '"You should. It is very liberating," you tell her as you flash her your naked pussy', '"Why am I not completely convinced that is the case?" you say')+'  and her face turns even more red.'
+					iif($panties_worn = 'nude', '"You should. It is very liberating," you tell her as you flash her your naked pussy', '"Why am I not completely convinced that is the case?" you say')+'  and her face turns even redder.'
 				end
 				'"Well, this was fun but I should change back," she says.'
 				if npc_sex['A14'] > 0 and katjaQW['slut'] > 60 and rand(0,3) = 0 and katjaQW['sex_clossedness'] < 2:
@@ -644,7 +644,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_strip':
 	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_4.jpg"></center>'
-	'Katja starts by moving in a more sensual way while she slowly lets the shirt fall down, still holding up the skirt so you have a full view of her pussy.'
+	'Katja starts by moving more sensually while she slowly lets the shirt fall down, still holding up the skirt so you have a full view of her pussy.'
 	if npc_sex['A14'] > 0:
 		if max(katjaQW['horny'],100) > rand(50,150) and katjaQW['slut'] >= 80:
 			act 'Katja makes things more interesting': gt 'katja_city', 'pussy_cat_outfit2_play'
@@ -738,7 +738,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 				act 'Masturbate while you watch Katja':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_9.jpg"></center>'		
-					'You put you hand down your '+iif(CloSkirtShortness > 0, 'skirt', 'pants')+' and start to rub your clit while you watch Katja. She starts really getting into it, and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+					'You put your hand down your '+iif(CloSkirtShortness > 0, 'skirt', 'pants')+' and start to rub your clit while you watch Katja. She starts really getting into it and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
 					gs 'arousal', 'foreplay', 3
 					gs 'arousal', 'clit_finger', -3, 'masturbate'
 					gs 'arousal', 'end'
@@ -747,11 +747,11 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 					katjaQW['slut'] += 4
 					gs 'stat'
 					*nl
-					'After she comes down, she says, "Wow, that was intense!"'
-					'"It was a great show," you tell her.'
-					'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the shirt.'
-					'She starts takes out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
-					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+					'After she comes down, she says, "Wow, that was intense!"' 
+					'"It was a fantastic show," you tell her.' 
+					'"Thanks. I guess," she adds while blushing. "Let me get changed," she adds and begins to remove the rest of the shirt.' 
+					'She tries to take out the buttplug, but you stop her. "Keep it in until you get home. It will be a great experience for you," you say. She blushes, but keeps it in and starts putting on her clothes.' 
+					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 					act 'Leave': minut += 2 & gt $loc, $loc_arg		
 				end
 				act 'Just watch Katja':
@@ -765,10 +765,10 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 					katjaQW['slut'] += 4
 					gs 'stat'
 					*nl
-					'After she comes down, she says, "Wow, that was intense!"'
-					'"It was a great show," you tell her.'
-					'"Thanks. I think," she says blushing. "Let me get changed," she says and start taking off the shirt.'
-					'She starts to take out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+					'After she comes down, she says, "Wow, that was intense!"' 
+					'"It was a fantastic show," you tell her.' 
+					'"Thanks. I guess," she adds while blushing. "Let me get changed," she adds and begins to remove the rest of the shirt.' 
+					'She tries to take out the buttplug, but you stop her. "Keep it in until you get home. It will be a great experience for you," you say. She blushes, but keeps it in and starts putting on her clothes.' 
 					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 					act 'Leave': minut += 2 & gt $loc, $loc_arg		
 				end

+ 488 - 34
locations/katja_city_sex.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 		act 'Make out with <<$npc_nickname[$npclastgenerated]>>': gt 'katja_city_sex', 'first_time'
 	else
 		if rand(0,4) = 0:
-			'When he comes back, he has a small bag of white powder. "I brought us this to make things more fun," he says, holding the the bag of cocaine.'
+			'When he comes back, he has a small bag of white powder. "I brought us this to make things more fun," he says, holding the bag of cocaine.'
 			if katjaQW['coke_stage'] = -1:
 				act 'Watch Katja''s reaction':
 					*clr & cla	
@@ -73,7 +73,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'drugs', 'cocaine'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
-							'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
+							'You take the tube and snort the first line and then the second, while Katja looks at you with wide-open eyes.'
 							'After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
 							if func('katja_procedural', 'willing_to_be_naughty') < 85:
 								gs 'willpower', 'drugs', 'force', 'hard'
@@ -96,7 +96,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									*nl
 									'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$npc_nickname[$npclastgenerated]>> prepared for her.'
 									'She slowly starts sniffing it but jerks her head back when the powder starts to itch in her nose. "Do it, faster. All at once!" you tell her, and she gets down again, still shaking and gets ready.'
-									'This times she snorts it all in on go, and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
+									'This time she snorts it all in on go and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
 									*nl
 									'After a moment, her discomfort resides and she starts to talk. "I don''t feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.'
 									'"See? I told you it would feel great!" you say.'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'"I''ll take some, but I don''t think my friend will," you say as you take the tube while Katja nods her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
-							'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
+							'You snort the first line and then the second while Katja looks at you with wide-open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
 							act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 						end
 						if katjaQW['coke_stage'] = 2:
@@ -170,9 +170,9 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								'Katja finally relents. "OK. Let''s do it, together," she says.'
 								*nl
 								'<<$npc_nickname[$npclastgenerated]>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lower your heads to the table.'
-								'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t rub her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
+								'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t itch her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
 								*nl
-								'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
+								'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
 								act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 							end
 						else
@@ -197,7 +197,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									gs 'willpower', 'drugs', 'force', 'easy'
 								end
 								if will_cost <= pcs_willpwr or katjaQW['coke_stage'] = 3:
-									act 'Convince Katja not to do cocaine (<<will_cost>> Willpower)':
+									act 'Convince Katja not to do cocaine'+iif(katjaQW['coke_stage'] = 3, '', ' (<<will_cost>> Willpower)')+'':
 										*clr & cla
 										if katjaQW['coke_stage'] = 4:
 											gs 'willpower', 'pay', 'force'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 										'"I don''t think it''s a good idea, Katja," you say.'
-										'"Why not? Never hurt me before," Katja '+iif(katjaQW['coke_stage'] = 3 , 'replies.', 'snaps at you.')
+										'"Why not? Never hurt me before," Katja '+iif(katjaQW['coke_stage'] = 3, 'replies.', 'snaps at you.')
 										'"No, but it might if you continue doing it this often," you respond.'
 										iif(katjaQW['coke_stage'] = 3, 'Katja looks at you. "Do you think I take too much?"', 'Katja scowls at you. "Are you implying I can''t control myself?"')
 										'"I''m just saying that maybe we should relax a little. Right now isn''t the time for this," you say.'
@@ -226,7 +226,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									'You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
 									'She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
 									*nl
-									'After a moment, it does and Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+									'After a moment, it does and Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 									act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 								end
 							end
@@ -245,7 +245,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube and Katja takes it happily.'
 							'You put your tubes to your nostrils and lower your heads to the table and sniff your line. Katja does it with great enthusiasm.' 
 							*nl
-							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 							act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 						end
 					else
@@ -264,7 +264,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								gs 'stat'										
 								'"Thanks, but that''s not for me," you reply.'
 								'"So just you, then?" he asks Katja.'
-								'"Yes. Seems like <<$pcs_nickname>> is being boring tonight. Make some lines for me," she says.'
+								'"Yes. Seems like <<$pcs_nickname>> is boring tonight. Make some lines for me," she says.'
 								if katjaQW['coke_stage'] = 5:
 									gs 'willpower', 'drugs', 'force', 'easy'
 								elseif katjaQW['coke_stage'] = 6:
@@ -310,9 +310,9 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'You watch as Katja takes the tube, puts one end at her nose and bends down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
-									'She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.' 
+									'She then sniffs the line like a pro and sits up, waiting for the drugs to hit her.' 
 									*nl
-									'After a moment, it does and Katja sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+									'After a moment, it does and Katja sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 									act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 								end
 							end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							'"Yes! That''s the spirit," she replies as she has already taken the tube from <<$npc_nickname[$npclastgenerated]>>. He quickly produces another one and hands it to you.'
 							'You both put your tubes to your nostrils and lower your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
 							*nl
-							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 							act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 						end			
 					end
@@ -339,7 +339,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 			end
 		else
 			minut += 10
-			'Soon, you are relaxing and having some wine while getting to know each other a little. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
+			'Soon, you are relaxing and having some wine while getting to know each other a little. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja returns his touch and you do the same.'
 			if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100): 
 				'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
 				'<<$npc_nickname[$npclastgenerated]>> quickly gets up and says, "Right this way."'
@@ -356,7 +356,7 @@ end
 if $ARGS[0] = 'after_drugs':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
 	minut += 10
-	'Soon you are relaxing and having some wine while getting to know each other a little. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
+	'Soon you are relaxing and having some wine while getting to know each other a little. <<$npc_nickname[$npclastgenerated]>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja returns his touch and you do the same.'
 	if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['horny'] >= rand(70,100): 
 		'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
 		'<<$npc_nickname[$npclastgenerated]>> quickly gets up and says, "Right this way."'
@@ -470,7 +470,7 @@ if $ARGS[0] = 'first_time':
 										katjaQW['horny'] += rand(5,10)
 										katjaQW['slut'] -= 2
 										'<<$npc_nickname[$npclastgenerated]>> slowly guides his cock into Katja, who''s clearly feeling some pain. But when he seems to stop, Katja says, "You can... go on."'
-										'So he slowly continues to push his cock into her, and before long, his cock is fully buried her pussy.'
+										'So he slowly continues to push his cock into her, and before long, his cock is fully buried inside her pussy.'
 										'It is clear that she is still feeling some pain, but before long, he pulls out and slowly pushes in again, and Katja''s discomfort seems to be disappearing.'
 									else									
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex7b.jpg"></center>'
@@ -528,7 +528,7 @@ if $ARGS[0] = 'first_time':
 														*clr & cla
 														katjaQW['horny'] += rand(10,20)
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex12.jpg"></center>'
-														'"I want to fuck the redhead again, before I cum," <<$npc_nickname[$npclastgenerated]>> says as he gets off you. Katja quickly takes your position.'
+														'"I want to fuck the redhead again before I cum," <<$npc_nickname[$npclastgenerated]>> says as he gets off you. Katja quickly takes your position.'
 														'He mounts her and starts thrusting like a piston. You crawl under them so you can look at his cock ravaging Katja''s pussy while she moans loudly.'
 														if katjaQW['horny'] >= 100:
 															katjaQW['horny'] = 0
@@ -669,10 +669,10 @@ if $ARGS[0] = 'on_guy_sex1':
 						elseif npc_throat['A14'] < dick:
 							'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> but is clearly having problems with taking all of his cock, and after trying for a few minutes, she gives up.'
 						elseif npc_throat['A14'] < 2*dick:
-							'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and is able to take most of his cock without a problem. After blowing him for a few minutes, she stops.'
+							'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and can take most of his cock without a problem. After blowing him for a few minutes, she stops.'
 						else
 							katjaQW['slut'] += 2
-							'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and is able to take all of his cock like a pro. After blowing him for a few minutes, she stops.'
+							'Katja then starts to blow <<$npc_nickname[$npclastgenerated]>> and can take all of his cock like a pro. After blowing him for a few minutes, she stops.'
 						end
 						if npc_throat['A14'] < dick: npc_throat['A14'] += 1
 						act 'Switch again':
@@ -775,20 +775,20 @@ if $ARGS[0] = 'going_home':
 		end
 	end
 	if katjaQW['birth_control_start_day'] > daystart:
-		'"Are you on birth control?" you ask. "Yes but I don''t think it''s working yet. I should probably go take a morning after pill to be safe," Katja says, looking a little worried.'
+		'"Are you on birth control?" you ask. "Yes, but I don''t think it''s working yet. I should probably go take a morning-after pill to be safe," Katja says, looking a little worried.'
 	elseif katjaQW['birth_control_start_day'] = 0:
-		'"Are you on birth control?" you ask. "No. But I definitely should be. I will go get started tomorrow, and maybe also take a morning after pill to be safe" Katja says, looking a little worried.'
+		'"Are you on birth control?" you ask. "No. But I definitely should be. I will go get started tomorrow, and maybe also take a morning-after pill to be safe" Katja says, looking a little worried.'
 		katjaQW['birth_control_start_day'] = daystart + 15
 	elseif katjaQW['birth_control_know'] = 0:
 		katjaQW['birth_control_know'] = 1
-		'"Are you on birth control?" you ask. "Yes. Of course I am prepared," Katja says, looking a little proud.'
+		'"Are you on birth control?" you ask. "Yes. Of course, I am prepared," Katja says, looking a little proud.'
 	end
 	act 'Enter the station': gt 'katja_city', 'metro'
 end
 
 if $ARGS[0]  = 'blindfold_sex_start':
 
-	'As you walk through his apartment, he leans into Katja and whispers something to her. She looks'+iif(katjaQW['bondage_sex'] > 0, ' quite excited by what he says, and immediately nods her heed enthusiastically.', ' intrigued and thinks about what he said for a moment before timidly nodding her head.')
+	'As you walk through his apartment, he leans into Katja and whispers something to her. She looks'+iif(katjaQW['bondage_sex'] > 0, ' quite excited by what he says, and immediately nods her head enthusiastically.', ' intrigued and thinks about what he said for a moment before timidly nodding her head.')
 	'As you go into <<$npc_nickname[$npclastgenerated]>>''s rather nice bedroom, he says, "Take off your clothes," in a demanding voice. You do as he says; you came here to have sex anyway. While you disrobe, he finds something in a drawer.'
 	'When you are naked, he holds up a blindfold and a pair of leather shackles. "I will put these on you," he says. "Your friend will be completely free and make sure that you are not hurt in any way. So it is not about trusting me, it''s about trusting her," he continues.'
 	if katjaQW['bondage_sex'] > 0:
@@ -825,7 +825,7 @@ if $ARGS[0] =  'blindfold_sex1':
 	act 'Wait to "see" what they do':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/blindfold_sex2.jpg"></center>'
-		'You lie there for what seems like an eternity, but it is probably not more that a minute or two. You then hear somebody moving on the bed, even though they are trying to be as quiet as possible.'
+		'You lie there for what seems like an eternity, but it is probably not more than a minute or two. You then hear somebody moving on the bed, even though they are trying to be as quiet as possible.'
 		'You almost jump when a delicate finger suddenly starts caressing your stomach.'
 		minut += 2
 		katjaQW['horny'] += rand(0,5)
@@ -948,7 +948,7 @@ if $ARGS[0] =  'blindfold_sex2':
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/blindfold_sex13.jpg"></center>'
-				'<<$npc_nickname[$npclastgenerated]>> lets go of Katja, who falls down onto you. As he pulls his cock out of her vagina, you can feel his sperm dripping down on your stomach.'
+				'<<$npc_nickname[$npclastgenerated]>> let''s go of Katja, who falls down onto you. As he pulls his cock out of her vagina, you can feel his sperm dripping down on your stomach.'
 				'<<$npc_nickname[$npclastgenerated]>> sits down in his chair and says, "That was wonderful, girls, you sure know how to entertain a guy. The bathroom is just there if you need to clean up."'
 				act 'Go get cleaned up':
 					*clr & cla
@@ -960,9 +960,9 @@ if $ARGS[0] =  'blindfold_sex2':
 					'You go to the bathroom and get the cum off your stomach, and then move on to help Katja with cleaning her much more messy pussy.'
 					if katjaQW['birth_control_start_day'] <= daystart and katjaQW['birth_control_start_day'] > 0:
 						if katjaQW['creampie'] = 0:
-							katjaQW['birth_control_know'] = 1
+							if katjaQW['birth_control_know'] = 0: katjaQW['birth_control_know'] = 1
 							'She stands there looking thoughtful. "Anything wrong?" you ask. "This is so strange, feeling this foreign substance moving in my vagina," she answers.' 
-							'"Is this the first time you''ve gotten a creampie?" you ask. "Yes. Don''t worry I''m on the pill, but I will take a morning after pill to be safe anyway." she answers.'
+							'"Is this the first time you''ve gotten a creampie?" you ask. "Yes. Don''t worry I''m on the pill, but I will take a morning-after pill to be safe anyway." she answers.'
 						elseif katjaQW['creampie'] < 10:
 							'"It still feels strange having another person''s fluid in my vagina. I don''t know if I will ever get used to it," Katja says as you help her clean up.'
 						elseif katjaQW['creampie'] >= 30:
@@ -980,17 +980,18 @@ if $ARGS[0] =  'blindfold_sex2':
 							'She is standing there looking thoughtful. "Anything wrong?" you ask. "This is so strange, feeling this foreign substance moving in my vagina," she answers.' 
 							'"Is this the first time you''ve gotten a creampie?" you ask. "Yes, a guy has never come inside me before," she answers.'
 						else
-							'"It still feels strange having another persons fluid in my vagina. I don''t know if I will ever get used to it," Katja says as you help her clean up.'
+							'"It still feels strange having another person''s fluid in my vagina. I don''t know if I will ever get used to it," Katja says as you help her clean up.'
 						end				
 						if katjaQW['birth_control_start_day'] > daystart:
-							'"Are you on birth control?" you ask. "Yes. Oh shit, I don''t thing it''s working yet. I will have to go take a morning after pill," Katja says, looking a little worried.'
+							if katjaQW['birth_control_know'] = 0: katjaQW['birth_control_know'] = 1
+							'"Are you on birth control?" you ask. "Yes. Oh shit, I don''t think it''s working yet. I will have to go take a morning-after pill," Katja says, looking a little worried.'
 						else
-							'"Are you on birth control?" you ask. "No. Shit. I will have to go take a morning after pill. I should also start on regular birth control. Something like this might happen again," Katja says looking a little worried.'
+							'"Are you on birth control?" you ask. "No. Shit. I will have to go take a morning-after pill. I should also start on regular birth control. Something like this might happen again," Katja says looking a little worried.'
 							katjaQW['birth_control_start_day'] = daystart + 15
 						end
 					end
 					'You then finish getting cleaned up and go back to <<$npc_nickname[$npclastgenerated]>>, who is already dressed.'
-					'You talk a little while getting dressed, but is is clear that he is not up for anything else, so you say your goodbyes and leave his apartment.'
+					'You talk a little while getting dressed, but it is clear that he is not up for anything else, so you say your goodbyes and leave his apartment.'
 					act 'Walk to the metro':
 						*clr & cla
 						katjaQW['creampie'] += 1
@@ -1004,7 +1005,7 @@ if $ARGS[0] =  'blindfold_sex2':
 							'"So if it''s okay with you, then I think it''s something I would like to try again," she finishes. You say that it might be something you could try another time since you don''t want to make her sad right now.'
 						else
 							if katjaQW['horny'] = 0:
-								'"This was great. He really prepared you well, and gave me a good hard fucking in the end. I hope it was great for you, too!" Katja says as you walk through the streets.'
+								'"This was great. He really prepared you well and gave me a good hard fucking in the end. I hope it was great for you, too!" Katja says as you walk through the streets.'
 								'"You just love seeing me helpless, don''t you?" you ask. Katja does not answer, but looks at you with a wicked smile.'
 							else
 								'"I don''t know about you, but I have definitely had better evenings. He didn''t really know how to use his dick," Katja says as you walk through the streets.'
@@ -1037,7 +1038,7 @@ if $ARGS[0] = 'safe_word_said':
 			*clr & cla
 			minut += 10
 			$location_type = 'public_outdoors'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'		
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
 			'Katja asks if you are okay as you walk through the streets and you explain why you decided to stop it.'
 			if katjaQW['bondage_sex'] > 0:
 				'She says you will have to find a better guy next time you try something like this.'
@@ -1050,5 +1051,458 @@ if $ARGS[0] = 'safe_word_said':
 	end
 end
 
+if $ARGS[0] = 'walking_home_with_two_guys':
+	menu_off = 1
+	minut += 20
+	gs 'npcgeneratec', 0, '', rand(18,55), 4
+	gs 'boystat', $npclastgenerated, 'a'
+	gs 'npcgeneratec', 0, '', rand(18,55), 4
+	gs 'boystat', $npclastgenerated, 'b'
+	katjaQW['drinks'] += 1
+	gs 'drugs', 'alcohol', 'wine', 1
+	$location_type = 'indoors'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/drinking_wine.jpg"></center>'
+	'While you walk through the streets, the men introduce themselves as <<$npc_nickname[$boy1]>> and <<$npc_nickname[$boy2]>>, before you and Katja tell them your names.'
+	*nl
+	'It doesn''t take long before you arrive at their building and he shows you up to a rather nice apartment.'
+	'"Let''s get a glass of wine and get comfortable," <<$npc_nickname[$boy1]>> says as he gets three glasses and a bottle of white wine from his fridge. Meanwhile, you and Katja'+iif(temper <20, ' take off your coats and ', ' ')+' sit down while small talking with <<$npc_nickname[$boy2]>>.'
+	*nl
+	'After you enjoyed the wine, talked for a couple of minutes and emptied the wine glasses <<$npc_nickname[$boy1]>> says "Why don''t we move the party to the adjoining room. I''m sure that it is more suitable for the next part."'
+	'You look at Katja and see that she also got that he meant the bedroom. She gives you an approving nod and you say "Lead the way" as you get up from the couch.'
+	act 'Go to the bedroom': gt 'katja_city_sex', 'two_guys_start'
+end
+
+if $ARGS[0] = 'two_guys_start':
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex1.jpg"></center>'
+	'<<$npc_nickname[$boy1]>> leads you to the bedroom, which has a nice big bed in the middle. "This bed looks very comfortable, why don''t we test if it actually is Katja," you say. "Sounds like a plan" Katja answers with a wink.'
+	'You then both take off your dress and climb on the bed '+iif($pantyworntype ! 'none', ' wearing just your underwear and shoes.', '.')+' "This bed is real soft, we could definitely spend some time here" Katja says.'
+	'You both turn your heads towards the men looking very seductive'+iif($pantyworntype ! 'none', ' while pulling at each other''s underwear,', ',')+' as you say "Hey why don''t you come and join us?"'
+	act 'The men join':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex2.jpg"></center>'
+		'The men don''t hesitate and walk up to you and Katja, not even waiting to take their clothes off. <<$npc_nickname[$boy1]>> starts to caress you, bends down and starts kissing your neck, while your hand finds his groin.' 
+		'At the same time <<$npc_nickname[$boy1]>> starts to play with Katja''s boobs and she starts to feel his cock through his pants.'
+		katjaQW['horny'] += rand(5,10)
+		gs 'arousal', 'foreplay', 3, 'group'
+		gs 'stat'
+		act 'Suck some cock':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex3.jpg"></center>'
+			'You unzip <<$npc_nickname[$boy1]>>''s pants and take out his  <<dick1>> cm <<$dick1_girth>> cock and start to suck it. Behind you Katja has done the same to <<$npc_nickname[$boy1]>>.'
+			katjaQW['horny'] += rand(5,10)
+			if npc_throat['A14'] < dick2: npc_throat['A14'] += 1
+			gs 'arousal', 'bj', 3, 'dick1', 'group'
+			gs 'stat'
+			act 'Switch partner':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex4.jpg"></center>'
+				'After a couple of minutes of sucking <<$npc_nickname[$boy1]>> Katja says to you "This is a real nice cock, you should try it." "This cock is also good, so let''s switch" you reply.'
+				'You then give up <<$npc_nickname[$boy1]>>''s cock and move over to the other side of the bed taking <<$npc_nickname[$boy1]>>''s <<dick1>> cm <<$dick1_girth>> dick into your wet mouth.'
+				'Katja mirrors you and soon has her head going up and down on <<$npc_nickname[$boy1]>>''s dick enthusiastically.'
+				katjaQW['horny'] += rand(5,10)
+				if npc_throat['A14'] < dick1: npc_throat['A14'] += 1
+				gs 'arousal', 'bj', 3, 'dick2', 'group'
+				gs 'stat'
+				act 'Continue sucking':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex5.jpg"></center>'
+					'As you are sucking on <<$npc_nickname[$boy1]>>''s cock, you suddenly feel your legs being spread apart, followed shortly by Katja''s soft tongue that starts to lick your pussy as if it was the best-tasting thing in the world.'
+					'She stops for a moment before starting again, and you take a look and see that <<$npc_nickname[$boy1]>>''s <<dick1>> cm <<$dick1_girth>> cock has entered her pussy from behind.'
+					katjaQW['horny'] += rand(10,5)
+					if npc_vag['A14'] < dick1: npc_vag['A14'] += 1
+					if npc_vag['A14']*2 < dick1: npc_vag['A14'] += 1
+					gs 'arousal', 'bj', 3, 'dick2', 'group'
+					gs 'arousal', 'cuni_give', -3, 'group', 'lesbian'
+					gs 'stat'
+					act 'Get your pussy fuck':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex6.jpg"></center>'
+						'"Okay. Now I also want my pussy stuffed," you say as you remove the cock from your mouth. You then turn around and get up on all fours placing your butt at the edge of the bed.'
+						'<<$npc_nickname[$boy1]>> gets the message and as you start to kiss Katja and let your tongues play, he slams his <<$npc_nickname[$boy1]>>''s <<dick2>> cm <<$dick2_girth>> cock into your wet pussy.'
+						'You both enjoy getting your pussies pounded for a few minutes before <<$npc_nickname[$boy1]>> says "I really want to fuck those assholes."'
+						katjaQW['horny'] += rand(5,10)
+						gs 'arousal', 'vaginal', 3, 'dick2', 'group'
+						gs 'arousal', 'kiss', -3, 'group', 'lesbian'
+						gs 'stat'
+						if katjaQW['anal_quest'] > 2 or  katjaQW['anal_sex'] > 0:
+							if katjaQW['anal_sex'] > 0: katjaQW['anal_quest'] = 3
+							'Katja immediately says "Yes, I want a cock in my butt".'
+							act 'Get butt fucked': gt 'katja_city_sex', 'two_guys_anal_sex1'
+						elseif katjaQW['anal_quest'] > 0:
+							'Katja looks at you a little hesitant, and you tell her "You wanted to try, so here is your chance. But if you would rather wait then we can. It''s up to you."'
+							'She then bites her lip for a moment before she says to the men with a shaky voice "Okay... I want to try anal sex... but please be gentle it''s my first time."'
+							act 'Get butt fucked': gt 'katja_city_sex', 'two_guys_anal_sex1'
+						else
+							'Katja quickly looks at you with fear in her eyes and you quickly tell the men "No butt fucking with us tonight, but you can continue to play with our pussies."'
+							act 'Continue with pussy sex': gt 'katja_city_sex', 'two_guys_pussy_sex'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'two_guys_pussy_sex':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex7.jpg"></center>'
+	'"Okay. But now I want my cuck sucked some more. Turn around" <<$npc_nickname[$boy2]>> says to you. You do as he says, get up on all fours and take his cock in your mouth.'
+	'"Get on top of her" <<$npc_nickname[$boy1]>> tells Katja, and you feel that she crawls up on your back and starts fondling your breasts.'
+	'Soon Katja also starts to make noise, and it is clear that <<$npc_nickname[$boy2]>> has penetrated her pussy.'
+	katjaQW['horny'] += rand(5,10)
+	gs 'arousal', 'bj', 3, 'dick2', 'group'
+	gs 'arousal', 'foreplay', -3, 'group', 'lesbian'
+	gs 'stat'
+	act 'Change partner':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex8.jpg"></center>'
+		'After some minutes you can feel that Katja moves up further on your back so her head is just above yours.'
+		'<<$npc_nickname[$boy2]>> takes the opportunity to move his cock to Katja''s mouth instead, as his balls are in front of your face and you start to lick them.'
+		'You then feel <<$npc_nickname[$boy1]>>''s cock enter your pussy, and he starts to fuck you hard.'
+		katjaQW['horny'] += rand(5,10)
+		gs 'arousal', 'vaginal', 3, 'dick1', 'group'
+		gs 'arousal', 'foreplay_give', -3, 'group'
+		gs 'stat'
+		act 'Change position':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex8.jpg"></center>'
+			'"Since you seem to be such good friends, why don''t you show us how much you love each other" <<$npc_nickname[$boy1]>> says as he removes his cock from your pussy after hammering you for a few minutes.'
+			'"Yes let''s show em" Katja says as she gets off your back. You lie down on your back and Katja crawls on top and soon you are eating each other out.'
+			'The men don''t want to be left out for long, and soon you see <<$npc_nickname[$boy1]>>''s dick penetrate Katja''s pussy just in front of your face, and feel <<$npc_nickname[$boy2]>>''s cock sliding into your pussy.'
+			'The men then pick up steam and fuck you hard while you and Katja try to eat each other out.'
+			katjaQW['horny'] += rand(5,10)
+			gs 'arousal', 'vaginal', -3, 'dick2', 'group'
+			gs 'arousal', 'cuni_give', 5, 'group', 'lesbian'
+			gs 'arousal', 'cuni', -5, 'group', 'lesbian'
+			gs 'stat'
+			if katjaQW['horny'] >= 100:
+				katjaQW['horny'] = 0
+				'Katja''s mouth suddenly disappears from your pussy and you can hear her scream as she is coming. After that <<$npc_nickname[$boy1]>> pulls out.'
+			else
+				'After some time <<$npc_nickname[$boy1]>> pulls out.'
+			end
+			'"I''m close to coming" he says, "and I want to paint those pretty faces with my cum, so get down to the floor and suck our cocks."'
+			act 'Get down on your knees': gt 'katja_city_sex', 'two_guys_cumming'
+		end
+	end
+end
+
+if $ARGS[0] = 'two_guys_anal_sex1':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_anal_1.jpg"></center>'
+	'The men start to take of their pants you and Katja remove'+iif($pantyworntype ! 'none', ' your underwear and ', ' ')+'shoes.'
+	if katjaQW['anal_quest'] < 3:
+		'You then make the slightly nervous Katja get up on all fours again, while you lie down on your back in front of her.'
+	else
+		'Katja gets up on all fours again, while you lie down on your back in front of her.'
+	end
+	if auto_anal_lube = 1:
+		if mc_inventory['lubricant'] > 0:
+			mc_inventory['lubricant'] -= 1
+			'You tell the men to use the bottle of lube in your purse, and Katja says that there also is a bottle in hers.'
+			'<<$npc_nickname[$boy1]>> finds your bottle and lubes you up and you soon feel the cool ointment being spread on your asshole by<<$npc_nickname[$boy1]>>''s finger.'
+		else
+			'You tell the men to use the bottle of lube in your purse, but as <<$npc_nickname[$boy1]>> checks he says it''s empty.'
+			'Katja quickly says that there is a bottle in her purse which should be almost full.'
+			'<<$npc_nickname[$boy1]>> finds the bottle, uses some on Katja and passes the bottle to <<$npc_nickname[$boy1]>>, and you soon feel the cool ointment being spread on your asshole by <<$npc_nickname[$boy1]>> ''s finger.'
+		end
+		'After both of you are lubed up, the guys position their dicks on your assholes.'
+		gs 'arousal', 'anal_finger', 1, 'lube', 'group'
+		katjaQW['lube'] = 1
+	else
+		'<<$npc_nickname[$boy1]>> applies some spit to your asshole and you can see <<$npc_nickname[$boy1]>> doing the same to Katja before they position their dicks.'
+	end
+	'You take the'+iif(katjaQW['anal_quest'] < 3, ' almost most frightened, but also ', ' very ')+'exited looking Katja''s mouth into yours and you start to play with your tongues.'
+	katjaQW['horny'] += katjaQW['anal_quest']* 10 -rand(0,25)
+	gs 'arousal', 'kiss', 3, 'group', 'lesbian'
+	gs 'stat'
+	act 'Ass fucking':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_anal_2.jpg"></center>'
+		'<<$npc_nickname[$boy1]>> guides his dick into you '+iif(pcs_ass < dick2, 'tight', 'well trained')+' asshole, and starts to pound you.'
+		'At the same time <<$npc_nickname[$boy1]>> guides his cock '+iif(katjaQW['anal_quest'] < 3, 'carefully', 'forcefully')+' into Katja''s butt hole.'
+		if npc_ass['A14'] + 4*katjaQW['lube'] < dick1:
+			katjaQW['horny'] -= rand(10,20)
+			'Katja lets out a scream and lets go of your mouth. "Shit, it hurts more than '+iif(katjaQW['anal_quest'] < 3, 'I expected', 'last time')+', slow down" Katja cries.'
+			'<<$npc_nickname[$boy1]>> does stop and lets Katja relax and get used to it. To district herself she moves her mouth to your pussy as if your juice is the best painkiller there is.'
+			'After a little, she removes her mouth for a moment to tell <<$npc_nickname[$boy1]>> "you can go on <<$npc_nickname[$boy1]>>. but'+iif(katjaQW['anal_quest'] < 3, ' go very slow I still don''t know if I can do it', 'be careful')+'." <<$npc_nickname[$boy1]>> does as he is told and soon Katja is also enjoying it.'
+		else
+			katjaQW['horny'] +=rand(10,20)
+			if katjaQW['anal_quest'] < 3:
+				'"Wow, that did''t did hurt. It feels nice" Katja says sounding very surprised and <<$npc_nickname[$boy1]>> enters her. "I thought it would hurt the first time. Go on fuck me faster" she continues.'
+			else
+				'Katja lets out a huge sigh "Ah... This is great, pound me faster <<$npc_nickname[$boy1]>>" she says.'
+			end
+			'<<$npc_nickname[$boy1]>> does what she says and is soon pounding her asshole as if it was something she did every day. Her mouth finds your pussy and starts to lick it.'
+		end
+		if npc_ass['A14'] < dick1: npc_ass['A14'] += 1
+		if npc_ass['A14']*2 < dick1: npc_ass['A14'] += 1
+		gs 'arousal', 'anal', 3, 'dick2',  'group'
+		gs 'arousal', 'cuni', -2, 'group', 'lesbian'
+		gs 'stat'
+		'After a few minutes, <<$npc_nickname[$boy1]>> says "I wanna try the girl you are with <<$npc_nickname[$boy1]>>," "You can have her pussy, I''ll keep her ass" <<$npc_nickname[$boy1]>> replies.'
+		act 'Agree to get a double penetration': gt 'katja_city_sex',  'two_guys_dp'
+		act 'Say no':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_anal_2.jpg"></center>'		
+			'"No. I don''t want two cocks in me at the same time," you say. "Okay" <<$npc_nickname[$boy1]>> says. "Then let''s change positions" <<$npc_nickname[$boy1]>> says.' 
+			act 'Cahnge position': gt 'katja_city_sex', 'two_guys_anal_sex2'
+		end
+	end
+end
+
+if $ARGS[0] = 'two_guys_anal_sex2':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_anal_3.jpg"></center>'
+	'After the men pull out, <<$npc_nickname[$boy1]>> lies down on the bed. "Get up and lower your ass on it in reverse cowgirl," he tells Katja.'
+	if katjaQW['anal_quest'] < 3:
+		'Katja looks a little confused and you explain to her what to do, and get down on all fours to help her.'
+	else
+		'Katja says "Help me <<$pcs_nickname>> and you get down on all fours and help her.'
+	end
+	'Seeing you with your ass in the air while Katja slides down on  <<$npc_nickname[$boy1]>> dick,  <<$npc_nickname[$boy2]>> won''t be left out and jams his hard cock into your butthole.'
+	katjaQW['horny'] += rand(5,15)
+	if npc_ass['A14'] + 4*katjaQW['lube'] < dick1: katjaQW['horny'] -= 10
+	gs 'arousal', 'anal', -1, 'dick2',  'group'
+	gs 'arousal', 'foreplay_give', 3, 'group', 'lesbian'
+	gs 'stat'
+	act 'More aAss fucking':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_anal_4'+iif(katjaQW['horny'] >= 100, 'a', 'b')+'.jpg"></center>'
+		'The men start to fuck you hard, and seeing Katja''s tasty pussy in front of your face you decide to taste it.'
+		if katjaQW['horny'] >= 100:
+			katjaQW['horny'] = 0
+			'That helps bring Katja over the edge, and soon she is coming with a big scream.'
+		else
+			'After a fucking you for a little while <<$npc_nickname[$boy2]>> pulls out of your ass, and moves to make Katja suck his dick instead.'
+		end
+		'"I''m close to coming"  <<$npc_nickname[$boy1]>> says, "and I want to paint those pretty face with my cum, so get down to the floor and suck our cocks."'
+		gs 'arousal', 'anal', -2, 'dick2',  'group'
+		gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
+		gs 'stat'
+		act 'Get down on your knees': gt 'katja_city_sex', 'two_guys_cumming', 1
+	end
+end
+
+if $ARGS[0] = 'two_guys_dp':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_dp1.jpg"></center>'
+	'<<$npc_nickname[$boy1]>> lies down on his back with his <<dick1>> cm <<$dick1_girth>> cock standing right up, and you mount it and ride up and down it a few times to feel it in your pussy.'
+	'Katja stands up in front of you, presenting her pussy to you, and you begin to lick it.'
+	'Meanwhile <<$npc_nickname[$boy2]>> has taken position behind you, and you feel '+iif(pcs_ass < dick2, 'some pain', 'only pleasure')+' as he pushes his cock into your asshole.'
+	katjaQW['horny'] += rand(0,5)
+	gs 'arousal', 'vaginal', 3, 'dick1', 'group'
+	gs 'arousal', 'anal', -3, 'dick2', 'group'
+	gs 'arousal', 'cuni_give', -3, 'group', 'lesbian'
+	gs 'stat'	
+	act 'Get both your holes pounded':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_dp2.jpg"></center>'
+		'The men continue to fuck both of your holes hard, but Katja turns around and presents her ass to you and you start to lick it.'
+		'After a few minutes <<$npc_nickname[$boy1]>> says "It''s time for the redhead to also get this treatment." "Yes. Lets switch girls" <<$npc_nickname[$boy2]>> agrees.'
+		katjaQW['horny'] += rand(0,5)
+		gs 'arousal', 'vaginal', 3, 'dick1', 'group'
+		gs 'arousal', 'anal', -3, 'dick2', 'group'
+		gs 'arousal', 'rimming_give', -3, 'group', 'lesbian'
+		gs 'stat'	
+		if katjaQW['dp'] = 0:
+			'"I''ve never tried something like that!" Katja says, a little shocked. "I don''t know if I''ll... be able to..." she stammers.'
+			iif(katjaQW['anal_quest'] < 3, '"You haven''t tried anal before tonight and that went well, so why don''t you try this also?"', '"You will only know if you try. So why don''t you?"' )+'  <<$npc_nickname[$boy1]>> says.'
+			if func('katja_procedural', 'willing_to_be_naughty') < 100 or katjaQW['horny'] < 75 or max(npc_vag['A14'], npc_ass['A14'] + 4*katjaQW['lube']) <dick1:
+				'"No," Katja says "Not tonight. I don''t feel like trying this right now."'
+				'The men look disappointed, but understand that.'
+				'"At least let me fuck your ass again," <<$npc_nickname[$boy1]>> says.'
+				'"Okay, we can do that," she says.'
+				act 'More butt fucking':  gt 'katja_city_sex', 'two_guys_anal_sex2'
+			else
+				'After a long pause, Katja says "Okay... I do want to try. But please be gentle."'
+				'The two men look very excited.'
+				act 'Watch Katja''s first DP': gt 'katja_city_sex', 'two_guys_katja_dp'
+			end
+		else
+			if katjaQW['dp'] < 5:
+				'"Okay... But please be gentle," Katja says, making the men look very excited.'
+			elseif katjaQW['dp'] < 10:
+				'"Okay. Let''s do it," she says, making the men look very excited.'
+			else
+				'"What are you waiting for? I need both my holes stuffed right now!" Katja says, making the men almost lose their minds in excitement.'
+			end
+			act 'Katja gets a DP': gt 'katja_city_sex', 'two_guys_katja_dp'
+		end
+	end
+end
+
+if $ARGS[0] = 'two_guys_katja_dp':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_katja_dp1'+iif(npc_ass['A14'] < dick2, 'a', 'b')+'.jpg"></center>'
+	'<<$npc_nickname[$boy2]>> gets off you and says "My turn to lie down", you then get off <<$npc_nickname[$boy1]>> who gets up so <<$npc_nickname[$boy2]>> can lie down.'
+	'When he lies down you give his cock some licks until it is very wet and Kajta asks "So I sit down with your cock in my pussy like <<$pcs_nickname>> did?" "No. I want your ass" <<$npc_nickname[$boy2]>> reply.'
+	'Katja looks '+iif(katjaQW['dp'] = 0, 'perplexed, and you have to explain to her how she is supposed to sit.', 'exited, and ready her ass above the cock.')+' You then help guide <<$npc_nickname[$boy2]>>''s cock into Katja''s ass as she lowers it down.'
+	if npc_ass['A14'] + 4*katjaQW['lube'] <dick2:
+		katjaQW['horny'] -= rand(10,20)
+		katjaQW['slut'] -= 5
+		'"Shit. it hurts" Katja screams as <<$npc_nickname[$boy2]>>''s fills out her asshole. You start to lick her boobs to try to distract her from the pain, while <<$npc_nickname[$boy1]>> looks on waiting to she is ready.'
+		'After a moment she comes down and says "You can try to put it in my pussy" which <<$npc_nickname[$boy1]>> does, and it goes in without any problems. The men then slowly start to fuck her.'
+		gs 'arousal', 'foreplay', 3, 'group', 'lesbian'
+	else
+		katjaQW['horny'] += rand(10,20)
+		'"Ahh. It feels good in my ass" Katja says as <<$npc_nickname[$boy2]>>''s dick fills out her asshole. You start to suck <<$npc_nickname[$boy1]>> ''s cock to get it more wet for Katja''s pussy.'
+		'"You can put it in my pussy" Katja says which <<$npc_nickname[$boy1]>> does, and it goes in without any problems. The men then slowly start to fuck her.'
+		gs 'arousal', 'bj', 3, 'dick1', 'group'
+	end
+	act 'Watch Katja get double penetrated':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_katja_dp2.jpg"></center>'
+		'You kiss Katja''s belly and try to lick her clit, but it gets harder and harder as the men start to move faster.'
+		'Especially since <<$npc_nickname[$boy1]>> is slamming into Katja''s pussy at a very fast pace.'
+		gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
+		minut += 2
+		gs 'stat'
+		if katjaQW['horny'] >= 100:
+			katjaQW['horny'] = 0
+			'It clearly makes her crazy as she is making more and more noise until she comes with a huge scream, which takes her some time to calm down from. After that <<$npc_nickname[$boy1]>> pulls out.'
+		else
+			'She clearly enjoys and is making a lot of noise, '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick2, 'but some of it is clearly also from ', ' and she doesn''t seem to feel any')+' pain. But before she comes <<$npc_nickname[$boy1]>> pulls out.'
+		end
+		'"I''m close to coming," he says, "and I want to paint those pretty faces with my cum, so get down to the floor and suck our cocks."'
+		katjaQW['dp'] += 1
+		if npc_vag['A14'] < dick1: npc_vag['A14'] += 1
+		if npc_vag['A14']*2 < dick1: npc_vag['A14'] += 1
+		if npc_ass['A14'] < dick2: npc_ass['A14'] += 1
+		if npc_ass['A14']*2 < dick2: npc_ass['A14'] += 1
+		act 'Get down on your knees': gt 'katja_city_sex', 'two_guys_cumming', 2
+	end
+end
+
+if $ARGS[0] = 'two_guys_cumming':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_cuming1.jpg"></center>'
+	'As the men stand up, you and Katja get down on your knees in front of the bed with your backs to each other.'
+	'You take <<$npc_nickname[$boy2]>>''s cock in your mouth, and Katja starts to suck <<$npc_nickname[$boy1]>>''s dick.'
+	'She also uses her other hand to play with your clit.'
+	'After a few minutes of sucking you can hear the grunting of the men signaling that they are about to come.'
+	gs 'arousal', 'bj', 3, 'dick2', 'group'
+	gs 'arousal', 'clit_finger', -3, 'group', 'lesbian'
+	gs 'stat'	
+	act 'Cum shower':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/two_men_home_sex_cuming2.jpg"></center>'
+		'<<$npc_nickname[$boy2]>> starts to come in thick splashes, hitting you square in the face.'
+		'As he is finished coming you can hear that Katja is very close to getting <<$npc_nickname[$boy1]>> off, and just as you turn to see he also comes. He sprays far and gets more cum on your face and in your mouth than on Katja''s.'
+		*nl
+		'After he has finished the men step back. "Show us those pretty faces" <<$npc_nickname[$boy1]>> says, and you both turn and look at them and start to kiss each other with the sperm in your mouths which clearly pleases the men.'
+		'After swapping cum for a little, you both get up and ask for the bathroom to get cleaned up.' 
+		gs 'arousal', 'kiss', 3, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'cum_call', 'face', $boy1, 1
+		gs 'cum_call', 'face', $boy2, 1
+		gs 'cum_call', 'mouth', $boy1, 1
+		gs 'cum_call', 'mouth', $boy2, 1
+		gs 'stat'
+		act 'Get cleaned up':
+			*clr & cla
+			minut += 7
+			cumspclnt =  1
+			gs 'cum_cleanup'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/claining_up_after_sex.jpg"></center>'
+			'On the way to the bathroom, you pick up your clothes, then spend some time cleaning the rest of their cum off your faces.'
+			if $ARGS[1] = 2:
+				if katjaQW['anal_quest'] < 3:
+					katjaQW['anal_quest'] = 3
+					katjaQW['slut'] += rand(10,20)
+					'"Impressive. First time doing anal sex and you are already getting double penetrated. What a slut you have become. How was it?" you ask Katja.'
+					if katjaQW['horny'] = 0:
+						'"It was amazing. I came so hard. When they both really started to fuck me fast I '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick2, 'completely forgot that the dick in my ass was so large that it hurt.', 'was overwhelmed by the sensations')+'." Katja says as her face is getting completely red.'
+					else
+						if npc_ass['A14'] + 4*katjaQW['lube'] <dick2:
+							'"It hurt a lot, so I''m not sure I really know how to feel about it. If I try again, then it has to be with a less well-endowed guy." Katja answers.' 
+						else
+							'"It was interesting. I did not hurt, but I did not come either. I think I need to try it again to really know what I think about it" Katja says, as her face is getting more red.'
+						end
+					end
+				else
+					if katjaQW['dp'] = 1:
+						katjaQW['slut'] += rand(5,10)
+						'"Welcome to the club of us complete sluts" you say "So how was it getting in both holes at the same time?" you ask.'
+						if katjaQW['horny'] = 0:
+							'"It was amazing. I came so hard. When they both really started to fuck me fast, I '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick2, 'completely forgot that the dick in my ass was so large that it hurt.', 'was overwhelmed by the sensations')+'." Katja says as her face is getting completely red.'
+						else
+							if npc_ass['A14'] + 4*katjaQW['lube'] <dick2:
+								'"It hurt a lot, so I''m not sure I really know how to feel about it. If I try again, then it has to be with a less well-endowed guy. Since I do like anal sex normally" Katja answers.' 
+							else
+								'"It was interesting. It did not hurt, but I did not come either. I think I need to try it again to really know what I think about it" Katja says, as her face is getting more red.'
+							end
+						end
+					else
+						katjaQW['slut'] += min(5,katjaQW['dp']) + 1
+						'"So how were these guys compared to others that have destroyed both of your holes?" you ask Katja.'
+						if katjaQW['horny'] = 0:
+							'"It was pretty good. I came hard, '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick2, 'even if the dick in my ass was so large that it hurt.', 'they clearly knows how to treat a lady')+'." Katja says.'
+						else
+							if npc_ass['A14'] + 4*katjaQW['lube'] <dick2:
+								'"Destroyed is the right word. It hurt a lot. Next time I either need guys that know how to be gentle or have smaller dicks." Katja answers before she starts to laugh about how casually she talks of things like this now.' 
+							else
+								'"They definitely do not compare well. It did not hurt, but these amateurs did not bring me to orgasm. Next time we need to find somebody that knows what they are doing" Katja says before she starts to laugh about how casually she talks of things like this now.' 
+							end
+						end
+					end
+				end
+			elseif $ARGS[1] = 1:
+				if katjaQW['anal_quest'] < 3:
+					katjaQW['anal_quest'] = 3
+					katjaQW['slut'] += rand(5,10)
+					'"So. How was anal sex. Was it what you expected," you ask Katja.'
+					if  katjaQW['horny'] = 0:
+						'"It was great. I would not have thought I would be able to come from a cock in my ass. '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick2, 'It hurt in the start, but soon I forgot about the pain.', 'I also thought there would be some pain, but there was none.')+' Definitely something I will be doing more." Katja says as her face is getting completely red.'
+					else
+						if npc_ass['A14'] + 4*katjaQW['lube'] <dick1:
+							'"It hurt a lot. Next time, if there is going to be a next time,  I need a guy with a smaller dick." Katja answers before she starts to laugh about how casually she talks of things like this now.' 
+						else
+							'"Okay. They did not manage to get me off, but at least it did not hurt. So I probably need to try it again to have a proper opinion about anal sex" Katja says before she starts to laugh about how casually she talks of things like this now.' 
+						end						
+					end
+				else
+					'"So were they any good?" you ask Katja.'
+					if  katjaQW['horny'] = 0:
+						katjaQW['slut'] += rand(2,5)
+						'"They were pretty good, '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick1, ' even if <<$npc_nickname[$boy1]>>''s dick was so large it hurt.', ' no pain at all.')+' So I will say they are approved." Katja says as her face is getting completely red, then she starts to laugh about how casually she talks of things like this now.' 
+					else
+						if npc_ass['A14'] + 4*katjaQW['lube'] < dick1:
+							katjaQW['slut'] -= rand(1,2)
+							'"No they were not. It hurt a lot. Next time, I need a guy with a smaller dick." Katja answers not looking satisfied at all.' 
+						else
+							'"Not really. They did okay in not making it hurt, but they did not know how to please a lady, only thinking about how to bring themselves off." Katja complains.' 
+						end						
+					end
+				end
+			else
+				'"So were they any good" you ask Katja.'
+				if  katjaQW['horny'] = 0:
+					katjaQW['slut'] += rand(1,2)
+					'"They were pretty good, '+iif(npc_vag['A14']<dick1, ' even if <<$npc_nickname[$boy1]>>''s dick was so large it hurt.', '  <<$npc_nickname[$boy1]>>''s dick fit nice in my pussy.')+' So I will say that he is approved, I never fucked  <<$npc_nickname[$boy2]>>. I only ever sucked his cock so I can''t say." Katja says as her face gets completely red, then she starts to laugh about how casually she rates guys sex skills now.' 
+				else
+					if npc_vag['A14']  <dick1:
+						katjaQW['slut'] -= rand(1,2)
+						'"No they were not. It hurt a lot.  <<$npc_nickname[$boy1]>>''s cock was too big for my pussy. Next time, I need a guy with a smaller dick." Katja answers, not looking satisfied at all.' 
+					else
+						'"Not really. They did okay, but they did not know how to please a lady, only thinking about how to bring themself off." Katja complains.' 
+					end						
+				end
+			end
+			*nl
+			'You continue to talk about the experience while you get dressed.  <<$npc_nickname[$boy1]>> is sleeping naked on the bed and  <<$npc_nickname[$boy2]>> is absentmindedly getting dressed when you come back in the room.'
+			'"Thanks, it was fun. But we will be going now," you say "Yes it was fun, take care" Katja chimes in. "Yes. You were great, rarely have I gotten such fine asses and pussies. Get home safe"  <<$npc_nickname[$boy2]>> says, clearly not in the mood for more talking,  <<$npc_nickname[$boy1]>> only response is to start snoring.'
+			act 'Walk to the metro':
+				*clr & cla
+				minut += 10
+				if katjaQW['lube'] = 1: katjaQW['lube'] = 0
+				$location_type = 'public_outdoors'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
+				'You leave the apartment and walk out into the streets, heading in the direction of the nearest metro station.'
+				'You keep walking and discussing the sex you just had. Soon you reach the metro station.'
+				act 'Enter the station': katjaQW['bondage_sex'] += 1 & gt 'katja_city', 'metro'
+			end
+		end
+	end
+end
+
 --- katja_city_sex ---------------------------------
 

+ 29 - 29
locations/katja_dorm.qsrc

@@ -17,8 +17,8 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> ''S Dorm Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dorm_room.jpg"></center>'
-	'The dorm room has two beds. The one on the left belongs to '+iif( sofiaQW['know'] = 0, 'Katja''s room mate', 'Sofia')+' while the one on the right is Katja''s. Above Katja''s bed is a full bookcase, and the wall is plastered with posters and notes.'
-	'Her table is likewise full of stuff; in the middle of it sits her laptop. '+iif( sofiaQW['know'] = 0, 'Her room mate''s', 'Sofia')+' side of the room is a lot less cluttered.'
+	'The dorm room has two beds. The one on the left belongs to '+iif( sofiaQW['know'] = 0, 'Katja''s roommate', 'Sofia')+' while the one on the right is Katja''s. Above Katja''s bed is a full bookcase, and the wall is plastered with posters and notes.'
+	'Her table is likewise full of stuff; in the middle of it sits her laptop. '+iif( sofiaQW['know'] = 0, 'Her roommate''s', 'Sofia')+' side of the room is a lot less cluttered.'
 	if locat['katja'] = 31:
 		'Katja is sitting at her desk.'
 		act 'Talk to Katja': gt 'katja_dorm', 'talk'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'talk':
 
 	if katjaQW['dress_borrowed'] = 1:
 		katjaQW['dress_borrowed'] = 0
-		'You hand Katja the dress you borrowed and say "Thanks for borrowing this." "It was nothing. That''s what friends are for." she reply.'
+		'You hand Katja the dress you borrowed and say "Thanks for borrowing this." "It was nothing. That''s what friends are for." she replied.'
 	end
 
 	if locat['katja'] ! 31:
@@ -257,7 +257,7 @@ if $ARGS[0] = 'chat':
 	end
 
 	if katjaQW['slut'] >= 50 and katjaQW['horny'] >= 80 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] < 2:
-		!!If you are in a sexual relationship and you can see that Katja is very horny, then you have the possibility to start sex.
+		!!If you are in a sexual relationship and you can see that Katja is very horny, then you can start sex.
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 	end
 
@@ -334,7 +334,7 @@ if $ARGS[0] = 'chat':
 	end
 
 	if npc_pregtalk['A14'] = 0 and KatjaConflict = 1 and KatConCheck ! daystart :
-	!!If you did not tell Katja that you are pregnant and she found out anyway. You can try to apologize. Different version if it is your fisrt child or not.
+	!!If you did not tell Katja that you are pregnant and she found out anyway. You can try to apologize. Different version if it is your first child or not.
 		if kid = 0:
 			act 'Apologize':
 				cla & *clr
@@ -364,7 +364,7 @@ if $ARGS[0] = 'chat':
 	end
 
 	if katjaQW['boy_block'] = 1:
-		act 'Tell Katja you have decided that boys are fun after all <br><font color="red">(Katja will start asking about sex with boys boys again)</font>': gt 'KatjaHomeTalk', 'boy_yes'
+		act 'Tell Katja 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
 
 	act 'Stop talking': gt 'katja_dorm', 'start'
@@ -387,8 +387,8 @@ if $ARGS[0] = 'sofia_meet':
 	'"Hi, Katja! I''m home early since Maxim suddenly had a meeting with one of his professors. I swear that he''s doing so much to study hard; almost too much. Always trying to meet with his teachers. I told him that they might see it as..." She suddenly stops, having noticed you. "Oh, you have a guest."'
 	'"Sofia, this is <<$pcs_nickname>>, my ' + iif($university['enrolled_in'] = 'teaching_studies', 'classmate and ', '') + 'friend from school who was just about to leave," Katja replies before she turns to you. "<<$pcs_nickname>>, this is Sofia, my roommate."'
 	'"Hi <<$pcs_nickname>>, it''s so nice to meet Katja''s friends since she doesn''t seem to have a lot of them," Sofia says, which clearly makes Katja blush. "So ' + iif( $university['enrolled_in'] = 'teaching_studies', 'you''re also studying to become a teacher like Katja', 'what are you studying') + '?" she asks.'
-	'' + iif( $university['enrolled_in'] = 'teaching_studies', '"yes" ', '"I''m ' + iif(university[student] = 1, 'in the ' + func('uni_programs', 'program_name') + ' program', 'not studying at the university') + '" ') + 'you answer.'
-	'"Cool. I''m ' + iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I think I''ve seen you in class now that I think about it.', 'studying to become a nurse.') + ' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.'
+	''+iif( $university['enrolled_in'] = 'teaching_studies', '"yes" ', '"I''m '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+'"')+'you answer.'
+	'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I think I''ve seen you in class now that I think about it.', 'studying to become a nurse.')+' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.'
 	*nl
 	'"I''m sorry, but <<$pcs_nickname>> was just leaving," Katja says, looking at you as if trying to say she''s sorry.'
 	'"That''s right, I''ll be leaving now," you say.'
@@ -401,7 +401,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['pussy_sex'] > 0 and katjaQW['QWstage'] < 6:
 		katjaQW['QWstage'] = 6
-		'"So I have had sex with boys before. '+iif(katjaQW['knows_sex'] = 0,' I don''t know if you', 'I know you also')+' have. So maybe we should try a threesome with a guy some time" Katja says looking at you wickedly.' 
+		'"So I have had sex with boys before. '+iif(katjaQW['knows_sex'] = 0,' I don''t know if you', 'I know you also')+' have. So maybe we should try a threesome with a guy sometime" Katja says looking at you wickedly.' 
 	end
 	if katjaQW['lazer_pussy_talk'] + katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0:
 		katjaQW['lazer_pussy_talk'] = 1
@@ -726,7 +726,7 @@ if $ARGS[0] = 'lazar_agree':
 	if katjaQW['anal_quest'] = 2:
 		if katjaQW['lazer_anal_talk'] = 1:
 			if katjaQW['QWstage'] > 5:
-				'"And we''ll let him fuck our butts, like we said earlier?" Katja asks.'
+				'"And we''ll let him fuck our butts like we said earlier?" Katja asks.'
 				'"Of course. We already agreed to that," you answer.'
 			else
 				'"Okay. We should let Lazar be the first guy to fuck '+iif(stat['anal'] >0, 'your', 'our')+' ass," you agree.'
@@ -734,7 +734,7 @@ if $ARGS[0] = 'lazar_agree':
 			end
 		else
 			katjaQW['lazer_anal_talk'] = 1
-			'"And we''ll let him fuck our butts, like we talked about getting somebody to do earlier?" Katja asks.'
+			'"And we''ll let him fuck our butts like we talked about getting somebody to do earlier?" Katja asks.'
 			'"We could get him to do that if he wants to," you answer.'
 		end
 	elseif katjaQW['anal_quest'] = 3:
@@ -788,7 +788,7 @@ if $ARGS[0] = 'lazar_anal_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['anal_sex'] > 0 and katjaQW['anal_quest'] < 3:
 		katjaQW['anal_quest'] = 3
-		'"So I have had anal sex with boys before. '+iif(katjaQW['knows_anal'] = 0, 'I don''t know if you', 'I know you also')+' have. So maybe we should try it together with a guy some time" Katja says looking at you wickedly.' 
+		'"So I have had anal sex with boys before. '+iif(katjaQW['knows_anal'] = 0, 'I don''t know if you', 'I know you also')+' have. So maybe we should try it together with a guy sometime" Katja says looking at you wickedly.' 
 	end
 	if katjaQW['lazer_pussy_talk'] + katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_pussy'] = 0:
 		katjaQW['lazer_anal_talk'] = 1
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'lazar_kiss':
 	katjaQW['Lazar_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-	'Katja almost jumps you and gives you a kiss. Afterwards, she looks at you a little hesitantly. "You know, why don''t we call Lazar to see if he wants us to come over?"'
+	'Katja almost jumps you and gives you a kiss. Afterward, she looks at you a little hesitantly. "You know, why don''t we call Lazar to see if he wants us to come over?"'
 	act 'Agree':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'movie_talk1':
 		cla
 		'"Sounds good," you reply. "Anything I can help with?"'
 		'"Yes, go to the kitchen to get a bowl for the popcorn," she answers.'
-		'You go the to kitchen and prepare the popcorn while Katja finishes setting up the movie. You then both set down on her bed and start watching the film Katja has selected.'
+		'You go the to kitchen and prepare the popcorn while Katja finishes setting up the movie. You then both sit down on her bed and start watching the film Katja has selected.'
 		act 'Watch the movie': gt 'katja_dorm', 'watch_movie'
 	end
 	act 'Not in the mood tonight':
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'movie_talk1':
 	if week > 4 or KatjaQW['slut'] > 75:
 		act 'Tell her you would rather go out tonight':
 			cla
-			'"Why don''t we go out partying instead? It''ll be fun" you say.'
+			'"Why don''t we go out partying instead? It''ll be fun," you say.'
 			if katjaQW['horny'] >= 100:
 					gs 'willpower', 'misc', 'force', 'easy'
 			elseif katjaQW['horny'] < 50:
@@ -1105,8 +1105,8 @@ if $ARGS[0] = 'movie_talk1':
 					act 'Convince her to go out (<<will_cost>> Willpower)':
 						cla
 						katjaQW['dom'] -= rand(1,2)			
-						'"Come on Katja. It is boring just sitting watching a movie when you con be out partying the night away" you say trying to convince Katja to come with you.'
-						'"Okay then. I''l watch the movie another time. Where do you want to go?" she finally relents.'
+						'"Come on Katja. It is boring just sitting watching a movie when you con be out partying the night away," you say trying to convince Katja to come with you.'
+						'"Okay then. I''ll watch the movie another time. Where do you want to go?" she finally relents.'
 						act 'Go to the night club':
 							cla
 							locat['katja'] = 53
@@ -1126,16 +1126,16 @@ if $ARGS[0] = 'movie_talk1':
 				cla
 				katjaQW['dom'] += rand(1,2)
 				'"Okay, I''ll stay and watch the movie with you" you relent.'
-				'"Yeah! We don''t you go to the kitchen to get a bowl for the popcorn," she ask happy that you want to watch the movie with her.'
-				'You go the to kitchen and prepare the popcorn while Katja finishes setting up the movie. You then both set down on her bed and start watching the film Katja has selected.'
+				'"Yeah! We don''t you go to the kitchen to get a bowl for the popcorn," she asks happy that you want to watch the movie with her.'
+				'You go the to kitchen and prepare the popcorn while Katja finishes setting up the movie. You then both sit down on her bed and start watching the film Katja has selected.'
 				act 'Watch the movie': gt 'katja_dorm', 'watch_movie'
 			end
-			act 'Tell her that you wont waste you evening watching a movie':
+			act 'Tell her that you won''t waste your evening watching a movie':
 				cla
 				katjaQW['dom'] += rand(1,2)
 				gs 'npc_relationship', 'modify', 'A14', 'dislike'
-				'"Well if you wont go out with me, I will just leave you to watch you boring movie yourself. I''m not going to waste my evening on that" you say.' 
-				'"Don''t be such downer, watching movies can be just as much fun as getting drunk at some random party" she says. "See you another day?"'
+				'"Well if you won''t go out with me, I will just leave you to watch your boring movie by yourself. I''m not going to waste my evening on that," you say.' 
+				'"Don''t be such a downer, watching movies can be just as much fun as getting drunk at some random party," she says. "See you another day?"'
 				act 'Leave her room': minut += 2 & gt 'uni_dorm', 'second_floor'
 			end
 		end
@@ -1155,7 +1155,7 @@ if $ARGS[0] = 'movie_talk2':
 	end
 	act 'Not in the mood tonight':
 		cla
-		'"Sorry, but I''m not in the mood tonight. Maybe some oter time?" you reply.' 
+		'"Sorry, but I''m not in the mood tonight. Maybe some other time?" you reply.' 
 		'Katja just nods, not removing her eyes from the screen.'
 		act 'Quietly leave her room': minut += 2 & gt 'uni_dorm', 'second_floor'
 	end
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'watch_movie':
 				minut += 10
 				gs 'stat'
 				'You spend some time discussing the film once it''s finished. You agree that it was '+iif(rand(0,1) = 1, 'good,', 'bad, but')+' with '+iif(rand(0,1) = 1, 'good', 'okay')+' acting.'
-				'Katja '+iif(t> 2, 'keeps coming back to the sex scenes and how good the actors looked in them.', 'didn''t find the scenes that believable and clearly didn''t like the look of the main actress.')+' Katja then says she want to go to sleep and you say your goodbyes.'
+				'Katja '+iif(t> 2, 'keeps coming back to the sex scenes and how good the actors looked in them.', 'didn''t find the scenes that believable and clearly didn''t like the look of the main actress.')+' Katja then says she wants to go to sleep and you say your goodbyes.'
 				act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
 			end
 		end	
@@ -1244,7 +1244,7 @@ if $ARGS[0] = 'watch_movie':
 				minut += 10
 				gs 'stat'
 				'You spend some time discussing the film once it''s finished. You agree that it was a '+iif(rand(0,1) = 1, 'good movie,', 'bad movie, but')+' with '+iif(rand(0,1) = 1, 'good', 'mediocre')+' acting.'
-				'Katja thinks that the overall plot was '+iif(rand(0,1)=1, 'quite interesting.', 'too complicated.')+' She then says she want to go to sleep and you say your goodbyes.'
+				'Katja thinks that the overall plot was '+iif(rand(0,1)=1, 'quite interesting.', 'too complicated.')+' She then says she wants to go to sleep and you say your goodbyes.'
 				act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
 			end
 		end
@@ -1266,7 +1266,7 @@ if $ARGS[0] = 'watch_movie':
 				minut += 10
 				gs 'stat'
 				'You spend some time discussing the film once it''s finished. You agree that it was a '+iif(rand(0,1) = 1, 'good movie,', 'bad movie, but')+' with '+iif(rand(0,1) = 1, 'a funny', 'a cringe')+' romance plot.'
-				'Katja '+iif(t> 3, 'keeps coming back to how great the chemistry between main actors were and how hot they looked together.', 'thinks that the overall plot was full of holes.')+' She then says she want to go to sleep and you say your goodbyes.'
+				'Katja '+iif(t> 3, 'keeps coming back to how great the chemistry between main actors was and how hot they looked together.', 'thinks that the overall plot was full of holes.')+' She then says she wants to go to sleep and you say your goodbyes.'
 				act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
 			end
 		end	
@@ -1288,7 +1288,7 @@ if $ARGS[0] = 'watch_movie':
 				minut += 10
 				gs 'stat'
 				'You spend some time discussing the film once it''s finished. You agree that it was a '+iif(rand(0,1) = 1, 'good movie,', 'bad movie, but')+' with '+iif(rand(0,1) = 1, 'great', 'mediocre')+' action scenes.'
-				'Katja '+iif(t> 3, 'keeps coming back to how hot the actors and actresses were.', 'thinks the acting of the main character was good.')+' She then says she want to go to sleep and you say your goodbyes.'
+				'Katja '+iif(t> 3, 'keeps coming back to how hot the actors and actresses were.', 'thinks the acting of the main character was good.')+' She then says she wants to go to sleep and you say your goodbyes.'
 				act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
 			end
 		end
@@ -1417,7 +1417,7 @@ if $ARGS[0] = 'relationship_talk':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'		
 			'"Since you''re now my girlfriend, I want us to be faithful to each other. But, as long as we both agree, we can bring in another person to have sex with together," you answer.'
-			'"Okay. '+iif(katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >=3 or katjaQW['simultanous_girls'] > 1, 'I do like it when we have fun with somebody else and want that to continue.', 'I guess we might try that some time.')+' But no sex with anyone else if I''m not there," Katja replies. "I''m glad we settled that, <<$pcs_nickname>>, but now it''s time for bed," she says, getting up and giving you a quick kiss.'
+			'"Okay. '+iif(katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >=3 or katjaQW['simultanous_girls'] > 1, 'I do like it when we have fun with somebody else and want that to continue.', 'I guess we might try that sometime.')+' But no sex with anyone else if I''m not there," Katja replies. "I''m glad we settled that, <<$pcs_nickname>>, but now it''s time for bed," she says, getting up and giving you a quick kiss.'
 			'"Sleep tight, my girlfriend," you say as you leave leave her room.'
 			'"Good night, my love," Katja replies.'
 			act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
@@ -1486,7 +1486,7 @@ if $ARGS[0] = 'cocain_offer':
 		'"Yes. That''s the spirit," she replies and prepares some lines for the two of you, and finds some tubes for you to use.'
 		'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
 		*nl
-		'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
+		'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling which turns into a laugh that lasts for some time.'
 		act 'Continue talking': gt 'katja_dorm', 'talk'
 	end			
 end

+ 88 - 88
locations/katja_lake.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	if month >11 or month <3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
-		'One good thing about living in Pavlovsk is the access to rivers and lakes. Now that it is winter, this landscape has beautifully transformed, thanks to the ice and snow, into a place where people rush to do things like ice skate, play hockey and (for the brave) swimming.'
+		'One good thing about living in Pavlovsk is the access to rivers and lakes. Now that it is winter, this landscape has beautifully transformed, thanks to the ice and snow, into a place where people rush to do things like ice skating, playing hockey and (for the brave) swimming.'
 		'Katja and you are no less, and go to the area to skate on the frozen lake, spend some time in the sauna or (with some cajoling) do an ice dip... and looking absolutely fabulous doing it.'
 	else
 		if sound = 0 and month >2 and month <6:
@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 					PLAY 'sound/lakeshore1.mp3', 30
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
 				end
-				'You decide to pass some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
+				'You decide to spend some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 				if func('changingroom','count_swim_item') > 0:
 					act 'Put on your swimwear':
 						*clr & cla
@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 							act 'Of course not!':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
-								'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensuall eyes.'
+								'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
 								'"Bitch!"'
 								'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
 								if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
@@ -312,7 +312,7 @@ if $ARGS[0] ='winter_activities':
 		gt 'katja_lake','hockey_match'
 	elseif dummy >= 3 and mc_inventory['ice_skates'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
-		'It''s winter, and most activities on the lake are limited, if you had skates, Katja and you, could use them on the ice covered waters, but at the moment, it''s seems that you can only look at the frozen waters, is better to look for something else to do.'
+		'It''s winter and most activities on the lake are limited, if you had skates, Katja and you, could use them on the ice-covered waters, but at the moment, it seems that you can only look at the frozen waters, it''s better to look for something else to do.'
 
 		act 'Continue':gt 'katjaEv','kathan'
 	else
@@ -350,7 +350,7 @@ if $ARGS[0] ='winter_activities':
 
 					if dummy <=3:
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS1.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></td></table></center>'
-						'You sit there with a redfaced, redhaired, red... something bitch! You try desperately to burn a hole in the ice with your gaze, but finally, after some... really long and embarrassing minutes, Katja seems to calm down and reach for you.'
+						'You sit there with a red-faced, red-haired, red... something bitch! You try desperately to burn a hole in the ice with your gaze, but finally, after some... really long and embarrassing minutes, Katja seems to calm down and reach for you.'
 						'"Sorry <<$pcs_nickname>>! Snort... It''s just that you are one of the worst skaters I have seen!"'
 						'"Fuck you!"'
 						'Using her as a support, you rise from the ice and take care of your clothes. That is good. Now you only need to put up with the pain in your ass and the embarrassment from the "pavlovsk''s Worst Skater" title.'
@@ -374,12 +374,12 @@ if $ARGS[0] ='winter_activities':
 					elseif dummy = 5:
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS1.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></td></table></center>'
 						'"Weee!"'
-						'Turning, you see Vanya skating towards you in... slow motion... with utterly exaggerated movements that are weirding out all present. He passes by your side and gives you a salute, then turns and returns doing the same, but this time he falls near you in, again, an exaggerated slow motion performance.'
+						'Turning, you see Vanya skating towards you in... slow motion... with utterly exaggerated movements that are weirding out all present. He passes by your side and gives you a salute, then turns and returns doing the same, but this time he falls near you in, again, an exaggerated slow-motion performance.'
 						'"Ouch! The pain! Ouch!"'
 						'Nobody is finding the gesture funny and more than one person is actually murmuring their disapproval at the "obvious derision" of this "jerk" against you. Taking advantage of the distraction, Katja helps you to your feet and fixes your clothes before leaving the lake, but you wait for Vanya and after a few minutes, the smiling jock meets with you.'
 						'"So girls. It worked?"'
 						'"Yeah... I think that now that everybody, including us, thinks that you are an idiot, they will forget my... performance."'
-						'Vanya smiles and raises his right hand in a high five motion. After a few minutes when neither Katja nor you react, he shrugs and leaves you to your own devices. It is time to look for something else to do.'
+						'Vanya smiles and raises his right hand in a high-five motion. After a few minutes when neither Katja nor you react, he shrugs and leaves you to your own devices. It is time to look for something else to do.'
 						gs 'stat'
 
 						act 'Continue':gt 'katjaEv','kathan'
@@ -387,7 +387,7 @@ if $ARGS[0] ='winter_activities':
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS1.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big141.jpg"></td></table></center>'
 						'"Just my luck! This can''t get worse!"'
 						'"Remember the ads Katja! Don''t throw trash in the lake!"'
-						'Yeah. Right. Christina. It could be worse. The bitch has just appeared and is skating around you backwards, showing off, but Christina''s words have rubbed Katja the wrong way, making the redhead confront her.'
+						'Yeah. Right. Christina. It could be worse. The bitch has just appeared and is skating around you backward, showing off, but Christina''s words have rubbed Katja the wrong way, making the redhead confront her.'
 						'"Fuck you Christina! Don''t you have puppies to hurt? Leave us alone!"'
 						'Christina doesn''t answer. She just looks at Katja, smiling. She turns and leaves quickly, letting a grumpy Katja help you stand up.'
 						'"Showtime bitches!"'
@@ -425,9 +425,9 @@ if $ARGS[0] ='winter_activities':
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS2.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></td></table></center>'
 						'Flabergasted by Katja''s gigging display, you don''t see anyone approaching until a tall figure slides by your side and extends a hand towards Katja. Is that Ivan?'
 						'"Come on girl. Get up!"'
-						'Grabbing her hand, he pulls Katja towards him, prompting her to give him an awkward embrace that ends her gigglings and causes a sudden blush on Katja''s cheeks. For several moments, she stands there looking nervously at the jock until you cough and Katja practically jump away from him.'
+						'Grabbing her hand, he pulls Katja towards him, prompting her to give him an awkward embrace that ends her gigglings and causes a sudden blush on Katja''s cheeks. For several moments, she stands there looking nervously at the jock until you cough and Katja practically jumps away from him.'
 						'"Sorry! I mean... Thanks! Uhh..."'
-						'Ivan just smiles and giving you both a nod, turns and silently skates towards the sunset, leaving you with a flustered Katja who gives you sideways glances. Ok, this is an awkward way to end this. It is time to look for something else to do.'
+						'Ivan just smiles and giving you both a nod, turns and silently skates towards the sunset, leaving you with a flustered Katja who gives you sideways glances. Okay, this is an awkward way to end this. It is time to look for something else to do.'
 
 						act 'Continue':katjaQW['horny'] += 5 & gt 'katjaEv','kathan'
 					else
@@ -435,7 +435,7 @@ if $ARGS[0] ='winter_activities':
 						'"Yep, good question. This is by far your worst performance <<$pcs_nickname>>"'
 						'You turn towards the person that just spoke, to see Lizaveta biting her tongue in concentration as she does a recording on her smartphone.'
 						'"And... uploaded! Let''s see how many likes you will receive this time!"'
-						'You roll your eyes and help Katja, who has suddenly stopped her whining and gets up. You both stand looking intensely at Lizaveta, who after a few moments, understands the silent message and leaves. Ok, this is an awkward to end this. It is time to look for something else to do.'
+						'You roll your eyes and help Katja, who has suddenly stopped her whining and gets up. You both stand looking intensely at Lizaveta, who after a few moments, understands the silent message and leaves. Okay, this is an awkward way to end this. It is time to look for something else to do.'
 
 						act 'Continue':npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
 					end
@@ -450,7 +450,7 @@ if $ARGS[0] ='winter_activities':
 					'"Come on Ronnie! <<$pcs_nickname>>! Showtime!"'
 					'Katja screams at you excitedly as you rush towards the "Ice Queen", following her lead around the lake and imitating Veronika''s ice dance. Around the lake, most people stop to see your performance, but it doesn''t matter how much you strive, Veronika is always a little faster, a little more graceful and after a grueling half hour, she finally stops.'
 					'"Hmm. Not bad <<$pcs_nickname>>."'
-					'There isn''t emotion, or even tiredness in the "Ice Queen"''s voice, but there is... approval? After a silent moment, she quickly leaves, letting you come back to an excited Katja.'
+					'There is no emotions, or even tiredness in the "Ice Queen"''s voice, but there is... approval? After a silent moment, she quickly leaves, letting you come back to an excited Katja.'
 					'"That was so cool <<$pcs_nickname>>! You are good!"'
 					'You smile tiredly as the crowd returns to their own skating, but there is more than a good share of wonderment at your demonstration. In general, you must say that it has been a great time, but it is time to look for something else to do.'
 
@@ -459,7 +459,7 @@ if $ARGS[0] ='winter_activities':
 				elseif dummy >50:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS4.jpg"></center>'
 					'"Oh god! <<$pcs_nickname>>! Oh god! What are you doing to me! Oh god!"'
-					'Katja screams as she loses her balance and slips. Fortunately, you catch the redhead before she falls and help her to recover her balance. It''s seems that you aren''t really good at skating, and your intended "synchronized ice dancing" with the redhead has ended with a tackle and Katja barely standing.'
+					'Katja screams as she loses her balance and slips. Fortunately, you catch the redhead before she falls and help her to recover her balance. It seems that you aren''t really good at skating, and your intended "synchronized ice dancing" with the redhead has ended with a tackle and Katja barely standing.'
 					'"Oh shit! Sorry Katja!"'
 					'Smiling, she grabs your hand and pulls, taking the lead and skating towards the crowd, this time without flourishing moves. You both enjoy some well-deserved distraction from your everyday problems.'
 					'And that is how you pass the next half hour. Skating, giggling and in general just showing off, before it is time to look for something else to do.'
@@ -488,7 +488,7 @@ if $ARGS[0] = 'playing_in_snow':
 	npc_rel['A14'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT9.jpg"></center>'
-	'Snow! During Pavlovsk''s winter, this isn''t exactly a novelty, but being the first to find a clean parcel without footsteps, car tracks or snot-nosed kids around, well... that is a being lucky! So... What can you do with this innocent and virginal gift?'
+	'Snow! During Pavlovsk''s winter, this isn''t exactly a novelty, but being the first to find a clean parcel without footsteps, car tracks or snot-nosed kids around, well... that is being lucky! So... What can you do with this innocent and virginal gift?'
 
 	act 'Snowfight!':
 		*clr & cla
@@ -510,25 +510,24 @@ if $ARGS[0] = 'playing_in_snow':
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT11.jpg"></center>'
 		'"Cold! Katja! Cold!"'
-		'That is the thing that passes by your head in the aftermath of laying in the frozen soil. The snow, trying to its heart content, to pass the flimsy protection that your winter clothes try to give but you remember one thing.'
-		'"I am a Russian bitch! You can''t stop me Winter!"'
-		'You scream at the heavens, and with an effort of will, your arms and legs begin to move against the snow''s cold resistance, shaping it on your heavenly form''s visage, but winter is not defeated, and a sudden icy wind blows against your face, trying to stop you.'
-		'"<<$pcs_nickname>>! Snort! You are crazy! Just... hahaha!"'
-		'You look to the smiling redhead, who is trying to stand, but fails and sits on the ground, laughing at your antics until you get up and help her to her feet. There in the ground are your silhouettes. It has been fun, but now you are cold and it is probably best to look for something else to do.'
+		'That''s the thought that races through your mind as you lie on the frozen ground. The snow, relentless in its pursuit, attempts to breach the meager defense offered by your winter garments, but you cling to one resolute idea.'
+		'"I''m a Russian bitch! Winter won''t defeat me!"'
+		'You shout at the heavens, and with unwavering determination, your arms and legs defy the icy grip of the snow, molding it to your resolute form. Yet, winter remains unyielding, and a sudden icy wind blasts against your face in an attempt to halt your progress.'
+		"<<$pcs_nickname>>! Haha! You''re insane! But I love it!"
+		'You glance at the smiling redhead, who tries to stand but ends up seated on the ground, laughing at your antics until you extend a hand to help her to her feet. There, on the ground, your silhouettes remain. It''s been a delightful adventure, but now the cold seeps into your bones, suggesting it''s time to find another activity.'
 		act 'Continue':gt 'katjaEv','kathan'
 	end
 
 	act 'Snowman!':
 		*clr & cla
 		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT12.jpg"></center>'
-		'You know the drill, it isn''t really that hard. Three big snowballs, some stones for details, maybe some discarded clothes from a dumpster... and bingo! A snowman! Then why is it taking you so much time to finish it?!'
+		'You know the drill; it isn''t really that hard. Three big snowballs, some stones for details, maybe some discarded clothes from a dumpster... and bingo! A snowman! Then why is it taking you so much time to finish it?!'
 		'"<<$pcs_nickname>>, I think that the red scarf doesn''t go with those sticks."'
-		'You two have examined the dumpsters and piked the most selected branches around the zone, but somehow that isn''t enough.'
-		'"Hmm, you are right Katja. I''m thinking... on that old jacket!"'
-		'Of course, kids around you want to help, but really, what will those snot-nosed kiddos know about dressing your creation! So, that is why you have "encouraged" the kids to, well, build their own far away so your work continues undisturbed, changing clothes, stones, and sticks until your snowman is ready.'
-		'"Ok <<$pcs_nickname>>! Let''s do a selfie!"'
-		'And then, after half an hour of intense work, your masterful creation is ready for posterity. It is time to look for something else to do.'
+		'You two have scoured the dumpsters and picked the finest branches in the area, but somehow that isn''t enough.'
+		'"Hmm, you are right, Katja. I''m thinking... about that old jacket!"'
+		'Of course, the kids around you want to help, but really, what will those snot-nosed kiddos know about dressing your creation! So, that''s why you''ve "encouraged" the kids to build their own creations far away, allowing you to continue your work undisturbed, swapping clothes, stones, and sticks until your snowman is ready.'
+		'"Ok, <<$pcs_nickname>>! Let''s take a selfie!"'
+		'And then, after half an hour of intense effort, your masterful creation is ready for posterity. It''s time to find something else to do.'
 
 		act 'Continue':gt 'katjaEv','kathan'
 	end
@@ -540,12 +539,13 @@ if $ARGS[0] = 'hockey_match':
 	dummy = rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT13.jpg"></center>'
-	'As you look for something to do, you get wind of this improvised ice hockey match that involves your school''s team. Katja isn''t really interested in sports, but as Vanya and Vicky will probably be there, she pushes you to attend the event.'
-	'"Hey Katja, <<$pcs_nickname>>! Over here!"'
-	'Vicky screams somehow fly over all the shouting and lets you locate the perky redhead. She smiles excitedly as Vanya & Co play the field, and without missing a beat, Viktoriya screams, jumps, dances and in general encourages your champions.'
-	'"Seriously bitch! Your boyfriend sucks and you are only embarrassing yourselves!"'
-	'Some girls beside you seem to not exactly be chill with the Meynold''s cheerleading efforts. Katja seems offended and Vicky sticks her tongue out for a moment before returning to her cheers. On their part, the other girls scoff at them and after calling your little group "childish", return their attention to the match. Hm... Maybe you must do something.'
+	'As you search for something to do, you catch wind of an impromptu ice hockey match involving your school''s team. Katja isn''t really into sports, but with the prospect of Vanya and Vicky''s presence, she urges you to join the event.'
+	'"Hey, Katja, <<$pcs_nickname>>! Over here!"'
+	'Vicky''s exclamations somehow pierce through the cacophony, guiding you to the lively redhead. She wears an excited smile as she watches Vanya & Co dominate the field. Without missing a beat, Viktoriya shouts, jumps, dances, and provides enthusiastic support to your team.'
+	'"Seriously, your boyfriend sucks, and you''re only embarrassing yourselves!"'
+	'Some girls next to you appear less than thrilled with the Meynold''s spirited cheering. Katja appears offended, while Vicky playfully sticks her tongue out before resuming her cheers. On the other side, the other girls scoff at your group and, after deeming your little gang "childish," return their focus to the match. Hm... Maybe you should do something.'
 
+	
 	act 'Who cares? Continue watching the match.':
 		*clr & cla
 		menu_off = 1
@@ -555,27 +555,28 @@ if $ARGS[0] = 'hockey_match':
 		npc_rel['A165'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT13.jpg"></center>'
-		'It is probably best to just chill and don''t make a mountain out of a molehill. After all, this is supposed to be fun! And fun it is! You join the hyper Vicky with Katja and begin to cheer your boys so they know that you are with them.'
-		'"Go! Vanya! Go!"'
-		'He hails your cheer squad and then launches himself towards their rivals'' net, trying to overwhelm their goaltender, but obviously, the other team doesn''t stand idle and counter their attack, pushing against your schoolfriend''s defenses, enforcing a full-contact clash between the teams. This is just the beginning of an hour long struggle for supremacy.'
+		'It''s best to keep it cool and not make a big deal out of it. After all, this is supposed to be fun! And fun it is! You join the enthusiastic Vicky and Katja to cheer on your boys, letting them know you''re there to support.'
+		'"Go, Vanya, go!"'
+		'He acknowledges your cheering squad and charges towards the rival team''s net, attempting to outplay their goalie. However, the other team isn''t sitting idle; they counterattack, leading to a full-contact showdown between the teams. This is just the start of an hour-long struggle for supremacy.'
 
 		if dummy = 1:
-			'"Yes! Vanya! Yes!"'
-			'You scream happily when, after many falls, kicks (This is hockey!) and bloodied noses, your team emerges victorious. Yeah! That feels nice, and Vanya skates tiredly towards your little group to embrace an excited Vicky, who can only make faces at the bitch squad.'
-			'You and Katja can only look with utter prepotency towards the crestfallen girls as they retreat to treat their men. This has been fun, but it is time to look for something else to do.'
+			'"Yes, Vanya, yes!"'
+			'You shout with joy when, after numerous falls, kicks (it''s hockey!), and some bloodied noses, your team emerges victorious. It feels great, and Vanya skates over to your group, embracing an excited Vicky, who taunts the bitch squad.'
+			'You and Katja exchange triumphant glances as the crestfallen girls retreat to tend to their injured men. It''s been a blast, but now it''s time to find something else to do.'
 			gs 'stat'
 
-			act 'Continue':pcs_mood +=10 & gt 'katjaEv','kathan'
+			act 'Continue': pcs_mood += 10 & gt 'katjaEv', 'kathan'
 		else
-			'"Oh Crap! Vanya!"'
-			'You scream sadly when, after many falls, kicks (This is hockey!) and bloodied noses, your team loses. Vanya lies on the ground tired, and you can only walk towards him with the Meynolds to try to cheer the crestfallen boy as the bitch squad giggle at your defeat.'
-			'Vicky embraces her poor boyfriend and whispers something into his ear that makes the jock smile sheepishly and get up, suddenly grab the redhead and quickly leave as a smiling Vicky winks an eye towards you. Well, it is time to look for something else to do.'
+			'"Oh, crap, Vanya!"'
+			'You exclaim sadly when, after many falls, kicks (it''s hockey!), and some bloody noses, your team loses. Vanya lies tired on the ground, and you join the Meynolds to console the dejected boy as the bitch squad giggles at your defeat.'
+			'Vicky embraces her disappointed boyfriend and shares a few comforting words that bring a sheepish smile to the jock''s face. He swiftly gets up, grabs the redhead, and they leave, with a wink from Vicky. It''s time to find something else to do.'
 			gs 'stat'
 
-			act 'Continue':pcs_mood -=10 & gt 'katjaEv','kathan'
+			act 'Continue': pcs_mood -= 10 & gt 'katjaEv', 'kathan'
 		end
 	end
 
+
 	gs 'willpower', 'misc', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Teach the bitch squad a lesson!':
@@ -625,7 +626,7 @@ if $ARGS[0] = 'beach_nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL3.jpg"></center>'
 		'After reaching the secluded beach, and being careful to make sure that there isn''t voyeurs, you both strip from your clothes, but as Katja reaches for her bikini, she stops and looks at you.'
 		'"<<$pcs_nickname>>, aren''t you going to put on your swimsuit?"'
-		'You stand there, proud on your nakedness, and smile at her as she looks between her bikini and you, conflicted.'
+		'You stand there, proud of your naked body, and smile at her as she looks between her bikini and you, conflicted.'
 		'"The things that you make me do <<$pcs_nickname>>..."'
 		'With embarrassed resignation, Katja leaves the bikini and stands before you naked. "Now what?"'
 	end
@@ -674,14 +675,14 @@ if $ARGS[0] = 'swim':
 	elseif $clothingworntype = 'nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL4.jpg"></center>'
 		'"Ah! This is nice Katja!"'
-		'Thanks to the privacy enabled by the secluded beach, you can both enjoy the pleasure to swim and have fun in the nude without peeping toms, judgemental prudes or envious "friends" watching. It is just Katja and you.'
-		'The time passes quickly as you both play, enjoying the water and the sun on your skin, and little by little you tire until the only thing you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense waterplay has passed and you are beginning to wrinkle. It is time to look for something else to do.'
+		'Thanks to the privacy enabled by the secluded beach, you can both enjoy the pleasure of swimming and have fun in the nude without peeping toms, judgemental prudes or envious "friends" watching. It is just Katja and you.'
+		'The time passes quickly as you both play, enjoying the water and the sun on your skin, and little by little you tire until the only thing you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense water play has passed and you are beginning to wrinkle. It is time to look for something else to do.'
 
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL5.jpg"></center>'
 		'"Ah! This is nice Katja!"'
 		'"Yes, it is. Sometimes you really just want to be alone with a good friend, without peeping toms, judgemental prudes or envious "friends watching you."'
-		'The time passes quickly as you both play, enjoying the water and the sun, and little by little you tire until the only you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense waterplay has passed and you are beginning to wrinkle. It is time to look for something else to do.'
+		'The time passes quickly as you both play, enjoying the water and the sun, and little by little you tire until the only you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense water play has passed and you are beginning to wrinkle. It is time to look for something else to do.'
 	end
 
 	act 'Tan': gt 'katja_lake','tan'
@@ -709,12 +710,12 @@ if $ARGS[0] = 'tan':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL6.jpg"></center>'
 		'Katja takes out some sunscreen and you make sure that your skin is protected from the UV rays, smearing it all over your naked bodies. After this, you both lie down and relax, letting the warm sun tan your skin without the danger of leaving ugly bikini marks.'
 		'"Hey! <<$pcs_nickname>>! I think it is time."'
-		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of recieving some painful sunburn. It is time to look for something else to do.'
+		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of receiving some painful sunburn. It is time to look for something else to do.'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_tanning_nude.jpg"></center>'
 		'Katja takes out some sunscreen and you make sure that your skin is protected from the UV rays, smearing it all over your bodies. After this, you both lie and relax, letting the warm sun tan your skin.'
 		'"Hey! <<$pcs_nickname>>! I think it is time."'
-		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of recieving some painful sunburn. It is time to look for something else to do.'
+		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of receiving some painful sunburn. It is time to look for something else to do.'
 	end
 	if $clothingworntype = 'nude' and pcs_inhib < 20: inhib_exp += rand(1,2)
 	if $clothingworntype = 'nude' and katjaQW['slut'] <= 20: katjaQW['slut'] += 5
@@ -749,11 +750,11 @@ if $ARGS[0] = 'walk':
 		gt 'katja_lake','ivan_appeared'
 	elseif $clothingworntype = 'nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL7.jpg"></center>'
-		'The secluded beach has, between other things a beautiful landscape. Strange in these industrialized areas, but a place where you can take a relaxing walk, a naked walk where the naturally hidden paths let you enjoy the wind without startling the locals.'
+		'The secluded beach has, among other things a beautiful landscape. Strange in these industrialized areas, but a place where you can take a relaxing walk, a naked walk where the naturally hidden paths let you enjoy the wind without startling the locals.'
 		 'After some girl talk, singing to the birds and feeding the squirrels, you realize that half an hour has passed and it is time to look for something else to do.'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL8.jpg"></center>'
-		'The secluded beach has, between other things a beautiful landscape. Strange in these industrialized areas, but a place where you can take a relaxing walk and enjoy your mutual company under a beautiful sky.'
+		'The secluded beach has, among other things a beautiful landscape. Strange in these industrialized areas, but a place where you can take a relaxing walk and enjoy your mutual company under a beautiful sky.'
 		'After some girl talk, singing to the birds and feeding the squirrels, you realize that half an hour has passed and it is time to look for something else to do.'
 	end
 
@@ -793,10 +794,10 @@ if $ARGS[0] = 'ivan_appeared':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL9.jpg"></center>'
 			'Katja isn''t exactly an exhibitionist, so it is probably better to not embarrass her, so... that is what you do. You quickly dive into the water and hide beside Katja, waiting for the jock to go away.'
 			'"Please <<$pcs_nickname>>! Don''t do anything stupid!"'
-			'You want to retort that, when you appreciate Ivan looking towards you. He doesn''t say anything, just giving a little acknowledgment before quickly, maybe too quickly, returning to the water.'
+			'You want to retort that when you appreciate Ivan looking towards you. He doesn''t say anything, just giving a little acknowledgment before quickly, maybe too quickly, returning to the water.'
 			'"Oh fuck! <<$pcs_nickname>>, do you think he seen us?"'
 			'"I... don''t know. Maybe?"'
-			'Katja obviously isn''t happy with your answer and sits there redfaced. After a few more awkward moments, you finally realize that Ivan has left the area, and it is safe to leave the water.'
+			'Katja obviously isn''t happy with your answer and sits there red-faced. After a few more awkward moments, you finally realize that Ivan has left the area, and it is safe to leave the water.'
 			minut += 5
 			katjaQW['slut'] -= 5
 			katjaQW['horny'] -= 5
@@ -896,7 +897,7 @@ if $ARGS[0] = 'ivan_interaction':
 			minut += 10  
 			gs 'stat'
 			'Talking with Ivan, King of the Lone Wolves, is an uphill battle. He is evidently not interested in the sort of things Katja likes to talk about and would probably prefer to jump back into his swimming. Alas, Ivan is too polite to just tell you to fuck off, and that is a weakness you and Katja can exploit.'
-			'After some pestering, Ivan finally resigns to sit with you and pass time in "civilized" conversation. The minutes pass, with him primarily listening to your endless rants, but after a while, between Katja''s shyness and Ivan''s apathy, silence falls over the three of you, leaving your little trio observing the lake in tranquillity.'
+			'After some pestering, Ivan finally resigns to sit with you and pass the time in "civilized" conversation. The minutes pass, with him primarily listening to your endless rants, but after a while, between Katja''s shyness and Ivan''s apathy, silence falls over the three of you, leaving your little trio observing the lake in tranquillity.'
 			'"Ehm... Girls, I must return to my training."'
 			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'			
 		end
@@ -926,12 +927,12 @@ if $ARGS[0] = 'ivan_interaction':
 						'Katja looks transfixed by Ivan''s <<dick>>cm <<$dick_girth>> cock. This must be the first time that she has seen something like this and seems insecure about what to do. To help her, Ivan extends his hands and tries to grab Katja''s head, but before he reaches her, you slap his hand.'
 						'"No way Ivan! Remember when you tried that with me in the showers?"'
 						'He has the decency to grimace and look apologetic, then lies down and lets Katja take her time, and for some time, she just observes his cock. She then closes her eyes and begins to lick him... again and again, gaining confidence until she finally opens her lips and plunges the cock in her mouth.'
-						'With your help, Katja begins to go up and down in an out of sync rhythm, sometimes gaging and others, from Ivan''s face, biting the tender flesh. However, he is, without doubt, enjoying the blowjob and begins to raise his hands again, but just when you are going to stop him, Katja slap your hand. She wants to do this.'
+						'With your help, Katja begins to go up and down in an out-of-sync rhythm, sometimes gaging and others, from Ivan''s face, biting the tender flesh. However, he is, without a doubt, enjoying the blowjob and begins to raise his hands again, but just when you are going to stop him, Katja slaps your hand. She wants to do this.'
 					else
 						'Katja and you caress Ivan''s <<dick>>cm <<$dick_girth>> cock, masturbating the jock and getting grunts of pleasure as he let you both take control. Katja licks her dry lips and looks at you with questioning eyes. She seems to want to do this.'
 						'"Ok Katja, I think it is your turn."'
 						'You sit confidently on Ivan''s chest and hold his dick for Katja, who sits over his legs closes her eyes and bends to swallow the jock''s cock. His moans are a pleasure indicator as Katja''s wet mouth closes over his sensitive flesh'
-						'Katja takes her time and seems to enjoy the blowjob as much as Ivan, who just grunts as the girl''s head goes up and down along his dick, covering the trembling shaft with her saliva. Katja puts all her heart into given the jock a time to remember, but soon Ivan extends his hands and grabs Katja''s head.'
+						'Katja takes her time and seems to enjoy the blowjob as much as Ivan, who just grunts as the girl''s head goes up and down along his dick, covering the trembling shaft with her saliva. Katja puts all her heart into giving the jock a time to remember, but soon Ivan extends his hands and grabs Katja''s head.'
 					end
 
 					act 'Katja gives him some deep throat.':
@@ -946,7 +947,7 @@ if $ARGS[0] = 'ivan_interaction':
 							'"Cough! Ugh! Oh shit! I... am sorry... Cough... Ivan!"'
 							'The jock caresses her hair to calm the apologetic girl as he eyes your angry face, before helping the redhead to her feet and bending her over a bench.'
 						else
-							'Ivan makes Katja sit and he stands to put his <<dick>>cm <<$dick_girth>> cock before her face, the girl looking intensely the length before her. In the meantime, you sit by her side and caress her back.'
+							'Ivan makes Katja sit and he stands to put his <<dick>>cm <<$dick_girth>> cock before her face, the girl looking intensely at the length before her. In the meantime, you sit by her side and caress her back.'
 							'"Don''t worry Katja, he isn''t going to hurt you. Are you, IVAN?"'
 							'He grimaces and delicately grabs the redhead''s mane, pushing his cock against Katja''s lips, which part and let the cock slide into her throat. You grab Ivan so he doesn''t push with too much force, and the redhead begin to take the jock''s cock in earnest.'
 							'"Oh fuck! Katja! You girls are amazing!"'
@@ -996,8 +997,8 @@ if $ARGS[0] = 'ivan_interaction':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KIS3.jpg"></center>'
 								'Ivan grunts and moans as he relentlessly drills Katja''s ass with his <<dick>>cm <<$dick_girth>> cock and you can only marvel at the jock''s incredible stamina, but eventually, the spit used to lubricate Katja''s sweet anus dries and painful sounds escape from the poor girl. You then redouble your effort to make the girl cum, and soon, Katja gives out a pleasured cry as her body shakes in orgasmic bliss.'
 								'"Yes! <<$pcs_nickname>>! Ivan! Yes"'
-								'She falls sprawled over the bench, but sadly, Ivan isn''t near release and there is only a thing to do. You bend and open your mouth at the same time the jock extracts his cock from Katja.'
-								'"Open your mouth baby!"'
+								'She falls sprawled over the bench, but sadly, Ivan isn''t near release and there is only one thing to do. You bend and open your mouth at the same time the jock extracts his cock from Katja.'
+								'"Open your mouth, baby!"'
 								'You don''t think, only react, and immediately begin to suck, lick and jerk his cock at the sound of Ivan''s pleasured moans. Even with that, it takes you several minutes to make him cum, giving you a mouthful of sperm that can barely be contained, and it spills out over Katja''s sore anus.'
 
 								act 'Afterglow':
@@ -1043,10 +1044,10 @@ if $ARGS[0] = 'ivan_interaction':
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KIS4.jpg"></center>'
-					'You and Katja caress Ivan''s <<dick>>cm <<$dick_girth>> cock, masturbating the jock. He lets out grunts of pleasure as he let you both take control. Slowly you grow bold in your competition and begin to lick his dick.'
+					'You and Katja caress Ivan''s <<dick>>cm <<$dick_girth>> cock, masturbating the jock. He lets out grunts of pleasure as he let''s you both take control. Slowly you grow bold in your competition and begin to lick his dick.'
 					'"Ok Katja, I think it is my turn."'
-					'Ivan sits back in a chair and relaxes, waiting for you. His glans is soon inside your mouth, covered in warm spit, with Katja joining your demonstration, giving him long licks along his length. Soon the room is filled with the sound of moaning.'
-					'You get lost in the moment as the cock enters and exits your mouth in a rhythmic cadence, accompanied by the occasional kiss coming from Katja, who is engrossed on her own endeavor, giving Ivan the time of his life.'
+					'Ivan sits back in a chair and relaxes, waiting for you. His length is soon inside your mouth, covered in warm spit, with Katja joining your demonstration, giving him long licks along his length. Soon the room is filled with the sound of moaning.'
+					'You get lost in the moment as the cock enters and exits your mouth in a rhythmic cadence, accompanied by the occasional kiss coming from Katja, who is engrossed in her own endeavor, giving Ivan the time of his life.'
 					'"Open your mouth <<$pcs_nickname>>."'
 
 					act 'You give him some deep throat.':
@@ -1060,7 +1061,7 @@ if $ARGS[0] = 'ivan_interaction':
 							'You are so engrossed in the act, that your brain is unable to discern who has spoken, only that a pair of hands close over your head... and push, causing Ivan''s <<dick>>cm <<$dick_girth>> cock fill your mouth and reach your tonsils.'
 							'Trying to resist the sudden invasion, you slap Ivan''s legs who immediately releases his grip, making you fall back.'
 							'"Cough! What the... Cough... Fuck! Ivan what are you... Hm?!"'
-							'The jock seems apprehensive and look sideways to Katja, that is smiling... sheepishly? It was her? The three of you sit in silence, not knowing how to react.'
+							'The jock seems apprehensive and looks sideways to Katja, that is smiling... sheepishly? It was her? The three of you sit in silence, not knowing how to react.'
 							'"Ehm... girls. I don''t how to say this, but... ehm... I have a problem."'
 							'Ivan''s words snap you from the sudden impasse, and after looking at his erection, you stand and bend invitingly over a nearby chair.'
 						else
@@ -1092,7 +1093,7 @@ if $ARGS[0] = 'ivan_interaction':
 							else
 								'Ivan doesn''t waste time and positions himself at your backdoor, but stops and waits for Katja to separate your buttocks then looks at you, waiting for a signal. You lick your lips and look at him sultrily.'
 								'"What are you waiting for Ivan? Are you worried about hurting me?"'
-								'He smiles, kisses your backside and pushes slowly, forcing his cock into your ass, shooting pleasant pain up your back. He isn''t alone, however, as Katja begins making out with the two of you and somehow managing to slide a hand down your belly to your nethers.'
+								'He smiles, kisses your backside and pushes slowly, forcing his cock into your ass, shooting pleasant pain up your back. He isn''t alone, however, as Katja begins making out with the two of you and somehow manages to slide a hand down your belly to your nethers.'
 								'"Oh fuck! Girls! You are amazing!"'
 								'You barely heard him, too preoccupied about Katja''s tongue playing in your mouth and the pleasure that her fingering of your cunt, combined with Ivan''s endless pounding of your asshole, overwhelm you in pleasure.'
 							end
@@ -1106,7 +1107,7 @@ if $ARGS[0] = 'ivan_interaction':
 								'Ivan grunts and moans as he relentlessly drills you with his <<dick>>cm <<$dick_girth>> cock in an amazing show of stamina, but eventually, the spit used to lubricate your little hole dries and painful sounds escape your mouth. Katja catches the message and redoubles her effort in making you cum and soon, a throaty moan escapes your mouth as the combined sensations make you cum.'
 								'"Yes! Katja! Ivan! Yes"'
 								'You fall sprawled over the chair, but sadly, Ivan isn''t near release and there is only one thing to do. You and Katja kneel before the jock, a grunt on your lips as the sudden movement leaves a cold void inside you, and proceed to give Ivan some well-deserved head.'
-								'"Open your mouth baby!"'
+								'"Open your mouth, baby!"'
 								'You don''t think, only react, and immediately the two of you begin to suck, lick and jerk his cock at the sound of Ivan''s pleasured moans. Even with that, it takes you several minutes to make him cum, giving you a mouthful of sperm that can barely be contained, and it spills down onto your breasts.'
 
 								act 'Afterglow':
@@ -1167,7 +1168,7 @@ if $ARGS[0] = 'saune_time':
 		if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20 and katjaQW['QWstage'] > 2 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] < 2:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you nor Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
 			'"Oh yes <<$pcs_nickname>> this hits the spot!"'
-			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, but as the time pass, you observe some details on the redhead. She seems unable to sit still, bites her lips and gives you longing gazes. It''s undeniable that she is horny, so... what to do? Have some semi-public hot and steamy sex or let the ginger cook in her own sauce until you reach a better place?'
+			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and doing some rumourmongering, but as time passes, you observe some details on the redhead. She seems unable to sit still, bites her lips and gives you longing gazes. It''s undeniable that she is horny, so... what to do? Have some semi-public hot and steamy sex or let the ginger cook in her own sauce until you reach a better place?'
 
 			gs 'willpower', 'sex', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -1200,9 +1201,9 @@ if $ARGS[0] = 'saune_time':
 		elseif katjaQW['slut'] >= 20:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you nor Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
 			'"Oh yes <<$pcs_nickname>> this hits the spot!"'
-			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, making the time pass quickly.'
+			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and doing some rumourmongering, making the time pass quickly.'
 			'"Ok <<$pcs_nickname>>. I think that this is enough."'
-			'Blinking surprised, you look the time. Yes, half an hour has passed, more than enough for your skin treatment.'
+			'Blinking surprised, you look at the time. Yes, half an hour has passed, more than enough for your skin treatment.'
 
 			if month >11 or month <3:
 				gs 'willpower', 'misc', 'force', 'easy'
@@ -1225,11 +1226,11 @@ if $ARGS[0] = 'saune_time':
 			'"Hey! What are you doing? This isn''t funny!"'
 			'Smiling, you look at her, ogling the petite doll-like ginger that is desperately trying to cover her body.'
 			'"No Katja! This is going to be better for your skin! So... let it go!"'
-			'Without expecting a reply from the angry girl, you exit the lockers. She stands there a moment before reluctantly following you, and after waiting for your turn, enter the sauna.'
+			'You leave the locker room without expecting a response from the angry girl. She hesitates for a moment, clearly torn, before deciding to join you. The two of you enter the sauna after waiting for your turn.'
 			'"Oh yes Katja this hits the spot!"'
-			'At the beginning, she is angry, but after some time in the relaxing atmosphere, you begin to talk and Katja returns to her more normal demeanor, talking about your problems and doing some rumourmongering, making the time pass quickly.'
+			'At the beginning, she is angry, but after some time in the relaxing atmosphere, you begin to talk and Katja returns to her normal demeanor, talking about your problems and doing some rumourmongering, making the time pass quickly.'
 			'"Ok, <<$pcs_nickname>>. I think that this is enough."'
-			'Blinking surprised, you look the time. Yes, half an hour has passed, more than enough for your skin treatment.'
+			'Blinking surprised, you look at the time. Yes, half an hour has passed, more than enough for your skin treatment.'
 
 			if month >11 or month <3:
 				gs 'willpower', 'misc', 'force', 'easy'
@@ -1251,11 +1252,11 @@ if $ARGS[0] = 'saune_time':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS7.jpg"></center>'
-		'You both change in the lockers, and after waiting for your turn, enter the sauna. There you sit, the hot and humid air helping to smoothen your precious skins.'
+		'You both change in the lockers and after waiting for your turn, enter the sauna. There you sit, the hot and humid air helping to smoothen your precious skin.'
 		'"Oh yes <<$pcs_nickname>> this hits the spot!"'
-		'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, making the time pass quickly.'
+		'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and doing some rumourmongering, making the time pass quickly.'
 		'"Ok <<$pcs_nickname>>. I think that this is enough."'
-		'Blinking surprised, you look the time. Yes, half an hour has passed, more than enough for your skin treatment. After taking a quick shower, you redress and leave. It is time to look for something else to do.'
+		'Blinking surprised, you look at the time. Yes, half an hour has passed, more than enough for your skin treatment. After taking a quick shower, you redress and leave. It is time to look for something else to do.'
 
 		if month >11 or month <3:
 			gs 'willpower', 'misc', 'force', 'easy'
@@ -1316,13 +1317,13 @@ if $ARGS[0] = 'sauna_sex1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS9.jpg"></center>'
 
 	if KatjaQW['dom'] > 30:
-		'There is a tense silence as you both realize what is going to happen. Finally, the tension is broken when Katja smile cutely, sits up straight and opens her legs invitingly.'
-		'"Come on <<$pcs_nickname>>. What are you waiting?"'
+		'There is a tense silence as you both realize what is going to happen. Finally, the tension is broken when Katja smiles cutely, sits up straight and opens her legs invitingly.'
+		'"Come on <<$pcs_nickname>>. What are you waiting for?"'
 		'She manages to sound utterly innocent and you, charmed by the slutty redhead, rise without hesitation, consumed by your need to love this cute little thing. Katja isn''t passive and as soon as you are within reach, she grabs a handful of your hair and forces a kiss on your lips.'
 		'"Dammit Katja! Why are you so cute?"'
 		'She giggles in your mouth, and obediently, your hand reaches for her inner thighs, looking to penetrate the warm petals that hide between them. Warmth and wetness greet your fingers and soon, you are masturbating the redhead, caressing her quickly engorging clit.'
 		'"<<$pcs_nickname>>... I want more"'
-		'She huskily whispers into your ear, and siezing her hands over your shoulders, tries to make you kneel.'
+		'She huskily whispers into your ear, her hands gripping your shoulders as she tries to make you kneel.'
 
 		act 'Eat her':
 			menu_off = 1
@@ -1353,11 +1354,11 @@ if $ARGS[0] = 'sauna_sex1':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 				'"You want more Katja? Ok, but first..."'
-				'You rise and caress Katja''s red mane as she looks consumed by her arousal and, understanding the statement, obediently rises from the bench and kneels so you can sit on her place. She bites her lips, transfixed by the need to play with your nether.'
-				'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
-				'Katja pushes your legs so she has easy access to your pussy, and after a sigh, begins to give you little amorous kisses all over your thighs. You sit back and try to relax, biting your lips as the burning sensation in your core only gets stronger with Katja''s slow performance.'
-				'"Katja! Just... Fuck! Use your tongue!"'
-				'The redhead obeys your command and licks your cunt passionately, her cold tongue making your body tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act taking place within, but is not enough. You grab Katja by the hair and make her kiss you.'
+				'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
+				'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
+				'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
+				'"Katja! Just... Fuck! Use your tongue!"' 
+				'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 
 				act 'You devour each other':gt 'katja_lake','sauna_sex2'
 
@@ -1372,7 +1373,7 @@ if $ARGS[0] = 'sauna_sex1':
 		'"Dammit Katja! Why are you so cute?"'
 		'As you approach her inner thighs, she gives a startled moan, and instinctively closes her legs, but you aren''t going to be denied and force your hand in, looking to penetrate the warm petals that hide between them. Warmth and wetness greet your fingers and soon, you are masturbating the redhead, who has forgetten her reservations and opened the legs so you can caress her quickly engorging clit.'
 		'"<<$pcs_nickname>>... I want... I mean..."'
-		'Katja bites her lips and looks at you with deseperate need. What are you going to do?'
+		'Katja bites her lips and looks at you with desperate need. What are you going to do?'
 
 		act 'Eat her':
 			menu_off = 1
@@ -1397,12 +1398,11 @@ if $ARGS[0] = 'sauna_sex1':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 			'"You want more Katja? Ok, but first..."'
-			'You rise and caress Katja''s red mane as she looks consumed by her arousal and, understanding the statement, obediently rises from the bench and kneels so you can sit on her place. She bites her lips, transfixed by the need to play with your nether.'
-			'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
-			'Katja pushes your legs so she has easy access to your pussy, and after a sigh, begins to give you little amorous kisses all over your thighs. You sit back and try to relax, biting your lips as the burning sensation in your core only gets stronger with Katja''s slow performance.'
-			'"Katja! Just... Fuck! Use your tongue!"'
-			'The redhead obeys your command and licks your cunt passionately, her cold tongue making your body tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act taking place within, but is not enough. You grab Katja by the hair and make her kiss you.'
-
+			'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
+			'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
+			'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
+			'"Katja! Just... Fuck! Use your tongue!"' 
+			'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 			act 'You devour each other':gt 'katja_lake','sauna_sex2'
 		end
 	end

+ 296 - 551
locations/katja_nightclub.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'dance_guy_approach':
 		'As you approach her, she notices you and demonstrably drags the guy she is dancing with away from you. She clearly doesn''t want anything to do with you.'
 		act 'Leave them': gt 'city_nightclub', 'dance'
 	else
-		if rand(0,0) = 0:
+		if rand(0,1) = 0:
 			if katjaQW['disco_arrival'] + 600 > totminut and katjaQW['disco_met'] + 600 > totminut: katjaQW['disco_met'] = totminut & gs 'npc_relationship', 'modify', 'A14', 'like'
 			'As you approach her, you notice that the guy she is dancing with is wearing expensive clothes. She notices you and waves you over to come join them.'
 			act 'Join them': gt 'katja_nightclub', 'dance_guy2'
@@ -250,11 +250,11 @@ if $ARGS[0] = 'dance_guy_approach':
 						katjaQW['nightclub_private_room_boy'] = 1
 						katjaQW['disco_loc'] = 7
 						katjaQW['disco_check_time'] = totminut
-						'By the end of the dance, he grabs her and leans in for a kiss and she fully kisses him back. Afterwards, he whispers something in her ear and she nods, then he takes her hand and leads her towards the private rooms.'
+						'By the end of the dance, he grabs her and leans in for a kiss and she fully kisses him back. Afterward, he whispers something in her ear and she nods, then he takes her hand and leads her towards the private rooms.'
 						!!act 'Follow them to see what happens':
 						act 'Leave them': gt 'city_nightclub', 'dance'
 					else
-						'By the end of the dance, he grabs her and leans in for a kiss but she just gives him a quick peck on the cheek and gets herself out from his grip. She thanks him for the dance before dancing away, leaving him standing there looking very letdown.'
+						'By the end of the dance, he grabs her and leans in for a kiss but she just gives him a quick peck on the cheek and gets herself out of his grip. She thanks him for the dance before dancing away, leaving him standing there looking very letdown.'
 						act 'Go to Katja': gt 'katja_nightclub', 'dance_approach'
 						act 'Leave her': gt 'city_nightclub', 'dance'							
 					end
@@ -274,7 +274,65 @@ if $ARGS[0] = 'dance_girl_approach':
 end
 
 if $ARGS[0] = 'dance_two_guys_approach':
-
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_katja_guy<<rand(1,2)>>.jpg"></center>'
+	if npc_rel['A14'] <= 20:
+		if katjaQW['disco_arrival'] + 600 > totminut and katjaQW['disco_met'] + 600 > totminut: katjaQW['disco_met'] = totminut & gs 'npc_relationship', 'modify', 'A14', 'like'
+		'As you approach her, she notices you and demonstrably drags the guys she is dancing with away from you. She clearly doesn''t want anything to do with you.'
+		act 'Leave them': gt 'city_nightclub', 'dance'
+	else
+		if rand(0,0) = 1:
+			if katjaQW['disco_arrival'] + 600 > totminut and katjaQW['disco_met'] + 600 > totminut: katjaQW['disco_met'] = totminut & gs 'npc_relationship', 'modify', 'A14', 'like'
+			'As you approach her, you notice that the men she is dancing with are wearing expensive clothes. She notices you and waves you over to come join them.'
+			act 'Join them': gt 'katja_nightclub', 'dance_two_guys2'
+			act 'Don''t join them': gs 'npc_relationship', 'modify', 'A14', 'dislike' & gt 'city_nightclub', 'dance'
+		else
+			'As you get near, you can see that Katja is dancing with two men in expensive clothes. She seems to be enjoying it, and they are clearly into her as you notice their hands sometimes touch her body.' 
+			act 'Join them': 
+				cla
+				if katjaQW['disco_arrival'] + 600 > totminut and katjaQW['disco_met'] + 600 > totminut: katjaQW['disco_met'] = totminut & gs 'npc_relationship', 'modify', 'A14', 'like'
+				'You get closer and get the attention of Katja. When she sees you, she motions you to come join them.'
+				act 'Join the dance': gt 'katja_nightclub', 'dance_guy2'
+			end
+			act 'Stay back and see how it goes':
+				cla
+				minut += 15
+				'They continue to dance for a while, and as the dance goes on, the men keep getting closer and closer to her. Their hands start to go from just touching her arms and back to also resting on her bottom.'
+				if func('katja_procedural', 'willing_to_be_naughty') < 75 and katjaQW['liberated'] = 0:
+					'That seems to be too much for her; and when they don''t get the hint after she''s removed their hands from her ass several times, she dances away from him, leaving him alone.'
+					act 'Go to Katja': gt 'katja_nightclub', 'dance_approach'
+					act 'Leave her': gt 'city_nightclub', 'dance'
+				else
+					if katjaQW['simultanous_boys'] < 2 or func('katja_procedural', 'willing_to_be_naughty') < 90 or katjaQW['boy_block'] = 1:
+						katjaqw['horny'] += 10
+						'It seems that Katja can''t decide how to respond to this. She tries at times to move so that their hands will let go. At other times, it seems as though she likes the attention.'
+					else
+						katjaqw['horny'] += 20
+						'Katja clearly enjoys the attention she is getting from the men. She starts to get closer to them as well, almost grinding her body against theirs.'
+					end
+					if (katjaQW['liberated'] = 1 and (katjaQW['simultanous_boys'] = 1 and rand(1,10)) or (katjaQW['simultanous_boys'] > 1 and rand(1,5))) or (katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and rand(1,10) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and rand(1,5) <= (min(katjaQW['horny'], 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and (katjaQW['faithful'] = 0 or katjaQW['cheat_warning'] = 2)):
+						gs 'katja_procedural', 'sex_set', 2
+						if hour > 10:
+							locat['katja_rand2'] = daystart
+						else
+							locat['katja_rand2'] = daystart -1
+						end
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']						
+						'By the end of the dance, leans in and says something to Katja that you can''t hear. '+iif(katjaQW['simultanous_boys'] > 2 and func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQw['horny'] >= 75, 'She immediately eagerly agrees to his proposition.' , 'she seems to consider it for some time and then hesitantly agrees.')+' The three of them then leave the dance floor and head for the exit of the club.'
+						act 'Leave them': gt 'city_nightclub', 'dance'
+					else
+						'By the end of the dance, one of the men grabs her and leans in for a kiss but she just gives him a quick peck on the cheek and gets herself out of his grip. She thanks them for the dance before dancing away, leaving him standing there looking very let-down.'
+						act 'Go to Katja': gt 'katja_nightclub', 'dance_approach'
+						act 'Leave her': gt 'city_nightclub', 'dance'							
+					end
+				end
+			end
+			act 'Leave them': gt 'city_nightclub', 'dance'
+		end
+	end
 end
 
 if $ARGS[0] = 'dance':
@@ -286,24 +344,39 @@ if $ARGS[0] = 'dance':
 	frost = 0
 	gs 'stat'
 	temp_rand = rand(0,20)
-	if temp_rand = 1 and katjaQW['drinks'] < 8:
+	if temp_rand = 1:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on _dance_floor.jpg"></center>'
+		'A song the Katja loves comes on and she starts singing the lyrics, and you join her.'
+		if katjaQW['drinks'] > 8:
+			'She is very drunk and it is basically just her shouting parts of the words very loud.'+iif( alko < 8 or pcs_vokal > 50, ' You at least manage to sing the correct lyrics.', ' But you are not doing any better.')+' At least'+iif( alko < 8, 'she is', 'you are')+' having fun.'
+		elseif katjaQW['drinks'] > 4:
+			'Katja is able to sing the song quite well considering how drunk she is.'+iif(alko < 5 or pcs_vokal > 25, ' You are also able to sing it well enough.', ' She clearly is doing better than you who mixes up the lyrics.')
+		else
+			'Katja clearly knows this song by heart, and sing it very well.'+iif(pcs_vokal > 50, ' But you skills at singing means that you are able to complement her perfectly.', ' YOu clearly is not as good as her at singing this song.')
+		end
+	elseif temp_rand = 2:
 		pcs_stam -= 10
 		gs 'sweat', 'add', 3
 		fat -= 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_wild.jpg"></center>'
 		'A very popular beat comes on, and the crowd goes wild. The dance floor becomes a mass of people moving fast to the rhythm. Dance skill does not matter at the moment, just enthusiasm and stamina.'
-		if katjaQW['drinks'] > 6:
-			iif(alko > 6, 'You and Katja are', 'Katja is')+' having some issues with not bumping into other dancers, not that they seem to be paying any notion to it.'
+		if katjaQW['drinks'] > 8:
+			'Katja is very drunk and is generally just having trouble staying on her feet with all the people bombing into her.'+iif( alko < 8, ' You do your best to not make her fall.', ' You are in the same state and it is a miracle that non of you fall.')
+		elseif katjaQW['drinks'] > 4:
+			iif(alko > 4, 'You and Katja are', 'Katja is')+' having some issues with not bumping into other dancers, not that they seem to be paying any notion to it.'
 		end
 	elseif temp_rand <= hotcat/2:
-		gt 'katja_nightclub', 'dance_guy1'
+		gt 'katja_nightclub', 'dance_guy2'
+	elseif temp_rand <= hotcat:
+		gt 'katja_nightclub', 'dance_guy'
 	elseif temp_rand = 11 and func('katja_procedural', 'willing_to_be_naughty') > 30*(2 -npc_sex['A14']):
 		katjaQW['horny'] += 5
 		gs 'arousal', 'foreplay', -5
 		gs 'arousal', 'end'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_grinding.jpg"></center>'
-		'As you are dancing then Katja turns around and starts doing quite sex sexy dance moves in front of you. As the rhythm allows it she starts to grind be butt into you.'
+		'As you are dancing then Katja turns around and starts doing quite sex sexy dance moves in front of you. As the rhythm allows it she starts to grind her butt into you.'
 		'When the number is over she turns around and dance normally for the next number but with a naughty glint in her eye.'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg"></center>'
@@ -453,7 +526,7 @@ if $ARGS[0] = 'bar_arrive':
 	$menu_arg = 'bar'
 	menu_off = 1
 	gs 'stat'
-	if (hour < 6 or hour > 22) and rand(1,4) = 0 and katjaQW['lone_bartender'] < daystart -1: gt 'katja_nightclub', 'lone_bartender'
+	if (hour < 6 or hour > 22) and rand(1,4) = 0 and katjaQW['lone_bartender'] < daystart -1: gt 'katja_nightclub_sex', 'lone_bartender'
 	katjaQW['disco_loc'] = 2
 	katjaQW['drinks'] += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_bar1.jpg"></center>'
@@ -629,7 +702,7 @@ if $ARGS[0] = 'bar_after_drink':
 								if katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] < 2 and katjaQW['horny'] > rand(40,60):
 									'You and Katja both end up agreeing at the same time, which causes her to giggle. You''re not sure if it''s because of the awkwardness of the two of you speaking at the same time or the eagerness both of you showed to his proposal.'
 									'"Great. Follow me, my ladies," he says and leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-									act 'Go with him': gt 'katja_nightclub', 'private_room1'
+									act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 								else
 									'"Sure," you answer.'
 									'However, Katja grabs your shoulder and whispers in you ear, "I''m not going with him. If you want to, you can go ahead, but I''m staying here."'
@@ -660,7 +733,7 @@ if $ARGS[0] = 'bar_after_drink':
 										katjaQW['doem'] += rand(1,2)
 										'"Well, if you want to, Katja," you say.'
 										'His face lights up. "Great! Follow me, my ladies." He leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-										act 'Go with him': gt 'katja_nightclub', 'private_room1'
+										act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 									end
 									act 'Try to convince Katja to stay':
 										*clr & cla
@@ -695,7 +768,7 @@ if $ARGS[0] = 'bar_after_drink':
 											katjaQW['doem'] += rand(1,2)
 											'"Well, if you really want to, Katja," you say.'
 											'His face lights up. "Great! Follow me, my ladies." He leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-											act 'Go with him': gt 'katja_nightclub', 'private_room1'
+											act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 										end
 										act 'Let Katja go with guy, but stay at the bar':
 											katjaQW['nightclub_private_room_boy'] = 1
@@ -763,7 +836,7 @@ if $ARGS[0] = 'bar_after_drink':
 								if katjaQW['horny'] > rand(40,60):
 									'You and Katja both end up agreeing at the same time, which causes her to giggle. You''re not sure if it''s because of the awkwardness of the two of you speaking at the same time or the eagerness both of you showed to his proposal.'
 									'"Great. Follow me, my ladies," he says and leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-									act 'Go with him': gt 'katja_nightclub', 'private_room1'
+									act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 								else
 									'"Sure," you answer.'
 									'However, Katja grabs your shoulder and whispers in you ear, "I''m not going with him. If you want to, you can go ahead, but I''m staying here."'
@@ -794,7 +867,7 @@ if $ARGS[0] = 'bar_after_drink':
 										katjaQW['doem'] += rand(1,2)
 										'"Well, if you want to, Katja," you say.'
 										'His face lights up. "Great! Follow me, my ladies." He leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-										act 'Go with him': gt 'katja_nightclub', 'private_room1'
+										act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 									end
 									act 'Try to convince Katja to stay':
 										*clr & cla
@@ -829,7 +902,7 @@ if $ARGS[0] = 'bar_after_drink':
 											katjaQW['doem'] += rand(1,2)
 											'"Well, if you really want to, Katja," you say.'
 											'His face lights up. "Great! Follow me, my ladies." He leads you to a private room, the bouncer seems to know him and just opens the door for you.'
-											act 'Go with him': gt 'katja_nightclub', 'private_room1'
+											act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 										end
 										act 'Let Katja go with him, while you stay at the bar':
 											katjaQW['nightclub_private_room_boy'] = 1
@@ -997,7 +1070,7 @@ if $ARGS[0] = 'dance_guy3':
 				cla
 				gs 'arousal', 'end'
 				gs 'stat'
-				'"Thanks, but no thanks. We need to get going," you says, and looking at Katja, she seems to be fine with this. He''s clearly not satisfied with your reply, it but doesn''t try to keep you.'
+				'"Thanks, but no thanks. We need to get going," you says, and looking at Katja, she seems to be fine with this. He''s clearly not satisfied with your reply, but he doesn''t try to keep you.'
 				gs 'katja_nightclub', 'dance_end'
 			end
 		else
@@ -1018,7 +1091,7 @@ if $ARGS[0] = 'dance_guy3':
 						if katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0 and katjaQW['horny'] > rand(40,60):
 							'You and Katja both end up agreeing at the same time, which causes her to giggle. You''re not sure if it''s because of the awkwardness of the two of you speaking at the same time or the eagerness both of you showed to his proposal.'
 							'"Great! Follow me, my ladies," he says and leads you to a private room. The bouncer seems to know him and just opens the curtain for you.'
-							act 'Go with him': gt 'katja_nightclub', 'private_room1'
+							act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 						else
 							'"Sure," you answer.'
 							'However, Katja grabs your shoulder and whispers in you ear, "I''m not going with him. If you want to, you can go ahead, but I''m staying here."'		
@@ -1050,7 +1123,7 @@ if $ARGS[0] = 'dance_guy3':
 								katjaQW['dom'] += rand(1,2)
 								'"Well, if you want to, Katja," you say.'
 								'His face lights up. "Great! Follow me, my ladies." He leads you to a private room. The bouncer seems to know him and just opens the door for you.'
-								act 'Go with the guy': gt 'katja_nightclub', 'private_room1'
+								act 'Go with the guy': gt 'katja_nightclub_sex', 'private_room1'
 							end
 							act 'Try to convince Katja to stay':
 								*clr & cla
@@ -1086,7 +1159,7 @@ if $ARGS[0] = 'dance_guy3':
 								katjaQW['dom'] += rand(1,2)
 								'"Well, if you really want to, Katja" you say.'
 								'His face lights up. "Great! Follow me, my ladies." He leads you to a private room. The bouncer seems to know him and just opens the curtain for you.'
-								act 'Go with him': gt 'katja_nightclub', 'private_room1'
+								act 'Go with him': gt 'katja_nightclub_sex', 'private_room1'
 							end
 							if katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0:
 								act 'Let Katja go with him, while you stay on the dance floor':
@@ -1143,7 +1216,7 @@ if $ARGS[0] = 'dance_guy3':
 									minut += 10
 									'"I know you want his cock. Just imagine it sliding in and out of your tight, wet pussy," you whisper in her ear and you can her start squirming.'
 									'"OK. Let''s go," she finally says out loud and the guy''s face lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-									act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy.' 	
+									act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy' 	
 								end
 							else
 								act 'Push her a little more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1190,7 +1263,7 @@ if $ARGS[0] = 'dance_guy3':
 							locat['katja_save2'] = 54
 							locat['katja'] = locat['katja_save2']
 							'"I just hope you are man enough to really entertain a couple of hot girls like us. Let''s go," you say, trying to sound as seductive as Katja. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy.'
+							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy'
 						end
 						act 'Tell Katja that you don''t want to go home with him':
 							*clr & cla
@@ -1233,7 +1306,7 @@ if $ARGS[0] = 'dance_guy3':
 								katjaQW['dom'] += rand(1,2)
 								'"Well, if you really want to, Katja," you say.'
 								'His face lights up. "Great! Follow me, my ladies," and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-								act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy.'
+								act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy'
 							end
 							if katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0:
 								act 'Let Katja go home with him, but stay at the club':
@@ -1266,7 +1339,7 @@ if $ARGS[0] = 'dance_guy3':
 							locat['katja_save2'] = 54
 							locat['katja'] = locat['katja_save2']
 							'"That does sound like fun. Let''s go," you say and his face lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy.' 
+							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_a_guy' 
 						end
 						act 'Say no thanks':
 							cla
@@ -1283,574 +1356,246 @@ if $ARGS[0] = 'dance_guy3':
 	end
 end
 
-if $ARGS[0] = 'private_room1':
-	menu_off = 1
-	minut += 10
-	gs 'npcgeneratec', 0, '', rand(18,55), 4
-	gs 'boystat', $npclastgenerated
-	gs 'beverage', 'only_stat_bev_cocktail'
-	katjaQW['drinks'] += rand(1,2)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
-	'The room has couches and a table, and as you sit down, he tells you that he has already ordered drinks for you. He then introduces himself as <<$npc_nickname[$npclastgenerated]>> and asks for your names.'
-	'The cocktails arrives before you and Katja finish your introduction, and you start sipping your drinks while you continue to talk.'
-	if rand(0,3) = 0:
-		if katjaQW['coke_stage'] = -1:
-			'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
-			'"That''s it. I''m out of here," Katja says and gets up and leaves abruptly.'
-			'<<$npc_nickname[$npclastgenerated]>> looks confused. "What was that about?" he asks.'
-			'"My friend has had an addiction problem. She''s over it now, but tries to avoid drugs because of that," you explain. "I''m very sorry, but I need to check up on my friend," you say and leave <<$npc_nickname[$npclastgenerated]>>.'
-			act 'Find Katja':
-				*clr & cla
-				minut += 10
+if $ARGS[0] = 'dance_two_guys1':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg"></center>'
+	'Tow men approaches you and Katja and it''s clear that they wants to join you two dancing. They rather good looking and wearing nice clothes.'
+	act 'Let them join you': gt 'katja_nightclub', 'dance_two_guys2'
+	act 'Don''t let them join':
+		cla
+		'You make sure to let them know that you don''t want them to join your dance, and you and Katja continue dancing alone having a lot of fun.'
+		gs 'katja_nightclub', 'dance_end'
+	end
+end
+
+if $ARGS[0] = 'dance_two_guys2':
+	if hotcat < rand(5,12):
+		minut += 15
+		pcs_stam -= 5
+		gs 'sweat', 'add', 3
+		fat -= 1
+		gs 'exp_gain', 'danc', 1
+		frost = 0
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_extra_guy1.jpg"></center>'
+		'You dance through several songs, and while they are '+iif(rand(0,1) = 0, 'good', 'terrible')+' dancers, they never tries to get too close to either of you nor Katja. In fact, whenever you try to get closer to one of them, he always distances himself.'
+		'After some time, they thanks you for the dance and excuse themself.'
+		'"Well, seems they weren''t that into us," Katja says with a smile.'
+		gs 'katja_nightclub', 'dance_end'
+	else
+		gt 'katja_nightclub', 'dance_two_guys3'
+	end
+end
+
+if $ARGS[0] = 'dance_two_guys3':
+	minut += 15
+	pcs_stam -= 5
+	gs 'sweat', 'add', 3
+	fat -= 1
+	gs 'exp_gain', 'danc', 1
+	frost = 0
+	gs 'arousal', 'foreplay', rand(-5,0) 
+	katjaQW['horny'] += rand(0,10)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_extra_guy1.jpg"></center>'
+	'You dance through several songs, and they are clearly into you and and Katja. One of them dances quite close to you and, from time to time, his hand moves from your back to your ass.'
+	if hotcat < rand(0,12):
+		gs 'arousal', 'end'
+		gs 'stat'
+		'After some time, he thanks you for the dance and excuses himself. He then go to his friend that is dancing with Katja and says something you can''t hear.'+iif(rand(0,2)=0, ' His friend just nods and then also', ' He seems not to agree with his friend, but after some back and forth he relents and')+' thanks Katja for the dance and they leave.' 
+		'"Well, seems they weren''t that into us, after all," Katja says with a smile.'
+		gs 'katja_nightclub', 'dance_end'
+	else
+		gs 'stat'
+		if rand(0,3) = 0:
+			'"This is great," he says after you have danced for a while. "Let''s keep dancing," he says, looking at Katja and her partner it seems they are also ready to dance some more.'  
+			act 'Keep dancing with them': gt 'katja_nightclub', 'dance_two_guys3'
+			act 'Find something else to do':
+				cla
+				gs 'arousal', 'end'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You leave the private rooms and find Katja just on the edge of the dance floor with tears in her eyes. "I''m sorry, Sveta. But the sight of the drugs just brought up all these feelings in me that I couldn''t control," Katja says and starts crying.'
-				'"There there, no need to hold it in. Let it all out," you say as you hug Katja. She hugs you back and you just stand there for some time until Katja finishes crying.'
-				'"Let''s dance," you say and drag her to the dance floor.'
-				'Soon, the dancing makes her forget the bad experience and, after a few minutes, she is her normal, happy self again.' 
+				'"Thanks, but no thanks. We need to get going," you says, and looking at Katja, she seems to be fine with this. They''re clearly not satisfied with your reply, but they doesn''t try to keep you.'
 				gs 'katja_nightclub', 'dance_end'
 			end
 		else
-			act 'Enjoy your drinks':
-				*clr & cla
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_guy_coke.jpg"></center>'
-				'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
-				if katjaQW['coke_stage'] = 0:
-					'Katja looks confused at first, she''s not really sure what it is. But as he pours some of the powder on the table and makes several lines, she seems to realize what''s going on and starts to look surprised and then skeptical.'
-					'"I''ll go first, if you ladies don''t mind," he says. And as he sniffs the first line, Katja look starts to change to curious. After he finishes, he looks around. "Who''s next?" he asks and he holds out the tube he used to sniff the cocaine.' 
-					gs 'willpower', 'drugs', 'resist'
-					if will_cost <= pcs_willpwr:
-						act 'Say no to the drugs (<<will_cost>> Willpower)':
-							cla
-							minut += 2
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'										
-							'"Thanks, but that''s not for me," you say, and Katja quickly and vehemently shakes her head when he tries to hand the tube to her.'
-							'"Well, more for me then," he says and does a couple more lines before packing away the drugs.'
-							act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1
-						end
-					else
-						act 'Say no to the drugs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-					act 'Do some lines':
+			'After some time, he gets you and Katja so close you both can hear him and he suggests that the four of you continue the party at his place which is close by, making it very clear that him and his friend is expecting the bedroom to be the main location of the party.'
+			if katjaQW['QWstage'] < 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (50,100):
+				'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
+				if katjaQW['QWstage'] > 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
+					+iif(katjaQW['simultanous_boys'] <2, 'She then leans into you and whisper "I''ve never been with two guys at once."', '')
+					act 'Try to convince Katja to go with him':
 						*clr & cla
-						minut += 5
-						dur += 1
-						gs 'drugs', 'cocaine'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
-						'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
-						'After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
-						if func('katja_procedural', 'willing_to_be_naughty') < 85:
-							gs 'willpower', 'drugs', 'force', 'hard'
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+						'"Come on, Katja. It''s going to be fun. They look hot and '+iif(katjaQW['simultanous_boys'] <2, ' if you never been with two guys, then you should defiantly try it.', 'I know you like to have several cocks to play with.')+' I grabbed the guy i was dancing withs cock while we danced and I think it''ll do nicely," you whisper in her ear.'
+						'Katja''s face is getting red, "I don''t know. I''m not sure '+iif(katjaQW['simultanous_boys'] <2, 'it is the right time to try a foursome', 'they are right for us')+'."'
+						if katjaQW['dom'] > 30:
+							gs 'willpower', '', 'force', 'hard'
+						elseif katjaQW['dom'] < 0:
+							gs 'willpower', '', 'force', 'easy'
 						else
-							gs 'willpower', 'drugs', 'force'
+							gs 'willpower', '', 'force'
 						end
 						if will_cost <= pcs_willpwr:
-							act 'Convince Katja to try the cocaine (<<will_cost>> Willpower)':
-								*clr & cla
-								minut += 8
+							act 'Push her a little more (<<will_cost>> Willpower)':
+								cla
+								gs 'npc_relationship', 'modify', 'A14', 'dislike'
 								gs 'willpower', 'pay', 'force'
-								gs 'katja_procedural', 'take_cocaine'
-								gs 'stat'										
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-								'"Come on, Katja. Just try it. It won''t harm you," you say, but Katja still looks skeptical.'
-								'"I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea. I don''t think it''s for me," she replies.'
-								'"You won''t know unless you try it. See, we are both fine," you continue.'
-								'"I''m still not sure. Why should I do it?" she asks.'
-								'"Because it feels great. You can''t say it''s not for you until you actually know how it feels," you say.'
-								*nl
-								'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$npc_nickname[$npclastgenerated]>> prepared for her.'
-								'She slowly starts sniffing it but jerks her head back when the powder start to itch in her nose. "Do it, faster. All at once!" you tell her, and she gets down again, still shaking and gets ready.'
-								'This times she snorts it all in on go, and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
-								*nl
-								'After a moment, her discomfort resides and she starts to talk. "I don''t feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.'
-								'"See? I told you it would feel great!" you say.'
-								'Katja just replies with a dreamy stare, then she starts giggling, which turns into a laugh that lasts for some time.'
-								act 'Continue talking': gt 'katja_nightclub', 'private_room2', 3
+								katjaQW['dom'] -= rand(1,2)
+								katjaQw['horny'] += 10
+								gs 'stat'
+								if hour > 10:
+									locat['katja_rand2'] = daystart
+								else
+									locat['katja_rand3'] = daystart -1
+								end
+								locat['katja_save2'] = 54
+								locat['katja'] = locat['katja_save2']
+								minut += 10
+								'"I know you want those cocks. Just imagine one of them sliding in and out of your tight, wet pussy, while you look at me bouncing up and down the other cock" you whisper in her ear and you can her start squirming.'
+								'"OK. Let''s go," she finally says out loud and the men''s faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+								act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 	
 							end
 						else
-							act 'Convince Katja to try the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							act 'Push her a little more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
-						act 'Don''t push Katja':
+						act 'Let it go':
 							cla
-							minut += 2
-							'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$npc_nickname[$npclastgenerated]>> doesn''t say anything and just cleans up the drugs.'
-							act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2
+							katjaQW['dom'] += rand(2,3)
+							gs 'arousal', 'end'
+							gs 'stat'
+							'You resign yourself and accept Katja''s decision. "I''m very sorry, but my friend doesn''t feel like it. So we''re staying here to dance," you tell them, and they says goodbye and walks away, looking quite sad.' 
+							gs 'katja_nightclub', 'dance_end'
 						end
+						!!if katjaQW['faithful'] = 0:
+						!!	act 'Go home with him alone':
+						!!		cla
+						!!		gs 'npc_relationship', 'modify', 'A14', 'hate'
+						!!		gs 'npcgeneratec', 0, '', rand(18,55), rand(3,4)
+						!!		'"Well, I''m going home with him. So if you don''t want to have fun, you can stay here alone," you tell her.'
+						!!		'Katja almost looks angry. "If you are going to get hurt, I won''t be able to help you. But whatever," she says before turning around and walking away.'
+						!!		'The guy looks a little surprised by that exchange, but takes you under his arm and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						!!		act 'Go with him': gt 'sex_ev_start', 'hookup_npc_home_start'
+						!!	end
+						!!end
 					end
-				elseif katjaQW['coke_stage'] < 3:
-					'Katja looks skeptical, but also a little curious, as he pours some of the powder on the table and makes several lines.'
-					'"I''ll go first, if you ladies don''t mind," he says.' 
-					'After he finishes, he looks around. "Who''s next?" he asks. He holds out the tube he used to take the cocaine, with Katja looking like she wants to say no.' 
-					gs 'willpower', 'drugs', 'resist'
-					if will_cost <= pcs_willpwr:
-						act 'Say no to the drugs (<<will_cost>> Willpower)':
-							cla
-							minut += 2
-							gs 'willpower', 'drugs', 'resist'
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'										
-							'"Thanks, but that''s not for me," you say, and Katja also quickly shakes her head when he tries to hand the tube to her.'
-							'"Well, more for me then," he says and does a few more of the lines before packing away the drugs.'
-							act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1
+				end
+				act 'Agree and say goodbye to them':
+					cla
+					gs 'arousal', 'end'
+					gs 'stat'
+					'You agree with Katja and say goodbye to the men.'
+					gs 'katja_nightclub', 'dance_end'
+				end
+			else
+				if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katjaQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
+					'"That sounds like a good idea. I''m sure that you two have lots of ways to entertain us," Katja says in a seductive voice, before you even have time to reply.'
+					act 'Go home with them':
+						cla
+						minut += 10
+						if hour > 10:
+							locat['katja_rand2'] = daystart
+						else
+							locat['katja_rand3'] = daystart -1
 						end
-					else
-						act 'Say no to the drugs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']
+						'"I just hope you are men enough to really entertain a couple of hot girls like us. Let''s go," you say, trying to sound as seductive as Katja. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys'
 					end
-					act 'Do some lines line but don''t push Katja':
+					act 'Tell Katja that you don''t want to go home with them':
 						*clr & cla
-						minut += 5
-						dur += 1
-						gs 'drugs', 'cocaine'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
-						'"I''ll take some, but I think my friend will not partake," you say as you take the tube while Katja nods her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
-						'You snort the first line and then the second while Katja looks at you with wide open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
-						act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2				
-					end
-					if katjaQW['coke_stage'] = 2:
-						gs 'willpower', 'drugs', 'force', 'easy'
-					else
-						gs 'willpower', 'drugs', 'force'
-					end
-					if will_cost <= pcs_willpwr:
-						act 'Convince Katja to do some lines with you (<<will_cost>> Willpower)':
-							*clr & cla
-							minut += 8
-							if katjaQW['coke_stage'] = 2:
-								gs 'willpower', 'drugs', 'force', 'easy'
-							else
-								gs 'willpower', 'drugs', 'force'
-							end
-							gs 'willpower', 'pay', 'force'
-							dur += 1
-							gs 'drugs', 'cocaine'
-							gs 'stat'
-							gs 'katja_procedural', 'take_cocaine'
-							gs 'stat'										
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
-							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
-							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'
-							'"You liked it last time! it will be fine this time, too," you continue.'
-							'"I''m not sure. '+iif(katjaQW['coke_stage'] = 2, 'I don''t want it to become a habit', 'I think the last time was enough for me')+'" she says.' 
-							'"Don''t be such a bore. You know you will love it," you say.'
-							'Katja finally relents. "OK. Let''s do it, together," she says.'
-							*nl
-							'<<$npc_nickname[$npclastgenerated]>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lover your heads to the table.'
-							'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t itch her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
-							*nl
-							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
-							act 'Continue talking': gt 'katja_nightclub', 'private_room2', 3
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+						'You lean into Katja and whisper, "Come on. I don''t want to go home with them. Who knows what will happen."'
+						'"They are actually quite hot and I get a good feeling from them. I''m sure nothing we don''t want to happen will happen. I will protect you for sure if they try to do something we don''t want," Katja answers while trying to look tough to you'
+						if katjaQW['dom'] > 30:
+							gs 'willpower', '', 'force', 'hard'
+						elseif katjaQW['dom'] < 0:
+							gs 'willpower', '', 'force', 'easy'
+						else
+							gs 'willpower', '', 'force'
 						end
-					else
-						act 'Convince Katja to do some lines with you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-				elseif katjaQW['coke_stage'] < 5:
-					'Katja looks curious and a little excited as he pours some of the powder on the table and makes several lines.'
-					'"I''ll go first, if you ladies don''t mind," he says.' 
-					'After he finishes, he looks around. "Who''s next?" he asks and holds out the tube he used to take the cocaine. Katja looks like she is ready.' 
-					gs 'willpower', 'drugs', 'resist'
-					if will_cost <= pcs_willpwr:
-						act 'Say no to the drugs (<<will_cost>> Willpower)':
-							cla
-							minut += 2
-							gs 'willpower', 'drugs', 'resist'
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'										
-							'"Thanks, but that is not for me," you say.'
-							'"How about you then?" he asks Katja.'
-							'"OK, make some lines for me," she replies'+iif(  katjaQW['coke_stage'] = 3, ' hesitantly.', '.')
-							if katjaQW['coke_stage'] = 4:
-								gs 'willpower', 'drugs', 'force', 'easy'
-							end
-							if will_cost <= pcs_willpwr or katjaQW['coke_stage'] = 3:
-								act 'Convince Katja not to do cocaine (<<will_cost>> Willpower)':
-									*clr & cla
-									if katjaQW['coke_stage'] = 4:
-										gs 'willpower', 'pay', 'force'
-										gs 'npc_relationship', 'modify', 'A14', 'dislike'
-									end
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-									'"I don''t think it''s a good idea, Katja," you say.'
-									'"Why not? Never hurt me before," Katja '+iif(katjaQW['coke_stage'] = 3 , 'replies.', 'snaps at you.')
-									'"No, but it might if you continue doing it this often," you respond.'
-									iif(katjaQW['coke_stage'] = 3, 'Katja looks at you. "Do you think I take too much?"', 'Katja scowls at you. "Are you implying I can''t control myself?"')
-									'"I''m just saying that maybe we should relax a little. Right now is not the time for this," you say.'
-									'Katja thinks about it for a moment. '+iif(katjaQW['coke_stage'] = 3, '"OK. Not tonight," she says.', '"Fine," she says, clearly not happy about it.')
-									'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs.'
-									act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1							
-								end
-							else
-								act 'Convince Katja not to take the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
-							end
-							act 'Watch Katja do her lines':
-								*clr & cla
-								minut += 5
-								gs 'katja_procedural', 'take_cocaine'
+						if will_cost <= pcs_willpwr:
+							act 'Convince Katja not to go home with them (<<will_cost>> Willpower)':
+								cla
+								gs 'npc_relationship', 'modify', 'A14', 'dislike'
+								gs 'willpower', 'pay', 'force'
+								katjaQW['dom'] -= rand(1,2)
 								gs 'stat'										
-								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-								'You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
-								'She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
-								*nl
-								'After a moment, it does and Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
-								act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2
+								'"I really don''t think it''s a good idea to go with them. I got a really bad feeling from the guy I was dancing with, you can play tough but you know damn well that we wont be able to do anything if the get violent?" you whisper.'
+								'Katja looks at the man you were dancing with again and after a moment of thinking, she relents. "OK. I''m not really convinced that they''re bad, but I will stay with you," she answers.'
+								'She then turns to them. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+								'They then leaves, looking very disappointed.'
+								gs 'katja_nightclub', 'dance_end'
 							end
+						else
+							act 'Convince Katja not to go home with him (<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 'Say no to the drugs  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-					act 'Do some lines with Katja (<<will_cost>> Willpower)':
-						*clr & cla
-						minut += 8
-						dur += 1
-						gs 'drugs', 'cocaine'
-						gs 'stat'
-						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
-						'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
-						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube and Katja takes it happily.'
-						'You put your tubes to your nostrils and lover your heads to the table and sniff your line. Katja does it with great enthusiasm.' 
-						*nl
-						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
-						act 'Continue talking': gt 'katja_nightclub', 'private_room2', 3
-					end
-				else
-					'Katja looks excited as he pours some of the powder on the table and makes several lines.'
-					'"I''ll go first, if you ladies don''t mind," he says.'
-					'"As long as you leave some for us," Katja responds.' 
-					'After he finishes, he looks around. "Who''s next?" he asks and holds out the tube he used to take the cocaine.'
-					'"We''re going to do it together. Right, <<$pcs_nickname>>?" Katja says with great enthusiasm.' 
-					gs 'willpower', 'drugs', 'resist'
-					if will_cost <= pcs_willpwr:
-						act 'Say no to the drugs (<<will_cost>> Willpower)':
+						act 'Relent and go with them':
 							cla
-							minut += 2
-							gs 'willpower', 'drugs', 'resist'
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'										
-							'"Thanks, but that''s not for me," you reply.'
-							'"So just you, then?" he asks Katja.'
-							'"Yes. Seems like <<$pcs_nickname>> is being boring tonight. Make some lines for me," she says.'
-							if katjaQW['coke_stage'] = 5:
-								gs 'willpower', 'drugs', 'force', 'easy'
-							elseif katjaQW['coke_stage'] = 6:
-								gs 'willpower', 'drugs', 'force'
-							elseif katjaQW['coke_stage'] = 7:
-								gs 'willpower', 'drugs', 'force', 'hard'
+							minut += 10
+							if hour > 10:
+								locat['katja_rand2'] = daystart
 							else
-								'It''s clear that if you want Katja to stop, it would require you to forcefully drag her away. But that would probably get the guy and the security guard to stop you, as well as get you thrown out of the club, maybe worse.'
+								locat['katja_rand3'] = daystart -1
 							end
-							if katjaQW['coke_stage'] < 8:
-								if will_cost <= pcs_willpwr:
-									act 'Convince Katja not to take cocaine (<<will_cost>> Willpower)':
-										*clr & cla
-										gs 'willpower', 'pay', 'force'
-										if katjaQW['coke_stage'] = 5: 
-											gs 'npc_relationship', 'modify', 'A14', 'dislike'
-										elseif katjaQW['coke_stage'] = 6: 
-											gs 'npc_relationship', 'modify', 'A14', 'hate'
-										elseif katjaQW['coke_stage'] = 7: 
-											gs 'npc_relationship', 'modify', 'A14', 'loathe'
-										end
-										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-										'"I don''t think it''s a good idea, Katja," you say.'
-										'"Why are you trying to ruin my fun? I know how to handle it," Katja snaps at you.'
-										'"No, I don''t think you do," you respond.'
-										'Katja looks at you angrily. "Are you saying I can''t control myself?"'
-										'"I think you are overdoing it. You shouldn''t do it as often or as much as you do," you tell her.'
-										'"You aren''t my mom!" Katja says.'
-										'"No, I''m not, and I''m sure she would be harsher with you than I am," you answer.'
-										'Katja is silently thinking about it for a moment. "Fine. You get it your way, this time," she says, clearly not happy about it.'
-										'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he is doing so.'
-										act 'Continue talking': gt 'katja_nightclub', 'private_room2', 1							
-									end
+							locat['katja_save2'] = 54
+							locat['katja'] = locat['katja_save2']
+							katjaQW['dom'] += rand(1,2)
+							'"Well, if you really want to, Katja," you say.'
+							'Their faces lights up. "Great! Follow me, my ladies," the guy you were dancing with says and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys'
+						end
+						if katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0:
+							act 'Let Katja go home with them, but stay at the club':
+								'"Well, you can go with them if you want to, but I''m staying here" you tell Katja.'
+								if katjaQW['simultanous_boys'] <2:
+									'Katja looks at you a little panicked. "But I''ve never been with two guys before. Wont you come with me please!" she pleads.'
+									'But seeing that you don''t relent so turns to the guys and says "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+									'They then leaves, looking very disappointed.'
+									gs 'katja_nightclub', 'dance_end'
 								else
-									act 'Convince Katja not to take the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
+									katjaQw['alone_with_other_day'] = daystart
+									if hour > 10:
+										locat['katja_rand2'] = daystart
+									else
+										locat['katja_rand3'] = daystart -1
+									end
+									locat['katja_save2'] = 54
+									locat['katja'] = locat['katja_save2']
+									cla
+									'She looks at you a little skeptical, but then turns to the men. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
+									'They then lights up and takes her hand and walk away, leaving you alone on the dance floor.'
+									act 'continue': gt 'city_nightclub', 'dance'
 								end
 							end
-							act 'Watch Katja do her lines':
-								*clr & cla
-								minut += 5
-								gs 'katja_procedural', 'take_cocaine'
-								gs 'stat'										
-								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
-								'You watch as Katja takes the tube, puts one end at her nose and bows down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
-								'She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.' 
-								*nl
-								'After a moment, it does and Katja sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
-								act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2
-							end
 						end
-					else
-						act 'Say no to the drugs  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Do some lines with Katja':
-						*clr & cla
-						minut += 8
-						dur += 1
-						gs 'drugs', 'cocaine'
-						gs 'stat'
-						gs 'katja_procedural', 'take_cocaine'
-						gs 'stat'										
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
-						'"Okay, Katja. Let''s do it together," you say.'
-						'"Yes. That''s the spirit," she replies as she has already taken the tube from <<$npc_nickname[$npclastgenerated]>>. He quickly produces another one and hands it to you.'
-						'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
-						*nl
-						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling which turns into a laugh that lasts for some time.'
-						act 'Continue talking': gt 'katja_nightclub', 'private_room2', 3
-					end
-				end
-			end
-		end
-	else
-		act 'Enjoy your drinks': gt 'katja_nightclub', 'private_room2', 0
-	end
-end
-
-if $ARGS[0] = 'private_room2':
-	minut += 7
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
-	if hotcat + ARGS[1] < rand(6,14):
-		gs 'stat'
-		'You sit and talk for a while, and after your drinks are finished, <<$npc_nickname[$npclastgenerated]>> says that he''s had a great time but he has to go. He says goodbye and leaves you and Katja siting alone in the booth.'
-		'You and Katja look at each other, a bit confused.'
-		'Katja then suggests that the two of you should go dancing and you follow her to the dance floor.'
-		act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
-	else
-		gs 'arousal', 'foreplay', 3
-		gs 'stat'
-		'You sit and talk while you sip your drinks. During this time, <<$npc_nickname[$npclastgenerated]>>''s hands become more and more daring. At first, they just accidentally touch you or Katja, but as time goes on, they keep lingering on your thighs.'
-		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (75,150):
-			'Katja is having none of it, demonstrably removing his hand from her thigh when it has been the for just a second. He then tries with your thigh to see if he has more luck.'
-			act 'Make it clear that you''re also not interested':
-				cla
-				'You remove his hand. "We''re not interested in that."'
-				'He acts very offended, standing up in a huff. "I think it''s high time you both left," he says.'
-				'As you and Katja leave the booth, you hear him mumble, "Well, that was money wasted."'
-				*nl
-				'"What an asshole!" Katja says. "He seems to think that we''re just cheap whores who can be bought with a couple of drinks!"'
-				'"A complete jerk," you add.'
-				'"Well, let''s forget about him and go dance," Katja suggests.'
-				act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
-			end
-			if katjaQW['QWstage'] >= 6 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
-				if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
-					gs 'willpower', 'sex', 'force', 'easy'
 				else
-					gs 'willpower', 'sex', 'force'
-				end
-				if will_cost <= pcs_willpwr:
-					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<<will_cost>> Willpower)':
+					'Katja looks at you, making it clear that it''s up to you to decide and she will do what you choose.'
+						act 'Go home with the men':
 						cla
-						gs 'willpower', 'pay', 'force'
-						gs 'arousal', 'foreplay_give', 3
-						KatjaQW['horny'] += 20
-						gs 'stat'			
-						'You accept his touch and place your hand on his thigh, moving it slowly towards his crotch. "Look. Katja, He is quite handsome. I''m sure what he has here is something we could make use of," you say as your hand grazes the growing lump in his trousers.'
-						'"It feels quite good, '+iif(dick  >  15, 'big just like you like it', 'nice and smooth')+'. It will be perfect for pounding that tight, wet pussy of yours," you say as you are stroking his now extremely hard <<dick>>cm dick through his pants.'
-						'Katja is squirming and her face is getting very red. "You know, <<$pcs_nickname>>. That might be just what I need," she says in a seductive voice, as she moves closer and lets her hand join yours.'
-						act 'Have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
-					end
-				else
-					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-			end
-			if katjaQW['faithful'] = 0:
-				act 'Have sex with <<$npc_nickname[$npclastgenerated]>> without Katja': 
-					cla
-					'You accept his touch and place your hand on his thighs, moving it slowly towards his crotch. "Mmm. this is something I''m going to enjoy," you say as you hand reaches his cock.'
-					'"What are you doing, <<$pcs_nickname>>?" Katja asks while getting flustered. YOu just ignore her and continue to stroke <<$npc_nickname[$npclastgenerated]>>''s now hard cock through his pants.'
-					'He takes your groping as approval and starts pawing at your <<$pcs_desc[''breast'']>> breasts. You''re so into it, that you don''t even notice Katja get up and leave.'
-					act 'Have sex with <<$npc_nickname[$npclastgenerated]>>': picrand = 38 & $sexloc = 'city_nightclub' & xgt 'sex', 'var'
-				end
-			end
-		else
-			gs 'arousal', 'erotic', -3
-			gs 'stat'
-			'Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<$npc_nickname[$npclastgenerated]>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja''s breasts.'
-			'"You gotta feel this, <<$pcs_nickname>>," Katja says as she starts stroking his cock through his pants. "It''s '+iif(dick > 17, 'very big', 'nice')+' and hard. I think we will have a good time with it," she says in her most seductive voice.'
-			act 'Join Katja and have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
-			if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 200:
-				gs 'willpower', 'sex', 'force', 'hard'
-			elseif func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
-				gs 'willpower', 'sex', 'force'
-			else
-				gs 'willpower', 'sex', 'force', 'easy'
-			end
-			if will_cost <= pcs_willpwr:
-				act 'Convince Katja to stop (<<will_cost>> Willpower)':
-					cla
-					gs 'willpower', 'pay', 'force'
-					'"Come on, Katja. Stop teasing the poor guy. You''re making him think that he''s anywhere close to our standard," you say out loud to make sure that he heard you.'
-					'Katja looks at you a little puzzled, but then smiles and pats his crotch in a condescending way. "You''re right. This here isn''t going to be able to satisfy us," she says and she stands up before holding out her hand to you.'
-					'You take it and stand up, leaving the booth with the guy looking completely confused and very frustrated.'
-					'When you get closer to the dance floor, Katja whispers to you, "You owe me a big orgasm tonight. I thought we would get a nice hard pounding in there. But for now, let''s dance."'
-					act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
-				end
-			else
-				act 'Convince Katja to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-			if katjaQW['faithful'] = 0:
-				act 'Give them some privacy':
-					cla
-					katjaQW['disco_loc'] = 7
-					gs 'katja_procedural', 'sex_set', 1
-					'You slowly get up and as you leave, you tell them, "Have fun, Katja. You can try to find me after you''ve finished your business."'
-					act 'Leave': gt 'city_nightclub', 'private_rooms'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS = 'lone_bartender':
-	menu_off = 1
-	minut += 5
-	katjaQW['lone_bartender'] = daystart 
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
-	'"Let'' go to one of the small bars upstairs. There are usually not that many people," Katja says, and you agree and follow her upstairs.'
-	'There you quickly find a bar that is actually empty except for the bartender. As you are about to enter Katja suddenly stops.'
-	'"I'' sorry, really need to powder my nose. Just go ahead, and start ordering" I will be back in just a minute, and before you can say anything, she'' gone.'
-	act 'Go to the bartender':
-		*clr & cla
-		minut += 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
-		'You approach the bar, where a rather handsome bartender looks like he is doing some cleaning.'
-		'"I''m sorry, but we are closed. You''ll have to find another bar." He says, just as you reach the bar.'
-		act 'Leave and wait for Katja outside':
-			*clr & cla
-			minut += 7
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
-			'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
-			act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
-		end
-		act 'Try to convince him to stay open':
-			*clr & cla
-			minut += 1
-			gs 'exp_gain', 'persuas', rand(0,1)
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
-			'"Why don''t you stay open for my cute friend and me, handsome? It will just be one drink. I promise we won''t make any mess." You say, trying to make the best doe eyes you can.'
-			if pcs_persuas >= rand(50,100):
-				'It looks like he is seriously considering staying open for you. You think that pushing a little more will convince him.'
-				if hotcat > 8:
-					gs 'willpower', 'misc', 'force', 'easy'
-				elseif hotcat > 5:
-					gs 'willpower', 'misc', 'force'
-				else
-					gs 'willpower', 'misc', 'force', 'hard'
-				end
-				if will_cost <= pcs_willpwr:
-					act 'Convince the bartender to serve you (<<will_cost>> Willpower)':
-						*clr & cla
-						if hotcat > 8:
-							gs 'willpower', 'misc', 'force', 'easy'
-						elseif hotcat > 5:
-							gs 'willpower', 'misc', 'force'
+						minut += 10
+						if hour > 10:
+							locat['katja_rand2'] = daystart
 						else
-							gs 'willpower', 'misc', 'force', 'hard'
-						end						
-						gs 'willpower', 'pay', 'force'		
-						gs 'stat'
-						
-						'"Come on, please. It will just be me and my friend". We won''t be a bother. We''ll just have a quick drink. You would be the best bartender ever if you did." You continue.'
-						'He finally relents. "Okay. Just one drink and only you and your friend. No others. So what will you have?" he asks.'
-						$loc = 'katja_nightclub'
-						$loc_arg = 'lonebartender_drinking'
-						gs 'food_menu', 'city_nightclub_only_cost'
+							locat['katja_rand3'] = daystart -1
+						end
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']
+						'"That does sound like fun. Let''s go," you say and their faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 
 					end
-				else
-					act 'Convince  the bartender to serve you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
-				end
-			else
-				'It does''nt seem like your charm alone will convince him.'
-			end
-			if hotcat > 7:
-				'He''s clearly having a hard time taking his eyes off your hot body, and you can see how flustered he''s getting from your flirting.'
-				'You are sure that giving him a blow job would convince him to stay open, and he is quite good looking.' 
-				gs 'willpower', 'bj', 'self', 'easy'
-				if will_cost <= pcs_willpwr:
-					act 'Give him a blow job (<<will_cost>> Willpower)':
+					act 'Say no thanks':
 						cla
-						if katjaQW['faithful'] = 1 and katjaQW['couple'] =1:
-							'As you are considering to give him a blow job, you remember that you promised Katja that you would be faithful.'
-							'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
-							act 'Risk it':
-								gs 'willpower', 'pay', 'self'
-								gt 'katja_nightclub_sex', 'bartender_bj' 
-							end
-						else
-							if KatjaQW['boy_block'] = 1:
-								'As you are considering giving him a blowjob, you remember you told Katja that you are not into boys. She will definitely be surprised if she catches you with his dick in your mouth.'
-								'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
-								act 'Risk it':
-									gs 'willpower', 'pay', 'self'
-									gt 'katja_nightclub_sex', 'bartender_bj' 
-								end
-							else
-								if katjaQW['knows_BJ'] = 0:
-									'As you are considering giving him a blowjob, you don''t think that Katja even knows you are giving boys blowjobs. You wonder how surprised she will be if she sees his dick in your mouth.'
-									'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
-									act 'Give him the blow job':
-										gs 'willpower', 'pay', 'self'
-										gt 'katja_nightclub_sex', 'bartender_bj' 
-									end
-								else							
-									gs 'willpower', 'pay', 'self'
-									gt 'katja_nightclub_sex', 'bartender_bj' 
-								end
-							end
-						end
-						act 'Don''t give him the blow job':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
-							'You change your mind and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
-							act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
-						end						
+						gs 'arousal', 'end'
+						gs 'stat'
+						'"Thanks, but no thanks," you say. "We prefer to stay here and dance."'
+						'They clearly looks disappointed and says goodbye before leaving you and Katja alone on the dance floor.'
+						gs 'katja_nightclub', 'dance_end'
 					end
-				else
-					act 'Give him a blow job(<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 'Leave and wait for Katja outside':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
-				'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
-				act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
-			end			
 		end
 	end
 end
 
-if $ARGS[0] = 'lonebartender_drinking':
-	$loc = 'city_nightclub'
-	$loc_arg = 'bar'
-	$menu_loc = 'city_nightclub'
-	$menu_arg = 'bar'
-	menu_off = 1
-	minut += 15
-	gs 'stat'
-	katjaQW['drinks'] += rand(1,2)
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
-	'Katja arrives as he is about to serve your order, and you quickly whisper to her that she should be quick and very kind to the bartender.'
-	'She does as you say and places her order immediately when he serves yours, and soon you both have your drinks talking until they are finished.'
-	'You thank the bartender again and heads back to the dance floor.'
-	act 'Go dancing': gt 'katja_nightclub', 'dance'
-end
-
 --- katja_nightclub ---------------------------------
 

+ 583 - 14
locations/katja_nightclub_sex.qsrc

@@ -1,6 +1,433 @@
 # katja_nightclub_sex
 !2023/05/27
 
+if $ARGS[0] = 'private_room1':
+	menu_off = 1
+	minut += 10
+	gs 'npcgeneratec', 0, '', rand(18,55), 4
+	gs 'boystat', $npclastgenerated
+	gs 'beverage', 'only_stat_bev_cocktail'
+	katjaQW['drinks'] += rand(1,2)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
+	'The room has couches and a table, and as you sit down, he tells you that he has already ordered drinks for you. He then introduces himself as <<$npc_nickname[$npclastgenerated]>> and asks for your names.'
+	'The cocktails arrive before you and Katja finish your introduction, and you start sipping your drinks while you continue to talk.'
+	if rand(0,3) = 0:
+		if katjaQW['coke_stage'] = -1:
+			'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
+			'"That''s it. I''m out of here," Katja says and gets up and leaves abruptly.'
+			'<<$npc_nickname[$npclastgenerated]>> looks confused. "What was that about?" he asks.'
+			'"My friend has had an addiction problem. She''s over it now, but tries to avoid drugs because of that," you explain. "I''m very sorry, but I need to check up on my friend," you say and leave <<$npc_nickname[$npclastgenerated]>>.'
+			act 'Find Katja':
+				*clr & cla
+				minut += 10
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You leave the private rooms and find Katja just on the edge of the dance floor with tears in her eyes. "I''m sorry, Sveta. But the sight of the drugs just brought up all these feelings in me that I couldn''t control," Katja says and starts crying.'
+				'"There there, no need to hold it in. Let it all out," you say as you hug Katja. She hugs you back and you just stand there for some time until Katja finishes crying.'
+				'"Let''s dance," you say and drag her to the dance floor.'
+				'Soon, the dancing makes her forget the bad experience and, after a few minutes, she is her normal, happy self again.' 
+				gs 'katja_nightclub', 'dance_end'
+			end
+		else
+			act 'Enjoy your drinks':
+				*clr & cla
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_guy_coke.jpg"></center>'
+				'After a few minutes, <<$npc_nickname[$npclastgenerated]>> says, "Why don''t we try some other good stuff?" He pulls out a small bag with white powder inside.'
+				if katjaQW['coke_stage'] = 0:
+					'Katja looks confused at first, she''s not really sure what it is. But as he pours some of the powder on the table and makes several lines, she seems to realize what''s going on and starts to look surprised and then skeptical.'
+					'"I''ll go first, if you ladies don''t mind," he says. And as he sniffs the first line, Katja''s look starts to change to curious. After he finishes, he looks around. "Who''s next?" he asks and he holds out the tube he used to sniff the cocaine.' 
+					gs 'willpower', 'drugs', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Say no to the drugs (<<will_cost>> Willpower)':
+							cla
+							minut += 2
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'										
+							'"Thanks, but that''s not for me," you say, and Katja quickly and vehemently shakes her head when he tries to hand the tube to her.'
+							'"Well, more for me then," he says and does a couple more lines before packing away the drugs.'
+							act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 1
+						end
+					else
+						act 'Say no to the drugs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Do some lines':
+						*clr & cla
+						minut += 5
+						dur += 1
+						gs 'drugs', 'cocaine'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
+						'You take the tube and snort the first line and then the second, while Katja looks at you with wide-open eyes.'
+						'After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
+						if func('katja_procedural', 'willing_to_be_naughty') < 85:
+							gs 'willpower', 'drugs', 'force', 'hard'
+						else
+							gs 'willpower', 'drugs', 'force'
+						end
+						if will_cost <= pcs_willpwr:
+							act 'Convince Katja to try the cocaine (<<will_cost>> Willpower)':
+								*clr & cla
+								minut += 8
+								gs 'willpower', 'pay', 'force'
+								gs 'katja_procedural', 'take_cocaine'
+								gs 'stat'										
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
+								'"Come on, Katja. Just try it. It won''t harm you," you say, but Katja still looks skeptical.'
+								'"I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea. I don''t think it''s for me," she replies.'
+								'"You won''t know unless you try it. See, we are both fine," you continue.'
+								'"I''m still not sure. Why should I do it?" she asks.'
+								'"Because it feels great. You can''t say it''s not for you until you actually know how it feels," you say.'
+								*nl
+								'"OK," Katja finally relents. With a shaking hand, she takes the tube. She then places it at her nostril and slowly bends down so the other end is at the line of cocaine that <<$npc_nickname[$npclastgenerated]>> prepared for her.'
+								'She slowly starts sniffing it but jerks her head back when the powder starts to itch in her nose. "Do it, faster. All at once!" you tell her, and she gets down again, still shaking and gets ready.'
+								'This time she snorts it all in on go and raises her head from the table. It''s clear that the powder itches her nostrils and she looks like she is about to sneeze. "Don''t sneeze! Keep it in!" you tell her, and Katja moves her hand to her nose to prevent it from coming out.'
+								*nl
+								'After a moment, her discomfort resides and she starts to talk. "I don''t feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.'
+								'"See? I told you it would feel great!" you say.'
+								'Katja just replies with a dreamy stare, then she starts giggling, which turns into a laugh that lasts for some time.'
+								act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 3
+							end
+						else
+							act 'Convince Katja to try the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Don''t push Katja':
+							cla
+							minut += 2
+							'"It''s fine if you don''t want to, Katja," you say. She seems relieved. <<$npc_nickname[$npclastgenerated]>> doesn''t say anything and just cleans up the drugs.'
+							act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 2
+						end
+					end
+				elseif katjaQW['coke_stage'] < 3:
+					'Katja looks skeptical, but also a little curious, as he pours some of the powder on the table and makes several lines.'
+					'"I''ll go first, if you ladies don''t mind," he says.' 
+					'After he finishes, he looks around. "Who''s next?" he asks. He holds out the tube he used to take the cocaine, with Katja looking like she wants to say no.' 
+					gs 'willpower', 'drugs', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Say no to the drugs (<<will_cost>> Willpower)':
+							cla
+							minut += 2
+							gs 'willpower', 'drugs', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'										
+							'"Thanks, but that''s not for me," you say, and Katja also quickly shakes her head when he tries to hand the tube to her.'
+							'"Well, more for me then," he says and does a few more of the lines before packing away the drugs.'
+							act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 1
+						end
+					else
+						act 'Say no to the drugs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Do some lines but don''t push Katja':
+						*clr & cla
+						minut += 5
+						dur += 1
+						gs 'drugs', 'cocaine'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
+						'"I''ll take some, but I think my friend will not partake," you say as you take the tube while Katja nods her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
+						'You snort the first line and then the second while Katja looks at you with wide-open eyes. After a short moment, it hits you and you feel the full effect of the drug. <<$npc_nickname[$npclastgenerated]>> takes the tube and cleans up the drugs.'
+						act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 2				
+					end
+					if katjaQW['coke_stage'] = 2:
+						gs 'willpower', 'drugs', 'force', 'easy'
+					else
+						gs 'willpower', 'drugs', 'force'
+					end
+					if will_cost <= pcs_willpwr:
+						act 'Convince Katja to do some lines with you (<<will_cost>> Willpower)':
+							*clr & cla
+							minut += 8
+							if katjaQW['coke_stage'] = 2:
+								gs 'willpower', 'drugs', 'force', 'easy'
+							else
+								gs 'willpower', 'drugs', 'force'
+							end
+							gs 'willpower', 'pay', 'force'
+							dur += 1
+							gs 'drugs', 'cocaine'
+							gs 'stat'
+							gs 'katja_procedural', 'take_cocaine'
+							gs 'stat'										
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
+							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
+							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'
+							'"You liked it last time! it will be fine this time, too," you continue.'
+							'"I''m not sure. '+iif(katjaQW['coke_stage'] = 2, 'I don''t want it to become a habit', 'I think the last time was enough for me')+'" she says.' 
+							'"Don''t be such a bore. You know you will love it," you say.'
+							'Katja finally relents. "OK. Let''s do it, together," she says.'
+							*nl
+							'<<$npc_nickname[$npclastgenerated]>> has already produced another tube and hands it to Katja, who takes it with unsteady hands. You both lover your heads to the table.'
+							'Then at the same time, you sniff your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t itch her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
+							*nl
+							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
+							act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 3
+						end
+					else
+						act 'Convince Katja to do some lines with you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				elseif katjaQW['coke_stage'] < 5:
+					'Katja looks curious and a little excited as he pours some of the powder on the table and makes several lines.'
+					'"I''ll go first, if you ladies don''t mind," he says.' 
+					'After he finishes, he looks around. "Who''s next?" he asks and holds out the tube he used to take the cocaine. Katja looks like she is ready.' 
+					gs 'willpower', 'drugs', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Say no to the drugs (<<will_cost>> Willpower)':
+							cla
+							minut += 2
+							gs 'willpower', 'drugs', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'										
+							'"Thanks, but that is not for me," you say.'
+							'"How about you then?" he asks Katja.'
+							'"OK, make some lines for me," she replies'+iif(  katjaQW['coke_stage'] = 3, ' hesitantly.', '.')
+							if katjaQW['coke_stage'] = 4:
+								gs 'willpower', 'drugs', 'force', 'easy'
+							end
+							if will_cost <= pcs_willpwr or katjaQW['coke_stage'] = 3:
+								act 'Convince Katja not to do cocaine'+iif( katjaQW['coke_stage'] = 3, '', '(<<will_cost>> Willpower)')+'':
+									*clr & cla
+									if katjaQW['coke_stage'] = 4:
+										gs 'willpower', 'pay', 'force'
+										gs 'npc_relationship', 'modify', 'A14', 'dislike'
+									end
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+									'"I don''t think it''s a good idea, Katja," you say.'
+									'"Why not? Never hurt me before," Katja '+iif(katjaQW['coke_stage'] = 3 , 'replies.', 'snaps at you.')
+									'"No, but it might if you continue doing it this often," you respond.'
+									iif(katjaQW['coke_stage'] = 3, 'Katja looks at you. "Do you think I take too much?"', 'Katja scowls at you. "Are you implying I can''t control myself?"')
+									'"I''m just saying that maybe we should relax a little. Right now is not the time for this," you say.'
+									'Katja thinks about it for a moment. '+iif(katjaQW['coke_stage'] = 3, '"OK. Not tonight," she says.', '"Fine," she says, clearly not happy about it.')
+									'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs.'
+									act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 1							
+								end
+							else
+								act 'Convince Katja not to take the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
+							end
+							act 'Watch Katja do her lines':
+								*clr & cla
+								minut += 5
+								gs 'katja_procedural', 'take_cocaine'
+								gs 'stat'										
+								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
+								'You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
+								'She then sniffs the line with no problem and just sits up waiting for the the drugs to hit her.' 
+								*nl
+								'After a moment, it does and Katja just sits there with wide-open eyes. She starts giggling which turns into a laugh that lasts for some time.'
+								act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 2
+							end
+						end
+					else
+						act 'Say no to the drugs  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Do some lines with Katja (<<will_cost>> Willpower)':
+						*clr & cla
+						minut += 8
+						dur += 1
+						gs 'drugs', 'cocaine'
+						gs 'stat'
+						gs 'katja_procedural', 'take_cocaine'
+						gs 'stat'										
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
+						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube and Katja takes it happily.'
+						'You put your tubes to your nostrils and lover your heads to the table and sniff your line. Katja does it with great enthusiasm.' 
+						*nl
+						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling which turns into a laugh that lasts for some time.'
+						act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 3
+					end
+				else
+					'Katja looks excited as he pours some of the powder on the table and makes several lines.'
+					'"I''ll go first, if you ladies don''t mind," he says.'
+					'"As long as you leave some for us," Katja responds.' 
+					'After he finishes, he looks around. "Who''s next?" he asks and holds out the tube he used to take the cocaine.'
+					'"We''re going to do it together. Right, <<$pcs_nickname>>?" Katja says with great enthusiasm.' 
+					gs 'willpower', 'drugs', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Say no to the drugs (<<will_cost>> Willpower)':
+							cla
+							minut += 2
+							gs 'willpower', 'drugs', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'										
+							'"Thanks, but that''s not for me," you reply.'
+							'"So just you, then?" he asks Katja.'
+							'"Yes. Seems like <<$pcs_nickname>> is being a bore tonight. Make some lines for me," she says.'
+							if katjaQW['coke_stage'] = 5:
+								gs 'willpower', 'drugs', 'force', 'easy'
+							elseif katjaQW['coke_stage'] = 6:
+								gs 'willpower', 'drugs', 'force'
+							elseif katjaQW['coke_stage'] = 7:
+								gs 'willpower', 'drugs', 'force', 'hard'
+							else
+								'It''s clear that if you want Katja to stop, it would require you to forcefully drag her away. But that would probably get the guy and the security guard to stop you, as well as get you thrown out of the club, maybe worse.'
+							end
+							if katjaQW['coke_stage'] < 8:
+								if will_cost <= pcs_willpwr:
+									act 'Convince Katja not to take cocaine (<<will_cost>> Willpower)':
+										*clr & cla
+										gs 'willpower', 'pay', 'force'
+										if katjaQW['coke_stage'] = 5: 
+											gs 'npc_relationship', 'modify', 'A14', 'dislike'
+										elseif katjaQW['coke_stage'] = 6: 
+											gs 'npc_relationship', 'modify', 'A14', 'hate'
+										elseif katjaQW['coke_stage'] = 7: 
+											gs 'npc_relationship', 'modify', 'A14', 'loathe'
+										end
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+										'"I don''t think it''s a good idea, Katja," you say.'
+										'"Why are you trying to ruin my fun? I know how to handle it," Katja snaps at you.'
+										'"No, I don''t think you do," you respond.'
+										'Katja looks at you angrily. "Are you saying I can''t control myself?"'
+										'"I think you are overdoing it. You shouldn''t do it as often or as much as you do," you tell her.'
+										'"You aren''t my mom!" Katja says.'
+										'"No, I''m not, and I''m sure she would be harsher with you than I am," you answer.'
+										'Katja is silently thinking about it for a moment. "Fine. You get it your way, this time," she says, clearly not happy about it.'
+										'"Well, more for me then," <<$npc_nickname[$npclastgenerated]>> says and does a few more lines before packing away the drugs. Katja looks longingly at the drugs while he is doing so.'
+										act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 1							
+									end
+								else
+									act 'Convince Katja not to take the cocaine (<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 'Watch Katja do her lines':
+								*clr & cla
+								minut += 5
+								gs 'katja_procedural', 'take_cocaine'
+								gs 'stat'										
+								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
+								'You watch as Katja takes the tube, puts one end at her nose and bows down so the other end is at the start of the line that <<$npc_nickname[$npclastgenerated]>> has prepared for her.'
+								'She then sniffs the line like a pro and sits up, waiting for the drugs to hit her.' 
+								*nl
+								'After a moment, it does and Katja sits there with wide-open eyes. She starts giggling which turns into a laugh that lasts for some time.'
+								act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 2
+							end
+						end
+					else
+						act 'Say no to the drugs  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Do some lines with Katja':
+						*clr & cla
+						minut += 8
+						dur += 1
+						gs 'drugs', 'cocaine'
+						gs 'stat'
+						gs 'katja_procedural', 'take_cocaine'
+						gs 'stat'										
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'"Okay, Katja. Let''s do it together," you say.'
+						'"Yes. That''s the spirit," she replies as she has already taken the tube from <<$npc_nickname[$npclastgenerated]>>. He quickly produces another one and hands it to you.'
+						'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 
+						*nl
+						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling which turns into a laugh that lasts for some time.'
+						act 'Continue talking': gt 'katja_nightclub_sex', 'private_room2', 3
+					end
+				end
+			end
+		end
+	else
+		act 'Enjoy your drinks': gt 'katja_nightclub_sex', 'private_room2', 0
+	end
+end
+
+if $ARGS[0] = 'private_room2':
+	minut += 7
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
+	if hotcat + ARGS[1] < rand(6,14):
+		gs 'stat'
+		'You sit and talk for a while, and after your drinks are finished, <<$npc_nickname[$npclastgenerated]>> says that he''s had a great time but he has to go. He says goodbye and leaves you and Katja siting alone in the booth.'
+		'You and Katja look at each other, a bit confused.'
+		'Katja then suggests that the two of you should go dancing and you follow her to the dance floor.'
+		act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
+	else
+		gs 'arousal', 'foreplay', 3
+		gs 'stat'
+		'You sit and talk while you sip your drinks. During this time, <<$npc_nickname[$npclastgenerated]>>''s hands become more and more daring. At first, they just accidentally touch you or Katja, but as time goes on, they keep lingering on your thighs.'
+		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (75,150):
+			'Katja is having none of it, demonstrably removing his hand from her thigh when it has been the for just a second. He then tries with your thigh to see if he has more luck.'
+			act 'Make it clear that you''re also not interested':
+				cla
+				'You remove his hand. "We''re not interested in that."'
+				'He acts very offended, standing up in a huff. "I think it''s high time you both left," he says.'
+				'As you and Katja leave the booth, you hear him mumble, "Well, that was money wasted."'
+				*nl
+				'"What an asshole!" Katja says. "He seems to think that we''re just cheap whores who can be bought with a couple of drinks!"'
+				'"A complete jerk," you add.'
+				'"Well, let''s forget about him and go dance," Katja suggests.'
+				act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
+			end
+			if katjaQW['QWstage'] >= 6 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
+				if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
+					gs 'willpower', 'sex', 'force', 'easy'
+				else
+					gs 'willpower', 'sex', 'force'
+				end
+				if will_cost <= pcs_willpwr:
+					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<<will_cost>> Willpower)':
+						cla
+						gs 'willpower', 'pay', 'force'
+						gs 'arousal', 'foreplay_give', 3
+						KatjaQW['horny'] += 20
+						gs 'stat'			
+						'You accept his touch and place your hand on his thigh, moving it slowly towards his crotch. "Look. Katja, He is quite handsome. I''m sure what he has here is something we could make use of," you say as your hand grazes the growing lump in his trousers.'
+						'"It feels quite good, '+iif(dick  >  15, 'big just like you like it', 'nice and smooth')+'. It will be perfect for pounding that tight, wet pussy of yours," you say as you are stroking his now extremely hard <<dick>>cm dick through his pants.'
+						'Katja is squirming and her face is getting very red. "You know, <<$pcs_nickname>>. That might be just what I need," she says in a seductive voice, as she moves closer and lets her hand join yours.'
+						act 'Have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
+					end
+				else
+					act 'Convince Katja to have sex with <<$npc_nickname[$npclastgenerated]>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			if katjaQW['faithful'] = 0:
+				act 'Have sex with <<$npc_nickname[$npclastgenerated]>> without Katja': 
+					cla
+					'You accept his touch and place your hand on his thighs, moving it slowly towards his crotch. "Mmm. this is something I''m going to enjoy," you say as your hand reaches his cock.'
+					'"What are you doing, <<$pcs_nickname>>?" Katja asks while getting flustered. YOu just ignore her and continue to stroke <<$npc_nickname[$npclastgenerated]>>''s now hard cock through his pants.'
+					'He takes your groping as approval and starts pawing at your <<$pcs_desc[''breast'']>> breasts. You''re so into it, that you don''t even notice Katja get up and leave.'
+					act 'Have sex with <<$npc_nickname[$npclastgenerated]>>': picrand = 38 & $sexloc = 'city_nightclub' & xgt 'sex', 'var'
+				end
+			end
+		else
+			gs 'arousal', 'erotic', -3
+			gs 'stat'
+			'Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<$npc_nickname[$npclastgenerated]>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja''s breasts.'
+			'"You gotta feel this, <<$pcs_nickname>>," Katja says as she starts stroking his cock through his pants. "It''s '+iif(dick > 17, 'very big', 'nice')+' and hard. I think we will have a good time with it," she says in her most seductive voice.'
+			act 'Join Katja and have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
+			if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 200:
+				gs 'willpower', 'sex', 'force', 'hard'
+			elseif func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 100:
+				gs 'willpower', 'sex', 'force'
+			else
+				gs 'willpower', 'sex', 'force', 'easy'
+			end
+			if will_cost <= pcs_willpwr:
+				act 'Convince Katja to stop (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'force'
+					'"Come on, Katja. Stop teasing the poor guy. You''re making him think that he''s anywhere close to our standard," you say out loud to make sure that he heard you.'
+					'Katja looks at you a little puzzled, but then smiles and condescendingly pats his crotch. "You''re right. This here isn''t going to be able to satisfy us," she says and she stands up before holding out her hand to you.'
+					'You take it and stand up, leaving the booth with the guy looking completely confused and very frustrated.'
+					'When you get closer to the dance floor, Katja whispers to you, "You owe me a big orgasm tonight. I thought we would get a nice hard pounding in there. But for now, let''s dance."'
+					act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
+				end
+			else
+				act 'Convince Katja to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			if katjaQW['faithful'] = 0:
+				act 'Give them some privacy':
+					cla
+					katjaQW['disco_loc'] = 7
+					gs 'katja_procedural', 'sex_set', 1
+					'You slowly get up and as you leave, you tell them, "Have fun, Katja. You can try to find me after you''ve finished your business."'
+					act 'Leave': gt 'city_nightclub', 'private_rooms'
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'private_booth_FFM':
 	menu_off = 1	
 	if npc_sex['A14'] = 0:
@@ -17,7 +444,7 @@ if $ARGS[0] = 'private_booth_FFM':
 	if katjaQW['QWstage'] >= 3:
 		'Katja quickly goes for a deep kiss and starts to undress you. You follow her lead and start pulling her clothes off.'
 	elseif katjaQW['simultanous_girls'] > 1:
-		'Katja approaches you for a kiss and you start making out. She''s a very good kisser, gentle yet passionate. You normally only experience this with girls who have kissed lot of other girls, and it clearly gets to you.'
+		'Katja approaches you for a kiss and you start making out. She''s a very good kisser, gentle yet passionate. You normally only experience this with girls who have kissed lots of other girls, and it clearly gets to you.'
 		'She also starts to undress you and you follow her in removing her clothes.'
 	elseif katjaQW['simultanous_girls'] = 1 or katjaQW['simultanous_boys'] > 3:
 		'You approach Katja for a kiss, which she readily reciprocates and it''s clear that she has some experience in the art of kissing. After a short while, you break off and start to remove your clothes while Katja slowly does the same.'
@@ -136,7 +563,7 @@ if $ARGS[0] = 'private_booth_FFM':
 											*clr & cla	
 											KatjaQW['horny'] += rand(10,20)						
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private11.jpg"></center>'
-											'Katja seems very eager to get some more cock, so much that she crawls up on your back to present her ass to <<$npc_nickname[$npclastgenerated]>>. He promptly removes his cock from your pussy and shoves it back in hers.'
+											'Katja seems very eager to get some more cock, so much so that she crawls up on your back to present her ass to <<$npc_nickname[$npclastgenerated]>>. He promptly removes his cock from your pussy and shoves it back in hers.'
 											if KatjaQW['horny'] >= 100:
 												KatjaQW['horny'] = 0
 												'He starts fucking her as hard as he can but Katja dares him to fuck her harder. Soon, she is howling when she has a huge orgasm on your back.'
@@ -183,6 +610,148 @@ if $ARGS[0] = 'private_booth_FFM':
 	end
 end
 
+if $ARGS = 'lone_bartender':
+	menu_off = 1
+	minut += 5
+	katjaQW['lone_bartender'] = daystart 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
+	'"Let'' go to one of the small bars upstairs. There are usually not that many people," Katja says, and you agree and follow her upstairs.'
+	'There you quickly find a bar that is actually empty except for the bartender. As you are about to enter Katja suddenly stops.'
+	'"I'' sorry, really need to powder my nose. Just go ahead, and start ordering" I will be back in just a minute, and before you can say anything, she'' gone.'
+	act 'Go to the bartender':
+		*clr & cla
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
+		'You approach the bar, where a rather handsome bartender looks like he is doing some cleaning.'
+		'"I''m sorry, but we are closed. You''ll have to find another bar." He says, just as you reach the bar.'
+		act 'Leave and wait for Katja outside':
+			*clr & cla
+			minut += 7
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+			'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+			act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+		end
+		act 'Try to convince him to stay open':
+			*clr & cla
+			minut += 1
+			gs 'exp_gain', 'persuas', rand(0,1)
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
+			'"Why don''t you stay open for my cute friend and me, handsome? It will just be one drink. I promise we won''t make any mess." You say, trying to make the best doe eyes you can.'
+			if pcs_persuas >= rand(50,100):
+				'It looks like he is seriously considering staying open for you. You think that pushing a little more will convince him.'
+				if hotcat > 8:
+					gs 'willpower', 'misc', 'force', 'easy'
+				elseif hotcat > 5:
+					gs 'willpower', 'misc', 'force'
+				else
+					gs 'willpower', 'misc', 'force', 'hard'
+				end
+				if will_cost <= pcs_willpwr:
+					act 'Convince the bartender to serve you (<<will_cost>> Willpower)':
+						*clr & cla
+						if hotcat > 8:
+							gs 'willpower', 'misc', 'force', 'easy'
+						elseif hotcat > 5:
+							gs 'willpower', 'misc', 'force'
+						else
+							gs 'willpower', 'misc', 'force', 'hard'
+						end						
+						gs 'willpower', 'pay', 'force'		
+						gs 'stat'
+						
+						'"Come on, please. It will just be me and my friend. We won''t be a bother. We''ll just have a quick drink. You would be the best bartender ever if you did." You continue.'
+						'He finally relents. "Okay. Just one drink and only you and your friend. No others. So what will you have?" he asks.'
+						$loc = 'katja_nightclub_sex'
+						$loc_arg = 'lonebartender_drinking'
+						gs 'food_menu', 'city_nightclub_only_cost'
+					end
+				else
+					act 'Convince  the bartender to serve you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
+				end
+			else
+				'It does''nt seem like your charm alone will convince him.'
+			end
+			if hotcat > 7:
+				'He''s clearly having a hard time taking his eyes off your hot body, and you can see how flustered he''s getting from your flirting.'
+				'You are sure that giving him a blow job would convince him to stay open, and he is quite good-looking.' 
+				gs 'willpower', 'bj', 'self', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Give him a blow job (<<will_cost>> Willpower)':
+						cla
+						if katjaQW['faithful'] = 1 and katjaQW['couple'] =1:
+							'As you are considering to give him a blow job, you remember that you promised Katja that you would be faithful.'
+							'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+							act 'Risk it':
+								gs 'willpower', 'pay', 'self'
+								gt 'katja_nightclub_sex', 'bartender_bj' 
+							end
+						else
+							if KatjaQW['boy_block'] = 1:
+								'As you are considering giving him a blowjob, you remember you told Katja that you are not into boys. She will definitely be surprised if she catches you with his dick in your mouth.'
+								'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+								act 'Risk it':
+									gs 'willpower', 'pay', 'self'
+									gt 'katja_nightclub_sex', 'bartender_bj' 
+								end
+							else
+								if katjaQW['knows_BJ'] = 0:
+									'As you are considering giving him a blowjob, you don''t think that Katja even knows you are giving boys blowjobs. You wonder how surprised she will be if she sees his dick in your mouth.'
+									'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+									act 'Give him the blow job':
+										gs 'willpower', 'pay', 'self'
+										gt 'katja_nightclub_sex', 'bartender_bj' 
+									end
+								else							
+									gs 'willpower', 'pay', 'self'
+									gt 'katja_nightclub_sex', 'bartender_bj' 
+								end
+							end
+						end
+						act 'Don''t give him the blow job':
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+							'You change your mind and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+							act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+						end						
+					end
+				else
+					act 'Give him a blow job(<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 'Leave and wait for Katja outside':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+				'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+				act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+			end			
+		end
+	end
+end
+
+if $ARGS[0] = 'lonebartender_drinking':
+	$loc = 'city_nightclub'
+	$loc_arg = 'bar'
+	$menu_loc = 'city_nightclub'
+	$menu_arg = 'bar'
+	menu_off = 1
+	minut += 15
+	gs 'stat'
+	katjaQW['drinks'] += rand(1,2)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
+	'Katja arrives as he is about to serve your order, and you quickly whisper to her that she should be quick and very kind to the bartender.'
+	'She does as you say and places her order immediately when he serves yours, and soon you both have your drinks talking until they are finished.'
+	'You thank the bartender again and head back to the dance floor.'
+	act 'Go dancing': gt 'katja_nightclub', 'dance'
+end
+
 if $ARGS[0] =  'bartender_bj': 
 	menu_off = 1
 	gs 'npcgeneratec', 0, 'Bartender', rand(18,38), rand(2,3)
@@ -211,7 +780,7 @@ if $ARGS[0] =  'bartender_bj':
 				gs 'arousal', 'end'
 				gs 'cum_call', 'mouth_swallow', $boy, 0
 				gs 'stat'
-				'You manage to just get back to the other side of the bar, and the bartender gets his pants zipped back up, when Katja comes back.'
+				'You manage to just get back to the other side of the bar, and the bartender gets his pants zipped back up when Katja comes back.'
 				'"Have you already ordered?" she asks.'
 				'"No, I was just about to," you say. "The bartender needed a little convincing to keep open for us," you say, subtly winking at the man.'
 				$loc = 'katja_nightclub_sex'
@@ -252,7 +821,7 @@ if $ARGS[0] = 'bartender_bj_katja':
 			'"Why is his dick in your mouth? You told me you didn''t like boys," Katja says, sounding very surprised but also a little disappointed.'
 			act 'You''re only doing it to keep the bar open':
 				'"I haven''t changed my mind. I''m just doing this so he will keep the bar open for us," you tell Katja. "I don''t like it."'
-				'"What the fuck? You''re gay!?" the bartender shouts, surprised. "I thought you liked me! But you''re just playing me like the cheep whore you are. Get out!" he continues.'
+				'"What the fuck? You''re gay!?" the bartender shouts, surprised. "I thought you liked me! But you''re just playing me like the cheap whore you are. Get out!" he continues.'
 				'"I was just..." you start but get interrupted by him yelling.'
 				'"Get out, you lesbian freak! Get out!" You can see he is getting really angry.'
 				act 'Leave fast':
@@ -261,7 +830,7 @@ if $ARGS[0] = 'bartender_bj_katja':
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
-					'You get up from your knees and almost run after Katja, who''s already left the bar. Out on the first floor platform, you stop.'
+					'You get up from your knees and almost run after Katja, who''s already left the bar. Out on the first-floor platform, you stop.'
 					'"That went well. I can see why you said you don''t like boys. But that was stupid of you to start something like trying to give him a blowjob," Katja says. "Let''s go to the main bar".' 
 					act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
 				end
@@ -312,7 +881,7 @@ if $ARGS[0] = 'bartender_bj_katja':
 						'"I''m just showing how grateful we are for keeping the bar open for us. You''re welcome to watch, or join," you answer, before turning back to his cock.'
 						'"You are such a slut," Katja replies.'
 						'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
-						act 'Get him of': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
+						act 'Get him off': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
 					end
 				end
 			end
@@ -331,7 +900,7 @@ if $ARGS[0] = 'bartender_bj_katja_watch':
 		gs 'stat'
 		*nl
 		'As you get up, you see that Katja is sitting in one of the couches near the bar. Apparently, she didn''t want to watch you give a blowjob.'
-		'"I''m done now, you can come and order your drink," you call to Katja as you move on the other side of the bar. She gets up and joins you while you order your drink.'
+		'"I''m done now, you can come and order your drink," you call to Katja as you move to the other side of the bar. She gets up and joins you while you order your drink.'
 	elseif katjaQW['slut'] < 50:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
 		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show Katja how it''s done.'
@@ -365,7 +934,7 @@ if $ARGS[0] = 'bartender_bj_katja_watch':
 		'"Slow down, Katja," you say as you move to the other side of the bar. After you sit down next to her, you start answering her questions. While trying to entertain her, you order your drinks.'	
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj3.jpg"></center>'
-		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show to Katja how it''s done.'
+		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show Katja how it''s done.'
 		'Katja starts cheering you on, tossing out one lewd comment after another while you blow the guy.'
 		'After a few minutes, he comes in your mouth, and you swallow it to Katja''s delight.'
 		gs 'arousal', 'bj', 3
@@ -407,7 +976,7 @@ end
 
 if $ARGS[0] = 'bartender_sex1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex1.jpg"></center>'
-	'"Enough sucking. I want that dick in my pussy," you say as you stand up. You '+iif($pantyworntype ! 'none', ' pull down you panties and ', ' ')+'lift up your dress before bending over.'
+	'"Enough sucking. I want that dick in my pussy," you say as you stand up. You '+iif($pantyworntype ! 'none', ' pull down your panties and ', ' ')+'lift up your dress before bending over.'
 	'Katja jumps onto the bar so her smooth pussy is just in front of your mouth.'
 	'You start to lick it, just as the bartender jams his <<dick>>cm, <<$dick_girth>> cock into your pussy.'
 	gs 'arousal', 'vaginal', 3, 'group'
@@ -545,7 +1114,7 @@ if $ARGS[0] = 'cheating_conversation':
 			else
 				gs 'exp_gain', 'persuas', rand(1,2)
 				gs 'npc_relationship', 'modify', 'A14', 'hate'
-				'"So you are just a cheep whore? That doesn''t make it better! How many others have you done it with behind my back?" Katja says, still crying but it seems to be more out of anger now.'
+				'"So you are just a cheap whore? That doesn''t make it better! How many others have you done it with behind my back?" Katja says, still crying but it seems to be more out of anger now.'
 				'"No one. This is the only time. I promise that it will never happen again," you say, trying to calm her down.'
 				'"I don''t know if I can trust you. Why did I fall in love with such a slut? I need to be alone," Katja says and turns around, walking towards the exit without giving you time to say anything else.'
 			end
@@ -596,13 +1165,13 @@ if $ARGS[0] = 'cheating_conversation':
 				gs 'willpower', 'pay', 'force'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				if $ARGS[1] = 'bartender':
-					'"I''m very sorry. I was just trying to get him to keep the bar open for us. The only way I knew, like the cheep Pavlovsk whore I am," you say.'
+					'"I''m very sorry. I was just trying to get him to keep the bar open for us. The only way I knew, like the cheap Pavlovsk whore I am," you say.'
 					'Your less-than-flattering description of yourself makes Katja laugh. "Don''t betray me again," she says, no longer very angry.'
-					'"But... It''s probably too much to ask. Seeing you are just a cheep whore from Five Eight estate. What shall I ever do with you?" she continue shaking her head, but with a small smile on her face.'
+					'"But... It''s probably too much to ask. Seeing you are just a cheap whore from Five Eight estate. What shall I ever do with you?" she continues shaking her head, but with a small smile on her face.'
 				else
 					'"I''m very sorry. I acted like the Pavlovsk slut my mother raised me to be. I won''t do it again," you say.'
-					'You less-than-flattering description of yourself makes Katja laugh. "Don''t betray me again," she says, no longer very angry.'
-					'"But... It''s probably to much to ask. Seeing you are just a dumb slut from Five Eight estate. What shall I ever do with you?" she continue shaking her head, but with a small smile on her face.'				
+					'Your less-than-flattering description of yourself makes Katja laugh. "Don''t betray me again," she says, no longer very angry.'
+					'"But... It''s probably too much to ask. Seeing you are just a dumb slut from Five Eight estate. What shall I ever do with you?" she continued shaking her head, but with a small smile on her face.'				
 				end
 				'"Let''s go dance," she continues.'
 				act 'Go dancing': gt 'katja_nightclub', 'dance'

+ 15 - 15
locations/katja_party.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'going_out':
 	if npc_sex['A14'] > 0 and (katjaQW['slut'] > 75 or katjaQW['pantiesQWstage'] >= 5):
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_surprised1.jpg"></center>'
 		'Katja has her back to you, half-dressed, seemingly in the process of putting on a dress. "Hey, Katja. What are doing?" you ask.'
-		'She turns around with her dress just hanging around her waist of her otherwise naked body. "I''m getting dressed to go '+iif(katjaQW['party_location'] = 1, 'out to have dinner', ' to a party')+'," Katja says, seemingly not bothered by being topless.' 
+		'She turns around with her dress just hanging around the waist of her otherwise naked body. "I''m getting dressed to go '+iif(katjaQW['party_location'] = 1, 'out to have dinner', ' to a party')+'," Katja says, seemingly not bothered by being topless.' 
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dressing_up_surprised2.jpg"></center>'
 		'Katja has her back to you, half-dressed, seemingly in the process of putting on a dress. "Hey, Katja. What are doing?" you ask.'
@@ -258,7 +258,7 @@ if $ARGS[0] = 'part_dress_check':
 		if pcs_sweat >= 50:
 			'Katja just whiffs her nose. "You need to shower first," she says. "You can use the shower on our floor. Here is a towel and some supplies," Katja adds, handing you a towel and a not-so-small bag of shower utilities.'
 			act 'Go take a shower':
-				noShampoo
+				noshampoo + 1
 				dynamic $showerdin
 				minut += 10
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'part_dress_check':
 			end
 		elseif PCloSkirt <= 2 and PCloPants <= 4 and PCloPanties ! 1 and ($clothingworntype ! 'salacious_dress' and $clothingworntype ! 'salacious_outfits') and katjaQW['changed_for_katja'] < daystart:
 			katjaQW['changed_for_katja'] = daystart
-			'"I''m sorry, but they have a dress code at the night club. So you need to wear a skirt or dress. Maybe some very short shorts or other extremely provocative outfit will also get you in,"  Katja says.'
+			'"I''m sorry, but they have a dress code at the nightclub. So you need to wear a skirt or dress. Maybe some very short shorts or other extremely provocative outfit will also get you in,"  Katja says.'
 			act 'Get changed':
 				minut += 10
 				gt 'wardrobe', 'start'
@@ -301,7 +301,7 @@ if $ARGS[0] = 'part_dress_check':
 				end
 			end
 		elseif (PCloQuality < 5 or PCloBimbo = 1) and katjaQW['recjected_katja_demand_for_better_clothes'] < daystart:
-			'"OK. They''ll let you in the club, but don''t you have something that is a little nicer?" Katja says, trying to be as polite as possible.'
+			'"OK. They''ll let you in the club, but don''t you have something a little nicer?" Katja says, trying to be as polite as possible.'
 			act 'Get changed again':
 				katjaQW['dom'] += rand(1,3)
 				minut += 10
@@ -316,7 +316,7 @@ if $ARGS[0] = 'part_dress_check':
 				act 'Continue': gt 'katja_party', 'party_look_approval'
 			end
 		elseif pcs_makeup < 2:
-			'"Lastly, we need to fix your makeup. Let me do it," Katja says before taking out her makeup kit, clearly not allowing you to deny her the fun of dolling you up. "How would you like you make up?" she asks.'
+			'"Lastly, we need to fix your makeup. Let me do it," Katja says before taking out her makeup kit, clearly not allowing you to deny her the fun of dolling you up. "How would you like your makeup?" she asks.'
 			pcs_hairbsh = 1
 			minut += 10
 			act 'Light touch-up':
@@ -434,7 +434,7 @@ if $ARGS[0] = 'party_heading_out':
 			'"Yes. That''s the spirit," she replies. She then prepares some lines for the two of you and finds some tubes to use to snort the cocaine.'
 			'You both put your tubes to your nostrils and lower your heads to the table and snort your lines.' 
 			*nl
-			'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+			'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 			'After a few minutes more, you''re ready to leave.'
 			act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 		end
@@ -467,7 +467,7 @@ if $ARGS[0] = 'party_heading_out':
 				'"Yes. That''s the spirit," she replies. You then prepare some lines for the two of you and find some tubes to use to snort the cocaine.'
 				'You both put your tubes to your nostrils and lower your heads to the table and snort your lines.' 
 				*nl
-				'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+				'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 				'After a few minutes more, you''re ready to leave.'
 				act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 			end
@@ -503,7 +503,7 @@ if $ARGS[0] = 'party_heading_out':
 								'"Come on, Katja. You don''t become an addict by just trying it once. I thought you were smart. Let''s just try it once; if we feel bad, we''ll never do it again," you say.'
 								'"I don''t know. I''m still not sure it''s something we should do," Katja says.'
 								'"Come on! Just once. Please?" you plead as you try to make your best puppy eyes.'
-								'"OK... Just once," Katja fianlly relents.'
+								'"OK... Just once," Katja finally relents.'
 								'"I knew I could count on you!" you say.'
 								act 'Take the drugs':
 									*clr & cla
@@ -520,7 +520,7 @@ if $ARGS[0] = 'party_heading_out':
 									*nl
 									'After a moment, her discomfort resides and she starts to talk. "I don''t feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.'
 									'That''s also when it hits you, and everything suddenly feels great. Katja sits there with a dreamy stare, then she starts giggling, which turns into a laugh that lasts for some time.'
-									'After some minutes, you both come down. "So how was was it?" you ask.'
+									'After some minutes, you both come down. "So how was it?" you ask.'
 									'"Well, it wasn''t so bad," she replies.'
 									'"Come on, Katja. It was great!" you say.'
 									'"Well, I''ll admit it was an interesting experience. But let''s get going," Katja answers, making it clear you won''t get her to admit to more.'
@@ -544,7 +544,7 @@ if $ARGS[0] = 'party_heading_out':
 						'"What?! You do drugs?!" Katja exclaims, shocked.'
 						'"'+iif(cocaine_count < 5, 'I''ve tried it a couple of times.', 'Sure I do.')+' It''s fun," you reply.'
 						'"I didn''t know that about you," Katja says, still surprised.'
-						'"Well, do you want try?" you ask.'
+						'"Well, do you want to try?" you ask.'
 						'"No way," Katja says.'
 						'"Come on. I''ll do some lines first so you can see how it''s done, and then it''ll be your turn," you tell her.'
 						'"Suit yourself, but I''m not doing that," she says, defiantly.'
@@ -558,7 +558,7 @@ if $ARGS[0] = 'party_heading_out':
 							'After a short moment, it hits you and you feel the full effect of the drug. "Damn, that was good!" you exclaim, as you come down a little.'
 							'You try to hand Katja the tube, "Your turn."'
 							'She''s still looking at you, like she doesn''t believe what just happened.'
-							'"I don''t do drugs. I''ve never done it before," she says, suddenly snapping out her daze.'
+							'"I don''t do drugs. I''ve never done it before," she says, suddenly snapping out of her daze.'
 							if func('katja_procedural', 'willing_to_be_naughty') < 100:
 								gs 'willpower', 'drugs', 'force', 'hard'
 							else
@@ -586,7 +586,7 @@ if $ARGS[0] = 'party_heading_out':
 									'After a moment, her discomfort resides and she starts to talk. "I don''t feel anything, except itching in my nose. I do-" Then it hits her, she stops mid-sentence and her eyes become wide open. "Wow!" is all she can say.'
 									'"See? I told you it would feel great!" you say.'
 									'Katja just replies with a dreamy stare, then she starts giggling, which turns into a laugh that lasts for some time.'
-									'After some minutes, you both come down. "So how was was it?" you ask.'
+									'After some minutes, you both come down. "So how was it?" you ask.'
 									'"Well, it wasn''t so bad," she replies.'
 									'"Come on, Katja. It was great!" you say.'
 									'"Well, I''ll admit it was an interesting experience. But let''s get going," Katja answers, making it clear you won''t get her to admit to more.'
@@ -651,7 +651,7 @@ if $ARGS[0] = 'party_heading_out':
 							'You prepare some lines and produce some tubes to snort it with and hand one of them to Katja, who takes it with unsteady hands. You both lower your heads to the table.'
 							'Then at the same time, you snort your lines. Katja '+iif(katjaQW['coke_stage'] = 2, 'has gotten used to it and it doesn''t irritate her nostrils anymore.', 'is still getting itching nostrils and has to concentrate on not sneezing.')
 							*nl
-							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
+							'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. Then she starts giggling, which turns into a laugh that lasts for some time.'
 							'After some minutes, you both come down and get ready to go partying.'
 							act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 						end
@@ -682,7 +682,7 @@ if $ARGS[0] = 'party_heading_out':
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You put your tubes to your nostrils and lower your heads to the table and snort your lines. Katja does it with great enthusiasm.' 
 						*nl
-						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 						'After some minutes, you both come down and get ready to go partying.'
 						act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 					end
@@ -701,7 +701,7 @@ if $ARGS[0] = 'party_heading_out':
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You both put your tubes to you nostrils and lower your heads to the table and snort your lines. Katja does it like it''s something she does all the time.' 
 						*nl
-						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
+						'After a moment, it hits you both. You feel wonderful while Katja just sits there with wide-open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
 						'After some minutes, you both come down and get ready to go partying.'
 						act 'Go to the metro': minut += 10 & gt 'katja_city',  'metro'
 					end			

+ 132 - 132
locations/katja_procedural.qsrc

@@ -1,136 +1,136 @@
 # katja_procedural
-!2022/08/02
-
-!!This files governs Katja''s procedural actions that are called form many places. 
-
-!! The model used for Katja''s porn scene was originally the porn actress Faye Reagan, lately Red Fox/Michelle H have also been used for a lot of content. But several other have also been used.
-
-!! The following variables are part of her story line (the name in the parenthesis is the old name of that variable):
-
-!! katjaQW['QWstage'] = 1 You have agreed to hang out with Katja afer school. (meynoldQW = 1)
-!! katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2)
-!! katjaQW['QWstage'] = 3 You have kissed Katja and she might be interested in more. (katjaFirstKiss = 1 and KatjaOTN)
-!! npc_sex['A14'] = 1 You have had at least one sexual experience with Katja.
-!! katjaQW['QWstage'] = 4 Katja have asked you to help have sex with a boy.
-!! katjaQW['QWstage'] = 5 You have agreed to help Katja have sex with a boy.
-!! katjaQW['QWstage'] = 6 You have talked with Katja about her first experience with a boy.
-!! katjaQW['QWstage'] = 7 You have told Katja about the boys in the park.
-
-!! katjaQW['liberated'] is set to one after some time if the player have not started Katja''s quest. It means she will start to be sexually active with out having the player character help her.
-
-!! katjaQW['first_time_in_nightclub'] is set to 1 if you have sex with Katja during a threesome at the night club before you start her storyline, and 2 if you make her come during that scene. Used trigger a different introduction to her storyline.
-
-!! katjaQW['boy_block'] is set to 1 if you tell Katja that you have no interest in boys when she ask about you sex experience whit boy.
-
-!! katjaQW['relationship_count_start'] is set to daystart when you have had sex with Katja and the yearstart is more than on (that is in the second year). It starts a countdown of 6 to 12 months before Katja will ask you about your relationship.
-!! katjaQW['relationship_talk'] = 1 you have had a discussion about your relationship.
-
-!! katjaQW['couple'] is set to 1 when you agree to be a couple.
-!! katjaQW['faithful'] is sent to 1 if you are a couple and agree not to have sex with others (unless you both participate)
-!! katjaQW['cheat_warning'] is set the first time Katja confronts the player because the caught them cheating and to 2 after the player have been caught so many times that Katja warns them that she will also starts to sleep around. 
-!! katjaQW['cheat_times'] the number of times since her last waring that Katja is certain that you cheated on her.
-
-!! katjaQW['sex_clossedness'] 0 mean no restriction on sex scenes with Katja, 1 mean only scenes with Katja and the player character are available, 2 mean that the player character wont have sex with Katja
-
-!! katjaQW['anal_quest'] =1 Katja has asked you to help her have anal sex with a boy.
-!! katjaQW['anal_quest'] =2 You have agreed to help Katja have anal sex with a boy.
-!! katjaQW['anal_quest'] =3 Katja has had anal sex with a boy and you discussed it afterwards.
-
-!! katjaQW['pantiesQWstage'] 	The stages of the side quest of getting Katja to go commando to school. 1 to 3 are just temporary counts,
-!!							4 means you have gotten Katja to take off her panties when you ask her, and 5 means that she won''t wear panties to school anymore.
-!!							If you want to check if Katja is not wearing panties at school use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
-
-!! katjaQW['school_kiss'] Increases the first two times you kiss at school. Used to trigger the kissing competition in the park. (flag_start_parc)
-
-!! katjaQW['slut'] a number that increases as Katja becomes more and more sexually liberated, and allows her to be willing to do more sexual stuff. (katjaSlut)
-!! katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, a negative means she is submissive and a positive means she is dominant. In general the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
-!! katjaQW['simultanous_boys'] the number of boys Katja have been with at the same time, Is not really set before the number is 2.
-!! katjaQW['simultanous_girls'] the number of girls Katja have been with at the same time including the player character, so it is not really set before the number is 2.
-
-!! katjaQW['horny'] a measure of Katja''s arousal. Grows until she have an orgasm and will determine how willing she is at the moment to have sex.
-!! katjaQw['drinks'] a measure of how drunk Katja is. 0 means sober, 8 quit drunk and 12 that she can barely stand.
-!! katjaQW['under_influnece_of_cocaine'] if positive it means that her inhibition is still affected by the cocaine she used.
-
-!! katjaQW['coke_stage'] = 0 Katja have never tried cocaine, and would need to be convinced by a difficult willpower check to try, the circumstances can make the check harder or easier,
-!! katjaQW['coke_stage'] = 1 Katja have tried cocaine at least once, but is still reluctant. Still need to be convinced by a willpower check try again, but not as difficult as the first time.
-!! katjaQW['coke_stage'] = 2 Katja have tried cocaine several times and is getting less reluctant to use it. Still need to be convinced by a willpower check try again, but easier and can at times be removed if the circumstances are right.
-!! katjaQW['coke_stage'] = 3 Katja have tried cocaine several times and is getting comfortable with using it. Does in general not need a willpower check to use it if offered, and might take it if offered even if the player character don''t unless forced not to by a willpower check.
-!! katjaQW['coke_stage'] = 4 Katja is starting to get into using cocaine. Does not need a willpower check to be convinced to take it, might ask the player character or other for it in the right situation (in general before or at a party), and would usually need a willpower check to be convinced to not use it. Might try to convince the player character to also take it.
-!! katjaQW['coke_stage'] = 5 Katja is getting even more into it. She will start to sometimes buy it herself and offer it to the Player characters in the right situations (at a party or such) and will need convincing to not take it herself. Still only a party user but might now take it at a party without the player being there.
-!! katjaQW['coke_stage'] = 6 Katja is starting to get addicted. She will almost always have some and will now start suggesting you are taking it more often, for example just hanging out an normal afternoon/evening and need willpower checks to be convinced not to take even if the Player character done''t take any. Still only takes some without the player being present at parties together with others.
-!! katjaQW['coke_stage'] = 7 Katja is addicted. Will take several times a week even with out the player characters presence. It will start to slowly affect her every day life. But will still be able to function more or less normally.
-!! katjaQW['coke_stage'] = 8 Katja is very addicted. Will take every day, and unless the player character provides she will start doing stuff to earn money for that takes time away from studying which will harm her education. She might not turn up to class because she was out all night trying to precure money for it, and will often not be found since she is trying to earn money for it, might prostitutes herself for the money.
-!! katjaQW['coke_stage'] = -1 Katja have been true a cold turkey/rehab and wont touch cocaine for the fear of getting addicted again.
-
-!!  katjaQW['coke_point'] A a variable used to change the katjaQW['coke_stage'].
-!! katjaQW['financial_strain'] A variable that is used to check if Katja is using more money on drugs thatn she have, so that she will start doing things to earn those money.
-
-!! katjaQW['park_sex'] 	a measure of what experience Katja has had with random guys in the park. 0 means she has not had sex with anybody in the park,
-!!					1 means that she has had sex with one guy at a time (either alone, in a threesome with the player character or while the player had sex with another guy next to them)
-!!					2 means she has had a threesome with 2 guys you met in the park, and 3 means she has paticipated in an orgy with guys from the park. (katjaSex)
-
-!! katjaQW['masturbates'] = 1 Katja has started masturbating at night if she get too horny. (KatjaMastr)
-!! The following 3 variables functions as pcs_throat, pcs_vag and pcs_ass does for the player character. So whenever Katja has sex with a guy or a dildo is used on her you should add code to change them as is done for the player character in arousal.
-!! npc_throat['A14'] The capacity for Katja to take a dick (or dildo) down her throat. (KatjaThroat)
-!! npc_vag['A14'] The capacity for Katja to take a dick (or dildo) in the vagina.
-!! 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['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.
-
-!! katjaQW['strapon_bj'] = 1 Katja has given a BJ to your strap-on.
-!! katjaQW['strapon_vag'] = 1 You have fucked Katja''s pussy with your strap-on.
-!! katjaQW['strapon_ass'] = 1 You have fucked Katja''s ass with your strap-on.
-!! katjaQW['fisted_vag'] = 1 You have fisted Katja''s vagina.
-
-!! katjaQW['ivan_pussy'] = 1 Katja has taken Ivan''s cock in her pussy.
-!! katjaQW['ivan_anal'] = 1 Katja has taken Ivan''s cock in her ass.
-!! katjaQW['marcus_pussy'] = 1 Katja has taken Marcus''s cock in her pussy.
-!! katjaQW['marcus_anal'] = 1 Katja has taken Marcus''s cock in her ass.
-!! 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['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.
-
-!! katjaQW['Lazar_Ivan_4some'] 1 means the had a foursome but no double penetration, 2 means that the player character received a double penetration during the first foursome and have not talked about it yet, and 3 is if the player character have received a double penetration and they have talked about the first foursome.
-
-!! katjaQW['Marcus_day'] is set to daystart if you or Katja ask to have a threesome with Marcus. Such that the question will only be asked once per day.
-!! katjaQW['Lazar_day'] is set to daystart if you or Katja ask to have a threesome with Lazar. Such that the question will only be asked once per day.
-
-!! katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective if the player tells her to use it. Should be used to check if Katja can become pregnant by if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure she is protected.
-!! katjaQW['birth_control_know'] = 1  Katja started taking birth control without talking with the player character, and has now told the player character that she uses birth control. Only used in one scene so that the player character does not continue to ask about it every time.
-
-!! KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all places). (KatjaOrgasm)
-!! katjaQW['take_of_panties_day'] is set to daystart if you get katja to take of her panties during school break.
-!! katjaQW['afterschool_hangout_day'] Is set to be equal daystart when you choose to hang out with Katja after school. (katjaMeynoldday)
-!! katjaQW['no_panties_day'] Is set to daystart if you show Katja that you are not wearing panties.
-!! katjaQW['no_panties_day_disco'] Is set to daystart if you show Katja that you are not wearing panties at the pav disco. (tangaday)
-
-!! katjaQW['knows_masterbation'] = 1 You have told Katja how you masturbate (KatjaKnowMastr =1)
-!! katjaQW['knows_self_fisting'] = 1 You have told Katja how you stuck your fist into your pussy
-!! katjaQW['knows_self_fisting_anal'] = 1 You have told Katja how you stuck your fist into your ass
-!! katjaQW['knows_BJ'] = 1 You have told Katja that you have given a guy a blow-job (KatjaKnowBJ =1)
-!! katjaQW['knows_sex'] = 1 You have told Katja that you have had virginal sex with a guy (KatjaKnowSex =1)
-!! katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
-!! katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
-!! katjaQW['know_Pirced_tongue'] = 1 katja have noticed your tongue piercing (KatjaKnowPirsA =1)
-
-!! katjaQW['school_sex'] = 1 Katja have taken you to a storage room at school to have sex. (katschoolsex)
-!! katjaQW['disco_Foto'] =1 somebody have takien a picture of Katja''s exposed breast at the disco. Right now to only use of this variable is so that another foto wont be taken. (katja_disco_Foto)
-
-!! katjaQW['drunk_help'] is set to 1 when Katja walks you home from the disco because you are to drunk. Will be reset to 0 after you talk to her about it at school. (meynoldQW = 3)
-!! katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not vearing panties. Will be reset to 0 at night. (katja_disco_end)
-!! KatjaQW['sex_in_the_park_comment'] temposry varibale which is set during sex with guys in the park to make sure she give the right comment before she says goodbuy. Will be rest to 0 when going home after sex. (KatjaOhrenet)
-
-!! katjaQW['know_katja_uni'] = 1 Katja has told you she is going to uni to study teaching.
-!! katjaQW['know_going_to_teaching_degree'] =1 you have told Katja that you are going to the university to study in the teaching program.
-!! katjaQW['meet_uni_class'] = 1 You have meet Katja in you uni class.
-
+!2022/08/0
+!{
+These files govern Katja''s procedural actions that are called from many places. 
+
+The model used for Katja''s porn scene was originally the porn actress Faye Reagan, lately Red Fox/Michelle H have also been used for a lot of content. But several others have also been used.
+
+The following variables are part of her storyline (the name in the parenthesis is the old name of that variable):
+
+katjaQW['QWstage'] = 1 You have agreed to hang out with Katja after school. (meynoldQW = 1)
+katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2)
+katjaQW['QWstage'] = 3 You have kissed Katja and she might be interested in more. (katjaFirstKiss = 1 and KatjaOTN)
+npc_sex['A14'] = 1 You have had at least one sexual experience with Katja.
+katjaQW['QWstage'] = 4 Katja has asked you to help have sex with a boy.
+katjaQW['QWstage'] = 5 You have agreed to help Katja have sex with a boy.
+katjaQW['QWstage'] = 6 You have talked with Katja about her first experience with a boy.
+katjaQW['QWstage'] = 7 You have told Katja about the boys in the park.
+
+katjaQW['liberated'] is set to one after some time if the player has not started Katja''s quest. It means she will start to be sexually active without having the player character help her.
+
+katjaQW['first_time_in_nightclub'] is set to 1 if you have sex with Katja during a threesome at the nightclub before you start her storyline, and 2 if you make her come during that scene. Used to trigger a different introduction to her storyline.
+
+katjaQW['boy_block'] is set to 1 if you tell Katja that you have no interest in boys when she asks you about your sexual experience with a boy.
+
+katjaQW['relationship_count_start'] is set to daystart when you have had sex with Katja and the yearstart is more than on (that is in the second year). It starts a countdown of 6 to 12 months before Katja will ask you about your relationship.
+katjaQW['relationship_talk'] = 1 you have had a discussion about your relationship.
+
+katjaQW['couple'] is set to 1 when you agree to be a couple.
+katjaQW['faithful'] is sent to 1 if you are a couple and agree not to have sex with others (unless you both participate)
+katjaQW['cheat_warning'] is set the first time Katja confronts the player because she caught them cheating and to 2 after the player has been caught so many times that Katja warns them that she will also start to sleep around. 
+katjaQW['cheat_times'] the number of times since her last wearing that Katja is certain that you cheated on her.
+
+katjaQW['sex_clossedness'] 0 means no restriction on sex scenes with Katja, 1 means only scenes with Katja and the player character are available, 2 means the player character wont have sex with Katja
+
+katjaQW['anal_quest'] =1 Katja has asked you to help her have anal sex with a boy.
+katjaQW['anal_quest'] =2 You have agreed to help Katja have anal sex with a boy.
+katjaQW['anal_quest'] =3 Katja has had anal sex with a boy and you discussed it after.
+
+katjaQW['pantiesQWstage'] 	The stages of the side quest of getting Katja to go commando to school. 1 to 3 are just temporary counts,
+							4 means you have gotten Katja to take off her panties when you ask her, and 5 means that she won''t wear panties to school anymore.
+							If you want to check if Katja is not wearing panties at school use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
+
+katjaQW['school_kiss'] Increases the first two times you kiss at school. Used to trigger the kissing competition in the park. (flag_start_parc)
+
+katjaQW['slut'] a number that increases as Katja becomes more and more sexually liberated, and allows her to be willing to do more sexual stuff. (katjaSlut)
+katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, a negative means she is submissive and a positive means she is dominant. In general, the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
+katjaQW['simultanous_boys'] the number of boys Katja has been with at the same time, Is not really set before the number is 2.
+katjaQW['simultanous_girls'] the number of girls Katja has been with at the same time including the player character, so it is not really set before the number is 2.
+
+katjaQW['horny'] a measure of Katja''s arousal. Grows until she has an orgasm and will determine how willing she is at the moment to have sex.
+katjaQw['drinks'] a measure of how drunk Katja is. 0 means sober, 8 quite drunk and 12 that she can barely stand.
+katjaQW['under_influnece_of_cocaine'] if positive it means that her inhibition is still affected by the cocaine she used.
+
+katjaQW['coke_stage'] = 0 Katja has never tried cocaine, and would need to be convinced by a difficult willpower check to try, the circumstances can make the check harder or easier,
+katjaQW['coke_stage'] = 1 Katja has tried cocaine at least once but is still reluctant. Still need to be convinced by a willpower check try again, but not as difficult as the first time.
+katjaQW['coke_stage'] = 2 Katja has tried cocaine several times and is getting less reluctant to use it. Still need to be convinced by a willpower check try again, but easier and can at times be removed if the circumstances are right.
+katjaQW['coke_stage'] = 3 Katja has tried cocaine several times and is getting comfortable with using it. Does in general not need a willpower check to use it if offered, and might take it if offered even if the player character don''t unless forced not to by a willpower check.
+katjaQW['coke_stage'] = 4 Katja is starting to get into using cocaine. Does not need a willpower check to be convinced to take it, might ask the player character or other for it in the right situation (in general before or at a party), and would usually need a willpower check to be convinced to not use it. Might try to convince the player character to also take it.
+katjaQW['coke_stage'] = 5 Katja is getting even more into it. She will start to sometimes buy it herself and offer it to the Player characters in the right situations (at a party or such) and will need convincing to not take it herself. Still only a party user but might now take it at a party without the player being there.
+katjaQW['coke_stage'] = 6 Katja is starting to get addicted. She will almost always have some and will now start suggesting you are taking it more often, for example just hanging out an normal afternoon/evening and need willpower checks to be convinced not to take even if the Player character done''t take any. Still only takes some without the player being present at parties together with others.
+katjaQW['coke_stage'] = 7 Katja is addicted. Will take several times a week even with out the player characters presence. It will start to slowly affect her every day life. But will still be able to function more or less normally.
+katjaQW['coke_stage'] = 8 Katja is very addicted. Will take every day, and unless the player character provides she will start doing stuff to earn money for that takes time away from studying which will harm her education. She might not turn up to class because she was out all night trying to precure money for it, and will often not be found since she is trying to earn money for it, might prostitutes herself for the money.
+katjaQW['coke_stage'] = -1 Katja have been true a cold turkey/rehab and wont touch cocaine for the fear of getting addicted again.
+
+ katjaQW['coke_point'] A a variable used to change the katjaQW['coke_stage'].
+katjaQW['financial_strain'] A variable that is used to check if Katja is using more money on drugs that she has, so that she will start doing things to earn those money.
+
+katjaQW['park_sex'] 	a measure of what experience Katja has had with random guys in the park. 0 means she has not had sex with anybody in the park,
+					1 means that she has had sex with one guy at a time (either alone, in a threesome with the player character or while the player had sex with another guy next to them)
+					2 means she has had a threesome with 2 guys you met in the park, and 3 means she has paticipated in an orgy with guys from the park. (katjaSex)
+
+katjaQW['masturbates'] = 1 Katja has started masturbating at night if she get too horny. (KatjaMastr)
+The following 3 variables function as pcs_throat, pcs_vag and pcs_ass does for the player character. So whenever Katja has sex with a guy or a dildo is used on her you should add code to change them as is done for the player character in arousal.
+npc_throat['A14'] The capacity for Katja to take a dick (or dildo) down her throat. (KatjaThroat)
+npc_vag['A14'] The capacity for Katja to take a dick (or dildo) in the vagina.
+npc_ass['A14'] The capacity for Katja to take a dick (or dildo) in her ass. (KatjaAnus)
+katjaQW['pussy_sex'] = 1 Katja has had pussy sex with a guy where the player character wasn''t present.
+katjaQW['anal_sex'] = 1 Katja has had anal sex with a guy where the player character wasn''t present.
+katjaQW['deepthroat'] Number of time Katja have deepthroated
+katjaQW['dp'] the number of times Katja has 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.
+
+katjaQW['strapon_bj'] = 1 Katja has given a BJ to your strap-on.
+katjaQW['strapon_vag'] = 1 You have fucked Katja''s pussy with your strap-on.
+katjaQW['strapon_ass'] = 1 You have fucked Katja''s ass with your strap-on.
+katjaQW['fisted_vag'] = 1 You have fisted Katja''s vagina.
+
+katjaQW['ivan_pussy'] = 1 Katja has taken Ivan''s cock in her pussy.
+katjaQW['ivan_anal'] = 1 Katja has taken Ivan''s cock in her ass.
+katjaQW['marcus_pussy'] = 1 Katja has taken Marcus''s cock in her pussy.
+katjaQW['marcus_anal'] = 1 Katja has taken Marcus''s cock in her ass.
+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['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.
+
+katjaQW['Lazar_Ivan_4some'] 1 means the had a foursome but no double penetration, 2 means that the player character received a double penetration during the first foursome and have not talked about it yet, and 3 is if the player character have received a double penetration and they have talked about the first foursome.
+
+katjaQW['Marcus_day'] is set to daystart if you or Katja ask to have a threesome with Marcus. Such that the question will only be asked once per day.
+katjaQW['Lazar_day'] is set to daystart if you or Katja ask to have a threesome with Lazar. Such that the question will only be asked once per day.
+
+katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective if the player tells her to use it. Should be used to check if Katja can become pregnant by if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure she is protected.
+katjaQW['birth_control_know'] = 1  Katja started taking birth control without talking with the player character, and has now told the player character that she uses birth control. Only used in one scene so that the player character does not continue to ask about it every time.
+
+KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all places). (KatjaOrgasm)
+katjaQW['take_of_panties_day'] is set to daystart if you get katja to take of her panties during school break.
+katjaQW['afterschool_hangout_day'] Is set to be equal daystart when you choose to hang out with Katja after school. (katjaMeynoldday)
+katjaQW['no_panties_day'] Is set to daystart if you show Katja that you are not wearing panties.
+katjaQW['no_panties_day_disco'] Is set to daystart if you show Katja that you are not wearing panties at the pav disco. (tangaday)
+
+katjaQW['knows_masterbation'] = 1 You have told Katja how you masturbate (KatjaKnowMastr =1)
+katjaQW['knows_self_fisting'] = 1 You have told Katja how you stuck your fist into your pussy
+katjaQW['knows_self_fisting_anal'] = 1 You have told Katja how you stuck your fist into your ass
+katjaQW['knows_BJ'] = 1 You have told Katja that you have given a guy a blow-job (KatjaKnowBJ =1)
+katjaQW['knows_sex'] = 1 You have told Katja that you have had virginal sex with a guy (KatjaKnowSex =1)
+katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
+katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
+katjaQW['know_Pirced_tongue'] = 1 katja have noticed your tongue piercing (KatjaKnowPirsA =1)
+
+katjaQW['school_sex'] = 1 Katja has taken you to a storage room at school to have sex. (katschoolsex)
+katjaQW['disco_Foto'] =1 somebody has taken a picture of Katja''s exposed breast at the disco. Right now to only use of this variable is so that another foto wont be taken. (katja_disco_Foto)
+
+katjaQW['drunk_help'] is set to 1 when Katja walks you home from the disco because you are too drunk. Will be reset to 0 after you talk to her about it at school. (meynoldQW = 3)
+katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not wearing panties. Will be reset to 0 at night. (katja_disco_end)
+KatjaQW['sex_in_the_park_comment'] temporary variabel which is set during sex with guys in the park to make sure she gave the right comment before she says goodbye. Will be reset to 0 when going home after sex. (KatjaOhrenet)
+
+katjaQW['know_katja_uni'] = 1 Katja has told you she is going to uni to study teaching.
+katjaQW['know_going_to_teaching_degree'] =1 you have told Katja that you are going to the university to study in the teaching program.
+katjaQW['meet_uni_class'] = 1 You have met Katja in your uni class.
+}
 if $ARGS[0] = 'hourly':
 	!! Modifies Katja''s state each hour, mainly reducing drugs and alcohol levels
 	gs 'katja_meynold_schedule'

+ 38 - 37
locations/katja_sex.qsrc

@@ -136,9 +136,9 @@ if $ARGS[0] = 'park':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver6_1.jpg"></center>'
 					end
 					'Running up to another guy, you hurriedly blurt out a greeting. "I want to see your tits."'
-					'He looks at you confused and you blush as you realize what you said. "No, I mean do you want to see my tits? No! I mean do you want to kiss me?" What''s wrong with you? The look of confusion passes on the guy''s face and he starts nodding. "Sure, I''ll kiss you if you show me your tits." You roll your eyes, but have no one to blame but yourself this time.'
+					'He looks at you confused and you blush as you realize what you said. "No, I mean do you want to see my tits? No! I mean do you want to kiss me?" What''s wrong with you? A look of confusion passes on the guy''s face and he starts nodding. "Sure, I''ll kiss you if you show me your tits." You roll your eyes but have no one to blame but yourself this time.'
 					act 'Agree':
-						'You quickly pull up your shirt and show him your breasts before pulling it down just as fast. A huge grins appears on his face and he kisses you as you take a picture.'
+						'You quickly pull up your shirt and show him your breasts before pulling it down just as fast. A huge grin appears on his face and he kisses you as you take a picture.'
 					end
 				end
 			end
@@ -207,7 +207,7 @@ if $ARGS[0] = 'prohorov_sex':
 												if katjaQW['anal_quest'] >= 2: gs 'willpower', 'pay', 'self'
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/pc/reactions/glare.jpg"></center>'
-												'You push Ivan''s hands away and turn your head to give him a dirty look. "Hey! Just watch!" You notice his crest fallen look, and as you turn back to Katja, you notice her disappointed expression as well.'
+												'You push Ivan''s hands away and turn your head to give him a dirty look. "Hey! Just watch!" You notice his crestfallen look, and as you turn back to Katja, you notice her disappointed expression as well.'
 												'Before you can say anything, the bell rings and you all rush to class. "Great show, girls!" you hear Ivan shout as you pull your shirt back on.'
 												
 												gs 'arousal', 'end'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'prohorov_sex':
 												'Katja quickly joins you and soon all three of you are kissing and fondling each other. At your encouragement, Ivan slips his finger into your ass, eliciting a moan of pleasure from you.'
 												'A few seconds later, the bell rings and you all break apart. "Meet me after school so we can continue this?" Ivan pleads as you and Katja get dressed.'
 												'You look at Ivan for a second and bite your lower lip in consideration. Turning to look at Katja, you find her looking at you and enthusiastically nodding. You can''t help but grin at her eagerness and nod as well.'
-												'"Meet us in the English classroom after school" you tel Ivan.'+iif(katjaQW['anal_quest']  >= 3 and katjaQW['slut']  >= 100,  ' Katja walks up to Ivan. "Meet us here after school and we''ll rock your world..." she says in a seductive tone and you watch as the biggest grin appears on his face. You turn to Katja and you both laugh as you all rush to class.', ' You noticed that Katja''s face is getting completely red before you all rush to class.')
+												'"Meet us in the English classroom after school" you tell Ivan.'+iif(katjaQW['anal_quest']  >= 3 and katjaQW['slut']  >= 100,  ' Katja walks up to Ivan. "Meet us here after school and we''ll rock your world..." she says in a seductive tone and you watch as the biggest grin appears on his face. You turn to Katja and you both laugh as you all rush to class.', ' You noticed that Katja''s face is getting completely red before you all rush to class.')
 											
 												gs 'arousal', 'anal_finger', -3
 												gs 'arousal', 'kiss', -3, 'lesbian'
@@ -280,14 +280,14 @@ if $ARGS[0] = 'marcus_wait':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/virgin/marcuswait1.jpg"></center>'
 	'You call Marcus'+iif(katjaQW['marcus_pussy'] = 0, ' and tell him the address, and he sounds very exicted to finally meet the mysterious girl whose virginity he will be taking',  ' and he almost too eagerly agrees to join you and Katja again for a threesome')+'. He says he will be there in 10 minutes.' 
 	'You tell Katja that he will be here soon and suggest that you greet him in your underwear. Katja'+iif(katjaQW['slut'] < 80, ' hesitantly', ' eagerly')+' agrees and you strip each other down and sit on the bed.' 
-	'While you wait, you getly stroke Katja''s body to keep her'+iif(npc_vag['A14'] + 5 < npc_dick['A146'] or katjaQW['marcus_pussy'] = 0, ' nerves down.', ' exicited.')+' Finally, after what seems like an eternity, you hear the doorbell ring.'
+	'While you wait, you getly stroke Katja''s body to keep her'+iif(npc_vag['A14'] + 5 < npc_dick['A146'] or katjaQW['marcus_pussy'] = 0, ' nerves down.', ' excited.')+' Finally, after what seems like an eternity, you hear the doorbell ring.'
 	act 'Tell him to come in':
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/virgin/marcuswait2.jpg"></center>'
 		'"Come in, the door is open!" you shout. After hearing the door close, you shout "We''re in here!"'
-		'Marcus enters the room and when he sees you and Katja in your underwear on the bed looking at him, '+iif(katjaQW['marcus_pussy'] = 0, 'he is momentarely stunned. The biggest smile you''ve ever seen on him then appears on his face.', ' his face breaks out in a huge smile.')
+		'Marcus enters the room and when he sees you and Katja in your underwear on the bed looking at him, '+iif(katjaQW['marcus_pussy'] = 0, 'he is momentarily stunned. The biggest smile you''ve ever seen on him appears on his face.', ' his face breaks out in a huge smile.')
 		iif(katjaQW['marcus_pussy'] = 0, '"You could have told me that you were offering me the hottest redhead in Pav, <<$pcs_nickname>>,"', '"I see that you''ve kept her warm for me,"')+' he says with a huge grin.'
 		act 'Tell him to join you':
 			*clr & cla
@@ -378,7 +378,7 @@ if $ARGS[0] = 'marcus_first':
 							*clr & cla
 							minut -= 3
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/virgin/katvirg9.jpg"></center>'
-							'You turn around and get on all fours as he scoots up behind you. He rubs the tip of his dick against your slit before sliding his massive cock back inside you and fucking you again, slowly working himself deeper into your pussy. As he fucks you, Katja kneels on the bed in front of you, leans forward and starts kissing you as Marcus continues fucking you.'
+							'You turn around and get on all fours as he scoots up behind you. He rubs the tip of his dick against your slit before sliding his massive cock back inside you and fucking you again, slowly working himself deeper into your pussy. As he fucks you, Katja kneels on the bed in front of you leans forward and starts kissing you as Marcus continues fucking you.'
 							gs 'arousal', 'vaginal', 3, 'group'
 							gs 'arousal', 'kiss', 3, 'lesbian', 'group'
 							gs 'stat'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'marcus_threesome':
 	act 'Watch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/virgin/katvirg5.jpg"></center>'
-		'She opens her mouth and starts sucking on his dick, taking it as deep as she can. She takes it surprisingly deep down her throat while jerking him off. She must be getting used to giving blowjobs, or has been practicing on her own. A few minutes go by before she stops, popping his dick out of her mouth and offering it to you.'
+		'She opens her mouth and starts sucking on his dick, taking it as deep as she can. She takes it surprisingly deep down her throat while jerking him off. She must be getting used to giving blowjobs or has been practicing on her own. A few minutes go by before she stops, popping his dick out of her mouth and offering it to you.'
 		gs 'arousal', 'voyeur_sex', 2, 'group'
 		gs 'stat'
 		act 'Give him a blowjob':
@@ -452,7 +452,7 @@ if $ARGS[0] = 'marcus_threesome':
 					*clr & cla
 					minut -= 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/marcusmff/marcusmff2.jpg"></center>'
-					'You keep rubbing her clit as she starts slamming herself down on him, moaning louder and louder as she goes. She seems to really be enjoying herself, but just as it seems like she''s starting to get close, Marcus suddenly lifts her off and places her gently aside. "You can''t have all the fun. It''s <<$pcs_nickname>>''s turn." Katja gives a slighty pouty look before smiling.'
+					'You keep rubbing her clit as she starts slamming herself down on him, moaning louder and louder as she goes. She seems to really be enjoying herself, but just as it seems like she''s starting to get close, Marcus suddenly lifts her off and places her gently aside. "You can''t have all the fun. It''s <<$pcs_nickname>>''s turn." Katja gives a slightly pouty look before smiling.'
 					if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 					if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 					gs 'arousal', 'vaginal_finger_give', 3, 'lesbian', 'group'
@@ -463,7 +463,8 @@ if $ARGS[0] = 'marcus_threesome':
 						minut -= 3
 						gs 'boyStat', 'A146'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/virgin/katvirg6.jpg"></center>'
-						'You smile and straddle Marcus, reaching down and lining his <<dick>>cm <<$dick_girth>> dick up with your slit before you slowly lower yourself down onto it. You feel it stretching you out as it fills you up, and once you''re all the way down, you start to slowly ride him, moaning in pleasure as you do. Marcus pulls Katja over and she straddles his face and starts moaning as he eats her out. She leans forward and starts kissing you as you ride Marcus. After a few minutes, she stops kissing you and looks at Marcus. "I want another go." He laughs and slaps you on the ass as he pulls out. Katja crawls over to him and he grabs her and flips her onto her back.'
+						'You smile and straddle Marcus, reaching down and lining his <<dick>>cm <<$dick_girth>> dick up with your slit before you slowly lower yourself down onto it. You feel it stretching you out as it fills you up, and once you''re all the way down, you start to slowly ride him, moaning in pleasure as you do.'
+						'Marcus pulls Katja over and she straddles his face and starts moaning as he eats her out. She leans forward and starts kissing you as you ride Marcus. After a few minutes, she stops kissing you and looks at Marcus. "I want another go." He laughs and slaps you on the ass as he pulls out. Katja crawls over to him and he grabs her and flips her onto her back.'
 						gs 'arousal', 'vaginal', 3, 'group'
 						gs 'arousal', 'kiss', 3, 'lesbian', 'group'
 						gs 'stat'
@@ -471,7 +472,7 @@ if $ARGS[0] = 'marcus_threesome':
 							*clr & cla
 							minut -= 6
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/marcusmff/marcusmff3.jpg"></center>'
-							'He slides his dick back in her and starts fucking her again. Since she''s getting the dick again, you straddle her face and sit on her. She start licking your wet pussy as you lean forward and start licking and sucking on her clit. You feel Marcus''s stomach slam against the top of your head with each thrust he takes into Katja.'
+							'He slides his dick back in her and starts fucking her again. Since she''s getting the dick again, you straddle her face and sit on her. She starts licking your wet pussy as you lean forward and start licking and sucking on her clit. You feel Marcus''s stomach slam against the top of your head with each thrust he takes into Katja.'
 							if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 							if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 							gs 'arousal', 'cuni', 3, 'lesbian', 'group'
@@ -482,7 +483,7 @@ if $ARGS[0] = 'marcus_threesome':
 								*clr & cla
 								minut -= 6
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/marcusmff/marcusmff4.jpg"></center>'
-								'This continues for several minutes before Katja stops licking you and starts moaning loudly. You keep licking her clit as Marcus fucks her, her moans getting louder and louder until she finally cries out and her whole body shakes as she has an intense orgasm. He fucks her all the way through her orgasm, and pulls out only once she stops shaking. He gets up to walk around you as Katja crawls out from under you, looking spent.'
+								'This continues for several minutes before Katja stops licking you and starts moaning loudly. You keep licking her clit as Marcus fucks her, her moans getting louder and louder until she finally cries out and her whole body shakes as she has an intense orgasm. He fucks her all the way through her orgasm and pulls out only once she stops shaking. He gets up to walk around you as Katja crawls out from under you, looking spent.'
 								if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 								if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 								katjaQW['horny'] = 0
@@ -565,7 +566,7 @@ if $ARGS[0] = 'katnatsex1':
 	'"Hey! Let''s show Natasha your room!"'
 	'You grab Katja''s hand and exit the shop, followed by a meekly Natasha. The journey back seems to take an eternity as the two girls eye one another silently, but finally, you enter Katjas''s room, quickly undress and jump onto the bed.'
 	'"So girls, how do we begin?"'
-	'The girls strip slower than you, and you can see Katja ogling a blushing (but not embarrassed) Natasha. They then jumps on the bed and looks at you expectantly.'
+	'The girls strip slower than you, and you can see Katja ogling a blushing (but not embarrassed) Natasha. They then jump on the bed and look at you expectantly.'
 	gs 'underwear', 'backup'
 	gs 'clothing', 'strip'
 
@@ -575,7 +576,7 @@ if $ARGS[0] = 'katnatsex1':
 		gs 'arousal', 'cuni_give', 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
-		'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced out Natasha and make her cuddle against her crotch.'
+		'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced-out Natasha and makes her cuddle against her crotch.'
 		'"Hm? Don''t worry <<$pcs_nickname>>, Natasha is in good hands."'
 		'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha give you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
 		'"Ouch! <<$pcs_nickname>>!"'
@@ -591,7 +592,7 @@ if $ARGS[0] = 'katnatsex1':
 			'The redhead grabs Natasha and pushes her against the headboard. The nerd tries to get up, squirming under Katja''s hands, but her weight immobilizes Natasha against the bed''s headboard. At the same time, you force open Natasha''s thighs. The nerd seems to be about to say something, but Katja stops her with a finger on the lips'
 			'"Shh. Don''t worry Natasha, you are too nervous. Let <<$pcs_nickname>> and I take care of that, ok?"'
 			'"Hm... Ok Katja. I trust... OUCH!"'
-			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and ends the struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
+			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and stops struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
 
 			act 'The girls seem too tired to continue.': gt 'katja_sex', 'katnatsex2'
 
@@ -644,7 +645,7 @@ if $ARGS[0] = 'katnatsex1':
 					'"Hmpf... <<$pcs_nickname>>... Muach... Is Katja''s... Lick..."'
 					'"Yeah... Slurp... Katja... Muach... Let''s give her a spectacle."'
 					'As you make out with the hot redhead, a gaze over her shoulder shows Natasha, squirming, not sure what to do. Finally, as it is evident that you aren''t going to let Katja fuck the little nerd, she slowly raises a hand towards her tit and the other down towards her pussy.'
-					'Katja sits hesitantly a moment, before hearing your slave''s moan, then looks into your eyes and begins to reply to your kisses. Soon, the sound of your own making out is joined with Natasha''s ragged breaths and wet slapping, that with a muffled scream, end in a much needed orgasm for the nerd.'
+					'Katja sits hesitantly a moment, before hearing your slave''s moan, then looks into your eyes and begins to reply to your kisses. Soon, the sound of your own making out is joined with Natasha''s ragged breaths and wet slapping, which with a muffled scream, end in a much-needed orgasm for the nerd.'
 
 					act 'Cuddles': gt 'katja_sex', 'katnatsex2'
 				end
@@ -661,18 +662,18 @@ if $ARGS[0] = 'katnatsex1':
 		'The redhead grabs Natasha and pushes her against the headboard. The nerd tries to get up, squirming under Katja''s hands, but her weight immobilizes Natasha against the bed''s headboard. At the same time, you force open Natasha''s thighs. The nerd seems to be about to say something, but Katja stops her with a finger on the lips'
 		'"Shh. Don''t worry Natasha, you are too nervous. Let <<$pcs_nickname>> and I take care of that, ok?"'
 		'"Hm... Ok Katja. I trust... OUCH!"'
-		'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and ends the struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
+		'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and stops struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
 
 		act 'Katja!':
 			*clr & cla
 			gs 'arousal', 'cuni_give', 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
-			'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced out Natasha and make her cuddle against her crotch.'
+			'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced-out Natasha and makes her cuddle against her crotch.'
 			'"Hm? Don''t worry <<$pcs_nickname>>, Natasha is in good hands."'
 			'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha give you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
 			'"Ouch! <<$pcs_nickname>>!"'
-			'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure on the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
+			'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure from the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
 			'"Now it''s my turn, isn''t it Katja?"'
 			'Natasha practically doesn''t react, happily snuggling under the redhead''s care, who somewhat tiredly(but satisfied) looks at you expectantly.'
 
@@ -723,9 +724,9 @@ if $ARGS[0] = 'katnatsex1':
 				gs 'arousal', 'cuni_give', 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
-				'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced out Natasha and make her cuddle against her crotch.'
+				'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced-out Natasha and makes her cuddle against her crotch.'
 				'"Hm? Don''t worry <<$pcs_nickname>>, Natasha is in good hands."'
-				'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha give you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
+				'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha gives you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
 				'"Ouch! <<$pcs_nickname>>!"'
 				'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure on the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
 				'"Now it''s my turn, isn''t it Katja?"'
@@ -755,11 +756,11 @@ if $ARGS[0] = 'katnatsex1':
 			gs 'arousal', 'cuni_give', 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
-			'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced out Natasha and make her cuddle against her crotch.'
+			'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced-out Natasha and makes her cuddle against her crotch.'
 			'"Hm? Don''t worry <<$pcs_nickname>>, Natasha is in good hands."'
 			'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha give you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
 			'"Ouch! <<$pcs_nickname>>!"'
-			'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure on the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
+			'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure from the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
 			'"Now it''s my turn, isn''t it Katja?"'
 			'Natasha practically doesn''t react, happily snuggling under the redhead''s care, who somewhat tiredly(but satisfied) looks at you expectantly.'
 
@@ -778,7 +779,7 @@ if $ARGS[0] = 'katnatsex1':
 					'"Hmpf... <<$pcs_nickname>>... Muach... Is Katja''s... Lick..."'
 					'"Yeah... Slurp... Katja... Muach... Let''s give her a spectacle."'
 					'As you make it, whit the hot redhead, a gaze over her shoulder, show Natasha, squirming, not sure what to do, but finally, as is evident, that you aren''t going to let Katja, fuck the little nerd, she slowly raises a hand towards a tit, and other get down towards her twat.'
-					'Katja sits hesitantly a moment, before hearing your slave''s moan, then, look into your eyes, and begin to reply to your kisses. Soon, the sound of your own making out is joined with Natasha''s ragged breaths and wet slapping, that with a muffled scream, end in a needy orgasm for the nerd.'
+					'Katja sits hesitantly a moment, before hearing your slave''s moan, then, looks into your eyes, and begins to reply to your kisses. Soon, the sound of your own making out is joined with Natasha''s ragged breaths and wet slapping, which with a muffled scream, end in a needy orgasm for the nerd.'
 
 					act 'Cuddles': gt 'katja_sex','katnatsex2'
 				end
@@ -796,7 +797,7 @@ if $ARGS[0] = 'katnatsex1':
 			'The redhead grabs Natasha and pushes her against the headboard. The nerd tries to get up, squirming under Katja''s hands, but her weight immobilizes Natasha against the bed''s headboard. At the same time, you force open Natasha''s thighs. The nerd seems to be about to say something, but Katja stops her with a finger on the lips'
 			'"Shh. Don''t worry Natasha, you are too nervous. Let <<$pcs_nickname>> and I take care of that, ok?"'
 			'"Hm... Ok Katja. I trust... OUCH!"'
-			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and ends the struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
+			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and stops struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
 
 			act 'Too tired... cuddle with the girls': gt 'katja_sex','katnatsex3'
 
@@ -805,9 +806,9 @@ if $ARGS[0] = 'katnatsex1':
 				gs 'arousal', 'cuni_give', 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS7.jpg"></center>'
-				'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced out Natasha and make her cuddle against her crotch.'
+				'You can only lick your lips as the ginger goddess smiles with grace and positions herself against the headboard. Then languidly, Katja opens her thighs so you can feast on her nectar, but as you kneel, the ginger grabs a spaced-out Natasha and makes her cuddle against her crotch.'
 				'"Hm? Don''t worry <<$pcs_nickname>>, Natasha is in good hands."'
-				'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha give you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
+				'She smiles as you pout and try on puppy eyes, but the cold bitch just caresses and kisses the nerdy girl as Natasha gives you sideways looks. Ok, message received. You are now her bitch... sigh... Time to serve your mistress!'
 				'"Ouch! <<$pcs_nickname>>!"'
 				'You smile, kissing the hickey that has just mysteriously appeared on Katja''s thigh and amorously, open her womanhood folds so your tongue can lick the redhead''s little love button. Her abstracted moans mix with Natasha''s insecure kisses as you take your time to take pleasure on the hotness between her legs, enjoying the slow cunnilingus as Katja approaches her orgasm. Finally, when she reaches it, you are so engrossed in the act that you practically lose it in the delicious moment when she tenses and relaxes.'
 				'"Now it''s my turn, isn''t it Katja?"'
@@ -833,8 +834,8 @@ if $ARGS[0] = 'katnatsex2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS9.jpg"></center>'
 	'The three of you lie on Katja''s bed. It''s quiet and nice, with a sleeping hot redhead at your left and a submissive nerd at your right.'
 	'"Ehm... <<$pcs_nickname>>, you know... my debt..."'
-	'"Hm? Oh yeah! I suppose that you have paid for something. I think it''s best if you leave. I want to pass some time with Katja."'
-	'Natasha doesn''t say anything. She just gets up and begins to redress, giving you a nice glance of her body, but before she leaves, you give her a signal to approach, then grab her hair and kiss her mouth. After a few moments, you release the nerd, who remains by the bedside a moment before giving Katja a quick peek that awakes the sleeping redhead. Before Katja can say anything, she exits the room.'
+	'"Hm? Oh yeah! I suppose that you have paid for something. I think it''s best if you leave. I want to spend some time with Katja."'
+	'Natasha doesn''t say anything. She just gets up and begins to redress, giving you a nice glance at her body, but before she leaves, you give her a signal to approach, then grab her hair and kiss her mouth. After a few moments, you release the nerd, who remains by the bedside a moment before giving Katja a quick peek that awakes the sleeping redhead. Before Katja can say anything, she exits the room.'
 	'"Hm?! What? <<$pcs_nickname>>? Huff! I''m wasted! That was nice... Hm? Where is Natasha?"'
 	'Kissing her, you explain to the redhead that Natasha has just left and then you snuggle against Katja, enjoying her company until you think it''s time to redress.'
 
@@ -863,7 +864,7 @@ if $ARGS[0] = 'katnatsex3':
 	'"Ehm... <<$pcs_nickname>>, you know... my debt..."'
 	'"Hm? Oh yeah! I suppose that you have paid something."'
 	'"Yes Natasha, she will forget ALL your debt. You are friends aren''t you <<$pcs_nickname>>?"'
-	'You turn surprised towards the redhead... Shit! Before you can retort, a horny and frustrated Natasha gets up and begins to redress, giving you a nice glance of her body, but before she leaves, Katja grabs her hand and kisses the nerd''s mouth. After a few moments, she releases Natasha, who remains by the bedside a moment, before quickly exiting the room.'
+	'You turn surprised towards the redhead... Shit! Before you can retort, a horny and frustrated Natasha gets up and begins to redress, giving you a nice glance at her body, but before she leaves, Katja grabs her hand and kisses the nerd''s mouth. After a few moments, she releases Natasha, who remains by the bedside a moment, before quickly exiting the room.'
 	'Katja is silent for a while, caressing your belly before sighing and redressing. She doesn''t say anything, but you doubt she is happy.'
 
 	act 'Redress and leave':
@@ -879,25 +880,25 @@ if $ARGS[0] = 'first_fisting':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'You tell Katja that of course you would love to show her how it feels the have a whole hand in your pussy. You tell her to strip of her clothes while you di the same and climb unto the bed with her.'
+	'You tell Katja that of course, you would love to show her how it feels to have a whole hand in your pussy. You tell her to strip off her clothes while you do the same and climb onto the bed with her.'
 	act 'Lay her down':
 		*clr & cla
 		gs 'arousal', 'foreplay_give', 3, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting1.jpg"></center>'
-		'Katja looks nervous as you lay her back on the bed. You give her a reassuring kiss before slowly moving down her body. She teeth bites her lip, as she watches you with anticipation, already thinking to herself she shouldn''t have asked for this. But she has come this far, it was too late to back out now. You move down her body letting your hands wander, cupping her breasts to place loving kisses on each nipple. Katja smiles down at you and gives a sigh of resignation, "Mmm, I can''t believe Im going through with this. Just be gentle...Please?" You nod with a sultry smile, reassuring her once again before you trail more kisses, down her stomach, and between her legs.'
+		'Katja looks nervous as you lay her back on the bed. You give her a reassuring kiss before slowly moving down her body. She teeth bites her lip, as she watches you with anticipation, already thinking to herself she shouldn''t have asked for this. But she has come this far, it was too late to back out now. You move down her body letting your hands wander, cupping her breasts to place loving kisses on each nipple. Katja smiles down at you and gives a sigh of resignation, "Mmm, I can''t believe I''m going through with this. Just be gentle...Please?" You nod with a sultry smile, reassuring her once again before you trail more kisses, down her stomach, and between her legs.'
 		act 'Get her ready':
 			*clr & cla
 			gs 'arousal', 'cuni_give', 3, 'lesbian'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting2.jpg"></center>'
-			'You give her clit one long loving kiss, sucking on it, before lapping along her slit and letting your tongue slip between her velvety folds. Katja''s hands reach down and grip the top of your head, pushing you deeper into her. Your tongue slipping further and further inside as you continue to lick every part of her insides and around her labia too.  You can hear Katja''s breath growing louder as you send waves of pleasure through her body. You pick up the pace as your first goal is to bring her to her an orgasm, to make sure she is wet enough for the trial ahead. You feel her legs wrapping around your head as she pulls you even closer into her. Keeping a steady pace your tongue explores her folds, lapping every place inside of her. You feel her whole body shake as you reach up with your hand and cup it below her wet vagina, getting it sopping wet from her climax as she moans out her first release.'
+			'You give her clit one long loving kiss, sucking on it, before lapping along her slit and letting your tongue slip between her velvety folds. Katja''s hands reach down and grip the top of your head, pushing you deeper into her. Your tongue slipping further and further inside as you continue to lick every part of her insides and around her labia too.  You can hear Katja''s breath growing louder as you send waves of pleasure through her body. You pick up the pace as your first goal is to bring her to her orgasm, to make sure she is wet enough for the trial ahead. You feel her legs wrapping around your head as she pulls you even closer to her. Keeping a steady pace your tongue explores her folds, lapping every place inside of her. You feel her whole body shake as you reach up with your hand and cup it below her wet vagina, getting it sopping wet from her climax as she moans out her first release.'
 			act 'Slip in first finger':
 				*clr & cla
 				gs 'arousal', 'vaginal_finger_give', 3, 'lesbian'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting3.jpg"></center>'
-				'Pulling away from her, you add your own saliva to your wet hand and reach forward and rub along her labia. Katja pulls out a clitoral stimulator and holds it to her pink button, looking down at you with lust filled eyes. "Are you ready Katja?", you ask with a mischievous look in your eye. Her only response is to nod and close her eyes. Grinning you slip in the first finger, making sure to get as much natural lube in as you can, sliding your thumb up to press down on the tip of her toy against her clit, pinching it from behind her folds, and letting your finger run along the sensitive parts hidden from view.'
+				'Pulling away from her, you add your own saliva to your wet hand and reach forward and rub along her labia. Katja pulls out a clitoral stimulator and holds it to her pink button, looking down at you with lust-filled eyes. "Are you ready Katja?", you ask with a mischievous look in your eye. Her only response is to nod and close her eyes. Grinning you slip in the first finger, making sure to get as much natural lube in as you can, sliding your thumb up to press down on the tip of her toy against her clit, pinching it from behind her folds, and letting your finger run along the sensitive parts hidden from view.'
 				act 'Add the second finger':
 					*clr & cla
 					gs 'arousal', 'vaginal_finger_give', 3, 'lesbian'
@@ -915,13 +916,13 @@ if $ARGS[0] = 'first_fisting':
 							gs 'arousal', 'vaginal_finger_give', 3, 'lesbian'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting6.jpg"></center>'
-							'Carefully you add your little finger, giving her small little thrusts until half of your hand slides into her. Rubbing your thumb against the tip of clitoral wand, you curl your fingers up against her G-spot just behind it. Katja cries out in extasy once more as you bring her to another climax, adding moisture to her already wet snatch'
+							'Carefully you add your little finger, giving her small little thrusts until half of your hand slides into her. Rubbing your thumb against the tip of the clitoral wand, you curl your fingers up against her G-spot just behind it. Katja cries out in ecstasy once more as you bring her to another climax, adding moisture to her already wet snatch'
 							act 'Push the whole hand in':
 								*clr & cla
 								gs 'arousal', 'vaginal_fist_give', 5, 'lesbian'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting7.jpg"></center>'
-								'Curling your thumb against your palm you slide it inside and give your hand a final push, feeling the walls of Katja''s labia sliding along it, until finally it clamps down around your wrist.  You take a moment to watch your friends face, as the realization that its all the way sinks into her. Katja’s mouth opens in a large ''O'', and doesn''t take her long to move her hips around your unmoving hand. Smiling, you lean down and lick along her clit, and around the buzzing toy, finally your hand starts to move again, pushing and twisting inside of her, pulling out ever so slightly before pushing back in. Her wetness over flows around your wrist, flooding the sheets like a waterfall, with each thrust of your arm, soon you are able to pull your hand half way out, before sliding it back in just as easily. Katja’s pussy start quivering around your hand as she orgasms once more, you keep your pace, pushing, pulling and twisting the whole way through it, she moans and cries out as her pleasure hits a crescendo, two more times almost non-stop. She moans and screams as her body continues to climax over and over again, each time your knuckle presses her G-spot. Then you finally slow down and give her clit one more long lick, before sliding your hand out.'
+								'Curling your thumb against your palm you slide it inside and give your hand a final push, feeling the walls of Katja''s labia sliding along it until finally it clamps down around your wrist.  You take a moment to watch your friend''s face, as the realization that it''s all the way sinks into her. Katja''s mouth opens in a large ''O'', and doesn''t take her long to move her hips around your unmoving hand. Smiling, you lean down and lick along her clit, and around the buzzing toy, finally, your hand starts to move again, pushing and twisting inside of her, pulling out ever so slightly before pushing back in. Her wetness overflows around your wrist, flooding the sheets like a waterfall, with each thrust of your arm, soon you can pull your hand halfway out, before sliding it back in just as easily. Katja''s pussy starts quivering around your hand as she orgasms once more, you keep your pace, pushing, pulling and twisting the whole way through it, she moans and cries out as her pleasure hits a crescendo, two more times almost non-stop. She moans and screams as her body continues to climax over and over again, each time your knuckle presses her G-spot. Then you finally slow down and give her clit one more long lick, before sliding your hand out.'
 								act 'Pull out':
 									*clr & cla
 									gs 'arousal', 'vaginal_fist_give', 2, 'lesbian'
@@ -942,7 +943,7 @@ if $ARGS[0] = 'first_fisting':
 										if katjaQW['fisted_vag'] = 0:  katjaQW['fisted_vag'] = 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting9.jpg"></center>'
-										'As you are sliding your body up and climbing up on top of Katja to hold her, her body still shakes as she deals with the aftershocks. You lost count how many times she cried out in new pleasure. She finally lets the buzzing toy drop to the side of the bed, wraps you in her arms and kisses you deeply. "Oh My God...oh my god....my body won''t stop...what did you do to me?...Ahhhh" she gasps out, as another one hits her stronger than the last few, she holds you tighter and squeezes you more as she rides through it, and relaxes afterwards, breathing heavily as if she just ran a marathon. "We definitely need to do that again, but not right away, I think I need to recover after that." '
+										'As you are sliding your body up and climbing up on top of Katja to hold her, her body still shakes as she deals with the aftershocks. You lost count of how many times she cried out in new pleasure. She finally lets the buzzing toy drop to the side of the bed, wraps you in her arms and kisses you deeply. "Oh My God...oh my god....my body won''t stop...what did you do to me?...Ahhhh" she gasps out, as another one hits her stronger than the last few, she holds you tighter and squeezes you more as she rides through it, and relaxes afterward, breathing heavily as if she just ran a marathon. "We definitely need to do that again, but not right away, I think I need to recover after that." '
 										act 'Talk with Katja': gt 'KatjaHomeTalk'
 										if mey_vika['key'] = 1:
 											act 'Leave the room': gt 'mey_home', 'start'

+ 68 - 52
locations/katja_uni.qsrc

@@ -21,7 +21,8 @@ if $ARGS[0] = 'first_in_class_meet':
 				else
 					katjaQW['annoyed'] = 2
 					gs 'npc_relationship', 'modify', 'A14', 'loathe'
-					'"Hey," Katja whispers in your ear. "Why didn''t you tell me that you were joining the teaching program?" She seems annoyed with you. Just as you think this, your suspicions are confirmed when her fingers find your nipples and she pinches them hard enough to make you gasp.'
+					'"Hey," Katja whispers in your ear. "Why didn''t you tell me that you were joining the teaching program?" She seems annoyed with you.'
+					'Just as you think this, your suspicions are confirmed when her fingers find your nipples and she pinches them hard enough to make you gasp.'
 					'"Sorry," you say, squirming in her arms while trying not to squeal. "I should have told you."'
 				end
 			else
@@ -31,31 +32,36 @@ if $ARGS[0] = 'first_in_class_meet':
 			end
 			if katjaQW['QWstage'] >= 7:
 				if katjaQW['annoyed'] = 1:
-					'"I suppose I''ll just have to forgive you," she says playfully, giving your breasts another gentle squeeze. "Have you seen all the hot guys around? You think we can find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"I suppose I''ll just have to forgive you," she says playfully, giving your breasts another gentle squeeze.'
+					'"Have you seen all the hot guys around? You think we can find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				elseif katjaQW['annoyed'] = 2:
-					'"I suppose I''ll just have to forgive you," she says, her tone softening to playful and giving your breasts a much more gentle squeeze. "Have you seen all the hot guys around? You think we can find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"I suppose I''ll just have to forgive you," she says, her tone softening to playful and giving your breasts a much more gentle squeeze.'
+					'"Have you seen all the hot guys around? You think we can find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				else
 					'"Have you seen all the hot guys around?" she asks excitedly, giving your breasts another playful fondle. "You think we can find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				end
 				'"Of course," you reply. "Who could say no to two hot chicks like us?"'
 				'"Anyways, we can find boys to fool around with later, we should get to class."'
-				'Katja gives your breast a last squeeze before removing her hands. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self conscious and more confident?'
+				'Katja gives your breast a last squeeze before removing her hands. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self-conscious and more confident?'
 			elseif katjaQW['QWstage'] = 6 or katjaQW['anal_quest'] >= 3:
 				if katjaQW['annoyed'] = 1:
-					'"I suppose I''ll just have to forgive you," she says playfully, giving your breasts another gentle squeeze. "Have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
+					'"I suppose I''ll just have to forgive you," she says playfully, giving your breasts another gentle squeeze. "Have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
 				elseif katjaQW['annoyed'] = 2:
-					'"I suppose I''ll just have to forgive you," she says, tone softening to playful and giving your breasts a much more gentle squeeze. "Have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
+					'"I suppose I''ll just have to forgive you," she says, tone softening to playful and giving your breasts a much more gentle squeeze. "Have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
 				else
-					'"Have you seen all the hot guys around?" she asks excitedly, giving your breasts another playful fondle. "Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
+					'"Have you seen all the hot guys around?" she asks excitedly, giving your breasts another playful fondle.'
+					'"Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' aren''t around, maybe we can find someone to join us sometime?"'
 				end
 				'"Of course," you reply. "Who could say no to two hot chicks like us?"'
 				'"Anyways, we can find boys to fuck later. We should get to class."'
-				'Katja gives your breast one last squeeze before removing her hands. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self conscious and more confident?'
+				'Katja gives your breast one last squeeze before removing her hands. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self-conscious and more confident?'
 			else
 				'"This is all so exciting!" she squeals. "Is it weird that it''s kind of turning me on? I almost feel like dragging you to an empty room right now."'
 				'Her breath is hot on your skin. The fondling of your breasts suddenly takes on a much more sensual feel and her lips brush against the back of your neck.'
 				'"But that would mean we would miss our first class," she says before abruptly pulling away, a mischievous smirk on her face. "So it''ll have to wait for later."'
-				'"Can''t wait..." you say, smiling back. Katja walks away, straight backed but with a bit of swing in her step. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self conscious and more confident?'
+				'"Can''t wait..." you say, smiling back. Katja walks away with a straight back and a bit of swing in her step. She seems much bolder than she was before. Maybe getting away from her childhood home has made her less self-conscious and more confident?'
 			end
 		elseif katjaQW['slut'] > 50:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/hug.jpg"></center>'
@@ -79,18 +85,22 @@ if $ARGS[0] = 'first_in_class_meet':
 			end
 			if katjaQW['QWstage'] >= 7:
 				if katjaQW['annoyed'] = 1:
-					'"I guess I can find it in myself to forgive you," she says, playfully nuzzling her head against yours. "But more importantly, have you seen all the hot guys around? You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"I guess I can find it in myself to forgive you," she says, playfully nuzzling her head against yours. "But more importantly, have you seen all the hot guys around?'
+					'You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				elseif katjaQW['annoyed'] = 2:
-					'"Well you''re here now, so I suppose I''ll forgive you," she says, pulling you tighter, pressing her breasts further into your back. "But <<$pcs_nickname>>, have you seen all the hot guys around? You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"Well you''re here now, so I suppose I''ll forgive you," she says, pulling you tighter, pressing her breasts further into your back. "But <<$pcs_nickname>>, have you seen all the hot guys around?'
+					'You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				else
 					'"Have you seen all the hot guys around? You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'" Katja asks, pressing her breasts further into your back while still hugging you.'
 				end
 				'"Of course," you reply. "Who could say no to two hot chicks like us?"'
 			elseif katjaQW['QWstage'] = 6 or katjaQW['anal_quest'] >= 3:
 				if katjaQW['annoyed'] = 1:
-					'"I guess I can find it in myself to forgive you," she says, playfully nuzzling her head against yours. "But more importantly, have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
+					'"I guess I can find it in myself to forgive you," she says, playfully nuzzling her head against yours. "But more importantly, have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
 				elseif katjaQW['annoyed'] = 2:
-					'"Well you''re here now, so I suppose I''ll forgive you," she says, pulling you tighter, pressing her breasts further into your back. "But <<$pcs_nickname>>, have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
+					'"Well you''re here now, so I suppose I''ll forgive you," she says, pulling you tighter, pressing her breasts further into your back. "But <<$pcs_nickname>>, have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
 				else
 					'"Have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?" Katja asks, pressing her breasts further into your back while still hugging you.'
 				end
@@ -100,7 +110,8 @@ if $ARGS[0] = 'first_in_class_meet':
 				'She hugs you tighter, pressing her breasts into your back, bringing her head down to give your neck a soft kiss.'
 				'"Absolutely..." you say, smiling back.'
 			end
-			'Katja releases you from her hug and carries on down the hallway past you. She walks straight backed but with a bit of swing in her step. Overall, she seems much bolder than she was before. Maybe getting away from her childhood home has made her less conscious about how she is seen?'
+			'Katja releases you from her hug and carries on down the hallway past you. She walks with a straight back and a bit of swing in her step. Overall, she seems much bolder than she was before.'
+			'Maybe getting away from her childhood home has made her less conscious about how she is seen?'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/hug.jpg"></center>'
 			if katjaQW['know_going_to_teaching_degree'] = 0:
@@ -112,7 +123,7 @@ if $ARGS[0] = 'first_in_class_meet':
 				else
 					gs 'npc_relationship', 'modify', 'A14', 'loathe'
 					'As you''re walking into the lecture hall, a pair of arms suddenly wrap themselves around your shoulders. You turn in surprise and find Katja holding you, an expression on her face that seems caught between a smile and a glare.'
-					'"Why didn''t you tell me that you were joining the teaching program?" Her lips go from a hybrid to a full on frown.'
+					'"Why didn''t you tell me that you were joining the teaching program?" Her lips go from a hybrid to a full-on frown.'
 					'"Sorry, I should have told you," you answer.'
 				end
 			else
@@ -123,18 +134,22 @@ if $ARGS[0] = 'first_in_class_meet':
 			end
 			if katjaQW['QWstage'] >= 7:
 				if katjaQW['annoyed'] = 1:
-					'"I guess I can find it in myself to forgive you," she says, letting her smile come back. "But more importantly, have you seen all the hot guys around? You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"I guess I can find it in myself to forgive you," she says, letting her smile come back. "But more importantly, have you seen all the hot guys around?'
+					'You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				elseif katjaQW['annoyed'] = 2:
-					'"Well you''re here now, so I suppose I''ll forgive you," she says, letting her frown fade away into a rueful smile. "But <<$pcs_nickname>>, have you seen all the hot guys around? You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
+					'"Well you''re here now, so I suppose I''ll forgive you," she says, letting her frown fade away into a rueful smile. "But <<$pcs_nickname>>, have you seen all the hot guys around?'
+					'You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'"'
 				else
 					'"Have you seen all the hot guys around?" she asks. "You think we can maybe find '+iif(katjaQW['park_sex'] < 3, 'one or maybe two guys who might have fun with us?', 'enough to satisfy our needs?')+'".'
 				end
 			elseif katjaQW['QWstage'] = 6 or katjaQW['anal_quest'] >= 3:
 				if katjaQW['annoyed'] = 1:
-					'"I guess I can find it in myself to forgive you," she says, letting her smile come back. "But more importantly, have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
+					'"I guess I can find it in myself to forgive you," she says, letting her smile come back. "But more importantly, have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
 					'"Of course," you reply "Who could say no to two hot chicks like us?"'
 				elseif katjaQW['annoyed'] = 2:
-					'"Well you''re here now, so I suppose I''ll forgive you," she says, letting her frown fade away into a rueful smile. "But <<$pcs_nickname>>, have you seen all the hot guys around? Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
+					'"Well you''re here now, so I suppose I''ll forgive you," she says, letting her frown fade away into a rueful smile. "But <<$pcs_nickname>>, have you seen all the hot guys around?'
+					'Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
 					'"Of course," you reply "Who could say no to two hot chicks like us?"'
 				else
 					'"Have you seen all the hot guys around?" she asks. "Since '+iif(katjaQW['marcus_pussy'] = 1, 'Marcus', '')+iif(katjaQW['marcus_pussy'] + katjaQW['ivan_anal'] = 2, 'and', '')+iif(katjaQW['ivan_anal'] = 1, 'Ivan', '')+' ain''t around, maybe we can find someone to join us sometime?"'
@@ -145,7 +160,8 @@ if $ARGS[0] = 'first_in_class_meet':
 				'Katja winks at you and you can''t help but smile back.'
 				'"Absolutely..." you say.'
 			end
-			'Katja gives you another quick hug, this time from the front in a way that squeezes both your breasts together before carrying on down the hallway past you. She walks straight backed but with a bit of swing in her step. Overall, she seems much bolder than she was before. Maybe getting away from her childhood home has made her less conscious about how she is seen?'
+			'Katja gives you another quick hug, this time from the front in a way that squeezes both your breasts together before carrying on down the hallway past you. She walks with a straight back and a bit of swing in her step.'
+			'Overall, she seems much bolder than she was before. Maybe getting away from her childhood home has made her less conscious about how she is seen?'
 		end
 	elseif katjaQW['QWstage'] > 0:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'	
@@ -153,13 +169,13 @@ if $ARGS[0] = 'first_in_class_meet':
 			if katjaQW['know_katja_uni'] = 0:
 				katjaQW['annoyed'] = 1
 				gs 'npc_relationship', 'modify', 'A14', 'dislike'
-				'As you''re walking into the lecture hall, somebody suddenly pokes you on your shoulder. You turn around and see a somewhat annoyed looking Katja.'
+				'As you''re walking into the lecture hall, somebody suddenly pokes you on your shoulder. You turn around and see a somewhat annoyed-looking Katja.'
 				'"Hey <<$pcs_nickname>>," she says flatly. "Why haven''t I seen you since we graduated? I had no idea that you were in this program!"'
 				'"Sorry, I didn''t think it was worth mentioning," you say. "Besides, you didn''t tell me were in this program either!"' 
 			else
 				katjaQW['annoyed'] = 2
 				gs 'npc_relationship', 'modify', 'A14', 'loathe'
-				'As you''re walking into the lecture hall, somebody suddenly pokes you on your shoulder. You turn around and see a pretty pissed looking Katja.'
+				'As you''re walking into the lecture hall, somebody suddenly pokes you on your shoulder. You turn around and see a pretty pissed-looking Katja.'
 				'"Why didn''t you tell me that you were joining the teaching program?!" she asks.'
 				'"Sorry, I should have told you," you answer.'
 			end
@@ -196,13 +212,13 @@ if $ARGS[0] = 'first_in_class_meet':
 					'As you enter the lecture hall, you hear a voice behind you. "So are you actually going to study this time around, or are you just here for the sex?" You turn round and see your old classmate, Katja Meynold, with a smile on her face.'
 					'"You could learn a thing or two from me," you say. "It''s going to get awfully boring around here if all you do is study for five years."'
 					'Katja shrugs. "I don''t think it''s going to be boring, and '+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I don''t really think you do either since you are here.', 'that wasn''t what you told me earlier when you said you were going to study to become a teacher.')+'"'
-					'"Well, there''s plenty of good looking boys here," you say while glancing around and grinning. "I think I''ll have plenty of ways to have fun."'
+					'"Well, there''s plenty of good-looking boys here," you say while glancing around and grinning. "I think I''ll have plenty of ways to have fun."'
 					'"You''re incorrigible," Katja says with a smile. "But we could chat about the classes and —if you''re serious about becoming a teacher— do some studying together." She then turns around to find a place to sit.'
 				elseif npc_rel['A14'] <= 20:
 					iif(katjaQW['know_going_to_teaching_degree'] = 0, '"Oh, I didn''t know that my school''s biggest slut would actually choose to study something where you have to be a role model for kids,"', '"This is the girl I told you about: the biggest slut in my school choosing to study something where you have to be a role model for kids,"')+' you hear someone say when you walk into the lecture hall.'
 					'As you look around, you see former classmate Katja talking to a girl you don''t recognize. When she sees that you''ve noticed her, she promptly drags the other girl away from you. Seems you have some work to do if you want to repair your relationship with her.'
 				else
-					'As you''re walking into the lecture hall, you suddenly come face to face with your old classmate, Katja. "Oh, hey <<$pcs_nickname>>," she says a little hesitantly. "'+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I didn''t know that you''d be starting in the teaching program.' , 'I wasn''t sure if you were joking when you said that you would be studying to become a teacher.')+' You do know that a teacher has to be a role model for the kids, so maybe you should try to act like an adult," she says, coming off a little more stern that she looks.'
+					'As you''re walking into the lecture hall, you suddenly come face to face with your old classmate, Katja. "Oh, hey <<$pcs_nickname>>," she says a little hesitantly. "'+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I didn''t know that you''d be starting in the teaching program.' , 'I wasn''t sure if you were joking when you said that you would be studying to become a teacher.')+' You do know that a teacher has to be a role model for the kids, so maybe you should try to act like an adult," she says, coming off a little sterner than she looks.'
 					'"I am acting like an adult," you reply. "Sex is a very adult thing to partake in. I''m sure your life would also be much better if you tried being more like me."'
 					'Katja''s face turns very red, and she just says "bye" before turning around to find a seat furthest away from you. You can''t help but get the feeling that she might be more interested in the things you do than she lets on.'
 				end
@@ -213,7 +229,7 @@ if $ARGS[0] = 'first_in_class_meet':
 						'"'+iif(katjaQW['know_katja_uni'] = 0, 'I didn''t know you were going to take these classes,', 'Yes, it''s important to be here for the first class,')+'" you reply.'
 						'"I think it''s going to be so fun and exciting. It''s nice to have friends in the class. We can talk about classes later and maybe study together," she says before saying goodbye and going off to find a place to sit.'
 					elseif npc_rel['A14'] <= 20:
-						'You see a redheaded girl trying to avoid you, and recognize her as your old classmate Katja. You decide to approach her. "Hi Katja!"'
+						'You see a redheaded girl trying to avoid you and recognize her as your old classmate Katja. You decide to approach her. "Hi Katja!"'
 						'"Hi <<$pcs_nickname>>," she replies, not looking particularly happy. "You know, you could try to be nicer and not just look down on others since you think you''re'+iif(grupTipe = 1, ' so cool', ' good at sports')+', that way others might like you more," she says before turning around and finding a place to sit.'
 					else
 						'"Hi <<$pcs_nickname>>. '+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I didn''t know you had decided to study to become a teacher,', 'I see that you''ve made you way to our first class,')+'" you hear someone say behind you. When you turn round, you see your former classmate Katja standing there.'
@@ -229,7 +245,7 @@ if $ARGS[0] = 'first_in_class_meet':
 						'You see a redheaded girl trying to avoid you, and recognize her as your old classmate Katja. You decide to approach her. "Hi Katja," you say.'
 						'"Hi <<$pcs_nickname>>," she replies, not looking particularly happy. "You know, you could try to be nicer and'+iif(grupTipe = 1 or grupTipe = 3, ' not just look down on others since you think you''re so much smarter than the rest of us,', ' not be such a bully,')+' that way others might like you more," she says before turning around and finding a place to sit.'
 					else
-						'"Hi <<$pcs_nickname>>. '+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I didn''t know you had decided to study to become a teacher.', 'I see that you''ve made your way to our first class,')+'" you hear someone say behind you. When you turn round, you see your former class mate Katja standing there.'
+						'"Hi <<$pcs_nickname>>. '+iif(katjaQW['know_going_to_teaching_degree'] = 0, 'I didn''t know you had decided to study to become a teacher.', 'I see that you''ve made your way to our first class,')+'" you hear someone say behind you. When you turn round, you see your former classmate Katja standing there.'
 						'"'+iif(katjaQW['know_katja_uni'] = 0, 'I didn''t know you were going to take these classes,', 'Yes, it is important to be here for the first class,')+'" you reply.'
 						'"I think it''s going to be so fun and exciting. It''s nice to have somebody you already know in the class, especially now that nobody''s going to judge us for talking simply because we belonged to some stupid cliques in school. Maybe we can talk about classes later?" she says before saying goodbye and finding a place to sit.'
 					end
@@ -274,9 +290,9 @@ if $ARGS[0] = 'panty_check':
 			'"Why are you wearing '+iif( CloSkirtShortness = 0, 'pants', 'such a long skirt')+'?" Katja asks. "I can''t check to see if you''re wearing panties or not!"'
 			'"I am '+iif($pantyworntype = 'none', 'of course not ', '')+'wearing panties," you say.'
 			if $pantyworntype = 'none': 
-				'"What''s the point of not wearing panties when there''s no chance that anyone can get a glimpse of your bare pussy? You can''t even feel the draft," she says. She looks at the clock and starts dragging you towards the toilets. "We have time before class for me to check if you''re lying."'
+				'"What''s the point of not wearing panties when there''s no chance that anyone can get a glimpse of your bare pussy? You can''t even feel the draft," she says. She looks at the clock and starts dragging you toward the toilets. "We have time before class for me to check if you''re lying."'
 			else
-				'"That will not do. Since when did you become a prude?" she asks playfully with a wink. She looks at the clock and starts dragging you towards the toilets. "We have time before class for rectifying this mistake of yours."'
+				'"That will not do. Since when did you become a prude?" she asks playfully with a wink. She looks at the clock and starts dragging you toward the toilets. "We have time before class to rectify this mistake of yours."'
 			end
 			gs 'willpower', 'exhib', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:	
@@ -333,8 +349,8 @@ if $ARGS[0] = 'panty_check':
 							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/double_panty_check.jpg"></center>'
-							'You move one of your hands under Katja''s skirt to find her bare and completely smooth pussy and gently start rubbing her pussy lips. "I''m not the only good girl around, it seems," you say. You continue rubbing each others pussies and you can feel that she is starting to get wet.' 
-							'Suddenly, you are disturbed by loud voices very close by, and you remember that you''re standing in the classroom with class about to start. You both quickly withdraw your hands and Katja turns to you saying with a grin and wink in her eye, "This is going to be really fun." She then licks her fingers leaves to find a place sit, and you are left wondering what kind of monster you have created.'
+							'You move one of your hands under Katja''s skirt to find her bare and completely smooth pussy and gently start rubbing her pussy lips. "I''m not the only good girl around, it seems," you say. You continue rubbing each other''s pussies and you can feel that she is starting to get wet.' 
+							'Suddenly, you are disturbed by loud voices very close by, and you remember that you''re standing in the classroom with classes about to start. You both quickly withdraw your hands and Katja turns to you saying with a grin and wink in her eye, "This is going to be really fun." She then licks her fingers and leaves to find a place to sit, and you are left wondering what kind of monster you have created.'
 							act 'Find a place to sit': gt 'uni_lessons1', $ARGS[1]
 						end
 					else
@@ -350,12 +366,12 @@ if $ARGS[0] = 'panty_check':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/panty_check.jpg"></center>'
 						'You just stand there, surprised about how bold Katja has gotten. She continues rubbing your pussy, making it harder for you to keep your voice down.' 
-						'Suddenly, you are disturbed by loud voices close by, and she remembers that you''re standing in the classroom with class about to start. She quickly withdraws her hand and turns to you, saying with a grin and wink in her eye, "This is going to be really fun." She then licks her fingers and leaves to find a place sit as you are left wondering what kind of monster you have created.'
+						'Suddenly, you are disturbed by loud voices close by, and she remembers that you''re standing in the classroom with classes about to start. She quickly withdraws her hand and turns to you, saying with a grin and wink in her eye, "This is going to be really fun." She then licks her fingers and leaves to find a place to sit as you are left wondering what kind of monster you have created.'
 						act 'Find a place to sit': gt 'uni_lessons1', $ARGS[1]
 					end
 				else
 					gs 'arousal', 'vaginal_finger', 1
-					'Katja moves one of her hands under your skirt and gently touches your panty covered pussy. "What''s that? I can feel panties," she whispers in shock while gently rubbing your pussy through the fabric. "You''ve become a very bad girl..." She looks at the clock. "This won''t do. Come with me, we have time before class starts," she says and starts dragging you towards the bathrooms.'
+					'Katja moves one of her hands under your skirt and gently touches your panty-covered pussy. "What''s that? I can feel panties," she whispers in shock while gently rubbing your pussy through the fabric. "You''ve become a very bad girl..." She looks at the clock. "This won''t do. Come with me, we have time before class starts," she says and starts dragging you towards the bathrooms.'
 					gs 'willpower', 'exhib', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:	
 						act 'Resist Katja (<<will_cost>> Willpower) ':
@@ -414,7 +430,7 @@ if $ARGS[0] = 'panty_check':
 					end
 				else
 					gs 'arousal', 'vaginal_finger', 1
-					'Katja moves one of her hands under your skirt and gently touches your panty covered pussy. "What''s that! I can feel panties," she whispers shocked while withdrawing her hand. "You''ve become a very bad girl..." She looks at the clock. "This won''t do. Come with me, we have time before class starts," she says and starts dragging you towards the bathrooms.'
+					'Katja moves one of her hands under your skirt and gently touches your panty-covered pussy. "What''s that! I can feel panties," she whispers shocked while withdrawing her hand. "You''ve become a very bad girl..." She looks at the clock. "This won''t do. Come with me, we have time before class starts," she says and starts dragging you towards the bathrooms.'
 					gs 'willpower', 'exhib', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:	
 					act 'Resist Katja (<<will_cost>> Willpower) ':
@@ -480,7 +496,7 @@ if $ARGS[0] = 'panty_check':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'	
 			if $pantyworntype = 'none': 
 				'"So, I''m still not wearing panties. Are you?" you ask.'
-				'"Yes, of course I am! Why should''t I?" she answers.'
+				'"Yes, of course, I am! Why should''t I?" she answers.'
 				'"Because life is more fun without panties," you say.'
 				'Looking at the clock, you see that there''s still enough time before class starts to go to the toilet and have her take off her panties.'
 				gs 'willpower', 'exhib', 'force', 'medium'
@@ -546,7 +562,7 @@ if $ARGS[0] = 'bathroom_panty_check':
 	menu_off = 1
 	minut += 3
 	gs 'stat'
-	'You follow Katja out of the lecture hall and quickly find your way to the girls room. Once you get inside, you see that they are empty save for the two of you.'
+	'You follow Katja out of the lecture hall and quickly find your way to the girl''s room. Once you get inside, you see that they are empty save for the two of you.'
 	if $pantyworntype = 'none': 
 		'"So, show me that you''re not wearing panties," Katja says.'
 		'You slowly '+iif(CloSkirtShortness = 0, 'unzip your pants and pull them down ', 'hike up your skirt ')+' so Katja can see your exposed pussy. "See. Are you satisfied?" you ask.'
@@ -585,7 +601,7 @@ if $ARGS[0] = 'bathroom_panty_check':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/bathroom_double_fingering.jpg"></center>'
 					'You move one of your hands under Katja''s skirt and find her bare, completely smooth pussy and gently start rubbing her pussy lips. You continue rubbing each other and you can feel that she''s starting to get wet.' 
-					'Katja starts moaning softly before she suddenly stops and pulls her self away from you, "Class is starting!" she says in an alarmed voice and runs back to the lecture hall.'
+					'Katja starts moaning softly before she suddenly stops and pulls herself away from you, "Class is starting!" she says in an alarmed voice and runs back to the lecture hall.'
 					'You quickly '+iif(CloSkirtShortness = 0, 'zip up your pants ', 'straighten your skirt ')+'and while rushing back to class, wonder what sort of monster you have created.'
 					act 'Find a place to sit': gt 'uni_lessons1', $ARGS[1]
 				end
@@ -732,7 +748,7 @@ if $ARGS[0] = 'bathroom_katja_panty_remove':
 	gs 'arousal', 'end'
 	gs 'stat'
 	katjaQW['pantiesQWstage'] = 5
-	'You drag Katja out of the lecture hall and hurry over to the girls room. Once you get inside, you quickly check to see they are empty save for the two of you.'
+	'You drag Katja out of the lecture hall and hurry over to the girl''s room. Once you get inside, you quickly check to see they are empty save for the two of you.'
 	*nl
 	if $pantyworntype = 'none': 
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/uni/taking_panties_of.mp4"></video></center>'
@@ -745,7 +761,7 @@ if $ARGS[0] = 'bathroom_katja_panty_remove':
 		
 		'"Okay, so let''s both take off our panties," you say.'
 		if CloSkirtShortness > 0:
-			'You reach under your skirt and tugging your panties down your legs. Katja is a little hesitant, but quickly follows your lead. You stuff yours into your purse and flip your skirt up, flashing Katja. She smiles back at you, doing the same, if not a little shyly.'
+			'You reach under your skirt and tugging your panties down your legs. Katja is a little hesitant but quickly follows your lead. You stuff yours into your purse and flip your skirt up, flashing Katja. She smiles back at you, doing the same, if not a little shyly.'
 		else
 			'You slip your thumbs into the bands of your underwear and tug them down. Katja''s eyes are trained on your pussy the whole time as you kick your ankles out of the leg holes. Moments later, she follows your lead, slipping her panties down her legs. After the panties have come off and you put them into your purses, she flips her skirt, giving you a fleeting view of her cleanshaven pussy.'
 		end
@@ -763,7 +779,7 @@ if $ARGS[0] = 'library':
 		gs 'npc_relationship', 'modify', 'A14', 'dislike'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_alone.jpg"></center>'
-		'You approach Katja, who is clearly studying. She notice you and says "I already told you once to go home to sleep until you are better. So go do it".'		
+		'You approach Katja, who is clearly studying. She notices you and says "I already told you once to go home to sleep until you are better. So go do it".'		
 		act 'Apologize and leave': gt 'uni_library', 'start'	
 	else
 		cla & *clr
@@ -914,7 +930,7 @@ if $ARGS[0] = 'studying':
 	else
 		minut += 15
 		gs 'stat'
-		'You and Katja start studying for your <<$ARGS[2]>> class. The library is mostly quiet so you and Katja try to keep you voices down, though she can''t always help herself when she gets excited about the material before realizing her volume and turning red with embarrassment.'
+		'You and Katja start studying for your <<$ARGS[2]>> class. The library is mostly quiet so you and Katja try to keep your voices down, though she can''t always help herself when she gets excited about the material before realizing her volume and turning red with embarrassment.'
 		*nl
 		if dyneval ('RESULT = class[''<<$ARGS[1]>>_<<$ARGS[2]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$ARGS[1]>>_<<$ARGS[2]>>_optional_weekly_max'']'):
 			'You study together for half an hour, making good progress, but can tell that you will need to study more if you want to completely understand this week''s material.'
@@ -1174,7 +1190,7 @@ if $ARGS[0] = 'dorm_room_walk':
 	if katjaQW['slut'] < 20: katjaQW['slut'] = 20
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
-	'"... and I bought the <i>cutest</i> dress at the mall. There''s so much variety here! Way more than what we had in Pavlovsk. And I passed the salon, so I thought about getting a mani-pedi but I decided I didn''t have time. There''s more swim shops here too but half of them are super slutty. I don''t know how any girl could wear some of the things they sell. They might as well just be string!"'
+	'"... and I bought the <i>cutest</i> dress at the mall. There''s so much variety here! Way more than what we had in Pavlovsk. And I passed the salon, so I thought about getting a mani-pedi but I decided I didn''t have time. There''s more swim shops here too but half of them are super slutty. I don''t know how any girl could wear some of the things they sell. They might as well just be strings!"'
 	*nl
 	'As you are walking to the dorms, Katja keeps telling you about her shopping trip yesterday, seeming unusually chatty today. When you reach the elevator, the light above it indicates it''s already on the top floor and you''d have to wait for it to come all the way back down.'
 	'Katja turns to you. "I live on the second floor, so let''s just take the stairs."'
@@ -1183,8 +1199,8 @@ if $ARGS[0] = 'dorm_room_walk':
 		gs 'arousal', 'voyeur', 3, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Stair_case_voyeur.jpg"></center>'
-		'You head up the stairs together and as you get to the second landing, Katja suddenly grabs you by the arm and yanks you backwards, stopping you from going any higher. You turn to look at her in confusion and see her eyes are wide.'
-		'Following her gaze up the staircase, you are greeted with the sight of two girls kissing, pressed up against the door. One of them has her hand up the other''s blouse, fondling her breast. In return, the second girl''s hand is under the first''s skirt, and from this angle you can see she''s knuckle deep in her pussy. Both of them seem to be trying to see who can get the other''s tongue deeper down the other''s throat.'
+		'You head up the stairs together and as you get to the second landing, Katja suddenly grabs you by the arm and yanks you backward, stopping you from going any higher. You turn to look at her in confusion and see her eyes are wide.'
+		'Following her gaze up the staircase, you are greeted with the sight of two girls kissing, pressed up against the door. One of them has her hand up the other''s blouse, fondling her breast. In return, the second girl''s hand is under the first''s skirt, and from this angle you can see she''s knuckle-deep in her pussy. Both of them seem to be trying to see who can get the other''s tongue deeper down the other''s throat.'
 		*nl
 		'They don''t stop, so engrossed in each other''s bodies that they don''t seem to have noticed you. In turn, the two of you stand there in awkward silence, unable to turn your eyes away from the intimate scene in front of you. Katja squirms next to you, struggling not to make a sound, her breathing labored.'
 		act'Continue':
@@ -1203,7 +1219,7 @@ if $ARGS[0] = 'dorm_room_walk':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dorm_room.jpg"></center>'
 				'You continue up the stairs and into Katja''s room in complete silence. Her side of the room is a lot less feminine than you would expect from a girl like her. The walls are plastered with posters and notes, and her shelves are lined with books. Her roommate''s side looks barren by comparison.'
 				*nl
-				'After you have taking in the look of her room, you turn to look at Katja. She hasn''t said anything since before the staircase and her blush hasn''t faded in the slightest. Just as you''re about to say something, she breaks the silence instead.'
+				'After you have taken in the look of her room, you turn to look at Katja. She hasn''t said anything since before the staircase and her blush hasn''t faded in the slightest. Just as you''re about to say something, she breaks the silence instead.'
 				'"<<$pcs_nickname>> have you ever done that? I mean kissed a girl and..." Her voice falters at the end, but she''s now looking at you with her big beautiful eyes.'
 				if girl > 0:
 					act 'Tell Katja you have kissed a girl and gone further': gt 'katja_uni', 'experienced_tell'
@@ -1259,7 +1275,7 @@ if $ARGS[0] = 'experienced_tell':
 				'"Oh! Yes!" she squeaks, clearly having forgotten after all the excitement. "Just give me a second!"' 
 				act 'Watch her try on her new clothes': gt 'katja_uni', 'try_clothes'
 			end
-			act 'Show Katja how women makes love': gt 'katja_uni_sex', 'first_time'
+			act 'Show Katja how women make love': gt 'katja_uni_sex', 'first_time'
 		end
 	end
 end
@@ -1354,8 +1370,8 @@ if $ARGS[0] = 'try_clothes':
 		minut += 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/showing_clothes2.jpg"></center>'
-		'Katja takes her time putting the dress on, and is almost teasing you when she finishes slipping on the dress that fits her curves wonderfully. It looks fantastic on her, and you are about to say something when the door opens and a girl steps in.'
-		'"Hi Katja, Maxim had a meeting with one of professors, so I- Oh! You have a guest."'
+		'Katja takes her time putting the dress on and is almost teasing you when she finishes slipping on the dress that fits her curves wonderfully. It looks fantastic on her, and you are about to say something when the door opens and a girl steps in.'
+		'"Hi Katja, Maxim had a meeting with one of the professors, so I- Oh! You have a guest."'
 		act 'Continue':
 			cla & *clr
 			minut += 3
@@ -1368,7 +1384,7 @@ if $ARGS[0] = 'try_clothes':
 			'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. Now that I think about it, I do think I''ve seen you in class.', 'studying to become a nurse.')+' So Katja is showing you her new clothes? She has such a great sense of fashion. Next time I have money to go shopping, I should bring her. Did you finish the show or was I disturbing?"'
 			'"No we''ve finished, and <<$pcs_nickname>> was about to leave," Katja says, looking at you as if trying to say she is sorry.'
 			'"That''s right, I will be leaving now," you say.' 
-			'"Nice meeting you," Sofia says. "I wish we had more time to chat since I barely knows anybody here, just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
+			'"Nice meeting you," Sofia says. "I wish we had more time to chat since I barely know anybody here, just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
 			'You say goodbye to Katja and as you leave the room, you can hear Sofia continuing to talk the ear off Katja.' 
 			act 'Leave': gt 'uni_dorm', 'second_floor'
 		end
@@ -1402,12 +1418,12 @@ if $ARGS[0] = 'katja_lazar_cafe':
 			'You smile at Lazar. "Things are going well. How are you finding college life?"'
 			'He nods with a friendly smile. "Good to hear. College life is amazing! I thought secondary school was a blast, but this blows that away. By the way, you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun..."'
 			*nl
-			'Katja grins at his comment and obvious interest, and his body language and way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time. Katja seems to respond in kind, which only encourages him more. It''s soon time for you to leave and you all get up from the table.'
+			'Katja grins at his comment and obvious interest. His body language and the way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time. Katja seems to respond in kind, which only encourages him more. It''s soon time for you to leave and you all get up from the table.'
 			act 'Leave': gt 'uni_cafe'
 		else
 			'You smile at Lazar. "Things are going well. How are you finding college life?"'
 			'He nods with a friendly smile. "Good to hear. College life is amazing! I thought secondary school was a blast, but this blows that away. By the way, you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun..."'
-			'Katja seems to be in two minds about his comment and obvious interest, and his body language and way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time, but it''s soon time for you to leave and you all get up from the table.'
+			'Katja seems to be in two minds about his comment and obvious interest. His body language and the way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time, but it''s soon time for you to leave and you all get up from the table.'
 			act 'Leave': gt 'uni_cafe'
 		end
 	end
@@ -1418,13 +1434,13 @@ if $ARGS[0] = 'katja_lazar_cafe':
 			'You smile at Lazar. "Things are going well, even better now that you'' re here. So, are you finding college life as exciting as I am?"'
 			'He nods with a friendly smile. "Damn, glad things are going so well for you," he says with a wink. "College life is amazing! I thought secondary school was a blast, but this blows that away. By the way, you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun..."'
 			*nl
-			'Katja grins at his comment and obvious interest, and his body language and way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time and Katja seems to respond in kind, which only encourages him more. It''s soon time for you to leave and you all get up from the table.'
+			'Katja grins at his comment and obvious interest. His body language and the way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time and Katja seems to respond in kind, which only encourages him more. It''s soon time for you to leave and you all get up from the table.'
 			act 'Leave': gt 'uni_cafe'
 		else
 			'You smile at Lazar. "Things are going well, even better now that you''re here. So, are you finding college life as exciting as I am?"'
 			'He nods with a friendly smile. "Damn, glad things are going so well for you," he says with a wink. "College life is amazing! I thought secondary school was a blast, but this blows that away. By the way, you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun..."'
 			*nl
-			'Katja seems to be in two minds about his comment and obvious interest, and his body language and way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time, but it''s soon time for you to leave and you all get up from the table.'
+			'Katja seems to be in two minds about his comment and obvious interest. His body language and the way he says things leave no doubt in your mind what he means. The three of you talk well past having finished your lunch; Lazar is charming, friendly and flirty the whole time, but it''s soon time for you to leave and you all get up from the table.'
 			act 'Leave': gt 'uni_cafe'
 		end
 	end

+ 48 - 46
locations/katja_uni_sex.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'first_time':
 			act 'Kiss her':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/first_time4.jpg"></center>'
-				'Once you''re both naked, you get back on your knees and pull her up into a sitting position and start passionately kissing her while your hands roam around her naked body. You can feel her hands returning the favor before you break the kiss. "Now it''s your turn," you say in a seductive manner, leaving no doubt that you want her to go down on you.'
+				'Once you''re both naked, you get back on your knees and pull her up into a sitting position and start passionately kissing her while your hands roam around her naked body. You can feel her hands returning the favor before you break the kiss. "Now it''s your turn," you say seductively, leaving no doubt that you want her to go down on you.'
 				gs 'arousal', 'kiss', 2, 'lesbian'
 				gs 'stat'
 				act 'Ask her to go down on you': gt 'katja_uni_sex', 'first_time_cuni_get'
@@ -37,14 +37,14 @@ if $ARGS[0] = 'first_time_cuni_get':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/first_time5.jpg"></center>'
-	'She bites her lower lip and grins as she crawls around behind you and gentle pushes you forward until you''re on all fours. Her wet tongue starts to lick your wet slit as her hair caresses your butt cheeks. You moan softly and lean forward until you''re on your elbows and knees, giving her easier access to your wet pussy.'
+	'She bites her lower lip and grins as she crawls around behind you and gently pushes you forward until you''re on all fours. Her wet tongue starts to lick your wet slit as her hair caresses your butt cheeks. You moan softly and lean forward until you''re on your elbows and knees, giving her easier access to your wet pussy.'
 	gs 'arousal', 'cuni', 2, 'lesbian'
 	gs 'stat'
 	act 'Grab her head':
 		cla & *clr
 		katjaQW['dom'] -= 5
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/first_time6.jpg"></center>'
-		'It starts feeling really good, so you reach back and grab her head and pull it against you, grinding her face against your wet pussy as you push your hips backwards. You start to take control and ride her face, using her mouth and tongue to give yourself maximum pleasure without a thought to her enjoyment. After a few minutes of this, you let go of her head and pull your dripping wet slit away from her face before you turn to face her, pulling her down on her back once more with her legs spread.'
+		'It starts feeling really good, so you reach back and grab her head and pull it against you, grinding her face against your wet pussy as you push your hips backward. You start to take control and ride her face, using her mouth and tongue to give yourself maximum pleasure without a thought to her enjoyment. After a few minutes of this, you let go of her head and pull your dripping wet slit away from her face before you turn to face her, pulling her down on her back once more with her legs spread.'
 		gs 'arousal', 'cuni', 3, 'lesbian', 'dom'
 		gs 'stat'
 		act 'Fingerbang her': gt 'katja_uni_sex', 'first_time_fingerbang_her'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'library_licking2':
 			gs 'katja_uni_sex', 'library_leave_actions'
 		end
 	elseif katjaQW['horny'] > 50 or katjaQW['slut'] >= 60:
-		'Katja immediately reacts by clamping her legs together with your head still between them. "Stop it <<$pcs_nickname>>. This isn''t the place for such things. Get out from there," she says in a hard tone.'
+		'Katja immediately reacts by clamping her legs together with your head still between them. "Stop it <<$pcs_nickname>>. This isn''t the place for such things. Get out of there," she says in a hard tone.'
 
 		gs 'willpower', 'cuni', 'force', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -251,7 +251,7 @@ if $ARGS[0] = 'library_licking3':
 	act 'Use your tongue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_licking4.jpg"></center>'
-		'Katja starts getting into it as you really start using your tongue on her. She leans back and puts one hand on your head, as if she is afraid that you would stop.'
+		'Katja starts getting into it as you really start using your tongue on her. She leans back and puts one hand on your head as if she is afraid that you would stop.'
 		gs 'arousal', 'cuni_give', 3, 'lesbian'
 		gs 'stat'
 		act 'Enjoy her pussy':
@@ -265,7 +265,7 @@ if $ARGS[0] = 'library_licking3':
 				katjaQW['slut'] += 3
 				katjaQW['horny'] = 0
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_licking5.jpg"></center>'
-				'Katja removes one on her hands to steady herself as you finally brings her to an orgasm. She is shaking for a long time, clearly trying to keep her voice down so as not to draw attention.'
+				'Katja removes one on her hands to steady herself as you finally bring her to an orgasm. She is shaking for a long time, clearly trying to keep her voice down so as not to draw attention.'
 				gs 'arousal', 'cuni_give', 1, 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -289,7 +289,7 @@ if $ARGS[0] = 'library_licking3':
 				else
 					minut += 5
 					gs 'stat'
-					'Katja composes her self and continue to study while you watch her.'
+					'Katja composes herself and continues to study while you watch her.'
 				end
 				killvar 'katja_library_consent'
 				gs 'katja_uni_sex', 'library_leave_actions'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'library_threesome1':
 	gs 'npcgeneratec', 0, 'Hot Student', rand(18,28), 2
 	gs 'boyStat', $npclastgenerated
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_threesome1.jpg"></center>'
-	'While you and Katja are sitting in one of the reading rooms of the library, a handsome guy comes into the room. He leans over you. "So how are the studys going my beautiful angels?"'
+	'While you and Katja are sitting in one of the reading rooms of the library, a handsome guy comes into the room. He leans over you. "So how are the studies going my beautiful angels?"'
 	'"Good. good. It''s going good," you manage to say as you notice Katja trying extremely hard to not start laughing over his corny lines.'
 	'"Well if it''s going so good, then perhaps you ladies need a break from your hard work..." he continues. "I''m <<$npc_nickname[$npclastgenerated]>> and will of course be more than willing to offer my services to make sure that you ladies are entertained during your respite." You look at Katja and see that she also understands his intentions.'
 	*nl
@@ -335,7 +335,7 @@ if $ARGS[0] = 'library_threesome1':
 	else
 		if katjaQW['QWstage'] < 6 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0:
 			'You can see Katja looking uncomfortable at his suggestion. "What the fuck? Get the hell away from us, perv!" you say in a harsh voice. He seems very surprised and doesn''t know what to say, so he just slowly backs away.'
-			'After he leaves the room, Katja can''t hold it any more and breaks out laughing "What a moron!" she says. "I can''t believe that they let such idiots enter the uni."'
+			'After he leaves the room, Katja can''t hold it anymore and breaks out laughing "What a moron!" she says. "I can''t believe that they let such idiots enter the uni."'
 			'"Maybe he''s a lab experiment that got loose?" you suggest, which just sends Katja into another giggling fit. After she stops laughing, you return to your work.'
 			act 'Finish up': gt 'katja_uni_sex', 'threeseome_over'
 		else
@@ -346,7 +346,7 @@ if $ARGS[0] = 'library_threesome1':
 					cla
 					if katjaQW['dom'] < -15:
 						'"No Katja, I don''t feel like it," you tell her.'
-						'She looks disappointed, but turns to the guy and says "No, we''re fine. We have no time for breaks." <<$npc_nickname[$npclastgenerated]>> takes the rejection with a smile. "Then I will leave you ladies to your work. Maybe another time?" he says before leaving you alone. It seems like he didn''t expect his pick-up line to have worked anyway.'
+						'She looks disappointed but turns to the guy and says "No, we''re fine. We have no time for breaks." <<$npc_nickname[$npclastgenerated]>> takes the rejection with a smile. "Then I will leave you ladies to your work. Maybe another time?" he says before leaving you alone. It seems like he didn''t expect his pick-up line to have worked anyway.'
 						act 'Finish up': gt 'katja_uni_sex', 'threeseome_over'
 					else
 						'"No Katja, I don''t feel like it," you tell her.'
@@ -359,7 +359,7 @@ if $ARGS[0] = 'library_threesome1':
 								gs 'willpower', 'pay', 'resist'
 								gs 'npc_relationship', 'modify', 'A14', 'dislike'
 								'"I said no, Katja!" you tell her in a stern voice.'
-								'She looks disappointed, but turns to the guy and says "No, we''re fine. My friend has no time for a break." <<$npc_nickname[$npclastgenerated]>> looks a little sad, as if he had gotten his hopes up that his pick-up line would actually work. "Then I will leave you ladies to your work. Maybe another time?" he says before leaving you alone.'
+								'She looks disappointed but turns to the guy and says "No, we''re fine. My friend has no time for a break." <<$npc_nickname[$npclastgenerated]>> looks a little sad, as if he had gotten his hopes up that his pick-up line would actually work. "Then I will leave you ladies to your work. Maybe another time?" he says before leaving you alone.'
 								act 'Finish up': gt 'katja_uni_sex', 'threeseome_over'
 							end
 						else
@@ -397,7 +397,7 @@ if $ARGS[0] = 'library_threesome1':
 				act 'Tell <<$npc_nickname[$npclastgenerated]>> that you are not interested':
 					cla
 					'You turn to <<$npc_nickname[$npclastgenerated]>>. "Sorry, but I don''t believe you have anything that could satisfy us."'
-					'He looks a little disappointed. "I believe you are wrong, but will accept the ladies wishes. You don''t know what know what pleasures you will miss out on!"'
+					'He looks a little disappointed. "I believe you are wrong, but will accept the lady''s wishes. You don''t know what know what pleasures you will miss out on!"'
 					'Once he is out of earshot, Katja scoffs. "What a jerk!"'
 					act 'Finish up': gt 'katja_uni_sex', 'threeseome_over'
 				end
@@ -408,8 +408,8 @@ end
 
 if $ARGS[0] = 'library_threesome2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_threesome2.jpg"></center>'
-	'After you and Katja agree, you get up while Katja turns around to face him. "It''s your lucky day," she says. "But don''t think it''s because of your cheesy pick up lines."'
-	'You get close to him and starts taking his shirt off as Katja slides her hand over his abs. "It''s only because you have something we need," you say, which prompts Katja to grab his already hard cock through his pants.'
+	'After you and Katja agree, you get up while Katja turns around to face him. "It''s your lucky day," she says. "But don''t think it''s because of your cheesy pick-up lines."'
+	'You get close to him and start taking his shirt off as Katja slides her hand over his abs. "It''s only because you have something we need," you say, which prompts Katja to grab his already hard cock through his pants.'
 	gs 'arousal', 'foreplay_give', 1, 'group'
 	gs 'stat'
 	act 'Show him that he is just your toy':
@@ -464,7 +464,7 @@ if $ARGS[0] = 'library_threesome2':
 									if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 									if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_threesome10.jpg"></center>'
-									'After a while, as he is fucking Katja, you get up and lie yourself on top of Katja. <<$npc_nickname[$npclastgenerated]>> then starts alternating between pounding his dick into your pussy and into Katja''s. After a doing this for a while, you hear Katja cum while he is inside her. When she comes down, he switches to you and is clearly getting close to cumming himself.'
+									'After a while, as he is fucking Katja, you get up and lie yourself on top of Katja. <<$npc_nickname[$npclastgenerated]>> then starts alternating between pounding his dick into your pussy and into Katja''s. After doing this for a while, you hear Katja cum while he is inside her. When she comes down, he switches to you and is clearly getting close to cumming himself.'
 									gs 'arousal', 'vaginal', 3, 'group'
 									gs 'stat'
 									act 'Finish':
@@ -477,7 +477,7 @@ if $ARGS[0] = 'library_threesome2':
 										'He continues to pound you, and you''re wondering if he will manage to pull out before he pulls out at the last second, causing his cum to splatter all over your pussy. You then climb off Katja and she slides off the table.'
 										'"That was amazing!" <<$npc_nickname[$npclastgenerated]>> says while getting dressed.'
 										'"Yeah, that wasn''t bad," Katja replies. '+iif(katjaQW['slut'] >= 100, '"At least he knows how to use his dick, even if he doesn''t know how to use his words,"', '"Yes. We did get something useful out of him after all, who would have thought with such a corny come on" you say.')+' <<$npc_nickname[$npclastgenerated]>> doesn''t seem to know how to react to that, and just puts on the rest of his clothes and leaves.'
-										'Once he''s gone, you and Katja break down laughing before finally getting clean up, your clothes back on and returning to the books.'
+										'Once he''s gone, you and Katja break down laughing before finally getting cleaned up, your clothes back on and returning to the books.'
 										cumspclnt = 1
 										gs 'cum_cleanup'
 										act 'Finish up': gt 'katja_uni_sex', 'threeseome_over'
@@ -513,9 +513,9 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some1.jpg"></center>'
-	'You and Katja leave the dorms, making your way off-campus to where Lazar lives. It''s not too far from the campus that you find the address. It''s a surprisingly nice looking house, fairly big too. At a guess, you would assume it has at least three or four bedrooms, maybe as many as five. You share a look as you take it in.'
+	'You and Katja leave the dorms, making your way off-campus to where Lazar lives. It''s not too far from the campus that you find the address. It''s a surprisingly nice-looking house, fairly big too. At a guess, you would assume it has at least three or four bedrooms, maybe as many as five. You share a look as you take it in.'
 	'"This is a really nice house," Katja says before knocking on the door.'
-	'A few seconds later, Lazar opens the door and is all smiles. He steps aside to invite you both in before closing the door behind you. He leads you into a really nice living room that is open to the kitchen in back. "Have a seat girls, make yourself comfortable."'
+	'A few seconds later, Lazar opens the door and is all smiles. He steps aside to invite you both in before closing the door behind you. He leads you into a really nice living room that is open to the kitchen in the back. "Have a seat girls, make yourself comfortable."'
 	act 'Sit down':
 		*clr & cla
 		gs 'stat'
@@ -575,7 +575,7 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 								else
 									'He reaches over and slaps Katja on the ass. "You''re up first." He then turns to you, "Sit at that end of the couch and spread your legs."'
 									'You don''t move. "You only get to fuck our butts today."'
-									'He snorts a laugh. "I can work with that. Get on your back and Katja can climb on top of you sixty nine style."'
+									'He snorts a laugh. "I can work with that. Get on your back and Katja can climb on top of you sixty-nine style."'
 									act 'Continue': gt 'katja_uni_sex', 'katja_anal_fucked'
 								end
 							end
@@ -594,7 +594,7 @@ if $ARGS[0] = 'katja_vag_fucked_lazar':
 	gs 'boyStat', 'A149'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some9.jpg"></center>'
-	'You sit down at the end of the couch and spread your legs apart. Lazar tells Katja to get up on the couch on all fours, with her face near your crotch. He gets on the other end of couch behind her.'
+	'You sit down at the end of the couch and spread your legs apart. Lazar tells Katja to get up on the couch on all fours, with her face near your crotch. He gets on the other end of the couch behind her.'
 	if npc_vag['A14'] = 0:
 		katjaQW['slut'] += 5
 		'Katja looks back at him, "Please be gentle, this is my first time."'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'katja_vag_fucked_lazar':
 	elseif katjaQW['lazar_pussy'] = 0:
 		katjaQW['slut'] += 1
 		'Katja looks back at him. "I don''t know what you like, but don''t be too rough with me; I like to make love."'
-		'He chuckles. "I will endeavor to give you the best love making you have ever had." Then she turns her attention to you and starts licking your clit. Katja moans into you as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure while she eats you out.'
+		'He chuckles. "I will endeavor to give you the best lovemaking you have ever had." Then she turns her attention to you and starts licking your clit. Katja moans into you as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure while she eats you out.'
 		'The louder she moans, the harder he starts to fuck her, but he doesn''t get too carried away. "I always heard you were really good; it''s nice to find out the rumors are true!"'
 	else
 		katjaQW['slut'] += 1
@@ -642,13 +642,13 @@ if $ARGS[0] = 'get_fucked_by_lazar':
 	'You move down the couch and straddle him, holding yourself over his dick.'
 	if pcs_vag = 0:
 		'"Please, be gentle. This is my first time," you tell him.'
-		'He looks surprised. "You sure? I could fuck you in the ass instead, if you want."'
+		'He looks surprised. "You sure? I could fuck you in the ass instead if you want."'
 		'You shake your head. "No, I''m sure. I''m ready and I want you to by my first."'
 		'You start to lower yourself, you feel the tip of his dick slide into your twat and you slow down as you take more of his length into you. You feel the pain of your hymen tearing, but it also feels good, better than you''d have thought.'
 		'Lazar seems content to let you control things and he coaxes Katja to sit on his face.'
 	elseif stat['vaginal'] = 0:
 		'"Please be gentle, this is my first time with a man," you tell him.'
-		'He looks a bit surprised. "You''re a virgin? You sure? I could fuck you in the ass instead, if you want."'
+		'He looks a bit surprised. "You''re a virgin? You sure? I could fuck you in the ass instead if you want."'
 		'"No, I''m not a virgin! I''ve just never been with a guy before," you tell him as you slowly start lowering yourself down, guiding his dick into your wet slit.'
 		'"Oh," You can sense his slight confusion. As you slowly lower yourself more until you feel completely full, Lazar seems content to just let you control things and he coaxes Katja to sit on his face so he can eat her out.'
 		'You moan loudly as you take more of his <<dick>>cm <<$dick_girth>> dick inside of you. "A dick feels different from a dildo, it is so much warmer!" You say to Katja as you slowly ride Lazar''s cock.'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'get_fucked_by_lazar':
 			act 'Ride him':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some11.jpg"></center>'
-				'You resist him trying to move you. "Nope, no ass for you today. Just be quiet and let me ride you." It feels so good to be in control. As you straddle his lap and plung his dick back in your wet pussy, Katja remounts his face as you keep riding him.'
+				'You resist him trying to move you. "Nope, no ass for you today. Just be quiet and let me ride you." It feels so good to be in control. As you straddle his lap and plunge his dick back in your wet pussy, Katja remounts his face as you keep riding him.'
 				'"Fuck... I''m about to cum," he groans loudly, and you both quickly climb off him.'
 				gs 'arousal', 'vaginal', 3, 'group'
 				gs 'stat'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'katja_anal_fucked':
 	gs 'boyStat', 'A149'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some13.jpg"></center>'
-	'Still holding on to you, Lazar puts you gently down on the couch before picking up Katja and setting her on top of you in a sixty-nine position. Katja lowers herself so her cunt is against your mouth and you start licking and sucking. Lazar grabs a bottle of lubricant before propping himself up behind Katja and presses his cock against her asshole.'
+	'Still holding on to you, Lazar puts you gently down on the couch before picking up Katja and setting her on top of you in a sixty-nine position. Katja lowers herself so her cunt is against your mouth and you start licking and sucking. Lazar grabs a bottle of lubricant before propping himself up behind Katja pressing his cock against her asshole.'
 	if npc_ass['A14'] = 0:
 		 katjaQW['slut'] += 5
 		'Katja looks back at Lazar, pleadingly. "Um, this is my first time trying anal. So please, go slow."'
@@ -731,7 +731,7 @@ if $ARGS[0] = 'katja_anal_fucked':
 		gs 'boyStat', 'A149'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some14.jpg"></center>'
 		'While you lick at Katja''s pussy, you watch as Lazar sinks his <<dick>>cm <<$dick_girth>> dick most of the way up her ass. She occasionally grunts and flinches when he goes a little too fast or pushes in a little too deep, but he always pulls backs and holds her in place.'
-		'Katja''s moans start to get louder and her pussy juice is running down over your face as she quickly approaches an orgasm. Lazar continues fucking her ass as she spasms over you but he pulls out of her once she''s done.'
+		'Katja''s moans start to get louder and her pussy juice is running down your face as she quickly approaches an orgasm. Lazar continues fucking her ass as she spasms over you but he pulls out of her once she''s done.'
 		'He looks down at you, "Come on, <<$pcs_nickname>>. I want to fuck your ass now."'
 		gs 'arousal', 'erotic', 2
 		gs 'arousal', 'cuni_give', -2, 'group', 'lesbian'
@@ -777,7 +777,8 @@ if $ARGS[0] = 'fucked_anal_by_lazar':
 		gs 'boyStat', 'A149'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some16.jpg"></center>'
-		'He starts slowly pushing his <<dick>>cm <<$dick_girth>> cock deeper up your ass, fucking you faster until he figures out your limit. Once he finds that sweet spot, he tries to stay in it. Sometimes he goes too deep or fast, which makes you cry out a bit, but he quickly backs off until he makes it feel as good as he can. After a bit, Katja reaches down and starts rubbing your clit.'
+		'He starts slowly pushing his <<dick>>cm <<$dick_girth>> cock deeper up your ass, fucking you faster until he figures out your limit. Once he finds that sweet spot, he tries to stay in it.'
+		'Sometimes he goes too deep or fast, which makes you cry out a bit, but he quickly backs off until he makes it feel as good as he can. After a bit, Katja reaches down and starts rubbing your clit.'
 		'Suddenly, Lazar yanks his dick out of your ass and scrambles to his feet. "Fuck, I''m cumming!"'
 		gs 'arousal', 'anal', 3, 'group'
 		gs 'arousal', 'clit_finger', -3, 'lesbian', 'group'
@@ -795,7 +796,8 @@ if $ARGS[0] = 'lazar_katja_cum':
 	if npc_sex['A149'] = 0: npc_sex['A149'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some17.jpg"></center>'
-	'You and Katja kneel down in front of Lazar as he starts furiously jerking off. You face each other with your mouths open and your tongues out, and soon you are rewarded with your treat when Lazar starts shooting cum all over your faces. He swaps between the two of you repeatedly until he finally stops cumming.'
+	'You and Katja kneel down in front of Lazar as he starts furiously jerking off. You face each other with your mouths open and your tongues out, and soon you are rewarded with your treat when Lazar starts shooting cum all over your faces.'
+	'He swaps between the two of you repeatedly until he finally stops cumming.'
 	'Panting and sweating, he moves over and drops onto the couch to catch his breath while he looks at the two of you covered in his cum.'
 	gs 'cum_call', 'face', 'A149', 1
 	act 'Leave':
@@ -816,19 +818,19 @@ if $ARGS[0] = 'lazar_katja_cum':
 			'"This is definitely something we need to repeat," she says. "Don''t worry, I still love your tongue on my pussy."'
 		elseif katjaQW['QWstage'] = 5:
 			katjaQW['QWstage'] = 6
-			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your fist time having sex with a boy?" you ask.'
+			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your first time having sex with a boy?" you ask.'
 			'"It was good," she answers "It''s definitely something we need to repeat," she says "Don''t worry, I still love your tongue on my pussy."'
 		elseif katjaQW['anal_quest'] = 2:
 			katjaQW['anal_quest'] = 3
-			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your fist time having a dick in your ass?" you ask.'
+			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your first time having a dick in your ass?" you ask.'
 			'"It was an interesting experience and kind of exciting," she says "This is something I want to try again. Don''t worry, I still love your tongue on my pussy."'
 		else
 			'As you walk back towards the campus, Katja starts talking about how great the sex with Lazar was, to which you agree.'
 		end
 		if katjaQW['birth_control_start_day'] > daystart:
-			'"Are you on birth control?" you ask. "Yes but I don''t thing it is working yet. I should probably go take a mooning after pill to be safe" Katja says looking a little worried.'
+			'"Are you on birth control?" you ask. "Yes but I don''t think it is working yet. I should probably go take a morning-after pill to be safe" Katja says looking a little worried.'
 		elseif katjaQW['birth_control_start_day'] = 0:
-			'"Are you on birth control?" you ask. "No. But I definitely should be. I will go get started tomorrow, and maybe also take a morning after pill to be safe" Katja says looking a little worried.'
+			'"Are you on birth control?" you ask. "No. But I definitely should be. I will go get started tomorrow, and maybe also take a morning-after pill to be safe" Katja says looking a little worried.'
 			katjaQW['birth_control_start_day'] = daystart + 15
 		elseif katjaQW['birth_control_know'] = 0:
 			katjaQW['birth_control_know'] = 1
@@ -896,7 +898,7 @@ if $ARGS[0] = 'lazar_ivan_katja_uni_4some':
 				act 'Swap cocks':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some4.jpg"></center>'
-					'"Let''s see if you both are equally skilled," Ivan says when he pulls you of his cock.'
+					'"Let''s see if you both are equally skilled," Ivan says when he pulls you off his cock.'
 					'"Yes, let''s switch," Lazar agrees, letting Katja off his dick.'
 					'You and Katja turn around and, without changing places, start devouring Lazar''s cock while Katja takes Ivan''s dick in her hungry mouth.'
 					if npc_throat['A14'] < dick1: npc_throat['A14'] += 1
@@ -954,7 +956,7 @@ if $ARGS[0] = 'lazar_ivan_katja_uni_4some':
 									'"Of course," she answers.'
 									'Lazar passes the bottle to Ivan, and you soon feel the cool ointment being spread on your asshole by Ivan''s finger.'
 								end
-								'After both of you are lubed up, the guys positions their dicks at your assholes.'
+								'After both of you are lubed up, the guys position their dicks at your assholes.'
 								gs 'arousal', 'anal_finger', 1, 'lube', 'group'
 								katjaQW['lube'] = 1
 							else
@@ -979,7 +981,7 @@ if $ARGS[0] = 'lazar_ivan_katja_uni_4some':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some8.jpg"></center>'
 									'You do as Lazar says and sit down on his <<$dick_girth2>> dick. Ivan moves so that his cock is in your face and Katja joins you in sucking it while you ride Lazar.'
-									'After a short period of time, Ivan moves away and gets behind you, lining his dick with your asshole.'
+									'After a short period, Ivan moves away and gets behind you, lining his dick with your asshole.'
 									gs 'arousal', 'vaginal', 3, 'dick2', 'group'
 									gs 'arousal', 'bj', -2, 'dick1', 'group'
 									gs 'stat'
@@ -1025,7 +1027,7 @@ if $ARGS[0] = 'lazar_ivan_dp':
 	act 'Get both of your holes pounded':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some10.jpg"></center>'
-		'They have really amped up the intensity and you''re getting both your ass and pussy pounded hard. Katja moves around and her mouth and tongue finds yours and you start making out.'
+		'They have really amped up the intensity and you''re getting both your ass and pussy pounded hard. Katja moves around and her mouth and tongue find yours and you start making out.'
 		gs 'arousal', 'vaginal', 3, 'dick2', 'group'
 		gs 'arousal', 'anal', -3, 'dick1', 'group'
 		gs 'arousal', 'kiss', -3, 'lesbian', 'group'
@@ -1095,7 +1097,7 @@ if $ARGS[0] = 'lazar_ivan_katja_dp':
 				'When Ivan finally stops pushing, you ask Katja if she is okay. She says she is, though she does not sound convincing, so you signal to Ivan that he should hold.'
 				'After a little while, Katja doesn''t seem to be in pain anymore. Ivan asks if she''s okay and if they can start to move, and she agrees with a slight nod. The guys start moving and try to coordinate their thrusts to give Katja the most pleasure.'
 			else
-				'When Ivan stops pushing, he waits a little until Katja '+iif(katjaQW['dp'] < 5, 'tells them to start moving.', 'yells in frustration, "Fuck me! Use those cocks!"')+' Then the guys start to moving and they try to coordinate their thrusts to give Katja the most pleasure.'
+				'When Ivan stops pushing, he waits for a little until Katja '+iif(katjaQW['dp'] < 5, 'tells them to start moving.', 'yells in frustration, "Fuck me! Use those cocks!"')+' Then the guys start to moving and they try to coordinate their thrusts to give Katja the most pleasure.'
 			end
 		end
 		if npc_vag['A14'] < dick2: npc_vag['A14'] += 1
@@ -1134,7 +1136,7 @@ if $ARGS[0] = 'lazar_ivan_anal2':
 		act 'Cum shots':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some15.jpg"></center>'
-			'Lazar cums fast all over Katja''s face. Soon after, Ivan pulls out of you and you and Katja get up and receive his cum all over your faces. To the guys'' amazement, you start licking the cum off each other''s face.'
+			'Lazar cums fast all over Katja''s face. Soon after, Ivan pulls out of you and you and Katja get up and receive his cum all over your faces. To the guys'' amazement, you start licking the cum off each other''s faces.'
 			gs 'cum_call', 'mouth', 'A149', 1, 0, 10000, 20
 			gs 'cum_call', 'face', 'A3', 1, 0, 10000, 20
 			cumspclnt = 1
@@ -1144,7 +1146,7 @@ if $ARGS[0] = 'lazar_ivan_anal2':
 			katjaQW['lube'] = 0
 			gs 'stat'
 			*nl
-			'You and Katja clean up and the guys look exhausted as the two of you get dresssed. Katja picks up both of the bodysuits and places them in her purse. You say goodbye to Lazar and Ivan before leaving the apartment.'
+			'You and Katja clean up and the guys look exhausted as the two of you get dressed. Katja picks up both of the bodysuits and places them in her purse. You say goodbye to Lazar and Ivan before leaving the apartment.'
 			act 'Leave':
 				*clr & cla
 				minut += 10
@@ -1250,7 +1252,7 @@ if $ARGS[0] =  'after_movie_masturbation3':
 	gs 'arousal', 'erotic', 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation7.jpg"></center>'
-	'You and Katja lie down completely naked. Katja just looks at you, and does not seem completely sure how to proceed. You just smile at her and whisper "Just continue doing what you started before I interrupted you."'
+	'You and Katja lie down completely naked. Katja just looks at you and does not seem completely sure how to proceed. You just smile at her and whisper "Just continue doing what you started before I interrupted you."'
 	'She slowly moves her hand towards her pussy and you follow her lead.'
 	act 'Masturbate':
 		*clr & cla
@@ -1307,7 +1309,7 @@ if $ARGS[0] = 'after_movie_masturbation_solo1':
 	gs 'arousal', 'erotic', 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo1.jpg"></center>'
-	'Katja continues to idly caress her panties for a little while, gently stroking the pussy hidden behind them, before she sits up and slowly starts to remove her bra while fondling her breasts.'
+	'Katja continues to idly caress her panties for a little while, gently stroking the pussy hidden behind it before she sits up and slowly starts to remove her bra while fondling her breasts.'
 	act 'Continue to watch':
 		*clr & cla		
 		gs 'arousal', 'erotic', 2
@@ -1337,7 +1339,7 @@ if $ARGS[0] = 'after_movie_masturbation_solo1':
 						gs 'arousal', 'erotic_nudity', 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo6.jpg"></center>'
-						'She comes with a loud cry with one hand touching her clit, and grasping her right boob with the other. She shakes for a long time afterwards and it was clearly an explosive orgasm she had.'
+						'She comes with a loud cry with one hand touching her clit, and grasping her right boob with the other. She shakes for a long time afterward and it was clearly an explosive orgasm she had.'
 						act 'Afterglow':
 							*clr & cla		
 							gs 'arousal', 'end'
@@ -1367,7 +1369,7 @@ if $ARGS[0] = 'after_movie_sex1':
 		gs 'arousal', 'kiss', -3, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex2.jpg"></center>'
-		'After you both have your bras off, you start kissing again while exploring each others breasts.'
+		'After you both have your bras off, you start kissing again while exploring each other''s breasts.'
 		act 'Off with her panties':
 			*clr & cla
 			gs 'arousal', 'foreplay', 3, 'lesbian'
@@ -1403,14 +1405,14 @@ if $ARGS[0] =  'after_movie_sex2':
 	gs 'arousal', 'cuni_give', 3, 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex6.jpg"></center>'
-	'You move down and place a pillow under Katja''s bottom, and start licking her sweet pussy. she starts to slightly moan and puts one hand on you head to keep you from stopping and the other hand she uses to fondle her breasts.'
+	'You move down and place a pillow under Katja''s bottom, and start licking her sweet pussy. she starts to slightly moan and puts one hand on your head to keep you from stopping and the other hand she uses to fondle her breasts.'
 	act 'Start using hands instead':
 		*clr & cla
 		gs 'arousal', 'clit_finger', 3, 'lesbian'
 		gs 'arousal', 'clit_finger_give', -3, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex7.jpg"></center>'
-		'You stop licking Katja and move up behind her, moving your hand to her pussy and begin playing with her clit. She quickly returns the favor, and for a while you are playing with each other''s clits, both moaning louder and louder.'
+		'You stop licking Katja and move up behind her, moving your hand to her pussy and begin playing with her clit. She quickly returns the favor, and for a while, you are playing with each other''s clits, both moaning louder and louder.'
 		act 'Katja''s turn to lick':
 			*clr & cla
 			gs 'arousal', 'cuni', 3, 'lesbian'
@@ -1574,7 +1576,7 @@ if $ARGS[0] = 'after_date_sex2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/katja_after_party_sex8.jpg"></center>'
 		'Katja removes her fingers from your pussy, before gently laying you down on your back, while her mouth is still giving your nipple attention.' 
-		'She slowly kisses her way down your body while her fingers starts playing with your slit again.'
+		'She slowly kisses her way down your body while her fingers start playing with your slit again.'
 		act 'Get your pussy eaten':
 			*clr & cla
 			gs 'arousal', 'cuni', 3, 'lesbian'

Някои файлове не бяха показани, защото твърде много файлове са промени