Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/body.qsrc

@@ -8,49 +8,42 @@
 !! There is also a special string, $pcdesc_typeinsertive, that follows the format " , descriptive text" as in, " , invitingly-glossed". Please check the master string document to see if this exists for the string you need. - xerya, July 2017
 
 if pcs_throat = 0:
-	thpic = 0
 	$pcs_throat = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
 	$pcdesc_throatrandom = 'virgin'
 	$pcdesc_throat = 'virgin'
 	$pcdesc_throatwordy = 'virginal, unused'
 	$throattipe = 'virgin'
 elseif pcs_throat <= 5:
-	thpic = 1
 	$pcs_throat = 'You have an extremely inexperienced <a href="exec:view''images/pc/body/throat/th1.jpg''">mouth</a>.'
 	$pcdesc_throatrandom = 'narrow'
 	$pcdesc_throat = 'narrow'
 	$pcdesc_throatwordy = 'reluctant, gag-prone'
 	$throattipe = 'narrow'
 elseif pcs_throat <= 10:
-	thpic = 2
 	$pcs_throat = 'Your slightly-experienced mouth leads to a sensitive <a href="exec:view''images/pc/body/throat/th2.jpg''">throat</a> with an easily-triggered gag reflex.'
 	$pcdesc_throatrandom = 'delicate'
 	$pcdesc_throat = 'delicate'
 	$pcdesc_throatwordy = 'delicate, barely-experienced'
 	$throattipe = 'delicate'
 elseif pcs_throat <= 15:
-	thpic = 3
 	$pcs_throat = 'You have an experienced mouth and fairly practiced <a href="exec:view''images/pc/body/throat/th3.jpg''">throat</a>.'
 	$pcdesc_throatrandom = 'fairly practiced'
 	$pcdesc_throat = 'fairly practiced'
 	$pcdesc_throatwordy = 'fairly practiced'
 	$throattipe = 'fairly practiced'
 elseif pcs_throat <= 25:
-	thpic = 4
 	$pcs_throat = 'You have a willing mouth and trained <a href="exec:view''images/pc/body/throat/th4.jpg''">throat</a>.'
 	$pcdesc_throatrandom = 'well-trained'
 	$pcdesc_throat = 'well-trained'
 	$pcdesc_throatwordy = 'experienced, well-trained and eager'
 	$throattipe = 'well-trained'
 elseif pcs_throat <= 35:
-	thpic = 5
 	$pcs_throat = 'Your deep tunnel of a <a href="exec:view''images/pc/body/throat/th5.jpg''">throat</a> may adopt any member.'
 	$pcdesc_throatrandom = 'capacious'
 	$pcdesc_throat = 'capacious'
 	$pcdesc_throatwordy = 'seasoned, effortlessly-plumbed'
 	$throattipe = 'capacious'
 else
-	thpic = 6
 	$pcs_throat = 'Your gag reflex is completely absent and your <a href="exec:view''images/pc/body/throat/th6.jpg''">throat</a> has seen nearly as much cock as it has food.'
 	$pcdesc_throatrandom = 'bottomless'
 	$pcdesc_throat = 'bottomless'
@@ -62,15 +55,13 @@ if pcs_breath = 1:$pcs_throat += ' Last you checked, your breath smelled fresh a
 
 
 if pcs_vag = 0:
-	puspic = 0
-	$pcs_vag = 'Your virgin <a href="exec:view''images/pc/body/pussy/vag0.jpg''">pussy</a> still has its hymen intact.'
+	$pcs_vag = 'Your virgin <a href="exec:view''images/pc/body/pussy/stage0/' + rand(1,5) + '.jpg''">pussy</a> still has its hymen intact.'
 	$pcdesc_pussyrandom = 'virgin'
 	$pcdesc_pussy = 'virgin'
 	$pcdesc_pussywordy = 'virgin'
 	$vaginatipe = 'virgin'
 elseif pcs_vag <= 5:
-	puspic = 1
-	$pcs_vag = 'You have an inexperienced <a href="exec:view''images/pc/body/pussy/vag1.jpg''">pussy</a>.'
+	$pcs_vag = 'You have an inexperienced <a href="exec:view''images/pc/body/pussy/stage1/' + rand(1,5) + '.jpg''">pussy</a>.'
 	rand_pussy = rand(0,2)
 	if rand_pussy = 0:
 		$pcdesc_pussyrandom = 'narrow'
@@ -83,8 +74,7 @@ elseif pcs_vag <= 5:
 	$pcdesc_pussywordy = 'squeezingly tight and narrow'
 	$vaginatipe = 'narrow'
 elseif pcs_vag <= 10:
-	puspic = 2
-	$pcs_vag = 'You have a tight <a href="exec:view''images/pc/body/pussy/vag1.jpg''">pussy</a>.'
+	$pcs_vag = 'You have a tight <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a>.'
 	rand_pussy = rand(0,1)
 	if rand_pussy = 0:
 		$pcdesc_pussyrandom = 'snug'
@@ -95,8 +85,7 @@ elseif pcs_vag <= 10:
 	$pcdesc_pussywordy = 'youthfully tight'
 	$vaginatipe = 'tight'
 elseif pcs_vag <= 15:
-	puspic = 3
-	$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/vag1.jpg''">vagina</a> is used to taking normal sized insertions.'
+	$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg''">vagina</a> is used to taking normal sized insertions.'
 	rand_pussy = rand(0,2)
 	if rand_pussy = 0:
 		$pcdesc_pussyrandom = 'elastic'
@@ -109,8 +98,7 @@ elseif pcs_vag <= 15:
 	$pcdesc_pussywordy = 'seasoned, pliable and tight'
 	$vaginatipe = 'pliable'
 elseif pcs_vag <= 25:
-	puspic = 4
-	$pcs_vag = 'You have a well-developed <a href="exec:view''images/pc/body/pussy/vag1.jpg''">vagina</a>.'
+	$pcs_vag = 'You have a well-developed <a href="exec:view''images/pc/body/pussy/stage4/' + rand(1,5) + '.jpg''">vagina</a>.'
 	rand_pussy = rand(0,3)
 	if rand_pussy = 0:
 		$pcdesc_pussyrandom = 'welcoming'
@@ -124,10 +112,13 @@ elseif pcs_vag <= 25:
 	$pcdesc_pussy = 'experienced'
 	$pcdesc_pussywordy = 'experienced, welcoming'
 	$vaginatipe = 'experienced'
-elseif pcs_vag <= 35:
-	puspic = 5
-	$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/vag2.jpg''">playground</a> can take most things you force up there.'
-	rand_pussy = rand(0,3)
+else
+	if rand(0,1) = 0:
+		$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there.'
+	else
+		$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/vag2.jpg''">pussy</a> is so used to being over-stuffed that it takes a huge member just to get off.'
+	end
+	rand_pussy = rand(0,6)
 	if rand_pussy = 0:
 		$pcdesc_pussyrandom = 'eager and hungry'
 	elseif rand_pussy = 1:
@@ -136,38 +127,30 @@ elseif pcs_vag <= 35:
 		$pcdesc_pussyrandom = 'cock-starved'
 	elseif rand_pussy = 3:
 		$pcdesc_pussyrandom = 'seemingly constantly-fucked'
-	end
-	$pcdesc_pussy = 'oft-fucked'
-	$pcdesc_pussywordy = 'well-trained, oft-fucked'
-	$vaginatipe = 'oft-fucked'
-else
-	puspic = 6
-	$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/vag2.jpg''">pussy</a> is so used to being over-stuffed that it takes a huge member just to get off.'
-	rand_pussy = rand(0,2)
-	if rand_pussy = 0:
+	elseif rand_pussy = 4:
 		$pcdesc_pussyrandom = 'always-ready'
-	elseif rand_pussy = 1:
+	elseif rand_pussy = 5:
 		$pcdesc_pussyrandom = 'near daily-stuffed'
