Merge branch 'original-master' into mine

.gitignore

@@ -47,3 +47,5 @@ glife.7z
 *.test
 *.drawio
 missing_media.txt
+plugins.dat
+*.log

glife.qproj

@@ -610,10 +610,15 @@
 		<Location name="anushkamaksim"/>
 		<Location name="anushka_konstantinov_schedule"/>
 		<Location name="valentin_bogdanov_schedule" />
-		<Location name="radomir_popov_schedule" />
 		<Location name="arkadi_fyodorov_schedule" />
 		<Location name="band_tour_anushka_SMS"/>
 	</Folder>
+	<Folder name="Radomir">
+		<Location name="radapt"/>
+		<Location name="radaptev1"/>
+		<Location name="radchat"/>
+		<Location name="radomir_popov_schedule" />
+	</Folder>
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
 		<Location name="soniahome"/>

locations/AppearanceSystem.qsrc

@@ -138,22 +138,22 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 			result = 8
 		end
 
+	! Succubus gets maximum appearance bonus
+	elseif succubusflag > 0:
+		result = func('body_structure', 'appearance_bonus', 22, 90)
+
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	else
-		tempBodyShapeBonus = func('body_structure', 'appearance_bonus')
+		result = func('body_structure', 'appearance_bonus')
 
 		!!This modifies bodykoef for high or low pcs_mass['body'] values
 		if pcs_mass['body'] < 8 or pcs_mass['body'] >= 98:
-			tempBodyShapeBonus -= 8
+			result -= 8
 		elseif pcs_mass['body'] < 23 or pcs_mass['body'] >= 83:
-			tempBodyShapeBonus -= 4
+			result -= 4
 		end
 
-		if bodyVars['vofat'] > 0: tempBodyShapeBonus -= bodyVars['vofat']
-
-		result = tempBodyShapeBonus
-
-		killvar 'tempBodyShapeBonus'
+		result -= max(0, bodyVars['vofat'])
 	end
 end
 

locations/Cheatmenu_din.qsrc

@@ -1,7 +1,10 @@
 # Cheatmenu_din
 if settingmode = 0: settingmode = 69
 menu_off = 1
-cls
+$cheatmenu['table_start'] = '<center><table width="80%" cellspacing="0" cellpadding="20" valign="top"><tr><td width="500" cellspacing="0" cellpadding="20" valign="top">'
+$cheatmenu['table_second'] = '</td><td width="500" cellspacing="0" cellpadding="20" valign="top">'
+$cheatmenu['table_end'] = '</td></tr></table></center>'
+cla & *clr
 
 $cheatmenu['empty'] = {
 	!Yes, intentionally empty, do not remove it
@@ -23,14 +26,13 @@ $cheatmenu['music'] = {
 }
 
 $cheatmenu['setting'] = {
-	cls
+	cla & *clr
 	$cheatmenu['this_menu'] = 'setting'
 	$BACKIMAGE = ''
 	if $theme['name'] = 'Custom': gs 'themes', 'check_custom_vars' & gs 'themes', 'set_custom' & gs '$menu_obnovit'
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Gameplay Settings</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 
 	'AutoSave: <a href="exec:									disable_autosave					= iif(disable_autosave, 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(disable_autosave						, ''Disabled'', ''Enabled'')>></a>'
 	'Music: <a href="exec:												dynamic $cheatmenu[''music'']												& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(music_on								, ''Enabled'', ''Disabled'')>></a>'
@@ -51,7 +53,6 @@ $cheatmenu['setting'] = {
 	*nl
 	'Renaming porn movies you star in: <a href="exec:			cheatVars[''rename_porn'']			= iif(cheatVars[''rename_porn''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''rename_porn'']			, ''Enabled'', ''Disabled'')>></a>'
 	'Remove "once a week" therapist limit: <a href="exec:		cheatVars[''therapist_schedule'']	= iif(cheatVars[''therapist_schedule''], 0, 1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''therapist_schedule'']	, ''Enabled'', ''Disabled'')>></a>'
-	if blackmailQW['stage'] ! 0:	'Purge the "Blackmailer" questline: <a href="exec:		gs ''blackmailer'', ''purge_all'' & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Permanently reset the entire questline!</a>'
 	*nl
 
 	'<B>Difficulty Setting</B>'
@@ -66,7 +67,7 @@ $cheatmenu['setting'] = {
 	'<li>set to ' + iif($temp_diff = 'hardcore', 'hardcore', '<a href="exec:		FUNC(''_difficulty'',''setdifficulty'',''hardcore'')		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">hardcore</a>') + '</li>'
 	'</ul>'
 	killvar '$temp_diff'
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -79,7 +80,7 @@ $cheatmenu['quicktime'] = {
 	gs 'outdoors', 'weather'
 	gs 'stat'
 	gs 'fertility', 'cum_arrcheat'
-	cls
+	cla & *clr
 }
 
 $cheatmenu['dynamic'] = {
@@ -91,7 +92,7 @@ $cheatmenu['dynamic'] = {
 
 $cheatmenu['vartracker'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	act 'Return to cheat index': dynamic $cheatmenu['index']
 	'<center><h1>Cheat menu</h1></center>'
 	'<center>For testing purposes.<br>If reporting a bug only the lines in red are neccessary.</center>'
@@ -233,11 +234,10 @@ $cheatmenu['index'] = {
 	currhour = (daystart-1) * 24 + hour
 	currday = daystart
 	temp_week = week & temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Index</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<a href="exec:dynamic $cheatmenu[''dynamic'']">Dynamic Input Command</a>'
 	'<a href="exec:gs ''fertility'',''cum_arrcheat''">OOX Debug</a>'
 	'Right now <<$week[week]>> <<$month>> <<day>> <<year>> <<hour>>:<<minut>>'
@@ -253,9 +253,10 @@ $cheatmenu['index'] = {
 	*nl
 	'Hide Console input in objects window: <a href="exec:		cheatVars[''console'']		= iif(cheatVars[''console''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''console'']		, ''Enabled'', ''Disabled'')>></a>'
 	'Time Cheat in Objects window: <a href="exec:				cheatVars[''time'']			= iif(cheatVars[''time''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''time'']			, ''Enabled'', ''Disabled'')>></a>'
+	if blackmailQW['stage'] ! 0: 'Purge the "Blackmailer" questline: <a href="exec: gs ''blackmailer'', ''purge_all'' & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Permanently reset the entire questline!</a>'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''vartracker'']"><b>Variable tracker</b></a>'
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -363,14 +364,13 @@ $cheatmenu['slutshot'] = {
 
 $cheatmenu['permanent'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	$cheatmenu['this_menu'] = 'permanent'
 
 	'<center><h1>Cheat Menu - Recurrent Cheats</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!</center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="90%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 
 	'Willpower cost always zero: <a href="exec:					cheatVars[''willpower'']			= iif(cheatVars[''willpower''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''willpower'']				, ''Enabled'', ''Disabled'')>></a>'
 	'Infinite willpower: <a href="exec:							cheatVars[''inf_willpower'']		= iif(cheatVars[''inf_willpower''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''inf_willpower'']			, ''Enabled'', ''Disabled'')>></a>'
@@ -417,7 +417,7 @@ $cheatmenu['permanent'] = {
 
 	*nl
 	'<font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!'
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -444,7 +444,7 @@ $cheatmenu['therapist_reset'] = {
 }
 
 $cheatmenu['cycle'] = {
-	cls
+	cla & *clr
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -520,14 +520,13 @@ $cheatmenu['remove_preg'] = {
 
 $cheatmenu['state'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
 	'<center><h1>Cheat Menu - Character State Changes</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save. Cheats manipulating pregnancy or the menstrual cycle are'
 	'especially dangerous unless you know what you''re doing. When reporting bugs, please mention any cheats you used.</center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'Set alcohol levels:'
 	'<a href="exec:alko = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Sober</a> <a href="exec:alko = 2 & dynamic $cheatmenu[''state''] & gs ''stat''">Tipsy</a> <a href="exec:alko = 4 & dynamic $cheatmenu[''state''] & gs ''stat''">Drunk</a> <a href="exec:alko = 7 & dynamic $cheatmenu[''state''] & gs ''stat''">Wasted</a> <a href="exec:alko = 11 & dynamic $cheatmenu[''state''] & gs ''stat''">Barely coherent</a>'
 	*nl
@@ -574,10 +573,10 @@ $cheatmenu['state'] = {
 			'Lactate Rate: <a href="exec:lactation[''lactaterate''] -= 10000 & dynamic $cheatmenu[''state'']">-10</a> <<lactation[''lactaterate'']/1000>>ml/h'
 		else
 			'Lactate Rate: <a href="exec:lactation[''lactaterate''] -= 10000 & dynamic $cheatmenu[''state'']">-10</a> <<lactation[''lactaterate'']/1000>>ml/h <a href="exec:lactation[''lactaterate''] += 10000 & dynamic $cheatmenu[''state'']">+10</a>'
-			'Cap Lactate Rate: ' + _ 
-			iif(lactation['milkprod_type'] = 0 and lactation['caplactaterate'] > 0,'<a href="exec:lactation[''caplactaterate''] -= 2 & dynamic $cheatmenu[''state'']">-2h</a> ','') + _ 
-			iif(lactation['milkprod_type'] = 1 and lactation['caplactaterate'] > 4,'<a href="exec:lactation[''caplactaterate''] -= 2 & dynamic $cheatmenu[''state'']">-2h</a> ','') + _ 
-			iif(lactation['caplactaterate'] > 0,'<<lactation[''caplactaterate'']>>h ','OFF ') + _ 
+			'Cap Lactate Rate: ' + _
+			iif(lactation['milkprod_type'] = 0 and lactation['caplactaterate'] > 0,'<a href="exec:lactation[''caplactaterate''] -= 2 & dynamic $cheatmenu[''state'']">-2h</a> ','') + _
+			iif(lactation['milkprod_type'] = 1 and lactation['caplactaterate'] > 4,'<a href="exec:lactation[''caplactaterate''] -= 2 & dynamic $cheatmenu[''state'']">-2h</a> ','') + _
+			iif(lactation['caplactaterate'] > 0,'<<lactation[''caplactaterate'']>>h ','OFF ') + _
 			iif(lactation['caplactaterate'] < 72,'<a href="exec:lactation[''caplactaterate''] += 2 & dynamic $cheatmenu[''state'']">+2h</a>','')
 			'<font color="grey">Cap lactate rate makes lactate rate stop growing if <<$pcs_firstname>> needs milking more often.</font>'
 		end
@@ -593,7 +592,7 @@ $cheatmenu['state'] = {
 	end
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''therapist_reset'']">Reset therapist states</a>'
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 $cheatmenu['set_preg_body'] = {
@@ -613,12 +612,11 @@ $cheatmenu['set_body_class'] = {
 }
 
 $cheatmenu['bodyMod'] = {
-	cls
+	cla & *clr
 	act 'Return to last menu': dynamic $cheatmenu['state']
 
 	'<center><h1>Cheat Menu - Body Modification</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<center><b><font color="red">WARNING!</font></b></center>'
 	'Changing body shape does not resize clothes.'
 	'May cause adverse interactions, use at your own risk!'
@@ -699,7 +697,7 @@ $cheatmenu['bodyMod'] = {
 		killvar 'bs_temp_bs_class'
 	end
 
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -776,13 +774,12 @@ $cheatmenu['looks'] = {
 		pcs_hgt = 200
 	end
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Character Appearance</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
 	*nl
-	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	'<tr><td width="33%" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<<$pcs_firstname>> <<$pcs_lastname>> (<<$pcs_nickname>>). <a href="exec:dynamic $cheatmenu[''rename'']">Rename</a>'
 
 
@@ -833,9 +830,9 @@ $cheatmenu['looks'] = {
 		$pcs_butt[1] = 'bubble'
 	end
 	'You have a <<$pcs_butt[1]>> butt'
-	if pcs_butt < 60: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
+	if pcs_butt < 50: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
 	if bodyVars['butt_silicone'] => 1: '<a href="exec: bodyVars[''butt_silicone''] = max(0, bodyVars[''butt_silicone'']-10) & dynamic $cheatmenu[''looks'']">Shrink butt (silicone)</a>'
-	if pcs_butt < 60: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
+	if pcs_mass['butt'] < 50: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
 	if pcs_mass['butt'] => 6: '<a href="exec: assreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', -10">Shrink butt (natural)</a>'
 
 	!! if pcs_butt < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
@@ -860,7 +857,7 @@ $cheatmenu['looks'] = {
 		'<a href="exec:dounsplkil = 2 & gs ''body'', ''hardreset''">Hard Reset body shape</a>'
 	end
 
-	'</td><td width="33%" cellpadding="20" valign="top">'
+	*nl
 	'<<$pcs_vag>>'
 	if pcs_vag > 0:'<a href="exec:pcs_vag = 0 & dynamic $cheatmenu[''looks'']">Reinstate virginity</a>'
 	if stat['think_virgin'] < 1:'<a href="exec:stat[''vaginal''] = 0 & stat[''vaginal_fist''] = 0 & stat[''vaginal_dildo''] = 0 & stat[''vaginal_strap''] = 0 & dynamic $cheatmenu[''looks'']">Make Sveta believe she is a virgin again (resets the related sex stats)</a>'
@@ -894,8 +891,7 @@ $cheatmenu['looks'] = {
 	end
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''tatoo'']">Tattoo removal</a>'
-
-	'</td><td width="33%" cellpadding="20" valign="top">'
+	*nl
 	'<<$hair>>'
 	if pcs_haircol = 0:
 		'Your hair is now (prev) <<$pcs_haircol>> <a href="exec:pcs_haircol +=1 & dynamic $cheatmenu[''looks''] & nathcol = pcs_haircol">(next)</a>'
@@ -934,7 +930,7 @@ $cheatmenu['looks'] = {
 	elseif pcs_eyecol >= 3:
 		'Your eyes are now <a href="exec:pcs_eyecol -=1 & dynamic $cheatmenu[''looks'']">(prev)</a> <<$pcs_eyecol>> (next)'
 	end
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 $cheatmenu['change_avatar_path'] = {
@@ -1028,7 +1024,7 @@ if $ARGS[0] = 'assreduce':
 end
 
 if $ARGS[0] = 'vneshpara':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - ?</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1074,7 +1070,7 @@ if $ARGS[0] = 'vneshpara':
 end
 
 if $ARGS[0] = 'parameters':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Appearance Stats</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1123,7 +1119,7 @@ end
 
 $cheatmenu['tatoo'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1247,38 +1243,13 @@ $cheatmenu['printStatLinksInverted'] = {
 
 $cheatmenu['stats'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
-	!Set a floor and ceiling for all attributes and skills
-	loop_index = 0
-	:attr_trim_loop
-		dynamic "
-			if <<$att_name[loop_index]>>_lvl < 0: <<$att_name[loop_index]>>_lvl = 0
-			if <<$att_name[loop_index]>>_lvlst < 0: <<$att_name[loop_index]>>_lvlst = 0
-			if <<$att_name[loop_index]>>_lvl > 100: <<$att_name[loop_index]>>_lvl = 100
-			if <<$att_name[loop_index]>>_lvlst > 100: <<$att_name[loop_index]>>_lvlst = 100
-		"
-		loop_index += 1
-		if loop_index < arrsize('$att_name'): jump 'attr_trim_loop'
-
-	loop_index = 0
-	:skill_trim_loop
-		dynamic "
-			if <<$skl_name[loop_index]>>_lvl < 0: <<$skl_name[loop_index]>>_lvl = 0
-			if <<$skl_name[loop_index]>>_lvlst < 0: <<$skl_name[loop_index]>>_lvlst = 0
-			if <<$skl_name[loop_index]>>_lvl > 100: <<$skl_name[loop_index]>>_lvl = 100
-			if <<$skl_name[loop_index]>>_lvlst > 100: <<$skl_name[loop_index]>>_lvlst = 100
-		"
-		loop_index += 1
-		if loop_index < arrsize('$skl_name'): jump 'skill_trim_loop'
-	killvar 'loop_index'
-
 	'<center><h1>Cheat Menu - Attributes and Skills</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
 	*nl
-	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	'<tr><td width="50%" cellpadding="10" valign="top">'
+	$cheatmenu['table_start']
 	*pl'<b>Attributes</b> (values 0 - 100):'
 	*pl '<a href="exec:dynamic $cheatmenu[''setAttrs''], 100" >Max Attributes</a>    <a href="exec:dynamic $cheatmenu[''setAttrs''], 0" >Min Attributes</a>'
 	*p 'Strength (<<stren_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'stren', 'Strength'
@@ -1335,7 +1306,7 @@ $cheatmenu['stats'] = {
 	*p 'Pool (<<pool_lvl>>) - Total (<<pcs_pool>>): ' & dynamic $cheatmenu['printStatLinks'], 'pool', 'Pool'
 	*p 'Heels (<<pcs_heels>>) - Total (<<pcs_heels>>): ' & dynamic $cheatmenu['printStatLinks'], 'heels', 'Heels'
 	if $start_type[1] ! 'nomagic': *p 'Spell Casting (<<splcstng_lvl>>) - Total (<<pcs_splcstng>>): ' & dynamic $cheatmenu['printStatLinks'], 'splcstng', 'Spellcasting'
-	'</td><td width="50%" cellpadding="10" valign="top">'
+	*nl
 	*pl'<b>Combat:</b>'
 	*p 'Jabs (<<jab_lvl>>)- Total (<<pcs_jab>>): ' & dynamic $cheatmenu['printStatLinks'], 'jab', 'Jabs'
 	*p 'Power Strikes (<<punch_lvl>>) - Total (<<pcs_punch>>): ' & dynamic $cheatmenu['printStatLinks'], 'punch', 'Power Strikes'
@@ -1371,7 +1342,7 @@ $cheatmenu['stats'] = {
 	*p 'Modeling (<<mdlng_lvl>>) - Total (<<pcs_mdlng>>): ' & dynamic $cheatmenu['printStatLinks'], 'mdlng', 'Modeling'
 	*p 'Medicine (<<medcn_lvl>>) - Total (<<pcs_medcn>>): ' & dynamic $cheatmenu['printStatLinks'], 'medcn', 'Medicine'
 	*p 'Cleaning (<<cleaning_lvl>>) - Total (<<pcs_cleaning>>): ' & dynamic $cheatmenu['printStatLinks'], 'cleaning', 'Cleaning'
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -1380,13 +1351,12 @@ $cheatmenu['stats'] = {
 
 $cheatmenu['reputation'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Relationships and Renown</h1></center>'
 	'<center>Relationship values are from 0 - 100.</center>'
 	'<center>If they exceed this limit they will be reset overnight.</center>'
-	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	'<tr><td width="50%" cellpadding="10" valign="top">'
+	$cheatmenu['table_start']
 	*nl
 	'Relationships in Pavlovsk'
 	*nl
@@ -1525,11 +1495,7 @@ $cheatmenu['reputation'] = {
 			'<<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>>: <<npc_rel[''A138'']>>  <a href="exec:npc_rel[''A138''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A138''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		end
 	end
-	*nl
-	'<font color="blue"><b>Nicholas'' Family</b></font>'
-	'<a href="exec:gt ''nichUtil'', ''debug''">Storyline Debug Menu</a>'
-	'</td><td width="50%" cellpadding="10" valign="top">'
-	*nl
+	$cheatmenu['table_second']
 	'Miscellaneous relationships'
 	*nl
 	'<font color="blue"><b>Others</b></font>'
@@ -1585,6 +1551,9 @@ $cheatmenu['reputation'] = {
 			'Martin: <<npc_rel[''A216'']>>	<a href="exec:npc_rel[''A216''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A216''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		end
 	end
+	*nl
+	'<font color="blue"><b>Nicholas'' Family</b></font>'
+	'<a href="exec:gt ''nichUtil'', ''debug''">Storyline Debug Menu</a>'
 
 	if pcs_lovers[0] = 1:
 		*nl
@@ -1675,7 +1644,7 @@ $cheatmenu['reputation'] = {
 			'You''ve been expelled from school. <a href="exec:SchoolBlock = 0 & schoolPredupr = 0 & schoolprogul = 0 & pcs_grades = 50 & dynamic $cheatmenu[''reputation'']">Clear</a>.'
 		end
 	end
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -1684,12 +1653,10 @@ $cheatmenu['reputation'] = {
 
 $cheatmenu['documents'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Diplomas, Licences, and Certificates</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="33%" cellspacing="0" cellpadding="20" valign="top">'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
@@ -1704,7 +1671,7 @@ $cheatmenu['documents'] = {
 	if masseuse['certification'] >= 10:'You already have a Masseuse Certificate'
 	if prava = 0:'<a href="exec:prava = 1 & dynamic $cheatmenu[''documents'']">Get Driving Licence</a>'
 	if prava = 1:'You already have Driving Licence'
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -1722,7 +1689,7 @@ $cheatmenu['input_time'] = {
 
 $cheatmenu['week'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1739,7 +1706,7 @@ $cheatmenu['week'] = {
 
 $cheatmenu['month'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1809,13 +1776,12 @@ $cheatmenu['time'] = {
 		:femcycloop
 		if femcycloop > 0:gs 'femcyc' & femcycloop -= 1 & jump 'femcycloop'
 	end
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Manipulate Time and Weather</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats to manipulate time can <b>easily</b> break quests and cause bugs. Do not use them unless'
 	'you know what you''re doing. When reporting bugs, please mention any cheats you used.</center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	if temp_minut > 9:
 		if temp_hour > 9: $temptime = '<b><<temp_hour>>:<<temp_minut>></b>' else $temptime = '<b>0<<temp_hour>>:<<temp_minut>></b>'
 	else
@@ -1883,7 +1849,7 @@ $cheatmenu['time'] = {
 	*nl
 	'<a href="exec:day = temp_day & $month = $temp_month & month = temp_month & year = temp_year & hour = temp_hour & minut = temp_minut & currtimecheck = 1 & dynamic $cheatmenu[''time'']">Accept target date & time</a>'
 	'<a href="exec:temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut & dynamic $cheatmenu[''time'']">Reset target date & time</a>'
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -1983,7 +1949,7 @@ $cheatmenu['sucresetdo'] = {
 }
 
 $cheatmenu['succubreset'] = {
-	cls
+	cla & *clr
 	'Are you sure you want to reset your Succubus status? You will lose all levels, saved power, and succubus skill levels.'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''magic'']"><b>No, nevermind.</b></a>'
@@ -1993,9 +1959,10 @@ $cheatmenu['succubreset'] = {
 
 $cheatmenu['magic'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Magic</h1></center>'
+	$cheatmenu['table_start']
 	'<center>Is magical: <a href="exec:pcs_magik += 1 & dynamic $cheatmenu[''magic'']">+1<<pcs_magik>></a></center>'
 	if succubusflag = 1:
 		'<center><a href="exec:dynamic $cheatmenu[''succubreset'']"><b>Remove & Reset Succubus status</b></a></center>'
@@ -2035,6 +2002,7 @@ $cheatmenu['magic'] = {
 
 	*pl func('cleanHTML',$SpellListStr)
 
+	$cheatmenu['table_end']
 	killvar 'i'
 	killvar '$ThisLocation'
 	killvar '$spellFlipper'
@@ -2047,10 +2015,10 @@ $cheatmenu['magic'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['display'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Display Setting</h1></center>'
-	*p '<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	if usePopUps = 1:
 		'Allow Popup Pictures: Currently ON - <a href="exec:usePopUps = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
 	else
@@ -2103,7 +2071,7 @@ $cheatmenu['display'] = {
 	if Enable_Android = 1:
 		'Set Fontsize for Status: Unsupported'
 		'Android Mode:Currently ON - <a href="exec:Enable_Android = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
-		! 'click <a href="exec:cls & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
+		! 'click <a href="exec:cla & *clr & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
 		'click <B>refresh</B> on top of status window to renew.'
 	else
 		'Android Mode: Currently OFF - <a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
@@ -2114,7 +2082,7 @@ $cheatmenu['display'] = {
 	else
 		'Show Debug window on save load: Currently ON - <a href="exec:loadg_show_debug = 0 & debug_warning_closed = 1 & showobjs 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
 	end
-	*p '</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 $cheatmenu['theme_customize_input'] = {
@@ -2250,14 +2218,14 @@ $cheatmenu['theme_presets_copy'] = {
 	custom_theme['table_bg'] = theme['table_bg']
 	custom_theme['table_bg_alt'] = theme['table_bg_alt']
 
-	$custom_theme['is_dark'] = str(theme['is_dark'])
+	custom_theme['is_dark'] = theme['is_dark']
 
 	gs 'themes', 'set_custom'
 	dynamic $cheatmenu['theme_customize']
 }
 
 $cheatmenu['theme_export'] = {
-	cls
+	cla & *clr
 	act 'Return': dynamic $cheatmenu['theme_customize']
 	"$custom_theme['fname'] = '<<$custom_theme['fname']>>'"
 	"custom_theme['fsize'] = <<custom_theme['fsize']>>"
@@ -2269,7 +2237,7 @@ $cheatmenu['theme_export'] = {
 	"custom_theme['table_bg'] = <<custom_theme['table_bg']>>"
 	"custom_theme['table_bg_alt'] = <<custom_theme['table_bg_alt']>>"
 	""
-	"$custom_theme['is_dark'] = '<<$custom_theme['is_dark']>>'"
+	"custom_theme['is_dark'] = <<custom_theme['is_dark']>>"
 }
 
 $cheatmenu['theme_presets'] = {
@@ -2357,10 +2325,10 @@ $cheatmenu['theme_customize'] = {
 	!!  --- DARK MODE ---
 	*nl
 	*p 'Dark Mode&nbsp;'
-	if $custom_theme['is_dark'] = '0':
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''1'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	if custom_theme['is_dark'] = 0:
+		*pl '<a href="exec: custom_theme[''is_dark''] = 1 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	else
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''0'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+		*pl '<a href="exec: custom_theme[''is_dark''] = 0 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	end
 
 	!!  --- INCREMENT ---
@@ -2377,7 +2345,7 @@ $cheatmenu['theme_customize'] = {
 	!!  --- LOREM IPSUM ---
 	$icon_selector = iif(theme['is_dark'] = 0, '_b', '_w')
 	icon_height = fsize * 15 / 10
-	*p '<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	*p '<td width="500" cellspacing="0" cellpadding="20" valign="top">'
 
 	*p '"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."'
 
@@ -2423,11 +2391,10 @@ $cheatmenu['theme_customize'] = {
 
 $cheatmenu['status'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Status Window Settings</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	if disable_LoadSave = 0:
 		'Save/Load Buttons: Currently Image - <a href="exec:disable_LoadSave = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Select Text</a>'
 	elseif disable_LoadSave = 1:
@@ -2564,7 +2531,7 @@ $cheatmenu['status'] = {
 	end
 
 	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png"></a>
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -2572,10 +2539,10 @@ $cheatmenu['status'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['theme'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Phone Theme Menu</h1></center>'
-	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
+	$cheatmenu['table_start']
 	*nl
 	if pcs_phonetheme = 0: $phoneNameTemp = 'Standard'
 	if pcs_phonetheme = 1: $phoneNameTemp = 'Bimbo'
@@ -2617,7 +2584,7 @@ $cheatmenu['theme'] = {
 	elseif i <= ARRSIZE('phonetheme') and i > 12 and i <= 15:
 		jump 'phonethemeloop'
 	end
-	'</tr></table></b></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -2661,13 +2628,12 @@ $cheatmenu['pain'] = {
 	if pain['clitoris'] < 0: pain['clitoris'] = 0
 	if pain['urethra'] < 0: pain['urethra'] = 0
 	if pain['cervix'] < 0: pain['cervix'] = 0
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
 	'<center><a href="exec:killvar ''pain'' & dynamic $cheatmenu[''pain'']">No pain</a></center>'
 	*nl
-	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	'<tr><td width="50%" cellpadding="10" valign="top">'
+	$cheatmenu['table_start']
 	'pain[head] = <<pain[''head'']>> <a href="exec:pain[''head''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''head''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[hair] = <<pain[''hair'']>> <a href="exec:pain[''hair''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''hair''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[ears] = <<pain[''ears'']>> <a href="exec:pain[''ears''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''ears''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
@@ -2687,7 +2653,7 @@ $cheatmenu['pain'] = {
 	'pain[thighs] = <<pain[''thighs'']>> <a href="exec:pain[''thighs''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''thighs''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[left leg] = <<pain[''legL'']>> <a href="exec:pain[''legL''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''legL''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[right leg] = <<pain[''legR'']>> <a href="exec:pain[''legR''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''legR''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
-	'</td><td width="50%" cellpadding="10" valign="top">'
+	$cheatmenu['table_second']
 	'pain[feet] = <<pain[''feet'']>> <a href="exec:pain[''feet''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''feet''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[toes] = <<pain[''toes'']>> <a href="exec:pain[''toes''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''toes''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[shoulders] = <<pain[''shoulders'']>> <a href="exec:pain[''shoulders''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''shoulders''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
@@ -2706,7 +2672,7 @@ $cheatmenu['pain'] = {
 	'pain[clitoris] = <<pain[''clitoris'']>> <a href="exec:pain[''clitoris''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''clitoris''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[urethra] = <<pain[''urethra'']>> <a href="exec:pain[''urethra''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''urethra''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
 	'pain[cervix] = <<pain[''cervix'']>> <a href="exec:pain[''cervix''] -= 10 & dynamic $cheatmenu[''pain'']">-10</a> <a href="exec:pain[''cervix''] += 10 & dynamic $cheatmenu[''pain'']">+10</a>'
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 	*nl
 	'You may still have pain from gaping or having been spanked, you can clear these using "Cure all ailments." in "Cheat Menu - Character State Changes"'
 	'You currently have vaginal gaping of <<vgape>>'
@@ -2740,11 +2706,10 @@ $cheatmenu['DNAC'] = {
 }
 
 $cheatmenu['DNA'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - DNA Generation</h1></center>'
-	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<center>DNA string generation<br>If parents are not in game, leave the respective IDs empty</center>'
 	*nl
 	if $cheatDNAC ! '':
@@ -2917,7 +2882,7 @@ $cheatmenu['DNA'] = {
 	killvar '$tempDNAM'
 	killvar '$tempDNAC'
 	killvar 'cheatDNAgenerated'
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -2925,7 +2890,7 @@ $cheatmenu['DNA'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['fame'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Fame</h1></center>'
 	$table['fame'] = '<center><table width="90%" cellspacing="0" cellpadding="5" valign="top" border="1">'
@@ -3074,7 +3039,7 @@ $cheatmenu['bdimcstaddpro'] = {
 }
 
 $cheatmenu['bdimcstadd'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Addition</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
 	*nl
@@ -3100,7 +3065,7 @@ $cheatmenu['bdimcstdesed'] = {
 
 $cheatmenu['bdimdisplay'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat menu</h1></center>'
 	*nl
 	'<center><b>Body Image Set Display</b></center>'
@@ -3201,7 +3166,7 @@ $cheatmenu['bdimdisplay'] = {
 }
 
 $cheatmenu['bdimcstdel'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Removal</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
 	*nl
@@ -3255,11 +3220,10 @@ $cheatmenu['bdimcstdel'] = {
 
 $cheatmenu['bdimmain'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td width="50%" cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<center><b>Body Image Controls</b></center>'
 	*nl
 	'You are currently using set: <<$bodimgsets[((bodset * 10) + 9)]>>'
@@ -3321,7 +3285,7 @@ $cheatmenu['bdimmain'] = {
 		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
 		*nl
 	end
-	'</td></tr></table></center>'
+	$cheatmenu['table_end']
 }
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -3330,17 +3294,17 @@ $cheatmenu['bdimmain'] = {
 
 $cheatmenu['about'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'saveg'
 	gs 'addbuilddate'
 	'<center><h1>About Window</h1></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top">'
+	$cheatmenu['table_start']
 	'<tr><td><h3><center>Girl Life version <<version_major+"."+version_minor+"."+version_revision+"."+version_patch+iif($git_hash ! "", "<br>"+$git_hash+" (dev build)", "")>></center></h3></td></tr>'
 	'<tr><td><h3><center>built on <<$builddate>></center></h3></td></tr>'
 	'<tr><td><h5><center>if loaded so it was the save from</center></h5></td></tr>'
 	'<tr><td cellspacing="0" cellpadding="20" valign="top"><center><<$version>></center></td></tr>'
-	'</table></center>'
+	$cheatmenu['table_end']
 	killvar '$tmp'
 }
 
@@ -3350,7 +3314,7 @@ $cheatmenu['about'] = {
 
 $cheatmenu['items'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Items</h1></center>'
 

locations/Cum_Manage.qsrc

@@ -713,20 +713,15 @@ if $ARGS[0] = 'cum_stat_display':
 			$icon_txtloc = $txtloc
 		elseif i = 11:
 			if pcs_haircol = 0:
-				$cum_face_image = 'brown/'
-				$cum_face_image += rand(1,31)
+				$cum_face_image = 'brown/<<rand(1,31)>>'
 			elseif pcs_haircol = 1:
-				$cum_face_image = 'black/'
-				$cum_face_image += rand(1,23)
+				$cum_face_image = 'black/<<rand(1,23)>>'
 			elseif pcs_haircol = 2:
-				$cum_face_image = 'red/'
-				$cum_face_image += rand(1,19)
+				$cum_face_image = 'red/<<rand(1,19)>>'
 			elseif pcs_haircol = 3:
-				$cum_face_image = 'blonde/'
-				$cum_face_image += rand(1,25)
+				$cum_face_image = 'blonde/<<rand(1,25)>>'
 			elseif pcs_haircol > 3:
-				$cum_face_image = 'custom/'
-				$cum_face_image += rand(1,20)
+				$cum_face_image = 'custom/<<rand(1,20)>>'
 			end
 			$txtloc_adj = 'across '
 			$icon_txtloc = 'your face'

locations/FedorEv2.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'Train Tracks':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Walk home with Fedor': gt 'pav_residential'	
+		act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'	
 	end	
 	act 'Offer him your hand':
 		*clr & cla
@@ -120,7 +120,7 @@ if $ARGS[0] = 'Train Tracks':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/nokiss.jpg"></center>'
 		'You think to yourself "This is going too fast." so you offer Fedor your hand. He is a little surprised at first but kisses your hand nonetheless. Fedor lowers your hand as he releases it and after a few moments of silence you notice a Fedor''s posture lowers as he turns away from you "It''s starting to get late, we should probably get going before your parents start to worry about you." He says, with a meek smile as he takes your hand and walks you home.'
 			
-		act 'Walk home with Fedor': gt 'pav_residential'
+		act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	end	
 end	
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'Movie 4':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Go Home': gt 'korrPar'
+		act 'Go Home': gs 'homes_properties', 'go_straight_home'
 	end
 	
 	act 'Say goodbye and leave':
@@ -322,7 +322,7 @@ if $ARGS[0] = 'Movie 4':
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 		'You put your index finger on his lips. "Sorry but I just re-applied my lipstick." and then you back up into your apartment as you say, "Bye" Fedor then tilts his head downward and looks noticeably upset as you close the door.'
 
-		act 'Go Home': gt 'korrPar'
+		act 'Go Home': gs 'homes_properties', 'go_straight_home'
 	end
 end	
 	
@@ -364,7 +364,7 @@ if $ARGS[0] = 'Home':
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 				'You tell Fedor that you need to go and he wraps his arms around you, giving you a warm hug as he replies, "I understand, maybe next time." and he walks you home. Fedor fetches your coat and walks you out the door. When you arrive at your apartment, you give Fedor a soft kiss on the cheek. "Until next time." as you give him a wink and close the door.'
 								
-				act 'Go home': gt 'korrPar'
+				act 'Go home': gs 'homes_properties', 'go_straight_home'
 			end
 			
 			act 'How can I say no to that? <b><h4><font color=#ff00cc>[Go steady]</font></h4></b>':
@@ -609,7 +609,7 @@ if $ARGS[0] = 'Wash Up':
 			gs 'arousal', 'end'	
 			gs 'stat'
 				
-			act 'Go home': gt 'korrPar'
+			act 'Go home': gs 'homes_properties', 'go_straight_home'
 		end	
 	end	
 end
@@ -700,7 +700,7 @@ if $ARGS[0] = 'Skate Kiss':
 	gs 'arousal', 'end'	
 	gs 'stat'		
 	
-	act 'Walk home with Fedor': gt 'korrPar'
+	act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	
 	act 'I''ll be fine on my own': gt 'pav_residential'
 end
@@ -714,7 +714,7 @@ if $ARGS[0] = 'Skate End':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/Skate/skate5.jpg"></center>'
 	'You and Fedor decide that you''ve had enough skating for today, so you both sit down on a nearby bench and discuss your favorite subjects in school, along with past experiences. After a few minutes of chatting Fedor says, "I had a great time with you <<$pcs_firstname>>. Would you like me to walk you home or will you be fine on your own?"'
 	
-	act 'Walk home with Fedor': gt 'korrPar'
+	act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	
 	act 'I''ll be fine on my own': gt 'pav_residential'
 end
@@ -1031,7 +1031,7 @@ if $ARGS[0] = 'Park End':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/walk2.jpg"></center>'
-	'Fedor takes you by the hand then leads you to your apartment while you both chat about various things. When you arrive at your apartment, Fedor spins you around then gives you a passionate kiss as he pushes you against the wall for a more passionate kiss, before pulling off you and giving you a wink as he turns away and walks off.'
+	'Fedor takes you by the hand then leads you home, while you both chat about various things. When you arrive at your place, Fedor spins you around then gives you a passionate kiss as he pushes you against the wall for a more passionate kiss, before pulling off you and giving you a wink as he turns away and walks off.'
 	*nl	
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/endkiss.mp4"></video></center>'
 	gs 'boyStat', 'A5'
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'Park End':
 	gs 'arousal', 'end'	
 	gs 'stat'		
 	
-	act 'Leave': gt 'korrPar'
+	act 'Leave': gs 'homes_properties', 'go_straight_home'
 end		
 
 if $ARGS[0] = 'Fedor Breakup':

locations/FedorEv4.qsrc

@@ -724,7 +724,7 @@ if $ARGS[0] = 'End Date 2':
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/endkiss.mp4"></video></center>'
 
-	act 'Walk home':gt 'korrPar'
+	act 'Walk home': gs 'homes_properties', 'go_straight_home'
 end
 
 if $ARGS[0] = 'TV':
@@ -1406,7 +1406,7 @@ if $ARGS[0] = 'Dimka Aftermath':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console2.jpg"></center>'
 	'You approach Fedor, he stands up and hugs you. "I''m so sorry about not getting there in time. I can''t believe I was so careless and it was you that paid the price." You give Fedor an innocent smile as you place your hand on his cheek and say, "It''s alright Fyodor. He used to make me do things far worst than that." Fedor clenches his fists as he responds, "That fucking coward will never harm you again. I will make sure that he learns his place from now on."'
 	*nl
-	'You give Fedor a soft kiss. "I know that I will always be safe with you." Fedor looks into your eyes. "I will always love you <<$pcs_firstname>>." You reply, "And I, you, Fyodor" then you both share a long passionate kiss.'
+	'You give Fedor a soft kiss. "I know that I will always be safe with you." Fedor looks into your eyes. "I will always love you <<$pcs_firstname>>." You reply, "And I, you, Fedor" then you both share a long passionate kiss.'
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss2.mp4"></video></center>'
 

locations/HotelRoom.qsrc

@@ -1,5 +1,7 @@
 # HotelRoom
 
+if hotelRoomDays[$region] = 0 and hour > 11: hotelRoom[$region] = 0
+if hotelRoomDays[$region] < 0: hotelRoom[$region] = 0
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
@@ -17,7 +19,7 @@ if $ARGS[0] = 'normal':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>' + iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
-	
+
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
 
@@ -55,7 +57,7 @@ if $ARGS[0] = 'better':
 	menu_off = 0
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
-	gs 'stat'	
+	gs 'stat'
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 
@@ -64,10 +66,10 @@ if $ARGS[0] = 'better':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
-	
+
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
-	
+
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
@@ -101,7 +103,7 @@ if $ARGS[0] = 'best':
 	menu_off = 0
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
-	gs 'stat'	
+	gs 'stat'
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 
@@ -110,7 +112,7 @@ if $ARGS[0] = 'best':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
-	
+
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
 
@@ -156,12 +158,12 @@ if $ARGS[0] = 'therapist':
 
 	'<center><b><font color = maroon>Your husband''s hotel room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/room.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''therapist_hotel'', ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''therapist_home'', ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
-	
+
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
-	
+
 	act 'Put on your clothes and go to the hotel lobby':
 		gs 'underwear', 'wear'
 		gs 'clothing', 'wear_last_worn'
@@ -184,7 +186,7 @@ if $ARGS[0] = 'therapist':
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
-	
+
 	gs 'therapist_home', 'set_Hotelacts'
 
 	if pcs_sweat >= 20 and locat['A186'] = 2:
@@ -203,7 +205,7 @@ if $ARGS[0] = 'shower1':
 	$location_type = 'bathroom'
 	gs 'themes', 'indoors'
 	gs 'stat'
-	
+
 	'<center><b><font color = maroon>The bathroom of your hotel room</font></b></center>'
 	if hotelRoom[$region] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal1.jpg"></center>'
@@ -239,7 +241,7 @@ if $ARGS[0] = 'shower1':
 			end
 		end
 	end
-	
+
 	gs 'din_van', 'private', 'hotelroom', iif(hotelRoom[$region] = 1, '', 'bath')
 end
 

locations/KGstart.qsrc

@@ -96,7 +96,7 @@ if KFOnLineReaga > 0:
 			cls
 			$KGOLname = input("Enter your nickname")
 
-			if $KGOLname <= 0:msg 'Not valid nickname' & gt $curloc
+			if $KGOLname = '': msg 'Not valid nickname' & gt $curloc
 
 			'Your nickname <<$KGOLname>>'
 			'You must select the player race'

locations/MeynoldHome.qsrc

@@ -779,7 +779,7 @@ if $ARGS[0] = 'Natalia Park 2':
 	minut += 15
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Natalia [Nat] Pavlova">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big240.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big240.jpg"></center>'
 	'You, and Natalia continue chatting for a few minutes before Natalia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home. When you reach your door Natalia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Natalia, as she walks away.'
 	
 	act 'Enter your apartment':gt 'korrPar'

locations/NPCChanger.qsrc

@@ -61,19 +61,19 @@ end
 if $ARGS[0] = 'npcdisplay':
 	*nl 'NPC[A<<n>>] = '
 
-	if $npc_firstname['A<<n>>'] = 0:
-	*p ''
+	if isnum($npc_firstname['A<<n>>']):
+		*p ''
 	else
-	*p '<<$npc_firstname[''A<<n>>'']>>'
+		*p $npc_firstname['A<<n>>']
 	end
 
-	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or $npc_nickname['A<<n>>'] = 0:
+	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or isnum($npc_nickname['A<<n>>']):
 		*p''
 	else
 		*p ' "<<$npc_nickname[''A<<n>>'']>>"'
 	end
 
-	if $npc_lastname['a<<n>>'] = 0:
+	if isnum($npc_lastname['a<<n>>']):
 		*p ''
 	else
 		*p ' <<$npc_lastname[''A<<n>>'']>>'
@@ -81,10 +81,9 @@ if $ARGS[0] = 'npcdisplay':
 
 end
 if $ARGS[0] = 'selection':
-	s = input("Which NPC do you want to edit? Enter #")
-		!!cla
-		!!*clr
-	if s = '':
+	s = val(input("Which NPC do you want to edit? Enter #"))
+	!!*clr & cla
+	if s = 0:
 		n = (o - 10)
 		gt 'NPCChanger', 'NPCLoop'
 	else

locations/SMS_selfies.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'show_sms':
 	gs 'telefon', 'show_sms', SMSSelfieVars['SMSid']
 	$SMSMessage[SMSSelfieVars['SMSid']] = $temp_curSMS
 	$SMSReplies[SMSSelfieVars['SMSid']] = $temp_curReplies
-	SMSSelfieVars['text'] = ''
+	$SMSSelfieVars['text'] = ''
 	killvar 'temp_curSMS'
 	killvar 'temp_curReplies'
 end

locations/SMStext_builder.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'add_sms':
 	end
 	gs 'telefon', 'add_sms', $ARGS[1], $SMSBuilderVars['text'], $SMSBuilderVars['replies'], $SMSBuilderImages[0], $SMSBuilderImages[1], $SMSBuilderImages[2], $SMSBuilderImages[3]
 	
-	SMSBuilderVars['replies'] = ''
+	$SMSBuilderVars['replies'] = ''
 
 elseif $ARGS[0] = 'show_sms':
 	if arrsize('SMSBuilderReplies') > 0:

locations/_attributes_cats_dress.qsrc

@@ -679,7 +679,6 @@ elseif ARGS[1] = 99:
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloDress = 1
 	
 elseif ARGS[1] = 100:
 	CloQuality = 5

locations/_face_image.qsrc

@@ -21,7 +21,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'noglass/'
 	end
-	
+
 	!!----------EYE COLOR----------
 	!! hazel
 	if pcs_eyecol = 0:
@@ -42,7 +42,7 @@ elseif face_style['type'] = 2:
 	!!	$result += 'other/'	!! missing !! will load blue !!
 		$result += 'blue/'
 	end
-	
+
 	!!----------HAIR COLOR----------
 	!! black
 	if pcs_haircol = 0:
@@ -61,7 +61,7 @@ elseif face_style['type'] = 2:
 	!!	$result += 'other'	!! missing !! will load brunette !!
 		$result += 'brunette/'
 	end
-	
+
 	!!----------HAIR LENGTH----------
 	!! very long
 	if pcs_hairlng > 400:
@@ -84,62 +84,74 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'very_short/'
 	end
-	
+
 	!!----------HAIR STYLE----------
 	!! messy/tangled
-	if pcs_hairbsh = -1 or pcs_hairbsh = 0:
+	if pcs_hairbsh <= 0:
 		$result += 'messy/'
 	!! braids
-	elseif hbraids > 0:
-		$result += 'braids/'
-	!! pigtails
-	elseif hpigtail > 0:
-		$result += 'pigtails/'
-	!! curly-bangs-buns
-	elseif curly > 0 and hbangs > 0 and hpingripw > 0:
-	!!	$result += 'curly-bangs-buns/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-bangs-scrunch
-	elseif curly > 0 and hbangs > 0 and hscrunchw > 0:
-	!!	$result += 'curly-bangs-scrunch/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-bangs
-	elseif curly > 0 and hbangs > 0:
-	!!	$result += 'curly-bangs/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-buns
-	elseif curly > 0 and hpingripw > 0:
-	!!	$result += 'curly-buns/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-scrunch
-	elseif curly > 0 and hscrunchw > 0:
-	!!	$result += 'curly-scrunch/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! bangs-buns
-	elseif hbangs > 0 and hpingripw > 0:
-	!!	$result += 'bangs-buns/'	!! missing !! will load bangs !!
-		$result += 'bangs/'
-	!! bangs-scrunch
-	elseif hbangs > 0 and hscrunchw > 0:
-	!!	$result += 'bangs-scrunch/'	!! missing !! will load bangs !!
-		$result += 'bangs/'
-	!! curly
-	elseif curly > 0:
-		$result += 'curly/'
-	!! bangs
-	elseif hbangs > 0:
-		$result += 'bangs/'
-	!! buns (updo)
-	elseif hpingripw > 0:
-		$result += 'buns/'
-	!! scrunch (ponytail)
-	elseif hscrunchw > 0:
-		$result += 'scrunch/'
-	!! normal
+	elseif pcs_hairlng > 80:
+		if hbraids > 0:
+			$result += 'braids/'
+		!! pigtails
+		elseif hpigtail > 0:
+			$result += 'pigtails/'
+		!! curly-bangs-buns
+		elseif curly > 0 and hbangs > 0 and hpingripw > 0:
+		!!	$result += 'curly-bangs-buns/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-bangs-scrunch
+		elseif curly > 0 and hbangs > 0 and hscrunchw > 0:
+		!!	$result += 'curly-bangs-scrunch/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-bangs
+		elseif curly > 0 and hbangs > 0:
+		!!	$result += 'curly-bangs/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-buns
+		elseif curly > 0 and hpingripw > 0:
+		!!	$result += 'curly-buns/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-scrunch
+		elseif curly > 0 and hscrunchw > 0:
+		!!	$result += 'curly-scrunch/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! bangs-buns
+		elseif hbangs > 0 and hpingripw > 0:
+		!!	$result += 'bangs-buns/'	!! missing !! will load bangs !!
+			$result += 'bangs/'
+		!! bangs-scrunch
+		elseif hbangs > 0 and hscrunchw > 0:
+		!!	$result += 'bangs-scrunch/'	!! missing !! will load bangs !!
+			$result += 'bangs/'
+		!! curly
+		elseif curly > 0:
+			$result += 'curly/'
+		!! bangs
+		elseif hbangs > 0:
+			$result += 'bangs/'
+		!! buns (updo)
+		elseif hpingripw > 0:
+			$result += 'buns/'
+		!! scrunch (ponytail)
+		elseif hscrunchw > 0:
+			$result += 'scrunch/'
+		!! normal
+		else
+			$result += 'normal/'
+		end
+	elseif pcs_hairlng > 30:
+		if hbangs > 0:
+			$result += 'bangs/'
+		elseif curly > 0:
+			$result += 'curly/'
+		else
+			$result += 'normal/'
+		end
 	else
 		$result += 'normal/'
 	end
-				
+
 	!!----------MAKEUP----------
 	!! none
 	if pcs_makeup = 1:
@@ -167,7 +179,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'smeared_'
 	end
-	
+
 	!!----------CUM----------
 	if cumloc[11] = 1:
 		!! enormous
@@ -190,7 +202,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'no_cum'
 	end
-	
+
 	$result += '.jpg'
 
 else
@@ -210,7 +222,7 @@ else
 
 	$result = 'images/pc/body/hairstyles/'
 
-	if pcs_haircol > 3: 
+	if pcs_haircol > 3:
 		$result += 'colours'
 		jump 'skipsteps'
 	end
@@ -263,9 +275,11 @@ else
 			$result += 'normal'
 		end
 	!! style for short hair (other images don''t exist)
-	elseif pcs_hairlng <= 80 and pcs_hairlng > 30:
+	elseif pcs_hairlng > 30:
 		if hbangs > 0:
 			$result += 'bangs'
+		elseif curly > 0:
+			$result += 'curly'
 		else
 			$result += 'normal'
 		end

locations/agentned.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'sell':
 			'<h4>Available offers for your properties</h4>'
 			i = 0
 			:listing_offers_on_owned_properties_loop
-				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and $property_construction_status[i] = 0):
+				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and property_construction_status[i] = 0):
 					!! NOTE: Offer: (last sales price + rand(-10%, +10%)) + (renovation value + rand(0%,+10%)
 					!! 		 No need to check what has been renovated, the only thing that matters is the total value of the renovation
 					!! 		 If Sveta sells, this will be stored as the new sales price of the property

locations/alexandriaEv.qsrc

@@ -1607,5 +1607,7 @@ if $ARGS[0] = 'anamotel':
 	end
 end
 
+killvar 'dummy'
+
 --- alexandriaEv ---------------------------------
 

locations/anush_bedroom_city.qsrc

@@ -72,6 +72,7 @@ if $ARGS[0] = 'anushroom':
 	music_loop = 1
 	*clr & cla
 	minut += 1
+	killvar '$returnLoc'
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom.jpg"></center>'
@@ -238,8 +239,8 @@ if $ARGS[0] = 'night_stand':
 		end
 !!this goes to anushkaev1 can you do what ever code is needed so both here and her pav apartment lead to it and then they go back to the correct location afterwards? That will save us from making a new sex folder with just a lot of repeat of the same content.
 !HM: done
-		act 'Strap-on': gt 'anushkaev1', 'strapon1', 'city'
-		act 'Butt plug': gt 'anushkaev1', 'buttplug', 'city'
+		act 'Strap-on': $returnLoc = '_city' & gt 'anushkaev1', 'strapon1'
+		act 'Butt plug': $returnLoc = '_city' & gt 'anushkaev1', 'buttplug'
 		act 'Joint':
 			*clr & cla
 			minut += 2

locations/anushapt.qsrc

@@ -1,5 +1,5 @@
 # anushapt
-!2024/03/25
+!2024/04/03
 !AnushkaLoc tells us where Anvushka is located
 !----------------------------------------------
 !AnushkaLoc = 0 (Anushka not home)
@@ -12,6 +12,9 @@
 !AnushkaLoc = 7 (Anushka in the bathroom)
 !---------------------------------------------
 
+!!anushkaQW['edtalk'] += 1  how many times Sveta has talked to Ed in the living room
+!!anushkaQW['kidstory'] += 1 How many times Ed has told Sveta bout Anushka as a kid
+
 if $ARGS[0] = 'home':
 	menu_off = 0
 	$track_loop = ''
@@ -36,10 +39,10 @@ if $ARGS[0] = 'home':
 	'You walk up to the front door and knock.'
 	if hour >= 22:
 		'It''s too late in the day to visit Anushka.'
-		act 'Move away from the door':gt'pav_complex', 'start'
+		act 'Move away from the door':gt 'pav_complex', 'start'
 	elseif hour < 8:
 		'It''s too early in the day to visit Anushka.'
-		act 'Move away from the door':gt'pav_complex', 'start'
+		act 'Move away from the door':gt 'pav_complex', 'start'
 	elseif locat['A144'] = 30:
 		*clr & cla
 		menu_off = 1
@@ -47,27 +50,27 @@ if $ARGS[0] = 'home':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 		'You stand outside the Konstantinov household knocking on the door. It''s some time before someone answers it. In the end, it turns out to be Maksim. He looks you over from head to toe, obviously trying to imagine you naked. "Nush isn''t here right now. She''s driving around the country with the band, they went on tour, I wish I could have gone."'
 		'You nod to that, you remember that now. "Right, I can''t believe I forgot that, well hope they are having fun."'
-		'"Rad is likely banging all the bitch''s." His tone makes it sound like he is a little jealous. "Nush is likely getting gangbanged by the band or a bunch of random dude every night." He says smuggly like it is some kind of joke.'
+		'"Rad is likely banging all the bitch''s." His tone makes it sound like he is a little jealous. "Nush is likely getting gangbanged by the band or a bunch of random dude every night." He says smugly like it is some kind of joke.'
 		*nl
 		'You shake your head. "You really shouldn''t say that about your sister."'
-		'He snorts derisively. "What are you my dad all of a sudden? Besides that''s what mom says."'
+		'He snorts derisively. "What are you my dad all of a sudden? Besides that''s what Mom says."'
 		'You just sigh, no point trying to talk to him about that. "Anyways do you know when they will be back?"'
-		'He shrugs. "She is suppose to be back sometime in August, mom said I can''t let any of her friends in while she is gone." Before you can even get a word in, he slowly closes the door checking you out as he does. With nothing more to do, you turn to leave.'
-		act 'Move away from the door':gt'pav_complex', 'start'
+		'He shrugs. "She is supposed to be back sometime in August, mom said I can''t let any of her friends in while she is gone." Before you can even get a word in, he slowly closes the door checking you out as he does. With nothing more to do, you turn to leave.'
+		act 'Move away from the door':gt 'pav_complex', 'start'
 	elseif yearstart > 1:
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-		'You stand outside the Konstantinov household knocking on the door. It''s some time before someone answers it. In the end, it turns out to be Maksim. He looks you over from head to toe, obviously trying to imagine you naked. "Nush isn''t moved out, she moved to the city with Rad and the guys, they got some apartment near the Uni so she can go to school." He sounds like he is about to throw up thinking about choosing to attend more school, he doesn''t seem to like school much.'
+		'You stand outside the Konstantinov household knocking on the door. It''s some time before someone answers it. In the end, it turns out to be Maksim. He looks you over from head to toe, obviously trying to imagine you naked. "Nush isn''t here she moved out, she moved to the city with Rad and the guys, they got some apartment near the University so she can go to school." He sounds like he is about to throw up thinking about choosing to attend more school, he doesn''t seem to like school much.'
 		'You nod to that. "Oh... ok, do you have their address?"'
-		'He sighs loudly like you are huge bother. "No, Rad works at the music store in the mall, I try and stop by when I get time to go to the city. Maybe you can stop by and ask him." He makes it sound like he is real busy and traveling around doing important stuff.'
+		'He sighs loudly like you are a huge bother. "No, Rad works at the music store in the mall, I try and stop by when I get time to go to the city. Maybe you can stop by and ask him." He makes it sound like he is real busy and traveling around doing important stuff.'
 		*nl
-		'You snort slightly in amusement. "Your sister work there too?"'
-		'He rolls his eyes. "No." He says no like you are a idiot for asking. "She works as a waitress or something at a coffee shop near where they live, like she could get a cool job like Rad, she is just some dumb waitress."'
-		'You just sigh, you are briefly tempted to point out your mom is just a waitress too. But no point trying to talk to him about that. "Anyways thanks I guess."'
-		'He shrugs. "Whatever, mom said I can''t let any of her friends since she doesn''t live here anymore." Before you can even get a word in, he slowly closes the door checking you out as he does. With nothing more to do, you turn to leave.'
-		act 'Move away from the door':gt'pav_complex', 'start'
+		'You snort slightly in amusement. "Your sister works there too?"'
+		'He rolls his eyes. "No." He says no like you are an idiot for asking. "She works as a waitress or something at a coffee shop near where they live, like she could get a cool job like Rad, she is just some dumb waitress."'
+		'You just sigh, you are briefly tempted to point out that your mom is just a waitress too. But no point trying to talk to him about that. "Anyways thanks I guess."'
+		'He shrugs. "Whatever, Mom said I can''t let any of her friends since she doesn''t live here anymore." Before you can even get a word in, he slowly closes the door checking you out as he does. With nothing more to do, you turn to leave.'
+		act 'Move away from the door':gt 'pav_complex', 'start'
 	elseif ((hour >= 15 and hour < 20) or (week > 5 and hour >= 10 and hour < 20)) and locat['A144'] ! 22 and (rand(0,4) = 0):
 		*clr & cla
 		menu_off = 1
@@ -75,24 +78,24 @@ if $ARGS[0] = 'home':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/valeria.jpg"></center>'
 		'You stand outside the Konstantinov household knocking on the door. It''s some time before someone answers it. In the end, it turns out to be Anushka''s mother.'
 		'Her mother just stands there, glaring at you for a while. "Well now, don''t just stand there. What do you want? Oh wait, let me guess you want to see Anushka? Well, the little slut isn''t here, and I don''t know when she''ll be back, so why don''t you just go bother someone else?" Before you can even get a word in, she slams the door in your face, and you hear all the locks click into place. With nothing more to do, you turn to leave.'
-		act 'Move away from the door':gt'pav_complex', 'start'
+		act 'Move away from the door':gt 'pav_complex', 'start'
 	elseif locat['A144'] = 24:
 		*clr & cla
 		AnushkaLoc = 0
 		band['practice_invite'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-		'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not here right now. She''s down in the garage the band rents and turned into some sort of cool studio. They''re likely practicing or partying with some bitches. You can wait for her in her room if you want, or you can just go down there."'
+		'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not here right now. She''s down in the garage with the band, that they turned into some sort of cool studio. They''re likely practicing or partying with some bitches. You can wait for her in her room if you want, or you can just go down there."'
 		'You shake your head, but there''s nothing you can do about it. Should you go in and wait for her or just go? As you decide, you can feel Maksim undressing you with his eyes as he stares straight at your tits.'
-		act 'Leave': gt 'pav_complex','start'
-		act 'Enter': gt 'anushapt','hallway'
+		act 'Leave': gt 'pav_complex', 'start'
+		act 'Enter': gt 'anushapt', 'hallway'
 	elseif locat['A144'] = 25:
 		*clr & cla
 		AnushkaLoc = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 		'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not here right now. She''s at the disco or out sucking some guy''s dick or something. You can wait for her in her room if you want, or you can just go there."'
 		'You shake your head, but there is nothing you can do about it. Should you go in and wait for her or just go? As you decide, you can feel Maksim undressing you with his eyes as he stares straight at your tits.'
-		act 'Leave': gt 'pav_complex','start'
-		act 'Enter': gt 'anushapt','hallway'
+		act 'Leave': gt 'pav_complex', 'start'
+		act 'Enter': gt 'anushapt', 'hallway'
 	elseif locat['A144'] = 22:
 		*clr & cla
 		menu_off = 1
@@ -109,27 +112,27 @@ if $ARGS[0] = 'home':
 			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s taking a shower."'
-			act 'Leave': gt 'pav_complex','start'
-			act 'Enter': gt 'anushapt','hallway'
-			act 'Wait in her room': gt 'anushapt','shower_wait'
-			act 'Go to the bathroom': gt 'anushapt','nushshower'
+			act 'Leave': gt 'pav_complex', 'start'
+			act 'Enter': gt 'anushapt', 'hallway'
+			act 'Wait in her room': gt 'anushapt', 'shower_wait'
+			act 'Go to the bathroom': gt 'anushapt', 'nushshower'
 			act 'Ask how he knows that':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 				'You smile a little. "How do you know she''s taking a shower?"'
 				'He blushes a little and sputters "I can hear the water."'
-				act 'Leave': gt 'pav_complex','start'
-				act 'Enter': gt 'anushapt','hallway'
-				act 'Wait in her room': gt 'anushapt','shower_wait'
-				act 'Go to the bathroom': gt 'anushapt','nushshower'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Enter': gt 'anushapt', 'hallway'
+				act 'Wait in her room': gt 'anushapt', 'shower_wait'
+				act 'Go to the bathroom': gt 'anushapt', 'nushshower'
 				act 'Tease him':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 					'You grin at him. "So you haven''t been spying on her taking a shower? She told me you spy on her and her friends."'
 					'He blushes red and sputters "No!" He doesn''t seem to know what to do, so he turns and walks away. Just before he goes into his room, he adds "Fuck you, I can hear the water." Before you can reply, he goes into his room and closes the door.'
-					act 'Wait in her room': gt 'anushapt','shower_wait'
-					act 'Go to the bathroom': gt 'anushapt','nushshower'
-					act 'Leave': gt 'pav_complex','start'
+					act 'Wait in her room': gt 'anushapt', 'shower_wait'
+					act 'Go to the bathroom': gt 'anushapt', 'nushshower'
+					act 'Leave': gt 'pav_complex', 'start'
 				end
 			end
 		elseif nushdoor <= 6:
@@ -138,8 +141,8 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 			'You stand outside the Konstantinov household and hope that Anushka will open the door.'
 			'To your relief, she opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in."'
-			act 'Leave': gt 'pav_complex','start'
-			act 'Enter': gt 'anushapt','hallway'
+			act 'Leave': gt 'pav_complex', 'start'
+			act 'Enter': gt 'anushapt', 'hallway'
 		elseif nushdoor <= 9 and anushkaQW['tv_day'] ! daystart:
 			*clr & cla
 			AnushkaLoc = 5
@@ -147,7 +150,7 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 			'You stand outside the Konstantinov household and hope that Anushka will open the door.'
 			'To your relief, she opens the door, smiling. "Hey <<$pcs_nickname>>. Come in, I was just watching some TV." As you go inside, she closes the door and heads for the living room where some action movie is playing on the TV. She practically falls down on the couch as she takes a seat.'
-			act 'Take a seat next to her': gt 'anushapt','nushlivroom'
+			act 'Take a seat next to her': gt 'anushapt', 'nushlivroom'
 		elseif nushdoor <= 10 and locat['A154'] = 23:
 			*clr & cla
 			AnushkaLoc = 2
@@ -155,23 +158,23 @@ if $ARGS[0] = 'home':
 			'You stand outside the Konstantinov household and wait for Anushka to open the door, but Maksim answers instead.'
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
-			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting pounded like the slut she is by Radomir."'
-			act 'Leave': gt 'pav_complex','start'
+			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting pounded like the slut she is by Rad."'
+			act 'Leave': gt 'pav_complex', 'start'
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 				'You ignore his comment and step around him to enter the apartment. Just then, you see Radomir walking up the hall towards the door, buckling his belt back in place. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, bad timing because you just missed out. Nush is in her room recovering from the ass fucking I just gave her."'
 				'He then reaches over and ruffles Maksim''s hair with his hand. "Your sister has a real nice tight ass, or at least she did." With that, he walks past both of you and leaves the apartment.'
-				'"See?" he sneers before walking back to his room.'
-				act 'Walk past him': gt 'anushapt','hallway'
+				'"See?" Maksim sneers before walking back to his room.'
+				act 'Walk past him': gt 'anushapt', 'hallway'
 			end
 			act 'Go to her room':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Radomir if Maksim is to be believed. You can''t quite make out what they''re saying, so you lean against the door to hear better. You hear the guy say "Turn around and let me see that fine ass of yours."'
-				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
+				act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Take a peek (<<will_cost>> Willpower)':
@@ -180,8 +183,8 @@ if $ARGS[0] = 'home':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/peek.jpg"></center>'
 						'Taking a little peek won''t hurt anyone. You glance around to make sure no one can see you, then you crack the door open to just barely peek in. You can just see Anushka stripping down to her underwear inside, but you can''t see the guy.'
-						act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
-						act 'Watch': gt 'anushkaev2','watch_nushrad'
+						act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
+						act 'Watch': gt 'anushkaev2', 'watch_nushrad'
 					end
 				else
 					act 'Take a peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -195,7 +198,7 @@ if $ARGS[0] = 'home':
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting fucked by Val."'
-			act 'Leave': gt 'pav_complex','start'
+			act 'Leave': gt 'pav_complex', 'start'
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
@@ -205,14 +208,14 @@ if $ARGS[0] = 'home':
 				'He just grins a little. "Oh you know, just hanging out and having fun." He then turns to Maksim. "Are you going to come by later and help me work on my bike?"'
 				'Maksim responds to Valentin. "If my dad lets me. He''s on my ass about my homework." Val just nods at him. "Gotcha." He gives both of you a slight wave and walks out.'
 				'"See?" is all Maksim says before he walks back to his room.'
-				act 'Walk past him': gt 'anushapt','hallway'
+				act 'Walk past him': gt 'anushapt', 'hallway'
 			end
 			act 'Go to her room':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Valentin if Maksim is to be believed. You can''t quite make out what they''re saying. You lean against the door to hear better, and you hear the guy ask "You wanna fuck?"'
-				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
+				act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Take a peek (<<will_cost>> Willpower)':
@@ -221,8 +224,8 @@ if $ARGS[0] = 'home':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/peek.jpg"></center>'
 						'Taking a little peek won''t hurt anyone. You glance around to make sure no one can see you, then you crack the door open to just barely peek in. You can just see Anushka pulling down the pants of some guy that is lying on her bed. You can only see him from the waist down from your vantage point, so you can''t see his face, but you do see his hard dick spring free when his pants come off.'
-						act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
-						act 'Watch': gt 'anushkaev2','watch_nushval'
+						act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
+						act 'Watch': gt 'anushkaev2', 'watch_nushval'
 					end
 				else
 					act 'Take a peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -236,22 +239,21 @@ if $ARGS[0] = 'home':
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring to ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s in her room taking some black guy''s dick up her ass." he says with disgust.'
-			act 'Leave': gt 'pav_complex','start'
+			act 'Leave': gt 'pav_complex', 'start'
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 				'You ignore his comments and step around him to enter the apartment. Just then, you see Marcus walking up the hall towards the door. He freezes in place, looking very embarrassed. He looks down to avoid eye contact. "Hey <<$pcs_nickname>>, I was just hanging out... anyways I need to get going... see you at school, yeah?" Without waiting for a reply, he hurries out of the apartment.'
 				'Maksim gives him a disgusted look as he walks by, then looks at you. "She''s so disgusting." he sneers before he walks back to his room.'
-
-				act 'Walk past him': gt 'anushapt','hallway'
+				act 'Walk past him': gt 'anushapt', 'hallway'
 			end
 			act 'Go to her room':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy. You can''t quite make out what they''re saying. You lean against the door to hear better, and you hear the guy say "God, you''re so beautiful."'
-				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
+				act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Take a peek (<<will_cost>> Willpower)':
@@ -261,8 +263,8 @@ if $ARGS[0] = 'home':
 						AnushkaLoc = 2
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/peek.jpg"></center>'
 						'Taking a little peek won''t hurt anyone. You glance around to make sure no one can see you, then you crack the door open to just barely peek in. You can see a naked Anushka dropping to her knees in front of a naked black guy who has his back to you.'
-						act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
-						act 'Watch': gt 'anushkaev2','watch_nushmar'
+						act 'Leave them in peace and leave the apartment': gt 'pav_complex', 'start'
+						act 'Watch': gt 'anushkaev2', 'watch_nushmar'
 					end
 				else
 					act 'Take a peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -276,9 +278,39 @@ if $ARGS[0] = 'home':
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s in her room, likely getting stoned or masturbating to porn or something."'
-			'You ignore his comments and step around him to enter the apartment. He closes the door and heads back to his room.'
-			act 'Leave': gt 'pav_complex','start'
-			act 'Enter': gt 'anushapt','hallway'
+			if maksimQW['blackmail'] >= 1 and maksimQW['blackmail_flash'] <= 5:
+				*nl
+				'You ignore his comments and start to step around him, to enter the apartment. But he puts his arm up blocking you from entering.'
+				'You give him a look of annoyance. "Do you mind?"'
+				'He grins. "Show me your tits!"'
+				'You know what this is about. You can''t believe you let this little shit blackmail you. "Seriously?"'
+				'He laughs. "If you want to come in, that''s the price now. So pay up or fuck off." You sigh, you know the little snitch would tell Anushka, so do you just leave or flash him.'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Flash Maksim': gt 'anushkamaksim', 'hallway_flash_tits'
+			elseif maksimQW['blackmail_flash'] > 5 and maksimQW['blackmail_flash'] <= 10:
+				*nl
+				'You ignore his comments and start to step around him, to enter the apartment. But he puts his arm up blocking you from entering.'
+				'You sigh, knowing what he wants. "Fine!" You say as you start to show him your tits again.'
+				'He shakes his head and grins. "Not this time, show me your pussy!"'
+				'You know what this is about. You can''t believe you let this little shit blackmail you. "Seriously?"'
+				'He laughs. "If you want to come in, that''s the price now. So pay up or fuck off." You sigh, you know the little snitch would tell Anushka, so do you just leave or flash him.'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Flash Maksim': gt 'anushkamaksim', 'hallway_flash_pussy'
+			elseif maksimQW['blackmail_flash'] > 10:
+				*nl
+				'You ignore his comments and start to step around him, to enter the apartment. But he puts his arm up blocking you from entering.'
+				'You sigh, knowing what he wants. "Fine!" You say as you start to show him your pussy again.'
+				'He shakes his head and grins. "Not this time, I want to see it all! So come to my room and get naked."'
+				'You know what this is about. You can''t believe you let this little shit blackmail you. "Seriously? What about your brother."'
+				'He laughs. "If you want to come in, that''s the price now. Don''t worry that little shit is outside at the moment, we got time."'
+				'You sigh, you know the little snitch would tell Anushka, so do you just leave or flash him.'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Go to Maksim''s room': gt 'anushkamaksim', 'maksim_room_naked'
+			else
+				'You ignore his comments and step around him to enter the apartment. He closes the door and heads back to his room.'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Enter': gt 'anushapt', 'hallway'
+			end
 		end
 		killvar 'nushdoor'
     elseif (hour >= 15 and hour < 22) or (week > 5 and hour >= 8 and hour < 22):
@@ -290,27 +322,27 @@ if $ARGS[0] = 'home':
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask, "Is Anushka home?"'
 			'"No, she''s not here right now. She''s probably out sucking some guy''s dick or something, but you can go wait for her in her room if you want."'
-			act 'Leave': gt 'pav_complex','start'
-			act 'Enter': gt 'anushapt','hallway'
+			act 'Leave': gt 'pav_complex', 'start'
+			act 'Enter': gt 'anushapt', 'hallway'
 			act 'Why would you say that?':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 				'You are aghast that her brother would say such a thing about her. "Why would you tell people something like that?"'
 				'At first, he looks a little confused, as if he''s not sure what you mean, then just shrugs. "That''s what mom always says when I ask where Anushka is."'
 				'You shake your head, unsure what to think about this. Should you go in and wait for her or just go? Maksim just stands there staring at your tits, and you can actually feel him undressing you with his eyes.'
-				act 'Leave': gt 'pav_complex','start'
-				act 'Enter': gt 'anushapt','hallway'
+				act 'Leave': gt 'pav_complex', 'start'
+				act 'Enter': gt 'anushapt', 'hallway'
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not here right now. She''s probably out sucking some guy''s dick or something, but you can wait for her in her room if you want."'
 			'You shake your head, but there''s nothing you can do about it. Should you go in and wait for her or just go? As you decide, you can feel Maksim undressing you with his eyes as he stares straight at your tits.'
 		end
-		act 'Leave': gt 'pav_complex','start'
-		act 'Enter': gt 'anushapt','hallway'
+		act 'Leave': gt 'pav_complex', 'start'
+		act 'Enter': gt 'anushapt', 'hallway'
 	else
 		'You knock on the door several times, but no one answers. You assume that there probably isn''t anyone home at the moment.'
-		act 'Move away from the door': gt 'pav_complex','start'
+		act 'Move away from the door': gt 'pav_complex', 'start'
 	end
 end
 
@@ -337,18 +369,18 @@ if $ARGS[0] = 'hallway':
 		'You stand still for a little while longer, listening for something, but nothing happens. After a while, you decide to move on, but you''re pretty sure that it was just Anushka''s younger brother, Maksim, spying on you.'
 	end
 	if AnushkaLoc ! 1:
-		act '<b>Leave Anushka''s apartment</b>': gt 'pav_complex','start'
-		act 'Anushka''s room': gt 'anush_bedroom','anushroom'
-		act 'Bathroom': gt 'anushapt','bathroom'
-		act 'Anushka''s brother''s room': gt 'anushaptbr','brotherroom'
-		act 'Living room': gt 'anushapt','livingroom'
-		act 'Kitchen': gt 'anushapt','kitchen'
-		act 'Parents room': gt 'anushapt','anushparents'
+		act '<b>Leave Anushka''s apartment</b>': gt 'pav_complex', 'start'
+		act 'Anushka''s room': gt 'anush_bedroom', 'anushroom'
+		act 'Bathroom': gt 'anushapt', 'bathroom'
+		act 'Anushka''s brother''s room': gt 'anushaptbr', 'brotherroom'
+		act 'Living room': gt 'anushapt', 'livingroom'
+		act 'Kitchen': gt 'anushapt', 'kitchen'
+		act 'Parents room': gt 'anushapt', 'anushparents'
 	else
 		'Anushka is standing next to you, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
-		act '<b>Leave Anushka''s apartment</b>': gt 'pav_complex','start'
-		act 'Let''s go to your room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
-		act 'Let''s check on your brother': AnushkaLoc = 3 & gt 'anushaptbr','brotherroom'
+		act '<b>Leave Anushka''s apartment</b>': gt 'pav_complex', 'start'
+		act 'Let''s go to your room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
+		act 'Let''s check on your brother': AnushkaLoc = 3 & gt 'anushaptbr', 'brotherroom'
 	end
 end
 
@@ -358,8 +390,7 @@ if $ARGS[0] = 'bathroom':
 	minut += 1
 	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
-	gs 'stat'
-	
+	gs 'stat'	
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom.jpg"></center>'
 	'The bathroom has seen better days. It looks like it hasn''t been cleaned for quite some time, with mold growing in the corners of the walls and floor.'
@@ -367,7 +398,7 @@ if $ARGS[0] = 'bathroom':
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-	act 'Leave the bathroom': gt 'anushapt','hallway'
+	act 'Leave the bathroom': gt 'anushapt', 'hallway'
 	act 'Take a shower':
 		*clr & cla
 		menu_off = 1
@@ -383,7 +414,7 @@ if $ARGS[0] = 'bathroom':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head, but you look out at him in consternation.'
 				'He looks up at you when you question him. It takes him a moment to realize who you are and he quickly zips up his pants. "Shit sorry... I thought you were my wife." He turns away and hurries for the door. "I''ll just be going... Sorry again." he says as he pulls the door closed. Unsure about what to think, you just decide to finish your shower.'
-				act 'Get out of the shower': gt 'anushapt','bathroom'
+				act 'Get out of the shower': gt 'anushapt', 'bathroom'
 			end
 			if pcs_inhib >= 50:
 				act 'Give him a show':
@@ -395,7 +426,7 @@ if $ARGS[0] = 'bathroom':
 					'He is a bit surprised at first. "Oh sorry... I thought you were my wife." His eyes roam up and down your naked body as he pulls out his dick and starts to piss in the toilet. "Don''t mind me. Just get back to your shower." he adds with a smirk.'
 					*nl
 					'You keep showering with the curtain open while glancing at him every now and then, but after his first once over, he doesn''t really pay you much attention. Once he is done, he washes his hands and leaves. He closes the door behind him without even another glance at your naked body. You decide to continue with your shower, and you don''t have any more surprises after that.'
-					act 'Get out of the shower': gt 'anushapt','bathroom'
+					act 'Get out of the shower': gt 'anushapt', 'bathroom'
 				end
 			end
 		elseif temp = 1 and maksimQW['QWstage'] >= 5:
@@ -410,10 +441,10 @@ if $ARGS[0] = 'bathroom':
 				else
 					'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head. "Get out of here you little pervert!"'
 					'He just laughs at you and keeps watching.'
-					'"Get out of her or I will tell your sister... or you dad." You tell him.'
+					'"Get out of here or I will tell your sister... or your dad." You tell him.'
 					'You see a flicker of fear in his eyes at the mention of his sister a lot when you mention his dad, he gives you a angry glare before closing the door leaving you in peace.'
 				end
-				act 'Get out of the shower': gt 'anushapt','bathroom'
+				act 'Get out of the shower': gt 'anushapt', 'bathroom'
 			end
 			if pcs_inhib >= 50:
 				act 'Give him a show':
@@ -422,7 +453,7 @@ if $ARGS[0] = 'bathroom':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showershow.jpg"></center>'
 					'Looking straight at him, you give him a smile. You pull the curtain wide open to give him the perfect view of your naked, wet, supple body. His eyes grow wide and he wastes no time, quickly coming into the bathroom, pulling the door closed behind him. After a few minutes of just watching you, you notice him pulling out his phone and trying to take a picture. You immediately shake your head at him. "No pictures or I will tell your sister that you snuck in here and started taking pictures of me in the shower." He doesn''t say anything, but gives you a look that''s a mixture of disgust, annoyance and fear at the mention of his sister.'
 					'He just settles in, enjoying watching you shower and dry yourself off. As you start getting dressed, you shoo him out of the room before finishing up.'
-					act 'Get out of the shower': gt 'anushapt','bathroom'
+					act 'Get out of the shower': gt 'anushapt', 'bathroom'
 				end
 			end
 		else
@@ -432,7 +463,7 @@ if $ARGS[0] = 'bathroom':
 			act 'Take a selfie':
 				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 			end
-			act 'Get out of the shower': gt 'anushapt','bathroom'
+			act 'Get out of the shower': gt 'anushapt', 'bathroom'
 		end
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		killvar 'temp'
@@ -449,8 +480,7 @@ if $ARGS[0] = 'nushshower':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
-	gs 'stat'
-	
+	gs 'stat'	
 	AnushkaLoc = 7
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry1.jpg"></center>'
@@ -527,7 +557,7 @@ if $ARGS[0] = 'nushshower':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/pc/activities/phone/anushka/6.jpg"></center>'
 										'She lets the towel completely drop away and turns to put one foot on the edge of the tub. This gives you a nice view of her backside.'
-										'"Yeah, show me that cute little ass!" you tell her as you take a couple of more pictures until she throws the towel at you.'
+										'"Yeah that''s it, work that cute little ass!" you tell her as you take a couple of more pictures until she throws the towel at you.'
 										gs 'arousal', 'erotic_nudity', 2
 										gs 'stat'
 										act 'Continue':
@@ -576,7 +606,7 @@ if $ARGS[0] = 'shower_wait':
 	end
 	gs 'arousal', 'erotic_nudity', 2
 	gs 'arousal', 'end'
-	act 'Get out of the bed': gt 'anush_bedroom','anushroom'
+	act 'Get out of the bed': gt 'anush_bedroom', 'anushroom'
 	act 'Chat': gt 'anushkachat', 'chat'
 end
 
@@ -612,7 +642,7 @@ if $ARGS[0] = 'snack':
 		'She laughs a bit. "No, but he doesn''t know that. However, if he doesn''t or he keeps being mean to you, come get me. I will kick his ass for you, OK?"'
 		'He nods all happy and gets up from the table. He tries to dart out of the room, but she manages to give him a one armed hug that he tries his best to squirm away from. He manages to finally break free, then he hurries out of the kitchen.'
 		'She stands up and looks at you. "Got everything?" When you nod, she says "Sweet, let''s go back to my room."'
-		act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
+		act 'Back to her room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
 	elseif snacktime <= 5 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		gs 'stat'
 		'<center><b><font color = maroon>Kitchen</font></b></center>'
@@ -623,7 +653,6 @@ if $ARGS[0] = 'snack':
 		'Her dad frowns at that. "That''s not funny. You shouldn''t even joke about stuff like that."'
 		'Anushka grins. "Oh come on, it was a little funny."'
 		'He just sighs and shakes his head slightly, resigned to what his daughter is like. "So, do you girls want a sandwich?"'
-
 		act 'No':
 			*clr & cla
 			gs 'stat'
@@ -634,12 +663,11 @@ if $ARGS[0] = 'snack':
 			*nl
 			'He rubs his hand over the top of his head. "I am well aware of how old you are. See all these gray hairs? I didn''t have any of them until you became a teenager."'
 			'Anushka rolls her eyes as she gets some snacks and drinks. "Right... and mom and those brats had nothing to do with it."'
-			'He smirks to her. "Ok... yeah... They may have had a little bit to do with it as well."'
+			'He smirks at her. "Ok... yeah... They may have had a little bit to do with it as well."'
 			'As the two of you walk out of the kitchen and back towards her room, he follows you both out and heads for the living room. "Have fun girls... but not too much fun."'
-			'Anushka looks back, and in a exacerbated tone says "Dad!" before she leads you back into her room'
+			'Anushka looks back, and in an exacerbated tone says "Dad!" before she leads you back into her room'
 			act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
 		end
-
 		act 'Yes':
 			*clr & cla
 			gs 'stat'
@@ -650,9 +678,9 @@ if $ARGS[0] = 'snack':
 			'He rubs his hand over the top of his head. "I am well aware of how old you are. See all these gray hairs? I didn''t have any of them until you became a teenager."'
 			*nl
 			'Anushka rolls her eyes as she gets some snacks and drinks. "Right... and mom and those brats had nothing to do with it."'
-			'He smirks to her. "Ok... yeah... They may have had a little bit to do with it as well."'
+			'He smirks at her. "Ok... yeah... They may have had a little bit to do with it as well."'
 			'As the two of you walk out of the kitchen and back towards her room, he follows you both out and heads for the living room. "Have fun girls... but not too much fun."'
-			'Anushka looks back, and in a exacerbated tone says "Dad!" before she leads you back into her room'
+			'Anushka looks back, and in an exacerbated tone says "Dad!" before she leads you back into her room'
 			act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
 		end
 	elseif snacktime <= 7 and anushkaQW['valeria_introduced'] = 0:
@@ -694,7 +722,7 @@ if $ARGS[0] = 'snack':
 					*nl
 					'Anushka walks over to the fridge and grabs two drinks plus a bag of chips. She grabs you by the arm and leads you out of the kitchen. As you walk out, she glances back at her mother to scream "Bitch!"'
 					'"It was great to meet you. I do hope to see you again, even though I doubt you''ll be back..." you hear Valeria sarcastically say as you''re leaving the kitchen.'
-					act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom','anushroom'
+					act 'Back to her room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
 				end
 			end
 		end
@@ -715,7 +743,7 @@ if $ARGS[0] = 'snack':
 			'Instead of getting angry, her mom just laughs. "You''re one to talk. We both know you''re a clingy, needy, little slut that will do anything to get anyone to pay attention to you. The only reason you''re in that band of yours is because you slept your way into it and continue to be their slut just so they will let you stay."'
 			'Anushka raises her hand like she might hit her mother. For a tense moment, you think she might, but then she lowers it. "You don''t know anything about me! You''ve never wanted to know anything about me! I fucking hate you! I wish you would just fucking leave if you hate it here so much!" With that, she turns and grabs some snacks. She pushes them into your hands so hard and fast that you are barely able to keep hold of them as she says "Come on, let''s go."'
 			'Her mother shakes her head. "That''s right! Go running to your room and cry like you have always done when you are faced with the truth. I can''t believe I raised such a pathetic excuse of a daughter."'
-			act 'Follow Anushka back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
+			act 'Follow Anushka back to her room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
 			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Defend Anushka (<<will_cost>> Willpower)':
@@ -727,7 +755,7 @@ if $ARGS[0] = 'snack':
 					'You can''t take listening to Valeria talk about your friend like that anymore. "You''re wrong! Anushka is a better person than you will ever be! If you would just talk to her for once instead of at her, you might realize just how great she really is!"'
 					'Anushka smiles at you and obviously appreciates what you said. Her mom just gives you a look of complete disgust. "You must be another one of those disgusting lesbians." she says scornfully before shooting an equally disgusted look at her daughter. "It is so sinful and shameful, but I guess I can''t expect my daughter to hang out with anyone decent." With that, she turns back to her cooking.'
 					'Anushka grabs you by the arm before you can say more. "Come on, let''s go. She just isn''t worth it."'
-					act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
+					act 'Back to her room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
 				end
 			else
 				act 'Defend Anushka (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -740,7 +768,7 @@ if $ARGS[0] = 'snack':
 		'She gets up and heads to the kitchen with you, the two of you talking and laughing the whole way.'
 		'As you walk into the kitchen, Anushka points to a refrigerator. "Grab some drinks out of the fridge and anything else good."'
 		'While you are doing that, she grabs a couple of snack cakes and chips from the cabinets, and once you both have your spoils from your raid on the kitchen, you head back to her room.'
-		act 'Back to her room':AnushkaLoc=2& gt 'anush_bedroom', 'anushroom'
+		act 'Back to her room':AnushkaLoc=2 & gt 'anush_bedroom', 'anushroom'
 	end
 	killvar 'snacktime'
 end
@@ -762,7 +790,7 @@ if $ARGS[0] = 'livingroom':
 	if livingev = 1 and anushkaQW['dad_mom_livingroom'] = 0 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		livingev_day = daystart
 		'As you start to walk into the living room, you overhear some muffled voices that are getting louder and louder as they go on... You notice that the door is ajar and sneak towards it to see if you can make out what is being said.'
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 		act 'Listen in':
 			cla & *nl
 			anushkaQW['dad_mom_livingroom'] = 1
@@ -770,7 +798,7 @@ if $ARGS[0] = 'livingroom':
 			'You see Valeria standing in front of the TV, yelling at Eduard. "I want to see that little bitch punished! And for real this time!!!"'
 			'Eduard sighs, clearly annoyed by Valeria being in the way. "What''s wrong now Valeria? I just want to relax and watch the TV..."'
 			'Valeria continues. "She''s undermining me in front of the boys! She talks back to me, and the boys are picking up on it. They''ve started doing it as well! So put a fucking stop to it, or else I''ll do it for you!"'
-			'Eduard frowns at her. "You''ll do what?! You''re not the better influence either, calling your own daughter a slut, a whore, and God knows what else while the boys overhear you. They repeat it to Anushka and call her names. What is wrong with you? God dammit, she''s your own daughter!" Eduard screams back at her.'
+			'Eduard frowns at her. "You''ll do what?! You''re not the better influence here, calling your own daughter a slut, a whore, and God knows what else while the boys overhear you. They repeat it to Anushka and call her names. What is wrong with you? God dammit, she''s your own daughter!" Eduard screams back at her.'
 			'"Like I care about that little whore... She needs to be put in her place and I want you to do something for once! Enough with this daddy''s little princess shit!" she says scoffingly.'
 			'You worry about getting caught, so you sneak away from the door without making a noise.'
 			act 'Leave the room':gt 'anushapt', 'hallway'
@@ -820,7 +848,7 @@ if $ARGS[0] = 'livingroom':
 						'"We should be on our way <<$pcs_nickname>>." Anushka whispers, then nudges you.'
 						'"Sure. It was nice to meet you." you say.'
 						'He raises his arm as he''s too into the program on the TV to answer by now.'
-						act 'Move away': AnushkaLoc = 1 & gt'anushapt', 'hallway'
+						act 'Move away': AnushkaLoc = 1 & gt 'anushapt', 'hallway'
 					end
 				end
 			end
@@ -830,8 +858,8 @@ if $ARGS[0] = 'livingroom':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				edtalk = rand(1,5)
-				if edtalk = 1:
+				if anushkaQW['edtalk'] = 0:
+					anushkaQW['edtalk'] += 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
 					'You smile at Eduard. "Hello Mr. Konstantinov, is Anushka around?"'
 					'An agitated Eduard calls you over. "Call me Ed. Come here <<$pcs_nickname>>, I need to ask you about something."'
@@ -848,7 +876,7 @@ if $ARGS[0] = 'livingroom':
 							*nl
 							'You try to defend Anushka and yourself. "We both just know what we want, and we''re not afraid to enjoy life how we want, but we are the ones that call the shots. We are not just some boy toys to be passed around."'
 							'He sighs and leans back in the chair, looking a bit defeated with a worried look on his face. "Well, you''re not my daughter, and she is old enough to make her own decisions. I just hope the both of you don''t end up like..." He suddenly trails off, looking at you as if he had more to say.'
-							act 'Leave':gt 'anushapt','hallway'
+							act 'Leave':gt 'anushapt', 'hallway'
 							if momslut >= 1:
 								act 'End up like my mom?':
 									*clr & cla
@@ -857,7 +885,7 @@ if $ARGS[0] = 'livingroom':
 									'He nods a bit. "Yeah, I don''t mean anything by it... but your mom had one hell of a rep when she was younger, and it has followed her for her whole life. That is something I would like you and my daughter to avoid. I know it''s not fair, but that''s just the way it is."'
 									'It wouldn''t hurt to try and ease his mind a bit. "Don''t worry, we like to have fun, but we know better than to take things too far."'
 									'He sighs and nods, more in acceptance of things he can''t control than anything else.'
-									act 'Leave':gt 'anushapt','hallway'
+									act 'Leave':gt 'anushapt', 'hallway'
 								end
 							end
 						end
@@ -871,7 +899,7 @@ if $ARGS[0] = 'livingroom':
 								'You look him straight in the eye and coldly say "I don''t know where those rumors came from. Someone must be talking behind our backs and trying to make us look bad. There''s no reason for us to act like that."'
 								'You''re still not sure if Eduard bought it or not, but he sighs despairingly. "I''ll take your word for it for now, but I''ll ask around some more to get to the bottom of this! There''s some explaining needing done here!" he says as he cracks his knuckles.'
 								'You let out a faint sigh of relief as he returns to his normal self.'
-								act 'Leave':gt 'anushapt','hallway'
+								act 'Leave':gt 'anushapt', 'hallway'
 							end
 						else
 							act 'Lie (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -887,7 +915,7 @@ if $ARGS[0] = 'livingroom':
 							*nl
 							'You try and defend Anushka. "She knows what she wants and isn''t afraid to enjoy life how she wants, but she never lets anyone take advantage of her. That is, unless she wants to take advantage of them."'
 							'He sighs and leans back in the chair, looking a bit defeated with a worried look on his face. "Well, she is old enough to make her own decisions. I just hope she doesn''t end up like..." He suddenly trails off, looking at you as if he has more to say.'
-							act 'Leave':gt 'anushapt','hallway'
+							act 'Leave':gt 'anushapt', 'hallway'
 							if momslut >= 1:
 								act 'End up like my mom?':
 									*clr & cla
@@ -896,7 +924,7 @@ if $ARGS[0] = 'livingroom':
 									'He nods a bit. "Yeah, I don''t mean anything by it... but your mom had one hell of a rep when she was younger, and it has followed her for her whole life. That is something I would like my daughter to avoid. I know it''s not fair, but that''s just the way it is."'
 									'It wouldn''t hurt to try and ease his mind a bit. "Don''t worry she likes to have fun, but she knows better than to take things too far."'
 									'He sighs and nods, more in acceptance of things he can''t control than anything else.'
-									act 'Leave':gt 'anushapt','hallway'
+									act 'Leave':gt 'anushapt', 'hallway'
 								end
 							end
 						end
@@ -910,17 +938,18 @@ if $ARGS[0] = 'livingroom':
 								'You look him straight in the eye and coldly say "I don''t know where those rumors came from. Someone must be talking behind her back and trying to make her look bad. There''s no reason for her to act like that."'
 								'You''re still not sure if Eduard bought it or not, but he sighs despairingly. "I''ll take your word for it for now, but I''ll ask around some more to get to the bottom of this! There''s some explaining needing done here." he says as he cracks his knuckles.'
 								'You let out a faint sigh of relief as he returns to his normal self.'
-								act 'Leave':gt 'anushapt','hallway'
+								act 'Leave':gt 'anushapt', 'hallway'
 							end
 						else
 							act 'Lie (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
-				elseif edtalk <= 3:
+				elseif anushkaQW['edtalk'] = 1:
+					anushkaQW['edtalk'] += 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
 					'You smile at Eduard. "Hello Mr. Konstantinov, is Anushka around?"'
 					'He turns to look at you and gives you a friendly smile. "Call me Ed. I have no idea where that girl is, but you can check her room if you want. If she''s not there, then there is no telling where she is." he says, sounding somewhat sad and worried.'
-					act 'Leave':gt 'anushapt','hallway'
+					act 'Leave':gt 'anushapt', 'hallway'
 					act 'Is everything ok?':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
@@ -943,14 +972,14 @@ if $ARGS[0] = 'livingroom':
 								act 'Tell her I stopped by':
 									*clr & cla
 									'You nod and know how he feels. There''s no point in waiting for her since she could be gone for hours. "Thanks, you can just tell her I stopped by."'
-									act 'Leave Anushka''s apartment': gt 'pav_complex','start'
+									act 'Leave Anushka''s apartment': gt 'pav_complex', 'start'
 								end
 								act 'Thanks, I''ll wait':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
 									'"Make yourself at home." he says with a small smile. "Just a bit of advice... if you can, avoid that... that..." Ed hesitates and grinds his teeth while he struggles to find the right words. "That woman... to put it nicely... She is always looking for a reason to pick a fight and argue with someone. Honestly, if it weren''t for the kids..." He trails off before falling silent for a few moments. You think he may have forgotten who he was talking to or that you''re even in the room, but eventually his expression softens.'
 									'"Just do your best to stay out of her way alright? You seem nice, and I''d hate to see her drive off another of Nush''s friends, especially one that could be a good influence on her."'
-									act 'Leave':gt 'anushapt','hallway'
+									act 'Leave':gt 'anushapt', 'hallway'
 								end
 							end
 						end
@@ -965,14 +994,14 @@ if $ARGS[0] = 'livingroom':
 							'He shakes his head. "Enough of my depressing talk. There is no telling when she might be home. You''re free to wait for her in her room if you want, or I can tell her you stopped by when I see her next?"'
 							act 'Tell her I stopped by':
 								'You nod and know how he feels. There''s no point waiting for her. She could be gone for hours. "Thanks, let her know I stopped by. Bye."'
-								act 'Leave Anushka''s apartment': gt 'pav_complex','start'
+								act 'Leave Anushka''s apartment': gt 'pav_complex', 'start'
 							end
 							act 'Thanks I''ll wait':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
 								'"Make yourself at home." he says with a small smile. "Just a bit of advice... if you can, avoid that... that..." Ed hesitates and grinds his teeth while he struggles to find the right words. "That woman... to put it nicely... She is always looking for a reason to pick a fight and argue with someone. Honestly, if it weren''t for the kids..." He trails off before falling silent for a few moments. You think he may have forgotten who he was talking to or that you''re even in the room, but eventually his expression softens.'
 								'"Just do your best to stay out of her way alright? You seem nice, and I''d hate to see her drive off another of Nush''s friends, especially one that could be a good influence on her."'
-								act 'Leave':gt 'anushapt','hallway'
+								act 'Leave':gt 'anushapt', 'hallway'
 							end
 						end
 					end
@@ -983,7 +1012,9 @@ if $ARGS[0] = 'livingroom':
 					'You nod. "Ok thanks, sorry to have bothered you. I''ll be quiet so you can watch your show."'
 					*nl
 					'Eduard just laughs. "We have three kids running around here, so there''s no need for that. Besides, if I saw you trying to be quiet and sneaking around, I would think you were up to something. Nush taught me long ago that if you see a kid being quiet or suddenly going quiet, it means that they are up to something." He shakes his head with a fond smile. "That does remind me of a time when Nush was younger..." He trails off and looks up at you. "Don''t mind me, I''m just reminiscing. I''m sure you''re not interested in hearing about that."'
-					act 'It''s fine, I would love to hear a story':gt 'anushapt', 'nushkidstory'
+					if anushkaQW['kidstory'] < 5:
+						act 'It''s fine, I would love to hear a story':gt 'anushapt', 'nushkidstory'
+					end
 					act 'Make an excuse':
 						cla & *clr
 						minut += 2
@@ -991,7 +1022,7 @@ if $ARGS[0] = 'livingroom':
 						'You shake your head. "I''m really sorry, but I should get going. Can I get a rain check for another time?"'
 						'He nods his head and says "Sure... sure... you have better stuff to do than listening to me. Go, go!"'
 						'You nod then say your goodbyes and quickly leave.'
-						act 'Leave':gt 'anushapt','hallway'
+						act 'Leave':gt 'anushapt', 'hallway'
 					end
 				end
 			end
@@ -1004,7 +1035,7 @@ if $ARGS[0] = 'livingroom':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
 				if rand(1,2) = 1:
 					'You turn and carefully tread out of the living room while Eduard is busy watching the TV. You quietly make it to the doorway to enter the hallway. With a final glance back, you see he is still sitting there watching TV, not having noticed you coming in at all.'
-					act 'Leave':gt 'anushapt','hallway'
+					act 'Leave':gt 'anushapt', 'hallway'
 				else
 					'You walk very carefully towards the door since you don''t want to make too much noise and disturb Eduard.'
 					'All of a sudden, you hear him clearing his throat. "Sneaking around are we?"'
@@ -1018,7 +1049,7 @@ if $ARGS[0] = 'livingroom':
 						'You shake your head. "I''m really sorry, but I should get going. Can I get a rain check for another time?"'
 						'He nods his head and says, "Sure... sure... you have better stuff to do than listening to me. Go, go!"'
 						'You nod then say your goodbyes and quickly leave...'
-						act 'Leave':gt 'anushapt','hallway'
+						act 'Leave':gt 'anushapt', 'hallway'
 					end
 				end
 			end
@@ -1055,7 +1086,7 @@ if $ARGS[0] = 'livingroom':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
 							'"Well it was nice talking to you, but I should likely get back to Anushka." you tell him.'
 							'He smiles a little. "Yeah, I wouldn''t want her wondering where you got off to. You girls have fun." he says before he turns back to the TV.'
-							act 'Leave':gt 'anushapt','hallway'
+							act 'Leave':gt 'anushapt', 'hallway'
 						end
 					end
 				end
@@ -1084,7 +1115,7 @@ if $ARGS[0] = 'kitchen':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/kitchen.jpg"></center>'
 	if kitchenev = 1 and anushkaQW['dad_mom_kitchen'] = 0 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		'As you start to enter the kitchen, you overhear some muffled voices that are getting louder and louder as they go on... You notice that the door is ajar and sneak towards it to see if you can make out what is being said.'
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 		act 'Listen':
 			*clr & cla
 			anushkaQW['dad_mom_kitchen'] = 1
@@ -1098,11 +1129,11 @@ if $ARGS[0] = 'kitchen':
 			'"So what? Didn''t you have a similar reputation when you were seeing me?" he asks.'
 			'"You''re really getting on my nerves right now Eduard! You know what I''m capable of doing..." She crosses her arms as she turns her eyes towards a knife that''s lying on the kitchen counter...'
 			'Feeling that this is getting out of hand, you quietly move away from the door and start walking back down the hallway as the yelling continues behinds you.'
-			act 'Leave':gt 'anushapt','hallway'
+			act 'Leave':gt 'anushapt', 'hallway'
 		end
 	else
 		'The room is not clean, and there are dishes on most of the available surfaces. The wood floor is not polished and only covers the areas being used. You''re surprised by the lack of a dining table.'
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 		act 'Look in the fridge': gt 'anushapt', 'fridge'
 		dynamic $fill_bottle
 		dynamic $driwater
@@ -1220,7 +1251,6 @@ end
 
 if $ARGS[0] = 'anushparents':
 	menu_off = 0
-
 	*clr & cla
 	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	minut += 1
@@ -1230,7 +1260,7 @@ if $ARGS[0] = 'anushparents':
 	'The room is fairly barren. What is in here is disorganized and untidy, with everything all over the place. You see that there is a bed, a bookshelf and a dresser with a TV on it. The dresser appears to be cheaply manufactured and poorly constructed. Even though it''s minimally furnished, the room is still quite dirty.'
 	if hour < 7:
 		'You look into the bedroom and see Anushka''s parents asleep. They are both on the edge of their side of the bed, as far apart as the bed allows. You don''t want to disturb them, so you close the door and leave.'
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 	elseif anushkaQW['valeria_introduced'] = 1 and rand(0,1) = 0:
 		menu_off = 1
 		gs 'stat'
@@ -1242,19 +1272,19 @@ if $ARGS[0] = 'anushparents':
 			act 'Ask about the band':gt 'anushapt', 'band'
 			act 'Photo album':gt 'anushapt', 'album'
 			act 'Ask about Alyona': gt 'anushapt', 'alyona_ask'
-			act 'Leave':gt 'anushapt','hallway'
+			act 'Leave':gt 'anushapt', 'hallway'
 		end
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 	else
 		'Since nobody''s here, you should probably leave, but you could take a look around if you''re curious.'
-		act 'Leave':gt 'anushapt','hallway'
+		act 'Leave':gt 'anushapt', 'hallway'
 		act 'Look around':
 			*clr & cla
 			minut += 10
 			'<center><b><font color = maroon>Anushka''s parent''s room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/momsdrawer.jpg"></center>'
 			'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. The room is too disorganized for you to find much. The only thing of note is a vibrator with a large pack of batteries in one of the night stands.'
-			act 'Leave':gt 'anushapt','hallway'
+			act 'Leave':gt 'anushapt', 'hallway'
 		end
 	end
 end
@@ -1272,8 +1302,44 @@ if $ARGS[0] = 'band':
 		'Valeria turns serious. "Yeah, I mean if I were in her shoes I wouldn''t give two shits about the others and focus all my energy on Radomir."'
 		'"Anushka is a fool for not latching onto Radomir. Just look at him, perfect body and he''s a really talented musician. He''ll probably amount to something big. She''s really stupid for not latching onto him while she still can, before he makes it big and leaves her behind."'
 		'You can''t even get a word in as she just keeps talking with a dreamy sigh. "Just think about the life she could have living with a big rock star. Hell if I was younger, I would''ve made sure that Radomir was all mine."'
+		*nl
 		'"What about being free and living your own life just like she''s doing right now?" you ask.'
 		'She looks at you as if you just asked the most stupid question ever. "Who gives a fuck? I can''t for the life of me understand why any woman would want that instead of having a man provide the perfect life. She would be free to do whatever, like just party, spend his money, and do whatever she wants." Valeria replies.'
+		if anushkaQW['raddate'] = 2:
+			act 'Point out Radomir broke up with Anushka':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
+				'"Um you do know Rad broke up with Nush, not the other way around." You tell her.'
+				'She gives you a look like you are an idiot. "I know what my darling daughter claims, most likely she was sleeping around and cheating on him."'
+				'You frown at that. "Actually Rad was cheating on her and she kept forgiving him."'
+				'She now looks annoyed. "No man is going to break up with a girl if she keeps forgiving him for cheating, then he can have his cake and eat it too. What nonsense."'
+				'You decide to push it a bit more. "Rad is the one that told me this."'
+				'She just shakes her head. "Oh I am sure he did, but if she wasn''t cheating she probably got all clinging and smothering with him, constantly being jealous anytime a girl even looked at him. Men don''t like that and she had to know with his talent he was going to attract girls. She should have done a better job making him happy and then he wouldn''t have had to break up with him. If she was smart she would do everything in her power to win him back, while she can."'
+				'You just sigh, you can tell there is nothing you can say that will convince her otherwise. So you decided it would be best to just change the topic.'
+				act 'Leave':
+					killvar 'nush_band'
+					killvar 'nush_album'
+					gt 'anushapt', 'hallway'
+				end
+				if nush_album = 0: act 'Ask about the photo album':gt 'anushapt', 'album'
+				act 'Bring up Alyona':gt 'anushapt', 'alyona_ask'
+				act 'How about the other bandmates?':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
+					'Valeria looks at you confused and begins to laugh. "Who? You mean the other two losers that are in the band? Don''t make me laugh, because they''re nothing compared to Radomir."'
+					'"Maybe you should just let her choose for herself." you answer.'
+					'"Listen here <<$pcs_nickname>>, I might not give two shits about Anushka, but the best outcome for me-" she stops and takes a deep breath. "For her I mean... is to hook up with Radomir and that''s the end of the story."'
+					'Seeing you''re not getting anywhere with Valeria you sigh, say goodbye, and turn around to leave.'
+					act 'Leave':
+						killvar 'nush_band'
+						killvar 'nush_album'
+						gt 'anushapt', 'hallway'
+					end
+					if nush_album = 0: act 'Ask about the photo album':gt 'anushapt', 'album'
+					act 'Bring up Alyona':gt 'anushapt', 'alyona_ask'
+				end
+			end
+		end
 		act 'How about the other bandmates?':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
@@ -1297,7 +1363,7 @@ if $ARGS[0] = 'album':
 	*clr & cla
 	nush_album = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
-	'There is an photo album on the nightstand that''s next to the bed. You walk up, open it up, and look at the photos inside. "Is that your family?"'
+	'There is a photo album on the nightstand that''s next to the bed. You walk up, open it up, and look at the photos inside. "Is that your family?"'
 	'In a rare occurrence, Valeria almost seems to smile as she picks up the old album and starts to look through the photos of her and her family.'
 	'"We all looked so happy then..." she says. "It was a whole different world back then. Come and have a look."'
 	'You sit next to her as she flips through the photo album. All of a sudden, you notice something...'
@@ -1305,7 +1371,7 @@ if $ARGS[0] = 'album':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
 		'"Is that who I think it is?" you ask smiling as you see a picture of a young Anushka running around completely naked.'
-		'"It sure is. She''s my first born. She should have been my pride and joy, but something happened that just made that girl hardheaded and stupid."'
+		'"It sure is. She''s my firstborn. She should have been my pride and joy, but something happened that just made that girl hardheaded and stupid."'
 		'She continues on. "Anushka''s has always been quite the exhibitionist. I remember her being around two or three years old and I was trying to make her wear clothes. As soon as I turned my back, she was always taking her clothes off and running around naked. It didn''t matter if we had someone over or if we were outside in public. She grew up, but didn''t change. Now she whores around, instead of focusing on trying to find a man to take care of her. It doesn''t matter what I tell her. She thinks she knows it all, the snotty little bitch." Her tone quickly changed from friendly to anger.'
 		*nl
 		'You debate saying anything, but feel you have to. "Maybe she wants to be her own woman and lead her own life without having to have a guy take care of her?"'
@@ -1393,8 +1459,7 @@ if $ARGS[0] = 'nushlivroom':
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
 		'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-
-		act 'Follow Anushka to her room': gt 'anush_bedroom','anushroom'
+		act 'Follow Anushka to her room': gt 'anush_bedroom', 'anushroom'
 	end
 	if strapnumber > 0:
 		act 'Pull out your strap-on':
@@ -1418,7 +1483,7 @@ if $ARGS[0] = 'nushlivroom':
 					'<center><b><font color = maroon>Living room</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
 					'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on, let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-					act 'Follow Anushka to her room': gt 'anush_bedroom','anushroom'
+					act 'Follow Anushka to her room': gt 'anush_bedroom', 'anushroom'
 				end
 			end
 		end
@@ -1431,35 +1496,41 @@ if $ARGS[0] = 'nushkidstory':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
-	nushkidstory = rand(1,4)
-	if nushkidstory = 1:
+	anushkaQW['kidstory'] += 1
+	if anushkaQW['kidstory'] = 1:
 		'The corner of Eduard''s mouth turns upwards as he starts. "I remember one autumn day when I was out in the garage and our car was in there. I had just given it a tuneup. Nush had helped me until she got bored and started running around as usual trying to find trouble. I think she was about eight at the time." He shakes his head in amusement as he remembers it.'
 		'"As usual." you reply as a smile spreads across your face and Eduard gives you a relatable look. "So all of a sudden she disappears somewhere. I remember her playing around with my jacket. Before you know it, I hear the car start, and off it goes! Nush is sitting in the drivers seat with a huge grin on her face, driving towards the garage door on the opposite side..."'
+		*nl
 		'You gasp as he continues. "Don''t worry. I start yelling at her to stop and she hits the brakes. She manages to stop less than a meter from the other garage. I don''t know how she was able to reach the pedals while being able to see over the dashboard. Anyways, I''m pissed, and I yank open the door to really lay into her. However, she is sitting there all sad. She knows she did something wrong and she looks up at me with those big puppy eyes..." he says sighing. "I couldn''t do anything as my anger just melted away. I just pulled her out and got in the car to back it back into the garage."'
 		*nl
 		'"This makes what she''s like now make so much more sense. My mom would have tanned my hide if I had done that!" you comment.'
 		'He nods a little. "Yeah, I should have been harder on her when she was growing up. Maybe it would have curbed her wilder ways now." He shakes his head. "She has always managed to wrap me around her little finger, and with just a look, melt away my anger to make me a better man."'
-		'You give him an awww look, and he clears his throat. "Yeah, anyways the little free spirited wild child looking for trouble is my Nush." Eduard responds. With that, you can tell he is done with telling stories, at least for now. "Well thank you for telling me. I loved hearing about it. Anyways, I should get going." you tell him, and he nods to you as you leave the living room.'
-	elseif nushkidstory = 2:
+		'You give him an awww look, and he clears his throat. "Yeah, anyways the little free-spirited wild child looking for trouble is my Nush." Eduard responds. With that, you can tell he is done with telling stories, at least for now. "Well thank you for telling me. I loved hearing about it. Anyways, I should get going." you tell him, and he nods to you as you leave the living room.'
+	elseif anushkaQW['kidstory'] = 2:
 		'The corner of Eduard''s mouth turns upwards as he starts. "I remember one of those warm spring days while Anushka was in preschool. She was creating havoc most likely. On this day, I was helping out at home looking after the baby when all of a sudden the phone rings and it''s the preschool..."'
 		'"You must''ve gotten lots of those back in the days!" you reply smiling and Eduard rolls his eyes. "I pick up the phone and there''s a hysterical teacher on the other side. She starts yelling that Nush is gone and that they can''t find her anywhere..."'
+		*nl
 		'You gasp as he continues. "I go to the preschool and join in the search. I even call some of my friends to help us look. The preschool even calls the police after a few hours." The way he says police sounds like he wants to spit the word. "Anyways... one of my friends finds her out near the palace. We still don''t know how she got there. When he brings her back, I ask what the hell she was doing and why she went off..." He sighs. "She just shrugs her shoulders and says that she felt like exploring the town. Turns out, my friend tells me, that she was conning tourists out of sweets then giving them bad directions. Apparently, she thought it was funny. That is until she got sick from eating too many sweets after I took her home. She threw up all over the place."'
+		*nl
 		'You continue on talking for a while about Anushka''s adventures while she was younger. "This makes what she''s like now make so much more sense." you comment.'
-		'"Yeah, anyways the little free spirited wild child looking for trouble my Nush." Eduard responds.'
-	elseif nushkidstory = 3:
+		'"Yeah, anyways the little free-spirited wild child looking for trouble my Nush." Eduard responds.'
+	elseif anushkaQW['kidstory'] = 3:
 		'The corner of Eduard''s mouth turns upwards as he starts. "This is a good story, so Nush used to like playing games when she was younger. I bought a used PlayStation and she just loved it. She spent all her time on it for a while and always wanted the newest games for it. Anyways, some of the kids from the neighborhood had been talking about this new game that was just about to get released, so of course, she comes running and asks for me to buy it..."'
 		'"Quite spoiled." you reply as you smile and Eduard gives you a relatable look. "Here comes the best part. So I tell her that we can''t afford it right now. At first she pouts, but she quickly stops and leaves the room. She never was much of a pouter. After about 30 minutes, we hear the door slam shut and the house goes really quiet..."'
+		*nl
 		'You smile as he continues. "So what did my dear daughter do? Well, she took her little brother down the street and tried to sell him for the same price as that game cost. Luckily a neighbor walked past and had the two of them follow her home. This was after she promised that she would think about buying Maksim."'
 		'"I about hit the roof when the neighbor brings them back and tells us what happened. My wife gets hysterical about it... Anyways I start yelling at Nush asking her why she would do that. As calmly as you please, she explains if she sold him I wouldn''t have to pay for the game. Since we wouldn''t have to feed him, then we would have more money for more games." He shakes his head laughing. "That''s when I knew she wasn''t just going to be trouble like most kids, but that she was too smart for her own good."'
+		*nl
 		'You continue on talking for a while about Anushka''s adventures while she was younger. "This makes what she''s like now make so much more sense." you comment.'
-		'"Yeah, anyways, the little free spirited wild child looking for trouble my Nush." Eduard responds.'
+		'"Yeah, anyways, the little free-spirited wild child looking for trouble my Nush." Eduard responds.'
 	else
-		'"Nush has always liked to take bike rides with me, specially when she was younger." he starts reminiscing. "So this one time we are riding along with her on the back of the bike. She was ten at the time I think. I was already going fast, and she was yelling to go faster... faster all the time."'
+		'"Nush has always liked to take bike rides with me, especially when she was younger." he starts reminiscing. "So this one time we are riding along with her on the back of the bike. She was ten at the time I think. I was already going fast, and she was yelling to go faster... faster all the time."'
 		'"I guess you listened?" you ask, but you already know what the answer will be.'
 		'Eduard starts laughing. "Well, of course, so we''re going way too fast and Nush is screaming out of joy when all of a sudden a police car appears behind us and pulls us over. The police officer and I are having a talk and all of a sudden, he turns towards Nush, and what does she do? Sticks out her tongue and flips him off. She was mad because he ruined her fun you see..."'
+		*nl
 		'You gasp as he continues laughing. "Luckily the police officer and I knew each other. He was a decent sort and just laughed it off. He petted her on her head and commented that she was going to be a real handful when she grew up. Boy was he right..." Eduard starts laughing.'
 		'You continue on talking for a while about Anushka''s adventures while she was younger. "This makes what she''s like now make so much more sense." you comment.'
-		'"Yeah, anyways the little free spirited wild child looking for trouble my Nush." Eduard responds.'
+		'"Yeah, anyways the little free-spirited wild child looking for trouble my Nush." Eduard responds.'
 	end
 	killvar 'nushkidstory'
 	act 'Leave': gt 'anushapt', 'hallway'

locations/anushapt_city.qsrc

@@ -438,7 +438,7 @@ if $ARGS[0] = 'bathroom':
 			'Despite the pattering noise of the running water, you hear the bathroom door open. You look past the shower curtain to see Eduard walking up to the toilet and unzipping his pants.'
 			act 'Uhm excuse me?':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showergetout.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head, but you look out at him in consternation.'
 				'He looks up at you when you question him. It takes him a moment to realize who you are and he quickly zips up his pants. "Shit sorry... I thought you were my wife." He turns away and hurries for the door. "I''ll just be going... Sorry again." he says as he pulls the door closed. Unsure about what to think, you just decide to finish your shower.'
 				act 'Get out of the shower': gt 'anushapt_city','bathroom'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'bathroom':
 				act 'Give him a show':
 					*clr & cla
 					inhib_exp += 3
-					'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showershow.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showershow.jpg"></center>'
 					'It seems he hasn''t looked over to see who is in the shower yet. You decide to pull the curtain wide open and give him a proper view of your soapy naked body. "Excuse me, is this what you were looking for?" you ask him.'
 					*nl
 					'He is a bit surprised at first. "Oh sorry... I thought you were my wife." His eyes roam up and down your naked body as he pulls out his dick and starts to piss in the toilet. "Don''t mind me. Just get back to your shower." he adds with a smirk.'
@@ -461,7 +461,7 @@ if $ARGS[0] = 'bathroom':
 			'Despite the pattering noise of the running water, you hear the bathroom door creaking slightly. Looking past the shower curtain you see that the bathroom door has been cracked open a little bit. Through the small crack in the doorway, you notice Maksim, Anushka''s younger brother, peeking in to watch you shower.'
 			act 'Yell at him':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showergetout.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				if locat['A144'] = 0:
 					'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head. "Get out of here you little pervert!"'
 					'He laughs, then quickly ducks away before you hear Anushka yelling at him. "What the hell are you doing?" As you continue your shower, you hear a lot more yelling from behind the door, and there is even a loud crash. Suddenly, silence descends upon the apartment.'
@@ -477,7 +477,7 @@ if $ARGS[0] = 'bathroom':
 				act 'Give him a show':
 					*clr & cla
 					inhib_exp += 3
-					'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showershow.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showershow.jpg"></center>'
 					'Looking straight at him, you give him a smile. You pull the curtain wide open to give him the perfect view of your naked, wet, supple body. His eyes grow wide and he wastes no time, quickly coming into the bathroom, pulling the door closed behind him. After a few minutes of just watching you, you notice him pulling out his phone and trying to take a picture. You immediately shake your head at him. "No pictures or I will tell your sister that you snuck in here and started taking pictures of me in the shower." He doesn''t say anything, but gives you a look that''s a mixture of disgust, annoyance and fear at the mention of his sister.'
 					'He just settles in, enjoying watching you shower and dry yourself off. As you start getting dressed, you shoo him out of the room before finishing up.'
 					act 'Get out of the shower': gt 'anushapt_city','bathroom'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'livingroom':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A156', 'like'
 			minut += 30
-			'<center><img <<$set_imgh>> src="images/shared/food/video_games/videogame_boy.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
 			'You take a seat next to Arkadi as he plays a video game. After a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. The two of you have a good time playing games for awhile, but after a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
 			act 'Leave the livingroom':gt 'anushapt_city', 'hallway'
 		end
@@ -876,7 +876,7 @@ if $ARGS[0] = 'nushlivroom':
 	gs 'anushapt_city_schedule'
 	locat['A144'] = 5
 	'<center><b><font color = maroon>Living room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living_room.jpg"></center>'
 	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch but in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it has been dusted in months or the floor has been recently swept. You walk over and sit down next to Anushka.'
 	*nl
 	'You notice that you don''t hear anything else. "Where''s everyone else?" you ask her.'

locations/anushaptbr.qsrc

@@ -1,4 +1,9 @@
 # anushaptbr
+!!2024/04/03
+!!maksimQW['QWstage'] - tracks the stage of his overall questline
+!!maksimQW['blackmail_flash']- tracks how many times Sveta has been blackmailed after agreeing to it
+!!maksimQW['blackmail'] shows if Sveta has agreed to be blackmailed
+!!maksimQW['nush_games'] shows how many times Sveta and Nush have played her brothers in video games
 
 if $ARGS[0] = 'brotherroom':
 	$menu_loc = 'anushaptbr'
@@ -10,16 +15,14 @@ if $ARGS[0] = 'brotherroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'
-	
-	act 'Leave': gt 'anushapt', 'hallway'
-	
+	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'	
+	act 'Leave': gt 'anushapt', 'hallway'	
 	if AnushkaLoc = 3 and maksimQW['QWstage'] = 0:
 		maksimQW['QWstage'] = 1
 		menu_off = 1
 		minut += 5
 		gs 'stat'
-		'The two of you enter her brothers'' room. They immediately stop doing what they were doing and look towards you in fear and anger. Maksim, the older brother, is 13 or 14, the age when boys start paying attention to girls. Timofey is about a year or two younger.'
+		'The two of you enter her brothers'' room. They immediately stop doing what they are doing and look towards you in fear and anger. Maksim, the older brother, is 13 or 14, the age when boys start paying attention to girls. Timofey is about a year or two younger.'
 		'Maksim gathers some courage before speaking. "What do you want? Get out of our room!"'
 		*nl
 		'"Calm down. I just wanted to see what you were up to because I know you little shitheads are always up to something!" Anushka quickly replies.'
@@ -27,7 +30,7 @@ if $ARGS[0] = 'brotherroom':
 		'Anushka reaches out and slaps him on the back of the head. "Watch what you say, or I''ll beat your little ass!"'
 		*nl
 		'He rubs the back of his head. "That''s what mother always says."'
-		'Anushka fumes. "Fuck that bitch and don''t listen to her. You better listen to dad, you little asshole!"'
+		'Anushka fumes. "Fuck that bitch and don''t listen to her. You better off listen to dad, you little asshole!"'
 		'He just rolls his eyes and ignores her. "Don''t tell me... Is this one of the famous groupies that we''ve heard so many stories about?" he asks while looking at you.'
 		act 'Excuse me?':
 			*clr & cla
@@ -36,9 +39,9 @@ if $ARGS[0] = 'brotherroom':
 			'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 			'"What do you mean?" you ask.'
-			'"We hear a lot of great stories about the band and its groupies from Radomir," he answers.'
+			'"We hear a lot of great stories about the band and its groupies from Rad," he answers.'
 			'"Don''t listen to him! He''s just making most of that stuff up to impress you!" Anushka snaps.'
-			'"Well, at least we can hope this groupie is better than Alyona."'
+			'"Well, at least we can hope this groupie is better than Alyona." Maksim says.'
 			act 'Why''s that?':
 				*clr & cla
 				minut += 5
@@ -47,23 +50,24 @@ if $ARGS[0] = 'brotherroom':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 				'"She''s really mean to us! She always beats me up and won''t play games with us," Maksim says as he looks at you sadly. Timofey nods in agreement.'
 				'"If you stop trying to film her while she''s taking a shower, maybe she wouldn''t be kicking your ass, you little pervert!" Anushka interjects.'
-				'"Your brothers are really something else. I guess even boys at this age think with their smaller head," you reply.'
+				'"Your brothers are really something else. I guess even boys at this age think with their smaller heads," you reply.'
 				*nl
 				'Anushka nods in agreement. "Yeah, most of them are slaves to their lust, even if they''re too young to even understand it yet."'
 				'Maksim puffs up. "I''m not too young!"'
-				'Anushka laughs at him and turns to you. "Maybe I should tell my dad what they''re up to?"'
+				'Anushka laughs at him and turns to you. "Maybe I should tell Dad what they''re up to?"'
 				act 'Laugh':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 					'The brothers are looking at the two of you in total fear as Anushka continues. "Look at them! They''re scared shitless!"'
 					'Maksim is fuming with anger and starts yelling. "Get out of our room!"'
 					'When you and Anushka just keep laughing, he and Timofey get up and push you out the door.'
-					act 'Leave': AnushkaLoc = 2 & gt 'anushapt','hallway'
+					act 'Leave': AnushkaLoc = 2 & gt 'anushapt', 'hallway'
 				end
 			end
 		end
-	elseif AnushkaLoc = 3 and maksimQW['QWstage'] = 1:
-		if maksimQW['QWstage'] = 1: maksimQW['QWstage'] = 2
+	elseif AnushkaLoc = 3 and maksimQW['nush_games'] = 0:
+		maksimQW['QWstage'] = 1
+		maksimQW['nush_games'] = 1
 		menu_off = 1
 		minut += 3
 		gs 'stat'
@@ -72,7 +76,7 @@ if $ARGS[0] = 'brotherroom':
 		'Maksim glances at his brother for a moment, then back at Anushka. "All of us?"'
 		*nl
 		'She nods. "That''s the plan. The two of us against the two of you."'
-		'Both of them get excited. "Your friend better be great. We''ve been practicing really hard, and we''ll definitely beat you this time!"'
+		'Both of them get excited. "Your friend better be great, because we are getting really good at this game!"'
 		'"You really think you can beat me this time? You got your asses handed to you the last time!" Anushka quickly replies while smiling.'
 		'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
 		act 'What''s this all about?':
@@ -80,7 +84,7 @@ if $ARGS[0] = 'brotherroom':
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-			'"Oh don''t worry. Sometimes I sit and play video games with them. I always beat their asses."'
+			'"Oh don''t worry. Sometimes I sit and play video games with them. I always beat their asses." Anushka explains.'
 			'"Not this time!" Maksim looks at the two of you determined.'
 			act 'Sit down and play':
 				*clr & cla
@@ -97,14 +101,17 @@ if $ARGS[0] = 'brotherroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
 					if pcs_gaming <= 20:
-						'The game is pretty much over. Both of them are better players than you are. Anushka does what she can, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
+						maksimQW['nush_games_win'] = 1
+						'The game is pretty much over. Both of them are better players than you are. Anushka does what she can, but the brothers easily manage to win the first game, they have a big lead during the second game when Anushka uses her foot to push Maksim off the bed, he manages to get back up. It gives you a chance but Timofey manages to keep you from taking advantage of it, despite Anushka trying to cheat the brothers manage to win again.'
+						'Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose! Even if you did try and cheat, loser!" Maksim taunts.'
 						'Anushka rolls her eyes at their antics. "You just got lucky is all."'
 						'"You suck, you suck!" Maksim chants and Timofey quickly joins in. "Losers, losers!"'
 						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like jackasses anytime soon." You get up and follow her out.'
 					elseif pcs_gaming <= 40:
-						'You start to get a handle on things, and for a while, the game is pretty much a draw with no team getting the upper hand. All of a sudden however, you make a mistake, and the brothers are about to win. Just as they''re about to grab their victory though, Anushka uses her foot to push Maksim off the bed. This allows her to secure the win while he''s trying to recover.'
+						maksimQW['nush_games_win'] = 2
+						'You start to get a handle on things, and for a while, the game is pretty much a draw with no team getting the upper hand. All of a sudden, however, you make a mistake, and the brothers are about to win. Just as they''re about to grab their victory though, Anushka uses her foot to push Maksim off the bed. This allows her to secure the win while he''s trying to recover.'
 						'He immediately starts yelling. "You cheated! You always do this when you''re about to lose!"'
-						'"Yeah, Anushka''s a cheater!" Timofey chimes in.'
+						'"Yeah, Nush''s a cheater!" Timofey chimes in.'
 						'"Don''t be such a crybaby! I thought you said you were prepared this time?" she says, teasing them with a smile on her face.'
 						*nl
 						'The comment only makes the situation worse, and things escalate. The brothers are now yelling at Anushka and taking it way too seriously. After a while, Anushka gets fed up with them and starts yelling back.'
@@ -113,13 +120,14 @@ if $ARGS[0] = 'brotherroom':
 						'"But dad nothing. Weren''t you supposed to be studying?" Eduard asks.'
 						*nl
 						'"Y-Yes..." both brothers answer.' 
-						'"Well get to it!" he says to them, then turns to you and Anushka. "You two get out of their room. And stop tormenting your brothers, Nush!" He holds the door open until you both leave, then pulls it shut hard.'
+						'"Well get to it!" he says to them, then turns to you and Anushka. "You two get out of their room and stop tormenting your brothers, Nush!" He holds the door open until you both leave, then pulls it shut hard.'
 						'Anushka starts to respond, but Eduard interrupts her. "I don''t care! Leave them alone so they can study. Take your friend to your room." With that, he turns and goes back to the living room.'
 					else
-						'While it''s your first time playing, you manage to hold your own, and with Anushka''s skill, it becomes clear you two have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+						maksimQW['nush_games_win'] = 3
+						'While it''s your first time playing, you manage to hold your own, and with Anushka''s skill, it becomes clear you two have the upper hand. The brothers keep it close, but they fall a little short in both games.'
 						'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
 						'Timofey tries to defend himself. "It''s not my fault Nush and <<$pcs_nickname>> are too good!"'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault. I killed you three times when you kept trying to go through that courtyard. You''re just mad because you got beat by a girl... Again," she says teasingly and sticks her tongue out at him.'
+						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault. I killed you three times when you kept trying to go through that courtyard. You''re just mad because you got beat by a girl... Again!" she says teasingly and sticks her tongue out at him.'
 						'Maksim''s eyes flare at Anushka. "GO SUCK A DICK! THAT''S ALL <i>YOU''RE</i> GOOD AT, SLUT!" he screams at her.'
 						*nl
 						'Anushka''s eyes narrow. "Watch your mouth, you little shit! It''s just a game!"'
@@ -129,21 +137,21 @@ if $ARGS[0] = 'brotherroom':
 						*nl
 						'Eduard turns and glares at Anushka. "Stop teasing your brothers and go to your room." When she starts to open her mouth, he cuts her off. "I don''t want to hear it. Go to your room!" With that, she gets up in a huff and does as she''s told. You follow behind her.'
 						'"What have I told you about calling your sister a slut?" you hear Eduard ask as you leave.'
-						'Maksim''s voices cracks. "I''m sorry..."'
+						'Maksim''s voice cracks. "I''m sorry..."'
 						'The door closes before you can hear any more, leaving you unable to make out anything beyond muffled sounds.'
 					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom','anushroom'
+					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 				end	
 			end
 		end
 	elseif AnushkaLoc ! 3:
 		brotherroom = rand(1,6)
 		menu_off = 1
-		if brotherroom = 1 and maksimQW['QWstage'] >= 3:
-			if maksimQW['QWstage'] = 3: maksimQW['QWstage'] = 4
+		if brotherroom = 1 and maksimQW['QWstage'] = 1:
+			maksimQW['QWstage'] = 2
 			minut += 2
 			gs 'stat'
-			'You open the door and look into the brothers'' room. You see the boys sitting talking about something. Maksim is 13 or 14, the age when boys start paying attention to girls. Timofey is about a year or two younger.'
+			'You open the door and look into the brothers'' room. You see the boys sitting and talking about something. Maksim is 13 or 14, the age when boys start paying attention to girls. Timofey is about a year or two younger.'
 			act 'What are you up to?':
 				*clr & cla
 				minut += 2
@@ -186,9 +194,9 @@ if $ARGS[0] = 'brotherroom':
 					end	
 				end
 			end	
-		elseif brotherroom = 2 and maksimQW['QWstage'] >= 4:
+		elseif brotherroom = 2 and maksimQW['QWstage'] = 2:
 			gs 'stat'
-			if maksimQW['QWstage'] = 4: maksimQW['QWstage'] = 5
+			maksimQW['QWstage'] = 3
 			'You open the door and look in the brothers'' room. You see them fighting on Maksim''s bed. They immediately stop when they see you.'
 			act 'What are you doing?':
 				*clr & cla
@@ -206,7 +214,7 @@ if $ARGS[0] = 'brotherroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 					'You walk up to them and grab the magazine. Maksim tries his hardest to stop you, but you easily manage to push him away.'
-					'"Give that back! It''s mine!" he says dejected. "It''s all your fault!" he says as he turns to his brother. "If you could only keep your mouth shut. I can''t wait to get my own room."'
+					'"Give that back! It''s mine!" he says dejectedly. "It''s all your fault!" he says as he turns to his brother. "If you could only keep your mouth shut. I can''t wait to get my own room."'
 					'Timofey just keeps on sneering at his brother.'
 					act 'Calm down':
 						*clr & cla
@@ -216,16 +224,16 @@ if $ARGS[0] = 'brotherroom':
 						'"It doesn''t have to be all bad," you say. "I share a room with my sister."'
 						'"Wow, two girls in one room? That''s so hot!" Maksim says. "Our sister is the only one with her own room. That''s so unfair!"'
 						'"She is a girl after all. Wouldn''t it be awkward if she shared a room with you?" you try to explain.'
-						'"I guess, but she could sleep in the living room, then we could each have our own room!" he says, as if that would be totally fair.'
+						'"I guess, but she could sleep in the living room, then we could each have our own room!" he says as if that would be totally fair.'
 						'Giving up on reasoning with him, you shrug and turn to the magazine. As you flip through the pages, you realize the boy has some kinky tastes and wonder who might have bought something like this for him. Whoever it was, you figure there''s no harm in him looking at pictures, so when you reach the end, you throw the magazine back onto his bed. "I won''t tell anyone your secret, but try to be nice to each other at least."'
 						act 'Leave': gt 'anushapt', 'hallway'
 					end
 				end	
 			end
-		elseif brotherroom = 3 and maksimQW['QWstage'] >= 2:
+		elseif brotherroom = 3 and maksimQW['QWstage'] >= 3:
+			maksimQW['QWstage'] = 4
 			gs 'stat'
-			if maksimQW['QWstage'] = 2: maksimQW['QWstage'] = 3
-			'You open the door and look in the brothers'' room. You see Maksim in there alone, playing some first person shooter on the PlayStation.'
+			'You open the door and look in the brothers'' room. You see Maksim in there alone, playing some first-person shooter on the PlayStation.'
 			act 'Ask where Timofey is':
 				*clr & cla
 				minut += 2
@@ -240,24 +248,43 @@ if $ARGS[0] = 'brotherroom':
 					*clr & cla
 					minut += 3
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-					'You nod while trying not to laugh. "Oh I see. Do you want to play a game with me then?"'
-					'It looks like he''s about to say no, but then he smiles. "Okay, but only if we make it interesting."'
-					'"Interesting how?" you ask.'
-					'He grins. "If I win, you have to show me your boobs, but if you win, I''ll tell you a secret about Nush that you don''t know."'
-					act 'I don''t think so':
-						*clr & cla
-						minut += 3
+					if maksimQW['blackmail_flash'] > 10:
+						maksimQW['blackmail_flash'] += 1
+						gs 'fame', 'pav', 'sex', 1
+						inhib_exp += rand(1,3)
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/naked_video_games.jpg"></center>'
+						'You nod while trying not to laugh. "Oh, I see. Do you want to play a game with me then?"'
+						'It looks like he''s about to say no, but then he smiles. "Okay, but you have to play naked."'
+						'You shake your head. "I don''t think so." you tell him.'
+						'He grins. "Do it or I will tell Nush you were spying on her."'
+						*nl
+						'You sigh once more being blackmailed by a boy who is barely a teenager, how did you get yourself into this. "Fine!" With that, you strip out of your clothes and pick up one of the controllers. The two of you play a game but you easily beat him, as he spends the whole time staring at your naked body instead of paying attention to the game.'
+						'With him still staring at your naked body you decided you had enough for now. Getting up you get dressed. "Hey you don''t got to get dressed we can play another game." He says.'
+						'You shake your head. "Maybe some other day." Once you finish getting dressed you leave.'
+						gs 'arousal', 'flash', 15, 'humiliation', 'sub'
+						gs 'arousal', 'end'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-						'You shake your head. "No, I don''t think so..." you tell him.'
-						'He frowns. "Fine then! Get out of my room. Just get out!"'
-						'You back out of the doorway. "Okay... Okay, I''m going."'
 						act 'Leave': gt 'anushapt', 'hallway'
-					end
-					act 'Deal': gt 'anushaptbr', 'race_maksim_result'
-					if pcs_inhib > 30: act 'Deal (Go easy on Maksim)': gt 'anushaptbr', 'race_maksim_result', 1
-				end	
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
+						'You nod while trying not to laugh. "Oh I see. Do you want to play a game with me then?"'
+						'It looks like he''s about to say no, but then he smiles. "Okay, but only if we make it interesting."'
+						'"Interesting how?" you ask.'
+						'He grins. "If I win, you have to show me your boobs, but if you win, I''ll tell you a secret about Nush that you don''t know."'
+						act 'I don''t think so':
+							*clr & cla
+							minut += 3
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
+							'You shake your head. "No, I don''t think so..." you tell him.'
+							'He frowns. "Fine then! Get out of my room. Just get out!"'
+							'You back out of the doorway. "Okay... Okay, I''m going."'
+							act 'Leave': gt 'anushapt', 'hallway'
+						end
+						act 'Deal': gt 'anushaptbr', 'race_maksim_result'
+						if pcs_inhib > 30: act 'Deal (Go easy on Maksim)': gt 'anushaptbr', 'race_maksim_result', 1
+					end	
+				end
 			end
 		else
 			'You open the door and look into the brothers'' room. You see Maksim and Timofey are here, doing whatever it is that boys do. Maksim stares at your breasts for a few seconds before telling you to get lost.'
@@ -338,122 +365,291 @@ if $ARGS[0] = 'rematch':
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-	if rand(1,2) = 1:
+	if maksimQW['nush_games'] = 1:
 		'The two of you enter her brothers'' room and they immediately stop doing whatever they were doing. Maksim gathers some courage. "What do you want?" He notices you and starts staring at your breasts. "I see you brought your groupie with you again."'
 		'"I just wanted to see if you were up for a rematch?" Anushka replies, pointing to the gaming console in their room.'
 		'Maksim glances at his brother for a moment, then back at Anushka. "Okay, fine."'
 		*nl
-		'Both of them get excited. "Your friend better be great. We''ve been practicing really hard and we''ll definitely beat you this time!"'
-		'Anushka quickly questions him while smiling. "You really think you can beat me this time?"'
-		'The boys nod at each other. "We''re sure!"'
-		act 'Sit down and play':
-			*clr & cla
-			minut += 15
-			gs 'exp_gain', 'gaming', rand(1, 3)
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-			'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
-			'"Let''s play!" Timofey says smiling.'
-			'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
-			act 'Finish':
+		if maksimQW['nush_games_win'] = 1:
+			'Both of them get excited. "Even when you tried to cheat we won easily, we will again too!"'
+			'Anushka quickly questions him while smiling. "You really think you can beat us this time? Keep in mind it was <<$npc_nickname>> first time playing that game, you know how it takes time to learn a game."'
+			'Timofey looks concerned while Maksim looks confident. "Pfft, girls suck at video games."'
+			'Anushka grins a bit and continues in a teasing tone of voice. "Then we do I... a GIIIIRRRLLLL always beat you when it''s just us playing uh?"'
+			*nl
+			'Maksim looks mad and turns on her. "Cause you always cheat!"'
+			'Timofey is starting to look upset as his brother and sister start to fight so you speak up. "How about we just play then uh?"'
+			'Anushka nods to that. "Yeah let''s just play and see what happens."'
+			'Maksim still looks angry but nods. "Fine!"'
+		elseif maksimQW['nush_games_win'] = 2:
+			'Both of them get excited. "If you don''t cheat again, we''ll definitely beat you this time!"'
+			'Anushka quickly questions him with a teasing smiling. "If you are half as good as you think then it wouldn''t have mattered."'
+			'Maksim responds. "Shut up!"'
+			'Then Timofey chimes in, obviously not liking it when his brother and sister fight. "Can we play now?"'
+			'Anushka''s face instantly softens. "Yeah sure we can."'
+		else
+			'Both of them get excited. "Your friend better be great. We''ve been practicing really hard and we''ll definitely beat you this time!"'
+			'Anushka quickly questions him while smiling. "You really think you can beat us this time?"'
+			'The boys nod at each other. "We''re sure!"'
+			act 'Sit down and play':
 				*clr & cla
+				maksimQW['nush_games'] = 2
 				minut += 15
+				gs 'exp_gain', 'gaming', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-				if pcs_gaming <= 20:
-					'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
-					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
-					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-				elseif pcs_gaming <= 40:
-					'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
-					'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
-					'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
-					*nl
-					'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
-					'Anushka just laughs. "Well whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
-					'"SHUT UP!" Maksim yells in response.'
-					'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
-					'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
-					*nl
-					'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
-					'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
-				else
-					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-					'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-					'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
-					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again," she says in a teasing tone, then sticks her tongue out at him.'
-					'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
-					*nl
-					'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
-					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-					'He pushes her towards the door. "Good, then don''t... Get out!"'
-					'Anushka sounds exasperated. "Fine then, you little brat!"'
-					*nl
-					'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-					'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
-					'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
-					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-				end
-				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom','anushroom'
-			end	
+				'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
+				'"Let''s play!" Timofey says smiling.'
+				'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
+				act 'Finish':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+					if pcs_gaming <= 20:
+						maksimQW['nush_games_win'] = 1
+						'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
+						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
+						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+					elseif pcs_gaming <= 40:
+						maksimQW['nush_games_win'] = 2
+						minut += 15
+						'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
+						'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
+						'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
+						*nl
+						'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
+						'Anushka just laughs. "Well, whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
+						'"SHUT UP!" Maksim yells in response.'
+						'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
+						'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
+						*nl
+						'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
+						'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
+					else
+						maksimQW['nush_games_win'] = 3
+						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+						'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+						'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
+						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again!" she says in a teasing tone, then sticks her tongue out at him.'
+						'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
+						*nl
+						'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
+						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+						'He pushes her towards the door. "Good, then don''t... Get out!"'
+						'Anushka sounds exasperated. "Fine, I won''t, you little brat!"'
+						*nl
+						'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+						'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
+						'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
+						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+					end
+					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				end	
+			end
 		end
-	else
+	elseif maksimQW['nush_games'] = 2:
+		'The two of you walk down the hall and enter her brothers'' room. As you do you hear moaning sounds, you have heard enough porn to recognize that sound. Maksim looks up with huge wide eyes like he was caught in the middle of something. He slams a small laptop closed and the sounds stop as he turns bright red, you notice Timofey is nowhere to be found. Anushka just stops a moment, she obviously knows the sounds as well as she says. "Just what was you doing you little pervert?"'
+		*nl
+		'He looks scared, angry and embarrassed all at once. "Nothing! Go away!" He says as he tries to hide the laptop, only making it more obvious. Anushka suddenly rushes across the room and jumps on his bed with him and starts trying to wrestle the laptop away from him. He puts up a decent fight but he still hasn''t hit his growth spurt yet and she manages to get it away from him. With one hand she holds him at bay, while she opens the laptop with the other. Within a moment the sounds start up again, you walk over to see and within moments it changes from movie to movie. A compilation of girls getting cum facials or cum shot into their mouths, only to then stick out their tongues showing the cum before swallowing it.'
+		*nl
+		'Anushka laughs when she looks at him. "Oh my god you little pervert, you better not be showing Timo this smut."'
+		'Maksim lunges and grabs the laptop back, Anushka lets him take it back as he closes it again. He is obviously embarrassed to be caught by his sister, looking at porn. "Shut up, you do that all the time, with every guy around."'
+		'All the humor leaves Anushka''s face. "Shut up you little bastard. I do not!"'
+		'Now he looks a little smug like he feels he is controlling things. "That''s not what mom says."'
+		'You think you almost hear Anushka growl at the mention of their mom. "Don''t listen to that cunt, she is just a stupid jealous cunt, who''s time is past and now she lashes out at everyone."'
+		*nl
+		'Now he looks more confident the more upset she gets. "Mom didn''t make you into a slut! You are just a slut, like most girls." The last bit he says while looking at you.'
+		'For a moment she pulls back her hand like she might slap him but then drops her hand, for a moment he looked scared when it looked like she might. "Stop listening to her, she lies all the time." She says in a more reasonable voice, obviously trying to calm down.'
+		'He regains his smug look when he is sure she isn''t going to smack him. "Yeah sure, I see all the boys leaving your room all the time, we can hear you through the wall, while they pound you stupid, stupider than you already are, you dumb slut."'
+		*nl
+		'Anushka''s anger flares back up but she just takes a deep breath and looks at Maksim and shakes her head. "No use trying to talk to you, but you better not be showing Timo that stuff or telling him this crap, or I will kick your ass next time." Maksim wisely clams up, seems even he knows he has pushed his sister as far as he safely can. Then she gets up and leads you out of the room. "God I fucking hate that cunt!" Obviously talking about her mother, as you go back to her room.'
+		act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+	elseif maksimQW['nush_games'] = 3:
 		'The two of you walk down the hall and enter her brothers'' room. They immediately stop doing what they were doing and Maksim visibly gathers up his courage. "What is it? What do you want?" He notices you and starts staring at your breasts. "I see you brought your groupie along again."'
-		'"Calm down. I just wanted to see if you were up for a rematch?" Anushka replies, pointing to the gaming console in their room.'
-		'Both of them get excited. "Yeah, and this time we will beat you!"'
-		'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
-		'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
-		'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
-		'Maksim looks mad. "Just shut up and play!"' 
-		'Anushka just laughs again and mimics what he said in a mutter that taunts him.'
+		'"Calm down. I just wanted to see if you guys wanted to play some more?" Anushka replies, pointing to the gaming console in their room.'
+		if maksimQW['nush_games_win'] = 1:
+			'Both of them get excited. "Even when you tried to cheat we won easily, we will again too!"'
+			'Anushka quickly questions him while smiling. "Fine, I admit you have won, twice. But keep in mind it was <<$npc_nickname>> second time playing that game, you know how it takes time to learn a game."'
+			'Timofey looks concerned while Maksim looks confident. "Pfft, girls suck at video games."'
+			'Anushka grins a bit and continues in a teasing tone of voice. "Then why do I... a GGGIIIRRRLLL always beat you when it''s just us playing uh?"'
+			*nl
+			'Maksim looks mad and turns on her. "Cause you always cheat!"'
+			'Timofey is starting to look upset as his brother and sister start to fight so you speak up. "How about we just play then uh?"'
+			'Anushka nods to that. "Yeah let''s just play and see what happens."'
+			'Maksim still looks angry but nods. "Fine!"'
+		elseif maksimQW['nush_games_win'] = 2:
+			'Both of them get excited. "If you don''t cheat again, we''ll definitely beat you this time!"'
+			'Anushka quickly questions him with a teasing smile. "If you are half as good as you think then it wouldn''t have mattered."'
+			'Maksim responds. "Shut up!"'
+			'Then Timofey chimes in, obviously not liking it when his brother and sister fight. "Can we play now?"'
+			'Anushka''s face instantly softens. "Yeah sure we can."'
+		else
+			'Both of them get excited. "Yeah, and this time we will beat you!"'
+			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
+			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
+			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
+			'Maksim looks mad. "Just shut up and play!"' 
+			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
+			act 'Play':
+				*clr & cla
+				gs 'exp_gain', 'gaming', rand(1,3)
+				minut += 15
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+				'"Come on guys, let''s just have fun!" you tell them.'
+				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+				'"Let''s play!" Timofey says smiling.'
+				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+				act 'Finish':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+					if pcs_gaming <= 20:
+						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back-to-back matches. Both brothers jump up and do some weird little victory dance. "Haha, go suck a dick that''s all your good at!" Maksim taunts as he looks directly at Anushka.'
+						'Anushka reaches out and grabs him by the shirt. "Shut your fucking mouth, I am so sick of your fucking shit." She looks visibly angry this time.'
+						'Maksim actually goes a little white, like he is actually afraid of her, while Timofey jumps up and grabs Anushka''s arm. "Stop... stop fighting, he didn''t mean it."'
+						*nl
+						'Anushka turns to look at Timofey and you see the anger melt away from her as she lets go of Marksim. "Ok for you." Then she kisses him on the top of his head much to his dismay, unable to get away from her until she finishes.'
+						'"EEEWWW stop it!" Timofey whines while Maksim laughs at him. Then he gives Maksim a dirty look while he is laughing. "Why do you both have to always be so mean."'
+						'Anushka rolls her eyes. "I wasn''t being mean."'
+						'Maksim decides to taunt his brother more. "Now you got all her sex cooties from all the guys she lets fuck her."'
+						*nl
+						'Timofey looks more distressed and then leaves the room. Anushka gives Maksim a dirty look. "Why do you always have to be such an asshole."'
+						'"Fuck you, get out!" Maksim says as Anushka just shakes her head in obvious disgust at her brother and then leaves the room.'
+						'You follow her, she catches up to Timofey as he is going into the bathroom. "Hey I don''t have cooties, stop listening to him."'
+						'He looks at her like she is stupid. "All girls have cooties, I need to wash them off." Then he goes into the bathroom closing the door.'
+						'Anushka just shakes her head and laughs. "God boys are so stupid, in a few years he will be chasing girls." Then the two of you go back to her room.'
+					elseif pcs_gaming <= 40:
+						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "Why are you so bad, if you didn''t suck so much we would have won."'
+						'Timofey shakes his head. "No, you suck and you''re why we lost. You always have to try and be the hero and try and win on your own, instead of sticking with me."'
+						'"I leave you because you suck and slow me down!" Maksim yells.'
+						'Before you can even react, Anushka tells him. "You want dad to come back in here?"'
+						'Maksim pushes Anushka. "Get out of my room. Get out!"'
+						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here."' 
+						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+					else
+						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+						*nl
+						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+					end
+					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				end
+			end
+		end
+	elseif maksimQW['nush_games'] = 4:
+		'The two of you walk down the hall and enter her brothers'' room. As you do you only see Timofey on his bed reading a comic, he looks up at the two of you but doesn''t say anything. "Where''s your brother?" Anushka asks.'
+		'Timofey shrugs. "I don''t know, he ran off outside with his friends, they wouldn''t let me play with them." He says sadly.'
+		'You see Anushka''s expression softens along with her voice. "How about we play instead huh? What do you say?"'
+		'He perks up to that and closes the comic. "Really?" He now sounds excited and happy.'
+		'She nods. "Yep any game you want, as long as all three of us can play."'
+		'He jumps up and starts setting up the game. He ends up picking Crash Team Racing, a kids racing game similar to Mario Kart. Anushka looks at you as he gets it all set up. "Come on." The two of you sit on Maksim bed while Timofey hands you both a controler before sitting on his.'
+		'As you start playing it is obvious Timofey is pretty good at this game, likely his favorite game as he seems to know all just what to do.'
 		act 'Play':
 			*clr & cla
 			gs 'exp_gain', 'gaming', rand(1,3)
 			minut += 15
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-			'"Come on guys, let''s just have fun!" you tell them.'
-			'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
-			'"Let''s play!" Timofey says smiling.'
-			'The four of you play for several minutes. You''ve gotten a lot better since the last time you played. You learned a lot and are able to help out more than you did before.'
-			act 'Finish':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/timo_play.jpg"></center>'
+			if pcs_gaming <= 20:
+				'They are both way better at the game than you are, you are pretty sure Anushka is better than Timofey because each time he messes up. She suddenly messes up to and seems unable to get going again until he passes her. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
+				'He smiles again and nods. "Ok but I won''t take it easy on you."'
+				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
+			elseif pcs_gaming <= 40:
+				'You are about as good as Timofey, you think Anushka is better than you both though. You notice each time he makes a mistake and you get in the lead she gets by him too suddenly, not long after she always manages to crash into you, letting Timofey get back ahead of both of you. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
+				'He smiles again and nods. "Ok but I won''t take it easy on you."'
+				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
+			else
+				'You are better than Timofey and maybe better than Anushka, each time she gets close to you, she always crashes into you. Which allows Timofey to get ahead again of both of you. You quickly realize she is keeping it close but letting him win on purpose, so you then join in and keep it close, but always let him get ahead before the end to win. He doesn''t seem to notice that you and Anushka are letting him win, as he is so into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
+				'He smiles again and nods. "Ok but I won''t take it easy on you."'
+				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
+			end
+			act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+		end
+	else
+		'The two of you walk down the hall and enter her brothers'' room. They immediately stop doing what they were doing and Maksim visibly gathers up his courage. "What is it? What do you want?" He notices you and starts staring at your breasts.'
+		'"Calm down. I just wanted to see if you guys wanted to play some more?" Anushka replies, pointing to the gaming console in their room.'
+		if maksimQW['nush_games_win'] = 1:
+			'Both of them get excited. "Even when you tried to cheat we won easily, we will again too!"'
+			'Anushka quickly questions him while smiling. "Fine I admit you have won, a few times finally. But keep in mind <<$npc_nickname>> doesn''t own the game so she can''t practice like you two do all the time and you know how it takes time to learn a game."'
+			'Maksim sneers. "Like like excuses from a couple of pussies."'
+			'Anushka rolls her eyes and continues in a teasing tone of voice. "Like you know what a pussy is, now you want to play or not?"'
+			*nl
+			'Maksim looks mad and turns on her. "I do too!"'
+			'Timofey is starting to look upset as his brother and sister start to fight so you speak up. "Can we just play?"'
+			'Anushka nods to that. "Yeah let''s just play and see what happens."'
+			'Maksim still looks angry but nods. "Fine!"'
+		elseif maksimQW['nush_games_win'] = 2:
+			'Both of them get excited. "If you don''t cheat again, we''ll definitely beat you this time!"'
+			'Anushka quickly questions him with a teasing smile. "Like you don''t do the same thing all the time."'
+			'Maksim responds. "Shut up!"'
+			'Then Timofey chimes in, obviously not liking it when his brother and sister fight. "Can we play now?"'
+			'Anushka''s face instantly softens. "Yeah sure we can."'
+		else
+			'Both of them get excited. "Yeah, and this time we will beat you!"'
+			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
+			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
+			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
+			'Maksim looks mad. "Just shut up and play!"' 
+			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
+			act 'Play':
 				*clr & cla
+				gs 'exp_gain', 'gaming', rand(1,3)
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-				if pcs_gaming <= 20:
-					'It''s not enough however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
-					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
-					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-				elseif pcs_gaming <= 40:
-					'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
-					'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
-					'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
-					'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
-					'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."' 
-					'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
-				else
-					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-					'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-					'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
-					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone, then sticks her tongue out at him.'
-					'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
-					*nl
-					'"Get out... Get out of our room!" he says as he tries to shove her off the bed.'
-					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-					'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
-					'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-					'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
-					'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
-					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+				'"Come on guys, let''s just have fun!" you tell them.'
+				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+				'"Let''s play!" Timofey says smiling.'
+				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+				act 'Finish':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
+					if pcs_gaming <= 20:
+						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, see told you girls suck at video games!" Maksim taunts.'
+						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
+						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+					elseif pcs_gaming <= 40:
+						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
+						'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
+						'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
+						'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
+						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."' 
+						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+					else
+						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+						*nl
+						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+					end
+					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 				end
-				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom','anushroom'
 			end
 		end
 	end

locations/anushkachat_city.qsrc

@@ -280,7 +280,6 @@ if $ARGS[0] = 'chat':
 			minut += 5
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
-!!need code that checks if Sveta is at the Uni, living in the city or still living in pav.
 			if $home['current'] = 'university_dorm':
 				'"I''m not sure, but I guess I have a few options," you tell her.'
 				'She nods. "Well, you should decide before you get stuck in this crappy little town married to some asshole whose kids you''re popping out every few years. Not judging you, unless that''s what you want. I''m just saying..."'
@@ -364,7 +363,7 @@ if $ARGS[0] = 'chat':
 			if model['status'] = 1:
 				'Knowing she''s a model, you decide to ask her about it. "I was in the city killing time between photo shoots and saw your photo album at Aphrodite... I didn''t know you modeled as well."'
 				'She nods. "Yeah it pays pretty well, so you model too?" You nod yes and soon the two of you are talking about the varies modeling gigs you have done and you have discovered you both work for the same modeling agency.'
-				act 'Do something else':gt 'anush_bedroom','anushroom'
+				act 'Do something else':gt 'anush_bedroom_city','anushroom'
 			else
 				anushkaQW['model_referral'] = 1
 				'Knowing she''s a model, you decide to ask her about it. "I was in the city and saw your photo album at Aphrodite..."'
@@ -373,8 +372,8 @@ if $ARGS[0] = 'chat':
 				'She nods. "Sort of... I mean, if you''re willing to do nude modeling, you can make a lot of money in a short amount of time. Are you interested?" she asks while arching a shapely eyebrow.'
 				'"Nude?" you silently ask yourself. Still, if it pays that much then it might be worth considering. "I don''t know... Maybe... How would I get started? Do I just walk in and tell them I want to be a model or something?"'
 				'She grins at you. "Yeah, pretty much. It helps if you have a portfolio already, but just tell them I sent you. Oh, and make sure you have ID showing you''re old enough."'
-				act 'Stop talking': gt 'anush_bedroom','anushroom'
-				act 'Keep talking': gt 'anushkachat', 'chat'
+				act 'Stop talking': gt 'anush_bedroom_city','anushroom'
+				act 'Keep talking': gt 'anushkachat_city', 'chat'
 				if fakepassport ! 1:
 					act 'Underaged?':
 						*clr & cla
@@ -383,8 +382,8 @@ if $ARGS[0] = 'chat':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 						'A thought then occurs to you. You''re underaged, and so is Anushka. It''s not legal to model in the nude when you''re under 18. "Wait a second, how did you get past the age check?"'
 						'She laughs. "Sometimes I forget that not everyone has a fake passport. It''s pretty easy to pick one up though." She tells you about a printing shop in the Red Light District that sells fake passports. "Once you have one, you won''t have any problems signing up as a model."'
-						act 'Stop talking': gt 'anush_bedroom','anushroom'
-						act 'Keep talking': gt 'anushkachat', 'chat'
+						act 'Stop talking': gt 'anush_bedroom_city','anushroom'
+						act 'Keep talking': gt 'anushkachat_city', 'chat'
 					end
 				end
 			end
@@ -571,8 +570,8 @@ if $ARGS[0] = 'chat':
 			'She laughs. "It was hot, I loved it, I like it when guys get all forceful and him being a neeerd." She copies your mocking tone for nerd but is grinning. "Just made it extra hot, so yeah I am up for another go. At least for now."'
 			'You arch a brow. "For now?" You ask her.'
 			'She shrugs a bit. "Yeah it''s fun but I think the novelty will wear off eventually... but maybe I should start looking at other nerds, instead of just focusing on bad boys and jocks all the time." You both laugh at that and talking about some of the nerd boys and what you think of them.'
-			act 'Stop talking': gt 'anush_bedroom','anushroom'
-			act 'Keep talking': gt 'anushkachat', 'chat'
+			act 'Stop talking': gt 'anush_bedroom_city','anushroom'
+			act 'Keep talking': gt 'anushkachat_city', 'chat'
 		end
 	end
 end
@@ -630,7 +629,7 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Niko':
 			cla
 			'"Niko," you tell her.'
-			'She looks at you, concerned. "<<$pcs_nickname>>, he''s bad news and I don''t mean in the ''fun bad boy'' sort of way. I mean he isn''t what he seems." Noticing your facial expression from bad mouthing your boyfriend, she holds up her hand. "Hey, it''s your life so do what you want. Just... just be careful with him.'
+			'She looks at you, concerned. "<<$pcs_nickname>>, he''s bad news and I don''t mean in the ''fun bad boy'' sort of way. I mean he isn''t what he seems." Noticing your facial expression from bad mouthing your boyfriend, she holds up her hand. "Hey, it''s your life so do what you want. Just... just be careful with him."'
 			act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 			act 'Keep talking': gt 'anushkachat_city', 'chat'
 		end

locations/anushkaev1.qsrc

@@ -1,13 +1,6 @@
 # anushkaev1
 !2021/05/06
 
-! First see if the return location var is set, adjust it so we can concatenate them.
-if $ARGS[1] = 'city':
-	$returnLoc = '_city'
-else
-	$returnLoc = ''
-end
-
 if $ARGS[0] = 'strapon1':
 	*clr & cla
 	menu_off = 1

locations/anushkaev2.qsrc

@@ -156,6 +156,7 @@ if $ARGS[0] = 'rad3some':
 	AnushkaLoc = 2
 	gs 'stat'
 	if hotcat >= 6:
+		radomirQW['had_sex'] += 1
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A154'] = 0:npc_sex['A154'] = 1 & boy += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin1.jpg"></center>'
@@ -454,7 +455,7 @@ if $ARGS[0] = 'watch_nushval':
 			act 'Walk in and join them': gt 'anushkaev2', 'val3some'
 			act 'Keep watching':
 				*clr & cla
-				if rand(1,5) = 1 and maksim_blackmail ! 1:
+				if rand(1,5) = 1 and maksimQW['blackmail'] ! 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/caughtspying.jpg"></center>'
 					'As you''re watching, you''re so caught up in the action that you don''t notice your hand slide down to your crotch, nor hear the footsteps heading your way.'
 					'"What are you doing?" You nearly jump out of your skin and blush when you look back and see Maksim, cursing to yourself for being so foolish as to let yourself be caught spying.'
@@ -815,7 +816,7 @@ if $ARGS[0] = 'watch_nushmar':
 			act 'Leave apartment': gt 'pav_complex','start'
 			act 'Keep watching':
 				*clr & cla
-				if rand(1,5) = 1 and maksim_blackmail ! 1:
+				if rand(1,5) = 1 and maksimQW['blackmail'] ! 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/caughtspying.jpg"></center>'
 					'As you''re watching, you''re so caught up in the action that you don''t notice your hand slide down to your crotch, nor hear the footsteps heading your way.'
 					'"What are you doing?" You nearly jump out of your skin and blush when you look back and see Maksim, cursing to yourself for being so foolish as to let yourself be caught spying.'

locations/anushkamaksim.qsrc

@@ -1,5 +1,5 @@
 # anushkamaksim
-!2021/03/26
+!2024/04/03
 if $ARGS[0] = 'maksim_blackmail':
 	*clr & cla
 	menu_off = 1
@@ -10,7 +10,8 @@ if $ARGS[0] = 'maksim_blackmail':
 	'He grins at you and looks you over as if he''s giving it some serious thought. "For now, just show me your tits."'
 	act 'Show him your tits':
 		*clr & cla
-		maksim_blackmail = 1
+		maksimQW['blackmail'] += 1
+		maksimQW['blackmail_flash'] += 1
 		gs 'fame', 'pav', 'sex', 1
 		inhib_exp += rand(1,3)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hallflashtits.jpg"></center>'
@@ -20,18 +21,17 @@ if $ARGS[0] = 'maksim_blackmail':
 		gs 'arousal', 'flashlite', 5, 'humiliation', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
-
 		act 'Follow him':
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/maksim/downstairs.jpg"></center>'
 			'You follow him as he leads you down the stairs and outside to the playground. Once there, he walks over to a few boys around his age and stops. The boys check you out. "Who''s that?" one of them asks.'
-			'He has his back to your as he responds. You can only imagine the smug look on his face. "She does things for me."'
+			'He has his back to you as he responds. You can only imagine the smug look on his face. "She does things for me."'
 			'One of the boys snorts a laugh. "Sure she does."'
 			'He turns towards you. "Go buy me a pack of smokes."'
 			'"What?!"'
-			'"I said go buy me a pack of cigarettes." He gives you a stern look, but it just shows how young he is and isn''t not intimidating at all.'
-			'You sigh. This is only going to get worse. You''ll have to figure a way out of this, but for now you can only play along. You turn and start walking to the nearby kiosk.'
+			'"I said go buy me a pack of cigarettes." He gives you a stern look, but it just shows how young he is and is not intimidating at all.'
+			'You sigh. This is only going to get worse. You''ll have to figure a way out of this, but for now, you can only play along. You turn and start walking to the nearby kiosk.'
 			'As you walk away, you hear the boys talking, surprised that you''re doing what Maksim says as he acts smug.'
 			if money >= 150:
 				act 'Buy him cigarettes':
@@ -49,7 +49,7 @@ if $ARGS[0] = 'maksim_blackmail':
 						'They all start muttering, seemingly surprised you actually did it.'
 						*nl
 						'Maksim takes the pack of cigarettes and passes them out to his friends. They all light up and a few of them cough, but it seems most of them have smoked before. After a few minutes, you''re about to leave when one of them starts talking to Maksim. "Having her buy you cigarettes is one thing..." You see the rest all nodding in agreement.'
-						'Maksim smirks at them. "Oh I see how it is. You have no faith in me! Okay then, let me prove it." He turns towards you. "Show me your tits."'
+						'Maksim smirks at them. "Oh, I see how it is. You have no faith in me! Okay then, let me prove it." He turns towards you. "Show me your tits."'
 						'You give him a look of surprise and don''t move, but his stern glare tells you what will happen if you don''t.'
 
 						act 'Flash them your tits':
@@ -57,6 +57,7 @@ if $ARGS[0] = 'maksim_blackmail':
 							minut += 5
 							gs 'fame', 'pav', 'sex', 2
 							inhib_exp += rand(1,3)
+							maksimQW['blackmail_flash_friends'] += 1
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/maksim/flashtits1.jpg"></center>'
 							'You sigh as you pull aside your clothes and flash your breasts at them.'
 							'"Holy shit! She really did it!" They all look surprised, but Maksim just looks smug.'
@@ -66,7 +67,7 @@ if $ARGS[0] = 'maksim_blackmail':
 							'"I''m still breaking her in and it will be when I say." He gives his friends a look to show that he''s in charge here. "Now pay up!"'
 							'The boys start handing over money, way more than the cigarettes would cost. He must have bet them that you would show your breasts. You sigh again and can''t believe you''re more or less being pimped out by a young boy. They all stare at your breasts for a few more minutes before Maksim looks at you. "Okay, you can go. We''ll talk later." He tries to make it sound like he''s in charge and sexy at the same time. He failed, but his friends seem to have bought it.' 
 							'You can''t help but roll your eyes as you rearrange your clothes back in place and walk away.'
-							act 'Leave': gt 'pav_complex','start'
+							act 'Leave': gt 'pav_complex', 'start'
 						end
 					end
 				end
@@ -87,10 +88,11 @@ if $ARGS[0] = 'maksim_blackmail':
 						'They all start muttering, seemingly surprised you actually did it.'
 						*nl
 						'Maksim takes the pack of cigarettes and passes them out to his friends. They all light up and a few of them cough, but it seems most of them have smoked before. After a few minutes, you''re about to leave when one of them starts talking to Maksim. "Having her buy you cigarettes is one thing..." You see the rest all nodding in agreement.'
-						'Maksim smirks at them. "Oh I see how it is. You have no faith in me! Okay then, let me prove it." He turns towards you. "Show me your tits."'
+						'Maksim smirks at them. "Oh, I see how it is. You have no faith in me! Okay then, let me prove it." He turns towards you. "Show me your tits."'
 						'You give him a look of surprise and don''t move, but his stern glare tells you what will happen if you don''t.'
 
 						act 'Flash them your tits':
+							maksimQW['blackmail_flash_friends'] += 1
 							*clr & cla
 							minut += 5
 							gs 'fame', 'pav', 'sex', 2
@@ -104,7 +106,7 @@ if $ARGS[0] = 'maksim_blackmail':
 							'"I''m still breaking her in and it will be when I say." He gives his friends a look to show that he''s in charge here. "Now pay up!"'
 							'The boys start handing over money, way more than the cigarettes would cost. He must have bet them that you would show your breasts. You sigh again and can''t believe you''re more or less being pimped out by a young boy. They all stare at your breasts for a few more minutes before Maksim looks at you. "Okay, you can go. We''ll talk later." He tries to make it sound like he''s in charge and sexy at the same time. He failed, but his friends seem to have bought it.' 
 							'You can''t help but roll your eyes as you rearrange your clothes back in place and walk away.'
-							act 'Leave': gt 'pav_complex','start'
+							act 'Leave': gt 'pav_complex', 'start'
 						end
 					end
 				end
@@ -121,16 +123,72 @@ if $ARGS[0] = 'maksim_blackmail':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 			'"Fuck off, you little shit!" you snarl and he blinks in surprise, eliciting a smirk from you. He obviously expected you to agree without question.'
 			'Anger washes over him. "Fine bitch! I''ll just go and show her!"'
-			'You smirk at him. "Go right head, I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
+			'You smirk at him. "Go right ahead, I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 			'He sneers at you and pauses before angrily walking away.'
 
-			act 'Leave': gt 'pav_complex','start'
+			act 'Leave': gt 'pav_complex', 'start'
 		end
 	else
 		act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
+if $ARGS[0] = 'hallway_flash_tits':
+	*clr & cla
+	menu_off = 1
+	AnushkaLoc = 2
+	maksimQW['blackmail_flash'] += 1
+	gs 'fame', 'pav', 'sex', 1
+	inhib_exp += rand(1,3)
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hallflashtits.jpg"></center>'
+	'You sigh as you pull your clothes aside and show him your bare breasts. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+	'You quickly pull your shirt back down. "You said show you."'
+	'"Fine," he sneers before stepping out of your way. "Go on then."'
+	gs 'arousal', 'flashlite', 1, 'humiliation', 'sub'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Enter': gt 'anushapt', 'hallway'
+end
+
+if $ARGS[0] = 'hallway_flash_pussy':
+	*clr & cla
+	menu_off = 1
+	AnushkaLoc = 2
+	maksimQW['blackmail_flash'] += 1
+	gs 'fame', 'pav', 'sex', 1
+	inhib_exp += rand(1,3)
+	if PCLoSkirt > 0:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_dress.jpg"></center>'
+		'You sigh as you lift your skirt to show him your naked pussy. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You quickly pull your skirt back down. "You said show you."'
+		'"Fine," he sneers before stepping out of your way. "Go on then."'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_pants.jpg"></center>'
+		'You sigh as you pull your pants down to show off your naked pussy to him. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You quickly pull your pants back up. "You said show you."'
+		'"Fine," he sneers before stepping out of your way. "Go on then."'
+	end
+	gs 'arousal', 'flashlite', 1, 'humiliation', 'sub'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Enter': gt 'anushapt', 'hallway'
+end
 
+if $ARGS[0] = 'maksim_room_naked':
+	*clr & cla
+	menu_off = 1
+	AnushkaLoc = 2
+	maksimQW['blackmail_flash'] += 1
+	gs 'fame', 'pav', 'sex', 1
+	inhib_exp += rand(1,3)
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/strip_naked.jpg"></center>'
+	'You follow him to his room and just as he said Timofey is not there. Maksim sits on his bed looking at you with a huge grin. "Well go on, strip. Slow and sexy."' 
+	'You sigh loudly but then do as he says. You slowly start stripping out of your clothes, while he leers at you. Once you are finally naked, you stand there for a minute or two. "Ok you seen enough."'
+	'"Fine," he sneers. "You can go then." You quickly get dressed and once you are you leave his room.'
+	gs 'arousal', 'flash', 5, 'humiliation', 'sub'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Go back to the hall': gt 'anushapt', 'hallway'
+end
 
 --- anushkamaksim ---------------------------------

locations/arousal.qsrc

@@ -1056,8 +1056,8 @@ end
 !!-----------------------------------------------
 
 !!workaround over use
-if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
-	if arousal_overcall = 0:
+if arousal_overcall = 0:
+	if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
 		$arousal_overcall = $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]
 		arousal_overcall = 1
 	end

locations/artem_chebotarev_schedule.qsrc

@@ -2,7 +2,7 @@
 !!2023/05/02
 
 
-$locat['A2'] = 0
+$locat['A2'] = ''
 
 if yearstart = 1:
 	!! Schedule for school year not yet done

locations/artem_dorm.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 	gs 'artem_chebotarev_schedule'
 	gs 'stat'
 	'<center><b><font color="maroon">Artem''s Dorm Room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/artemroom/artem_dorm_room.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/artemroom/artem_dorm_room.jpg"></center>'
 	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.' 
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		'Above his bed is a small <a href="exec:gt ''artem_dorm'',''bookshelf''">bookshelf</a> full of books, and the wall is plastered with sci-fi, fantasy, anime and super hero posters. At the foot of his bed is a small desk with a <a href="exec:gt ''artem_dorm'',''computer''">laptop</a> on it. Artem is sitting on a couch facing a TV sitting against the wall.'
@@ -68,7 +68,7 @@ if $ARGS[0] = 'bookshelf':
 	*clr & cla
 	minut += 2
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 	'The small bookshelf has a lot of fantasy and science fiction books, a few gaming books and a lot of various nerdy nicknacks from popular fantasy, anime, and science fiction movies and TV shows. Maybe he wouldn''t mind if you borrowed a book?'
 	if artem_borrowed_book ! 1:
 		act 'Ask to borrow a book':
@@ -79,7 +79,7 @@ if $ARGS[0] = 'bookshelf':
 			artembook = 5
 !!need code to add a book for Sveta to read other than the ones she can buy.			
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this to read?"'
 			'He looks a little surprised as he walks over. "Oh sure yeah, you can borrow it," he answers a little excitedly.'
 			'You take the book and put it in your purse. "Thanks. I''ll get it back to you as soon as I finish it."'
@@ -94,7 +94,7 @@ if $ARGS[0] = 'bookshelf':
 			artem_borrowed_book = 0
 			artembook = 0
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
 			'"Did you like it?" he asks.'
 			act 'I did':
@@ -129,7 +129,7 @@ if $ARGS[0] = 'computer':
 		ArtemCompUse = 1
 		*clr & cla
 		'<center><h4><font color="maroon">Artem''s Dorm Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/start/laptop.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/laptop.jpg"></center>'
 		'You point towards his laptop. "You''re so lucky to have your own computer."'
 		'"I saved up my allowance for years before I could afford it," he replies.'
 		'"Mind if I use it? I want to check my emails and stuff," you ask.'

locations/artem_nush_sex.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'anushka_3some1':
 		*nl
 		'She''s speechless; the shock of just how different he''s acting seems to be too much for her to process. When she doesn''t reply, he confidently walks over, leans forward and runs his hand up her skirt. You see her stiffen and gasp slightly when his hand disappears up her skirt. "Just what I suspected," he grins. "You''re soaking wet already." When he pulls his hand out of her skirt, he pulls her panties off and tosses them aside. Even you''re a little surprised by how dominant he''s being, but you figure this is good for him.'
 		'You watch as he grabs her skirt and unbuttons it before yanking it off. He then pulls off her shirt and then her bra. She never once complains or acts like she''s not into it. In fact, she mostly bites her lower lip and occasionally giggles. He then forces her to kneel on the floor, completely exposed and naked in front of him as he starts to unbutton his pants. "Open your mouth," he orders.'
-		act 'Watch': gt 'artem_nush_sex', 'anushka_3some11_dom_bj'
+		act 'Watch': gt 'artem_nush_sex', 'anushka_3some1_dom_bj'
 	elseif artemQW['rough_anal_nush'] = 2:
 		'As he turns around, he nods and gives her a confident smile. "I knew you''d be back. When I''m done with you, you''ll know your ass was completely owned by a nerd. That a nerd made you his bitch and fucked you for his pleasure."'
 		'She looks up at him and bites her lower lip. "I... Almost believe you..."'
@@ -802,7 +802,7 @@ if $ARGS[0] = 'artem_nush_disco_walk':
 	menu_off = 1
 	*clr & cla
 	minut += 10
-	'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 	'Artem leads you down the side streets and into the alleyway that runs behind the apartment courtyard where all the garages are located. You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about your classmates and teachers. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.'
 	'She changes the subject by asking you what you thought of some of the boys at the disco tonight, but is interrupted by a smacking sound as she jumps. "What the fuck, dude?" she asks.'
 	*nl
@@ -811,7 +811,7 @@ if $ARGS[0] = 'artem_nush_disco_walk':
 	'Artem barks a laugh. "Doubtful. I''m a great boyfriend. I''m kind, caring, romantic, good in bed and when my girl needs to be dominated, then I can do that too. What more could she want?"'
 	act 'Just let them banter':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 		'Anushka snorts. "Maybe she wants to try a real bad boy for a change..."'
 		'Artem responds by smacking her on the ass again. "Maybe, but I''m not worried."'
 		'Anushka scowls a little. "What was that for?"'
@@ -828,18 +828,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look, but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			gs 'arousal', 'voyeur_sex', 2
@@ -848,14 +848,14 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
 					'"Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says to her between moans as you make her deepthroat his cock.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
@@ -866,14 +866,14 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab ahold of Anushka''s hair to pull it up out of the way so it is easier to watch her suck Artem''s dick. "Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says with a smirk.' 
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
 					gs 'arousal', 'voyeur_sex', 2, 'dom'
@@ -888,27 +888,27 @@ end
 if $ARGS[0] = 'artem_nush_strip':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip1.jpg"></center>'
 	'You pull her head up and both you and Artem start unbuttoning her jeans. Once you have them off, Artem tosses them aside as Anushka continues jerking him off. He then starts to tug at her panties.'
 	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Watch Artem take off her panties':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip2.jpg"></center>'
 		'Artem roughly pulls her panties off and tosses them down by her jeans before he stands up and starts pulling down his pants and underwear. "Roll the dirty slut over on all fours so I can fuck her."'
 		gs 'arousal', 'voyeur', 1
 		gs 'stat'
 		act 'Help her onto all fours':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal1.jpg"></center>'
 			'You help Anushka get up on all fours so her ass is facing Artem. Once she''s in place, Artem kneels down behind her. "Damn, you''re soaking wet! Look babe, her juices are already running down her thigh!"'
 			'He moves forward and she suddenly moans loudly as he shoves his <<dick>>cm <<$dick_girth>> cock inside her pussy and starts fucking her as you lean in and start kissing her.'
 			gs 'arousal', 'kiss', 2
 			gs 'stat'
 			act 'Spread her ass cheeks':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal2.jpg"></center>'
 				'After you break the kiss with her, you reach back and spread her ass cheeks as wide as you can while looking up at Artem. He grins as he gets the hint.'
 				'"Look at that little asshole, just begging to be used by nerd dick!" he says before he spits on her ass and uses a finger to rub it into her asshole.'
 				gs 'arousal', 'voyeur_sex', 2
@@ -917,7 +917,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -929,7 +929,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					gs 'stat'
 					act 'Keep holding her':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal2.jpg"></center>'
 						'Now that she''s unable to move, Artem shoves his hips forward again, causing her to moan loudly. As he starts really hammering her ass, she starts crying out and shaking as she has a massive orgasm, so much so you have to help hold her up as Artem starts grunting louder himself.'
 						gs 'arousal', 'voyeur_sex', 2
 						gs 'arousal', 'end'
@@ -937,7 +937,7 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_facial.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
 							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
@@ -972,18 +972,18 @@ if $ARGS[0] = 'artem_sveta':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Artem and Anushka take a seat, with Anushka leaving room for you to sit between her and Artem. You sit between them and lean against Artem as the three of you talk a bit more.'
 	'Artem leans back in a half reclining position and you can see his bulge growing in his pants. After a while, Anushka notices as well. "Looks like someone is getting a little worked up, huh?" she asks is a bemused tone.'
 	'Artem smiles at you. "Sorry babe, but I can''t help it. You''re just so beautiful."'
 	act 'Take a peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You unbutton his pants, but it''s too dark to see anything as you hear Anushka''s voice in your ear. It seems she''s leaned over to try and take a look too. "Go on. Pull it out."'
 		act 'Pull his dick out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'You pull his dick out and he looks at you with pleading eyes. "Please suck it, babe."'
 			'You lean forward and take his dick into your mouth and start sucking it while stroking his shaft. "Damn <<$pcs_nickname>>, you''re getting good at that!" Anushka says.'
 			'You''re unable to answer, so Artem replies for you. "She''s the best!"'
@@ -993,14 +993,14 @@ if $ARGS[0] = 'artem_sveta':
 			act 'Deepthroat':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As you''re sucking Artem''s dick, you feel a hand press down on the back of your head and force it down until his dick slides down your throat, causing you to gag. You think it''s Artem at first, but soon realize that it''s Anushka.'
 				gs 'arousal', 'bj', 2, 'deepthroat'
 				gs 'stat'
 				act 'Get your hair grabbed':
 					*clr & cla
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You feel her fingers wrap themselves in your hair as she roughly forces you to deepthroat Artem before he speaks up. "Okay, let her up."'
 					'You can keep sucking his dick until he blows his load, offer up your pussy or give him your ass.'
 					gs 'arousal', 'bj', 2, 'deepthroat', 'rough'
@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'artem_sveta':
 						*clr & cla
 						minut += 5
 						gs 'boyStat', 'A2'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 						'He stands up and you keep sucking his dick until he tells you he''s about to cum. You then pop his dick out of your mouth and jerk him off until he starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 						gs 'cum_call', 'face', 'A2', 1
 						gs 'arousal', 'end'
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal1.jpg"></center>'
 	'You slide his dick out of your mouth and turn to look at him. "I want you to fuck me, right here, right now."'
 	'He just grins and gets up as Anushka helps you get naked from the waist down while he strips out of his pants and underwear. Once you''re both ready, you lay on your back and spread your legs wide before he lays down between your legs and slides his <<dick>>cm <<$dick_girth>> cock into your already wet pussy.'
 	gs 'arousal', 'vaginal', 2
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	act 'Watch Anushka':
 		*clr & cla
 		gs 'boyStat', 'A2'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal2.jpg"></center>'
 		'As Artem fucks you, you glance over and see that Anushka has her hand down her pants, rubbing one out as she watches you get fucked by Artem. You just grin.'
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 		act 'Get fucked some more':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal3.jpg"></center>'
 			'Anushka is soon moaning almost as loud as you are, enough to attract even Artem''s attention. "What a little slut you are, rubbing one off while you watch me fuck your friend," he grins. "Admit it. You wish you were being fucked by some nerd cock right now, don''t you?"'
 			'Anushka bites her lower lip and redoubles her effort as she keeps rubbing one off. "YES! Oh fuck yes, I wish you were fucking me with your big nerd cock right now!"'
 			'Artem looks at you and smiles before looking back at her as he keeps fucking you. "Maybe next time I''ll ask Petka or Feofan to come along and they can fuck you while you watch me fuck <<$pcs_nickname>>. You''d like that, wouldn''t you? I can tell by your expression that the meer thought of some other nerd using you turns you on."'
@@ -1066,14 +1066,14 @@ if $ARGS[0] = 'artem_sveta_vag':
 			act 'Let him finish':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal4.jpg"></center>'
 				'He then starts really pounding your pussy, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 				gs 'arousal', 'vaginal', 2
 				gs 'stat'
 				act 'Artem blows his load':
 					*clr & cla
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 					'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 					gs 'cum_call', 'face', 'A2', 1
 					gs 'arousal', 'end'
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 	'"I want you to fuck my ass," you tell him with a smile.'
 	'He grins. "Get on all fours for me then."'
 	'You get on all fours while Anushka keeps rubbing one out. Artem uses your pussy juices and some spit to lube your asshole up before he gently slides it in. Once his dick is inside you, he starts to slowly fuck your ass.'
@@ -1111,14 +1111,14 @@ if $ARGS[0] = 'artem_sveta_anal':
 	act 'Take an anal pounding':
 		*clr & cla
 		gs 'boyStat', 'A2'		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'
 		gs 'stat'
 		act 'Artem blows his load':
 			*clr & cla
 			minut += 5
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 			'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 			gs 'cum_call', 'face', 'A2', 1
 			gs 'arousal', 'end'

locations/artem_nush_sex_uni.qsrc

@@ -801,7 +801,7 @@ if $ARGS[0] = 'nerd_game_night_walk':
 	menu_off = 1
 	*clr & cla
 	minut += 10
-	'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 	if func('uniutil', 'student', 'enrolled'):
 		'You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about the university, your respective courses and the professors. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.' 
 		'You then walk past the garages out back of the apartment complex Anushka lives in, and she points out which one the band is renting. Artem suddenly stops and takes his jacket off before spreading it wide on the ground. "Hey, why don''t we sit and talk for a bit here?" If you want Anushka to have sex with Artem, then you should sit with her between you and him. If you want to have sex with him, then you should sit between them.'
@@ -817,18 +817,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half-reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			'"This is the best use for that mouth of her''s," he says as you grin at him.'
@@ -838,14 +838,14 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
 					'"God, you''re the best girlfriend a guy could have!" he says between moans as you make Anushka deepthroat his cock.' 
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
@@ -856,14 +856,14 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and pull it up out of the way so it''s easier to watch her suck Artem''s dick.'
 					'"Just look at you submissively and obediently sucking my dick like a good little slut. We''ll make you into a slut for all the nerds before long," he says to her.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this dirty slut in this alley."'
@@ -879,27 +879,27 @@ end
 if $ARGS[0] = 'artem_nush_strip':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip1.jpg"></center>'
 	'You pull her head up and both you and Artem start unbuttoning her jeans. Once you have them off, Artem tosses them aside as Anushka continues jerking him off. He then starts to tug at her panties.'
 	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Watch Artem take off her panties':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip2.jpg"></center>'
 		'Artem roughly pulls her panties off and tosses them down by her jeans before he stands up and starts pulling down his pants and underwear. "Roll the dirty slut over on all fours so I can fuck her."'
 		gs 'arousal', 'voyeur', 1
 		gs 'stat'
 		act 'Help her onto all fours':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal1.jpg"></center>'
 			'You help Anushka get up on all fours so her ass is facing Artem. Once she''s in place, Artem kneels down behind her. "Damn, you''re soaking wet! Look babe, her juices are already running down her thigh!"'
 			'He moves forward and she suddenly moans loudly as he shoves his <<dick>>cm <<$dick_girth>> cock inside her pussy and starts fucking her as you lean in and start kissing her.'
 			gs 'arousal', 'kiss', 2
 			gs 'stat'
 			act 'Spread her ass cheeks':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal2.jpg"></center>'
 				'After you break the kiss with her, you reach back and spread her ass cheeks as wide as you can while looking up at Artem. He grins as he gets the hint.'
 				'"Look at that little asshole, just begging to be used by nerd dick!" he says before he spits on her ass and uses a finger to rub it into her asshole.'
 				gs 'arousal', 'voyeur_sex', 2
@@ -908,7 +908,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -920,7 +920,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					gs 'stat'
 					act 'Keep holding her':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal2.jpg"></center>'
 						'Now that she''s unable to move, Artem shoves his hips forward again, causing her to moan loudly. As he starts really hammering her ass, she starts crying out and shaking as she has a massive orgasm, so much so you have to help hold her up as Artem starts grunting louder himself.'
 						gs 'arousal', 'voyeur_sex', 2
 						gs 'arousal', 'end'
@@ -928,7 +928,7 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_facial.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
 							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
@@ -971,18 +971,18 @@ if $ARGS[0] = 'artem_sveta':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Artem and Anushka take a seat, with Anushka leaving room for you to sit between her and Artem. You sit between them and lean against Artem as the three of you talk a bit more.'
 	'Artem leans back in a half reclining position and you can see his bulge growing in his pants. After a while, Anushka notices as well. "Looks like someone is getting a little worked up, huh?" she asks is a bemused tone.'
 	'Artem smiles at you. "Sorry babe, but I can''t help it. You''re just so beautiful."'
 	act 'Take a peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You unbutton his pants, but it''s too dark to see anything as you hear Anushka''s voice in your ear. It seems she''s leaned over to try and take a look too. "Go on. Pull it out."'
 		act 'Pull his dick out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'You pull his dick out and he looks at you with pleading eyes. "Please suck it, babe."'
 			'You lean forward and take his dick into your mouth and start sucking it while stroking his shaft. "Damn <<$pcs_nickname>>, you''re getting good at that!" Anushka says.'
 			'You''re unable to answer, so Artem replies for you. "She''s the best!"'
@@ -992,14 +992,14 @@ if $ARGS[0] = 'artem_sveta':
 			act 'Deepthroat':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As you''re sucking Artem''s dick, you feel a hand press down on the back of your head and force it down until his dick slides down your throat, causing you to gag. You think it''s Artem at first, but soon realize that it''s Anushka.'
 				gs 'arousal', 'bj', 2, 'deepthroat'
 				gs 'stat'
 				act 'Get your hair grabbed':
 					*clr & cla
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You feel her fingers wrap themselves in your hair as she roughly forces you to deepthroat Artem before he speaks up. "Okay, let her up."'
 					'You can keep sucking his dick until he blows his load, offer up your pussy or give him your ass.'
 					gs 'arousal', 'bj', 2, 'deepthroat', 'rough'
@@ -1010,7 +1010,7 @@ if $ARGS[0] = 'artem_sveta':
 						*clr & cla
 						minut += 5
 						gs 'boyStat', 'A2'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 						'He stands up and you keep sucking his dick until he tells you he''s about to cum. You then pop his dick out of your mouth and jerk him off until he starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 						gs 'cum_call', 'face', 'A2', 1
 						gs 'arousal', 'end'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal1.jpg"></center>'
 	'You slide his dick out of your mouth and turn to look at him. "I want you to fuck me, right here, right now."'
 	'He just grins and gets up as Anushka helps you get naked from the waist down while he strips out of his pants and underwear. Once you''re both ready, you lay on your back and spread your legs wide before he lays down between your legs and slides his <<dick>>cm <<$dick_girth>> cock into your already wet pussy.'
 	gs 'arousal', 'vaginal', 2
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	act 'Watch Anushka':
 		*clr & cla
 		gs 'boyStat', 'A2'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal2.jpg"></center>'
 		'As Artem fucks you, you glance over and see that Anushka has her hand down her pants, rubbing one out as she watches you get fucked by Artem. You just grin.'
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
@@ -1063,7 +1063,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 		act 'Get fucked some more':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal3.jpg"></center>'
 			'Anushka is soon moaning almost as loud as you are, enough to attract even Artem''s attention. "What a little slut you are, rubbing one off while you watch me fuck your friend," he grins. "Admit it. You wish you were being fucked by some nerd cock right now, don''t you?"'
 			'Anushka bites her lower lip and redoubles her effort as she keeps rubbing one off. "YES! Oh fuck yes, I wish you were fucking me with your big nerd cock right now!"'
 			'Artem looks at you and smiles before looking back at her as he keeps fucking you. "Maybe next time I''ll ask Petka or Feofan to come along and they can fuck you while you watch me fuck <<$pcs_nickname>>. You''d like that, wouldn''t you? I can tell by your expression that the meer thought of some other nerd using you turns you on."'
@@ -1072,14 +1072,14 @@ if $ARGS[0] = 'artem_sveta_vag':
 			act 'Let him finish':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal4.jpg"></center>'
 				'He then starts really pounding your pussy, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 				gs 'arousal', 'vaginal', 2
 				gs 'stat'
 				act 'Artem blows his load':
 					*clr & cla
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 					'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 					gs 'cum_call', 'face', 'A2', 1
 					gs 'arousal', 'end'
@@ -1116,7 +1116,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 	'"I want you to fuck my ass," you tell him with a smile.'
 	'He grins. "Get on all fours for me then."'
 	'You get on all fours while Anushka keeps rubbing one out. Artem uses your pussy juices and some spit to lube your asshole up before he gently slides it in. Once his dick is inside you, he starts to slowly fuck your ass.'
@@ -1125,14 +1125,14 @@ if $ARGS[0] = 'artem_sveta_anal':
 	act 'Take an anal pounding':
 		*clr & cla
 		gs 'boyStat', 'A2'		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'
 		gs 'stat'
 		act 'Artem blows his load':
 			*clr & cla
 			minut += 5
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 			'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 			gs 'cum_call', 'face', 'A2', 1
 			gs 'arousal', 'end'

locations/ballet_npc.qsrc

@@ -27,8 +27,8 @@ gs 'npcstaticdefaults', 'body', 'model'
 !! mod appearance NPC settings, height in cm, weight in kg
 $npc_haircolour['A<<npctemp>>'] = 'Blonde'
 $npc_eyecolour['A<<npctemp>>'] = 'blue'
-$npc_height['A<<npctemp>>'] = 160
-$npc_weight['A<<npctemp>>'] = 50 
+$npc_height['A<<npctemp>>'] = str(160)
+$npc_weight['A<<npctemp>>'] = str(50)
 $npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
 
 npctemp = 3502 
@@ -72,8 +72,8 @@ gs 'npcstaticdefaults', 'body', 'model'
 !! mod appearance NPC settings, height in cm, weight in kg
 $npc_haircolour['A<<npctemp>>'] = 'Brunette'
 $npc_eyecolour['A<<npctemp>>'] = 'Blue'
-$npc_height['A<<npctemp>>'] = 145
-$npc_weight['A<<npctemp>>'] = 40 
+$npc_height['A<<npctemp>>'] = str(145)
+$npc_weight['A<<npctemp>>'] = str(40)
 $npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
 
 !! Calina

locations/beverage.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'bev_kva':
 	frost = 1
 	minut += 10
 	fat += 2
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 15
 	if pcs_hydra >= 100:
@@ -37,7 +37,7 @@ if $ARGS[0] = 'bev_jui':
 	if alko > 0: alko -= 1
 	minut += 10
 	fat += 3
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 8
 	pcs_mood += 10
 	if pcs_hydra >= 100:
@@ -66,7 +66,7 @@ if $ARGS[0] = 'bev_mil':
 	frost = 1
 	minut += 10
 	fat += 6
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	pcs_energy += 5
@@ -96,7 +96,7 @@ if $ARGS[0] = 'bev_wat':
 	frost = 1
 	if alko > 0: alko -= 1
 	minut += 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -123,7 +123,7 @@ if $ARGS[0] = 'bev_cof':
 	frost = 0
 	if alko > 0: alko -= 1
 	minut += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -153,7 +153,7 @@ if $ARGS[0] = 'bev_tea':
 	frost = 0
 	if alko > 0: alko -= 1
 	minut += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -183,7 +183,7 @@ if $ARGS[0] = 'bev_energy_drink':
 	frost = 1
 	if alko > 0: alko -= 1
 	minut += 5
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	pcs_energy += 10
@@ -213,7 +213,7 @@ if $ARGS[0] = 'bev_vod':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barordervodka.jpg"></center>'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'bev_bla':
 		*clr & cla
 		minut += 15
 		pcs_mood += 10
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/blackrussian.jpg"></center>'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'bev_sco':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'scotch'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/scotch.jpg"></center>'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'bev_win':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'wine'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/redwine.jpg"></center>'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'bev_mar':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		pcs_mood += 10
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
@@ -333,7 +333,7 @@ if $ARGS[0] = 'bev_cha':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'champagne'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/champagne.jpg"></center>'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'bev_bee':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'beer'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/darkbeer.jpg"></center>'
@@ -379,7 +379,7 @@ if $ARGS[0] = 'bev_cocktail':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 20
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		pcs_mood += 15
 		gs 'drugs', 'alcohol', 'rum'
 		pcs_horny += rand(10, 50)
@@ -465,7 +465,7 @@ if $ARGS[0] = 'only_cost_bco':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -490,7 +490,7 @@ if $ARGS[0] = 'only_cost_cof':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -516,7 +516,7 @@ if $ARGS[0] = 'only_cost_tea':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -540,7 +540,7 @@ if $ARGS[0] = 'only_cost_esp':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -558,7 +558,7 @@ end
 if $ARGS[0] = 'only_cost_kva':
 	frost = 1
 	fat += 2
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 15
 	if pcs_hydra >= 100:
@@ -582,7 +582,7 @@ if $ARGS[0] = 'only_cost_jui':
 	frost = 1
 	if alko > 0: alko -= 1
 	fat += 3
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 8
 	pcs_mood += 10
 	if pcs_hydra >= 100:
@@ -606,7 +606,7 @@ if $ARGS[0] = 'only_cost_mil':
 	*clr & cla
 	frost = 1
 	fat += 6
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	pcs_energy += 5
@@ -630,7 +630,7 @@ end
 if $ARGS[0] = 'only_cost_wat':
 	frost = 1
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -651,7 +651,7 @@ end
 if $ARGS[0] = 'only_cost_bev_energy_drink':
 	frost = 1
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	pcs_energy += 10
@@ -674,7 +674,7 @@ if $ARGS[0] = 'only_cost_bev_energy_drink':
 end
 
 if $ARGS[0] = 'only_cost_bev_vod':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -687,7 +687,7 @@ end
 
 if $ARGS[0] = 'only_cost_bev_bla':
 	pcs_mood += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -699,7 +699,7 @@ if $ARGS[0] = 'only_cost_bev_bla':
 end
 
 if $ARGS[0] = 'only_cost_bev_sco':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'scotch'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -711,7 +711,7 @@ if $ARGS[0] = 'only_cost_bev_sco':
 end
 
 if $ARGS[0] = 'only_cost_bev_win':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'wine'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -723,7 +723,7 @@ if $ARGS[0] = 'only_cost_bev_win':
 end
 
 if $ARGS[0] = 'only_cost_bev_mar':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_mood += 10
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
@@ -736,7 +736,7 @@ if $ARGS[0] = 'only_cost_bev_mar':
 end
 
 if $ARGS[0] = 'only_cost_bev_cha':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'champagne'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'only_cost_bev_cha':
 end
 
 if $ARGS[0] = 'only_cost_bev_bee':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'beer'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'only_cost_bev_bee':
 end
 
 if $ARGS[0] = 'only_cost_bev_cocktail':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_mood += 15
 	gs 'drugs', 'alcohol', 'rum'
 	pcs_horny += rand(10, 50)

locations/body_desc.qsrc

@@ -388,27 +388,12 @@ if $ARGS[0] = 'breasts':
 end
 
 if $ARGS[0] = 'butt':
-	if 1:
-		!natural butt
-		if pcs_butt <= 14:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-		elseif pcs_butt <= 29:
-			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>.'
-		elseif pcs_butt <= 44:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average.'
-		elseif pcs_butt <= 59:
-			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
-		else
-			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
-		end
+	!have butt implant
+	if bodyVars['butt_silicone'] > 0:
+		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
 
-		!have butt implant
-		if bodyVars['butt_silicone'] > 0:
-			buttpic = 4
-			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a>.'
-		end
+	!natural butt
 	else
-		!natural butt
 		if pcs_butt <= 7:
 			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
 		elseif pcs_butt <= 14:
@@ -428,12 +413,6 @@ if $ARGS[0] = 'butt':
 		else
 			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/9.jpg''">butt</a> that jiggles and sways as you walk.'
 		end
-
-		!have butt implant
-		if bodyVars['butt_silicone'] > 0:
-			buttpic = 4
-			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
-		end
 	end
 end
 

locations/body_structure.qsrc

@@ -315,7 +315,8 @@ if $ARGS[0] = 'body_img':
 	! -----     45 <= bmi           ----- !
 	else
 		!	0 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/8.jpg'
+		!$result = 'images/pc/body/shape/8.jpg'
+		$result = 'images/pc/body/shape/7.jpg'
 	end
 
 	killvar 'bs_temp_bs_class'

locations/booty_call.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'sugar_daddy_scheduler2':
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
 		if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
 			npc_no_booty_call[$sugar_daddy[i]] = daystart
-			
+
 		elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
 			sugar_daddy_call[$sugar_daddy[i]] = 1
 			gs 'booty_call', 'sugar_daddy_scheduler3'
@@ -79,9 +79,9 @@ if $ARGS[0] = 'sugar_daddy_scheduler3':
 	end
 end
 
-!!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0: 
+!!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0:
 !!		$boy = $FuckBuddy[i]
-		
+
 !!	end
 
 !!		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
@@ -288,7 +288,7 @@ if $ARGS[0] = 'text1':
 		elseif booty_call['text'] = 3:
 			'	<b><font color="blue">fucking you on my bed</font></b>'
 		end
-		gs 'booty_call_start', 'text2'
+		gs 'booty_call', 'text2'
 	end
 
 	act'Me too':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'invite_yourself1':
 			'<b><font color="pink">this is a booty call</font></b>'
 			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
-			gs 'booty_call_start', 'invite_yourself2'
+			gs 'booty_call', 'invite_yourself2'
 		end
 
 		act'I wanna fuck':
@@ -394,7 +394,7 @@ if $ARGS[0] = 'invite_yourself1':
 			'<b><font color="pink">when do you get off?</font></b>'
 			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
-			gs 'booty_call_start', 'invite_yourself2'
+			gs 'booty_call', 'invite_yourself2'
 		end
 	else
 		'	<b><font color="blue">i was thinking about your naked body in my bed</font></b>'
@@ -537,13 +537,13 @@ if $ARGS[0] = 'sd_npc_stat_update':
 			if rand(1,2) = 1:
 				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] = 18
 				npc_end_free_time[$npclastgenerated] = 22
-				
+
 				npc_work_start[$npclastgenerated] = 9
 				npc_work_end[$npclastgenerated] = 17
 			end

locations/boyStat.qsrc

@@ -8,17 +8,13 @@
 !! A second argument calls for multiple partners. They are output as stats1, stats2, stats3, and stats4, for a total of 5 stats.
 !! If ARGS[1] is not set it defaults to zero, so you can use the variables it sets with or without [0] e.g. dick or dick[0] are equivalent 
 
-if ($ARGS[0] = '' and ARGS[0] > 0) or mid($ARGS[0],1,1) < 10:
-	if ARGS[0] > 0:
-		npclastcalledn = ARGS[0]
-	else
-		npclastcalledn = val($ARGS[0])
-	end
+if ($ARGS[0] = '' and ARGS[0] > 0) or (isnum(mid($ARGS[0],1,1)) and val(mid($ARGS[0],1,1)) < 10):
+	npclastcalledn = iif(isnum($ARGS[0]),val($ARGS[0]),ARGS[0])
 	$npcboytemp = 'A' + npclastcalledn
 else
 	$npcboytemp = $ARGS[0]
 	!! {This error is for where something outside the range of possibility is specified. The calling code is broken. The exact thing specified will be announced.}
-	if mid($npcboytemp,2,1) > 10:
+	if isnum(mid($npcboytemp,2,1)) and val(mid($npcboytemp,2,1)) > 10:
 		MSG 'There has been an error in the $boy passing code. Please contact a developer with what you were doing prior to receiving this message so the error may be fixed. Error type: Improper value for boyStat. Calling <<$ARGS[0]>>'
 		$npcboytemp = 'D0'
 	end
@@ -27,7 +23,7 @@ end
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 	$npclastcalled = $npcboytemp
 	npclastcalledn = val(mid($npcboytemp, 2))
-	if $npc_usedname[$npclastcalled]=0: $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
+	if isnum($npc_usedname[$npclastcalled]) or $npc_usedname[$npclastcalled] = '': $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
 	$bstemp[3] = $npc_thdick[$npclastcalled]
@@ -103,9 +99,7 @@ elseif $ARGS[1] = 'f':
 	$dick_girth6 = $bstemp[3]
 	silavag6 = bstemp[4]
 else
-	boyStat_i = ARGS[1]
-	!! check if $ARGS[1] is an empty string or not
-	if $ARGS[1] ! 0 and isnum($ARGS[1]) ! 0: boyStat_i = val($ARGS[1])
+	boyStat_i = iif(isnum($ARGS[1]),val($ARGS[1]),ARGS[1])
 	$boy[boyStat_i] = $npclastcalled
 	$boydesc[boyStat_i] = $bstemp[1]
 	dick[boyStat_i] = bstemp[2]

locations/brother_voyeur.qsrc

@@ -228,7 +228,6 @@ if $ARGS[0] = 'showertalk2':
 				act'Do it':
 					menu_off = 1
 					*clr & cla
-					if rand(0, 5) = 0: gt 'vann', 'v4'
 					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 					'Unable to help yourself, you decide to risk it. After taking a quick look at your brother to make sure he''s still facing away you gently lower the showerhead between your legs.'
 					'As the pressure builds on your pussy your reponses to what your brother is saying become increasingly close to moans, often being monosyllabic or simple hums and your eyes squeeze tight as you concentrate on the sensation.'
@@ -782,10 +781,8 @@ if $ARGS[0] = 'brother_shower_shave':
 	else
 		'"Yeah, you''re probably right. I should shave," you say looking down at yourself, frowning at the growing body hair.'
 	end
-	
-	if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] < razors_to_use['all']:
-		msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
-	else
+
+	if pcs_leghair <= 3 and pcs_pubes <= 3:
 		*nl
 		'You don''t have enough hair on either your legs of pussy for you to need shave.'
 		'"Sorry bro but I don''t need to shave. Give a couple of days and I can show you." You say to the now a bit disappointed Kolka but there''s not much you can do about that.'
@@ -794,10 +791,15 @@ if $ARGS[0] = 'brother_shower_shave':
 			act'Put his hand on your pussy': gs 'brother_shower_sex', 'sex_menu'
 		end
 		act 'Finish showering together': gt 'brother_voyeur', 'brother_shower_end'
+	else
+		if mc_inventory['razor'] < razors_to_use['all']:
+			msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
+		else
+			gs 'brother_voyeur', 'shave_both'
+		end
+		gs 'brother_voyeur', 'shave_legs'
+		gs 'brother_voyeur', 'shave_pussy'
 	end
-	gs 'brother_voyeur', 'shave_both'
-	gs 'brother_voyeur', 'shave_legs'
-	gs 'brother_voyeur', 'shave_pussy'
 end
 
 if $ARGS[0] = 'shave_both':
@@ -837,7 +839,7 @@ if $ARGS[0] = 'shave_both':
 						end
 					else
 						cla & *clr
-						gs 'stat'						
+						gs 'stat'
 						'Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the feeling.'
 						'You put your hands on either side of your pussy and say, "Well? Satisfied now?"'
 						'"Yeah..." he says, trailing off at the end, obviously hypnotized by your pussy, causing you to roll your eyes.'
@@ -883,12 +885,12 @@ if $ARGS[0] = 'shave_legs':
 								cla & *nl
 								'"That''s not what I said. I said I''d shave just because you asked. I didn''t say what exactly I''d be shaving or that I''d do everything you tell me to."'
 								'"Hrmph." Kolka seems disappointed. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-								
+
 								gs 'brother_voyeur', 'shower_end'
 							end
 
 							act'I guess I did': brother_shower['shave_request'] = 1 & gt 'brother_voyeur', 'brother_shower_shave'
-							
+
 							act'Oh alright': brother_shower['shave_request'] = 2 & gt 'brother_voyeur', 'brother_shower_shave'
 						end
 
@@ -906,7 +908,7 @@ if $ARGS[0] = 'shave_legs':
 									cla
 									'"Sorry little brother, you''re not going to change my mind that easily. I said I''d shave just because you asked. I didn''t say that I''d do everything you asked."'
 									'"Hmph. I still think you''d look better if you just kept it smooth..." he mutters while you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-									
+
 									gs 'brother_voyeur', 'shower_end'
 								end
 
@@ -933,7 +935,7 @@ if $ARGS[0] = 'shave_legs':
 									cla & *nl
 									'"Sorry little brother, you''re not going to change my mind that easily. I said I''d shave just because you asked. I didn''t say that I''d shave everything you wanted."'
 									'"Hmph. I still think you''d look better if you just kept it smooth..." he mutters while you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-									
+
 									gs 'brother_voyeur', 'shower_end'
 								end
 
@@ -1012,7 +1014,7 @@ if $ARGS[0] = 'shave_pussy':
 				'"Yeah, I guess I could use a trim."'
 				'You lather up your crotch and then start carefully shaving your pussy.'
 			end
-			
+
 			if pcs_leghair > 3:
 				'Kolka frowns. "You''re not going to shave your legs?"'
 				if mc_inventory['razor'] < razors_to_use['legs']:
@@ -1278,7 +1280,7 @@ if $ARGS[0] = 'shave':
 				'"Hmm..." He seems disappointed.'
 				act 'Dry off': gt 'brother_voyeur', 'dryoff'
 			end
-			
+
 			if pcs_pubes < 21:
 				act'"Nope! I''m thinking of growing it out"':
 					cla
@@ -1301,7 +1303,7 @@ if $ARGS[0] = 'shave':
 					act 'Dry off': gt 'brother_voyeur', 'dryoff'
 				end
 			end
-			
+
 			if pcs_pubes > 10:
 				act'"I like it like this!"':
 					cla
@@ -1599,7 +1601,7 @@ if $ARGS[0] = 'shave_not_done':
 			act 'Dry off': gt 'brother_voyeur', 'dryoff'
 		end
 	end
-	
+
 	act'Indulge him':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'

locations/bus.qsrc

@@ -80,7 +80,7 @@ elseif $ARGS[0] = 'community_busses':
 	act 'Look at the bus schedule':
 		*clr & cla
 		gs 'transport_functions', 'display_bus_schedule', 'pg'
-		act 'Stop looking at the schedule': gt 'bus', 'community_busses.'
+		act 'Stop looking at the schedule': gt 'bus', 'community_busses'
 	end
 
 	act 'Take a bus to the Pavlovsk train station (<<func(''transport_functions'', ''display_bus_timecost'', ''community'', ''pavstation'')>>)':	gt 'bus', 'community_pavstation'

locations/camera.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_locations[iterator]
 		! Show the player unphotographed locations
-		if camera_found[$camera_event] ! 1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1: $camera_description
 		iterator += 1
 		if iterator < location_count: jump 'location_loop'
 	end
@@ -148,7 +148,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_people[iterator]
 		! If the subject has not been photographed and requirements are met (-1), show the name
-		if camera_found[$camera_event] ! 1 and camera_requirement = -1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1 and camera_requirement = -1: $camera_description
 		iterator += 1
 		if iterator < people_count: jump 'people_loop'
 	end
@@ -158,7 +158,7 @@ end
 
 if $ARGS[0] = 'check_location':
 	! If the player has a camera and this location exists in the array
-	if photographyEv >= 2 and $camera_locations[$loc] ! 0:
+	if photographyEv >= 2 and arrpos('$camera_locations', $loc) >= 0:
 		! Assign the variables
 		dynamic $camera_locations[$loc]
 		! If they have not already photographed the location
@@ -181,7 +181,7 @@ end
 
 if $ARGS[0] = 'check_person':
     ! If the player has a camera and this person exists in the array
-    if photographyEv >= 2 and $camera_people[$ARGS[1]] ! 0:
+    if photographyEv >= 2 and arrpos('$camera_people', $ARGS[1]) >= 0:
         ! Assign the variables
         dynamic $camera_people[$ARGS[1]]
         ! If they have not already photographed the person

locations/cikl.qsrc

@@ -164,13 +164,13 @@ if husbandMark = 1 and husband <= 10:
 end
 
 !! after having surgery you will be in recuperation for a few days
-
-if surgeryday ! '':
+if surgeryday > 0:
 	if daystart - 7 <= surgeryday:
 		dailyhealthimprov = (daystart - surgeryday) * 50
 		pcs_health = dailyhealthimprov
 		recuperation = 1
 	else
+		killvar 'surgeryday'
 		killvar 'recuperation'
 		killvar 'dailyhealthimprov'
 	end

locations/city_experimental_trials_events.qsrc

@@ -83,14 +83,14 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 		end
 
 		'Your agility has increased and you feel faster! This must have been that experimental pill you took.'
-	
+
 	elseif experimentQW['random_option'] = 5:
 		if vital_lvl > 11:
 			vital_exp -= 2 * vital_xpnxt
 		end
 
 		'Your endurance has decreased! This must have been that experimental pill you took.'
-	
+
 	else
 		if vital_lvl < 99:
 			vital_exp += 2 * vital_xpnxt
@@ -514,7 +514,7 @@ if $experimentQW['trial_active'] = 'aphrodisiac_pill':
 		orgasm += 1
 		pcs_mood = 100
 		if pcs_traits['easy_orgams'] < 2: pcs_traits['easy_orgams'] = 2
-		
+
 		*nl
 		'You feel a heat spreading from your stomach and moving towards your pussy. The heat pulses and you find yourself in the grips of an intense orgasm! You feel like it''ll be easier to orgasm from now on. This must have been that experimental aphrodisiac.'
 	end
@@ -530,7 +530,7 @@ end
 
 if $experimentQW['trial_active'] = 'butt_injection':
 	pcs_horny += 10
-	butt_tr_exp += butt_tr_xpnxt * 2
+	bodyVars['butt_other'] += 2
 
 	if experimentQW['trial_duration'] >= 4:
 		*nl
@@ -568,7 +568,7 @@ if $experimentQW['trial_active'] = 'fertility_shot':
 	if experimentQW['trial_duration'] = 3:
 		if min_arousal < 20: min_arousal = 20
 		if pcs_horny < 20: pcs_horny = 20
-		
+
 		*nl
 		'You feel a heat radiate from your womb, awakening your arousal. This must have been that experimental fertility shot.'
 	elseif experimentQW['trial_duration'] = 2:

locations/city_experimental_trials_list.qsrc

@@ -106,13 +106,13 @@ if $ARGS[0] = $trial_sections[0]:
 	$loc_arg = $trial_sections[0]
 
 	minut += 2
-	
+
 	!!Image of the desk, or an experimental trials folder
 	'<center><img <<$set_imgh>> src="images\system\image_needed.png"></center>'
 
 	'We have developed a range of enhancement pills that are designed to improve both body and mood. They''ve just been approved for human trials, so we''re still cataloguing the effects.'
 	'The following are expected: mood swings, aches, itches, rashes and physical changes.'
-	
+
 	act 'Sign up':
 		$experimentQW['trial_active'] = $trial_names[0]
 
@@ -137,79 +137,79 @@ if $ARGS[0] = $trial_sections[0]:
 		!! Change tits
 		if temp_rand < 10:
 			$temp_pill_color = 'cyan'
-			$experimentQW['trial_active']     = 'pill_cyan'
-			$experimentQW['pill_cyan_taken'] += 1
-			 experimentQW['trial_duration']   = rand(1,3)
+			$experimentQW['trial_active']    = 'pill_cyan'
+			experimentQW['pill_cyan_taken'] += 1
+			experimentQW['trial_duration']   = rand(1, 3)
 
 		!! Change stren, vital, or agil
 		elseif temp_rand < 20:
 			$temp_pill_color = 'red'
-			$experimentQW['trial_active']    = 'pill_red'
-			$experimentQW['pill_red_taken'] += 1
-			 experimentQW['trial_duration']  = rand(2,4)
+			$experimentQW['trial_active']   = 'pill_red'
+			experimentQW['pill_red_taken'] += 1
+			experimentQW['trial_duration']  = rand(2, 4)
 
 		!! Change intel, cha, perception?
 		elseif temp_rand < 30:
 			$temp_pill_color = 'blue'
 			$experimentQW['trial_active']     = 'pill_blue'
-			$experimentQW['pill_blue_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			 experimentQW['pill_blue_taken'] += 1
+			 experimentQW['trial_duration']   = rand(2, 4)
 
 		!! Change skin
 		elseif temp_rand < 40:
 			$temp_pill_color = 'yellow'
-			$experimentQW['trial_active']       = 'pill_yellow'
-			$experimentQW['pill_yellow_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,5)
+			$experimentQW['trial_active']      = 'pill_yellow'
+			experimentQW['pill_yellow_taken'] += 1
+			experimentQW['trial_duration']     = rand(2, 5)
 
 		!! Change butt
 		elseif temp_rand < 50:
 			$temp_pill_color = 'orange'
-			$experimentQW['trial_active']       = 'pill_orange'
-			$experimentQW['pill_orange_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,4)
+			$experimentQW['trial_active']      = 'pill_orange'
+			experimentQW['pill_orange_taken'] += 1
+			experimentQW['trial_duration']     = rand(2, 4)
 
 		!! Change inhib
 		elseif temp_rand < 60:
 			$temp_pill_color = 'violet'
-			$experimentQW['trial_active']       = 'pill_violet'
-			$experimentQW['pill_violet_taken'] += 1
-			 experimentQW['trial_duration']     = 1
+			$experimentQW['trial_active']      = 'pill_violet'
+			experimentQW['pill_violet_taken'] += 1
+			experimentQW['trial_duration']     = 1
 
 		!! Change min_arousal
 		elseif temp_rand < 65:
 			$temp_pill_color = 'brown'
-			$experimentQW['trial_active']      = 'pill_brown'
-			$experimentQW['pill_brown_taken'] += 1
-			 experimentQW['trial_duration']    = rand(2,4)
-		
+			$experimentQW['trial_active']     = 'pill_brown'
+			experimentQW['pill_brown_taken'] += 1
+			experimentQW['trial_duration']    = rand(2, 4)
+
 		!! Change clit
 		elseif temp_rand < 70:
 			$temp_pill_color = 'purple'
-			$experimentQW['trial_active']     = 'pill_purple'
-			$experimentQW['pill_purple_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			$experimentQW['trial_active']      = 'pill_purple'
+			experimentQW['pill_purple_taken'] += 1
+			experimentQW['trial_duration']     = rand(2, 4)
 
 		!! Change alko_status
 		elseif temp_rand < 80:
 			$temp_pill_color = 'green'
-			$experimentQW['trial_active']      = 'pill_green'
-			$experimentQW['pill_green_taken'] += 1
-			 experimentQW['trial_duration']    = 1
+			$experimentQW['trial_active']     = 'pill_green'
+			experimentQW['pill_green_taken'] += 1
+			experimentQW['trial_duration']    = 1
 
 		!! Give exhib level or change willwpower
 		elseif temp_rand < 85:
 			$temp_pill_color = 'gray'
-			$experimentQW['trial_active']     = 'pill_gray'
-			$experimentQW['pill_gray_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			$experimentQW['trial_active']    = 'pill_gray'
+			experimentQW['pill_gray_taken'] += 1
+			experimentQW['trial_duration']   = 1
 
 		!! Give bimbo lvl or change willpower?
 		elseif temp_rand < 90:
 			$temp_pill_color = 'pink'
-			$experimentQW['trial_active']     = 'pill_pink'
-			$experimentQW['pill_pink_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			$experimentQW['trial_active']    = 'pill_pink'
+			experimentQW['pill_pink_taken'] += 1
+			experimentQW['trial_duration']   = 1
 		end
 
 		experimentQW['times_participated_0'] += 1
@@ -403,7 +403,7 @@ elseif $ARGS[0] = $trial_sections[4]:
 		 experimentQW['times_participated_4'] += 1
 		$experimentQW['trial_active'] = $trial_sections[4]
 		 experimentQW['trial_duration'] = trial_durations[4]
-		
+
 		menu_off = 1
 		minut += 2
 		gs 'stat'

locations/city_experimental_trials_pharmacy.qsrc

@@ -15,11 +15,26 @@ if $ARGS[0] = 'counter':
 		end
 		*nl
 
-		'There is currently nothing of note being sold here (yet).'
-		'More content will be added here in later updates.'
+		if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0 and experimentQW['times_participated_5'] = 0:
+			'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
+		else
+			act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
+		end
 
 		act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
 end
 
 
+if $ARGS[0] = 'cart':
+	*clr & cla
+	$loc_s = 'city_experimental_trials_pharmacy'
+	$args_s = 'cart'
+
+	gs 'item_cart', 'shoppping_aisle', 'experimental_trials'
+	gs 'themes', 'indoors'
+	gs 'stat'
+
+	act 'Exit shopping cart': gt 'city_experimental_trials_pharmacy', 'counter'
+end
+
 --- city_experimental_trials_pharmacy ---------------------------------

locations/city_hotel.qsrc

@@ -1,6 +1,8 @@
 # city_hotel
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
+	if hotelRoomDays['city'] = 0 and hour > 11: hotelRoom['city'] = 0
+	if hotelRoomDays['city'] <= 0: hotelRoom['city'] = 0
 	*clr & cla
 	nom_o[1] = 100
 	nom_o[2] = 1000

locations/courtletter.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'letter':
 
 		$policeQW_courthearing_subjects[] = mid($policeQW_courtletter_subjects[0], 14)
 
-		if $policeQW['courtletter_hearing_counter'] < 10:
+		if policeQW['courtletter_hearing_counter'] < 10:
 			policeQW['courtletter_hearing_counter'] += 1
 			pcs_mood -= 100
 			gs 'stat'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'letter':
 
 		$policeQW_courthearing_subjects[] = $policeQW_courtletter_subjects[0]
 
-		if $policeQW['courtletter_hearing_counter'] < 10:
+		if policeQW['courtletter_hearing_counter'] < 10:
 			policeQW['courtletter_hearing_counter'] += 1
 			pcs_mood -= 100
 			gs 'stat'

locations/cum_call.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] ! 'precum':
 	if $boy ! $ARGS[1] and $ARGS[1] ! '': $boy = $ARGS[1]
 
 	!!This check if the name passed is not in the new MGX format
-	if $ARGS[1] = '' or mid($ARGS[1],2,1) > 10:
+	if $ARGS[1] = '' or (isnum(mid($ARGS[1],2,1)) and val(mid($ARGS[1],2,1)) > 10):
 		if ARGS[2] = 0 or ARGS[2] = 2:
 			gs 'npcgeneratec', 0, $ARGS[1], rand(18,60)
 			gs 'boyStat', $npclastgenerated

locations/dimaHome.qsrc

@@ -211,7 +211,6 @@ if $ARGS[0] = 'bathroom2':
 
 			act '"Wash" your pussy':
 				*clr & cla
-				if rand(0, 5) = 1:gt 'vann', 'v4'
 				minut += 10
 
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash7.mp4"></center>'

locations/din_bad.qsrc

@@ -236,15 +236,15 @@ if $ARGS[0] = 'd_bag':
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
-	if mc_inventory['refill_bottle_water'] = 4: 
+	if mc_inventory['refill_bottle_water'] = 4 and mc_inventory['refill_bottle'] >= 1: 
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle_water''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 3:
+	elseif mc_inventory['refill_bottle_water'] = 3 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost full. <a href="exec: mc_inventory[''refill_bottle_water''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 2:
+	elseif mc_inventory['refill_bottle_water'] = 2 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
-	elseif mc_inventory['refill_bottle_water'] = 1:
+	elseif mc_inventory['refill_bottle_water'] = 1 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost empty. <a href="exec: mc_inventory[''refill_bottle_water''] = 0 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 0:
+	elseif mc_inventory['refill_bottle_water'] = 0 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'set_bc_reminder':
 	birth_control['remind_hour'] = input ("When do you want to set your reminder? (Pick an hour 1 - 22. An icon will appear in the stat display during that hour to remind you to take your pill.)")
 	if birth_control['remind_hour'] < 1 or birth_control['remind_hour'] > 22:
 		msg 'Invalid reminder input. Pick an hour between 1 and 22.'
-		jump 'invalid_bc_reminder'
+		jump 'invalid_bc_reminder_loop'
 	else
 		msg 'You set a reminder on your phone to take your birth control pill at <<birth_control[''remind_hour'']>>.'
 		if tabloc = 0:

locations/din_van.qsrc

@@ -156,7 +156,7 @@ $shower = {
 				'His cum <i>leaking</i> out of you.'
 				*nl
 				'You grab the soap again and scrub yourself again, but it still feels like something is there, coating your skin. You scrub and scrub and scrub but it just won''t go away until you finally cry out, throwing it into the corner. Tremors begin coursing through your body and you slowly sink down onto the shower floor, where you remain, sobbing while the water continues raining down on you.'
-				
+
 				dynamic $dryOff
 			end
 		elseif pcs_horny >= 40:
@@ -188,9 +188,9 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
-		
+
 		gs 'selfplay', 'shower_dildo_check'
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
@@ -282,7 +282,7 @@ $bath = {
 			gs 'arousal', 'end'
 			dynamic $dryOff
 		end
-		
+
 		gs 'selfplay', 'bathtub_dildo_check'
 
 		act 'Take a selfie':
@@ -305,7 +305,7 @@ $SkinCare = {
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/skincare.jpg"></center>'
 			'You get out your skin care products and apply them, the creams feel cool and nice against your skin. You sometimes wonder if all this effort and money is worth it, but one look in the mirror at your skin and you figure it is.'
-			
+
 			gs 'body', 'SkinGain', 'Moisturizer'
 			gs 'stat'
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
@@ -332,7 +332,7 @@ $brit = {
 							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
 							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 						else
-							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.' 
+							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 						end
 					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
@@ -360,7 +360,7 @@ $brit = {
 					elseif pubestyle = 11:
 						$shave_act = 'Shave your legs and pussy'
 						if pcs_pubes <= 10:
-							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.' 
+							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
 						else
 							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
@@ -368,7 +368,7 @@ $brit = {
 					else
 						$shave_act = ''
 					end
-				
+
 					if $shave_act ! '':
 						act '<<$shave_act>> (0:15)':
 							menu_off = 1
@@ -415,7 +415,7 @@ $brit = {
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
-						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
+						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 					else
 						$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
@@ -716,7 +716,7 @@ $publicpan = {
 	!! Changing into a different outfit for prostitution
 	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
 		gs 'prostitution_functions', 'work_clothes'
-		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
 			act 'Change into prostitute outfit': gt 'prostitution_functions', 'change_to_work', 'restroom'
 		elseif prostitute['work_clothes'] and prostitute['changed_for_work']:
 			act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'restroom'
@@ -909,7 +909,7 @@ $basin = {
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-	
+
 	if KandidozOnce = 1 and KandidNapr > 0:
 		act 'Use antifungal Medication':
 			*clr & cla
@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'private':
 	end
 
 	if mc_inventory['chaffing_cream'] > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mc_inventory[''chaffing_cream'']>></b> applications.'
-	if mc_inventory['moisturiser'] > 0: 
+	if mc_inventory['moisturiser'] > 0:
 		'You look at your moisturiser and think you have about <<mc_inventory[''moisturiser'']>> applications left.'
 	end
 	if mc_inventory['tampons'] =  0 and mc_inventory['sanitary_pads'] = 0:
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'private':
 	elseif mc_inventory['tampons'] > 0:
 		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
-	
+
 	if mc_inventory['sanitary_pads'] = 1 and tampon['warning'] ! daystart:
 		tampon['warning'] = daystart
 		msg'<font color="red">You only have <b><<mc_inventory[''sanitary_pads'']>></b> pad left!</font>'
@@ -1099,7 +1099,7 @@ if $ARGS[0] = 'private':
 	end
 
 	'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
-	
+
 	if $ARGS[1] = 'hotelroom':
 		dynamic $shower
 		if $ARGS[2] = 'bath': dynamic $bath
@@ -1142,6 +1142,13 @@ if $ARGS[0] = 'private':
 		end
 	end
 
+	if mc_inventory['hair_extensioncream'] > 0:
+		'<a href="exec:gs ''drugs'', ''hair_extensioncream'' & gt $loc, $loc_arg">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
+	end
+	if mc_inventory['butt_injection'] > 0:
+		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
+	end
+
 	if mc_inventory['breastcream'] > 0:
 		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
@@ -1202,7 +1209,7 @@ if $ARGS[0] = 'private':
 	dynamic $brit
 
 	dynamic $enema
-	
+
 	dynamic $palelady
 
 
@@ -1273,7 +1280,7 @@ if $ARGS[0] = 'private':
 				*nl
 				'The test shows one band. You are not pregnant.'
 				act 'Sigh in relief': gt 'din_van', 'ReliefReact'
-				
+
 				act 'Sigh in disappointment': gt 'din_van', 'DisappointedReact'
 			end
 
@@ -1797,7 +1804,7 @@ if $ARGS[0] = 'shave_options':
 
 	!! ROW 1: IMAGES
 		*p '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD>'
-		
+
 		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 2)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
@@ -1858,7 +1865,7 @@ if $ARGS[0] = 'shave_options':
 
 		$temp_pube_image = FUNC('$pube_image', 26, pcs_pubecol[2], 10)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
-	
+
 	!! ROW 2: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 6 and pcs_pubes > 15:

locations/drugs.qsrc

@@ -22,6 +22,8 @@ if $ARGS[0] = 'cikl':
 	gs 'drugs', 'cocaine', 'cikl'
 	gs 'drugs', 'mentats', 'cikl'
 	gs 'drugs', 'aphrodisiac', 'cikl'
+	gs 'drugs', 'hair_extensioncream', 'cikl'
+	gs 'drugs', 'butt_injection', 'cikl'
 
 elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'smoke', 'hourly_events'
@@ -74,7 +76,7 @@ elseif $ARGS[0] = 'smoke':
 			drugVars['cigarettes_used'] += 1
 			if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
 		end
-		
+
 		stat['cigarettes_smoked'] += 1
 		drugVars['cigarettes_day'] = daystart
 		drugVars['cigarettes_hour'] = hour
@@ -96,7 +98,7 @@ elseif $ARGS[0] = 'smoke':
 		gs 'stat'
 	end
 
-	
+
 elseif $ARGS[0] = 'joint':
 	if $ARGS[1] = 'hourly_events':
 		if drugVars['weed_high'] > 0: drugVars['weed_high'] -= 1
@@ -137,16 +139,16 @@ elseif $ARGS[0] = 'joint':
 
 elseif $ARGS[0] = 'heroin':
 	if $ARGS[1] = 'hourly_events':
-		if drugVars['heroin_high'] > 0: 
+		if drugVars['heroin_high'] > 0:
 			pcs_mood -= (40 / drugVars['heroin_high'])
 			drugVars['heroin_high'] -= 1
 		end
 
-		if drugVars['heroin_need'] > 0 and pcs_mood > 10: 
+		if drugVars['heroin_need'] > 0 and pcs_mood > 10:
 			drugVars['heroin_need'] += 1
 			pcs_mood -= pcs_mood / 10
 		end
-		if drugVars['heroin_need'] > 100 and drugVars['heroin_high'] <= 0: 
+		if drugVars['heroin_need'] > 100 and drugVars['heroin_high'] <= 0:
 			drugVars['heroin_need'] = 0
 			drugVars['heroin_used'] = 0
 		end
@@ -189,7 +191,7 @@ elseif $ARGS[0] = 'cocaine':
 	elseif $ARGS[1] = 'hourly_events':
 		if drugVars['cocaine_addict'] = 1 and drugVars['cocaine_day'] ! daystart:
 			pcs_health -= 5
-			
+
 			!! Changed from pcs_mood > 40 -> pcs_mood > 45 to avoid pcs_mood becoming lower than 5. Blame Anjuna
 			if pcs_mood > 45:
 				pcs_mood -= 40
@@ -246,7 +248,7 @@ elseif $ARGS[0] = 'amphetamine':
 			end
 		end
 
-		if drugVars['amphetamine_withdrawl'] >= 5: 
+		if drugVars['amphetamine_withdrawl'] >= 5:
 			drugVars['amphetamine_withdrawl'] += 1
 			pcs_mood -= (drugVars['amphetamine_withdrawl'] / 5)
 		end
@@ -275,7 +277,7 @@ elseif $ARGS[0] = 'amphetamine':
 			drugVars['amphetamine_bonus'] = 1
 		end
 
-		if drugVars['amphetamine_withdrawl'] > 169: 
+		if drugVars['amphetamine_withdrawl'] > 169:
 			drugVars['amphetamine_withdrawl'] = 1
 			drugVars['amphetamine_bonus'] = 1
 			drugVars['amphetamine_used'] = 0
@@ -299,7 +301,7 @@ elseif $ARGS[0] = 'amphetamine':
 				mc_inventory['amphetamine'] -= 1
 				if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
 			end
-			if cheatVars['drugs_immune'] = 0: 
+			if cheatVars['drugs_immune'] = 0:
 				drugVars['amphetamine_used'] += 1
 				if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
 			end
@@ -362,7 +364,7 @@ elseif $ARGS[0] = 'breastcream':
 			drugVars['breastcream_dose'] = 0
 
 			temp = pcs_mass['bust'] - pcs_mass['bust_gen']
-			temp = rand(0, 5 + max(0, temp)) / max(1, temp)
+			temp = rand(0, 10 + max(0, temp)) / max(1, temp)
 
 			if temp > 0:
 				bodyVars['bust_other'] += 1
@@ -407,12 +409,12 @@ elseif $ARGS[0] = 'alcohol':
 			pain['relief'] = 15
 		end
 	else
-		if cheatVars['drugs_immune'] = 0: 
+		if cheatVars['drugs_immune'] = 0:
 			drugVars['alcohol_used'] += 1
 			if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
-		end	
+		end
 
-		if ARGS[2] <= 1: 
+		if ARGS[2] <= 1:
 			temp_alc_count = 1
 		else
 			temp_alc_count = ARGS[2]
@@ -567,6 +569,64 @@ elseif $ARGS[0] = 'aphrodisiac':
 		end
 		gs 'stat'
 	end
+elseif $ARGS[0] = 'hair_extensioncream':
+	if $ARGS[1] = 'cikl':
+		if drugVars['hair_extensioncream_dose'] >= 1:
+			drugVars['hair_extensioncream_dose'] = 0
+
+			if pcs_hairlng < 999:
+				pcs_hairlng += 2
+				'Feels like your hair has grown slightly.'
+			end
+		end
+	else
+		if drugVars['hair_extensioncream_dose'] < 1:
+			'<font color = #DB7093>You smear the shampoo into your hair and rub it in, then wash it out shortly later.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['hair_extensioncream'] -= 1
+				if mc_inventory['hair_extensioncream'] <= 0: mc_inventory['hair_extensioncream'] = 0 & msg 'That was your last bit of hair extension shampoo.'
+			end
+
+			drugVars['hair_extensioncream_used'] += 1
+			drugVars['hair_extensioncream_dose'] = 1
+		else
+			'Using any more hair extension shampoo won''t have any effect.'
+		end
+		gs 'stat'
+	end
+
+elseif $ARGS[0] = 'butt_injection':
+	if $ARGS[1] = 'cikl':
+		if drugVars['butt_injection_dose'] >= 1:
+			drugVars['butt_injection_dose'] = 0
+
+			temp = pcs_mass['butt'] - pcs_mass['butt_gen']
+			temp = rand(0, 10 + max(0, temp)) / max(1, temp)
+
+			if temp > 0:
+				bodyVars['butt_other'] += 1
+				'Feels like your butt has grown slightly.'
+			end
+			killvar 'temp'
+		end
+	else
+		if drugVars['butt_injection_dose'] < 1:
+			'<font color = #DB7093>You inject the KBI formula into your ass.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['butt_injection'] -= 1
+				if mc_inventory['butt_injection'] <= 0: mc_inventory['butt_injection'] = 0 & msg 'That was your last KBI shot.'
+			end
+
+			drugVars['butt_injection_used'] += 1
+			drugVars['butt_injection_dose'] = 1
+		else
+			'Using any more injections won''t have any effect.'
+		end
+		gs 'stat'
+	end
+
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end

locations/emp_functions.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
 
-	msg '<<$msg_body>>'
+	msg $msg_body
 	killvar '$msg_body'
 end
 
@@ -300,17 +300,14 @@ if $ARGS[0] = 'gen_evt':
 	transient_evt_minutes = rand(0, 9)
 
 	!! Set as multiples of 60
-	if transient_evt_duration = '':
-		transient_evt_duration = rand(1,8)
-	end
-	!! logic check for when randomising event duration
+	if transient_evt_duration <= 0: transient_evt_duration = rand(1,8)
 
+	!! logic check for when randomising event duration
 	if transient_evt_duration + transient_evt_hour >= 22:
 		transient_evt_hour = 22 - transient_evt_duration
 	end
 
 	!! find a suitable date
-
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
@@ -476,7 +473,7 @@ end
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '':
+	if ARGS[1] ! 0:
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -486,7 +483,7 @@ if $ARGS[0] = 'evt_day_suffix':
 	else
 		test_day = query_day
 	end
-	if transient_evt_day ! '':
+	if transient_evt_day ! 0:
 		if test_day => 4 and test_day <= 10:
 			$evt_suffix = 'th'
 		elseif test_day = 1 or test_day = 31:

locations/ender.qsrc

@@ -203,7 +203,7 @@ if $ARGS[0] = 'loss':
 		gs 'pain', 5, 'thighs', 'kick'
 		gs 'pain', 5, 'hair', 'stretch'
 		dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] = 0'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		'You do your best, but there are just too many of them. Eventually they get you down on the ground and beat you, ripping out handfuls of your hair and tearing your clothes.'
 		'After what feels like an eternity, they finally stop hitting you. "That''s what you get, you stupid bitch." Then the girl spits on you, with the rest of the gang following suit and spitting on you as well. Finally they get bored of tormenting you further and leave, laughing about how they beat the ugly girls ass.'
@@ -283,10 +283,11 @@ if $ARGS[0] = 'loss':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -535,7 +536,7 @@ if $ARGS[0] = 'win':
 	elseif fightEnding = 14:
 		fightEnding = 0
 		Win += 1
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 
@@ -598,10 +599,11 @@ if $ARGS[0] = 'win':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -907,7 +909,7 @@ if $ARGS[0] = 'surrender':
 		fightEnding = 0
 		Loss += 1
 		gs 'pain', 5, 'hair', 'stretch'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		if fightPStats['Health'] = pcs_health:
 			'Just the mere thought of a fight, your knees go weak and you feel yourself being out of breath. Before even the first punch is thrown you raise up your hands and squeak out in fear. "Don''t hurt me, I give up."'
@@ -997,10 +999,11 @@ if $ARGS[0] = 'surrender':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'

locations/food.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'pirosh':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 5
 	fat += 4
@@ -51,7 +51,7 @@ if $ARGS[0] = 'golub':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -87,7 +87,7 @@ if $ARGS[0] = 'pozhar':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 10
 	fat += 6
@@ -123,7 +123,7 @@ if $ARGS[0] = 'reuben':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 25
 	fat += 12
@@ -159,7 +159,7 @@ if $ARGS[0] = 'bliny':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -195,7 +195,7 @@ if $ARGS[0] = 'varenfan':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 15
 	fat += 10
@@ -224,7 +224,7 @@ if $ARGS[0] = 'salfan':
 	*clr & cla
 	frost = 0
 	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 12
@@ -254,7 +254,7 @@ if $ARGS[0] = 'strofan':
 	*clr & cla
 	frost = 0
 	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 30
 	fat += 6
@@ -284,7 +284,7 @@ if $ARGS[0] = 'borfan':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 25
 	fat += 4
@@ -314,7 +314,7 @@ if $ARGS[0] = 'blifan':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 30
 	pcs_mood += 40
 	fat += 6
@@ -344,7 +344,7 @@ if $ARGS[0] = 'ryesna':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 10
 	fat += 4
@@ -374,7 +374,7 @@ if $ARGS[0] = 'crisps':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 20
 	fat += 16
@@ -404,7 +404,7 @@ if $ARGS[0] = 'onring':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 16
@@ -434,7 +434,7 @@ if $ARGS[0] = 'vegburg':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 10
 	fat += 8
@@ -464,7 +464,7 @@ if $ARGS[0] = 'turburg':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 10
 	fat += 10
@@ -494,7 +494,7 @@ if $ARGS[0] = 'batfish':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 15
 	fat += 11
@@ -524,7 +524,7 @@ if $ARGS[0] = 'cheburg':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 14
@@ -554,7 +554,7 @@ if $ARGS[0] = 'snack':
 	*clr & cla
 	gs 'stat'
 	minut += 5
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	fat += 6
@@ -577,8 +577,8 @@ end
 if $ARGS[0] = 'f_food':
 	*clr & cla
 	frost = 0
-	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	minut += 10
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 14
 	pcs_energy += 70
@@ -607,7 +607,7 @@ if $ARGS[0] = 's_meal':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 4
 	pcs_energy += 40
@@ -635,8 +635,8 @@ end
 if $ARGS[0] = 'm_meal':
 	*clr & cla
 	frost = 0
-	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	minut += 15
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 8
 	pcs_energy += 60
@@ -665,8 +665,8 @@ end
 if $ARGS[0] = 'l_meal':
 	*clr & cla
 	frost = 0
-	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	minut += 20
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 14
 	pcs_energy += 100
@@ -696,7 +696,7 @@ if $ARGS[0] = 'bag_lunch':
 	*clr & cla
 	frost = 0
 	minut += 15
-	! money -= val($_eat['<<args[1]>>,price'])
+	! money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 5
 	pcs_energy += 40
@@ -719,7 +719,7 @@ if $ARGS[0] = 'h_food':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 7
 	money -= 100
@@ -750,7 +750,7 @@ if $ARGS[0] = 'h_meal':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	fat += 1
 	pcs_energy += 50
@@ -779,7 +779,7 @@ if $ARGS[0] = 'jerky':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 1
 	pcs_hydra -= 15
@@ -804,7 +804,7 @@ if $ARGS[0] = 'meat_stew':
 	*clr & cla
 	frost = 0
 	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 3
 	pcs_energy += 50
@@ -834,7 +834,7 @@ if $ARGS[0] = 'mush_soup':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 3
 	pcs_energy += 40
@@ -863,8 +863,8 @@ end
 if $ARGS[0] = 'bilberry':
 	*clr & cla
 	gs 'stat'
-	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	minut += 5
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 10
 	fat += 1
@@ -962,7 +962,7 @@ end
 if $ARGS[0] = 'only_cost_snack':
 	*clr & cla
 	gs 'stat'
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	fat += 6
@@ -979,7 +979,7 @@ end
 
 if $ARGS[0] = 'only_cost_light_snack':
 	*clr & cla
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 20
 	fat += 3
@@ -1069,7 +1069,7 @@ end
 if $ARGS[0] = 'only_cost_pirosh':
 	*clr & cla
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 5
 	fat += 4
@@ -1093,7 +1093,7 @@ end
 
 if $ARGS[0] = 'only_cost_golub':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -1117,7 +1117,7 @@ end
 
 if $ARGS[0] = 'only_cost_pozhar':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 10
 	fat += 6
@@ -1141,7 +1141,7 @@ end
 
 if $ARGS[0] = 'only_cost_reuben':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 25
 	fat += 12
@@ -1165,7 +1165,7 @@ end
 
 if $ARGS[0] = 'only_cost_bliny':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8

locations/food_menu.qsrc

@@ -34,38 +34,38 @@ if $loc = 'burger':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
+	_drink['1,price'] = 55
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
+	_drink['2,price'] = 70
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
+	_drink['3,price'] = 110
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
+	_drink['4,price'] = 120
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
+	_drink['5,price'] = 180
 elseif $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
@@ -74,73 +74,73 @@ elseif $loc = 'gkafe':
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
-		$_eat['0,price'] = 'Free'
+		_eat['0,price'] = 0
 		$_eat['1,name'] = 'Herring Blini'
 		$_eat['1,type'] = 'bliny'
-		$_eat['1,price'] = 'Free'
+		_eat['1,price'] = 0
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
-		$_eat['2,price'] = 'Free'
+		_eat['2,price'] = 0
 		$_eat['3,name'] = 'Pozharsky Cutlets'
 		$_eat['3,type'] = 'pozhar'
-		$_eat['3,price'] = 'Free'
+		_eat['3,price'] = 0
 		$_eat['4,name'] = 'Rueben Sandwich'
 		$_eat['4,type'] = 'reuben'
-		$_eat['4,price'] = 'Free'
+		_eat['4,price'] = 0
 
 		$_drink['0,name'] = 'Water'
 		$_drink['0,type'] = 'bev_wat'
-		$_drink['0,price'] = 'Free'
+		_drink['0,price'] = 0
 		$_drink['1,name'] = 'Kvass'
 		$_drink['1,type'] = 'bev_kva'
-		$_drink['1,price'] = 'Free'
+		_drink['1,price'] = 0
 		$_drink['2,name'] = 'Juice'
 		$_drink['2,type'] = 'bev_jui'
-		$_drink['2,price'] = 'Free'
+		_drink['2,price'] = 0
 		$_drink['3,name'] = 'Spiced Tea'
 		$_drink['3,type'] = 'bev_tea'
-		$_drink['3,price'] = 'Free'
+		_drink['3,price'] = 0
 		$_drink['4,name'] = 'Black Coffee'
 		$_drink['4,type'] = 'bev_cof'
-		$_drink['4,price'] = 'Free'
+		_drink['4,price'] = 0
 		$_drink['5,name'] = 'Milkshake'
 		$_drink['5,type'] = 'bev_mil'
-		$_drink['5,price'] = 'Free'
+		_drink['5,price'] = 0
 	else
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
-		$_eat['0,price'] = 100
+		_eat['0,price'] = 100
 		$_eat['1,name'] = 'Herring Blini'
 		$_eat['1,type'] = 'bliny'
-		$_eat['1,price'] = 190
+		_eat['1,price'] = 190
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
-		$_eat['2,price'] = 210
+		_eat['2,price'] = 210
 		$_eat['3,name'] = 'Pozharsky Cutlets'
 		$_eat['3,type'] = 'pozhar'
-		$_eat['3,price'] = 290
+		_eat['3,price'] = 290
 		$_eat['4,name'] = 'Rueben Sandwich'
 		$_eat['4,type'] = 'reuben'
-		$_eat['4,price'] = 340
+		_eat['4,price'] = 340
 
 		$_drink['0,name'] = 'Water'
 		$_drink['0,type'] = 'bev_wat'
-		$_drink['0,price'] = 'Free'
+		_drink['0,price'] = 0
 		$_drink['1,name'] = 'Kvass'
 		$_drink['1,type'] = 'bev_kva'
-		$_drink['1,price'] = 60
+		_drink['1,price'] = 60
 		$_drink['2,name'] = 'Juice'
 		$_drink['2,type'] = 'bev_jui'
-		$_drink['2,price'] = 80
+		_drink['2,price'] = 80
 		$_drink['3,name'] = 'Spiced Tea'
 		$_drink['3,type'] = 'bev_tea'
-		$_drink['3,price'] = 120
+		_drink['3,price'] = 120
 		$_drink['4,name'] = 'Black Coffee'
 		$_drink['4,type'] = 'bev_cof'
-		$_drink['4,price'] = 130
+		_drink['4,price'] = 130
 		$_drink['5,name'] = 'Milkshake'
 		$_drink['5,type'] = 'bev_mil'
-		$_drink['5,price'] = 200
+		_drink['5,price'] = 200
 	end
 elseif $loc = 'brothel':
 	'<center><h3>Hotel Bar</h3></center>'
@@ -148,33 +148,33 @@ elseif $loc = 'brothel':
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
-	$_eat['1,price'] = 40
+	_eat['1,price'] = 40
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Beer on tap'
 	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Vodka'
 	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Scotch'
 	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
+	_drink['3,price'] = 140
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
+	_drink['4,price'] = 160
 	$_drink['5,name'] = 'Black Russian'
 	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
+	_drink['5,price'] = 250
 	if hotelWhore = 1:
 		$_drink['6,name'] = 'Blue-blooded Russian'
 		$_drink['6,type'] = 'bev_bbr'
-		$_drink['6,price'] = 'Free'
+		_drink['6,price'] = 0
 	end
 elseif $loc = 'cafe_parco':
 	'<center><h4><font color="maroon">Cafe "Del Parco"</font></h4></center>'
@@ -183,38 +183,38 @@ elseif $loc = 'cafe_parco':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'city_kafe':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
@@ -222,181 +222,181 @@ elseif $loc = 'city_kafe':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
+	_drink['1,price'] = 55
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
+	_drink['2,price'] = 70
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
+	_drink['3,price'] = 110
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
+	_drink['4,price'] = 120
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
+	_drink['5,price'] = 180
 elseif $loc = 'lakecafe':
 	'<center><B><font color=maroon>The Lake Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'pushkin_cafe':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'ParkKafe':
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'qwBarPolet':
 	'<center><b><font color="maroon">Bar "Rabotnik"</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
-	$_eat['1,price'] = 40
+	_eat['1,price'] = 40
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Beer on tap'
 	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Vodka'
 	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Scotch'
 	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
+	_drink['3,price'] = 140
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
+	_drink['4,price'] = 160
 	$_drink['5,name'] = 'Black Russian'
 	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
+	_drink['5,price'] = 250
 elseif $loc = 'restoran':
 	'<center><b><font color="maroon">Babel</font></b></center>'
 	*nl
@@ -404,76 +404,76 @@ elseif $loc = 'restoran':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vareniki with Potatoes'
 	$_eat['0,type'] = 'varenfan'
-	$_eat['0,price'] = 760
+	_eat['0,price'] = 760
 	$_eat['1,name'] = 'Borscht and French Baguette'
 	$_eat['1,type'] = 'borfan'
-	$_eat['1,price'] = 900
+	_eat['1,price'] = 900
 	$_eat['2,name'] = 'Atlantic Salmon Steak'
 	$_eat['2,type'] = 'salfan'
-	$_eat['2,price'] = 1000
+	_eat['2,price'] = 1000
 	$_eat['3,name'] = 'Beef & Mushroom Stroganoff'
 	$_eat['3,type'] = 'strofan'
-	$_eat['3,price'] = 1200
+	_eat['3,price'] = 1200
 	$_eat['4,name'] = 'Red Caviar Blinchiki'
 	$_eat['4,type'] = 'blifan'
-	$_eat['4,price'] = 1360
+	_eat['4,price'] = 1360
 
 	$_drink['0,name'] = 'Spring Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Imported Tea'
 	$_drink['1,type'] = 'bev_tea'
-	$_drink['1,price'] = 180
+	_drink['1,price'] = 180
 	$_drink['2,name'] = 'Imported Beer'
 	$_drink['2,type'] = 'bev_bee'
-	$_drink['2,price'] = 200
+	_drink['2,price'] = 200
 	$_drink['3,name'] = 'Vodka Martini'
 	$_drink['3,type'] = 'bev_mar'
-	$_drink['3,price'] = 400
+	_drink['3,price'] = 400
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 800
+	_drink['4,price'] = 800
 	$_drink['5,name'] = 'Glass of Champagne'
 	$_drink['5,type'] = 'bev_cha'
-	$_drink['5,price'] = 900
+	_drink['5,price'] = 900
 elseif $loc = 'uni_cafe':
 	'<center><b><font color="maroon">University cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'only_cost_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'only_cost_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'only_cost_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'only_cost_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'only_cost_bco'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'only_cost_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'city_coffee_hole':
 	$loc_arg = 'eat'
 	'<center><B><font color=maroon>Cafe "Coffee hole"</font></B></center>'
@@ -481,88 +481,88 @@ elseif $loc = 'city_coffee_hole':
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Biscotti'
 	$_eat['0,type'] = 'only_cost_light_snack'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Cannoli'
 	$_eat['1,type'] = 'only_cost_snack'
-	$_eat['1,price'] = 120
+	_eat['1,price'] = 120
 	$_eat['2,name'] = 'Muffin'
 	$_eat['2,type'] = 'only_cost_snack'
-	$_eat['2,price'] = 120
+	_eat['2,price'] = 120
 	$_eat['3,name'] = 'Croissants'
 	$_eat['3,type'] = 'only_cost_snack'
-	$_eat['3,price'] = 120
+	_eat['3,price'] = 120
 	$_eat['4,name'] = 'Danish'
 	$_eat['4,type'] = 'only_cost_snack'
-	$_eat['4,price'] = 120
+	_eat['4,price'] = 120
 	$_eat['5,name'] = 'Cookies'
 	$_eat['5,type'] = 'only_cost_light_snack'
-	$_eat['5,price'] = 100
+	_eat['5,price'] = 100
 	$_eat['6,name'] = 'Miagkie Plushki s Sakharom'
 	$_eat['6,type'] = 'only_cost_snack'
-	$_eat['6,price'] = 120
+	_eat['6,price'] = 120
 	$_eat['7,name'] = 'Mannik'
 	$_eat['7,type'] = 'only_cost_snack'
-	$_eat['7,price'] = 120
+	_eat['7,price'] = 120
 	$_eat['8,name'] = 'Korzinochki'
 	$_eat['8,type'] = 'only_cost_snack'
-	$_eat['8,price'] = 120
+	_eat['8,price'] = 120
 
 	$_drink['0,name'] = 'Tea'
 	$_drink['0,type'] = 'only_cost_tea'
-	$_drink['0,price'] = 120
+	_drink['0,price'] = 120
 	$_drink['1,name'] = 'Espresso'
 	$_drink['1,type'] = 'only_cost_esp'
-	$_drink['1,price'] = 100
+	_drink['1,price'] = 100
 	$_drink['2,name'] = 'Black Coffee'
 	$_drink['2,type'] = 'only_cost_bco'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Cappuccino'
 	$_drink['3,type'] = 'only_cost_cof'
-	$_drink['3,price'] = 150
+	_drink['3,price'] = 150
 	$_drink['4,name'] = 'Cafe Latte'
 	$_drink['4,type'] = 'only_cost_cof'
-	$_drink['4,price'] = 150
+	_drink['4,price'] = 150
 	$_drink['5,name'] = 'Iced Latte'
 	$_drink['5,type'] = 'only_cost_cof'
-	$_drink['5,price'] = 150
+	_drink['5,price'] = 150
 elseif $loc = 'city_nightclub':
 	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Energy Drink'
 	$_drink['1,type'] = 'bev_energy_drink'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Beer on tap'
 	$_drink['2,type'] = 'bev_bee'
-	$_drink['2,price'] = 60
+	_drink['2,price'] = 60
 	$_drink['3,name'] = 'Vodka'
 	$_drink['3,type'] = 'bev_vod'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Scotch'
 	$_drink['4,type'] = 'bev_sco'
-	$_drink['4,price'] = 140
+	_drink['4,price'] = 140
 	$_drink['5,name'] = 'Glass of Wine'
 	$_drink['5,type'] = 'bev_win'
-	$_drink['5,price'] = 160
+	_drink['5,price'] = 160
 	$_drink['6,name'] = 'Black Russian'
 	$_drink['6,type'] = 'bev_bla'
-	$_drink['6,price'] = 250
+	_drink['6,price'] = 250
 	$_drink['7,name'] = 'Champagne'
 	$_drink['7,type'] = 'bev_cha'
-	$_drink['7,price'] = 220
+	_drink['7,price'] = 220
 	$_drink['8,name'] = 'Vodka Martini'
 	$_drink['8,type'] = 'bev_mar'
-	$_drink['8,price'] = 250
+	_drink['8,price'] = 250
 	$_drink['9,name'] = 'Fancy cocktail'
 	$_drink['9,type'] = 'bev_cocktail'
-	$_drink['9,price'] = 300
+	_drink['9,price'] = 300
 elseif $loc = 'katja_nightclub' or $loc = 'katja_nightclub_sex':
 	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
 	*nl
@@ -573,34 +573,34 @@ elseif $loc = 'katja_nightclub' or $loc = 'katja_nightclub_sex':
 	end
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'only_cost_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Energy Drink'
 	$_drink['1,type'] = 'only_cost_bev_energy_drink'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Beer on tap'
 	$_drink['2,type'] = 'only_cost_bev_bee'
-	$_drink['2,price'] = 60
+	_drink['2,price'] = 60
 	$_drink['3,name'] = 'Vodka'
 	$_drink['3,type'] = 'only_cost_bev_vod'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Scotch'
 	$_drink['4,type'] = 'only_cost_bev_sco'
-	$_drink['4,price'] = 140
+	_drink['4,price'] = 140
 	$_drink['5,name'] = 'Glass of Wine'
 	$_drink['5,type'] = 'only_cost_bev_win'
-	$_drink['5,price'] = 160
+	_drink['5,price'] = 160
 	$_drink['6,name'] = 'Black Russian'
 	$_drink['6,type'] = 'only_cost_bev_bla'
-	$_drink['6,price'] = 250
+	_drink['6,price'] = 250
 	$_drink['7,name'] = 'Champagne'
 	$_drink['7,type'] = 'only_cost_bev_cha'
-	$_drink['7,price'] = 220
+	_drink['7,price'] = 220
 	$_drink['8,name'] = 'Vodka Martini'
 	$_drink['8,type'] = 'only_cost_bev_mar'
-	$_drink['8,price'] = 250
+	_drink['8,price'] = 250
 	$_drink['9,name'] = 'Fancy cocktail'
 	$_drink['9,type'] = 'only_cost_bev_cocktail'
-	$_drink['9,price'] = 300
+	_drink['9,price'] = 300
 end
 
 $_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'
@@ -612,12 +612,12 @@ food_loop = 0
 !!  column 1 - food
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_eat['<<food_loop>>,name'] + '</td>'
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= val($_eat['<<food_loop>>,price']):
-		$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + $_eat['<<food_loop>>,price'] + '</a>'
+	if money >= _eat['<<food_loop>>,price']:
+		$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + iif(_eat['<<food_loop>>,price'] ! 0, str(_eat['<<food_loop>>,price']),'Free') + '</a>'
 	else
-		$_str += $_eat['<<food_loop>>,price']
+		$_str += str(_eat['<<food_loop>>,price'])
 	end
-	$_str += iif(val($_eat['<<food_loop>>,price']) ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
+	$_str += iif(_eat['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 !!  separator
 	$_str += '<td bgcolor=<<$bcolor>> border="0" width="50" cellpadding="0" cellspacing="0"></td>'
@@ -625,12 +625,12 @@ food_loop = 0
 !!  column 2 - drinks
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_drink['<<food_loop>>,name'] + '</td>'
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= val($_drink['<<food_loop>>,price']):
-		$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + $_drink['<<food_loop>>,price'] + '</a>'
+	if money >= _drink['<<food_loop>>,price']:
+		$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + iif(_drink['<<food_loop>>,price'] ! 0, str(_drink['<<food_loop>>,price']),'Free') + '</a>'
 	else
-		$_str += $_drink['<<food_loop>>,price']
+		$_str += str(_drink['<<food_loop>>,price'])
 	end
-	$_str += iif(val($_drink['<<food_loop>>,price']) ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
+	$_str += iif(_drink['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 	$_str += '</tr>'
 	food_loop += 1

locations/gad_gphouse.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 	$locclass = 'singleroom'
 	display_bb = 1
 	frost = 0
-	
+
 	gs 'homes_properties', 'give_access', 'grandparents_house'
 
 	gs 'gad_gphouse', 'nudity_trouble_limit'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'main':
 
 	if hour < 8:
 		temp = rand(0,9)
-		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 1:
 		temp = rand(0,2)
 		if temp = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'
@@ -361,9 +361,9 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
 	end
 
-	if locat['A60'] = 21: 
+	if locat['A60'] = 21:
 		if MiraVars['guest'] = 0:
-			MiraVars['follow_time'] = 1
+			if MiraVars['follow_time'] < 1: MiraVars['follow_time'] = 1
 			gt 'gad_gphouse', 'start'
 		else
 			MiraVars['follow_time'] = 0
@@ -472,7 +472,7 @@ if $ARGS[0] = 'main':
 	if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
 
 	if pcs_sewng >= 80:
-		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
 			act'Start a new tapestry': gt 'sewing', 'tapestry'
 		elseif newgobelen >= 1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'

locations/gdktoilet.qsrc

@@ -76,8 +76,8 @@ if $ARGS[0] = 'start':
 		CLOSE ALL
 	end
 
-	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'pav_library'
-	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
+	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
+	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
 	if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the gym': gt 'gdksport', 'start'
 	act 'Change outfit in the locker room': gt 'wardrobe', 'start'
 end

locations/goplust.qsrc

@@ -108,7 +108,7 @@ $namgop[0] = ''
 $gopnik = ''
 
 if gopV = 1:
-	$gopnik += '<<$gopV>>'
+	$gopnik += $gopV
 	if gopB + gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopB + gopVi + gopK + gopU + gopS = 1:
@@ -117,7 +117,7 @@ if gopV = 1:
 end
 
 if $namgop[1] ! '':
-	$namgop[0] += '<<$namgop[1]>>'
+	$namgop[0] += $namgop[1]
 	if namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -126,7 +126,7 @@ if $namgop[1] ! '':
 end
 
 if gopB = 1:
-	$gopnik += '<<$gopB>>'
+	$gopnik += $gopB
 	if gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopVi + gopK + gopU + gopS = 1:
@@ -135,7 +135,7 @@ if gopB = 1:
 end
 
 if $namgop[2] ! '':
-	$namgop[0] += '<<$namgop[2]>>'
+	$namgop[0] += $namgop[2]
 	if namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -144,7 +144,7 @@ if $namgop[2] ! '':
 end
 
 if gopVi = 1:
-	$gopnik += '<<$gopVi>>'
+	$gopnik += $gopVi
 	if gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopK + gopU + gopS = 1:
@@ -152,8 +152,8 @@ if gopVi = 1:
 	end
 end
 
-if namgop[3] ! '':
-	$namgop[0] += '<<$namgop[3]>>'
+if $namgop[3] ! '':
+	$namgop[0] += $namgop[3]
 	if namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[4] + namgop[5] + namgop[6] = 1:
@@ -162,7 +162,7 @@ if namgop[3] ! '':
 end
 
 if gopK = 1:
-	$gopnik += '<<$gopK>>'
+	$gopnik += $gopK
 	if gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopU + gopS = 1:
@@ -170,8 +170,8 @@ if gopK = 1:
 	end
 end
 
-if namgop[4] ! '':
-	$namgop[0] += '<<$namgop[4]>>'
+if $namgop[4] ! '':
+	$namgop[0] += $namgop[4]
 	if namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[5] + namgop[6] = 1:
@@ -180,18 +180,18 @@ if namgop[4] ! '':
 end
 
 if gopU = 1:
-	$gopnik += '<<$gopU>>'
+	$gopnik += $gopU
 	if gopS = 1:$gopnik += ' and '
 end
 
-if namgop[5] ! '':
-	$namgop[0] += '<<$namgop[5]>>'
+if $namgop[5] ! '':
+	$namgop[0] += $namgop[5]
 	if namgop[6] = 1:$gopnik += ' and '
 end
 
-if gopS = 1:$gopnik += '<<$gopS>>'
+if gopS = 1:$gopnik += $gopS
 
-if namgop[6] ! '':$namgop[0] += '<<$namgop[6]>>'
+if $namgop[6] ! '':$namgop[0] += $namgop[6]
 
 $namgop[0] += ' strip off your clothes and get out their members'
 

locations/gschool_chats.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'nerds':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 		if PCloStyle2 = 4:
-			if PCloInhibit <= 10:
+			if PCloInhibit <= 5:
 				grupvalue[3] += 1
 				if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
 				gs 'gschool_socialchg', 'group_rel_change', 'nerds', 1
@@ -51,7 +51,7 @@ if $ARGS[0] = 'nerds':
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
@@ -73,7 +73,7 @@ if $ARGS[0] = 'nerds':
 				*nl
 				gs 'gschool_groups', 'nerds'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloInhibit >= 35:
+				if PCloInhibit >= 35 or PCloTopCut = 4:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
@@ -83,7 +83,7 @@ if $ARGS[0] = 'nerds':
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
@@ -166,13 +166,13 @@ if $ARGS[0] = 'gopniks':
 					grupvalue[4] -= 10
 					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -5
 					gs 'npc_relationship', 'modify', 'A189', 5
-					
+
 					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 					'A few of them stare at you before Dan laughs and Lavrenti speaks up. "What are you wearing?" They seem stunned at your uniform as Anushka chimes in. "Please tell me you just lost some kind of bet?" Several others comment, all expressing displeasure at your choice of uniform. After a few minutes of ridicule, they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
 				else
 					grupvalue[4] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -2
-					
+
 					'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.'
 					'A few of them stare at you before Radomir speaks up. "Are you lost or something?" Pauline then chimes in, pointing back the way you came. "The nerds are back that way, loser." Several others also comment, all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy.'
 				end
@@ -227,7 +227,7 @@ if $ARGS[0] = 'gopniks':
 					gs 'npc_relationship', 'modify', 'A9', 'dislike'
 					pcs_mood -= 10
 					gs 'stat'
-					
+
 					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					*nl
 					'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'gopniks':
 					gs 'npc_relationship', 'modify', 'A9', 'hate'
 					pcs_mood -= 10
 					gs 'stat'
-					
+
 					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks over to you before grabbing you roughly by the arm and dragging you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				elseif grupTipe = 4:
@@ -248,7 +248,7 @@ if $ARGS[0] = 'gopniks':
 				else
 					grupvalue[4] -= 5
 					gs 'fame', 'pav', 'sex', 3
-					
+
 					'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. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me," Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					gs 'gschool_groups', 'gopniks'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -293,7 +293,7 @@ if $ARGS[0] = 'cooljocks':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
 		'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know while the guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.'
 		if PCloStyle2 = 4:
-			if PCloInhibit <= 10:
+			if PCloInhibit <= 5:
 				if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
 				grupvalue[1] -= 5
 				grupvalue[2] -= 3
@@ -341,7 +341,7 @@ if $ARGS[0] = 'cooljocks':
 					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
 					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
 					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
@@ -354,8 +354,8 @@ if $ARGS[0] = 'cooljocks':
 					gs 'npc_relationship', 'modify', 'A139', 'dislike'
 					gs 'npc_relationship', 'modify', 'A140', 'dislike'
 					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
-                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
-                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+					'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+					'"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
 				elseif PCloQuality >= 4:
 					grupvalue[1] += 1
 					grupvalue[2] += 1
@@ -368,7 +368,7 @@ if $ARGS[0] = 'cooljocks':
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 1
 					gs 'npc_relationship', 'modify', 'A139', 1
 					gs 'npc_relationship', 'modify', 'A140', 1
-					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
+					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.'
 					'"Yeah I like it, it looks very nice," Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
 				else
 					'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Christina, Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
@@ -377,7 +377,7 @@ if $ARGS[0] = 'cooljocks':
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloInhibit >= 35:
+				if PCloInhibit >= 35 or PCloTopCut = 4:
 					gs 'fame', 'pav', 'sex', 5
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
@@ -393,7 +393,7 @@ if $ARGS[0] = 'cooljocks':
 					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
 					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
 					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
@@ -406,16 +406,16 @@ if $ARGS[0] = 'cooljocks':
 					gs 'npc_relationship', 'modify', 'A139', 'dislike'
 					gs 'npc_relationship', 'modify', 'A140', 'dislike'
 					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
-                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
-                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+					'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+					'"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
 				elseif PCloQuality >= 4:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', 1
 					grupvalue[1] += 2
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1
 					grupvalue[2] += 1
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-					
-					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
+
+					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.'
 					'"Yeah, looking sexy <<$pcs_nickname>>!" Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe to you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
 				else
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1, 'male'

locations/gschool_gopnik_chats.qsrc

@@ -87,13 +87,13 @@ if $ARGS[0] = 'vitek':
 		if npc_rel['A9'] >= 70:
 			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. "Hey, you''re friends with Zinaida, right?" Vitek asks when they notice you.'
 			'"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' 
+			'"No no, nothing like that. We thought, being her friend, you could take a picture of Zinaida''s tits for us, you know?" He mimics 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
-			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. "This isn''t the place where good girls like you should hang out." Vitek says when they notice you and tries to direct you back to where you came from.'
+			'You sit on the stairs near Vitek and listen to him, Dan and Vasily telling stories. "This isn''t the place where good girls like you should hang out." Vitek says when they notice you and try to direct you back to where you came from.'
 			'"Girls like me?" you reply.'
 			'"You know... Whatever, just keep quiet." He lights his cigarette and returns to chatting with the boys.'
 		end
@@ -135,7 +135,7 @@ if $ARGS[0] = 'radomir':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 	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.'
+		'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 sometime, 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'
@@ -148,6 +148,11 @@ if $ARGS[0] = 'radomir':
 					gopnikbandQW['practice_invite'] = 1
 					'After the bell rings, you start to head to class when Radomir calls out to you. "Hey, you should stop by the garages sometime and listen to us." You tell him you will and you both head to class.'
 				end
+				if npc_rel['A154'] >= 50 and radomirQW['first_visit'] = 0:
+					'"Hey <<$pcs_nickname>>, you should come over to my place today and hangout, what do you say?"'
+					act 'Not today': gt 'gschool_gopnik_chats', 'rad_invite_no'
+					act 'Sure': gt 'gschool_gopnik_chats', 'rad_invite_yes'
+				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')
@@ -175,6 +180,11 @@ if $ARGS[0] = 'radomir':
 					gopnikbandQW['practice_invite'] = 1
 					'After the bell rings, you start to head to class when Radomir calls out to you. "Hey, you should stop by the garages sometime and listen to us." You tell him you will and you both head to class.'
 				end
+				if npc_rel['A154'] >= 50 and radomirQW['first_visit'] = 0:
+					'"Hey <<$pcs_nickname>>, you should come over to my place today and hangout, what do you say?"'
+					act 'Not today': gt 'gschool_gopnik_chats', 'rad_invite_no'
+					act 'Sure': gt 'gschool_gopnik_chats', 'rad_invite_yes'
+				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')
@@ -202,6 +212,11 @@ if $ARGS[0] = 'radomir':
 					gopnikbandQW['practice_invite'] = 1
 					'After the bell rings, you start to head to class when Radomir calls out to you. "Hey, you should stop by the garages sometime and listen to us." You tell him you will and you both head to class.'
 				end
+				if npc_rel['A154'] >= 50 and radomirQW['first_visit'] = 0:
+					'"Hey <<$pcs_nickname>>, you should come over to my place today and hangout, what do you say?"'
+					act 'Not today': gt 'gschool_gopnik_chats', 'rad_invite_no'
+					act 'Sure': gt 'gschool_gopnik_chats', 'rad_invite_yes'
+				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')
@@ -229,6 +244,11 @@ if $ARGS[0] = 'radomir':
 					gopnikbandQW['practice_invite'] = 1
 					'After the bell rings, you start to head to class when Radomir calls out to you. "Hey, you should stop by the garages sometime and listen to us." You tell him you will and you both head to class.'
 				end
+				if npc_rel['A154'] >= 50 and radomirQW['first_visit'] = 0:
+					'"Hey <<$pcs_nickname>>, you should come over to my place today and hangout, what do you say?"'
+					act 'Not today': gt 'gschool_gopnik_chats', 'rad_invite_no'
+					act 'Sure': gt 'gschool_gopnik_chats', 'rad_invite_yes'
+				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')
@@ -254,6 +274,29 @@ if $ARGS[0] = 'radomir':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
+if $ARGS[0] = 'rad_invite_no':
+	*clr & cla
+	menu_off = 1
+	gs 'npc_relationship', 'modify', 'A154', 'loathe'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
+	'"Sorry, but I can''t. Maybe some other time?" you reply.'
+	'He frowns and shrugs. "Sure, whatever."'
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+end
+
+if $ARGS[0] = 'rad_invite_yes':
+	*clr & cla
+	menu_off = 1
+	radomirQW['meet_after_school'] = 1
+	gs 'npc_relationship', 'modify', 'A154', 'like'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
+	'"Yeah, I would like that," you reply.'
+	'"Nice babe, I''ll wait for you at the doors after school."'
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+end
+
 if $ARGS[0] = 'roman':
 	*clr & cla
 	menu_off = 1
@@ -379,14 +422,14 @@ if $ARGS[0] = 'valentin':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if grupTipe = 4 and gopnik_slut = 1:
 		'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."'
+		'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 sometime. 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."'
+			'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.'
@@ -442,7 +485,7 @@ if $ARGS[0] = 'valentin':
 			'"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.'
 		else
 			'"Hey, Valentin!" you greet him as you approach.'
-			'He gives you a slight chin up greeting. "Hey <<$pcs_nickname>>. What do you need?"'
+			'He gives you a slight chin-up greeting. "Hey <<$pcs_nickname>>. What do you need?"'
 			'"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
@@ -466,7 +509,7 @@ if $ARGS[0] = 'valentin':
 			'"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.'
 		else
 			'"Hey Valentin!" you greet him as you approach.'
-			'He gives you a slight chin up greeting. "Hey <<$pcs_nickname>>. You get lost little nerd?"'
+			'He gives you a slight chin-up greeting. "Hey <<$pcs_nickname>>. You get lost little nerd?"'
 			'"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
@@ -475,7 +518,7 @@ if $ARGS[0] = 'valentin':
 		if npc_rel['A158'] >= 50:
 			'Valentin calls out to you as you approach. "Hey <<$pcs_nickname>>, do anything fun lately?"'
 			'You smile as you reply. "You know, this and that, causing a bit of mayhem when I can."'
-			'Valentin laughs. "Well then, we should hang out sometime and see what we can get up to together." His suggestive look and tone of voice makes it sound dirty. You don''t know if he''s being serious or is joking.'
+			'Valentin laughs. "Well then, we should hang out sometime and see what we can get up to together." His suggestive look and tone of voice make it sound dirty. You don''t know if he''s being serious or is joking.'
 			'You just shake your head at his comment and the two of you engage in a friendly conversation, mostly about the band or his bike.'
 			act 'Ask for a ride on his bike':
 				cla & *nl
@@ -492,7 +535,7 @@ if $ARGS[0] = 'valentin':
 			'"Hey Valentin!" you greet him as you approach.'
 			'He gives you a slight nod in greeting.'
 			'"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.'
+			'"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
@@ -519,7 +562,7 @@ if $ARGS[0] = 'shulga':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big11.jpg"></center>'
 	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.'
+		'"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:
@@ -697,7 +740,7 @@ if $ARGS[0] = 'lavrenti':
 		if npc_rel['A155'] >= 50:
 			'You approach Lavrenti as he leans against the wall near the stairs. "So, what''s up with you 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?"'
+			'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."'
@@ -727,8 +770,8 @@ if $ARGS[0] = 'lavrenti':
 		if npc_rel['A155'] >= 50:
 			'You approach Lavrenti as he leans against the wall near the stairs. "So, what''s up with you 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.'
+			'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':
@@ -750,7 +793,7 @@ if $ARGS[0] = 'lavrenti':
 		if npc_rel['A155'] >= 50:
 			'You approach Lavrenti as he leans against the wall near the stairs. "So, what''s up with you 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?"'
+			'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."'
@@ -766,7 +809,7 @@ if $ARGS[0] = 'lavrenti':
 			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?"'
+				!!'You bite your lip and look at him with the cutest look you can muster. "Think I can get an invite?"'
 				!!'He frowns at you. "Why the fuck would I invite you?"'
 				!!'"Come on, don''t be like that. It''ll be fun!" you reply.'
 				!!'He snorts. "Let me think about it." He then walks away without another word.'
@@ -774,7 +817,7 @@ if $ARGS[0] = 'lavrenti':
 		else
 			'You approach Lavrenti as he leans against the wall near the stairs. "So, what''s up with you 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?"'
+			'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."'
@@ -846,7 +889,7 @@ if $ARGS[0] = 'ekaterina':
 			'As you approach her, you see her nursing some bruised knuckles. "Get in a fight?"'
 			'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.'
+			'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?"'
@@ -875,7 +918,7 @@ if $ARGS[0] = 'lera':
 		'As usual, you find Lera and Lena smoking on the stairs. "So, hopped on any cocks today bunny?" Lera inquires.'
 		'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.'
+		'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:
@@ -885,26 +928,26 @@ if $ARGS[0] = 'lera':
 			'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?"'
+			'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:
 		if grupTipe = 4:
-			'As usual, you find Lera and Lena smoking on the stairs. "Hi Lera! What are you up to?"'
+			'As usual, you find Lera and Lena smoking on the stairs. "Hi, Lera! What are you up to?"'
 			'She looks back at you and frowns. "None of your fucking business."'
-			'You continue talking to her, but it''s mostly one sided as she alternates between ignoring you and making snide remarks.'
+			'You continue talking to her, but it''s mostly one-sided as she alternates between ignoring you and making snide remarks.'
 		else
-			'As usual, you find Lera and Lena smoking on the stairs. "Hi Lera! What are you up to?"'
+			'As usual, you find Lera and Lena smoking on the stairs. "Hi, Lera! What are you up to?"'
 			'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.'
+			'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?"'
+		'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.'
@@ -940,14 +983,14 @@ if $ARGS[0] = 'alyona':
 			'"At least someone else in this shitty place knows how to live. I''m tired of everyone telling me what to do, and especially what not to do!" she says in a complaining tone.'
 			*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.'
+			'She shows you a few new songs, tells you about her new favorite 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:
 		if npc_rel['A143'] >= 50:
 			'"Hi <<$pcs_nickname>>, what''s up?" Alyona greets you as you make your way up the stairs.'
-			'"Hey Alyona. How''s my favourite troublemaker?" you ask, giggling as you lean against the wall. "I know very well you have a story to tell. If you can''t find any trouble, you''re always happy to kick up a riot by yourself!" you add jokingly.'
+			'"Hey Alyona. How''s my favorite troublemaker?" you ask, giggling as you lean against the wall. "I know very well you have a story to tell. If you can''t find any trouble, you''re always happy to kick up a riot by yourself!" you add jokingly.'
 			'"Huh, you know me, right?" she replies. She takes a deep breath, then starts talking about all the things she''s been getting into lately. Some of the stories are wild, others are rather naughty, some are sad, and some aren''t exactly legal, though you''re not surprised by that at all.'
 			'"And what boring things happened to you?" she asks jokingly, looking at you and rolling her eyes. "I promise I''ll try not to fall asleep while I''m listening."'
 			*nl
@@ -969,7 +1012,7 @@ if $ARGS[0] = 'alyona':
 			*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.'
+			'For the next few minutes, you tell her what you want 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
 	elseif grupTipe = 2:
@@ -985,7 +1028,7 @@ if $ARGS[0] = 'alyona':
 		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.'
 			'When you move a little closer, you see her pull a bottle of alcohol from her bag and she takes a few sips.'
-			'"Hey Alyona. I see you''re having a rough day..." you start to say. "You know, it''s not really healthy to drink so early. Or drink that much of alcohol at any time actually." Before you can say another word, she cuts in.'
+			'"Hey Alyona. I see you''re having a rough day..." you start to say. "You know, it''s not really healthy to drink so early. Or drink that much alcohol at any time actually." Before you can say another word, she cuts in.'
 			*nl
 			'"And you know what else isn''t healthy? To say that. You don''t want to accidentally get hurt, do you?!" she says in a threatening tone, then takes another sip. "What wasn''t clear?" she asks. "Go bother someone who cares!"'
 			'Seeing better not to push the matter, you decide to leave and spend the rest of the break somewhere else.'
@@ -1150,7 +1193,7 @@ if $ARGS[0] = 'alyona_tampon':
 		else
 			'"Just take one," she waves dismissively at her bag on the floor before taking another drink from her flask.'
 			if rand(1,2) = 1:
-				'Not knowing what else to do, you start opening random zippers looking for a pad. Instead you find a tampon jammed into a cramped pocket sandwiched between several blunts.'
+				'Not knowing what else to do, you start opening random zippers looking for a pad. Instead, you find a tampon jammed into a cramped pocket sandwiched between several blunts.'
 				'"Can I take this?" you say, raising it up to show her.'
 				'"Yeah whatever," she shrugs and you run off to the bathroom to put the tampon in before class starts.'
 				isprok = 1
@@ -1182,7 +1225,7 @@ if $ARGS[0] = 'anushka':
 			'She pushes you up against the wall and tries to kiss you while her hand reaches down to squeeze your ass. You break the kiss out of surprise by her bold actions more than anything else. "What are you doing?! I was only asking if you were okay."'
 			*nl
 			'She crowds you a bit more so you''re face to face. "You talk too much. I can think of better things you can do with that tongue of yours."'
-			'Pauline speaks up at this point. "What the fuck? I''m about to eat my lunch! No one wants to see your lesbian shit, Nush! For fuck sakes, keep it in your pants for once!" She sounds very annoyed, but Anushka just ignores her. You notice most of the guys don''t seem to mind and even seem interested in watching, as does Lera.'
+			'Pauline speaks up at this point. "What the fuck? I''m about to eat my lunch! No one wants to see your lesbian shit, Nush! For fucks sake, keep it in your pants for once!" She sounds very annoyed, but Anushka just ignores her. You notice most of the guys don''t seem to mind and even seem interested in watching, as does Lera.'
 			act 'That''s not what I meant':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
@@ -1205,7 +1248,7 @@ if $ARGS[0] = 'anushka':
 		end
 	elseif grupTipe = 4 and gopnik_slut = 1:
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step crosslegged, which gives you a nice upskirt view 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
@@ -1214,7 +1257,7 @@ if $ARGS[0] = 'anushka':
 			elseif CloSkirtShortness >= 4:
 				'You follow her gaze to your short skirt and see her smile widen. "Cute skirt."'
 			end
-			'"No, I was just doing some online window shopping. I guess you could call it that." She acts like she was about to say more, but stops and looks at you before shaking her head. "You know you could have just been one of us, instead of a sex toy for the boys to use whenever they want."'
+			'"No, I was just doing some online window shopping. I guess you could call it that." She acts like she is about to say more, but stops and looks at you before shaking her head. "You know you could have just been one of us, instead of a sex toy for the boys to use whenever they want."'
 			'You shrug. "I love sex, so it worked out."'
 			'She sighs. "Loving sex is great, I love it, but fucking stand up for yourself and control your own body! Have sex when you want to have sex, not them. Fuck whatever, do what you want." It takes a while, but the two of you are soon talking about her music, which leads to a variety of other subjects. The two of you talk and laugh until the bell rings.'
 			if npc_rel['A144'] >= 55 and anushkaQW['first_visit'] = 0:
@@ -1228,7 +1271,7 @@ if $ARGS[0] = 'anushka':
 			'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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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
@@ -1237,13 +1280,13 @@ if $ARGS[0] = 'anushka':
 			elseif CloSkirtShortness >= 4:
 				'You follow her gaze to your short skirt and see her smile widen. "Cute skirt."'
 			end
-			'"No, I was just doing some online window shopping. I guess you could call it." She acts like she was about to say more, but stops and looks at you before shaking her head. "You know you could have just been one of us, instead of a sex toy for the boys to use whenever they want."'
+			'"No, I was just doing some online window shopping. I guess you could call it." She acts like she is about to say more, but stops and looks at you before shaking her head. "You know you could have just been one of us, instead of a sex toy for the boys to use whenever they want."'
 			'You shrug. "I love sex, so it worked out."'
 			'She sighs and shakes her head slightly. It takes a bit of effort for you to get her to talk, but the two of you are soon talking about her music, which leads to a variety of other subjects. The two of you talk until the bell rings.'
 		end
 	elseif fame['pav_slut'] >= 300:
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1261,7 +1304,7 @@ if $ARGS[0] = 'anushka':
 		elseif npc_rel['A144'] <= 20:
 			'She gives you a disgusted look. "Get the fuck away from me!" You sigh and, seeing the looks the other gopniks are giving you, turn and walk away.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1275,7 +1318,7 @@ if $ARGS[0] = 'anushka':
 		end
 	elseif grupTipe = 1:
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1300,7 +1343,7 @@ if $ARGS[0] = 'anushka':
 			'You sigh, not getting to see whatever it is she found so amusing. "I just thought we could hang out?"'
 			'She rolls her eyes. "Like I would want to talk to you! I don''t find gossiping about who''s dating who or what clothes are in fashion this year interesting, so go bother someone that finds that shallow shit interesting." You try to talk to her, but she just ignores you, only occasionally responding with another barbed comment.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1317,7 +1360,7 @@ if $ARGS[0] = 'anushka':
 		end
 	elseif grupTipe = 2:
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1337,7 +1380,7 @@ if $ARGS[0] = 'anushka':
 			'You sigh, not getting to see whatever it is she found so amusing. "I just thought we could hang out?"'
 			'She rolls her eyes. "Like I would want to talk to you to a steroid junky like you!" You try to talk to her, but she just ignores you, only occasionally responding with another barbed comment.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1346,15 +1389,15 @@ if $ARGS[0] = 'anushka':
 				'You follow her gaze to your short skirt and see her smile widen. "Cute skirt."'
 			end
 			*nl
-			'"No, just checking something," she replies as she closes the computer and puts it away. "What do you need? Looking for some steroids so you can bulk up?" she asks while flexing in an over exaggerated way with a grin on her face.'
+			'"No, just checking something," she replies as she closes the computer and puts it away. "What do you need? Looking for some steroids so you can bulk up?" she asks while flexing in an over-exaggerated way with a grin on her face.'
 			'You sigh, unsure if she''s just teasing you or not. It''s hard to tell with Anushka. "No, I don''t want any steroids. I just wanted to hang out and talk is all."'
 			*nl
-			'She smirks. "Oh... So what flavor protein drink is best? I don''t like that powdered crap. I tried it once and it was nasty as Petia''s breath. I prefer liquid protein right from the tap if you know what I mean..." she says with a wink.'
+			'She smirks. "Oh... So what flavor protein drink is best? I don''t like that powdered crap. I tried it once and it was as nasty as Petia''s breath. I prefer liquid protein right from the tap if you know what I mean..." she says with a wink.'
 			'You shake your head, knowing exactly what she means and the two of you are soon talking about a variety of subjects. You talk and laugh until the bell rings.' 
 		end
 	elseif grupTipe = 3:
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1374,7 +1417,7 @@ if $ARGS[0] = 'anushka':
 			'You sigh, not getting to see whatever it is she found so amusing. "I just thought we could hang out?"'
 			'She scoffs. "Like I would want to talk to a loser like you! Get lost, you''re ruining my high." You try to talk to her, but she just ignores you, only occasionally responding to bully you verbally. After a while, you get tired of it and walk away.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1387,7 +1430,7 @@ if $ARGS[0] = 'anushka':
 		end
 	elseif grupTipe = 4:
 		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?"'
+			'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 upskirt view 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
@@ -1408,7 +1451,7 @@ if $ARGS[0] = 'anushka':
 			'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 just ignores you.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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
@@ -1422,7 +1465,7 @@ if $ARGS[0] = 'anushka':
 		end
 	else
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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 looks over at you with a shocked look. "Oh my god, were you looking up my skirt pervert?" she says loud enough for everyone nearby to stare at you, which causes you to blush.'
 			*nl
 			'You shake your head. "No, no! Of course not!"'
@@ -1447,7 +1490,7 @@ if $ARGS[0] = 'anushka':
 			'You sigh, not getting to see whatever it is she found so amusing. "I just thought we could hang out?"'
 			'She rolls her eyes. "Like I would want to talk to the likes of you!" You try to talk to her, but she just ignores you.'
 		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?"'
+			'As you walk up the steps, you notice Anushka sitting on the top step cross-legged, which gives you a nice upskirt view 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:
@@ -1563,11 +1606,11 @@ if $ARGS[0] = 'lena':
 	elseif npc_rel['A20'] >= 50 and fame['pav_slut'] < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
-			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi, Lena! What are you up to?"'
 			'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.'
 		else
-			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi, Lena! What are you up to?"'
 			'She looks back at you and arches a brow. "Nothing much. You lost <<$pcs_nickname>>?"'
 			'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.'
@@ -1576,12 +1619,12 @@ if $ARGS[0] = 'lena':
 	elseif npc_rel['A20'] <= 20 and fame['pav_slut'] < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
-			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi, Lena! What are you up to?"'
 			'She looks back at you with a frown. "What do you want <<$pcs_nickname>>?"'
 			'"I just wanted to say hi and see what you were up to."'
 			'"Yeah? Well, I don''t want to talk to you." You continue talking to her for a while, but it''s obvious that she has no interest in talking to you.'
 		else
-			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi, Lena! What are you up to?"'
 			'She looks back at you with a frown. "What do you want, freak?"'
 			'"I just wanted to say hi and see what you were up to."'
 			'"Yeah? Well, I don''t want to talk to you." You continue talking to her for a while, but it''s obvious that she has no interest in talking to you.'
@@ -1590,7 +1633,7 @@ if $ARGS[0] = 'lena':
 		'"What do you want, cunt? Shouldn''t you be sucking some cocks somewhere?" She turns away and ignores you.'
 	else
 		npc_rel['A20'] += 1
-		'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+		'Seeing Lena sitting on the steps, you approach her. "Hi, Lena! What are you up to?"'
 		'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.'
@@ -1607,7 +1650,7 @@ if $ARGS[0] = 'pauline':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		gs 'npc_relationship', 'modify', 'A24', 'dislike'
-		'As usual you find Pauline on the stairs. "What do you want?" Pauline asks in a non too friendly tone as you approach.'
+		'As usual you find Pauline on the stairs. "What do you want?" Pauline asks in a non-too-friendly tone as you approach.'
 		'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.'
@@ -1649,7 +1692,7 @@ if $ARGS[0] = 'pauline':
 			'Seeing Pauline sitting on the steps you approach her, "Hi Pauline! What are you up to?"'
 			'She looks back at you. "You lost nerd? Shouldn''t you be with your own kind?"'
 			'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.'
+			'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:
@@ -1674,7 +1717,7 @@ if $ARGS[0] = 'pauline':
 			'Seeing Pauline sitting on the steps you approach her, "Hi Pauline! What are you up to?"'
 			'She looks back at you and asks "You lost <<$pcs_nickname>>? Shouldn''t you be with your own kind?"'
 			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
-			'She narrows her eyes a little at you. "Yeah? Well no one cares how you''re doing, so go back to your own kind before I kick your ass back over there!" You try talking to her, but she just gets more agitated with you until you get up and leave.'
+			'She narrows her eyes a little at you. "Yeah? Well, no one cares how you''re doing, so go back to your own kind before I kick your ass back over there!" You try talking to her, but she just gets more agitated with you until you get up and leave.'
 		else
 			'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
 			'She glances at you and then looks around before replying. "If there weren''t teachers around, I would kick your ass right now."'

locations/gschool_grounds.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'main':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 	end
 	'Pavlovsk''s only school, where all the local children go for their education. Next to the school is the athletic field and a parking lot for the teachers, with a large grove of trees just beyond them.'
-	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advance classes after the new one was built, but budget cuts meant the project was cancelled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
+	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advanced classes after the new one was built, but budget cuts meant the project was canceled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
 
 	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
@@ -94,7 +94,7 @@ if $ARGS[0] = 'main':
 				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
 			end
 
-			'Your Principial begins calling your classmates in alphabetical order. Finally it''s your turn.'
+			'Your principal begins calling your classmates in alphabetical order. Finally it''s your turn.'
 
 			if class['school_grade_average'] >= 90:
 				'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applauding and the auditorium quickly joins in.'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'main':
 						menu_off = 1
 						'<center><b><font color="maroon">School Hallway</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<rand(0,2)>>.jpg"></center>'
-						'You don''t feel like attending all of your classes this morning and so make your way to the bathroom.'
+						'You don''t feel like attending all of your classes this morning and make your way to the bathroom.'
 						act 'Go to girl''s bathroom': gt 'gschool_girls_bathroom', 'start'
 						act 'Go to boy''s bathroom': gt 'gschool_boys_bathroom', 'start'
 					end
@@ -246,6 +246,7 @@ if $ARGS[0] = 'main':
 
 		if Enable_tablemap = 0:
 			if anushkaQW['first_visit'] = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka</a> is leaning against a tree just in front of the school.'
+			if radomirQW['first_visit'] = 0 and radomirQW['meet_after_school'] = 1: '<a href="exec: gt ''radapt'', ''meet_after_school''">Radomir</a> is leaning against a tree just in front of the school.'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: 'You see <a href="exec:minut += 1 & gt ''LariskaGo''">Lariska</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a> is walking across the school courtyard, looking irritated.'
 			if juliaQW['study_unlocked'] >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia</a> is sitting out on the courtyard, reading a book.'
@@ -301,7 +302,7 @@ if $ARGS[0] = 'main':
 				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
 			end
 			if st_count > 0:
-				'Near school yard, you see: '
+				'Near the schoolyard, you see: '
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 			end
 		end
@@ -371,7 +372,7 @@ if $ARGS[0] = 'sports':
 		elseif pcs_stam >= stammax / 5:
 			act 'Go for a run (1:00)': '<br><font color="red">You are so hungry you cannot face going for a run.</font>'
 		else
-			act 'Go for a run (1:00)': '<br><font color="red">You are to exhausted to do this. Recover your stamina before trying to go for a run.</font>'
+			act 'Go for a run (1:00)': '<br><font color="red">You are too exhausted to do this. Recover your stamina before trying to go for a run.</font>'
 		end
 	elseif ($clothingworntype ! 'danilovich_outfits' or $shoeworntype ! 'danilovich'):
 		'You could go for a run here if you were wearing sports clothes and shoes.'
@@ -455,7 +456,7 @@ if $ARGS[0] = 'bulding':
 	if dimaRevenge = 1:
 		menu_off = 1
 		'You''re in a good mood today as you enter the school. That changes when Dimka stops you in the hall on the way to class.
-		"I know what you did, bitch. Did you really thing I wouldn''t figure out it was you that wiped my hard drive?"
+		"I know what you did, bitch. Did you really think I wouldn''t figure out it was you that wiped my hard drive?"
 		Before you can deny anything, he continues, "I don''t even need that video to ruin your life. Just you wait. Soon the whole school will know what a whore you are."
 		His words fill you with dread as you make your way to class.'
 	end
@@ -504,7 +505,7 @@ if $ARGS[0] = 'SchoolRun':
 	menu_off = 1
 	minut += 30
 	gs 'stat'
-	'You think you might be able to win, and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan wins. When the guys have finished, it is the girls'' turn.'
+	'You think you might be able to win and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan wins. When the guys have finished, it is the girls'' turn.'
 
 	act 'Go to the start':
 		*clr & cla
@@ -513,7 +514,7 @@ if $ARGS[0] = 'SchoolRun':
 		runnerQW['races_ran'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
-		'The 400m sprint event for girls is up next. You take off your jacket and go the starting line, mentally preparing yourself for the race.'
+		'The 400m sprint event for girls is up next. You take off your jacket and go to the starting line, mentally preparing yourself for the race.'
 		wait 725
 		'On your marks...'
 		wait 725
@@ -564,14 +565,14 @@ if $ARGS[0] = 'SchoolRun_result':
 		'You run as fast as you can, but only manage to take 4th place.'
 	elseif runnerQW['result'] < 45:
 		grupvalue[2] += 2
-		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
+		'You run as fast as you can and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
 	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 3
-		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
+		'You run as fast as you can and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
 	else
 		runnerQW['pav_wins1'] += 1
 		grupvalue[2] += 5
-		'You run as fast as you can, and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition as you walk around with your arms raised in triumph.'
+		'You run as fast as you can and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition as you walk around with your arms raised in triumph.'
 	end
 
 	gs 'exp_gain', 'run', 1
@@ -601,7 +602,7 @@ if $ARGS[0] = 'SchoolRun2':
 	menu_off = 1
 	minut += 30
 	gs 'stat'
-	'You think you might be able to win, and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan Prokhorov wins. When the guys have finished, it is the girls'' turn.'
+	'You think you might be able to win and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan Prokhorov wins. When the guys have finished, it is the girls'' turn.'
 
 	if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 		if runnerQW['pav_wins2'] = 0:
@@ -679,14 +680,14 @@ if $ARGS[0] = 'SchoolRun2_result':
 		'You run as fast as you can, but only manage to take 4th place.'
 	elseif runnerQW['result'] < 40:
 		grupvalue[2] += 2
-		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
+		'You run as fast as you can and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
 	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 3
-		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
+		'You run as fast as you can and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
 	else
 		runnerQW['pav_wins2'] += 1
 		grupvalue[2] += 5
-		'You run as fast as you can, and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
+		'You run as fast as you can and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
 	end
 
 	gs 'exp_gain', 'run', 1
@@ -695,38 +696,38 @@ if $ARGS[0] = 'SchoolRun2_result':
 	if runnerQW['pav_wins2'] = 3 and runnerQW['pav_stage'] = 1:
 		runnerQW['pav_stage'] = 2
 		if runnerQW['prof_stage'] < 2:
-			'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
+			'You have won the competition three more times and Mr. Pavlovich awards you the second-tier sports trophy in running.'
 			runnerQW['prof_stage'] = 2
 		else
 			'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
 		end
 		if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 			npc_rel['A19'] += 5
-			'Lina stands at at the finish line, gasping for breath. Even though you beat her again, she flashes you a bright smile in congratulations.'
+			'Lina stands at the finish line, gasping for breath. Even though you beat her again, she flashes you a bright smile in congratulations.'
 		else
 			'Christina stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		end
 	elseif runnerQW['pav_wins2'] = 2 and runnerQW['result'] >= 130:
 		if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 			gs 'npc_relationship', 'modify', 'A19', 'love'
-			'Lina stands at at the finish line, gasping for breath. Even though you beat her a second time, she flashes you a bright smile in congratulations.'
+			'Lina stands at the finish line, gasping for breath. Even though you beat her a second time, she flashes you a bright smile in congratulations.'
 		else
 			gs 'npc_relationship', 'modify', 'A18', 'loathe'
-			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
+			'Christina is gasping for breath at the finish line. She was unable to overtake you and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
 		end
 	elseif runnerQW['pav_wins2'] = 1 and runnerQW['result'] >= 130:
 		if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 			gs 'npc_relationship', 'modify', 'A19', 'love'
-			'Lina stands at at the finish line, gasping for breath. Even though you beat her, she flashes you a bright smile in congratulations.'
+			'Lina stands at the finish line, gasping for breath. Even though you beat her, she flashes you a bright smile in congratulations.'
 		else
 			gs 'npc_relationship', 'modify', 'A18', 'loathe'
-			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a toothy grin and continue your victory lap. Through clenched teeth Christina growls at you. "You bitch!"'
+			'Christina is gasping for breath at the finish line. She was unable to overtake you and came second yet again. You just flash her a toothy grin and continue your victory lap. Through clenched teeth Christina growls at you. "You bitch!"'
 		end
 	end
 
 	gs 'stat'
 	if runnerQW['result'] > 50:
-		act 'Continue': gt 'gschool_grounds','Family extension'
+		act 'Continue': gt 'gschool_grounds', 'Family extension'
 	else
 		act 'Leave': gt 'gschool_grounds', 'main'
 	end
@@ -766,7 +767,7 @@ if $ARGS[0] = 'change_room':
 		end
 	end
 	*nl
-	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
+	'The locker room is accessed through the school gym and is left unlocked until 18:30 each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 	*nl
 
 	if (hour = 18 and minut >= 30) or hour > 18:
@@ -800,7 +801,7 @@ if $ARGS[0] = 'Family extension':
 	if $home['current'] = 'parents_home':
 		if npc_rel['A34'] > 50:
 			'You hear your name and turn to see Kolka. "<<$pcs_nickname>>... <<$pcs_nickname>> you won!" Kolka shouts while running towards you with a huge grin. He crashes into you and gives you a tight hug.'
-			'"Hey, how''s my favourite brother? Thanks for coming, I wasn''t aware you knew I was running."'
+			'"Hey, how''s my favorite brother? Thanks for coming, I wasn''t aware you knew I was running."'
 			'Kolka, still grinning, replies "Hey, you didn''t think I spotted you doing all those laps when the school was closed and training at the community center? You''re always out wearing your sports gear and carrying that water bottle, so you''re clearly not just meeting friends!"'
 		else
 			'You hear your name and turn to find Kolka. "<<$pcs_nickname>>, you won! Well done."'
@@ -858,7 +859,7 @@ if $ARGS[0] = 'Family extension':
 						pcs_breath = 0
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/restaurant_family.jpg"></center>'
-						'At the local Del Parco restaurant, you all spend a few hours enjoying your meal as your family encourage you to continue and improve, but stressing that they are very proud of what you''ve achieved so far.'
+						'At the local Del Parco restaurant, you all spend a few hours enjoying your meal as your family encourages you to continue and improve, but stressing that they are very proud of what you''ve achieved so far.'
 						'Your stepfather orders some wine and although your <<$npc_nickname[''A29'']>> gives him a disapproving look, he gives you a glass so you can toast your victory.'
 						'At the end of a very enjoyable meal and some quality family time, you thank them again for their kindness and acknowledge that you really appreciate this as you know that money is tight. There''s a big family hug and you all return home.'
 						minut += 90
@@ -883,7 +884,7 @@ if $ARGS[0] = 'Family extension':
 					pcs_hairbsh = 1
 					'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 					'After showering and changing, you head out and greet your mother. "Thanks for coming. It means a lot to me."'
-					'"Of course I''d come <<$pcs_nickname>>! I just want the best for you and I''m proud of you and your win. Come on, let''s go out for a bite to eat. I think we need to have a chat."'
+					'"Of course, I''d come <<$pcs_nickname>>! I just want the best for you and I''m proud of you and your win. Come on, let''s go out for a bite to eat. I think we need to have a chat."'
 					'"You don''t have to <<$npc_nickname[''A29'']>>, I''m so glad you came and I know money is tight."'
 					'"That''s fine, so long as you don''t mind the station cafe. I want to see if we can patch things up between us."'
 					minut += 10
@@ -909,13 +910,13 @@ if $ARGS[0] = 'Family extension':
 						if npc_QW['A29'] > 0:
 							if npc_QW['A29'] = 1: npc_QW['A29'] = 2
 							'At the station cafe, your mother selects a corner spot away from the main area so you can keep your chat private.'
-							'You both initially have some general small talk during which she again congratulates you on your win and explains that she wants the best for you and will help in any way she can, but you need to meet her half way.'
+							'You both initially have some general small talk during which she again congratulates you on your win and explains that she wants the best for you and will help in any way she can, but you need to meet her halfway.'
 							'You''re initially unsure how to respond, but after a while in a very low shaky voice, you reply. "I''d love that, but why do you give me such a hard time just because I had sex?"'
 							'As your feelings start to come to the surface, you continue. "Yes, I had sex, but it doesn''t make me a bad person! And what gives you the right to immediately treat me like I''m a whore!? I can do the maths, you were 16 when you had Anya! That''s younger than me!"'
 							*nl
-							'Your mother sighs and a tear starts rolling down her cheek as she slowly replies "I know. Maybe I was a bit harsh, but I don''t want you repeating my mistakes. I want you to have the chance to go to university and make a better life for yourself."'
+							'Your mother sighs and a tear starts rolling down her cheek as she slowly replies "I know. Maybe I was a bit harsh, but I don''t want you to repeat my mistakes. I want you to have the chance to go to university and make a better life for yourself."'
 							'You feel bad seeing your mother cry and tell her that you''re careful and will try your best at school. You also reassure her that you are taking precautions.'
-							'Your mother responds that she accepts that she may have been a bit harsh and apologises.'
+							'Your mother responds that she accepts that she may have been a bit harsh and apologizes.'
 							'"Okay <<$npc_nickname[''A29'']>>, I''ll try and yes it would be great to have my <<$npc_nickname[''A29'']>> back!" you reply.'
 							*nl
 							'Your mother gets up and comes over to hug you. "Thanks <<$pcs_nickname>>, that''s all I can ask and I''ll try to be more supportive too. Just please talk to me if you''re worried about anything."'
@@ -923,8 +924,8 @@ if $ARGS[0] = 'Family extension':
 						else
 							'At the station cafe, your mother selects a corner spot away from the main area so you can keep your chat private.'
 							'You both initially have some general small talk during which she again congratulates you on your win and explains that she wants the best for you and will help in any way she can, but she doesn''t want you staying out late as you could get into trouble. She continues by saying that she wants you to go to university so that you can make a better life for yourself.'
-							'Although you''re a little annoyed that she''s still treating you like a child, you do appreciate her concern. "I know <<$npc_nickname[''A29'']>> and I''m sorry that you get worried when I get back a little late, but you know what time the disco finishes at and that I''ll never be home by midnight unless I leave earlier than my friends. They would laugh at me having to be home early for bedtime!"'
-							'Your mother thinks it through for a moment. "Okay, I can accept that. I''m also aware that you''re nearly 18, but that won''t stop me from worrying. Maybe I''ve been a bit harsh in my approach out of habit with Anya but, like I said, I only want the best for you. Can you at least try to meet me half way on this and do your best in school too?"'
+							'Although you''re a little annoyed that she''s still treating you like a child, you do appreciate her concern. "I know <<$npc_nickname[''A29'']>> and I''m sorry that you get worried when I get back a little late, but you know what time the disco finishes and that I''ll never be home by midnight unless I leave earlier than my friends. They would laugh at me having to be home early for bedtime!"'
+							'Your mother thinks it through for a moment. "Okay, I can accept that. I''m also aware that you''re nearly 18, but that won''t stop me from worrying. Maybe I''ve been a bit harsh in my approach out of habit with Anya but, like I said, I only want the best for you. Can you at least try to meet me halfway on this and do your best in school too?"'
 							'Unsure how to respond, you sigh. "Okay <<$npc_nickname[''A29'']>>, I''ll try. It''s just that it can get a bit overbearing."'
 							'Your mother continues. "Okay, let''s just try to get our relationship back to a good place. Please promise me that you''ll do your best in school too. Also, no matter what please know that you can always talk to me if something is worrying you. Please know that I do love you and want the best for you."'
 							'This is the closest you''ve felt to your mother for ages, so you get up and give her a hug. "Thanks <<$npc_nickname[''A29'']>>. I''m glad we had this chat to clear the air. I love you too and it''ll be good to have my <<$npc_nickname[''A29'']>> back." She hugs you back and you both finish your meals with some more relaxed conversation.'
@@ -965,7 +966,7 @@ if $ARGS[0] = 'Family extension':
 					*clr & cla
 					gs 'drugs', 'alcohol', 'beer', 4
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/Sis_drink.jpg"></center>'
-					'You both have a few beers for the next few hours and spend time catching up. Feeling light headed and more than a little tipsy, you both leave the cafe and share a hug as you promise to meet up regularly and catch up. You know that you can see Anya at the community center on Friday evenings.'
+					'You both have a few beers for the next few hours and spend time catching up. Feeling light-headed and more than a little tipsy, you both leave the cafe and share a hug as you promise to meet up regularly and catch up. You know that you can see Anya at the community center on Friday evenings.'
 					minut += 100
 					gs 'stat'
 
@@ -984,7 +985,7 @@ if $ARGS[0] = 'Family extension':
 				'You hear <<$lover[lover_number]>> shouting your name and jog over to meet them. You both embrace with a cuddle and a kiss on the cheek.'
 				'"Hey love, well done."'
 				'"Thanks. And thanks for coming, it means a lot."'
-				'"Of course I''d come and support you. Now go and get freshened up and we''ll go out, my treat and you choose."'
+				'"Of course, I''d come and support you. Now go and get freshened up and we''ll go out, my treat and you choose."'
 				'You both have another cuddle before you head into the changing rooms to get showered and changed.'
 				minut += 4
 				act 'Go take your shower':

locations/gschool_lessons.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'morning':
 	$location_type = 'public_indoors'
 	killvar '$locclass'
 	menu_off = 0
-	
+
 	if school_check_day ! daystart:
 		school_check_day = daystart
 		schoolprogul -= 1
@@ -24,7 +24,7 @@ if $ARGS[0] = 'morning':
 		if runnerQW['pav_racetype'] = 1: runnerQW['pav_racetype'] = 0
 		if hour < 8: gs 'gschool_socialchg', 'test'
 	end
-		
+
 	if $breaktype ! 'first':
 		if detention_set = 1 and week = 1:
 			detention_set = 2
@@ -39,7 +39,7 @@ if $ARGS[0] = 'morning':
 			act 'Continue down the hall': gt 'gschool_lessons', 'morning'
 		elseif week < 4 and class['first_grade_check'] = 0:
 			gt 'gschool_lessons', 'grade_check'
-		elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+		elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 			gt 'nerd_game_night', 'invite', 'morning'
 		else
 			gs 'gschool_gossip', 'morning'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="red">This uniform complies with the regulations but is too risqué.</font>'
 		elseif PCloStyle = 2:
 			grupvalue[4] += 1
-			'<font color="blue">This uniform follows the school regulation on skirt length and is of a style that appeals to Gopniks.</font>'	
+			'<font color="blue">This uniform follows the school regulation on skirt length and is of a style that appeals to Gopniks.</font>'
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
@@ -100,7 +100,7 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="red">This uniform slightly breaches the school regulations and it is too risqué.</font>'
 		elseif PCloStyle = 2:
 			grupvalue[4] += 1
-			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
@@ -251,11 +251,11 @@ if $ARGS[0] = 'short_break':
 		act 'Go to next class': gt 'gschool_lessons', 'schedule'
 
 		act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'
-		
+
 		if cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
 			gs 'gschool_cheerleading', 'skipped_ev'
 			act 'Continue down the hall': gt 'gschool_lessons', 'short_break'
-		elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+		elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 			gt 'nerd_game_night', 'invite', 'short_break'
 		end
 	elseif Kuznetsov_punishment = 1:
@@ -371,61 +371,61 @@ if $ARGS[0] = 'grade_check':
 	end
 	*nl
 	gs 'grades', 'assing_grade_description', 'school'
-	
-	'Math: <<$class[''school_math_grade'']>> (<<class[''school_math_grade'']>>) Russian: <<$class[''school_rus_grade'']>> (<<class[''school_rus_grade'']>>) Literature: <<$class[''school_lit_grade'']>> (<<class[''school_lit_grade'']>>) Art: <<$class[''school_art_grade'']>> (<<class[''school_art_grade'']>>) Biology: <<$class[''school_bio_grade'']>> (<<class[''school_bio_grade'']>>) English: <<$class[''school_eng_grade'']>> (<<class[''school_eng_grade'']>>) Geography: <<$class[''school_geo_grade'']>> (<<class[''school_geo_grade'']>>) Science: <<$class[''school_sci_grade'']>> (<<class[''school_sci_grade'']>>) History: <<$class[''school_his_grade'']>> (<<class[''school_his_grade'']>>) Shop: <<$class[''school_shop_grade'']>> (<<class[''school_shop_grade'']>>) Computer: <<$class[''school_comp_grade'']>> (<<class[''school_comp_grade'']>>) Music: <<$class[''school_mus_grade'']>> (<<class[''school_mus_grade'']>>) P.E.: <<$class[''school_pe_grade'']>> (<<class[''school_pe_grade'']>>)' 
+
+	'Math: <<$class[''school_math_grade'']>> (<<class[''school_math_grade'']>>) Russian: <<$class[''school_rus_grade'']>> (<<class[''school_rus_grade'']>>) Literature: <<$class[''school_lit_grade'']>> (<<class[''school_lit_grade'']>>) Art: <<$class[''school_art_grade'']>> (<<class[''school_art_grade'']>>) Biology: <<$class[''school_bio_grade'']>> (<<class[''school_bio_grade'']>>) English: <<$class[''school_eng_grade'']>> (<<class[''school_eng_grade'']>>) Geography: <<$class[''school_geo_grade'']>> (<<class[''school_geo_grade'']>>) Science: <<$class[''school_sci_grade'']>> (<<class[''school_sci_grade'']>>) History: <<$class[''school_his_grade'']>> (<<class[''school_his_grade'']>>) Shop: <<$class[''school_shop_grade'']>> (<<class[''school_shop_grade'']>>) Computer: <<$class[''school_comp_grade'']>> (<<class[''school_comp_grade'']>>) Music: <<$class[''school_mus_grade'']>> (<<class[''school_mus_grade'']>>) P.E.: <<$class[''school_pe_grade'']>> (<<class[''school_pe_grade'']>>)'
 	*nl
 	'A grade of 1 means "Very Poor" and is generally only used for absence. 2 means "Unsatisfactory" and is also a falling grade. 3 means "Satisfactory" and is a passing grade. 4 means "Good". 5 means "Excellent" and is only given to the best students. (The number in the parenthesis is the variable grade, which is changed by your in-class actions and translated into the actual grade)'
 	*nl
-	
+
 	gs 'grades', 'grade above', 'school', 90
 	gs 'grades', 'grade above', 'school', 70
 	gs 'grades', 'grade above', 'school', 50
 	gs 'grades', 'grade above', 'school', 40
-	
+
 	if class['school_grades_above_90'] = 13:
 		'You''re getting top marks in all your classes. You''re one of the best, if not the best student in the entire school.'
-	elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13:
 		'You''re getting top marks in more than half your classes and aren''t failing any of the others. You''re one of the best students in the school.'
-	elseif class['school_grades_above_90'] > 6: 
+	elseif class['school_grades_above_90'] > 6:
 		'Even if you''re failing some of your classes, you''re getting top marks in more than half of them and are still one of the best students in the school. You should have no trouble getting into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13:
 		'You''re only getting top marks in a few of your classes, but the rest of your grades are still good. You should have no trouble getting into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13:
 		'You''re only getting top marks in some of your classes, but only a few of your grades are bad and you''re not failing any classes. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10:
 		'You''re only getting top marks in a few of your classes and are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13:
 		'You''re only getting top marks in some of your classes and a lot of bad grades, but you''re not failing any classes. You need to improve your bad grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10:
 		'You''re getting top marks in a few of your classes, but are failing some of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6:
 		'You''re getting top marks in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0: 
+	elseif class['school_grades_above_90'] > 0:
 		'Even a top mark or two won''t help when you''re failing more than half of your classes. You''ll have to put a lot of work in if you want to go to university.'
-	elseif class['school_grades_above_70'] = 13: 
+	elseif class['school_grades_above_70'] = 13:
 		'You''re getting good grades in all of your classes, but nothing impressive. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13: 
+	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13:
 		'You''re getting good grades in over half of your classes, but nothing impressive. You''re not failing any classes, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10: 
+	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10:
 		'You''re getting good grades in over half of your classes, but are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13:
 		'You''re getting good grades in a few of your classes, but nothing impressive. You''re not failing any classes, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10:
 		'You''re getting good grades in a few of your classes, but are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6:
 		'You''re getting good grades in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0: 
+	elseif class['school_grades_above_70'] > 0:
 		'A good grade or two isn''t enough when you''re failing more than half of your classes. It will require a lot of work for you to turn this around.'
-	elseif class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_40'] = 13:
 		'You are not getting any good grades, but at least you are not failing any classes. It will require a lot of work if you want to go to university.'
-	elseif class['school_grades_above_40']  > 10: 
+	elseif class['school_grades_above_40']  > 10:
 		'Your grades are terrible and you''re in danger of not graduating high school.'
-	elseif class['school_grades_above_40']  > 6: 
+	elseif class['school_grades_above_40']  > 6:
 		'You''re failing a lot of classes and barely passing the rest. You won''t graduate at this rate unless you get your grades up.'
 	else
 		'You''re failing high school and need to do something about it right now if you want to graduate.'
 	end
-	
+
 	act 'Continue': gt 'gschool_lessons', 'morning'
 end
 --- gschool_lessons ---------------------------------

locations/gschool_lessons4.qsrc

@@ -1193,7 +1193,7 @@ if $ARGS[0] = 'shower2':
 	mc_inventory['shampoo'] +=  1
 	dynamic $showerdin
 	gs 'stat'
-	: gymshower_loop
+	:gymshower_loop
 	gymshower = rand(1,10)
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/shower/showerspank.mp4"></video></center>'
@@ -1315,8 +1315,8 @@ if $ARGS[0] = 'shower2':
 			gt 'gschool_lessons4', 'pube_bully'
 		elseif pcs_pubes > 25:
 			gt 'gschool_lessons4','pube_bully'
-		elseif grupTipe = 1 or grupTipe = 2:
-			gt 'gschool_lessons4', 'pube_compliment'
+!!		elseif grupTipe = 1 or grupTipe = 2:
+!!			gt 'gschool_lessons4', 'pube_compliment'
 !!		elseif grupTipe = 4 or grupTipe = 2:
 !!			
 		else
@@ -1400,7 +1400,8 @@ if $ARGS[0] = 'pube_bully':
 end
 
 if $ARGS[0] = 'pube_compliment':
-
+	!!temp link as no content in this event
+	gs 'gschool_lessons4','shower_options'
 end
 
 if $ARGS[0] = 'whore_bully':

locations/gschool_lessonsev1.qsrc

@@ -10,29 +10,7 @@ if $ARGS[0] = 'fiz_rand':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand2.jpg"></center>'
 		'During the warm-up for gym class, Coach Pavlovich comes over to assist you with your warm-up, his groin grinding against your ass as he does. If looks could kill, Christina''s jealous gaze would have had you dead on the ground by now.'
 	elseif fizperand = 2:
-		*clr & cla
-		pcs_mood += 20
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand3.jpg"></center>'
-		'You and some of the other girls get down on your knees together, enjoying the attention of the watching boys as you all show off your asses to them. Deciding to tease them further, the girls all pull their pants down at the same time.'
-		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Pull your pants down':
-				cla
-				gs 'willpower', 'misc', 'self', 'hard'
-				gs 'willpower', 'pay', 'self'
-				gs 'arousal', 'foreplay', 10, 'exhibitionism'
-				pcs_mood += 20
-				gs 'stat'
-				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
-			end
-		else
-			act 'Pull your pants down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		act 'Don''t pull your pants down':
-			cla
-			'You refrain from following their example and just sway your ass for the boys, but they seem to be more interested in the other girls.'
-		end
+		gt 'gschool_lessonsev1', 'fiz2'
 	elseif fizperand = 3:
 		*clr & cla
 		pcs_mood += 20
@@ -69,45 +47,7 @@ if $ARGS[0] = 'fiz_rand':
 		'During a break in gym class, you and several other girls are talking when Igor wanders over and tries to chat you all up. You find his efforts amusing at best and you can tell they aren''t working on the other girls either, yet he seems to think he''s oozing cool and keeps chatting up the lot of you before Vitek suddenly rushes up behind him, grabs his shorts and yanks them down to his ankles.'
 		'Unfortunately for Igor, his underwear went with the shorts and now he''s standing half naked in front of a bunch of girls. What''s worse is that now everyone can see how tiny his dick is, making you and the others gasp and giggle, several girls even pointing and laughing loudly. The whole class is soon in stitches as Igor desperately tries to pull up his shorts and fails, all while cursing at Vitek and calling him all kinds of names. You almost feel sorry for him; not only is he a terrible flirt, but the whole class has seen his tiny dick.'
 	elseif fizperand = 8 and $pantyworntype ! 'none':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
-		'During a break in gym class, you''re chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grab hold of your panties and sharply yank them up so hard that your feet actually lift off the ground for a moment. You cry out in pain, quickly turn around and see Dan laughing while several others are watching and laughing as well.'
-		act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons4', 'postphys'
-		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Kick him (<<will_cost>> Willpower)':
-				!!Screen not cleared as no event image, change that if you find an image for it
-				cla & *nl
-				gs 'willpower', 'misc', 'self', 'medium'
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				grupvalue[2] +=1
-				'He starts to back up, but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in its proper place.'
-				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
-			end
-		else
-			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		if grupTipe = 2 or grupTipe = 4:
-			gs 'willpower', 'misc', 'self', 'hard'
-			if will_cost <= pcs_willpwr:
-				act 'Beat his ass (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'misc', 'self', 'hard'
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					grupvalue[4] +=1
-					demerit += 20
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
-					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him.'
-					'He tries to block your incoming blows to no avail. Luckily for him, the coach arrives, grabs you by the back of the neck and effortlessly pulls you off of him, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, <b>NOW</b>!"' 
-					'You try to protest, but he doesn''t want to hear it and points sternly at the door, so you begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
-					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
-				end
-			else
-				act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-		end
+		gt 'gschool_lessonsev1', 'fiz8'
 	elseif fizperand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight; he''s certainly very well endowed.' 
@@ -115,50 +55,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs 'arousal', 'erotic_nudity', 2
 		gs 'arousal', 'end'
 	elseif fizperand = 10 and hotcat >= 5 and fame['pav_slut'] >= 150:
-		cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
-		'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class, but he gets uncomfortably close and touches you way more than is necessary.' 
-		'At one point, you''re reaching for something high on a shelf and he stands so close behind you, you can feel his dick against your ass as his hands grip your waist. "Careful! We wouldn''t want you to fall now. Let me steady you."'
-		gs 'arousal', 'foreplay', 5, 'sub'
-		act 'Do nothing':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
-			'When you don''t object, his hands slide under your shirt and squeeze your breasts. He then pulls your shirt over your head before you can even protest.'
-			gs 'arousal', 'foreplay', 2, 'sub'
-			act 'Say nothing': gt 'gschool_sex', 'storagesex'
-			act 'Pull away':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
-				'You jerk away from him and snatch your shirt out of his hand. "Mr. Pavlovich, I''m not that kind of girl!"'
-				'He laughs. "That''s not what I hear..."'
-				'You give him a dirty look and put your shirt back on before storming out.'
-				gs 'arousal', 'end'
-				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
-			end
-		end
-		act 'Leave the creep':
-			*clr & cla
-			gs 'arousal', 'end'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
-			'Once you have the equipment, you duck out of the room as quickly as you can, not looking back at him.'
-			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
-		end
-		gs 'willpower', 'exhib', 'self'
-		if will_cost <= pcs_willpwr:
-			act 'Tease him (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
-				'You decide to have a little fun of your own. You ''accidentally'' drop something while he''s keeping you steady and bend over to pick it up, pushing your ass up against his crotch. You then grind yourself against him and can feel him getting hard before you pick up the dropped item and quickly stand up before heading out of the room.'
-				'You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of extra sway to your hips as you walk away.'
-				gs 'arousal', 'foreplay', 5, 'sub'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
-			end
-		else
-			act 'Tease him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
+		gt 'gschool_lessonsev1', 'fiz10'
 	elseif fizperand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
 		'During class, Lina notices Ivan watching Lariska and moves up behind her before pushing her forward at the shoulders, making her bend over. She proceeds to pretend to hump Lariska, obviously trying to mimic Ivan''s voice and speech. "Oh Lariska, I want to fuck your ass!" This causes several of the other students to laugh, even Ivan, but it''s quickly broken up by Mr. Nikolaevich.'
@@ -184,6 +81,131 @@ if $ARGS[0] = 'fiz_rand':
 	end
 end
 
+if $ARGS[0] = 'fiz2':
+	*clr & cla
+	pcs_mood += 20
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand3.jpg"></center>'
+	'You and some of the other girls get down on your knees together, enjoying the attention of the watching boys as you all show off your asses to them. Deciding to tease them further, the girls all pull their pants down at the same time.'
+	gs 'willpower', 'flash', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Pull your pants down':
+			cla
+			gs 'willpower', 'flash', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
+			gs 'arousal', 'foreplay', 10, 'exhibitionism'
+			pcs_mood += 20
+			if $pantyworntype = 'none':
+				gs 'fame', 'pav', 'sex', 1
+				gs 'stat'
+				'You are not wearing panties so you sway your naked ass for the boys, this gains you a lot of attention but its not great for your reputation. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			else
+				gs 'stat'
+				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			end
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	else
+		act 'Pull your pants down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Don''t pull your pants down':
+		cla
+		'You refrain from following their example and just sway your ass for the boys, but they seem to be more interested in the other girls.'
+		act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+	end
+end
+
+if $ARGS[0] = 'fiz8':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
+	'During a break in gym class, you''re chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grab hold of your panties and sharply yank them up so hard that your feet actually lift off the ground for a moment. You cry out in pain, quickly turn around and see Dan laughing while several others are watching and laughing as well.'
+	act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons4', 'postphys'
+	gs 'willpower', 'misc', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Kick him (<<will_cost>> Willpower)':
+			!!Screen not cleared as no event image, change that if you find an image for it
+			cla & *nl
+			gs 'willpower', 'misc', 'self', 'medium'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			grupvalue[2] +=1
+			'He starts to back up, but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in its proper place.'
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	else
+		act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	if grupTipe = 2 or grupTipe = 4:
+		gs 'willpower', 'misc', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Beat his ass (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				grupvalue[4] +=1
+				demerit += 20
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
+				'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him.'
+				'He tries to block your incoming blows to no avail. Luckily for him, the coach arrives, grabs you by the back of the neck and effortlessly pulls you off of him, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, <b>NOW</b>!"' 
+				'You try to protest, but he doesn''t want to hear it and points sternly at the door, so you begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
+				act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+			end
+		else
+			act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+end
+
+if $ARGS[0] = 'fiz10':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
+	'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class, but he gets uncomfortably close and touches you way more than is necessary.' 
+	'At one point, you''re reaching for something high on a shelf and he stands so close behind you, you can feel his dick against your ass as his hands grip your waist. "Careful! We wouldn''t want you to fall now. Let me steady you."'
+	gs 'arousal', 'foreplay', 5, 'sub'
+	act 'Do nothing':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
+		'When you don''t object, his hands slide under your shirt and squeeze your breasts. He then pulls your shirt over your head before you can even protest.'
+		gs 'arousal', 'foreplay', 2, 'sub'
+		act 'Say nothing': gt 'gschool_sex', 'storagesex'
+		act 'Pull away':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
+			'You jerk away from him and snatch your shirt out of his hand. "Mr. Pavlovich, I''m not that kind of girl!"'
+			'He laughs. "That''s not what I hear..."'
+			'You give him a dirty look and put your shirt back on before storming out.'
+			gs 'arousal', 'end'
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	end
+	act 'Leave the creep':
+		*clr & cla
+		gs 'arousal', 'end'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
+		'Once you have the equipment, you duck out of the room as quickly as you can, not looking back at him.'
+		act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+	end
+	gs 'willpower', 'exhib', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Tease him (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
+			'You decide to have a little fun of your own. You ''accidentally'' drop something while he''s keeping you steady and bend over to pick it up, pushing your ass up against his crotch. You then grind yourself against him and can feel him getting hard before you pick up the dropped item and quickly stand up before heading out of the room.'
+			'You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of extra sway to your hips as you walk away.'
+			gs 'arousal', 'foreplay', 5, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	else
+		act 'Tease him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+end
+
+
+
 if $ARGS[0] = 'biology':
 	*clr & cla
 	menu_off = 1

locations/gschool_lessonsev2.qsrc

@@ -358,13 +358,16 @@ if $ARGS[0] = 'geography':
 					'Everybody quickly settles down and the class goes back to normal.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
-			elseif soniaPS > 0:
-				'"Well, everyone has a bigger cock than you, but why not ask the expert on cocks?" Lazar says before he turns to Sonia. "Is there any truth to this ''fact'', Sonia?"'
-				'Sonia blushes heavily and avoids answering, but the smirk on her lips betrays her thoughts.'
-				'"I knew it!" Lazar grins and Sonia blushes even more.'
-				'"That''s enough! You''ve had your fun," Mrs. Sokoloff angrily shouts and you quickly settle down and return to the lesson.'
 			else
-				'"That''s enough! You''ve had your fun," Mrs. Sokoloff angrily shouts and you quickly settle down and return to the lesson.'
+				if soniaPS > 0:
+					'"Well, everyone has a bigger cock than you, but why not ask the expert on cocks?" Lazar says before he turns to Sonia. "Is there any truth to this ''fact'', Sonia?"'
+					'Sonia blushes heavily and avoids answering, but the smirk on her lips betrays her thoughts.'
+					'"I knew it!" Lazar grins and Sonia blushes even more.'
+					'"That''s enough! You''ve had your fun," Mrs. Sokoloff angrily shouts and you quickly settle down and return to the lesson.'
+				else
+					'"That''s enough! You''ve had your fun," Mrs. Sokoloff angrily shouts and you quickly settle down and return to the lesson.'
+				end
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:

locations/gschool_lunch.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'break':
 		gs 'gschool_cheerleading', 'skipped_ev'
 		act 'Continue down the hall': gt 'gschool_events', 'leave_break_events2'
 		exit
-	elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+	elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
@@ -160,10 +160,10 @@ if $ARGS[0] = 'break':
 			gt 'NikoPayback', 'Payback 2'
 		elseif NikoVolkovQW = 10 and NikoEv = 14:
 			lunch_event = daystart
-			gt 'NikoEv2', 'Vicky Talk'	
+			gt 'NikoEv2', 'Vicky Talk'
 		elseif NikoVolkovQW = 10 and NikoEv = 16:
 			lunch_event = daystart
-			gt 'NikoEv2', 'Natalia Talk'		
+			gt 'NikoEv2', 'Natalia Talk'
 		end
 
 		if school_period = 6:
@@ -348,7 +348,7 @@ if $ARGS[0] = 'events':
 				act 'Eat Katja out':
 					*clr & cla
 					KatjaQW['dom'] += 1
-					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 
+					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1
 					katjaQW['slut'] += 1
 					katjaQW['horny'] = 0
 					gs 'stat'
@@ -470,7 +470,7 @@ if $ARGS[0] = 'events':
 	elseif rand(1,100) < 3:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunchdhump.jpg"></center>'
-		'While in the cafeteria, you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty-clad ass of the first girl, pretending like she''s giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies.' 
+		'While in the cafeteria, you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty-clad ass of the first girl, pretending like she''s giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies.'
 		'The quite public fake fucking gets laughs from all the other gopniks, while most of the other boys and more than one teacher watch with a gleam of lust in their eyes at their antics. The raunchy display has an obvious effect and many of the boys in the audience do their best to inconspicuously cover their groins with whatever happens to be available. Even a few the girls seem to be lightly rubbing their legs together, their faces slightly flushed.'
 		gs 'arousal', 'erotic', 10
 		act 'Continue your break': gt 'gschool_lunch', 'break'

locations/homes_properties.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'set_access':
 	orig_status_code = accessible_property[$propcode]
 	new_status_code = ARGS[2]
 	if orig_status_code ! new_status_code:
-		if $accessible_property[$propcode] = '' or accessible_property['<<$propcode>>-display'] = '' or accessible_property['<<$propcode>>-name'] = '':
+		if $accessible_property[$propcode] = '' or $accessible_property['<<$propcode>>-display'] = '' or $accessible_property['<<$propcode>>-name'] = '':
 			if $property['code'] ! $propcode: 				
 				gs 'homes_properties_attr', 'get_property_attr', $propcode	
 			else
@@ -538,10 +538,8 @@ if $ARGS[0] = 'get_properties_for_sale':
 			$getforsalespropcode = $homes[i]
 			if $getforsalespropcode ! '' and checked_homes[$getforsalespropcode] = 0 and accessible_property[$getforsalespropcode] < 2:
 				checked_homes[$getforsalespropcode] = 1
-				if accessible_property[$getforsalespropcode] = '': 
-					gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
-				end
-				ishome = iif(accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
+				if $accessible_property[$getforsalespropcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
+				ishome = iif($accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
 				hasprice = iif($accessible_property[$getforsalespropcode] = '', property['price'] > 0, accessible_property['<<$getforsalespropcode>>-sales-price'] > 0)
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and hasprice:
 					$property_code[j] = $getforsalespropcode
@@ -586,7 +584,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 			$getpropforrentcode = $homes[i]
 			if $getpropforrentcode ! '' and checked_homes[$getpropforrentcode] = 0 and accessible_property[$getpropforrentcode] = 0:
 				checked_homes[$getpropforrentcode] = 1
-				if accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
+				if $accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
 				ishome = iif($accessible_property[$getpropforrentcode] = '', INSTR($property['type'], 'residence') > 1, INSTR($accessible_property['<<$getpropforrentcode>>-type'], 'residence') > 1 )
 				isrental = iif($accessible_property[$getpropforrentcode] = '', property['rental'] = 1, accessible_property['<<$getpropforrentcode>>-rental'] = 1 )
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and isrental:			
@@ -838,7 +836,7 @@ end
 !!
 !! $ARGS[1] - property code
 if $ARGS[0] = 'get_property_sales_price':
-	if accessible_property[$ARGS[1]] ! '':
+	if $accessible_property[$ARGS[1]] ! '':
 		result = accessible_property['<<$ARGS[1]>>-sales-price']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]

locations/hourly_events.qsrc

@@ -85,6 +85,11 @@ else
 		pcs_mood -= rand(2,5)
 	end
 
+	if hypnoHair > 0 and pcs_mood > 50:
+		if pcs_pubes > 3: pcs_mood -= rand(2, 5)
+		if pcs_leghair > 3: pcs_mood -= rand(2, 5)
+	end
+
 	if pcs_energy > 20: pcs_stam += stammax / max(5, 110-pcs_energy)
 	pcs_willpower_feeder += willpowermax*4/3
 	pcs_willpwr += pcs_willpower_feeder/100
@@ -113,7 +118,7 @@ else
 	if pcs_willpwr < willpowermax/4: will_counter -= 1
 end
 
-if will_counter <= -10: 
+if will_counter <= -10:
 	willpowermax -= 1
 	will_counter = 0
 end
@@ -157,11 +162,11 @@ else
 
 		if alko > 4:
 			vomit['hangover'] = 1
-		
+
 		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
 			vomit['morning_sick'] = 1
-		
-		elseif rand(1,100) = 100: 
+
+		elseif rand(1,100) = 100:
 			vomit['unlucky'] = 1
 		end
 	end
@@ -175,7 +180,7 @@ if alko > 0 and alkoblock = 0:
 	if alko >= 6:
 		if pcs_run > 0: run_deg -= 1
 		if vball_lvl >= 50: vball_deg -= 1
-		
+
 		if alko >= 10:
 			if pcs_stren > 10: stren_deg -= 1
 			if pcs_vital > 10: vital_deg -= 1
@@ -204,7 +209,7 @@ if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingwo
 	elseif pcs_traits['commando_lvl'] = 1:
 		mosol += 1
 	end
-	
+
 	if mosol >= 100: pcs_mood -= 5
 
 	if mosol >= 60 and pain['pubic'] < 80: gs 'pain', 1, 'pubic', 'ache'
@@ -223,14 +228,14 @@ end
 if pcs_hydra > 200: pcs_hydra = 200
 
 if mosol > 0:
-	if $pantyworntype ! 'none' or $clothingworntype = 'nude' or PCloPanties = 1: 
+	if $pantyworntype ! 'none' or $clothingworntype = 'nude' or PCloPanties = 1:
 		mosol -= rand(0,1)
 	end
 end
 
 if pcs_lipbalm > 0: pcs_lipbalm -= 1
 
-if sickstage = 1: 
+if sickstage = 1:
 	sick += 1
 	sicktimer += 1
 
@@ -242,7 +247,7 @@ end
 
 if sickstage = 2:
 	if sick > 0: sick -= 1
-	if sick <= 0: 
+	if sick <= 0:
 		sick = 0
 		sickstage = 0
 	end

locations/igorev.qsrc

@@ -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/vstavlaet1.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet_1.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'

locations/indiktab.qsrc

@@ -23,7 +23,7 @@ if ARGS[3] > 0: indiktab['bar_phantom'] = min(max(ARGS[3] - indiktab['bar_progre
 !{if Enable_Android = 1:
 	$indiktab['bar_bg_color'] = 'gray'
 else}
-$indiktab['bar_bg_color'] = $bcolor
+! $indiktab['bar_bg_color'] = $bcolor
 ! end
 
 if ARGS[0] = 1:
@@ -140,35 +140,42 @@ end
 
 $result = '<TABLE  cellpadding="1" cellspacing="0" width="200"><TR>'
 if indiktab['bar_progress'] >= ARGS[3]:
-	if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
+	! if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
 
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
+		$result += 'align="left">&nbsp;<<ARGS[2]>></TD>' & !! label
+		! <font color ="<<$fcolor>>"></font>
 	end
 else
-	if indiktab['bar_progress'] + indiktab['bar_phantom'] = 100: $indiktab['bar_bg_color'] = $indiktab['phantom_color']
+	! if indiktab['bar_progress'] + indiktab['bar_phantom'] = 100: $indiktab['bar_bg_color'] = $indiktab['phantom_color']
 
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	elseif indiktab['bar_phantom'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"' & !! phantom
 		$result += 'align="left">&nbsp;<font color ="<<$indiktab[''phantom_label'']>>"><<ARGS[2]>></font></TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
+		$result += 'align="left">&nbsp;<<ARGS[2]>></TD>' & !! label
+		! <font color ="<<$fcolor>>"></font>
 	end
 end
 $result += '</TR></TABLE>'

locations/initg.qsrc

@@ -37,6 +37,12 @@ if $ARGS[0] = 'get_game_set':
 		'cheatVars[''full_morning_rout''] = <<cheatVars[''full_morning_rout'']>>'
 		'cheatVars[''track_period''] = <<cheatVars[''track_period'']>>'
 		'cheatVars[''enema''] = <<cheatVars[''enema'']>>'
+		'cheatVars[''pee''] = <<cheatVars[''pee'']>>'
+
+		'cheatVars[''random_lovers'']  = <<cheatVars[''random_lovers'']>>'
+		'cheatVars[''random_robbers''] = <<cheatVars[''random_robbers'']>>'
+		'cheatVars[''random_rapists''] = <<cheatVars[''random_rapists'']>>'
+		'cheatVars[''therapist_schedule''] = <<cheatVars[''therapist_schedule'']>>'
 		'cheatVars[''rename_porn''] = <<cheatVars[''rename_porn'']>>'
 		'difficulty = <<difficulty>>'
 

locations/intro_customization.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'modpur':
 	act 'I do not want a purse':
 		bag = 0
 		$currentpursetype = ''
-		currentpursenumber = ''
+		currentpursenumber = 0
 		gt 'intro_customization','modpur'
 	end	
 end

locations/intro_initialization.qsrc

@@ -273,7 +273,7 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_h[8] = 60
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
-	gs 'clothing', 'wear', 'cats_outfits', 90
+	gs 'clothing', 'wear', 'gm_dress', 39
 elseif $start_type['cat'] = 'bimbo':
 	!!bimbo start
 	gm_panties[14] = 1
@@ -378,12 +378,18 @@ elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
-	danilovich_outfits[48] = 1
-	danilovich_outfits_h[48] = 100
+	if $start_type['cat'] = 'dancer':
+		danilovich_outfits[82] = 1
+		danilovich_outfits_h[82] = 100
+		sportsclothingnumber = 82
+	else
+		danilovich_outfits[48] = 1
+		danilovich_outfits_h[48] = 100
+		sportsclothingnumber = 48
+	end
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
-	sportsclothingnumber = 48
 	gs 'clothing', 'wear', 'gm_dress', 63
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1
@@ -519,9 +525,9 @@ else
 		market_outfits_h[17] = 60
 		market_outfits_b[17] = pcs_hips
 	elseif $start_type['cat'] = 'anorexic':
-		gm_school[127] = 1
-		gm_school_h[127] = 120
-		gm_school_b[127] = pcs_hips
+		gm_school[59] = 1
+		gm_school_h[59] = 120
+		gm_school_b[59] = pcs_hips
 	elseif $start_type['cat'] = 'bimbo':
 		cats_dress[127] = 1
 		cats_dress_h[127] = 100

locations/intro_initialization_city.qsrc

@@ -297,7 +297,7 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_h[8] = 60
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
-	gs 'clothing', 'wear', 'cats_outfits', 90
+	gs 'clothing', 'wear', 'gm_dress', 39
 elseif $start_type['cat'] = 'bimbo':
 	!!bimbo start
 	gm_panties[14] = 1
@@ -412,7 +412,7 @@ elseif pcs_inhib < 20:
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
-	sportsclothingnumber = 43
+	sportsclothingnumber = 64
 	gs 'clothing', 'wear', 'gm_outfits', 99
 elseif pcs_inhib < 25:
 	gm_outfits[58] = 1
@@ -432,7 +432,7 @@ elseif pcs_inhib < 25:
 	gm_dress[39] = 1
 	gm_dress_h[39] = 100
 	gm_dress_b[39] = pcs_hips
-	sportsclothingnumber = 1
+	sportsclothingnumber = 87
 	gs 'clothing', 'wear', 'flamingos_dress', 59
 elseif pcs_inhib < 30:
 	gm_outfits[91] = 1
@@ -452,14 +452,21 @@ elseif pcs_inhib < 30:
 	gm_dress[57] = 1
 	gm_dress_h[57] = 100
 	gm_dress_b[57] = pcs_hips
-	sportsclothingnumber = 48
+	sportsclothingnumber = 96
 	gs 'clothing', 'wear', 'flamingos_dress', 89
 elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
-	danilovich_outfits[48] = 1
-	danilovich_outfits_h[48] = 100
+	if $start_type['cat'] = 'dancer':
+		danilovich_outfits[82] = 1
+		danilovich_outfits_h[82] = 100
+		sportsclothingnumber = 82
+	else
+		danilovich_outfits[48] = 1
+		danilovich_outfits_h[48] = 100
+		sportsclothingnumber = 48
+	end
 	scandalicious_dress[18] = 1
 	scandalicious_dress_h[18] = 100
 	scandalicious_dress_b[18] = pcs_hips
@@ -472,7 +479,6 @@ elseif pcs_inhib < 35:
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
-	sportsclothingnumber = 40
 	gs 'clothing', 'wear', 'bomba_outfits', 36
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1

locations/item_cart.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'shoppping_aisle':
 	gs 'item_stock_db', 'cleanup'
-	
+
     $curr_aisle = $ARGS[1]
 	gs 'item_stock_db', $ARGS[1]
 
@@ -45,7 +45,7 @@ if $ARGS[0] = 'shoppping_aisle':
 		i += 1
 	if i <= item_idx:jump 'loopshopping_cart'
 	'</table></center>'
-	
+
 	killvar '$temp_bcolor' & killvar '$icon_selector' & killvar 'icon_height'
 
 	!! Checkout

locations/journal.qsrc

@@ -4,7 +4,7 @@
 !! Refactored 24 Aug 22
 !! Amended by Hooded Silence
 !! Game Character Journal - central core game data area for players.
-!! V .01 Refactored to enable menu bar navigation for UI consistency. 
+!! V .01 Refactored to enable menu bar navigation for UI consistency.
 !! V .02 Redesign and integration of content areas.
 !! V .03 Bug fixes.
 !!
@@ -14,7 +14,7 @@
 !! 2 Work - calls in journal_work
 !! 3 Quests - calls in journal_quest section
 !! 4 Relations / Current Group - pulls in various elements refactored from other areas to make tracking relationships easier. To be expanded on.
-!! 5 General Information 
+!! 5 General Information
 !! 6 User Notes - custom function
 !!
 !! Menu Variables
@@ -52,19 +52,19 @@ if $ARGS[0]='journalmenu':
 	$tablebody += '</tr>'
 
 	!display the table here.
-	
+
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
 	killvar '$tablebody'
-	
-	if $jumploc = '' or jclose = 1: 
-		if $start_type[1] ! 'nomagic': 
+
+	if $jumploc = '' or jclose = 1:
+		if $start_type[1] ! 'nomagic':
 			menutrack = 0
 			jclose = 0
 			gt 'journal', 'magictab'
 		else
 			menutrack = 1
 			jclose = 0
-			gt 'journal', 'housingtab'  
+			gt 'journal', 'housingtab'
 		end
 	end
 	gs 'journal', 'leaveactions'
@@ -83,19 +83,19 @@ end
 if $ARGS[0] = 'magictab':
 	$jumploc = 'magictab'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Spells</h2></center><br>'
 	'<center><h2>Spells to Cast</h2></center><br>'
-	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1') 
+	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1')
 	!!''''
 	'<br><center><h2>Spell Learning</h2></center><br>'
 	'<br><center><h3>Combat</h3></center><br>'
-	func('spellBook','learn','$combatSpells') 
+	func('spellBook','learn','$combatSpells')
 	'<br><center><h3>Non-Combat</h3></center><br>'
-	func('spellBook','learn','$nonComSpells') 
+	func('spellBook','learn','$nonComSpells')
 	delact 'Never mind'
-	
-	
+
+
 ! magic
 end
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'housingtab':
 	gs 'journal', 'journalmenu'
 
 	'<center><h2>Housing</h2></center>'
-	
+
 	*nl
 	if accessible_property['shared_apartment'] = 4: 'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services.'
 	if accessible_property['city_apartment'] = 1: 'You rent a two bedroom apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<accessible_property[''city_apartment-rent'']>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<accessible_property[''city_apartment-days-left'']>></b> days.'
@@ -171,26 +171,26 @@ if $ARGS[0] = 'relationstab':
 
 	'<center><h2>Relationships</h2></center>'
 	'<h2>Family</h2>'
-		
+
 	'Mother:'
-		
+
 	gs 'journal', 'relindex', 'A29'
-	
+
 	'Stepfather:'
-	
+
 	gs 'journal', 'relindex', 'A28'
-	
+
 	'Sister:'
 
 	gs 'journal', 'relindex', 'A33'
-	
+
 	'Brother:'
-	
+
 	gs 'journal', 'relindex', 'A34'
 
-	
+
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
-	
+
 		'<center><h2>Standings by Social Group</h2></center>'
 
 		if grupTipe < 5 and grupvalue[grupTipe] > 700:
@@ -217,7 +217,7 @@ if $ARGS[0] = 'relationstab':
 			'Your school social group consists of losers, teacher''s pets, sluts and the ugly.'
 		end
 		*nl
-		
+
 		'Cool Kids'
 
 		gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
@@ -230,94 +230,94 @@ if $ARGS[0] = 'relationstab':
 
 		'Gopnik'
 		gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
-			
+
 		'<center><h2>Popular Kids Relations</h2></center>'
-		
-		if npc_rel['A1']   > 0: 'Friendship with Dimka:'    & gs 'journal', 'relindex', 'A1' 
-		if npc_rel['A4']   > 0: 'Friendship with Igor:'     & gs 'journal', 'relindex', 'A4' 
-		if npc_rel['A14']  > 0: 'Friendship with Katja:'    & gs 'journal', 'relindex', 'A14' 
-		if npc_rel['A15']  > 0: 'Friendship with Vicky:'    & gs 'journal', 'relindex', 'A15' 
+
+		if npc_rel['A1']   > 0: 'Friendship with Dimka:'    & gs 'journal', 'relindex', 'A1'
+		if npc_rel['A4']   > 0: 'Friendship with Igor:'     & gs 'journal', 'relindex', 'A4'
+		if npc_rel['A14']  > 0: 'Friendship with Katja:'    & gs 'journal', 'relindex', 'A14'
+		if npc_rel['A15']  > 0: 'Friendship with Vicky:'    & gs 'journal', 'relindex', 'A15'
 		if npc_rel['A17']  > 0: 'Friendship with Irina:'    & gs 'journal', 'relindex', 'A17'
-		if npc_rel['A22']  > 0: 'Friendship with Bella:'    & gs 'journal', 'relindex', 'A22' 
-		if npc_rel['A146'] > 0: 'Friendship with Marcus:'   & gs 'journal', 'relindex', 'A146' 
-		if npc_rel['A147'] > 0: 'Friendship with Andrey:'   & gs 'journal', 'relindex', 'A147' 
-		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:'  & gs 'journal', 'relindex', 'A148' 
-		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if npc_rel['A139'] > 0: 'Friendship with Stasya:'   & gs 'journal', 'relindex', 'A139' 
-		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140' 
-		
+		if npc_rel['A22']  > 0: 'Friendship with Bella:'    & gs 'journal', 'relindex', 'A22'
+		if npc_rel['A146'] > 0: 'Friendship with Marcus:'   & gs 'journal', 'relindex', 'A146'
+		if npc_rel['A147'] > 0: 'Friendship with Andrey:'   & gs 'journal', 'relindex', 'A147'
+		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:'  & gs 'journal', 'relindex', 'A148'
+		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if npc_rel['A139'] > 0: 'Friendship with Stasya:'   & gs 'journal', 'relindex', 'A139'
+		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140'
+
 		'<center><h2>Jocks Relations</h2></center>'
-		
-		if npc_rel['A3']   > 0: 'Friendship with Ivan:'       & gs 'journal', 'relindex', 'A3' 
-		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		if npc_rel['A8']   > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8' 
-		if npc_rel['A13']  > 0: 'Friendship with Lariska:'    & gs 'journal', 'relindex', 'A13' 
+
+		if npc_rel['A3']   > 0: 'Friendship with Ivan:'       & gs 'journal', 'relindex', 'A3'
+		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+		if npc_rel['A8']   > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8'
+		if npc_rel['A13']  > 0: 'Friendship with Lariska:'    & gs 'journal', 'relindex', 'A13'
 		if npc_rel['A18']  > 0: 'Friendship with Christina:'  & gs 'journal', 'relindex', 'A18'
 		if npc_rel['A19']  > 0: 'Friendship with Lina:'       & gs 'journal', 'relindex', 'A19'
-		if npc_rel['A23']  > 0: 'Friendship with Albina:'     & gs 'journal', 'relindex', 'A23' 
-		if npc_rel['A149'] > 0: 'Friendship with Lazar:'      & gs 'journal', 'relindex', 'A149' 
-		if npc_rel['A150'] > 0: 'Friendship with Erast:'      & gs 'journal', 'relindex', 'A150' 
-		if npc_rel['A141'] > 0: 'Friendship with Veronika:'   & gs 'journal', 'relindex', 'A141' 
-		if npc_rel['A165'] > 0: 'Friendship with Vanya:'      & gs 'journal', 'relindex', 'A165' 
-		
+		if npc_rel['A23']  > 0: 'Friendship with Albina:'     & gs 'journal', 'relindex', 'A23'
+		if npc_rel['A149'] > 0: 'Friendship with Lazar:'      & gs 'journal', 'relindex', 'A149'
+		if npc_rel['A150'] > 0: 'Friendship with Erast:'      & gs 'journal', 'relindex', 'A150'
+		if npc_rel['A141'] > 0: 'Friendship with Veronika:'   & gs 'journal', 'relindex', 'A141'
+		if npc_rel['A165'] > 0: 'Friendship with Vanya:'      & gs 'journal', 'relindex', 'A165'
+
 		'<center><h2>Nerds Relations</h2></center>'
-		
-		if npc_rel['A2']   > 0: 'Friendship with Artem:'   & gs 'journal', 'relindex', 'A2' 
-		if npc_rel['A6']   > 0: 'Friendship with Petka:'   & gs 'journal', 'relindex', 'A6' 
-		if npc_rel['A12']  > 0: 'Friendship with Julia:'   & gs 'journal', 'relindex', 'A12' 
-		if npc_rel['A16']  > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16' 
+
+		if npc_rel['A2']   > 0: 'Friendship with Artem:'   & gs 'journal', 'relindex', 'A2'
+		if npc_rel['A6']   > 0: 'Friendship with Petka:'   & gs 'journal', 'relindex', 'A6'
+		if npc_rel['A12']  > 0: 'Friendship with Julia:'   & gs 'journal', 'relindex', 'A12'
+		if npc_rel['A16']  > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16'
 		if npc_rel['A151'] > 0: 'Friendship with Evgeny:'  & gs 'journal', 'relindex', 'A151'
 		if npc_rel['A152'] > 0: 'Friendship with Feofan:'  & gs 'journal', 'relindex', 'A152'
-		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153' 
-		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142' 
-		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240' 
-		
+		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153'
+		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142'
+		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240'
+
 		'<center><h2>Gopnik Relations</h2></center>'
-		
-		if npc_rel['A9']   > 0: 'Friendship with Vitek:'     & gs 'journal', 'relindex', 'A9' 
-		if npc_rel['A10']  > 0: 'Friendship with Dan:'       & gs 'journal', 'relindex', 'A10' 
-		if npc_rel['A11']  > 0: 'Friendship with Vasily:'    & gs 'journal', 'relindex', 'A11' 
-		if npc_rel['A20']  > 0: 'Friendship with Lena:'      & gs 'journal', 'relindex', 'A20' 
+
+		if npc_rel['A9']   > 0: 'Friendship with Vitek:'     & gs 'journal', 'relindex', 'A9'
+		if npc_rel['A10']  > 0: 'Friendship with Dan:'       & gs 'journal', 'relindex', 'A10'
+		if npc_rel['A11']  > 0: 'Friendship with Vasily:'    & gs 'journal', 'relindex', 'A11'
+		if npc_rel['A20']  > 0: 'Friendship with Lena:'      & gs 'journal', 'relindex', 'A20'
 		if npc_rel['A21']  > 0: 'Friendship with Lera:'      & gs 'journal', 'relindex', 'A21'
-		if npc_rel['A24']  > 0: 'Friendship with Pauline:'   & gs 'journal', 'relindex', 'A24' 
-		if npc_rel['A154'] > 0: 'Friendship with Radomir:'   & gs 'journal', 'relindex', 'A154' 
-		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:'  & gs 'journal', 'relindex', 'A155' 
-		if npc_rel['A156'] > 0: 'Friendship with Arkadi:'    & gs 'journal', 'relindex', 'A156' 
-		if npc_rel['A157'] > 0: 'Friendship with Roman:'     & gs 'journal', 'relindex', 'A157' 
-		if npc_rel['A158'] > 0: 'Friendship with Valentin:'  & gs 'journal', 'relindex', 'A158' 
-		if npc_rel['A143'] > 0: 'Friendship with Alyona:'    & gs 'journal', 'relindex', 'A143' 
-		if npc_rel['A144'] > 0: 'Friendship with Anushka:'   & gs 'journal', 'relindex', 'A144' 
-		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145' 
-		if npc_rel['A189'] > 0: 'Friendship with Niko:'      & gs 'journal', 'relindex', 'A189' 
-		
+		if npc_rel['A24']  > 0: 'Friendship with Pauline:'   & gs 'journal', 'relindex', 'A24'
+		if npc_rel['A154'] > 0: 'Friendship with Radomir:'   & gs 'journal', 'relindex', 'A154'
+		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:'  & gs 'journal', 'relindex', 'A155'
+		if npc_rel['A156'] > 0: 'Friendship with Arkadi:'    & gs 'journal', 'relindex', 'A156'
+		if npc_rel['A157'] > 0: 'Friendship with Roman:'     & gs 'journal', 'relindex', 'A157'
+		if npc_rel['A158'] > 0: 'Friendship with Valentin:'  & gs 'journal', 'relindex', 'A158'
+		if npc_rel['A143'] > 0: 'Friendship with Alyona:'    & gs 'journal', 'relindex', 'A143'
+		if npc_rel['A144'] > 0: 'Friendship with Anushka:'   & gs 'journal', 'relindex', 'A144'
+		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145'
+		if npc_rel['A189'] > 0: 'Friendship with Niko:'      & gs 'journal', 'relindex', 'A189'
+
 		'<center><h2>Outcast/Loner Relations</h2></center>'
-		
-		if npc_rel['A7']   > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7' 
-		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159' 
-		if soniaPS    > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if fedormasha = 1 and npc_rel['A5']  > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		
+
+		if npc_rel['A7']   > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7'
+		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159'
+		if soniaPS    > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if fedormasha = 1 and npc_rel['A5']  > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+
 		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
-		
-		if npc_rel['A26']  > 0: 'Friendship with Anatoly Tsarev (Math Teacher):'             & gs 'journal', 'relindex', 'A26' 
-		if npc_rel['A69']  > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):'    & gs 'journal', 'relindex', 'A69' 
-		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):'              & gs 'journal', 'relindex', 'A128' 
+
+		if npc_rel['A26']  > 0: 'Friendship with Anatoly Tsarev (Math Teacher):'             & gs 'journal', 'relindex', 'A26'
+		if npc_rel['A69']  > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):'    & gs 'journal', 'relindex', 'A69'
+		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):'              & gs 'journal', 'relindex', 'A128'
 		if npc_rel['A129'] > 0: 'Friendship with Serafim Ivanov (Computer Science Teacher):' & gs 'journal', 'relindex', 'A129'
-		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):'         & gs 'journal', 'relindex', 'A130' 
+		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):'         & gs 'journal', 'relindex', 'A130'
 		if npc_rel['A131'] > 0: 'Friendship with Viktor Pavlovich (P.E. Teacher):'           & gs 'journal', 'relindex', 'A131'
-		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):'           & gs 'journal', 'relindex', 'A132' 
-		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):'                   & gs 'journal', 'relindex', 'A133' 
-		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):'        & gs 'journal', 'relindex', 'A134' 
+		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):'           & gs 'journal', 'relindex', 'A132'
+		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):'                   & gs 'journal', 'relindex', 'A133'
+		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):'        & gs 'journal', 'relindex', 'A134'
 		if npc_rel['A135'] > 0: 'Friendship with Yeva Sokoloff (Geography Teacher):'         & gs 'journal', 'relindex', 'A135'
-		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):'           & gs 'journal', 'relindex', 'A136' 
-		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):'          & gs 'journal', 'relindex', 'A137' 
+		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):'           & gs 'journal', 'relindex', 'A136'
+		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):'          & gs 'journal', 'relindex', 'A137'
 		if npc_rel['A138'] > 0: 'Friendship with Arina Orlov (Biology Teacher):'             & gs 'journal', 'relindex', 'A138'
-		
+
 
 		!!!WD: Formatting
 		if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
 		*nl
-		
+
 	end
 
 	'<center><h2>Pavlovsk Relations</h2></center>'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A217'] > 0: 'Friendship with Pavlin:'         & gs 'journal', 'relindex', 'A217'
 	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'
 	if npc_rel['A119'] > 0: 'Friendship with Borislav:'       & gs 'journal', 'relindex', 'A119'
-		
+
 	'<center><h2>Gadukino Relations</h2></center>'
 	if npc_rel['A31']  > 0: 'Friendship with Elena (your great-grandmother):'  & gs 'journal', 'relindex', 'A31'
 	if npc_rel['A32']  > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32'
@@ -340,7 +340,7 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172'
 	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):'   & gs 'journal', 'relindex', 'A173'
 	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174'
-	
+
 	'<center><h2>Saint Petersburg Relations</h2></center>'
 	if npc_QW['A192']  > 0: 'Friendship with Nastya:'  & gs 'journal', 'relindex', 'A192'
 	if npc_rel['A218'] > 0: 'Friendship with Tanya:'   & gs 'journal', 'relindex', 'A218'
@@ -348,11 +348,11 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A220'] > 0: 'Friendship with Vika:'    & gs 'journal', 'relindex', 'A220'
 	if npc_rel['A93']  > 0: 'Friendship with Ira:'     & gs 'journal', 'relindex', 'A93'
 	if npc_rel['A43']  > 0: 'Friendship with Tamara:'  & gs 'journal', 'relindex', 'A43'
-	if npc_rel['A35']  > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35' 
+	if npc_rel['A35']  > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35'
 	if npc_rel['A169'] > 0: 'Friendship with Dima:'    & gs 'journal', 'relindex', 'A169'
 	if npc_rel['A89']  > 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89'
 	if npc_rel['A216'] > 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'
-	
+
 	! '<center><h2>Other Relations</h2></center>'
 	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
 	! if alla > 0: 'Friendship with Alla <<alla>>'
@@ -432,10 +432,10 @@ end
 if $ARGS[0] = 'generaltab':
 	$jumploc = 'generaltab'
 	gs 'journal', 'journalmenu'
-	
+
 !! generaltab
 	'<center><h2>General Information</h2></center>'
-	
+
 	if ARRSIZE('$portfolio_locations') > 0 or ARRSIZE('$portfolio_people') > 0:
 		act 'View your photography portfolio': gt 'journal_portfolio'
 	end
@@ -447,13 +447,13 @@ if $ARGS[0] = 'generaltab':
 	'<br><center><a href="exec: gs ''journal'', ''city_res''">City Residents</a></center>'
 	if mod_ballet['blocker'] >  0 or balletqw['school'] > 0: '<br><center><a href="exec: gs ''journal'', ''ballet''">Ballet Career</a></center>'
 
-	if SchoolAtestat = 0 and mid($start_type, 1, 2) = 'sg' and SchoolBlock = 0: 
+	if SchoolAtestat = 0 and mid($start_type, 1, 2) = 'sg' and SchoolBlock = 0:
 		'<br><center><a href="exec: gs ''journal_school'', ''school''">School</a></center>
 		<br><center><a href="exec: gs ''journal_school'', ''coursesinfo''">School Courses and Grades</a></center>'
 	end
 
 	!!Make this an elseif, add a third option to see where our friends end up in city-life??
-	if university['student'] = 1: 
+	if university['student'] = 1:
 		'<br><center><a href="exec: gs ''journal'', ''uni''">University</a></center>'
 	end
 
@@ -470,7 +470,7 @@ end
 if $ARGS[0] = 'notestab':
 	$jumploc = 'notestab'
 	gs 'journal', 'journalmenu'
-	'<center><h2>Notes</h2></center>' 
+	'<center><h2>Notes</h2></center>'
 
 	'Your Current Start is: ' + $start_type['cat']
 	'Create notes to keep track of any information you need.'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'notestab':
 		jump 'jur_loop'
 	end
 	killvar 'jur_temp'
-	
+
 !! notes
 end
 
@@ -522,23 +522,23 @@ if $ARGS[0] = 'ballet':
 	gs 'journal', 'journalmenu'
 	'<center><h1>Ballet Career</h1></center>'
 	'<center><img <<$set_imgh>> src="mod/img_ballet/system/readme.jpg"></center>'
-	
+
 	'Пан или пропал (You become the master or, leave).'
-	
+
 	'A narrative based mod and activities for the Dancer start. The MC has been given a grant to attend an intensive 6 day summer class with an assessment that, if passed, can lead to a weekly rehearsal and a Winter dance show in December.'
-	
+
 	'Note: This storyline will play out over a long time span and your actions will have consequences that won''t initially be obvious. Some of this is dependent on the development of the main Girl Life codebase.'
-	
+
 	 'Current and planned features:'
-	
+
 		'• A new dancer start option, with other starts being granted access later or uni/city years paying to join.'
 		'• A 6 day intensive course during the school summer break - look for the letter in your parents kitchen to notify you.'
 		'• New pen friend(s), with meet ups and theatre or ballet nights with family or partner.'
 		'• A new dance instructor, whose intentions may prevent MC from joining the Pushkin Ballet Company or could have far ranging consequences on both herself and NPC characters.'
 		'• New dance gigs. At each rehearsal, there''s a chance that you may get a dance job for the local theatre or the city if you pass with merit.'
-	
+
 	'NB: There is no sex acts in this mod at present. If you wish to write such scenes based on the content, then contact me on the Girl Life Discord.'
-	
+
 	'<center><h2>In Memoriam — Hooded Silence.</h2></center>'
 	*nl
 	'This content is being maintained as part of Hooded Silence''s legacy. I have approximately 1-2 years of original content to add but if you wish to contribute, then note that there is no sexual content in this mod until at least year 3 as per his notes.'
@@ -550,10 +550,10 @@ if $ARGS[0] = 'ballet':
 
 	*nl
 	'These are the obvious repercussions, but there will be subtle consequences for your interactions with NPCs. This mod is meant to be played blind for your initial playthrough and the only feedback will be the varying conversations.'
-	
+
 end
 
-!! ---- Other Sections ---- 
+!! ---- Other Sections ----
 
 
 !! --- General Information -- Clothing
@@ -616,7 +616,7 @@ if $ARGS[0] = 'uni':
 		j += 1
 		if j < 8: jump 'semester_loop'
 	killvar 'j'
-	
+
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
 		*nl
 		'You need to register for your next semester at the university administration building.'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'uni':
 			if ARRSIZE('class_list_institution') >= j: jump 'exam_loop'
 		killvar 'j'
 	end
-	
+
 	*nl
 	!!Added a link to the various Character Journal entries for location: journal_uni.
 	!!Should probably be put somewhere else.                                           Blame Anjuna and Nutluck
@@ -725,7 +725,7 @@ if $ARGS[0] = 'uni':
 	*nl
 	'<br><center><a href="exec: gs ''journal_uni'', ''former_pavlovsk_students''">Former Pavlovsk Students</a></center>'
 
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 end
@@ -797,7 +797,7 @@ if $ARGS[0] = 'family':
 elseif $ARGS[0] = 'pav_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Pavlovsk Residents</h2></center>'
 
 	!! Post Secondary school !!
@@ -813,25 +813,25 @@ elseif $ARGS[0] = 'pav_res':
 		*nl
 		!!Erast Vagin
 		gs 'journal_NPC_information', 'A150', 'uni'
-		*nl	
+		*nl
 		!!Veronika
 		gs 'journal_NPC_information', 'A141', 'uni'
-		*nl	
+		*nl
 		!!Evgany
 		gs 'journal_NPC_information', 'A151', 'uni'
 		*nl
 		!!Natalia
 		gs 'journal_NPC_information', 'A240', 'uni'
-		*nl	
+		*nl
 		!!Vitek
 		gs 'journal_NPC_information', 'A9',   'uni'
 		*nl
 		!!Dan
 		gs 'journal_NPC_information', 'A10',  'uni'
-		*nl	
+		*nl
 		!!Vasily
 		gs 'journal_NPC_information', 'A11',  'uni'
-		*nl	
+		*nl
 		!!Roman
 		gs 'journal_NPC_information', 'A157', 'uni'
 		*nl
@@ -865,7 +865,7 @@ elseif $ARGS[0] = 'pav_res':
 elseif $ARGS[0] = 'gad_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Gadukino Residents</h2></center>'
 	!!Grandpa
 	gs 'journal_NPC_information', 'A31'
@@ -874,7 +874,7 @@ elseif $ARGS[0] = 'gad_res':
 	gs 'journal_NPC_information', 'A32'
 	*nl
 	!!Mira
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A60'
 		*nl
 	end
@@ -892,12 +892,12 @@ elseif $ARGS[0] = 'gad_res':
 		*nl
 	end
 	!!Afanasiy (Mira''s father)
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A64'
 		*nl
 	end
 	!!Vtialiy (Mira''s brother)
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A64'
 		*nl
 	end
@@ -905,7 +905,7 @@ elseif $ARGS[0] = 'gad_res':
 	if npc_qw['A221'] > 0:
 		gs 'journal_NPC_information', 'A221'
 		*nl
-	end 
+	end
 	!!Hunters
 	if hunters_were_met > 0:
 		gs 'journal_NPC_information', 'A172'
@@ -915,7 +915,7 @@ elseif $ARGS[0] = 'gad_res':
 		gs 'journal_NPC_information', 'A174'
 		*nl
 	end
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 
@@ -923,7 +923,7 @@ elseif $ARGS[0] = 'gad_res':
 elseif $ARGS[0] = 'city_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>City Residents</h2></center>'
 
 	!! Post Secondary school !!
@@ -937,7 +937,7 @@ elseif $ARGS[0] = 'city_res':
 		!!Valentin
 		gs 'journal_NPC_information', 'A154', 'uni'
 	end
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 end
@@ -951,11 +951,11 @@ if $ARGS[0] = 'relindex':
 
 
 elseif $ARGS[0] = 'leaveactions':
-	act 'Put your notebook down': 		 
+	act 'Put your notebook down':
 		killvar 'jumploc'
 		jclose = 1
 		gt $loc, $loc_arg
-	end	
+	end
 end
 
 

locations/katja_chat.qsrc

@@ -340,9 +340,6 @@ if $ARGS[0] = 'brunch':
 		'After a while, a heavily tattooed waitress with short blond hair shaved on one side comes over to your table. "Welcome to the Coffee Hole, what can I get you?" she asks in a bored and monotone voice.'
 	end
 	act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
-	if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-		act 'Show Katja that you''re not wearing panties': gt 'katja_pantyquest', 'coffee_hole'
-	end
 	act 'Say you don''t need anything': gt 'katja_chat', 'coffee_hole_event'
 end
 
@@ -576,13 +573,13 @@ if $ARGS[0] = 'coffee_hole_event':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			if katjaQW['know_dandd'] = 0:
 				'"Have you heard that the nerds from our high school meet here every week?" Katja asks. But before you can answer, she continues, "They are playing some kind of game, dragons and elves or something like that. Julia tried to explain it to me, but I didn''t really get what it was about."'
-				'"Apparently, they used to play at the library in Pavlovsk, but it seems like they have gotten braver and don''t think they need to hide themselves anymore. Which is really good, just because they''re doing something we don''t understand, doesn''t mean that they should be ashamed about it. Luckily, the days where the stupid jocks or girls like Stasya would try to act important by bullying others for doing things they don''t understand are over."'
+				'"Apparently, they used to play at the library in Pavlovsk, but it seems like they have gotten braver and don''t think they need to hide themselves anymore. Which is really good, just because they''re doing something we don''t understand, doesn''t mean that they should be ashamed about it. Luckily, the days, when the stupid jocks or girls like Stasya would try to act important by bullying others for doing things they don''t understand, are over."'
 				if nerd_game['stage'] > 0:
 					act 'Tell Katja that you play with them':
 						*clr & cla
 						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.'
+						'"It''s called ''Dungeons and Dragons'' the game we play" 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 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
@@ -769,6 +766,9 @@ if $ARGS[0] = 'coffee_hole_hangout':
 		end
 	else
 		act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+		if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
+			act 'Show Katja that you''re not wearing panties': gt 'katja_pantyquest', 'coffee_hole'
+		end
 		act 'Continue talking': gt 'katja_chat', 'coffee_hole_event'
 		act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
 	end

locations/katja_city_sex.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines':
 							*clr & cla
 							minut += 5
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'You take the tube and snort two lines as Katja watches with wide-open eyes.'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines line, but don''t push Katja':
 							*clr & cla
 							minut += 5
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'"I''ll take some, but I don''t think my friend will," you say as you take the tube and Katja shakes her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
@@ -156,11 +156,11 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 									gs 'willpower', 'drugs', 'force'
 								end
 								gs 'willpower', 'pay', 'force'
-								gs 'drugs', 'cocaine'
+								gs 'drugs', 'cocaine', 1
 								gs 'stat'
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
-								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 								'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 								'She still looks skeptical. "I don''t know, <<$pcs_nickname>>... I''m not sure it''s a good idea," she replies.'
 								'"You liked it last time! It''ll be fine this time too," you continue.'
@@ -235,11 +235,11 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines with Katja (<<will_cost>> Willpower)':
 							*clr & cla
 							minut += 8
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
-							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 							'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube, which she happily takes.'
 							'You put your tubes to your nostrils and lower your heads to the table to sniff your line. Katja does it with great enthusiasm.' 
@@ -321,11 +321,11 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines with Katja (<<will_cost>> Willpower)':
 							*clr & cla
 							minut += 8
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
-							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Okay, let''s do it together," you say.'
 							'"Yes! That''s the spirit," she replies. She''s already taken the tube from <<$npc_nickname[$npclastgenerated]>>, so he quickly produces another one and hands it to you.'
 							'You both put your tubes to your nostrils and lower your heads to the table to sniff your lines. Katja does it like it''s something she does all the time.' 

locations/katja_dorm.qsrc

@@ -1471,7 +1471,7 @@ if $ARGS[0] = 'cocain_offer':
 		gs 'stat'
 		gs 'katja_procedural', 'take_cocaine'
 		gs 'stat'										
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 		'"Okay, Katja. Let''s do it," you say.'
 		'"Yes. That''s the spirit," she replies and prepares some lines for the two of you, and finds some tubes for you to use.'
 		'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 

locations/katja_nightclub.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'dance_guy_approach':
 						katjaQW['horny'] += 20
 						'Katja clearly enjoys the attention she''s getting and 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_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)):
+					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 has introduced her to sex with a boy is there a chance that she will go with the guy. In the later case she won''t go until after the the player has had the relationship talk, and then only if they agreed on an open relationship or if she has warned the player because she has caught the player cheating. She also won''t go if the player said they''re not into boys.
 						katjaQW['nightclub_private_room_boy'] = 1
 						katjaQW['disco_loc'] = 7

locations/katja_nightclub_sex.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube, which she happily takes.'
 						'You put your tubes to your nostrils and lower your heads to the table to sniff your line. Katja does it with great enthusiasm.' 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'"Okay, let''s do it together," you say.'
 						'"Yes! That''s the spirit," she replies. She''s already taken the tube from <<$npc_nickname[$npclastgenerated]>>, so he quickly produces another one and hands it to you.'
 						'You both put your tubes to your nostrils and lower your heads to the table to sniff your lines. Katja does it like it''s something she does all the time.' 
@@ -1352,7 +1352,7 @@ if $ARGS[0] = 'private_booth_FFFF':
 		gs 'arousal', 'foreplay_give', 2, 'group', 'lesbian'
 		gs 'arousal', 'kiss', -2, 'group', 'lesbian'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private2.png"></center>'
 		'You walk over to Katja and <<$npc_nickname[$boy2]>> as <<$npc_nickname[$boy1]>> gets down on her knees and removes Katja''s head from <<$npc_nickname[$boy2]>>''s breast and starts to kiss her.'
 		'You follow and bend down to make out with <<$npc_nickname[$boy2]>> and fondle her breast.'
 		act 'Get into it':
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'private_booth_FFFF_you':
 						*clr & cla		
 						katjaQw['horny'] += rand(5,15)
 						gs 'boystat', 'D5', 'd'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private10.jpg"></center>'	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private10.png"></center>'	
 						'<<$npc_nickname[$boy2]>> moves away, but Katja quickly moves in and starts kissing you. You hear <<$npc_nickname[$boy2]>> say "Here it is," before you feel something hard getting stuffed into your pussy. "It''s better if you do this yourself <<$pcs_nickname>>," <<$npc_nickname[$boy1]>> says and you feel your right hand being moved to grasp what you imagine is a dildo in your pussy.'
 						'It takes a few tries to get into the rhythm of using the dildo, but you soon feel the nice sensation of having the dildos in your pussy and ass moving in and out of you, alternating which is deepest.'
 						*nl
@@ -1574,6 +1574,7 @@ if $ARGS[0] = 'private_booth_FFFF_girls':
 	'<<$npc_nickname[$boy2]>> is clearly very excited and it don''t take you long to get her off. She cums with a huge yell, which makes you wonder if they can hear her on the dance floor.'
 	'After <<$npc_nickname[$boy2]>> get her breath back, she get up. "Okay whore, now it''s your turn so get down on all fours," she says to <<$npc_nickname[$boy1]>>.'
 	act 'See what happens':
+		*clr & cla
 		katjaQw['horny'] += rand(0,5)
 		gs 'arousal', 'vaginal_dildo_give', 4, 'group', 'lesbian'
 		gs 'stat'
@@ -1585,6 +1586,7 @@ if $ARGS[0] = 'private_booth_FFFF_girls':
 		'You use the dildo on <<$npc_nickname[$boy1]>> while <<$npc_nickname[$boy2]>> keeps her foot on her head, saying one humiliating thing after the other about her or her body.'
 		'<<$npc_nickname[$boy1]>> soon cums with a powerful, squirting orgasm.'
 		act 'After sex':
+			*clr & cla
 			gs 'arousal', 'kiss', 2, 'group', 'lesbian'
 			gs 'arousal', 'clit_finger_give', -1, 'group', 'lesbian'
 			minut += 4

locations/katja_pantyquest.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'kitchen':
 				katjaQW['horny'] += rand(5,10)
 				katjaQW['slut'] += 1
 				katjaQW['no_panties_day'] = daystart
-				if PCloSkirt > 1:
+				if PCloSkirt => 1:
 					if analplugIN = 1:
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/tanga1_7.mp4"></video></center>'
 					else
@@ -34,7 +34,7 @@ if $ARGS[0] = 'kitchen':
 					end
 						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
@@ -110,7 +110,7 @@ if $ARGS[0] = 'kitchen':
 					end
 						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
@@ -228,7 +228,7 @@ if $ARGS[0] = 'kitchen':
 								end
 								'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 							else
-								'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 								'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 							end
 							act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
@@ -268,7 +268,7 @@ if $ARGS[0] = 'kitchen':
 					end
 					'You look around to see if anyone is coming before pulling up your skirt and showing Katja your pussy from behind.' 
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your bare pussy.' 
 				end
 				act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
@@ -337,7 +337,7 @@ if $ARGS[0] = 'uni_hallway':
 				end
 					'You look around to see if anyone is coming, before pulling up your skirt to show Katja your pussy from behind.' 
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
@@ -539,7 +539,7 @@ if $ARGS[0] = 'uni_exit':
 				end
 					'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] = 1:

locations/katja_party.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'party_heading_out':
 			gs 'drugs', 'cocaine', 1
 			gs 'katja_procedural', 'take_cocaine'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 			'"OK, Katja. Let''s do it together," you say.'
 			'"Yes. That''s the spirit," she replies. She then prepares some lines for the two of you and finds some tubes to use to snort the cocaine.'
 			'You both put your tubes to your nostrils and lower your heads to the table and snort your lines.' 
@@ -552,7 +552,7 @@ if $ARGS[0] = 'party_heading_out':
 							minut += 5
 							gs 'drugs', 'cocaine'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'You open your bag and make some lines on the table before taking a tube and snorting the first line, then the second. Katja looks at you with wide open eyes.'
 							'After a short moment, it hits you and you feel the full effect of the drug. "Damn, that was good!" you exclaim, as you come down a little.'
 							'You try to hand Katja the tube, "Your turn."'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'party_heading_out':
 						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You put your tubes to your nostrils and lower your heads to the table and snort your lines. Katja does it with great enthusiasm.' 
 						*nl
@@ -695,7 +695,7 @@ if $ARGS[0] = 'party_heading_out':
 						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You both put your tubes to you nostrils and lower your heads to the table and snort your lines. Katja does it like it''s something she does all the time.' 
 						*nl

locations/katja_uni.qsrc

@@ -910,7 +910,7 @@ if $ARGS[0] = 'studying_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you,"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -919,7 +919,7 @@ if $ARGS[0] = 'studying':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_together.jpg"></center>'
 	minut += 15
 	modifier = dyneval('RESULT = max(npc_intel[''<<$ARGS[5]>>''], pcs_intel) + (max(10+min(npc_intel[''<<$ARGS[5]>>''] -pcs_intel, pcs_intel -npc_intel[''<<$ARGS[5]>>'']),0)*(100 - max(npc_intel[''<<$ARGS[5]>>''], pcs_intel)))/50')
-	gs 'grades', 'optional_activity_attribute', '<<$ARGS[1]>>', '<<$ARGS[2]>>', 'yes', min(modifier+10,100)
+	gs 'grades', 'optional_activity_attribute', $ARGS[1], $ARGS[2], 'yes', min(modifier+10,100)
 	killvar 'modifier'
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'studying_exam_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you for the <<$ARGS[2]>> exam"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying_exam', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying_exam', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'studying_exam':
 		else
 			'You study for half an hour and believe that you''re improving a lot.'
 		end		
-		gs 'grades', 'grade_award', '<<$ARGS[1]>>', '<<$ARGS[2]>>', study_mod
+		gs 'grades', 'grade_award', $ARGS[1], $ARGS[2], study_mod
 	end
 	
 	gs 'stat'
@@ -1072,8 +1072,7 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'modifier'
 	killvar 'study_mod'
 	
-	if (week < 6 or hour < 23) and hour > 7 and 'no_study' = 0:
-		killvar 'no_study'
+	if (week < 6 or hour < 23) and hour > 7 and no_study = 0:
 		act 'Say goodbye to Katja and return to the library entrance':
 			killvar 'no_study'
 			minut += 2
@@ -1087,7 +1086,7 @@ if $ARGS[0] = 'studying_exam':
 			'She leaves the library, giving you a wave and a smile on the way out.'
 		end
 	else
-		if 'no_study' = 0:
+		if no_study = 0:
 			'"Well, it looks like the library is closing up," Katja says, reaching to pack up her stuff. "But it was nice studying together. We should do it again sometime!"'
 			'You leave together, parting ways at the entrance with a wave and a smile.'
 		else

locations/lact_bp.qsrc

@@ -72,8 +72,8 @@ if $ARGS[0] = 'build_bp':
 	bpID_arr[bp_i] = bp_i
 	bpType_arr[bp_i] = ARGS[1]
 	bpLocID_arr[bp_i] = ARGS[2]
-	bpbID1_arr[bp_i] = ''
-	bpbID2_arr[bp_i] = ''
+	bpbID1_arr[bp_i] = -1
+	bpbID2_arr[bp_i] = -1
 	result = bp_i
 end
 

locations/mey_home.qsrc

@@ -40,7 +40,7 @@ if $args[0] = 'door':
 			if frost > 0: frost = 0
 			act 'Enter': minut += 1 & gt 'mey_home', 'start'
 		end
-	elseif locat['katja'] = 7:
+	elseif locat['katja'] = 7 and katjaQW['QWstage'] > 1:
 		cla
 		'You walk up to the Meynolds residence and ring the doorbell...'
 		'Katja opens the door and quickly drags you to her room.'

locations/miroslava.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	! MiraVars['QW'] = 11 Guys fuck Mira after she pissed at party
 	! MiraVars['QW'] = 12 PC tells her about it
 	! MiraVars['QW'] += Mira pose as a prostitute
-	
+
 	! daystart < MiraVars['emb_day'] hiding in her house after 3rd wish. Reduces 1 per day, plus 1 more per day if you talk to her
 
 	gs 'miroslava', 'miraclothes'
@@ -506,7 +506,7 @@ if $ARGS[0] = 'cattle_chore_acts':
 				pcs_mood += 5
 				if pcs_inhib < 50: inhib_exp += rand(1, 2)
 				gs 'stat'
-	
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
 				'You wade in the river, splashing around with Mira is a lot of fun.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
@@ -736,7 +736,6 @@ if $ARGS[0] = 'offer_steam_bath':
 
 			'You offer Mira the opportunity to relax with you in the bath. She pauses for a few moments to think but then agrees slowly. Then, you lead her into your grandparents'' backyard...'
 
-			MiraVars['guest'] = 1
 			act 'Go to your home': gt 'gad_gpbath', 'start'
 		end
 	end
@@ -832,19 +831,18 @@ if $ARGS[0] = 'guest_acts':
 			menu_off = 1
 			minut += 5
 			MiraVars['guest'] = 1
-			if npc_rel['A60'] < 30:npc_rel['A60'] += 1
+			if npc_rel['A60'] < 30: npc_rel['A60'] += 1
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 
 			'You are tired of hanging around on the street, and you decide to invite Mira to dinner.'
 
-			act'Go home':
+			act 'Go home':
 				if ($clothingworntype ! 'nude' and PCloswimwear = 0):
 					minut += 15 & gt 'gad_gphouse', 'start'
 				else
 					*clr & cla
 					minut += 5
-					MiraVars['guest'] = 1
 					gs 'underwear', 'wear'
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 
@@ -867,7 +865,7 @@ if $ARGS[0] = 'guest_acts':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_tv'+rand(1, 12)+'.jpg"></center>'
 			'You and Mira watch TV for an hour.'
 
-			act'Continue': gt 'gad_gphouse', 'start'
+			act 'Continue': gt 'gad_gphouse', 'start'
 		end
 
 		if hour >= 18:
@@ -900,6 +898,7 @@ if $ARGS[0] = 'guest_acts':
 			MiraVars['guest'] = 0
 			MiraVars['follow_time'] = 0
 			MiraVars['follower'] = 0
+			if MiraVars['guestday'] <= daystart: MiraVars['guestday'] = daystart + 1
 			act 'Walk back home': gt 'gad_gphouse', 'start'
 		end
 	end

locations/miroslava_schedule.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'get_locat_from_loc':
 		result = 81
 	elseif $loc = 'furi' and nroad = 10:
 		result = 82
-	
+
 	else
 		result = 10
 	end
@@ -98,15 +98,15 @@ end
 if $ARGS[0] = 'force_change':
 	temp_start_loc = locat['A60']
 	gs 'miroslava_schedule'
-	i = 0
+	mss_i = 0
 	:mira_loop_start
 	if locat['A60'] = temp_start_loc:
 		gs 'miroslava_schedule', 'cikl'
 		gs 'miroslava_schedule'
-		i += 1
-		if i < 10: jump 'mira_loop_start'
+		mss_i += 1
+		if mss_i < 10: jump 'mira_loop_start'
 	end
-	killvar 'i'
+	killvar 'mss_i'
 	killvar 'temp_start_loc'
 end
 
@@ -133,6 +133,7 @@ if $ARGS[0] = 'update_locat':
 	end
 
 	if MiraVars['guest'] = 1:
+		if MiraVars['guestday'] <= daystart: MiraVars['guestday'] = daystart + 1
 		!! check if mira and sveta are in the same location.
 		!! if so: locat['A60'] remains the same
 		!! else: MiraVars['guest'] = 0
@@ -156,17 +157,16 @@ if $ARGS[0] = 'update_locat':
 
 	gs 'miroslava_schedule', 'get_base_schedule'
 
-
 	if sunWeather = 0:
 		if locat['A60'] >= 30 and locat['A60'] ! 42:
-			if MiraVars['guestday'] >= daystart or npc_known['A60'] = 0 or locat['A60'] = 10 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
+			if MiraVars['invite_day'] >= daystart or npc_known['A60'] = 0 or locat['A60'] = 10 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
 				locat['A60'] = 10
 			else
 				MiraVars['invite_rand'] = rand(0, 1)
-				MiraVars['guestday'] = daystart
+				MiraVars['invite_day'] = daystart
 				if MiraVars['invite_rand'] = 0:
 					locat['A60'] = 21
-					MiraVars['follow_time'] = 3
+					MiraVars['follow_time'] = 2
 				else
 					locat['A60'] = 10
 				end
@@ -174,12 +174,14 @@ if $ARGS[0] = 'update_locat':
 		end
 	else
 		if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
-		if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution 
+		if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution
 		if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
 		if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
 		if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
 		if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.
 	end
+
+	if MiraVars['guest'] = 0 and (locat['A60'] / 10 = 2) and MiraVars['guestday'] > daystart: locat['A60'] = 10
 end
 
 

locations/nerd_game_night.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'game_night1':
 		'You hear a few sighs as Feofan passionately continues. "Why does it always end up like this? Let''s get on with the game already!" Petka exclaims.'
 		gs 'nerd_game_night', 'group_rel_change','nerds', 1
 	elseif $loc = 'city_coffee_hole':
-		'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 		'Upon entering the Coffee Hole, you can see the nerds have claimed a area of couches around a large coffee table in the back corner. As you make your way over to them, you can''t help but notice Anushka working the counter. As you join them, you can feel the anxious gazes as you greet the group sitting around the table that has a large map spread across it, along with small figures, various papers and books, and lots and lots of dice.'
 		'Just as you''re about to ask what they''re doing, Feofan speaks up. "Welcome to our little game night, <<$pcs_nickname>>! Please take a seat and I''ll explain the rules to you."'
 		*nl
@@ -269,7 +269,7 @@ if $ARGS[0] = 'keep_playing_on1':
 					'She just shakes her head slightly and continues serving. "Your Elven Ladyship," she says teasingly to Petka which causes him to blush, loud enough for everyone to hear. "Well, have fun nerds. Just remember to clean up after yourselves."'
 					act 'Back to the game':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 						'Once Anushka is gone, you all get back into the game. The rest continue with their special banter and the discussions are quite intensive, forcing you to take small breaks.'
 						'Feofan tries his best to be a good game leader, but sometimes even he can''t keep his head cool and gets carried away as he passionately discusses the game world.'
 						'The time quickly flies by before Feofan interrupts and stops the game as it''s getting late and he has to get back to the dorm.'
@@ -371,7 +371,7 @@ if $ARGS[0] = 'keep_playing_on2':
 				'He blushes bright red and stammers. "What?! No! I just... I mean...." He''s totally flustered by her question and you notice Zinaida smiling slightly at the interaction. Petka''s reaction makes Anushka grin, having gotten the reaction she was hoping for. "Well, have fun nerds. Just remember to clean up after yourselves."'
 				act 'Back to the game':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Once Anushka is gone, you all get back into the game. The group banter back and forth as their characters talking about what they plan to spend their share of the treasure on, before deciding the order of who is on watch during the night. After that, everyone takes their turn on watch as Petka receives a ribbing about what Anushka said about his choice of character.'
 					'"We''re out of time," Feofan announces and you and the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time." The group then gather up their books and walk out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 					act 'Leave': gt 'city_coffee_hole', 'inner'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'keep_playing_on2':
 					'"See, this is why I could never play a game like this. You guys never want to role play the fun stuff." She walks away without waiting for a reply, but you notice Feofan watching her, seemingly thinking about what she just said.'
 					act 'Back to the game':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 						'Once Anushka is gone, you all get back into the game. The party beds down for the night as you and the others keep teasing Petka.'
 						'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and walk out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 						act 'Leave': gt 'city_coffee_hole', 'inner'
@@ -512,7 +512,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -567,7 +567,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -620,7 +620,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'game_night3':
 									'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gerasim just smiles as Anushka walks away.'
 									act 'Back to the game':
 										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 										act 'Leave': gt 'city_coffee_hole', 'inner'
 										act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -773,7 +773,7 @@ if $ARGS[0] = 'game_night4':
 					if anushkaQW['artem_dom'] = 1:
 						act 'Wait for your order':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffe_hole/waiting_tables.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffee_hole/waiting_table.jpg"></center>'
 							'When Anushka leaves to go get your orders Zinaida looks pretty shocked as she says. "I can''t believe she played along."'
 							'Gerasim clears his throat. "I''ve been telling you guys she''s not that bad once you get to know her." Which quickly starts a debate if she is that bad or not. Gerasim is firmly on the side she isn''t that bad, Feofan seems a bit torn but leans towards that she isn''t so bad. The rest seem not to really trust her or think she is going to play some prank on them or get back at them later. Before you can get into to much Feofan clears his throat and everyone glances to where he is looking and you see her returning with your orders.'
 							*nl 
@@ -787,7 +787,7 @@ if $ARGS[0] = 'game_night4':
 								'Anushka only gives a backwards glance to that as she walks off. Everyone watches her walk away, as she throws some extra sway into her walk, really rocking her ass, that is barely covered by a pair of really tight shorts, as it rocks back and forth. Zinaida gives a annoyed snort and barely looks, Julia''s gaze lingers a bit longer but she too looks away, the boys though, they all pretty much watch her until she is back behind the counter, you know they are all staring at her ass, just like that walk was intended to get them to do.'
 								act 'Back to the game':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 									'Once Anushka is gone, Feofan turns and looks at Artem. "Dude I can''t believe you did that."'
 									'Petka chimes in. "I can''t believe she didn''t kick your ass right on the spots."'
 									'Zinaida shakes her head. "Personally I can''t believe you would do that in front of <<$pcs_nickname>>, you know your Girl Friend!" She looks very annoyed he would treat you like this.'
@@ -806,7 +806,7 @@ if $ARGS[0] = 'game_night4':
 										'Then Feofan looks to you. "What do you think <<$pcs_nickname>>? We are split three for and three against." You realize you are the deciding vote. Even if you votes yes you don''t think she would agree, but then you never thought she would play along either like she just did.'
 										act 'I will ask':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'You look around and figure why not ask her. "I kinda doubt she will say yes, but you never know. I will ask her next time we hang out."'
 											'Feofan speaks up. "I think this could be fun, text me with what she says <<$pcs_nickname>>." Julia, Petka, and Zinaida look disappointed, while Artem gives you a reassuring smile and Gerasim looks happy.'
 											*nl
@@ -818,7 +818,7 @@ if $ARGS[0] = 'game_night4':
 										end
 										act 'I won''t ask':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'You shake your head. "Even if I asked her, she wouldn''t agree. I know her well enough that any free time she has, she would rather go party, than sit around playing a game."'
 											'Artem speaks up. "I agree, while it might be fun I just don''t see her agreeing." Gerasim and Feofan look disappointed while the rest look relieved.'
 											*nl
@@ -838,7 +838,7 @@ if $ARGS[0] = 'game_night4':
 										'Artem just looks more smug and proud of himself. "She''s more bark than bit, after <<$pcs_nickname>> and I started dating. We started hanging out with her some and I realized, she isn''t that bad once you get to know her."'									
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'With that settled you all get back into the game. Feofan continues. "After a bit the patrons seems to have relaxed and forget about you. Their is several patrons that catch your trained eyes. There''s a beautiful woman sitting furthest away, almost hidden from the rest. She''s dressed in all black, observing your group. Closest to the bar counter, you see a group of drunk and rowdy men in armor, talking loudly about some of the adventures they''ve been on. Lastly, an old man, his face covered in scars, is enjoying his drink..."'
 											'Julia nudges you. "Pick one and go talk to them." You look around in confusion. "Don''t look so worried! You have the highest persuasion out of the whole group, so decide who to talk to and if anything happens, we have your back."'
 											act 'Talk to the woman': gt 'nerd_game_night', 'woman'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'game_night4':
 					else
 						act 'Wait for your order':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffe_hole/waiting_tables.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffee_hole/waiting_table.jpg"></center>'
 							'When Anushka leaves to go get your orders Zinaida looks pretty shocked as she says. "I can''t believe she played along."'
 							'Gerasim clears his throat. "I''ve been telling you guys she''s not that bad once you get to know her." Which quickly starts a debate if she is that bad or not. Gerasim is firmly on the side she isn''t that bad, Feofan seems a bit torn but leans towards that she isn''t so bad. The rest seem not to really trust her or think she is going to play some prank on them or get back at them later. Before you can get into to much Feofan clears his throat and everyone glances to where he is looking and you see her returning with your orders.'
 							*nl 
@@ -870,7 +870,7 @@ if $ARGS[0] = 'game_night4':
 								'Anushka pours on the seductive girl charm and giggles. "I thought you would never ask." Followed by planting a big kiss on his lips, which has all the other nerds staring. After breaking the kiss she gets up. "I have to get back to work, but I will see you tonight for more of that." Then she saunters off in character and for real. Everyone watches her walk away, as she throws some extra sway into her walk, really rocking her ass, that is barely covered by a pair of really tight shorts, as it rocks back and forth. Zinaida gives a annoyed snort and barely looks, Julia''s gaze lingers a bit longer but she too looks away, the boys though, they all pretty much watch her until she is back behind the counter, you know they are all staring at her ass, just like that walk was intended to get them to do.'
 								act 'Back to the game':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 									'Once Anushka is gone, Gerasim turns to the group and says. "We should ask her to join again."'
 									'Most are against the idea, while Artem points out. "Even if we wanted she works on the days we play."'
 									'Gerasim presses on. "We could switch days to one that she is off then, I mean if she said yes." Feofan seems open to the idea but the rest are against it so you just keep your opinion to yourself, since they always vote. Even if you voted with Gerasim and Feofan there would be more no''s.'
@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'game_night5':
 				act 'So what about next week?':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 					'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 					*nl
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'game_night5':
 				act 'So what about next week?':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 					'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 					*nl

locations/newspaper_pages.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'add_event_pages':
 !		$np_pages[] = 'gs ''loc'', ''loc_arg'' '
 !	end
 
+	if daystart => 94 and daystart <= 107: $np_front_pages[] = 'gs ''newspaper_pages'', ''boris_arrested'' '
+
 	if rand(0, 9) = 0 and NewspaperVars['gad_missing_day'] < daystart:
 		$NewspaperVars['gad_missing_name'] = $randname
 		NewspaperVars['gad_missing_age'] = rand(9, 69)
@@ -48,12 +50,12 @@ end
 if $ARGS[0] = 'add_generic_frontpage':
 !	$np_front_pages[] = 'gs ''newspaper_pages'', ''generic_front_<<rand(0, 1)>>'' '
 
-	$np_front_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 2)>>'' '
+	$np_front_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 1)>>'' '
 
 end
 
 if $ARGS[0] = 'add_generic_page':
-	$np_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 2)>>'' '
+	$np_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 1)>>'' '
 end
 
 
@@ -65,20 +67,13 @@ end
 	!!=======================================================!!
 
 if $ARGS[0] = 'generic_0':
-	'<center>Mayor Election Scandal</center>'
-	*nl
-	'In a shocking turn of events the Mayoral candidate Boris Barlovsky has been arrested and is under investigation for numerous offences including running an escort services in Pavlosk.'
-	'We can exclusively reveal the full scandal on page 3.'
-end
-
-if $ARGS[0] = 'generic_1':
 	'<center>Mysterious Lights over Pushkin</center>'
 	*nl
 	'Last night there was several reports of floating lights over Pushkin lake, authorities have dismissed it as light bouncing off the water into low mist. However eye witness reports and photographs discredit the official report.'
 	'Read more on page 4.'
 end
 
-if $ARGS[0] = 'generic_2':
+if $ARGS[0] = 'generic_1':
 	'<center>Missing cosmonaut found living in cave in Vladivostok</center>'
 	*nl
 	'Former cosmonaut Valentin Vitalyevich Lebedev (82) had been reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science which Valentin started and is the director of. He was found in a cave with only basic amenities and a small supply of food. When asked why he was there he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
@@ -101,6 +96,14 @@ if $ARGS[0] = 'Gad_missing':
 	'Today <<$NewspaperVars[''gad_missing_name'']>> name, <<NewspaperVars[''gad_missing_age'']>> has been reported missing in Gadukino. They was last seen four days ago foraging in the forest. This makes this the <<NewspaperVars[''gad_missing_counter'']>> person that has gone missing in recent months and the authorities are at a loss in trying to locate to what has happened to them.'
 end
 
+if $ARGS[0] = 'boris_arrested':
+	'<center>Mayor Election Scandal</center>'
+	*nl
+	'In a shocking turn of events the Mayoral candidate Boris Barlovsky has been arrested and is under investigation for numerous offences including running an escort services in Pavlosk.'
+	'We can exclusively reveal the full scandal on page 3.'
+end
+
+
 
 
 --- newspaper_pages ---------------------------------

locations/nichUtil.qsrc

@@ -24,6 +24,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	'This page should never appear. Please report this bug including a description of how you got here.'
 
 elseif $ARGS[0] = 'debug':
+	!reset cheat menu
+	if settingmode > 0:
+		killvar 'settingmode'
+		killvar 'menu_off'
+	end
+
 	if $ARGS[1] = 'debugToggle':
 		nichDebug = 1 - nichDebug
 	elseif $ARGS[1] = 'galaTrainingToggle':

locations/npc_3501_init.qsrc

@@ -58,7 +58,7 @@ end
 if $ARGS[0] = 'graveyard_memorial':
 	*clr & cla
 	$setloc['StageTitle'] = 'Pushkin Graveyard'
-	$setloc['StageImage'] = '<<$default_img_path>>ballet_events/graveyard'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_events/graveyard.jpg'
 	minut += 45
 	gs 'stat'
 	gs 'core_library', 'stage_title'
@@ -195,13 +195,13 @@ if $ARGS[0] = 'summer_school':
 		*clr & cla
 		if mayaqw['grave'] = 4:
 			mood += 10
-			'<center><img <<$set_imgh>> src="images/characters/ballet/3501_1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/maya/3501-1.jpg"></center>'
 			'<<$npc_firstname[''A3501'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
 			'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A3501'']>>.'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/ballet/warden.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_npc/3513.jpg"></center>'
 			'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'

locations/npc_finder.qsrc

@@ -2,63 +2,95 @@
 
 *clr
 gs 'obj_din', 'cheattabs'
-'<a href="exec: gt ''npc_finder'', ''finder''">Enter the ID of the character.</a>'
+'<center><a href="exec: gt ''npc_finder'', ''finder''">Enter the ID of the character.</a></center>'
+*nl
+'<center><a href="exec: gt ''npc_finder'', ''finderDNA''">Enter the DNA of the character.</a></center>'
+
 if $ARGS[0] = 'finder':
     $looking = input ('ID (like <i>A17</i>)')
+    if $looking ! '': gt 'npc_finder'
+end
+
+if $ARGS[0] = 'finderDNA':
+    $looking = input ('DNA (like <i>1594378993</i>)')
+    if $looking ! '' and isnum($looking):
+        killvar 'npctemp'
+        :npcdnafinder
+            if val($looking) = val($mid($npc_dna['A<<npctemp>>'], 1, 10)): $npctemp = 'A<<npctemp>>'
+            if $npctemp = '':
+                if val($looking) = val($mid($npc_dna['B<<npctemp>>'], 1, 10)): $npctemp = 'B<<npctemp>>'
+            end
+            if $npctemp = '':
+                if val($looking) = val($mid($npc_dna['C<<npctemp>>'], 1, 10)): $npctemp = 'C<<npctemp>>'
+            end
+        if npctemp < arrsize('$npc_dna') and $npctemp = '': npctemp += 1 & jump 'npcdnafinder'
+        $looking = $npctemp
+        killvar 'npctemp'
+    end
+    if $looking = '': msg 'Can''t find this NPC' & killvar 'looking' & exit
     gt 'npc_finder'
 end
 
 if $looking ! '':
     '<br><br>'
     'Found character:'
-    '<br>'
-    '<<$npc_pic[''<<looking>>'']>>'
-    'DNA string: <<$npc_dna[''<<$looking>>'']>>'
-    'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
-    if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
-    'Intelligence: <<npc_intel[''<<$looking>>'']>>'
-    if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
-    if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
-    if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
-    if npc_haircol['<<$looking>>'] = 0:
-        'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 1:
-        'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 2:
-        'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+    if $mid($looking,1,1) = 'A':
+        if $npc_pic[$looking] = '':
+            '<center><img src="images/characters/shared/headshots_main/big<<mid($looking,2)>>.jpg"></center>'
+        else
+            '<center><img <<$set_imgh>> src="<<$npc_pic[$looking]>>"></center>'
+        end
+    else
+        '<center><img <<$set_imgh>> src="images/system/phone/icons/<<$npc_pic[$looking]>>"></center>'
+    end
+    '<br>ID: <<$looking>>'
+    'DNA string: <<$npc_dna[$looking]>>'
+    'Name: <<$npc_firstname[$looking]>>'+ iif($npc_nickname[$looking] ! '', ' "<<$npc_nickname[$looking]>>" ',' ') +'<<$npc_lastname[$looking]>> (<<$npc_usedname[$looking]>>)'
+    if npc_dob[$looking] > 0: 'Birthday (YYYY-MM-DD): <<mid(npc_dob[$looking],1,4)>>-<<mid(npc_dob[$looking],5,2)>>-<<mid(npc_dob[$looking],7,2)>>'
+    if npc_intel[$looking] > 0: 'Intelligence: <<npc_intel[$looking]>>'
+    if npc_grupTipe[$looking] >= 0: 'Social group: <<npc_grupTipe[$looking]>>'
+    if npc_sexskill[$looking] >= 0: 'Sex skill: <<npc_sexskill[$looking]>>'
+    if npc_rep[$looking] > 0: ' Reputation in school: <<npc_rep[$looking]>>'
+    if npc_haircol[$looking] = 0:
+        'Natural hair color: black (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 1:
+        'Natural hair color: brown (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 2:
+        'Natural hair color: read (<<npc_haircol[$looking]>>)'
     else
-        'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+        'Natural hair color: blonde (<<npc_haircol[$looking]>>)'
     end
-    if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
-    'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
-    'Height: <<npc_height[''<<$looking>>'']>>'
-    if npc_gender['<<$looking>>'] = 0:
+    if hotcat_rating[$looking] > 0: 'Hotness rating: <<hotcat_rating[$looking]>>'
+    if npc_apprnc[$looking] > 0: 'Appearance value: <<npc_apprnc[$looking]>>'
+    if nnpc_heightpc_rep[$looking] > 0: 'Height: <<npc_height[$looking]>>'
+    if npc_gender[$looking] = 0:
         'Gender: male'
-        'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
-        'Dick length: <<npc_dick[''<<$looking>>'']>>'
-        'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+        'Dick thickness: <<$npc_thdick[$looking]>>'
+        'Dick length: <<npc_dick[$looking]>>'
+        'Potential: <<npc_spermpot[$looking]>> (default is 10000)'
     else
         'Gender: female'
-        'Breast size: <<npc_bust[''<<$looking>>'']>>'
+        'Breast size: <<npc_bust[$looking]>>'
     end
-    if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
-    if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
-    if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
-    if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+    if npc_herpes[$looking] > 0: $npcvendisease += 'herpes; '
+    if npc_syth[$looking] > 0: $npcvendisease += 'syphilis; '
+    if npc_gon[$looking] > 0: $npcvendisease += 'gonorrhea; '
+    if npc_thrush[$looking] > 0: $npcvendisease += 'yeast infection; '
     if $npcvendisease = '': $npcvendisease = 'none'
     'Veneral diseases: <<$npcvendisease>>'
-    'Sexual acts with PC: <<npc_sex[''$looking'']>>'
-    'Perversion: <<npc_perv[''$looking'']>>'
-    'Notes: <<$npc_notes[''<<$looking>>'']>>'
+    'Sexual acts with PC: <<npc_sex[$looking]>>'
+    'Perversion: <<npc_perv[$looking]>>'
+    'Notes: <<$npc_notes[$looking]>>'
     ''
     'Found relationships:'
     npctemp = 0
     :relationshipfinder
-        gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
-        if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
-            '<br>ID: A<<npctemp>>'
+        gs 'DNA','relate', $npc_dna[$looking], $npc_dna['A<<npctemp>>']
+        if $gen_relationship ! '' and 'A<<npctemp>>' ! $looking:
+            '<center><img src="images/characters/shared/headshots_main/big<<npctemp>>.jpg"></center>'
+            '<br><a href="exec:$looking = ''A<<npctemp>>'' & gt ''npc_finder''">ID: A<<npctemp>></a>'
             'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
-            'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+            'Name: <<$npc_firstname[''A<<npctemp>>'']>>'+ iif($npc_nickname['A<<npctemp>>'] ! '', ' "<<$npc_nickname[''A<<npctemp>>'']>>" ',' ') +'<<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
             'Relationship type: <<$gen_relationship>>'
         end
     if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'

locations/npcgeneratec.qsrc

@@ -48,19 +48,20 @@ if mid($cemptyarray[0],1,1) = 'C':
 	killvar '$cemptyarray', 0
 else
 	:npcgencsanityloop
-	i = 0
+	ngc_scheck = 0
 	$npclastgenerated = 'C' + '<<carraynumber>>'
 	$npctemparrc = 'C' + '<<(carraynumber)-(1)>>'
 	if $npc_perstype[$npctemparrc] = '' and carraynumber > 0:
 		carraynumber -= 1
-		i = 1
+		ngc_scheck = 1
 	elseif $npc_perstype[$npclastgenerated] = '':
-		i = 0
+		ngc_scheck = 0
 	else
 		carraynumber += 1
-		i = 1
+		ngc_scheck = 1
 	end
-	if i = 1: jump 'npcgencsanityloop'
+	if ngc_scheck = 1: jump 'npcgencsanityloop'
+	killvar 'ngc_scheck'
 end
 carraynumber += 1
 
@@ -154,62 +155,62 @@ end
 if npc_dick[$npclastgenerated] < 9:
 	$npc_dick_class[$npclastgenerated] = 'short'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'tiny'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'short'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'chode'
-		
+
 	end
-	
+
 !! average length dicks
-elseif npc_dick[$npclastgenerated] < 15:	
+elseif npc_dick[$npclastgenerated] < 15:
 	$npc_dick_class[$npclastgenerated] = 'average'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'skinny'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'normal'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'thick'
-		
+
 	end
 !! long dicks
 elseif npc_dick[$npclastgenerated] < 20:
 	$npc_dick_class[$npclastgenerated] = 'big'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'long'
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'huge'
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'enormous'
-		
+
 	end
 !! extremely long dicks
 else
 	$npc_dick_class[$npclastgenerated] = 'extra_big'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'lengthy'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'gigantic'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'monster'
 	end
 end
@@ -230,7 +231,7 @@ npc_intel[$npclastgenerated] = rand(1,npctempc2)
 npc_drunk[$npclastgenerated] = 0
 
 !! Horniness
-npc_horny[$npclastgenerated] = rand(0,60)
+npc_horny[$npclastgenerated] = max(0, rand(hotcat*2,hotcat*8) - npc_gender[$npclastgenerated]*20)
 
 !! Attractiveness
 npc_apprnc[$npclastgenerated] = rand(30,60)
@@ -325,7 +326,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_residence[$npclastgenerated] = 'city_center'
 	end
 
-	
+
 	if npc_finance[$npclastgenerated] = 0:
 		if npc_residence[$npclastgenerated] ! 1 and npc_residence[$npclastgenerated] ! 4 and npctempgage < 22:
 			npc_student[$npclastgenerated] = rand(0,1)
@@ -340,20 +341,20 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		if rand(1,3) = 1:
 			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] = 15
 			npc_end_free_time[$npclastgenerated] = 20
-			
+
 			npc_work_start[$npclastgenerated] = 6
 			npc_work_end[$npclastgenerated] = 14
 		else
 			npc_start_free_time[$npclastgenerated] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
@@ -361,33 +362,33 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_finance[$npclastgenerated] = 1:
 		npc_apt_type[$npclastgenerated] = rand(2,5)
 		npc_occupation[$npclastgenerated] = rand(7,15)
-		
+
 		if rand(1,2) = 1:
 			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] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
-		
+
 		if npc_car[$npclastgenerated] = 0: npc_car[$npclastgenerated] = rand(-3,1)
 	elseif npc_finance[$npclastgenerated] = 2:
 		if rand(1,2) = 1:
 			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] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
@@ -397,13 +398,13 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(14,18)
 		npc_car[$npclastgenerated] = rand(0,1)
 	end
-	
+
 	!! failsafe until possibility of roommates is sorted out
 	if npc_apt_type[$npclastgenerated] = 4: npc_apt_type[$npclastgenerated] = 5
-	
+
 	npc_day_off[$npclastgenerated] = rand(1,7)
-	
-	
+
+
 !!	npc_style[$npclastgenerated] determines generally how they dress and what their "persona" is
 !!	Each style is limited by their financial status and occupation
 !!	e.g. You can''t have someone who dresses like a businessman but works as a line cook
@@ -419,10 +420,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	else
 		npc_style[$npclastgenerated] = (rand(2,6) mod 6) + 1
 	end
-	
+
 	if npc_apt_type[$npclastgenerated] = 6:
 		!! high rise
-		
+
 		!! this is to determine what their spare room is used for based on their personality type
 		if npc_style[$npclastgenerated] = 3:
 			npc_apt_spare[$npclastgenerated] = 1
@@ -441,11 +442,11 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
-		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'		
+		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 	elseif npc_apt_type[$npclastgenerated] = 4 or npc_apt_type[$npclastgenerated] = 5:
 		!! multi-bedroom
 		!! npc_apt_type[$npclastgenerated] = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
-		
+
 		!! this is to determine what their spare room is used for based on their personality type
 		if npc_style[$npclastgenerated] = 3:
 			npc_apt_spare[$npclastgenerated] = 1
@@ -459,7 +460,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		elseif npc_apt_spare[$npclastgenerated] = 2:
 			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
-		
+
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg"></center>'
@@ -492,39 +493,39 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 	end
-	
-	if npc_occupation[$npclastgenerated] = 1: 
+
+	if npc_occupation[$npclastgenerated] = 1:
 		$npc_occupation[$npclastgenerated] = 'cashier_supermarket'
-	elseif npc_occupation[$npclastgenerated] = 2: 
+	elseif npc_occupation[$npclastgenerated] = 2:
 		$npc_occupation[$npclastgenerated] = 'cashier_liquor'
-	elseif npc_occupation[$npclastgenerated] = 3: 
+	elseif npc_occupation[$npclastgenerated] = 3:
 		$npc_occupation[$npclastgenerated] = 'cashier_coffee'
-	elseif npc_occupation[$npclastgenerated] = 4: 
+	elseif npc_occupation[$npclastgenerated] = 4:
 		$npc_occupation[$npclastgenerated] = 'barista'
-	elseif npc_occupation[$npclastgenerated] = 5: 
+	elseif npc_occupation[$npclastgenerated] = 5:
 		$npc_occupation[$npclastgenerated] = 'fast_food'
-	elseif npc_occupation[$npclastgenerated] = 6: 
+	elseif npc_occupation[$npclastgenerated] = 6:
 		$npc_occupation[$npclastgenerated] = 'taxi_driver'
 		npc_car[$npclastgenerated] = 1
-	elseif npc_occupation[$npclastgenerated] = 7: 
+	elseif npc_occupation[$npclastgenerated] = 7:
 		$npc_occupation[$npclastgenerated] = 'masseuse'
-	elseif npc_occupation[$npclastgenerated] = 8: 
+	elseif npc_occupation[$npclastgenerated] = 8:
 		$npc_occupation[$npclastgenerated] = 'masseuse_sexual'
-	elseif npc_occupation[$npclastgenerated] = 9: 
+	elseif npc_occupation[$npclastgenerated] = 9:
 		$npc_occupation[$npclastgenerated] = 'factory'
-	elseif npc_occupation[$npclastgenerated] = 10: 
+	elseif npc_occupation[$npclastgenerated] = 10:
 		$npc_occupation[$npclastgenerated] = 'bartender'
-	elseif npc_occupation[$npclastgenerated] = 11: 
+	elseif npc_occupation[$npclastgenerated] = 11:
 		$npc_occupation[$npclastgenerated] = 'mechanic'
-	elseif npc_occupation[$npclastgenerated] = 12: 
+	elseif npc_occupation[$npclastgenerated] = 12:
 		$npc_occupation[$npclastgenerated] = 'line_cook'
-	elseif npc_occupation[$npclastgenerated] = 13: 
+	elseif npc_occupation[$npclastgenerated] = 13:
 		$npc_occupation[$npclastgenerated] = 'waiter'
-	elseif npc_occupation[$npclastgenerated] = 14: 
+	elseif npc_occupation[$npclastgenerated] = 14:
 		$npc_occupation[$npclastgenerated] = 'personal_trainer'
-	elseif npc_occupation[$npclastgenerated] = 15: 
+	elseif npc_occupation[$npclastgenerated] = 15:
 		$npc_occupation[$npclastgenerated] = 'programmer'
-	elseif npc_occupation[$npclastgenerated] = 16: 
+	elseif npc_occupation[$npclastgenerated] = 16:
 		npc_criminal[$npclastgenerated] = 1
 		!! npc_criminal_open determines whether or not they will hide their criminality from the player
 		npc_criminal_open[$npclastgenerated] = rand(0,1)
@@ -537,15 +538,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		else
 			$npc_occupation[$npclastgenerated] = 'thief'
 		end
-	elseif npc_occupation[$npclastgenerated] = 17: 
+	elseif npc_occupation[$npclastgenerated] = 17:
 		$npc_occupation[$npclastgenerated] = 'businessman'
-	elseif npc_occupation[$npclastgenerated] = 18: 
+	elseif npc_occupation[$npclastgenerated] = 18:
 		$npc_occupation[$npclastgenerated] = 'lawyer'
-	elseif npc_occupation[$npclastgenerated] = 19: 
+	elseif npc_occupation[$npclastgenerated] = 19:
 		$npc_occupation[$npclastgenerated] = 'investment_banker'
 	end
 
-	
+
 !! ------------------------- lifestyle and personality choices ----------------------------------
 
 
@@ -578,15 +579,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	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: 
+	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 
-!!	2 = casual relationship 
+!!	1 = just sex
+!!	2 = casual relationship
 !!	3 = serious relationship
 	npc_goal[$npclastgenerated] = rand(1,3)
 	if npc_goal[$npclastgenerated] = 1:
@@ -626,7 +627,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 !!	if npc_lover_keys = 1: the player has keys to their apartment and can access it whenever they want
 	npc_lover_keys[$npclastgenerated] = 0
-	
+
 !!	quirk/trait generation
 	if rand(0,2) > 0:
 		if rand(0,1) = 1:
@@ -637,7 +638,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_earlyriser[$npclastgenerated] = 0
 		end
 	end
-	
+
 	if rand(0,2) > 0:
 		if rand(0,1) = 1:
 			npc_generous[$npclastgenerated] = 1
@@ -647,8 +648,8 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_generous[$npclastgenerated] = 0
 		end
 	end
-	
-	
+
+
 	!! 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:
@@ -671,7 +672,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_risktaker[$npclastgenerated] = 0
 		end
 	end
-	
+
 	if rand(0,2) > 0:
 		if rand(1,3) + npc_diligent[$npclastgenerated] > 2:
 			npc_neat[$npclastgenerated] = 1
@@ -681,7 +682,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_neat[$npclastgenerated] = 0
 		end
 	end
-	
+
 	npc_manscaped[$npclastgenerated] = rand(0,2) - npc_neat[$npclastgenerated]
 	if npc_manscaped[$npclastgenerated] < 1:
 		npc_manscaped[$npclastgenerated] = 0
@@ -691,42 +692,42 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_manscaped[$npclastgenerated] = 2:
 		$npc_pubes[$npclastgenerated] = 'bush'
 	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 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:
@@ -748,7 +749,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	end
 	if npc_condom_conscious[$npclastgenerated] < 0: npc_condom_conscious[$npclastgenerated] = 0
 	if npc_no_condoms[$npclastgenerated] < 0: npc_no_condoms[$npclastgenerated] = 0
-	
+
 	if rand(1,50) = 1:
 		npc_latex_allergy[$npclastgenerated] = 1
 		npc_no_condoms[$npclastgenerated] = 1
@@ -757,7 +758,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 !! Preferred sexual position
 	npc_fav_pos[$npclastgenerated] = rand(1,7)
-	
+
 	if npc_fav_pos[$npclastgenerated] = 1:
 		$npc_fav_pos[$npclastgenerated] = 'miss'
 	elseif npc_fav_pos[$npclastgenerated] = 2:
@@ -773,19 +774,19 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	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)
-	
-	
+
+
 	npc_sex_volume[$npclastgenerated] = rand(0,3)
 	!! npc_sex_volume refers to how much noise they make during sex
 	!! npc_sex_volume = 0: virtually quiet during sex
 	!! npc_sex_volume = 1: grunting noises only
 	!! npc_sex_volume = 2: will add dirty talk
 	!! npc_sex_volume = 3: loud "obnoxious" noises
-	
+
 	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
@@ -801,7 +802,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !! 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:
@@ -813,14 +814,14 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_cum_pref[$npclastgenerated] = 5:
 		$npc_cum_pref[$npclastgenerated] = 'pullout'
 	end
-	
+
 	if rand(1,5) = 1:
 		npc_bukakke_fetish[$npclastgenerated] = 1
 	elseif rand(1,3) = 1 and npc_cum_pref[$npclastgenerated] ! 3:
 		npc_dislikes_facials[$npclastgenerated] = 1
 	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)
@@ -828,14 +829,14 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	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'
@@ -846,7 +847,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	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
 	if rand(1,10) <= 4:
@@ -862,10 +863,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_sexdrive[$npclastgenerated] = rand(1,10)
 		if npc_sexdrive[$npclastgenerated] > 5: npc_energetic[$boy] = rand(0,1)
 	end
-	
+
 	!! if npc_sex_stamina determines how long they can last in bed without cumming
 	npc_sex_stamina[$npclastgenerated] = rand(1,10)
-	
+
 !!{	if rand(1,10) <= 4:
 		npc_sex_stamina[$npclastgenerated] = rand(3,5)
 	elseif rand(1,10) <= 3:
@@ -881,26 +882,26 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 	!! npc_spanker determines whether or not they''re into spanking during sex
 	if rand(1,3) = 1: npc_sex_spanker[$npclastgenerated] = 1
-	
+
 	!! npc_childfree determines that they never want to have kids and will react poorly to pregnancy related topics
 	if rand(1,5) = 1: npc_childfree[$npclastgenerated] = 1
-	
+
 	!! if npc_pussyeater = 1: they have a fetish for eating pussy
 	!! if npc_pussyeater = -1: they refuse to eat pussy
 	if rand(1,3) = 1: npc_pussyeater[$npclastgenerated] = 1
-	
+
 	!! if npc_cuddler = 1: the npc likes to cuddle
 	if rand(1,3) = 1: npc_cuddler[$npclastgenerated] = 1
-	
+
 	!! if npc_cum_cannon = 1: the npc ejaculates particularly large loads
 	if rand(1,5) = 1: npc_cum_cannon[$npclastgenerated] = 1
-	
+
 	!! if npc_sex_filmer = 1: the npc likes to make sex videos
 	if rand(1,5) = 1: npc_sex_filmer[$npclastgenerated] = 1
-	
+
 	!! if npc_two_pump = 1: the npc will always cum immediately in the first penetration act of sex
 	if rand(1,6) = 1: npc_two_pump[$npclastgenerated] = 1
-	
+
 !! ------------------------- date preferences ----------------------------------
 	!! favorite kind of date
 	if $npc_door_pref[$npclastgenerated] = 'indoor' and rand(1,3) < 3:
@@ -950,7 +951,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			$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'

locations/npcgenext.qsrc

@@ -119,7 +119,7 @@ end
 ! {Venerial Disease Generator. requires an index.}
 if $args[0] = 'rstd':
 	if $ARGS[1] = '': ARGS[1] = 0
-	if mid($ARGS[1],1,1) < 10: 
+	if isnum(mid($ARGS[1],1,1)) and val(mid($ARGS[1],1,1)) < 10: 
 		$tempvan1 = 'A' + $ARGS[1]
 	else
 		$tempvan1 = $ARGS[1]

locations/npcpreservec.qsrc

@@ -10,172 +10,173 @@ npcgen_lastrun = 1
 
 if mid($npctemp,1,1) = 'C':
 	:npcsavebsanityloop
-	i = 0
+	npc_scheck = 0
 	$npclastsaved = 'B' + '<<barraynumber>>'
 	$npctemparrb = 'B' + '<<(barraynumber)-(1)>>'
 	if $npc_PersType[$npctemparrb] = '' and barraynumber > 0:
 		barraynumber -= 1
-		i = 1
+		npc_scheck = 1
 	elseif $npc_PersType[$npclastsaved] = '':
-		i = 0
+		npc_scheck = 0
 	else
 		barraynumber += 1
-		i = 1
+		npc_scheck = 1
 	end
-	if i = 1: jump 'npcsavebsanityloop'
+	if npc_scheck = 1: jump 'npcsavebsanityloop'
 	barraynumber += 1
-	
+	killvar 'npc_scheck'
+
 	! {This copies the array from Array C to Array B}
-	$npc_firstname[$npclastsaved]	= $npc_firstname[$npctemp]
-	$npc_nickname[$npclastsaved]	= $npc_nickname[$npctemp]
-	$npc_lastname[$npclastsaved]	= $npc_lastname[$npctemp]
-	$npc_usedname[$npclastsaved]	= $npc_usedname[$npctemp]
-	$npc_notes[$npclastsaved]		= $npc_notes[$npctemp]
-	$npc_pic[$npclastsaved]			= $npc_pic[$npctemp]
-	lover_picrand[$npclastsaved]	= lover_picrand[$npctemp]
-	
-	npc_age[$npclastsaved]			= npc_age[$npctemp]
-	npc_dob[$npclastsaved]			= npc_dob[$npctemp]
-	npc_gender[$npclastsaved]		= npc_gender[$npctemp]
-
-	npc_height[$npclastsaved]		= npc_height[$npctemp]
+	$npc_firstname[$npclastsaved]		= $npc_firstname[$npctemp]
+	$npc_nickname[$npclastsaved]		= $npc_nickname[$npctemp]
+	$npc_lastname[$npclastsaved]		= $npc_lastname[$npctemp]
+	$npc_usedname[$npclastsaved]		= $npc_usedname[$npctemp]
+	$npc_notes[$npclastsaved]			= $npc_notes[$npctemp]
+	$npc_pic[$npclastsaved]				= $npc_pic[$npctemp]
+	lover_picrand[$npclastsaved]		= lover_picrand[$npctemp]
+
+	npc_age[$npclastsaved]				= npc_age[$npctemp]
+	npc_dob[$npclastsaved]				= npc_dob[$npctemp]
+	npc_gender[$npclastsaved]			= npc_gender[$npctemp]
+
+	npc_height[$npclastsaved]			= npc_height[$npctemp]
 ! npc_body
-	npc_haircol[$npclastsaved]		= npc_haircol[$npctemp]
-	npc_apprnc[$npclastsaved]		= npc_apprnc[$npctemp]
-
-	npc_dick[$npclastsaved]			= npc_dick[$npctemp]
-	$npc_thdick[$npclastsaved]		= $npc_thdick[$npctemp]
-	npc_bust[$npclastsaved]			= npc_bust[$npctemp]
-	$npc_dick_desc[$npclastsaved]	= $npc_dick_desc[$npctemp]
-	
-
-	npc_spermpot[$npclastsaved]		= npc_spermpot[$npctemp]
-	npc_sexskill[$npclastsaved]		= npc_sexskill[$npctemp]
-
-	npc_drunk[$npclastsaved]		= npc_drunk[$npctemp]
-	npc_horny[$npclastsaved]		= npc_horny[$npctemp]
-
-	npc_rel[$npclastsaved]			= npc_rel[$npctemp]
-	npc_love[$npclastsaved]			= npc_love[$npctemp]
-	npc_sex[$npclastsaved]			= npc_sex[$npctemp]
-	npc_QW[$npclastsaved]			= npc_QW[$npctemp]
-
-	$npc_perstype[$npclastsaved]	= $npc_perstype[$npctemp]
-	$npc_dna[$npclastsaved]			= $npc_dna[$npctemp]
-
-	npc_herpes[$npclastsaved]		= npc_herpes[$npctemp]
-	npc_syth[$npclastsaved]			= npc_syth[$npctemp]
-	npc_gon[$npclastsaved]			= npc_gon[$npctemp]
-	npc_thrush[$npclastsaved]		= npc_thrush[$npctemp]
-
-	npc_residence[$npclastsaved]	= npc_residence[$npctemp]
-	npc_apt_type[$npclastsaved]		= npc_apt_type[$npctemp]
-	npc_apt_number[$npclastsaved]	= npc_apt_number[$npctemp]
-	
-	$npc_apt_bedroom[$npclastsaved] = $npc_apt_bedroom[$npctemp]
-	$npc_apt_kitchen[$npclastsaved] = $npc_apt_kitchen[$npctemp]
-	$npc_apt_livingroom[$npclastsaved] = $npc_apt_livingroom[$npctemp]
-	$npc_apt_bathroom[$npclastsaved] = $npc_apt_bathroom[$npctemp]
-	$npc_apt_hall[$npclastsaved] = $npc_apt_hall[$npctemp]
-	if $npc_apt_spare[$npclastsaved] ! '':$npc_apt_spare[$npclastsaved] = $npc_apt_spare[$npctemp]
-	
-	npc_perv[$npclastsaved]			= npc_perv[$npctemp]
-	npc_outfit[$npclastsaved]		= npc_outfit[$npctemp]
-	npc_finance[$npclastsaved]		= npc_finance[$npctemp]
-	npc_occupation[$npclastsaved]	= npc_occupation[$npctemp]
-	$npc_occupation[$npclastsaved]	= $npc_occupation[$npctemp]
-	
-	npc_start_free_time[$npclastsaved] = npc_start_free_time[$npctemp]
-	npc_end_free_time[$npclastsaved] = npc_end_free_time[$npctemp]
-	npc_work_start[$npclastsaved] 	= npc_work_start[$npctemp]
-	npc_work_end[$npclastsaved] = npc_work_end[$npctemp]
-	
-	npc_day_off[$npclastsaved]		 = npc_day_off[$npctemp]
-	
-	npc_car[$npclastsaved]  		= npc_car[$npctemp]
-	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
-	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
-
-	npc_style[$npclastsaved]		= npc_style[$npctemp]
-	npc_smoker[$npclastsaved]		= npc_smoker[$npctemp]
-	npc_mj[$npclastsaved]			= npc_mj[$npctemp]
-	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
-	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
-	npc_goal[$npclastsaved]			= npc_goal[$npctemp]
-	$npc_rel_goal[$npclastsaved]			= $npc_rel_goal[$npctemp]
-	
+	npc_haircol[$npclastsaved]			= npc_haircol[$npctemp]
+	npc_apprnc[$npclastsaved]			= npc_apprnc[$npctemp]
+
+	npc_dick[$npclastsaved]				= npc_dick[$npctemp]
+	$npc_thdick[$npclastsaved]			= $npc_thdick[$npctemp]
+	npc_bust[$npclastsaved]				= npc_bust[$npctemp]
+	$npc_dick_desc[$npclastsaved]		= $npc_dick_desc[$npctemp]
+
+
+	npc_spermpot[$npclastsaved]			= npc_spermpot[$npctemp]
+	npc_sexskill[$npclastsaved]			= npc_sexskill[$npctemp]
+
+	npc_drunk[$npclastsaved]			= npc_drunk[$npctemp]
+	npc_horny[$npclastsaved]			= npc_horny[$npctemp]
+
+	npc_rel[$npclastsaved]				= npc_rel[$npctemp]
+	npc_love[$npclastsaved]				= npc_love[$npctemp]
+	npc_sex[$npclastsaved]				= npc_sex[$npctemp]
+	npc_QW[$npclastsaved]				= npc_QW[$npctemp]
+
+	$npc_perstype[$npclastsaved]		= $npc_perstype[$npctemp]
+	$npc_dna[$npclastsaved]				= $npc_dna[$npctemp]
+
+	npc_herpes[$npclastsaved]			= npc_herpes[$npctemp]
+	npc_syth[$npclastsaved]				= npc_syth[$npctemp]
+	npc_gon[$npclastsaved]				= npc_gon[$npctemp]
+	npc_thrush[$npclastsaved]			= npc_thrush[$npctemp]
+
+	npc_residence[$npclastsaved]		= npc_residence[$npctemp]
+	npc_apt_type[$npclastsaved]			= npc_apt_type[$npctemp]
+	npc_apt_number[$npclastsaved]		= npc_apt_number[$npctemp]
+
+	$npc_apt_bedroom[$npclastsaved]		= $npc_apt_bedroom[$npctemp]
+	$npc_apt_kitchen[$npclastsaved]		= $npc_apt_kitchen[$npctemp]
+	$npc_apt_livingroom[$npclastsaved]	= $npc_apt_livingroom[$npctemp]
+	$npc_apt_bathroom[$npclastsaved]	= $npc_apt_bathroom[$npctemp]
+	$npc_apt_hall[$npclastsaved]		= $npc_apt_hall[$npctemp]
+	if $npc_apt_spare[$npclastsaved]	! '':$npc_apt_spare[$npclastsaved] = $npc_apt_spare[$npctemp]
+
+	npc_perv[$npclastsaved]				= npc_perv[$npctemp]
+	npc_outfit[$npclastsaved]			= npc_outfit[$npctemp]
+	npc_finance[$npclastsaved]			= npc_finance[$npctemp]
+	npc_occupation[$npclastsaved]		= npc_occupation[$npctemp]
+	$npc_occupation[$npclastsaved]		= $npc_occupation[$npctemp]
+
+	npc_start_free_time[$npclastsaved]	= npc_start_free_time[$npctemp]
+	npc_end_free_time[$npclastsaved]	= npc_end_free_time[$npctemp]
+	npc_work_start[$npclastsaved]		= npc_work_start[$npctemp]
+	npc_work_end[$npclastsaved]			= npc_work_end[$npctemp]
+
+	npc_day_off[$npclastsaved]			= npc_day_off[$npctemp]
+
+	npc_car[$npclastsaved]  			= npc_car[$npctemp]
+	npc_intel[$npclastsaved]			= npc_intel[$npctemp]
+	npc_humor[$npclastsaved]			= npc_humor[$npctemp]
+
+	npc_style[$npclastsaved]			= npc_style[$npctemp]
+	npc_smoker[$npclastsaved]			= npc_smoker[$npctemp]
+	npc_mj[$npclastsaved]				= npc_mj[$npctemp]
+	npc_addit[$npclastsaved]			= npc_addit[$npctemp]
+	npc_doors[$npclastsaved]			= npc_doors[$npctemp]
+	npc_goal[$npclastsaved]				= npc_goal[$npctemp]
+	$npc_rel_goal[$npclastsaved]		= $npc_rel_goal[$npctemp]
+
 !!	relationship ideals/stats
-	
-	npc_fidelity[$npclastsaved]		= npc_fidelity[$npctemp]
-	$npc_fidelity[$npclastsaved]	= $npc_fidelity[$npctemp]
-	npc_wife[$npclastsaved]			= npc_wife[$npctemp]
-	npc_girlfriend[$npclastsaved]	= npc_girlfriend[$npctemp]
-	npc_lover_days[$npclastsaved]	= npc_lover_days[$npctemp]
-	npc_lover_keys[$npclastsaved]	= npc_lover_keys[$npctemp]
+
+	npc_fidelity[$npclastsaved]			= npc_fidelity[$npctemp]
+	$npc_fidelity[$npclastsaved]		= $npc_fidelity[$npctemp]
+	npc_wife[$npclastsaved]				= npc_wife[$npctemp]
+	npc_girlfriend[$npclastsaved]		= npc_girlfriend[$npctemp]
+	npc_lover_days[$npclastsaved]		= npc_lover_days[$npctemp]
+	npc_lover_keys[$npclastsaved]		= npc_lover_keys[$npctemp]
 
 !!	traits
-	
-	npc_earlyriser[$npclastsaved] 	= npc_earlyriser[$npctemp]
-	npc_latesleeper[$npclastsaved]	= npc_latesleeper[$npctemp]
-	npc_generous[$npclastsaved]		= npc_generous[$npctemp]
-	npc_selfish[$npclastsaved] 		= npc_selfish[$npctemp]
-	npc_gentle[$npclastsaved] 		= npc_gentle[$npctemp]
-	npc_rough[$npclastsaved] 		= npc_rough[$npctemp]
-	npc_risktaker[$npclastsaved] 	= npc_risktaker[$npctemp]
-	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
-	npc_neat[$npclastsaved] 		= npc_neat[$npctemp]
-	npc_messy[$npclastsaved] 		= npc_messy[$npctemp]
-	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
-	
+
+	npc_earlyriser[$npclastsaved]		= npc_earlyriser[$npctemp]
+	npc_latesleeper[$npclastsaved]		= npc_latesleeper[$npctemp]
+	npc_generous[$npclastsaved]			= npc_generous[$npctemp]
+	npc_selfish[$npclastsaved]			= npc_selfish[$npctemp]
+	npc_gentle[$npclastsaved]			= npc_gentle[$npctemp]
+	npc_rough[$npclastsaved]			= npc_rough[$npctemp]
+	npc_risktaker[$npclastsaved]		= npc_risktaker[$npctemp]
+	npc_diligent[$npclastsaved]			= npc_diligent[$npctemp]
+	npc_neat[$npclastsaved]				= npc_neat[$npctemp]
+	npc_messy[$npclastsaved]			= npc_messy[$npctemp]
+	npc_diligent[$npclastsaved]			= npc_diligent[$npctemp]
+
 	npc_manscaped[$npclastsaved]		= npc_manscaped[$npctemp]
 	npc_argumentative[$npclastsaved]	= npc_argumentative[$npctemp]
 	npc_competitive[$npclastsaved]		= npc_competitive[$npctemp]
-	npc_insecure[$npclastsaved] 		= npc_insecure[$npctemp]
+	npc_insecure[$npclastsaved]			= npc_insecure[$npctemp]
 	npc_condom_conscious[$npclastsaved] = npc_condom_conscious[$npctemp]
-	npc_no_condoms[$npclastsaved] 		= npc_no_condoms[$npctemp]
-	npc_latex_allergy[$npclastsaved] 	= npc_latex_allergy[$npctemp]
-	npc_caretaker[$npclastsaved] 		= npc_caretaker[$npctemp]
+	npc_no_condoms[$npclastsaved]		= npc_no_condoms[$npctemp]
+	npc_latex_allergy[$npclastsaved]	= npc_latex_allergy[$npctemp]
+	npc_caretaker[$npclastsaved]		= npc_caretaker[$npctemp]
 	npc_childfree[$npclastsaved]		= npc_childfree[$npctemp]
-	npc_abusive[$npclastsaved] 			= npc_abusive[$npctemp]
+	npc_abusive[$npclastsaved]			= npc_abusive[$npctemp]
 
-	npc_cuddler[$npclastsaved] 			= npc_cuddler[$npctemp]
+	npc_cuddler[$npclastsaved]			= npc_cuddler[$npctemp]
 
 !!	sex traits and stats
-	npc_sexdrive[$npclastsaved] 		= npc_sexdrive[$npctemp]
-	npc_sex_stamina[$npclastsaved] 		= npc_sex_stamina[$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_sex_volume[$npclastsaved]	= npc_sex_volume[$npctemp]
-	npc_gentle_lover[$npclastsaved]	= npc_gentle_lover[$npctemp]
-	npc_dirty_lover[$npclastsaved]	= npc_dirty_lover[$npctemp]
-	npc_sensual_lover[$npclastsaved]= npc_sensual_lover[$npctemp]
-	npc_cum_pref[$npclastsaved]		= npc_cum_pref[$npctemp]
-	$npc_cum_pref[$npclastsaved]	= $npc_cum_pref[$npctemp]
+	npc_sexdrive[$npclastsaved]			= npc_sexdrive[$npctemp]
+	npc_sex_stamina[$npclastsaved]		= npc_sex_stamina[$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_sex_volume[$npclastsaved]		= npc_sex_volume[$npctemp]
+	npc_gentle_lover[$npclastsaved]		= npc_gentle_lover[$npctemp]
+	npc_dirty_lover[$npclastsaved]		= npc_dirty_lover[$npctemp]
+	npc_sensual_lover[$npclastsaved]	= npc_sensual_lover[$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_dislikes_facials[$npclastsaved]	= npc_dislikes_facials[$npctemp]
-	npc_tit_pref[$npclastsaved]		= npc_tit_pref[$npctemp]
-	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
-	npc_sex_spanker[$npclastsaved] 	= npc_sex_spanker[$npctemp]
-	npc_pussyeater[$npclastsaved]	= npc_pussyeater[$npctemp]
-	npc_cum_cannon[$npclastsaved]	= npc_cum_cannon[$npctemp]
-	npc_sex_filmer[$npclastsaved]	= npc_sex_filmer[$npctemp]
-	npc_know_bc[$npclastsaved]		= npc_know_bc[$npctemp]
-	npc_know_not_bc[$npclastsaved]	= npc_know_not_bc[$npctemp]
-	npc_thinkage[$npclastsaved]		= npc_thinkage[$npctemp]
-	$npc_know_pubes[$npclastsaved]	= $npc_know_pubes[$npctemp]
-	npc_hj_count[$npclastsaved]		= npc_hj_count[$npctemp]
-	npc_bj_count[$npclastsaved]		= npc_bj_count[$npctemp]
-	npc_fuck_times[$npclastsaved]	= npc_fuck_times[$npctemp]
-	virgin_taker_ID[$npclastsaved]	= virgin_taker_ID[$npctemp]
-	
+	npc_tit_pref[$npclastsaved]			= npc_tit_pref[$npctemp]
+	npc_bush_pref[$npclastsaved]		= npc_bush_pref[$npctemp]
+	npc_sex_spanker[$npclastsaved]		= npc_sex_spanker[$npctemp]
+	npc_pussyeater[$npclastsaved]		= npc_pussyeater[$npctemp]
+	npc_cum_cannon[$npclastsaved]		= npc_cum_cannon[$npctemp]
+	npc_sex_filmer[$npclastsaved]		= npc_sex_filmer[$npctemp]
+	npc_know_bc[$npclastsaved]			= npc_know_bc[$npctemp]
+	npc_know_not_bc[$npclastsaved]		= npc_know_not_bc[$npctemp]
+	npc_thinkage[$npclastsaved]			= npc_thinkage[$npctemp]
+	$npc_know_pubes[$npclastsaved]		= $npc_know_pubes[$npctemp]
+	npc_hj_count[$npclastsaved]			= npc_hj_count[$npctemp]
+	npc_bj_count[$npclastsaved]			= npc_bj_count[$npctemp]
+	npc_fuck_times[$npclastsaved]		= npc_fuck_times[$npctemp]
+	virgin_taker_ID[$npclastsaved]		= virgin_taker_ID[$npctemp]
+
 	!! This checks if you have had sex with this person before or not
-	npc_sex[$npclastsaved] = npc_sex[$npctemp]
+	npc_sex[$npclastsaved]				= npc_sex[$npctemp]
+
+	$npc_index[$npclastsaved]			= $npclastsaved
+
 
-	$npc_index[$npclastsaved] = $npclastsaved
-	
-	
 
 	! {This checks the miscellanious arrays for the Entry and changes it to the new Array B.}
 	:npctempmloop

locations/npcstatic1.qsrc

@@ -30,7 +30,8 @@ Empty number - 66(bandit), 100, 231
 
 Example
 npctemp = 1
-$npc_dna['A<<npctemp>>'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
+Use Cheat Menu DNA Generation tool for custom DNA or parents DNA, otherwise func is enough
+$npc_dna['A<<npctemp>>'] = func('dna','create')
 $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'
@@ -1199,7 +1200,7 @@ $npc_dna['A<<npctemp>>'] = '1389808807 1404442169 1642165848 1673620649 15315971
 $npc_firstname['A<<npctemp>>'] = 'Margaret'
 $npc_nickname['A<<npctemp>>'] = 'Margo'
 $npc_usedname['A<<npctemp>>'] = 'A girl met outside of the Boutique'
-$npc_notes['A<<npctemp>>'] = 19940810
+$npc_notes['A<<npctemp>>'] = str(19940810)
 npc_dob['A<<npctemp>>'] = rand(10,30)
 npc_gender['A<<npctemp>>'] = 1
 

locations/npcstatic2.qsrc

@@ -634,7 +634,7 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 npctemp = 85
 $npc_dna['A<<npctemp>>'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
-$npc_firstname['A<<npctemp>>'] = 0
+$npc_firstname['A<<npctemp>>'] = ''
 $npc_nickname['A<<npctemp>>'] = 'Kas'
 $npc_notes['A<<npctemp>>'] = 'A black handyman from the office.'
 npc_gender['A<<npctemp>>'] = 0
@@ -665,7 +665,7 @@ npc_dick['A<<npctemp>>'] = 20
 npctemp = 87
 $npc_dna['A<<npctemp>>'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
-$npc_nickname['A<<npctemp>>'] = 0
+$npc_nickname['A<<npctemp>>'] = ''
 $npc_lastname['A<<npctemp>>'] = 'Ivanovich'
 $npc_notes['A<<npctemp>>'] = 'Cleaning Job Boss'
 npc_gender['A<<npctemp>>'] = 0

locations/obj_din.qsrc

@@ -2331,17 +2331,19 @@ if $ARGS[0] = 'wait':
 	if waiting > 0 and waiting <= 120:
 		minut += waiting
 	else
-		'Invalid time.'
+		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
+	killvar 'waitStr'
 	gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'rest':
 	cla
-	waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
+	waiting = val(input("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)"))
 
-	if waiting = '':
+	if waiting = 0:
 		minut += 15
 	elseif waiting > 0 and waiting <= 120:
 		minut += waiting
@@ -2349,10 +2351,11 @@ if $ARGS[0] = 'rest':
 		if pcs_sleep < 90 and waiting >= 60:
 			pcs_sleep += 10
 		end
-	elseif waiting <= 0 or waiting > 120:
+	else
 		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
 	gt $loc, $loc_arg
 end
 

locations/park_walkevents.qsrc

@@ -671,7 +671,7 @@ if $ARGS[0] = '6b':
 
 					act 'Stop resisting':
 						cla & *clr
- 
+
 						'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/event/rape/11.jpg"></center>'
 						'For every thrust he goes deeper into you and with a violent thrust he reaches your cervix and you squeal as he smirks. He continues thrusting and by now you don''t even know if you''re enjoying yourself or if you''re in pain.'
 						'You keep on screaming but to no avail, he''s pulled you deep into the woods and no one can hear your screams. Realizing this, you give up and let him have his way with you.'
@@ -932,14 +932,14 @@ if $ARGS[0] = 'run':
 							elseif temp['catcall'] = 3:
 								'"Wooooeee! That ass! I wanna take it home with me and make it mine!"'
 							end
-							
+
 							act'Ignore him':
 								cla & *clr
 								gs 'park_walkevents', 'running_image'
 								'You roll your eyes but otherwise ignore him, continuing to run until his hollering is nothing but a distant buzz behind you. And soon enough, there''s no hollering at all.'
 								act 'Finish your run': gt 'park_walkevents', 'run_end'
 							end
-							
+
 							act'Ignore him (annoyed)':
 								cla & *clr
 								temp['catcall'] = 4
@@ -949,7 +949,7 @@ if $ARGS[0] = 'run':
 								'Fuck! Who does he think he is? Are you just a piece of meat to him? Fuck that guy and fuck everybody like him!'
 								act 'Finish your run': gt 'park_walkevents', 'run_end'
 							end
-							
+
 							act'Walk up to him':
 								cla & *clr
 								!! IMAGE HERE
@@ -965,7 +965,7 @@ if $ARGS[0] = 'run':
 									'"You know I would baby! Just come back here and we''ll make it happen!" the guy shouts after you.'
 									act 'Finish your run': gt 'park_walkevents', 'run_end'
 								end
-								
+
 								act'Wanna fuck?':
 									cla & *nl
 									'"<<$pcs_nickname>>." you say flatly. "Nice to meet you. But really. You mean all that stuff you said? Cause if you''re serious, we could go back to your place and get it on. I could go for a good fuck right now."'
@@ -973,8 +973,12 @@ if $ARGS[0] = 'run':
 										'He blinks in surprise but recovers quickly. "I mean, hell yeah. If you''re offering."'
 										'"You''re the one who offered," you shrug. "Now hurry up and lead the way."'
 										'He quickly heads out of the park and towards an apartment complex, you follow all the way.'
-										gs 'npcpreservec', $npclastgenerated
-										act 'Go to his place':$hookup['pickup'] = 'park_run' & gt 'sex_ev_start', 'hookup_npc_home_start'
+										act 'Go to his place':
+											gs 'npcpreservec', $npclastgenerated
+											$npclastgenerated = $npclastsaved
+											$hookup['pickup'] = 'park_run'
+											gt 'sex_ev_start', 'hookup_npc_home_start'
+										end
 									else
 										'"Uhhh..." he blinks in surprise and begins sputtering. "Well I- You''re uhmm... It''s just-"'
 										'"Ugh," you roll your eyes. "What a waste of fucking time. Limp dick loser." You don''t spare him another thought and break back into a run, leaving him and your disappointment behind.'
@@ -1023,13 +1027,13 @@ if $ARGS[0] = 'run':
 				elseif $daystage['desc'] = 'pre_dawn':
 					'It''s still dark out. Are you sure it''s such a good idea to go running so early in the morning?'
 				end
-				
+
 				act'Maybe not':
 					cla & *nl
 					'On second thought, maybe a young girl like yourself <i>shouldn''t</i> go running in the dark...'
 					act 'Continue': gt $loc, $loc_arg
 				end
-				
+
 				act'It''ll be fine':
 					!! if running late at night
 					*clr & cla
@@ -1051,7 +1055,7 @@ if $ARGS[0] = 'run':
 							!! not added yet because don''t have single rapist event written yet
 							$temp['rape_type'] = 'gang'
 							cla & *clr
-							'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn1.jpg"></center>'
 							'About halfway through your run, you hear a branch snap to your left. You turn to see a shadow crouching in the bushes, but before you can react, arms grip you from behind and a dirty hand clamps over your mouth. Your eyes go wide with fear as several more shapes emerge from the darkness, moving towards you.'
 							*nl
 							'"Well well well, what do we have here?" a gravely voice says from behind you. "A tasty little treat for us to enjoy?"'
@@ -1329,7 +1333,7 @@ if $ARGS[0] = 'find_baby':
 				minut += 30
 				act 'Finish': gt 'city_clinic', 'start'
 			end
-			if pcs_mood < 20:				
+			if pcs_mood < 20:
 				act 'Call an ambulance and leave.':
 					*clr & cla
 					minut += 10