87 Commits 4289b0e92a ... 3f53bacb88

Author SHA1 Message Date
  KevinSmarts 3f53bacb88 [Fixed] Version update I forgot. 5 years ago
  KevinSmarts 4fdfa60622 [fixed] Updated the version number 5 years ago
  KevinSmarts 3465b773fa <added> Placeholder image replaced with mp4 5 years ago
  KevinSmarts c4e54d4e90 Revert "<added> Placeholder image replaced with mp4" 5 years ago
  KevinSmarts f8c58aa419 <added> Placeholder image replaced with mp4 5 years ago
  julzor dbc26057a4 [fixed] wrong image in natbelapt 5 years ago
  3xpurt 693c37b5da [fixed] forgot to update the other instances of tampon and pads. 5 years ago
  3xpurt 4d60e87a26 [fixed] grammar for available porn shoots in stat_display. 5 years ago
  3xpurt 58c445a108 [fixed] missing 'Pee' option in zaprF Gas Station. 5 years ago
  julzor 0717f9eeee [text edit] in lesbisubhouse 5 years ago
  julzor 1fcb9fafb2 [fixed] changed old willpower event to the new system 5 years ago
  julzor 695f0f5118 Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife 5 years ago
  sandra_schulz 10e49f505f [fixed] magicf2bccm issue + QSP rounding issue. 5 years ago
  julzor 1e4a29fdd8 [fixed] kolka being to young 5 years ago
  CroWke dc87872f1c [fixed] I changed the touch belly event to show up at the same time as the pregnant pics are shown at the door. Changed it to use daystart so that it can be used once a day. 5 years ago
  julzor 62ff179be2 [fixed] wrong elseif in natbelapt 5 years ago
  julzor 320fa3062c [fixed] time travel in bed2 and old image paths in gschool_chats1 5 years ago
  julzor 7f3da4a431 [fixed] wrong if condition 5 years ago
  julzor 36d9539d02 [fixed] an edge case ... 'Continue looking for the road' would do nothing in the highly unlikely case of goforest = lostrand 5 years ago
  julzor 61e6e004ea [fixed] changed arousal to exhibitionism, missing undressing while exercising nude and moved the leave option to the top in meadow 5 years ago
  julzor de7527cd05 Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  CroWke a694c3c93d [edit] I merged the two sonia chats into gschool_chats1 because having it spread over two files can only cause trouble in the long run. 5 years ago
  CroWke c79c8c68f6 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  CroWke e97ef3c285 [new] New variable that'll point to the right schoolchat for when we use clickable images again. It won't affect anything right now so it doesn't matter if it's added to the bugfix version. 5 years ago
  CroWke c4dcbe27a2 [fixed] Vicky's name was wrong so I changed it to prevent confusion. 5 years ago
  sovietmercader c29c0b1dbc [fixed] clothing arrays for exercise clothes bought at glake when nude 5 years ago
  3xpurt 1cebad7575 [fixed] table valign in bedrPar 5 years ago
  CroWke 410df1d94e [fixed] this was a missing image, not a wrong link. image has been sent to nutluck on tfgs 5 years ago
  CroWke 05985c1307 [edit] fixed some of the language. I don't believe this file has been proofread. 5 years ago
  julzor 880dbb37c6 [fixed] missing images in mey_vika_events 5 years ago
  julzor f5523669b6 [fixed] apply make-up still used the old makeupsetting variable that is now used for the routines 5 years ago
  julzor a37427e512 [fixed] wrong image name in natbelEV 5 years ago
  julzor 8ab13e3cf8 [fixed] replaced more of the old school image paths 5 years ago
  julzor a8bc7918ed Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  sandra_schulz 7c72227ad4 [fixed] switched off magicf2b size change as a quick fix for the breastcream + magic growth. Switched off bcream_used reset in lact_bp. 5 years ago
  julzor 8890d32bfb [text edit] missing boys name in gschool_lessonsev3 5 years ago
  sovietmercader c789a3c530 [fixed] only allow Mira events when walking in the village when Mira is not busy elsewhere 5 years ago
  julzor 542b0cf233 [fixed] blocked the other magic if condition for non-magic svetas 5 years ago
  julzor 3585f37bad [fixed] blocked magical body change for non-magic starts 5 years ago
  julzor d98a11d58e [fixed] missed a $phone_loc in telefon 5 years ago
  julzor 372e0ab4be [fixed] missing text in furi, natashas pregnant images showing up too early, negative money in sauna, bathroom phone loc selfies 5 years ago
  julzor 646f61bd16 [fixed] removed strange gosub in gskino 5 years ago
  julzor e1c2b01cc3 [fixed] commented out all huntersex dead ends, because the hunters are fubar 5 years ago
  julzor b9db3589ec [fixed] missing gs 'stat' in bed2 5 years ago
  julzor e89d509eee [fixed] missing willpower in gschool_lessons1 5 years ago
  julzor 4ff619c0e6 [fixed] $boy wasn't defined 5 years ago
  julzor 2d7add3466 [fixed] blocked Gaddvor for inhib/exhibitionism 5 years ago
  julzor 3bcc5fab2d [fixed] missing willpower calculation, missing *clr & cla in gschool_events 5 years ago
  julzor 55a04d0da8 [fixed] moved the brush action in mirror below the routines so that they don't appear 5 years ago
  julzor 3f19480269 [fixed] missing willpower check and missing variable in gschool_events, missing < in gschool_chats2 and replaced ` with '' 5 years ago
  julzor 2e28bd71df [text edit] removed unnecessary white space to avoid having strange line breaks when the text is longer than the main screen 5 years ago
  julzor 3a766d4360 [fixed] ever changing picture in pharmacy 5 years ago
  julzor 02aa8b8f95 Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  julzor e0416c286c [fixed] time travel in din_van 5 years ago
  sovietmercader 4164a5b4d6 [fixed] rand_girl_arg in gschool_events was generating boys names instead of girls 5 years ago
  julzor 100a2fec21 [fixed] missing default for the mother name 5 years ago
  julzor 32abb2406c [fixes] wrong version number 5 years ago
  julzor ecc65dee40 Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  julzor 28031accb5 [changed] version to 0.7.4 5 years ago
  julzor d2557a0c2f [fixes] last stuff before the release 5 years ago
  julzor bbfee7caab [fixed] another dead end in gschool_chats 5 years ago
  julzor 38d750b57e [fixed] dead end if christina is an outcast 5 years ago
  julzor 98c5028f37 [fixed] dead end in abduction 5 years ago
  julzor c5f1b0850e [fixed] redundant variables in poli 5 years ago
  julzor 8a7b6ebb79 [fixed] wrong RecovH, made the loop unique and fertegg weren't removed in the preg removal cheat 5 years ago
  julzor 97c4610947 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor 0471040645 [fixed] wrong boystat in therapist 5 years ago
  3xpurt 6ca2dc0d38 [fixed] variables for analplugin (reapplied julzor's fix) in bed2, fixed plugin removal to work with julzors fix. removed incorrect InSleep. 5 years ago
  julzor 5823aa09ed [fixed] mentats and aphrodisiac messages weren't displayed in din_bad, changed dynamics into gosubs and moved mentats and aphrodisiac into drugs 5 years ago
  julzor ce4062e557 [fixed] condoms making Sveta look older and missing sexcontra variable in the condom cum_call in dinsex 5 years ago
  julzor d56b773829 [fixed] wrong variables in pavaptcourtev and postdeliveries 5 years ago
  julzor e41f9ca9ff [fixed] dead end in anushapt and wrong image paths 5 years ago
  3xpurt 8d11101870 [fixed] multiple issues with bed2. Time should now correctly display, and sveta should no longer time travel. Sveta no longer gains an extra minute for no reason. 5 years ago
  julzor 57c8ce3fe4 [fixed] jobs can't be found on the internet 5 years ago
  Deroc b257e7ca0a [fixed] minor text edits 5 years ago
  Deroc 882aaaf53a Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  Deroc a2d885fdd3 Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  julzor 3a19526136 [fixed] more wrong variables in bed2 and missing elseifs 5 years ago
  Deroc c618ac3d9b [fixed] [changed] fixed (<<will_cost>> Willpower) on gschool_lessons, missing name in igorhome and changed sub>dom for a Igor event 5 years ago
  julzor 99324af396 Merge branch 'master' of https://git.catrenelle.com/sandra_schulz/glife 5 years ago
  julzor 9f8c3ec754 [fixed] wrong variable in bed2 and wrong label in pod_ezd 5 years ago
  julzor c09346497c Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  julzor bb61142562 [text edit] for bed2 to avoid confusion 5 years ago
  CroWke 28c81ecaa6 [edit] The hair braiding options have been removed from the bed and are now mirror exclusive. You can add pony tails etc in your purse. 5 years ago
  sovietmercader e0b97e4ba3 [fixed] unobtainable action and white screen in ParChurch also added Kirill to variable tracker 5 years ago
  CroWke 433c369542 [added] You can now use the mirror to braid your hair, make a ponytail etc. 5 years ago
  sandra_schulz 1714d99dac [fix] Cleaned up lact_lib and removed unused functions. Captured some stray function result zeroes. 5 years ago
71 changed files with 2431 additions and 2229 deletions
  1. 10 6
      locations/Cheatmenu_din.qsrc
  2. 3 3
      locations/Komp.qsrc
  3. 9 6
      locations/Meadow.qsrc
  4. 11 1
      locations/ParChurch.qsrc
  5. 1 0
      locations/ParChurch2.qsrc
  6. 2 2
      locations/abduction.qsrc
  7. 3 3
      locations/anushapt.qsrc
  8. 121 86
      locations/bed2.qsrc
  9. 3 4
      locations/bedrPar.qsrc
  10. 2 2
      locations/body_shape.qsrc
  11. 1 1
      locations/brother.qsrc
  12. 4 4
      locations/brother2.qsrc
  13. 228 228
      locations/brother_lessons.qsrc
  14. 226 227
      locations/brother_voyeur.qsrc
  15. 1 2
      locations/dinSex.qsrc
  16. 27 47
      locations/din_bad.qsrc
  17. 35 29
      locations/din_van.qsrc
  18. 48 0
      locations/drugs.qsrc
  19. 212 212
      locations/foto.qsrc
  20. 282 282
      locations/foto_events.qsrc
  21. 298 298
      locations/foto_models.qsrc
  22. 3 0
      locations/furi.qsrc
  23. 1 1
      locations/gadforest_event.qsrc
  24. 12 22
      locations/gadforestlost.qsrc
  25. 1 1
      locations/gadukino.qsrc
  26. 12 9
      locations/glake.qsrc
  27. 1 1
      locations/gopsex.qsrc
  28. 6 6
      locations/gschool_break.qsrc
  29. 2 2
      locations/gschool_chats.qsrc
  30. 94 69
      locations/gschool_chats1.qsrc
  31. 35 64
      locations/gschool_chats2.qsrc
  32. 79 57
      locations/gschool_events.qsrc
  33. 77 72
      locations/gschool_grounds.qsrc
  34. 47 25
      locations/gschool_lessons1.qsrc
  35. 27 26
      locations/gschool_lessons2.qsrc
  36. 20 20
      locations/gschool_lessonsev3.qsrc
  37. 3 3
      locations/gschool_lunch.qsrc
  38. 3 3
      locations/gschool_office.qsrc
  39. 10 14
      locations/gskino.qsrc
  40. 5 3
      locations/hunter_interactions.qsrc
  41. 0 3
      locations/hunters.qsrc
  42. 1 1
      locations/igorhome.qsrc
  43. 4 2
      locations/kid.qsrc
  44. 1 1
      locations/lact_bp.qsrc
  45. 54 129
      locations/lact_lib.qsrc
  46. 1 1
      locations/lesbisubhouse.qsrc
  47. 2 5
      locations/mey_vika_events.qsrc
  48. 86 94
      locations/mirror.qsrc
  49. 10 11
      locations/natbelapt.qsrc
  50. 26 1
      locations/npcstatic1.qsrc
  51. 11 0
      locations/npcstatic3.qsrc
  52. 12 0
      locations/npcstatic4.qsrc
  53. 2 23
      locations/obj_din.qsrc
  54. 2 2
      locations/outdoors.qsrc
  55. 1 1
      locations/pavaptcourtev.qsrc
  56. 2 1
      locations/pharmacy.qsrc
  57. 19 12
      locations/pod_ezd.qsrc
  58. 0 3
      locations/poli.qsrc
  59. 3 4
      locations/postdeliveries.qsrc
  60. 1 1
      locations/preSYS2.qsrc
  61. 26 27
      locations/sauna.qsrc
  62. 2 0
      locations/saveupdater.qsrc
  63. 1 1
      locations/start.qsrc
  64. 9 1
      locations/stat_display.qsrc
  65. 9 6
      locations/succubus.qsrc
  66. 46 48
      locations/swamphouse.qsrc
  67. 2 2
      locations/telefon.qsrc
  68. 1 1
      locations/therapist.qsrc
  69. 3 3
      locations/traits.qsrc
  70. 124 0
      locations/version.qsrc
  71. 5 4
      locations/zaprF.qsrc

+ 10 - 6
locations/Cheatmenu_din.qsrc

@@ -669,7 +669,7 @@ $cheatmenu['looks'] = {
 	'<a href="exec:dynamic $cheatmenu[''visualage'']">Change apparent age</a>'
 	*nl
 	'<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)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</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
 	'You have <<$titsize>> breasts'
 	if tits => 0 and tits < 11:'<a href="exec:silicone += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
@@ -777,7 +777,8 @@ $cheatmenu['parameters'] = {
 	'agilbuf = <<agilbuf>>'
 	'strenbuf = <<strenbuf>>'
 	'vitalbuf = <<vitalbuf>>'
-	'weight (pcs_weight) = <<pcs_weight>>'
+	'BMI (bmi_calc) = <<bmi_calc>>'
+	'weight (pcs_weight) = <<pcs_weight>> kg'
 	'bust (pcs_bust) = <<pcs_bust>>'
 	'band (pcs_band) = <<pcs_band>>'
 	'waist (pcs_waist) = <<pcs_waist>>'
@@ -1714,12 +1715,12 @@ $cheatmenu['remove_preg'] = {
 	knowpreg = 0
 	cycle = 4
 	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is 1 week
-	RecovH = 189 
-	pregchem = 0	
+	RecovH = rand(375,575) 
+	pregchem = 0
 	knowpregloss = 2
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 	nextbaby = arrsize('yearkid')
-	:poliabortloop
+	:poliabortloop_cheat
 	!!Changed to check if baby has a birth year instead, if it doesn''t, do abortion
 	if yearkid[nextbaby-1] = 0:
 		KILLVAR 'polkid',nextbaby-1
@@ -1739,8 +1740,9 @@ $cheatmenu['remove_preg'] = {
 	end
 	nextbaby -= 1
 	if nextbaby > 0:
-		jump 'poliabortloop'
+		jump 'poliabortloop_cheat'
 	end
+	if FertEgg > 0: FertEgg = 0 
 }
 
 $cheatmenu['cycle'] = {
@@ -2406,6 +2408,8 @@ $cheatmenu['vartracker'] = {
 	'Mitka''s Quest (npc_QW[''A63'']): <<npc_QW[''A63'']>>'
 	'mirabrosextime: <<mirabrosextime>>'
 	'momslut: <<momslut>>'
+	'Kirill''s Relationship (Kirill): <<Kirill>>'
+	'Kirill''s Corruption (Kirill_Crpt): <<Kirill_Crpt>>'
 	'children: <<kid>>'
 	'fetus number: <<BabyEmbryo>>'
 	'pregnancy state: <<preg>>'

+ 3 - 3
locations/Komp.qsrc

@@ -411,7 +411,7 @@ if $ARGS[0] = 'rabota':
 
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'
 
-		if komprabota = 0 and gorodokKomp = 0:
+		if komprabota = 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."'
 			'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.'
 
@@ -424,7 +424,7 @@ if $ARGS[0] = 'rabota':
 			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'Komp', 'rabota'
 
 			act 'Leave this website':gt 'Komp', 'brows'
-		elseif komprabota = 1 and gorodokKomp = 0:
+		elseif komprabota = 1:
 			'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.'
 
@@ -437,7 +437,7 @@ if $ARGS[0] = 'rabota':
 			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'Komp', 'rabota'
 
 			act 'Leave this website':gt 'Komp', 'brows'
-		elseif komprabota > 1 and komprabota < 5 and gorodokKomp = 0:
+		elseif komprabota > 1 and komprabota < 5:
 			'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.'
 

+ 9 - 6
locations/Meadow.qsrc

@@ -68,6 +68,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'In a clearing you see <a href="exec: gt ''Meadow'', ''9''">Mira</a>.'
 		end
 	end
+	
+	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
+	
 	if sunWeather = 1:
 		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
 			if $clothingworntype ! 'exercise' and pcs_inhib < 35 and Miraloc ! 2:
@@ -78,7 +81,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				*nl
 				'Your meadow is a perfect place to do some <a href="exec: gt ''Meadow'', ''workout''">exercises</a>. There is no one around, so you could probably <a href="exec: gs ''clothing'', ''strip'', ''Meadow''& gs ''underwear'', ''remove'' & gt ''Meadow'', ''workout'', ''nude''">exercise nude</a>.'
 				act 'Exercise': gt 'Meadow', 'workout'
-				act 'Exercise nude': gt 'Meadow', 'workout', 'nude'
+				act 'Exercise nude': 
+					gs 'clothing', 'strip', 'Meadow'
+					gs 'underwear', 'remove'
+					gt 'Meadow', 'workout', 'nude'
+				end
 			elseif Miraloc = 2:
 				*nl
 				'It''s a nice day to exercise, but you don''t feel comfortable working out with an audience.'
@@ -93,8 +100,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	else
 		'It''s currently raining. You could do some exercises here if the weather improves..'
 	end
-
-	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
 end
 
 if $ARGS[0] = 'Mira':
@@ -1093,9 +1098,7 @@ if $ARGS[0] = 'workout':
 		end
 		clothesAtLocation = FUNC('lost_clothes_here','Meadow')
 		gs 'clothing', 'strip', $sportloc
-		gs 'arousal', 'voyeur', 15, 'exhibitionism'
-		gs 'arousal', 'end'
-		minut -= 15
+		gs 'exhibitionism', 3
 		gs 'stat'
 		act 'Continue': gt 'exercise', 'workout'
 	else

+ 11 - 1
locations/ParChurch.qsrc

@@ -411,7 +411,17 @@ if $ARGS[0] = 'tease':
 		'You look the priest right in the eyes then when his attention is on you, you slowly lean forward, allowing your breasts to be exposed. To your delight, you see his eyes dart to your tits and stay there.'
 		if kirillsex ! 0:
 			'"Very nice, <<$pcs_nickname>>." Father Kirill whispers as he reaches out and caresses your firm breasts before pulling your top back into place, covering you once again. "Follow me."'
-			act 'Follow him': gt 'ParChurch2', 'Sex'
+			act 'Follow him': gt 'ParChurch2', 'sex'
+			gs 'willpower', 'sex'
+			if will_cost <= pcs_willpwr:
+				act 'Leave the church (<<will_cost>> Willpower)':
+					gs 'willpower', 'resist'
+					gs 'stat'
+					gt 'ParChurch' , 'start'
+				end
+			else
+				'<br>You don''t have enough willpower to refuse.'
+			end
 		else
 			'"Very nice, <<$pcs_nickname>>." Father Kirill whispers with a smile as he reaches out and softly caresses your breasts before pulling your top back into place, covering you up once again.' 
 			'"No temptation has overtaken you except what is common to mankind. And God is faithful; he will not let you be tempted beyond what you can bear. But when you are tempted, he will also provide a way out so that you can endure it," he murmurs as he fastens your buttons then sighs.'

+ 1 - 0
locations/ParChurch2.qsrc

@@ -888,6 +888,7 @@ end
 
 if $ARGS[0] = 'sex':
 	*clr & cla
+	kirillsex += 1
 	gs 'boyStat', 'A166'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay2.jpg"></center>'

+ 2 - 2
locations/abduction.qsrc

@@ -604,7 +604,7 @@ if $ARGS[0] = 'abdFood':
 
 	if abdTools = 1:
 		act 'Train with dildos':gt 'abduction', 'abdTrainDildos'
-		if breastpump > 0 and bp_unbox >= 1: act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+		if breastpump > 0 and bp_unbox >= 1: act 'Use breast pump': gt 'lact_bp', 'bp_milking'
 	end
 
 	if painkiller > 0:
@@ -1044,7 +1044,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	'"A nice lady from an established business" he smiles.'
 	'You are blindfolded and led away into a car.'
 	'After some time you are led through doors and finally you can see. You are in a backroom of a brothel.'
-	'"Madame: "I paid 20 000 for you, bitch. Don''t make me regret this."'
+	'"Madame: "I paid 8000 for you, bitch. Don''t make me regret this."'
 	'"Yes madame."'
 	'"I am not a bad person. If you earn me at least five times more, I may let you go."'
 	'With this faint sign of hope she leaves.'

+ 3 - 3
locations/anushapt.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'home':
 					'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 					'You grin at him. "So you havn''t been spying on her taking a shower? She told me you spy on her and her friends."'
 					'He blushes red and sputters. "No!" He doesn''t seem to know what to do so he turns and walks away and just before he goes into his room he adds. "Fuck you, I can hear the water." Then before you can reply he goes into his room and closes the door.'
-					act 'Wait in her room': gt 'anushapt','showerwait'
+					act 'Wait in her room': gt 'anushapt','shower_wait'
 					act 'Go to the bathroom': gt 'anushapt','nushshower'
 					act 'Leave': gt 'pavComplex','start'
 				end
@@ -176,7 +176,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img src="images/pc/npc_headshots/big154158.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big158.jpg"></center>'
 				'You ignore his comments and step around, to enter the apartment. Just then you see Valentin walking up the hall towards the door, zipping his pants up. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>> what''s up?"'
 				'You look at him and say. "What where you two doing?"'
 				'He grins a bit, that kind of grin guys get after getting laid. "Oh you know just hanging out and having fun." Then he says to Maksim. "You going to go by later and help me work on my bike?"'
@@ -219,7 +219,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img src="images/pc/npc_headshots/big154146.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big146.jpg"></center>'
 				'You ignore his comments and step around, to enter the apartment. Just then you see Marcus walking up the hall towards the door, freezes in place looking obviously embarrassed. He looks down not meeting your eyes. "Hey <<$pcs_nickname>> I was just hanging out... anyways I need to get going, see you at school yeah?" Then with out waiting for a reply he hurries out of the apartment.'
 				'Maksim gives him a disgusted look at he walks by and then looks to you with a <i>I told you so</i> look. "See." Is all he says and then walks back to his room'
 				

+ 121 - 86
locations/bed2.qsrc

@@ -15,34 +15,34 @@ if $ARGS[0] = '':
 	*nl
 
 	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> 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 ''bed2''">off</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> and is currently turned <a href="exec: budilnikOn = 1 & gt ''bed2''">OFF</a>.'
 	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> 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 ''bed2''">on</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> and is currently turned <a href="exec: budilnikOn = 0 & gt ''bed2''">ON</a>.'
 	end
 	*nl
 
 	if bedPanty = 0:
-		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 1 & gs ''stat'' & & gt ''bed2''">as is</a>.'
+		'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 wear your underwear to bed? Currently - <a href="exec:bedPanty = 2 & gs ''stat'' & gt ''bed2''">yes</a>.'
+		'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 wear your underwear to bed? Currently - <a href="exec:bedPanty = 0 & gs ''stat'' & gt ''bed2''">no</a>.'
+		'Will you always wear your underwear to bed? Currently - <a href="exec:bedPanty = 0 & gs ''stat'' & gt ''bed2''">NO</a>.'
 	end
 	*nl
 
-	if analplug = 1:
+	if analplug = 1 :
 		if bedAnal = 0:
-			'Should you remove your anal plug before bed? Currently - <a href="exec:bedAnal = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+			'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 remove your anal plug before bed? Currently - <a href="exec:bedAnal = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:bedAnal = 0 & gs ''stat'' & gt ''bed2''">YES</a>.'
 		end
 	end
 
 	if vibrator = 1 and cheatVib = 1:
 		if bedVibrator = 0:
-			'Should you remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+			'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 remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 0 & gs ''stat'' & gt ''bed2''">YES</a>.'
 		end
 	end
 
@@ -62,8 +62,6 @@ if $ARGS[0] = '':
 				elseif bedPanty = 1:
 					gs 'underwear', 'wear'
 				end
-				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
-				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if $clothingworntype ! 'nude':
 					strip_here = 1
 					gs 'clothing', 'strip'
@@ -78,8 +76,6 @@ if $ARGS[0] = '':
 				elseif bedPanty = 1:
 					gs 'underwear', 'wear'
 				end
-				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
-				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if disable_autosave = 0:
 					if StoryLine = 0:
 						savegame 'autosave.sav'
@@ -120,29 +116,6 @@ if $ARGS[0] = '':
 		end
 	end
 
-!!Braid hair skill
-
-	if canBraidHair = 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800):
-		act 'Braid your hair (0:30)':
-			cls
-			menu_off = 1
-			hbraids = 15
-			minut += 30
-			'You spend some time braiding your hair. It may not be salon level quality, but at the end you are happy with the results.'
-			act 'Return to bed':gt 'bed2'
-		end
-	end
-
-	if hbraids > 0:
-		act 'Remove your braids (0:30)':
-			cls
-			menu_off = 1
-			hbraids = 0
-			minut += 30
-			'You spend some time removing your braids. It may not be salon level quality, but at the end you are happy with the results.'
-			act 'Return to bed':gt 'bed2'
-		end
-	end
 	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 75) or (pcs_horny > 50 and pav_slut >= 25 and pcs_inhib >= 60):
 			act 'Masturbate':
@@ -154,7 +127,6 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'sleep':
-	cls
 	*clr & cla
 	menu_off = 1
 	if $clothingworntype ! 'nude':
@@ -165,12 +137,11 @@ if $ARGS[0] = 'sleep':
 	gs 'stat'
 	*nl
 	if budilnikOn = 1:
-		'You run through your regular nightly routine, seting your alarm for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+', you undress, and prepare for sleep:'
+		'You run through your regular nightly routine, seting your alarm for <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b>, you undress, and prepare for sleep:'
 	else
 		'You run through your regular nightly routine, not bothering to setting your alarm, you undress, and prepare for sleep:'
 	end
 	pcs_hairbsh = 0
-	InSleep = 1
 	cloth_vid = 0
 	pain['killer'] = 0
 	if StoryLine = 1 and $loc ! 'bedrPar' and SchoolAtestat = 0:
@@ -183,35 +154,47 @@ if $ARGS[0] = 'sleep':
 		gs 'nichBedroomServant', 'sleepEvents'
 	end
 
-	if succubusflag = 1 and sucwalkday <= daystart:
-		If succublvl <= rand(1,20) or pcs_willpwr < ((succublvl * willpowermax) / 10) or sucpowzeroed >= 3: gs 'succubus', 'sucwalkinginit'
-	end
-	if analplug = 1 and vibrator = 1:
+	if succubusflag = 1 and sucwalkday <= daystart and (succublvl <= rand(1,20) or pcs_willpwr < ((succublvl * willpowermax) / 10) or sucpowzeroed >= 3): gs 'succubus', 'sucwalkinginit'
+
+	if analplugIN = 1 and vibratorIN = 1:
 		if bedAnal = 1 and bedVibrator = 1:
+			analplugIN = 0
+			vibratorIN = 0
+			gs 'stat'
 			*nl
 			'You remove your butt plug and your vibrator.'
 		elseif bedAnal = 0 and bedVibrator = 0:
 			*nl
 			'You decide to leave your butt plug and vibrator in.'
+		elseif bedAnal = 1 and bedVibrator = 0:
+			vibratorIN = 0
+			gs 'stat'
+			*nl
+			'You decide to leave your butt plug in, but remove your vibrator.'
+		elseif bedAnal = 0 and bedVibrator = 1:
+			analplugIN = 0
+			gs 'stat'
+			*nl
+			'You decide to remove your butt plug, but leave your vibrator in.'
 		end
-	elseif analplug = 1 or vibrator = 1:
-		if analplug = 1:
-			if bedAnal = 1:
-				*nl
-				'You remove your butt plug.'
-			elseif bedAnal = 0:
-				*nl
-				'You decide to leave your butt plug in.'
-			end
+	elseif analplugIN = 1 and vibratorIN = 0:
+		if bedAnal = 1:
+			analplugIN = 0
+			gs 'stat'
+			*nl
+			'You remove your butt plug.'
+		elseif bedAnal = 0:
+			*nl
+			'You decide to leave your butt plug in.'
 		end
-		if vibrator = 1:
-			if bedVibrator = 1:
-				*nl
-				'You remove your vibrator.'
-			elseif bedVibrator = 0:
-				*nl
-				'You decide to leave your vibrator in.'
-			end
+	elseif analplugIN = 0 and vibratorIN = 1:
+		if bedVibrator = 1:
+			vibratorIN = 0
+			*nl
+			'You remove your vibrator.'
+		elseif bedVibrator = 0:
+			*nl
+			'You decide to leave your vibrator in.'
 		end
 	end
 	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
@@ -261,9 +244,10 @@ end
 
 if $ARGS[0] = 'dream':
 	*clr & cla
+	menu_off = 1
+	InSleep = 1
+	gs 'stat'
 	gs 'dreams', 'start'
-	*nl
-	'<<$waketext>>'
 
 	:loopson
 	minut += 1
@@ -278,13 +262,14 @@ if $ARGS[0] = 'dream':
 		end
 
 		if pcs_horny = 100:
-			cls
+			*clr & cla
 			pcs_horny = 0
 			orgasm += 1
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/oface/o_face.jpg"></center>'
-			'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>.'
+			*nl
+			'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>.'
 
 			act 'Go back to sleep':
 				*clr & cla
@@ -292,14 +277,19 @@ if $ARGS[0] = 'dream':
 			end
 
 			act 'Give up trying to sleep':
-				$waketext = 'Maybe trying to sleep with a vibrator in your pussy wasn''t such a good idea.'
-				gt 'bed2', 'wake'
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/shared/sex/oface/kotovfirst1.jpg"></center>'
+				*nl
+				'Maybe trying to sleep with a vibrator in your pussy wasn''t such a good idea.'
+				gs 'bed2', 'wake'
 			end
 
 			exit
 		end
-!! Exclusions for succubus dreams as they set horny to 100 and will always get overridden otherwise
+	!! Exclusions for succubus dreams as they set horny to 100 and will always get overridden otherwise
 	elseif pcs_horny > 80 and pcs_sleep >= 30 and rand (1,300) = 300 and succubusQW ! 1 and succubusQW ! 2:
+		gs 'stat'
+		$waketext = 'You glance at your alarm clock. It reads <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>.'
 		gt 'bed2', 'wake_horny'
 	end
 
@@ -320,43 +310,87 @@ if $ARGS[0] = 'dream':
 
 	if slept_in = 1:
 		gs 'stat'
-		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'
+		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 0:
 		gs 'stat'
-		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, no longer tired and ready to start the day with plenty of sleep.'
+		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, no longer tired and ready to start the day with plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 1 and alarm_now >= alarm_set:
 		gs 'stat'
-		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, just before your alarm goes off. You''ve had plenty of sleep.'
+		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, just before your alarm goes off. You''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif budilnikOn = 1 and alarm_now = alarm_time:
 		pcs_mood -= 10
 		gs 'stat'
-		$waketext = 'Your alarm goes off at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''
+		$waketext = 'Your alarm goes off at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''
 		gs 'bed2', 'extra'
 		gs 'bed2', 'wake'
 	else
 		jump 'loopson'
 	end
+	*nl
+	'<<$waketext>>'
 end
 
 if $ARGS[0] = 'wake_horny':
+	cla
 	menu_off = 1
 	InSleep = 1
+	SleepHorny += 1
 	gs 'stat'
-	'Your wet dream and overall horniness rouse you from your sleep. From one moment to the next, you are wide awake and very much aware that your pussy is hot and wet.'
-	''
-	'You glance at your alarm clock. It reads <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>.'
-	''
-	'You could try and go back to sleep, of course, but it''s doubtful that you would find this kind of sleep very restful; not to mention the frustration that comes with ignoring your needs, but masturbating is an option, too, and not the worst one in this situation. It might take some time, but you''d be able to sleep like a baby after.'
-	''
-	'Of course, you could always just give up on trying to sleep and just get up.'
+	if $pantyworntype = 'none':
+		if SleepHorny = 1:
+			'<center><img <<$set_imgh>> src="images/pre/csb/wakeupcsb.jpg"></center>'
+		elseif SleepHorny = 2:
+			'<center><img <<$set_imgh>> src="images/shared/sex/mast/klit.jpg"></center>'
+		elseif SleepHorny >= 3:
+			'<center><img <<$set_imgh>> src="images/shared/sex/oface/kotovfirst1.jpg"></center>'
+		end
+	else
+		if SleepHorny = 1:
+			'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
+		elseif SleepHorny = 2:
+			'<center><img <<$set_imgh>> src="images/shared/sex/undress/kiska.jpg"></center>'
+		elseif SleepHorny >= 3:
+			'<center><img <<$set_imgh>> src="images/shared/sex/oface/kotovfirst1.jpg"></center>'
+		end
+	end
+	*nl
+	'<<$waketext>>'
+	*nl
+	if SleepHorny = 1:
+		'Your wet dream and overall horniness rouse you from your sleep. From one moment to the next, you are wide awake and very much aware that your pussy is hot and wet.'
+		*nl
+		'You could try and go back to sleep, of course, but it''s doubtful that you would find this kind of sleep very restful; not to mention the frustration that comes with ignoring your needs, but masturbating is an option, too, and not the worst one in this situation. It might take some time, but you''d be able to sleep like a baby after.'
+		*nl
+		'Of course, you could always just give up on trying to sleep and just get up.'
+	elseif SleepHorny = 2:
+		'You''re so horny that you''ve woken a second time. Your pussy is still wet and wanting attention.'
+		*nl
+		'You could try and get back to sleep again, but it''s doubtful that you will get much sleep, and continuously ignoring your needs wont help; maybe you should masturbate, and make the most of the time that''s left.'
+		*nl
+		'Soon you will have to get up one way or another.'
+	elseif SleepHorny >= 3:
+		'Once again your horniness has roused you from your sleep. This is getting ridiculous! You are finding it very difficult to get any sleep at all.'
+		*nl
+		'Going back to sleep almost feels like a waste of time at this point;  you won''t get much rest at all, at least until you fix the problem.'
+		*nl
+		if $pantyworntype ! 'none':
+			gs 'underwear', 'remove'
+			'You''ve removed  your underwear, as your panties were soaked through.'
+			*nl
+		end
+		'Maybe you should just get up.'
+	end
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
+		*nl
 		'Or... you could wake up Anya and see if your dearest sister would be willing to help you with that.'
 	elseif $loc = 'FedorEv4':
+		*nl
 		'Or... you could wake up Fedor and see if your boyfriend can''t help you with that.'
 	elseif $loc = 'bedr' and husband > 0:
+		*nl
 		'Or... you could wake up <<$husName>> and see if your husband can''t help you with that.'
 	end
 
@@ -395,33 +429,32 @@ if $ARGS[0] = 'wake':
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
-
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
 	if slept_in = 1 and kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14:
 		if schoolprogul > 2 and schoolPredupr = 2:
 			pcs_mood -= 35
 			gs 'stat'
-			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be furious. I don''t know what she might do...</center>'
+			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be furious. I don''t know what she might do...</center>'
 		elseif schoolprogul > 2 and schoolPredupr = 1:
 			pcs_mood -= 30
 			gs 'stat'
-			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very angry if I miss another day of school.</center>'
+			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very angry if I miss another day of school.</center>'
 		elseif schoolprogul > 2 and schoolPredupr = 0:
 			pcs_mood -= 25
 			gs 'stat'
-			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be angry to find out I missed a day of school.</center>'
+			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be angry to find out I missed a day of school.</center>'
 		else
 			pcs_mood -= 20
 			gs 'stat'
-			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very upset if I''m not at school every day.</center>'
+			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very upset if I''m not at school every day.</center>'
 		end
 	end
 	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and hour >= 8 and hour < 9:
 			pcs_mood -= 10
 			gs 'stat'
-			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, you''ve slept too long! You''re going to be late for school!</center>'
+			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, you''ve slept too long! You''re going to be late for school!</center>'
 		end
 		act 'Get up out of bed and get dressed for school (0:15)':
 			minut += 15
@@ -475,7 +508,7 @@ if $ARGS[0] = 'extra':
 		menu_off = 1
 		slept_in = 1
 		stime = 0
-		minut = (100-pcs_sleep)*6
+		minut += (100-pcs_sleep)*6
 		pcs_sleep += 100
 		gs 'stat'
 		gt 'bed2', 'dream'
@@ -484,9 +517,11 @@ end
 
 if $ARGS[0] = 'end':
 	menu_off = 1
+	minut -= 1
 	InSleep = 0
 	slept_in = 0
 	strip_here = 0
+	SleepHorny = 0
 	if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':

+ 3 - 4
locations/bedrPar.qsrc

@@ -95,7 +95,7 @@ if popugai2 = 1:
 
 	*nl
 end
-'<table><tr><td>'
+'<table><tr><td valign="top">'
 if budilnikOn = 0:
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> 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>.'
 else
@@ -116,8 +116,7 @@ if sewing_kit = 1:
 	'You have <<tkan>> pieces of sewing fabric left.'
 end
 
-if komp = 1:'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop</a> is on your desk.'
-gorodokKomp = 0
+if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
 
 gad = 0
 
@@ -225,7 +224,7 @@ elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 end
 gs 'lact_bp', 'massage'
 
-'</td><td width = "100"></td><td>'
+'</td><td width = "100" valign="top"></td><td>'
 gs 'subkid'
 '</td></tr></table>'
 

+ 2 - 2
locations/body_shape.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = '':
 		jump 'salocatloop'
 	end
 
-	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_mana >= manamax / 2:
+	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_mana >= manamax / 2 and magikDostup = 0:
 		if sftrstflag = 0:'<b>Your breasts seem fuller.</b>'
 		magicf2b += 1
 		salo -= 3
@@ -158,7 +158,7 @@ if $ARGS[0] = '':
 		jump 'salocatloop'
 	end
 
-	if salobustdo = 0 and salocatnow < 2 and salocatlast >= 2 and magicf2b > 0:
+	if salobustdo = 0 and salocatnow < 2 and salocatlast >= 2 and magicf2b > 0 and magikDostup = 0:
 		if sftrstflag = 0:'<b>Your breasts seem to be getting smaller.</b>'
 		magicf2b -= 1
 		salo += 3

+ 1 - 1
locations/brother.qsrc

@@ -699,7 +699,7 @@ if $ARGS[0] = 'homework':
 	textrand = rand(1,3)
 	if textrand = 1:
 		'You ask your brother, "Kolka, would you like help with your homework?"'
-	'	He replies, "Yeah, that would be great."'
+		'He replies, "Yeah, that would be great."'
 	elseif textrand = 2:
 		'You approach your brother, "Kolka, how are your classes going? Do you need any help?"'
 		'"I could use some help," he says.'

+ 4 - 4
locations/brother2.qsrc

@@ -73,13 +73,13 @@ if $ARGS[0] = 'chat':
 			'"Pfft! More like you want more time to watch porn with them!" you laugh scoffingly.'
 			*nl
 			if pornMagazine = 0:
-				'	"We play football too!" Kolka protests while you tease him with a silly face and fake jerk off motions.'
+				'"We play football too!" Kolka protests while you tease him with a silly face and fake jerk off motions.'
 			elseif pornMagazine > 0:
-				'	"We play football too!" Kolka protests while you tease him with silly face and fake jerk off motions. "Hrmph! You''re one to talk anyways," he grumbles. "I know about that magazine you hide under your bed."'
+				'"We play football too!" Kolka protests while you tease him with silly face and fake jerk off motions. "Hrmph! You''re one to talk anyways," he grumbles. "I know about that magazine you hide under your bed."'
 				*nl
-				'	"I don''t know what you''re talking about," you say with an air of feigned innocence and superiority. "I have never been anything other than ladylike!"'
+				'"I don''t know what you''re talking about," you say with an air of feigned innocence and superiority. "I have never been anything other than ladylike!"'
 				*nl
-				'	"Come on sis," he says with a look. "We were just talking about this. I watch porn. I know what girls do when no one is looking. Furiously schlicking it while biting down on your pillow <i>is</i> your version of ladylike."'
+				'"Come on sis," he says with a look. "We were just talking about this. I watch porn. I know what girls do when no one is looking. Furiously schlicking it while biting down on your pillow <i>is</i> your version of ladylike."'
 			end
 		end
 	end

+ 228 - 228
locations/brother_lessons.qsrc

@@ -208,10 +208,10 @@ if $ARGS[0] = 'showbody':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/homework1.jpg"></center>'
 	if brothersexed < 1:
 		if anatomyhomeworkhelp = 0:
-			'	After you both finish studying, Kolka suddenly goes quiet and his cheeks turn a bright red.'
-			'	"<<$pcs_nickname>>..." he starts. "I have to learn about human anatomy, but I am having trouble with it. Can you help me?"'
-			'	"What do you mean?" you ask, a little confused.'
-			'	"Well, um..." Kolka hesitated, "Can you show me what girls look like...'
+			'After you both finish studying, Kolka suddenly goes quiet and his cheeks turn a bright red.'
+			'"<<$pcs_nickname>>..." he starts. "I have to learn about human anatomy, but I am having trouble with it. Can you help me?"'
+			'"What do you mean?" you ask, a little confused.'
+			'"Well, um..." Kolka hesitated, "Can you show me what girls look like...'
 			if sub < 30:
 				act'"No way"':
 					cla
@@ -238,76 +238,76 @@ if $ARGS[0] = 'showbody':
 			act'"What do you mean?"':
 				cla
 				*nl
-				'	"What do you mean?" you ask quizzically.'
-				'	"Uhmm... Well... T-the diagrams of b-bodies in this book a-aren''t very good... I d-don''t really get them..." he stammers. "So... I was hoping t-that... m-maybe I could just s-see the real thing... i-if... y-you know... y-you''d let me s-see yours..." When he''s finished speaking he looks down, seemingly ashamed for even asking.'
+				'"What do you mean?" you ask quizzically.'
+				'"Uhmm... Well... T-the diagrams of b-bodies in this book a-aren''t very good... I d-don''t really get them..." he stammers. "So... I was hoping t-that... m-maybe I could just s-see the real thing... i-if... y-you know... y-you''d let me s-see yours..." When he''s finished speaking he looks down, seemingly ashamed for even asking.'
 				act'"What?! No way!"':
 					cla
 					*nl
-					'	It finally dawns on you what he''s asking and you pull back in disgust. "What the hell?! No way! I''m not about to let you use me as a science project! Ugh! Get a grip Kolka!"'
-					'	"I''m sorry <<$pcs_firstname>>..." he whimpers. "I shouldn''t have asked..."'
+					'It finally dawns on you what he''s asking and you pull back in disgust. "What the hell?! No way! I''m not about to let you use me as a science project! Ugh! Get a grip Kolka!"'
+					'"I''m sorry <<$pcs_firstname>>..." he whimpers. "I shouldn''t have asked..."'
 					act 'Finish':gt $loc, $metka
 				end
 
 				act'Well, nothing beats practical learning':
 					cla
 					*nl
-					'	Now that you finally understand what he''s suggesting, you muse over it for a moment.'
-					'	<i>Well... practical learning is pretty helpful... Might help to show him the real thing,</i> you think to yourself while Kolka visibly squirms in front of you.'
-					'	"Okay. Sure."'
-					'	Kolka looks up at you in surprise. "Really? You''ll really do it?"'
-					'	"Yeah, I''ll do it," you say. "Like you said, it might help if you get to see the real thing. I''m happy to do it to help my little brother," you smile.'
+					'Now that you finally understand what he''s suggesting, you muse over it for a moment.'
+					'<i>Well... practical learning is pretty helpful... Might help to show him the real thing,</i> you think to yourself while Kolka visibly squirms in front of you.'
+					'"Okay. Sure."'
+					'Kolka looks up at you in surprise. "Really? You''ll really do it?"'
+					'"Yeah, I''ll do it," you say. "Like you said, it might help if you get to see the real thing. I''m happy to do it to help my little brother," you smile.'
 					npc_rel['A34'] += rand(2,3)
 					act'Undress':gt'brother_lessons', 'anatomylesson1'
 				end
 			end
 		else
-			'	Towards the end of the study session, Kolka seems to remember something.'
-			'	"Hey <<$pcs_nickname>>, remember when you said that you would help me with my anatomy homework? You know, when..." he stops and cups his hands, leaning in to whisper, "...when you were in the shower? Are you still willing to help me with that?"'
+			'Towards the end of the study session, Kolka seems to remember something.'
+			'"Hey <<$pcs_nickname>>, remember when you said that you would help me with my anatomy homework? You know, when..." he stops and cups his hands, leaning in to whisper, "...when you were in the shower? Are you still willing to help me with that?"'
 			act'"Not right now"':
 				cla
 				*nl
-				'	"Of course I am Kolka, just not right now," you say. "I''m a little busy at the moment, but if you ask me again later, maybe some other day, okay?"'
-				'	"Okay!" he nods, taking it as a promise.'
+				'"Of course I am Kolka, just not right now," you say. "I''m a little busy at the moment, but if you ask me again later, maybe some other day, okay?"'
+				'"Okay!" he nods, taking it as a promise.'
 				act 'Finish':gt $loc, $metka
 			end
 
 			act'"Of course!"':
 				cla
 				*nl
-				'	"Yeah of course!" you say. "How could I forget a promise to my little brother?"'
-				'	"Thanks <<$pcs_nickname>>! So, before I told you I was having trouble understanding the pictures and diagrams," he says, holding out the book to you. "Is there anything you can do to help me understand it better?" You take the book and flip through the pages he''s supposed to be studying. Looks like basic anatomy right now, but later on it seems to move into sexual reproduction and general sex ed.'
+				'"Yeah of course!" you say. "How could I forget a promise to my little brother?"'
+				'"Thanks <<$pcs_nickname>>! So, before I told you I was having trouble understanding the pictures and diagrams," he says, holding out the book to you. "Is there anything you can do to help me understand it better?" You take the book and flip through the pages he''s supposed to be studying. Looks like basic anatomy right now, but later on it seems to move into sexual reproduction and general sex ed.'
 				*nl
-				'	How do you want to try and teach it to Kolka?'
+				'How do you want to try and teach it to Kolka?'
 				act'Use the book and try to find a way to explain it':
 					cla & *clr
 					'<center><b><font color = maroon>Kolka</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/homework1.jpg"></center>'
-					'	You do your best to go through the text with your brother and explain it to him but he''s still really struggling with it. Even you have to admit, those pictures and diagrams really aren''t very good.'
+					'You do your best to go through the text with your brother and explain it to him but he''s still really struggling with it. Even you have to admit, those pictures and diagrams really aren''t very good.'
 					act'Finish':gt $loc, $metka
 				end
 
 				act'Use your body as an example and explain it that way':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
-					'	"I think I have a pretty good idea..." you say mischievously while he looks at you quizzically.'
+					'"I think I have a pretty good idea..." you say mischievously while he looks at you quizzically.'
 					act'Undress':gt'brother_lessons', 'anatomylesson1'
 				end
 			end
 		end
 	else
-		'	After finishing the rest of his homework, Kolka pipes up, "<<$pcs_nickname>>, I could still use some more help with my anatomy homework. Will you help me?"'
+		'After finishing the rest of his homework, Kolka pipes up, "<<$pcs_nickname>>, I could still use some more help with my anatomy homework. Will you help me?"'
 		act'"Not right now"':
 			cla
 			*nl
-			'	"I''m sorry Kolka," you say. "I''m a little busy at the moment, maybe next time okay?"'
-			'	"Okay!" he nods, packing up the rest of his schoolwork.'
+			'"I''m sorry Kolka," you say. "I''m a little busy at the moment, maybe next time okay?"'
+			'"Okay!" he nods, packing up the rest of his schoolwork.'
 			act 'Finish':gt $loc, $metka
 		end
 
 		act'"Sure!"':
 			cla
 			*nl
-			'	"Sure," you grin at him. "Just let me get ''presentable'' for you," you say with a wink before you start undressing.'
+			'"Sure," you grin at him. "Just let me get ''presentable'' for you," you say with a wink before you start undressing.'
 			act'Undress':gt'brother_lessons', 'anatomylesson1'
 		end
 
@@ -332,7 +332,7 @@ if $ARGS[0] = 'anatomylesson1':
 	gs 'underwear', 'remove'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/1.jpg"></center>'
-	'	After taking a look around to make sure you''re in the clear, you quickly strip down until you''re completely naked in front of your brother.'
+	'After taking a look around to make sure you''re in the clear, you quickly strip down until you''re completely naked in front of your brother.'
 	if anatomyhomeworkhelp = 1:
 		'<br>	"Woah! What are you doing?" Kolka exclaims.'
 		'<br>	"I''m doing what you asked me to do!" you say with a grin. "I''m going to help you understand the material better! Nothing should help you more with anatomy than being able to look at someone else''s body right?"'
@@ -340,32 +340,32 @@ if $ARGS[0] = 'anatomylesson1':
 	act'Start the lesson':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/2.jpg"></center>'
-		'	"So looking at your book it says you''re learning about arteries and veins right now. Arteries are some of the tubes that carry blood around your body. And they all start here," you say, putting your hand around your left breast. "When you breathe in, your lungs take in oxygen which the rest of the body needs to survive. But in order to get it to the rest of the body, your heart needs pathways to deliver it. The oxygen attaches itself to your red blood vessels, and your arteries are the pathways that deliver it. So, for example if your body wants to get oxygenated blood from your heart to your brain it travels along an artery that passes right through..."'
+		'"So looking at your book it says you''re learning about arteries and veins right now. Arteries are some of the tubes that carry blood around your body. And they all start here," you say, putting your hand around your left breast. "When you breathe in, your lungs take in oxygen which the rest of the body needs to survive. But in order to get it to the rest of the body, your heart needs pathways to deliver it. The oxygen attaches itself to your red blood vessels, and your arteries are the pathways that deliver it. So, for example if your body wants to get oxygenated blood from your heart to your brain it travels along an artery that passes right through..."'
 		act'Continue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/3.jpg"></center>'
-			'	"... here!" you say, pointing to your neck. "This is your carotid artery, and it supplies all of your head and your neck with oxygenated blood. Come here and feel it!"'
-			'	Your brother timidly moves closer and puts his finger on your neck.'
-			'	"Push in gently. Do you feel the little ''ba-bump, ba-bump, ba-bump, ba-bump?'' That''s my heartbeat and you can feel the pulse through this artery. Since arteries come directly from the heart, they are the easiest ways to feel someone''s pulse!"'
-			'	"Woah!" your brother says in amazement. "That''s cool!"'
+			'"... here!" you say, pointing to your neck. "This is your carotid artery, and it supplies all of your head and your neck with oxygenated blood. Come here and feel it!"'
+			'Your brother timidly moves closer and puts his finger on your neck.'
+			'"Push in gently. Do you feel the little ''ba-bump, ba-bump, ba-bump, ba-bump?'' That''s my heartbeat and you can feel the pulse through this artery. Since arteries come directly from the heart, they are the easiest ways to feel someone''s pulse!"'
+			'"Woah!" your brother says in amazement. "That''s cool!"'
 			act'Continue':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/4.jpg"></center>'
-				'	You lay back and spend the rest of the lesson letting Kolka use your body as a map, tracing your blood vessels with his finger to understand where they all go and where they branch out from.'
+				'You lay back and spend the rest of the lesson letting Kolka use your body as a map, tracing your blood vessels with his finger to understand where they all go and where they branch out from.'
 				*nl
-				'	As the lesson goes on, you suddenly realize that the gentle touch all over your body is actually turning you on a little bit. The tracing of his fingers feel like a lover''s caress and you feel warmth in your hips signalling that you''re starting to get wet.'
+				'As the lesson goes on, you suddenly realize that the gentle touch all over your body is actually turning you on a little bit. The tracing of his fingers feel like a lover''s caress and you feel warmth in your hips signalling that you''re starting to get wet.'
 				pcs_horny += 15
 				act'Continue':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/5.jpg"></center>'
-					'	Eventually, Kolka has traced out all the arteries and veins you have and you bring the lesson to a close.'
-					if lactation['active'] > 0: '	He even traces every vein and artery that can be seen through your breasts skin.'
-					'	You quickly sit up to hide the growing wetness between you legs and ask him, "So how was that? Do you think you have a better understanding of the material now?"'
-					'	"Yeah!" he says excitedly. "I think I get it now! You really helped me out <<$pcs_nickname>>!" He unexpectedly wraps his arms around you, giving you a big hug. You''re surprised by this, mostly because you weren''t expecting him to do something like this while you were still naked.'
-					'	"You''re the best sister ever!" he cries.'
-					'	You hug him back, feeling the warmth of your bare skin spreading into his shirt. "Aww, thanks Kolka."'
-					'	He pulls back from the hug, eagerly sitting in front of you. "Will you help me with this again sometime?"'
-					'	"Of course I will. But you need to let me get dressed before <<$npc_nickname[''A29'']>> or dad sees me helping you out like this. I don''t think they''d approve. Do you?" He twists his mouth up and shakes his head. "I didn''t think so. So make sure you don''t tell anyone else about this. But if you need more help, just ask me and I''ll see what I can do," you say, giving him a sweet smile before getting dressed again.'
+					'Eventually, Kolka has traced out all the arteries and veins you have and you bring the lesson to a close.'
+					if lactation['active'] > 0: 'He even traces every vein and artery that can be seen through your breasts skin.'
+					'You quickly sit up to hide the growing wetness between you legs and ask him, "So how was that? Do you think you have a better understanding of the material now?"'
+					'"Yeah!" he says excitedly. "I think I get it now! You really helped me out <<$pcs_nickname>>!" He unexpectedly wraps his arms around you, giving you a big hug. You''re surprised by this, mostly because you weren''t expecting him to do something like this while you were still naked.'
+					'"You''re the best sister ever!" he cries.'
+					'You hug him back, feeling the warmth of your bare skin spreading into his shirt. "Aww, thanks Kolka."'
+					'He pulls back from the hug, eagerly sitting in front of you. "Will you help me with this again sometime?"'
+					'"Of course I will. But you need to let me get dressed before <<$npc_nickname[''A29'']>> or dad sees me helping you out like this. I don''t think they''d approve. Do you?" He twists his mouth up and shakes his head. "I didn''t think so. So make sure you don''t tell anyone else about this. But if you need more help, just ask me and I''ll see what I can do," you say, giving him a sweet smile before getting dressed again.'
 					act'Get dressed':
 						gs 'underwear', 'wear'
 						gs 'stat'
@@ -385,52 +385,52 @@ if $ARGS[0] = 'anatomylesson2':
 	gs 'underwear', 'remove'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/1.jpg"></center>'
-	'	You quickly get undressed taking small peeks at the book while you do so you know what you''re helping him with. It looks like this section is about female genitals.'
+	'You quickly get undressed taking small peeks at the book while you do so you know what you''re helping him with. It looks like this section is about female genitals.'
 	*nl
-	'	Once you''re completely naked you kneel down again and say, "Alright Kolka. All ready for today''s lesson?" He nods eagerly. "Okay! Let''s begin then!"'
+	'Once you''re completely naked you kneel down again and say, "Alright Kolka. All ready for today''s lesson?" He nods eagerly. "Okay! Let''s begin then!"'
 	act'Begin the lesson':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/6.jpg"></center>'
-		'	"So, your lesson today is about female genitals. We''ll start with the most obvious one because I know you love to look at them: breasts!" You pull your arms back behind your head to give him a good view. "Women have breasts because they''re used to feed babies-" you start to say before Kolka interrupts you.'
-		'	"Can I get a closer look? You know... for uhh... scientifical reasons?" he says. The look on his face says he''s genuinely curious but you''re still a little skeptical he isn''t doing this just to get close to your tits.'
-		'	<i>Oh, whatever. As long as he learns something right?</i>'
+		'"So, your lesson today is about female genitals. We''ll start with the most obvious one because I know you love to look at them: breasts!" You pull your arms back behind your head to give him a good view. "Women have breasts because they''re used to feed babies-" you start to say before Kolka interrupts you.'
+		'"Can I get a closer look? You know... for uhh... scientifical reasons?" he says. The look on his face says he''s genuinely curious but you''re still a little skeptical he isn''t doing this just to get close to your tits.'
+		'<i>Oh, whatever. As long as he learns something right?</i>'
 		act'Continue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-			'	"Uhh-ha... Okay I guess," you say with a bit of a nervous giggle. You stick your chest out some more and Kolka brings his face right next to your breasts.'
+			'"Uhh-ha... Okay I guess," you say with a bit of a nervous giggle. You stick your chest out some more and Kolka brings his face right next to your breasts.'
 			act'Continue':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-				'	A few awkward long moments go by of Kolka closely examining your breasts and nipples before you realize that he''s not going to sit back down. You sigh and figure you might as well get on with the lesson in the mean time. At least he''ll be able to see them clearly.'
+				'A few awkward long moments go by of Kolka closely examining your breasts and nipples before you realize that he''s not going to sit back down. You sigh and figure you might as well get on with the lesson in the mean time. At least he''ll be able to see them clearly.'
 				if lactation['active'] > 0 and kid <= 0:
-					'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. In some cases, there can also be milk without having a baby."'
+					'"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. In some cases, there can also be milk without having a baby."'
 				elseif lactation['active'] > 0 and kid > 0:
 					if npc_know_sveta_lact['A34'] = 1 or npc_know_sveta_lact['A34'] = 2:
-						'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. You probably saw me doing this from time to time."'
+						'"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. You probably saw me doing this from time to time."'
 					else
-						'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
+						'"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
 					end
 				else
-					'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
+					'"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
 				end
 				if npc_know_sveta_lact['A34'] = 1 or npc_know_sveta_lact['A34'] = 2:
 					if npc_breastfeed_by_sveta['A34'] >= 1 and kid >= 0:
-						'	Kolka inspecting your breasts from multiple angles. "Yeah, I remember. Your milk tasted good."'
-						'	You blush a bit, remembering how you breastfeed Kolka. "Uhm yes, but we are doing this here for school, so you bettern don''t write that down somewhere. So the baby latches out with the mouth here an then sucks to draw out the milk."'
-						'	"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+						'Kolka inspecting your breasts from multiple angles. "Yeah, I remember. Your milk tasted good."'
+						'You blush a bit, remembering how you breastfeed Kolka. "Uhm yes, but we are doing this here for school, so you bettern don''t write that down somewhere. So the baby latches out with the mouth here an then sucks to draw out the milk."'
+						'"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
 					elseif npc_breastfeed_by_sveta['A34'] <= 0 and kid >= 1:
-						'	Kolka inspecting your breasts from multiple angles. "Yeah, I remember. The baby sucked on your breast."'
-						'	You nod at Kolka. "Exactly. So the baby latches out with the mouth here an then sucks to draw out the milk." Your finger points to your nipples.'
-						'	"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+						'Kolka inspecting your breasts from multiple angles. "Yeah, I remember. The baby sucked on your breast."'
+						'You nod at Kolka. "Exactly. So the baby latches out with the mouth here an then sucks to draw out the milk." Your finger points to your nipples.'
+						'"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
 					else
-						'	"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
-						'	You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
-						'	"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+						'"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
+						'You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
+						'"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
 					end
 				else
-					'	"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
-					'	You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
-					'	"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+					'"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
+					'You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
+					'"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
 				end
 				act'"Hey! Stop that!"':
 					cla & *clr
@@ -440,80 +440,80 @@ if $ARGS[0] = 'anatomylesson2':
 					milkedvolume = temp_var/6
 					if lactation['active'] > 0 and milkedvolume >=5:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
-						'	"But you were sayin-"'
+						'You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'"But you were sayin-"'
 						if npc_breastfeed_by_sveta['A34'] <= 0:
-							'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
+							'"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
 						else
-							'	"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
+							'"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
 						end
-						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
-						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
-						'	"Wait so if I ask I can do it?" he pipes up.'
-						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
-						'	"Mkay," he says, while writing down some things in his notebook.'
+						'"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'"Wait so if I ask I can do it?" he pipes up.'
+						'"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'"Mkay," he says, while writing down some things in his notebook.'
 						if npc_know_sveta_lact['A34'] = 0 and npc_tasted_sveta_milk['A34'] <= 0:
-							'	During writing Kolka licks his lips "I didn''t know you had milk in your breasts. It tastes good!"'
+							'During writing Kolka licks his lips "I didn''t know you had milk in your breasts. It tastes good!"'
 						elseif npc_know_sveta_lact['A34'] = 0 and npc_tasted_sveta_milk['A34'] >= 1:
-							'	During writing Kolka licks his lips "Wow ... I didn''t know you had milk in your breasts... and it tastes familiar..."'
+							'During writing Kolka licks his lips "Wow ... I didn''t know you had milk in your breasts... and it tastes familiar..."'
 						elseif npc_know_sveta_lact['A34'] = 1 and npc_tasted_sveta_milk['A34'] >= 1:
-							'	During writing Kolka licks his lips and adds "Your milk tastes way better from the source...".'
+							'During writing Kolka licks his lips and adds "Your milk tastes way better from the source...".'
 						elseif npc_know_sveta_lact['A34'] = 1 and npc_tasted_sveta_milk['A34'] <= 0:
-							'	During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
+							'During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
 						elseif npc_know_sveta_lact['A34'] = 2 and npc_tasted_sveta_milk['A34'] >= 1:
-							'	During writing Kolka licks his lips and adds "I didn''t know you had milk again..."'
+							'During writing Kolka licks his lips and adds "I didn''t know you had milk again..."'
 							npc_know_sveta_lact['A34'] = 1
 						elseif npc_know_sveta_lact['A34'] = 2 and npc_tasted_sveta_milk['A34'] <= 0:
-							'	During writing Kolka licks his lips and adds "I didn''t know you had milk again...and it tastes really good."'
+							'During writing Kolka licks his lips and adds "I didn''t know you had milk again...and it tastes really good."'
 							npc_know_sveta_lact['A34'] = 1
 						else
-							'	During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
+							'During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
 						end
-						'	You slap him on the back of his head playfully. "shh - stop that now."'
-						'	<i><b>sigh</b> Boys...</i>'
-						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+						'You slap him on the back of his head playfully. "shh - stop that now."'
+						'<i><b>sigh</b> Boys...</i>'
+						'Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
 						npc_tasted_sveta_milk['A34'] = 1
 					elseif lactation['active'] > 0 and milkedvolume < 5:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
-						'	"But you were sayin-"'
+						'You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'"But you were sayin-"'
 						if npc_breastfeed_by_sveta['A34'] <= 0:
-							'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+							'"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
 						else
-							'	"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+							'"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
 						end
 						if npc_know_sveta_lact['A34'] <= 0:
-							'	You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation.'
+							'You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation.'
 						elseif npc_know_sveta_lact['A34'] = 1 and npc_breastfeed_by_sveta['A34'] <= 0:
-							'	You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation. You don''t feel like breastfeeding Kolka at the moment.'
+							'You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation. You don''t feel like breastfeeding Kolka at the moment.'
 						elseif npc_know_sveta_lact['A34'] = 2:
-							'	You can tell that no milk came out, but you were nervous for a moment for him to find out that you are lactation again.'
+							'You can tell that no milk came out, but you were nervous for a moment for him to find out that you are lactation again.'
 						end
-						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
-						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
-						'	"Wait so if I ask I can do it?" he pipes up.'
-						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
-						'	"Mkay," he says, while writing down some things in his notebook.'
-						'	<i><b>sigh</b> Boys...</i>'
-						'	You '
-						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+						'"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'"Wait so if I ask I can do it?" he pipes up.'
+						'"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'"Mkay," he says, while writing down some things in his notebook.'
+						'<i><b>sigh</b> Boys...</i>'
+						'You '
+						'Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
-						'	"But you were sayin-"'
-						'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
-						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
-						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
-						'	"Wait so if I ask I can do it?" he pipes up.'
-						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
-						'	"Mkay," he says, while writing down some things in his notebook.'
+						'You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'"But you were sayin-"'
+						'"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+						'"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'"Wait so if I ask I can do it?" he pipes up.'
+						'"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'"Mkay," he says, while writing down some things in his notebook.'
 						if npc_know_sveta_lact['A34'] = 1:
-							'	Kolka looks up at you for a moment "Did you stop having milk?"'
-							'	You nod at Kolka and tell him to concentrate on the studies.'
+							'Kolka looks up at you for a moment "Did you stop having milk?"'
+							'You nod at Kolka and tell him to concentrate on the studies.'
 							npc_know_sveta_lact['A34'] = 2
 						end
-						'	<i><b>sigh</b> Boys...</i>'
-						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+						'<i><b>sigh</b> Boys...</i>'
+						'Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
 					end
 					act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
 				end
@@ -527,58 +527,58 @@ if $ARGS[0] = 'anatomylesson2':
 						milkedvolume += func('lact_lib','$get_breastmilk', 5, 5)
 						if npc_know_sveta_lact['A34'] <= 0:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
-							'	He pulls his lips off with a pop. "Wow! There really is any milk coming out!" he says surprised. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, I didn''t know you had milk - and it is so delicious!"'
-							if milkedvolume >= 500:'	He goes on "... and there is so much of it!'
-							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'He pulls his lips off with a pop. "Wow! There really is any milk coming out!" he says surprised. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, I didn''t know you had milk - and it is so delicious!"'
+							if milkedvolume >= 500:'He goes on "... and there is so much of it!'
+							'Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 							npc_know_sveta_lact['A34'] = 1
 							npc_breastfeed_by_sveta['A34'] = 1
 						elseif npc_know_sveta_lact['A34'] = 1 and npc_breastfeed_by_sveta['A34'] <= 0:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
-							'	He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
-							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
-							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'He goes on "... and you probably can make enough milk for that!'
+							'Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 						elseif npc_know_sveta_lact['A34'] = 2:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
-							'	He pulls his lips off with a pop. "Wow! I didn''t know you had milk again - this milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
-							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
-							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'He pulls his lips off with a pop. "Wow! I didn''t know you had milk again - this milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'He goes on "... and you probably can make enough milk for that!'
+							'Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 							npc_know_sveta_lact['A34'] = 1
 						else
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
-							'	He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
-							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
-							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'He goes on "... and you probably can make enough milk for that!'
+							'Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 						end
 						milkedvolume = 0
 						act'Continue':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-							'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive..."'
-							'	"Oh. Sorry."'
-							'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
-							'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+							'"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive..."'
+							'"Oh. Sorry."'
+							'"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+							'"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
 							if kid <= 0 and npc_know_sveta_lact['A34'] <= 0:
-								'	Kolka looks up for short "Wait ... haven''t you said only pregnant women have milk?'
-								'	You blush a bit "I also said, that it can happen under other circumstances...'
+								'Kolka looks up for short "Wait ... haven''t you said only pregnant women have milk?'
+								'You blush a bit "I also said, that it can happen under other circumstances...'
 							end
-							'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
-							'	<i>Well, at least I didn''t get wet for nothing.</i>'
+							'You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+							'<i>Well, at least I didn''t get wet for nothing.</i>'
 							npc_know_sveta_lact['A34'] = 1
 							npc_breastfeed_by_sveta['A34'] = 1
 							npc_tasted_sveta_milk['A34'] = 1
@@ -590,40 +590,40 @@ if $ARGS[0] = 'anatomylesson2':
 						milkedvolume = 0
 						if npc_know_sveta_lact['A34'] = 1:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
-							'	He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought your milk will come out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
+							'He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought your milk will come out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 							npc_know_sveta_lact['A34'] = 2
 							act'Continue':
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-								'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I don''t have milk anymore."'
-								'	"Oh. Sorry." Kolka looks a bit sad that no milk came.'
-								'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
-								'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
-								'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
-								'	<i>Well, at least I didn''t get wet for nothing.</i>'
+								'"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I don''t have milk anymore."'
+								'"Oh. Sorry." Kolka looks a bit sad that no milk came.'
+								'"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+								'"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+								'You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+								'<i>Well, at least I didn''t get wet for nothing.</i>'
 								act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
 							end
 							
 						else
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-							'	Your brother continues to suck on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
-							'	He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-							'	After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought you said milk came out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'Your brother continues to suck on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
+							'He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought you said milk came out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
 							act'Continue':
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-								'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I''m not pregnant dummy! Breasts only produce milk if you''re pregnant or recently gave birth."'
-								'	"Oh. Sorry."'
-								'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
-								'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
-								'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
-								'	<i>Well, at least I didn''t get wet for nothing.</i>'
+								'"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I''m not pregnant dummy! Breasts only produce milk if you''re pregnant or recently gave birth."'
+								'"Oh. Sorry."'
+								'"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+								'"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+								'You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+								'<i>Well, at least I didn''t get wet for nothing.</i>'
 								act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
 							end
 						end
@@ -637,18 +637,18 @@ end
 if $ARGS[0] = 'anatomylesson3':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/9.jpg"></center>'
-	'	"Okay Kolka, the next part of the lesson is about the vulva," you say, leaning back and spreading your legs to give visual access to your pussy. "That means just the external parts, not what''s inside. We''ll go over that as part of your next lesson."'
-	'	"Woah..." he says, clutching his notebook but still sitting from afar.'
-	'	"Well come on! You just sucked on my tits, don''t be shy now, take a closer look!"'
+	'"Okay Kolka, the next part of the lesson is about the vulva," you say, leaning back and spreading your legs to give visual access to your pussy. "That means just the external parts, not what''s inside. We''ll go over that as part of your next lesson."'
+	'"Woah..." he says, clutching his notebook but still sitting from afar.'
+	'"Well come on! You just sucked on my tits, don''t be shy now, take a closer look!"'
 	act'Continue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/10.jpg"></center>'
-		'	You spread your legs a little farther apart as Kolka leans in to take a look. You briefly go over everything explaining the mons pubis is where the hair grows and that the labia are the "lips" of your vagina.'
-		'	"Are you always this slimy down here?" he asks, in obvious reference to your wetness.'
-		'	"Well <i>that</i> is actually your fault!" you say.'
-		'	"Huh?" he looks up, concerned that he''s in trouble.'
-		'	"When a girl gets stimulated, say from sex or, I don''t know, getting their nipples sucked," you say meaningfully, causing him to blush, "They get wet down there. It comes from the Bartholin glands and it naturally lubricates the vagina to make sex more comfortable."'
-		'	"Ohhh! Okay!" he says, writing everything down. <i>This might just be helping him in school after all...</i> you think to yourself.'
+		'You spread your legs a little farther apart as Kolka leans in to take a look. You briefly go over everything explaining the mons pubis is where the hair grows and that the labia are the "lips" of your vagina.'
+		'"Are you always this slimy down here?" he asks, in obvious reference to your wetness.'
+		'"Well <i>that</i> is actually your fault!" you say.'
+		'"Huh?" he looks up, concerned that he''s in trouble.'
+		'"When a girl gets stimulated, say from sex or, I don''t know, getting their nipples sucked," you say meaningfully, causing him to blush, "They get wet down there. It comes from the Bartholin glands and it naturally lubricates the vagina to make sex more comfortable."'
+		'"Ohhh! Okay!" he says, writing everything down. <i>This might just be helping him in school after all...</i> you think to yourself.'
 		act'Continue':
 			cla & *clr
 			
@@ -667,31 +667,31 @@ if $ARGS[0] = 'anatomylesson3':
 			'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag<<vagtype>>.jpg"></center>'
 			
 			if vagtype = 0:
-				'	"Next is a very special part of the vagina," you start. You spread your pussy lips apart and let him look inside. "This is the hymen. Every girl is born with one and will have it until it gets torn."'
+				'"Next is a very special part of the vagina," you start. You spread your pussy lips apart and let him look inside. "This is the hymen. Every girl is born with one and will have it until it gets torn."'
 			else
-				'	"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
+				'"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
 			end
 			
-			'	"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
-			'	"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+			'"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
+			'"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
 
 			if vagtype = 0:
-				'	He continues to look at your hymen for a few moments before asking, "So... does this mean..."'
-				'	"That I''ve never had sex? Yeah Kolka. It means I''m a virgin." The admittance causes you to blush for some reason, you''re not sure why.'
+				'He continues to look at your hymen for a few moments before asking, "So... does this mean..."'
+				'"That I''ve never had sex? Yeah Kolka. It means I''m a virgin." The admittance causes you to blush for some reason, you''re not sure why.'
 			else
-				'	He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
+				'He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
 				if guy > 0:
-					'	"That I''ve had sex? Yeah. Someone already took my v-card," You say somewhat proudly. "But don''t tell <<$npc_nickname[''A29'']>>!"'
+					'"That I''ve had sex? Yeah. Someone already took my v-card," You say somewhat proudly. "But don''t tell <<$npc_nickname[''A29'']>>!"'
 				else
-					'	"That I''ve had sex? No actually. I actually broke mine-" You stop and blush with the realization of what you''re about to admit. "... mastur...bating..."'
+					'"That I''ve had sex? No actually. I actually broke mine-" You stop and blush with the realization of what you''re about to admit. "... mastur...bating..."'
 				end
 			end
 			
-			'	He nods in acknowledgement while writing down some more notes.'
+			'He nods in acknowledgement while writing down some more notes.'
 			*nl
 
 			if vagtype = 2:
-				'	"Is it supposed to look this loose?" he asks, causing you to blush hard.'
+				'"Is it supposed to look this loose?" he asks, causing you to blush hard.'
 			elseif vagtype = 3:
 				'<br>	"Woah! It''s like a cave in there! Are they all this wide?" he exclaims. You blush harder than you think you''ve ever blushed in your life.'
 			end
@@ -699,27 +699,27 @@ if $ARGS[0] = 'anatomylesson3':
 			if (vagtype = 2 or vagtype = 3) and guy > 0:
 				act'"I''ve had a lot of sex"':
 					cla
-					'	"I''ve had a lot of sex..." you say slowly.'
-					'	After a couple more questions, you continue on with the lesson.'
+					'"I''ve had a lot of sex..." you say slowly.'
+					'After a couple more questions, you continue on with the lesson.'
 					act'Continue':gt'brother_lessons', 'anatomylesson4'
 				end
 
 				act'"There''ve been a few... big ones..."':
 					cla
-					'	"There''ve been..." you don''t really know how to say this without saying it. "There''ve been a few uhh, big guys inside me..." you trail off.'
-					'	After a couple more questions, you continue on with the lesson.'
+					'"There''ve been..." you don''t really know how to say this without saying it. "There''ve been a few uhh, big guys inside me..." you trail off.'
+					'After a couple more questions, you continue on with the lesson.'
 					act'Continue':gt'brother_lessons', 'anatomylesson4'
 				end
 			elseif vagtype = 2:
-				'	"I masturbate a lot..."'
-				'	After a couple more questions, you continue on with the lesson.'
+				'"I masturbate a lot..."'
+				'After a couple more questions, you continue on with the lesson.'
 				act'Continue':gt'brother_lessons', 'anatomylesson4'
 			elseif vagtype = 3:
-				'	"No... Not all..." you force out. "I masturbate a lot, okay...?" you mutter somewhat ashamed.'
-				'	After a couple more questions, you continue on with the lesson.'
+				'"No... Not all..." you force out. "I masturbate a lot, okay...?" you mutter somewhat ashamed.'
+				'After a couple more questions, you continue on with the lesson.'
 				act'Continue':gt'brother_lessons', 'anatomylesson4'
 			else
-				'	After a couple more questions, you continue on with the lesson.'
+				'After a couple more questions, you continue on with the lesson.'
 				act'Continue':gt'brother_lessons', 'anatomylesson4'
 			end
 		end
@@ -729,20 +729,20 @@ end
 if $ARGS[0] = 'anatomylesson4':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/11.jpg"></center>'
-	'	"Hey <<$pcs_nickname>> is it alright if you lift your hips a bit? It''s kind of hard to see everything so close to the ground."'
-	'	"Uhm, sure?" you say, lifting your hips as he asked.'
-	'	You lean your weight back to make it easier on yourself while he continues to inspect your vagina for a little while comparing it to his textbook and write things down in his notebook.'
-	'	"<<$pcs_nickname>>, what''s this little thing at the top?" he asks. You look down and he''s using his pencil to point towards the top of your labia. After a moment, you realize he''s pointing at your clit.'
-	'	"Oh! That! That''s..." You think to yourself how you want to proceed.'
+	'"Hey <<$pcs_nickname>> is it alright if you lift your hips a bit? It''s kind of hard to see everything so close to the ground."'
+	'"Uhm, sure?" you say, lifting your hips as he asked.'
+	'You lean your weight back to make it easier on yourself while he continues to inspect your vagina for a little while comparing it to his textbook and write things down in his notebook.'
+	'"<<$pcs_nickname>>, what''s this little thing at the top?" he asks. You look down and he''s using his pencil to point towards the top of your labia. After a moment, you realize he''s pointing at your clit.'
+	'"Oh! That! That''s..." You think to yourself how you want to proceed.'
 	act'Just explain it to him':
 		cla
 		*nl
-		'	"So, remember how we talked about the Bartholin glands and why girls get wet? That right there is called the clitoris and its only purpose is to get girls wet."'
-		'	"Woah! Really? That''s cool! How does it work?"'
-		'	"Well, it''s the most sensitive place a girl has on her body. When someone touches it with their fingers or licks it with their tongue or if a penis rubs it in the right way, it makes a girl feel <i>really</i> good. Do that enough, a girl can orgasm from it. I bet you already know what an orgasm is though, don''t you?" you say, causing him to blush.'
+		'"So, remember how we talked about the Bartholin glands and why girls get wet? That right there is called the clitoris and its only purpose is to get girls wet."'
+		'"Woah! Really? That''s cool! How does it work?"'
+		'"Well, it''s the most sensitive place a girl has on her body. When someone touches it with their fingers or licks it with their tongue or if a penis rubs it in the right way, it makes a girl feel <i>really</i> good. Do that enough, a girl can orgasm from it. I bet you already know what an orgasm is though, don''t you?" you say, causing him to blush.'
 		*nl
-		'	"Anyways, that''s the end of this section. Did you enjoy the lesson today?" you ask, followed by more of his furious nodding.'
-		'	"Thanks <<$pcs_nickname>>, you''re the best!" You smile back at him before going to get dressed.'
+		'"Anyways, that''s the end of this section. Did you enjoy the lesson today?" you ask, followed by more of his furious nodding.'
+		'"Thanks <<$pcs_nickname>>, you''re the best!" You smile back at him before going to get dressed.'
 		act'End the lesson':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear_last_worn'
@@ -754,29 +754,29 @@ if $ARGS[0] = 'anatomylesson4':
 	act'Give him a "practical" lesson':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/10.jpg"></center>'
-		'	With a sly look on your face, you decide to go through with your idea.'
-		'	"Kolka..." you start. "Did you like sucking on my nipples?" He blushes when you bring it up. "Oh come on, don''t be shy. Tell me the truth: did you enjoy it?"'
-		'	"Y-yeah..." he says, hesitantly.'
-		'	"Well, since you liked that, why don''t I let you try a more ''hands on'' approach to show you what you''re asking about?" He looks at you quizzically. You spread your legs open some more and roll your hips a little. "You see Kolka, what you''re asking about is called the clitoris and it exists for exactly one purpose: to give girls pleasure." His jaw drops as he stares at you with wide eyes.'
-		'	"It''s the most sensitive place a girl has on her body," you continue. "When someone touches it with their fingers or licks it with their tongue, it makes a girl feel <i>really</i> good. Do that enough and do it right, a girl can orgasm from it..." You trail off and look him right in the eye. "You want to see what that looks like?"'
-		'	"Yeah!" he almost shouts.'
-		'	You curl your index finger, motioning for him to come closer as you get up on the couch and invite him in between your legs. "Well then hurry up and get your head down here! Come find out what a girl tastes like!"'
+		'With a sly look on your face, you decide to go through with your idea.'
+		'"Kolka..." you start. "Did you like sucking on my nipples?" He blushes when you bring it up. "Oh come on, don''t be shy. Tell me the truth: did you enjoy it?"'
+		'"Y-yeah..." he says, hesitantly.'
+		'"Well, since you liked that, why don''t I let you try a more ''hands on'' approach to show you what you''re asking about?" He looks at you quizzically. You spread your legs open some more and roll your hips a little. "You see Kolka, what you''re asking about is called the clitoris and it exists for exactly one purpose: to give girls pleasure." His jaw drops as he stares at you with wide eyes.'
+		'"It''s the most sensitive place a girl has on her body," you continue. "When someone touches it with their fingers or licks it with their tongue, it makes a girl feel <i>really</i> good. Do that enough and do it right, a girl can orgasm from it..." You trail off and look him right in the eye. "You want to see what that looks like?"'
+		'"Yeah!" he almost shouts.'
+		'You curl your index finger, motioning for him to come closer as you get up on the couch and invite him in between your legs. "Well then hurry up and get your head down here! Come find out what a girl tastes like!"'
 		act'Continue':
 			cla & *clr
 			'<center><video src="images/shared/sex/kuni/pussylick1.mp4"></center>'
-			'	You instruct him as best you can as he leans in and starts giving you head. It''s a little rough at first but with your encouragement he starts to focus more on your clit, licking and swirling his tongue around it.'
+			'You instruct him as best you can as he leans in and starts giving you head. It''s a little rough at first but with your encouragement he starts to focus more on your clit, licking and swirling his tongue around it.'
 			act'Continue':
 				cla & *clr
 				'<center><video src="images/shared/sex/kuni/pussylick3.mp4"></center>'
-				'	Before you know it, he''s found a rhythm and is licking you like there''s no tomorrow. Your eyes roll back in your head and every other sensation fades and blurs into the background except the feeling of your brother''s tongue on your clit.'
-				'	He stops briefly and you vaguely hear him say, "Girls taste good," before diving back in and returning you to bliss.'
+				'Before you know it, he''s found a rhythm and is licking you like there''s no tomorrow. Your eyes roll back in your head and every other sensation fades and blurs into the background except the feeling of your brother''s tongue on your clit.'
+				'He stops briefly and you vaguely hear him say, "Girls taste good," before diving back in and returning you to bliss.'
 				act'"I''m cumming!"':
 					cla & *clr
 					pcs_horny = 100
 					gs'stat'
 					'<center><video src="images/shared/sex/kuni/pussylickorgasm.mp4"></center>'
-					'	All your muscles start to tense up and you can feel a powerful orgasm approaching. Unable to do anything but moan as quietly as you can, you feel yourself explode in climax, your body violently quivering.'
-					'	Even through your orgasm, Kolka continues to lick you. His tongue on your hyper-sensitive clit is too much and you try to pull away but your brother is unrelenting, grabbing onto your legs and pulling you back, trying to keep drinking the flood of juices spilling from your honeypot.'
+					'All your muscles start to tense up and you can feel a powerful orgasm approaching. Unable to do anything but moan as quietly as you can, you feel yourself explode in climax, your body violently quivering.'
+					'Even through your orgasm, Kolka continues to lick you. His tongue on your hyper-sensitive clit is too much and you try to pull away but your brother is unrelenting, grabbing onto your legs and pulling you back, trying to keep drinking the flood of juices spilling from your honeypot.'
 					act'Continue':
 						cla & *clr
 						orgasm += 1
@@ -784,14 +784,14 @@ if $ARGS[0] = 'anatomylesson4':
 						kuni += 1
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/12.jpg"></center>'
-						'	After what seems like an eternity of excruciating pleasure, your orgasm winds down and you find the mental acuity to speak, though your brother continues to lap up your girl cum.'
-						'	As tempting as it is to let him go another round, you push his head away, saying, "Okay Kolka, that''s enough," before laying back in exhaustion. You look at him with a weak smile. "Good job bro..."'
-						'	"Really?" he says, grinning. "I did good?"'
-						'	Your smile gets a bit more strength when you reply, "Good? Kolka you blew my fucking mind!"'
-						'	"Well, I had a great teacher didn''t I?" he says before starting to lick your pussy again.'
-						'	"Ohhh! Kolka~!" you say, pushing his head away with more than a small amount of regret. "As much as I''d love to let you keep going, we have to stop now. We don''t want <<$npc_nickname[''A29'']>> or dad to catch us."'
-						'	"Yeah I know..." he says in a disappointed tone. "You just taste so good I want more!"'
-						'	You''re so tempted but your fear outweighs your temptation right now. "Maybe some other time kiddo," you say before you find the strength to put your clothes on while Kolka packs up his schoolwork.'
+						'After what seems like an eternity of excruciating pleasure, your orgasm winds down and you find the mental acuity to speak, though your brother continues to lap up your girl cum.'
+						'As tempting as it is to let him go another round, you push his head away, saying, "Okay Kolka, that''s enough," before laying back in exhaustion. You look at him with a weak smile. "Good job bro..."'
+						'"Really?" he says, grinning. "I did good?"'
+						'Your smile gets a bit more strength when you reply, "Good? Kolka you blew my fucking mind!"'
+						'"Well, I had a great teacher didn''t I?" he says before starting to lick your pussy again.'
+						'"Ohhh! Kolka~!" you say, pushing his head away with more than a small amount of regret. "As much as I''d love to let you keep going, we have to stop now. We don''t want <<$npc_nickname[''A29'']>> or dad to catch us."'
+						'"Yeah I know..." he says in a disappointed tone. "You just taste so good I want more!"'
+						'You''re so tempted but your fear outweighs your temptation right now. "Maybe some other time kiddo," you say before you find the strength to put your clothes on while Kolka packs up his schoolwork.'
 						act'End the lesson':
 							gs 'underwear', 'wear'
 							gs 'clothing', 'wear_last_worn'

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


+ 1 - 2
locations/dinSex.qsrc

@@ -908,7 +908,6 @@ $analsexrude = {
 !! gs 'dinsex', 'boy_puts_condom'
 if $ARGS[0] = 'boy_puts_condom':
 	protect = iif(prezik > 0,1,0)
-	vidageday -= 1 &! the people guess that you are a bit more older than you are in fact
 	if $ARGS[1] = '':
 		! do you have condoms?
 		if prezik > 0:
@@ -1172,7 +1171,7 @@ if $ARGS[0] = 'sexcum':
 			'Pulling out of you and looking at <<$xyr>> dick, <<$boydesc>> said "Fuck! The condom is missing."'
 		end
 		eff_contra = sexcontra
-		gs 'cum_call','',$boy,1
+		gs 'cum_call', '', $boy, 1, sexcontra
 		
 		gs 'cuminsidereact',$boydesc, eff_contra
 		protect = 0

+ 27 - 47
locations/din_bad.qsrc

@@ -130,17 +130,32 @@ if $ARGS[0] = 'd_bag':
 	elseif mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0:
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
 	end
+	if compact_mirror = 1: 
+		'You have a <a href="exec: gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
+	elseif compact_mirror = 0 and kosmetitka > 0:
+		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
+	end
+!! Hair options
+	*nl
 	if (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 0: 
 		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
 	elseif (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 1: 
 		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	end
-
-	if compact_mirror = 1: 
-		'You have a <a href="exec: gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
-	elseif compact_mirror = 0 and kosmetitka > 0:
-		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
-	end		
+	if pcs_hairlng > 41 and hscrunch >= 1 and hbraids = 0:
+		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''d_bag''">scrunchie</a> to get rid of the ponytail.'
+	end
+	if pcs_hairlng > 41 and hpingrip >= 1 and hbraids = 0:
+		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''din_bad'', ''d_bag''">flow free</a>.'
+	end
+	if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+		if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''din_bad'', ''d_bag''">pigtails</a>.'
+		if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''din_bad'', ''d_bag''">Remove</a> your scrunchies and let your hair flow free again.'
+	end
+	
+	*nl
 	if prezik + prezikcount + preziksabo > 0:
 		if preziktype = 2 or preziksabo > 0:
 			'You have <b><<iif(preziktype = 2, prezikcount, prezikcount+prezik)>></b> normal condoms left, and <b><<iif(preziktype = 2, prezik+preziksabo, preziksabo)>></b> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
@@ -162,10 +177,14 @@ if $ARGS[0] = 'd_bag':
 	else
 		'You are out of birth control pills.'
 	end
-	if mentats_have > 0:'<a href="exec:dynamic $use_mentats & gs ''din_bad'', ''d_bag''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
+	if mentats_have > 0 and mentats_dose < 3:
+		'<a href="exec: gs ''drugs'', ''mentats'' & gs ''din_bad'', ''d_bag'' & *pl ''<font color = green><br>You swallow the neurobooster pill.</font>''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
+	elseif mentats_have > 0:
+		'There are <b><<mentats_have>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
+	end
 	if steroid_have > 0:'<a href="exec:dynamic $use_steroids & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<steroid_have>></b> steroids left in your purse.'
 	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
-	if aphrodisiac_have > 0:'<a href="exec:dynamic $use_aphrodisiac & gs ''din_bad'', ''d_bag''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
+	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
 	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
 	if refillable_bottle = 3: 
@@ -796,15 +815,6 @@ $d_pregmovement = {
 	end
 }
 
-$use_mentats = {
-	if mentats_dose < 3:
-		'<font color = green>You swallow the pill.</font>'
-		mentats_dose += 1
-		mentats_have -= 1
-	else
-		'You really shouldn''t take any more pills today.'
-	end
-}
 $use_steroids = {
 	if steroid_dose < 3:
 		'<font color = blue>You swallow the orange pill.</font>'
@@ -825,36 +835,6 @@ $use_bcream = {
 		'Using any more cream won''t have any effect.'
 	end
 }
-$use_aphrodisiac = {
-	if aphrodisiac_overdose = 1:
-		'You''ve had enough for today.'
-	elseif aphrodisiac_timer = 0:
-		'<font color = #DB7093>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 80
-	elseif aphrodisiac_timer > 0 and aphrodisiac_timer <= 8:
-		'<font color = #DB7093>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 100
-	elseif aphrodisiac_timer > 8 and min_arousal < 60:
-		'<font color = red><b>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br> It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
-		aphrodisiac_have -= 1
-		orgasm += 1
-		min_arousal += 10
-		aphrodisiac_overdose = 1
-		if min_arousal = 10:'<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
-		if min_arousal = 20:'<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
-		if min_arousal = 30:'<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
-		if min_arousal = 40:'<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
-		if min_arousal = 50:'<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
-		if min_arousal = 60:'<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
-	else
-		'<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
-		aphrodisiac_have -= 1
-	end
-}
 
 if $ARGS[0] = 'takepill':
 

+ 35 - 29
locations/din_van.qsrc

@@ -89,7 +89,7 @@ $shower = {
 			'<b>You notice that your muscles are starting to show through your skin.</b>'
 			act 'Examine yourself closer while drying off and getting dressed...': gt 'din_van', 'buffpick'
 		end
-		
+
 		if lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularily probably made you lactate!'
@@ -142,12 +142,12 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
 		dynamic $brit
-		
+
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
 			'In your absentmindedness you forgot to close the door.'
@@ -178,7 +178,7 @@ $bath = {
 			bath_daystart = daystart
 			pcs_skin += rand(1,2)
 		end
-		
+
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
 		*nl
@@ -228,7 +228,7 @@ $bath = {
 			gs 'arousal', 'end'
 			dynamic $dryOff
 		end
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
 		end
@@ -396,12 +396,12 @@ $brit = {
 
 $tampon = {
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
-		act 'Use a sanitary pad (0:05)':
+		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
 			*clr & cla
 			sanpad -= 1
 			isprokp = 1
-			minut += 5
+			minut += 2
 			pcs_mood -= 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 			*nl
@@ -410,12 +410,12 @@ $tampon = {
 		end
 	end
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
-		act 'Use a tampon (0:05)':
+		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla
 			tampon -= 1
 			isprok = 1
-			minut += 5
+			minut += 2
 			pcs_mood -= 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 			*nl
@@ -452,7 +452,7 @@ $quickwash = {
 
 $wearpan = {
 	if $pantyworntype = 'none':
-		act 'Wear panties (0:02)': 
+		act 'Wear panties (0:02)':
 			minut += 2
 			gs 'stat'
 			gt 'panties', 'view_panty_list', 'bathroom'
@@ -460,7 +460,7 @@ $wearpan = {
 	end
 
 	if $braworntype = 'none':
-		act 'Wear a bra (0:02)': 
+		act 'Wear a bra (0:02)':
 			minut += 2
 			gs 'stat'
 			gt 'bras', 'view_bra_list', 'bathroom'
@@ -512,7 +512,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if cumloc[13] = 1:
 		act 'Wash the cum from your hands (0:05)':
 			menu_off = 1
@@ -527,7 +527,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-		
+
 	if cumloc[11] = 1 and cumloc[16] = 0:
 		act 'Wash the cum from your face (0:05)':
 			menu_off = 1
@@ -583,7 +583,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if cumloc[2] = 1 or cumloc[5] = 1 or cumloc[6] = 1 or cumloc[7] = 1:
 		act 'Wash the cum off your clothes (0:10)':
 			menu_off = 1
@@ -600,7 +600,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
 			menu_off = 1
@@ -997,16 +997,16 @@ if $ARGS[0] = 'private':
 
 	act 'Change clothes and toys':
 		cla
-		
+
 		act 'Return':menu_off = 0 & gt $loc, $metka
-		
+
 		dynamic $wearpan
 		dynamic $removepan
 
 		if $curloc = 'vanrPar' and $clothingworntype = 'nude':
 			act 'Wear clothes (0:05)':
 				*clr & cla
-				minut = 5
+				minut += 5
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
 				'You get dressed'
 				gs 'clothing', 'wear_last_worn'
@@ -1016,7 +1016,7 @@ if $ARGS[0] = 'private':
 		elseif $curloc = 'vanrPar' and $clothingworntype ! 'nude':
 			act 'Remove clothes (0:05)':
 				*clr & cla
-				minut = 5
+				minut += 5
 				'<center><video autoplay loop src="images/shared/accessories/computer/webcam/undress1.mp4"></video></center>'
 				'You remove your clothing'
 				gs 'clothing', 'strip'
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'private':
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'ArousedReact1':
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
 		else
-			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'	
+			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 		end
 		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $metka
@@ -1282,9 +1282,10 @@ end
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
-	act 'Go pee':
+	act 'Go pee (0:04)':
 		*clr & cla
 		menu_off = 1
+		minut += 4
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-private/' + rand(1,19) + '.jpg"></center>'
 		!!Get random pee-private picture
 		rand_pee = rand(0,7)
@@ -1309,8 +1310,9 @@ if $ARGS[0] = 'prvt_pee':
 !!If PC is on her period and using tampon, then the following options should appear as well as the standard "Finish and wipe" act:
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
-			act 'Change tampon':
+			act 'Change tampon (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1320,8 +1322,9 @@ if $ARGS[0] = 'prvt_pee':
 !!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
-			act 'Change pad':
+			act 'Change pad (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1351,10 +1354,11 @@ if $ARGS[0] = 'prvt_pee_end':
 end
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
-if $ARGS[0] = 'pblc_pee':	
-	act 'Go pee':
+if $ARGS[0] = 'pblc_pee':
+	act 'Go pee (0:04)':
 		*clr & cla
 		menu_off = 1
+		minut += 4
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
 		rand_pee = rand(0,7)
 		if rand_pee = 0:
@@ -1422,8 +1426,9 @@ if $ARGS[0] = 'pblc_pee':
 		end
 
 		if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and tampon > 0 and bag = 1:
-			act 'Change tampon':
+			act 'Change tampon (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1432,8 +1437,9 @@ if $ARGS[0] = 'pblc_pee':
 		end
 
 		if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and sanpad > 0 and bag = 1:
-			act 'Change pad':
+			act 'Change pad (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1581,7 +1587,7 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-	
+
 	act 'Return':menu_off = 0 & gt $loc, $metka
 	act 'Set image height for this view':
 		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")

+ 48 - 0
locations/drugs.qsrc

@@ -6,6 +6,8 @@
 !! Heroin: gs 'drugs', 'heroin'
 !! Cocaine: gs 'drugs', 'cocaine' (if it isn''t svetas cocaine, you have to add dur += 1)
 !! Amphetamine: gs 'drugs', 'amphetamine' (if it isn''t svetas amphetamine, you have to add amphetamine += 1)
+!! Neurobooster: gs 'drugs', 'mentats' (if it isn''t svetas mentats, you have to add mentats_have += 1)
+!! Aphrodisiac: gs 'drugs', 'aphrodisiac' (if it isn''t svetas aphrodisiac, you have to add aphrodisiac_have += 1)
 
 !! Alcohol: gs 'drugs', 'alcohol', 'type', count
 !! Types: beer, champagne, moonshine, rum, scotch, vodka, wine, whiskey
@@ -158,6 +160,52 @@ elseif $ARGS[0] = 'alcohol':
 	if alc_count > 0: jump 'alcohol_jump'
 	killvar 'alc_count'
 	gs 'stat'
+elseif $ARGS[0] = 'mentats':
+	mentats_dose += 1
+	mentats_have -= 1
+elseif $ARGS[0] = 'aphrodisiac':
+	if aphrodisiac_overdose = 1:
+		$aphrodisiac_msg = '<br>You''ve had enough aphrodisiac for today.'
+	elseif aphrodisiac_timer = 0:
+		$aphrodisiac_msg = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
+		aphrodisiac_have -= 1
+		aphrodisiac_timer += 8
+		pcs_horny = 80
+	elseif aphrodisiac_timer > 0 and aphrodisiac_timer <= 8:
+		$aphrodisiac_msg = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
+		aphrodisiac_have -= 1
+		aphrodisiac_timer += 8
+		pcs_horny = 100
+	elseif aphrodisiac_timer > 8 and min_arousal < 60:
+		$aphrodisiac_msg = '<font color = red><b><br>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br>It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
+		aphrodisiac_have -= 1
+		orgasm += 1
+		pcs_mood = 100
+		min_arousal += 10
+		aphrodisiac_overdose = 1
+		if min_arousal = 10:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
+		elseif min_arousal = 20:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
+		elseif min_arousal = 30:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
+		elseif min_arousal = 40:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
+		elseif min_arousal = 50:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
+		elseif min_arousal = 60:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
+		end
+	else
+		$aphrodisiac_msg = '<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
+		aphrodisiac_have -= 1
+	end
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end

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


File diff suppressed because it is too large
+ 282 - 282
locations/foto_events.qsrc


File diff suppressed because it is too large
+ 298 - 298
locations/foto_models.qsrc


+ 3 - 0
locations/furi.qsrc

@@ -181,6 +181,9 @@ act 'Try to get a lift':
 			end		
 		end
 	else
+		'The truck driver gives you a knowing grin: "Ah, a hitchhiker? Of course I can, dear! But the real question is... how are you going to thank me if I do?"'
+		'He walks over to you and puts his hand on your buttocks, not leaving any question as to what he wants from you.'
+		'You quickly look around, but no other drivers are around to give you a ride instead; he''s your only option right now.'
 		act 'Refuse and leave':minut += 5 & gt $curloc
 
 		act 'Tell him you''ll suck him off':

+ 1 - 1
locations/gadforest_event.qsrc

@@ -2090,7 +2090,7 @@ if $ARGS[0] = 'nude_event':
 		'Finally after the hundredth time, of looking around to make sure no one is around, you decide to...'
 	end
 
-	if pcs_pcs_inhib >= 25 or exhibitionist_lvl > 1 or pcs_horny > 60:
+	if pcs_inhib >= 25 or exhibitionist_lvl > 1 or pcs_horny > 60:
 		act'Give in to the temptation':
 			cla
 			*clr

+ 12 - 22
locations/gadforestlost.qsrc

@@ -26,7 +26,8 @@ if $ARGS[0] = 'forestrescue':
 	'Suddenly you spot a man dressed as a forest ranger.'
 	'He walks up to you and says, "And here is our lost girl. Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
 
-	!rescued during rest
+	!rescued during rest 
+	!is this possible? isn''t $loc = 'gadforestlost' ??? (julzor)
 	if $loc = 'gadforestrelax':
 		!have fire
 		if bonfire = 1:
@@ -119,8 +120,7 @@ if $ARGS[0] = '2':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -163,8 +163,7 @@ if $ARGS[0] = '3':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -198,9 +197,7 @@ if $ARGS[0] = '4':
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
-	cla
-	*clr
-
+	*clr & cla
 
 	wolfrand = rand(1,10)
 	huntrand = rand(1,10)
@@ -212,8 +209,7 @@ if $ARGS[0] = '4':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -224,7 +220,7 @@ if $ARGS[0] = '4':
 
 		gs 'gadforestlost', 'lostclothes'
 		act 'Continue looking for the road':
-			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
+			if goforest >= lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
 		end
@@ -289,8 +285,7 @@ if $ARGS[0] = 'gadforestlostfinish':
 end
 
 if $ARGS[0] = 'gadforestlostfinish1':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,3)
 	lost = 0
@@ -302,12 +297,10 @@ if $ARGS[0] = 'gadforestlostfinish1':
 	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
 	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
 	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-
 end
 
 if $ARGS[0] = 'gadforestlostfinish2':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,5)
 	lost = 0
@@ -324,8 +317,7 @@ if $ARGS[0] = 'gadforestlostfinish2':
 end
 
 if $ARGS[0] = 'gadforestlostfinish3':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,7)
 	lost = 0
@@ -344,8 +336,7 @@ if $ARGS[0] = 'gadforestlostfinish3':
 end
 
 if $ARGS[0] = 'gadforestlostfinish4':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,9)
 	lost = 0
@@ -369,8 +360,7 @@ end
 if $ARGS[0] = 'searchfood':
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10:
 		act 'Look for mushrooms and berries':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 30
 			new_boletus += rand(1,2)

+ 1 - 1
locations/gadukino.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = '':
 				if temp > 90 and meadow = 0:
 					gt 'gadukino', 'find_meadow'
 				! 50% chance of mira events if you already found the meadow and are still friends with mira
-				elseif temp > 50 and Mira_no = 0:
+				elseif temp > 50 and Mira_no = 0 and MiraLoc = 0:
 					gt 'gadukino', 'mira_events'
 				! 50% chance of other random 1 picture flavour events
 				else

+ 12 - 9
locations/glake.qsrc

@@ -110,8 +110,6 @@ if month >= 5 and month <= 9:
 			*clr & cla
 			menu_off = 1
 			minut+=5
-			gs 'clothing', 'wear_last_worn'
-			gs 'underwear', 'wear'
 			nudelake = rand(1,20)
 			if nudelake <= 3:
 				minut += 5
@@ -140,12 +138,13 @@ if month >= 5 and month <= 9:
 						*clr & cla
 						money -= 3000
 						exercise[1] = 1
-						if exerciseH[1] > 40:exerciseH[1] = 40
-						gs 'underwear', 'wear'
+						exerciseS[1] = 0
+						exerciseH[1] = 100
+						exerciseB[1] = pcs_hips
 						gs 'clothing', 'wear', 'exercise', 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 						'So... there''s the catch. The guy looks at your naked body while you mull over his proposition, and you come to the conclusion that you really don''t have any other choice. You can''t walk home through town naked! You silently nod and give him the money, quickly putting the clothes on when he hands them over. You feel relieved in the knowledge that at least you won''t have to go home naked... hopefully your clothes will turn up later.'
-						act 'Run home naked': gt 'glake', 'nude_home'
+						act'Continue':gt'glake'
 					end
 				else
 					act 'Tell him you don''t have enough money':
@@ -179,8 +178,9 @@ if month >= 5 and month <= 9:
 							*clr & cla
 							money -= 3000
 							exercise[1] = 1
-							if exerciseH[1] > 40:exerciseH[1] = 40
-							gs 'underwear', 'wear'
+							exerciseS[1] = 0
+							exerciseH[1] = 100
+							exerciseB[1] = pcs_hips
 							gs 'clothing', 'wear', 'exercise', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 							'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
@@ -189,6 +189,8 @@ if month >= 5 and month <= 9:
 					end
 				end
 			else
+				gs 'clothing', 'wear_last_worn'
+				gs 'underwear', 'wear'
 				'You return to the place where you left your clothes, and put them back on.'
 				act'Continue':gt'glake'
 			end
@@ -420,8 +422,9 @@ end
 if $ARGS[0] = 'car_sex': 
 	*clr & cla
 	exercise[1] = 1
-	if exerciseH[1] > 40:exerciseH[1] = 40
-	gs 'underwear', 'wear'
+	exerciseS[1] = 0
+	exerciseH[1] = 100
+	exerciseB[1] = pcs_hips
 	gs 'clothing', 'wear', 'exercise', 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
 	'He wastes no time for you to second guess yourself, and immediately throws you down on the back seat of his car when you agree. He quickly pulls down his pants and, after quickly putting a condom on, quickly guides his cock to your pussy lips. He obviously doesn''t plan on spending a lot of time with you and sinks it in one firm thrust, fucking you with rapid, short strokes. Soon he shoots his load in the condom, ties a knot in it and throws it away. Seconds after he hands you the clothes as promised, he drives off.'

+ 1 - 1
locations/gopsex.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'gopsex_select':
 			gs 'gopsex', 'shgopsex'
 		end
 	end
-	if week < 6 and hour >= 0 and hour < 3:
+	if week < 5 and hour >= 20:
 		act 'Have sex with Dan': 
 			if shgopsex_den_count <= 0:
 				cla

+ 6 - 6
locations/gschool_break.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'girls_restroom_events':
 			'After sucking his dick for several minutes, they finally change positions. Mr. Kuznetsov sits on the toilet, while Ms. Orlov straddles his lap, facing the door. You duck back a moment to make sure you are not seen. The moans get louder and you peek again. She''s riding his dick hard, taking his cock balls deep into her twat while he reaches around and fondles her breasts. Her hard nipples poke between his fingers, he squeezes them lightly each time her pussy wetly sinks back down from his cock to his balls. Strands of her arousal glisten and stretch from his balls to her cunt, each time she rises to the top of his cock, before she slams back down again.'
 			gs 'arousal', 'voyeur', 5
 			act 'Leave before you''re caught': gt 'gschool_lessons', 'short_break'
-			act 'Watch':
+			act 'Continue to watch':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/sex/teacher3.mp4"></video></center>'
 				'Several long minutes pass, before he lifts her off of him and they switch positions again. She stands on one side of the toilet slightly bent over, her face and hands pressed against the side of the stall, while he stands on the opposite side of the toilet from her. He lines up his dick and slowly pushes it in, eliciting a moan from both of them. After a moment he starts gradually thrusting into her. You hear him say: "Fuck Arina, your ass is so fucking tight." He continues to fuck her ass, slowly getting faster and harder. Her breasts bounce in rhythm with each thrust of his cock into her ass. From the sounds of their moans you can tell they are both getting close to orgasm. You decide it is time to leave before you get caught.'
@@ -225,7 +225,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					gs 'willpower', 'resist'
 					npc_rel['A20'] -= 3
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/20.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 					'You shake your head. "What? No I''m not going to eat your pussy."'
 					'She takes a step towards you. "You better, if you know what''s good for you."'
 					'You know these gopnik girls are dangerous, most of them like to fight for fun and many of them carry knives. Not sure how serious she is about this, you know that you are far enough away that you can just dash out of the restroom, but she might come after you later, or you could do what she says and lick her pussy.'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					act 'Make a run for it':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/20.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 						'You turn and run for the door. As you make it to the door, you hear Lena call after you. "You better run far, bitch!"'
 						act 'Continue': gt 'gschool_lessons', 'short_break'
 					end
@@ -253,7 +253,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					gs 'willpower', 'resist'
 					npc_rel['A20'] -= 3
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/20.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 					'You shake your head. "What? No, I''m not going to eat your pussy."'
 					'She takes a step towards you. "Well then, I guess I am going to work out my frustration by kicking you in your face."'
 					'You know these gopnik girls are dangerous, most of them like to fight for fun and many of them carry knives. Not sure how serious she is about this, you know that you are far enough away that you can just dash out of the restroom, but she might come after you later, or you could do what she says and lick her pussy.'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'girls_restroom_events':
 							*clr & cla
 							gs 'willpower', 'resist'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/20.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 							'You turn and run for the door. As you make it to the door you hear Lena call after you. "You can run all you want bitch, I will find you and kick your ass, eventually"'
 							act 'Continue': gt 'gschool_lessons', 'short_break'
 						end
@@ -779,7 +779,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			*clr & cla
 			menu_off = 0
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 			'You walk into the boys room and see Ivan washing his hands at the sinks. He glances up as you walk in and he smiles. "<<$pcs_nickname>> what''s up, get lost?"'
 			'You blush a bit. "Um no, I... I don''t know, just felt like checking out the boys room."'
 			'He laughs a bit. "Don''t sweat it, I won''t tell. Well have fun, catch you later." He says with a wink, as he walks out.'

+ 2 - 2
locations/gschool_chats.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'nerds':
 			*nl
 			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 		end
-		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats2'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats2'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats2'',''christina''">Christina</a> is sitting at a desk looking forlorn.')
+		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a> is sitting at a desk looking forlorn.')
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -47,7 +47,7 @@ if $ARGS[0] = 'cooljocks':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats1'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats1'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''viktoriya''">Viktoriya</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(soniaPS = 0, ', <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>', '')+iif (fedormasha = 0, ', <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>', '')+iif (zverSlutQW < 2, ' and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>', '')+'.'
+	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats1'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats1'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''viktoria''">Vicky</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(soniaPS = 0, ', <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>', '')+iif (fedormasha = 0, ', <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>', '')+iif (zverSlutQW < 2, ' and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>', '')+'.'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 

+ 94 - 69
locations/gschool_chats1.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'dimka':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if dimka_debt > 0:
 		'As you walk up the first thing Dimka says is. "Do you have my money?"'
@@ -14,7 +14,7 @@ if $ARGS[0] = 'dimka':
 				money -= dimka_debt
 				dimka_debt = 0
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 				'You nod your head and dig in your purse, pulling out enough money, you hand it over to him. He takes his time slowly counting it out, then nods as it seems to all be their. You briefly talk back and forth, as he puts the money away.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				if dimarudorient = 1: act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
@@ -71,7 +71,7 @@ end
 
 if $ARGS[0] = 'dim_drugs':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You don''t want to but the you feel miserable and everything hurts, you crave the rush that you''ve come to enjoy so much'
 	'"Please Dimka, can I have some pale lady?"'
 	'He smiles at you with a smug knowing smile. "Sure do you have any money?"'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'igor':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if IgorloverQW > 0:
@@ -176,7 +176,7 @@ if $ARGS[0] = 'igor':
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly, and it makes you giggle. While you talk with each other, his warm hand finds yours. You remain holding hands and chatting until break is over, with a smile you give him a quick kiss goodbye.'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -185,17 +185,17 @@ if $ARGS[0] = 'igor':
 			act 'Tease him':
 				*clr & cla
 				npc_rel['A4'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'You decide to tease Igor a little bit. "I hope you''re not too sore after last time," You whisper with a smirk. Igor''s cheeks flush pink as he looks around nervously, hoping no one overheard.'
 				act 'Just chat':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'You don''t press it anymore and start talking to him about a variety of topics.'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Tell him you have a surprise':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'You keep whispering in his ear. "I want to fuck you right now." He gives you a shocked look and then you open up your purse and show him your strapon nestled inside, which makes him blush even more.'
 					'"What if we get caught?" He sounds scared and excited at the same time.'
 					'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'igor':
 				end
 				act 'Help with homework':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
 					'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
 					'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
@@ -218,7 +218,7 @@ if $ARGS[0] = 'igor':
 			'"Oh, it''s not that weird," Igor blushes a bit. "I have a sister so I hear about these things all the time..."'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'Igor''s face lights up. "Yeah, of course I''ll help you."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -226,7 +226,7 @@ if $ARGS[0] = 'igor':
 			'As usual, Igor is hanging around Dimka but with you here, Igor pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -237,7 +237,7 @@ if $ARGS[0] = 'igor':
 			'The conversation feels forced as Igor does little to keep talking to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -246,7 +246,7 @@ if $ARGS[0] = 'igor':
 			'"Uh, hello?" Igor is unamused to see you and completely ignores you as you try to keep a one-sided conversation going. Eventually he just walks away without saying a word.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'"No," Igor says flatly as he slams his locker closed and walks away.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -255,7 +255,7 @@ if $ARGS[0] = 'igor':
 		'Igor is hanging with Dimka, Stasya and Albina when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'igor':
 		'The two of you spend some time chatting while he waits for Dimka. Eventually he shows up, and Igor is ready to leave. "Maybe we can talk some other time?" he says with a small smile as he waves goodbye.'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -304,12 +304,12 @@ if $ARGS[0] = 'igor_peg':
 					'He stands up and bends over one of the desks, you step up behind him and rub the tip of your strapon against his little puckered asshole. You bend over a bit and spit in the crack of his ass to add a little more lubrication. Then you press the head of the strapon against his asshole into it pops in, he moans in a mixture of pain and pleasure as it does.'
 					*nl
 					'You slowly slide the full length of your <<dick>>cm <<$dick_girth>> dildo into his ass. Once you are balls deep you start to slowly stroke the strapon in his ass. You steadily pick up speed with each stroke, before long you are holding onto his hips and pounding his ass for all your worth. It doesn''t take long after that until he moans loudly and his whole body starts to shudder, you know he just shot his lead, without either of you even touching his dick.'
-					gs 'arousal', 'anal_dildo_give', 5, 'sub', 'rough'
+					gs 'arousal', 'anal_dildo_give', 5, 'dom', 'rough'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Clean up':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 						'Feeling better and knowing he feels better. You give him a few last hard deep thrusts before pulling out of him. You take the harness off and clean up the dildo before putting them back in your purse. Then you both get dressed, just as you both finish getting dressed the bell rings for next class. You slap him on the ass which makes him yelp a little, as you walk out of the class room with him. "Talk to you later Igor." You say to him with a wink.'
 						'He blushes and nods, as he replies. "Talk to you later <<$pcs_nickname>>." With that you both hurry to your next class.'
 						act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'katja':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	if KatjaOTN > 0:
 		if KatjaHorny < 20:
 			'Katja looks calm and stoic.'
@@ -372,7 +372,7 @@ if $ARGS[0] = 'katja':
 			meynoldQW = 2
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together."'
 			'"Sure, why not," you reply.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -384,7 +384,7 @@ if $ARGS[0] = 'katja':
 			pcs_hairbsh = 1
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
 			act 'Light touch-up':
 				cla
@@ -419,7 +419,7 @@ if $ARGS[0] = 'katja':
 				artemIzdev = 1
 				gs 'stat'
 				'<center><b><font color = maroon><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You make sure no one else is paying attention, and tell Katja about what Artem and Petka are doing to you on Mondays. At first she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
 				'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -438,7 +438,7 @@ if $ARGS[0] = 'katja':
 				else
 					*clr & cla
 					'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 					'You slowly lean in towards Katja to kiss her. Unable to resist, Katja almost closing her eyes, slowly opening her mouth, leans in and meets your kiss.'
 					gs 'katjaEv', 'kiss_events'
 				end
@@ -460,7 +460,7 @@ if $ARGS[0] = 'albina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/23.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0:
 		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 	end
@@ -513,7 +513,7 @@ if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
 	if npc_rel['A140'] >= 50 and pav_slut < 125:
 		npc_rel['A140'] += 1
 		if grupTipe = 1:
@@ -546,7 +546,7 @@ end
 
 if $ARGS[0] = 'latest_gossip':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
 	'"So Lizaveta hear any good gossip of late?"'
 	'As you ask that her face lights up and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing but I overheard some others talking and they said..."'
 	gs 'gschool_gossip', 'Lizaveta'
@@ -557,7 +557,7 @@ if $ARGS[0] = 'marcus':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 	if npc_rel['A146'] >= 50 and pav_slut < 125:
 		npc_rel['A146'] += 1
 		if grupTipe = 1:
@@ -591,7 +591,7 @@ if $ARGS[0] = 'andrey':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/28.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big147.jpg"></center>'
 	if npc_rel['A147'] >= 50 and pav_slut < 125:
 		npc_rel['A147'] += 1
 		if grupTipe = 1:
@@ -625,7 +625,7 @@ if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/29.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big148.jpg"></center>'
 	if npc_rel['A148'] >= 50 and pav_slut < 125:
 		npc_rel['A148'] += 1
 		if grupTipe = 1:
@@ -653,11 +653,11 @@ if $ARGS[0] = 'mefodiy':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-if $ARGS[0] = 'viktoriya':
+if $ARGS[0] = 'viktoria':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/15.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></center>'
 		
 	if npc_rel['A15'] >= 50 and pav_slut < 125:
 		npc_rel['A15'] += 1
@@ -695,7 +695,7 @@ if $ARGS[0] = 'stasya':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/30.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big139.jpg"></center>'
 	if npc_rel['A139'] >= 50 and pav_slut < 125:
 		npc_rel['A139'] += 1
 		if grupTipe = 1:
@@ -728,7 +728,7 @@ if $ARGS[0] = 'irina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/17.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big17.jpg"></center>'
 	if npc_rel['A17'] >= 50 and pav_slut < 125:
 		npc_rel['A17'] += 1
 		if grupTipe = 1:
@@ -761,43 +761,68 @@ if $ARGS[0] = 'sonia':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/25.jpg"></center>'
-	if npc_rel['A25'] >= 50 and pav_slut < 125:
-		npc_rel['A25'] += 1
-		'"What are you up to?" You ask Sonia as you watch her organizing a stack of various teen magazines inside her locker.'
-		'"I think it''s time I got rid of some of these..." Sonia sighs as she stares longinly at the stack. "But I can''t bear throwing any of them away!"'
-		'You can''t help but laugh and tease her a bit. In the end, the two of you end up reading through the magazines rather than throwing them out.'
-	elseif npc_rel['A25'] >= 50:
-		npc_rel['A25'] += 1
-		'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
-		'"Ready to get drunk and party at the community center, hm?" You give her a playful nudge.'
-		'Sonia giggles and bounces around excitedly. "Damn right, and you better be ready, too!"'
-	elseif npc_rel['A25'] <= 20 and pav_slut < 125:
-		npc_rel['A25'] += 1
-		if grupTipe = 1:
-			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading which is a bit disappointing, but at least she stuck around.'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big25.jpg"></center>'
+	if soniaPS = 0:
+		if npc_rel['A25'] >= 50 and pav_slut < 125:
+			npc_rel['A25'] += 1
+			'"What are you up to?" You ask Sonia as you watch her organizing a stack of various teen magazines inside her locker.'
+			'"I think it''s time I got rid of some of these..." Sonia sighs as she stares longinly at the stack. "But I can''t bear throwing any of them away!"'
+			'You can''t help but laugh and tease her a bit. In the end, the two of you end up reading through the magazines rather than throwing them out.'
+		elseif npc_rel['A25'] >= 50:
+			npc_rel['A25'] += 1
+			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
+			'"Ready to get drunk and party at the community center, hm?" You give her a playful nudge.'
+			'Sonia giggles and bounces around excitedly. "Damn right, and you better be ready, too!"'
+		elseif npc_rel['A25'] <= 20 and pav_slut < 125:
+			npc_rel['A25'] += 1
+			if grupTipe = 1:
+				'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading which is a bit disappointing, but at least she stuck around.'
+			else
+				'"Have you seen the new clothes they''re selling at the garment factory in town?" You ask Sonia, trying to catch her interest... but you manage to do the exact opposite.'
+				'"Garment factory?" She asks with a hurt and slightly annoyed look. "What makes you think I shop at that place...?"'
+				'It takes some time, but eventually you manage to save the conversation, or at least you think so since she doesn''t run you off, although she''s more withdrawn after that point.'
+			end
+		elseif pav_slut >= 125:
+			npc_rel['A25'] += 1
+			'Unlike most people, Sonia isn''t calling you a slut or whore. Instead she asks you about some of the best sex you''ve had lately and some of your favorite positions. The conversation continues like this and you end up enjoying hanging out with her as you talk about all kinds of naughty things.'
+		else 
+			npc_rel['A25'] += 1
+			'"Hey, Sonia," you greet her with a smile and gives you a friendly little wave.'
+			'"What''s up, <<$pcs_nickname>>?" she asks and you tell her you just wanted to hang out for a bit. "Sure, I got a little bit of time."'
+			'With Sonia being so friendly, you slip into an easygoing banter with her for the rest of break.'
+		end
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+	else
+		if npc_rel['A25'] >= 50 and pav_slut < 125:
+			npc_rel['A25'] += 1
+			if grupTipe = 5:
+				'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			else
+				'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			end
+		elseif npc_rel['A25'] <= 20 and pav_slut < 125:
+			npc_rel['A25'] += 1
+			if grupTipe = 5:
+				'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and gives you a a slight frown in return. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			else
+				'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens at your approach. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			end
+		elseif pav_slut >= 125:
+			npc_rel['A25'] += 1
+			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "What''s up slut?" You laugh and sit down next to her telling her about your day. The two of you banter back and forth about who''s breath smells like cum and discuss each of your latest sexcapades.'
 		else
-			'"Have you seen the new clothes they''re selling at the garment factory in town?" You ask Sonia, trying to catch her interest... but you manage to do the exact opposite.'
-			'"Garment factory?" She asks with a hurt and slightly annoyed look. "What makes you think I shop at that place...?"'
-			'It takes some time, but eventually you manage to save the conversation, or at least you think so since she doesn''t run you off, although she''s more withdrawn after that point.'
+			npc_rel['A25'] += 1
+			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens slightly at your approach. "Do you need something <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 		end
-	elseif pav_slut >= 125:
-		npc_rel['A25'] += 1
-		'Unlike most people, Sonia isn''t calling you a slut or whore. Instead she asks you about some of the best sex you''ve had lately and some of your favorite positions. The conversation continues like this and you end up enjoying hanging out with her as you talk about all kinds of naughty things.'
-	else 
-		npc_rel['A25'] += 1
-		'"Hey, Sonia," you greet her with a smile and gives you a friendly little wave.'
-		'"What''s up, <<$pcs_nickname>>?" she asks and you tell her you just wanted to hang out for a bit. "Sure, I got a little bit of time."'
-		'With Sonia being so friendly, you slip into an easygoing banter with her for the rest of break.'
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	if npc_rel['A149'] >= 50 and pav_slut < 125:
 		npc_rel['A149'] += 1
 		if grupTipe = 2:
@@ -843,7 +868,7 @@ if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	if npc_rel['A8'] >= 50 and pav_slut < 125:
 		npc_rel['A8'] += 1
 		if grupTipe = 2:
@@ -883,7 +908,7 @@ if $ARGS[0] = 'vanya':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/59.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 	if npc_rel['A165'] >= 50 and pav_slut < 125:
 		npc_rel['A165'] += 1
 		if grupTipe = 2:
@@ -934,7 +959,7 @@ if $ARGS[0] = 'erast':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 	if npc_rel['A150'] >= 50 and pav_slut < 125:
 		npc_rel['A150'] += 1
 		if grupTipe = 2:
@@ -977,7 +1002,7 @@ if $ARGS[0] = 'christina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>' 
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>' 
 	if zverRageQW = 10:
 		'As you pass by Christina, she looks at you triumphantly, "Don''t forget my little slave, showers after the gym class..."'
 		'Before you''re able to respond she turns around and walks away...'
@@ -1035,7 +1060,7 @@ if $ARGS[0] = 'bella':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	if npc_rel['A22'] >= 50 and pav_slut < 125:
 		npc_rel['A22'] += 1
 		if grupTipe = 2:
@@ -1075,7 +1100,7 @@ if $ARGS[0] = 'veronika':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 	if npc_rel['A141'] >= 50 and pav_slut < 125:
 		npc_rel['A141'] += 1
 		if grupTipe = 2:
@@ -1119,7 +1144,7 @@ if $ARGS[0] = 'lina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
 	if npc_rel['A19'] >= 50 and pav_slut < 125:
 		npc_rel['A19'] += 1
 		if grupTipe = 2:
@@ -1159,7 +1184,7 @@ if $ARGS[0] = 'lariska':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 	if lariskaHelp = -1:
 		'She looks at you rejectingly, and softly says: "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
 	elseif npc_rel['A13'] >= 50 and pav_slut < 125:
@@ -1215,7 +1240,7 @@ if $ARGS[0] = 'ivan':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 	if pav_slut < 125 and IvanShowerQW = 1:
 		IvanShowerQW = 11
 		'Ivan thinks for a moment, before he says: "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics, I think I have a good shot at getting to the Russian National Championships this year. I really cannot afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'

+ 35 - 64
locations/gschool_chats2.qsrc

@@ -7,32 +7,32 @@ if $ARGS[0] = 'artem':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
 
 	if artQW = 5:
-		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I cant wait for our next lesson after school…" He says, his hand running down your thigh and stopping at the hem of your skirt. "I bet you cant wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
+		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I can''t wait for our next lesson after school…" He says, his hand running down your thigh and stopping at the hem of your skirt. "I bet you can''t wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
 	elseif artQW = 3 or artQW = 20:
 		npc_rel['A2'] += 1
-		'Artem notices you walking over and quickly grabs an empty chair and makes room for you to sit next to him. "I was worried we wouldn’t see each other today." He jokes, but you can tell there’s a part of him that was being sincere. Artem isn’t one for public affection, but he still can’t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
+		'Artem notices you walking over and quickly grabs an empty chair and makes room for you to sit next to him. "I was worried we wouldn''t see each other today." He jokes, but you can tell there''s a part of him that was being sincere. Artem isn''t one for public affection, but he still can''t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
 	elseif npc_rel['A2'] >= 50 and pav_slut < 125:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
-			'"There you are, <<$pcs_nickname>>. How’s it going?" Artem greets you as you sit down. "I figure we can get a head-start on Yenotin’s lesson while we talk," he says, moving the textbook towards you so the both of you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
+			'"There you are, <<$pcs_nickname>>. How''s it going?" Artem greets you as you sit down. "I figure we can get a head-start on Yenotin''s lesson while we talk," he says, moving the textbook towards you so the both of you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
 		else
-			'"Hey, Artem, how’’s it going?" You ask, taking a seat at a desk across from him. His desk is covered with worksheets and a stack of textbooks.'
+			'"Hey, Artem, how''s it going?" You ask, taking a seat at a desk across from him. His desk is covered with worksheets and a stack of textbooks.'
 			*nl
-			'"Oh hey, <$pcs_nickname>>. I’’m just putting together a study guide," he tells you with a smile. He hasn’’t bothered to stop writing in his notebook since you started talking. As you watch him work, you realize that he’’s writing quite a lot, more than needed for one person.'
+			'"Oh hey, <<$pcs_nickname>>. I''m just putting together a study guide," he tells you with a smile. He hasn''t bothered to stop writing in his notebook since you started talking. As you watch him work, you realize that he''s writing quite a lot, more than needed for one person.'
 			*nl
-			'"Who are you writing all that for?" You ask.
-			"Well, I tutor a lot of the jocks, so it’’s mostly for them, but I also help some of the popular kids."'
+			'"Who are you writing all that for?" You ask.'
+			'"Well, I tutor a lot of the jocks, so it''s mostly for them, but I also help some of the popular kids."'
 			*nl
 			'"You mean actually tutoring them or just doing their work for them?" You ask suspiciously with a raised brow.'
 			*nl
-			'Artem chuckles sheepishly, obviously a bit flustered by the question. "The jocks aren’’t too bad and the popular kids… well, they need all the help they can get, and… and I’’m happy to help if I can," he says before quickly changing the subject. You decide not to insist and keep him company while he works.'
+			'Artem chuckles sheepishly, obviously a bit flustered by the question. "The jocks aren''t too bad and the popular kids… well, they need all the help they can get, and… and I''m happy to help if I can," he says before quickly changing the subject. You decide not to insist and keep him company while he works.'
 		end
 	elseif npc_rel['A2'] <= 20 and pav_slut < 125:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
-			'You try to chat up Artem, but he doesn’t seem all that interested in the conversation. His answers are short and he doesn’t even bother to stop writing in his notebook as you talk.'
+			'You try to chat up Artem, but he doesn''t seem all that interested in the conversation. His answers are short and he doesn''t even bother to stop writing in his notebook as you talk.'
 		else
-			'"Sorry, <<$Pcs_nickname>>, but why are you talking to me? We’re not exactly friends, y’know…." Artem asks weakly. He’s careful not to offend you, but it’s clear he’s hesitant to talk to you.'
+			'"Sorry, <<$Pcs_nickname>>, but why are you talking to me? We''re not exactly friends, y''know…." Artem asks weakly. He''s careful not to offend you, but it''s clear he''s hesitant to talk to you.'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
@@ -65,20 +65,20 @@ if $ARGS[0] = 'petka':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/6.jpg"></center>'
 	if artQW = 5:
 		npc_rel['A6'] += 1
-		'A devious smile spreads across his face as he closes his book and sets it aside. You try your best to keep the conversation lighthearted, but Petka is determined to let you know how much he’s enjoying his after school "lessons" and how he can’t wait for the next one.'
+		'A devious smile spreads across his face as he closes his book and sets it aside. You try your best to keep the conversation lighthearted, but Petka is determined to let you know how much he''s enjoying his after school "lessons" and how he can''t wait for the next one.'
 	elseif npc_rel['A6'] >= 50 and pav_slut < 125:
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
-			'"You really have to read this book, <<$pcs_nickname>>! I’m pretty sure it’s one you’d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don’t worry, I won’t spoil it for you."'
+			'"You really have to read this book, <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you."'
 		else
-			'"Oh, hey, <<$Pcs_nickname>>. Did you say something? I dont think I heard you." He smiles sheepishly as he puts his book down. "This book is crazy interesting." He tells you, and before you know it hes going on and on about all the interesting characters, plot holes and themes in the book.'
+			'"Oh, hey, <<$Pcs_nickname>>. Did you say something? I don''t think I heard you." He smiles sheepishly as he puts his book down. "This book is crazy interesting." He tells you, and before you know it he''s going on and on about all the interesting characters, plot holes and themes in the book.'
 		end
 	elseif npc_rel['A6'] <= 20 and pav_slut < 125:
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
 			'"Can we talk later? I really want to finish this chapter before class starts." Petka says, only briefly looking up from his book to address you before burying his nose right back into it.'
 		else
-			'You try talking to Petka, bit it’s a very one-sided with you doing all of the talking until they finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
+			'You try talking to Petka, bit it''s a very one-sided with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
@@ -99,14 +99,14 @@ if $ARGS[0] = 'julia':
 		if grupTipe = 3:
 			'Usually Julia is quiet and lets others do most of the talking, but with you, she participates more in the conversation.'
 		else
-			'Julia is sitting alone, diligently working on her homework, when you sit down and start talking with her. She’s a quiet, soft spoken girl, so you end up doing most of the talking, but you can tell she’s enjoying herself.'
+			'Julia is sitting alone, diligently working on her homework, when you sit down and start talking with her. She''s a quiet, soft spoken girl, so you end up doing most of the talking, but you can tell she''s enjoying herself.'
 		end
 	elseif npc_rel['A12'] <= 20 and pav_slut < 125:
 		npc_rel['A12'] += 1
 		if grupTipe = 3:
 			'You try to talk to Julia, but the conversation becomes completely one-sided, with you doing all the talking while Julia busies herself with schoolwork.'
 		else
-			'You try talking to Julia, but its a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." She says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
+			'You try talking to Julia, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 125:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
@@ -140,16 +140,16 @@ if $ARGS[0] = 'natasha':
 	if npc_rel['A16'] >= 50 and pav_slut < 125:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
-			'"Hey, have you seen this new makeup line coming out? Its expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she cant afford nice things like this, and it ends up bringing her down, but you quickly change the subject and start complimenting her on her sense of style and grades, reminding her shes a top student in school which brings a smile to her face.'
+			'"Hey, have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this, and it ends up bringing her down, but you quickly change the subject and start complimenting her on her sense of style and grades, reminding her she''s a top student in school which brings a smile to her face.'
 		else
 			'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day so far and what goes on in the apartment complex where you both live.'
 		end
 	elseif npc_rel['A16'] <= 20 and pav_slut < 125:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
-			'Natasha isn’t really interested in talking to you, but you persit trying to keep up a conversation. "Hey, I’ve gotta go… do this thing. I guess I’ll see you later?" She says halfheartedly.'
+			'Natasha isn''t really interested in talking to you, but you persit trying to keep up a conversation. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" She says halfheartedly.'
 		else
-			'"Why are you even talking to me? It’s not like we’re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just…" She drags the last part out, expecting you to catch her drift and leave.'
+			'"Why are you even talking to me? It''s not like we''re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just…" She drags the last part out, expecting you to catch her drift and leave.'
 		end
 	elseif pav_slut >= 125:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'natasha':
 			'You grab Natasha by the hand and pull her along with you as you tell her. "Come to the bathroom with me."'
 			'She looks at you questioningly but doesn''t protest, as you pull her into the bathroom, past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread you legs and tell her. "Down on your knees, time to pay off a little debt."'
 			'She looks a little shocked at first but then gets down on her knees and lowers her face to your crotch.'
-			act 'Further':
+			act 'Continue':
 !!ToDo: Expand this content (nutluck)
 				*clr & cla
 				minut += 15
@@ -212,16 +212,16 @@ if $ARGS[0] = 'evgeny':
 	if npc_rel['A151'] >= 50 and pav_slut < 125:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
-			'"In chess, you should be as cool as a cucumber." Evgeny says without you asking his opinion on the matter. You cant help but laugh a bit, but go along with it nonetheless as you watch him play chess against himself.'
+			'"In chess, you should be as cool as a cucumber." Evgeny says without you asking his opinion on the matter. You can''t help but laugh a bit, but go along with it nonetheless as you watch him play chess against himself.'
 		else
-			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn’t even bother to look up from his chessboard, but you don’t take it as an insult. He’s always been socially awkward, some going as far as to say he’s autistic, so you don’t take offense, and instead sit down across from him and make small talk while he plays against himself.'
+			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn''t even bother to look up from his chessboard, but you don''t take it as an insult. He''s always been socially awkward, some going as far as to say he''s autistic, so you don''t take offense, and instead sit down across from him and make small talk while he plays against himself.'
 		end
 	elseif npc_rel['A151'] <= 20 and pav_slut < 125:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
-			'You try talking to Evgeny, but it’s a very one-sided with you doing all of the talking until he finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
+			'You try talking to Evgeny, but it''s a very one-sided with you doing all of the talking until he finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		else
-			'"I really don’t want to talk right now." Evgeny says abruptly. You’re a bit shocked at how straightforward he is, but he refuses to look up from his chessboard, leaving you with no other option but to walk away.'
+			'"I really don''t want to talk right now." Evgeny says abruptly. You''re a bit shocked at how straightforward he is, but he refuses to look up from his chessboard, leaving you with no other option but to walk away.'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
@@ -240,16 +240,16 @@ if $ARGS[0] = 'feofan':
 	if npc_rel['A152'] >= 50 and pav_slut < 125:
 		npc_rel['A152'] += 1
 		if grupTipe = 3:
-			'"I cant believe this…" Feofan says as you approach. "Someone on this sci-fi forum said that Alien vs. Predator cross-over crap is the best in the series. Anyone with half a braincell knows the first two and last two movies are the only good ones!" He pauses for a second as he finishes reading what’s on his phone screen. "I can’t read anymore of this blasphemy." He finishes with a heavy sigh.'
+			'"I can''t believe this…" Feofan says as you approach. "Someone on this sci-fi forum said that Alien vs. Predator cross-over crap is the best in the series. Anyone with half a braincell knows the first two and last two movies are the only good ones!" He pauses for a second as he finishes reading what''s on his phone screen. "I can''t read anymore of this blasphemy." He finishes with a heavy sigh.'
 		else
-			'Feofan is busy on his phone when you approach, but when he sees you he flashes you a quick smile. "There’s this little Star Trek convention going on, but it’s out of town. Wish I could go." He’s clearly saddened by this, but gives a dismissive shrug of his shoulders before going on to talk about other conventions he has gone to..'
+			'Feofan is busy on his phone when you approach, but when he sees you he flashes you a quick smile. "There''s this little Star Trek convention going on, but it''s out of town. Wish I could go." He''s clearly saddened by this, but gives a dismissive shrug of his shoulders before going on to talk about other conventions he has gone to..'
 		end
 	elseif npc_rel['A152'] <= 20 and pav_slut < 125:
 		npc_rel['A152'] += 1
 		if grupTipe = 3:
-			'Feofan isnt really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I’ve gotta go… do this thing. I guess I’ll see you later?" He says halfheartedly with an awkward laugh.'
+			'Feofan isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" He says halfheartedly with an awkward laugh.'
 		else
-			'"Sorry if this sounds rude, but why are you talking to me, of all people? It’s not like we’re in the same social circle or something." Feofan says with a suspicious look. "Listen… I’m just kinda busy at the moment, so…" He remains polite and tries to stay lighthearted, but he obviously doesnt want to talk.'
+			'"Sorry if this sounds rude, but why are you talking to me, of all people? It''s not like we''re in the same social circle or something." Feofan says with a suspicious look. "Listen… I''m just kinda busy at the moment, so…" He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk.'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
@@ -268,16 +268,16 @@ if $ARGS[0] = 'gerasim':
 	if npc_rel['A153'] >= 50 and pav_slut < 125:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
-			'You greet Gerasim with a smile, and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "Im fine." He says, his smile growing. "Thanks for worrying about me, <<$pcs_nickname>>."'
+			'You greet Gerasim with a smile, and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "I''m fine." He says, his smile growing. "Thanks for worrying about me, <<$pcs_nickname>>."'
 		else
-			'"Oh, hello, <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously, and you realize he’s doing someone else’s homework. "Yeah, I’m a little busy, but I wouldn’t mind the company while I work." He adds with a small laugh.'
+			'"Oh, hello, <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously, and you realize he''s doing someone else''s homework. "Yeah, I''m a little busy, but I wouldn''t mind the company while I work." He adds with a small laugh.'
 		end
 	elseif npc_rel['A153'] <= 20 and pav_slut < 125:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
-			'Gerasim isnt really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I’ve gotta go… do this thing. I guess I’ll see you later?" He says halfheartedly with an awkward laugh.'
+			'Gerasim isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" He says halfheartedly with an awkward laugh.'
 		else
-			'You try talking to Gerasim, but its a very one-sided conversation with you doing all of the talking until they finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
+			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
@@ -296,16 +296,16 @@ if $ARGS[0] = 'zinaida':
 	if npc_rel['A142'] >= 50 and pav_slut < 125:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
-			'"Hey, look at this, I got into the top ten with my last score." With a small smile, Zinaida shows you the screen of her phone, and sure enough shes number five on the leader board. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it.'
+			'"Hey, look at this, I got into the top ten with my last score." With a small smile, Zinaida shows you the screen of her phone, and sure enough she''s number five on the leader board. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it.'
 		else
 			'"Hey, <<$pcs_nickname>>." Zinaida says with a small smile. "Come to watch me beat some noobs?" She says as she lowers her phone so you can watch her as she plays.'
 		end
 	elseif npc_rel['A142'] <= 20 and pav_slut < 125:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
-			'She is playing some game on her phone. "I’d like to talk… but I’m busy trying to beat this level. It’s… hard." Zinaida says quietly, looking up at you through her messy hair that hang down onto her face.'
+			'She is playing some game on her phone. "I''d like to talk… but I''m busy trying to beat this level. It''s… hard." Zinaida says quietly, looking up at you through her messy hair that hang down onto her face.'
 		else
-			'You try talking to Zinaida, but its a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." She says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
+			'You try talking to Zinaida, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 125:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
@@ -460,34 +460,5 @@ if $ARGS[0] = 'lesco':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-if $ARGS[0] = 'sonia':
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/25.jpg"></center>'
-	if npc_rel['A25'] >= 50 and pav_slut < 125:
-		npc_rel['A25'] += 1
-		if grupTipe = 5:
-			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
-		else
-			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
-		end
-	elseif npc_rel['A25'] <= 20 and pav_slut < 125:
-		npc_rel['A25'] += 1
-		if grupTipe = 5:
-			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and gives you a a slight frown in return. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
-		else
-			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens at your approach. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
-		end
-	elseif pav_slut >= 125:
-		npc_rel['A25'] += 1
-		'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "What''s up slut?" You laugh sit down next to her telling her about your day. The two of you banter back and forth about who''s breath smells like cum and discuss each of your latest sexcapades.'
-	else
-		npc_rel['A25'] += 1
-		'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens slightly at your approach. "Do you need something <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
-	end
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-end
-
 --- gschool_chats2 ---------------------------------
 

+ 79 - 57
locations/gschool_events.qsrc

@@ -294,7 +294,7 @@ if $ARGS[0] = 'break_events':
 					grupvalue[4] += 1
 					pcs_horny += 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/tease.jpg"></center>'
-					'You turn to face <<$rand_boy>> who is standing right behind you with a shit eating grin on his face. You step towards him and put your face centimeters from his. With a sultry smile you move your lips up to his ear and whisper, "Baby, if you wanted to cop a feel, all you had to do was ask..." as your hand gently slides up his thigh to caress his now rapidly stiffening member through his trousers. As the word "ask" leaves your lips, you give a gentle blow into his ear before quickly turning back and cheerfully continuing down the hall before he can even respond, lifting your skirt slightly to show off your hip. Observant individuals might have noticed a slight skip in your step and an extra '+iif(PCloSkirt > 0 and $pantyworntype = 'none', 'and a shiny wetness on the inside of your thighs.', 'sway to your hips as you walk away.')
+					'You turn to face <<$rand_boy>> who is standing right behind you with a shit eating grin on his face. You step towards him and put your face centimeters from his. With a sultry smile you move your lips up to his ear and whisper, "Baby, if you wanted to cop a feel, all you had to do was ask..." as your hand gently slides up his thigh to caress his now rapidly stiffening member through his trousers. As the word "ask" leaves your lips, you give a gentle blow into his ear before quickly turning back and cheerfully continuing down the hallway before he can even respond, lifting your skirt slightly to show off your hip. Observant individuals might have noticed a slight skip in your step and an extra '+iif(PCloSkirt > 0 and $pantyworntype = 'none', 'and a shiny wetness on the inside of your thighs.', 'sway to your hips as you walk away.')
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
@@ -304,7 +304,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 2 and hot > 5 and PCloSkirt > 0:
 		cla
 		gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 0, 0
-		'As you walk through the halls you hear the sound of running footsteps behind you. Before you can turn to see what''s happening, you feel hands on your skirt and in a flash the button and zipper has been undone and your skirt is around your ankles. You hear whooping laughter and whistles as all of your present classmates have a clear view of your '+iif($pantyworntype ! 'none', 'panties.', 'utmost of private parts.')
+		'As you walk through the hallway you hear the sound of running footsteps behind you. Before you can turn to see what''s happening, you feel hands on your skirt and in a flash the button and zipper has been undone and your skirt is around your ankles. You hear whooping laughter and whistles as all of your present classmates have a clear view of your '+iif($pantyworntype ! 'none', 'panties.', 'utmost of private parts.')
 
 		act 'Embarrassment':
 			cla
@@ -529,7 +529,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand =  11 and hotcat > 5:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		'As you walk down the hall, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from the embarrassed look on his face and the admiring glances of his friends that Feofan was the one touching your ass. Looks like he scored some points with the boys today.'
+		'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from the embarrassed look on his face and the admiring glances of his friends that Feofan was the one touching your ass. Looks like he scored some points with the boys today.'
 		act 'Ignore him':
 			*clr & cla
 			npc_rel['A152'] += 1
@@ -652,7 +652,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 12 and hotcat > 5 and PCloSkirt > 0:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		'As you walk down the hall, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from his disappointed expression that Lazar was the one groping your ass. Perhaps he was expecting something firmer, after hanging out with the athletic girls so much? Maybe you should work out more...'
+		'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from his disappointed expression that Lazar was the one groping your ass. Perhaps he was expecting something firmer, after hanging out with the athletic girls so much? Maybe you should work out more...'
 
 		act 'Ignore him':
 			*clr & cla
@@ -776,7 +776,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 13 and hotcat > 5 and PCloSkirt > 0:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		'As you walk down the hall, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. The brazen look on his face betrays Roman, it must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
+		'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. The brazen look on his face betrays Roman, it must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
 
 		act 'Ignore him':
 			*clr & cla
@@ -879,7 +879,7 @@ if $ARGS[0] = 'break_events':
 		end
 	elseif break_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		'As you walk down the hall, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. Lesco is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
+		'As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. Lesco is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
 		'"Lesco, are you out of your mind!?" you cry out, as the other boys burst out into laughter. You can see the panic in his face as he raises his hands in defense, rapidly apologizing:'
 		*nl
 		'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
@@ -912,20 +912,33 @@ if $ARGS[0] = 'break_events':
 			'You think he is kinda cute so you decided to flirt back with him. You lay your had on his chest and tell him he isn''t so bad himself, soon you are flirting back just as much as he is flirting with you.'
 			*nl
 			'After a bit he seems emboldened by you flirting back at him and if you are not mistaken, he is sporting a raging hard-on as well. "Hey <<$pcs_nickname>>, want to go somewhere private and have some fun?"'
-			act 'Not today':
-				*clr & cla
-				gs 'fame', 'pav', 'sex', 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
-				'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'
-				gs 'gschool_events', 'leave_break_events'
+			
+			gs 'willpower', 'sex'
+			if will_cost <= pcs_willpwr:
+				act 'Not today (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'fame', 'pav', 'sex', 1
+					gs 'willpower', 'sex'
+					gs 'willpower', 'resist'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
+					'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'
+					gs 'gschool_events', 'leave_break_events'
+				end
+			else
+				'<br>You don''t have enough willpower to tell him ''Not today''.'
 			end
-
+			
+			gs 'willpower', 'sex'
+			will_cost = will_cost * 3/2
 			if will_cost <= pcs_willpwr:
 				act 'Hell no (<<will_cost>> Willpower)':
 					*clr & cla
+					gs 'fame', 'pav', 'sex', -1
+					gs 'willpower', 'sex'
+					will_cost = will_cost * 3/2
 					gs 'willpower', 'resist'
 					gs 'stat'
-					gs 'fame', 'pav', 'sex', -1
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
 					'You can not believe he asked that, well yes you can. That seems to be the only thing boys are even remotely capable of thinking about. "No! What kind of girl do you think I am anyways? Whatever, I don''t even want to know." With that you turn and storm off, leaving him behind.'
 					gs 'gschool_events', 'leave_break_events'
@@ -958,25 +971,25 @@ if $ARGS[0] = 'break_events':
 		end
 	elseif break_rand = 17:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/bendover.jpg"></center>'
-		'As walk down the halls, you see Veronika writing something in her notebook as she walks. She bumps into one of the other students from not looking where she is going and ends up dropping her pencil. Without thinking she bends over and picks it up, giving everyone in the hall a nice view of her panty clad ass, which elicits hoots, hollers, and whistles from the other students, especially the boys. She quickly stands up blushing a bit and smooths her skirt back in place. She gives some of the more vocal boys a dirty look as she hurries on her way.'
+		'As you walk down the hallway, you see Veronika writing something in her notebook as she walks. She bumps into one of the other students from not looking where she is going and ends up dropping her pencil. Without thinking she bends over and picks it up, giving everyone in the hallway a nice view of her panty clad ass, which elicits hoots, hollers, and whistles from the other students, especially the boys. She quickly stands up blushing a bit and smooths her skirt back in place. She gives some of the more vocal boys a dirty look as she hurries on her way.'
 		gs 'arousal', 'voyeur', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girldryhump.jpg"></center>'
-		'As walk down the halls, you see a commotion ahead. Several students are cluster together looking at something. As you get closer you see Anushka bent over at the waist, with Alyona standing behind her. Pulling her hair as she pretend to hump her from behind, to the delight of the boys watching. Then a teacher starts loudly asking whats going on and everyone quickly disperses.'
+		'As you walk down the hallway, you see a commotion ahead. Several students are cluster together looking at something. As you get closer you see Anushka bent over at the waist, with Alyona standing behind her. Pulling her hair as she pretend to hump her from behind, to the delight of the boys watching. Then a teacher starts loudly asking whats going on and everyone quickly disperses.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 19:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girlsbj.jpg"></center>'
-		'As walk down the halls, you see two girls from your brothers class. One of them bends over and starts pretending to suck the other girls imaginary dick, the first one just stands there proudly a moment then grabs the second girls head to force her to deep throat the imaginary dick. As the boys hoot and holler, they carry on for a few moments until a teacher starts coming down the hall. Obviously attracted by all the noise the boys are making.'
+		'As you walk down the hallway, you see two girls from your brothers class. One of them bends over and starts pretending to suck the other girls imaginary dick, the first one just stands there proudly a moment then grabs the second girls head to force her to deep throat the imaginary dick. As the boys hoot and holler, they carry on for a few moments until a teacher starts coming down the hallway. Obviously attracted by all the noise the boys are making.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 20:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girlskiss.jpg"></center>'
-		'As you stop at your locker, you see a few of the cool kids hanging out. Andrey starts trying to get his girlfriend Stasya and Lizaveta to kiss, several other boys and some of the girls join in with the encouragement. Lizaveta is shaking her head no, Stasya looks over at Andrey who nods and winks to her. Stasya rolls her eyes but then grabs Lizaveta, says something to her then starts to kiss her. Lizaveta resist a moment but as the kids all keep up the encouragement she gives in and returns the kiss. They quickly breaks the kiss, Andrey hugs and kisses Stasya, while Lizaveta blushes a bit at the attention. Before long a teacher hollers down the hall asking whats going on, which causes everyone to break up.'
+		'As you stop at your locker, you see a few of the cool kids hanging out. Andrey starts trying to get his girlfriend Stasya and Lizaveta to kiss, several other boys and some of the girls join in with the encouragement. Lizaveta is shaking her head no, Stasya looks over at Andrey who nods and winks to her. Stasya rolls her eyes but then grabs Lizaveta, says something to her then starts to kiss her. Lizaveta resist a moment but as the kids all keep up the encouragement she gives in and returns the kiss. They quickly breaks the kiss, Andrey hugs and kisses Stasya, while Lizaveta blushes a bit at the attention. Before long a teacher hollers down the hallway asking whats going on, which causes everyone to break up.'
 		gs 'arousal', 'voyeur', 2
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -988,7 +1001,7 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 22:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/handstand.jpg"></center>'
-		'As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterdays practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hall until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.'
+		'As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterdays practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.'
 		*nl
 		'After a few moments when it is obvious Christina isn''t going to relent both Lariska and Lina do as they are commanded and with predictable results their skirts fall down around their stomaches showing off their panties, they blush as the boys and some of the girls whistle and comment about their choice in panties, but do as Christina demands. Who stands their smugly, obviously enjoying bullying the other girls.'
 		gs 'arousal', 'voyeur', 1
@@ -996,7 +1009,7 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 23:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/hellokitty.jpg"></center>'
-		'As walk down the hall, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins like made nodding yes as he says yes to her. She smiles and pulls up her skirt to show off a pair of boyshorts with hellokitty on them. The boy looks disappointed whle the girl laughs.'
+		'As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins like made nodding yes as he says yes to her. She smiles and pulls up her skirt to show off a pair of boyshorts with hellokitty on them. The boy looks disappointed whle the girl laughs.'
 		gs 'arousal', 'voyeur', 1
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1008,10 +1021,10 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 25:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/makeupgirl.jpg"></center>'
-		'As walk down the hall, you see Bella sitting on one of the window ledges ignoring her class mates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.'
+		'As you walk down the hallway, you see Bella sitting on one of the window ledges ignoring her class mates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.'
 	elseif break_rand = 26:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nastymessage.jpg"></center>'
-		'As walk down the hall, you see Christina writing a nasty message on a locker. Obviously another girls locker by the comments. Calling her a fat cow of a slut and such. She is such a bully, you idly wonder how hard it will be for who ever''s locker it is to remove it.'
+		'As you walk down the hallway, you see Christina writing a nasty message on a locker. Obviously another girls locker by the comments. Calling her a fat cow of a slut and such. She is such a bully, you idly wonder how hard it will be for who ever''s locker it is to remove it.'
 	elseif break_rand = 27:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties.jpg"></center>'
 		'As you pass the stair well, you see a cluster of boys including your brother around a girl. You stop a moment to see what they are doing, the boys quickly give the girl some money and then she lifts up her skirt, she them her lack of panties and her pussy. She quickly pulls it back down only giving them the briefest of looks. You wonder if you should say something when a teacher starts coming down the stairs and they all scatter.'
@@ -1020,13 +1033,13 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 28:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shhh.jpg"></center>'
-		'You notice Lena and Lera sitting on the floor near the end of one of the halls. Lera leans over to say something and Lena grabs her by the hair and forces her face down to her crotch. As you watch Lena makes a shhh motion at you. You can''t tell if Lera is really going down on Lena or if they are just messing around. After a moment you move on.'
+		'You notice Lena and Lera sitting on the floor near the end of the hallway. Lera leans over to say something and Lena grabs her by the hair and forces her face down to her crotch. As you watch Lena makes a shhh motion at you. You can''t tell if Lera is really going down on Lena or if they are just messing around. After a moment you move on.'
 		gs 'arousal', 'voyeur', 2
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 29:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
-		'As pass by some of the nerds talking, Dan comes starts to walk by as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull the skirt out of his hand to no avail, Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything a teacher looks out from one of the classes and asks whats going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
+		'As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything a teacher looks out from one of the classes and asks whats going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
 		gs 'arousal', 'voyeur', 1
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1044,22 +1057,22 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 32:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/tieshoe.jpg"></center>'
-		'As walk down the hall, you see Irina has stopped. She lifts her foot up to place it on the window sill as she bends over to tie her shoe. Her skirt rides way up showing off her ass. It is only for a moment but you are almost certain she wasn''t wearing panties. You briefly wonder if she was even aware how much others could see.'
+		'As you walk down the hallway, you see Irina has stopped. She lifts her foot up to place it on the window sill as she bends over to tie her shoe. Her skirt rides way up showing off her ass. It is only for a moment but you are almost certain she wasn''t wearing panties. You briefly wonder if she was even aware how much others could see.'
 		gs 'arousal', 'voyeur', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 33:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/walkaround.jpg"></center>'
-		'As walk down the hall, you see Paulina, Lena and Lera practically laying in the middle of the hallway. Which forces the other students to carefully walk around them, while they berate the students who step to close to them. Though you are sure they are just enjoying making the other students life harder by just being in the way.'
+		'As you walk down the hallway, you see Paulina, Lena and Lera practically laying in the middle of the hallway. Which forces the other students to carefully walk around them, while they berate the students who step to close to them. Though you are sure they are just enjoying making the other students life harder by just being in the way.'
 	elseif break_rand <= 36 and petka_homework_day ! daystart:
 		*clr & cla
 		petka_homework_day = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		if grupTipe = 1 or grupTipe = 2 or grupTipe = 4:
-			'As you walk down the halls you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. That likely means he is alone in there, looking around you see the hall start to clear out of people.'
+			'As you walk down the hallway you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. That likely means he is alone in there, looking around you see the hall start to clear out of people.'
 		else
-			'As you walk down the halls you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. You don''t blame him for being cautious, as you go about your business.'
+			'As you walk down the hallway you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. You don''t blame him for being cautious, as you go about your business.'
 		end
 		act 'Leave': gt 'gschool_events', 'leave_break_events2'
 		if petka_homework_need = 1:
@@ -1191,6 +1204,7 @@ if $ARGS[0] = 'homework_sex_bribe':
 	grupvalue[3] -= 3
 	grupvalue[4] -= 1
 	npc_rel['A6'] += 5
+	if npc_sex['A6'] = 0: npc_sex['A6'] = 1
 	pcs_grades += 3
 	lernHome -= 1
 	gs 'fame', 'pav', 'sex', 5
@@ -1316,7 +1330,7 @@ if $ARGS[0] = 'afterschool_events':
 	if break_rand = 1:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/alyona1.jpg"></center>'
-		'As walk down the hall, you see Alyona squating in the floor next to her locker with a bottle of vodka in her hands as she starts to open it.'
+		'As you walk down the hallway, you see Alyona squating in the floor next to her locker with a bottle of vodka in her hands as she starts to open it.'
 		act 'Ignore her and leave': gt 'gschool_grounds', 'main'
 		act 'Talk to her':
 			*clr & cla
@@ -1392,7 +1406,7 @@ if $ARGS[0] = 'afterschool_events':
 	elseif break_rand = 2:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/andsta1.jpg"></center>'
-		'As walk down the hall, you see Andrey leaning against the lockers talking to Stasya as she is getting something out of her locker, nothing special here just a couple acting like a couple.'
+		'As you walk down the hallway, you see Andrey leaning against the lockers talking to Stasya as she is getting something out of her locker, nothing special here just a couple acting like a couple.'
 		act 'Ignore them and leave': gt 'gschool_grounds', 'main'
 		act 'Watch':
 			*clr & cla
@@ -1414,20 +1428,20 @@ if $ARGS[0] = 'afterschool_events':
 		end
 	elseif break_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/braflash.jpg"></center>'
-		'As walk down the hall, you see several of the gopnik boys giving Paulina a bit of a hard time, she flips them off and shoves the closer ones away. But before she walks off she flips up her shirt to flash them her bra and laughs at their reaction before walking away. While the boys call her a tease as she does.'
+		'As you walk down the hallway, you see several of the gopnik boys giving Paulina a bit of a hard time, she flips them off and shoves the closer ones away. But before she walks off she flips up her shirt to flash them her bra and laughs at their reaction before walking away. While the boys call her a tease as she does.'
 		gs 'arousal', 'voyeur', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/nakedgirl' + rand(1,2) + '.jpg"></center>'
-		'As you walk down the hall you are greeted by a unusual sight. A girl from your brothers class naked, walking the school halls. When she see''s you she lets out a squeek and runs off before you can ask her what she is doing. Not feeling like trying to chase a naked girl around school and it''s really not your business anyways you continue on your way.'
+		'As you walk down the hallway you are greeted by a unusual sight. A girl from your brothers class naked, walking the school hallway. When she see''s you she lets out a squeek and runs off before you can ask her what she is doing. Not feeling like trying to chase a naked girl around school and it''s really not your business anyways you continue on your way.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 5:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/nushflash1.jpg"></center>'
-		'As you walk down the hall you are greeted by a unusual sight. Anushka naked, well maybe not that unusual, still you don''t typically see her naked in the school halls.'
+		'As you walk down the hallway you are greeted by a unusual sight. Anushka naked, well maybe not that unusual, still you don''t typically see her naked in the school hallway.'
 		gs 'arousal', 'voyeur', 5, 'unknown'
 		gs 'stat'
 		act 'Ignore her and leave': gt 'gschool_grounds', 'main'
@@ -1446,7 +1460,7 @@ if $ARGS[0] = 'afterschool_events':
 	elseif break_rand = 6:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/onlypanties.jpg"></center>'
-		'As you walk down the hall you are greeted by a unusual sight. Natasha frantically trying to open her locker while only wearing panties.'
+		'As you walk down the hallway you are greeted by a unusual sight. Natasha frantically trying to open her locker while only wearing panties.'
 		gs 'arousal', 'voyeur', 5, 'unknown'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1463,16 +1477,17 @@ if $ARGS[0] = 'afterschool_events':
 		end
 	elseif break_rand = 7 and soniaPS >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/sonialeash.jpg"></center>'
-		'As you walk down the hall you are greeted by a unusual sight. Sonia down on all fours crawling along, with a collar around her neck and a leash attached to it. Meanwhile Vitek holds onto the leach walking Sonia like he was walking a dog, with several other of the gopniks walking along with them. The boys are making crude jokes about Sonia being their little bitch and how after he walk they was going to show her a real good time. Sonia keeps her head down, while a few of the gopniks look at at you as they pass. Knowing you couldn''t do anything about it even if you wanted to, you go on your way.'
+		'As you walk down the hallway you are greeted by a unusual sight. Sonia down on all fours crawling along, with a collar around her neck and a leash attached to it. Meanwhile Vitek holds onto the leach walking Sonia like he was walking a dog, with several other of the gopniks walking along with them. The boys are making crude jokes about Sonia being their little bitch and how after he walk they was going to show her a real good time. Sonia keeps her head down, while a few of the gopniks look at at you as they pass. Knowing you couldn''t do anything about it even if you wanted to, you go on your way.'
 	elseif break_rand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/streakers.jpg"></center>'
-		'The halls are almost completely empty as you leave school, but then you hear giggling. You look up just in time to see two naked girls run by and up the stairs to the second floor of the school. You are fairly certain it was Anushka and Alyona, really who else would it be? With the little show over you head out.'
+		'The hallways are almost completely empty as you leave school, but then you hear giggling. You look up just in time to see two naked girls run by and up the stairs to the second floor of the school. You are fairly certain it was Anushka and Alyona, really who else would it be? With the little show over you head out.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 9:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
-		'You running a bit late leaving school, the halls are deserted. Or so you thought at first, as you hear some voices down one of the halls, you slow down and then peak around the corner. You see several of the jock boys and Lariska, she seems unsure about something and you hear the boys encouraging her to give them a peak and show off her great body. She glances up and down the hall obviously afraid of being seen, but also just as obviously about to give into peer pressure.'
+		'You''re running a bit late leaving school, the hallways are deserted. Or so you thought at first, as you hear some voices down one of the corridors, you slow down and then peak around the corner. You see several of the jock boys and Lariska, she seems unsure about something and you hear the boys encouraging her to give them a peak and show off her great body. She glances up and down the hallway, obviously afraid of being seen, but also just as obviously about to give into peer pressure.'
 		act 'Ignore whats happening and leave': gt 'gschool_grounds', 'main'
 		act 'Intervene':
 			*clr & cla
@@ -1553,25 +1568,25 @@ if $ARGS[0] = 'afterschool_events':
 	elseif break_rand = 10:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/upset.jpg"></center>'
-		'As walk down the hall you see a girl you don''t know from your brothers class sitting on the floor with her head in her hands. She looks visible upset and you think you might hear her sniffs as if she might be crying.'
+		'As you walk down the hallway you see a girl you don''t know from your brothers class sitting on the floor with her head in her hands. She looks visible upset and you think you might hear her sniffs as if she might be crying.'
 		act 'Ignore her': gt 'gschool_grounds', 'main'
 		act 'Ask if she is ok':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/upset.jpg"></center>'
 			'You stop by her and ask her. "Are you ok?"'
 			'She looks up a bit startled, apparently she didn''t hear you walk up. She quickly rubs her eyes now very obviously she was crying. "I''m fine."'
-			'Her tone suggest she is anything but fine, but before you can say more she gets up quickly and runs down the hall. Not sure what else to do, you go on your way.'
+			'Her tone suggest she is anything but fine, but before you can say more she gets up quickly and runs down the hallway. Not sure what else to do, you go on your way.'
 			act 'Leave': gt 'gschool_grounds', 'main'
 		end
 	elseif break_rand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/sex/lazarlina.jpg"></center>'
-		'The school is nearly empty, you must be one of the last people left in school. As you walk past one of the hallways you catch sight of something, you stop and peek back around the corner. Halfway down the hall you see Lazar standing and leaning against the wall with his pants and underwear down around his ankles, while Lina kneels in front of him sucking his dick, she seems to be enjoying herself almost as much as he is. After watching them a few moments, you decide to leave them in peace and go on your way.'
+		'The school is nearly empty, you must be one of the last people left in school. As you walk past one of the hallways you catch sight of something, you stop and peek back around the corner. Halfway down the hallway you see Lazar standing and leaning against the wall with his pants and underwear down around his ankles, while Lina kneels in front of him sucking his dick, she seems to be enjoying herself almost as much as he is. After watching them a few moments, you decide to leave them in peace and go on your way.'
 		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/sex/lenalera.jpg"></center>'
-		'The school is nearly empty, you must be one of the last people left in school. As you walk past one of the hallways you catch sight of something, you stop and peek back around the corner. Down at the end of the hall you see Lena standing and leaning against the wall with her skirt pushed up, while Lera kneels in front of her with her face buried in her crotch, obviously eating Lena out. After watching them a few moments, you decide to leave the girls in peace and go on your way.'
+		'The school is nearly empty, you must be one of the last people left in school. As you walk past one of the hallways you catch sight of something, you stop and peek back around the corner. Down at the end of the hallway you see Lena standing and leaning against the wall with her skirt pushed up, while Lera kneels in front of her with her face buried in her crotch, obviously eating Lena out. After watching them a few moments, you decide to leave the girls in peace and go on your way.'
 		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1696,43 +1711,43 @@ if $ARGS[0] = 'afterschool_classroom_events':
 	act 'Leave': gt 'gschool_grounds', 'main'
 	if break_rand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/girlsnudeboy.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. You notice Lavrenti sitting at one of the desk completely naked while Paulina, Lera and Lena are sitting in desk near him. You are not sure what is going on as you can''t quite make out what they are saying, but the girls are teasing him about something. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. You notice Lavrenti sitting at one of the desk completely naked while Paulina, Lera and Lena are sitting in desk near him. You are not sure what is going on as you can''t quite make out what they are saying, but the girls are teasing him about something. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/nudegirl' + rand(1,2) + '.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. Inside you see a girl from your brothers class sitting at a desk completely naked, she is talking softly to someone out of view, you can''t tell what they are talking about, but she seems happy about it. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. Inside you see a girl from your brothers class sitting at a desk completely naked, she is talking softly to someone out of view, you can''t tell what they are talking about, but she seems happy about it. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/nudegirls2.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. Within is two girls that are naked standing at the teachers desk facing the back of the classroom. They are giggling and laughing, while looking at something out side of your view. Most likely another person at the back of the classroom, which they seem to be teasing or modeling for. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. Within is two girls that are naked standing at the teachers desk facing the back of the classroom. They are giggling and laughing, while looking at something out side of your view. Most likely another person at the back of the classroom, which they seem to be teasing or modeling for. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/nudegirls1.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. Two girls completely naked sits at one of the desks with books in front of them. They look unhappy about what is going on and you hear a males voice tell them to start reading, it sounds like one of the teachers but you can''t tell as his voice is low and partially muffled. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. Two girls completely naked sits at one of the desks with books in front of them. They look unhappy about what is going on and you hear a males voice tell them to start reading, it sounds like one of the teachers but you can''t tell as his voice is low and partially muffled. You decided you would rather not get caught spying, so you gentle close the door and hurry off.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/nudepunish.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. You see Ms Braakman sitting at her desk with a stern look on her face and a cane restting across her lap. She is watching a naked girl standing at the blackboard writing something. From your angle you can''t tell who the girl is or what she is writing. After a few moments Ms Braakman smacks the girl with the cane across her bare ass, causing the girl to yelp and start writing faster. Ms Braakman says something but you can''t make it out. You decided you would rather not get caught spying and likely end up naked writing on the blackboard yourself so you gentle close the door and hurry off.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. You see Ms Braakman sitting at her desk with a stern look on her face and a cane restting across her lap. She is watching a naked girl standing at the blackboard writing something. From your angle you can''t tell who the girl is or what she is writing. After a few moments Ms Braakman smacks the girl with the cane across her bare ass, causing the girl to yelp and start writing faster. Ms Braakman says something but you can''t make it out. You decided you would rather not get caught spying and likely end up naked writing on the blackboard yourself so you gentle close the door and hurry off.'
 		gs 'arousal', 'voyeur', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/sex/bjstudent.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. Standing near the windows, with his dick sticking out of his pants is Lazar, just in front of him is Lizaveta, on her knees with Lazar''s cock in her mouth sucking him off for all she is worth. She seems to be enjoying it and from the moans he definitely is, his moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, she keeps sucking him off, sucking out ever last drop of his cum. You quickly close the door and hurry off before they finish and you get caught, wondering if you should spread rumors about Lizaveta, like she likes to do about everyone else.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. Standing near the windows, with his dick sticking out of his pants is Lazar, just in front of him is Lizaveta, on her knees with Lazar''s cock in her mouth sucking him off for all she is worth. She seems to be enjoying it and from the moans he definitely is, his moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, she keeps sucking him off, sucking out ever last drop of his cum. You quickly close the door and hurry off before they finish and you get caught, wondering if you should spread rumors about Lizaveta, like she likes to do about everyone else.'
 		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 7:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/classroom/sex/bjteacher.jpg"></center>'
-		'You step over to the classroom door, look up and down the hall and see no one around. Then you gently pull the door open just a crack and peek inside. Standing near the teachers desk with his pants around his ankles is Mr Kuznetsov, just in front of him is Ms Orlov, on her knees sitting on her heels, as she sucks Mr Kuznetsov dick. She seems to be enjoying it and from the moans he definitely is, his moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, she keeps sucking him off, sucking out ever last drop of his cum. You quickly close the door and hurry off before they finish and you get caught.'
+		'You step over to the classroom door, look up and down the hallway and see no one around. Then you gently pull the door open just a crack and peek inside. Standing near the teachers desk with his pants around his ankles is Mr Kuznetsov, just in front of him is Ms Orlov, on her knees sitting on her heels, as she sucks Mr Kuznetsov dick. She seems to be enjoying it and from the moans he definitely is, his moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, she keeps sucking him off, sucking out ever last drop of his cum. You quickly close the door and hurry off before they finish and you get caught.'
 		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1861,14 +1876,21 @@ if $ARGS[0] = 'rand_scoolboy':
 				'You give him a playful slap in the face. It''s not hard enough to really hurt him but enough to send a message. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
 				act 'Continue': gt 'gschool_events', 'leave_break_events2'
 			end
-			act 'Lift your skirt':
-				*clr & cla
-				gs 'exhibitionism', 1
-				inhib_exp += 2
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
-				'You think to yourself, "<<$rand_boy>> is actually kind of cute..."'
-				'You pretend the other boys aren''t there and sweetly ask him, "Come on <<$rand_boy>>, you know you only have to ask do you want to see more?" as you slowly begin to lift your skirt. That made him the hero of your class, and all the boys look at your body, and then at him in admiration. Then you drop your skirt back down and wave him off, "Just kidding, you pervert! Not with all these other guys around, anyway." and you give him a cute wink as you sit down and get ready for your next class. When you look back, you can see his face is all flustered.'
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			gs 'willpower', 'exhib'
+			if will_cost <= pcs_willpwr:
+				act 'Lift your skirt (<<will_cost>> Willpower)':
+					*clr & cla
+					inhib_exp += 2
+					gs 'willpower', 'force', 'self'
+					gs 'exhibitionism', 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+					'You think to yourself, "<<$rand_boy>> is actually kind of cute..."'
+					'You pretend the other boys aren''t there and sweetly ask him, "Come on <<$rand_boy>>, you know you only have to ask do you want to see more?" as you slowly begin to lift your skirt. That made him the hero of your class, and all the boys look at your body, and then at him in admiration. Then you drop your skirt back down and wave him off, "Just kidding, you pervert! Not with all these other guys around, anyway." and you give him a cute wink as you sit down and get ready for your next class. When you look back, you can see his face is all flustered.'
+					act 'Continue': gt 'gschool_events', 'leave_break_events2'
+				end
+			else
+				'<br>You don''t have enough willpower to life your skirt.'
 			end
 		else
 			act 'Continue': gt 'gschool_events', 'leave_break_events2'
@@ -2257,7 +2279,7 @@ if $ARGS[0] = 'rand_girl_arg':
 	:rnd_girl_loop
 	girl_counter += 1
 	r = rand(0,arrsize('npc_grupTipe'))
-	if npc_gender['A<<r>>'] = 0 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
+	if npc_gender['A<<r>>'] = 1 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
 		$school_static_num = $school_static_num['A<<r>>']
 		$rand_girl = $npc_nickname['A<<r>>']
 		killvar 'girl_counter'

+ 77 - 72
locations/gschool_grounds.qsrc

@@ -34,8 +34,8 @@ if $ARGS[0] = 'main':
 		killvar 'InvitationToDimkaNYparty'
 		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
 	end
-	
-	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
+
+	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:
 		afterschool_day = daystart
 		if rand(0,3) = 0:
 			$eventtype = 'after_school'
@@ -44,36 +44,36 @@ if $ARGS[0] = 'main':
 			gt 'gschool_events', 'afterschool_events'
 		end
 	end
-	
+
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 
 		act 'Go to your graduation':
 			*clr & cla
 			menu_off = 1
-            hour = 10
+			hour = 10
 			minut = 0
 			SchoolAtestat = 1
 			kanikuli = 7
 			gs 'stat'
-            
-            if ParHomeBlock = 1:
-                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
-            else
-                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
-            end
-            
+
+			if ParHomeBlock = 1:
+				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
+			else
+				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
+			end
+
 			'Your Principial begins calling your classmates in alphabetical order. Finally it''s your turn.'
-            
-            if pcs_grades >= 90:
-                'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
-                if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
-            elseif pcs_grades >= 70:
-                'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
-            else
-                'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
-            end
-            
+
+			if pcs_grades >= 90:
+				'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
+				if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
+			elseif pcs_grades >= 70:
+				'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
+			else
+				'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
+			end
+
 			act 'Return to town': minut += 2 & gt 'pavResidential'
 
 			act 'Go to the prom party':
@@ -93,7 +93,7 @@ if $ARGS[0] = 'main':
 	exit
 	end
 
-    if SchoolAtestat = -1 and week < 6 and hour >= 6 and hour < 14:
+	if SchoolAtestat = -1 and week < 6 and hour >= 6 and hour < 14:
 		act 'Get your diploma':
 			*clr & cla
 			menu_off = 1
@@ -103,14 +103,14 @@ if $ARGS[0] = 'main':
 			gs 'stat'
 			if pcs_grades >= 70:
 				'The Principal hands you your diploma. "Well done, Miss <<$pcs_lastname>>! Good luck in your future!" she says as she shakes your hand.'
-			else 
+			else
 				'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
 			end
-				
-			act 'Return to town': minut += 2 & gt 'pavResidential'    
-        end
-    end
-    
+
+			act 'Return to town': minut += 2 & gt 'pavResidential'
+		end
+	end
+
 !!	act 'Go to old school building': gt
 
 !!	act 'Go to the Principals Office': gt
@@ -158,11 +158,11 @@ if $ARGS[0] = 'main':
 	end
 
 	act 'Return to town': minut += 2 & gt 'pavResidential'
-	
+
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $metka
-	
+
 	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if zverRageQW = 1:gt 'gschool_grounds', 'KristinaFight'
@@ -170,35 +170,35 @@ if $ARGS[0] = 'main':
 	if week < 6 and hour = 14 and dimaRevenge = 5 and dimaRevChoice = 0:
 		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 14 and dimaRevenge = 4 and dimaRevChoice = 1:
-		gt 'dimaRevenge', dimaRevenge	
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 1:
 		gt 'dimaRevenge', 5, 'before'
 	elseif week < 6 and hour = 7 and dimaRevenge = 6 and dimaRevChoice = 1:
-		gt 'dimaRevenge', 6, 'before'	
+		gt 'dimaRevenge', 6, 'before'
 	elseif week < 6 and hour = 14 and dimaRevenge = 7 and dimaRevChoice = 1:
-		gt 'dimaRevenge', dimaRevenge		
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 2:
 		gt 'dimaRevenge', dimaRevenge, 'day4jockbefore'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 2:
-		gt 'dimaRevenge', dimaRevenge, 'day5jockbefore'		
+		gt 'dimaRevenge', dimaRevenge, 'day5jockbefore'
 	elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 2:
 		gt 'dimaRevenge', 5, 'day5jockafter'
-	!elseif week < 6 and hour = 11 and dimaRevenge = 4 and  dimaRevChoice = 3:
-	!    gt 'gschool_lessons', 'short_break'	
+	!elseif week < 6 and hour = 11 and dimaRevenge = 4 and	dimaRevChoice = 3:
+	!	 gt 'gschool_lessons', 'short_break'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and  dimaRevChoice = 3:
-	    gt 'dimaRevenge', dimaRevenge	
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 14 and dimaRevenge = 4 and dimaRevChoice = 4:
 		gt 'dimaRevenge', dimaRevenge, 'after'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 4:
-		gt 'dimaRevenge', dimaRevenge, 	'before'
+		gt 'dimaRevenge', dimaRevenge,	'before'
 	elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 4:
-		gt 'dimaRevenge', 5, 'after'	
+		gt 'dimaRevenge', 5, 'after'
 	elseif week < 6 and hour = 7 and dimaRevenge = 7 and dimaRevChoice = 4:
-		gt 'dimaRevenge', 6	
+		gt 'dimaRevenge', 6
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 5:
 		gt 'dimaRevenge', dimaRevenge, 'before'
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 5:
-		gt 'dimaRevenge', 5	
+		gt 'dimaRevenge', 5
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
 		gt 'dimaRevenge', dimaRevenge
 	end
@@ -215,7 +215,7 @@ if $ARGS[0] = 'main':
 			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
 				gt 'NikoDates', 'After School'
 			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
-				gt 'NikoDates', 'After School 2'		
+				gt 'NikoDates', 'After School 2'
 			elseif (NikoVolkovQW = 5 and NikoDate = 1) or NikoEv = 11:
 				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20:
@@ -224,7 +224,7 @@ if $ARGS[0] = 'main':
 				gt 'NikoEv2', 'Recovery'
 			end
 		end
-		
+
 		if ivan_afterschool = 1: act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 
 		if LinaSlut > 0 and rand(1,10) < 3:'You see Lina, Dan and Vasily leaving the school together.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'main':
 				'You can see <a href="exec:gt ''FedorEv'', ''Start''">Fedor</a> with his backpack around his arm, standing by himself.'
 			end
 		else
-			!display friends in table if switch is on. 
+			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
 			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>','5'
 			if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>','5'
@@ -280,7 +280,7 @@ if $ARGS[0] = 'main':
 			end
 		end
 		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
-		
+
 		! meynold`s events
 		if hour = 14 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
 		if mey_vika['mey_vika_qw'] = 35 or mey_vika['mey_vika_qw'] = 36 and minut < 45:
@@ -318,11 +318,11 @@ if $ARGS[0] = 'sports':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
-	
+
 	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see <a href="exec:gt ''gschool_socialchg1'', ''tLazar''">Lazar</a> is on the football field showing off his skills.'
-	
+
 	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice <a href="exec:gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a> doing sprints by the football field.'
-	
+
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
 	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'sports':
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
 			act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
-		else 
+		else
 			'You need to wear exercise clothes to participate.'
 		end
 	end
@@ -397,7 +397,7 @@ if $ARGS[0] = 'bulding':
 			if rand(0,3) = 0:
 				gt 'gschool_events', 'teacher_greet'
 			else
-				$eventtype = 'before_school' 
+				$eventtype = 'before_school'
 				gt 'gschool_events', 'break_events'
 			end
 		end
@@ -410,7 +410,7 @@ if $ARGS[0] = 'bulding':
 		"I know what you did, bitch. Did you really thing I wouldn''t figure out it was you that wiped my harddrive."
 		Before you can deny anything he continues: "I don''t even need that video to ruin your life. Just you wait. Soon the whole school will know what a whore you are."
 		His words fill you with dread as you make your way to class.'
-	end		
+	end
 
 	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
 		zverSlutQW = 2
@@ -481,7 +481,7 @@ if $ARGS[0] = 'KristinaFight':
 end
 
 if $ARGS[0] = 'SchoolRun':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
 	minut += 30