-	elseif rand_pussy = 2:
+	elseif rand_pussy = 6:
 		$pcdesc_pussyrandom = 'overeager, ever-popular'
 	end
 	$pcdesc_pussy = 'overeager'
 	$pcdesc_pussywordy = 'cock-tamed and ever-ready'
-	$vaginatipe = 'overeager'
+	$vaginatipe = 'oft-fucked'
 end
 
 !! The original variables are all named for ass, but really, this is just all about the asshole.
 if analplugIN = 0:
 	if pcs_ass = 0:
 		anpic = 0
-		$pcs_ass = 'You have a virgin <a href="exec:view''images/pc/body/anus/0.jpg''">anus</a>.'
+		$pcs_ass = 'You have a virgin <a href="exec:view''images/pc/body/anus/stage0/' + rand(1,5) + '.jpg''">anus</a>.'
 		$pcdesc_anusrandom = 'virgin'
 		$pcdesc_anus = 'virgin'
 		$pcdesc_anuswordy = 'virgin'
 		$anustipe = 'virgin'
 	elseif pcs_ass <= 5:
 		anpic = 1
-		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/1.jpg''">anus</a> is barely used, and looking at it none would know it was used for sex.'
+		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage1/' + rand(1,5) + '.jpg''">anus</a> is barely used, and looking at it none would know it was used for sex.'
 		rand_anus = rand(0,2)
 		if rand_anus = 0:
 			$pcdesc_anusrandom = 'tight'
@@ -181,7 +164,7 @@ if analplugIN = 0:
 		$anustipe = 'tight'
 	elseif pcs_ass <= 10:
 		anpic = 2
-		$pcs_ass = 'Your pliable <a href="exec:view''images/pc/body/anus/2.jpg''">anus</a> has the shape of an asterisk.'
+		$pcs_ass = 'Your pliable <a href="exec:view''images/pc/body/anus/stage2/' + rand(1,5) + '.jpg''">anus</a> has the shape of an asterisk.'
 		rand_anus = rand(0,2)
 		if rand_anus = 0:
 			$pcdesc_anusrandom = 'flexible'
@@ -195,7 +178,7 @@ if analplugIN = 0:
 		$anustipe = 'flexible'
 	elseif pcs_ass <= 15:
 		anpic = 3
-		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/3.jpg''">anus</a> is usually slightly parted, it has been used quite often.'
+		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage3/' + rand(1,5) + '.jpg''">anus</a> is usually slightly parted, it has been used quite often.'
 		rand_anus = rand(0,2)
 		if rand_anus = 0:
 			$pcdesc_anusrandom = 'stretchy'
@@ -209,7 +192,7 @@ if analplugIN = 0:
 		$anustipe = 'stretchy'
 	elseif pcs_ass <= 25:
 		anpic = 4
-		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/4.jpg''">anus</a> often looks like a wide hole; anyone would think that the only thing you do is anal sex.'
+		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage4/' + rand(1,5) + '.jpg''">anus</a> often looks like a wide hole; anyone would think that the only thing you do is anal sex.'
 		rand_anus = rand(0,2)
 		if rand_anus = 0:
 			$pcdesc_anusrandom = 'loose'
@@ -221,38 +204,34 @@ if analplugIN = 0:
 		$pcdesc_anus = 'loose'
 		$pcdesc_anuswordy = 'loose, open'
 		$anustipe = 'loose'
-	elseif pcs_ass <= 35:
+	else
 		anpic = 5
-		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/5.jpg''">anus</a> genuinely doesn''t fully close on its own anymore. You could put a fist through it and it would scarcely stretch at all.'
-		rand_anus = rand(0,2)
+		if rand(0,1) = 0:
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage5/' + rand(1,5) + '.jpg''">anus</a> genuinely doesn''t fully close on its own anymore. You could put a fist through it and it would scarcely stretch at all.'
+		else
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/6.jpg''">anus</a> is almost completely wrecked. Even with conscious effort it''s hard to close it.'
+		end
+		rand_anus = rand(0,7)
 		if rand_anus = 0:
 			$pcdesc_anusrandom = 'gaping'
 		elseif rand_anus = 1:
 			$pcdesc_anusrandom = 'yawning'
 		elseif rand_anus = 2:
 			$pcdesc_anusrandom = 'obscenely yawning'
