.gitignore

@@ -43,3 +43,5 @@ MakeQSP.bat
 /Qqsp-1.9.0-win64/
 glife.7z.tmp
 glife.7z
+
+*.test

Callvalidator.bat

@@ -0,0 +1,28 @@
+@ECHO off
+
+:: The folder where the callvalidator.py can be found
+set VALIDATOR=tools
+:: The list file with the files that will be validated [optional]
+set LIST=glife-validate.qproj
+:: The qsrc file that will be validated [optional]
+:: set FILE=
+:: The folder where the LIST or the FILE can be found [optional, will use the root folder if not set]
+set FOLDER=tools
+:: The folder where the qsrc file can be found [mandatory]
+set SOURCE=locations
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+cls
+echo.
+
+echo.
+
+@ECHO ON
+:: python %VALIDATOR%\callvalidator.py source=%SOURCE%
+:: python %VALIDATOR%\callvalidator.py source=%SOURCE% file=%FILE% folder=%FOLDER%
+python %VALIDATOR%\callvalidator.py source=%SOURCE% list=%LIST% folder=%FOLDER%
+@ECHO OFF
+echo.
+echo Done.
+
+:exit

MakeTestQSP.bat

@@ -0,0 +1,60 @@
+@ECHO off
+
+:: The file that will be generated or open
+set TESTFOLDER=test
+set TESTSUITE=test\testsuite-basic.qproj 
+set QSPGUI=tools\QSPgui\qspgui.exe
+:: set QSPGUI=Qqsp.exe
+set SAVE_ENABLED=FALSE
+set LOCATIONSFOLDER=locations
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:menu
+cls
+echo.
+echo :: QSP Compiler and Launcher
+echo.
+
+echo.
+
+if defined QSPGUI (
+	if not exist "%QSPGUI%" ( 
+		echo QSP EXEC : [ERROR] - %QSPGUI% not found.
+		set QSPGUI=
+	) else ( echo QSP EXEC : [OK] - "%QSPGUI%")
+) else ( echo QSP EXEC : [NOT DEFINED] - Using Windows DEFAULT.)
+
+echo.
+
+if defined NOT_FOUND (
+	echo ERROR: Option '%action%' wasn't recognized. Is it lowercase? 
+	set NOT_FOUND=
+)
+
+echo QPSGUI: %QSPGUI% 
+echo.
+
+:build
+echo.
+
+echo Building ...
+
+@ECHO ON
+python tools\testbuilder.py %LOCATIONSFOLDER% %TESTSUITE% %SAVE_ENABLED%
+@ECHO OFF
+
+SET /p MYVAR=<_temp-filename.txt
+SET TXTFILE="%MYVAR%.txt"
+SET QSPFILE="%MYVAR%.qsp"
+
+@ECHO ON
+tools\txt2gam.exe  %TXTFILE% %QSPFILE% : > nul
+del %TXTFILE%
+del _temp-filename.txt
+%QSPGUI% %QSPFILE%
+@ECHO OFF
+
+
+echo.
+echo Done.
+pause

glife.qproj

@@ -74,7 +74,7 @@
 		<Location name="internet_mobile"/>
 	</Folder>
 	<Folder name="Body">
-		<Location name="ApperanceSystem"/>
+		<Location name="AppearanceSystem"/>
 		<Location name="body"/>
 		<Location name="body_desc"/>
 		<Location name="lact_lib"/>
@@ -678,27 +678,6 @@
 		<Location name="danceGev"/>
 		<Location name="volAndGev"/>
 	</Folder>
-	<Folder name="Booty call">
-		<Location name="booty_call_after"/>
-		<Location name="booty_call_condoms"/>
-		<Location name="booty_call_cowgirl"/>
-		<Location name="booty_call_cum"/>
-		<Location name="booty_call_doggy"/>
-		<Location name="booty_call_miss"/>
-		<Location name="booty_call_morning"/>
-		<Location name="booty_call_pillow_talk"/>
-		<Location name="booty_call_pillow_talk2"/>
-		<Location name="booty_call_favorite_part"/>
-		<Location name="booty_call_work_talk1"/>
-		<Location name="booty_call_sex"/>
-		<Location name="booty_call_shower"/>
-		<Location name="booty_call_start"/>
-		<Location name="booty_call_stats"/>
-		<Location name="booty_call_talk"/>
-		<Location name="booty_call_reactions"/>
-		<Location name="booty_call_virgin"/>
-		<Location name="booty_call_leave"/>
-	</Folder>
 	<Folder name="Sex Events For Generic NPCs">
 		<Location name="sex_ev_after"/>
 		<Location name="sex_ev_condoms"/>
@@ -1033,6 +1012,9 @@
 		<Location name="uni_exams2"/>
 		<Location name="uni_exams3"/>
 		<Location name="uni_exams4"/>
+		<Location name="uni_lessons_electives1"/>
+		<Location name="uni_lessons_electives2"/>
+		<Location name="uni_lessons_electivesev1"/>
 		<Location name="uni_events"/>
 		<Location name="uniutil"/>
 	</Folder>

locations/BurgerTip.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'work':
 					'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossex.jpg"></center>'
 					'While you kiss him, Anatoly leads you to the couch. He soon has his face planted between your breasts, and a hand fondling your ass.'
 
-					gs 'arousal', 'give_kiss', 5, 'sub'
+					gs 'arousal', 'kiss', 5, 'sub'
 					gs 'arousal', 'foreplay', 5, 'sub'
 					minut -= 5
 					gs 'stat'

locations/Cheatmenu_din.qsrc

@@ -304,7 +304,7 @@ $cheatmenu['addict'] = {
 	end
 }
 
-$cheatmenu['willpower'] = {
+$cheatmenu['willpower2'] = {
 	if InfWillpwer = 0:
 		InfWillpwer = 1
 		dynamic $cheatmenu['permanent']
@@ -589,6 +589,7 @@ $cheatmenu['permanent'] = {
 	'<td width="450" cellspacing="0" cellpadding="20" valign="top">'
 	'More than one job is possible: <a href="exec:dynamic $cheatmenu[''work'']"><<$cheatWork>></a>'
 	'Willpower cost always zero: <a href="exec:dynamic $cheatmenu[''willpower'']"><<$cheatWillpower>></a>'
+	'Infinite willpower: <a href="exec:dynamic $cheatmenu[''willpower2'']"><<$InfWillpwer>></a>'
 	'Always combed: <a href="exec:dynamic $cheatmenu[''hair'']"><<$cheatHapri>></a>'
 	'Cosmetics never smeared: <a href="exec:dynamic $cheatmenu[''nomakeup'']"><<$cheatNomakeup>></a>'
 	'Never sweat: <a href="exec:dynamic $cheatmenu[''nosweat'']"><<$cheatNoSweat>></a>'
@@ -599,7 +600,6 @@ $cheatmenu['permanent'] = {
 	'Never lose or gain weight: <a href="exec:dynamic $cheatmenu[''noFat'']"><<$cheatNoFat>></a>'
 	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$NarkImmune>></a>'
 	'Never shave legs: <a href="exec:dynamic $cheatmenu[''shaveLegs'']"><<$cheatShaveLegs>></a>'
-	'Infinite willpower: <a href="exec:dynamic $cheatmenu[''willpower'']"><<$InfWillpwer>></a>'
 
 	if Enable_sforma = 1:
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'

locations/KatjaHomeTalk.qsrc

@@ -813,17 +813,16 @@ if $ARGS[0] = 'Sextalk':
 	end
 
 	if kattalkrand = 0:
-		if katjaQW['knows_BJ'] > 0:
-			'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
-		else
-			'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
-		end
-
 		if stat['bj'] > 0:
 			gs 'KatjaHomeTalk', 'bj_talk1'
 		else
+			if katjaQW['knows_BJ'] > 0:
+				'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
+			else
+				'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+			end
 			act 'You''ve never given a blowjob':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -850,7 +849,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['vaginal'] > 0:
 			act 'Talk about sex':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_sex'] = 1
@@ -872,7 +871,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'No':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -905,7 +904,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['anal'] > 0:
 			act 'Talk about anal':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_anal'] = 1
@@ -928,7 +927,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'You''ve never had anal sex':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -961,7 +960,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['cuni_give'] > 0:
 			act 'Talk about licking pussy':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_cuni'] = 1
@@ -973,7 +972,7 @@ if $ARGS[0] = 'Sextalk':
 					'Katja asks you to show her how you lick pussy.'
 
 					act 'Show her':
-						cla
+						*clr & cla
 						katjaQW['horny'] = 0
 						katjaQW['slut'] += 1
 						katjaQW['dom'] += 2
@@ -1019,7 +1018,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'No':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1097,7 +1096,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['mast'] > 0:
 			act 'Talk about masturbation':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_masterbation'] = 1
@@ -1116,7 +1115,7 @@ if $ARGS[0] = 'Sextalk':
 					end
 				else
 					act 'Katja responds':
-						cla
+						*clr & cla
 						minut += 5
 						katjaQW['horny'] += 10
 						gs 'stat'
@@ -1137,7 +1136,7 @@ if $ARGS[0] = 'Sextalk':
 
 			if stat['self_fisting'] > 0:
 				act 'Tell her how you pushed your hand into your pussy':
-					cla
+					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
 
@@ -1165,7 +1164,7 @@ if $ARGS[0] = 'Sextalk':
 
 			if stat['self_fisting_anal'] > 0:
 				act 'Tell her how you fisted your ass':
-					cla
+					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
 
@@ -1188,7 +1187,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'You''ve never masturbated':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1307,6 +1306,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	act'It''s fun':
 		cla & *nl
+		katjaQW['horny'] += 5
 		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
 		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
 		act 'Continue':
@@ -1350,6 +1350,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	act'It turns me on':
 		cla & *nl
+		katjaQW['horny'] += 5
 		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
 		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
 		act 'Continue':

locations/Katja_nightclub.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'activity':
 	if katjaQW['disco_loc'] >= 3 and katjaQW['disco_loc'] <= 6: 
 		if katjaQW['disco_check_time'] + 30 < totminut:
 			katjaQW['disco_check_time'] = totminut
-			if (rand(1,15) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0) or (katjaQW['liberated'] and rand(0,3) = 0):
+			if (rand(1,15) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0) or (katjaQW['liberated'] and rand(0,3) = 0):
 				if katjaQW['disco_loc'] = 3 and rand(0,4) < 4:
 					!! Katja goes to a private room with the guy 
 					katjaQW['nightclub_private_room_boy'] = 1
@@ -29,11 +29,11 @@ if $ARGS[0] = 'activity':
 					!! Katja leaves the club with whom she is dancing
 					katjaQw['alone_with_other_day'] = daystart
 					if katjaQW['disco_loc'] = 5:
-						gs 'katja_procdural', 'sex_set', 0, 1
+						gs 'katja_procedural', 'sex_set', 0, 1
 					elseif katjaQW['disco_loc'] = 6:
-						gs 'katja_procdural', 'sex_set', 2
+						gs 'katja_procedural', 'sex_set', 2
 					else
-						gs 'katja_procdural', 'sex_set', 1
+						gs 'katja_procedural', 'sex_set', 1
 					end
 					
 					if hour > 10:
@@ -96,9 +96,9 @@ if $ARGS[0] = 'activity':
 				katjaQW['drinks'] += 1
 			elseif rand(0,8) = 0:
 				katjaQW['disco_loc'] = 8
-			elseif rand(1,12) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
+			elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
 				katjaQW['disco_loc'] = 3
-			elseif rand(1,12) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
+			elseif rand(1,12) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 or (katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0 and rand(1,8) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10) or (katjaQW['liberated'] = 1 and rand(0,3) = 0): 
 				katjaQW['disco_loc'] = rand(4,6)
 			end
 		end
@@ -133,7 +133,7 @@ if $ARGS[0] = 'dance_approach':
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
 			'You approach her from behind. "Hi, Katja!" you shout, so she can hear you.'
-			'She turns around and when she sees it is you, '+iif(npc_sex['A14'] > 0 and func('katja_procdural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss', 'she gets a huge smile on her face')+'. "You''re here, too? We''re going to have so much fun! Let''s dance!"'
+			'She turns around and when she sees it is you, '+iif(npc_sex['A14'] > 0 and func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss', 'she gets a huge smile on her face')+'. "You''re here, too? We''re going to have so much fun! Let''s dance!"'
 			act 'Dance with Katja': gt 'katja_nightclub', 'dance'
 		elseif npc_rel['A14'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'dance_approach':
 	else
 		if katjaQW['QWstage'] > 0 or npc_rel['A14'] > 70:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_talking_on_dance_floor.jpg"></center>'
-			'You approach her and tap her on the shoulder. She turns around, and seeing you, she '+iif(npc_sex['A14'] > 0 and func('katja_procdural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss before', 'gets a huge smile on her face')+' shouting, "Great! You''re back. Let''s dance!"'
+			'You approach her and tap her on the shoulder. She turns around, and seeing you, she '+iif(npc_sex['A14'] > 0 and func('katja_procedural', 'willing_to_be_naughty') > 80 and katjaQW['sex_clossedness'] < 2, 'gives you a quick kiss before', 'gets a huge smile on her face')+' shouting, "Great! You''re back. Let''s dance!"'
 			act 'Dance with Katja': gt 'katja_nightclub', 'dance'
 		elseif npc_rel['A14'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -230,19 +230,19 @@ if $ARGS[0] = 'dance_guy_approach':
 				cla
 				minut += 15
 				'They continue to dance for a while, and as the dance goes on, he keeps getting closer and closer to her. His hand starts to go from just touching her arms and back to also rest on her bottom.'
-				if func('katja_procdural', 'willing_to_be_naughty') < 50 and katjaQW['liberated'] = 0:
+				if func('katja_procedural', 'willing_to_be_naughty') < 50 and katjaQW['liberated'] = 0:
 					'That seems to be too much for her; and when he doesn''t get the hint after she''s removed his hand from her ass several times, she dances away from him, leaving him alone.'
 					act 'Go to Katja': gt 'katja_nightclub', 'dance_approach'
 					act 'Leave her': gt 'city_nightclub', 'dance'
 				else
-					if katjaQW['simultanous_boys'] = 0 or func('katja_procdural', 'willing_to_be_naughty') < 65 or katjaQW['boy_block'] = 1:
+					if katjaQW['simultanous_boys'] = 0 or func('katja_procedural', 'willing_to_be_naughty') < 65 or katjaQW['boy_block'] = 1:
 						katjaqw['horny'] += 10
 						'It seems that Katja can''t decide how to respond to this. She tries at times to move so that his hand will let go. At other times, it seems as though she likes the attention.'
 					else
 						katjaqw['horny'] += 20
 						'Katja clearly enjoys the attention she is getting from the boy. She starts to get closer to him as well, almost grinding her body against his.'
 					end
-					if (katjaQW['liberated'] = 1 and (katjaQW['simultanous_boys'] = 0 and rand(1,10)) or (katjaQW['simultanous_boys'] > 0 and rand(1,5))) or (katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and rand(1,10) <= (min(func('katja_procdural', 'willing_to_be_naughty'), 100) - 50)/10 and rand(1,5) <= (min(katjaQW['horny'], 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and (katjaQW['faithful'] = 0 or katjaQW['cheat_warning'] = 2)):
+					if (katjaQW['liberated'] = 1 and (katjaQW['simultanous_boys'] = 0 and rand(1,10)) or (katjaQW['simultanous_boys'] > 0 and rand(1,5))) or (katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and rand(1,10) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and rand(1,5) <= (min(katjaQW['horny'], 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and (katjaQW['faithful'] = 0 or katjaQW['cheat_warning'] = 2)):
 						!! The conditions is such that only if Katja is liberated or the player have introduced her to sex with a boy is there a chance that she will go with the guy. In the later case she wont go until after the the player have had the relationship talk, and then only if they agreed on an open relationship or if she have warned the player because she has caught the player cheating, and she wont go if the player have said they are not into boys.
 						katjaQW['nightclub_private_room_boy'] = 1
 						katjaQW['disco_loc'] = 7
@@ -477,10 +477,10 @@ if $ARGS[0] = 'bar_after_drink':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_kiss_cheek.jpg"></center>'
 		katjaQW['horny'] += 5
 		iif(katjaQW['disco_drink_bought'] = 1, 'You and Katja are', 'Katja is')+' drinking '+iif(katjaQW['disco_drink_bought'] = 1, 'your', 'her')+' drink, but then suddenly, Katja decides to kiss you on the cheek.'
-		if func('katja_procdural', 'willing_to_be_naughty') < 65 and katjaQW['drinks'] < 8:
+		if func('katja_procedural', 'willing_to_be_naughty') < 65 and katjaQW['drinks'] < 8:
 			'Then quickly looks around and starts giggling, like she is embarrassed about what she just did.'
 		else
-			if func('katja_procdural', 'willing_to_be_naughty') < 65:
+			if func('katja_procedural', 'willing_to_be_naughty') < 65:
 				'As she is doing this, she stumbles and almost falls to the ground, laughing. It''s clear that she''s very inebriated by all the alcohol she has drunk.'
 			else
 				'She then continues the conversations like this was the most natural thing to do.'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'bar_after_drink':
 		'As '+iif(katjaQW['disco_drink_bought'] = 1, 'you and Katja are', 'Katja is')+' drinking '+iif(katjaQW['disco_drink_bought'] = 1, 'your', 'her')+' drink, a well-dressed man comes up to you. "Hello, ladies! Mind if I join you?"'
 		katjaQW['disco_drink_bought'] = 0
 		act 'Let him join':
-			if (katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0) or (katjaQW['boy_block'] = 1 and katjaQW['sex_clossedness'] <2) or func('katja_procdural', 'willing_to_be_naughty')+katjQW['horny'] < rand (50,100):
+			if (katjaQW['QWstage'] < 3 and katjaQW['liberated'] = 0) or (katjaQW['boy_block'] = 1 and katjaQW['sex_clossedness'] <2) or func('katja_procedural', 'willing_to_be_naughty')+katjQW['horny'] < rand (50,100):
 				cla
 				if katjaQW['dom'] > rand(0,30):
 					'You start to tell him that he can join you, but Katja says no.'
@@ -673,7 +673,7 @@ if $ARGS[0] = 'bar_after_drink':
 												gs 'stat'										
 												'"I really don''t think it''s a good idea to go with him. He really seems like a guy that won''t stop if we tell him to when we''re alone with him," you whisper.'
 												'Katja looks at the guy again, and after a moment of thinking, she relents. "OK. I''m not really convinced that he''s bad, but I''ll stay with you," she answers.'
-												'She turns to him. "I''m sorry, but my friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+												'She turns to him. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
 												'He then leaves, looking very disappointed.'
 												gs 'katja_nightclub', 'bar_end'
 											end
@@ -693,7 +693,7 @@ if $ARGS[0] = 'bar_after_drink':
 											katjaQW['disco_check_time'] = totminut
 											cla
 											'"Well, you can go with him if you want to," you tell Katja.'
-											'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
+											'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
 											'He then lights up and takes her hand and walks away, leaving you alone at the bar.'
 											act 'Continue': gt 'city_nightclub', 'bar'
 										end
@@ -710,7 +710,7 @@ if $ARGS[0] = 'bar_after_drink':
 			end
 		end
 		act 'Tell him no':
-			if katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] < 2 and katjaQW['horny'] > rand(40,60) and func('katja_procdural', 'willing_to_be_naughty') > rand(80,80):
+			if katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] < 2 and katjaQW['horny'] > rand(40,60) and func('katja_procedural', 'willing_to_be_naughty') > rand(80,80):
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nigthclub/disco_drinnking_bar.jpg"></center>'
 				'"We would love to have you join us for a drink," Katja says before you have time to say anything.' 
@@ -719,7 +719,7 @@ if $ARGS[0] = 'bar_after_drink':
 					gs 'npc_relationship', 'modify', 'A14', 'dislike'
 					gs 'stat'
 					'"Come on Katja. We''re having fun, just the two of us. We don''t need some guy. Besides, he gives me the wrong vibes," you lean in and whisper to Katja.'
-					'She looks at him again, then at you and whispers, "OK, you win, <<$pcs_nickname>>." She turns to him. "I''m sorry, but my friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'prefers just the two of us right now')+', so we have to decline. But maybe another time?"'
+					'She looks at him again, then at you and whispers, "OK, you win, <<$pcs_nickname>>." She turns to him. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'prefers just the two of us right now')+', so we have to decline. But maybe another time?"'
 					gs 'katja_nightclub', 'bar_end'
 				end
 				act 'Let him join':
@@ -807,7 +807,7 @@ if $ARGS[0] = 'bar_after_drink':
 												gs 'stat'
 												'"I really don''t think it''s a good idea to go with him. He really seems like a guy that won''t stop if we tell him to when we are alone with him," you whisper.'
 												'Katja looks at the guy again and after a moment of thinking, she relents. "OK. I''m not really convinced that he''s bad, but I will stay with you," she answers.'
-												'She turns to him. "I''m sorry, but my friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+												'She turns to him. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
 												'He then leaves looking very disappointed.'
 												gs 'katja_nightclub', 'bar_end'
 											end
@@ -827,7 +827,7 @@ if $ARGS[0] = 'bar_after_drink':
 											katjaQW['disco_check_time'] = totminut
 											cla
 											'"Well, you can go with him if you want to," you tell Katja.'
-											'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she is not coming. But I would still love another drink with you."'
+											'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she is not coming. But I would still love another drink with you."'
 											'He then lights up and takes her hand and walks away, leaving you alone at the bar.'
 											act 'continue': gt 'city_nightclub', 'bar'
 										end
@@ -1061,7 +1061,7 @@ if $ARGS[0] = 'dance_guy3':
 										gs 'stat'										
 										'"I really don''t think it''s a good idea to go with him. He really seems like a guy that won''t stop if we tell him to when we are alone with him," you whisper.'
 										'Katja looks at the guy again and after a moment of thinking, she relents. "OK. I''m not really convinced that he''s bad, but I will stay with you," she answers.'
-										'She then turns to him and says, "I''m sorry, but my friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+										'She then turns to him and says, "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
 										'He then leaves, looking very disappointed.'
 										gs 'katja_nightclub', 'dance_end'
 									end
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'dance_guy3':
 									katjaQW['disco_check_time'] = totminut
 									cla
 									'"Well, you can go with him if you want to," you tell Katja.'
-									'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she is not coming. But I would still love another drink with you."'
+									'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she is not coming. But I would still love another drink with you."'
 									'He then lights up and takes her hand and walks away, leaving you alone on the dance floor.'
 									act 'continue': gt 'city_nightclub', 'dance'
 								end
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'dance_guy3':
 				end
 			else
 				'After some time, he tells you that his place isn''t far from here and suggests that you continue the party at his place, making it very clear that he''s expecting his bedroom to be the main location of the party.'
-				if katjaQW['QWstage'] <= 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] < rand (50,100):
+				if katjaQW['QWstage'] <= 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] < rand (50,100):
 					'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
 					if katjaQW['QWstage'] >= 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
 						act 'Try to convince Katja to go with him':
@@ -1164,7 +1164,7 @@ if $ARGS[0] = 'dance_guy3':
 						gs 'katja_nightclub', 'dance_end'
 					end
 				else
-					if (func('katja_procdural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katajQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
+					if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katajQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
 						'"That sounds like a good idea. I''m sure that you have lots of ways to entertain us," Katja says in a seductive voice, before you even have time to reply.'
 						act 'Go home with him':
 							cla
@@ -1200,7 +1200,7 @@ if $ARGS[0] = 'dance_guy3':
 									gs 'stat'										
 									'"I really don''t think it''s a good idea to go with him. I got a really bad feeling from him, he might have someone waiting for us, and then what''re we going to do?" you whisper.'
 									'Katja looks at the guy again and after a moment of thinking, she relents. "OK. I''m not really convinced that he''s bad, but I will stay with you," she answers.'
-									'She then turns to him. "I''m sorry, but my friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+									'She then turns to him. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
 									'He then leaves, looking very disappointed.'
 									gs 'katja_nightclub', 'dance_end'
 								end
@@ -1234,7 +1234,7 @@ if $ARGS[0] = 'dance_guy3':
 									locat['katja'] = locat['katja_save2']
 									cla
 									'"Well, you can go with him if you want to," you tell Katja.'
-									'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procdural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
+									'She looks at you a little skeptical, but then turns to the guy. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
 									'He then lights up and takes her hand and walks away, leaving you alone on the dance floor.'
 									act 'continue': gt 'city_nightclub', 'dance'
 								end
@@ -1330,7 +1330,7 @@ if $ARGS[0] = 'private_room1':
 						'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 						'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
 						'After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
-						if func('katja_procdural', 'willing_to_be_naughty') < 85:
+						if func('katja_procedural', 'willing_to_be_naughty') < 85:
 							gs 'willpower', 'drugs', 'force', 'hard'
 						else
 							gs 'willpower', 'drugs', 'force'
@@ -1340,7 +1340,7 @@ if $ARGS[0] = 'private_room1':
 								*clr & cla
 								minut += 8
 								gs 'willpower', 'pay', 'force'
-								gs 'katja_procdural', 'take_cocaine'
+								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'"Come on, Katja. Just try it. It won''t harm you," you say, but Katja still looks skeptical.'
@@ -1416,7 +1416,7 @@ if $ARGS[0] = 'private_room1':
 							dur += 1
 							gs 'drugs', 'cocaine'
 							gs 'stat'
-							gs 'katja_procdural', 'take_cocaine'
+							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
@@ -1477,7 +1477,7 @@ if $ARGS[0] = 'private_room1':
 							act 'Watch Katja do her lines':
 								*clr & cla
 								minut += 5
-								gs 'katja_procdural', 'take_cocaine'
+								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'You watch as Katja takes the tube, puts one end at her nose and bows down to the start of the line that <<$boyname>> has prepared for her.'
@@ -1496,7 +1496,7 @@ if $ARGS[0] = 'private_room1':
 						dur += 1
 						gs 'drugs', 'cocaine'
 						gs 'stat'
-						gs 'katja_procdural', 'take_cocaine'
+						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
@@ -1564,7 +1564,7 @@ if $ARGS[0] = 'private_room1':
 							act 'Watch Katja do her lines':
 								*clr & cla
 								minut += 5
-								gs 'katja_procdural', 'take_cocaine'
+								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 								'You watch as Katja takes the tube, puts one end at her nose and bows down so the other end is at the start of the line that <<$boyname>> has prepared for her.'
@@ -1583,7 +1583,7 @@ if $ARGS[0] = 'private_room1':
 						dur += 1
 						gs 'drugs', 'cocaine'
 						gs 'stat'
-						gs 'katja_procdural', 'take_cocaine'
+						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'"Okay, Katja. Let''s do it together," you say.'
@@ -1614,7 +1614,7 @@ if $ARGS[0] = 'private_room2':
 		gs 'arousal', 'foreplay', 3
 		gs 'stat'
 		'You sit and talk while you sip your drinks. During this time, <<$boyname>>''s hands become more and more daring. At first, they just accidentally touch you or Katja, but as time goes on, they keep lingering on your thighs.'
-		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] < rand (75,150):
+		if (katjaQW['QWstage'] <= 6 and katjaQW['liberated'] = 0) or (katjaQW['simultanous_boys'] = 0 and katjaQW['liberated'] = 1) or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] < rand (75,150):
 			'Katja is having none of it, demonstrably removing his hand from her thigh when it has been the for just a second. He then tries with your thigh to see if he has more luck.'
 			act 'Make it clear that you''re also not interested':
 				cla
@@ -1628,7 +1628,7 @@ if $ARGS[0] = 'private_room2':
 				act 'Follow Katja to the dance floor': gt 'katja_nightclub', 'dance'
 			end
 			if katjaQW['QWstage'] >= 6 and katjaQW['sex_clossedness'] = 0 and katjaQW['boy_block'] = 0:
-				if func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
+				if func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
 					gs 'willpower', 'sex', 'force', 'easy'
 				else
 					gs 'willpower', 'sex', 'force'
@@ -1663,9 +1663,9 @@ if $ARGS[0] = 'private_room2':
 			'Katja is visibly enjoying his attention and reciprocates by starting to stroke his thigh, moving closer and closer to his crutch. <<$boyname>> seems completely captivated by her and forgets about you. Moving his hand from your thigh to Katja''s breasts.'
 			'"You gotta feel this, <<pcs_nickname>>," Katja says as she starts stroking his cock through his pants. "It''s '+iif(dick > 17, 'very big', 'nice')+' and hard. I think we will have a good time with it," she says in her most seductive voice.'
 			act 'Join Katja and have a threesome': gt 'katja_nightclub_sex', 'private_booth_FFM'
-			if func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] > 200:
+			if func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 200:
 				gs 'willpower', 'sex', 'force', 'hard'
-			elseif func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
+			elseif func('katja_procedural', 'willing_to_be_naughty') + katjQW['horny'] > 100:
 				gs 'willpower', 'sex', 'force'
 			else
 				gs 'willpower', 'sex', 'force', 'easy'
@@ -1687,7 +1687,7 @@ if $ARGS[0] = 'private_room2':
 				act 'Give them some privacy':
 					cla
 					katjaQW['disco_loc'] = 7
-					gs 'katja_procdural', 'sex_set', 1
+					gs 'katja_procedural', 'sex_set', 1
 					'You slowly get up and as you leave, you tell them, "Have fun, Katja. You can try to find me after you''ve finished your business."'
 					act 'Leave': gt 'city_nightclub', 'private_rooms'
 				end

locations/LCwork.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'start4':
 		'They live in the residential area of the city, and it''s a short drive there. You remember it form last time, they inform you, she is ready to try anal, but wants you to coach her through it and get her ready.'
 		'Once inside he watches the two of you have fun. He waits until you bring his girlfriend to an orgasm.'
 	
-		gs 'arousal', 'give_cuni', 60, 'sub', 'prostitution', 'lesbian'
+		gs 'arousal', 'cuni_give', 60, 'sub', 'prostitution', 'lesbian'
 		gs 'stat'
 		
 		if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'You were already fairly turned on before going with them, and the girl turns out to be an expert at pleasing other women! She has you begging and moaning in no time, and licks you to an intense orgasm within moments.'
@@ -214,7 +214,7 @@ if $ARGS[0] = 'start4':
 			'At that point he comes over and sits on the couch with the two of you. He lubes up his dick, while you lube up her asshole. You help her ease down on his dick, he is very gentle with her and lets her lead the action. You help by licking her clit while she rides his dick with her ass.'
 			'By the sounds of it, you can tell she kinda likes it but also finds it a bit painful. Before long she gets off him and says she can''t take anymore and applogises to him. He tells her it''s ok they can try again some other time. With that he bends you over the couch and starts to fuck you in the ass. He is fairly gentle with you, but not nearly as much as he was with his girlfriend, which is kinda sweet.'
 			
-			gs 'arousal', 'give_cuni', 60, 'sub', 'prostitution', 'lesbian'
+			gs 'arousal', 'cuni_give', 60, 'sub', 'prostitution', 'lesbian'
 			gs 'arousal', 'anal', 60, 'sub', 'prostitution'
 		    minut -= 20 
 			gs 'stat'

locations/MartinSex2.qsrc

@@ -642,7 +642,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 	if lubri > 0:
 		gs 'arousal', 'anal_finger', 5, 'lube'
 		gs 'arousal', 'hj', 3
-		gs 'arousal', 'masturbation', 5
+		gs 'arousal', 'masturbate', 5
 		minut -= 8
 		lubri -= 1
 	else
@@ -875,7 +875,7 @@ if $ARGS[0] = 'PainalDyn':
 				*nl
 				$orgasm_txt = 'Even though you were enjoying the pain, you didn''t think you would actually orgasm. But the feeling of Martin''s hot cum in your ass seems to flip a switch inside you, setting all the nerves in your ass on edge and flooding your brain with pleasure. You cum, your yelps of pain mixing with moans of pleasure as your mind goes blank.'
 				gs 'cum_call', 'anus', $boy, 1
-				gs 'arousal', 'masturbation', 5
+				gs 'arousal', 'masturbate', 5
 				gs 'arousal', 'anal', 5, 'maso'
 				$orgasm_txt = ''
 				minut -= 5

locations/NikoDreams.qsrc

@@ -389,7 +389,7 @@ if $ARGS[0] =  'woods_hide':
 	act 'Continue':gt 'NikoDreams', 'Woods <<VKWoods>>'
 end	
 
-if $ARGS[0] =  'Friends':
+if $ARGS[0] =  'friends':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/vicky.jpg"></center>'

locations/NikoMeyHome.qsrc

@@ -341,7 +341,7 @@ if $ARGS[0] = 'bathroom_locked':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/locked.jpg"></center>'
 	'You try to enter the bathroom, but the door is locked. '+$OpenInnerThought+'Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them.'+$CloseInnerThought+''
 
-	act 'Walk away': gt 'NikoMeyHome', 'Hallway'	
+	act 'Walk away': gt 'NikoMeyHome', 'hallway'	
 end
 
 if $ARGS[0] = 'bathroom_hornet':
@@ -519,7 +519,7 @@ if $ARGS[0] = 'vickychat5':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/vicky/vickySmile.jpg"></center>'
 	'You approach Vicky, but she seems to be fast asleep. Not wanting to disturb her, you carefully walk out of the room.'
-	act 'Leave':gt 'NikoMeyHome', 'Hallway'	
+	act 'Leave':gt 'NikoMeyHome', 'hallway'	
 end		
 
 if $ARGS[0] = 'vicky_reminder':
@@ -654,7 +654,7 @@ if $ARGS[0] = 'katjachat4':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/Katja2.jpg"></center>'
 	'You sit next to Katja and she turns to you. "Hey <<$pcs_nickname>>, it was great having you here. Feel free to pay us another visit sometime." She winks at you before turning back to the TV screen.'
 	
-	act 'Walk away':gt 'NikoMeyHome', 'Lounge'
+	act 'Walk away':gt 'NikoMeyHome', 'lounge'
 end
 
 if $ARGS[0] = 'Katja and Natalia':

locations/NikoWhore.qsrc

@@ -852,7 +852,7 @@ if $ARGS[0] = 'Locker Room 2':
 																			'You can feel your consciousness fading in and out. You can hear some words, but they too seem to fade in and out... "You''ll be a star, <<$pcs_nickname>>. An even bigger whore than Sonia."... "You look all tuckered out. Had a good time?..." "I think we broke our new toy already..." ... "It looks like she passed out... Too much fun maybe."...'
 																			'You hear footsteps as they leave the room and everything starts to fade until you hear... "How could they do this to her?"..."Oh wow, she looks... Sticky."..." This isn''t the time for jokes, Vicky! We need to do something! We can''t just leave her like this!" ...'
 																		
-																			act '...':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'Family'
+																			act '...':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'family'
 																		end
 																	end
 																end

locations/ParkKafe.qsrc

@@ -849,7 +849,7 @@ if $ARGS[0] = 'youth':
 							'Since you see it as a challenge, and you''re wanting to break her, you slide your hand lower towards her exposed pussy. As you reach her clit, you slowly start massaging it which makes her moan louder and louder. You''ve finally managed to break her and you start thinking about your next move.'
 							'"What the hell are you doing?!" the old man starts yelling as he walks up to the gazebo. "This is a public area! This is not the place for this kind of debauchery!"'
 							gs 'arousal', 'flash', 5, 'exhibitionism', 'lesbian', 'humiliation'
-							gs 'arousal', 'give_massage', -5, 'exhibitionism', 'lesbian', 'dom'
+							gs 'arousal', 'massage_give', -5, 'exhibitionism', 'lesbian', 'dom'
 							gs 'arousal', 'vaginal_finger_give', -5, 'exhibitionism', 'lesbian', 'dom'
 							gs 'stat'
 							act 'Return to the group':

locations/Prostitute.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'start':
 
 								gs 'fight','initFight'
 
-								gs 'fight_npcdata', 'prostitue2'
+								gs 'fight_npcdata', 'prostitute2'
 
 								gt 'fight', 'start'
 							end

locations/Vika.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'brothel_questions':
 				'You are taken aback by these words. Why would you not want to be her friend? "Yes, Of course we''ll still be friends."'
 				'"I will show you then," she tells you'
 
-				act 'Follow Vika': gt 'bordelv', 'start'
+				act 'Follow Vika': gt 'bordelv'
 			end
 		elseif vikaslut = 1:
 			if bordel = 0:

locations/Vnlake1.qsrc

@@ -19,7 +19,7 @@ act 'Kiss':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake2.jpg"></center>'
 	'You turn to her and kiss her lips. She begins to fondle your breasts with her tongue, and her hand massages your pussy.'
 
-	gs 'arousal', 'give_kiss', 5, 'lesbian'
+	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	minut -= 5
 	gs 'stat'

locations/Zvereva_sub_1.qsrc

@@ -557,7 +557,7 @@ if $ARGS[0] = '7':
 		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -586,7 +586,7 @@ if $ARGS[0] = '8':
 		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -616,7 +616,7 @@ if $ARGS[0] = '9':
 		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -645,7 +645,7 @@ if $ARGS[0] = '10':
 		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -673,7 +673,7 @@ if $ARGS[0] = '11':
 		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -702,7 +702,7 @@ if $ARGS[0] = '12':
 		gs 'arousal', 'vaginal_finger', 10, 'sub', 'humiliation', 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -734,7 +734,7 @@ if $ARGS[0] = '13':
 		gs 'arousal', 'vaginal_finger', -10, 'sub', 'humiliation', 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 	
@@ -763,7 +763,7 @@ if $ARGS[0] = '14':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		gs 'gschool_lessons4', 'finished'
+		gs 'Zvereva_sub_1', 'finished'
 	end
 end
 
@@ -779,7 +779,7 @@ if $ARGS[0] = 'default':
 		'Christina grins as you walk up to her meekly, expecting your punishment. "Sorry bitch, I''m busy today. You''ll have to do without punishment this time."'
 		'She quickly heads into the showers, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
 	end
-	gs 'gschool_lessons4', 'finished'
+	gs 'Zvereva_sub_1', 'finished'
 end
 
 if $ARGS[0] = 'finished':
@@ -809,7 +809,7 @@ if $ARGS[0] = 'ws_1':
 		gs 'arousal', 'pee', 5, 'sub', 'humiliation', 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue': gs 'gschool_lessons4', 'finished'
+		act 'Continue': gs 'Zvereva_sub_1', 'finished'
 	end
 end
 

locations/_attributes_school.qsrc

@@ -331,7 +331,7 @@ elseif ARGS[1] = 46:
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 4
+	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
@@ -344,9 +344,9 @@ elseif ARGS[1] = 48:
 	
 elseif ARGS[1] = 49:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 4
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 50:

locations/agentned.qsrc

@@ -363,14 +363,18 @@ end
 if $ARGS[0] = 'format_price_string':
 	$worknum = STR(ARGS[1])
 	worknumlength = LEN($worknum)
-	pos1 = 1 &
-	pos2 = iif((worknumlength MOD 3) = 0, 3, worknumlength MOD 3)
+	pos1 = 1
 	:format_price_string_loop
-		$split = $MID($worknum, pos1, pos2)
-		$result += iif(pos2 < worknumlength, $split+',', $split)
-		pos1 = pos2+1
-		pos2 = pos1+2
+		$split = $MID($worknum, pos1, 1)
+		if (worknumlength - 1)/3 ! (worknumlength-2)/3:
+			$result += $split+','
+		else
+			$result += $split
+		end
+		worknumlength -= 1
+		pos1 += 1
 	if pos2 <= worknumlength: jump 'format_price_string_loop'
 	killvar 'pos1' & killvar 'pos2' & killvar 'worknum' & killvar 'worknumlength' & killvar 'split'
 end
---- agentned ---------------------------------
+--- agentned ---------------------------------
+

locations/albina_chat.qsrc

@@ -33,42 +33,7 @@ if $ARGS[0] = 'small_talk2':
 		!! Albina takes the lead
 		AlbinaQW['chat_rand'] = rand(1,2)
 		if AlbinaQW['chat_rand'] = 1:
-			'"What do you do for money <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on mama forever. Don''t tell me that everything you had came from Starlets?"'
-			act 'My mom':
-				cla & *nl
-				'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
-				'"Fuuuuck," Albina groans, flipping over to stare at the ceiling in frustration. "What else can I do? I''m <i>so</i> over getting fucked for money."'
-				gs 'albina_chat','small_talk'
-			end
-			act 'Odd jobs':
-				cla & *nl
-				'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?" Albina wrinkles her nose in disgust.'
-				'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
-				gs 'albina_chat','small_talk'
-			end
-			
-			gs 'albina_chat2','first_model_talk1'
-			
-			if film > 0:
-				act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
-			end
-			
-				
-			!!{if masseuse['jobtype'] ! 0:
-				act 'I work as a masseuse':
-					cla & *nl
-					
-					gs 'albina_chat','small_talk'
-				end
-			end}
-			
-			if stripdancesum > 0:
-				act 'I''m a stripper':
-					cla & *nl
-					gs 'albina_chat','stripper_talk1'
-				end
-			end
-
+			gs 'albina_chat','job_talk1'
 		elseif AlbinaQW['chat_rand'] = 2:
 			if AlbinaQW['commando_know'] = 0:
 				gs 'albina_chat','underwear_talk'
@@ -84,12 +49,50 @@ if $ARGS[0] = 'small_talk2':
 	end
 end
 
+if $ARGS[0] = 'job_talk1':
+	'"What do you do for money <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on Mama forever. Don''t tell me that everything you had came from Starlets?"'
+	act 'My mom':
+		cla & *nl
+		'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
+		'"<i>Fuuuuck</i>," Albina groans, flipping over to stare at the ceiling in frustration. "What else can I do? I''m <i>so</i> over getting fucked for money."'
+		gs 'albina_chat','small_talk'
+	end
+	act 'Odd jobs':
+		cla & *nl
+		'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?" Albina wrinkles her nose in disgust.'
+		'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
+		gs 'albina_chat','small_talk'
+	end
+	
+	gs 'albina_chat2','first_model_talk1'
+	
+	if film > 0:
+		act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
+	end
+	
+		
+	!!{if masseuse['jobtype'] ! 0:
+		act 'I work as a masseuse':
+			cla & *nl
+			
+			gs 'albina_chat','small_talk'
+		end
+	end}
+	
+	if stripdancesum > 0:
+		act 'I''m a stripper':
+			cla & *nl
+			gs 'albina_chat','stripper_talk1'
+		end
+	end
+end
+
 if $ARGS[0] = 'stripper_talk1':
 	act 'Embarrassed':
 		cla & *nl
 		'"I... do some strip dancing in the city," you admit, blushing hard.'
 		if age < 18:
-			'"You''re a stripper?" Albina exclaims, her jaw dropping. "How? You''re underage!"'
+			'"You''re a stripper?" Albina''s jaw drops. "How? You''re underage!"'
 			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
 				'"I''ve had a fake passport for years, Albina," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
 			else
@@ -100,7 +103,7 @@ if $ARGS[0] = 'stripper_talk1':
 				gs 'albina_chat','small_talk'
 			end
 		else
-			'"You''re a stripper?" Albina exclaims and you laugh nervously.'
+			'"You''re a stripper?" Albina''s jaw drops and you laugh nervously.'
 			'"Y-Yeah. I needed money and it''s... an easy job," you reply.'
 			'"Say no more. I''ve always thought about doing it myself, I just don''t know what Mama would say about it..."'
 			gs 'albina_chat','small_talk'
@@ -333,7 +336,7 @@ if $ARGS[0] = 'pornstar_talk3.2':
 end
 
 if $ARGS[0] = 'underwear_talk':
-	'"Hey <<$pcs_nickname>>, where do you buy your panties? Albina asks."'
+	'"Hey <<$pcs_nickname>>, where do you buy your panties?" Albina asks.'
 	act'I buy from G&M':
 		cla & *nl
 		'"I get most of mine from G&M," you admit.'
@@ -341,7 +344,7 @@ if $ARGS[0] = 'underwear_talk':
 		act'They''re cheap':
 			cla & *nl
 			'"They''re cheap and affordable," you shrug. "Not everybody''s a rich princess like you."'
-			'"I''ll have you know I get all my thongs from a seedy sex shop in the red light district for 500 <b>₽</b> a pop," Albina says, turning her nose up at you. "I''m no princess. I''m a dirty little girl who likes her panties cheap and easily snapped off."'
+			'"I''ll have you know I get all my thongs from a seedy sex shop in the red light district for 500 <b>₽</b> a pop," Albina says, turning her nose up at you. "I''m no princess. I''m a dirty little girl who likes her panties cheap and snappable."'
 			*nl
 			'You both laugh at that.'
 			gs'albina_chat','small_talk'
@@ -538,14 +541,14 @@ if $ARGS[0] = 'pube_talk':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"I can''t help but notice when we''re in the locker room that you keep your pussy clean," you say. "Do you shave every day or something?"'
 		if AlbinaQW['shower_caught'] = 0:
-			'"You spying on me or something?" Albina asks with a raised eyebrow. She''s giving you a "glare" but you can also see a smirk tugging at the corner of her lips. When the full smile finally breaks out, she laughs and says, "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
+			'"You spying on me or something?" Albina asks with a raised eyebrow. She''s giving you a "glare" but you can also see a smirk tugging at the corner of her lips. When the full smile finally breaks out, she laughs and says, "I wax all my pussy and leg hair. I used to use a razor but I can''t stand the feeling of stubble. Prickly, pokey, ick!"'
 		elseif AlbinaQW['shower_caught'] = 1:
-			'"Is that what you were looking at when I caught you staring?" Albina says with a smug smirk. She holds the look for a few seconds before laughing. "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
+			'"Is that what you were looking at when I caught you staring?" Albina says with a smug smirk. She holds the look for a few seconds before laughing. "I wax all my pussy and leg hair. I used to use a razor but I can''t stand the feeling of stubble. Prickly, pokey, ick!"'
 		else
 			'"How often are you peeping on me in there?" Albina laughs. "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
 		end
 		'She shivers with a grimace of disgust and annoyance.'
-		'"Waxing takes care of the problem for weeks at a time. Which is great cause shaving sucks too!"'
+		'"Waxing takes care of the problem for weeks at a time. Which is great cause shaving hurt my neck too!"'
 		*nl
 		if rand(1,100) < pcs_prcptn:
 			AlbinaQW['pube_hint'] = 1

locations/albina_chat2.qsrc

@@ -245,7 +245,7 @@ if $ARGS[0] = 'first_model_talk4':
 			'Albina stops, turning to look at you with a frown. You give her a stare and she stares back.'
 			*nl
 			'"Damn!" she swears after a moment. "Tell me what to search!"'
-			gs 'albina_chat','first_model_talk_tell'
+			gs 'albina_chat2','first_model_talk_tell'
 		end
 			
 		act'Let her search':
@@ -255,7 +255,7 @@ if $ARGS[0] = 'first_model_talk4':
 			'"Why can''t I find it?!" she grumbles, cursing.'
 			'"I don''t use my <i>actual</i> name when modelling," you say. "Do you think I''m crazy?"'
 			'"Come ooooonnn!" she moans. "Tell me what to search!"'
-			gs 'albina_chat','first_model_talk_tell'
+			gs 'albina_chat2','first_model_talk_tell'
 		end
 	end
 end
@@ -891,10 +891,8 @@ if $ARGS[0] = 'recurrent_model_talk1':
 		cla & *nl
 		'"It''s whatever," you shrug. "Same as any other job I guess. Show up, do the work, get paid."'
 		'"That''s all you have to say about being a fucking super model?" she grins back, punching you in the arm. "You bitch."'
-		if ''
+		!! if '' -> commented out just so it does not cause problems elsewhere  
 	end
-	
-	
 end
 
 if $ARGS[0] = 'recurrent_porn_talk1':

locations/albina_house_events.qsrc

@@ -192,13 +192,13 @@ if $ARGS[0] = 'first_sex':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss1.mp4"></video></center>'
 	'The moment you get into her room, you start tearing each other''s clothes off and tossing them aside without a care. Her thong is drenched and comes away with a trail of juices as she wiggles out of it. As soon as you''re completely naked, she pushes you back onto the bed and climbs on top of you. You wrap your legs around her back and you go right back to passionately making out again. But it isn''t enough. You can feel Albina''s juices smearing against your thigh and you''re pretty sure she can feel the same from you.'
-	gs 'arousal', 'kiss', 2, 'no_orgasm_msg'
-	gs 'arousal', 'massage', -2, 'no_orgasm_msg'
+	gs 'arousal', 'kiss', 2, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'massage', -2, 'no_orgasm_msg', 'lesbian'
 	gs 'stat'
 
 	act 'Take it further':
-		gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
-		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg'
+		gs 'arousal', 'rimming', 5, 'no_orgasm_msg', 'lesbian'
+		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg', 'lesbian'
 		gs 'stat'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli22.jpg"></center>'
@@ -207,11 +207,10 @@ if $ARGS[0] = 'first_sex':
 		act '69':
 			*clr & cla
 			if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
-			lesbian += 1
 			$orgasm_or = 'yes'
-			gs 'arousal', 'cuni', 10, 'no_orgasm_msg'
-			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg'
-			gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
+			gs 'arousal', 'cuni', 10, 'no_orgasm_msg', 'lesbian'
+			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg', 'lesbian'
+			gs 'arousal', 'rimming', 5, 'no_orgasm_msg', 'lesbian'
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/lesbian/69_1.mp4"></video></center>'
 			'You turn, forcing her tongue away from your ass and towards your other hole instead, wrapping your thighs around her torso. In the same motion, you dive between her legs and run your tongue across her pussy. It''s absolutely <i>soaked</i>. The two of you eat each other out with mutually reckless abandon as you relentlessly tease each other''s clits. Albina''s tongue occasionally slides up and rims your ass before moving back down to your pussy, which grows wetter and wetter.'
@@ -220,9 +219,9 @@ if $ARGS[0] = 'first_sex':
 			*nl
 			'Finally, the tension gives out and both of you are left panting. You can feel Albina''s breath between your legs.'
 			act'Continue':
-				pcs_hairbsh = 0
+				pcs_hairbsh = -1
 				if pcs_makeup > 1: pcs_makeup = 0
-				gs 'arousal', 'kiss', 1, 'no_orgasm_msg'
+				gs 'arousal', 'kiss', 1, 'no_orgasm_msg', 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
 				cla & *clr

locations/albinahome.qsrc

@@ -836,7 +836,7 @@ if $ARGS[0] = 'first_anal1':
 	end
 end
 
-if ARGS[0] = 'anal_refuse':
+if $ARGS[0] = 'anal_refuse':
 	*clr & cla
 	menu_off = 1
 	gs 'arousal', 'end'

locations/alexandriaChat.qsrc

@@ -662,7 +662,7 @@ if $ARGS[0] = 'sword':
 	elseif AlexandriaQW = 16:
 		*clr & cla
 		minut += 5
-		pcs_mood - 20
+		pcs_mood -= 20
 		npc_rel['A241'] = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/saber.jpg"></center>'
@@ -809,8 +809,8 @@ if $ARGS[0] = 'sword':
 	
 	else
 	    *clr & cla
-		minut += 2
-		if AlexandriaMissionQW > 1: AlexandriaMissionQW - 1
+		minut += 2 
+		if AlexandriaMissionQW > 1: AlexandriaMissionQW -= 1 
 	    gs 'stat'
 	    '<center><b><font color="maroon">Aleksei</font></b></center>'
 	    '<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'

locations/arousal_oneline.qsrc

@@ -2,7 +2,7 @@
 
 !! For use only for one of arousal calls and not to be used in larger scenes, includes the 'end' call
 
-gs 'arousal', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8], $ARGS[9]
+gs 'arousal', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
 gs 'arousal', 'end'
 
 --- arousal_oneline ---------------------------------

locations/arturdin.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'fist':
 	if pcs_ass >= 20:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/sex/fist2.jpg"></center>'
 		'Arthur inserts two fingers into your ass, then adds another finger, and another. You want to tell him to stop but are too paralyzed with shock and pain. Before you know it, Arthur''s entire fist is in your anus, stretching it beyond what you thought possible. All you can do is whimper pathetically as he explores your butt.'
-		gs 'arousal', 'anal__fist', 5, 'sub'
+		gs 'arousal', 'anal_fist', 5, 'sub'
 		gs 'stat'
 	end
 

locations/bank.qsrc

@@ -282,7 +282,7 @@ if $ARGS[0] = 'loan_officer':
 								'"On your side now," Karpenko tells you gruffly. You clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you find yourself pushing back into him to take every millimeter into you.'
 								*nl
 
-								gs 'arousal', 'kissing', -5
+								gs 'arousal', 'kiss', -5
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'stat'
 
@@ -581,7 +581,7 @@ if $ARGS[0] = 'cikl':
 	end
 
 	!! Checking for tenants moving out
-	gs 'homes_properties', 'tenant_movements'
+	gs 'homes_properties', 'tenant_move_out_check'
 	
 
 	!!----------------------------------------

locations/bed.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'rab':
 		gs 'stat'
 		
 		act 'Lie down':
-			*clr cla
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
 			'You lay down on the bed and she climbs on top of you and kneels over your face. She makes you open your mouth and forcefully shoves the strap-on in. You try to pull away, but her hands hold your head firmly. She continues to violate your mouth, hardly allowing you to catch a breath of air while she thrust it deeper and deeper, eventually sliding it down your throat, cutting off your breath completely. When you start to lose consciousness, she finally takes it out, allowing you to roll onto your side, wheezing and sniffling.'
 			'"And now for the punishment. Get up, bitch!" she demands.'

locations/bedrPar.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if prezik > 0 and rand(1,3) = 1:
 			gt 'mother', 'condom_find'
-		elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
+		elseif dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'dildo_find'
 		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'plug_find'
@@ -91,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
-			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
 		else
 			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
 		end

locations/bedrPar2.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'kamasutra':
 end
 
 ! read book
-if $args = 'read_book':
+if $ARGS[0] = 'read_book':
 	*clr & cla
 	menu_off = 1
 	pcs_horny += 2

locations/booty_call.qsrc

@@ -94,12 +94,10 @@ if $ARGS[0] = 'home_links':
 	*nl
 	:loopBC_homes
 	if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-	
-!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 		!! ''''
 	end
-	
+	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 
 	i +=1
 	if i < arrsize('$Fuckbuddy') : jump 'loopBC_homes'

locations/boy_updater.qsrc

@@ -34,7 +34,7 @@ end
 
 if $ARGS[0] = 'dick_update':
 	if $npc_dick_desc[$boy] = '':
-		if npc_dick[$boy] < 9:
+		if npc_dick[$boy] < 10:
 			if $npc_thdick[$boy] = 'skinny' or $npc_thdick[$boy] = 'slim':
 				$npc_dick_desc[$boy] = 'tiny'
 			elseif $npc_thdick[$boy] = 'well proportioned' or $npc_thdick[$boy] = 'thicker than average':
@@ -42,7 +42,7 @@ if $ARGS[0] = 'dick_update':
 			elseif $npc_thdick[$boy] = 'thick' or $npc_thdick[$boy] = 'massive' or $npc_thdick[$boy] = 'monstrous':
 				$npc_dick_desc[$boy] = 'chode'
 			end
-		elseif npc_dick[$boy] < 20:
+		elseif npc_dick[$boy] < 16:
 			if $npc_thdick[$boy] = 'skinny' or $npc_thdick[$boy] = 'slim':
 				$npc_dick_desc[$boy] = 'skinny'
 			elseif $npc_thdick[$boy] = 'well proportioned' or $npc_thdick[$boy] = 'thicker than average':
@@ -50,7 +50,7 @@ if $ARGS[0] = 'dick_update':
 			elseif $npc_thdick[$boy] = 'thick' or $npc_thdick[$boy] = 'massive' or $npc_thdick[$boy] = 'monstrous':
 				$npc_dick_desc[$boy] = 'thick'
 			end
-		elseif npc_dick[$boy] < 31:
+		elseif npc_dick[$boy] < 20:
 			if $npc_thdick[$boy] = 'skinny' or $npc_thdick[$boy] = 'slim':
 				$npc_dick_desc[$boy] = 'long'
 			elseif $npc_thdick[$boy] = 'well proportioned' or $npc_thdick[$boy] = 'thicker than average':
@@ -71,4 +71,8 @@ if $ARGS[0] = 'dick_update':
 	end
 end
 
+if $ARGS[0] = 'stamina_update':
+	if npc_sex_stamina[$boy] = 0: npc_sex_stamina[$boy] = rand(1,10)
+end
+
 --- boy_updater ---------------------------------

locations/brother2.qsrc

@@ -453,7 +453,7 @@ if $ARGS[0] = 'DTR_vaginal':
 		'You move yourself up and down on your brother''s <<npc_dick[''A34'']>>cm cock, slowly increasing your tempo until you find a pace both of you enjoy.'
 		'Kolka starts playing with your <<$titsize>> breasts, tweaking your nipples with his fingers before putting his mouth over them and sucking.'
 		'You mewl in appreciation. "Mmm."'
-		gs 'arousal', 'kissing', -5, 'incest'
+		gs 'arousal', 'kiss', -5, 'incest'
 		gs 'arousal', 'foreplay', -5, 'incest'
 		gs 'arousal', 'vaginal', 5, 'incest'
 		gs 'stat'

locations/brother_shower_sex.qsrc

@@ -374,7 +374,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 				*nl
 				'You move a hand down to your clit, and while it''s not that easy, you manage to give yourself some extra stimulation. You soon realize that you''re beginning to feel good, really good. Your clit stimulation, the taboo act and now Kolka''s thrusting is turning from pleasant to... pleasure. Indeed, the pain is rapidly falling into history as your pleasure ramps up with every thrust.  Now you are finding it hard not moan in pleasure as this new experience is undeniably pushing you towards a powerful orgasm.'
 				gs 'arousal', 'anal', 5
-				gs 'arousal', 'finger_clit', 2
+				gs 'arousal', 'clit_finger', 2
 				gs 'stat'
 				act 'Enjoy':
 					cla & *clr
@@ -383,7 +383,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 					*nl
 					'"That was..." you begin to say before you realize that you''re unsure what to say.'
 					gs 'cum_call', 'anal', 'A34', 1
-					gs 'arousal', 'finger_clit', 2
+					gs 'arousal', 'clit_finger', 2
 					gs 'arousal','breasts', -1
 					$orgasm_txt = ''
 					$orgasm_or = 'custom'

locations/brother_voyeur_sex.qsrc

@@ -366,7 +366,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 				'Kolka starts moving a little faster, and you realize that having water as lube isn''t that effective. You feel some burning pain as he begins picking up speed, but there is another feeling. You start to feel... pleasant; it''s not that much, but it''s definitely there.'
 				'You move a hand down to your clit, and while it''s not that easy, you manage to give yourself some extra stimulation. You soon realize that you''re beginning to feel good, really good. Your clit stimulation, the taboo act and now Kolka''s thrusting is turning from pleasant to... pleasure. Indeed, the pain is rapidly falling into history as your pleasure ramps up with every thrust.  Now you are finding it hard not moan in pleasure as this new experience is undeniably pushing you towards a powerful orgasm.'
 				gs 'arousal', 'anal', 5
-				gs 'arousal', 'finger_clit', 2
+				gs 'arousal', 'clit_finger', 2
 				gs 'stat'
 				act 'Enjoy':
 					*clr
@@ -375,7 +375,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 					'Just as you''re about to cum, you feel Kolka thrust deep and hold it as he cums deep in your bowels, pushing you over the edge. Unable to keep quiet, you moan as your climax tears though you, your body quivering as your knees become weak. You are steadied as Kolka holds you in a firm embrace from behind, squeezing your breasts as he does.'
 					'"That was..." you begin to say before you realize that you''re unsure what to say.'
 					gs 'cum_call', 'anal', 'A34', 1
-					gs 'arousal', 'finger_clit', 2
+					gs 'arousal', 'clit_finger', 2
 					gs 'arousal','breasts', -1
 					$orgasm_txt = ''
 					$orgasm_or = 'custom'

locations/cardgame_durak.qsrc

@@ -440,7 +440,7 @@ if $ARGS[0] = 'card_game_rough_sex':
 			if pcs_horny >=70:
 				$orgasm_or = 'yes'
 				$orgasm_txt = 'Your pussy is drenched by the time <<$boydesc3>> fucks you again. The guys haven''t shown any interest in it today, fully focusing on fucking your ass as if you''re just a rubber doll. You feel greatly aroused despite (or maybe because of?) the way they''re treating you, and gently masturbate yourself while <<$boydesc3>> fucks you. You stifle your moans and have a quiet orgasm, trying to not let the guys find out.'
-				gs 'arousal','masturbation',2,'exhibitionism'
+				gs 'arousal','masturbate',2,'exhibitionism'
 			end
 			'"Almost done, whore. Show us your ass", <<$boydesc3>> smirks with contempt.'
 			gs 'stat'
@@ -499,7 +499,7 @@ if $ARGS[0] = 'card_game_casual_sex':
 			if pcs_horny >=70:
 				$orgasm_or = 'yes'
 				$orgasm_txt = 'You are overcome by surging emotions and your body convulses with waves of pleasure. You let out a loud moan. "Oh! More... don''t stop. Oh yeah! Oh!"'
-				gs 'arousal','masturbation',2,'exhibitionism'
+				gs 'arousal','masturbate',2,'exhibitionism'
 				'"The guy is surprised by your stormy climax and he says with a grin: "You cum like a wild cat, I love nymphos like you. Could you give me your phone number?"'
 				'"Maybe, but first you should finish", You answer with a smirk.'
 			end

locations/city_apt_building.qsrc

@@ -558,7 +558,7 @@ if $ARGS[0] = 'floor3_events':
 				'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."' 
 				'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.' 
 				'You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
-				gs 'arousal', 'forplay', 3, 'humiliation'
+				gs 'arousal', 'foreplay', 3, 'humiliation'
 				gs 'arousal', 'end'
 				gs 'stat'
 			else

locations/city_center.qsrc

@@ -197,9 +197,9 @@ end
 if hour >= 8 and hour <= 18:
 	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a> and <a href="exec: minut += 1 & gt ''city_hermitage'', ''start''">Hermitage Museum</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a><a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
+	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a> and <a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>>, <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 1 & gt ''sentence'',''start''">The City Courthouse</a>'

locations/city_clinic.qsrc

@@ -421,14 +421,14 @@ if $ARGS[0] = 'stdclinic':
 		if money < 450 and karta < 450: *nl & 'You can''t afford your herpes shot.'
 
 		if money >= 450:
-			act 'Get herpes shot (1,000 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
+			act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
 				money -= 450
 				gs 'city_clinic', 'herpes_shot'
 			end
 		end
 
 		if karta >= 450:
-			act 'Get herpes shot (1,000 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
+			act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
 				karta -= 450
 				gs 'city_clinic', 'herpes_shot'
 			end
@@ -1734,7 +1734,7 @@ if $ARGS[0] = 'milk_donation':
 					'She looks surprised at the large amount of milk as she stores away <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk in <<lact_ev[''poli_temp_var'']>> bottles.'
 				elseif lact_ev['poli_temp_var'] >= 6:
 					'She looks pleasantly satisfied at you as she stores away <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk in <<lact_ev[''poli_temp_var'']>> bottles.'
-					'"A very generous donation, Ms. <<$pcs_lastname>."'
+					'"A very generous donation, Ms. <<$pcs_lastname>>."'
 				elseif lact_ev['poli_temp_var'] >= 4:
 					'She looks satisfied at you as she stores away <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk in <<lact_ev[''poli_temp_var'']>> bottles.'
 				elseif lact_ev['poli_temp_var'] >= 2:

locations/city_coffee_hole.qsrc

@@ -563,6 +563,6 @@ end
 
 !!if $ARGS[0] = 'albina'
 !!!!!!!!!!!!!!!!!!!!!!!!
-end
+!!end
 
 --- city_coffee_hole ---------------------------------

locations/city_residential.qsrc

@@ -11,7 +11,7 @@ menu_off = 0
 killvar '$locclass'
 
 if sound = 0:
-	if month >= 11 and month <= 12 or month > =1 and month <= 3:
+	if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
 		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else

locations/din_van.qsrc

@@ -938,7 +938,7 @@ $toymanage = {
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
+	elseif analplug = 1 and analplugin = 0:
 		act 'Insert your butt plug (0:05)':
 			menu_off = 1
 			cla
@@ -1741,7 +1741,7 @@ if $ARGS[0] = 'shave_options':
 	else
 		'Full Bush'
 	end
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD>'
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:

locations/etoexhib.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'pos1':
 						pcs_horny += 20
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar6.jpg"></center>'
 						'You start furiously rubbing your pussy to finally finish your shameless adventure. Gradually, you get excited to such an extent that you can not hold back anymore. You start to moan and push your labia with your fingers, showing your pussy to a stranger in all its glory.'
-						gs 'arousal', 'mastubate', 10, 'exhibitionism'
+						gs 'arousal', 'masturbate', 10, 'exhibitionism'
 						gs 'stat'
 
 						act 'Next':
@@ -88,7 +88,7 @@ if $ARGS[0] = 'pos1':
 							''
 							'Gradually you come to your senses, get dressed,and get out of the booth.'
 							$orgasm_or = 'yes'
-							gs 'arousal', 'mastubate', 10, 'exhibitionism'
+							gs 'arousal', 'masturbate', 10, 'exhibitionism'
 							gs 'arousal', 'end'
 							gs 'stat'
 

locations/eugeneev1.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'firsttime':
 						'She grins, and you can tell that she''s really aroused now. She pulls out of you and flips you over onto all fours on top of the box. As you get in place, she walks over to the desk and pulls out a bottle of lube. She walks back over, applies some to your asshole, and uses her fingers to work it inside you. She then applies some to her wet cock before tossing the bottle aside.'
 						*nl
 						'The head of her dick presses against your asshole before it suddenly pops in, and you gasp as you feel her cock stretching your backdoor wide. Then, she starts fucking your ass, not going too fast or too deep, giving you plenty of time to adjust.'
-						gs 'arousal', 'anal_sex', 5, 'lube'
+						gs 'arousal', 'anal', 5, 'lube'
 						gs 'stat'
 						act 'Get butt fucked':
 							*clr & cla
@@ -383,7 +383,7 @@ if $ARGS[0] = 'sex_work':
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work7.jpg"></center>'
 			'She pulls out of your mouth, letting you respond to her. "I want you... to fuck my ass..." you gasp through your breaths.'
 			'She grins down at you and gives you a wink. "If that''s what you want." She leaves you on all fours, on the box, as she walks over and grabs a bottle from the desk. She comes back and turns you around to squirt some lube onto your asshole, working it into your ass with her fingers. You glance over your shoulder and watch her squirt some lube onto her dick before tossing the bottle aside. She then lines her cock up and pushes it inside your asshole. "Fuck, your ass feels so tight!" You clench the box tightly and bite your lip as she slides balls deep into you and starts hammering away at your ass. You moan in a mixture of pleasure and pain.'
-			gs 'arousal', 'anal_sex', 5, 'lube'
+			gs 'arousal', 'anal', 5, 'lube'
 			gs 'stat'
 			act 'Get butt fucked':
 				*clr & cla

locations/foto.qsrc

@@ -660,7 +660,7 @@ if $ARGS[0] = 'interview2':
 						'"Are your breasts smaller than they were before?"'
 						'"Oh," you say, blinking. "Yeah, they''re a little smaller now. Kind of happened when I lost weight. That''s not a problem is it?"'
 					end
-					'"No, not at all," he says, shaking his head. "We don''t tend to discriminate on breast size here. We have plenty of big tit and small tit girls, I was just wondering if it was my imagination or not.'
+					'"No, not at all," he says, shaking his head. "We don''t tend to discriminate on breast size here. We have plenty of big tit and small tit girls, I was just wondering if it was my imagination or not."'
 					'You nod in understanding.'
 				end
 				act'Continue':
@@ -765,7 +765,7 @@ if $ARGS[0] = 'job_offer':
 		elseif age_truth = 1:
 			'"Well done!" he says, with a smile. "You''ve slimmed down to meet our requirements and you have a beautiful body. Unfortunately... how old was it that you said you were again?"'
 			'"<<age>>," you reply slowly.'
-			'"Ahuh... Well, you see, legally we can only hire girls 18 years and older, so unfortunately, you aren''t going to be allowed to work here right now.'
+			'"Ahuh... Well, you see, legally we can only hire girls 18 years and older, so unfortunately, you aren''t going to be allowed to work here right now".'
 		end
 	elseif age >= 18 or fakepassport = 1 or age_lie = 1:
 		'When he''s finished, he stands in front of you and says, "You fit the criteria for the kind of images we want to produce. I just need to see your passport to confirm your age and put your info into our database," holding out his hand.'
@@ -837,7 +837,7 @@ if $ARGS[0] = 'job_offer':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					fakepassport = 2
 					fotofakepassport = 3
-					'"Oh please!" you shout abruptly. The truth is, I''m only <<age>>. But it just makes me so fucking horny to know that strange men I''ll never meet could be out there looking at pictures of my naked body!"'
+					'"Oh please!" you shout abruptly. "The truth is, I''m only <<age>>. But it just makes me so fucking horny to know that strange men I''ll never meet could be out there looking at pictures of my naked body!"'
 					'You stand there trembling with tight muscles before him. You can feel your juices starting to flow from between your legs with a heightened sense of arousal in anticipation.'
 					*nl
 					'"Hmmm..." He rubs his chin thoughtfully while continuing to look at your body, especially the fluids that have already begun to leak out of your pussy and slip down your thighs, before saying, "Alright, listen, I''m not supposed to do this but you really do have an exceptional body so I''m going to make an exception. There''s a man who runs a small printing shop in the Red Light District. If you can come up with 30.000 cash, he can sell you a fake passport that says you''re 18. If you can do that, I can at least have some deniability and you can work here. Sound good?"'

locations/foto_events.qsrc

@@ -1065,7 +1065,7 @@ if $ARGS[0] = 'fine_art':
 		*nl
 		specialjob2 = 0
 		'"I''d like to do this one."'
-		'"Great! Go to set 32, the client is waiting for you there. Just tell him you''re the model he''ll be working with today and follow his instructions.'
+		'"Great! Go to set 32, the client is waiting for you there. Just tell him you''re the model he''ll be working with today and follow his instructions."'
 		act'Go to set 32':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'

locations/foto_shoot.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'model':
 		'<center><b><font color="maroon">Manager</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
-		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
+		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work."'
 		act'Leave':gt 'foto','studio'
 	end
 	

locations/gschool.qsrc

@@ -64,11 +64,14 @@ end
 if $ARGS[0] = 'weekly grade update':
 	if kanikuli = 0 and week = 1 and SchoolAtestat = 0:
 		if lernHome > 0 and petka['homework'] = 1: gs 'grades', 'homework', 'school', 'yes', lernHome, 2, 'A6'
-		pcs_traits['nerd_lernHome'] = 0
 		pcs_traits['nerd_points'] -= lernHome		
 		if lernHome = 0:
 			pcs_traits['nerd_points'] += pcs_traits['nerd_lernHome'] 
-			if pcs_traits['nerd_lernHome'] < 5: pcs_traits['nerd_lernHome'] += 1
+			if pcs_traits['nerd_lernHome'] < 5:
+				pcs_traits['nerd_lernHome'] += 1
+			else
+				pcs_traits['nerd_lernHome'] = 0
+			end
 		end
 		lernHome = 0
 		if class['first_grade_check'] > 0:

locations/gschool_chats.qsrc

@@ -192,7 +192,6 @@ if $ARGS[0] = 'gopniks':
 					else
 						'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 					end
-					'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				end
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'

locations/gschool_coolkid_chats.qsrc

@@ -36,6 +36,7 @@ if $ARGS[0] = 'dimka':
 			act 'Go with Dimka': gt 'gschool_coolkid_chats', 'dimka_sex'
 		end
 	else
+		func('npc_reactions', 'general', 'A1')
 		if DimaRudeQW > 0 and DimaRudeBlock = 0:
 			'Dimka looks into your eyes with a disinterested glare. "Whatever. After school, we''re going to my place. I''ll wait for you by the entrance."'
 		else
@@ -223,6 +224,7 @@ if $ARGS[0] = 'igor':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if IgorLoverQW > 0:
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kind of missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours.'
+		func('npc_reactions', 'general', 'A4')
 		act 'Help with homework':
 			*clr & cla
 			igor_history = 1
@@ -288,6 +290,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif grupTipe = 1:
+		func('npc_reactions', 'general', 'A4')
 		if npc_rel['A4'] >= 50:
 			if npc_rel['A4'] >= 60 and hotcat >= 5 and IgorQW['house_open'] = 0:
 				IgorQW['house_open'] = 1
@@ -327,6 +330,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif grupTipe = 2:
+		func('npc_reactions', 'general', 'A4')
 		if npc_rel['A4'] >= 50:
 			if npc_rel['A4'] >= 60 and hotcat >= 5 and IgorQW['house_open'] = 0:
 				IgorQW['house_open'] = 1
@@ -366,6 +370,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif grupTipe = 3:
+		func('npc_reactions', 'general', 'A4')
 		if npc_rel['A4'] >= 50:
 			if npc_rel['A4'] >= 60 and hotcat >= 5 and IgorQW['house_open'] = 0:
 				IgorQW['house_open'] = 1
@@ -405,6 +410,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif grupTipe = 4:
+		func('npc_reactions', 'general', 'A4')
 		if npc_rel['A4'] >= 70:
 			if npc_rel['A4'] >= 75 and hotcat >= 5 and IgorQW['house_open'] = 0:
 				IgorQW['house_open'] = 1
@@ -438,6 +444,7 @@ if $ARGS[0] = 'igor':
 		if npc_rel['A4'] >= 80:
 			'"Hey Igor, what are you doing?" you ask as you see him looking around for someone.'
 			'He shrugs dismissively. "Just waiting for Dimka."'
+			func('npc_reactions', 'general', 'A4')
 			'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 asks with a small smile as he waves goodbye.'
 			act 'Help with homework':
 				*clr & cla
@@ -580,6 +587,7 @@ if $ARGS[0] = 'katja':
 				'Katja''s face is flushed bright red and her chest is heaving from her heavy breathing. She''s idly rubbing her thighs against one another while you talk.'
 			end
 		end
+		func('npc_reactions', 'general', 'A14')
 		if katjaQW['drunk_help'] = 1:
 			act 'Thank her for taking you home':
 				*clr & cla
@@ -897,6 +905,7 @@ if $ARGS[0] = 'bella':
 			'"Ugh," you sigh. "That''s a long story for another time."'
 			'"Okay, no hurry." she assures you.'  
 		end
+		func('npc_reactions', 'general', 'A22')
 	elseif grupTipe = 3:
 		if npc_rel['A22'] >= 70:
 			'You see Bella waving at you to get your attention. "Hey <<$pcs_nickname>>, can I take a quick look at your notes for the next class, thanks." She takes your notebook before you can even answer.'
@@ -918,6 +927,7 @@ if $ARGS[0] = 'bella':
 			'You try to talk to her a bit more, but she mostly ignores you. When the bell rings and you both go your own ways, she taps your shoulder. "The Phantom Menace is the best."'
 			'"Wait, how do you...?" You only get a sly wink as an answer.'
 		end
+		func('npc_reactions', 'general', 'A22')
 	elseif grupTipe = 4:
 		if npc_rel['A22'] >= 70:
 			'You brashly squeeze yourself between Bella and her friends, who all lighten up when you start sharing stories of the petty crimes and practical jokes the gopniks have been performing.'
@@ -934,8 +944,10 @@ if $ARGS[0] = 'bella':
 			'"Bitch, do I look like a drug dealer to you?" you answer sternly and suggest she try her luck with Vitek.' 
 			'"Fine, I will!" The two of you talk a bit more, but it isn''t a comfortable conversation.'
 		end
+		func('npc_reactions', 'general', 'A22')
 	else
 		if npc_rel['A22'] >= 70:
+			func('npc_reactions', 'general', 'A22')
 			'"You know, you should come and hang out with me and my friends," Bella says with a smile.'
 			'"You really mean that?!" you ask as your eyes widen. "You think I''ll fit in with them?"'
 			'Bella nods. "No doubt! You''ll have no issues fitting in."' 
@@ -1126,6 +1138,7 @@ if $ARGS[0] = 'lizaveta':
 			'"The current rumor is that you''ve sucked well over 100 dicks!" Lizaveta exclaims with a cruel laugh. "There''s even a bet that you''ll have sucked or fucked 1,000 dicks by the end of the year. Want to know if I''m betting against or for you?" she taunts before dismissing it as a joke, but you''re not sure if she''s telling the truth...'
 		end
 	elseif grupTipe = 1:
+		func('npc_reactions', 'general', 'A140')
 		if npc_rel['A140'] >= 50:
 			'The perks of being a close friend of Liza go beyond just running in the same social circle. She tells you some gossip that no one else should know about.'
 			'"I heard from a little red bird that one time while Vicky was out partying at the community center, she couldn''t hold it in, so she went to do her business behind a bush, buuuut..." Liza drags it out to build a little suspense. "She was so drunk that she ended up falling into her own piss! Luckily Kat-- her friend, I mean, was there to take her home before anyone saw!"'
@@ -1139,6 +1152,7 @@ if $ARGS[0] = 'lizaveta':
 			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		end
 	elseif grupTipe = 2:
+		func('npc_reactions', 'general', 'A140')
 		if npc_rel['A140'] >= 50:
 			'You would think that being close friends with Lizaveta would mean getting some exclusive gossip from her, but she keeps her lips sealed. "I know everyone likes to say I can''t keep my mouth shut, but even I need to have some secrets of my own." she winks.'
 			'"Oh come on!" you plead. "You gotta give me a little bit of something..."'
@@ -1151,6 +1165,7 @@ if $ARGS[0] = 'lizaveta':
 			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		end
 	elseif grupTipe = 3:
+		func('npc_reactions', 'general', 'A140')
 		if npc_rel['A140'] >= 50:
 			'When you sit on the floor next to Lizaveta, she smiles at you and the two of you are soon talking about a variety of subjects. However, she can''t help herself and soon starts asking you all sorts of questions about your fellow nerds. You can barely even get a word in edge wise as she pumps you for gossip. You can''t help yourself and start letting some stuff slip as the two of you talk.'
 			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
@@ -1160,6 +1175,7 @@ if $ARGS[0] = 'lizaveta':
 			'When you sit on the floor next to Lizaveta, she starts asking you all sorts of questions about your fellow nerds. You can barely get a word in edge wise as she pumps you for gossip. You just can''t help yourself and start letting some stuff slip as the two of you talk.'
 		end
 	elseif grupTipe = 4:
+		func('npc_reactions', 'general', 'A140')
 		if npc_rel['A140'] >= 50:
 			'When you sit on the floor next to Lizaveta, she smiles at you and the two of you are soon talking about a variety of subjects. However, she can''t help herself and starts asking you all sorts of questions about your fellow gopniks. You can barely even get a word in edge wise as she pumps you for gossip. You can''t help yourself and start letting some stuff slip as the two of you talk.'
 			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
@@ -1271,6 +1287,7 @@ if $ARGS[0] = 'marcus':
 			'You walk up to Marcus and try to talk to him. He mostly ignores you, with only the occasional "uh-huh" for an answer. You notice the others giving you disgusted looks and he finally speaks up. "Look, I don''t mean to be rude, but we''re not friends and I don''t want to talk to you." You sigh and nod before walking away.'
 		end
 	elseif grupTipe = 1:
+		func('npc_reactions', 'general', 'A146')
 		if npc_rel['A146'] >= 50:
 			'Talking with Marcus is always fun. He always knows how to make you laugh with the stories he tells. "You should have seen his face!" He lets out a deep laugh. "We walk by the bathroom on the way to his room and BAM! There''s his mom, butt naked, and we see it all! You ever seen someone change colors? Poor guy was as pink as... as his mom''s nipples now that I think about it!"'
 			'You spend the rest of break laughing along with him as he tells you some more stories.'
@@ -1287,6 +1304,7 @@ if $ARGS[0] = 'marcus':
 		else
 			'You walk up to Marcus and he gives you a smile as you start talking to him. The conversation quickly turns to sports, mostly sports in America. It seems he was a jock back home and loves watching and playing sports. He seems to really miss American football, his favorite sport to play, but is happy there is basketball here, his second favorite sport. He talks about the games he played back home.'
 		end
+		func('npc_reactions', 'general', 'A146')
 	elseif grupTipe = 3:
 		if npc_rel['A146'] >= 50:
 			'You walk up to Marcus and he gives you a smile as you start talking to him. You enjoy hearing the stories Marcus tells about his life in America, though he often talks about the differences between nerds here and there. He explains how nerds back home are less about grades and more about what school club you belonged to.'
@@ -1297,6 +1315,7 @@ if $ARGS[0] = 'marcus':
 			'You walk up to Marcus and he gives you a smile as you start talking to him. You enjoy hearing the stories Marcus tells about his life in America. "It''s kind of funny, I don''t think I was nearly as popular as this back home. I''m not complaining though!"'
 			'You spend the rest of break asking more questions about his home life and he''s happy to tell you all about it.'
 		end
+		func('npc_reactions', 'general', 'A146')
 	elseif grupTipe = 4:
 		if npc_rel['A146'] >= 50:
 			'You walk up to Marcus and he gives you a smile as you start talking to him. You enjoy hearing the stories Marcus tells about his life in America. "You guys seem a lot more fun than I expected. I''m still trying to wrap my head around what a gopnik is. I know a lot of you are called that, but there are some big differences." You explain some of the differences between the collective term and what a real gopnik is, which just leads to him once again wondering why you all hang out together.'
@@ -1305,6 +1324,7 @@ if $ARGS[0] = 'marcus':
 		else
 			'You walk up to Marcus and he gives you a smile as you start talking to him. You enjoy hearing the stories Marcus tells about his life in America. "You guys aren''t nearly as bad as the bangers back home. I''ve never seen any of you carrying guns." He goes on to tell you about some of his encounters with gangbangers back home. It sounds like they were a lot more dangerous than gopniks.'
 		end
+		func('npc_reactions', 'general', 'A146')
 	else
 		if npc_rel['A146'] >= 50:
 			'You walk up to Marcus and try talking to him, but he mostly ignores you with only the occasional "uh-huh" for an answer. You notice the others giving you disgusted looks before he gets up, gives you a very slight nod and walks away with Andrey.'
@@ -1344,6 +1364,7 @@ if $ARGS[0] = 'andrey':
 			'Andrey glances your way for a second before focusing back on looking through his locker, completely uninterested in you. "Shouldn''t you be in the bathroom with the gopniks sucking them all off?" he remarks before turning away and ignoring you until you leave.'
 		end
 	elseif grupTipe = 1:
+		func('npc_reactions', 'general', 'A147')
 		if npc_rel['A147'] >= 50:
 			'"Do you think Stasya will ever get over this whole... jealousy thing she has for Marcus?" Andrey confides in you with a look of exhaustion.'
 			'Stasya must really be putting him through it lately. "She''ll get over herself, don''t worry. Just be glad you''re not one of the nerds." you tease.'
@@ -1367,6 +1388,7 @@ if $ARGS[0] = 'andrey':
 			'"Oh yeah?" You can''t help but smile when you see the good mood he''s in. "Did something happen recently?"'
 			'"No, it''s just that hanging around him, he is way more into sports than I am. But he got me into working out and jogging and you know what? I feel great." He goes on talking about the positive changes in his life since Marcus moved in.'
 		end
+		func('npc_reactions', 'general', 'A147')
 	elseif grupTipe = 3:
 		if npc_rel['A147'] >= 50:
 			'"Hey, Andrey! How''s it been?" you ask with a small smile.'
@@ -1381,6 +1403,7 @@ if $ARGS[0] = 'andrey':
 			'"Hey, Andrey! How''s it been?" you ask with a small smile.'
 			'He gives you a slightly confused look as to why you''re talking to him. "If I wanted to talk to you, I would come find you. Go away." He proceeds to ignore you and you can feel everyone else staring at you. Afraid someone might start picking on you, you quickly leave.'
 		end
+		func('npc_reactions', 'general', 'A147')
 	elseif grupTipe = 4:
 		if npc_rel['A147'] >= 50:
 			'"Hey, Andrey! How''s it been?" you ask with a small smile.'
@@ -1395,6 +1418,7 @@ if $ARGS[0] = 'andrey':
 			'"Hey, Andrey! How''s it been?" you ask with a small smile.'
 			'He gives you a slightly confused look as to why you''re talking to him. "Why are you talking to me? We''re not friends, so go bother someone else." He proceeds to ignore you and you can feel everyone else staring at you.'
 		end
+		func('npc_reactions', 'general', 'A147')
 	else
 		gs 'npc_relationship', 'modify', 'A147', 'dislike'
 		'"Hey, Andrey! How''s it been?" you ask with a small smile.'
@@ -1413,7 +1437,7 @@ if $ARGS[0] = 'mefodiy':
 		if npc_rel['A148'] >= 50:
 			'"I hear you''ve been a naughty girl, slutting it up. Someone should give you a spanking, but you''d probably like it. Maybe I could help you there, if we stick to the spanking."'
 			'"Sure you don''t want more?" you tease.'
-			'"I''m sure there''s a lot of guy that''ll take you up on that offer, but it''s not my bag."'
+			'"I''m sure there''s a lot of guys that''ll take you up on that offer, but it''s not my bag."'
 			'You wrap an arm around him and stroke his chest. "Aww, you don''t know what you''re missing."'
 			'"Oh I do, but if by some bizarre act of God I change my preferences, you''ll be the first one I call.'
 		elseif npc_rel['A148'] <= 20:
@@ -1425,6 +1449,7 @@ if $ARGS[0] = 'mefodiy':
 			'"It''s not like I ran an article in the school newspaper! Some guys just don''t know when to keep quiet."'
 			'"Some? More like all of them." You both laugh as he gives you a big and over dramatic hug.'
 		end
+		func('npc_reactions', 'general', 'A148')
 	elseif grupTipe = 1:
 		if npc_rel['A148'] >= 50:
 			'Hey <<$pcs_nickname>>, how''s it going?'
@@ -1444,6 +1469,7 @@ if $ARGS[0] = 'mefodiy':
 			'"Same here." He puts an arm around you. "A hug''ll make it all better."'
 			'You don''t have much choice but to hug this soppy guy, but it does raise your mood.'
 		end
+		func('npc_reactions', 'general', 'A148')
 	elseif grupTipe = 2:
 		if npc_rel['A148'] >= 50:
 			'"If it isn''t my favourite jock, what''s up?"'
@@ -1462,6 +1488,7 @@ if $ARGS[0] = 'mefodiy':
 			'He grabs you in a big hug. "Well done champ!"'
 			'You push him off you. "Yeah yeah, very funny."'
 		end
+		func('npc_reactions', 'general', 'A148')
 	elseif grupTipe = 3:
 		if npc_rel['A148'] >= 50:
 			'"Hi there brainiac, how''s it going?"'
@@ -1476,6 +1503,7 @@ if $ARGS[0] = 'mefodiy':
 			'"Yeah, got to work hard, get a good job and all that."'
 			'"That''s a good plan, just don''t over do it."'
 		end
+		func('npc_reactions', 'general', 'A148')
 	elseif grupTipe = 4:
 		if npc_rel['A148'] >= 50:
 			'"Hey <<$pcs_nickname>>, still hanging around with those a-holes? You can do better than them."'
@@ -1489,6 +1517,7 @@ if $ARGS[0] = 'mefodiy':
 			'"I don''t want any trouble, so just spit it out."'
 			'"I just want to chat, I''m not here to cause trouble." you reply while holding your hands up.'
 		end
+		func('npc_reactions', 'general', 'A148')
 	else
 		if npc_rel['A148'] >= 50:
 			'"Hey sweetie, you know I could help you get into a decent social group. You just gotta put a bit of work into it."'
@@ -1500,6 +1529,7 @@ if $ARGS[0] = 'mefodiy':
 			'"Hey there <<$pcs_firstname>>, we gotta get you into a social group. It''ll make everything that bit easier for you."'
 			'"I''m working on it!" He has a point. Life can be tough as an outcast.'
 		end
+		func('npc_reactions', 'general', 'A148')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -1537,6 +1567,7 @@ if $ARGS[0] = 'vicky':
 			'Vicky is silent for a while before shrugging. "No?"'
 			'"Bald. You will definitely be bald after a week of dying your hair..." You and Vicky then spend the rest of break joking back and forth.'
 		end
+		func('npc_reactions', 'general', 'A15')
 	elseif grupTipe = 2:
 		if npc_rel['A15'] >= 50:
 			'"Hey <<$pcs_nickname>>, I''m working on a new flip for cheerleading and I could use a spotter."'
@@ -1547,6 +1578,7 @@ if $ARGS[0] = 'vicky':
 			'"Hey <<$pcs_nickname>>, I see you''re making a name for yourself. Keep up the good work!" she says as she gives you a high five. "Just remember what a famous person once said, ''Strong women don’t have ''attitudes'', we have standards.''"'
 			'Vicky spends some time talking to you until the end of the break.'
 		end
+		func('npc_reactions', 'general', 'A15')
 	elseif grupTipe = 3:
 		if npc_rel['A15'] >= 60:
 			'"Hey <<$pcs_nickname>>, can you help me with this Math assignment? It really has me stumped," she says, showing you a page of her homework. You glace over it and point out a few simple mistakes she had made that were messing up her equations. She thanks you for the help and then spends the rest of the time during break talking to you about other things.'
@@ -1557,6 +1589,7 @@ if $ARGS[0] = 'vicky':
 		else
 			'It can be hard to follow Vicky as she keeps up a lively conversation, jumping from one topic to another; but you don''t really mind and find her upbeat attitude intoxicating.'
 		end
+		func('npc_reactions', 'general', 'A15')
 	elseif grupTipe = 4:
 		if npc_rel['A15'] >= 60:
 			'"Hey <<$pcs_nickname>>, can I ask you a favor? Could you keep an eye on my sister for me? I heard some guys are taking their interest in her too far. I''d like her to open up a bit, but not in the way they have in mind, if you know what I mean."'
@@ -1566,6 +1599,7 @@ if $ARGS[0] = 'vicky':
 		else
 			'It can be hard to follow Vicky as she keeps up a lively conversation, jumping from one topic to another; but you don''t really mind and find her upbeat attitude intoxicating.'
 		end
+		func('npc_reactions', 'general', 'A15')
 	else
 		if npc_rel['A15'] >= 70:
 			'"I''ve been thinking of going all in and dying my hair to match the color of the outfits I wear. What do you think?" Vicky asks as she runs her fingers through her red hair.'
@@ -1577,6 +1611,7 @@ if $ARGS[0] = 'vicky':
 		else
 			'It can be hard to follow Vicky as she keeps up a lively conversation, jumping from one topic to another; but you don''t really mind and find her upbeat attitude intoxicating.'
 		end
+		func('npc_reactions', 'general', 'A15')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
@@ -1658,6 +1693,7 @@ if $ARGS[0] = 'stasya':
 		else
 			'You spend some time conversing with Stasya until she holds out her hand to stop you from talking. "I don''t mean to cut you off, but I need to get see Andrey before break ends." She gives you a half-assed apologetic smile before walking off in search of her elusive boyfriend.'
 		end
+		func('npc_reactions', 'general', 'A139')
 	elseif grupTipe = 2:
 		if npc_rel['A139'] >= 50:
 			'As you walk up, Stasya gives her reflection in the little mirror hanging inside her locker one last look and asks Bella what she thinks of her lipstick.'
@@ -1676,6 +1712,7 @@ if $ARGS[0] = 'stasya':
 		else
 			'She stares at you approaching. "What do you want? Never mind I don''t want to know." She turns and ignores you, talking with Bella and Irina instead, who also ignore you. At least they don''t chase you off.'
 		end
+		func('npc_reactions', 'general', 'A139')
 	elseif grupTipe = 4:
 		if npc_rel['A139'] >= 50:
 			'She looks you over from head to toe before she scoffs. "What?"'
@@ -1844,6 +1881,7 @@ if $ARGS[0] = 'irina':
 			'"You don’t have any friends, do you?" Irina asks with a stern, unimpressed look. "And you won''t ever find any either." She then turns around and ignores you.'
 		end
 	end
+	func('npc_reactions', 'general', 'A17')
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
@@ -2010,6 +2048,7 @@ if $ARGS[0] = 'sonia':
 			'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.'
 		end
 	end
+	func('npc_reactions', 'general', 'A25')
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		act 'Ask for a tampon':

locations/gschool_detention.qsrc

@@ -922,7 +922,7 @@ if $ARGS[0] = 'nothing':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Bored out of your mind and feeling a little sexually frustrated, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate.You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to make sure no one is near and heard you. Once it is clear, you decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -952,7 +952,7 @@ if $ARGS[0] = 'eatout':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy and sit down with your back to a shelf. Your legs spread wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -964,7 +964,7 @@ if $ARGS[0] = 'eatout':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple are gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -994,7 +994,7 @@ if $ARGS[0] = 'finger':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore. You remove enough of your clothes to expose your pussy and sit down with your back to a shelf. Your legs spread wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'finger':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'doggy':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -1048,7 +1048,7 @@ if $ARGS[0] = 'doggy':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'couple':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -1090,7 +1090,7 @@ if $ARGS[0] = 'couple':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -1120,7 +1120,7 @@ if $ARGS[0] = 'lesbian':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'lesbian':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'anal':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 			'After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.'
 			$orgasm_or = 'yes'
-			gs 'arousal', 'mast', 15
+			gs 'arousal', 'masturbate', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -1174,7 +1174,7 @@ if $ARGS[0] = 'anal':
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/mast.mp4"></video></center>'
 		'Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'mast', 15
+		gs 'arousal', 'masturbate', 15
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home': gt 'gschool_detention', 'end'

locations/gschool_girls_bathroom.qsrc

@@ -551,7 +551,7 @@ if $ARGS[0] = 'company1':
 		end
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
-		gs 'arousal', 'mast', 10
+		gs 'arousal', 'masturbate', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.'
@@ -726,7 +726,7 @@ if $ARGS[0] = 'company4':
 			'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck Mr. Kuznetsov is giving Miss Orlov. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
 		end
 		$orgasm_or = 'custom'
-		gs 'arousal', 'mast', 10
+		gs 'arousal', 'masturbate', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.'

locations/gschool_gopnik_chats.qsrc

@@ -41,6 +41,7 @@ if $ARGS[0] = 'vitek':
 			'"Hey Vitek, what did the virgin say after her first blowjob?"'
 			'"I don''t know, what did she say?" Vitek shrugs while you use the opportunity to take a mouthful of water.'
 			'"I love you..." you reply, pretending that the water dripping out of your mouth is cum while you talk. This gets laughs from a few others, and you manage to get him to talk about a variety of things the group is up to. He only insults you every so often, but in an almost friendly way.'
+			func('npc_reactions', 'general', 'A9')
 		elseif npc_rel['A9'] <= 20:
 			'You sit on the stairs near Vitek. He glances at you and gives you a look of disgust. "Get the fuck away from me, slut!"'
 			'"Maybe she''s looking for a fuck?" Dan chimes in as he gives you a dark look.'
@@ -49,12 +50,14 @@ if $ARGS[0] = 'vitek':
 			'You sit on the stairs near Vitek and he turns to you. "What''s up, slut?" You grimace slightly, but what can you say> You''re pretty much the gopnik''s party slut by your own choice.'
 			'"I just wanted to say hi and talk is all," you reply.'
 			'He laughs. "Who knew your mouth was good for anything other than sucking cock?" You put up with the comments and end up talking to him, managing to get him to talk a little but not much.'
+			func('npc_reactions', 'general', 'A9')
 		end
 	elseif grupTipe = 1:
 		if npc_rel['A9'] >= 70:
 			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. As you listen, Vitek starts talking about a dream he had about Bella, a sex dream of course. "Of course, just as I was getting to the best part, Lena wakes me up by slapping my dick. The fucking bitch laughed about it! Now that''s a fucked up way to be woken up." The guys chuckle at his story.'
 			'"You think I''d have a shot with Bella? I saw her tight ass in gym class and damn, would I love to plow that. Would a BMW impress her?" He''s brainstorming on how to get into the panties of the most beautiful girl in school.'
 			'"Never say never," you say while patting him in the back. You talk to him for a while, mostly about the girls he would like to bang.'
+			func('npc_reactions', 'general', 'A9')
 		elseif npc_rel['A9'] <= 20:
 			'As you approach Vitek, he looks at you and glares. "Fuck off, princess."'
 			'You try to talk to him, but he pretty much ignores you.'
@@ -69,6 +72,7 @@ if $ARGS[0] = 'vitek':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'He shrugs. "Whatever." He then goes back to talking, but now including you in the conversation.'
 			'Just as the bell rings, Vitek smiles at you. "You know what? You''re a pretty cool chick, <<$pcs_nickname>>."'
+			func('npc_reactions', 'general', 'A9')
 		elseif npc_rel['A9'] <= 20:
 			'As you approach Vitek, he looks at you and glares. "Fuck off, dyke."'
 			'You try to talk to him, but he pretty much ignores you.'   
@@ -77,6 +81,7 @@ if $ARGS[0] = 'vitek':
 			'"Whoah, what did she do?" you inquire'
 			'"I was putting the moves on Lina and she was about to drop to her knees and give me a blowjob right there and then before Christina stormed over and dragged her away, the fucking bitch!"'
 			'You just shake your head and listen to the guys talk about the girls they have banged or want to bang.'
+			func('npc_reactions', 'general', 'A9')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A9'] >= 70:
@@ -84,6 +89,7 @@ if $ARGS[0] = 'vitek':
 			'"Yeah, why? Want her to help you with your studies or something?" you reply.'
 			'"No no, nothing like that. We thought, being her friend, you could take a picture of Zinaida''s tits for us, you know?" He mimicks large breasts with his hands. "It''s Dan''s birthday." he coughs' 
 			'You just roll your eyes and ignore their request. You still don''t know how that rumor got started and instead talk with the boys for a while.'                          
+			func('npc_reactions', 'general', 'A9')
 		elseif npc_rel['A9'] <= 20:
 			'Before you can even say hello, Vitek forcefully shoves you into the wall as he walks past. You get the message and walk away.'           
 		else
@@ -94,6 +100,7 @@ if $ARGS[0] = 'vitek':
 	elseif grupTipe = 4:
 		if npc_rel['A9'] >= 50:
 			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. After a few questions, he starts telling you about some of his more exciting adventures and you''re soon both laughing about them and telling them stories of your own.'
+			func('npc_reactions', 'general', 'A9')
 		elseif npc_rel['A9'] <= 20:
 			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. "What do you want, you stupid fucking cow?" Vitek snarls when they notice you.'
 			'"I just wanted to say hi and talk is all," you reply.'
@@ -113,6 +120,7 @@ if $ARGS[0] = 'vitek':
 			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. "What do you want, you stupid cow?" Vitek asks when they notice you.'
 			'"I just wanted to say hi and talk is all," you reply.'
 			'He shrugs. "Whatever." He then goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He only answers a few, but doesn''t completely ignore you.'
+			func('npc_reactions', 'general', 'A9')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -128,6 +136,7 @@ if $ARGS[0] = 'radomir':
 	if grupTipe = 4 and gopnik_slut = 1:
 		'"Well well well, if it isn''t my favorite groupie slut." Radomir says as you approach.'
 		'You smile and put up with the comments, knowing this is now your place among the gopniks. He tells you that you should stop by practice some time, saying the boys could use some "stress release", which leads to him talking about the band and where they will be playing.'
+		func('npc_reactions', 'general', 'A154')
 	elseif fame['pav_slut'] > 250:
 		gs 'npc_relationship', 'modify', 'A154', 'dislike'
 		'As you start to say something to him, he interrupts you. "Get lost, slut! I can''t be seen with the likes of you! I have a reputation to uphold!"'
@@ -141,9 +150,11 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He smirks a little when he sees you. "So what can I do for one of my fans?" You ask him how things are going for the band and he starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		elseif npc_rel['A154'] <= 20:
 			'Radomir is talking about the band''s latest gig as you approach. You''re not sure if he''s even seen you as he completely ignores you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He ignores your comments, like you''re not even there.'
+			func('npc_reactions', 'general', 'A154')
 		else
 			if hotcat >= 6:
 				'Radomir is talking about the band''s latest gig as you approach. Seeing you, he looks your body up and down. "Looking good girl, looking good." You ask him how things are going for the band and he starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
@@ -153,6 +164,7 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He smirks when he sees you. "Come to try and butter me up before I get famous?" You ignore his comment and ask him about how things are going for the band. He starts telling you about all the girls throwing their panties on stage and asking a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		end
 	elseif grupTipe = 2:
@@ -165,9 +177,11 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He gives you a slight knowing smirk when he sees you. "So what can I do for one of my fans?" You ask him how things are going for the band and he starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		elseif npc_rel['A154'] <= 20:
 			'Radomir is talking about the band''s latest gig as you approach. You''re not sure if he''s even seen you as he completely ignores you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He ignores your comments, like you''re not even there.'
+			func('npc_reactions', 'general', 'A154')
 		else
 			if hotcat >= 6:
 				'Radomir is talking about the band''s latest gig as you approach. He sees you and looks your body up and down. "Nice to see all the working out is paying off. Looking good." You ignore his stares as you ask him how things are going for the band and he starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
@@ -177,6 +191,7 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He smirks when he sees you. "Come to try and butter me up before I get famous?" You ignore his comment and ask him how things are going for the band. He starts telling you about all the girls throwing their panties on stage and asking a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		end
 	elseif grupTipe = 3:
@@ -189,9 +204,11 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He gives you a wink when he sees you. "So what can I do for one of my fans?" You ask him how things are going for the band and he starts telling you about all the girls throwing their panties on stage and asking a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		elseif npc_rel['A154'] <= 20:
 			'Radomir is talking about the band''s latest gig as you approach. You''re not sure if he''s even seen you as he completely ignores you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He ignores your comments, like you''re not even there.'
+			func('npc_reactions', 'general', 'A154')
 		else
 			if hotcat >= 6:
 				'Radomir is talking about the band''s latest gig as you approach. He sees you and starts looking your body up and down. "You know if you just dressed a little more sexy and showed off that hot little bod of yours more, you would be pretty good looking for a nerd." You feel like a side of meat on display under his gaze, but do your best to ignore it and ask him how things are going for the band. He starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
@@ -201,6 +218,7 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He smirks when he sees you. "Come to try and butter me up before I get famous?" You ignore his comment and ask him how things are going for the band. He starts telling you about all the girls throwing their panties on stage and asking a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		end
 	elseif grupTipe = 4:
@@ -213,6 +231,7 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you approach. He gives you a wink when he sees you and starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		elseif npc_rel['A154'] <= 20:
 			'Radomir is talking about the band''s latest gig as you approach, but he barely acknowledges you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He mostly ignores you, but does reply to a few of your comments.'
@@ -225,6 +244,7 @@ if $ARGS[0] = 'radomir':
 				end
 			else
 				'Radomir is talking about the band''s latest gig as you walk up. He smirks when he sees you. "Come to try and butter me up before I get famous?" You ignore his comment and ask him how things are going for the band. He starts telling you about all the girls throwing their panties on stage and asking a few questions leads to the two of you talking about where the band''s going and the success it will have.'
+				func('npc_reactions', 'general', 'A154')
 			end
 		end
 	else
@@ -243,6 +263,7 @@ if $ARGS[0] = 'roman':
 		'"Well well well, if it isn''t our little fuck bunny. You looking for a cock to hop on?" Roman asks with a smirk as you approach.'
 		'"I just wanted to say hi and talk is all," you reply.'
 		'"Tell me how much you love cock then." You banter with him for a while, where he rips on you a lot, but at least he talks to you.'
+		func('npc_reactions', 'general', 'A159')
 	elseif fame['pav_slut'] > 250:
 		gs 'npc_relationship', 'modify', 'A157', 'dislike'
 		'As you approach Roman, he snarls at you. "If you so much as open your cum breath mouth at me, I''ll toss you down these stairs." Not wishing to push your luck, you walk away.'
@@ -261,6 +282,7 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Yeah, what about?" You banter with him for a while about a variety of things. He''s rude and often insulting, but at least he doesn''t threaten you.'
 		end
+		func('npc_reactions', 'general', 'A159')
 	elseif grupTipe = 3:
 		gs 'npc_relationship', 'modify', 'A157', rand(0,1)
 		if npc_rel['A157'] >= 80:
@@ -276,6 +298,7 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Whatever." You banter with him for a while about a variety of things. He spends most of his time making fun of you and you get the feeling that, regardless of what he thinks of you, he''s going to pick on any nerd.'
 		end
+		func('npc_reactions', 'general', 'A159')
 	elseif grupTipe = 4:
 		gs 'npc_relationship', 'modify', 'A157', 'like'
 		if npc_rel['A157'] >= 50:
@@ -290,11 +313,13 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Yeah, what about?" You banter with him for a while about a variety of things. He''s rude and often insulting, but at least he doesn''t threaten you.'
 		end
+		func('npc_reactions', 'general', 'A159')
 	else
 		gs 'npc_relationship', 'modify', 'A157', 'dislike'
 		'You take a seat near Roman. "What''s up, Roman?"'
 		'"Get lost, cunt!" he snarls in response.'
 		'"Calm down, I just want to talk." He mostly insults you as you try and talk to him, but at least he doesn''t run you off.'
+		func('npc_reactions', 'general', 'A159')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -308,6 +333,7 @@ if $ARGS[0] = 'dan':
 		'"You lost or just looking for a cock to suck?" Dan asks as you approach.'
 		'"I just wanted to say hi and talk is all," you reply.'
 		'"I bet that''s rare. Not having your mouth full long enough to talk." You banter with him for a while. He rips on you a lot, but at least he talks to you.'
+		func('npc_reactions', 'general', 'A10')
 	elseif npc_rel['A10'] >= 50 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'"Hey Dan!" you greet him.'
@@ -317,6 +343,7 @@ if $ARGS[0] = 'dan':
 			'"Oh, come on Dan! Don''t act that way. I know you like it when I talk to you."'
 			'"Is that so?" he asks. You laugh and the two of you strike up a friendly conversation.'
 		end
+		func('npc_reactions', 'general', 'A10')
 	elseif npc_rel['A10'] <= 20 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'"Hey Dan!" you greet him.'
@@ -329,6 +356,7 @@ if $ARGS[0] = 'dan':
 			'"I just wanted to talk is all," you reply.'
 			'"Yeah? Well, I don''t want to talk to you." You persist and he relents. He briefly chats to you before making it clear that he''s done talking, so you leave him in peace.'
 		end
+		func('npc_reactions', 'general', 'A10')
 	elseif fame['pav_slut'] >= 300:
 		'You try and talk to him, but he completely ignores you, like you aren''t even there. Eventually, you give up and walk away.'
 	else
@@ -336,6 +364,7 @@ if $ARGS[0] = 'dan':
 		'He glances at you. "What do you want?"'
 		'"I just wanted to talk is all," you reply.'
 		'"I''m not in the mood." You persist and he relents. He briefly chats to you before making it clear that he''s done talking, so you leave him in peace.'
+		func('npc_reactions', 'general', 'A10')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -352,11 +381,13 @@ if $ARGS[0] = 'valentin':
 		'He smiles as you approach. "What''s up, <<$pcs_nickname>>?"'
 		'You smile back. "Nothing much, just wanted to hang out and talk."'
 		'The two of you talk about a few things. He gets a little hands on with you at times, but you''re used to it. As you''re about to leave, he stops you. "Stop by the garage some time. I can always use a break and a quick fuck."'
+		func('npc_reactions', 'general', 'A158')
 	elseif fame['pav_slut'] > 300:
 		if npc_rel['A158'] >= 60:
 			'He smiles as you approach. "What''s up, <<$pcs_nickname>>?"'
 			'You smile back. "Nothing much, just wanted to hang out and talk."'
 			'The two of you talk about a few things. He gets a little hands on with you at times, but you''re used to it. As you''re about to leave, he stops you. "Stop by the garage some time, I can always use a break and a quick fuck."'
+			func('npc_reactions', 'general', 'A158')
 		elseif npc_rel['A158'] <= 20:
 			'"Hey, Valentin!" you greet him as you approach.'
 			'He frowns at you. "Fuck off, slut!"'
@@ -391,6 +422,7 @@ if $ARGS[0] = 'valentin':
 			'"I just wanted to talk is all," you reply.'
 			'He shrugs and you start talking to him. You wouldn''t say he''s eager to talk to you, but he doesn''t seem to mind either.'
 		end
+		func('npc_reactions', 'general', 'A158')
 	elseif grupTipe = 2:
 		if npc_rel['A158'] >= 50:
 			'Valentin calls out to you as you approach. "Hey <<$pcs_nickname>>."'
@@ -414,6 +446,7 @@ if $ARGS[0] = 'valentin':
 			'"I just wanted to talk is all," you reply.'
 			'He shrugs and you start talking to him. You wouldn''t say he''s eager to talk to you, but he doesn''t seem to mind either.'
 		end
+		func('npc_reactions', 'general', 'A158')
 	elseif grupTipe = 3:
 		if npc_rel['A158'] >= 60:
 			'Valentin calls out to you as you approach. "Hey <<$pcs_nickname>>, get lost? Or just wanting to take a peek at the wild side?"'
@@ -437,6 +470,7 @@ if $ARGS[0] = 'valentin':
 			'"No, I just wanted to talk is all," you reply.'
 			'He shrugs and you start talking to him. You wouldn''t say he''s eager to talk to you, but he doesn''t seem to mind either. After a few minutes, you break off the conversation and bid him farewell as the looks some of the other gopniks are giving you make you nervous.'
 		end
+		func('npc_reactions', 'general', 'A158')
 	elseif grupTipe = 4:
 		if npc_rel['A158'] >= 50:
 			'Valentin calls out to you as you approach. "Hey <<$pcs_nickname>>, do anything fun lately?"'
@@ -460,12 +494,14 @@ if $ARGS[0] = 'valentin':
 			'"So what have you been up to?" you ask.'
 			'"Working on my bike and practicing with the band," he half heartedly answers, but warms up the more you talk to him. You mostly ask him about his music and his bike, which seems to do the trick.'
 		end
+		func('npc_reactions', 'general', 'A158')
 	else
 		if npc_rel['A158'] >= 60:
 			'"Hey Valentin!" you greet him as you approach.'
 			'He frowns at you. "We have nothing to talk about, so go bother someone else!"'
 			'"I just wanted to talk is all," you reply.'
 			'"Yeah? Well, I don''t want to talk to you." You persist, but he just ignores you. The looks some of the other gopniks are giving you make you nervous, so you give up and walk away.'
+			func('npc_reactions', 'general', 'A158')
 		else
 			'"Hey Valentin!" you greet him as you approach.'
 			'He frowns at you. "Fuck off, loser!"'
@@ -485,6 +521,7 @@ if $ARGS[0] = 'shulga':
 	if grupTipe = 4 and gopnik_slut = 1:
 		'"I''m surprised you don''t walk bow legged the number of times you''ve been fucked, <<$pcs_nickname>>!" Vasily says with a laugh.'
 		'You flip him the bird as you sit next to him. The two of you talk about a variety of things, although he keeps asking about who you''ve fucked or whose dick you just finished sucking.'
+		func('npc_reactions', 'general', 'A11')
 	elseif npc_rel['A11'] >= 50 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'Vasily calls out to you as you approach. "Hey <<$pcs_nickname>>, what''s up?"'
@@ -495,6 +532,7 @@ if $ARGS[0] = 'shulga':
 			'You smile. "Not much. I thought I''d just come by and hang out with you for a bit."'
 			'The two of you engage in a friendly conversation, mostly about when you were both kids.'
 		end
+		func('npc_reactions', 'general', 'A11')
 	elseif npc_rel['A11'] <= 20 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'"Hey Vasily!" you greet him as you approach.'
@@ -507,12 +545,14 @@ if $ARGS[0] = 'shulga':
 			'"I just wanted to talk is all," you reply.'
 			'"Go bother someone else!" You persist and he relents. He briefly chats to you before making it clear that he''s done talking, so you leave him in peace.'
 		end
+		func('npc_reactions', 'general', 'A11')
 	elseif fame['pav_slut'] >= 300:
 		'"Get lost you fucking slut!" he says with a sneer, more than loud enough for everyone to hear, so you turn and walk away.'
 	else
 		'As you approach, he greets you with a slight nod. "Hey."'
 		'You smile. "I thought I''d just come by and hang out with you for a bit."'
 		'The two of you engage in a friendly conversation, mostly about when you were both kids.'
+		func('npc_reactions', 'general', 'A11')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -528,6 +568,7 @@ if $ARGS[0] = 'arkadi':
 		'As you approach, he cups his crotch and bounces it. "Yeah, you want this, don''t you? Well, I don''t have time to give it to you right now."'
 		'"I just wanted to talk is all," you reply.'
 		'He snorts, but doesn''t refute what you say as you talk to him.'
+		func('npc_reactions', 'general', 'A156')
 	elseif fame['pav_slut'] >= 300:
 		gs 'npc_relationship', 'modify', 'A156', 'dislike'
 		if npc_rel['A156'] >= 50:
@@ -542,6 +583,7 @@ if $ARGS[0] = 'arkadi':
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He scoots over and makes room for you on the step he''s sitting on. "That so princess? You want to hear what the world is like from a real man, huh?"'
 			'You roll your eyes and ignore his comment. You know he loves the city, so you ask him questions about it and soon you''re both chatting away.'
+			func('npc_reactions', 'general', 'A156')
 		elseif npc_rel['A156'] <= 20:
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He snorts and grabs his crotch. "Why don''t you do something useful with that mouth of yours and suck my dick instead, princess?"'
@@ -550,6 +592,7 @@ if $ARGS[0] = 'arkadi':
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit and talk."'
 			'He looks up and down from where he''s sitting on the stairs, making you feel like a piece of meat on display. "That so princess? You curious about the dark side, huh?"'
 			'You ignore his stares. You know he loves the city, so you ask him questions about it and soon you''re both chatting away.'
+			func('npc_reactions', 'general', 'A156')
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A156'] >= 60:
@@ -565,11 +608,13 @@ if $ARGS[0] = 'arkadi':
 			'He looks up and down from where he''s sitting on the stairs, making you feel like a piece of meat on display. "That so? So what do you want to talk about?"'
 			'You ignore his stares. You know he loves the city, so you ask him questions about it and soon you''re both chatting away.'
 		end
+		func('npc_reactions', 'general', 'A156')
 	elseif grupTipe = 3:
 		if npc_rel['A156'] >= 80:
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He snorts. "Why do you think I would hang out with a nerd like you?"'
 			'You ignore his comment and ask him about the city. He''s reluctant to talk at first, but eventually starts to respond and tells you about his time in the city.'
+			func('npc_reactions', 'general', 'A156')
 		elseif npc_rel['A156'] <= 20:
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He snorts and grabs his crotch. "Why don''t you suck my dick instead? Or would I have to dress up as an elf or some shit to get you all wet?" He laughs at you and several of the others join in. Everyone is soon making fun of you, so you turn around and flee.'
@@ -591,12 +636,14 @@ if $ARGS[0] = 'arkadi':
 			'He looks up at you from where he''s sitting on the stairs. "Oh yeah? What about?"'
 			'You know he loves the city, so you ask him questions about it and soon you''re both chatting away.'
 		end
+		func('npc_reactions', 'general', 'A156')
 	else
 		gs 'npc_relationship', 'modify', 'A156', 'dislike'
 		if npc_rel['A156'] >= 80:
 			'Youa approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He snorts. "Why do you think I would hang out with a loser like you?"'
 			'You ignore his comment and ask him about the city. He''s reluctant to talk at first, but eventually starts to respond and tells you about his time in the city.'
+			func('npc_reactions', 'general', 'A156')
 		else
 			'You approach Arkadi. "Hey, I thought I''d just come by and hang out with you for a bit."'
 			'He snorts. "Why do you think I would hang out with a loser like you?" Before you can respond, he turns to the others. "Maybe she''s lonely and misses us picking on her?" He turns towards you as you hear several of the others agreeing with him and you start to panic. "Is that it?"'
@@ -617,6 +664,7 @@ if $ARGS[0] = 'lavrenti':
 		'Lavrenti slightly smiles at you while barely looking up from his phone. "Not much. I was just texting some girl I met recently."'
 		'You''re not surprised by his answer. He was always a good looking guy and now he has that bad boy vibe going for him as well. "Oh, you like her?"'
 		'He laughs and nods. "Fuck yeah! I tore her tight little ass up so much I doubt it''s tight anymore!" You smile at him, used to how the gopnik boys talk. "Don''t worry, I''ll always loving fucking yours." He chuckles as he slaps you on the ass and you start talking about other girls, then his legendary parties.'
+		func('npc_reactions', 'general', 'A155')
 		'Just before the bell rings, Lavrenti smiles at you. "My parents will be out of town soon and I was thinking of throwing another party."'
 		!!act 'Ask to go to party':
 			!!lavrentiQW['lav_party_invite'] = 1
@@ -651,6 +699,7 @@ if $ARGS[0] = 'lavrenti':
 			'Lavrenti smiles at you while barely looking up from his phone. "Not much. I was just texting some girl I met recently."'
 			'You''re not surprised by his answer. He was always a good looking guy and now he has that bad boy vibe going for him as well. "Oh, you like her?"'
 			'He laughs and nods. "Fuck yeah! I tore her tight little ass up so much I doubt it''s tight anymore!" You smile at him and start talking about girls, then his legendary parties.'
+			func('npc_reactions', 'general', 'A155')
 			'Just before the bell rings, Lavrenti gets the attention of the other gopniks. "Hey guys, my parents will be out of town soon and I was thinking of throwing another party."'
 			!!act 'Ask to go to party':
 				!!lavrentiQW['lav_party_invite'] = 1
@@ -664,6 +713,7 @@ if $ARGS[0] = 'lavrenti':
 			'He frowns at you. "Fuck off! You''re not invited."'
 			'"Come on, don''t be like that. It''ll be fun!" you reply.'
 			'He snorts. "You''re about the last person I would invite." You keep talking to him, hoping to warm him up for an invite. You ask about his party, which slowly gets him talking a little.'
+			func('npc_reactions', 'general', 'A155')
 		else
 			'You approach Lavrenti as he leans against the wall near the stairs. "So, what''s up with you Lavrenti?"'
 			'Lavrenti gives you a slight shrug. "Not much. I was just thinking about what I want to do this weekend."'
@@ -671,6 +721,7 @@ if $ARGS[0] = 'lavrenti':
 			'He chuckles a little. "Yeah, I remember what you guys did on the weekends, so much lamer than what I do now."'
 			'"Oh? In what way?" you ask.'
 			'He snorts, then tells you about what some of the gopniks get up to, which seems to mostly involve partying, fighting, fucking, getting drunk or high and vandalizing stuff for fun.'
+			func('npc_reactions', 'general', 'A155')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A155'] >= 50:
@@ -678,6 +729,7 @@ if $ARGS[0] = 'lavrenti':
 			'Lavrenti smiles at you. "Not a lot. I was just texting some girl I met."'
 			'You''re not surprised by his answer. He was always a good looking guy and now he has that bad boy vibe going for him as well. "Oh. So what did you think of class today?" you ask, wanting to change the subject knowing how gopnik boys talk about girls.'
 			'He sighs and shakes his head. He half ass talks about class, but the conversation soon turns towards him talking about his legendary parties and he starts telling you about some of the funny things that happened at some of the other gopnik parties.'
+			func('npc_reactions', 'general', 'A155')
 			'Just before the bell rings, Lavrenti gets the attention of the other gopniks. "Hey guys, my parents will be out of town soon and I was thinking of throwing another party."'
 			!!act 'Ask to go to party':
 				!!'"Sounds like fun. Could I come?" you ask.'
@@ -692,6 +744,7 @@ if $ARGS[0] = 'lavrenti':
 			'He chuckles. "Let me guess. Studying, followed by playing some video games, maybe hanging out with the other nerds pretending to be elves or something."'
 			'"Is that all you think us nerds do?" you ask.'
 			'He snorts, then tells you about what some of the gopniks get up to, which seems to mostly involve partying, fighting, fucking, getting drunk or high and vandalizing stuff for fun.'
+			func('npc_reactions', 'general', 'A155')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A155'] >= 50:
@@ -699,6 +752,7 @@ if $ARGS[0] = 'lavrenti':
 			'Lavrenti grins at you and throws his arm around your shoulder in a friendly way. "Not much. I was just texting some girl I met recently."'
 			'You''re not surprised by his answer. He was always a good looking guy and now he has that bad boy vibe going for him as well. "So, you bang her yet?"'
 			'He laughs and nods. "Fuck yeah! I tore her tight little ass up so much I doubt it''s tight anymore." You smile at him, used to how the gopnik boys talk and start talking about girls, then his legendary parties.'
+			func('npc_reactions', 'general', 'A155')
 			'Just before the bell rings, Lavrenti smiles at you. "My parents will be out of town soon and I was thinking of throwing another party."'
 			!!act 'Ask to go to party':
 				!!lavrentiQW['lav_party_invite'] = 1
@@ -709,6 +763,7 @@ if $ARGS[0] = 'lavrenti':
 			'You approach Lavrenti and stand as he leans against the wall near the stairs. "So, what''s up with you Lavrenti?"'
 			'Lavrenti just looks at you. "Why the fuck do you care?"'
 			'"Come on, don''t be like that. I just want to try and be friends," you reply.'
+			func('npc_reactions', 'general', 'A155')
 			'He''s reluctant to talk to you and mostly talks to some of the other gopniks. Just before the bell rings, he mentions how he''s planning to throw another one of his parties soon.'
 			!!act 'Ask to go to party':
 				!!'You bite your lip and look at him with the cutest look you can muster. "Think I can get a invite?"'
@@ -721,6 +776,7 @@ if $ARGS[0] = 'lavrenti':
 			'Lavrenti smiles at you while barely looking up from his phone. "Not much. I was just texting some girl I met recently."'
 			'You''re not surprised by his answer. He was always a good looking guy and now he has that bad boy vibe going for him as well. "So, you bang her yet?"'
 			'He laughs and nods. "Fuck yeah! I tore her tight little ass up so much I doubt it''s tight anymore!" You smile at him, used to how the gopnik boys talk and start talking about girls, then his legendary parties parties.'
+			func('npc_reactions', 'general', 'A155')
 			'Just before the bell rings, Lavrenti smiles at you. "My parents will be out of town soon and I was thinking of throwing another party."'
 			!!act 'Ask to go to party':
 				!!lavrentiQW['lav_party_invite'] = 1
@@ -778,10 +834,12 @@ if $ARGS[0] = 'ekaterina':
 			'As you approach her, you see her nursing some bruised knuckles. "Get in a fight?"'
 			'She shakes her head. "Not really. Some of the girls and I got together last night for fight night."'
 			'She goes on to tell you about how some of the gopnik girls get together and fight each other to practice or just to kick the shit out of each other for fun. "You should come by sometime and go a few rounds."'
+			func('npc_reactions', 'general', 'A145')
 		else
 			'As you approach her, you see her nursing some bruised knuckles. "Get in a fight?"'
 			'She shakes her head. "Not really. Some of the girls and I got together last night for fight night."'
 			'She then goes on to tell you about how some of the gopnik girls get together and fight each other to practice or just to kick the shit out of each other for fun. She then stops and looks you over, as if judging you. "You should come by sometime and go a few rounds. See what you''re made of."'
+			func('npc_reactions', 'general', 'A145')
 		end
 	elseif npc_rel['A145'] <= 20 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
@@ -789,6 +847,7 @@ if $ARGS[0] = 'ekaterina':
 			'She glares at you. "What fucking business is it of yours?"'
 			'You raise your hands to show you didn''t mean anything by it. "I was just asking is all."'
 			'She starts to say something, but stops and gives you a look over before a dark smile creeps onto her face. "You should come by sometime and go a few rounds. See what you''re made of." By the way she''s looking at you, you think she just wants an excuse to beat your ass.'
+			func('npc_reactions', 'general', 'A145')
 		else
 			'As you approach her, you see her nursing some bruised knuckles. "Get in a fight?"'
 			'She snarls at you. "What fucking business is it of yours?"'
@@ -817,15 +876,18 @@ if $ARGS[0] = 'lera':
 		'You sigh. "No, have you licked any pussy?"'
 		'"No, but you just might if you don''t watch your mouth!" Lera replies as she spreads her legs.'
 		'You both engage in a bit of back and forth banter for the rest of the break.'
+		func('npc_reactions', 'general', 'A21')
 	elseif npc_rel['A21'] >= 50:
 		if grupTipe = 4:
 			'As usual, you find Lera and Lena smoking on the stairs. "What''s up <<$pcs_nickname>>?" Lera inquires.'
 			'You shrug your shoulders. "Nothing much. You?"'
 			'"Nah." Lera says as she shakes her head.'
 			'You both engage in a bit of banter back and forth about how the school day has been.'
+			func('npc_reactions', 'general', 'A21')
 		else
 			'Seeing Lera sitting on the steps without Lena, you decide to approach her. "Hey Lera! What are you up to?"'
 			'She looks back at you and shrugs her shoulders. "Hi <<$pcs_nickname>>, nothing much. Just waiting for Lena."'
+			func('npc_reactions', 'general', 'A21')
 			'The two of you continue talking for a while until Lena shows up and calls Lera over, ending your conversation.'
 		end
 	elseif npc_rel['A21'] <= 20 and fame['pav_slut'] < 300:
@@ -838,11 +900,13 @@ if $ARGS[0] = 'lera':
 			'She looks back at you and frowns. "None of your fucking business, bitch!"'
 			'You continue talking to her, but it''s mostly one sided as she alternates between ignoring you and making snide remarks.'
 		end
+		func('npc_reactions', 'general', 'A21')
 	elseif fame['pav_slut'] >= 300:
 		'"Don''t even come near me with that disgusting cum breath of yours!"'
 	else
 		'Seeing Lera sitting on the steps without Lena, you decide to approach her. "Hey Lera! What are you up to?"'
 		'She looks back at you and shrugs her shoulders. "Nothing much. Just waiting for Lena."'
+		func('npc_reactions', 'general', 'A21')
 		'The two of you continue talking for a while until Lena shows up and calls Lera over, ending your conversation.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -863,6 +927,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'"More for me," she shrugs and starts to tell you about what happened to her recently. She talks about her quarrels at school, the other gopniks and what trouble they''ve been getting into together lately. "Not to mention I''d rather be on the streets than at home..."'
 			'Apparently not wanting to get into any details, she looks at you and says, "Your turn, I bet you''ve got some juicy stories. I''d be surprised if you didn''t." She pumps an eyebrow at you, clearly hinting at your dubious reputation.'
+			func('npc_reactions', 'general', 'A143')
 			'Time passes quickly, and you soon realize your break is over when you hear the bell. "I hope we can continue this next time?" you ask as you start walking towards the classroom.'
 		elseif npc_rel['A143'] <= 20:
 			'"Hi Alyona, how are you today?" You approach her as she''s talking to the other gopniks.'
@@ -876,6 +941,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'Maybe that''s why, although you''re not friends, you understand each other well. She complains for the next few minutes before stopping. "But enough of that, let''s listen to some music instead." She hands you one of her earbuds.'
 			'She shows you a few new songs, tells you about her new favourite bands and that she hopes they''ll come and play in the area one day.'
+			func('npc_reactions', 'general', 'A143')
 			'Before the break is over, she takes back the earbud and stands up. "Okay, I''ve got some things to do. See you next time." With that, she leaves.'
 		end
 	elseif grupTipe = 1:
@@ -887,6 +953,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'"Hey, that''s not fair!" You tap her on the shoulder and then talk about some things that happened to you recently. You also complain, mostly about how much traveling you have to do to buy some nice clothes or for a little beautification. You also tell her about how random people always walk up you to ask for a date.'
 			'"Well, that''s not my problem. I guess it''s the downside of being so popular," she replies while laughing boisterously. You talk for a few more minutes before you hear the bell ring, signalling that your next class is about to start.'
+			func('npc_reactions', 'general', 'A143')
 		elseif npc_rel['A143'] <= 20:
 			'You see Alyona sitting on the stairs. She has her phone in her hand and earbuds in her ears. You decide to try and strike up a conversation.'
 			'As you approach her, she looks up and starts shaking her head with a questioning, confused look, indicating that she has no intention of talking to you.'
@@ -901,6 +968,7 @@ if $ARGS[0] = 'alyona':
 			'She''s clearly not happy at you bothering her, but she seems curious about why you''re asking her opinion in the first place. She tells Anushka that they''ll talk later, then sits down on the stairs and beckons for you to take a seat.'
 			*nl
 			'She looks at you. "Come on, I haven''t got all day for this..." she says urgently.'
+			func('npc_reactions', 'general', 'A143')
 			'For the next few minutes, you tell her what you wanted her opinion on. However, she gets tired of listening and stands up. "Okay <<$pcs_nickname>>, you could have asked someone else, actually. I''m going back to the others now..." With that, she leaves.'
 			'You still have a little time left, but not enough to do anything, so you decide to head for the classroom and wait for the lesson to start.'
 		end
@@ -912,6 +980,7 @@ if $ARGS[0] = 'alyona':
 			'For the next few minutes, you talk excitedly about what new training plans you''ve come up with. You also tell her some of your ideas to improve your endurance and stamina. "Maybe you could benefit from it too?" you tell her, half jokingly, half seriously.'
 			*nl
 			'"Oh <<$pcs_nickname>>, you know I''m not interested in sports at all. However, some jock guys have a good, sexy body, I gotta admit it. Or jock girls." she adds while biting her lip.'
+			func('npc_reactions', 'general', 'A143')
 			'For the rest of the break, you continue talking about sports and she shares some stories that happened to her recently. When you hear the bell, you say goodbye and head to your next class.'
 		elseif npc_rel['A143'] <= 20:
 			'You see Alyona leaning against the wall. Her eyes are scanning the corridor as if to see if anyone can see her.'
@@ -927,6 +996,7 @@ if $ARGS[0] = 'alyona':
 			'"Another day, another wasted one. We shouldn''t even be here, we should be enjoying life!" she begins, then goes on to tell you about her ideas for partying, pranks or a little mischief to keep herself entertained.'
 			*nl
 			'Despite the fact that you''re not good friends and there''s rivalry between gopniks and jocks, she''s happy to talk to you sometimes. Or rather she talks and lets you listen.'
+			func('npc_reactions', 'general', 'A143')
 			'After spending a few minutes daydreaming about wild parties, she puts the bottle back in her bag before putting her finger to her mouth. "Sshh... Not a word to anyone about the booze. The teachers would freak out and the others would come asking for it." She laughs, then starts walking towards the toilet, probably to smoke.'
 		end
 	elseif grupTipe = 3:
@@ -938,6 +1008,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'As she talks, you get the feeling that maybe the reason why she likes you more than the gopniks is because she sees in you what she might have been if she hadn''t been born into that family.'
 			'After a short time complaining, she sighs. "Never mind, check this song out instead." With that, she pulls out her phone and shows you a song that you listen to together.'
+			func('npc_reactions', 'general', 'A143')
 			'Before the break is over, you give her a little hug. "I have to check my homework before class. So if you don''t mind, we''ll continue this next time."'
 		elseif npc_rel['A143'] <= 20:
 			'Alyona is sitting on the stairs talking to the other gopniks. When she sees you approaching, she nods to the others to get their attention and to warn them not to miss the show.'
@@ -958,6 +1029,7 @@ if $ARGS[0] = 'alyona':
 			'"Do you have anything to make it go by a little faster?" you ask, hoping that she has some alcohol on her.'
 			'She looks at you and smiles, knowing exactly what you mean. "No, sorry. Today''s been a hard day for me too, so I''ve already drank my dose," she says as she lets out a sigh.'
 			*nl
+			func('npc_reactions', 'general', 'A143')
 			'You start talking about all sorts of things, but mostly music and parties, and soon get into a small argument about how far Radomir''s band would take them. As their number one fan, she really thinks they''ll have their big break one day. You also revive some old memories before you hear the bell.'
 			'You both sigh as you look at each other and almost simultaneously say "I was beginning to forget where we were." You laugh, then start walking towards your classroom.'
 		elseif npc_rel['A143'] <= 20:
@@ -974,6 +1046,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'"I''ve never heard these ones before. Are they from some new band?" you ask as you start nodding your head to the beat. "They''re pretty awesome."'
 			'Alyona takes out her earbud and tells you how she found these bands and how many new ones she wants to listen to. "Sometimes you find some rare gems," she says.'
+			func('npc_reactions', 'general', 'A143')
 			'You listen to the music for a few more minutes before Alyona takes the earbud back and stands up. "I''ll show you some more bands next time, but right now I''ve got some things to do." With that, she walks away towards the others.'
 		end
 	else
@@ -984,6 +1057,7 @@ if $ARGS[0] = 'alyona':
 			*nl
 			'You can tell by her expression that she doesn''t know what to do. "<<$pcs_nickname>>, you know very well that most of them aren''t on good terms with you. I''ll see what I can do, but no promises. Besides, I have my own problems."'
 			'She spends the rest of the break complaining, mostly about school, but also about things at home. However, whenever you ask her about it, she refuses to go into details, preferring to just vent her pent-up tension.'
+			func('npc_reactions', 'general', 'A143')
 			'After spending a few minutes complaining, you hear the bell ringing. You get up and walk towards the classroom.'
 		elseif npc_rel['A143'] <= 20:
 			'When Alyona sees you approaching her, she looks at you questioningly, as if she doesn''t understand why you would want to talk to her at all. Or rather, why she should. "What the hell do you want?" she asks edgily.'
@@ -1133,6 +1207,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances at you with a smile.'
+			func('npc_reactions', 'general', 'A144')
 			*nl
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
@@ -1151,9 +1226,11 @@ if $ARGS[0] = 'anushka':
 			'Anushka is leaning against the wall, snickering about something she''s looking at on her phone. You stand next to her and try and peek. Before you can see anything, she puts her phone away and frowns at you. "Sorry, I don''t have a dick for you to suck. Best look elsewhere."'
 			'You sigh, not getting to see whatever it is she found so amusing. "I thought we could just hang out?"'
 			'She rolls her eyes. "Whatever." You try to talk to her, but she mostly ignores you.'
+			func('npc_reactions', 'general', 'A144')
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a slight smile.'
+			func('npc_reactions', 'general', 'A144')
 			*nl
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
@@ -1168,6 +1245,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances to you with a friendly smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
 			elseif CloSkirtShortness >= 4:
@@ -1185,6 +1263,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances to you with a slight smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
 			elseif CloSkirtShortness >= 4:
@@ -1198,6 +1277,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances at you with a friendly smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'""Nice outfit," she says, looking over your uniform. "Though I doubt your social circle would approve."'
 			elseif CloSkirtShortness >= 4 and $pantyworntype = 'none':
@@ -1222,6 +1302,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances to you with a slight smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit, though I doubt your social circle would approve."'
 			elseif CloSkirtShortness >= 4:
@@ -1238,6 +1319,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances to you with a friendly smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit, though I doubt your social circle would approve."'
 			elseif CloSkirtShortness >= 4:
@@ -1257,6 +1339,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties to anyone. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a slight smile.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit, though I doubt your social circle would approve."'
 			elseif CloSkirtShortness >= 4:
@@ -1273,6 +1356,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. You blush when you see her panties on full display like that. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a smirk.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit, though I doubt your fellow nerds would approve."'
 			elseif CloSkirtShortness >= 4:
@@ -1292,6 +1376,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. You blush when you see her panties on full display like that. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a smirk.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
 			elseif CloSkirtShortness >= 4:
@@ -1304,6 +1389,7 @@ if $ARGS[0] = 'anushka':
 		if npc_rel['A144'] >= 50:
 			'As you walk up the steps, you notice Anushka sitting on the top step with her knees pulled up almost to her chin, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over and see her typing lyrics to a song. "New song?"'
 			'She glances to you with a friendly smile.'
+			func('npc_reactions', 'general', 'A144')
 			*nl
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
@@ -1324,6 +1410,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a slight smile.'
+			func('npc_reactions', 'general', 'A144')
 			*nl
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
@@ -1343,6 +1430,7 @@ if $ARGS[0] = 'anushka':
 			'You stammer as you feel flustered. She''s always doing things like this to you. "What? No... I mean yes... No! If you didn''t sit like that, no one would look."'
 			*nl
 			'She grins at you. "So you were looking?" You just sigh and lean back until you''re looking straight up and give up trying to defend yourself. You just let her have her fun.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
 			elseif CloSkirtShortness >= 4:
@@ -1361,6 +1449,7 @@ if $ARGS[0] = 'anushka':
 		else
 			'As you walk up the steps, you notice Anushka sitting on the top step cross legged, which gives you a nice up the skirt shot of her panties. She''s using her knees to support a notebook computer that she''s typing on. Taking a seat next to her, you glance over at the screen as she''s closing it, missing whatever she was looking at. "New song?"'
 			'She glances to you with a smirk.'
+			func('npc_reactions', 'general', 'A144')
 			if CloStyle = 2:
 				'You see her look over your uniform. "Nice outfit."'
 			elseif CloSkirtShortness >= 4:
@@ -1470,6 +1559,7 @@ if $ARGS[0] = 'lena':
 		'You sigh slightly. "No, I just wanted to see what you were up to."'
 		'"Go bother someone else!" she says.'
 		'You talk to her for a bit and while she doesn''t ignore you, she also makes it clear she doesn''t approve of how you got in the gopniks.'
+		func('npc_reactions', 'general', 'A20')
 	elseif npc_rel['A20'] >= 50 and fame['pav_slut'] < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
@@ -1482,6 +1572,7 @@ if $ARGS[0] = 'lena':
 			'You shake your head. "No, I just came over to see how you were and hang out."'
 			'The two of you talk for a while about how much school sucks and all the better things you could be doing with your time.'
 		end
+		func('npc_reactions', 'general', 'A20')
 	elseif npc_rel['A20'] <= 20 and fame['pav_slut'] < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
@@ -1503,6 +1594,7 @@ if $ARGS[0] = 'lena':
 		'She looks back at you and arches a brow. "You lost? Shouldn''t you be hanging out with your own friends?"'
 		'You shake your head. "I have a lot of friends. I just wanted to come over to see how you were and hang out."'
 		'The two of you talk for a while about how much school sucks and all the better things you could be doing with your time.'
+		func('npc_reactions', 'general', 'A20')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -1519,6 +1611,7 @@ if $ARGS[0] = 'pauline':
 		'You sigh slightly. "I just wanted to talk is all," you reply.'
 		'"Go talk to someone that cares then!" she says.'
 		'You talk to her for a bit and while she doesn''t ignore you, she also makes it clear she doesn''t approve of how you got into the gopniks.'
+		func('npc_reactions', 'general', 'A24')
 	elseif fame['pav_slut'] > 250:
 		gs 'npc_relationship', 'modify', 'A24', 'dislike'
 		'She glares at you as you approach. "Don''t even think about trying to talk to me, slut."'
@@ -1539,6 +1632,7 @@ if $ARGS[0] = 'pauline':
 			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'The two of you continue talking for a while, mostly about how, if you want to hang with the gopniks, you should just change everything about yourself and join them.'
 		end
+		func('npc_reactions', 'general', 'A24')
 	elseif grupTipe = 3:
 		gs 'npc_relationship', 'modify', 'A24', rand(0,-1)
 		if npc_rel['A24'] >= 80:
@@ -1557,6 +1651,7 @@ if $ARGS[0] = 'pauline':
 			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'The two of you continue talking for a while, mostly about how, about how crap all the stuff you like is and that you have no business hanging with the gopniks.'
 		end
+		func('npc_reactions', 'general', 'A24')
 	elseif grupTipe = 4:
 		if npc_rel['A24'] >= 50:
 			'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
@@ -1572,6 +1667,7 @@ if $ARGS[0] = 'pauline':
 			'She looks back at you and shrugs her shoulders. "Hey <<$pcs_nickname>>, nothing much. Just waiting for this day to end."'
 			'The two of you talk for a while about how much school sucks and all the better things you could be doing with your time.'
 		end
+		func('npc_reactions', 'general', 'A24')
 	else
 		gs 'npc_relationship', 'modify', 'A24', rand(0,-1)
 		if npc_rel['A24'] >= 80:
@@ -1584,6 +1680,7 @@ if $ARGS[0] = 'pauline':
 			'She glances at you and then looks around before replying. "If there weren''t teachers around, I would kick your ass right now."'
 			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'You try and talk to her, but she doesn''t really have much to say to you other than offer a few threats.'
+			func('npc_reactions', 'general', 'A24')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'

locations/gschool_grounds.qsrc

@@ -44,9 +44,9 @@ if $ARGS[0] = 'main':
 			if week = 1 and NikoIntro = 0:
 				gt 'NikoEv', 'Intro'
 			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
-				gt 'NikoDates', 'After School'
+				gt 'NikoDates', 'after_school'
 			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
-				gt 'NikoDates', 'After School 2'
+				gt 'NikoDates', 'after_school2'
 			elseif NikoVolkovQW = 10 and NikoEv = 22:
 				gt 'NikoEv2', 'Recovery'
 			end
@@ -265,7 +265,7 @@ if $ARGS[0] = 'main':
 				'You can see <a href="exec: gt ''FedorEv'', ''Start''">Fedor</a> standing by himself, his backpack around his arm.'
 			end
 			if NikoVolkovQW >= 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
-				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
+				'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 and NikoDate_Day ! daystart:
 				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai</a> is smoking outside of the school.'
 			end
@@ -294,7 +294,7 @@ if $ARGS[0] = 'main':
 				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
 			end
 			if NikoVolkovQW = 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
-				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''Niko Dates''">Nikolai</a>', '5'
+				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''niko_dates''">Nikolai</a>', '5'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
 			end

locations/gschool_jock_chats.qsrc

@@ -13,9 +13,11 @@ if $ARGS[0] = 'lazar':
 		'Lazar smirks when he sees you. "Back for more? I know, it was amazing."'
 		'You only let out a short "Mmhmm" as you roll your eyes.'
 		'Lazar breaks out in a smile. "No worries <<$pcs_nickname>>! I''m sure we''ll hook up again." You notice several others paying attention to what he says and aren''t happy about him bragging publicly about banging you. You try and change the topic, but all you get from him is sexual banter.'
+		func('npc_reactions', 'general', 'A149')
 	elseif AlbinaQW['Lazar_Threesome'] = 1:
 		'Lazar smirks when he sees you. "Back for more? Albina is a little busy right now, but I''m sure we can work something out next time she''s in the mood."'
 		'You blush at his comment and he smiles. "I''m sure you enjoy our... sessions as much as she does." He has a wide grin on his face and winks at you.'
+		func('npc_reactions', 'general', 'A149')
 	elseif fame['pav_slut'] > 225:
 		gs 'npc_relationship', 'modify', 'A149', 'dislike'
 		if npc_rel['A149'] >= 50:
@@ -34,6 +36,7 @@ if $ARGS[0] = 'lazar':
 			'"Hey, <<$pcs_nickname>>. So I''ve been noticing you eyeballing me." Lazar winks.'
 			'You laugh. "Nice line Lazar... Is that how you get the ladies interested in you?"'
 			'He confidently continues. "You know it. And it works like a charm every time. You just wait, you''ll fall for me too." You talk about a variety of topics, mostly sports.'
+			func('npc_reactions', 'general', 'A149')
 		elseif npc_rel['A149'] <= 20:
 			'"Are you the one that''s been going around telling the other girls that I''m no good for them?!" Lazar angrily asks.'
 			'"No? Like I give a shit about you! You''re not the center of the world, Lazar!" you yell back.'
@@ -42,6 +45,7 @@ if $ARGS[0] = 'lazar':
 			'"I didn''t take you for one of them girls <<$pcs_nickname>>?" Lazar smiles.'
 			'"What?" you ask surprised.'
 			'"Didn''t take you for one of my fan girls, that''s all." he winks. You roll your eyes and shake your head. You know he''s full of himself, even if he is the most gifted athlete in school and cute to boot. You talk about a variety of things, which he twists into you just liking him.'
+			func('npc_reactions', 'general', 'A149')
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A149'] >= 50:
@@ -58,11 +62,13 @@ if $ARGS[0] = 'lazar':
 			'"I heard many boys are out to get at your level <i>Mister Superstar</i>. Watch out, you might lose that cheer squad of yours!" you jokingly reply.'
 			'Lazar bursts out in laughter. "No no, I''m not worried. That only makes me want to improve even more..."'
 		end
+		func('npc_reactions', 'general', 'A149')
 	elseif grupTipe = 3:
 		if npc_rel['A149'] >= 50:
 			'"Hey, <<$pcs_nickname>>. So I''ve been noticing you''ve been eying me." Lazar winks.'
 			'You blush. "No... no I haven''t."'
 			'He confidently continues. "Are you saying I''m not good looking?" You start to stammer and he laughs, showing he is just messing with you. You proceed to talk about a variety of topics, mostly sports.'
+			func('npc_reactions', 'general', 'A149')
 		elseif npc_rel['A149'] <= 20:
 			'You approach and try to talk with him, but he flat out ignores you and pretends you''re not there. After several minutes of this, he finally sighs loudly. "Can''t you take a fucking hint? No one wants to talk to you!" He then returns to ignoring you and you walk away.'
 		else
@@ -70,12 +76,14 @@ if $ARGS[0] = 'lazar':
 			'You glance around, waiting for someone to start picking on you. "Hi, I just wanted to say hi."'
 			'He smirks. "Of course you do." Just the way he says it makes it sound like a forgone conclusion you would want to talk to him.'
 			'"Okay..." you reply, not sure how to respond. He starts talking to some of the others and seems friendly enough, even if he and the others don''t pay much attention to you. At least no one is picking on you.'
+			func('npc_reactions', 'general', 'A149')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A149'] >= 50:
 			'"Hey, <<$pcs_nickname>>. So I''ve been noticing you''ve been eying me." Lazar winks.'
 			'You laugh. "You wish... Are any of the girls dumb enough to fall for that?"'
 			'He confidently continues. "Nothing to fall for, it''s a simple fact. You don''t have to hide it." He lifts up his shirt and shows off his six pack, which gets the attention of most of the girls. You have to admit that he has a great body. You proceed to talk about a variety of topics, mostly sports.'
+			func('npc_reactions', 'general', 'A149')
 		elseif npc_rel['A149'] <= 20:
 			'You approach and try to talk with him, but he flat out ignores you and pretends you''re not there. After several minutes of this, he finally sighs loudly. "Can''t you take a fucking hint? No one wants you to talk to you!" He then returns to ignoring you and you walk away.'
 		else
@@ -83,6 +91,7 @@ if $ARGS[0] = 'lazar':
 			'You sigh. "I just wanted to say hi."'
 			'He smirks. "Of course you do." Just the way he says it makes it sound like a forgone conclusion you would want to talk to him.'
 			'"Okay..." you reply, not sure how to respond. He starts talking to some of the others and seems friendly enough, even if he and the others don''t pay much attention to you.'
+			func('npc_reactions', 'general', 'A149')
 		end
 	else
 		if npc_rel['A149'] >= 50:
@@ -110,6 +119,7 @@ if $ARGS[0] = 'svyatoslav':
 			'"So when am I going to get the complementary blowjob?" Svyatoslav asks.'
 			'"Never..." you sourly reply.'
 			'"Come on, don''t play hard to get. I know you loving sucking cock, you little slut." He starts approaching you, so you turn and walk away.'
+			func('npc_reactions', 'general', 'A8')
 		else
 			'"Look who it is, the school bicycle! Run out of cocks in the bathroom? Had to come out of your stall to find more?" Svyatoslav says as you approach.'
 			'Most of the other jocks and cool kids laugh at his comments. "No..." you sourly reply.'
@@ -120,24 +130,29 @@ if $ARGS[0] = 'svyatoslav':
 			'"Well, isn''t this a surprise? Are you here to wish me good luck in the next race?" Svyatoslav curiously asks.'
 			'Seeing him excited and not wanting to hurt his feelings, you just nod. "Yeah... that''s exactly what I wanted to say..."'
 			'"Thanks <<$pcs_nickname>>! I''ll be sure to win this time!" he boastfully replies. The two of you then talk about the many times he fails to beat Ivan or Lazar in one of the various sports at school.'
+			func('npc_reactions', 'general', 'A8')
 		elseif npc_rel['A8'] <= 20:
 			'He gives you a dirty look as you approach. "I''ve got nothing to say to you, so go bother someone else." You try talking to him, but he just gets more annoyed with you, so you finally give up and leave.'
 		else
 			'You walk up to him and start chatting. You talk about working out and staying fit before he starts flirting with you. You get the feeling he has a thing for you, or that he just wants to get in any girl''s panties so he has something to brag about to the other jocks.'
+			func('npc_reactions', 'general', 'A8')
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A8'] >= 50:
 			'You walk up to him and start chatting. You talk about working out and staying fit before he starts flirting with you. You get the feeling he has a thing for you, or that he just wants to get in any girl''s panties so he has something to brag about to the other jocks.'
+			func('npc_reactions', 'general', 'A8')   
 		elseif npc_rel['A8'] <= 20:
 			'He gives you a dirty look as you approach. "I''ve got nothing to say to you, so go bother someone else." You try talking to him, but he just gets more annoyed with you, so you finally give up and leave.'
 		else
 			'You walk up to him and start chatting. You talk about working out and staying fit before he starts flirting with you. You get the feeling he has a thing for you, or that he just wants to get in any girl''s panties so he has something to brag about to the other jocks.'
+			func('npc_reactions', 'general', 'A8')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A8'] >= 50:
 			'"You get lost, nerd?" he asks as you approach.'
 			'You shake your head. "No, I just wanted to say hi."'
 			'He snorts. "Whatever. Make sure you don''t lean too far forward in class so I can copy off you." He then ignores you, but doesn''t pick on you.'
+			func('npc_reactions', 'general', 'A8')
 		elseif npc_rel['A8'] <= 20:
 			'"You get lost, nerd?" he asks as you approach.'
 			'You shake your head. "No, I just wanted to say hi."'
@@ -146,12 +161,14 @@ if $ARGS[0] = 'svyatoslav':
 			'"You get lost, nerd?" he asks as you approach.'
 			'You shake your head. "No, I just wanted to say hi."'
 			'He laughs. "Why don''t you just go back to your fellow losers and pretend to be an elf or whatever it is you losers do." He continues mocking you when he isn''t talking to someone else.'
+			func('npc_reactions', 'general', 'A8')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A8'] >= 50:
 			'"You come to see what real men are like?" he asks as you approach.'
 			'You shake your head and roll your eyes at his comment. "No, I just wanted to say hi."'
 			'He snorts. "Sure you didn''t. Well, take a good look." He does a little flexing before you''re able to engage him in something resembling a conversation.'
+			func('npc_reactions', 'general', 'A8')
 		elseif npc_rel['A8'] <= 20:
 			'"You come to beg for some money to buy drugs?" he asks with a laugh, causing several others to join in.'
 			'You shake your head. "No, I just wanted to say hi."'
@@ -160,6 +177,7 @@ if $ARGS[0] = 'svyatoslav':
 			'"You get lost, junkie?" he asks as you approach.'
 			'You shake your head. "No, I just wanted to say hi."'
 			'He laughs. "Why don''t you just go back to your fellow wannabe gangsters and pretend like you matter?" He continues mocking you when he isn''t talking to someone else.'
+			func('npc_reactions', 'general', 'A8')
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A8', 'dislike'
@@ -190,12 +208,14 @@ if $ARGS[0] = 'vanya':
 			'Vanya cracks up seeing you panic. "Just kidding! I just wanted to see your reaction."'
 			'"Always the same thing with you, Vanya. Don''t you get tired of playing games all the time?" you reprimand him.'
 		end
+		func('npc_reactions', 'general', 'A165')
 	elseif npc_rel['A165'] <= 20 and fame['pav_slut'] < 225:
 		if grupTipe = 2:
 			'"What the hell, Vanya?!" you yell while angrily stomping towards him.'
 			'"What now?" he replies with an innocent look. "I''m getting tired of you accusing me of things I haven''t done!"'
 			'"It must''ve been you! Who else replaces talc powder with itching powder?!"'
 			'"No idea. What an amazing... I mean cruel joke though..." he replies.'
+			func('npc_reactions', 'general', 'A165')
 		else
 			'"Funny joke you played on me there, dickhead!" you angrily yell while pushing him.'
 			'"What are you talking about? You''ve gone crazy!" he replies.'
@@ -207,6 +227,7 @@ if $ARGS[0] = 'vanya':
 		'Vanya turns towards you. "Hell yeah! I love secrets! Especially ones I can use against others as a joke."'
 		'"Well this one is special..." you snicker. "I saw you and Vicky having sex in the park..."'
 		'Vanya stops and thinks for a second before grinning. "That''s the big secret? Well that''s nothing new. Vicky and I love to have sex outdoors," he winks.'
+		func('npc_reactions', 'general', 'A165')
 	elseif fame['pav_slut'] >= 225:
 		gs 'npc_relationship', 'modify', 'A8', 'dislike'
 		'"Are you up for a threesome with Vicky and me?" Vanya asks.'
@@ -218,6 +239,7 @@ if $ARGS[0] = 'vanya':
 		'"Hey <<$pcs_nickname>>! Check this out!" Vanya yells out as he throws a crumbled paper ball at Vitek''s head.'
 		'He in turn quickly spins around and glares, trying to figure out who threw the crumbled paper. "Who did that?!" Vitek yells out. "Tell me who the fuck it was!"'
 		'"So easily agitated..." Vanya comments while you burst out in laughter over the stupid face Vitek is making.'
+		func('npc_reactions', 'general', 'A165')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -262,6 +284,7 @@ if $ARGS[0] = 'erast':
 			*nl
 			'"You already look good <<$pcs_nickname>>," he says politely, but his face turns red. Before you can react, he starts talking about aerobic and anaerobic techniques which he thinks would help you with your goal.'
 			'You listen to him very carefully and try to remember as much as you can, which isn''t easy since he''s so passionate about this topic that he often uses technical terms you don''t understand.'
+			func('npc_reactions', 'general', 'A150')
 			'When you realize the bell is about to ring, you thank him for his useful tips and you both head to the classroom for the next lesson.'
 		elseif npc_rel['A150'] <= 20:
 			'"Hey Erast!" you greet him, but he''s so focused on watching something on his phone that he doesn''t even notice you. You poke him and greet him again.'
@@ -269,6 +292,7 @@ if $ARGS[0] = 'erast':
 			'"Okay, no problem. What are you watching anyway? You seem to be lost in it," you say as you have a look at the video he''s watching.'
 			*nl
 			'"Oh, he''s my favorite bodybuilder. He just uploaded this new motivational video on his channel. It''s really worth watching. So inspirational."'
+			func('npc_reactions', 'general', 'A150')
 			'You sit next to him and exchange the occasional word while watching the video, but he''s not interested in chatting. Soon, you hear the bell signalling the end of the break.'
 			'"See you later, <<$pcs_nickname>>," he says before putting his phone in his pocket and leaving.'
 		else
@@ -280,6 +304,7 @@ if $ARGS[0] = 'erast':
 			'"Years?" you ask in despair before asking if he could explain some things to you.' 
 			'He looks around, as if looking for someone to talk to instead, before he sighs and starts to talk about nutrition, metabolism, resting, bulking, calisthenics, and everything that can affect your progress.'
 			'You don''t understand everything he says, but are happy that he''s willing to share some of his knowledge. After talking about it for a few minutes, you feel you might have learned something.'
+			func('npc_reactions', 'general', 'A150')
 			'"Good talk. Thanks Erast!" you say when you hear the bell ringing and head to the classroom for the next lesson.'
 		end
 	elseif grupTipe = 2:
@@ -290,7 +315,9 @@ if $ARGS[0] = 'erast':
 			*nl
 			'"Also, get enough sleep. Your muscles need enough recovery time," he adds. He clearly knows a lot about strength and conditioning and could continue talking about it for hours, but the bell rings after only a few minutes.'
 			'"Thanks Erast, that''s really helpful. See you later."'
-			'"Don''t sweat it. Come and find me if you have more questions." With that, you both grab your things and head to the next lesson together.'
+			'"Don''t sweat it. Come and find me if you have more questions."'
+			func('npc_reactions', 'general', 'A150')
+			'With that, you both grab your things and head to the next lesson together.'
 		elseif npc_rel['A150'] <= 20:
 			'"Hi <<$pcs_nickname>>, what''s up?" Erast asks as you approach him.'
 			'"Hey Erast! I was wondering if you could give me some new tips on boxing. You might have learned something new while boxing with Ivan which would be useful for me too."'
@@ -298,6 +325,7 @@ if $ARGS[0] = 'erast':
 			*nl
 			'"Well, I''m not, but it helps me to improve my balance and posture," you reply.'
 			'By the skin of his teeth, he shares his knowledge but doesn''t let you interrupt him with your questions. You get the feeling that he only helps you because he is polite and you are a fellow jock.'
+			func('npc_reactions', 'general', 'A150')
 			'When the bell rings, he seems a bit relieved.'
 			'"Thanks Erast," you say while grabbing your things and you both go your own ways.'			
 		else
@@ -306,6 +334,7 @@ if $ARGS[0] = 'erast':
 			'"Wow, this is... this is really interesting," you reply. You''ve always known that he''s very committed to sport, but this new plan is very detailed, even for him.'
 			*nl
 			'You start chatting, mostly about training and exchanging some tips on working out, stretching and different warm-up techniques.'
+			func('npc_reactions', 'general', 'A150')
 			'"Look, <<$pcs_nickname>>, I still have to do some things before the next lesson. Talk to you later," he says and gives you a little wave while he''s leaving.'
 			'"Sure, later then." When he leaves, you look at the clock and see that you don''t have much time to left before the next lesson starts, so you head to your classroom.'
 		end
@@ -317,6 +346,7 @@ if $ARGS[0] = 'erast':
 			*nl
 			'"Yes, studying is important..." you reply and suddenly don''t know what to say. You know he''s not the brightest, but despite being in a different clique, he''s always been kind and polite to you and you don''t want him to feel bad about it.'
 			'After a short pause, you start to talk about studying and doing exercises. By this time, it''s clear to both of you that they have something in common: both require dedication and a lot of discipline in some way.'
+			func('npc_reactions', 'general', 'A150')
 			'You hear the bell a few minutes later. "I should go, Erast. There''s something I would like to ask the teacher before the lesson. See you later." You then hurry to catch your teacher in the corridor.'
 		elseif npc_rel['A150'] <= 20:
 			'"Hello <<$pcs_nickname>>... Is there anything I can help with?" Erast asks when he notices you approaching him.'
@@ -332,6 +362,7 @@ if $ARGS[0] = 'erast':
 			'He looks surprised, but eventually starts to talk about his training routines. "You know <<$pcs_nickname>>, it''s very important to do something for your body every single day."'
 			*nl
 			'"I know, I know..." you sigh. It''s clear you don''t have a lot in common, but you''re able to have a nice chat with each other.'
+			func('npc_reactions', 'general', 'A150')
 			'Before the break is over, he grabs his things. "Alright <<$pcs_nickname>>, I have a few things I need to do before the lesson. Thanks for the chat."'
 			'"Of course. See you later." You quickly check your notes from the previous lesson and revise them before going to the classroom.'
 		end
@@ -343,6 +374,7 @@ if $ARGS[0] = 'erast':
 			'"How''s your training going lately?" you ask and he starts talking about his training schedule and plan he''s been doing for a while. He enjoys talking to you about it, although you''re not sure whether it''s because of you or because he''s so obsessed with this topic.'
 			*nl
 			'"That''s cool," you reply and start telling him some new stories that have happened to you lately. You also talk about boxing, which seems to be the only topic you''re both familiar with.'
+			func('npc_reactions', 'general', 'A150')
 			'You have a nice chat and don''t even notice how fast time flies. You only realize your break is over when you hear the bell.'
 			'"See you later big boy," you say as you gather your things and stand up.'
 		elseif npc_rel['A150'] <= 20:
@@ -360,6 +392,7 @@ if $ARGS[0] = 'erast':
 			'"How about you?" you ask before the conversation turns awkward for both of you.'
 			'"I''ve been working out hard as always." He''s noticeably somewhere else in his mind, so you try not to interrogate him.'
 			'You wonder whether he''s disorganised because he''s just exhausted, or if the rumours are true and it''s a side effect of the steroids he takes.'
+			func('npc_reactions', 'general', 'A150')
 			'After a very short conversation, you both go your own ways and try to do something useful before the next lesson starts.'
 		end
 	else
@@ -369,6 +402,7 @@ if $ARGS[0] = 'erast':
 			'Knowing you don''t really have any friends and you aren''t on speaking terms with many of your classmates, he smiles. "Sure, I can check this video later."'
 			*nl
 			'He puts his phone away and you chat for a while, occasionally changing subjects to things you don''t completely understand. You don''t mind; You''re just happy you don''t have to spend the break alone.'
+			func('npc_reactions', 'general', 'A150')
 			'"Okay Erast, I should let you do your things before the next lesson starts," you tell him with a smile.'
 			'"See you later <<$pcs_nickname>>," he replies before heading to the toilet. You grab your things and go to your classroom to wait for the bell.'
 		elseif npc_rel['A150'] <= 20:
@@ -381,6 +415,7 @@ if $ARGS[0] = 'erast':
 			'"Hi <<$pcs_nickname>>, what''s up?"'
 			'"As you''re really good at skating, I was wondering if you could give me some advice about keeping my balance and posture?" you ask him nicely.'
 			'He looks at his watch and glances at the others before he sighs. "Okay, I can give you some tips..." he says reluctantly and you realize that he would prefer spending the break with someone else.'
+			func('npc_reactions', 'general', 'A150')
 			'He quickly explains some things before stopping. "Well, I have to go now if you don''t mind. Another time maybe?" He doesn''t wait for your answer before leaving.'
 			'You have a few minutes before the next lesson, so you head to your classroom and try to kill the time.'
 		end
@@ -416,6 +451,7 @@ if $ARGS[0] = 'christina':
 	elseif christinaQW['subpath'] >= 2:
 		if christinaQW['subpath'] >= 3:
 			'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after gym class..."'
+			func('npc_reactions', 'general', 'A18')
 			'Before you''re able to respond, she turns around and walks away.'
 		else
 			'"I''m looking forward to after P.E. class," Christina says with a wicked smile.'
@@ -609,6 +645,7 @@ if $ARGS[0] = 'albina':
 					'The rest of the girls giggle until they see Albina''s glare and quickly scurry away.'
 				end
 				'She sighs as she turns back to you.'
+				func('npc_reactions', 'general', 'A23')
 				*nl
 				'"I told you to be careful..." she says and places her hand on your cheek. She lingers there for just a moment before turning away, a sorry look in her eyes is the last thing you see before she leaves.'
 			else
@@ -623,6 +660,7 @@ if $ARGS[0] = 'albina':
 				'"<<$pcs_nickname>>!" she hisses in a hushed tone. "There are some <i>nasty</i> fucking rumors going around about you! Everything from cock hungry slut to a straight up hooker!"'
 				'"They''re just rumors Albina," you try to reassure her.'
 				'"They don''t sound like <i>just</i> rumors <<$pcs_nickname>>..." She glares at you for a moment before sighing. "Look, I''m not trying to slut shame you or anything like that. I know I''m not one to talk. But seriously, be careful okay?"'
+				func('npc_reactions', 'general', 'A23')
 				'She gives you a worried look and hugs you tight before you part ways for your next class.'
 			elseif npc_rel['A23'] >= 70:
 				'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying that you''re a cock hungry whore! How can you live like that - just letting guys... <i>use</i> you like that?"'
@@ -635,6 +673,7 @@ if $ARGS[0] = 'albina':
 			if AlbinaQW['Friends'] = 2:
 				'"Hey <<$pcs_nickname>>, I''ve been hearing some weird rumors about you lately," Albina says with a bemused look. "Everyone''s saying you''re ''easy'' and suck dick in the boys bathroom! I don''t know what''s going on but... be careful, okay?"'
 				'"They''re just rumors Albina," you try to reassure her.'
+				func('npc_reactions', 'general', 'A23')
 				'"This might end up worse than you think..." she says with a worried look before walking away.'
 			else
 				'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying you''re a cock hungry whore! How can you live like that - just letting guys... use you like that?"'
@@ -643,6 +682,7 @@ if $ARGS[0] = 'albina':
 		elseif AlbinaQW['Friends'] = 2:
 			if grupTipe = 1 or grupTipe = 2:
 				'Albina gives you a tight hug when you approach and you both a lively conversation. It''s as if a weight has been lifted from her shoulders and she smiles a lot more than before.'
+				func('npc_reactions', 'general', 'A23')
 			elseif grupTipe = 3:
 				'You approach Albina and she smiles. She ignores the stares you''re getting from her friends and has a friendly conversation with you.'
 			elseif grupTipe = 4:
@@ -656,18 +696,22 @@ if $ARGS[0] = 'albina':
 		elseif grupTipe = 1:
 			if npc_rel['A23'] >= 70:
 				'Albina has a friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off. You don''t know what her problem is, but she''s always been sensitive when it comes to discussing her home life.'
+				func('npc_reactions', 'general', 'A23')
 			elseif npc_rel['A23'] <= 20:
 				'Albina glares at you. "What do you want you fake ass bitch? I don''t like you, so why would I want to talk to you?" You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
 			else
 				'Albina sighs and begrudgingly starts chatting with you. She spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but it''s obvious that she''s just tolerating your presence and humouring you with conversation.'
+				func('npc_reactions', 'general', 'A23')
 			end
 		elseif grupTipe = 2:
 			if npc_rel['A23'] >= 70:
 				'Albina has a friendly, yet awkward conversation with you. You both talk about the sports you enjoy and which of the jocks have caught your attention lately, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off. You don''t know what her problem is, but she''s always been sensitive when it comes to discussing her home life.'
+				func('npc_reactions', 'general', 'A23')
 			elseif npc_rel['A23'] <= 20:
 				'Albina scoffs at you. "I don''t like you, I barely tolerate you being in the same social group as me, so why would I want to talk to you?" You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
 			else
 				'Albina sighs and begrudgingly starts chatting with you. She spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but it''s obvious that she''s just tolerating your presence and humouring you with conversation.'
+				func('npc_reactions', 'general', 'A23')
 			end
 		elseif grupTipe = 3:
 			if npc_rel['A23'] >= 70:
@@ -675,10 +719,12 @@ if $ARGS[0] = 'albina':
 				'"League of Legends? The online strategy game?" you continue and she looks even more confused.'
 				'Before you can explain, she puts a finger against your lips and shushes you. "I don''t play any of that dumb geeky shit, <<$pcs_nickname>>. I only play fighting games like Tekken and Mortal Kombat. It helps me relax when people are... annoying me."'
 				'Catching her drift, you change the subject to something you think she''ll be more interested in.'
+				func('npc_reactions', 'general', 'A23')
 			elseif npc_rel['A23'] <= 20:
 				'Albina rolls her eyes and crosses her arms. "This isn''t your stop, <<$pcs_firstname>>. The train to Geeksville terminates over there." She motions towards the door to the classroom that the nerds hang out in. "So get back on board and piss off!"'
 			else
 				'Albina sighs and begrudgingly starts chatting with you. She spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but it''s obvious that she''s just tolerating your presence and humouring you with conversation.'
+				func('npc_reactions', 'general', 'A23')
 			end
 		elseif grupTipe = 4:
 			'Albina glares at you with a look of utter contempt on her face. "What the hell do you want? Go find the other knuckle brained morons. The zoo is over there." She motions towards the stairway that the gopniks usually hang out in before returning to her phone and ignoring you.'
@@ -755,6 +801,7 @@ if $ARGS[0] = 'veronika':
 		if npc_rel['A141'] >= 50:
 			'You sit next to Veronika. "What''s up?" you ask and the two of you start talking about things that have happened recently. She also shows you some photos of her latest skating routine, which makes you wonder if you could ever be as flexible as she is.'
 			'"I wish I could be as flexible as you are. It would save me a lot of muscle pain," you say. She opens her mouth and is about to ask what you mean, but then realizes why you''re in pain. She pinches her nose, but she doesn''t say a word about it.'
+			func('npc_reactions', 'general', 'A141')
 			'After a few awkward seconds, she gets up. "Okay... I''ve got to go now. Hopefully you''ll return to reason one day."'
 		elseif npc_rel['A141'] <= 20:
 			'As you walk past Veronika during your break, you her her mumbling something and approach her. "Were you talking to me? Sorry, I didn''t hear what you said."'
@@ -769,6 +816,7 @@ if $ARGS[0] = 'veronika':
 		if npc_rel['A141'] >= 50:
 			'You see Veronika among her fellow jocks and decide to talk to her. "Hey Veronika!" you say as you sit next to her. "What''s up?"'
 			'She looks up and greets you with a small smile. The two of you start talking about things that have happened to you lately, addressing various topics. She seems indifferent to some of them, but she''s always happy to talk about sports, especially skating.'
+			func('npc_reactions', 'general', 'A141')
 			'"You know Veronika, I got some ideas about your clothing the other day," you say. She seems confused, as she''s not really into fashion, especially not as much as you.'
 			'"If you want to enter the Winter Olympic Games, we have to find you a really good one which would fit your nickname. The <i>Ice Queen</i>..." you say jokingly. "You can''t skate in an average skating costume. Looks are important too, not just the pure skill."'
 			'She smiles, which surprises you a little. You exchange some ideas about her costume before you hear the bell ring. You both pick up your things and head to the classroom.'
@@ -781,6 +829,7 @@ if $ARGS[0] = 'veronika':
 			'"Hello <<$pcs_nickname>>, do you want something?" she asks in her cold voice when she sees you approaching.'
 			'"Hi Veronika. I just thought we could chat and catch up?" you reply as you touch her shoulder as a sign of a friendly welcome. She immediately pulls back from you since she doesn''t like the idea of physical contact, especially with someone she''s not close to.'
 			'The two of you start talking about things that have happened lately in Pavlovsk, occasionally discussing ice skating and school PE lessons  too. She talks to you without interest or concern, but at least she tolerates you enough to have a word or two.'
+			func('npc_reactions', 'general', 'A141')
 			'Talking to her for 10 minutes can feel like an hour as time goes slowly when she doesn''t put much effort into the conversation. When you realize the break is almost over, you bid her farewell and head to your classroom.'
 		end
 	elseif grupTipe = 2:
@@ -793,7 +842,9 @@ if $ARGS[0] = 'veronika':
 			'"I wouldn''t miss the chance to see another practice of the Ice Queen." you smile as you refer to her infamous nickname.'
 			'"You too, <<$pcs_nickname>>?" She rolls her eyes, but smiles. She knows you''re just joking, unlike many of the other students who regularly mock her with it.'
 			'"Come on now, you''re really acting like your nickname now..." you reply jokingly as you poke her shoulder.'
-			'Both of you burst into laughter and start talking about different topics before you hear the ring. You pack your things and go to the classroom together.'
+			'Both of you burst into laughter and start talking about different topics before you hear the ring.'
+			func('npc_reactions', 'general', 'A141')
+			'You pack your things and go to the classroom together.'
 		elseif npc_rel['A141'] <= 20:
 			'"Hey Veronika, how are things going?" you ask as you approach her.'
 			'"Fine, just fine..." she replies with a huge amount of indifference in her words.'
@@ -809,6 +860,7 @@ if $ARGS[0] = 'veronika':
 			'She glances at you with her blank, indifferent stare before you start talking about different techniques and moves. You try to pay attention to what she says since she''s more experienced than anyone else. In fact, she has every chance to be a professional skater.'
 			'"Thanks Veronika. I''m sure many of these will be useful and your advice can come in handy anytime." You feel you''ve learned something and it was good to talk to her. Despite her nickname, she can be talkative too.'
 			'"And most importantly, never forget to warm up and stretch correctly," she adds before she goes on her business.'
+			func('npc_reactions', 'general', 'A141')
 			'You look at the clock in the hallway and see you don''t have too much time left. You grab your things and go to your next lesson.'
 		end
 	elseif grupTipe = 3:
@@ -819,6 +871,7 @@ if $ARGS[0] = 'veronika':
 			'She''s talking about some of her moves on the ice when you interrupt her. "Look, this is all very interesting. Not many know this, but physics actually plays a huge part in skating."'
 			'For the rest of the break time, you explain some things to her. How surface friction, different angles and dragging can help her with getting better results.'
 			'The time flies and you could talk about it for many hours, but you soon hear the bell ringing.'
+			func('npc_reactions', 'general', 'A141')
 			'"Alright, Veronika, we''ll get back to this later," you say and head to the classroom together, hoping you won''t be late.'
 		elseif npc_rel['A141'] <= 20:
 			'You see Veronika sitting alone in the hallway, so you decide to go and talk to her.'
@@ -832,6 +885,7 @@ if $ARGS[0] = 'veronika':
 			'She doesn''t even look up as she replies. "No." Just as you''re about to leave, she glances up and stops you.'
 			'"Wait! Maybe you can help me, yes." she says, hoping you still hear her. You turn back, smile at her and ask her again. She explains that she didn''t have time to do her homework because she was practicing for her next competition until late.'
 			'You sit next to her and help her with it. Not only do you help her, but also explain some things. You''re not sure how much she understands, but you''re happy that she''s listening to you at all.'
+			func('npc_reactions', 'general', 'A141')
 			'"You see? It wasn''t that complicated and it''s not that hard to understand," you say as you finish.'
 			'"I see." She keeps her reply short. She thanks you for the help before you both hurry to the classroom as your break is already over.'
 		end
@@ -843,6 +897,7 @@ if $ARGS[0] = 'veronika':
 			'You both smile and start chatting. She mostly talks about her recent results and how much she has been improved lately, but complains about your PE lessons as she doesn''t think the level of the PE education is good enough.'
 			'You listen to her and occasionally ask her about the upcoming competitions. After a while, you share some of your latest stories with her and also complain a lot about school, but for different reasons.'
 			'"Alright Veronika, I guess it''s time to finish the interview," you say as you wouldn''t miss a chance to mock her a little.'
+			func('npc_reactions', 'general', 'A141')
 			'When the bell rings, you go about your own business as she joins the other jocks to go to the classroom.'
 		elseif npc_rel['A141'] <= 20:
 			'"Well, well, look who''s here..." you say as you approach Veronika.'
@@ -852,6 +907,7 @@ if $ARGS[0] = 'veronika':
 			'"Get back here, bitch!" you snarl while clenching your fist, but realize it wouldn''t be worth it. You return to the other gopniks and try to calm down.'
 		else
 			'As you''re wandering through the hallway, you see Veronika sitting on the floor checking her phone. You walk up to her and, without greeting her, sit down and start chatting.'
+			func('npc_reactions', 'general', 'A141')
 			'"Ugh, where do I begin? What does one need to suffer?" you say before complaining about anything that comes to mind. You complain about school, your fellow gopniks and your parents.'
 			'She listens to you for some time before finally speaking up. "Hey <<$pcs_nickname>>, why do you tell me these things? We''re barely on speaking terms anyway and what you''re talking about is something I''m not interested in at all..." she says with a cold tone.'
 			'"Suuuure, whatever. Jog on, even better, skate on. Queen of the Ice, huh? More like Queen of Boredom..." you mutter as you stand up and go back to your fellow gopniks to wait for the bell.'
@@ -860,6 +916,7 @@ if $ARGS[0] = 'veronika':
 		if npc_rel['A141'] >= 50:
 			'"Hi <<$pcs_nickname>>..." Veronika greets you as you walk towards her. "Are you looking for me?"'
 			'"Hi Veronika, yes, yes, I was looking for you. It''s always good to see you and talk," you happily reply.'
+			func('npc_reactions', 'general', 'A141')
 			'She starts talking about her skating routines, techniques and dreams of entering the Winter Olympic Games. Even though you''re not an expert of this topic, she''s happy to talk about it as she knows you always listen to her.'
 			'"You''re so energetic when you mention these things. I envy you a lot, you know. It must be super cool. I can''t even imagine what it would be like to participate in the Olympic Games! I''m sure there are some good-looking boys among the athletes..." you blush.'
 			'"Ah, you know I''m not interested in that. Anyway, not everything is black or white. You know how much they mock me and call me that nickname. Even the jocks make fun of me sometimes..." she says with sadness in her voice.'
@@ -874,6 +931,7 @@ if $ARGS[0] = 'veronika':
 			'"Oh... Hi <<$pcs_nickname>>..." she replies indifferently.'
 			'You sit next to her and try to strike up a conversation, but you end up doing most of the talking. She gives you a one-word answer every now and then, but mostly just nods or grunts. She doesn''t seem to enjoy the conversation and doesn''t try to hide that fact.'
 			'In spite of that, she spends some time with you, listening to you talk about your problems at school and how the others pick you on almost every time.'
+			func('npc_reactions', 'general', 'A141')
 			'After a few minutes, she starts packing her things. "Okay, I''m leaving now." She keeps it short, and with that she goes on her business. You stay for a while and try to eavesdrop on others talking.'
 		end
 	end
@@ -963,6 +1021,7 @@ if $ARGS[0] = 'lina':
 			'Lina sees you and leans forward conspiratorially and whispers "Any good stories to tell?"'
 			'Looking around to make sure nobody is watching, you lean in and whisper back, telling her about some of your latest sexual adventures.'
 			'When your story is done, she leans back against the wall, a dreamy look on her face.'
+			func('npc_reactions', 'general', 'A19')
 		elseif npc_rel['A19'] <= 20:
 			'"Christina says that you fuck anyone," Lina says while glaring at you.'
 			'"Christina doesn''t know what she''s talking about it," you reply.'
@@ -973,11 +1032,13 @@ if $ARGS[0] = 'lina':
 			'Confused, you ask "What is what like?"'
 			'"Free to not care what others think. To have sex whenever you want."'
 			'You think on it for a moment. Shrugging, you say "Every day is ... just ... fun."'
+			func('npc_reactions', 'general', 'A19')
 		end
 	elseif grupTipe = 1:
 		if npc_rel['A19'] >= 60:
 			'"Hey <<$pcs_nickname>>," she greets you.'
 			'"Hi Lina," you reply. "What''s new with you?"'
+			func('npc_reactions', 'general', 'A19')
 			'The two of you spend the break chatting about various things until it ends.'
 		elseif npc_rel['A19'] <= 20:
 			'Lina sees you coming over to her. "You just think you''re so cool. You''ll never be as cool as Christina!" she says.'
@@ -987,7 +1048,9 @@ if $ARGS[0] = 'lina':
 			'"Hey, <<$pcs_nickname>>. Did you see the last track race?"'
 			'"Sorry, Lina. I don''t really watch those."'
 			'"Oh. You should come watch some time. You might like it."'
-			'"Maybe. See you around, Lina."'
+			'"Maybe."'
+			func('npc_reactions', 'general', 'A19')
+			'"See you around, Lina."'
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A19'] >= 60:
@@ -995,6 +1058,7 @@ if $ARGS[0] = 'lina':
 			'"Great news! I''m glad you''re improving!" you encouragingly tell her.'
 			'Lina nods. "Yeah, the new workout plan that Christina made for me is really great. She''s really helped me out a lot."'
 			+$OpenInnerThought+'There she goes, worshipping Christina.'+$CloseInnerThought
+			func('npc_reactions', 'general', 'A19')
 		elseif npc_rel['A19'] <= 20:
 			'"I always hear that I''m bad at sports, but you''re even worse than me!" Lina spares no time to insult you.'
 			'"Where did this come from?"'
@@ -1036,12 +1100,14 @@ if $ARGS[0] = 'lina':
 				'"If you don''t believe me, just look after the next gym class. We don''t all have tattoos."'
 				'She laughs. "Yeah, I''m sure the other girls wouldn''t mind me checking for tattoos. Especially Lena and Lera."'
 				'You both end up laughing at the thought, and gossip the rest of the break away.'
+				func('npc_reactions', 'general', 'A19')
 			else
 				'Lina sees you coming and asks "Does getting a tattoo hurt?"'
 				'"A little. Why, are you thinking about getting one?"'
 				'"Hell no. Christina would beat my ass if I did. She says..." She goes on a tirade about Christina''s views on tattoos and the people who get them when she remembers who she''s talking to. "Err... sorry <<$pcs_nickname>>."'
 				'"You should make your own mind up about things, Lina."'
 				'You spend the rest of your break trying to get her to open her mind to new ideas, but you''re pretty sure it had no effect.'
+				func('npc_reactions', 'general', 'A19')
 			end
 		elseif npc_rel['A19'] <= 20:
 			'Lina sees you coming and seems to get nervous. "I don''t speak to your kind. Go away!"'
@@ -1196,12 +1262,14 @@ if $ARGS[0] = 'lariska':
 				'"Okay, <<$pcs_nickname>>. I guess Christina won''t stop me from hanging out with you now." She smiles shyly. "Do you want to come over after school and work on our homework together?"'
 				'You smile in response. "Sure. I''ll meet up with you after school!"'
 				'She blushes a little. "Good, I''m looking forward to it!"'
+				func('npc_reactions', 'general', 'A13')
 			else
 				'"Hey Lariska! How''s your day going?"'
 				'"I''m sorry <<$pcs_nickname>>, but I already told you that Christina doesn''t want me hanging out with you after school."'
 				'"I know Lariska, I''m working on it. In the meantime, I was just saying hi."'
 				'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you''ll manage to convince her." She gives you a sad smile.'
 				'"Hang in there, sweetie. I''ll convince her, I promise."'
+				func('npc_reactions', 'general', 'A13')
 			end
 		elseif LariskaQW['story'] = 4:
 			LariskaQW['story'] = 5
@@ -1209,9 +1277,11 @@ if $ARGS[0] = 'lariska':
 			'"Okay <<$pcs_nickname>>. I guess Christina won''t stop me from hanging out with you now." She smiles shyly. "Do you want to come over after school and work on our homework together?"'
 			'You smile in response. "Sure thing, Lariska. I''ll meet up with you after school!"'
 			'She blushes a little. "Good, I''m looking forward to it!"'
+			func('npc_reactions', 'general', 'A13')
 		else
 			gs 'npc_relationship', 'modify', 'A13', 'love'
 			'"Hey cutie," you say when you see Lariska. She blushes a little, but still smiles at you. You spend the rest of the break chatting with her.'
+			func('npc_reactions', 'general', 'A13')
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A13', 'like'
@@ -1219,6 +1289,7 @@ if $ARGS[0] = 'lariska':
 			if npc_rel['A13'] >= 50:
 				'Seeing you, Lariska smiles and says "Hey slut, what are you up to?"'
 				'"Bored. Hey, did I ever tell you about the time I..." You spend the rest of break telling her dirty stories, trying to make her face turn as red as you can before class starts.'
+				func('npc_reactions', 'general', 'A13')
 			elseif npc_rel['A13'] <= 20:
 				'"Aren''t you looking for a cock to suck you big slut?" Lariska says mockingly.'
 				'"Shut up Lariska! Don''t you have Christina''s tail to run after or something?" you tiredly reply.'
@@ -1235,6 +1306,7 @@ if $ARGS[0] = 'lariska':
 				'"Well Lina was running after her and I don''t want to be left out..." She dismayingly looks at you.'
 				'"Listen Lariska." You grab hold of her. "You don''t need to run after anyone. You''re fine on your own, okay? Now stop worrying and head to class instead."'
 				'Blushing, she nods. "I''ll try."'
+				func('npc_reactions', 'general', 'A13')
 				'You spend the rest of break chatting with her, trying to take her mind off Christina.'
 			elseif npc_rel['A13'] <= 20:
 				'"The other kids may think you''re cool, but I know better!"'
@@ -1254,6 +1326,7 @@ if $ARGS[0] = 'lariska':
 				'"Well Lina was running after her and I don''t want to be left out..." She dismayingly looks at you.'
 				'"Listen Lariska." You grab hold of her. "You don''t need to run after anyone. You''re fine on your own, okay? Now stop worrying and head to class instead."'
 				'She nods while blushing. "I''ll try."'
+				func('npc_reactions', 'general', 'A13')
 				'You spend the rest of break chatting with her, trying to take her mind off Christina.'
 			elseif npc_rel['A13'] <= 20:
 				'"I sure beat your ass during gym class. You had no chance against me!" Lariska is gleefully trash-talking you.'
@@ -1273,6 +1346,7 @@ if $ARGS[0] = 'lariska':
 				'"There''s nothing wrong with studying, but you have to go outside once in a while too."'
 				'You tell her a bit about the last book you read, but you can see her eyes glazing over. "Okay, I need to head to class," you say, letting her off the hook.'
 				'"Okay," she responds. "See you later." She''s trying to hide her relief.'
+				func('npc_reactions', 'general', 'A13')
 			elseif npc_rel['A13'] <= 20:
 				'"You don''t belong here, nerd. You better leave before I get Christina to kick your ass!"'
 				'"My, aren''t you friendly today?"'
@@ -1290,7 +1364,9 @@ if $ARGS[0] = 'lariska':
 				'"Hey, Lariska."'
 				'"Hi, <<$pcs_nickname>>. You know Christina will throw a fit if she sees you talking to me."'
 				'"Fuck her. I''m not afraid."'
-				'Your attitude seems to embolden her a bit, as she stands a bit straighter and actually talks to you for a while. Break eventually ends and she waves goodbye with a secret little smile on her face meant just for you.'
+				'Your attitude seems to embolden her a bit, as she stands a bit straighter and actually talks to you for a while.'
+				func('npc_reactions', 'general', 'A13')
+				'Break eventually ends and she waves goodbye with a secret little smile on her face meant just for you.'
 			elseif npc_rel['A13'] <= 20:
 				'Lariska sees you in the hallway walking towards her and stands up, looking nervous.'
 				'"Hey Lariska."'
@@ -1311,6 +1387,7 @@ if $ARGS[0] = 'lariska':
 				'"I would be careful talking like that. If she hears you..."'
 				'You shrug again. "I''m not afraid of her."'
 				'Changing the subject, the two of you gossip for the rest of break.'
+				func('npc_reactions', 'general', 'A13')
 			elseif npc_rel['A13'] <= 20:
 				'"So where''s the old ball and chain?" you ask teasingly.'
 				'"Oh shut up, <<$pcs_nickname>>! Don''t you have anything better to do? At least I have friends!" she fires back.'
@@ -1406,6 +1483,7 @@ if $ARGS[0] = 'ivan':
 			'You nod at what he says. "Sure Ivan, I understand. I''m okay with just being friends, really close friends who sometimes fool around in the shower..." you say in your best sexy voice with a wink.'
 			'He gives you a one armed hug. "<<$pcs_nickname>>, you''re the best! Not only are you smoking hot, but you''re a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses and looks around before leaning in close. "Or if you get a little bored during lunch break, you can let me know too..." he says with a suggestive tone and waggled eyebrows.'
 			'You laugh at his silly antics. It''s nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
+			func('npc_reactions', 'general', 'A3')
 
 			if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -1418,6 +1496,7 @@ if $ARGS[0] = 'ivan':
 		if rand(0,4) = 0:
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/School/ivan2.jpg"></center>'
+			func('npc_reactions', 'general', 'A3')
 			'You begin chatting with Ivan when he leans toward you and whispers in your ear. "Tell me you''re bored <<$pcs_nickname>>."'
 			act 'Go with him':gt 'gdksport', 'Ivan_bored'
 		else
@@ -1425,6 +1504,7 @@ if $ARGS[0] = 'ivan':
 		end
 !! Since Ivan is only asking about the current day, not indefinitely, might be good to use a daystart variable here and in the scene in gdksport IvanShowerYes guards (IvanShowerDayStart or something)
 	elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
+		func('npc_reactions', 'general', 'A3')
 		'As you''re about to head for your next class, Ivan suddenly stops you. "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 		act 'Decline':
 			cla
@@ -1447,6 +1527,7 @@ if $ARGS[0] = 'ivan':
 			'"You sure know how to play this game, I''ll give you that," he replies. You flirt back and forth with each other for the next few minutes. The air between you is almost glowing. "By the way, if you ever decide you want to train your ass, let me know. I can help you with that." Ivan winks.'
 			'"I have a feeling you''re talking about a very tiring and deeeeep workout plan..." you reply. "Is there ever a time when your mind isn''t on butts?"'
 			'"Hardly ever..." he replies. Following his gaze with your eyes, you see him looking at your ass. He''s about to continue his sentence, but the bell rings, so you both start walking towards the classroom.'
+			func('npc_reactions', 'general', 'A3')
 		elseif npc_rel['A3'] <= 20:
 			'"Hello handsome!" you greet Ivan as you approach him in the corridor.'
 			'"What do you want <<$pcs_nickname>>?" he asks, barely looking at you. "Whatever it is, I''m not interested." he adds in a cold tone.'
@@ -1469,6 +1550,7 @@ if $ARGS[0] = 'ivan':
 			'"I can''t let anything hold me back. It''s the only thing that can help me achieve my goals and give my family everything they deserve," he says. You can tell he''s very determined and that he doesn''t take things lightly.'
 			'"Still, sometimes you have to let go a little. You know, make friends. I don''t even see you with anyone else but Fedor. Go out and have fun. Enjoy life, especially while you''re young." you try to convince him. "Or even ask a girl out on a date...." you add quietly, trying to avoid his gaze.'
 			'As you wait for his response, the bell rings. "I''ll try to take your advice. But no dating, I certainly can''t get anyone pregnant by accident." he replies before walking towards the classroom. You do the same, thinking that the rumours about him might be true.'
+			func('npc_reactions', 'general', 'A3')
 			act 'Teach me to box':
 				*clr & cla
 				!!ivanQW['ivan_boxing_invite'] = 1
@@ -1492,6 +1574,7 @@ if $ARGS[0] = 'ivan':
 			*nl
 			'"I don''t have much free time anyway..." he says in a slightly tired voice. You wait for him to continue, but he doesn''t seem to be in much of a talking mood. Although he listens to what you have to say, he doesn''t add much to it.'
 			'You continue talking for the next few minutes, touching on many topics and trying to get him to speak, but he still prefers to listen.'
+			func('npc_reactions', 'general', 'A3')
 			'The bell then rings and Ivan gets up and starts walking towards the classroom. Halfway there, he turns around. "If you really don''t know what to do, you can always come and watch my next match."'
 		end
 	elseif grupTipe = 2:
@@ -1504,6 +1587,7 @@ if $ARGS[0] = 'ivan':
 			'While you''re watching the video, Ivan shares a few useful techniques he thinks you can benefit from. Useful tips on agility, stamina and endurance, as well as some squatting techniques. "If you do this exercise, you''ll have the hardest butt in school..." he says as his gaze shifts from your eyes to your ass.'
 			'You playfully slap your ass and giggle. "Then you''ll have to share more of your secret information with me next time. I can''t settle for the second place."'
 			'Time almost flies, and you almost don''t even notice the bell ringing. "We''ll continue this next time, champ!" you say and head for the classroom. As you walk away, you can almost feel Ivan''s eyes on your ass and wonder why he''s so obsessed with it.'
+			func('npc_reactions', 'general', 'A3')
 			act 'Teach me to box':
 				*clr & cla
 				!!ivanQW['ivan_boxing_invite'] = 1
@@ -1526,6 +1610,7 @@ if $ARGS[0] = 'ivan':
 			'"I can''t slack off, I have to do my best every day." he says before telling you how important boxing is to him. It''s a good chance for him to break out so he can help his mom financially and provide his family a better life.'
 			'You put your hand on his shoulder understandingly and try to say a few words, but he cuts you off. "I''m sorry, but I have to go now. I have to discuss a few things with Fedor."'
 			'It seems that, although he''s glad you listen to him and are supportive, he''s not so keen to hear about your affairs. With not much time left of the break, you head for the classroom and wait for the lesson to start.'
+			func('npc_reactions', 'general', 'A3')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A3'] >= 50:
@@ -1537,6 +1622,7 @@ if $ARGS[0] = 'ivan':
 			'"Look at that! Little <<$pcs_nickname>> is starting to box?" he laughs. "Relax, you know I''m just kidding. Who would think that physics and maths would make someone a boxing coach?" he continues, and punches you in the shoulder jokingly.'
 			'You talk for the rest of the break, although it''s mainly Ivan who does the talking. He explains the training plans he''s been working with Fedor to improve his pace and agility. When he hears the bell ring, he turns to you. "Don''t forget to give the girls tips on how to improve their squats. You know, to get achieve the perfect shape." he winks.'
 			'"Ah, you never change," you reply while rolling your eyes before grabbing your stuff and heading to the classroom to wait for your next lesson.'
+			func('npc_reactions', 'general', 'A3')
 		elseif npc_rel['A3'] <= 20:
 			'When you reach the hallway, you see Ivan standing by his locker, looking for something. You approach him and try to talk to him. "Hi Ivan, are you looking for something?"'
 			'He closes the locker door and looks at you. "Hey, I didn''t notice you. As a matter of fact yes, I''m looking for something, so if you don''t mind I''ll be going now." he says as he grabs his backpack.'
@@ -1548,6 +1634,7 @@ if $ARGS[0] = 'ivan':
 			'"Hi <<$pcs_nickname>>, fine..." he replies as he looks around. When he sees that everyone is busy or talking to someone, he sits on the floor and gestures for you to sit next to him.'
 			'You start chatting about everything from school, to sports and reading. After a while, Ivan starts talking about how he tried to help his younger siblings learn. "It''s important that they get a good education. I want them to achieve something in life." he says with a serious look in his eyes.'
 			'"That''s very thoughtful of you. If you want, I can share some tips." you reply. For the next few minutes, you share a few tips on how he can help them as much as possible and how he could make learning enjoyable for them.'
+			func('npc_reactions', 'general', 'A3')
 			'After a while, you stand up. "I''ll be going now. I want to revise my homework one more time before class." you say before heading off to the classroom.'
 		end
 	elseif grupTipe = 4:
@@ -1560,6 +1647,7 @@ if $ARGS[0] = 'ivan':
 			'"You can always find me in the community center if you''d like to bet your ass," he says and you can see his eyes running down your ass.'
 			'"Oh, shut up!" you reply as you slap his cheek playfully. "I''d rather you be quiet and just listen to me." you say before you start talking about what''s been going on with you lately.'
 			'Time passes quickly, and you soon hear the bell ring. "Well, I guess that means no more fun." you sigh, and you start walking towards the classroom together.'
+			func('npc_reactions', 'general', 'A3')
 			act 'Teach me to box':
 				*clr & cla
 				!!ivanQW['ivan_boxing_invite'] = 1
@@ -1581,6 +1669,7 @@ if $ARGS[0] = 'ivan':
 			'He''s not in a great mood, and keeps looking in the direction of the others, as if expecting one of them to do something. He sighs and realizes he has no other choice than to share a thing or two about what''s been going on with him lately.'
 			*nl
 			'"Booooring!" you say as you roll your eyes. "You should do more things, get some free time or you''ll miss the best time of your life."'
+			func('npc_reactions', 'general', 'A3')
 			'"You know, I don''t really have time for anything other than training and doing some important things at home." he says, then complains about how although he''d like to be a bit more social, he can''t afford to be distracted by anything.'
 			'"I was hoping you''d tell me something more interesting, though. I''m probably more bored now than I was before!" you say jokingly before standing up, dusting yourself off and walking away while waving at him.'
 		end
@@ -1588,6 +1677,7 @@ if $ARGS[0] = 'ivan':
 		if npc_rel['A3'] >= 50:
 			'"Hi <<$pcs_nickname>>." Ivan greets you as you approach him.'
 			'"Hi Ivan. I don''t really have much to do and I saw you were standing here all alone, so I thought we could talk? What''s been going on with you lately?" you ask as you lean against the wall. You give him a friendly smile and listen to him.'
+			func('npc_reactions', 'general', 'A3')
 			'He leans against the wall and spends the next few minutes talking about the boxing techniques he''s trying to master, the training sessions he''s had with Fedor, and of course a few fights with Vitek.'
 			'"And do you have any exciting plans? Like, are you going to meet someone and hang out, or are you going to go to the disco for a change?" you ask curiously. "If you''re not careful, you might end up a friendless outcast."'
 			*nl
@@ -1603,6 +1693,7 @@ if $ARGS[0] = 'ivan':
 			'You see Ivan looking at something on his phone and decide to approach him. "Hi Ivan, what are you looking at?" you ask as you lean over and look at the screen.'
 			'"Oh, hello <<$pcs_nickname>>, nothing important. I''m looking at some new boxing gear, and boxing shoes and bindings. You know, it''s very important to have the right grip so you don''t get hurt."'
 			'For the next few minutes, you look at the range of products in an online shop together. He sometimes comments on what different products are good for.'
+			func('npc_reactions', 'general', 'A3')
 			'Although you don''t really talk, he tolerates you enough not to send you away. A few minutes go by when he says "I''m going to show these to Fedor." With that, he leaves.'
 			'There''s still a few minutes left of the break, so you decide to walk around a bit before heading back to the classroom.'
 		end

locations/gschool_lessons.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'short_break':
 			school_period = 6
 			gt 'gschool_lessons', 'short_break'
 		end
-		if NikoVolkovQW = 10 and NikoEv = 12: school_lunch = 1 & school_period = 6 & gt 'NikoDreams', 'Classroom Dream'
+		if NikoVolkovQW = 10 and NikoEv = 12: school_lunch = 1 & school_period = 6 & gt 'NikoDreams', 'classroom_dream'
 	elseif school_period = 6:
 		if $ARGS[1] = '':
 			if hour = 10:

locations/gschool_lunch.qsrc

@@ -48,10 +48,10 @@ if $ARGS[0] = 'cafeteria':
 	if school_lunch = 0:
 		if NikoVolkovQW = 5 and NikoEv = 5 and NikoDate = 0 and NikoDate_Day ! daystart:
 			school_lunch = 1
-			gt 'NikoDates', 'Hallway Strip'
+			gt 'NikoDates', 'hallway_strip'
 		elseif NikoVolkovQW = 10 and NikoEv = 12:
 			school_lunch = 1
-			gt 'NikoDreams', 'Classroom Dream'
+			gt 'NikoDreams', 'classroom_dream'
 		elseif NikoVolkovQW = 10 and NikoEv = 13 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'break':
 			gt 'NikoEv', 'Date Intro'
 		elseif NikoVolkovQW = 5 and NikoEv = 4 and NikoDate = 0:
 			lunch_event = daystart
-			gt 'NikoDates', 'Cafeteria'
+			gt 'NikoDates', 'cafeteria'
 		elseif NikoPayback = 2 and FedorVsNiko = 1:
 			gt 'NikoPayback', 'Fedor Help 2'
 		elseif NikoPayback = 2 and FyodorVsNiko = 1:

locations/gschool_nerd_chats.qsrc

@@ -9,6 +9,7 @@ if $ARGS[0] = 'artem':
 	if artQW = 3 or artQW = 20:
 		npc_rel['A2'] += 1
 		'Artem notices you walking over, 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.'
+		func('npc_reactions', 'general', 'A2')
 	elseif npc_rel['A2'] >= 50 and fame['pav_slut'] < 200:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
@@ -22,6 +23,7 @@ if $ARGS[0] = 'artem':
 			'"You mean actually tutoring them or just doing their work for them?" you ask suspiciously with a raised brow.'
 			'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, well, I''m happy to help if I can," he replies before quickly changing the subject. You decide not to insist and keep him company while he works.'
 		end
+		func('npc_reactions', 'general', 'A2')
 	elseif npc_rel['A2'] <= 20 and fame['pav_slut'] < 200:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
@@ -29,11 +31,13 @@ if $ARGS[0] = 'artem':
 		else
 			'"Sorry <<$pcs_nickname>>, but why are you talking to me? We''re not exactly friends you know..." Artem asks weakly. He''s careful not to offend you, but it''s clear he''s hesitant to talk to you.'
 		end
+		func('npc_reactions', 'general', 'A2')
 	elseif fame['pav_slut'] >= 200:
 		'When he sees you walking over, he gives you a disgusted look. "Get away from me, you disgusting slut!" he says as he moves away from you.'
 	else
 		npc_rel['A2'] += 1
 		'You strike up a conversation with Artem. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+		func('npc_reactions', 'general', 'A2')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if artemLernQW = 0 and npc_rel['A2'] > 20:
@@ -66,33 +70,40 @@ if $ARGS[0] = 'petka':
 			'He nods. "Oh yeah... Um... Hi? I''m real sorry about... You know..." he says while looking around. You know exactly what he means.'
 			'You nod. "Thanks. It''s my cross to bear."'
 			'He smiles and nods before looking back down at his book. "This book is crazy interesting!" From this point on, he doesn''t ignore you, but mostly pays attention to his book. You know he''s afraid of what will happen if he''s seen talking to you.'
+			func('npc_reactions', 'general', 'A6')
 		elseif npc_rel['A6'] <= 20:
 			'When he sees you walking over, he gives you a disgusted look. "Get away from me, you disgusting slut!" he says as he moves away from you.'
 		else
 			'"Oh hey <<$pcs_nickname>>. Did you say something?" He smiles tightly at you as he puts his book down. Before you can even respond, he continues. "This book is crazy interesting!" From this point on, he doesn''t ignore you, but mostly pays attention to his book. You know he''s afraid of what will happen if he''s seen talking to you.'
+			func('npc_reactions', 'general', 'A6')
 		end
 	elseif grupTipe = 1 or grupTipe = 2:
 		if npc_rel['A6'] >= 60:
 			'"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!" Before you know it, he''s going on and on about all the interesting characters, plot holes and themes in the book.'
+			func('npc_reactions', 'general', 'A6')
 		elseif npc_rel['A6'] <= 20:
 			if grupTipe = 2:
 				'When you approach him, he gives you a fearful look. "Please don''t."'
 				'You smile at him. "Please don''t what?"'
 				'He sighs. "Pick on me. Isn''t that why you''re here?"'
 				'You shake your head. "I''m not going to pick on you, I just wanted to say hi." You talk to him and he responds, but you can tell he''s expecting you to do something at any moment.'
+				func('npc_reactions', 'general', 'A6')
 			else
 				'You try talking to Petka, but it''s very one-sided with you doing all the talking until he 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," he says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind..."'
 			end
 		else
 			'You strike up a conversation with Petka. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			func('npc_reactions', 'general', 'A6')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A6'] >= 50:
 			'"You really have to read this book <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy!" Petka says excitedly. He starts telling you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you."'
+			func('npc_reactions', 'general', 'A6')
 		elseif npc_rel['A6'] <= 20:
 			'"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 really have to read this book <<$pcs_nickname>>!" Petka says excitedly. He starts telling you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you in case you want to read it for yourself."'
+			func('npc_reactions', 'general', 'A6')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A6'] >= 70:
@@ -106,6 +117,7 @@ if $ARGS[0] = 'petka':
 			'He sighs. "Pick on me. Isn''t that why you''re here?"'
 			'You shake your head. "I''m not going to pick on you, I just wanted to say hi." You talk to him and he responds, but you can tell he''s expecting you to do something at any moment.'
 		end
+		func('npc_reactions', 'general', 'A6')
 	else
 		if npc_rel['A6'] >= 70:
 			'"Oh hey <<$pcs_nickname>>. Did you say something? I don''t think I heard you." He smiles sheepishly as he puts his book down.'
@@ -113,10 +125,12 @@ if $ARGS[0] = 'petka':
 			'He nods. "Oh yeah... Um... Hi? I''m real sorry about... You know..." he says while looking around. You know he means about you being an outcast.'
 			'You nod. "Thanks. It''s my cross to bear."'
 			'He smiles and nods before looking back down at his book. "This book is crazy interesting!" From this point on, he doesn''t ignore you, but mostly pays attention to his book. You know he''s afraid of what will happen if he''s seen talking to you.'
+			func('npc_reactions', 'general', 'A6')
 		elseif npc_rel['A6'] <= 20:
 			'When he sees you walking over, he gives you an annoyed look. "Please don''t bother me, I''m busy." he says as he moves away from you.'
 		else
 			'"Oh hey <<$pcs_nickname>>. Did you say something?" He smiles tightly at you as he puts his book down. Before you can even respond, he continues. "This book is crazy interesting." He tells you, from here he doesn''t exactly ignore you but he also mostly pays attention to the book, you know he is afraid of what it will do to his rep if he is seen talking to you.'
+			func('npc_reactions', 'general', 'A6')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -177,6 +191,7 @@ if $ARGS[0] = 'julia':
 		else
 			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure thing, <<$pcs_nickname>>. That could be fun!"'
 		end
+		func('npc_reactions', 'general', 'A12')
 	elseif fame['pav_slut'] >= 175:
 		if npc_rel['A12'] >= 50:
 			'A thin smile appears on Julia''s lips. "Hi <<$pcs_nickname>>." She chews her lip before releasing a sigh. "Look, don''t take this the wrong way. I like you, but..." A moment of awkward silence hangs in the air as Julia''s eyes refuse to face you. "With your reputation... It might be better if you stayed away for a bit. Radomir..." she sighs. "I... don''t want to give him more avenues to do something, you know?"'
@@ -201,6 +216,7 @@ if $ARGS[0] = 'julia':
 		else
 			'"Hi <<$pcs_nickname>>! Great to see you. Say, did you see the photos of that latest G&M catalogue? The camera work feels off, like they hired a blind amateur. Or my brother... It''s a similar level of skill, honestly," she says before pausing. "I''m joking. A blind person knows more about proper composition than Misha."'
 		end
+		func('npc_reactions', 'general', 'A12')
 	elseif grupTipe = 2:
 		if npc_rel['A12'] >= 50:
 			if hotcat >= 6:
@@ -217,6 +233,7 @@ if $ARGS[0] = 'julia':
 				'Julia breaks from her schoolwork and looks up. "Hello <<$pcs_nickname>>! Nice to see you! So, uhm, right. Did you see that football game? Uhm, you know, Zenit against... uhm... I think it was Moscow? They did good, right?" she offers awkwardly.'
 			end
 		end
+		func('npc_reactions', 'general', 'A12')
 	elseif grupTipe = 3:
 		if npc_rel['A12'] >= 50:
 			if hotcat >= 6:
@@ -232,6 +249,7 @@ if $ARGS[0] = 'julia':
 					'Julia smiles. "Hey <<$pcs_nickname>>! So, what did you think of Feofan''s game? I think it has potential, but I wonder how to progress..."'
 				end
 			end
+			func('npc_reactions', 'general', 'A12')
 		elseif npc_rel['A12'] <= 20:
 			if hotcat >= 6:
 				'You try to talk to Julia, but the conversation quickly becomes one-sided. Her focus is lost in schoolwork as she absent-mindedly murmurs in agreement to anything you say, but you do manage to draw a few glances without breaking her concentration completely.'
@@ -245,6 +263,7 @@ if $ARGS[0] = 'julia':
 				'You approach Julia and find her warming to your presence. "Hi <<$pcs_nickname>>! Nice to see you! Say, did you hear about Zina? She broke my record in Subway Surfers again!" She sticks her tongue out at her friend. Zina, sitting across the room with her phone capturing her full attention, doesn''t notice her. "I did manage to beat her in Street Fighter though." You hear murmurs of cheating from around the room, eliciting a chuckle from Julia.'
 			end
 		end
+		func('npc_reactions', 'general', 'A12')
 	elseif grupTipe = 4:
 		if npc_rel['A12'] >= 50:
 			if hotcat >= 6:
@@ -265,6 +284,7 @@ if $ARGS[0] = 'julia':
 				'Julia greets you anxiously. The two of you chat awkwardly as she distracts herself with schoolwork. From time to time, she looks up at you with a nervous smile.'
 			end
 		end
+		func('npc_reactions', 'general', 'A12')
 	else
 		if npc_rel['A12'] >= 50:
 			'Julia smiles. No longer the quiet girl you first met, she speaks with an easy confidence as two of you cover a wide range of topics, such as photography, video games, and surprisingly, motorbikes.'
@@ -277,6 +297,7 @@ if $ARGS[0] = 'julia':
 		else
 			'Julia looks up from her schoolwork. You manage to steal some of her attention away from her books as the two of you chat efficiently and comfortably.'
 		end
+		func('npc_reactions', 'general', 'A12')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
@@ -385,9 +406,11 @@ if $ARGS[0] = 'natasha':
 		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
+		func('npc_reactions', 'general', 'A16')
 	elseif npc_rel['A16'] <= 20 and fame['pav_slut'] < 200:
 		if grupTipe = 3:
 			'Natasha isn''t really interested in talking to you, but you persist in trying to keep up a conversation. "Hey, I''ve gotta go... do this thing. I guess I''ll see you later?" she says halfheartedly.'
+			func('npc_reactions', 'general', 'A16')
 		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.'
 		end
@@ -395,6 +418,7 @@ if $ARGS[0] = 'natasha':
 		'When she sees you walking over, she gives you a disgusted look. "Get away from me, you disgusting slut!" she says as she moves away from you.'
 	else
 		'You strike up a conversation with Natasha. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+		func('npc_reactions', 'general', 'A16')
 	end
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -451,6 +475,7 @@ if $ARGS[0] = 'evgeny':
 	elseif grupTipe = 1:
 		if npc_rel['A151'] >= 50:
 			'Evngey looks up at you and sees you approaching before going back to his chess board. "Hey <<$pcs_nickname>>." You have a delightful conversation while ignoring the odd looks your peers give you.'
+			func('npc_reactions', 'general', 'A151')
 		elseif npc_rel['A151'] <= 20:
 			'Evgeny looks at you in confusion. He cuts you off as you attempt to greet him. "Your friends aren''t here and I''m busy!" he retorts before going back to playing chess with himself. Any further attempts at conversation are ignored.'
 		else
@@ -459,6 +484,7 @@ if $ARGS[0] = 'evgeny':
 	elseif grupTipe = 2:
 		if npc_rel['A151'] >= 50:
 			'"Hey <<$pcs_nickname>>." He holds out his hand, which you proceed to highfive. He then quickly goes back to his chess board. You have a somewhat engaging conversation as Evgeny is rather focused on his chess match against himself while both of you are ignorant to the odd looks your peers give you.'
+			func('npc_reactions', 'general', 'A151')
 		elseif npc_rel['A151'] <= 20:
 			'As you apporach, Evgeny looks at you with a frown. "I don''t have time for you. I''m busy!" Evgeny dismisses you and leaves.'
 		else
@@ -467,6 +493,7 @@ if $ARGS[0] = 'evgeny':
 	elseif grupTipe = 3:
 		if npc_rel['A151'] >= 50:
 			'"In chess, you should be as cool as a cucumber," Evgeny says without you asking his opinion on the matter and you can''t help but laugh. You have a somewhat engaging conversation as Evgeny is rather focused on his chess match against himself, but go along with it nonetheless and silently watch him.'
+			func('npc_reactions', 'general', 'A151')
 		elseif npc_rel['A151'] <= 20:
 			'You strike up a conversation with Evgeny and he sighs and looks up from his chessboard. "Look, I don''t want to be mean, but we aren''t really friends and I''m busy..." He goes back to his chess match and ignores any other attempts at conversation.'
 		else
@@ -475,6 +502,7 @@ if $ARGS[0] = 'evgeny':
 	elseif grupTipe = 4:
 		if npc_rel['A151'] >= 50:
 			'You approach Evgeny and sit next to him as he plays chess. "Hello," he meekly responds to your greeting and you have a somewhat one sided conversation. He seems to enjoy your company, but is still intimidated by you.'
+			func('npc_reactions', 'general', 'A151')
 		elseif npc_rel['A151'] <= 20:
 			'As you approach Evgeny, he immediately packs up his chessboard. "I don''t want any trouble!" He gets up and leaves in a hurry.'
 		else
@@ -483,10 +511,12 @@ if $ARGS[0] = 'evgeny':
 	else
 		if npc_rel['A151'] >= 50:
 			'"In chess, you should be as cool as a cucumber," Evgeny says without you asking his opinion on the matter and you can''t help but laugh. You have a somewhat engaging conversation as Evgeny is rather focused on his chess match against himself, but go along with it nonetheless and silently watch him.'
+			func('npc_reactions', 'general', 'A151')
 		elseif npc_rel['A151'] <= 20:
 			'"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.'
 		else
 			'You strike up a conversation with Evgeny. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			func('npc_reactions', 'general', 'A151')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -510,48 +540,58 @@ if $ARGS[0] = 'feofan':
 			'"Hey <<$pcs_nickname>>, I was just thinking about how much you look like a character from one of my shows!" He shows you images of an attractive looking girl in a tight fitting outfit. "She gets kidnapped all the time and has to be rescued, but I think you could easily pull her off."'
 			'You give him a sly grin. "Oh so I''m supposed to be kidnapped and tied up so you can come and rescue me?"'
 			'He blushes bright red while looking awkwardly at the floor. "I didn''t mean it like that..." You can''t help but smile at his reaction before engaging him in another conversation.'
+			func('npc_reactions', 'general', 'A152')
 		elseif npc_rel['A152'] <= 20:
 			'"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 anything..." he says with a suspicious look. "Listen. I''m just busy at the moment, so..." He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk with you.'
 		else
 			'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in a rather one sided conversation about sci-fi, comic books and fantasy role play.'
+			func('npc_reactions', 'general', 'A152')
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A152'] >= 50:
 			'"Hey <<$pcs_nickname>>, I was just thinking about what great shape you''re in and how you could easily do a cosplay!" He goes on to describe and show you images of a heavily sexualized comic book character wearing a rather skimpy outfit.'
 			'"What the fuck, Feofan? You want me to parade myself around in <i>that</i>?"'
 			'He looks dejectedly at the floor. "Sorry, I just thought that you would enjoy it was all." You sigh and shake your head at him in disappointment before changing the subject.'
+			func('npc_reactions', 'general', 'A152')
 		elseif npc_rel['A152'] <= 20:
 			'"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 anything..." he says with a suspicious look. "Listen. I''m just busy at the moment, so..." He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk with you.'
 		else
 			'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in a rather one sided conversation about sci-fi, comic books and fantasy role play.'
+			func('npc_reactions', 'general', 'A152')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A152'] >= 50:
 			'"I can''t believe this..." he mutters as you approach. "Someone on the 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 his phone screen. "I can''t read anymore of this blasphemy!" he finishes with a heavy sigh before he starts filling you in on his plans for the next game night.'
+			func('npc_reactions', 'general', 'A152')
 		elseif npc_rel['A152'] <= 20:
 			'He 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 need to go... do this thing..."'
 			'"I''ll see you later then?" you ask with a small smile.'
 			'"I guess so..." he halfheartedly replies with an awkward laugh before dashing off.'
 		else
 			'Feofan is busy on his phone when you approach, but flashes you a quick smile when he sees you. "There''s this Star Trek convention going on, but it''s out of town. I wish I could go..." He''s clearly saddened by this, but gives you a dismissive shrug of his shoulders before going on to talk about other conventions he has attended.'	
+			func('npc_reactions', 'general', 'A152')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A152'] >= 50:
 			'He smiles as you approach. "You know that you remind me of a character from a show that I watch? She kicks ass and everything, just like you!"'
 			'You give him a confused stare. "Are you saying that I''m like one of your dumb geeky characters?"'
 			'He raises his hands in defense. "No, no! I''m just saying you remind me of her is all." You smile at his reaction before engaging him in another conversation.'
+			func('npc_reactions', 'general', 'A152')
 		elseif npc_rel['A152'] <= 20:
 			'"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 anything..." he says with a suspicious look. "Listen. I''m just busy at the moment, so..." He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk with you.'
 		else
 			'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in a rather one sided conversation about sci-fi, comic books and fantasy role play.'
+			func('npc_reactions', 'general', 'A152')
 		end
 	else
 		if npc_rel['A152'] >= 50:
 			'You approach Feofan and engage him in conversation. His fellow nerds give him dirty looks, but he ignores them and continues speaking with you, telling you about the latest convention he attended and what cosplay outfit he wore.'
+			func('npc_reactions', 'general', 'A152')
 		elseif npc_rel['A152'] <= 20:
 			'"Why are you talking to me? It''s not like we''re in the same social circle. You''re not even in one!" He makes no attempt to hide the fact that he doesn''t want to talk to you.'
 		else
 			'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in a rather one sided conversation about sci-fi, comic books and fantasy role play. His fellow nerds give him dirty looks, but he ignores them and continues speaking with you.'
+			func('npc_reactions', 'general', 'A152')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -633,24 +673,29 @@ if $ARGS[0] = 'gerasim':
 	elseif grupTipe = 1 or grupTipe = 2:
 		if npc_rel['A153'] >= 50:
 			'"Oh hello <<$pcs_nickname>>," Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously and 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. The two of you talk while he does the work.'
+			func('npc_reactions', 'general', 'A153')
 		elseif npc_rel['A153'] <= 20:
 			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all the talking until he 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..." he says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind..."'
 		else
 			'"Oh hello <<$pcs_nickname>>," Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously and realize he''s doing someone else''s homework. "I''m a little busy," he adds with a small laugh.'
 			'"Mind if I keep you company while you work?" you ask.'
 			'He pauses for a moment before nodding. "Sure, I don''t mind. I just need to make sure I get this done." The two of you talk for a while as you make sure not to disturb him too much so he can get the work done.'
+			func('npc_reactions', 'general', 'A153')
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A153'] >= 50:
 			'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 though <<$pcs_nickname>>." The two of you talk while he does the work.'
+			func('npc_reactions', 'general', 'A153')
 		elseif npc_rel['A153'] <= 20:
 			'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 strike up a conversation with Gerasim. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			func('npc_reactions', 'general', 'A153')
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A153'] >= 50:
 			'"Oh hello <<$pcs_nickname>>, you''re not going to pick on me are you?" Gerasim asks with a sheepish smile. You think he''s joking as you shake your head and watch him move the papers on his desk around nervously. 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. The two of you talk while he does the work.'
+			func('npc_reactions', 'general', 'A153')
 		elseif npc_rel['A153'] <= 20:
 			'You walk up to Gerasim, who gives you a fearful look, apparently expecting you to bully him. You smile at him. "Don''t worry, I''m not going to do anything, so just relax."'
 			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all the talking until he 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..." he says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind..."'
@@ -658,16 +703,19 @@ if $ARGS[0] = 'gerasim':
 			'"Oh hello <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously and realize he''s doing someone else''s homework. "I''m a little busy," he adds with a small laugh.'
 			'"Mind if I keep you company while you work?" you ask.'
 			'He pauses for a moment before nodding. "Sure, I don''t mind. I just need to make sure I get this done." The two of you talk for a while as you make sure not to disturb him too much so he can get the work done.'
+			func('npc_reactions', 'general', 'A153')
 		end
 	else
 		if npc_rel['A153'] >= 50:
 			'"Oh hello <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously and 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. The two of you talk while he does the work.'
+			func('npc_reactions', 'general', 'A153')
 		elseif npc_rel['A153'] <= 20:
 			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all the talking until he 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..." he says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind..."'
 		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. "I''m a little busy," he adds with a small laugh.'
 			'"Mind if I keep you company while you work?" you ask.'
 			'He pauses for a moment before sighing. "Just... I need to get this done so..." You can tell he''s trying to politely tell you not to bother him, so you sit with him and only occasionally say something, which he responds to but never adds much more than that.'
+			func('npc_reactions', 'general', 'A153')
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -690,6 +738,7 @@ if $ARGS[0] = 'zinaida':
 			'She looks at you and smiles. "You really think so? Sometimes I dream about it, but the truth is I don''t think I could ever compete with most of them." You sense the lack of confidence and despair in her voice.'
 			'"Come on, you''re good! We must do something with your looks, though. Some of those who watch streamers are just nasty pervs who only like pretty girls. They care more about your tits than your gaming skill, trust me!" you say while trying to straighten her tangled hair.'
 			'You go on talking about how she could improve her looks, giving her some tips about makeup and other techniques. You try to teach her something about flirting, too. When you hear the bell, you both sit back on your seat and wait for the teacher to arrive.'
+			func('npc_reactions', 'general', 'A142')
 		elseif npc_rel['A142'] <= 20:
 			'"Hey Zinaida! How''s it going?" you ask when you notice her lost in her phone.'
 			'She doesn''t even look at you. "Sorry <<$pcs_nickname>>, but I''m very busy with this now and I don''t think we have anything to say each other anyway, considering we have two very different hobbies..."'
@@ -705,6 +754,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'When you''re tired of standing, you sit next to her on the desk. She glances at you and moves back a little. She doesn''t tell you to leave, but it''s very clear she wouldn''t like to be associated with you in any way.'
 			'You watch her playing for a few minutes while occasionally asking about the game. She only shrugs or gives you a one-word answer.'
+			func('npc_reactions', 'general', 'A142')
 			'You don''t want to bother her more, so you wish her good luck with the game and go back to your desk to wait for the next lesson.'
 		end
 	elseif grupTipe = 1:
@@ -717,6 +767,7 @@ if $ARGS[0] = 'zinaida':
 			'She pauses the game and starts to explain what it is. "It''s a fantasy roleplaying game where you can choose a character and customize it as much as you want. Look, you can have different hair styles, clothes, accessories..."'
 			'You start talking about the look of the character and she shows you the uncountable items that you can wear, from armor to weapons and clothes.'
 			'"Oh look, if you match those ones, they will look pretty," you say and she nods and continues browsing some other matching items to that outfit. Although she''s not into fashion at all, and she barely pays attention to her own appearance, you must admit she does it quite well in these games.'
+			func('npc_reactions', 'general', 'A142')
 			'You silent ponder your thought before you hear the bell ringing. "See you later, Zina!" you say as you go back to your own seat.'
 		elseif npc_rel['A142'] <= 20:
 			'It''s one of the rare moments when Zinaida isn''t playing on her phone and is talking to her fellow nerds. You think it could be a good chance to talk with her, so you approach her.'
@@ -734,6 +785,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'"Yeah, I play a lot on my phone, but that doesn''t mean..." she starts to say then looks around, hoping someone will intervene and save her from this conversation. "Fine, let me see..." she says when she realizes there''s no way out.'
 			'Although she''s not happy about it, she helps you as much as she can. She''s not even half done when you hear the bell and she gives your phone back. "You hear that? The teacher will be here any second, so next time maybe?"'
+			func('npc_reactions', 'general', 'A142')
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A142'] >= 50:
@@ -744,6 +796,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'She listens to every word you say and nods whenever she agrees with you. You don''t belong to the same social group and you have very different lifestyles, but despite all that, you get along very well. In fact, you both admire and acknowledge each other''s competitive personalities.'
 			'She starts talking about the latest games and complains about some players, especially about cheaters who destory the game. You continue chatting about different topics until you hear the bell.'
+			func('npc_reactions', 'general', 'A142')
 			'"Okay <<$pcs_nickname>>, it was really nice to talk, but the lesson is about to start so we should take our seats. Hopefully, we can talk more next time," she says with a smile on her face.'
 		elseif npc_rel['A142'] <= 20:
 			'You see Zinaida sitting at her desk and try to strike up a conversation with her. "Hey Zinaida, how''re you doing?"'
@@ -759,6 +812,7 @@ if $ARGS[0] = 'zinaida':
 			'You start talking about different topics, but she mostly goes on about the latest games and the characters in them, while you talk about everything related to sport.'
 			*nl
 			'You also talk about how sport is evolving today. Analytics is becoming more and more important, so maths and physics also play a role in the development of sport and individual performance. "That''s so interesting! Who knew sports and maths could be connected?" she says.'
+			func('npc_reactions', 'general', 'A142')
 			'After spending a few more minutes talking, you hear the bell signaling that the break is over and the next lesson is about to start. "Thanks Zina, talk to you later!" you say as you find your seat.'
 		end
 	elseif grupTipe = 3:
@@ -769,6 +823,7 @@ if $ARGS[0] = 'zinaida':
 			'"These are my latest scores. What do you think?" she asks as she proudly shows you her phone.'
 			*nl
 			'"Wow, those are impressive numbers Zina. I don''t even know what to say!" you reply and see she''s very satisfied and pleased with your acknowledgment.'
+			func('npc_reactions', 'general', 'A142')
 			'For the rest of the break, you talk about school, the role-playing evenings in the community center, books and everything that comes to your mind. At one point, she asks if you''ve heard anything about why some boys whisper about her.'
 			'"No, but don''t even worry about it. It''s probably nothing." You then hear the bell ringing and she goes to take her seat before the teacher arrives.'
 		elseif npc_rel['A142'] <= 20:
@@ -784,6 +839,7 @@ if $ARGS[0] = 'zinaida':
 			'She barely looks up from her phone. "Oh sorry <<$pcs_nickname>>, I hardly noticed you. I''m trying to set a new record in this game. It''s amazing and completely captivating!" she says passionately as she taps the screen. "You should try it out one day!"'
 			*nl
 			'You sit on the desk next to her and watch her playing for a while. She''s very talented and you try to ask her about the game with little success as she''s completely immersed in it and only gives you short answers.'
+			func('npc_reactions', 'general', 'A142')
 			'Time passes quickly as you watch her playing before you hear the bell signaling the end of the break. You find your seat and wait for the teacher to arrive.'
 		end
 	elseif grupTipe = 4:
@@ -795,6 +851,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'"Uhm, I don''t want to wake you up from dreaming <<$pcs_nickname>>, but you''re actually living a life like that!" she says jokingly.'
 			'You give her a serious stare and try to pretend that you''re offended, but burst into laughter. "Huh. Yeah, I guess you''re right, smarty pants."'
+			func('npc_reactions', 'general', 'A142')
 			'After a few minutes, you hear the bell. "Time to go back to living that mousy life of yours <<$pcs_nickname>>," she says with a huge smile.'
 		elseif npc_rel['A142'] <= 20:
 			'You see Zinaida talking to her fellow nerds and decide to strike up a conversation with her. "Hey, what''s up?"'
@@ -812,6 +869,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'"Nah, I''m not interested in games, but I hear the music when you play and I must admit, some of the songs are really cool. I just love listening to them. I might get to know a new song, you know?" you say and start whistling the song being played by the game.'
 			'"Okay." she says and with that she is focusing on the game again.'
+			func('npc_reactions', 'general', 'A142')
 			'You watch her playing for a while, but soon get bored, so you get up and head for the stairs. "Well, maybe next time," you say as you leave.'
 		end
 	else
@@ -822,6 +880,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'You start talking about different topics, including video games, the daily life in Pavlovsk and of course, the school. Not to mention the constant mocking that both of you recieve quite often.'
 			'Soon, you realize that belonging to the nerds is not much better than being an outcast, as you''re both the most common targets of bullying.'
+			func('npc_reactions', 'general', 'A142')
 			'After spending some more time talking, you hear the bell ring and go back to your seat before the next lesson starts.'
 		elseif npc_rel['A142'] <= 20:
 			'"Hey Zinaida," you say as you approach her.'
@@ -839,6 +898,7 @@ if $ARGS[0] = 'zinaida':
 			*nl
 			'She soon starts talking about video games. It seems she doesn''t mind who she''s talking to as long as somebody listens. She tells you some interesting stories that happened to her, and complains about the prices of the games.'
 			'"On the other hand, there are always free games to play..." she continues, but points out why free to play games can be more expensive than some of the most popular video games in the long run.'
+			func('npc_reactions', 'general', 'A142')
 			'After continuing to talk for a few more minutes, she takes her notes out of her backpack. "We''ll continue this next time, maybe. But for now, I''d like to check my homework before the lesson starts. See you." With that, she turns to her desk and starts revising her homework.'
 		end
 	end
@@ -919,6 +979,7 @@ if $ARGS[0] = 'natalia':
 						'"Guess there''s a big mixture of sad and happy stuff then?"'
 						'"Yes. If you like that sort of thing, then it might be worth getting a copy; you can skip one of them if you don''t like it too much." After a brief pause, she continues. "Look <<$pcs_nickname>>, I know you must be tired of me always telling you to improve your reputation, but you seem nice, and I just want to see you happy and not being bullied all the time."'
 						'"Actually, it makes a nice change that someone actually cares and doesn''t mock me. You''re a good friend, Natalia."'
+						func('npc_reactions', 'general', 'A240')
 						'The bell then sounds, so you both head to the next class separately.'
 					end
 				else
@@ -932,6 +993,7 @@ if $ARGS[0] = 'natalia':
 						'"It''s called ''Anna Karenina'' by Leo Tolstoy. It''s about a woman who loves a man that isn''t her husband. It also explores her relationship with her son, to whom she''s totally devoted."'
 						'"Sounds interesting. I bet it won''t end well, though," you reply with a smile.'
 						'"Probably not. It''s written by a Russian after all," she replies with a rueful smile.'
+						func('npc_reactions', 'general', 'A240')
 						'"I think I''d best start heading to class. Bye for now," you say with a smile.'
 					elseif npc_rel['A240'] <= 40:
 						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>..." she says in a quiet voice.'
@@ -942,6 +1004,7 @@ if $ARGS[0] = 'natalia':
 						'"So what''s it called?" you ask.'
 						'"It''s called ''The Master and Margarita'' by Mikhail Bulgakov. It''s quite a famous book. Have you read it?"'
 						'"No, but it does sound interesting. I bet it won''t end well though."'
+						func('npc_reactions', 'general', 'A240')
 						'The bell then sounds, so you start heading to class.'
 					elseif npc_rel['A240'] <= 50:
 						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice with a slight smile.'
@@ -951,7 +1014,9 @@ if $ARGS[0] = 'natalia':
 						'"Sounds sad," you reply.'
 						'"Yes, it is, but is it better for them to have experienced love knowing it was only fleeting, than none at all?"'
 						'"Wow, that''s a deep question," you reply.'
-						'"Yeah, I don''t know which would be worse. Oh, there''s the bell! We should get going to class."'
+						'"Yeah, I don''t know which would be worse."'
+						func('npc_reactions', 'general', 'A240')
+						'"Oh, there''s the bell! We should get going to class."'
 					elseif npc_rel['A240'] <= 70:
 						'Natalia is sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice with a smile.'
 						'"Hey Nat," you say with a friendly smile. "So what book is this?"'
@@ -963,7 +1028,9 @@ if $ARGS[0] = 'natalia':
 						'"But I guess tragedy strikes?" you ask.'
 						'"He gets sent off to war and while at the front, he meets someone else and also falls in love with her. The book explores the torment he feels between his love for both of them."'
 						'"And what happens next?"'
-						'"No, I''m not going to spoil it for you! You''ll just have to read it yourself," she replies with a broad grin. "Oh, there''s the bell! We best head to class." She grins at you and gives you a friendly wave as she heads to the next lesson.'
+						'"No, I''m not going to spoil it for you! You''ll just have to read it yourself," she replies with a broad grin.'
+						func('npc_reactions', 'general', 'A240')
+						'"Oh, there''s the bell! We best head to class." She grins at you and gives you a friendly wave as she heads to the next lesson.'
 					else
 						'Natalia is sitting with the nerds, engrossed in a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice.'
 						'"Hey Natalia," you reply with a friendly smile. "Let me guess. Another romantic novel that ends in some sort of tragedy?"'
@@ -976,6 +1043,7 @@ if $ARGS[0] = 'natalia':
 						'"Sort of..." she replies. "It still explores love, heartbreak and disappointment but has some lovely stuff where the poems explore fluttery feelings and infatuation. They also look at the differences between infatuation and love."'
 						'"Guess there''s a big mixture of sad and happy stuff then?"'
 						'"Yes. If you like that sort of thing, then it might be worth getting a copy; you can skip one of them if you don''t like it too much." She pauses, then continues. "I sometimes go to the community center library on non-school days at lunchtime. If you fancy meeting me there sometime, that''d be great."'
+						func('npc_reactions', 'general', 'A240')
 						'The bell then sounds, so you both head to the next class while still chatting.'				
 					end
 				end

locations/hunterLoveSex.qsrc

@@ -2604,7 +2604,7 @@ if $ARGS[0] = 'din_hunters_sex_bell_bonus':
 	*pl
 	*pl
 	gs 'arousal', 'anal', 5, 'sub'
-	gs 'arousal', 'kiss_give', 5, 'sub'
+	gs 'arousal', 'kiss', 5, 'sub'
 	minut -= 5
 	gs 'stat'
 	i = rand(1,4)

locations/hunter_interactions.qsrc

@@ -1365,7 +1365,7 @@ if $ARGS[0] = 'naked_encounter':
 						'You start grinding against his fingers before he pulls back out and gives you a smirk before walking back, leaving you aching for more.'
 
 						gs 'arousal', 'kiss', 5, 'exhibitionism'
-						gs 'arousal', 'vaginal_fingering', 5, 'sub'
+						gs 'arousal', 'vaginal_finger', 5, 'sub'
 						gs 'arousal', 'end'
 						gs 'stat'
 					end

locations/igorev.qsrc

@@ -77,7 +77,7 @@ qwday	igor_qwday
 $location_type = 'event'
 
 	! walk, movie
-if $ARGS[0] = '': gt 'igorhome', 'Chat'
+if $ARGS[0] = '': gt 'igorhome', 'chat'
 
 if $ARGS[0] = 'Movies':
 	act 'Walk to the theater':
@@ -105,7 +105,7 @@ if $ARGS[0] = 'Movies':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/watchmovie.jpg" ></center>'
 					'You quietly sit with Igor and watch the movie, once the credits roll the two of you leave the theater. Once back outside he turns to you and says. "<<$pcs_nickname>> would you like to come back to my place?"'
-					act 'Agree and go back to Igor''s house': gt'Igorhome','hallway'
+					act 'Agree and go back to Igor''s house': gt 'igorhome', 'hallway'
 					act 'Decline and go home': gt 'pav_residential'
 				end
 				act 'Make out':
@@ -115,7 +115,7 @@ if $ARGS[0] = 'Movies':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/kissmovie.jpg" ></center>'
 					'The movie is fairly boring and Igor strokes your thigh, you return the favor and lean in close to him. He turns to you and starts to kiss you. Soon the two of you are making out, you spend the rest of the time making out, you have no idea what the movie was even about. Once the credits roll the two of you leave the theater. Once back outside he turns to you and says. "<<$pcs_nickname>> would you like to come back to my place?"'
-					act 'Agree and go back to Igor''s house': gt'Igorhome','hallway'
+					act 'Agree and go back to Igor''s house': gt 'igorhome', 'hallway'
 					act 'Decline and go home': gt 'pav_residential'
 				end
 			end
@@ -126,7 +126,7 @@ if $ARGS[0] = 'Movies':
 				'"Let''s just keep it to a walk." you say. "I''m not that keen watching a movie."'
 				'You continue to walk. The conversation is really stale and not much is said...'
 				'After a while, you decide to go back to Igor''s house. On the way there, you keep thinking that a movie may have been more interesting.'
-				act 'Return to Igor''s house': gt'Igorhome','hallway'
+				act 'Return to Igor''s house': gt 'igorhome', 'hallway'
 			end
 		end
 	end
@@ -158,7 +158,7 @@ if $ARGS[0] = 'kiss':
 		'The two of you kiss, he starts groping your breasts and stroking your crotch. He whispers in your ear, "I want you so bad, come on baby." Igor grabs you and pushes you onto the bed.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
-		act'Agree to have sex':IgorLove += 10 & gt 'igorEv','din_sex'
+		act'Agree to have sex':IgorLove += 10 & gt 'igorEv', 'din_sex'
 		act 'Stop him':
 			cla
 			igorsub += 1
@@ -191,7 +191,7 @@ end
 if $ARGS[0] = 'din_sex':
 	if igor_htday ! daystart:
 		*clr & cla
-		gs 'boyStat','A4'
+		gs 'boyStat', 'A4'
 		igor_htday = daystart
 		gs 'stat'
 		'Both of you quickly undress, kissing, as you pull the clothes off each other.'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'din_sex':
 			act 'Lick my pussy':
 				cls
 				igorkuni += 1
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni_'+ rand(1,8) +'.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni.mp4"></video></center>'
 				'Both of you get undressed and start caressing each other. You tell him that you want him to please you instead.'
 				'He nods and without a word drops down on his knees. He starts licking you, expertly working his tongue.'
 				'You feel your pussy pulsating thanks to Igor''s smooth tongue. You notice that he''s as excited as you, jerking his cock.'
@@ -289,7 +289,7 @@ if $ARGS[0] = 'din_sex':
 		act 'Lick my pussy':
 			cls
 			igorkuni += 1
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni_'+ rand(1,8) +'.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni.mp4"></video></center>'
 			'Both of you get undressed and start caressing each other. You tell him that you want him to please you instead.'
 			'You have had sex today already'
 			gs 'arousal', 'cuni', 15
@@ -328,7 +328,7 @@ if $ARGS[0] = 'din_krossdresssex':
 		'You quickly put the makeup on him and pick out some good clothes. He puts on the clothes and seems to quickly get into dressing up.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/rkd_'+ rand(1,9) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/rkd.jpg"></center>'
 			'"Well, there we have her, my beautiful girl!" you say with lust in your voice as you look at him. He blushes a bit and checks out his own reflection in the mirror.'
 			act 'Kiss him':
 				*clr & cla
@@ -345,7 +345,7 @@ if $ARGS[0] = 'din_krossdresssex':
 					igor_kdsexday = day
 					igor_krossdresssex += 1
 					gs 'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/crossdress/kdsex_'+ rand(1,4) +'.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/crossdress/kdsex.mp4"></video></center>'
 					'You ask him if he can lick your pussy. He nods and without a word drops down on his knees. He starts licking you, expertly working his tongue.'
 					'You feel your pussy pulsating thanks to Igor''s smooth tongue. You notice that he''s as exicted as you, jerking his cock.'
 					'After a while your breaths are heavy, you grab him by the hair and cum in his mouth...'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'strap on':
 												end
 												act 'Slow down':
 													*clr & cla
-													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+rand(1,3)+'.mp4" ></video></center>'
+													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 													'"Stop being a pussy! I know you love this! But since it is your first time so I will slow down. Just take a deep breath and relax." You wait for him to take a deep breath and relax, feeling him relax you start fucking him again but slower.'
 													'"Ok <<$pcs_nickname>>, that''s not to bad." Igor says.'
 													'"Good, now just keep relaxed." As you keep fucking him, he starts moaning more and more. He is obviously starting to get into it, enjoying it.'
@@ -512,7 +512,7 @@ if $ARGS[0] = 'strap on':
 														*clr & cla
 														gs 'willpower', 'pay', 'force'
 														gs 'stat'
-														'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/rough'+ rand(1,3) +'.mp4" ></video></center>'
+														'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/rough1.mp4" ></video></center>'
 														'"Shut up, don''t be a pussy! I know you love this!". You keep on pounding him without stopping while laying on top on him.'
 														'"<<$pcs_nickname>>, please stop!" Igor begs.'
 														'"I said shut up bitch!" you grab him by his hips and pull him up until he is on all fours. Then you get a firm grip on his hips and really start pounding his ass. He starts crying out at once. "Relax your ass, Igor or it''ll continue to hurt!"'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'strap on':
 				'He gets up and eagerly starts taking off his pants.'
 				act 'Suck my cock':
 					*clr & cla
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/suck'+ rand(1,5) +'.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/suck1.mp4"></video></center>'
 					'You pull him over to you and push him down. "Suck my cock bitch!" He eagerly takes your strap-on into his mouth and starts sucking it for all he is worth.'
 					'After you fuck his mouth for a bit, you pull him over to the bed and lay him down.'
 					gs 'arousal', 'bj', 5, 'dom'
@@ -582,7 +582,7 @@ if $ARGS[0] = 'strap on':
 						gs 'stat'
 						act 'Insert the tip':
 							*clr & cla
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet_'+ rand(1,4) +'.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet1.mp4"></video></center>'
 							'You lube up the strap-on real good and for good measure you spit on his asshole for a little extra lube. You move up behind him and slowly begin to push the tip of the strap-on against his asshole. Igor starts moaning immediately.'
 							gs 'arousal', 'anal_strap_give', 10, 'dom'
 							gs 'stat'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'strap on':
 								gs 'stat'
 								act 'Fuck him more':
 									*clr & cla
-									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+ rand(1,3) +'.mp4" ></video></center>'
+									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 									'You can tell by his moans he is really enjoying this and so are you. You ride him for a long time loving every moment of it, as his moans get louder and louder you know he is getting close to finishing.'
 									gs 'arousal', 'anal_strap_give', 10, 'dom'
 									gs 'stat'
@@ -619,13 +619,13 @@ if $ARGS[0] = 'strap on':
 										*clr & cla
 										gs 'willpower', 'pay', 'force'
 										gs 'stat'
-										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet_'+ rand(1,3) +'.mp4" ></video></center>'
+										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet1.mp4" ></video></center>'
 										'You grab ahold of his hips and pull him up until he is in a doggystyle position with you kneeling behind him. Once he is in place your start really hammering his ass and occasionally smacking his ass with one of your hands.'
 										gs 'arousal', 'anal_strap_give', 10, 'dom', 'rough'
 										gs 'stat'
 										act 'Slow down':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+ rand(1,3) +'.mp4" ></video></center>'
+											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 											'You decide to slowdown as you feeling sorry for him and his ass. You keep fucking him but now much slower and more sensually. Maybe after he gets a little more use to it he will let you really hammer his ass.'
 											gs 'arousal', 'anal_strap_give', 10, 'dom'
 											gs 'stat'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'strap on':
 										end
 										act 'Show him no mercy':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet_'+rand(1,3)+'.mp4" ></video></center>'
+											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet1.mp4" ></video></center>'
 											'"Shut up, don''t be a pussy! I know you love this!". You keep on pounding him without stopping while holding tightly to his hips, so he can''t pull away.'
 											'"<<$pcs_nickname>>, please stop!" Igor begs, as he tries to pull away. But you just grab tighter to his hips and yank him back burying your strap-on balls deep in his ass. He gasps in pain when you do.'
 											'"I said shut up bitch!" Then with a firm grip on his hips, you really start pounding his ass. He starts crying out at once. "Relax your ass, Igor or it''ll continue to hurt!"'
@@ -1081,7 +1081,7 @@ end
 if $ARGS[0] = 'crossdress_walk1':
 	*clr & cla
 	minut += 45
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_'+ rand(3,6) +'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 	'"You know, hiding such a beauty at home is a crime!"'
 	'"What did you say?" Igor responded.'
 	'"What do you say about we go for a walk outside?!" you enthusiastically suggest.'
@@ -1116,7 +1116,7 @@ if $ARGS[0] = 'crossdress_walk1':
 				'"Really? And when your ass was appreciated by those guys, what was it that like?" you ask playfully biting your lip.'
 				'"I think I had a little heart attack! But honestly, it was... uh... fun. I was so pumped up on adrenaline, I loved it!" he says with a huge grin on his face.'
 				'"Alright then. We will have to do this again!" you happily hug him.'
-				act 'Finish': gt'Igorhome','igorroom'
+				act 'Finish': gt 'igorhome', 'igorroom'
 			end
 		end
 	end
@@ -1432,7 +1432,7 @@ if $ARGS[0] = 'walk':
 			'He comes back wearing the outfit he picked out, he quickly sits down so you can get started. You start applying the makeup to him and at the same time explaining all the tricks you have learned to applying makeup.'
 			act 'Done':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 				'"Wow, you''re as beautiful as ever!" you say and he smiles while checking the mirror.'
 				'"Thank you." he said blushing.'
 				'Without hesitating you lean forward and kiss Igor and playfully bite her lip. "You know, hiding such a beauty at home is a crime!"'
@@ -1472,7 +1472,7 @@ if $ARGS[0] = 'walk':
 							'"Alright then. We will have to do this again!" you happily hug him.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish': gt'Igorhome','igorroom'
+							act 'Finish': gt 'igorhome', 'igorroom'
 						end
 					end
 				end
@@ -1486,7 +1486,7 @@ if $ARGS[0] = 'walk':
 		'"Come on, let''s get you dressed and go for a walk." you say as you''re pulling out the makeup kit. Igor gladly changes into one of his sisters outfits.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 			'He comes back all dressed up and applies his own makeup, you note he is starting to get really good at it. He must be practicing a lot. "All right. Are you done, beautiful?"'
 			'"I really am stunning." Igor said smiling, looking at himself in the mirror.'
 			'"Yes you are sweety, now ready to go show the world?"'
@@ -1529,7 +1529,7 @@ if $ARGS[0] = 'walk':
 		'Igor sits down in front of the mirror. He puts on the makeup and does a pretty amazing job at it, far better than you could do at first. He seems to have a natural knack for it. As soon as he finishes he quickly runs over to his sister''s room and gets dressed quickly.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_'+ rand(1,6) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 			'"You look sexy as hell, you are going to drive the boys crazy." you boldly tell him.'
 			'"I hope so, lets go." Igor smiles and eagerly heads for the door.'
 			act 'Go out for a walk':
@@ -1800,7 +1800,7 @@ if $ARGS[0] = 'Ask about Dianas date':
 						'"Well, while we were walking past the lake, he suddenly grabbed me in his arms and acted like he wanted to throw me in the water. I''m ashamed to admit it, but I screamed like a girl. I grabbed onto his neck with my hands."'
 						act 'Continue to listen':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/dimanos/ozero2.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/dimanos/ozero.jpg"></center>'
 							'"I clung to him and begged him not to do it."'
 							'"And...?" you spur him on. "Did he listen to you?" Igor raised an eyebrow, somewhat irritated.'
 							'"Well, not really..." Igor continued.'
@@ -1989,7 +1989,7 @@ if $ARGS[0] = 'parkwalk':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/progulka_1.jpg"></center>'
 	'You and Diana go for a walk in the park. The two of you talk about many different things. You hear someone behind you calling out your names "<<$pcs_nickname>>, Diana, wait up."'
-	act 'Turn back': gt 'igorhome','hallway'
+	act 'Turn back': gt 'igorhome', 'hallway'
 end
 
 if $ARGS[0] = 'kruglov_desc':

locations/internet_mobile.qsrc

@@ -64,9 +64,8 @@ if subscription['free'] = 0: subscription['free'] = 1
 if $ARGS[0] = 'top_up_metered':
     subscription[$ARGS[1]] += ARGS[2]
     subscription['<<$ARGS[1]>>-date'] = day
-    if $ARGS[1] = 'metered_calls': subscription['sms_limit'] += ARGS[3]
+    if $ARGS[1] = 'metered_calls': subscription['<<$ARGS[1]>>-sms_limit'] += ARGS[3]
     if subscription['<<$ARGS[1]>>-type'] = 0:  subscription['<<$ARGS[1]>>-type'] = 2
-    gs 'stat'
 end
 
 !! In case we decide that internet prices are different for different homes (mobile definitely should be)
@@ -80,7 +79,6 @@ if $ARGS[0] = 'buy_subscription':
     subscription['<<$ARGS[1]>>-price'] = ARGS[2] 
     subscription['<<$ARGS[1]>>-discount'] = ARGS[3] 
     if subscription['<<$ARGS[1]>>-type'] = 0: subscription['<<$ARGS[1]>>-type'] = 1
-    gs 'stat'
 end
 
 !! Nightly check called from cikl - check for subscription renewal and suspension.
@@ -126,10 +124,10 @@ end
 !! Cancelling a subscription (currently uused only for metered_calls and metered_mobile to clean them up when a monthly subscription 
 !! is bought to repplace them)
 !! $ARGS[1] - subscription name
-if $ARGS[0] = 'cancel_subscription':
+if $ARGS[0] = 'cancel_subscription': 
     subscription[$ARGS[1]] = 0
     subscription['<<$ARGS[1]>>-date'] = 0
-    subscription['sms_limit'] = 0
+    subscription['<<$ARGS[1]>>-sms_limit'] = 0
     subscription['<<$ARGS[1]>>-type'] = 0
     subscription['<<$ARGS[1]>>-price'] = 0
     subscription['<<$ARGS[1]>>-discount'] = 0

locations/intro_city_select.qsrc

@@ -98,13 +98,11 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	!! default friendship is 30 for all  npcs not covered by the other options below.
-	gs 'npc_relationship', 'defaultnotschool'
-	!! default friendship is 30 for all for all former classmates
-	gs 'npc_relationship', 'defaultfriendship'
-	!! Sets family and friends relationship values and overwrites the npcstatic data for them
-	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
 	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
 	npc_rel['A18'] = 1
 
 	!!Default Names

locations/intro_sg_select.qsrc

@@ -51,7 +51,12 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	gs 'npc_relationship', 'defaultnotschool'
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
+	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
 
 	if $start_type[1] ! 'tg':
 		!!Default Names
@@ -179,15 +184,6 @@ if $ARGS[0] = 'SGStart3':
 	*nl
 	'In the Pavlovsk start, you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start, you are visiting your grandparent''s house in the small farming village of Gadukino.'
 
-
-	!! default friendship is 30 for all students
-	gs 'npc_relationship', 'defaultfriendship'
-
-	!! Sets family and friends relationship values and overwrites the npcstatic data for them
-	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
-	gs 'npc_relationship', 'default_family_friends'
-	npc_rel['A18'] = 1
-
 	act 'Pavlovsk Start':
 		gt 'intro_sg_select', 'pav_start'
 	end
@@ -957,7 +953,7 @@ if $ARGS[0] = 'beautiful':
 			pcs_lip = 3
 			pcs_lashes = 2
 		end
-		pcs_skin = 800
+		pcs_skin = 900
 		pcs_teeth = -1
 		pcs_tan = 50
 		genbsize = 22

locations/intro_sg_tg.qsrc

@@ -184,13 +184,12 @@ if $ARGS[0] = 'settings':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	gs 'npc_relationship', 'defaultnotschool'
-
-	!! Set all schoolkids to 30 rel except for outcasts
-	gs 'npc_relationship', 'defaultfriendship'
-
-	!! Set defaults for family and friends
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
 	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
 
 	!! Sveta was an outcast (good girl start)
 	gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0

locations/intro_uni.qsrc

@@ -111,11 +111,49 @@ if $ARGS[0] = 'degree_choice':
 		gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'general education 101', 35
 		gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'teaching methods 101', 35
 		gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories 101', 35
-		!!gt 'intro_uni', 'elective_choice'
-		gt 'intro_uni', 'dorm_intro'
+		gt 'intro_uni', 'select_electives'
 	end
 end
 
+if $ARGS[0] = 'select_electives':
+	!! Choosing elective classes for the first year
+	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
+	'It''s possible to enroll in up to 3 elective classes, which have to be chosen now.'
+	if $university['elective_semester_1_1'] = '':
+		act 'Read about the computer class':
+			cla & *clr
+			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
+			'You read about the computer class, which seems to be a basic class that teaches you how to use a computer, the functions of some of the more basic programs and how to troubleshoot the OS if something goes wrong. It seems like a fairly useful class.'
+			act 'Enroll in the computer class':
+				cla
+				'You decide to enrol in the computer class for the first and second semester of this year.'
+				$university['elective_semester_1_1'] = 'Computers 101'
+				$university['elective_semester_2_1'] = 'Computers 102'
+				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'
+			end
+			act 'Don''t enroll in the computer class': gt 'intro_uni', 'select_electives'
+		end
+	end
+	if $university['elective_semester_1_2'] = '':
+		act 'Read about the art class':
+			cla & *clr
+			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
+			'This class is about learning how to draw. It will start off with the basics before moving onto the more advanced art studies by the end of the second semester. It might be fun to take part in such a relaxed class.'
+			act 'Enroll in the art class':
+				cla
+				'You decide to enroll in the art class for the first and second semester of this year.'
+				$university['elective_semester_1_2'] = 'Art 101'
+				$university['elective_semester_2_2'] = 'Art 102'
+				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'
+			end
+			act 'Don''t enroll in the art class': gt 'intro_uni', 'select_electives'
+		end
+	end
+	act 'Don''t enroll in any more elective classes': gt 'intro_uni', 'dorm_intro'
+end
+
 if $ARGS[0] = 'dorm_intro':
 	!! Going to the dorm to get the keys
 	*clr & cla

locations/katja_chat.qsrc

@@ -272,7 +272,7 @@ end
 
 if $ARGS[0] = 'coffee_hole':
 	menu_off = 1
-	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'coffe_hole1'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'coffee_hole1'
 	if npc_rel['A14'] < 20:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 		'You approach Katja, who seems to be studying while drinking coffee and having brunch.'
@@ -302,7 +302,7 @@ end
 
 if $ARGS[0] = 'brunch':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
-	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffee_hole2'
 	minut += 10
 	gs 'stat'
 	if katjaQW['QWstage'] >= 2 and pcs_makeup < 2:
@@ -542,7 +542,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					gs 'npc_relationship', 'modify', 'A152', 'dislike'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 					'"What are you talking about, Feofan?" you ask.'
-					'"You know, Triss'+iif(hotcat > 5, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
+					'"You know, Triss'+iif(hotcat > 4, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
 					'"The what?" Katja asks, looking no wiser.' 
 					'"The Witcher, the video game series. Help me out, <<$pcs_nickname>>! You know it, don''t you?" he asks.'
 					'"No, I don''t," you answer.'
@@ -576,7 +576,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						katjaQW['know_dandd'] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 						'"It''s ''Dungeons and Dragons is what the game''," you tell Katja, who looks at you a little surprised. "I''m part of their group, it''s a lot of fun," you says.'
-						'"I didn''t know that. How does it work, Julia told me you are taking on roles lije in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
+						'"I didn''t know that. How does it work, Julia told me you are taking on roles like in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
 						act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 					end
 				end
@@ -730,7 +730,7 @@ if $ARGS[0] = 'coffee_hole_event_girls_night_no':
 end
 
 if $ARGS[0] = 'coffee_hole_hangout':
-	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffee_hole2'
 	minut += 15
 	gs 'katja_meynold_schedule'
 	gs 'stat'
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffee_hole_event'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				else
 					KatjaQW['dom'] += 1
@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffee_hole_event'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				elseif katjaQW['horny'] > 50:
 					'"No, I don''t feel like it," Katja says, but something in her voice makes you think that she can be convinced.'
@@ -1096,12 +1096,12 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffee_hole_event'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				else
 					KatjaQW['dom'] += 1
 					'"No, I don''t want to," Katja responds in a stern voice. You realize that you won''t convince her otherwise.'
-					act 'Continue talking': gt 'katja_chat', 'coffe_hole_event'
+					act 'Continue talking': gt 'katja_chat', 'coffee_hole_event'
 					act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
 				end
 			end

locations/katja_city_sex.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 					'"OK, OK. I''ll put it away," <<$boyname>> says and leaves the room to hide his drugs.'
 					*nl
 					'Katja has relaxed by the time he comes back, and you start to enjoy sipping your wine and making small talk. <<$boyname>>''s free hand gently caresses your and Katja''s thighs from time to time. Katja returns his touch and you do the same.'
-					if func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+					if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
 						'After a short while of this, Katja asks, "Why don''t you show us your bedroom?"'
 						'<<$boyname>> quickly gets up. "Right this way."'
 						act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
@@ -75,7 +75,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
 							'You take the tube and snort the first line and then the second, while Katja looks at you with wide open eyes.'
 							'After a short moment, it hits you and you feel the full effect of the drug. <<$boyname>> takes the tube from you and tries to hand it to Katja, but she doesn''t take it. "I don''t do drugs. I''ve never done it before."'
-							if func('katja_procdural', 'willing_to_be_naughty') < 85:
+							if func('katja_procedural', 'willing_to_be_naughty') < 85:
 								gs 'willpower', 'drugs', 'force', 'hard'
 							else
 								gs 'willpower', 'drugs', 'force'
@@ -85,7 +85,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									*clr & cla
 									minut += 8
 									gs 'willpower', 'pay', 'force'
-									gs 'katja_procdural', 'take_cocaine'
+									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'"Come on, Katja. Just try it. It won''t hurt you," you say, but Katja still looks skeptical.'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								gs 'willpower', 'pay', 'force'
 								gs 'drugs', 'cocaine'
 								gs 'stat'
-								gs 'katja_procdural', 'take_cocaine'
+								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
 								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 								'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
@@ -220,7 +220,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								act 'Watch Katja do her lines':
 									*clr & cla
 									minut += 5
-									gs 'katja_procdural', 'take_cocaine'
+									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'You watch as Katja takes the tube, puts one end at her nose and bends down to the start of the line that <<$boyname>> has prepared for her.'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							minut += 8
 							gs 'drugs', 'cocaine'
 							gs 'stat'
-							gs 'katja_procdural', 'take_cocaine'
+							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$boyname>>.'
@@ -306,7 +306,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 								act 'Watch Katja do her lines':
 									*clr & cla
 									minut += 5
-									gs 'katja_procdural', 'take_cocaine'
+									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'You watch as Katja takes the tube, puts one end at her nose and bends down so the other end is at the start of the line that <<$boyname>> has prepared for her.'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 							minut += 8
 							gs 'drugs', 'cocaine'
 							gs 'stat'
-							gs 'katja_procdural', 'take_cocaine'
+							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 							'"Okay, Katja. Let''s do it together," you say.'
@@ -339,7 +339,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 			end
 		else
 			'Soon, you are relaxing and having some wine. <<$boyname>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
-			if func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+			if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
 				'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
 				'<<$boyname>> quickly gets up and says, "Right this way."'
 				act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
@@ -355,7 +355,7 @@ end
 if $ARGS[0] = 'after_drugs':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/private_with_guy<<rand(1,2)>>.jpg"></center>'
 	'Soon you are relaxing and having some wine. <<$boyname>>''s free hand gently caresses your and Katja''s thighs on occasion. Katja return his touch and you do the same.'
-	if func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
+	if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100): 
 		'After a short while of touching, Katja asks, "Why don''t you show us your bedroom?"'
 		'<<$boyname>> quickly gets up and says, "Right this way."'
 		act 'Go to his bedroom': gt 'katja_city_sex', 'one_guy_start'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'one_guy_start':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex1.jpg"></center>'
 	'<<$boyname>>''s bedroom is, like the rest of his apartment, quite nice. The center of the room, his bed, is ready for action.'
 	'"Nice bed," you say. "Let''s see if it''s as soft as it looks," you continue, and crawl up on the bed with Katja following you.'
-	'"It''s very hot in here, I think I need to lose some of these worm clothes," '+iif(func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja says', 'you say')+', and you both proceed to take off your clothes.'
+	'"It''s very hot in here, I think I need to lose some of these worm clothes," '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja says', 'you say')+', and you both proceed to take off your clothes.'
 	'"Let''s show <<$boyname>> what he has to look forward to," you whisper to Katja as you get up on all four, displaying your behind to <<$boyname>>.'
 	'Katja does the same and <<$boyname>> says, "What a fantastic view!"'
 	'Katja leans in and gives you a soft kiss, and you hear clothes being taken off behind you.'
@@ -596,7 +596,7 @@ if $ARGS[0] = 'one_guy_start':
 		gs 'arousal', 'bj', 3, 'group'
 		gs 'stat'			
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex2.jpg"></center>'			
-		'"This is a really comfortable bed. Why don''t you join us?" '+iif(func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja asks.', 'you ask.')
+		'"This is a really comfortable bed. Why don''t you join us?" '+iif(func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100), 'Katja asks.', 'you ask.')
 		'<<$boyname>> immediately lies down on the bed between Katja and yourself.'
 		'You and Katja both sit down and start licking the sides of his <<dick>> cm <<$dick_girth>> cock.'
 		act 'Time to fuck':
@@ -673,7 +673,7 @@ if $ARGS[0] = 'one_guy_start':
 								*clr & cla
 								katjaQW['horny'] += rand(5,10)
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex10.jpg"></center>'
-								if func('katja_procdural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100):
+								if func('katja_procedural', 'willing_to_be_naughty') > 80 and katjQW['horny'] >= rand(70,100):
 									'"My turn, now," Katja says and crawls up on him for a reverse cowgirl and guides his cock into her pussy.'
 								else
 									'"Your turn again, Katja." you say. "Try reverse cowgirl this time."'
@@ -749,7 +749,7 @@ end
 if $ARGS[0] = 'going_home':
 	minut += 10
 	$location_type = 'public_outdoors'
-
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
 	'You leave his apartment and walk out into the streets, heading in the direction of the nearest metro station.'
 	if katjaQW['QWstage'] = 5:
 		katjaQW['QWstage'] = 6

locations/katja_dorm.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = 'talk':
 	end
 	act 'Leave Katja''s dorm room':
 		if sofiaQW['know'] = 0 and university['semester_week'] > 0:
-			gt 'katja_dorm', 'soifa_meet'
+			gt 'katja_dorm', 'sofia_meet'
 		else
 			minut += 2
 			gt 'uni_dorm', 'second_floor'
@@ -1069,7 +1069,7 @@ if $ARGS[0] = 'lazar_kiss':
 			act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
 		end
 	end
-	act 'You''re not in the mood': katjaQW['horny'] -= 20 & gt 'Katja_dorm', 'Talk'
+	act 'You''re not in the mood': katjaQW['horny'] -= 20 & gt 'katja_dorm', 'talk'
 end
 
 if $ARGS[0] = 'movie_talk1':
@@ -1183,7 +1183,7 @@ if $ARGS[0] = 'watch_movie':
 		t = rand(1,4)
 		katjaQW['slut'] += t*10
 		gs 'arousal', 'erotic',  -(t*5)
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_erotic.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_erotic.jpg"></center>'
 		'You end up watching a drama which is quite erotic and barely eat your popcorn.'	
 		if npc_sex['A14'] > 0 and katjaQW['horny'] + min(katjaQW['slut']/3,34) >= 100 and rand(0,3) < 3 and katjaQW['sex_clossedness'] < 2:
 			act 'Finish the movie': gt 'katja_dorm', 'after_movie_strip2'
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'watch_movie':
 	elseif katjaQW['movie_temp'] = 3:
 		t = rand(0,4)
 		katjaQW['slut'] -= t*5	
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_tragic.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_tragic.jpg"></center>'
 		'You''re watching a tragic drama and barely eat your popcorn because of how sad the story is.'	
 		if npc_sex['A14'] > 0 and katjaQW['horny'] + min(katjaQW['slut']/3,34) >= 100 and rand(0,3) < 3 and katjaQW['sex_clossedness'] < 2:
 			act 'Finish the movie': gt 'katja_dorm', 'after_movie_strip2'
@@ -1218,7 +1218,7 @@ if $ARGS[0] = 'watch_movie':
 			end
 		end	
 	elseif katjaQW['movie_temp'] = 2:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_drama.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_drama.jpg"></center>'
 		'You watch a drama while eating your popcorn.'
 		if npc_sex['A14'] > 0 and katjaQW['horny'] + min(katjaQW['slut']/3,34) >= 100 and rand(0,3) < 3 and katjaQW['sex_clossedness'] < 2:
 			act 'Finish the movie': gt 'katja_dorm', 'after_movie_strip2'
@@ -1237,7 +1237,7 @@ if $ARGS[0] = 'watch_movie':
 		t = rand(0,6)
 		katjaQW['slut'] += t*6
 		gs 'arousal', 'erotic',-( t*3)
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_funny.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_funny.jpg"></center>'
 		'You watch a romantic comedy while eating your popcorn. '+iif(t > 3, 'The movie centers around some very good looking actors and includes some sex scenes, which have a clear effect on Katja.', '')
 		if npc_sex['A14'] > 0 and katjaQW['horny'] + min(katjaQW['slut']/3,34) >= 100 and rand(0,3) < 3 and katjaQW['sex_clossedness'] < 2:
 			act 'Finish the movie': gt 'katja_dorm', 'after_movie_strip2'
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'watch_movie':
 		t = rand(-2,6)
 		katjaQW['slut'] += max(t*5,0)
 		gs 'arousal', 'erotic', -(max(t,0)*3)
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_action.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_action.jpg"></center>'
 		'You watch an action movie while eating your popcorn. '+iif(t > 3, 'The movie includes a lot of men without there shirts on and women in very tight clothes, and it is clear that this is having an effect upon Katja.', '')
 		if npc_sex['A14'] > 0 and katjaQW['horny'] + min(katjaQW['slut']/3,34) >= 100 and rand(0,3) < 3 and $braworntype ! 'none' and katjaQW['sex_clossedness'] < 2:
 			act 'Finish the movie': gt 'katja_dorm', 'after_movie_strip2'
@@ -1276,7 +1276,7 @@ end
 
 if $ARGS[0] = 'after_movie_strip1':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/after_movie1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie1.jpg"></center>'
 	gs 'arousal', 'erotic', 2
 	'It''s gotten very hot in the room, and Katja has stripped down to her underwear. She''s breathing heavily with her eyes closed and has her hand on her breast.'
 	act 'Wait and see what she does': gt 'katja_uni_sex', 'after_movie_masturbation1'
@@ -1285,7 +1285,7 @@ if $ARGS[0] = 'after_movie_strip1':
 		minut += 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/after_movie2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie2.jpg"></center>'
 		'You get up from the bed. "See you another day," you say as you get ready to leave, which startles Katja.' 
 		'"Oh.. Um.. Bye <<$pcs_nickname>>. See you later..." she says without moving from the bed.'
 		'As you leave the room, you''re a little curious about what''s going to happen once you leave.'
@@ -1295,7 +1295,7 @@ end
 
 if $ARGS[0] = 'after_movie_strip2':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/after_movie3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie3.jpg"></center>'
 	gs 'arousal', 'kiss', 1, 'lesbian'
 	'The room grew hotter throughout the movie. At one point, Katja stripped down to her underwear and you did the same. As the movie ends, Katja leans into you from behind and starts to kiss you.'
 	act 'Kiss her back': gt 'katja_uni_sex', 'after_movie_sex1'
@@ -1305,7 +1305,7 @@ if $ARGS[0] = 'after_movie_strip2':
 		gs 'arousal', 'end'
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/after_movie4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie4.jpg"></center>'
 		'You break off the kiss and tell Katja that you''re not in the mood tonight. She understands and lets you get off the bed. You then get dressed and say your goodbyes.'
 		'As you leave the room, Katja is still lying on her bed in her underwear and you find yourself a little curious about what''s going to happen once you leave.'
 		act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
@@ -1322,7 +1322,7 @@ if $ARGS[0] = 'relationship_talk':
 		minut += 190
 	end
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/movie_drama.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/movie_drama.jpg"></center>'
 	'This time, Katja has chosen a French movie from a couple of years back that she said was recommended to her. It''s called ''Blue is the Warmest Color''.'
 	'Katja is immediately captivated by the movie, she completely forgets to eat any of the popcorn, so drawn into the story as though it speaks to something inside of her.'
 	'When the movie is over, she remains silent for several minutes.'
@@ -1456,7 +1456,7 @@ if $ARGS[0] = 'cocain_offer':
 		dur += 1
 		gs 'drugs', 'cocaine'
 		gs 'stat'
-		gs 'katja_procdural', 'take_cocaine'
+		gs 'katja_procedural', 'take_cocaine'
 		gs 'stat'										
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 		'"Okay, Katja. Let''s do it," you say.'

locations/katja_party.qsrc

@@ -422,7 +422,7 @@ if $ARGS[0] = 'party_heading_out':
 			minut += 8
 			dur += 1
 			gs 'drugs', 'cocaine'
-			gs 'katja_procdural', 'take_cocaine'
+			gs 'katja_procedural', 'take_cocaine'
 			gs 'stat'										
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 			'"OK, Katja. Let''s do it together," you say.'
@@ -455,7 +455,7 @@ if $ARGS[0] = 'party_heading_out':
 				minut += 8
 				dur -= 1
 				gs 'drugs', 'cocaine'
-				gs 'katja_procdural', 'take_cocaine'
+				gs 'katja_procedural', 'take_cocaine'
 				gs 'stat'										
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 				'"I do have enough for the two of us. So let''s have some fun before we leave," you say.'
@@ -479,7 +479,7 @@ if $ARGS[0] = 'party_heading_out':
 						cla
 						'"You know, Katja. I''ve got some cocaine, and I wanted to try it. Why don''t we try it together?" you ask.'
 						'"You want us to do drugs?!" Katja exclaims, clearly shocked at your proposal "What has gotten into you. We can''t do that!" she continues.'
-						if func('katja_procdural', 'willing_to_be_naughty') < 100:
+						if func('katja_procedural', 'willing_to_be_naughty') < 100:
 							gs 'willpower', 'drugs', 'force', 'hard'
 						else
 							gs 'willpower', 'drugs', 'force'
@@ -503,7 +503,7 @@ if $ARGS[0] = 'party_heading_out':
 								act 'Take the drugs':
 									*clr & cla
 									minut += 8
-									gs 'katja_procdural', 'take_cocaine'
+									gs 'katja_procedural', 'take_cocaine'
 									dur -= 1
 									gs 'drugs', 'cocaine'									
 									gs 'stat'
@@ -554,7 +554,7 @@ if $ARGS[0] = 'party_heading_out':
 							'You try to hand Katja the tube, "Your turn."'
 							'She''s still looking at you, like she doesn''t believe what just happened.'
 							'"I don''t do drugs. I''ve never done it before," she says, suddenly snapping out her daze.'
-							if func('katja_procdural', 'willing_to_be_naughty') < 100:
+							if func('katja_procedural', 'willing_to_be_naughty') < 100:
 								gs 'willpower', 'drugs', 'force', 'hard'
 							else
 								gs 'willpower', 'drugs', 'force'
@@ -565,7 +565,7 @@ if $ARGS[0] = 'party_heading_out':
 									minut += 8
 									gs 'willpower', 'pay', 'force'
 									dur = -1
-									gs 'katja_procdural', 'take_cocaine'
+									gs 'katja_procedural', 'take_cocaine'
 									gs 'stat'										
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/katja_cocaine2.jpg"></center>'
 									'"Come on, Katja. Just try it. It won''t harm you," you say, but Katja still looks skeptical.'
@@ -633,7 +633,7 @@ if $ARGS[0] = 'party_heading_out':
 							gs 'willpower', 'pay', 'force'
 							gs 'drugs', 'cocaine'
 							dur -= 1
-							gs 'katja_procdural', 'take_cocaine'
+							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, Katja. Let''s do it together," you say and start cleaning the table.'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'party_heading_out':
 						minut += 8
 						gs 'drugs', 'cocaine'
 						dur -= 1
-						gs 'katja_procdural', 'take_cocaine'
+						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
@@ -690,7 +690,7 @@ if $ARGS[0] = 'party_heading_out':
 						minut += 8
 						gs 'drugs', 'cocaine'
 						dur -= 1
-						gs 'katja_procdural', 'take_cocaine'
+						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'										
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'

locations/katja_procedural.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'hourly':
 	end
 	if katjaQW['under_influnece_of_cocaine'] > 0: katjaQW['under_influnece_of_cocaine'] -= 1
 
-	if katjaQW['nightclub_private_room_boy'] = 1 and katjaQW['disco_loc'] ! 7: katjaQW['nightclub_private_room_boy'] = 0 & gs 'katja_procdural', 'sex_set', 1
+	if katjaQW['nightclub_private_room_boy'] = 1 and katjaQW['disco_loc'] ! 7: katjaQW['nightclub_private_room_boy'] = 0 & gs 'katja_procedural', 'sex_set', 1
 end
 
 if $ARGS[0] = 'cikl':
@@ -171,7 +171,7 @@ if $ARGS[0] = 'cikl':
 		if katjaQW['masturbates'] = 0: katjaQW['masturbates'] = 1
 	end
 
-	!! Set some variables related to her sexual experience that is not taking care in all the acts.
+	!! Set some variables related to her sexual experience that is not taking care of in all the acts.
 	if (katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >= 3) and katjaQW['simultanous_boys'] = 0: katjaQW['simultanous_boys'] = 1
 	if npc_sex['A14'] >= 1 and katjaQW['simultanous_girls'] = 0: katjaQW['simultanous_girls'] = 1
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'cikl':
 	!! Setting the sex stat for Katja if she went to a private room at the nightclub and the player character did not spy on her.
 	if katjaQW['nightclub_private_room_boy'] = 1: 
 		katjaQW['nightclub_private_room_boy'] = 0
-		if rand(0,katjaQw['slut']/25) > 0: gs 'katja_procdural', 'sex_set', 1
+		if rand(0,katjaQw['slut']/25) > 0: gs 'katja_procedural', 'sex_set', 1
 	end
 	
 	!!Out commented Katja becoming pregnant until more content for a pregnant Katja is done 
@@ -213,9 +213,9 @@ if $ARGS[0] = 'cikl':
 	!! Check if she did drugs with others
 	if katjaQW['coke_stage'] >= 5:
 		if locat['katja_save2'] = 53 and katjaQW['disco_arrival'] + 600 > totminut or katjaQW['disco_met'] + 600 > totminut:
-			if rand(0,katjaQW['coke_stage']) >= 5: gs 'katja_procdural', 'take_cocaine', 1, 1
+			if rand(0,katjaQW['coke_stage']) >= 5: gs 'katja_procedural', 'take_cocaine', 1, 1
 		elseif katjaQw['alone_with_other_day'] = daystart -1
-			if rand(2,katjaQW['coke_stage']) >= 5: gs 'katja_procdural', 'take_cocaine', 1, 1
+			if rand(2,katjaQW['coke_stage']) >= 5: gs 'katja_procedural', 'take_cocaine', 1, 1
 		end
 	end
 	
@@ -245,14 +245,14 @@ if $ARGS[0] = 'cikl':
 			katjaQW['coke_stage'] = 5
 		end
 	elseif katjaQW['coke_stage'] = 7:
-		if katjaQW['coke_day'] + 1 < daystart and rand(0,3)= 0: gs 'katja_procdural', 'take_cocaine', 1, 1
+		if katjaQW['coke_day'] + 1 < daystart and rand(0,3)= 0: gs 'katja_procedural', 'take_cocaine', 1, 1
 		if katjaQW['coke_point'] > 70: 
 			katjaQW['coke_stage'] = 8
 		elseif katjaQW['coke_point'] < 45:
 			katjaQW['coke_stage'] = 6
 		end
 	elseif katjaQW['coke_stage'] = 8:
-		if katjaQW['coke_day'] + 1 < daystart: katjaQW['financial_strain'] += rand(0,1) & gs 'katja_procdural', 'take_cocaine', 1, 1
+		if katjaQW['coke_day'] + 1 < daystart: katjaQW['financial_strain'] += rand(0,1) & gs 'katja_procedural', 'take_cocaine', 1, 1
 		if katjaQW['coke_point'] < 55: katjaQW['coke_stage'] = 7
 	end
 			
@@ -480,7 +480,7 @@ if $ARGS[0] = 'sex_set':
 				if rand(0,6) = 0: npc_throat['A14'] += 1
 			end
 			
-			!! It this case Katja will have sex with at most 3 of the girls present
+			!! In this case Katja will have sex with at most 3 of the girls present
 			katjaQW['simultanous_girls'] = rand(1,min(3,ARGS[1]))
 			katjaQW['slut'] += katjaQW['simultanous_girls']*4
 		elseif rand(0,1) <= katjaQW['slut']/50:

locations/katja_sex.qsrc

@@ -633,7 +633,7 @@ if $ARGS[0] = 'katnatsex1':
 				'Katja embraces you and lies down, so you end on top, where you lash on her gorgeous bosom. Natasha meanwhile doesn''t stand idle and her hands begin to work you, her cold tongue tasting your asshole, startling you, but Katja embraces your body so you can''t escape the nerd''s probing. They continue doing this, slowly drilling your soaking cunt, exploring your hungry mouth and caressing your burning skin.'
 				'"Oh! Katja! I mean, oh! Fuck! Natasha I''m cumming!"'
 
-				act 'Cuddle with Katja and ignore Natasha': gt 'katjaEv','katnatsex3'
+				act 'Cuddle with Katja and ignore Natasha': gt 'katja_sex','katnatsex3'
 
 				act 'Too tired for sex, so "help" Natasha in another way':
 					*clr & cla
@@ -798,7 +798,7 @@ if $ARGS[0] = 'katnatsex1':
 			'"Hm... Ok Katja. I trust... OUCH!"'
 			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and ends the struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
 
-			act 'Too tired... cuddle with the girls': gt 'katjaEv','katnatsex3'
+			act 'Too tired... cuddle with the girls': gt 'katja_sex','katnatsex3'
 
 			act 'Groaning help Katja':
 				*clr & cla

locations/katja_uni_sex.qsrc

@@ -820,21 +820,20 @@ if $ARGS[0] = 'lazar_katja_cum':
 		else
 			'As you walk back towards the campus, Katja starts talking about how great the sex with Lazar was, to which you agree.'
 		end
-			'You continue to chat about the experience on the way back.'
-			if locat['katja'] = 31:
-				'"Want to come back to my dorm room?" she asks as you reach campus.'
-				act 'Go with Katja to her room': minut +=5 & gt 'katja_dorm', 'start'
-			elseif locat['katja'] = 44:
-				'"I''m going to the city mall to look at clothes. Want to come?" she asks before you arrive at the campus.'
-				act 'Go with Katja to the city mall': minut += 5 & gt 'katja_city', 'metro'
-			elseif locat['katja'] = 29:
-				'"I need to go to the library to study. Want to join me?" she asks as you reach campus.'
-				act 'Go to the library with Katja': minut += 5 & gt 'katja_uni', 'library2'
-			else
-				'"I have to run and do something. See you soon," she says as you reach campus.'
-			end
-			act 'Say goodbye to Katja': gt 'uni_grounds', 'main'
-		and
+		'You continue to chat about the experience on the way back.'
+		if locat['katja'] = 31:
+			'"Want to come back to my dorm room?" she asks as you reach campus.'
+			act 'Go with Katja to her room': minut +=5 & gt 'katja_dorm', 'start'
+		elseif locat['katja'] = 44:
+			'"I''m going to the city mall to look at clothes. Want to come?" she asks before you arrive at the campus.'
+			act 'Go with Katja to the city mall': minut += 5 & gt 'katja_city', 'metro'
+		elseif locat['katja'] = 29:
+			'"I need to go to the library to study. Want to join me?" she asks as you reach campus.'
+			act 'Go to the library with Katja': minut += 5 & gt 'katja_uni', 'library2'
+		else
+			'"I have to run and do something. See you soon," she says as you reach campus.'
+		end
+		act 'Say goodbye to Katja': gt 'uni_grounds', 'main'
 	end
 end
 
@@ -1180,7 +1179,7 @@ end
 if $ARGS[0] =  'after_movie_masturbation1':
 	$orgasm_or = 'no'
 	gs 'arousal', 'erotic', 2
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation1.jpg"></center>'
 	'Katja moves her hand to her panties and starts to gently stroke her pussy through the fabric. She doesn''t seem to mind that you''re watching her.'
 	!!act 'Keep watching': gt 'katja_uni_sex', 'after_movie_masturbation_solo1'
 	act 'Join her on the bed':
@@ -1188,21 +1187,21 @@ if $ARGS[0] =  'after_movie_masturbation1':
 		minut += 3
 		gs 'arousal', 'erotic', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation2.jpg"></center>'
 		'You quickly strip down to your underwear and get back on the bed as Katja stops fondling herself.'
 		'You move close in to her and whisper in her ear. "Let''s get rid of those panties, yes?"'
 		act 'Strip naked':
 			*clr & cla
 			gs 'arousal', 'foreplay_give', 2, 'lesbian'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation3.jpg"></center>'
 			'Katja sits up and you start by removing her bra, exposing her ample breasts.'
 			if  $braworntype ! 'none':
 				act 'Katja returns the favor':
 					*clr & cla
 					gs 'arousal', 'foreplay', 2, 'lesbian'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation4.jpg"></center>'
 					'Katja starts pulling down your bra, which uncovers your <<$pc_desc[''breast'']>> breasts. You then proceed to take your bras off.'
 					act 'Now her panties':  gt 'katja_uni_sex',  'after_movie_masturbation2'
 				end
@@ -1213,17 +1212,17 @@ if $ARGS[0] =  'after_movie_masturbation1':
 	end
 end
 
-if $ARGs[0] =  'after_movie_masturbation2':
+if $ARGS[0] =  'after_movie_masturbation2':
 	gs 'arousal', 'foreplay_give', 2, 'lesbian'		
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation5.jpg"></center>'
 	'"Come on Katja, let''s get these panties off," you say. Katja starts slowly to remove her panties but feeling impatient, you decide to help her.'
 	if $pantyworntype ! 'none':
 		act 'And now your panties':
 			*clr & cla
 			gs 'arousal', 'foreplay', 2, 'lesbian'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation6.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation6.jpg"></center>'
 			'You get up on your knees so Katja can pull down your panties.'
 			act 'Lie down':  gt 'katja_uni_sex',  'after_movie_masturbation3'
 		end		
@@ -1232,10 +1231,10 @@ if $ARGs[0] =  'after_movie_masturbation2':
 	end
 end
 
-if $ARGs[0] =  'after_movie_masturbation3':
+if $ARGS[0] =  'after_movie_masturbation3':
 	gs 'arousal', 'erotic', 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation7.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation7.jpg"></center>'
 	'You and Katja lie down completely naked. Katja just looks at you, and does not seem completely sure how to proceed. You just smile at her and whisper "Just continue doing what you started before I interrupted you."'
 	'She slowly moves her hand towards her pussy and you follow her lead.'
 	act 'Masturbate':
@@ -1243,7 +1242,7 @@ if $ARGs[0] =  'after_movie_masturbation3':
 		gs 'arousal', 'clit_finger', 3, 'masturbate'
 		gs 'arousal', 'erotic', -3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation8.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation8.jpg"></center>'
 		'You both start to rub your clits. Katja is a little hesitant, and often looks at how you''re doing it, as if trying to see how it''s done.'
 		'You just smile at her '+iif(katjaQW['slut'] > 80 or  katjaQW['QWstage'] > 5 or katjaQW['anal_quest'] > 2, 'perceived ', ' ')+'innocence.' 
 		act 'Get into it':
@@ -1251,7 +1250,7 @@ if $ARGs[0] =  'after_movie_masturbation3':
 			gs 'arousal', 'vaginal_finger', 3, 'masturbate'
 			gs 'arousal', 'erotic', -3
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation9.jpg"></center>'
 			'Both of you are getting into it as you reach out and grab Katja''s hand with the one you''re not using on your pussy. You occasionally look at each other as you both moan in pleasure.'
 			'Hand in hand, you both start approaching orgasm.'
 			act 'Katja''s orgasm':
@@ -1260,7 +1259,7 @@ if $ARGs[0] =  'after_movie_masturbation3':
 				gs 'arousal', 'erotic', -3
 				gs 'stat'
 				katjaQW['horny'] = 0
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation10.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation10.jpg"></center>'
 				'Katja curls up and turns her back to you. Not wanting to miss it, you slow yourself down a little and stretch your neck so you can see what''s going on.'
 				'Katja cums hard with a lot of noise, even if she seems to be trying not to. Once she comes down, you return your focus to your own pussy.'
 				act 'Your turn to cum':
@@ -1268,14 +1267,14 @@ if $ARGs[0] =  'after_movie_masturbation3':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'vaginal_finger', 3, 'masturbate'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation11.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation11.jpg"></center>'
 					'Katja sits back up and gently plays with her pussy and breast while watching you. After a short period of furiously stuffing two of your fingers into your pussy, your orgasm comes as a huge explosion of overwhelming pleasure.'
 					act 'Relax':
 						*clr & cla
 						minut += 5
 						gs 'arousal', 'end'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation12.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation12.jpg"></center>'
 						'You both collapse back on the bed and spend a few minutes just lying there with your heads close together. "Whoa... That was intense!" Katja says after some time.' 
 						'"Yeah... It was," you answer.'
 						'"I''m completely exhausted now," she says. "I think I''ll just go to bed now."' 
@@ -1292,44 +1291,44 @@ end
 if $ARGS[0] = 'after_movie_masturbation_solo1':
 	gs 'arousal', 'erotic', 3
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo1.jpg"></center>'
 	'Katja continues to idly caress her panties for a little while, gently stroking the pussy hidden behind them, before she sits up and slowly starts to remove her bra while fondling her breasts.'
 	act 'Continue to watch':
 		*clr & cla		
 		gs 'arousal', 'erotic', 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo2.jpg"></center>'
 		'After the bra comes off, she lies back and continues to play with her ample breasts, pinching her nipples a couple of times. She seems completely oblivious to the fact that you are standing there watching her.'   
 		act 'Watch her remove her panties':
 			*clr & cla		
 			gs 'arousal', 'erotic', 3
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo3.jpg"></center>'
 			'She then gets up on her knees and starts to pull down her panties. At one point during this, she looks at you and gives you a small wink, before continuing on as though you weren''t there.'
 			act 'Keep watching':
 				*clr & cla		
 				gs 'arousal', 'erotic_nudity', 3
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo4.jpg"></center>'
 				'After her panties are off, she lies down on her back and touches her breasts with one hand, while she stuffs two fingers into her very wet pussy with the other hand.'
 				act 'Continue to watch':
 					*clr & cla		
 					gs 'arousal', 'erotic_nudity', 3
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo5.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo5.jpg"></center>'
 					'As she is getting closer to an orgasm, her fingers leave her wet slit and start to directly stroke her clit. She softly moans a few times, but they quickly become louder and louder.' 
 					act 'Watch her come':
 						*clr & cla		
 						gs 'arousal', 'erotic_nudity', 2
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo6.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo6.jpg"></center>'
 						'She comes with a loud cry with one hand touching her clit, and grasping her right boob with the other. She shakes for a long time afterwards and it was clearly an explosive orgasm she had.'
 						act 'Afterglow':
 							*clr & cla		
 							gs 'arousal', 'end'
 							minut += 1
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_mastubation_solo7.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_mastubation_solo7.jpg"></center>'
 							'After she comes down from her orgasm, she just turns around on her side with a smile on her face, showing her nice round bottom to you. She still acts as if she was alone in the room.' 
 							'So you decide to leave without saying anything, keeping the illusion that you just illicitly watched her masturbate like another voyeur, even though it was clear that she was aware of you the whole time,' 
 							act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
@@ -1344,7 +1343,7 @@ end
 if $ARGS[0] = 'after_movie_sex1':
 	gs 'arousal', 'foreplay', 3, 'lesbian'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex1.jpg"></center>'
 	'Katja unclasps your bra and you turn around so you face each other. She then continues to take off your bra, and starts playing with your nipple while you take her bra off.'
 	act 'Kiss some more':
 		*clr & cla
@@ -1352,20 +1351,20 @@ if $ARGS[0] = 'after_movie_sex1':
 		gs 'arousal', 'foreplay_give', -3, 'lesbian'
 		gs 'arousal', 'kiss', -3, 'lesbian'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex2.jpg"></center>'
 		'After you both have your bras off, you start kissing again while exploring each others breasts.'
 		act 'Off with her panties':
 			*clr & cla
 			gs 'arousal', 'foreplay', 3, 'lesbian'
 			gs 'arousal', 'foreplay_give', -3, 'lesbian'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex3.jpg"></center>'
 			'You lie Katja back down and start licking her tit while she still fondles your breasts. You then proceed to remove her panties, not taking your mouth off her now very hard nipple.' 
 			act 'More sucking':
 				*clr & cla
 				gs 'arousal', 'foreplay_give', -3, 'lesbian'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex4.jpg"></center>'
 				'After you got her panties off, you continue to lick her breast and start sucking on her nipple almost like a baby expecting to get milk out of it.'
 				if $pantyworntype ! 'none': 
 					act 'And now your panties':
@@ -1373,7 +1372,7 @@ if $ARGS[0] = 'after_movie_sex1':
 						gs 'arousal', 'foreplay', 2, 'lesbian'
 						gs 'arousal', 'kiss', -2, 'lesbian'
 						gs 'stat'					
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex5.jpg"></center>'
 						'You stop sucking her tit and move up for another kiss, giving Katja access to your panties, which she promptly starts to remove, and soon you are both completely naked.'
 						act 'Lick some pussy': gt 'katja_uni_sex',  'after_movie_sex2'
 					end
@@ -1388,50 +1387,50 @@ end
 if $ARGS[0] =  'after_movie_sex2':
 	gs 'arousal', 'cuni_give', 3, 'lesbian'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex6.jpg"></center>'
 	'You move down and place a pillow under Katja''s bottom, and start licking her sweet pussy. she starts to slightly moan and puts one hand on you head to keep you from stopping and the other hand she uses to fondle her breasts.'
 	act 'Start using hands instead':
 		*clr & cla
 		gs 'arousal', 'clit_finger', 3, 'lesbian'
 		gs 'arousal', 'clit_finger_give', -3, 'lesbian'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex7.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex7.jpg"></center>'
 		'You stop licking Katja and move up behind her, moving your hand to her pussy and begin playing with her clit. She quickly returns the favor, and for a while you are playing with each other''s clits, both moaning louder and louder.'
 		act 'Katja''s turn to lick':
 			*clr & cla
 			gs 'arousal', 'cuni', 3, 'lesbian'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex8.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex8.jpg"></center>'
 			'After some time, Katja moves off the bed and down to her knees before positioning you so that she has access to your pussy. She starts to lick you and it doesn''t take too long before you''re moaning even louder than before.'
 			act 'You are ready to come':
 				*clr & cla
 				$orgasm_or = 'yes'
 				gs 'arousal', 'clit_finger', 3, 'lesbian'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex9.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex9.jpg"></center>'
 				'Katja stops using her tongue and switches to direct application of her fingers to your clit. She moves behind you and treats your clit like she was masturbating herself. She is actually quite skilled at this and gets you to a crashing orgasm in no time.'
 				act 'Now to Katja':
 					*clr & cla
-					gs 'arousal', 'viginal_finger_give', 3, 'lesbian'
+					gs 'arousal', 'vaginal_finger_give', 3, 'lesbian'
 					gs 'arousal', 'foreplay', -3, 'lesbian'
 					gs 'arousal', 'kiss', -3, 'lesbian'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex10.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex10.jpg"></center>'
 					'After you come, Katja starts kissing you and letting her hands explore your breasts. You find her pussy and put a finger inside and start to fuck her with it.' 
 					act 'Katja''s turn to come':
 						*clr & cla
-						gs 'arousal', 'viginal_finger_give', 3, 'lesbian'
+						gs 'arousal', 'vaginal_finger_give', 3, 'lesbian'
 						gs 'arousal', 'foreplay', -3, 'lesbian'
 						gs 'arousal', 'kiss', -3, 'lesbian'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex11.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex11.jpg"></center>'
 						'You remove your finger from her pussy and start rubbing her clit, as you can feel Katja getting closer to coming. When she does, Katja removes her mouth from yours and lets out a loud moan.'
 						act 'Relax':
 							*clr & cla
 							minut += 5
 							gs 'arousal', 'end'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/dorm/sex/after_movie_sex12.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/sex/after_movie_sex12.jpg"></center>'
 							'After Katja comes down, she lies on top of you and looks into your eyes for a while before she finally gets up. "That was great, <<$pcs_nickname>>! Just what I needed. But it is getting late and I should probably go to bed."'
 							'You take the hint. "It was definitely fantastic, we should do this more often. But I really should get going," you tell her, causing her to blush. You start to get dressed while Katja gets ready for bed, before saying your goodbyes.'
 							act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'

locations/kendra.qsrc

@@ -569,14 +569,14 @@ if $ARGS[0] = 'kendra_bed_strap':
 					if pcs_vag ! 0:
 						'"That''s it, get it nice and wet so when I fuck that little pussy of yours, it slides in balls deep nice and easy." She thrusts her hips and starts fucking your mouth with the strap-on as she reaches over and starts slapping your ass. "Turn around, slut!" she commands. As you start to turn around, she grabs you by the hips and gets you up on your knees so you''re on all fours in front of her.'
 						gs 'arousal', 'bj', 3, 'lesbian', 'sub'
-						gs 'arousal', 'bdsm', -3, 'lesbian', 'sub'
+						gs 'arousal','BDSM', -3, 'lesbian', 'sub'
 						gs 'stat'
 						act 'Get fucked': gt 'kendra', 'kendra_bed_strap_vag'
 					else
 						'"Don''t worry my little pet, I''m not going to take your virginity. I have something special in mind for that." She caresses the side of your face as she thrusts the dildo into your mouth. "That''s it, get it nice and wet so when I fuck that little asshole of yours, it slides in balls deep nice and easy," she says before stepping back, popping the dildo out of your mouth and pointing at the couch. "Turn around, slut!" she commands.' 
 						'As you start to turn around, she grabs you by the hips and gets you up on your knees so you''re on all fours in front of her.'
 						gs 'arousal', 'bj', 3, 'lesbian', 'sub'
-						gs 'arousal', 'bdsm', -3, 'lesbian', 'sub'
+						gs 'arousal','BDSM', -3, 'lesbian', 'sub'
 						gs 'stat'
 						act 'Get butt fucked': gt 'kendra', 'kendra_bed_strap_anal'
 					end
@@ -644,7 +644,7 @@ if $ARGS[0] = 'kendra_gloryhole':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/gloryhole/first_glory2.jpg"></center>'
 		'She follows you into the stall and closes the door before suddenly grabbing you by the throat and choking you. You can barely breathe as she leans in and whispers in your ear. "You''re going to suck whatever dick comes through that hole until whoever it is cums in your mouth and you''re going to swallow it. You''ll keep doing this until I get bored, got it?" You''re unable to speak, so you just nod.'
-		gs 'arousal', 'bdsm', 2, 'lesbian', 'sub'
+		gs 'arousal','BDSM', 2, 'lesbian', 'sub'
 		gs 'stat'
 		act 'Accept your fate':
 			*clr & cla

locations/korrPar.qsrc

@@ -18,6 +18,7 @@ boycherdaksex = 0
 minut += 1
 bonusZ = 0
 display_bb = 0
+$location_type = 'private'
 gs 'themes', 'indoors'
 gs 'family_schedule'
 gs 'stat'
@@ -67,9 +68,9 @@ act '<b>Leave and go to the courtyard</b>':
 end
 
 if blockBedrPar = 0:
-	if locat['Anya'] = 11 and sisboytrioQW = 1:
+	if locat['Anya'] = 11 and sisboytrioQW = 1 and sisThank ! 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom'
-	elseif locat['Anya'] = 11 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
+	elseif locat['Anya'] = 11 and sisboytrioQW ! 1 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
 		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else
 		act 'Go to your room':gt 'bedrPar'
@@ -361,7 +362,7 @@ if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
 				schoolPredupr = 3
 				npc_rel['A29'] = 0
 				SchoolBlock = 1
-				gs 'homes_properties', 'block_acces', 'parents_home'
+				gs 'homes_properties', 'block_access', 'parents_home'
 				schoolprogul = 0
 				gs 'grades', 'grade_award', 'school', 'math', -100
 				gs 'grades', 'grade_award', 'school', 'rus', -100

locations/lesbisubhouse.qsrc

@@ -183,7 +183,7 @@ if $ARGS[0] = 'start':
 						'Ignoring your slave as well as you can, you fuck her ass at your leisure. She proves distracting enough to keep you from cumming, though.'
 
 						$orgasm_or = 'no'
-						gs 'arousal', 'anal_strapon_give', 30, 'dom', 'lesbian', 'bound'
+						gs 'arousal', 'anal_strap_give', 30, 'dom', 'lesbian', 'bound'
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -194,7 +194,7 @@ if $ARGS[0] = 'start':
 						'You accelerate the pace, her incoherent mumbling distracting and even angering you, each thrust a tiny punishment in its own right. Once she''s silenced, you have no trouble bringing yourself to orgasm. Meanwhile, your slave enjoys herself thoroughly and cums several times more, helping herself with her fingers.'
 
 						$orgasm_or = 'yes'
-						gs 'arousal', 'anal_strapon_give', 30, 'dom', 'lesbian', 'rough', 'bound'
+						gs 'arousal', 'anal_strap_give', 30, 'dom', 'lesbian', 'rough', 'bound'
 						gs 'arousal', 'end'
 						gs 'stat'
 					end
@@ -203,7 +203,7 @@ if $ARGS[0] = 'start':
 						'You pull out all the way the way again, torturously slowly, until her wide anus releases your strapon with a pop. You can hear her heavy breathing and see her impatience, her hips moving towards you, looking for your fake cock. She finds it, as if her hole had been drawn to it, and you drive it back in one powerful thrust, entering her without resistance, eliciting guttural sounds of satisfaction from her. Once you''ve pushed the strapon all the way in to the hilt, you start fuck her roughly, slapping against her perfect ass with loud slaps. Soon, you sense that familiar tingling in your stomach and an orgasm shakes both of you.'
 
 						$orgasm_or = 'yes'
-						gs 'arousal', 'anal_strapon_give', 30, 'dom', 'lesbian', 'rough', 'bound'
+						gs 'arousal', 'anal_strap_give', 30, 'dom', 'lesbian', 'rough', 'bound'
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -211,7 +211,7 @@ if $ARGS[0] = 'start':
 						'You start moving your hips, moving whichever way you have to to rub the strapon against your pussy. Your slave manages to free one of her hands from her bindings and immediately puts it between her legs, furiously rubbing her clit - the final push to send her into a screaming orgasm. You keep driving the dildo into her ass, feeling the resistance as her contracting muscles try to push the invader from her anus, but it only spurs you on and you drive the cock into her with even more force, the excitement of the situation soon causing you to cum with your slave, who is already enjoying her second climax.'
 
 						$orgasm_or = 'yes'
-						gs 'arousal', 'anal_strapon_give', 30, 'dom', 'lesbian', 'rough', 'bound'
+						gs 'arousal', 'anal_strap_give', 30, 'dom', 'lesbian', 'rough', 'bound'
 						gs 'arousal', 'end'
 						gs 'stat'
 

locations/lover.qsrc

@@ -131,6 +131,7 @@ if $ARGS[0] = 'remove':
 
 	killvar 'pcs_lovers', i
 	pcs_lover -=1
+	if loverGender[i] = 1: pcs_girlfriends -= 1
 end
 
 if $ARGS[0] = 'add fuckbuddy':

locations/mey_tamara_events.qsrc

@@ -119,13 +119,13 @@ if $args[0] = 'next_meet':
 			elseif zz_stage = 7:
 				'Tamara glances at the wall clock.'
 				'"Oh, look at the clock, time really flies by when you''re enjoying yourself! "'
-				'" Look how dark it is outside! "'
+				'"Look how dark it is outside!"'
 				'"You know what, you can stay the night. I don''t want you to running around this late! "'
 				'You start making excuses, but Aunt Tamara''s not listening:'
-				'" You never know who you might meet this late. And my little carrots will be glad. Let''s call your parents and say you''ll be staying here tonight! "'
+				'"You never know who you might meet this late. And my little carrots will be glad. Let''s call your parents and say you''ll be staying here tonight!"'
 				'You insist saying you do not want to impose...'
 				'"Impose? Don''t be silly. In this large house?!" says Aunt Tamara.'
-				'- No one will be bothered. We have a guest bedroom, it''s always empty. And the rest of us have our own private room here." You longingly remember about your room, which you shared with your sister all your life... "So let''s call your parents and let them know you''re staying, so they don''t worry."'
+				'"No one will be bothered. We have a guest bedroom, it''s always empty. And the rest of us have our own private rooms here." You longingly remember about your room, which you shared with your sister all your life... "So let''s call your parents and let them know you''re staying, so they don''t worry."'
 			end
 
 			act 'Drink tea with Tamara': gt 'mey_tamara_events', 'next_meet', zz_stage + 1
@@ -138,7 +138,7 @@ if $args[0] = 'next_meet':
 			gs 'stat'
 			'"I''m sorry, Aunt Tamara, I must go home or else I''ll get some stern scolding..."'
 			'"Well, I can''t say I''m not disappointed <<$pcs_nickname>>. Don''t stop anywhere on your way home." said a disappointed Aunt Tamara.'
-			'"Remember this, if you change your mind and want to hang out, come visit us anytime again! You''re always welcome here!'
+			'"Remember this, if you change your mind and want to hang out, come visit us anytime again! You''re always welcome here!"'
 
 			killvar 'zz_stage'
 			act 'Go home': gt 'pav_residential'

locations/mey_vika_events.qsrc

@@ -684,7 +684,7 @@ if $ARGS[0] = 'park_meet':
 
 		mey_vika['mey_vika_park_action'] += 1
 		if mey_vika['mey_vika_park_action'] > 2: mey_vika['mey_vika_park_action'] = 0
-		if mey_vika['mey_vika_qw'] < 11: mey_vika['mey_vika_qw'] += 1
+		if mey_vika['mey_vika_qw'] < 10: mey_vika['mey_vika_qw'] += 1
 	end
 end
 
@@ -724,7 +724,7 @@ if $ARGS[0] = 'cafe_qw':
 				gs 'npc_relationship', 'modify', 'A15', 'like'
 				gs 'npc_relationship', 'modify', 'A165', 'like'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_org.jpg"></center>'
-				'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.'
+				'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 patio wall of the café, just so you won''t fall over.'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'voyeur_sex', 2, 'unknown'
 				gs 'arousal', 'end'

locations/mod_setting.qsrc

@@ -97,6 +97,86 @@ if mod_list > 0:
 			gt 'mod_setting'
 		end
 	end
+	! Delete single mod
+	act ''+iif(settingmode = 1, '<center><b>Uninstall mod</b></center>','Uninstall mod')+'':
+		$mod_temp = input('Input mod name to uninstall (Case Sensetive)')
+		mod_removed_temp = 0
+		if $mod_temp ! '':
+			mod_i = mod_list
+			:mod_data_remover
+			if $mod_name[mod_i] = $mod_temp:
+				$mod_su_name = 'mod_<<$mod_name[mod_i]>>_onremove'
+				if LOC($mod_su_name): gs $mod_su_name
+				mod_removed_temp += 1
+				$mod_name_temp[mod_i] = ''
+			else
+				$mod_name_temp[mod_i] = $mod_name[mod_i]
+				$mod_version_temp[mod_i] = $mod_version[mod_i]
+				$mod_author_temp[mod_i] = $mod_author[mod_i]
+				$mod_desc_temp[mod_i] = $mod_desc[mod_i]
+				$mod_opt_temp[mod_i] = $mod_opt[mod_i]
+			end
+			if mod_i > 1:
+				mod_i -= 1
+				jump 'mod_data_remover'
+			end
+			killvar '$mod_su_name'
+			killvar 'mod_i'
+		end
+
+		if mod_removed_temp > 0:
+
+			killqst
+			killvar '$mod_name'
+			killvar '$mod_version'
+			killvar '$mod_author'
+			killvar '$mod_desc'
+			killvar '$mod_opt'
+
+			mod_i = 1
+			mod_restored_i = 1
+			:mod_data_restore
+			if $mod_name_temp[mod_i] ! '':
+				$mod_name_add_temp = $mod_name_temp[mod_i]
+				addqst 'mod/<<$mod_name_add_temp>>.qsp'
+				killvar '$mod_name_add_temp'
+
+				$mod_name[mod_restored_i] = $mod_name_temp[mod_i]
+				$mod_version[mod_restored_i] = $mod_version_temp[mod_i]
+				$mod_author[mod_restored_i] = $mod_author_temp[mod_i]
+				$mod_desc[mod_restored_i] = $mod_desc_temp[mod_i]
+				$mod_opt[mod_restored_i] = $mod_opt_temp[mod_i]
+				mod_restored_i += 1      
+			end
+			if mod_i < mod_list:
+				mod_i += 1
+				jump 'mod_data_restore'
+			end
+
+			mod_list = mod_restored_i - 1
+
+			killvar '$mod_name_temp'
+			killvar '$mod_version_temp'
+			killvar '$mod_author_temp'
+			killvar '$mod_desc_temp'
+			killvar '$mod_opt_temp'
+			killvar 'mod_i'
+			killvar 'mod_restored_i'
+
+			if mod_removed_temp > 0:
+				msg 'Mod <<$mod_temp>> was disabled.'
+			end
+		else
+			msg 'Mod <<$mod_temp>> was not installed.'
+		end
+
+		killvar 'mod_removed_temp'
+		killvar 'mod_temp'
+
+		gt 'mod_setting'
+	end
 end
+
+
 --- mod_setting ---------------------------------
 

locations/mother.qsrc

@@ -316,7 +316,7 @@ if $ARGS[0] = '':
 				'You tell her that you were rapped.'
 				'<<$npc_nickname[''A29'']>> freezes in shock. Few second later, after understanding what you just said, she hugs you.'
 				'"Do not worry, <<$pcs_nickname>>. You are safe now, everyting will be ok."'
-				'She keeps hugging you firmly for few minutes, talking to you, tryiong to make you feel better. <<$npc_nickname[''A29'']>> asks you to try to be more cerefull so this situation would not repeat for you.'
+				'She keeps hugging you firmly for few minutes, talking to you, trying to make you feel better. <<$npc_nickname[''A29'']>> asks you to try to be more cerefull so this situation would not repeat for you.'
 				'"Please, take this pill, we do not want that you become pregnant because of a raper."'
 				minut+=rand(8,12)
 				gs 'npc_relationship', 'modify', 'A29', 4

locations/music_buskingevents.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'calculate_tips':
 		ml_location_mod = 30
 	elseif $region = 'pav':
 		ml_location_mod = 0
-	elseif $region = 'pushkin_sq':
+	elseif $region = 'pushkin':
 		ml_location_mod = 15
 	end 	
 

locations/nichGala.qsrc

@@ -745,7 +745,7 @@ elseif $ARGS[0] = 'slaveImplant':
 		'A girl steps right in front of you and pulls down her top.'
 		'Being pushed down by one of her friends she forces you to suck on her breasts.'
 		'"This feels amazing, you should try that as well."'
-		gs 'arousal','kiss_give',5,'exhibitionism','humiliation','unknown','bound','group','lesbian'
+		gs 'arousal','kiss',5,'exhibitionism','humiliation','unknown','bound','group','lesbian'
 		gs 'stat'
 		act 'Continue': gt 'nichGala','slaveImplant',124 + rand(1,2)
 	elseif ARGS[1] = 125:	

locations/npc_relationship.qsrc

@@ -241,4 +241,12 @@ if $ARGS[0] = 'defaultnotschool':
 	if r <= aarraynumber :jump 'default_friendship_loop2'
 end
 
+if $ARGS[0] = 'default':
+	r = 1
+	:default_friendship_loop3
+		gs 'npc_relationship', 'set', 'A<<r>>', 30
+		r += 1
+	if r <= aarraynumber :jump 'default_friendship_loop3'
+end
+
 --- npc_relationship ---------------------------------

locations/npcgeneratec.qsrc

@@ -164,7 +164,7 @@ if npc_dick[$npclastgenerated] < 9:
 	end
 	
 !! average length dicks
-elseif npc_dick[$npclastgenerated] < 20:
+elseif npc_dick[$npclastgenerated] < 13:
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
 	
 		$npc_dick_desc[$npclastgenerated] = 'skinny'
@@ -179,7 +179,7 @@ elseif npc_dick[$npclastgenerated] < 20:
 		
 	end
 !! long dicks
-elseif npc_dick[$npclastgenerated] < 31:
+elseif npc_dick[$npclastgenerated] < 18:
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
 	
 		$npc_dick_desc[$npclastgenerated] = 'long'
@@ -296,16 +296,20 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	occupation set, list below
 
 	npc_residence[$npclastgenerated] = temp_location
-
-	if temp_location = 1:
+	if npc_residence[$npclastgenerated] = 1:
 		npc_finance[$npclastgenerated] = 0
-	elseif temp_location = 2:
+		$npc_residence[$npclastgenerated] = 'pav_res'
+	elseif npc_residence[$npclastgenerated] = 2:
 		npc_finance[$npclastgenerated] = 0
-	elseif temp_location = 3:
+		$npc_residence[$npclastgenerated] = 'student_dorms'
+	elseif npc_residence[$npclastgenerated] = 2:
 		npc_finance[$npclastgenerated] = rand(1,2)
-	elseif temp_location = 4:
+		$npc_residence[$npclastgenerated] = 'city_res'
+	elseif npc_residence[$npclastgenerated] = 2:
 		npc_finance[$npclastgenerated] = 2
+		$npc_residence[$npclastgenerated] = 'city_center'
 	end
+
 	
 	if npc_finance[$npclastgenerated] = 0:
 		if npc_residence[$npclastgenerated] ! 1 and npc_residence[$npclastgenerated] ! 4 and npctempgage < 22:
@@ -319,14 +323,24 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		end
 		npc_occupation[$npclastgenerated] = rand(1,7)
 		if rand(1,3) = 1:
-			npc_start_free_time[$npclastgenerated] = 9
+			npc_start_free_time[$npclastgenerated] = 8
 			npc_end_free_time[$npclastgenerated] = 12
+			
+			npc_work_start[$npclastgenerated] = 13
+			npc_work_end[$npclastgenerated] = 21
+			
 		elseif rand(1,2) = 1:
-			npc_start_free_time[$npclastgenerated] = 16
+			npc_start_free_time[$npclastgenerated] = 15
 			npc_end_free_time[$npclastgenerated] = 20
+			
+			npc_work_start[$npclastgenerated] = 6
+			npc_work_end[$npclastgenerated] = 14
 		else
-			npc_start_free_time[$npclastgenerated] = 20
-			npc_end_free_time[$npclastgenerated] = 23
+			npc_start_free_time[$npclastgenerated] = 18
+			npc_end_free_time[$npclastgenerated] = 22
+			
+			npc_work_start[$npclastgenerated] = 9
+			npc_work_end[$npclastgenerated] = 17
 		end
 		npc_day_off[$npclastgenerated] = rand(1,7)
 	elseif npc_finance[$npclastgenerated] = 1:
@@ -334,14 +348,20 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(7,15)
 		
 		if rand(1,2) = 1:
-			npc_start_free_time[$npclastgenerated] = 9
+			npc_start_free_time[$npclastgenerated] = 8
 			npc_end_free_time[$npclastgenerated] = 12
+			
+			npc_work_start[$npclastgenerated] = 13
+			npc_work_end[$npclastgenerated] = 21
 		else
-			npc_start_free_time[$npclastgenerated] = 20
-			npc_end_free_time[$npclastgenerated] = 23
+			npc_start_free_time[$npclastgenerated] = 18
+			npc_end_free_time[$npclastgenerated] = 22
+			
+			npc_work_start[$npclastgenerated] = 9
+			npc_work_end[$npclastgenerated] = 17
 		end
 		
-		npc_car[$npclastgenerated] = rand(-3,1)
+		if npc_car[$npclastgenerated] = 0: npc_car[$npclastgenerated] = rand(-3,1)
 	elseif npc_finance[$npclastgenerated] = 2:
 		npc_apt_type[$npclastgenerated] = 5
 		!!npc_apt_type[$npclastgenerated] = rand(5,6)
@@ -453,6 +473,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_occupation[$npclastgenerated] = 'fast_food'
 	elseif npc_occupation[$npclastgenerated] = 6: 
 		$npc_occupation[$npclastgenerated] = 'taxi_driver'
+		npc_car[$npclastgenerated] = 1
 	elseif npc_occupation[$npclastgenerated] = 7: 
 		$npc_occupation[$npclastgenerated] = 'masseuse'
 	elseif npc_occupation[$npclastgenerated] = 8: 
@@ -468,74 +489,37 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_occupation[$npclastgenerated] = 13: 
 		$npc_occupation[$npclastgenerated] = 'waiter'
 	elseif npc_occupation[$npclastgenerated] = 14: 
-		$npc_occupation[$npclastgenerated] = 'personal trainer'
+		$npc_occupation[$npclastgenerated] = 'personal_trainer'
 	elseif npc_occupation[$npclastgenerated] = 15: 
 		$npc_occupation[$npclastgenerated] = 'programmer'
 	elseif npc_occupation[$npclastgenerated] = 16: 
-		$npc_occupation[$npclastgenerated] = 'businessman'
+		$npc_occupation[$npclastgenerated] = 'criminal'
+		!! npc_criminal_open determines whether or not they will hide their criminality from the player
+		npc_criminal_open[$npclastgenerated] = rand(0,1)
+		if rand(1,3) = 1:
+			$npc_crime_type[$npclastgenerated] = 'drug_dealer'
+		elseif rand(1,2) = 1:
+			$npc_crime_type[$npclastgenerated] = 'enforcer'
+		else
+			$npc_crime_type[$npclastgenerated] = 'thief'
+		end
 	elseif npc_occupation[$npclastgenerated] = 17: 
-		$npc_occupation[$npclastgenerated] = 'lawyer'
+		$npc_occupation[$npclastgenerated] = 'businessman'
 	elseif npc_occupation[$npclastgenerated] = 18: 
-		$npc_occupation[$npclastgenerated] = 'investment banker'
+		$npc_occupation[$npclastgenerated] = 'lawyer'
+	elseif npc_occupation[$npclastgenerated] = 19: 
+		$npc_occupation[$npclastgenerated] = 'investment_banker'
 	end
 
-!!	type of homour
-	npc_humor[$npclastgenerated] = rand(0,3)
-	
-!! Preferred sexual position
-	npc_fav_pos[$npclastgenerated] = rand(1,7)
 	
-	if npc_fav_pos[$npclastgenerated] = 1:
-		$npc_fav_pos[$npclastgenerated] = 'missionary'
-	elseif npc_fav_pos[$npclastgenerated] = 2:
-		$npc_fav_pos[$npclastgenerated] = 'doggy'
-	elseif npc_fav_pos[$npclastgenerated] = 3:
-		$npc_fav_pos[$npclastgenerated] = 'cowgirl'
-	elseif npc_fav_pos[$npclastgenerated] = 4:
-		$npc_fav_pos[$npclastgenerated] = 'blowjob'
-	elseif npc_fav_pos[$npclastgenerated] = 5:
-		$npc_fav_pos[$npclastgenerated] = 'titjob'
-	elseif npc_fav_pos[$npclastgenerated] = 6:
-		$npc_fav_pos[$npclastgenerated] = '69'
-	elseif npc_fav_pos[$npclastgenerated] = 7:
-		$npc_fav_pos[$npclastgenerated] = 'anal'
-	end
-	
-	!! npc_sex_speed determines whether they like it slow, steady, or fast and will cause them to select that speed more frequently
-	!! 1 is slow, 2 is steady, 3 is fast/rough
-	npc_sex_speed[$npclastgenerated] = rand(1,3)
+!! ------------------------- lifestyle and personality choices ----------------------------------
 
-!! Preferred cumming location
-!!	0 = no preference
-	npc_cum_pref[$npclastgenerated] = rand(0,5)
-	
-	if npc_cum_pref[$npclastgenerated] = 1:
-		$npc_cum_pref[$npclastgenerated] = 'creampie'
-	elseif npc_cum_pref[$npclastgenerated] = 2:
-		$npc_cum_pref[$npclastgenerated] = 'mouth'
-	elseif npc_cum_pref[$npclastgenerated] = 3:
-		$npc_cum_pref[$npclastgenerated] = 'facial'
-	elseif npc_cum_pref[$npclastgenerated] = 4:
-		$npc_cum_pref[$npclastgenerated] = 'tits'
-	elseif npc_cum_pref[$npclastgenerated] = 5:
-		$npc_cum_pref[$npclastgenerated] = 'pullout'
-	end
-	
 
-!!	npc_tit_pref determines an npcs preference for breast size
-!!	if npc_tit_pref = 0: they don''t care
-!!	if npc_tit_pref = 1: they like small tits (A or smaller)
-!!	if npc_tit_pref = 2: they like medium sized tits (B to C)
-!!	if npc_tit_pref = 3: they like busty girls (D to E)
-!!	if npc_tit_pref = 4: they like big fat titties (F+)
-	npc_tit_pref[$npclastgenerated] = rand(0,4)
-	
-!!	npc_bush_pref determines an npcs preference for the player''s shaving habits
-!!	if npc_bush_pref = 0: they don''t care
-!!	if npc_bush_pref = 1: they prefer it cleanshaven
-!!	if npc_bush_pref = 2: they like it trimmed or cleanshaven
-!!	if npc_bush_pref = 3: they like it bushy
-	npc_bush_pref[$npclastgenerated] = rand(0,3)
+!!	type of humour
+!!	1 - childish
+!!	2 - perverted
+!!	3 - intellectual/clever
+	npc_humor[$npclastgenerated] = rand(0,3)
 
 !! 	if npc_smoker > 0: they smoke cigarettes
 	npc_smoker[$npclastgenerated] = rand(0,2)
@@ -549,10 +533,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !! we will skip addit for now, have a variable just for smoking
 !!	npc_addit[$npclastgenerated] = rand(0,1)
 
-!!	if npc_doors = 0: they have no preference on indoor or outdoor
-!!	if npc_doors = 1: they like outdoor activities
-!!	if npc_doors = 2: they like indoor activities
-	npc_doors[$npclastgenerated] = rand(0,2)
+	npc_door_pref[$npclastgenerated] = rand(0,2)
+	if npc_door_pref[$npclastgenerated] = 1:
+		!! they like going out for things and doing things outside
+		$npc_door_pref[$npclastgenerated] = 'outdoor'
+	elseif npc_door_pref[$npclastgenerated] = 2: 
+		!! they like more quiet activities and staying at home
+		$npc_door_pref[$npclastgenerated] = 'indoor'
+	end
+	
 	
 !!	npc_goal is what they want out of a relationship
 !!	1 = just sex 
@@ -611,46 +600,211 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		end
 	end
 	
+	if rand(0,2) > 0:
+		if rand(0,1) = 1:
+			npc_neat[$npclastgenerated] = 1
+			npc_messy[$npclastgenerated] = 0
+		else
+			npc_messy[$npclastgenerated] = 1
+			npc_neat[$npclastgenerated] = 0
+		end
+	end
 	
-	!! if npc_argumentative = 1:, they will get into more arguments with you about things
+	!! npc_gentle = 1: npc is likely to have a soft emotional and physical touch outside of sex
+	!! npc_rough = 1: npc is likely to have a rough/aggressive emotional and physical touch outside of sex
+	if rand(0,2) > 0:
+		if rand(0,1) = 1:
+			npc_gentle[$npclastgenerated] = 1
+			npc_rough[$npclastgenerated] = 0
+		else
+			npc_gentle[$npclastgenerated] = 1
+			npc_rough[$npclastgenerated] = 0
+		end
+	end
+	!! npc_diligent = 1: npc is more methodical, doesn''t like to skip steps, and usuallly plays it safe
+	!! npc_risktaker = 1: npc is more likely to take risks, such as never using a condom
+	if rand(0,2) > 0:
+		if rand(0,1) = 1:
+			npc_diligent[$npclastgenerated] = 1
+			npc_risktaker[$npclastgenerated] = 0
+		else
+			npc_diligent[$npclastgenerated] = 1
+			npc_risktaker[$npclastgenerated] = 0
+		end
+	end
+	
+	!! if npc_argumentative = 1: they will get into more arguments with you about things
 	!! it is also harder to persuade them
 	npc_argumentative[$npclastgenerated] = rand(0,2)
 	
+	!! if npc_assertive = 1: they will know what they want
+	!! if npc_assertive = -1: they will often ask what the player wants
+	!! it is also harder to persuade them
+	npc_assertive[$npclastgenerated] = rand(-1,1)
+	
 	!! how easy or difficult it is to persuade them into doing something
 	npc_willpwr[$npclastgenerated] = rand(1,50)
 	npc_willpwr[$npclastgenerated] += npc_argumentative[$npclastgenerated] * 10
 	
+	!! if npc_arrogant = 1: they will act arrogantly
+	npc_arrogant[$npclastgenerated] = rand(-1,1)
+	
 	!! if npc_competitive = 1: they are overly competitive in contests against you or others
 	npc_competitive[$npclastgenerated] = rand(-1,1)
 	
+	
 	!! if npc_insecure = 1: they are insecure in their masculinity and won''t respond well to teasing
 	npc_insecure[$npclastgenerated] = rand(-1,1)
 	
-	if rand(0,1) = 1:
+	!! if npc_gymrat = 1: they like working out
+	npc_gymrat[$npclastgenerated] = rand(-1,1)
+	
+	!! if npc_abusive = 1: the npc will be abusive
+	npc_abusive[$npclastgenerated] = rand(-3,1)
+	
+	
+	!! if npc_caretaker = 1: they will frequently show love through acts of service
+	!! example: making you breakfast in bed
+	if npc_selfish[$npclastgenerated] ! 1: npc_caretaker[$npclastgenerated] = rand(-3,1)
+	
+!! ------------------------- sex related preferences ----------------------------------
+
+	if rand(0,1) >= 1 and npc_risktaker[$npclastgenerated] = 1:
 !!		if npc_condom_conscious = 1: they will use condoms but can be talked out of it
 !!		if npc_condom_conscious = 2: they will always insist on using condoms unless you are in a committed relationship 
-		npc_condom_conscious[$npclastgenerated] = rand(-2,2)
-	else
+		if npc_diligent[$npclastgenerated] = 1:
+			npc_condom_conscious[$npclastgenerated] = rand(-1,2)
+		else
+			npc_condom_conscious[$npclastgenerated] = rand(-2,2)
+		end
+	elseif npc_diligent[$npclastgenerated] ! 1:
 !!		if npc_no_condoms = 1: they have a preference for skipping condoms but can be talked into using one
 !!		if npc_no_condoms = 2: they will never use a condom no matter what
-		npc_no_condoms[$npclastgenerated] = rand(-2,2)
+		if npc_risktaker[$npclastgenerated] = 1:
+			npc_no_condoms[$npclastgenerated] = rand(-1,2)
+		else
+			npc_no_condoms[$npclastgenerated] = rand(-2,2)
+		end
 	end
+
+!! Preferred sexual position
+	npc_fav_pos[$npclastgenerated] = rand(1,7)
 	
-	!! if npc_caretaker = 1: they will frequently show love through acts of service
-	!! example: making you breakfast in bed
-	if npc_selfish[$npclastgenerated] ! 1: npc_caretaker[$npclastgenerated] = rand(-3,1)
+	if npc_fav_pos[$npclastgenerated] = 1:
+		$npc_fav_pos[$npclastgenerated] = 'miss'
+	elseif npc_fav_pos[$npclastgenerated] = 2:
+		$npc_fav_pos[$npclastgenerated] = 'doggy'
+	elseif npc_fav_pos[$npclastgenerated] = 3:
+		$npc_fav_pos[$npclastgenerated] = 'cowgirl'
+	elseif npc_fav_pos[$npclastgenerated] = 4:
+		$npc_fav_pos[$npclastgenerated] = 'blowjob'
+	elseif npc_fav_pos[$npclastgenerated] = 5:
+		$npc_fav_pos[$npclastgenerated] = 'titjob'
+	elseif npc_fav_pos[$npclastgenerated] = 6:
+		$npc_fav_pos[$npclastgenerated] = '69'
+	elseif npc_fav_pos[$npclastgenerated] = 7:
+		$npc_fav_pos[$npclastgenerated] = 'anal'
+	end
 	
-	!! npc_childfree determines that they never want to have kids and will react poorly to pregnancy related topics
-	npc_childfree[$npclastgenerated] = rand(-3,1)
+	!! npc_sex_speed determines whether they like it slow, steady, or fast and will cause them to select that speed more frequently
+	!! 1 is slow, 2 is steady, 3 is fast/rough
+	npc_sex_speed[$npclastgenerated] = rand(1,3)
+	if npc_sex_speed[$npclastgenerated] = 1 and rand(1,3) = 1:
+		!! npc has a tendency to be overly gentle and cautious
+		npc_gentle_lover[$npclastgenerated] = 1
+	elseif rand(1,3) = 1:
+		!! npc prefers sex with dirty talk and perverted acts
+		!! example: using spit instead of lube
+		npc_dirty_lover[$npclastgenerated] = 1
+	elseif rand(1,3) = 1:
+		!! npc prefers romantic and sensual sex
+		npc_sensual_lover[$npclastgenerated] = 1
+	end
+
+!! Preferred cumming location
+!!	0 = no preference
+	npc_cum_pref[$npclastgenerated] = rand(0,5)
 	
-	!! if npc_abusive = 1: the npc will be abusive
-	npc_abusive[$npclastgenerated] = rand(-3,1)
+	if npc_cum_pref[$npclastgenerated] = 1:
+		$npc_cum_pref[$npclastgenerated] = 'creampie'
+	elseif npc_cum_pref[$npclastgenerated] = 2:
+		$npc_cum_pref[$npclastgenerated] = 'mouth'
+	elseif npc_cum_pref[$npclastgenerated] = 3:
+		$npc_cum_pref[$npclastgenerated] = 'facial'
+	elseif npc_cum_pref[$npclastgenerated] = 4:
+		$npc_cum_pref[$npclastgenerated] = 'tits'
+	elseif npc_cum_pref[$npclastgenerated] = 5:
+		$npc_cum_pref[$npclastgenerated] = 'pullout'
+	end
+	
+	if rand(-3,1) = 1: npc_bukakke_fetish[$npclastgenerated] = 1
+	
+	
+!!	npc_tit_pref determines an npcs preference for breast size
+!!	if npc_tit_pref = 0: they don''t care
+!!	if npc_tit_pref = 1: they like small tits (A or smaller)
+!!	if npc_tit_pref = 2: they like medium sized tits (B to C)
+!!	if npc_tit_pref = 3: they like busty girls (D to E)
+!!	if npc_tit_pref = 4: they like oversized breasts (F+)
+	npc_tit_pref[$npclastgenerated] = rand(0,4)
 	
+!!	npc_bush_pref determines an npcs preference for the player''s shaving habits
+!!	if npc_bush_pref = 0: they don''t care
+!!	if npc_bush_pref = 1: they prefer it cleanshaven
+!!	if npc_bush_pref = 2: they like it trimmed or cleanshaven
+!!	if npc_bush_pref = 3: they like it bushy
+	npc_bush_pref[$npclastgenerated] = rand(0,3)
+	
+!! $npc_fav_body_part
+	if rand(1,4) = 1:
+		$npc_fav_body_part[$npclastgenerated] = 'pussy'
+	elseif rand(1,3) = 1:
+		$npc_fav_body_part[$npclastgenerated] = 'tits'
+	elseif rand(1,2) = 2:
+		$npc_fav_body_part[$npclastgenerated] = 'ass'
+	else
+		$npc_fav_body_part[$npclastgenerated] = 'thighs'
+	end
+	
+
 	!! if npc_sexdrive determines how likely the npc will be to engage in sexual behavior and how many times they can orgasm in a single sexual encounter
-	npc_sexdrive[$npclastgenerated] = rand(1,10)
+	if rand(1,10) <= 4:
+		npc_sexdrive[$npclastgenerated] = rand(3,5)
+	elseif rand(1,10) <= 3:
+		npc_sexdrive[$npclastgenerated] = rand(1,3)
+!!	elseif rand(1,10) <= 3:
+!!		npc_sexdrive[$npclastgenerated] = rand(1,10)
+!!	elseif rand(1,10) <= 2:
+!!		npc_sexdrive[$npclastgenerated] = rand(7,10)
+	else
+		!!failsafe
+		npc_sexdrive[$npclastgenerated] = rand(1,10)
+	end
+	
+	!! if npc_sex_stamina determines how long they can last in bed without cumming
+	
+	if rand(1,10) <= 4:
+		npc_sex_stamina[$npclastgenerated] = rand(3,5)
+	elseif rand(1,10) <= 3:
+		npc_sex_stamina[$npclastgenerated] = rand(1,3)
+!!	elseif rand(1,10) <= 3:
+!!		npc_sex_stamina[$npclastgenerated] = rand(1,10)
+!!	elseif rand(1,10) <= 2:
+!!		npc_sex_stamina[$npclastgenerated] = rand(7,10)
+	else
+		!!failsafe
+		npc_sex_stamina[$npclastgenerated] = rand(1,10)
+	end
+
+	!! npc_spanker determines whether or not they''re into spanking during sex
+	npc_sex_spanker[$npclastgenerated] = rand(-1,1)
+	
+	!! npc_childfree determines that they never want to have kids and will react poorly to pregnancy related topics
+	npc_childfree[$npclastgenerated] = rand(-3,1)
 	
 	!! if npc_pussyeater = 1: they have a fetish for eating pussy
-	npc_pussyeater[$npclastgenerated] = rand(-2,1)
+	!! if npc_pussyeater = -1: they refuse to eat pussy
+	npc_pussyeater[$npclastgenerated] = rand(-1,1)
 	
 	!! if npc_cuddler = 1: the npc likes to cuddle
 	npc_cuddler[$npclastgenerated] = rand(-1,1)
@@ -660,6 +814,73 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	
 	!! if npc_two_pump = 1: the npc will always cum immediately in the first penetration act of sex
 	npc_two_pump[$npclastgenerated] = rand(-5,1)
+	
+!! ------------------------- date preferences ----------------------------------
+	!! favorite kind of date
+	if $npc_door_pref[$npclastgenerated] = 'indoor' and rand(1,3) < 3:
+		if rand(1,5) = 1:
+			$npc_fav_date[$npclastgenerated] = 'takeout_date'
+		elseif rand(1,4) = 1:
+			$npc_fav_date[$npclastgenerated] = 'coffee_date'
+		elseif rand(1,3) = 1:
+			$npc_fav_date[$npclastgenerated] = 'casual_meal'
+		elseif rand(1,2) = 1:
+			$npc_fav_date[$npclastgenerated] = 'netflix_chill'
+		elseif rand(1,1) = 1:
+			$npc_fav_date[$npclastgenerated] = 'movie_date'
+		end
+	elseif $npc_door_pref[$npclastgenerated] = 'outdoor' and rand(1,3) < 3:
+		if rand(1,6) = 1:
+			$npc_fav_date[$npclastgenerated] = 'picnic_date'
+		elseif rand(1,5) = 1:
+			$npc_fav_date[$npclastgenerated] = 'beach_date'
+		elseif rand(1,4) = 1:
+			$npc_fav_date[$npclastgenerated] = 'casual_meal'
+		elseif rand(1,3) = 1:
+			$npc_fav_date[$npclastgenerated] = 'fancy_meal'
+		elseif rand(1,2) = 1:
+			$npc_fav_date[$npclastgenerated] = 'amusement_park'
+		elseif rand(1,1) = 1:
+			$npc_fav_date[$npclastgenerated] = 'shopping_date'
+		end
+	else
+		if rand(1,4) = 1:
+			$npc_fav_date[$npclastgenerated] = 'picnic_date'
+		elseif rand(1,4) = 1:
+			$npc_fav_date[$npclastgenerated] = 'beach_date'
+		elseif rand(1,3) = 1:
+			$npc_fav_date[$npclastgenerated] = 'shopping_date'
+		elseif rand(1,2) = 1:
+			$npc_fav_date[$npclastgenerated] = 'fancy_meal'
+		elseif rand(1,1) = 1:
+			$npc_fav_date[$npclastgenerated] = 'amusement_park'
+		elseif rand(1,4) = 1:
+			$npc_fav_date[$npclastgenerated] = 'takeout_date'
+		elseif rand(1,3) = 1:
+			$npc_fav_date[$npclastgenerated] = 'casual_meal'
+		elseif rand(1,2) = 1:
+			$npc_fav_date[$npclastgenerated] = 'netflix_chill'
+		elseif rand(1,1) = 1:
+			$npc_fav_date[$npclastgenerated] = 'movie_date'
+		end
+	end
+	
+	!! npc_fav_genre determines what kind of media they like to consume
+	if rand(1,10) > 7:
+		$npc_fav_genre[$npclastgenerated] = 'action'
+	elseif rand(1,7) > 4:
+		$npc_fav_genre[$npclastgenerated] = 'horror'
+	elseif rand(1,5) > 2:
+		if rand(1,10) < npc_sexdrive[$npclastgenerated]:
+			$npc_fav_genre[$npclastgenerated] = 'raunchy_comedy'
+		else
+			$npc_fav_genre[$npclastgenerated] = 'comedy'
+		end
+	elseif rand(1,2) = 1:
+		$npc_fav_genre[$npclastgenerated] = 'drama'
+	else
+		$npc_fav_genre[$npclastgenerated] = 'romance'
+	end
 
 !! Variable clean up
 killvar '$npctempgn'

locations/npcpreservec.qsrc

@@ -33,6 +33,7 @@ if mid($npctemp,1,1) = 'C':
 	$npc_notes[$npclastsaved]		= $npc_notes[$npctemp]
 	$npc_pic[$npclastsaved]			= $npc_pic[$npctemp]
 	
+	npc_age[$npclastsaved]			= npc_age[$npctemp]
 	npc_dob[$npclastsaved]			= npc_dob[$npctemp]
 	npc_gender[$npclastsaved]		= npc_gender[$npctemp]
 
@@ -91,9 +92,11 @@ if mid($npctemp,1,1) = 'C':
 	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
 	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
 	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
+	$npc_fav_pos[$npclastsaved]		= $npc_fav_pos[$npctemp]
 	npc_sex_speed[$npclastsaved]	= npc_sex_speed[$npctemp]
 	npc_cum_pref[$npclastsaved]		= npc_cum_pref[$npctemp]
 	$npc_cum_pref[$npclastsaved]	= $npc_cum_pref[$npctemp]
+	$npc_bukakke_fetish[$npclastsaved]	= $npc_bukakke_fetish[$npctemp]
 	npc_tit_pref[$npclastsaved]		= npc_tit_pref[$npctemp]
 	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
 
@@ -128,6 +131,8 @@ if mid($npctemp,1,1) = 'C':
 	npc_childfree[$npclastsaved]		= npc_childfree[$npctemp]
 	npc_abusive[$npclastsaved] 			= npc_abusive[$npctemp]
 	npc_sexdrive[$npclastsaved] 		= npc_sexdrive[$npctemp]
+	npc_sex_stamina[$npclastsaved] 		= npc_sex_stamina[$npctemp]
+	npc_sex_spanker[$npclastsaved] 		= npc_sex_spanker[$npctemp]
 	npc_pussyeater[$npclastsaved]		= npc_pussyeater[$npctemp]
 	npc_cuddler[$npclastsaved] 			= npc_cuddler[$npctemp]
 	npc_cum_cannon[$npclastsaved]		= npc_cum_cannon[$npctemp]

locations/pav_beach_chat.qsrc

@@ -537,7 +537,7 @@ if $ARGS[0] = 'igor':
 			'You sit next to Igor holding his hand while the two of you chat for some time about a variety of topics.'
 			act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 		end
-		if igorstrap = 1:
+		if igorstrap >= 1:
 			act 'Tease him about fucking him with a strapon':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/beach_chat.jpg"></center>'
@@ -774,7 +774,6 @@ if $ARGS[0] = 'marcus':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/beach_chat.jpg"></center>'
 	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
-!!bgk don''t know if you want this katja stuff here or not I left it for now, you might want to tweak the text below because it is happening during the summer or on the beach
 	if katjaQW['QWstage'] = 5 and Marcus_sextype > 0 and katjaQW['marcus_asked'] = 0: act 'Ask Marcus about being Katja''s first': gt 'pav_beach_chat', 'Marcus_Katja_talk'
 	if grupTipe = 1:
 		if npc_rel['A146'] >= 50:
@@ -931,7 +930,7 @@ if $ARGS[0] = 'vicky':
 	if npc_rel['A15'] >= 50:
 		if grupTipe = 1 or grupTipe = 2:
 			'As soon as Vicky sees you, she pulls you into a tight hug. "<<$pcs_nickname>>, my third favorite person!"'
-			'"Wait, third? I get Kat being second, but who''s first?!" You pretend to be outraged and she plays along.'
+			'"Wait, third? I get Katja being second, but who''s first?!" You pretend to be outraged and she plays along.'
 			'"Oh honey. You... you didn''t know? I don''t know how to tell you this but... Vanya is my number one!"'
 			'You pout and cross your arms. "That''s not fair. I can''t fuck my way to the number one spot like he can!" you say before the two of you burst into laughter.'
 		else

locations/pav_disco.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if NikoVolkovQW = 5 and NikoEv = 7 and NikoDate_Day ! daystart: gt 'NikoDates', 'Disco'
+	if NikoVolkovQW = 5 and NikoEv = 7 and NikoDate_Day ! daystart: gt 'NikoDates', 'disco'
 
 	if hour >= 20 and hour <= 23:
 		'<center><b><font color="maroon">Disco</font></b></center>'

locations/pav_disco_sex.qsrc

@@ -412,7 +412,7 @@ if $ARGS[0] = 'kissing':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/tits.jpg"></center>'
 					'You pull your clothes back into place before letting him drag you away.'
-					act'Go to his place':gt'hookup', 'start'
+					act'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 				end
 			else
 				if fame['pav_slut'] < 150:
@@ -854,7 +854,7 @@ if $ARGS[0] = 'blowjob':
 					act 'Go with him':
 						cla & *clr
 						'"Well... a bed <i>does</i> sound nice," you smile. Taking that as acceptance, he pulls up his pants and grabs you by the arm, leading you back to a nearby apartment complex.'
-						act'Continue':gt'hookup','start'
+						act'Continue':gt 'sex_ev_start', 'hookup_npc_home_start'
 					end
 				end
 			end
@@ -950,7 +950,7 @@ if $ARGS[0] = 'blowjob':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 			'"Wait!" you cry, looking around. "Not here. Maybe we could... go back to your place?"'
 			'"That works for me," he grins. Then, pulling his pants back up, he rushes you to a nearby apartment complex, and you head inside.'
-			act 'Continue':gt'hookup','start'
+			act 'Continue':gt 'sex_ev_start', 'hookup_npc_home_start'
 		end
 	end
 end
@@ -1856,10 +1856,10 @@ if $ARGS[0] = 'hotelsex':
 				'You slide his dick as deeply down your throat as you can without gagging as your free hand slides between your legs and your fingers slip inside your pussy. You suck harder as your arousal builds, flicking your clit every time he thrusts his cock down your throat.'
 				if $ARGS[1] = 'paid':
 					gs 'arousal', 'bj', 10, 'prostitution'
-					gs 'arousal', 'mast', 10, 'prostitution'
+					gs 'arousal', 'masturbate', 10, 'prostitution'
 				elseif $ARGS[1] = 'unpaid':
 					gs 'arousal', 'bj', 10
-					gs 'arousal', 'mast', 10
+					gs 'arousal', 'masturbate', 10
 				end
 				minut -= 10
 				gs 'stat'
@@ -1873,10 +1873,10 @@ if $ARGS[0] = 'hotelsex':
 					'He cums so much that you feel like your mouth is about to overflow with it all, but swallowing as fast as you can, you manage to get it all down. As he pulls his dick from your mouth, a strand of cum stretches from the tip of his cock back down to your lips. Then, smirking, he wipes his cock against your lips before tucking it back in his pants.'
 					if $ARGS[1] = 'paid':
 						gs 'arousal', 'bj', 10, 'prostitution'
-						gs 'arousal', 'mast', 10, 'prostitution'
+						gs 'arousal', 'masturbate', 10, 'prostitution'
 					elseif $ARGS[1] = 'unpaid':
 						gs 'arousal', 'bj', 10
-						gs 'arousal', 'mast', 10
+						gs 'arousal', 'masturbate', 10
 					end
 					minut -= 10
 					gs 'stat'
@@ -1894,10 +1894,10 @@ if $ARGS[0] = 'hotelsex':
 					'You quickly pull back, letting his member pop out of your mouth and smile up at him happily when you feel another jet of sperm immediately land on your forehead. You close your eyes in pleasure and let him cover the rest of your face with his load, which <<$npc_firstname[$npclastsaved]>> does with great enthusiasm.'
 					if $ARGS[1] = 'paid':
 						gs 'arousal', 'bj', 10, 'prostitution'
-						gs 'arousal', 'mast', 10, 'prostitution'
+						gs 'arousal', 'masturbate', 10, 'prostitution'
 					elseif $ARGS[1] = 'unpaid':
 						gs 'arousal', 'bj', 10
-						gs 'arousal', 'mast', 10
+						gs 'arousal', 'masturbate', 10
 					end
 					minut -= 10
 					gs 'stat'
@@ -1975,10 +1975,10 @@ if $ARGS[0] = 'hotelsex':
 							'"Let me suck you off. I want to taste myself on you," you tell him, not wanting him to cum inside you. He grins and pulls out of you, letting you slide off the bed onto your knees. You slide his dick as deeply down your throat as you can without gagging. Sucking up every drop of pussy juice clinging to his cock and licking the occasional stray drop from his balls. You slip your free hand down between your legs, and your fingers slide into your well fucked pussy. You suck harder as your arousal builds, flicking your clit every time he thrusts his cock down your throat.'
 							if $ARGS[1] = 'paid':
 								gs 'arousal', 'bj', 10, 'prostitution'
-								gs 'arousal', 'mast', 10, 'prostitution'
+								gs 'arousal', 'masturbate', 10, 'prostitution'
 							elseif $ARGS[1] = 'unpaid':
 								gs 'arousal', 'bj', 10
-								gs 'arousal', 'mast', 10
+								gs 'arousal', 'masturbate', 10
 							end
 							gs 'dinSex', 'std_trigger_oral'
 							minut -= 10
@@ -1991,10 +1991,10 @@ if $ARGS[0] = 'hotelsex':
 								'He cums so much that you feel like your mouth is about to overflow with it all, but swallowing as fast as you can, you manage to get it all down. As he pulls his dick from your mouth, a strand of cum stretches from the tip of his cock back down to your lips. Then, smirking, he wipes his cock against your lips before tucking it back in his pants.'
 								if $ARGS[1] = 'paid':
 									gs 'arousal', 'bj', 10, 'prostitution'
-									gs 'arousal', 'mast', 10, 'prostitution'
+									gs 'arousal', 'masturbate', 10, 'prostitution'
 								elseif $ARGS[1] = 'unpaid':
 									gs 'arousal', 'bj', 10
-									gs 'arousal', 'mast', 10
+									gs 'arousal', 'masturbate', 10
 								end
 								minut -= 10
 								gs 'stat'
@@ -2011,10 +2011,10 @@ if $ARGS[0] = 'hotelsex':
 								'You quickly pull back, letting his member pop out of your mouth and smile up at him happily when you feel another jet of sperm immediately land on your forehead. You close your eyes in pleasure and let him cover the rest of your face with his load, which <<$npc_firstname[$npclastsaved]>> does with great enthusiasm.'
 								if $ARGS[1] = 'paid':
 									gs 'arousal', 'bj', 10, 'prostitution'
-									gs 'arousal', 'mast', 10, 'prostitution'
+									gs 'arousal', 'masturbate', 10, 'prostitution'
 								elseif $ARGS[1] = 'unpaid':
 									gs 'arousal', 'bj', 10
-									gs 'arousal', 'mast', 10
+									gs 'arousal', 'masturbate', 10
 								end
 								minut -= 10
 								gs 'stat'
@@ -2043,10 +2043,10 @@ if $ARGS[0] = 'hotelsex':
 					'"Let me suck you off. I want to taste myself on you," you tell him, not wanting him to cum inside you. He grins and pulls out of you, letting you slide off the bed onto your knees. You slide his dick as deeply down your throat as you can without gagging, sucking up every drop of pussy juice clinging to his cock and licking the occasional stray drop from his balls. You slip your free hand down between your legs, and your fingers slide into your well fucked pussy. You suck harder as your arousal builds, flicking your clit every time he thrusts his cock down your throat.'
 					if $ARGS[1] = 'paid':
 						gs 'arousal', 'bj', 10, 'prostitution'
-						gs 'arousal', 'mast', 10, 'prostitution'
+						gs 'arousal', 'masturbate', 10, 'prostitution'
 					elseif $ARGS[1] = 'unpaid':
 						gs 'arousal', 'bj', 10
-						gs 'arousal', 'mast', 10
+						gs 'arousal', 'masturbate', 10
 					end
 					gs 'dinSex', 'std_trigger_oral'
 					minut -= 10
@@ -2059,10 +2059,10 @@ if $ARGS[0] = 'hotelsex':
 						'He cums so much that you feel like your mouth is about to overflow with it all, but swallowing as fast as you can, you manage to get it all down. As he pulls his dick from your mouth, a strand of cum stretches from the tip of his cock back down to your lips. Then, smirking, he wipes his cock against your lips before tucking it back in his pants.'
 						if $ARGS[1] = 'paid':
 							gs 'arousal', 'bj', 10, 'prostitution'
-							gs 'arousal', 'mast', 10, 'prostitution'
+							gs 'arousal', 'masturbate', 10, 'prostitution'
 						elseif $ARGS[1] = 'unpaid':
 							gs 'arousal', 'bj', 10
-							gs 'arousal', 'mast', 10
+							gs 'arousal', 'masturbate', 10
 						end
 						minut -= 10
 						gs 'stat'
@@ -2079,10 +2079,10 @@ if $ARGS[0] = 'hotelsex':
 						'You quickly pull back, letting his member pop out of your mouth and smile up at him happily when you feel another jet of sperm immediately land on your forehead. You close your eyes in pleasure and let him cover the rest of your face with his load, which <<$npc_firstname[$npclastsaved]>> does with great enthusiasm.'
 						if $ARGS[1] = 'paid':
 							gs 'arousal', 'bj', 10, 'prostitution'
-							gs 'arousal', 'mast', 10, 'prostitution'
+							gs 'arousal', 'masturbate', 10, 'prostitution'
 						elseif $ARGS[1] = 'unpaid':
 							gs 'arousal', 'bj', 10
-							gs 'arousal', 'mast', 10
+							gs 'arousal', 'masturbate', 10
 						end
 						minut -= 10
 						gs 'stat'
@@ -2109,10 +2109,10 @@ if $ARGS[0] = 'hotelsex':
 					'"Let me suck you off. I want to taste myself on you," you tell him, not wanting him to cum inside you. He grins and pulls out of you, letting you slide off the bed onto your knees. You slide his dick as deeply down your throat as you can without gagging, sucking up every drop of pussy juice clinging to his cock and licking the occasional stray drop from his balls. You slip your free hand down between your legs, and your fingers slide into your well fucked pussy. You suck harder as your arousal builds, flicking your clit every time he thrusts his cock down your throat.'
 					if $ARGS[1] = 'paid':
 						gs 'arousal', 'bj', 10, 'prostitution'
-						gs 'arousal', 'mast', 10, 'prostitution'
+						gs 'arousal', 'masturbate', 10, 'prostitution'
 					elseif $ARGS[1] = 'unpaid':
 						gs 'arousal', 'bj', 10
-						gs 'arousal', 'mast', 10
+						gs 'arousal', 'masturbate', 10
 					end
 					gs 'dinSex', 'std_trigger_oral'
 					minut -= 10
@@ -2125,10 +2125,10 @@ if $ARGS[0] = 'hotelsex':
 						'He cums so much that you feel like your mouth is about to overflow with it all, but swallowing as fast as you can, you manage to get it all down. As he pulls his dick from your mouth, a strand of cum stretches from the tip of his cock back down to your lips. Then, smirking, he wipes his cock against your lips before tucking it back in his pants.'
 						if $ARGS[1] = 'paid':
 							gs 'arousal', 'bj', 10, 'prostitution'
-							gs 'arousal', 'mast', 10, 'prostitution'
+							gs 'arousal', 'masturbate', 10, 'prostitution'
 						elseif $ARGS[1] = 'unpaid':
 							gs 'arousal', 'bj', 10
-							gs 'arousal', 'mast', 10
+							gs 'arousal', 'masturbate', 10
 						end
 						minut -= 10
 						gs 'stat'
@@ -2145,10 +2145,10 @@ if $ARGS[0] = 'hotelsex':
 						'You quickly pull back, letting his member pop out of your mouth and smile up at him happily when you feel another jet of sperm immediately land on your forehead. You close your eyes in pleasure and let him cover the rest of your face with his load, which <<$npc_firstname[$npclastsaved]>> does with great enthusiasm.'
 						if $ARGS[1] = 'paid':
 							gs 'arousal', 'bj', 10, 'prostitution'
-							gs 'arousal', 'mast', 10, 'prostitution'
+							gs 'arousal', 'masturbate', 10, 'prostitution'
 						elseif $ARGS[1] = 'unpaid':
 							gs 'arousal', 'bj', 10
-							gs 'arousal', 'mast', 10
+							gs 'arousal', 'masturbate', 10
 						end
 						minut -= 10
 						gs 'stat'

locations/pav_discoev1.qsrc

@@ -461,7 +461,7 @@ if $ARGS[0] = 'girlfriend_ask':
 						IgorLove += 10
 						'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 						'You tell Igor to get back on his feet and, meeting his eyes, kiss him. He responds with passion. It seems that your dominance has aroused him a little.'
-						gs 'arousal', 'kiss_give', 5, 'dom'
+						gs 'arousal', 'kiss', 5, 'dom'
 						gs 'arousal', 'end'
 						gs 'stat'
 		

locations/pet_dog.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	minut += 1
 	menu_off = 1
-	$location_type = 'privat'
+	$location_type = 'private'
 	gs 'stat'
 
 	if objects['chew'] > 0 and rand(1,10) > 5 and rex['chew_day'] ! daystart:
@@ -48,6 +48,7 @@ if $ARGS[0] = 'start':
 		'<<$rex[''name'']>> jumps up and'+iif(rex['relationship'] > 80, ' happily ', ' ')+'wags his tail when you approach. '+iif(objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')
 	end
 
+	gs 'pet_dog', 'activities_normal'
 	act 'Leave': gt $loc, $loc_arg
 
 end

locations/pirsingsalon.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 
 	'<center><table border=1><TH>View tattoos</TH><TH>View tattoos</TH><TH>View piercings</TH>'
 	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''arm''">Arm - 8,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''lip''">Lip - 5,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsyaz''">Tongue - 5,000 <b>₽</b></a></TD></tr>'
-	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''ass''">Ass - 1,0000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''neck''">Neck - 8,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsgub''">Lip - 6,000 <b>₽</b></a></TD></tr>'
+	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''ass''">Ass - 10,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''neck''">Neck - 8,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsgub''">Lip - 6,000 <b>₽</b></a></TD></tr>'
 	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''back''">Back - 10,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pubic''">Pubic - 20,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsysh''">Ear - 3,000 <b>₽</b></a></TD></tr>'
 	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''belly''">Belly - 10,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''shoulder''">Shoulder - 8,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsnos''">Nose - 5,000 <b>₽</b></a></TD></tr>'
 	*p '<tr><TD><a href="exec:gt ''pirsingsalon'', ''breast''">Breasts - 15,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''side''">Side - 12,000 <b>₽</b></TD><TD><a href="exec:gt ''pirsingsalon'', ''pirsbro''">Eyebrow - 5,000 <b>₽</b></a></TD></tr>'

locations/pod_ezd.qsrc

@@ -2000,7 +2000,7 @@ if $ARGS[0] = 'sex_ev3':
 						'<br><font color = red><b>Even though the sex feels good, you''re still on your period. The menstrual blood slowly flows from your vagina as you get your ass fucked, and the blood on your fingers makes you feel disgusted to the point that you no longer want to stimulate yourself.</b></font>'
 					elseif mesec <= 0 and pcs_horny >=70:
 						$orgasm_or = 'yes'
-						gs 'arousal', 'masturbation', 3
+						gs 'arousal', 'masturbate', 3
 						minut -= 3
 						$orgasm_txt = 'You move one hand down to your soaking pussy and begin to masturbate furiously, completely forgetting about the situation you''re in. Without holding back at all, you loudly moan as your body spasms. Your ass is squeezing the guy''s dick tightly, there''s no way he did not notice you orgasming just now.'
 						'The guy groans at his friend: "Whoa dude, she''s orgasming from getting fucked in her ass!", while he keeps ramming his <<dick>>cm <<$dick_girth>> dick into your ass.'

locations/pornfilm.qsrc

@@ -1601,7 +1601,7 @@ if $ARGS[0] = '17':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/lesbo3.mp4"></video></center>'
 					'Satisfied with pleasing you with her tongue, <<$pactress[1]>> straddles you and holds your leg to one side as she brings her pussy down to meet your own. You let out a pleasured moan as your clits make contact. She then starts rocking her hips back and forth, and you both enjoy the sensation as your wet labia makes it easy for her to slide across you.'
-					gs 'arousal', 'tribbing', 15, 'exhibitionism'
+					gs 'arousal', 'trib', 15, 'exhibitionism'
 					gs 'stat'
 
 					act 'Double dildo':

locations/post_events.qsrc

@@ -380,7 +380,7 @@ if $ARGS[0] = '2-2':
 		'Then you sit up straight and kiss Jenya on her mouth, stifling her moans while Arsen fucks her harder and harder to try and coax a reaction out of her.'
 		'After a few minutes, Arsen slows down a little and collapses down on the bed, gasping for breath. His erection, glistening with Jenya''s juices, is pointing straight up in the air.'
 		'Jenya takes a moment to catch her breath as well, and wipes the sweat from her forehead. "What do you think, sweetie? Do you want to take it for a ride?" she asks between breaths. She looks fairly tired from the fucking Arsen just gave her.'
-		gs 'arousal', 'mast', 5
+		gs 'arousal', 'masturbate', 5
 		gs 'arousal', 'kiss', -5
 		gs 'stat'
 		gs 'willpower', 'sex', 'resist', 'easy'

locations/prostitution_functions.qsrc

@@ -7,7 +7,7 @@
 !!							  and the Gas Station will be completely blocked
 !!						  0 - WLife is not loaded, everything works as normal.	
 !! prostitute[<<$location>>]: 1 - Sveta can work at the location.
-!!                            0 - Sveta can''t work at the location'
+!!                            0 - Sveta can''t work at the location
 !!     current locations: Pavlovsk - ''pavlovsk'', Gadukino - ''gadukino'', 
 !!                        Road between Pavlovsk and St Petersburg - ''road'', Gas Station ''gas_station''
 !! prostitute['active']: 1- Sveta ''unlocked'' prostitution somewhere. It is use for non-location specific checks, like
@@ -15,7 +15,7 @@
 !! prostitute['work_clothes']: 1 - Sveta is wearing a prostitute outfit, i.e. clothes and shoes
 !! prostitute['outfit_is_set']: 1 - Sveta has a default outfit set up. Needed if she wants to change in restrooms 
 !!									or in the car on location, and not travel wearing that outfit
-!! prostitute['changed_for_work']: 1 - It measn that Sveta changed into her prostitute outfit on site from some regular
+!! prostitute['changed_for_work']: 1 - It means that Sveta changed into her prostitute outfit on site from some regular
 !!                                     clothes. This enables the 'Change into regular clothes' action in the changing
 !!									   location. 
 !!								   0 - Sveta didn''t change which means she can''t change into regular clothing. 
@@ -23,7 +23,14 @@
 !!---------- Initial set up, enabling locations, etc. -------------------------------------------------------------------
 !!-----------------------------------------------------------------------------------------------------------------------
 
-!! This will run every time for now until I find out how to call this whenever Sveta changes clothes regardless of where and how. I don't want to put it in gs 'stat'
+$solicitation_locations[0] = 'pav_commcenter'
+$solicitation_locations[1] = 'pav_residential'
+$solicitation_locations[2] = 'pav_industrial'
+$solicitation_locations[3] = 'pav_commercial'
+$solicitation_locations[4] = 'pav_market'
+$solicitation_locations[5] = 'pav_complex'
+$solicitation_locations[6] = 'pav_park'
+$solicitation_locations[7] = 'pushkin'
 
 
 if $ARGS[0] = 'check_for_wlife':
@@ -41,7 +48,7 @@ if $ARGS[0] = 'check_for_wlife':
 end
 
 if $ARGS[0] = 'set_pavlovsk_prostitute':
-    if fame['pav_prostitute'] > 250 or fame['pav_slut'] > 250 and prostitute['blocked'] = 0:
+    if (fame['pav_prostitute'] > 250 or fame['pav_slut'] > 250) and prostitute['blocked'] = 0:
         prostitute['pavlovsk'] = 1
 		prostitute['active'] = 1
         prostitute['payment_method'] = 1
@@ -60,6 +67,19 @@ if $ARGS[0] = 'set_gadukion_prostitute':
 	end
 end
 
+if $ARGS[0] = 'prostitute_work_hours':
+	if $region = 'pushkin':
+		RESULT = (hour >= 0 and hour < 2) or (hours >= 12 and hour < 14) or (hour >= 17 and hour <= 23)
+	elseif $region = 'pav' or $MID($loc,1,4) = 'pav_':
+		RESULT = (hour >= 12 and hour < 14) or (hour >= 17 and hour <= 23)
+	else
+		RESULT = 0
+	end
+end
+
+if $ARGS[0] = 'is_solicitation_location':
+	RESULT = $curloc ! 'shop' and $curloc ! 'prostitution_pavlovsk' and $loc = $curloc and menu_off = 0 and ($loc_arg = '' or $loc_arg = 'start') and (ARRPOS('$solicitation_locations', $loc) ! -1)
+end
 !!-----------------------------------------------------------------------------------------------------------------------
 !!-----------------------------------------------------------------------------------------------------------------------
 !!
@@ -222,24 +242,21 @@ end
 !!-----------------------------------------------------------------------------------------------------------------------
 !!---------- Checking for events ----------------------------------------------------------------------------------------
 !!-----------------------------------------------------------------------------------------------------------------------
-
+  
 if $ARGS[0] = 'check_solicitation_event':
 	gs 'prostitution_functions', 'work_clothes'
-    if prostitute['blocked'] = 0:
-        if (($loc_arg = '' and ($loc = 'pav_commcenter' or $loc = 'pav_residential' or $loc = 'pav_industrial' or $loc = 'pav_commercial' or $loc = 'pav_market' or $loc = 'pushkin')) or ($loc_arg = 'start' and ($loc = 'pav_complex' or $loc = 'pav_park'))) and hour > 6 and hour < 23 and $curloc ! 'shop' and menu_off = 0 and $loc = $curloc:
-
-            if prostitute['pavlovsk'] = 1 and prostitute['pav_time_hour'] ! hour and rand(-20, 70) < minut and $curloc ! 'prostitution_pavlovsk' and $curloc ! 'shop' and menu_off = 0 and $loc = $curloc: 
-                gs 'prostitution_pavlovsk', 'chance'
-            end
-            
-            if prostitute['pavlovsk'] = 1 and prostitute['work_clothes'] :
-                pl '<center><a href="exec: gt ''prostitution_pavlovsk'', ''search''"><img title="Click to start working in Pavlovsk." height = 80 src="images/system/icons/icon_prostitute.png"></a></center>'
-            end
-
-            if prostitute['pav_residential_prost_day'] ! daystart: prostitute['pav_residential_prost_day'] = daystart
-            !!pav_residential_prost_day
-        end 
-    end
+	if prostitute['blocked'] = 0 and func('prostitution_functions', 'prostitute_work_hours') and func('prostitution_functions','is_solicitation_location'):
+		if prostitute['pavlovsk'] = 1 and prostitute['pav_time_hour'] ! hour and rand(-20, 70) < minut: 
+			gs 'prostitution_pavlovsk', 'chance'
+		end
+		
+		if prostitute['pavlovsk'] = 1 and prostitute['work_clothes'] :
+			pl '<center><a href="exec: gt ''prostitution_pavlovsk'', ''search''"><img title="Click to start working in Pavlovsk." height = 80 src="images/system/icons/icon_prostitute.png"></a></center>'
+		end
+
+		if prostitute['pav_residential_prost_day'] ! daystart: prostitute['pav_residential_prost_day'] = daystart
+		!!pav_residential_prost_day
+	end
 end
 
 

locations/prostitution_pavlovsk.qsrc

@@ -11,7 +11,7 @@
 
 if $ARGS[0] = 'chance':
 	gs 'prostitution_pavlovsk', 'pav_rnd'
-	if hour > 6 and hour < 23 and prostitute['pav_daily_count'] < prostitute['pav_daily_max'] and rand(1,1000) < min(prostitute['pav_rnd'], 400):
+	if prostitute['pav_daily_count'] < prostitute['pav_daily_max'] and rand(1,1000) < min(prostitute['pav_rnd'], 400):
 		gt 'prostitution_pavlovsk', 'rng'
 	end
 end

locations/pushkin.qsrc

@@ -2,7 +2,7 @@
 !!2021/05/14
 *clr & cla
 gs 'shortgs', 'setloc', 'pushkin', $ARGS[0]
-$region = 'puskin'
+$region = 'pushkin'
 menu_off = 0
 if sound = 0:PLAY 'sound/street.mp3',30
 gs'stat'