@@ -535,12 +535,12 @@ if $ARGS[0] = 'SchoolRun':
 
 		if swinbeg = 3 and LocalRun = 0:
 			LocalRun = 1
-            if razradbeg < 1:
-                'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
-                razradbeg = 1
+			if razradbeg < 1:
+				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
+				razradbeg = 1
 			else
-                'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
-            end
+				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
+			end
 		end
 
 		gs 'stat'
@@ -550,7 +550,7 @@ if $ARGS[0] = 'SchoolRun':
 end
 
 if $ARGS[0] = 'SchoolRun2':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
 	minut += 30
@@ -614,13 +614,13 @@ if $ARGS[0] = 'SchoolRun2':
 			LocalRun = 2
 			npc_rel['A18'] = 0
 			zverevaQW = 1
-            if razradbeg < 2:
-                'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
-                razradbeg = 2
-            else
-                'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
-            end
-            'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
+			if razradbeg < 2:
+				'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
+				razradbeg = 2
+			else
+				'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
+			end
+			'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		elseif swinbeggor = 2 and begresult >= 130:
 			npc_rel['A18'] = 0
 			'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
@@ -646,6 +646,7 @@ if $ARGS[0] = 'change_room':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
 
 	act 'Leave the school building':
 		if $clothingworntype = 'nude':