-		end
-		$pcdesc_anus = 'gaping'
-		$pcdesc_anuswordy = 'gaping, seemingly constantly-fucked'
-		$anustipe = 'gaping'
-	else
-		anpic = 6
-		$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/6.jpg''">anus</a> is almost completely wrecked. Even with conscious effort it''s hard to close it.'
-		rand_anus = rand(0,4)
-		if rand_anus = 0:
+		elseif rand_anus = 3:
 			$pcdesc_anusrandom = 'destroyed'
-		elseif rand_anus = 1:
+		elseif rand_anus = 4:
 			$pcdesc_anusrandom = 'demolished'
-		elseif rand_anus = 2:
+		elseif rand_anus = 5:
 			$pcdesc_anusrandom = 'uselessly loose'
-		elseif rand_anus = 3:
+		elseif rand_anus = 6:
 			$pcdesc_anusrandom = 'ruined'
-		elseif rand_anus = 4:
+		elseif rand_anus = 7:
 			$pcdesc_anusrandom = 'wrecked'
 		end
-		$pcdesc_anus = 'destroyed'
-		$pcdesc_anuswordy = 'absolutely fuck-wrecked'
-		$anustipe = 'destroyed'
+		$pcdesc_anus = 'gaping'
+		$pcdesc_anuswordy = 'gaping, seemingly constantly-fucked'
+		$anustipe = 'gaping'
 	end
 !! This below was originally missing even the original reference for $anustipe, so I added it in simplistically. Also, tanga means panties, or more specifically, a thong. A lot of duplication on descriptions, but not much to change, the logic is for images.
 else

locations/gschool_lessons1.qsrc

@@ -103,10 +103,10 @@ if $ARGS[0] = 'math':
 			VK = rand(1,20)
 			if VK > 18 and VKHappyHome < 2 and VKPuppetDream = 0:
 				gt 'NikoDreams', 'Puppeteer'
-			elseif VK > 16:
-				gt 'NikoDreams', 'Night Out'
-			elseif VK > 14:
-				gt 'NikoDreams', 'Toilet Time'
+			!elseif VK > 16:
+			!	gt 'NikoDreams', 'Night Out' this does not exist so commenting it out
+			!elseif VK > 14:
+			!	gt 'NikoDreams', 'Toilet Time' this does not exist so commenting it out
 			elseif VK > 12:
 				*clr & cla
 				gs'stat'

locations/npcstatic1.qsrc