@@ -666,23 +667,27 @@ if $ARGS[0] = 'change_room':
 			gt 'gschool_grounds', 'sports'
 		end
 	end
-
-	'You can <a href="exec:gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here.'
+	*nl
+	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec:gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0,', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave so you don''t get stuck here all night.'
 		exit
 	end
 
+	gs 'wardrobe', 'sports_outfit'
+	act 'Change you outfit':
+		cla
+		gt 'wardrobe', 'start'
+	end
+	dynamic $removepan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
-	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	dynamic $shower
+	dynamic $tampon
+	gs 'din_van', 'pblc_pee'
 end
 
 --- gschool_grounds ---------------------------------

+ 47 - 25
locations/gschool_lessons1.qsrc

@@ -611,10 +611,10 @@ if $ARGS[0] = 'literature':
 		act 'Avoid being chosen':
 			*clr & cla
 			pcs_grades -= rand(0,1)
+			$boy = 'A'+str( val($mid(' 004 140 156 157 144 006 152 159 145',4*rand(0,8)+2,3)))
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work.jpg"></center>'
 			'You keep your head down and pretend to be deep in thought as Ms. Braakman scans the rooms for a moment. Luckily, she stops and points to someone else in the class. "<<$npc_lastname[$boy]>>, please read the next passage."'
 			*nl
-			$boy = 'A'+str( val($mid(' 004 140 156 157 144 006 152 159 145',4*rand(0,8)+2,3)))
 			if $boy = 'A4':
 				'You watch Igor sink lower into his seat; apparently he was also trying to hide. Reluctantly, he quietly starts to read the passage, but Ms. Braakman interrupts to remind him to speak clearly. Some kids start to snicker and whisper to each other, causing Igor to awkwardly clear his throat before continuing. By the time he''s finished reading, his cheeks are colored a rosy red and he refuses to look up from his desk for the rest of the class.'
 			elseif $boy = 'A140':
@@ -1806,14 +1806,20 @@ if $ARGS[0] = 'literature_late':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latel1.jpg"></center>'
 		if lit_late_counter > 15:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
-			act 'Refuse':
-				*clr & cla
-				gs 'pain', 2, 'ears', 'twist'
-				demerit += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
-				act 'Go to principal''s office': gt 'gschool_office', 'principal'
+			gs 'willpower', 'misc'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'pain', 2, 'ears', 'twist'
+					gs 'willpower', 'resist'
+					demerit += 10
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
+					'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+					act 'Go to principal''s office': gt 'gschool_office', 'principal'
+				end
+			else
+				'<br>You don''t have enough willpower to refuse.'
 			end
 			act 'Do as she says':
 				*clr & cla