@@ -137,7 +137,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''dimka''"><<$npc_nickname[''A1'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''dimka''"><<$npc_usedname[''A1'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A1'
 	
 
@@ -172,7 +172,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''artem''"><<$npc_nickname[''A2'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''artem''"><<$npc_usedname[''A2'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A2'
 
 
@@ -207,7 +207,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''ivan''"><<$npc_nickname[''A3'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''ivan''"><<$npc_usedname[''A3'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A3'
 
 
@@ -243,7 +243,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''igor''"><<$npc_nickname[''A4'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''igor''"><<$npc_usedname[''A4'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A4'
 
 
@@ -279,7 +279,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''fedor''"><<$npc_nickname[''A5'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''fedor''"><<$npc_usedname[''A5'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A5'
 
 
@@ -314,7 +314,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''petka''"><<$npc_nickname[''A6'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''petka''"><<$npc_usedname[''A6'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A6'
 
 
@@ -349,7 +349,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''lesco''"><<$npc_nickname[''A7'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''lesco''"><<$npc_usedname[''A7'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A7'
 
 
@@ -384,7 +384,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''svyatoslav''"><<$npc_nickname[''A8'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''svyatoslav''"><<$npc_usedname[''A8'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A8'
 
 
@@ -420,7 +420,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vitek''"><<$npc_nickname[''A9'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vitek''"><<$npc_usedname[''A9'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A9'
 
 
@@ -456,7 +456,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''dan''"><<$npc_nickname[''A10'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''dan''"><<$npc_usedname[''A10'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A10'
 
 
@@ -498,7 +498,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vasily''"><<$npc_nickname[''A11'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vasily''"><<$npc_usedname[''A11'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A11'
 
 
@@ -532,7 +532,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''julia''"><<$npc_nickname[''A12'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''julia''"><<$npc_usedname[''A12'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A12'
 
 npctemp = 13
@@ -571,7 +571,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lariska''"><<$npc_nickname[''A13'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lariska''"><<$npc_usedname[''A13'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A13'
 
 
@@ -605,7 +605,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''katja''"><<$npc_nickname[''A14'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''katja''"><<$npc_usedname[''A14'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A14'
 
 npctemp = 15
@@ -638,7 +638,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_nickname[''A15'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_usedname[''A15'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A15'
 
 
@@ -673,7 +673,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''natasha''"><<$npc_nickname[''A16'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''natasha''"><<$npc_usedname[''A16'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A16'
 
 
@@ -707,7 +707,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''irina''"><<$npc_nickname[''A17'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''irina''"><<$npc_usedname[''A17'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A17'
 
 
@@ -751,7 +751,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_nickname[''A18'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A18'
 
 
@@ -785,7 +785,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lina''"><<$npc_nickname[''A19'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''lina''"><<$npc_usedname[''A19'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A19'
 
 
@@ -821,7 +821,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lena''"><<$npc_nickname[''A20'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lena''"><<$npc_usedname[''A20'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A20'
 
 
@@ -859,7 +859,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lera''"><<$npc_nickname[''A21'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''lera''"><<$npc_usedname[''A21'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A21'
 
 
@@ -889,7 +889,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''bella''"><<$npc_nickname[''A22'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''bella''"><<$npc_usedname[''A22'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A22'
 
 
@@ -922,7 +922,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''albina''"><<$npc_nickname[''A23'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''albina''"><<$npc_usedname[''A23'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A23'
 
 
@@ -954,7 +954,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''pauline''"><<$npc_nickname[''A24'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''pauline''"><<$npc_usedname[''A24'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A24'
 
 
@@ -993,7 +993,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'',
 schoolenable['A<<npctemp>>'] = 1
 discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''sonia''"><<$npc_nickname[''A25'']>></a>'
+$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''sonia''"><<$npc_usedname[''A25'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A25'
 
 

locations/npcstatic2.qsrc

@@ -100,7 +100,7 @@ npc_hymen['A<<npctemp>>'] = -1
 npc_nips['A<<npctemp>>'] = 1
 npc_grupTipe['A<<npctemp>>'] = 7
 npc_selfieon['A<<npctemp>>'] = 1
-$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_nickname[''A54'']>>'
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_usedname[''A54'']>>'
 
 
 npctemp = 55

locations/npcstatic3.qsrc

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

locations/npcstatic4.qsrc

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

locations/saveupdater.qsrc

@@ -609,5 +609,9 @@ if mistpiss > stat['pee_give'] - natpee: stat['pee_give'] += mistpiss
 !!0.7.4 pavChurch variable rename
 if moral > 0: church_moral = moral & killvar 'moral'
 
+if thpic ! 0: killvar 'thpic'
+if puspic ! 0: killvar 'puspic'
+
+
 --- saveupdater ---------------------------------
 

locations/seeporn.qsrc

@@ -167,8 +167,6 @@ act 'Watch it':
 						spafinloc = 7
 						sexpartkno = 1
 						gs 'cum_manage'
-						spafinloc = 11
-						gs 'cum_manage'
 						gs 'boyStat', 'A34'
 						spafinloc = 11
 						sexpartkno = 1

locations/sny.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = '6':
 			act 'Continue': minut += 5 & gt 'sny', '7'
 		end
 	else
-		act 'Refuse to drink (<font color="red"<<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
+		act 'Refuse to drink (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	
 	act 'Drink':