@@ -1868,15 +1874,23 @@ if $ARGS[0] = 'literature_late':
 			end
 		elseif lit_late_counter > 10:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
-			act 'Refuse':
-				*clr & cla
-				gs 'pain', 2, 'ears', 'twist'
-				demerit += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
-				act 'Go to principal''s office': gt 'gschool_office', 'principal'
+			
+			gs 'willpower', 'misc'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'pain', 2, 'ears', 'twist'
+					gs 'willpower', 'resist'
+					demerit += 10
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
+					'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+					act 'Go to principal''s office': gt 'gschool_office', 'principal'
+				end
+			else
+				'<br>You don''t have enough willpower to refuse.'
 			end
+			
 			act 'Do as she says':
 				*clr & cla
 				if $pantyworntype ! 'none':
@@ -1917,15 +1931,23 @@ if $ARGS[0] = 'literature_late':
 			end
 		elseif lit_late_counter > 5:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, I warned you I would not tolerate this. Now come up here right now young lady!" She says as she points in front of her desk.'
-			act 'Refuse':
-				*clr & cla
-				gs 'pain', 2, 'ears', 'twist'
-				demerit += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
-				act 'Go to principal''s office': gt 'gschool_office', 'principal'
+			
+			gs 'willpower', 'misc'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'pain', 2, 'ears', 'twist'
+					gs 'willpower', 'resist'
+					demerit += 10
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
+					'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+					act 'Go to principal''s office': gt 'gschool_office', 'principal'
+				end
+			else
+				'<br>You don''t have enough willpower to refuse.'
 			end
+			
 			act 'Do as she says':
 				*clr & cla
 				gs 'pain', 2, 'asscheeks', 'slap'

+ 27 - 26
locations/gschool_lessons2.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'computer':
 					'The whole class bursts into loud laughter, Mr. turns and gives the rest of class a hard look. "Silence now!" Then he turns back to you.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'computer':
 							'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems. Would you like me to talk about those instead?" you answer brashly, not having any intentions of getting up.'
 							'He leans in close to you. "Get out of my classroom right now or I will drag you out!"'
 							gs 'willpower', 'misc'
-							if will_cost <= pcs_willpwr:	
+							if will_cost <= pcs_willpwr:
 								act 'Refuse (<<will_cost>> Willpower)':
 									cla
 									gs 'willpower', 'resist'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'computer':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Ivanov walking towards your desk.'
 							'When Mr. Ivanov arrives at your desk, he tells you, "And what could you be doing on your phone that''s more important than paying attention in class, Miss <<$pcs_lastname>>? Hand it over."'
@@ -302,9 +302,9 @@ if $ARGS[0] = 'science':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'	
+					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'science':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Miss Orlov walking towards your desk.'
 							'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<$pcs_nickname>>, this is important you need to pay attention."'
@@ -507,7 +507,7 @@ if $ARGS[0] = 'music':
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'music':
 						end
 					else
 						'<br>You don''t have enough willpower to stay inside the classroom.'
-					end		
+					end
 				end
 			else
 				'<br> You don''t have enough willpower to be a smart ass.'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'music':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Vasilyev walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'music':
 					end
 					gs 'willpower', 'misc'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
-						act 'Hide the phone in your bra <<will_cost>>':
+						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'misc'
 							gs 'willpower', 'force', 'self'
@@ -678,17 +678,17 @@ if $ARGS[0] = 'art':
 		*nl
 		'Just as he reaches for his phone Anushka snatches it up off the floor and starts looking at it. "Oooo what''s this? Who''s panties are these Erast?" He grabs ahold of her and takes a moment to wrestle his phone away from her. He obviously is trying to be gentle and yet urgently trying to get his phone back, as she keeps talking. Her voice strained abit as Erast easily over powers her, but you have to give it to her. She doesn''t make it easy on him, holding onto the phone as long as she can.'
 		temp = rand(0,5)
-		if temp=0: 
+		if temp=0:
 			'"White cotton panties by the look of it, must be Julia''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Julia blushing, guess Anushka know''s her panties.'
-		elseif temp = 1: 
+		elseif temp = 1:
 			'"Expensive white lacy panties by the look of it, must be Katja''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Katja blushing, guess Anushka know''s her panties.'
-		elseif temp = 2: 
+		elseif temp = 2:
 			'"Black thong panties by the look of it, must be Albina''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Albina rolling her eyes, guess Anushka know''s her panties.'
-		elseif temp = 3: 
+		elseif temp = 3:
 			'"Black and yellow slippery when wet panties." The whole time Mr. Vasilyev is trying to get class to calm down. Then Anushka laughs after a moment. "Those are mine!" She grins at Erast and places a hand on his chest and looks him right in the eyes. "If you wanted to see, all you had to do was ask." She says as she hikes up her skirt to show off her black and yellow panties. Mr Vasilyev opens his jacket wide to try and block most of the classes view.'
-		elseif temp = 4: 
+		elseif temp = 4:
 			'"Stylish red cotton panties by the look of it, must be Natasha''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Natasha blushing, guess Anushka know''s her panties.'
-		elseif temp = 5: 
+		elseif temp = 5:
 			'"What is that? Comic book character panties? They must be Zinaida''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Zinaida looking mortified, guess Anushka know''s her panties.'
 		end
 		killvar 'temp'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'art':
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -751,7 +751,7 @@ if $ARGS[0] = 'art':
 						end
 					else
 						'<br>You don''t have enough willpower to stay inside the classroom.'
-					end		
+					end
 				end
 			else
 				'<br> You don''t have enough willpower to be a smart ass.'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'art':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Vasilyev walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -866,7 +866,7 @@ if $ARGS[0] = 'art':
 				end
 			else
 				'<br>You don''t have enough willpower to keep using your phone.'
-			end			
+			end
 		end
 	end
 end
@@ -917,7 +917,7 @@ if $ARGS[0] = 'shop':
 				*clr & cla
 				pcs_grades -= rand(0,1)
 				grupvalue[4] -= 1
-				grupvalue[3] += 1 
+				grupvalue[3] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look and then goes back to teacher the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'shop':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Kuznetsov walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'postphys':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to burst into the room.'	
+					'<br>You don''t have enough willpower to burst into the room.'
 				end
 				act 'Keep looking':
 					*clr & cla
@@ -1321,7 +1321,7 @@ if $ARGS[0] = 'postphys':
 					gs 'arousal', 'voyeur', 5, 'unkown'
 					gs 'arousal', 'end'
 					gs 'stat'
-!!Event missing for bursting into the room when christina already sucked him off 
+!!Event missing for bursting into the room when christina already sucked him off
 					!!act 'Burst into the room':gt 'gschool_lessons2', 'postphys'
 					act 'Admit defeat':
 						*clr & cla
@@ -1342,7 +1342,7 @@ if $ARGS[0] = 'postphys':
 		end
 	elseif fizrukSex > 0 and kristinaSex > 0:
 		'When the class is finished, Christina approaches you, "<<$pcs_nickname>>, sweetie, Mr. Pavlovich wants you to join me again in his office. He wants us to ''entertain him'', if you know what I mean. Want to join me?"'
-		gs 'willpower', 'bj' 
+		gs 'willpower', 'bj'
 		if will_cost <= pcs_willpwr:
 			act 'No thanks (<<will_cost>> Willpower)':
 				gs 'willpower', 'resist'
@@ -1421,7 +1421,7 @@ if $ARGS[0] = 'shower2':
 		*nl
 		'As you wash off the soap, you turn just in time to see one girl start spanking another one; most of the girls in the shower room stop what they''re doing to watch the antics of the two of them. After several fairly hard smacks, they stop and laugh about it, the ''victim'' rubbing her butt with strange glee, before everyone returns to showering.'
 	end
-	
+
 !!Does it really makes sense that you can shave in the school??
 !!Also, shaving code must be updated to the new shaving system
 !!If you uncomment this code, also uncomment the code in the 'shower' scene
@@ -1569,6 +1569,7 @@ if $ARGS[0] = 'post_dress':
 	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
 	act 'Use the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	gs 'din_van', 'pblc_pee'
 end
 
 --- gschool_lessons2 ---------------------------------

+ 20 - 20
locations/gschool_lessonsev3.qsrc

@@ -7,12 +7,12 @@ if $ARGS[0] = 'literature':
 		school_event_hour = 1
 		scooltiperand = rand(1,10)
 		if scooltiperand = 1:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'During a rare moment of quiet, you take the opportunity to stretch and look around the room. Your attention settles on Igor, who is working quietly by himself, which is an odd sight to see as he''s usually attached to Dimka''s hip. As you continue to watch him, it starts to dawn on you that without his popular friend around, no one really wants to talk or hang out with him. Maybe those rumors of Dimka being Igor''s only friend are true?'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'"What''s wrong, Igor? Why don''t you call me a slut like you and Dimka did to my friend yesterday!"'
 			*nl
 			'You look up to see Lizaveta and her clique surrounding Igor like wolves cornering their prey. Even from where you''re sitting, you can see how tense and rigid his body is as he keeps his head is hung low, doing his best to ignore them by focusing on his school work, but Lizaveta demands his full attention. Before he can react, she snatches the paper out from under his pen and holds it above his head.'
@@ -24,7 +24,7 @@ if $ARGS[0] = 'literature':
 				*clr & cla
 				npc_rel['A4'] -= 1
 				grupvalue[3] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				*nl
 				'You quickly look away, and spend the rest of class trying to avoid eye contact with Igor.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -35,7 +35,7 @@ if $ARGS[0] = 'literature':
 				npc_rel['A140'] += 1
 				grupvalue[1] -= 1
 				grupvalue[4] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'"It is pretty weird how he always follows Dimka around," you chime in. Lizaveta is quick to agree, and together with the other girls, you continue to mock him until Ms. Braakman finally steps in to put an end to it.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
@@ -48,7 +48,7 @@ if $ARGS[0] = 'literature':
 					npc_rel['A140'] -= 1
 					grupvalue[1] += 1
 					grupvalue[4] -= 1
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
 					'"You''ve made your point, Lizaveta," you sigh. "Just leave him alone."'
 					*nl
 					'"Are you really defending him right now?" She shoots you a disgusted look, "Someone told me that they heard Dimka and Igor call my friend a slut!"'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'literature':
 					*clr & clagrupvalue[1] -= 1
 					grupvalue[4] -= 1
 					npc_rel['A144'] -= 2
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
 					*nl
 					'Unamused, you push Anushka off you. "I was only fucking around. Christ, you''re no fun," she says with a scowl.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'literature':
 			end
 		elseif scooltiperand = 8:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/36.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
 			'During class, you overhear Feofan excitedly telling a boy about the last convention he went to.'
 			*nl
 			'"Feofan, not to be rude, but I don''t really care," the boy says.'
@@ -212,7 +212,7 @@ if $ARGS[0] = 'reading':
 	scooltiperand = rand(1,4)
 	if scooltiperand = 1:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 		'"Screw reading, <<$pcs_nickname>>''s mouth is better suited for sucking cock." You overhear someone say from behind you. You turn around and it''s none other than Petia staring back at you. Unashamed, a perverted smile spreads across his face. You get the feeling he''s undressing you with his eyes.'
 		act 'Say nothing':
 			cla & *nl			
@@ -325,7 +325,7 @@ if $ARGS[0] = 'getphone':
 		'"What do you think?"'
 		act 'Apologize':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/54.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big137.jpg"></center>'
 			'"I'' really sorry, Ms. Braakman. I promise not to do it again."'
 			*nl
 			'Ms. Braakman says nothing for what feels like an eternity, until she finally lets out a heavy sigh, "Don''t do it again." She says, holding your phone out. With a grateful smile, you take it and quickly make your way to the door before she can change her mind.'
@@ -471,7 +471,7 @@ if $ARGS[0] = 'english':
 		school_event_hour = 1
 		scooltiperand = rand(1,5)
 		if scooltiperand = 1:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big158.jpg"></center>'
 			'During class, you overhear Radomir bragging to a group a girls about his musical talents, and they''re hanging on his every word. "It''s crazy that you''re not signed to a company yet, Radomir," a girl says dreamily as the other girls sing a chorus of praise and agreement.'
 			*nl
 			'Radomir scoffs and nods his head, "They need to get their shit together because they''re missing out. I''d make them millions!"'
@@ -522,7 +522,7 @@ if $ARGS[0] = 'english':
 			end
 		elseif scooltiperand = 4:
 			if pcs_makeup > 1:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/15.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></center>'
 				pcs_mood +=5
 				'From over your shoulder, a folded piece of paper is thrown onto your desk. You glance behind you and see Vicky smiling back at you. Opening the note, it reads:'
 				*nl
@@ -531,7 +531,7 @@ if $ARGS[0] = 'english':
 				'You make sure to write back a thank you and hand the note back to her with a smile.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/15.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></center>'
 				'Vicky taps you on the shoulder and shows you a small makeup bag, "Want me to put some makeup on you? Katja showed me some tips last night and I''m looking to try them out on someone," she asks. "Other than myself, that is," she adds with a laugh.'
 				act 'Decline':
 					cla & *nl
@@ -551,7 +551,7 @@ if $ARGS[0] = 'english':
 				end
 			end
 		elseif scooltiperand = 5:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 			'A group of girls are loudly mocking Veronika, calling her all sorts of names, in particular that she''s a stuck-up bitch.'
 			act 'Do nothing': act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			
@@ -595,7 +595,7 @@ if $ARGS[0] = 'working':
 	menu_off = 1
 	scooltiperand = rand(1,4)
 	if scooltiperand = 1:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		'Someone taps you on the shoulder, and when you turn around you see it''s Radomir leaning towards you. "Hey, let me copy off you." It''s more of a demand than a question, and judging by the cocky smirk on his face, he knows the difference and expects you to do as he says.'
 		gs 'willpower', 'misc'
 		if will_cost <= pcs_willpwr:
@@ -705,7 +705,7 @@ if $ARGS[0] = 'working':
 			'<br>You don''t have enough willpower to give them the wrong answers.'
 		end
 	elseif scooltiperand = 4:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 		*nl
 		'"Hey, do you think you can help me? You seem to know what you''re doing," Ivan whispers to you. He laughs a bit nervously, clearly he isn''t used to asking for help like this.'
 				
@@ -741,13 +741,13 @@ if $ARGS[0] = 'help_radomir':
 	menu_off = 1
 	scooltiperand = rand(1,4)
 	if scooltiperand = 1:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		npc_rel['A3'] += 1
 		*nl
 		'After awhile, Radomir hands you back your paper, "Thanks, babe," he says, once again winking at you.'
 		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	elseif scooltiperand = 2:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		pcs_mood -= 10
 		*nl
 		'Radomir has had your paper for awhile, so you turn around to see what''s taking him so long, but he''s busy talking to someone behind him. Your paper is sitting on his desk, and it looks like he hasn''t finished copying your answers.'
@@ -776,7 +776,7 @@ if $ARGS[0] = 'help_radomir':
 	elseif scooltiperand = 3:
 		pcs_grades -= 1
 		npc_rel['A154'] +=2
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		*nl
 		'Radomir taps you on the shoulder, "Hey, I think someone stole your paper," he says. You stare at him for a moment, unsure if this is some kind of joke or if he''s telling the truth. "Yeah, I think it''s gone. Damn...I didn''t even get to finish copying. I wonder if Bella will let me borrow hers..."'
 		'"Was it stolen or did you lose it, Radomir?" you ask with a glare.'
@@ -784,7 +784,7 @@ if $ARGS[0] = 'help_radomir':
 		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	elseif scooltiperand = 4:
 		npc_rel['A154'] +=1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		*nl
 		'"Hey, I noticed some of your answers were wrong, so I corrected them," Radomir says as he hands you back your paper. You give him a grateful smile and thank him. Lucky you!'
 		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'music':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flick.jpg"></center>'
-			'You notice Radomir keeps flicking Petia''s ear who is sitting in front of him, when Mr. Vasilyev looks away. Poor <<$rand_boy2>>''s ear is already bright red from all the flicking and he looks like he is on the verge of tears.'
+			'You notice Radomir keeps flicking Petia''s ear who is sitting in front of him, when Mr. Vasilyev looks away. Poor Petia''s ear is already bright red from all the flicking and he looks like he is on the verge of tears.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 12:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'

+ 3 - 3
locations/gschool_lunch.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'marcus_event':
 			gs 'willpower', 'bj'
 			gs 'willpower', 'resist'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 			'"Sorry Marcus but I got some stuff I got to do, maybe some other time?" You can see he is fairly disappointed but he nods in agreement.'
 			'"Sure not a problem, talk to you later then?"'
 			'"Yeah, talk to you later." With that you walk off.'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'marcus_event':
 			will_cost = will_cost * 3/2
 			gs 'willpower', 'resist'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 			'You shake your head no. "Sorry not today Marcus."'
 			'He nods his head in understanding. "Yeah ok, not a problem. I figured, you know it wouldn''t hurt to ask, but don''t worry about it. But hey you want to sit with me at lunch and talk?"'
 			act 'Yeah that would be nice':
@@ -402,7 +402,7 @@ if $ARGS[0] = 'events':
 				gs 'willpower', 'resist'
 				gs 'stat'
 				grupvalue[4] -= 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
 				'You think a moment about it but decide that you have other things you need to do. So you shake your head. "Sorry Nush not today, maybe some other time, I got some stuff I need to do."'
 				'She gives a little shrug "Whatever." Then she turns and walks off. Leaving you behind wondering if you made the right decision.'
 				act 'Continue': gt 'gschool_lunch', 'break'

+ 3 - 3
locations/gschool_office.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'principal':
 		else
 			*nl
 			'She takes a look at your file and slowly shakes her head. "I see, you already have detention Miss <<$pcs_lastname>>. That means I have no other choice but to use the alternative punishment."'
-			act 'Ge spanked': gt 'gschool_office', 'spanked'
+			act 'Get spanked': gt 'gschool_office', 'spanked'
 		end
 !!		if demerit >= 50:act 'Choose suspension': gt 'gschool_lessons', 'suspension'
 !!		act 'Call Parents': gt 'gschool_lessons', 'Call Parents' - I will add this one in later as it will be a bit of work to write and tie in events at home.
@@ -33,7 +33,7 @@ if $ARGS[0] = 'principal':
 		else
 			*nl
 			'She takes a look at your file and slowly shakes her head. "I see, you already have detention Miss <<$pcs_lastname>>. That means I have no other choice but to use the alternative punishment."'
-			act 'Ge spanked': gt 'gschool_office', 'spanked'
+			act 'Get spanked': gt 'gschool_office', 'spanked'
 		end
 	else
 		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you. "Do you know why you are here, <<$pcs_lastname>>?", before you have a chance to reply she continues on. "It was a rhetorical question - we both know why you are here. You are here because you got in trouble." She pauses to look over at the folder in front of her. "Your file shows you have mostly stayed out of trouble until now. I hope this is only a minor lapse in judgment and not a new trend from you. We won''t get into what you did, just understand this is a warning. Straighten yourself out or there will be consequences. Now, return to class."'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'spanked':
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Principal''s Office</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big134.jpg"></center>'
 	if detention_set ! 2:'No way are you coming back to school on a Saturday. "Uh, I would rather just get it over with, so... Spanking."'
 	'"Very well, come over here." She says as she gets up, pulls a chair out and sits down on it. You get up and walk over to her.'
 	demerit -= 10

+ 10 - 14
locations/gskino.qsrc

@@ -21,7 +21,7 @@ if money >= 100:
 			cla
 			'As you are watching the film a guy sits next to you and whispers in your ear, "Everyone knows you like to suck cock, I''ll pay you if you have a go on this."'
 			'Its dark, but you can just about see well enough to see that he is pointing at his dick.'
-			act 'Reject':
+			act 'Refuse':
 				cla
 				'You tell him you''d rather watch the film, he mutters something that sounded like bitch and leaves you to watch the rest of the movie in peace.'
 				act 'Leave the cinema':gt 'gskver', 'start'
@@ -37,23 +37,19 @@ if money >= 100:
 			'You quietly watch the film.'
 		else
 			'You quietly watch the movie, but suddenly behind you there is a strange sound.'
-			gs 'gskino', 'kinoevent'
+			act 'Turn around and look':
+				*clr & cla
+				pcs_horny += 3
+				gs'stat'
+				'<center><video autoplay loop src="images/locations/pavlovsk/park/theater/sex/kino.mp4"></video></center>'
+				'You see on the back row a girl sucking a guy, nobody reacts to the loud smacking sound that can be heard by the whole cinema.'
+				'You turn back and watch the rest of the film.'
+				act 'Leave the cinema':gt 'gskver', 'start'		
+			end
 		end
 	end
 end
 
-if $ARGS[0] = 'kinoevent':
-	act 'Turn around and look':
-		*clr & cla
-		pcs_horny += 3
-		gs'stat'
-		'<center><video autoplay loop src="images/locations/pavlovsk/park/theater/sex/kino.mp4"></video></center>'
-		'You see on the back row a girl sucking a guy, nobody reacts to the loud smacking sound that can be heard by the whole cinema.'
-		'You turn back and watch the rest of the film.'
-		act 'Leave the cinema':gt 'gskver', 'start'		
-	end
-end
-
 
 --- gskino ---------------------------------
 

+ 5 - 3
locations/hunter_interactions.qsrc

@@ -919,15 +919,17 @@ if $ARGS[0] = 'striptease':
                             'The men continue cheering you on, you keep undressing further, remaining only in underwear...'
 
                             act 'Keep dancing':
-                                *clr & cla
+								*clr & cla
                                 temp_sh = rand(1,2)
                                 gs 'stat'
                                 '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance4.jpg"></center>'
                                 *nl
                                 'You remove the bra and throw it on the table, the men cheer you on and you flash your breasts infront of them.'
                                 gs 'arousal', 'flash', 10
-                                gs 'stat'
-                                if temp_sh = 1:
+								gs 'stat'
+!!ToDo: Huntersex in the else is a dead end, if that is fixed, remove this comment and the next line (julzor)								
+								temp_sh = 1
+							    if temp_sh = 1:
                                     act 'Pass out':
                                         *clr & cla
                                         minut += 1

+ 0 - 3
locations/hunters.qsrc

@@ -3,9 +3,6 @@
 if $ARGS[0] = 'start':
 	gs 'stat'
 
-	!The comment below is a monument to the countless unnamed souls fallen in the battle to revamp this code and text
-	!$textsexhunter = 'From a member of the unpleasant smells and remains in the mouth tastes foul feces. "-Damn, I had to do an enema." - belatedly dumaeete you.'
-
 	act 'Walk away':gt'swamp_yard'
 	if huntersKnow = 0:
 		act 'Greet them':

+ 1 - 1
locations/igorhome.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'igorroom':
 	!!This one I think is if he is dating Dima, not sure.
 	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
 	!!if igor is home the following is added.
-	'You see sitting on the edge of his bed.'
+	'You see Igor sitting on the edge of his bed.'
 	act 'Excuse yourself': gt 'igorhome','hallway'
 	act 'Study': gt 'igorhome','study'
 	act 'Chat': gt 'igorhome','Chat'

+ 4 - 2
locations/kid.qsrc

@@ -25,7 +25,8 @@ $breastfeed = {
 	'You gently lay <<$kidname[ks]>> back <<$babyloc>>.'
 	act 'Done':
 		if $pcs_mothername = '':
-			$pcs_mothername = input("What name do you wish your children to call you by?")
+			$pcs_mothername = input("What name do you wish your children to call you by? (Leave it blank for ''Mom'')")
+			if $pcs_mothername = '': $pcs_mothername = 'Mom'
 		end
 		gt 'kid', 'start'
 	end
@@ -125,7 +126,8 @@ $homework = {
 if $ARGS[0] = 'start':
 	gs 'stat'
 	if $pcs_mothername = '':
-		$pcs_mothername = input("What name do you wish your children to call you by?")
+		$pcs_mothername = input("What name do you wish your children to call you by? (Leave it blank for ''Mom'')")
+		if $pcs_mothername = '': $pcs_mothername = 'Mom'
 	end
 	act 'Leave':
 		cla

+ 1 - 1
locations/lact_bp.qsrc

@@ -998,7 +998,7 @@ if $ARGS[0] = 'milking':
 		end
 		if bcream_used = 1:
 			pcs_nips += rand(0,2)
-			bcream_used = 0
+			!!	bcream_used = 0
 		end
 		minut += pumptime
 	elseif lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:

+ 54 - 129
locations/lact_lib.qsrc

@@ -74,12 +74,12 @@ if $ARGS[0] = 'init_breasttissue' and lactation['breasttissueinitiated'] <= 0:
 	!!	full breastccm would be nbsize + magicf2b + silicone.
 	!!	Getting percentage tissue from breastccm.
 	lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))
-	if lactation['breastccm'] <= 0: lactation['breastccm'] = 1
-	lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['nbsizepercent_wos'] = (nbsize*100/(nbsize + magicf2b)*100)/100
-	lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
+	if lactation['breastccm'] <= 0: lactation['breastccm'] = 1	
+	lactation['nbsizepercent'] = ((nbsize*100/(nbsize + magicf2b + silicone)*100)/100)
+	lactation['magicf2bpercent'] = ((magicf2b*100/(nbsize + magicf2b + silicone)*100)/100)
+	lactation['siliconepercent'] = ((silicone*100/(nbsize + magicf2b + silicone)*100)/100)
+	lactation['nbsizepercent_wos'] = ((nbsize*100/(nbsize + magicf2b)*100)/100)
+	lactation['magicf2bpercent_wos'] = ((magicf2b*100/(nbsize + magicf2b)*100)/100)
 	lactation['nbsizechange'] = nbsize
 	lactation['magicf2bchange'] = magicf2b
 	lactation['siliconechange'] = silicone
@@ -213,84 +213,13 @@ if $ARGS[0] = 'bccmtosize':
 	end
 end
 
-!!	function to recalculate breastccm size. Basically an update function to the init_breasttissue, but without the initialization. Used in breastgrowth function and can be used for debugging or ... whatever comes up in the future.
-if $ARGS[0] = 'breastrecalc':
-	!!	use func('lact_lib','breastrecalc')
-	lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))
-	if lactation['breastccm'] <= 0: lactation['breastccm'] = 1
-	lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
-	lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
-	lactation['breastuseabletissue'] = ((lactation['nbsizepercent'] + lactation['magicf2bpercent'])*lactation['breastccm'])/100
-	lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
-	if lactation['alveolicount'] > 0:
-		lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
-	else
-		if lactation['breastdensitytype'] = 1:
-			lactation['breastglandtissue'] = (lactation['breastuseabletissue']*17)/100
-			lactation['breastdensitypercent'] = 17
-		elseif lactation['breastdensitytype'] = 2:
-			lactation['breastglandtissue'] = (lactation['breastuseabletissue']*36)/100
-			lactation['breastdensitypercent'] = 36
-		elseif lactation['breastdensitytype'] = 3:
-			lactation['breastglandtissue'] = (lactation['breastuseabletissue']*55)/100
-			lactation['breastdensitypercent'] = 55
-		elseif lactation['breastdensitytype'] = 4:
-			lactation['breastglandtissue'] = (lactation['breastuseabletissue']*74)/100
-			lactation['breastdensitypercent'] = 74
-		elseif lactation['breastdensitytype'] = 5:
-			lactation['breastglandtissue'] = (lactation['breastuseabletissue']*93)/100
-			lactation['breastdensitypercent'] = 93
-		end
-		if lactation['active'] <= 0:
-			lactation['alveolicount'] = ((lactation['breastglandtissue']*100000)/218)
-			lactation['alveoliexpandlvl'] = 0
-			lactation['breastmm'] = 0
-			lactation['breastmv'] = 0
-			lactation['lactaterate'] = 0			
-			if pcs_nips > lactation['nipgrowth']: pcs_nips -= lactation['nipgrowth']
-			lactation['nipgrowth'] = 0
-		else
-			lactation['alveolicount'] = ((lactation['breastglandtissue']*100000)/418)
-			lactation['alveoliexpandlvl'] = 10
-			lactation['nipgrowth'] = 2
-			func('lact_lib','set_breastmm')
-			if lactation['prolactinlvl'] < 200: lactation['prolactinlvl'] = 200
-			lactation['lactaterate'] = 1000*(lactation['prolactinlvl']/200)
-			lactation['breastmv'] = 0
-			lactation['nipgrowth'] = 2
-			pcs_nips += lactation['nipgrowth']
-		end
-	end
-	lactation['breastfat'] = lactation['breastuseabletissue'] - lactation['breastglandtissue']
-end
-
-if $ARGS[0] = 'breastgrowthcalc':
-	!!	calculating the ccm all mammarygland tissue will use up in the breast, based on alveolicount and alveoliexpandlvl. With every level, cmm will rise by 20 per alveoli.
-	lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
-	!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
-	!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
-	lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
-	lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
-	lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
-	lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
-	lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
-	lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['nbsizebccm'])
-	nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
-	magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
-	lactation['nbsizechange'] = nbsize
-	lactation['magicf2bchange'] = magicf2b
-	lactation['siliconechange'] = silicone
-end
-
 !!	This function is used for breastgrowth. When nbsize, magicf2b, silicone, alveolicount or the alveoliexpandlvl are changed the breastccm changes. Everything will be written back to the specific variable
 if $ARGS[0] = 'BreastGrowth':
 	!!	usage func('lact_lib','BreastGrowth')
 	!!	Checking for variable errors, and re-initializing breastccm or alveolicount
 	if lactation['breastccm'] <= 0 or lactation['alveolicount'] <= 0:
 		lactation['breasttissueinitiated'] = 0
-		func('lact_lib','init_breasttissue')
+		lactation['result'] = func('lact_lib','init_breasttissue')
 	end
 	!!	things will start if breastccm is different from bust/cup size (mostly due to other events or cheating) or if the mammaryglands change due to breastpumping or pregnancy.
 	if lactation['breastccm'] <> func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone)) or lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
@@ -299,49 +228,45 @@ if $ARGS[0] = 'BreastGrowth':
 		!!	first - check for alveoligrowth: yes, do the crazy stuff
 		!!	second - check for nbsize, magicf2b and silicone change
 		!!	there is no else on purpose, because nothing should happen to svetas breasts if nothing else changes
-		!!	checking for internal changes or growth
-	!!	if lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']: lactation['internal_growth'] = 1
-		!!	checking for external changes or growth
-		!!	if (lactation['nbsizechange'] + lactation['siliconechange'] + lactation['magicf2bchange']) <> (nbsize + magicf2b + silicone): lactation['external_growth'] = 1
-		!!	changing the breasts
-	!!	if lactation['external_growth'] > 0 and lactation['internal_growth'] > 0:
-			!!	changes in nbsize, magicf2b or silicone?
-			if nbsize <> lactation['nbsizechange'] or magicf2b <> lactation['magicf2bchange'] or silicone <> lactation['siliconechange']:
-				!!	getting the new percentages
-				lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
-				lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
-				lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
-				lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
-				!!	calculating new breastccm
-				lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))				
-			end
-			!!	calculating all the breast tissue - breastglandtissue, breastfat and silicone.
-			lactation['breastfat'] = (lactation['breastccm'] - lactation['breastglandtissue'] - ((lactation['siliconepercent']*lactation['breastccm'])/100))
-			lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
-			if lactation['breastfat'] < 0: lactation['breastfat'] = 0
-			if lactation['breastsiliconeccm'] < 0: lactation['breastsiliconeccm'] = 0
-			!!	getting new breastglandtissue
-			lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
-			!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
-			!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
-			lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
-			lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
-			lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
-			lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
-			lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
-			lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['nbsizebccm'])
-			!!	writing back nbsize and magicf2b. Silicone does not change
-			nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
-			magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
-			lactation['nbsizechange'] = nbsize
-			lactation['magicf2bchange'] = magicf2b
-			lactation['siliconechange'] = silicone			
-	!!	elseif lactation['external_growth'] <= 0 and lactation['internal_growth'] > 0:
-		!!	func('lact_lib','breastgrowthcalc')
-	!!	elseif lactation['external_growth'] > 0 and lactation['internal_growth'] <= 0:
-		!!	func('lact_lib','breastrecalc')
-	!!	else
-	!!	end
+		!!	changes in nbsize, magicf2b or silicone?
+		if nbsize <> lactation['nbsizechange'] or magicf2b <> lactation['magicf2bchange'] or silicone <> lactation['siliconechange']:
+			!!	getting the new percentages
+			lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
+			lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
+			lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
+			lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
+			!!	calculating new breastccm
+			lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))
+		end
+		!!	calculating all the breast tissue - breastglandtissue, breastfat and silicone.
+		lactation['breastfat'] = (lactation['breastccm'] - lactation['breastglandtissue'] - ((lactation['siliconepercent']*lactation['breastccm'])/100))
+		lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
+		if lactation['breastfat'] < 0: lactation['breastfat'] = 0
+		if lactation['breastsiliconeccm'] < 0: lactation['breastsiliconeccm'] = 0
+		!!	getting new breastglandtissue
+		lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
+		!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
+		!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
+		lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
+		lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
+		lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
+		lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
+		lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
+		lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['breastccm'])
+		!!	fixing QSP rounding issue
+		if (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) < 100:
+			lactation['nbsizepercent'] += (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
+		elseif (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) > 100:
+			lactation['nbsizepercent'] -= (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
+		end
+		!!	writing back nbsize and magicf2b. Silicone does not change
+		nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
+		magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
+		lactation['nbsizechange'] = nbsize
+		lactation['magicf2bchange'] = magicf2b
+		lactation['siliconechange'] = silicone
+		!!	if sveta is lactating, we need to reset the breastmm too
+		if lactation['active'] > 0:	lactation['result'] = func('lact_lib','set_breastmm')
 	end
 end
 
@@ -551,7 +476,7 @@ if $ARGS[0] = 'lact_switch':
 		!!	setting lactation to active
 		lactation['active'] = 1
 		!!	setting breast maximum milk volume via function
-		func('lact_lib','set_breastmm')
+		lactation['result'] = func('lact_lib','set_breastmm')
 		!!	resetting prolactinlvl so that the initial production rate is not too high
 		if lactation['prolactinlvl'] < 200: lactation['prolactinlvl'] = 200
 		!!	setting the lactation rate. Warning! lactation rate is in ml*1000 now for higher accuracy.
@@ -577,12 +502,12 @@ if $ARGS[0] = 'lact_switch':
 		lactation['nipgrowth'] = 0
 	end
 	!!	Always trigger the breastcycle after breast change, or the changes to svetas breasts will not happen.
-	func('lact_lib','breastcycle')
+	lactation['result'] = func('lact_lib','breastcycle')
 end
 
 !!	new breast cycle function, replaced the monster lactation function in femcyc
 if $ARGS[0] = 'breastcycle':
-	if lactation['breasttissueinitiated'] <= 0: func('lact_lib','init_breasttissue')
+	if lactation['breasttissueinitiated'] <= 0: lactation['result'] = func('lact_lib','init_breasttissue')
 	!!	usage func('lact_lib','breastcycle')
 	!!	if lactating or not, breasts will grow during pregnancy. This will only happen during first full pregnancy
 	if pregchem => 2191 and lactation['maturebreast'] <= 0:
@@ -648,7 +573,7 @@ if $ARGS[0] = 'breastcycle':
 		end
 		!!	If sveta meets alveoliexpandlvl 10 and her prolactinlvl is between random 200 and 250, her lactation will set in. This is happening during induction or during pregnancy
 		if rand(1,50) + lactation['prolactinlvl']  >= rand(200,250) and lactation['alveoliexpandlvl'] >= 10:
-			func('lact_lib','lact_switch')
+			lactation['result'] = func('lact_lib','lact_switch')
 		end
 	else
 	!!	things that happen when Sveta is lactating lactation['active'] > 1
@@ -688,7 +613,7 @@ if $ARGS[0] = 'breastcycle':
 					lactation['lactaterate'] = 10
 				elseif lactation['lactaterate'] <= 0:
 					!!	switching off lactation production and making sure prolactin is dropping. Nipples shrink too. There are some changes that are permanent, especially during pregnancy.
-					func('lact_lib','lact_switch')
+					lactation['result'] = func('lact_lib','lact_switch')
 				end
 			end
 		end
@@ -701,10 +626,10 @@ if $ARGS[0] = 'breastcycle':
 		end
 		!!	Reset used_lactaterate, so milk can be produced again.
 		lactation['used_lactaterate'] = 0
-		func('lact_lib','breast_engorment')
+		lactation['result'] = func('lact_lib','breast_engorment')
 	end
 	if lactation['milkgrowday'] < daystart:
-		func('lact_lib','BreastGrowth')
+		lactation['result'] = func('lact_lib','BreastGrowth')
 		lactation['dailyoverdemand'] = 0
 		lactation['alveolicount_change'] = lactation['alveolicount']
 		lactation['milkgrowday'] = daystart
@@ -716,7 +641,7 @@ if $ARGS[0] = 'lactate_optout':
 	!! usage 1: func('lact_lib','lactate_optout')
 	!! usage 2: gs 'lact_lib','lactate_optout'
 	if lactation['active'] > 0:
-		func('lact_lib','lact_switch')
+		lactation['result'] = func('lact_lib','lact_switch')
 	end
 	lactation['active'] = 0
 	lactation['prolactinlvl'] = 0

+ 1 - 1
locations/lesbisubhouse.qsrc

@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'ev1':
 		gs'stat'
 		
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/dom.jpg"></center>'
-		'To your surprise, the woman dressed up in a pretty outfit this time - one that is basically completely transparent and allows you to see every detail of her body. Most notably: Her big boobs. She''s clasping her hands in front her groin and expectantly stands in front of you.'
+		'To your surprise, Natalya dressed up in a pretty outfit this time - one that is basically completely transparent and allows you to see every detail of her body. Most notably: Her big boobs. She''s clasping her hands in front her groin and expectantly stands in front of you.'
 		
 		gs 'arousal', 'voyeur', 5, 'dom', 'lesbian', 'exhibitionism'
 		gs 'stat'

+ 2 - 5
locations/mey_vika_events.qsrc

@@ -241,9 +241,9 @@ if $ARGS[0] = 'play_game_wish1':
 
 		act '...': gt 'mey_vika_events', 'play_game_wish1', 16
 	elseif zz_stage <= 33:
-		if zz_stage=16 or zz_stage=22 or zz_stage=25 or (zz_stage>=27 and zz_stage<=30):
+		if zz_stage = 16 or zz_stage = 22 or zz_stage = 25 or (zz_stage> 27 and zz_stage < 31):
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.mp4"></video></center>'
-		else
+		elseif (zz_stage > 16 and zz_stage < 22) or zz_stage = 23 or zz_stage = 24 or zz_stage = 26 or zz_stage > 30:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.jpg"></center>'
 		end
 		if zz_stage = 16:
@@ -554,7 +554,6 @@ if $ARGS[0] = 'cafe_qw':
 				*clr & cla
 				minut += 2
 				gs 'stat'
-				$ImageNeededPlacholder
 				'You hastily say goodbye, wanting to get away. Vicky tries to say goodbye but she only manages to let out some quiet moans while Vanya begins speeding up. Seeing this you leave as quickly as you can. You turn around seeing them still at it, and right at the exit of the café a powerful orgasm hits you, making your legs tremble, barely keeping on your feet. You have to grab the railing of the porch of the café. Just so you won''t fall over.'
 				
 				act 'Go outside':
@@ -606,7 +605,6 @@ if $ARGS[0] = 'park_qw':
 	end
 	act 'Agree':
 		*clr & cla
-		$ImageNeededPlacholder
 		'You walk for an hour in the Park and spend a wonderful time with them. You walk in between them. Vicky, cheerfully chatting, holds you by the waist with one of her hands.'
 		if pcs_dom > 10:'You, of course, respond to her advances. You gently touch her back, continuing to walk arm in arm.'
 
@@ -616,7 +614,6 @@ if $ARGS[0] = 'park_qw':
 			*clr & cla
 			minut += 10
 			gs 'stat'
-			$ImageNeededPlacholder
 			'<font color="maroon"><i>"What a wonderful walk, Vanya! We need to do this again some time."</i></font><br> Vanya suddenly grabs you both with his arms and twirls around. The two of you start laughing and playfully try to escape from his grip. When saying goodbye Vicky leans towards you... and gives you a kiss on the lips. This kiss feel extraordinary and surprises you a bit… Vanya also kisses you and you, once again, start getting turned on just like at the café.'
 			
 			act 'Go home':

+ 86 - 94
locations/mirror.qsrc

@@ -32,6 +32,36 @@ if $ARGS[0] = 'start':
 		if dyefade > 0 and dyefade < 7: '<br>Your hair dye is beginning to fade and your roots are showing.'
 		if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
 	end
+	
+	!!!!!!!! Maruda Hair Mod
+	if hscrunch < 1:hscrunchw = 0
+	if hpingrip < 1:hpingripw = 0
+	if hscrunch < 2:hpigtail = 0
+	
+	if pcs_hairlng > 41 and hscrunch >= 1 and hbraids = 0:
+		*nl
+		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
+	end
+
+	if pcs_hairlng > 41 and hpingrip >= 1 and hbraids = 0:
+		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
+	end
+
+	if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+		if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
+		if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
+	end
+	
+	if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+		'You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
+	end
+
+	if hbraids > 0:
+		'Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
+	end
+	!!!!!!!! Maruda Hair Mod
 
 	if kosmetica > 0: *nl 'Cosmetics: <<kosmetica>>' else *nl 'You have no makeup.'
 	if lipbalm > 0: *pl ' | Lip gloss: <<lipbalm>>' else *pl ' You have no lip gloss left.'
@@ -92,89 +122,53 @@ if $ARGS[0] = 'start':
 
 	!! Added the makeup setting.
 
-	if pcs_makeup = 1 and kosmetica >= makeupSetting:
+	if pcs_makeup = 1 and kosmetica > 0:
 		act 'Apply makeup':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
-			*nl
 			'You consider for a moment which look you want to go for.'
 			*nl
-			if makeupSetting = 1:
-				cla
-				'Without thinking, you instantly apply a subtle amount of makeup to your face.'
-				minut += 3
-				makupskl_exp += rand(1,3)
-				kosmetica -= 1
-				pcs_makeup = 2
-				'<<$makeupLight>>'
-				act 'View results':gt 'mirror', 'start'
-			elseif makeupSetting = 2:
-				cla
-				'Without thinking, you instantly apply a moderate amount of makeup to your face.'
-				minut += 5
-				makupskl_exp += rand(1,3)
-				kosmetica -= 2
-				pcs_makeup = 3
-				'<<$makeupNatural>>'
-				act 'View results':gt 'mirror', 'start'
-			elseif makeupSetting = 3:
-				cla
-				'Without thinking, you instantly apply a heavy amount of makeup to your face.'
-				minut += 10
-				makupskl_exp += rand(1,3)
-				kosmetica -= 3
-				vidageday -= 1
-				pcs_makeup = 4
-				'<<$makeupHeavy>>'
-				act 'View results':gt 'mirror', 'start'
-			else
-				if kosmetica > 0:
-					act 'Light make-up':
-						cla
-						minut += 3
-						makupskl_exp += rand(1,3)
-						kosmetica -= 1
-						pcs_makeup = 2
-						'<<$makeupLight>>'
-						act 'View results':gt 'mirror', 'start'
-					end
-				end
-
-				if kosmetica > 1:
-					act 'Natural makeup':
-						cla
-						minut += 5
-						makupskl_exp += rand(1,3)
-						kosmetica -= 2
-						pcs_makeup = 3
-						'<<$makeupNatural>>'
-						act 'View results':gt 'mirror', 'start'
-					end
+			act 'Change your mind': gt 'mirror', 'start'
+			
+			if kosmetica > 0:
+				act 'Light make-up':
+					cla
+					minut += 3
+					makupskl_exp += rand(1,3)
+					kosmetica -= 1
+					pcs_makeup = 2
+					'<<$makeupLight>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
+			end
 
-				if kosmetica > 2:
-					act 'Heavy makeup':
-						cla
-						minut += 10
-						makupskl_exp += rand(1,3)
-						kosmetica -= 3
-						vidageday -= 1
-						pcs_makeup = 4
-						'<<$makeupHeavy>>'
-						act 'View results':gt 'mirror', 'start'
-					end
+			if kosmetica > 1:
+				act 'Vibrant make-up':
+					cla
+					minut += 5
+					makupskl_exp += rand(1,3)
+					kosmetica -= 2
+					pcs_makeup = 3
+					'<<$makeupNatural>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
+			end
 
-				act 'No makeup':
+			if kosmetica > 2:
+				act 'Thick make-up':
 					cla
-					minut += 2
-					'After looking in the mirror, you decide that you look fine and don''t need to put on any makeup, especially since you''ll likely be washing it off in a few hours.'
-					act 'View results':gt 'mirror', 'start'
+					minut += 10
+					makupskl_exp += rand(1,3)
+					kosmetica -= 3
+					vidageday -= 1
+					pcs_makeup = 4
+					'<<$makeupHeavy>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
 			end
 		end
-	elseif kosmetica < makeupSetting:
-		'You don''t have enough makeup to apply your chosen option.'
+	elseif kosmetica <= 0:
+		'You don''t have any makeup to apply.'
 	end
 
 	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'
@@ -223,7 +217,7 @@ if $ARGS[0] = 'start':
 !	end
 
 	if $routine1 ! '':
-		'Make-up routine 1 is called ''<<$routine1custname>> ''and consists of : '
+		'Make-up routine 1 is called ''<<$routine1custname>>'' and consists of : '
 		if mid($routine1,1,1) = 0:'No make-up'
 		if mid($routine1,1,1) = 1:'Light make-up'
 		if mid($routine1,1,1) = 2:'Vibrant make-up'
@@ -384,41 +378,21 @@ $createcustroutine = {
 	end
 }
 
-
-
 if $ARGS[0] = 'steam':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/mirror1.jpg"></center>'
-	'<center>The mirror is heavily misted. It must wiped or left to cool.</center>'
+	'<center>The mirror is heavily misted. It must be wiped or left to cool.</center>'
 	gs 'stat'
 	act 'Wipe the mirror':
 		*clr & cla
-		minut+=1
+		minut += 1
 		mirror_steam = 100
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/mirror2.jpg"></center>'
 		'<center>You wipe the mirror with a towel.</center>'
 		act 'Look in the mirror':gt 'mirror','start'
 	end
-	act '<b>Move away from the mirror</b>':gt 'mirror','fin'
-end
-
-if $ARGS[0] = 'brush':
-	menu_off = 1
-	*clr & cla
-	minut += 3
-	pcs_hairbsh = 1
-	if player_avatar = 1:
-		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	end
-	'You brush your hair.'
-	if $mirrorloc = 'mirror':
-		act 'Continue': gt 'mirror', 'start'
-	else
-		act 'Continue': gt 'mirror', 'fin'
-	end
+	act 'Move away from the mirror':gt 'mirror','fin'
 end
 
 if $routine1 ! '' and pcs_makeup < 2:
@@ -450,6 +424,24 @@ if $routine4 ! '' and pcs_makeup < 2:
 	end
 end
 
+if $ARGS[0] = 'brush':
+	menu_off = 1
+	*clr & cla
+	minut += 3
+	pcs_hairbsh = 1
+	if player_avatar = 1:
+		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	end
+	'You brush your hair.'
+	if $mirrorloc = 'mirror':
+		act 'Finish': gt 'mirror', 'start'
+	else
+		act 'Finish': gt 'mirror', 'fin'
+	end
+end
+
 if $ARGS[0] = 'works':
 	cla
 	if kosmetica <= 0:

+ 10 - 11
locations/natbelapt.qsrc

@@ -136,15 +136,17 @@ if $ARGS[0] = 'home':
 		act 'Move away from the door':gt 'pod_ezd', 'etaj_4'
 	elseif ((hour >= 15 and hour < 21) or (week > 5 and hour >= 10 and hour < 21)) and DoorOpenBy = 0 and NatashaLoc > 0 and NatashaLoc < 6:
 		*clr & cla
-		if natpregday = 0:
+		if natpregday = 0 or (natpregday > 0 and (daystart-natpregday) < 90):
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
-		elseif  natpregday > 0 and (daystart-natpregday) < 200:
+		elseif natpregday > 0 and (daystart-natpregday) >= 90 and (daystart-natpregday) < 200:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(2).jpg" width="356"></center>'
-		elseif  natpregday > 0 and (daystart-natpregday) >= 200: 
+		elseif natpregday > 0 and (daystart-natpregday) >= 200: 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(3).jpg" width="356"></center>'
 		end
 		'You stand outside the Belova household, knocking on the door. After a few moments, Natasha opens the door.'
-		if  natpregday > 0 and (daystart-natpregday) < 200:
+		if natpregday > 0 and (daystart-natpregday) >= 90 and (daystart-natpregday) < 200:
+			'Looking at Natasha, her pregnant belly is starting to show. You have a strong suspicion that she carries your niece or nephew.'
+		elseif natpregday > 0 and (daystart-natpregday) >= 200: 
 			'Looking at Natasha, it is clear that she is pregnant. You have a strong suspicion that she carries your niece or nephew.'
 		end
 		if NatashaQW > 5:
@@ -453,17 +455,13 @@ if $ARGS[0] = 'natroom':
 		
 		act 'Talk with her': gt 'natbelapt', 'chat'
 		
-		if natpregday > 0 and daystart-natpregday > 84:
+		if natpregday > 0 and daystart-natpregday > 90 and nataskedbaby ! daystart:
 			act 'Touch her belly':
-				if nataskedbaby = 1:
-					delact 'Touch her belly'
-					nataskedbaby = 0
-				end
+				nataskedbaby = daystart
 				*nl
 				'She looks at you with a strange smile.'
 				'"Yes," she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
 				'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
-				nataskedbaby = 1
 			end
 		end
 			
@@ -762,6 +760,7 @@ if $ARGS[0] = 'hwundress':
 					*clr & cla
 					minut += 20
 					NatashaNakedHW += 1
+					natunderwear = 0
 					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 					'"Then your mom will see you naked, this is what happens when you borrow money from people and can''t pay them back. You pay it back in other ways. Now do as you''re told and take off your clothes, all of your clothes."'
 					'Natasha looks as if she wants to object but then hangs her head and begins to remove her clothing. Once she''s completely naked, she shyly walks over to her desk and sits down as she starts in on your homework. Though after a while you think she''s actually enjoying it.'
@@ -1825,7 +1824,7 @@ if $ARGS[0] = 'natmother':
 		end
 		act 'Leave':gt 'natbelapt','hallway'
 }
-	elseif hour > 7 or hour < 21 and NatashaLoc = 5:
+	elseif hour > 7 and hour < 21 and NatashaLoc = 5:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natdressing01.jpg"></center>'

+ 26 - 1
locations/npcstatic1.qsrc

@@ -137,6 +137,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''dimka''"><<$npc_nickname[''A1'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A1'
 	
 
@@ -171,6 +172,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''artem''"><<$npc_nickname[''A2'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A2'
 
 
@@ -205,6 +207,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''ivan''"><<$npc_nickname[''A3'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A3'
 
 
@@ -240,6 +243,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''igor''"><<$npc_nickname[''A4'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A4'
 
 
@@ -275,6 +279,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''fedor''"><<$npc_nickname[''A5'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A5'
 
 
@@ -309,6 +314,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''petka''"><<$npc_nickname[''A6'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A6'
 
 
@@ -343,6 +349,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''lesco''"><<$npc_nickname[''A7'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A7'
 
 
@@ -377,6 +384,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''svyatoslav''"><<$npc_nickname[''A8'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A8'
 
 
@@ -412,6 +420,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vitek''"><<$npc_nickname[''A9'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A9'
 
 
@@ -447,6 +456,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''dan''"><<$npc_nickname[''A10'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A10'
 
 
@@ -488,6 +498,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vasily''"><<$npc_nickname[''A11'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A11'
 
 
@@ -521,6 +532,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''julia''"><<$npc_nickname[''A12'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A12'
 
 npctemp = 13
@@ -559,6 +571,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lariska''"><<$npc_nickname[''A13'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A13'
 
 
@@ -592,6 +605,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''katja''"><<$npc_nickname[''A14'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A14'
 
 npctemp = 15
@@ -624,6 +638,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_nickname[''A15'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A15'
 
 
@@ -658,6 +673,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''natasha''"><<$npc_nickname[''A16'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A16'
 
 
@@ -691,6 +707,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''irina''"><<$npc_nickname[''A17'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A17'
 
 
@@ -734,6 +751,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_nickname[''A18'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A18'
 
 
@@ -767,6 +785,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lina''"><<$npc_nickname[''A19'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A19'
 
 
@@ -802,6 +821,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lena''"><<$npc_nickname[''A20'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A20'
 
 
@@ -839,6 +859,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lera''"><<$npc_nickname[''A21'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A21'
 
 
@@ -868,6 +889,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''bella''"><<$npc_nickname[''A22'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A22'
 
 
@@ -900,6 +922,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''albina''"><<$npc_nickname[''A23'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A23'
 
 
@@ -931,6 +954,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''pauline''"><<$npc_nickname[''A24'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A24'
 
 
@@ -969,6 +993,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''sonia''"><<$npc_nickname[''A25'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A25'
 
 
@@ -1196,7 +1221,7 @@ $npc_nickname['A<<npctemp>>'] = 'Kolka'
 $npc_lastname['A<<npctemp>>'] = $pcs_lastname
 $npc_usedname['A<<npctemp>>'] = 'Kolka'
 $npc_notes['A<<npctemp>>'] = 'Your Brother'
-npc_dob['A<<npctemp>>'] = 20011219
+npc_dob['A<<npctemp>>'] = 20001219
 npc_cyc['A<<npctemp>>'] = -1
 npc_fert['A<<npctemp>>'] = -1
 $npc_firstpart['A<<npctemp>>'] = 'V'

+ 11 - 0
locations/npcstatic3.qsrc

@@ -857,6 +857,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 139 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 139 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''stasya''"><<$npc_nickname[''A139'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A139'
 
 
@@ -885,6 +886,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 140 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 140 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lizaveta''"><<$npc_nickname[''A140'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A140'
 
 
@@ -913,6 +915,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 141 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 141 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''veronika''"><<$npc_nickname[''A141'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A141'
 
 
@@ -941,6 +944,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 142 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 142 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''zinaida''"><<$npc_nickname[''A142'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A142'
 
 
@@ -969,6 +973,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 143 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 143 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''alyona''"><<$npc_nickname[''A143'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A143'
 
 
@@ -997,6 +1002,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 144 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 144 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''anushka''"><<$npc_nickname[''A144'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A144'
 
 
@@ -1025,6 +1031,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 145 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 145 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''ekaterina''"><<$npc_nickname[''A145'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A145'
 
 
@@ -1053,6 +1060,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 146 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 146 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''marcus''"><<$npc_nickname[''A146'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A146'
 
 
@@ -1081,6 +1089,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 147 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 147 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''andrey''"><<$npc_nickname[''A147'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A147'
 
 
@@ -1109,6 +1118,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 148 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 148 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''mefodiy''"><<$npc_nickname[''A148'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A148'
 
 
@@ -1137,6 +1147,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 149 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 149 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lazar''"><<$npc_nickname[''A149'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A149'
 
 

+ 12 - 0
locations/npcstatic4.qsrc

@@ -27,6 +27,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 150 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 150 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''erast''"><<$npc_nickname[''A150'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A150'
 
 
@@ -56,6 +57,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 151 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 151 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''evgeny''"><<$npc_nickname[''A151'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A151'
 
 
@@ -85,6 +87,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 152 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 152 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''feofan''"><<$npc_nickname[''A152'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A152'
 
 
@@ -114,6 +117,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 153 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 153 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''gerasim''"><<$npc_nickname[''A153'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A153'
 
 
@@ -143,6 +147,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 154 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 154 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''radomir''"><<$npc_nickname[''A154'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A154'
 
 
@@ -172,6 +177,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 155 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 155 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lavrenti''"><<$npc_nickname[''A155'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A155'
 
 
@@ -202,6 +208,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 156 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 156 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''arkadi''"><<$npc_nickname[''A156'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A156'
 
 
@@ -231,6 +238,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 157 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 157 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''roman''"><<$npc_nickname[''A157'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A157'
 
 
@@ -260,6 +268,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 158 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 158 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''valentin''"><<$npc_nickname[''A158'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A158'
 
 
@@ -289,6 +298,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 159 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 159 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''petia''"><<$npc_nickname[''A159'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A159'
 
 
@@ -419,6 +429,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 165 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 165 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''vanya''"><<$npc_nickname[''A165'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A165'
 
 npctemp = 166
@@ -945,6 +956,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 189 & gt ''phone_selfies''
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 189 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''niko''"><<$npc_nickname[''A189'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A189'
 	
 

+ 2 - 23
locations/obj_din.qsrc

@@ -128,9 +128,9 @@ if $ARGS[0] = 'description':
 
 	!!!0.2.6 extension
 	if StoryLine > 0:
-		'Your friends and family sometimes call you <<$pcs_nickname>>.'
+		'Your friends and family call you <<$pcs_nickname>>.'
 	else
-		'Your friends sometimes call you <<$pcs_nickname>>.'
+		'Your friends call you <<$pcs_nickname>>.'
 	end
 	!!!
 
@@ -235,27 +235,6 @@ if $ARGS[0] = 'description':
 	!! 'pcs_sweat <<pcs_sweat>> the maximum 0'
 	!! 'pcs_hairbsh <<pcs_hairbsh>> a maximum of 1'
 
-	!!!!!!!! Maruda Hair Mod
-	if pcs_hairlng > 41 and hscrunch >= 1:
-		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''obj_din'', ''description''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
-		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''obj_din'', ''description''">scrunchie</a> to get rid of the ponytail.'
-	end
-
-	if pcs_hairlng > 41 and hpingrip >= 1:
-		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''obj_din'', ''description''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
-		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''obj_din'', ''description''">flow free</a>.'
-	end
-
-	if pcs_hairlng > 80 and hscrunch >= 2:
-		if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''obj_din'', ''description''">pigtails</a>.'
-		if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''obj_din'', ''description''">Remove</a> your scrunchies and let your hair flow free again.'
-	end
-
-	if hscrunch < 1:hscrunchw = 0
-	if hpingrip < 1:hpingripw = 0
-	if hscrunch < 2:hpigtail = 0
-	!!!!!!!! Maruda Hair Mod
-
 	'</td></tr></table></center>'
 end
 

+ 2 - 2
locations/outdoors.qsrc

@@ -371,12 +371,12 @@ if $ARGS[0] = 'main':
 
 !!Exhibitionism
 
-			if PCloInhibit >= pcs_inhib - 10:
+			if PCloInhibit >= pcs_inhib - 10 and $loc ! 'Gaddvor':
 				exhibition_outdoors += 1
 				if pcs_inhib < 45 and PCloPanties = 1: exhibition_outdoors += 1
 			end
 
-			if $pantyworntype = 'none':
+			if $pantyworntype = 'none' and $loc ! 'Gaddvor':
 				if PCloSkirt = 3:
 					exhibition_outdoors += 1
 				elseif PCloSkirt = 4:

+ 1 - 1
locations/pavaptcourtev.qsrc

@@ -1421,7 +1421,7 @@ if $ARGS[0] = 'naked_aptcomplex':
 	'There are several older women sitting out front of your building. So you make your way around to the back of the complex near the garages, you stop a moment to peek around one of the buildings. Not seeing anyone, you dart from one building to the next, leaving just the small courtyard behind your building to cross. You peek around a building and see a few people there, you keep yourself hidden as you wait, finally they move off and you rush across the courtyard and into the back door of the apartment building.'
 	act 'Sneak upstairs':
 		*clr & cla
-		rand(1,10)
+		nakedrand = rand(1,10)
 		if nakedrand = 1: 
 			gt 'pavaptcourtev', 'two_boys'
 		elseif nakedrand = 2: 

+ 2 - 1
locations/pharmacy.qsrc

@@ -34,7 +34,8 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	menu_off = 0
 	gs 'stat'
 	*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,3)+'.jpg"></center>'
+	if pharma_day ! daystart: pharma_day = daystart & pharma_picrand = rand(1,3)
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg"></center>'
 	*nl
 	if $message ! '':
 		$message

+ 19 - 12
locations/pod_ezd.qsrc

@@ -466,10 +466,8 @@ if $ARGS[0] = 'floor2_events':
 	killvar 'floor2'
 end
 
-if $ARGS[0] = 'floor3_events':
-	floor3 = rand(1,22)
-	if (floor3 <= 3 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump1
+if $ARGS[0] = 'gopnik_events':
+	if ARGS[1] = 1:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -478,8 +476,7 @@ if $ARGS[0] = 'floor3_events':
 		'You see Vasily standing in the stairwell having a smoke.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask him for a smoke': gt 'pod_ezd', 'vasily_smoke'
-	elseif (floor3 <= 6 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump2
+	elseif ARGS[1] = 2:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -488,8 +485,7 @@ if $ARGS[0] = 'floor3_events':
 		'Vasily and Dan are standing outside uncle Sergey''s apartment, smoking a cigarette.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask them for a smoke': gt 'pod_ezd', 'smoke_danvas'
-	elseif (floor3 <= 9 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump3
+	elseif ARGS[1] = 3:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -498,8 +494,7 @@ if $ARGS[0] = 'floor3_events':
 		'Vasily, Vitek and Dan are standing outside uncle Sergey''s apartment, smoking a cigarette.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask them for a smoke': gt 'pod_ezd', 'smoke_vitdanvas'
-	elseif (floor3 <= 11 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump4
+	elseif ARGS[1] = 4:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -508,6 +503,19 @@ if $ARGS[0] = 'floor3_events':
 		'Lena is sitting outside uncle Sergey''s apartment, drinking.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Talk to Lena': gt 'pod_ezd', 'lena_chat'
+	end
+end
+
+if $ARGS[0] = 'floor3_events':
+	floor3 = rand(1,22)
+	if (floor3 <= 3 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 1
+	elseif (floor3 <= 6 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 2
+	elseif (floor3 <= 9 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 3
+	elseif (floor3 <= 11 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 4
 	elseif floor3 > 11 and floor3 <= 14 and hour >= 15 and hour <= 23:
 		*clr & cla
 		menu_off = 1
@@ -682,8 +690,7 @@ if $ARGS[0] = 'floor5_events':
 		act 'Leave': gt 'pod_ezd', 'etaj_5'
 		act 'Join them':
 			if rand(0,2) = 2:
-				gopnik_rand = rand(1,4)
-				jump 'gopnik_jump<<gopnik_rand>>'
+				gt 'pod_ezd', 'gopnik_events', rand(1,4)
 			else
 				gt 'pod_ezd', 'gopnik_group_chat'
 			end

+ 0 - 3
locations/poli.qsrc

@@ -183,9 +183,6 @@ if $ARGS[0] = 'start':
 
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/abort.jpg"></center>'
 			'You spread out on a gynecological chair, from which angle you are fortunate not to be able to see what is going on. You feel nauseous and violated. A nurse hands you a single aspirin and a glass of muddy-looking water to down it with.'
-			preg = 0
-			thinkpreg = 0
-			knowpreg = 0
 			pcs_hydra += 20
 			!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 			nextbaby = arrsize('yearkid')

+ 3 - 4
locations/postdeliveries.qsrc

@@ -603,8 +603,7 @@ if $ARGS[0] = '13':
 end
 
 if $ARGS[0] = '14':
-	cla
-	*clr
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
 	'The next package is for... your stepfather? You didn''t know he ordered anything!'
@@ -615,7 +614,7 @@ if $ARGS[0] = '14':
 	''
 	act 'Tell her you forgot something':
 		cla
-		father += 5
+		npc_rel['A28'] += 5
 		gs 'stat'
 		'"I forgot my phone!" you shrug apologetically. "I was in the area anyway, and I thought I''d come pick it up quickly."'
 		'"Ah I see... you''re such a scatterbrain sometimes!" she smiles, and returns to the kitchen.'
@@ -625,7 +624,7 @@ if $ARGS[0] = '14':
 	end
 	act 'Tell her you''re delivering a package':
 		cla
-		father -= 5
+		npc_rel['A28'] -= 5
 		gs 'stat'
 		'"I am, <<$npc_nickname[''A29'']>>! I was just delivering a pac-" you say, but your stepfather quickly puts his hand over your mouth out of your mother''s view.'
 		'"S-uhh... She forgot her phone!" he says quickly. You hear your mother laugh from the hallway.'

+ 1 - 1
locations/preSYS2.qsrc

@@ -795,7 +795,7 @@ if $ARGS[0] = 'pol_grup_set':
 	!!ARGS[1] 0 is boys, 1 is girls. ARGS[2] 1nerd 2jock 3cool 4gopnik 5outcast 6teachers. ARGS[3] is changes to value
 	r = 1
 	:pol_grup_set_loop
-		if npc_gender['A<<r>>'] = ARGS[1] and grupTipe['A<<r>>'] = ARGS[2]:
+		if npc_gender['A<<r>>'] = ARGS[1] and npc_grupTipe['A<<r>>'] = ARGS[2]:
 			npc_rel['A<<r>>'] = ARGS[3]
 		end
 		r += 1

+ 26 - 27
locations/sauna.qsrc

@@ -119,14 +119,13 @@ if $ARGS[0] = 'saunaroom':
 	act '<b>Exit to the sauna</b>':gt 'saunawhore', 'saunawork'
 
 	if workDolg > 0:
-
 		act 'Have some food (0:15)':
 			gs 'food', 'm_meal'
 			workDolg += 100
 		end
-		act 'Drink some water (0:05)':
-			gs 'beverage', 'bev_wat'
-		end
+		
+		act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
+		
 		act 'Borrow cosmetics':
 			workDolg += 1000
 			kosmetica += 25
@@ -143,9 +142,7 @@ if $ARGS[0] = 'saunaroom':
 			end
 		end
 		
-		act 'Drink some water (0:05)':
-			gs 'beverage', 'bev_wat'
-		end
+		act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 
 		dynamic $fatdel
 		dynamic $lekarstvo
@@ -154,9 +151,7 @@ if $ARGS[0] = 'saunaroom':
 
 	gs 'events', 'read_porn'
 
-	if pcs_horny >= 50:
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
+	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 
 	if pcs_sleep <= 80:
 		if $clothingworntype = 'nude':
@@ -170,27 +165,31 @@ if $ARGS[0] = 'saunaroom':
 				gt 'bed2', 'succhoice'
 			end
 		else
-			act '<<$sleep_txt>>':
-				if SaunaWhore = 0:
-					workDolg += 850
-				elseif SaunaWhore > 0:
-					money -= 850
-				end
-				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
+			if workDolg > 0 or money >= 850:
+				act '<<$sleep_txt>>':
+					if workDolg > 0:
+						workDolg += 850
+					elseif workDolg <= 0:
+						money -= 850
+					end
+					if disable_autosave = 0:
+						if StoryLine = 0:
+							savegame 'autosave.sav'
+						else
+							savegame 'autosave_alt.sav'
+						end
+					end
+					if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+					if magf2bdo = 2:
+						gt 'bed2', 'magbstchoice'
 					else
-						savegame 'autosave_alt.sav'
+						gt 'bed2', 'sleep'
 					end
 				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				if magf2bdo = 2:
-					gt 'bed2', 'magbstchoice'
-				else
-					gt 'bed2', 'sleep'
-				end
+				killvar '$sleep_txt'
+			else
+				'<br>You don''t have enough money (850 <b>₽</b>) to sleep her tonight.'
 			end
-			killvar '$sleep_txt'
 		end
 	end
 end

+ 2 - 0
locations/saveupdater.qsrc

@@ -566,5 +566,7 @@ if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
 
 if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
 
+if npc_dob['A34'] ! 20001219: npc_dob['A34'] = 20001219
+
 --- saveupdater ---------------------------------
 

+ 1 - 1
locations/start.qsrc

@@ -16,7 +16,7 @@ $counter = 'counter'
 $usercom = 'inputProcessing'
 $fname = 'Tahoma'
 fsize = 12
-$version = '0.7.3.1 Bug fix of the Crime and Punishment version.'
+$version = '0.7.4.1 Willpower version - bug fix.'
 
 opPRE = 1
 

+ 9 - 1
locations/stat_display.qsrc

@@ -1335,7 +1335,15 @@ if pfilmday[0] > 0:
 end
 if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
 if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
-if firstkasting > 0 and pfilmNO < 1: $stat_msg += '<br>You can contract '+iif(pornstack < 9,'up to <<10-pornstack>> porn shoots','<<10-pornstack>> porn shoot')+' at the Porn Studio.'
+if firstkasting > 0 and pfilmNO < 1:
+	if pornstack <= 10:
+		$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+	elseif pornstack = 11:
+		$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
+	else
+		$stat_msg += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
+	end
+end
 if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
 if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
 if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'

+ 9 - 6
locations/succubus.qsrc

@@ -15,21 +15,24 @@
 if $ARGS[0] = 'init':
 	if succubusQW = 5 and scpopt = 1 and succhungry < 1:
 		'You sense <<$sucself1>> perk up, ready to spring forth...'
-		act 'Call your power and feed (takes a lot of time)': scpopt = 0 & gt 'succubus', 'init'
-		act 'Refrain from feeding, you don''t have the time now':
+		act 'Call your power and feed (Takes a lot of time)': scpopt = 0 & gt 'succubus', 'init'
+		act 'Try to control your urges':
 			cla
 			'You try to contain <<$sucself1>>...'
-			if pcs_willpwr >= rand(20,40) + (40 * succublvl):
-				!!the willpower check values are based on a willpowermax of 200
+			gs 'willpower', 'misc'
+			will_cost = will_cost * succublvl
+			if will_cost <= pcs_willpwr:
+				gs 'willpower', 'resist'
 				'And you''re successful, <<$sucself1>> returns to your core.'
 				act 'Continue': scpopt = 2 & gt $sclocrt, $scargrt
 			else
-				'And you fail, <<$sucself1>> continues rising toward the surface of your being.'
+				'<br>You don''t have enough willpower to control your urges.'
+				'<<$sucself1>> continues rising toward the surface of your being.'
 				succonfail = 1
 				scpopt = 0
 				xgt 'succubus', 'init'
 			end
-		end
+		end	
 	elseif succubusQW = 4:
 		gt 'succubus', 'firsttime'
 	else

+ 46 - 48
locations/swamphouse.qsrc

@@ -266,22 +266,23 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		if klismaday ! daystart:'Well, we could <<$pcs_nickname>>..." said Andrew. "But since you''re already here, you not being all dolled up doesn''t matter to us. But don''t dare to try to fool us next time, we will not forget."'
 		'"There are some bushes not far from here, we could take her with us there, no one would be able to find us. Should we tell Igor to join us?" said Sergei. "Nevermind Igor, it would take him to long time to join us."'
 
-		act 'Follow the guys':
-			*clr & cla
-			minut += 5
-			huntersAndreiQw += 1
-			huntersSergeiQw += 1
-			pcs_horny += 5
-			doublelovesex = 1
-			hunterslut += 1
-			temphunt = 1
-			if klismaday ! daystart:hunterslut += 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/doublehanterlove.jpg"></center>'
-			'The men hold your hands leading you away from the hut. You''re fully aware of their plans but you don''t really mind.'
-			act 'Continue': gt 'huntersex', 'doublelovesex'
-		end
+!!ToDo: The huntersex location doesn''t exist
+!!		act 'Follow the guys':
+!!			*clr & cla
+!!			minut += 5
+!!			huntersAndreiQw += 1
+!!			huntersSergeiQw += 1
+!!			pcs_horny += 5
+!!			doublelovesex = 1
+!!			hunterslut += 1
+!!			temphunt = 1
+!!			if klismaday ! daystart:hunterslut += 1
+!!			gs 'stat'
+
+!!			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/doublehanterlove.jpg"></center>'
+!!			'The men hold your hands leading you away from the hut. You''re fully aware of their plans but you don''t really mind.'
+!!			act 'Continue': gt 'huntersex', 'doublelovesex'
+!!		end
 		act 'Refuse':
 			*clr & cla
 			minut += 5
@@ -347,47 +348,44 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 		if huntersKnowSlut > 0:
-			if huntslutsex = 0:
-				*clr & cla
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
-				'Seeing you naked, the men get quickly aroused...'
-				'"Come here <<$pcs_nickname>>, come to us," one of the guys calls out to you.'
-
-				act 'Continue':huntersexnude = 1 & gt 'huntersex', 'huntersexnude'
-			else
+!!ToDo: The huntersex location doesn''t exist		
+!!			if huntslutsex = 0:
+!!				*clr & cla
+!!				gs 'stat'
+!!				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
+!!				'Seeing you naked, the men get quickly aroused...'
+!!				'"Come here <<$pcs_nickname>>, come to us," one of the guys calls out to you.'
+!!				act 'Continue':huntersexnude = 1 & gt 'huntersex', 'huntersexnude'
+!!			else
 				hunterknowday = daystart
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
 				'Seeing you naked, the men just shake their heads...'
 				'"Look here <<$pcs_nickname>>, if you want to charm us, you will need to think of something else." said one of the guys.'
 
 				act 'Continue': gt 'swamphouse', 'start'
-			end
+!!			end
 		end
 	end
 
-	! sex if GG whore
-	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0 and hour >= 7 and hour < 23:
-		*clr & cla
-		minut += 5
-		temphunt = rand(1,3)
-		! the choice of who will fuck GG
-		sluthomesex = 1
-		gs 'stat'
-
-		if temphunt = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-		if temphunt = 2:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
-		if temphunt = 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
-		if temphunt = 1:'You enter the hut and bump into Andrei. "Come here <<$pcs_nickname>>," not saying anything more while he throws you on the bed.'
-		if temphunt = 2:'You enter the hut and bump into Sergei. Noticing you he heads toward you saying "<<$pcs_nickname>>, I''ve got an itch that only you can help scratch."'
-		if temphunt = 3:'You enter the hut and bump into Igor. He comes over saying smiling "<<$pcs_nickname>>, I need to empty my sack, help me out..."'
-		if pcs_horny < 40:' You obediently follow suit, knowing what he wants.'
-		if pcs_horny >= 40 and pcs_horny < 70:'"Come and get me..." is all you manage to say before spreading your legs.'
-		if pcs_horny >= 70:'"I was hoping this would happen," you think to yourself, feeling your wet pussy screaming with desire. You jump on him, taking charge, leaving him stunned about who wants it more.'
-
-		act 'Go': gt 'huntersex', 'sluthomesex'
-	end
+!!ToDo: The huntersex location doesn''t exist
+!!	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0 and hour >= 7 and hour < 23:
+!!		*clr & cla
+!!		minut += 5
+!!		temphunt = rand(1,3)
+!!		sluthomesex = 1
+!!		gs 'stat'
+!!		if temphunt = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
+!!		if temphunt = 2:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
+!!		if temphunt = 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
+!!		if temphunt = 1:'You enter the hut and bump into Andrei. "Come here <<$pcs_nickname>>," not saying anything more while he throws you on the bed.'
+!!		if temphunt = 2:'You enter the hut and bump into Sergei. Noticing you he heads toward you saying "<<$pcs_nickname>>, I''ve got an itch that only you can help scratch."'
+!!		if temphunt = 3:'You enter the hut and bump into Igor. He comes over saying smiling "<<$pcs_nickname>>, I need to empty my sack, help me out..."'
+!!		if pcs_horny < 40:' You obediently follow suit, knowing what he wants.'
+!!		if pcs_horny >= 40 and pcs_horny < 70:'"Come and get me..." is all you manage to say before spreading your legs.'
+!!		if pcs_horny >= 70:'"I was hoping this would happen," you think to yourself, feeling your wet pussy screaming with desire. You jump on him, taking charge, leaving him stunned about who wants it more.'
+
+!!		act 'Go': gt 'huntersex', 'sluthomesex'
+!!	end
 end
 
 if $ARGS[0] = 'bucket':

+ 2 - 2
locations/telefon.qsrc

@@ -973,8 +973,8 @@ if $ARGS[0] = 'Phone_camera':
 	!! Take a selfie depending on which clothes you are wearing
 	pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a>'
 	!! Flashing selfie
-	if $clothingworntype ! 'nude' and ($phone_loc = 'bathroom' or $phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
-		if $phone_loc = 'bedroom' or $phone_loc = 'bathroom':
+	if $clothingworntype ! 'nude' and ($phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
+		if $phone_loc = 'bedroom':
 			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a>'
 			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a>'
 			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a>'

+ 1 - 1
locations/therapist.qsrc

@@ -131,7 +131,7 @@ end
 if $ARGS[0] = 'hypno':
 	hypnoWithdrawal = 0
 	minut += 15
-	gs 'boyStat', 'A68'
+	gs 'boyStat', 'A186'
 	if firsthypno = 0:
 		firsthypno = 1
 		$firsthypno = 'While you are Under, I will call you <i>Cunt</i>, and you will respond to it. You will also call me Master.<br>You reply, "yes, <i>Master</i>."'

+ 3 - 3
locations/traits.qsrc

@@ -79,15 +79,15 @@ if $ARGS[0] = 'menu':
 		'To gain this trait you have to use 2 different types of drugs several times. At the moment you have <<addictive_exp>> out of 2 points towards level 1.'
 	elseif addictive_trait_lvl = 1:
 		'You have this trait at level 1.'
-		'You have some experience with taking drugs and it becomes harder for you to refuse taking them.'
+		'You have some experience with taking drugs and it becomes harder for you to refuse to take them.'
 		'To increase this trait you have to use 3 different types of drugs several times. At the moment you have <<addictive_exp>> out of 3 points towards level 2.'
 	elseif addictive_trait_lvl = 2:
 		'You have this trait at level 2.'
-		'Taking drugs has become something normal and that makes it even harder for you to refuse taking them.'
+		'Taking drugs has become something normal and that makes it even harder for you to refuse to take them.'
 		'To increase this trait you have to use 4 different types of drugs several times. At the moment you have <<addictive_exp>> out of 4 points towards level 3.'
 	elseif addictive_trait_lvl = 3:
 		'You have this trait at level 3.'
-		'Taking drugs is a normal part of your life which makes it difficult for you to refuse taking them.'
+		'Taking drugs is a normal part of your life which makes it difficult for you to refuse to take them.'
 		'This is the highest level of this trait.'
 	end
 	

+ 124 - 0
locations/version.qsrc

@@ -2,6 +2,130 @@
 
 act 'Return': gt 'start'
 
+'0.7.4.1'
+'- bugfixes from julzor, milky-boobs, crowke, 3xpurt, Deroc, Christine, KeyMasterOfGozer and sovietmercader'
+
+'0.7.4'
+'- bugfixes from Crowke, spectre1viper, oldentree, Milky Boobs, pffbft, zaba, sovietmercader, rachels, hornguy6, 3xpurt, Sunshine105, Deroc, DSX93459, KeyMasterOfGozer, Jeep91, Test1234, and julzor'
+'- Text edits by Karma199696, Lurk Morrison, sovietmercader, oldentree, az133, and Blatte'
+'- Cheat to prevent meeting random girl/boyfriends by julzor'
+'- spellmenu by key'
+'- added back miras third wish by sovietmercader'
+'- fixed random crashes when playing with the sonnix 64bit player by Key and julzor'
+'- added dynamic strapon sizes by Crowke'
+'- added more places to smoke weed and reworked the drug prices by julzor'
+'- added more willpower to the school by julzor'
+'- new menu symbols by akossi'
+'- You now need mana to do magical stuff and only a wet sveta can masturbate in front of magic trees by Key'
+'- Added addictive personality trait and a cheat to make me sad and block it if you hate it by julzor'
+'- Merged drug use into a single location by julzor'
+'- Chess is literally playable again with like new logic and stuff by sovietmercader'
+'- Moar selfies by crowke and nutluck'
+'- CleanHTML function by Key'
+'- Burned the city clinic experiment with fire (will be turned into a mod) by julzor'
+'- Breast milk donations at the city clinic by milky'
+'- Added willpower, weed dealer and ability to smoke weed to the Five Eight Estate by nutluck and coded by julzor'
+'- Mod settings by 3x'
+'- New maid event by christine'
+'- and text edits by several people I don''t know the names of, because they aren''t in the commits. It''s still very much appreciated!'
+'- Spellteaching unified and can take a few attempts to learn by KeyMasterOfGozer'
+'- Tatiana''s body modification spells expanded and working by KeyMasterOfGozer'
+'- Truckers can now recognise you if you''ve got lifts from them before by hornguy6'
+'- Cleaned up the mira sex making it shorter and intergrating the arousal system by Kevin Smarts'
+'- New descriptions for thin clothing without a bra and weight restriction for the modelling job by hornguy6'
+'- More sefies added (park and flashing) by CroWke'
+'- Beast content removed from main game (content has been moved into a mod) by julzor'
+'- Spell restructing in how they are accessed, and data stored by KeyMasterOfGozer'
+'- Sex with Nicholas, dating Tanya and image folder restructure in the live in maid job by MaidChristine'
+'- Magic teleport using tree circles in parks by KeyMasterOfGozer'
+'- Images for a couple of events imported from Province that did not have them imported by Консервытч'
+'- Removal of defunct variable initialization by CroWke'
+'- Imported some missing images from Province events by Консервытч'
+'- Fix to the insanity formating file from bicobus'
+'- Willpower system added, will need seeding before it can do anything by Kevin Smarts'
+'- Appearance calculation adjusted to make it easier to max by Kevin Smarts'
+'- Changes to pregnancy check variables and sychronizing the checks used by jhawkkaw'
+'- Start names not defined and music not stopping fixed by sovietmercader'
+'- Additional code work for the selfies and changing of school group files to use the same system by CroWke'
+'- Stripping of excess data from npcstatic by CroWke with advice from rachels'
+'- various changes and fixes for the hunters and swamp locations, inc. the first new sex scenes from pffbft (the hunters are still WIP)'
+'- More village fixes and tweaks from sovietmercader'
+'- Dressing room add to Pussy-Kats by CroWke'
+'- Extra food options at grandparents and food fixes from julzor'
+'- Additional selfies and new selfie viewer from CroWke'
+'- Pregnancy images add by jhawkkaw'
+'- Code cleaning from CroWke'
+'- Lactation opt out option, switch for realistic and permanent and new laction features from milky_boobs'
+'- various changes and fixes for the hunters from pffbft'
+'- More village fixes and tweaks from sovietmercader'
+'- Fixes and reordering of the swampfiles by pfffbft'
+'- HS diploma now available from principal or mum and not a letter in the post. Mum comes to graduation too, from Christine'
+'- Code to move potential fathers from C to B array and clean C array from buraki2'
+'- Rebalancing and repairs to the village events by sovietmercader'
+'- Update to the lactation system from milky_boobs'
+'- Stripper job updates and rework from CroWke, pubic style allowances by Kevin Smarts'
+'- Refillable water bottle and places to fill it added by julzor'
+'- New prostitution events in the Pav hotel from CroWke (mmf and ff)'
+'- Exercise option added to uni dorm by test123'
+'- Change of variable naming in lactation from milky_boobs'
+'- Options for car location actions sorted to add second layer for Pav and city locations to reduce the length of action list by Kevin Smarts'
+'- Orgasms restricted to direct stimulation only by Kevin Smarts, based on changes suggested by pb2eb'
+'- Night time bike ride of doom removed by Kevin Smarts'
+'- Virinity checker that let''s Sveta recall her first time from CroWke'
+'- checker added to repo by bicobus'
+'- First part of Anna events at the station hotel from junjulang75 with code from julzor'
+'- Divorce party (street random events) from Akossi'
+'- Walking in park with generic lover scene from spectre1viper'
+'- willpower seeded in school - Nutluck and Julzor'
+'- hotcat seeded in school - Nutluck'
+'- willpower seeded in pav apt courtyard/garages - Nutluck and Julzor'
+'- hotcat seeded in pav apt courtyard/garages - Nutluck'
+'- willpower seeded in Anushka files - Nutluck'
+'- hotcat seeded in Anushka files - Nutluck'
+'- school files cum calls cleaned up, fixed and added to missing scenes - Nutluck'
+'- school files gossip update and Lizaveta now has her own unique gossip list, so it sounds more personal from her - Nutluck code by Julzor'
+'- school files friendship changes tweaked and some new ones added - Nutluck'
+'- school files social group changes tweaked and some new ones added - Nutluck'
+'- school files water cooler added in school hallway - Nutluck code by Julzor'
+'- school files bathroom now usable for those using optional pee requirements - Nutluck code by Julzor'
+'- school kids chat completely revamped with a all new system, with different text based on social and friendship standing with each NPC - Nutluck, Blatte, and Akossi code by Julzor'
+'- School break split up into 4 times, before school, main break, lunch and after school. Each with a lot of new small events and a few major ones - Nutluck code by Julzor'
+'- school files new paths and options added to many of the old content events - Nutluck code by Julzor'
+'- school files a few new during class events added - Nutluck code by Julzor'
+'- school files several bully events added where Sveta can be bullied at school - Nutluck code by Julzor'
+'- school files new event which can force Sveta to brave running home naked from school, with chances to be caught. - Nutluck code by Julzor'
+'- Plus a host of minor tweaks to improve things.  - Nutluck code by Julzor'
+'- Pavlovsk courtyard expanded walk home naked events - Nutluck code by Julzor'
+'- Pavlovsk garages new Eduard chats - Blatte code by Julzor'
+'- Pavlovsk courtyard able to buy joints and now smoke them in pav complex courtyard - Nutluck code by Julzor'
+'- Pavlovsk Many new events of running into jocks around pav and able to interact with them - Blatte'
+'- Anushka apartment 4 new events answer the door events  - Nutluck code by Julzor'
+'- Anushka apartment 2 for watch tv/have lesbian sex in the living room, while the family is away - Nutluck code by Julzor'
+'- Anushka apartment 3 for spy on Anushka having sex with a guy in her bedroom - Nutluck code by Julzor'
+'- Anushka apartment Expanded talking to Ed in living room. - Blatte code by Julzor'
+'- Pavlovsk apartment stairs willpower added - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs hotcat added - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs cleaned up and tweaking of some events - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs a few events slightly expanded - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs a few new events added to each floor - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs a gopnik only even added to the 5th floor - Nutluck code by Julzor'
+'- Pavlovsk apartment stairs added a dan/vasily bj scenes with standing around wearing cum. - Nutluck code by Julzor'
+'- Natasha apartment full fleshed out and able to be explored now - Crowke wrote and coded, tweaked by Nutluck'
+'- Natasha story revamped and greatly expanded - Crowke wrote and coded, tweaked by Nutluck'
+'- Natasha/Kolka content revamped and expanded. - Crowke wrote and coded, tweaked by Nutluck'
+'- Natasha/Olu content revamped and expanded. - Crowke wrote and coded, tweaked by Nutluck'
+'- Pavlovsk Lake willpower seeded - Nutluck code by julzor'
+'- Pavlovsk Lake hotcat seeded - Nutluck code by julzor'
+'- Pavlovsk Lake Some events cleaned up - Nutluck code by julzor'
+'- Pavlovsk Lake added new run home naked event as a new option for a existing event - Nutluck code by julzor'
+'- Pavlovsk Lake added sauna/banya to secluded lake area - Nutluck code by julzor'
+'- Pavlovsk church willpower added - Nutluck code by crowke'
+'- Pavlovsk church hotcat added - Nutluck code by crowke'
+'- Pavlovsk church some events cleaned up - Nutluck code by crowke'
+'- Pavlovsk church a few minor events added  - Nutluck code by crowke'
+'- Pavlovsk church new options added to old events - Nutluck code by crowke'
+'- Pavlovsk church sex events finished that where commented out and unfinished - Nutluck code by crowke'
+
 '0.7.3'
 '- Inhibition skill added to replace large parts of exhibitionism, exhibitionism now a trait by Hornguy6 and Kevin Smarts'
 '- School schedule with next class listing from 3xpurt'

+ 5 - 4
locations/zaprF.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	'When the weather is nice sometimes girls will offer a car washing service for some tips, there''s no structure to it so you could always try it.'
 	'The petrol price is 30 <b>₽</b> per liter.'
 	*nl
-	
+
 	act 'Leave':
 		if cardrive = 6:
 			minut += 5
@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 			gt 'pavCommercial'
 		end
 	end
-	
+
 	if temper < 10:
 		'It''s too cold outside to wash cars. You''re more likely to get ill than make money. Maybe try again when the weather is warmer?'
 	elseif sunWeather = 0:
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 			act 'Disengage from the pump':gt 'zaprF', 'start'
 		end
 	end
-	
+
 	zprbenz = 40 - benz
 
 	if benz < 40 and car > 0 and cardrive = 6 or benz < 40 and car > 0 and cardrive = 21:
@@ -111,7 +111,7 @@ if $ARGS[0] = 'toilet':
 	'You are in a dirty gas station toilet. At least it provides some privacy.'
 
 	act 'Leave the restroom':gt 'zaprF', 'start'
-	
+
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
@@ -119,6 +119,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $removepan
+	gs 'din_van', 'pblc_pee'
 end
 
 --- zaprF ---------------------------------

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